[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/source sd/source

[Gabor Kelemen (via logerrit)]

 sc/source/ui/drawfunc/fuins1.cxx |    4 +++-
 sd/source/ui/func/fuinsert.cxx   |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 1e1b1d63028fd1328ed8cd72b5e2d6721bf08a73
Author:     Gabor Kelemen <kelem...@ubuntu.com>
AuthorDate: Tue Nov 30 11:15:08 2021 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Dec 2 10:06:56 2021 +0100

    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 <xiscofa...@libreoffice.org>
    (cherry picked from commit 970cbb120a62e952e80348b8e94478600241273a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126144

diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 31b597e9ea19..5c7bac6ce2a6 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 );
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 01434b40f141..d51a580ff081 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 );