commit f62558cb9f03b74fa2d97a01a149e7572a6084dc
author Gabor Kelemen <kelemeng@ubuntu.com> Tue Nov 30 11:15:08 2021 +0100
committer Xisco Fauli <xiscofauli@libreoffice.org> Thu Dec 02 10:07:42 2021 +0100
tree 7e43d3d9fe96b14abfeb6c50a0cf9efab9a4c932
parent 37de99cf953f0d7035527f245dff8f9376d29be3

tdf#145819 Revert logic of the image-with-rotation dialog: sc & sd

Change-Id: I906e83ada98fd7a583872a2eaa76d7fd04a5401b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126110
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 970cbb120a62e952e80348b8e94478600241273a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126143

sc/source/ui/drawfunc/fuins1.cxx

diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 31b597e..5c7bac6 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -113,7 +113,9 @@ static void lcl_InsertGraphic( const Graphic& rGraphic,
        if (aRotation)
        {
            std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(nullptr, VclMessageType::Question,VclButtonsType::YesNo,ScResId(STR_QUERYROTATION)));
            if (xQueryBox->run() == RET_YES)
            // tdf#145819 Apply the rotation information if the user does NOT want to unrotate the image
            // If they chose Yes we ignore the rotation
            if (xQueryBox->run() == RET_NO)
            {
                GraphicNativeTransform aTransform( rGraphic1 );
                aTransform.rotate( aRotation );

sd/source/ui/func/fuinsert.cxx

diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index f8f5625..4fa9db0 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -148,7 +148,9 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq )
            if (aRotation)
            {
                std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(nullptr, VclMessageType::Question,VclButtonsType::YesNo,SdResId(STR_QUERYROTATION)));
                if (xQueryBox->run() == RET_YES)
                // tdf#145819 Apply the rotation information if the user does NOT want to unrotate the image
                // If they chose Yes we ignore the rotation
                if (xQueryBox->run() == RET_NO)
                {
                    GraphicNativeTransform aTransform( aGraphic );
                    aTransform.rotate( aRotation );