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

[Gabor Kelemen (via logerrit)]

 sw/source/uibase/dochdl/swdtflvr.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6417d9a3b79346da4e1d08994436a0a17849cd8a
Author:     Gabor Kelemen <kelem...@ubuntu.com>
AuthorDate: Mon Nov 29 21:26:03 2021 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Nov 30 12:29:59 2021 +0100

    tdf#145819 Revert logic of the image-with-rotation dialog
    
    Change-Id: Ibca1092699e3a7edd37161f421f3d369a4eb49a6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126070
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
    (cherry picked from commit cda9a5af36977420bae34737cd7b52cddb3226ef)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126097
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx 
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 67f8f3204d4e..6dd35e9fe34c 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -417,7 +417,9 @@ namespace
         {
             std::unique_ptr<weld::Builder> 
xBuilder(Application::CreateBuilder(nullptr, 
"modules/swriter/ui/queryrotateintostandarddialog.ui"));
             std::unique_ptr<weld::MessageDialog> 
xQueryBox(xBuilder->weld_message_dialog("QueryRotateIntoStandardOrientationDialog"));
-            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 );