core.git: Branch 'feature/cib_contract49d' - sd/source

[Oliver Specht (via logerrit)]

 sd/source/ui/app/optsitem.cxx |   29 ++++-------------------------
 sd/source/ui/dlg/tpoption.cxx |    2 +-
 2 files changed, 5 insertions(+), 26 deletions(-)

New commits:
commit 1f93a122fcf97274e54f19adc2fdb62bdec79300
Author:     Oliver Specht <oliver.spe...@cib.de>
AuthorDate: Tue Feb 11 16:50:21 2025 +0100
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Fri Feb 28 00:23:35 2025 +0100

    tdf#165077 Align applied options to dialog
    
    Options in tools/.../draw|impress/general do not overwrite
    flags not supported in the dialog any longer.
    
    Change-Id: Ia1e8e678dd47e58d6201a36e4c57501d27429759
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181440
    Tested-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
    Tested-by: Jenkins
    Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
    (cherry picked from commit 7957b996cf53cdd4952817b15b41a4581316e3b3)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182339
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
    Tested-by: allotropia jenkins <jenk...@allotropia.de>

diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 454e2171baf6..f4aa974a036b 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -482,37 +482,16 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) 
const
 {
     if( !pOpts )
         return;
-
+    //this needs to reflect all settings from SdTpOptionsMisc::FillItemSet()
     pOpts->SetStartWithTemplate( maOptionsMisc.IsStartWithTemplate() );
     pOpts->SetMarkedHitMovesAlways( maOptionsMisc.IsMarkedHitMovesAlways() );
-    pOpts->SetMoveOnlyDragging( maOptionsMisc.IsMoveOnlyDragging() );
-    pOpts->SetCrookNoContortion( maOptionsMisc.IsCrookNoContortion() );
-    pOpts->SetQuickEdit( maOptionsMisc.IsQuickEdit() );
+    pOpts->SetQuickEdit(maOptionsMisc.IsQuickEdit());
+    pOpts->SetPickThrough( maOptionsMisc.IsPickThrough() );
     pOpts->SetMasterPagePaintCaching( maOptionsMisc.IsMasterPagePaintCaching() 
);
     pOpts->SetDragWithCopy( maOptionsMisc.IsDragWithCopy() );
-    pOpts->SetPickThrough( maOptionsMisc.IsPickThrough() );
-    pOpts->SetDoubleClickTextEdit( maOptionsMisc.IsDoubleClickTextEdit() );
-    pOpts->SetClickChangeRotation( maOptionsMisc.IsClickChangeRotation() );
     pOpts->SetSummationOfParagraphs( maOptionsMisc.IsSummationOfParagraphs() );
-    pOpts->SetTabBarVisible( maOptionsMisc.IsTabBarVisible() );
-
-    pOpts->SetSolidDragging( maOptionsMisc.IsSolidDragging() );
-    pOpts->SetShowUndoDeleteWarning( maOptionsMisc.IsShowUndoDeleteWarning() );
-    pOpts->SetPrinterIndependentLayout( 
maOptionsMisc.GetPrinterIndependentLayout() );
-    pOpts->SetShowComments( maOptionsMisc.IsShowComments() );
-    pOpts->SetDefaultObjectSizeWidth( 
maOptionsMisc.GetDefaultObjectSizeWidth() );
-    pOpts->SetDefaultObjectSizeHeight( 
maOptionsMisc.GetDefaultObjectSizeHeight() );
-
-    pOpts->SetPreviewNewEffects( maOptionsMisc.IsPreviewNewEffects() );
-    pOpts->SetPreviewChangedEffects( maOptionsMisc.IsPreviewChangedEffects() );
-    pOpts->SetPreviewTransitions( maOptionsMisc.IsPreviewTransitions() );
-
-    pOpts->SetDisplay( maOptionsMisc.GetDisplay() );
-
-    pOpts->SetPresentationPenColor( maOptionsMisc.GetPresentationPenColor() );
-    pOpts->SetPresentationPenWidth( maOptionsMisc.GetPresentationPenWidth() );
+    pOpts->SetCrookNoContortion( maOptionsMisc.IsCrookNoContortion() );
 
-    pOpts->SetDragThreshold( maOptionsMisc.GetDragThresholdPixels() );
 }
 
 /*************************************************************************
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 29cd8dba742f..c7386792dd40 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -536,7 +536,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs )
         m_xCbxDistort->get_state_changed_from_saved())
     {
         SdOptionsMiscItem aOptsItem;
-
+        //all settings here need to be reflected in 
SdOptionsMiscItem::SetOptions()
         aOptsItem.GetOptionsMisc().SetStartWithTemplate( 
m_xCbxStartWithTemplate->get_active() );
         aOptsItem.GetOptionsMisc().SetMarkedHitMovesAlways( 
m_xCbxMarkedHitMovesAlways->get_active() );
         aOptsItem.GetOptionsMisc().SetQuickEdit( m_xCbxQuickEdit->get_active() 
);