commit cda9a5af36977420bae34737cd7b52cddb3226ef
author Gabor Kelemen <kelemeng@ubuntu.com> Mon Nov 29 21:26:03 2021 +0100
committer Xisco Fauli <xiscofauli@libreoffice.org> Tue Nov 30 09:51:14 2021 +0100
tree caf057a8c7bc19488e85682e6c642fd7b6f1871f
parent 557beef6a958f9fa67123ad5a8a232b467039030

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.tietze@documentfoundation.org>

sw/source/uibase/dochdl/swdtflvr.cxx

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 45e13b3..7c9917a 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -426,7 +426,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 );