[Libreoffice-commits] .: default_images/cmd default_images/svx officecfg/registry ooo_custom_images/hicontrast ooo_custom_images/human ooo_custom_images/industrial ooo_custom_images/oxygen sc/inc sc/source sd/inc sd/sdi sd/source sd/uiconfig svx/inc svx/source sw/inc sw/source testautomation/global test/user-template
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Nov 8 07:39:41 PST 2011
default_images/svx/res/cropmarkers.png |binary
default_images/svx/res/markers.png |binary
dev/null |binary
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 9 -
officecfg/registry/schema/org/openoffice/Office/Draw.xcs | 11 -
officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 10 -
ooo_custom_images/human/svx/source/svdraw/cropmarkers.png |binary
ooo_custom_images/human/svx/source/svdraw/markers.png |binary
ooo_custom_images/oxygen/svx/source/svdraw/cropmarkers.png |binary
ooo_custom_images/oxygen/svx/source/svdraw/markers.png |binary
sc/inc/unonames.hxx | 1
sc/inc/viewopti.hxx | 1
sc/source/core/tool/viewopti.cxx | 9 -
sc/source/ui/inc/tpview.hxx | 1
sc/source/ui/optdlg/tpview.cxx | 12 -
sc/source/ui/unoobj/viewuno.cxx | 4
sc/source/ui/view/drawview.cxx | 1
sd/inc/app.hrc | 1
sd/inc/sdcommands.h | 1
sd/sdi/_drvwsh.sdi | 5
sd/sdi/sdraw.sdi | 27 ---
sd/source/ui/app/optsitem.cxx | 76 ++++------
sd/source/ui/app/tbxids_tmpl.src | 8 -
sd/source/ui/app/toolbox2_tmpl.src | 1
sd/source/ui/inc/optsitem.hxx | 3
sd/source/ui/view/drviews5.cxx | 4
sd/source/ui/view/drviewsg.cxx | 5
sd/source/ui/view/frmview.cxx | 2
sd/uiconfig/sdraw/toolbar/optionsbar.xml | 2
sd/uiconfig/simpress/toolbar/optionsbar.xml | 1
svx/inc/svx/svdhdl.hxx | 4
svx/inc/svx/svdmrkv.hxx | 9 -
svx/inc/svx/svdstr.hrc | 2
svx/source/svdraw/svdhdl.cxx | 50 +-----
svx/source/svdraw/svdmrkv.cxx | 10 -
svx/source/svdraw/svdmrkv1.cxx | 1
svx/source/svdraw/svdstr.src | 10 -
sw/inc/viewopt.hxx | 5
sw/source/core/view/viewimp.cxx | 1
sw/source/core/view/viewsh.cxx | 3
sw/source/ui/config/cfgitems.cxx | 5
sw/source/ui/config/usrpref.cxx | 2
sw/source/ui/uno/SwXDocumentSettings.cxx | 1
sw/source/ui/uno/unomod.cxx | 4
test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optionsbar.xml | 2
test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optionsbar.xml | 1
test/user-template/user/registry/main.xcd | 14 -
testautomation/global/sid/bars.sid | 1
testautomation/global/win/bars.win | 1
49 files changed, 49 insertions(+), 272 deletions(-)
New commits:
commit ec4f69493b50c15861b0cdcc290ecedd00efb51d
Author: Tim Hardeck <thardeck at suse.com>
Date: Mon Nov 7 19:33:56 2011 +0100
removed Simple Handles option
Removed the unnecessary option "Simple Handles" with all related
functions and icons.
diff --git a/default_images/cmd/lc_handlesdraft.png b/default_images/cmd/lc_handlesdraft.png
deleted file mode 100644
index 6c39d69..0000000
Binary files a/default_images/cmd/lc_handlesdraft.png and /dev/null differ
diff --git a/default_images/cmd/sc_handlesdraft.png b/default_images/cmd/sc_handlesdraft.png
deleted file mode 100644
index 0d85d0c..0000000
Binary files a/default_images/cmd/sc_handlesdraft.png and /dev/null differ
diff --git a/default_images/svx/res/cropmarkers.png b/default_images/svx/res/cropmarkers.png
index 8c3b6cd..c37736f 100644
Binary files a/default_images/svx/res/cropmarkers.png and b/default_images/svx/res/cropmarkers.png differ
diff --git a/default_images/svx/res/cropmarkers2.png b/default_images/svx/res/cropmarkers2.png
deleted file mode 100644
index c37736f..0000000
Binary files a/default_images/svx/res/cropmarkers2.png and /dev/null differ
diff --git a/default_images/svx/res/markers.png b/default_images/svx/res/markers.png
index 6b19db8..0a69bbe 100644
Binary files a/default_images/svx/res/markers.png and b/default_images/svx/res/markers.png differ
diff --git a/default_images/svx/res/markers2.png b/default_images/svx/res/markers2.png
deleted file mode 100644
index 0a69bbe..0000000
Binary files a/default_images/svx/res/markers2.png and /dev/null differ
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index dc84fb0..8464949 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -1420,15 +1420,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:HandlesDraft" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
-
- <value xml:lang="en-US">Simple Handles</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:SolidCreate" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index 8a77738..0cb2ee0 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -364,17 +364,6 @@
</info>
<value>true</value>
</prop>
- <prop oor:name="SimpleHandles" oor:type="xs:boolean">
- <!-- OldPath: Draw/Other -->
- <!-- OldLocation: soffice.cfg -->
- <!-- UIHints: Optionbar -->
- <info>
- <author>AF</author>
- <desc>Indicates whether to show simple (true) or 3D-handles (false).</desc>
- <label>Simple Handles</label>
- </info>
- <value>true</value>
- </prop>
<prop oor:name="BigHandles" oor:type="xs:boolean">
<!-- OldPath: Draw/Other -->
<!-- OldLocation: soffice.cfg -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 874aae7..16634f5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -408,16 +408,6 @@
</info>
<value>true</value>
</prop>
- <prop oor:name="SimpleHandles" oor:type="xs:boolean">
- <!-- OldPath: Impress/Other -->
- <!-- OldLocation: soffice.cfg -->
- <!-- UIHints: Optionbar -->
- <info>
- <desc>Indicates whether to show simple (true) or 3D-handles (false).</desc>
- <label>Simple Handles</label>
- </info>
- <value>false</value>
- </prop>
<prop oor:name="BigHandles" oor:type="xs:boolean">
<!-- OldPath: Impress/Other -->
<!-- OldLocation: soffice.cfg -->
diff --git a/ooo_custom_images/hicontrast/cmd/lc_handlesdraft.png b/ooo_custom_images/hicontrast/cmd/lc_handlesdraft.png
deleted file mode 100644
index 7d5411a..0000000
Binary files a/ooo_custom_images/hicontrast/cmd/lc_handlesdraft.png and /dev/null differ
diff --git a/ooo_custom_images/hicontrast/cmd/sc_handlesdraft.png b/ooo_custom_images/hicontrast/cmd/sc_handlesdraft.png
deleted file mode 100644
index 19c36c5..0000000
Binary files a/ooo_custom_images/hicontrast/cmd/sc_handlesdraft.png and /dev/null differ
diff --git a/ooo_custom_images/hicontrast/svx/source/svdraw/cropmarkers2.png b/ooo_custom_images/hicontrast/svx/source/svdraw/cropmarkers2.png
deleted file mode 100644
index 21c3d32..0000000
Binary files a/ooo_custom_images/hicontrast/svx/source/svdraw/cropmarkers2.png and /dev/null differ
diff --git a/ooo_custom_images/hicontrast/svx/source/svdraw/markers2.png b/ooo_custom_images/hicontrast/svx/source/svdraw/markers2.png
deleted file mode 100644
index 4def978..0000000
Binary files a/ooo_custom_images/hicontrast/svx/source/svdraw/markers2.png and /dev/null differ
diff --git a/ooo_custom_images/human/cmd/lc_handlesdraft.png b/ooo_custom_images/human/cmd/lc_handlesdraft.png
deleted file mode 100644
index fda34e3..0000000
Binary files a/ooo_custom_images/human/cmd/lc_handlesdraft.png and /dev/null differ
diff --git a/ooo_custom_images/human/cmd/sc_handlesdraft.png b/ooo_custom_images/human/cmd/sc_handlesdraft.png
deleted file mode 100644
index 6dd01da..0000000
Binary files a/ooo_custom_images/human/cmd/sc_handlesdraft.png and /dev/null differ
diff --git a/ooo_custom_images/human/svx/source/svdraw/cropmarkers.png b/ooo_custom_images/human/svx/source/svdraw/cropmarkers.png
index f5e7283..24aaca1 100644
Binary files a/ooo_custom_images/human/svx/source/svdraw/cropmarkers.png and b/ooo_custom_images/human/svx/source/svdraw/cropmarkers.png differ
diff --git a/ooo_custom_images/human/svx/source/svdraw/cropmarkers2.png b/ooo_custom_images/human/svx/source/svdraw/cropmarkers2.png
deleted file mode 100644
index 24aaca1..0000000
Binary files a/ooo_custom_images/human/svx/source/svdraw/cropmarkers2.png and /dev/null differ
diff --git a/ooo_custom_images/human/svx/source/svdraw/markers.png b/ooo_custom_images/human/svx/source/svdraw/markers.png
new file mode 100644
index 0000000..6c77f7c
Binary files /dev/null and b/ooo_custom_images/human/svx/source/svdraw/markers.png differ
diff --git a/ooo_custom_images/human/svx/source/svdraw/markers2.png b/ooo_custom_images/human/svx/source/svdraw/markers2.png
deleted file mode 100644
index 6c77f7c..0000000
Binary files a/ooo_custom_images/human/svx/source/svdraw/markers2.png and /dev/null differ
diff --git a/ooo_custom_images/industrial/cmd/lc_handlesdraft.png b/ooo_custom_images/industrial/cmd/lc_handlesdraft.png
deleted file mode 100644
index fda34e3..0000000
Binary files a/ooo_custom_images/industrial/cmd/lc_handlesdraft.png and /dev/null differ
diff --git a/ooo_custom_images/industrial/cmd/sc_handlesdraft.png b/ooo_custom_images/industrial/cmd/sc_handlesdraft.png
deleted file mode 100644
index 6dd01da..0000000
Binary files a/ooo_custom_images/industrial/cmd/sc_handlesdraft.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/cmd/lc_handlesdraft.png b/ooo_custom_images/oxygen/cmd/lc_handlesdraft.png
deleted file mode 100644
index fda34e3..0000000
Binary files a/ooo_custom_images/oxygen/cmd/lc_handlesdraft.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/cmd/sc_handlesdraft.png b/ooo_custom_images/oxygen/cmd/sc_handlesdraft.png
deleted file mode 100644
index 6dd01da..0000000
Binary files a/ooo_custom_images/oxygen/cmd/sc_handlesdraft.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/svx/source/svdraw/cropmarkers.png b/ooo_custom_images/oxygen/svx/source/svdraw/cropmarkers.png
index f5e7283..24aaca1 100644
Binary files a/ooo_custom_images/oxygen/svx/source/svdraw/cropmarkers.png and b/ooo_custom_images/oxygen/svx/source/svdraw/cropmarkers.png differ
diff --git a/ooo_custom_images/oxygen/svx/source/svdraw/cropmarkers2.png b/ooo_custom_images/oxygen/svx/source/svdraw/cropmarkers2.png
deleted file mode 100644
index 24aaca1..0000000
Binary files a/ooo_custom_images/oxygen/svx/source/svdraw/cropmarkers2.png and /dev/null differ
diff --git a/ooo_custom_images/oxygen/svx/source/svdraw/markers.png b/ooo_custom_images/oxygen/svx/source/svdraw/markers.png
new file mode 100644
index 0000000..6c77f7c
Binary files /dev/null and b/ooo_custom_images/oxygen/svx/source/svdraw/markers.png differ
diff --git a/ooo_custom_images/oxygen/svx/source/svdraw/markers2.png b/ooo_custom_images/oxygen/svx/source/svdraw/markers2.png
deleted file mode 100644
index 6c77f7c..0000000
Binary files a/ooo_custom_images/oxygen/svx/source/svdraw/markers2.png and /dev/null differ
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 7bc50f1..72070af 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -517,7 +517,6 @@
#define SC_UNO_SHOWOBJ "ShowObjects"
#define SC_UNO_SHOWPAGEBR "ShowPageBreaks"
#define SC_UNO_SHOWZERO "ShowZeroValues"
-#define SC_UNO_SHOWSOLID "SolidHandles"
#define SC_UNO_VALUEHIGH "IsValueHighlightingEnabled"
#define SC_UNO_VERTSCROLL "HasVerticalScrollBar"
#define SC_UNO_SNAPTORASTER "IsSnapToRaster"
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 00233f1..63d244b 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -56,7 +56,6 @@ enum ScViewOption
VOPT_HELPLINES,
VOPT_ANCHOR,
VOPT_PAGEBREAKS,
- VOPT_SOLIDHANDLES,
VOPT_CLIPMARKS,
VOPT_BIGHANDLES
};
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index c2dbfa4..149351c 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -165,7 +165,6 @@ void ScViewOptions::SetDefaults()
aOptArr[ VOPT_GRID ] =
aOptArr[ VOPT_ANCHOR ] =
aOptArr[ VOPT_PAGEBREAKS ] =
- aOptArr[ VOPT_SOLIDHANDLES] =
aOptArr[ VOPT_CLIPMARKS ] = sal_True;
aModeArr[VOBJ_TYPE_OLE ] =
@@ -457,10 +456,6 @@ ScViewCfg::ScViewCfg() :
case SCLAYOUTOPT_GUIDE:
SetOption( VOPT_HELPLINES, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
break;
- case SCLAYOUTOPT_SIMPLECONT:
- // content is reversed
- SetOption( VOPT_SOLIDHANDLES, !ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
- break;
case SCLAYOUTOPT_LARGECONT:
SetOption( VOPT_BIGHANDLES, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
break;
@@ -628,10 +623,6 @@ IMPL_LINK( ScViewCfg, LayoutCommitHdl, void *, EMPTYARG )
case SCLAYOUTOPT_GUIDE:
ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_HELPLINES ) );
break;
- case SCLAYOUTOPT_SIMPLECONT:
- // content is reversed
- ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], !GetOption( VOPT_SOLIDHANDLES ) );
- break;
case SCLAYOUTOPT_LARGECONT:
ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], GetOption( VOPT_BIGHANDLES ) );
break;
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 2599ea2..260ee38 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -53,7 +53,6 @@ class ScTpContentOptions : public SfxTabPage
ColorListBox aColorLB;
CheckBox aBreakCB;
CheckBox aGuideLineCB;
- CheckBox aHandleCB;
CheckBox aBigHandleCB;
FixedLine aSeparator1FL;
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index b03d492..f9db04e 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -68,7 +68,6 @@ ScTpContentOptions::ScTpContentOptions( Window* pParent,
aColorLB( this, ScResId(LB_COLOR )),
aBreakCB( this, ScResId(CB_PAGEBREAKS )),
aGuideLineCB( this, ScResId(CB_GUIDELINE )),
- aHandleCB( this, ScResId(CB_HANDLES )),
aBigHandleCB( this, ScResId(CB_BIGHANDLES )),
aSeparator1FL (this, ScResId(FL_SEPARATOR1 )),
@@ -125,7 +124,6 @@ ScTpContentOptions::ScTpContentOptions( Window* pParent,
aOutlineCB .SetClickHdl(aCBHdl);
aBreakCB .SetClickHdl(aCBHdl);
aGuideLineCB.SetClickHdl(aCBHdl);
- aHandleCB .SetClickHdl(aCBHdl);
aBigHandleCB.SetClickHdl(aCBHdl);
aRowColHeaderCB.SetClickHdl(aCBHdl);
@@ -163,7 +161,6 @@ sal_Bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet )
aColorLB .GetSavedValue() != aColorLB .GetSelectEntryPos() ||
aBreakCB .GetSavedValue() != aBreakCB .IsChecked() ||
aGuideLineCB .GetSavedValue() != aGuideLineCB .IsChecked() ||
- aHandleCB .GetSavedValue() != aHandleCB .IsChecked() ||
aBigHandleCB .GetSavedValue() != aBigHandleCB .IsChecked())
{
pLocalOptions->SetGridColor( aColorLB.GetSelectEntryColor(),
@@ -215,7 +212,6 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
aBreakCB.Check( pLocalOptions->GetOption(VOPT_PAGEBREAKS) );
aGuideLineCB.Check( pLocalOptions->GetOption(VOPT_HELPLINES) );
- aHandleCB.Check( !pLocalOptions->GetOption(VOPT_SOLIDHANDLES) ); // inverted
aBigHandleCB.Check( pLocalOptions->GetOption(VOPT_BIGHANDLES) );
if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, false, &pItem))
@@ -244,7 +240,6 @@ void ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
aColorLB .SaveValue();
aBreakCB .SaveValue();
aGuideLineCB .SaveValue();
- aHandleCB .SaveValue();
aBigHandleCB .SaveValue();
}
@@ -295,15 +290,10 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn )
else if ( &aOutlineCB == pBtn ) eOption = VOPT_OUTLINER;
else if ( &aBreakCB == pBtn ) eOption = VOPT_PAGEBREAKS;
else if ( &aGuideLineCB == pBtn ) eOption = VOPT_HELPLINES;
- else if ( &aHandleCB == pBtn ) eOption = VOPT_SOLIDHANDLES;
else if ( &aBigHandleCB == pBtn ) eOption = VOPT_BIGHANDLES;
else if ( &aRowColHeaderCB == pBtn ) eOption = VOPT_HEADER;
- // VOPT_SOLIDHANDLES is inverted (CheckBox is "simple handles")
- if ( eOption == VOPT_SOLIDHANDLES )
- pLocalOptions->SetOption( eOption, !bChecked );
- else
- pLocalOptions->SetOption( eOption, bChecked );
+ pLocalOptions->SetOption( eOption, bChecked );
return 0;
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index b789d9d..f52b73a 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -109,7 +109,6 @@ const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap()
{MAP_CHAR_LEN(SC_UNO_SHOWOBJ), 0, &getCppuType((sal_Int16*)0), 0, 0},
{MAP_CHAR_LEN(SC_UNO_SHOWPAGEBR), 0, &getBooleanCppuType(), 0, 0},
{MAP_CHAR_LEN(SC_UNO_SHOWZERO), 0, &getBooleanCppuType(), 0, 0},
- {MAP_CHAR_LEN(SC_UNO_SHOWSOLID), 0, &getBooleanCppuType(), 0, 0},
{MAP_CHAR_LEN(OLD_UNO_VALUEHIGH), 0, &getBooleanCppuType(), 0, 0},
{MAP_CHAR_LEN(OLD_UNO_VERTSCROLL), 0, &getBooleanCppuType(), 0, 0},
{MAP_CHAR_LEN(SC_UNO_VISAREA), 0, &getCppuType((awt::Rectangle*)0), 0, 0},
@@ -1929,8 +1928,6 @@ void SAL_CALL ScTabViewObj::setPropertyValue(
aNewOpt.SetOption( VOPT_PAGEBREAKS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
else if ( aString.EqualsAscii( SC_UNO_SHOWZERO ) )
aNewOpt.SetOption( VOPT_NULLVALS, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
- else if ( aString.EqualsAscii( SC_UNO_SHOWSOLID ) )
- aNewOpt.SetOption( VOPT_SOLIDHANDLES, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
else if ( aString.EqualsAscii( SC_UNO_VALUEHIGH ) || aString.EqualsAscii( OLD_UNO_VALUEHIGH ) )
aNewOpt.SetOption( VOPT_SYNTAX, ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
else if ( aString.EqualsAscii( SC_UNO_VERTSCROLL ) || aString.EqualsAscii( OLD_UNO_VERTSCROLL ) )
@@ -2046,7 +2043,6 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const rtl::OUString& aProperty
else if ( aString.EqualsAscii( SC_UNO_SHOWNOTES ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_NOTES ) );
else if ( aString.EqualsAscii( SC_UNO_SHOWPAGEBR ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_PAGEBREAKS ) );
else if ( aString.EqualsAscii( SC_UNO_SHOWZERO ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_NULLVALS ) );
- else if ( aString.EqualsAscii( SC_UNO_SHOWSOLID ) ) ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_SOLIDHANDLES ) );
else if ( aString.EqualsAscii( SC_UNO_VALUEHIGH ) || aString.EqualsAscii( OLD_UNO_VALUEHIGH ) )
ScUnoHelpFunctions::SetBoolInAny( aRet, rOpt.GetOption( VOPT_SYNTAX ) );
else if ( aString.EqualsAscii( SC_UNO_VERTSCROLL ) || aString.EqualsAscii( OLD_UNO_VERTSCROLL ) )
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index d97364d..bfd65dd 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -557,7 +557,6 @@ void ScDrawView::UpdateUserViewOptions()
sal_Bool bBigHdl = rOpt.GetOption( VOPT_BIGHANDLES );
SetDragStripes( rOpt.GetOption( VOPT_HELPLINES ) );
- SetSolidMarkHdl( rOpt.GetOption( VOPT_SOLIDHANDLES ) );
SetMarkHdlSizePixel( bBigHdl ? SC_HANDLESIZE_BIG : SC_HANDLESIZE_SMALL );
SetGridVisible( rGrid.GetGridVisible() );
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 707a62f..b34d403 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -215,7 +215,6 @@
#define SID_CONNECTOR_LINES_CIRCLES (SID_SD_START+145)
// Options-Leisten Slot-IDs
-#define SID_HANDLES_DRAFT (SID_SD_START+150)
#define SID_SOLID_CREATE (SID_SD_START+151)
#define SID_HELPLINES_USE (SID_SD_START+152)
#define SID_HELPLINES_MOVE (SID_SD_START+153)
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index 9e1efeb..cad54f8 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -145,7 +145,6 @@
#define CMD_SID_GRAPHIC_EXPORT ".uno:GraphicExport"
#define CMD_SID_GRID_FRONT ".uno:GridFront"
#define CMD_SID_3D_HALF_SPHERE ".uno:HalfSphere"
-#define CMD_SID_HANDLES_DRAFT ".uno:HandlesDraft"
#define CMD_SID_HANDOUT_MASTERPAGE ".uno:HandoutMasterPage"
#define CMD_SID_HANDOUTMODE ".uno:HandoutMode"
#define CMD_SID_HATCH ".uno:Hatch"
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index cd3648b..f668a66 100755
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1944,11 +1944,6 @@ interface DrawView
//ExecMethod = FuTemporary ;
//StateMethod = GetMenuState ;
]
- SID_HANDLES_DRAFT // ole : ?, status : ?
- [
- ExecMethod = ExecOptionsBar ;
- StateMethod = GetOptionsBarState ;
- ]
SID_SOLID_CREATE // ole : ?, status : ?
[
ExecMethod = ExecOptionsBar ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 5e13f85..425915b 100755
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -3041,33 +3041,6 @@ SfxBoolItem HalfSphere SID_3D_HALF_SPHERE
]
//--------------------------------------------------------------------------
-SfxBoolItem HandlesDraft SID_HANDLES_DRAFT
-
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
SfxVoidItem HandoutMasterPage SID_HANDOUT_MASTERPAGE
(SfxBoolItem Isactive ID_VAL_ISACTIVE)
[
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index 3f215da..d5eec0a 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -501,7 +501,6 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
bClickChangeRotation( sal_False ),
bStartWithActualPage( sal_False ),
bSolidDragging( sal_True ),
- bSolidMarkHdl( sal_True ),
bSummationOfParagraphs( sal_False ),
bShowUndoDeleteWarning( sal_True ),
bSlideshowRespectZOrder( sal_True ),
@@ -538,7 +537,6 @@ sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const
IsStartWithActualPage() == rOpt.IsStartWithActualPage() &&
IsSummationOfParagraphs() == rOpt.IsSummationOfParagraphs() &&
IsSolidDragging() == rOpt.IsSolidDragging() &&
- IsSolidMarkHdl() == rOpt.IsSolidMarkHdl() &&
IsShowUndoDeleteWarning() == rOpt.IsShowUndoDeleteWarning() &&
IsSlideshowRespectZOrder() == rOpt.IsSlideshowRespectZOrder() &&
GetPrinterIndependentLayout() == rOpt.GetPrinterIndependentLayout() &&
@@ -572,7 +570,6 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
"RotateClick",
"Preview",
"ModifyWithAttributes",
- "SimpleHandles",
"DefaultObjectSize/Width",
"DefaultObjectSize/Height",
@@ -597,7 +594,7 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
"PenWidth"
};
- rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 27 : 16 );
+ rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 26 : 15 );
ppNames = aPropNames;
}
@@ -615,46 +612,45 @@ sal_Bool SdOptionsMisc::ReadData( const Any* pValues )
if( pValues[7].hasValue() ) SetDoubleClickTextEdit( *(sal_Bool*) pValues[ 7 ].getValue() );
if( pValues[8].hasValue() ) SetClickChangeRotation( *(sal_Bool*) pValues[ 8 ].getValue() );
if( pValues[10].hasValue() ) SetSolidDragging( *(sal_Bool*) pValues[ 10 ].getValue() );
- if( pValues[11].hasValue() ) SetSolidMarkHdl( *(sal_Bool*) pValues[ 11 ].getValue() );
- if( pValues[12].hasValue() ) SetDefaultObjectSizeWidth( *(sal_uInt32*) pValues[ 12 ].getValue() );
- if( pValues[13].hasValue() ) SetDefaultObjectSizeHeight( *(sal_uInt32*) pValues[ 13 ].getValue() );
- if( pValues[14].hasValue() ) SetPrinterIndependentLayout( *(sal_uInt16*) pValues[ 14 ].getValue() );
+ if( pValues[11].hasValue() ) SetDefaultObjectSizeWidth( *(sal_uInt32*) pValues[ 11 ].getValue() );
+ if( pValues[12].hasValue() ) SetDefaultObjectSizeHeight( *(sal_uInt32*) pValues[ 12 ].getValue() );
+ if( pValues[13].hasValue() ) SetPrinterIndependentLayout( *(sal_uInt16*) pValues[ 13 ].getValue() );
- if( pValues[15].hasValue() )
- SetShowComments( *(sal_Bool*) pValues[ 15 ].getValue() );
+ if( pValues[14].hasValue() )
+ SetShowComments( *(sal_Bool*) pValues[ 14 ].getValue() );
// just for Impress
if( GetConfigId() == SDCFG_IMPRESS )
{
+ if( pValues[15].hasValue() )
+ SetStartWithTemplate( *(sal_Bool*) pValues[ 15 ].getValue() );
if( pValues[16].hasValue() )
- SetStartWithTemplate( *(sal_Bool*) pValues[ 16 ].getValue() );
+ SetStartWithActualPage( *(sal_Bool*) pValues[ 16 ].getValue() );
if( pValues[17].hasValue() )
- SetStartWithActualPage( *(sal_Bool*) pValues[ 17 ].getValue() );
+ SetSummationOfParagraphs( *(sal_Bool*) pValues[ 17 ].getValue() );
if( pValues[18].hasValue() )
- SetSummationOfParagraphs( *(sal_Bool*) pValues[ 18 ].getValue() );
+ SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 18 ].getValue() );
+
if( pValues[19].hasValue() )
- SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 19 ].getValue() );
+ SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 19 ].getValue());
if( pValues[20].hasValue() )
- SetSlideshowRespectZOrder(*(sal_Bool*) pValues[ 20 ].getValue());
+ SetPreviewNewEffects(*(sal_Bool*) pValues[ 20 ].getValue());
if( pValues[21].hasValue() )
- SetPreviewNewEffects(*(sal_Bool*) pValues[ 21 ].getValue());
+ SetPreviewChangedEffects(*(sal_Bool*) pValues[ 21 ].getValue());
if( pValues[22].hasValue() )
- SetPreviewChangedEffects(*(sal_Bool*) pValues[ 22 ].getValue());
+ SetPreviewTransitions(*(sal_Bool*) pValues[ 22 ].getValue());
if( pValues[23].hasValue() )
- SetPreviewTransitions(*(sal_Bool*) pValues[ 23 ].getValue());
+ SetDisplay(*(sal_Int32*) pValues[ 23 ].getValue());
if( pValues[24].hasValue() )
- SetDisplay(*(sal_Int32*) pValues[ 24 ].getValue());
+ SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 24 ] ) );
if( pValues[25].hasValue() )
- SetPresentationPenColor( getSafeValue< sal_Int32 >( pValues[ 25 ] ) );
-
- if( pValues[26].hasValue() )
- SetPresentationPenWidth( getSafeValue< double >( pValues[ 26 ] ) );
+ SetPresentationPenWidth( getSafeValue< double >( pValues[ 25 ] ) );
}
return sal_True;
@@ -676,29 +672,28 @@ sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const
// The preview is not supported anymore. Use a dummy value.
pValues[ 9 ] <<= (double)0;// GetPreviewQuality();
pValues[ 10 ] <<= IsSolidDragging();
- pValues[ 11 ] <<= IsSolidMarkHdl();
- pValues[ 12 ] <<= GetDefaultObjectSizeWidth();
- pValues[ 13 ] <<= GetDefaultObjectSizeHeight();
- pValues[ 14 ] <<= GetPrinterIndependentLayout();
- pValues[ 15 ] <<= (sal_Bool)IsShowComments();
+ pValues[ 11 ] <<= GetDefaultObjectSizeWidth();
+ pValues[ 12 ] <<= GetDefaultObjectSizeHeight();
+ pValues[ 13 ] <<= GetPrinterIndependentLayout();
+ pValues[ 14 ] <<= (sal_Bool)IsShowComments();
// just for Impress
if( GetConfigId() == SDCFG_IMPRESS )
{
- pValues[ 16 ] <<= IsStartWithTemplate();
- pValues[ 17 ] <<= IsStartWithActualPage();
- pValues[ 18 ] <<= IsSummationOfParagraphs();
- pValues[ 19 ] <<= IsShowUndoDeleteWarning();
- pValues[ 20 ] <<= IsSlideshowRespectZOrder();
+ pValues[ 15 ] <<= IsStartWithTemplate();
+ pValues[ 16 ] <<= IsStartWithActualPage();
+ pValues[ 17 ] <<= IsSummationOfParagraphs();
+ pValues[ 18 ] <<= IsShowUndoDeleteWarning();
+ pValues[ 19 ] <<= IsSlideshowRespectZOrder();
- pValues[ 21 ] <<= IsPreviewNewEffects();
- pValues[ 22 ] <<= IsPreviewChangedEffects();
- pValues[ 23 ] <<= IsPreviewTransitions();
+ pValues[ 20 ] <<= IsPreviewNewEffects();
+ pValues[ 21 ] <<= IsPreviewChangedEffects();
+ pValues[ 22 ] <<= IsPreviewTransitions();
- pValues[ 24 ] <<= GetDisplay();
+ pValues[ 23 ] <<= GetDisplay();
- pValues[ 25 ] <<= GetPresentationPenColor();
- pValues[ 26 ] <<= GetPresentationPenWidth();
+ pValues[ 24 ] <<= GetPresentationPenColor();
+ pValues[ 25 ] <<= GetPresentationPenWidth();
}
return sal_True;
@@ -759,7 +754,6 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
maOptionsMisc.SetDoubleClickTextEdit( pView->IsDoubleClickTextEdit() );
maOptionsMisc.SetClickChangeRotation( pView->IsClickChangeRotation() );
maOptionsMisc.SetSolidDragging( pView->IsSolidDragging() );
- maOptionsMisc.SetSolidMarkHdl( pView->IsSolidMarkHdl() );
}
else if( pOpts )
{
@@ -774,7 +768,6 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
maOptionsMisc.SetDoubleClickTextEdit( pOpts->IsDoubleClickTextEdit() );
maOptionsMisc.SetClickChangeRotation( pOpts->IsClickChangeRotation() );
maOptionsMisc.SetSolidDragging( pOpts->IsSolidDragging() );
- maOptionsMisc.SetSolidMarkHdl( pOpts->IsSolidMarkHdl() );
}
}
@@ -815,7 +808,6 @@ void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const
pOpts->SetStartWithActualPage( maOptionsMisc.IsStartWithActualPage() );
pOpts->SetSummationOfParagraphs( maOptionsMisc.IsSummationOfParagraphs() );
pOpts->SetSolidDragging( maOptionsMisc.IsSolidDragging() );
- pOpts->SetSolidMarkHdl( maOptionsMisc.IsSolidMarkHdl() );
pOpts->SetShowUndoDeleteWarning( maOptionsMisc.IsShowUndoDeleteWarning() );
pOpts->SetPrinterIndependentLayout( maOptionsMisc.GetPrinterIndependentLayout() );
pOpts->SetShowComments( maOptionsMisc.IsShowComments() );
diff --git a/sd/source/ui/app/tbxids_tmpl.src b/sd/source/ui/app/tbxids_tmpl.src
index 90fd733..5ec5d23 100644
--- a/sd/source/ui/app/tbxids_tmpl.src
+++ b/sd/source/ui/app/tbxids_tmpl.src
@@ -501,14 +501,6 @@
AutoCheck = TRUE ; \
};
-#define TBI_HANDLES_DRAFT \
- ToolBoxItem\
- {\
- Identifier = SID_HANDLES_DRAFT ; \
- HelpID = SID_HANDLES_DRAFT ; \
- AutoCheck = TRUE ; \
- };
-
#define TBI_BIG_HANDLES \
ToolBoxItem\
{\
diff --git a/sd/source/ui/app/toolbox2_tmpl.src b/sd/source/ui/app/toolbox2_tmpl.src
index d5033ce..b9bdaf4 100644
--- a/sd/source/ui/app/toolbox2_tmpl.src
+++ b/sd/source/ui/app/toolbox2_tmpl.src
@@ -224,7 +224,6 @@ ToolBox RID_GRAPHIC_OPTIONS_TOOLBOX
TBI_PICK_THROUGH
TBI_DOUBLECLICK_TEXTEDIT
SEPARATOR
- TBI_HANDLES_DRAFT
TBI_BIG_HANDLES
#if SD_TOOLBOX != RID_DRAW_TOOLBOX
TBI_SOLID_CREATE
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 42ecc2b..36c9aac 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -265,7 +265,6 @@ private:
sal_Bool bClickChangeRotation : 1; // Misc/RotateClick
sal_Bool bStartWithActualPage : 1; // Misc/Start/CurrentPage
sal_Bool bSolidDragging : 1; // Misc/ModifyWithAttributes
- sal_Bool bSolidMarkHdl : 1; // /Misc/SimpleHandles
sal_Bool bSummationOfParagraphs : 1; // misc/SummationOfParagraphs
sal_Bool bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning
// #i75315#
@@ -315,7 +314,6 @@ public:
sal_Bool IsClickChangeRotation() const { Init(); return (sal_Bool) bClickChangeRotation; }
sal_Bool IsStartWithActualPage() const { Init(); return (sal_Bool) bStartWithActualPage; }
sal_Bool IsSolidDragging() const { Init(); return (sal_Bool) bSolidDragging; }
- sal_Bool IsSolidMarkHdl() const { Init(); return (sal_Bool) bSolidMarkHdl; }
sal_Bool IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs != 0; };
/** Return the currently selected printer independent layout mode.
@@ -363,7 +361,6 @@ public:
*/
void SetPrinterIndependentLayout (sal_uInt16 nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } }
void SetSolidDragging( sal_Bool bOn = sal_True ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } }
- void SetSolidMarkHdl( sal_Bool bOn = sal_True ) { if( bSolidMarkHdl != bOn ) { OptionsChanged(); bSolidMarkHdl = bOn; } }
void SetShowUndoDeleteWarning( sal_Bool bOn = sal_True ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } }
void SetSlideshowRespectZOrder( sal_Bool bOn = sal_True ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } }
void SetDefaultObjectSizeWidth( sal_uLong nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } }
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index d645d8e..892d9dd 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -255,9 +255,6 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView)
if (mpDrawView->IsEliminatePolyPoints() != pView->IsEliminatePolyPoints() )
mpDrawView->SetEliminatePolyPoints( pView->IsEliminatePolyPoints() );
- if (mpDrawView->IsSolidMarkHdl() != pView->IsSolidMarkHdl() )
- mpDrawView->SetSolidMarkHdl( pView->IsSolidMarkHdl() );
-
if (mpDrawView->IsSolidDragging() != pView->IsSolidDragging() )
mpDrawView->SetSolidDragging( pView->IsSolidDragging() );
@@ -372,7 +369,6 @@ void DrawViewShell::WriteFrameViewData()
mpFrameView->SetEliminatePolyPointLimitAngle( mpDrawView->GetEliminatePolyPointLimitAngle() );
mpFrameView->SetEliminatePolyPoints( mpDrawView->IsEliminatePolyPoints() );
- mpFrameView->SetSolidMarkHdl( mpDrawView->IsSolidMarkHdl() );
mpFrameView->SetSolidDragging( mpDrawView->IsSolidDragging() );
mpFrameView->SetQuickEdit( mpDrawView->IsQuickTextEditMode() );
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index 5928ddb..bfcee48 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -134,10 +134,6 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
switch( nSlot )
{
- case SID_HANDLES_DRAFT:
- pOptions->SetSolidMarkHdl( !mpDrawView->IsSolidMarkHdl() );
- break;
-
case SID_SOLID_CREATE:
pOptions->SetSolidDragging( !mpDrawView->IsSolidDragging() );
break;
@@ -256,7 +252,6 @@ void DrawViewShell::ExecOptionsBar( SfxRequest& rReq )
void DrawViewShell::GetOptionsBarState( SfxItemSet& rSet )
{
- rSet.Put( SfxBoolItem( SID_HANDLES_DRAFT, !mpDrawView->IsSolidMarkHdl() ) );
rSet.Put( SfxBoolItem( SID_SOLID_CREATE, mpDrawView->IsSolidDragging() ) );
rSet.Put( SfxBoolItem( SID_GRID_VISIBLE, mpDrawView->IsGridVisible() ) );
rSet.Put( SfxBoolItem( SID_GRID_USE, mpDrawView->IsGridSnap() ) );
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 124dd3f..18fc3ab 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -183,7 +183,6 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
SetEliminatePolyPoints( pFrameView->IsEliminatePolyPoints() );
SetDesignMode( pFrameView->IsDesignMode() );
- SetSolidMarkHdl( pFrameView->IsSolidMarkHdl() );
SetSolidDragging( pFrameView->IsSolidDragging() );
maVisibleLayers = pFrameView->GetVisibleLayers();
@@ -350,7 +349,6 @@ void FrameView::Update(SdOptions* pOptions)
SetEliminatePolyPointLimitAngle( pOptions->GetEliminatePolyPointLimitAngle() );
GetModel()->SetPickThroughTransparentTextFrames( pOptions->IsPickThrough() );
- SetSolidMarkHdl( pOptions->IsSolidMarkHdl() );
SetSolidDragging( pOptions->IsSolidDragging() );
SetGridCoarse( Size( pOptions->GetFldDrawX(), pOptions->GetFldDrawY() ) );
diff --git a/sd/uiconfig/sdraw/toolbar/optionsbar.xml b/sd/uiconfig/sdraw/toolbar/optionsbar.xml
index e3d92eb..13a9548 100644
--- a/sd/uiconfig/sdraw/toolbar/optionsbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/optionsbar.xml
@@ -17,9 +17,8 @@
<toolbar:toolbaritem xlink:href=".uno:PickThrough" toolbar:helpid="helpid:27159" toolbar:style="auto" />
<toolbar:toolbaritem xlink:href=".uno:DoubleClickTextEdit" toolbar:helpid="helpid:27169" toolbar:style="auto" />
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HandlesDraft" toolbar:helpid="helpid:27150" toolbar:style="auto" />
<toolbar:toolbaritem xlink:href=".uno:BigHandles" toolbar:helpid="helpid:27168" toolbar:style="auto" />
<toolbar:toolbaritem xlink:href=".uno:SolidCreate" toolbar:helpid="helpid:27151" toolbar:style="auto" />
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LeaveAllGroups" toolbar:helpid="helpid:27345" toolbar:style="auto" />
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/optionsbar.xml b/sd/uiconfig/simpress/toolbar/optionsbar.xml
index 6b6325b..9fe4141 100644
--- a/sd/uiconfig/simpress/toolbar/optionsbar.xml
+++ b/sd/uiconfig/simpress/toolbar/optionsbar.xml
@@ -17,7 +17,6 @@
<toolbar:toolbaritem xlink:href=".uno:PickThrough" toolbar:helpid="27159"/>
<toolbar:toolbaritem xlink:href=".uno:DoubleClickTextEdit" toolbar:helpid="27169"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HandlesDraft" toolbar:helpid="27150"/>
<toolbar:toolbaritem xlink:href=".uno:BigHandles" toolbar:helpid="27168"/>
<toolbar:toolbaritem xlink:href=".uno:SolidCreate" toolbar:helpid="helpid:27151"/>
<toolbar:toolbarseparator/>
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 0026f8e..cadd4a4 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -150,7 +150,7 @@ class SVX_DLLPUBLIC SdrHdl
friend class SdrHdlList;
// #101928#
- BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine );
+ BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd);
protected:
SdrObject* pObj; // Gehoert das Handle zu einem Objekt?
@@ -524,7 +524,7 @@ protected:
BitmapEx GetBitmapForHandle( const BitmapEx& rBitmap, int nSize );
- static BitmapEx GetHandlesBitmap( bool bIsFineHdl );
+ static BitmapEx GetHandlesBitmap();
};
#endif //_SVDHDL_HXX
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index da08586..d292e3c 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -338,15 +338,6 @@ public:
sal_uInt16 GetMarkHdlSizePixel() const;
void SetMarkHdlSizePixel(sal_uInt16 nSiz);
- // Die Groesse der Markierungs-Handles wird ueber die jeweilige Aufloesung
- // und die Groesse des Bereichs der markierten Objekte so angepasst, dass
- // sie sich bei einer Frame-Selektion moeglichst nicht ueberschneiden.
- // Dazu muessen die Handles ggf. verkleinert dargestellt werden. Mit der
- // MinMarkHdlSize kann man hierfuer eine Mindestgroesse angeben.
- // Defaultwert ist 3, Mindestwert 3 Pixel.
- sal_Bool IsSolidMarkHdl() const { return aHdl.IsFineHdl(); }
- void SetSolidMarkHdl(sal_Bool bOn);
-
virtual sal_Bool HasMarkablePoints() const;
virtual sal_uIntPtr GetMarkablePointCount() const;
virtual sal_Bool HasMarkedPoints() const;
diff --git a/svx/inc/svx/svdstr.hrc b/svx/inc/svx/svdstr.hrc
index e298b75..3e45638 100755
--- a/svx/inc/svx/svdstr.hrc
+++ b/svx/inc/svx/svdstr.hrc
@@ -702,7 +702,6 @@
#define SIP_SA_MARKERS (SIP_Begin + 258)
#define SIP_SA_PAGESHADOW35X35 (SIP_Begin + 259)
-#define SIP_SA_FINE_MARKERS (SIP_Begin + 260)
#define BMP_SVXOLEOBJ (SIP_Begin + 261)
@@ -720,7 +719,6 @@
#define STR_TABLE_STYLE (SIP_Begin + 274)
#define STR_TABLE_STYLE_SETTINGS (SIP_Begin + 275)
#define SIP_SA_CROP_MARKERS (SIP_Begin + 276)
-#define SIP_SA_CROP_FINE_MARKERS (SIP_Begin + 277)
#define SIP_End (SIP_SA_CROP_FINE_MARKERS)
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index abf2b11..98cd7a8 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -263,15 +263,9 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrHdlBitmapSet& getSimpleSet()
-{
- static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aSimpleSet(new SdrHdlBitmapSet(SIP_SA_MARKERS));
- return *aSimpleSet.get();
-}
-
SdrHdlBitmapSet& getModernSet()
{
- static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aModernSet(new SdrHdlBitmapSet(SIP_SA_FINE_MARKERS));
+ static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aModernSet(new SdrHdlBitmapSet(SIP_SA_MARKERS));
return *aModernSet.get();
}
@@ -632,16 +626,9 @@ BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) const
}
// #101928#
-BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine )
+BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd)
{
- if(bFine)
- {
- return getModernSet().GetBitmapEx(eKindOfMarker, nInd);
- }
- else
- {
- return getSimpleSet().GetBitmapEx(eKindOfMarker, nInd);
- }
+ return getModernSet().GetBitmapEx(eKindOfMarker, nInd);
}
::sdr::overlay::OverlayObject* SdrHdl::CreateOverlayObject(
@@ -649,7 +636,6 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker, Point aMoveOutsideOffset)
{
::sdr::overlay::OverlayObject* pRetval = 0L;
- sal_Bool bIsFineHdl(pHdlList->IsFineHdl());
// support bigger sizes
sal_Bool bForceBiggerSize(sal_False);
@@ -695,9 +681,8 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
}
// create animated hdl
- // #101928# use ImpGetBitmapEx(...) now
- BitmapEx aBmpEx1 = ImpGetBitmapEx( eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl );
- BitmapEx aBmpEx2 = ImpGetBitmapEx( eNextBigger, (sal_uInt16)eColIndex, bIsFineHdl );
+ BitmapEx aBmpEx1 = ImpGetBitmapEx( eKindOfMarker, (sal_uInt16)eColIndex );
+ BitmapEx aBmpEx2 = ImpGetBitmapEx( eNextBigger, (sal_uInt16)eColIndex );
// #i53216# Use system cursor blink time. Use the unsigned value.
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
@@ -728,7 +713,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd
else
{
// create normal handle: use ImpGetBitmapEx(...) now
- BitmapEx aBmpEx = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex, bIsFineHdl );
+ BitmapEx aBmpEx = ImpGetBitmapEx(eKindOfMarker, (sal_uInt16)eColIndex);
if(eKindOfMarker == Anchor || eKindOfMarker == AnchorPressed)
{
@@ -2232,22 +2217,12 @@ SdrCropHdl::SdrCropHdl(const Point& rPnt, SdrHdlKind eNewKind)
// --------------------------------------------------------------------
-BitmapEx SdrCropHdl::GetHandlesBitmap( bool bIsFineHdl )
+BitmapEx SdrCropHdl::GetHandlesBitmap()
{
- if( bIsFineHdl )
- {
- static BitmapEx* pModernBitmap = 0;
- if( pModernBitmap == 0 )
- pModernBitmap = new BitmapEx(ResId(SIP_SA_CROP_FINE_MARKERS, *ImpGetResMgr()));
- return *pModernBitmap;
- }
- else
- {
- static BitmapEx* pSimpleBitmap = 0;
- if( pSimpleBitmap == 0 )
- pSimpleBitmap = new BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr()));
- return *pSimpleBitmap;
- }
+ static BitmapEx* pModernBitmap = 0;
+ if( pModernBitmap == 0 )
+ pModernBitmap = new BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr()));
+ return *pModernBitmap;
}
// --------------------------------------------------------------------
@@ -2304,11 +2279,10 @@ void SdrCropHdl::CreateB2dIAObject()
if( pPageView && !pView->areMarkHandlesHidden() )
{
- sal_Bool bIsFineHdl(pHdlList->IsFineHdl());
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
int nHdlSize = pHdlList->GetHdlSize();
- const BitmapEx aHandlesBitmap( GetHandlesBitmap( bIsFineHdl ) );
+ const BitmapEx aHandlesBitmap( GetHandlesBitmap() );
BitmapEx aBmpEx1( GetBitmapForHandle( aHandlesBitmap, nHdlSize ) );
for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 9dd2e62..d8573d1 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1547,16 +1547,6 @@ sal_uInt16 SdrMarkView::GetMarkHdlSizePixel() const
return aHdl.GetHdlSize()*2+1;
}
-void SdrMarkView::SetSolidMarkHdl(sal_Bool bOn)
-{
- if (bOn!=aHdl.IsFineHdl()) {
- //HMHBOOL bMerk=IsMarkHdlShown();
- //HMHif (bMerk) HideMarkHdl();
- aHdl.SetFineHdl(bOn);
- //HMHif (bMerk) ShowMarkHdl();
- }
-}
-
void SdrMarkView::SetMarkHdlSizePixel(sal_uInt16 nSiz)
{
if (nSiz<3) nSiz=3;
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index c9835b4..f650754 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -241,7 +241,6 @@ sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark)
const SdrPageView* pPV0=NULL;
SdrMark* pM=NULL;
aHdl.Sort();
- //HMHBOOL bHideHdl=IsMarkHdlShown() && IsSolidMarkHdl() && !bPlusHdlAlways;
sal_uIntPtr nHdlAnz=aHdl.GetHdlCount();
for (sal_uIntPtr nHdlNum=nHdlAnz; nHdlNum>0;) {
nHdlNum--;
diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src
index e68f681..1846cac 100644
--- a/svx/source/svdraw/svdstr.src
+++ b/svx/source/svdraw/svdstr.src
@@ -2725,11 +2725,6 @@ Bitmap SIP_SA_MARKERS
File = "markers.png";
};
-Bitmap SIP_SA_FINE_MARKERS
-{
- File = "markers2.png";
-};
-
Bitmap BMP_SVXOLEOBJ
{
File = "oleobj.png" ;
@@ -2817,11 +2812,6 @@ Bitmap SIP_SA_CROP_MARKERS
File = "cropmarkers.png";
};
-Bitmap SIP_SA_CROP_FINE_MARKERS
-{
- File = "cropmarkers2.png";
-};
-
String STR_ObjNameSingulFONTWORK
{
Text [ en-US ] = "font work" ;
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 38590c7..171f5f7 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 c3ca3f6..a1ea19b 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 4db0144..e2ed627 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 aae530a..41c4527 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 30acbbc..8ef33b8 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 0d42d12..bba60d9 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 bfa8707..83e0ac7 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;
diff --git a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optionsbar.xml b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optionsbar.xml
index e3d92eb..13a9548 100644
--- a/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optionsbar.xml
+++ b/test/user-template/user/config/soffice.cfg/modules/sdraw/toolbar/optionsbar.xml
@@ -17,9 +17,8 @@
<toolbar:toolbaritem xlink:href=".uno:PickThrough" toolbar:helpid="helpid:27159" toolbar:style="auto" />
<toolbar:toolbaritem xlink:href=".uno:DoubleClickTextEdit" toolbar:helpid="helpid:27169" toolbar:style="auto" />
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HandlesDraft" toolbar:helpid="helpid:27150" toolbar:style="auto" />
<toolbar:toolbaritem xlink:href=".uno:BigHandles" toolbar:helpid="helpid:27168" toolbar:style="auto" />
<toolbar:toolbaritem xlink:href=".uno:SolidCreate" toolbar:helpid="helpid:27151" toolbar:style="auto" />
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LeaveAllGroups" toolbar:helpid="helpid:27345" toolbar:style="auto" />
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optionsbar.xml b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optionsbar.xml
index 6b6325b..9fe4141 100644
--- a/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optionsbar.xml
+++ b/test/user-template/user/config/soffice.cfg/modules/simpress/toolbar/optionsbar.xml
@@ -17,7 +17,6 @@
<toolbar:toolbaritem xlink:href=".uno:PickThrough" toolbar:helpid="27159"/>
<toolbar:toolbaritem xlink:href=".uno:DoubleClickTextEdit" toolbar:helpid="27169"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:HandlesDraft" toolbar:helpid="27150"/>
<toolbar:toolbaritem xlink:href=".uno:BigHandles" toolbar:helpid="27168"/>
<toolbar:toolbaritem xlink:href=".uno:SolidCreate" toolbar:helpid="helpid:27151"/>
<toolbar:toolbarseparator/>
diff --git a/test/user-template/user/registry/main.xcd b/test/user-template/user/registry/main.xcd
index 156c664..f925711 100644
--- a/test/user-template/user/registry/main.xcd
+++ b/test/user-template/user/registry/main.xcd
@@ -2722,9 +2722,6 @@
<prop oor:name="ShowComments" oor:type="xs:boolean">
<value>true</value>
</prop>
- <prop oor:name="SimpleHandles" oor:type="xs:boolean">
- <value>true</value>
- </prop>
<prop oor:name="BigHandles" oor:type="xs:boolean">
<value>true</value>
</prop>
@@ -3130,9 +3127,6 @@
<prop oor:name="ShowComments" oor:type="xs:boolean">
<value>true</value>
</prop>
- <prop oor:name="SimpleHandles" oor:type="xs:boolean">
- <value>false</value>
- </prop>
<prop oor:name="BigHandles" oor:type="xs:boolean">
<value>true</value>
</prop>
@@ -41926,14 +41920,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:HandlesDraft" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Simple Handles</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:SolidCreate" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Modify Object with Attributes</value>
diff --git a/testautomation/global/sid/bars.sid b/testautomation/global/sid/bars.sid
index 227c310..834e9ac 100644
--- a/testautomation/global/sid/bars.sid
+++ b/testautomation/global/sid/bars.sid
@@ -738,7 +738,6 @@ Opl_SD_FangenAnObjektpunkten .uno:SnapPoints
Opl_SD_Schnellbearbeitung .uno:QuickEdit
Opl_SD_NurTextbreichSelektieren .uno:PickThrough
Opl_SD_TextBearbeitenBeiDoppelklick .uno:DoubleClickTextEdit
-Opl_SD_EinfacheHandles .uno:HandlesDraft
Opl_SD_GrosseHandles .uno:BigHandles
Opl_SD_ObjektMitAttributen .uno:SolidCreate
Opl_SD_AlleGruppierungenVerlassen .uno:ConnectorLinesCircles
diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win
index 850baef..78184ce 100644
--- a/testautomation/global/win/bars.win
+++ b/testautomation/global/win/bars.win
@@ -888,7 +888,6 @@ ZeilenGleichmaessig .uno:DistributeRows
AlleGruppenVerlassen .uno:LeaveAllGroups
AlleGruppierungenVerlassen .uno:ConnectorLinesCircles
DrehmodusNachKlick .uno:ClickChangeRotation
-EinfacheHandles .uno:HandlesDraft
FangenAnObjektRahmen .uno:SnapFrame
FangenAnObjektpunkten .uno:SnapPoints
FangenAnSeitenraendern .uno:SnapBorder
More information about the Libreoffice-commits
mailing list