From aeab5bfa024f7d15099730fa536d78b5a7a7ea01 Mon Sep 17 00:00:00 2001 From: Muhammet Kara Date: Fri, 20 Dec 2019 20:35:00 +0300 Subject: [PATCH] tdf#129526: Prevent accidental toggling of page orientation Change-Id: I3145cb34ec782c1aa60fe864a6ec7c195185ad18 Reviewed-on: https://gerrit.libreoffice.org/85637 Tested-by: Jenkins Reviewed-by: Muhammet Kara --- sw/source/uibase/sidebar/PageOrientationControl.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx index 0d9844efef36..9d9caa418b1d 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.cxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx @@ -114,6 +114,14 @@ void PageOrientationControl::ExecuteOrientationChange( const bool bLandscape ) SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState(SID_ATTR_PAGE_SIZE, pItem); mpPageSizeItem.reset( static_cast(pItem->Clone()) ); + // Prevent accidental toggling of page orientation + if ((mpPageSizeItem->GetWidth() > mpPageSizeItem->GetHeight()) == bLandscape) + { + if ( mxUndoManager.is() ) + mxUndoManager->leaveUndoContext(); + return; + } + SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState(SID_ATTR_PAGE_LRSPACE, pItem); mpPageLRMarginItem.reset( static_cast(pItem->Clone()) );