summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/viewopt.hxx5
-rw-r--r--sw/source/core/view/viewimp.cxx1
-rw-r--r--sw/source/core/view/viewsh.cxx3
-rw-r--r--sw/source/ui/config/cfgitems.cxx5
-rw-r--r--sw/source/ui/config/usrpref.cxx2
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx1
-rw-r--r--sw/source/ui/uno/unomod.cxx4
7 files changed, 0 insertions, 21 deletions
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 38590c796c4c..171f5f789244 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -291,11 +291,6 @@ public:
inline void SetPageBack( sal_Bool b )
{ (b != 0) ? (nCoreOptions |= VIEWOPT_1_PAGEBACK) : ( nCoreOptions &= ~VIEWOPT_1_PAGEBACK); }
- inline sal_Bool IsSolidMarkHdl() const
- { return nCoreOptions & VIEWOPT_1_SOLIDMARKHDL ? sal_True : sal_False; }
- inline void SetSolidMarkHdl( sal_Bool b )
- { (b != 0) ? (nCoreOptions |= VIEWOPT_1_SOLIDMARKHDL) : ( nCoreOptions &= ~VIEWOPT_1_SOLIDMARKHDL); }
-
inline sal_Bool IsBigMarkHdl() const
{ return nCore2Options & VIEWOPT_CORE2_BIGMARKHDL ? sal_True : sal_False;}
inline void SetBigMarkHdl(sal_Bool b)
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index c3ca3f655ae1..a1ea19b19bf4 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -93,7 +93,6 @@ void SwViewImp::Init( const SwViewOption *pNewOpt )
pDrawView->SetAnimationEnabled( sal_False );
pDrawView->SetUseIncompatiblePathCreateInterface( sal_False );
- pDrawView->SetSolidMarkHdl(pNewOpt->IsSolidMarkHdl());
// it's a JOE interface !
pDrawView->SetMarkHdlSizePixel(pNewOpt->IsBigMarkHdl() ? 9 : 7);
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 4db0144de641..e2ed627baf83 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1979,9 +1979,6 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
Fraction aSnGrWdtY(rSz.Height(), rOpt.GetDivisionY() + 1);
pDView->SetSnapGridWidth( aSnGrWdtX, aSnGrWdtY );
- if ( pOpt->IsSolidMarkHdl() != rOpt.IsSolidMarkHdl() )
- pDView->SetSolidMarkHdl( rOpt.IsSolidMarkHdl() );
-
// it's a JOE interface !
if ( pOpt->IsBigMarkHdl() != rOpt.IsBigMarkHdl() )
pDView->SetMarkHdlSizePixel(rOpt.IsBigMarkHdl() ? 9 : 7);
diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/ui/config/cfgitems.cxx
index aae530ad1f73..41c45278988b 100644
--- a/sw/source/ui/config/cfgitems.cxx
+++ b/sw/source/ui/config/cfgitems.cxx
@@ -145,7 +145,6 @@ SwElemItem::SwElemItem( sal_uInt16 _nWhich ) :
bVertRuler =
bVertRulerRight=
bCrosshair =
- bHandles =
bBigHandles =
bSmoothScroll =
bTable =
@@ -171,7 +170,6 @@ SwElemItem::SwElemItem(const SwViewOption& rVOpt, sal_uInt16 _nWhich) :
bVertRuler = rVOpt.IsViewVRuler(sal_True);
bVertRulerRight = rVOpt.IsVRulerRight();
bCrosshair = rVOpt.IsCrossHair();
- bHandles = rVOpt.IsSolidMarkHdl();
bBigHandles = rVOpt.IsBigMarkHdl();
bSmoothScroll = rVOpt.IsSmoothScroll();
bTable = rVOpt.IsTable();
@@ -200,7 +198,6 @@ int SwElemItem::operator==( const SfxPoolItem& rAttr ) const
bVertRuler == rItem.bVertRuler &&
bVertRulerRight == rItem.bVertRulerRight&&
bCrosshair == rItem.bCrosshair &&
- bHandles == rItem.bHandles &&
bBigHandles == rItem.bBigHandles &&
bSmoothScroll == rItem.bSmoothScroll &&
bTable == rItem.bTable &&
@@ -219,7 +216,6 @@ void SwElemItem::operator=( const SwElemItem& rElemItem)
bVertRuler = rElemItem. bVertRuler ;
bVertRulerRight = rElemItem. bVertRulerRight ;
bCrosshair = rElemItem. bCrosshair ;
- bHandles = rElemItem. bHandles ;
bBigHandles = rElemItem. bBigHandles ;
bSmoothScroll = rElemItem. bSmoothScroll ;
bTable = rElemItem.bTable ;
@@ -238,7 +234,6 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const
rVOpt.SetViewVRuler(bVertRuler );
rVOpt.SetVRulerRight(bVertRulerRight );
rVOpt.SetCrossHair(bCrosshair );
- rVOpt.SetSolidMarkHdl(bHandles );
rVOpt.SetBigMarkHdl(bBigHandles );
rVOpt.SetSmoothScroll(bSmoothScroll);
rVOpt.SetTable (bTable );
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index 30acbbc80ad8..8ef33b8b6e77 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -288,7 +288,6 @@ void SwLayoutViewConfig::Commit()
switch(nProp)
{
case 0: rVal <<= (sal_Bool) rParent.IsCrossHair(); break; // "Line/Guide",
- case 1: rVal <<= (sal_Bool) rParent.IsSolidMarkHdl(); break; // "Line/SimpleControlPoint",
case 2: rVal <<= (sal_Bool) rParent.IsBigMarkHdl(); break; // "Line/LargeControlPoint",
case 3: rVal <<= (sal_Bool) rParent.IsViewHScrollBar(); break; // "Window/HorizontalScroll",
case 4: rVal <<= (sal_Bool) rParent.IsViewVScrollBar(); break; // "Window/VerticalScroll",
@@ -341,7 +340,6 @@ void SwLayoutViewConfig::Load()
switch(nProp)
{
case 0: rParent.SetCrossHair(bSet); break;// "Line/Guide",
- case 1: rParent.SetSolidMarkHdl(bSet); break;// "Line/SimpleControlPoint",
case 2: rParent.SetBigMarkHdl(bSet); break;// "Line/LargeControlPoint",
case 3: rParent.SetViewHScrollBar(bSet); break;// "Window/HorizontalScroll",
case 4: rParent.SetViewVScrollBar(bSet); break;// "Window/VerticalScroll",
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index 0d42d120c3c6..bba60d997e26 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -207,7 +207,6 @@ MasterPropertySetInfo * lcl_createSettingsInfo()
{ RTL_CONSTASCII_STRINGPARAM("ShowTableLimitGuide"), HANDLE_SHOW_TABLE_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("ShowSectionLimitGuide"), HANDLE_SHOW_SECTION_LIMIT_GUIDE, CPPUTYPE_BOOLEAN, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("ShowGuidesWhileMoving"), HANDLE_SHOW_GUIDES_WHILE_MOVING, CPPUTYPE_BOOLEAN, 0, 0},
- { RTL_CONSTASCII_STRINGPARAM("ShowSimpleHandles"), HANDLE_SHOW_SIMPLE_HANDLES, CPPUTYPE_BOOLEAN, 0, 0},
{ RTL_CONSTASCII_STRINGPARAM("ShowLargeHandles"), HANDLE_SHOW_LARGE_HANDLES, CPPUTYPE_BOOLEAN, 0, 0},
*/
{ NULL, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 }
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index bfa87079e039..83e0ac776a9e 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -90,7 +90,6 @@ enum SwViewSettingsPropertyHandles
HANDLE_VIEWSET_VRULER,
HANDLE_VIEWSET_VSCROLL,
HANDLE_VIEWSET_SMOOTH_SCROLLING,
- HANDLE_VIEWSET_SOLID_MARK_HANDLES,
HANDLE_VIEWSET_ZOOM_TYPE,
HANDLE_VIEWSET_ZOOM,
HANDLE_VIEWSET_PREVENT_TIPS,
@@ -170,7 +169,6 @@ static ChainablePropertySetInfo * lcl_createViewSettingsInfo()
{ RTL_CONSTASCII_STRINGPARAM ( "ShowVertRuler"), HANDLE_VIEWSET_VRULER , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "ShowVertScrollBar"), HANDLE_VIEWSET_VSCROLL , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "SmoothScrolling"), HANDLE_VIEWSET_SMOOTH_SCROLLING , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
- { RTL_CONSTASCII_STRINGPARAM ( "SolidMarkHandles"), HANDLE_VIEWSET_SOLID_MARK_HANDLES , CPPUTYPE_BOOLEAN, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "VerticalRulerMetric"), HANDLE_VIEWSET_VERT_RULER_METRIC , CPPUTYPE_INT32, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "ZoomType"), HANDLE_VIEWSET_ZOOM_TYPE , CPPUTYPE_INT16, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "ZoomValue"), HANDLE_VIEWSET_ZOOM , CPPUTYPE_INT16, PROPERTY_NONE, 0},
@@ -655,7 +653,6 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
case HANDLE_VIEWSET_TABLE_BOUNDARIES : mpViewOption->SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, sal_True); break;
case HANDLE_VIEWSET_TEXT_BOUNDARIES : mpViewOption->SetDocBoundaries(bVal); break;
case HANDLE_VIEWSET_SMOOTH_SCROLLING : mpViewOption->SetSmoothScroll(bVal); break;
- case HANDLE_VIEWSET_SOLID_MARK_HANDLES : mpViewOption->SetSolidMarkHdl(bVal); break;
case HANDLE_VIEWSET_PREVENT_TIPS : mpViewOption->SetPreventTips(bVal); break;
case HANDLE_VIEWSET_IS_RASTER_VISIBLE : mpViewOption->SetGridVisible(bVal); break;
case HANDLE_VIEWSET_IS_SNAP_TO_RASTER : mpViewOption->SetSnap(bVal); break;
@@ -888,7 +885,6 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
case HANDLE_VIEWSET_TABLE_BOUNDARIES : bBoolVal = SwViewOption::IsTableBoundaries(); break;
case HANDLE_VIEWSET_TEXT_BOUNDARIES : bBoolVal = SwViewOption::IsDocBoundaries(); break;
case HANDLE_VIEWSET_SMOOTH_SCROLLING : bBoolVal = mpConstViewOption->IsSmoothScroll(); break;
- case HANDLE_VIEWSET_SOLID_MARK_HANDLES : bBoolVal = mpConstViewOption->IsSolidMarkHdl(); break;
case HANDLE_VIEWSET_PREVENT_TIPS : bBoolVal = mpConstViewOption->IsPreventTips(); break;
case HANDLE_VIEWSET_IS_RASTER_VISIBLE : bBoolVal = mpConstViewOption->IsGridVisible(); break;
case HANDLE_VIEWSET_IS_SNAP_TO_RASTER : bBoolVal = mpConstViewOption->IsSnap(); break;
generated by cgit (git 2.34.1) at 2025-01-06 13:20:51 +0000