summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@ubuntu.com>2021-11-29 21:26:03 +0100
committerXisco Fauli <xiscofauli@libreoffice.org>2021-11-30 12:29:40 +0100
commit8185375a269b53bc1968f04223a0c290d30ef166 (patch)
tree27cc6d9b3c379ae680d321191fffb6064c1d7196 /sw
parenta1306b2d9204ea72b5e5d045f634551a71d34e63 (diff)
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> (cherry picked from commit cda9a5af36977420bae34737cd7b52cddb3226ef) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126096 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index ab31e7feec93..25051ed51845 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 );