[Libreoffice-commits] .: 2 commits - binfilter/bf_sc binfilter/bf_sd binfilter/bf_svx binfilter/bf_sw binfilter/inc
Michael Meeks
michael at kemper.freedesktop.org
Thu Nov 10 03:35:47 PST 2011
binfilter/bf_sc/source/core/tool/sc_viewopti.cxx | 8 ----
binfilter/bf_sd/source/ui/app/sd_optsitem.cxx | 25 ++++++---------
binfilter/bf_sd/source/ui/inc/optsitem.hxx | 3 -
binfilter/bf_sd/source/ui/view/sd_frmview.cxx | 1
binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx | 1
binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx | 10 ------
binfilter/bf_sw/source/core/unocore/sw_unoprnms.cxx | 1
binfilter/bf_sw/source/ui/config/sw_usrpref.cxx | 1
binfilter/bf_sw/source/ui/config/sw_viewopt.cxx | 8 ++--
binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx | 1
binfilter/bf_sw/source/ui/uno/sw_unomod.cxx | 4 --
binfilter/inc/bf_sc/unonames.hxx | 1
binfilter/inc/bf_sc/viewopti.hxx | 1
binfilter/inc/bf_svx/svdhdl.hxx | 4 --
binfilter/inc/bf_svx/svdmrkv.hxx | 8 ----
binfilter/inc/bf_sw/unoprnms.hxx | 1
binfilter/inc/bf_sw/viewopt.hxx | 6 ---
17 files changed, 14 insertions(+), 70 deletions(-)
New commits:
commit 0bc4ff444d1c233f5f3a75979384cb90b73a39b6
Author: Michael Meeks <michael.meeks at suse.com>
Date: Thu Nov 10 11:35:58 2011 +0000
cleanup list length mismatch
diff --git a/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx b/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx
index fca23c3..c608581 100644
--- a/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx
+++ b/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx
@@ -345,9 +345,7 @@ using namespace ::com::sun::star::uno;
/*N*/ "ShowUndoDeleteWarning"
/*N*/ };
/*N*/
-/*N*/ // #90356# rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 15 : 12 );
-/*N*/ // #97016# rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 16 : 12 );
-/*N*/ rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 19 : 15 );
+/*N*/ rCount = ( ( GetConfigId() == SDCFG_IMPRESS ) ? 18 : 14 );
/*N*/ ppNames = aPropNames;
/*N*/ }
commit c6c92c26bf4aeee6757a03a84d0c164c395432b2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 7 19:26:32 2011 +0000
removed Simple Handles option (binfilter)
Removed the unnecessary option "Simple Handles" with all related
functions and variables.
diff --git a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
index c0564c8..52483aa 100644
--- a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
@@ -194,7 +194,6 @@ using ::rtl::OUString;
/*N*/ aOptArr[ VOPT_GRID ] =
/*N*/ aOptArr[ VOPT_ANCHOR ] =
/*N*/ aOptArr[ VOPT_PAGEBREAKS ] =
-/*N*/ aOptArr[ VOPT_SOLIDHANDLES] =
/*N*/ aOptArr[ VOPT_CLIPMARKS ] = TRUE;
/*N*/
/*N*/ aModeArr[VOBJ_TYPE_OLE ] =
@@ -288,9 +287,6 @@ using ::rtl::OUString;
/*N*/ rStream >> rOpt.aOptArr[VOPT_PAGEBREAKS];
/*N*/
/*N*/ if( aHdr.BytesLeft() )
-/*N*/ rStream >> rOpt.aOptArr[VOPT_SOLIDHANDLES];
-/*N*/
-/*N*/ if( aHdr.BytesLeft() )
/*N*/ rStream >> rOpt.aOptArr[VOPT_CLIPMARKS];
/*N*/
/*N*/ if( aHdr.BytesLeft() )
@@ -459,10 +455,6 @@ using ::rtl::OUString;
/*N*/ case SCLAYOUTOPT_GUIDE:
/*N*/ SetOption( VOPT_HELPLINES, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
/*N*/ break;
-/*N*/ case SCLAYOUTOPT_SIMPLECONT:
-/*N*/ // content is reversed
-/*N*/ SetOption( VOPT_SOLIDHANDLES, !ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
-/*N*/ break;
/*N*/ case SCLAYOUTOPT_LARGECONT:
/*N*/ SetOption( VOPT_BIGHANDLES, ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
/*N*/ break;
diff --git a/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx b/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx
index fb04c37..fca23c3 100644
--- a/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx
+++ b/binfilter/bf_sd/source/ui/app/sd_optsitem.cxx
@@ -308,7 +308,6 @@ using namespace ::com::sun::star::uno;
/*N*/ bClickChangeRotation( FALSE ),
/*N*/ bStartWithActualPage( FALSE ),
/*N*/ bSolidDragging( FALSE ),
-/*N*/ bSolidMarkHdl( TRUE ),
/*N*/ bSummationOfParagraphs( FALSE ),
/*N*/ bShowUndoDeleteWarning( TRUE ),
/*N*/ mnPrinterIndependentLayout( 1 )
@@ -332,7 +331,6 @@ using namespace ::com::sun::star::uno;
/*N*/ "RotateClick",
/*N*/ "Preview",
/*N*/ "CreateWithAttributes",
-/*N*/ "SimpleHandles",
/*N*/ // #97016#
/*N*/ "DefaultObjectSize/Width",
/*N*/ "DefaultObjectSize/Height",
@@ -368,24 +366,23 @@ using namespace ::com::sun::star::uno;
/*N*/ if( pValues[8].hasValue() ) SetClickChangeRotation( *(sal_Bool*) pValues[ 8 ].getValue() );
/*N*/ if( pValues[9].hasValue() ) SetPreviewQuality( FRound( *(double*) pValues[ 9 ].getValue() ) );
/*N*/ if( pValues[10].hasValue() ) SetSolidDragging( *(sal_Bool*) pValues[ 10 ].getValue() );
-/*N*/ if( pValues[11].hasValue() ) SetSolidMarkHdl( *(sal_Bool*) pValues[ 11 ].getValue() );
/*N*/ // #97016#
-/*N*/ if( pValues[12].hasValue() ) SetDefaultObjectSizeWidth( *(sal_uInt32*) pValues[ 12 ].getValue() );
-/*N*/ if( pValues[13].hasValue() ) SetDefaultObjectSizeHeight( *(sal_uInt32*) pValues[ 13 ].getValue() );
-/*N*/ if( pValues[14].hasValue() ) SetPrinterIndependentLayout( *(sal_uInt16*) pValues[ 14 ].getValue() );
+/*N*/ if( pValues[11].hasValue() ) SetDefaultObjectSizeWidth( *(sal_uInt32*) pValues[ 11 ].getValue() );
+/*N*/ if( pValues[12].hasValue() ) SetDefaultObjectSizeHeight( *(sal_uInt32*) pValues[ 12 ].getValue() );
+/*N*/ if( pValues[13].hasValue() ) SetPrinterIndependentLayout( *(sal_uInt16*) pValues[ 13 ].getValue() );
/*N*/
/*N*/ // just for Impress
/*N*/ if( GetConfigId() == SDCFG_IMPRESS )
/*N*/ {
+/*N*/ if( pValues[14].hasValue() )
+/*N*/ SetStartWithTemplate( *(sal_Bool*) pValues[ 14 ].getValue() );
/*N*/ if( pValues[15].hasValue() )
-/*N*/ SetStartWithTemplate( *(sal_Bool*) pValues[ 15 ].getValue() );
+/*N*/ SetStartWithActualPage( *(sal_Bool*) pValues[ 15 ].getValue() );
/*N*/ if( pValues[16].hasValue() )
-/*N*/ SetStartWithActualPage( *(sal_Bool*) pValues[ 16 ].getValue() );
-/*N*/ if( pValues[17].hasValue() )
-/*N*/ SetSummationOfParagraphs( *(sal_Bool*) pValues[ 17 ].getValue() );
+/*N*/ SetSummationOfParagraphs( *(sal_Bool*) pValues[ 16 ].getValue() );
/*N*/ // #90356#
-/*N*/ if( pValues[18].hasValue() )
-/*N*/ SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 18 ].getValue() );
+/*N*/ if( pValues[17].hasValue() )
+/*N*/ SetShowUndoDeleteWarning( *(sal_Bool*) pValues[ 17 ].getValue() );
/*N*/ }
/*N*/
/*N*/ return TRUE;
diff --git a/binfilter/bf_sd/source/ui/inc/optsitem.hxx b/binfilter/bf_sd/source/ui/inc/optsitem.hxx
index a99818f..95bba89 100644
--- a/binfilter/bf_sd/source/ui/inc/optsitem.hxx
+++ b/binfilter/bf_sd/source/ui/inc/optsitem.hxx
@@ -245,7 +245,6 @@ private:
BOOL bClickChangeRotation : 1; // Misc/RotateClick
BOOL bStartWithActualPage : 1; // Misc/Start/CurrentPage
BOOL bSolidDragging : 1; // Misc/CreateWithAttributes
- BOOL bSolidMarkHdl : 1; // /Misc/SimpleHandles
BOOL bSummationOfParagraphs : 1; // misc/SummationOfParagraphs
// #90356#
BOOL bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning
@@ -282,7 +281,6 @@ public:
BOOL IsStartWithActualPage() const { Init(); return (BOOL) bStartWithActualPage; }
ULONG GetPreviewQuality() const { Init(); return nPreviewQuality; }
BOOL IsSolidDragging() const { Init(); return (BOOL) bSolidDragging; }
- BOOL IsSolidMarkHdl() const { Init(); return (BOOL) bSolidMarkHdl; }
BOOL IsSummationOfParagraphs() const { Init(); return bSummationOfParagraphs != 0; };
/** Return the currently selected printer independent layout mode.
@return
@@ -318,7 +316,6 @@ public:
void SetPrinterIndependentLayout (USHORT nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } }
void SetPreviewQuality( ULONG nQual ) { if( nPreviewQuality != nQual ) { OptionsChanged(); nPreviewQuality = nQual; } }
void SetSolidDragging( BOOL bOn = TRUE ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } }
- void SetSolidMarkHdl( BOOL bOn = TRUE ) { if( bSolidMarkHdl != bOn ) { OptionsChanged(); bSolidMarkHdl = bOn; } }
// #90356#
void SetShowUndoDeleteWarning( BOOL bOn = TRUE ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } }
// #97016#
diff --git a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
index 516897e..a8a9075 100644
--- a/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
+++ b/binfilter/bf_sd/source/ui/view/sd_frmview.cxx
@@ -291,7 +291,6 @@ void FrameView::Update(SdOptions* pOptions)
SetFillDraft( pOptions->IsOutlineMode() );
SetTextDraft( pOptions->IsNoText() );
SetGrafDraft( pOptions->IsExternGraphic() );
- SetSolidMarkHdl( pOptions->IsSolidMarkHdl() );
SetSolidDragging( pOptions->IsSolidDragging() );
SetGridCoarse( Size( pOptions->GetFldDrawX(), pOptions->GetFldDrawY() ) );
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx b/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
index 30b1cf2..70e76f7 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdhdl.cxx
@@ -55,7 +55,6 @@ SdrHdl::~SdrHdl() {}
/*N*/ bRotateShear = FALSE;
/*N*/ bMoveOutside = FALSE;
/*N*/ bDistortShear = FALSE;
-/*N*/ bFineHandles = FALSE;
/*N*/ }
/*N*/
/*N*/ SdrHdlList::~SdrHdlList()
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
index 0a3c3f7..1efdd91 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
@@ -294,13 +294,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void SdrMarkView::SetSolidMarkHdl(BOOL bOn)
-/*N*/ {
-/*N*/ if (bOn!=aHdl.IsFineHdl()) {
-/*N*/ aHdl.SetFineHdl(bOn);
-/*N*/ }
-/*N*/ }
-
/*N*/ #define SDRSEARCH_IMPISMASTER 0x80000000 /* MasterPage wird gerade durchsucht */
/*N*/ SdrObject* SdrMarkView::ImpCheckObjHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const
/*N*/ {
@@ -523,9 +516,7 @@ namespace binfilter {
// - Xor: Nach dem Painten werden die Handles im (vom PaintHandler gerufenen)
// InitRedraw per ToggleShownXor bei gesetzter ClipRegion nochmal gemalt
// und damit ist alles in Butter.
-// - ToggleShownXor macht bei SolidHdl nix weil bHdlShown=FALSE
// - Der AfterPaintTimer wird gestartet.
-// - SolidHdl: Im AfterPaintHandler wird ShowMarkHdl gerufen.
// Da die Handles zu diesem Zeitpunkt nicht angezeigt sind wird:
// - SaveBackground durchgefuehrt.
// - DrawMarkHdl gerufen und bHdlShown gesetzt.
@@ -533,7 +524,6 @@ namespace binfilter {
// MarkHandles bei sonstigem Invalidate:
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// In diesem Fall bekomme ich kein Notify und beim Aufruf des
-// PaintHandlers->InitRedraw() sind auch die SolidHandles sichtbar.
}
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unoprnms.cxx b/binfilter/bf_sw/source/core/unocore/sw_unoprnms.cxx
index 45d8ae4..907e31e 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unoprnms.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unoprnms.cxx
@@ -261,7 +261,6 @@ const SwPropNameTab aPropNameTab = {
/* 0218 IS_SYNC_HEIGHT_TO_WIDTH */ {MAP_CHAR_LEN("IsSyncHeightToWidth")},
/* 0219 SIZE_PROTECTED */ {MAP_CHAR_LEN("SizeProtected")},
/* 0220 SMOOTH_SCROLLING */ {MAP_CHAR_LEN("SmoothScrolling")},
-/* 0221 SOLID_MARK_HANDLES */ {MAP_CHAR_LEN("SolidMarkHandles")},
/* 0222 TABLES */ {MAP_CHAR_LEN("Tables")},
/* 0223 TEXT_FRAMES */ {MAP_CHAR_LEN("TextFrames")},
/* 0224 TEXT_COLUMNS */ {MAP_CHAR_LEN("TextColumns")},
diff --git a/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx b/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx
index 822fbe5..d3352aa 100644
--- a/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx
+++ b/binfilter/bf_sw/source/ui/config/sw_usrpref.cxx
@@ -253,7 +253,6 @@ using ::rtl::OUString;
/*M*/ switch(nProp)
/*M*/ {
/*M*/ case 0: rParent.SetCrossHair(bSet); break;// "Line/Guide",
-/*M*/ case 1: rParent.SetSolidMarkHdl(bSet); break;// "Line/SimpleControlPoint",
/*M*/ case 2: rParent.SetBigMarkHdl(bSet); break;// "Line/LargeControlPoint",
/*M*/ case 3: rParent.SetViewHScrollBar(bSet); break;// "Window/HorizontalScroll",
/*M*/ case 4: rParent.SetViewVScrollBar(bSet); break;// "Window/VerticalScroll",
diff --git a/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx b/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
index 92706c7..cbe00bc 100644
--- a/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
+++ b/binfilter/bf_sw/source/ui/config/sw_viewopt.cxx
@@ -103,11 +103,11 @@ static const char aPostItStr[] = " ";
/*M*/ // Initialisierung ist jetzt etwas einfacher
/*M*/ // alle Bits auf 0
/*M*/ nCoreOptions = VIEWOPT_1_IDLE | VIEWOPT_1_HARDBLANK | VIEWOPT_1_SOFTHYPH |
-/*M*/ VIEWOPT_1_REF |
-/*M*/ VIEWOPT_1_GRAPHIC |
+/*M*/ VIEWOPT_1_REF |
+/*M*/ VIEWOPT_1_GRAPHIC |
/*M*/ VIEWOPT_1_TABLE | VIEWOPT_1_DRAW | VIEWOPT_1_CONTROL |
-/*M*/ VIEWOPT_1_PAGEBACK |
-/*M*/ VIEWOPT_1_SOLIDMARKHDL | VIEWOPT_1_POSTITS;
+/*M*/ VIEWOPT_1_PAGEBACK |
+/*M*/ VIEWOPT_1_POSTITS;
/*M*/ nCore2Options = VIEWOPT_CORE2_BLACKFONT | VIEWOPT_CORE2_HIDDENPARA;
/*M*/ nUIOptions = VIEWOPT_2_MODIFIED | VIEWOPT_2_EXECHYPERLINKS | VIEWOPT_2_GRFKEEPZOOM |VIEWOPT_2_ANY_RULER;
/*M*/
diff --git a/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx b/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
index 95dbf1f..e131865 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_SwXDocumentSettings.cxx
@@ -149,7 +149,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/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx b/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
index cb51917..ec8a7cd 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unomod.cxx
@@ -99,7 +99,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,
@@ -157,7 +156,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 ( "ZoomType"), HANDLE_VIEWSET_ZOOM_TYPE , CPPUTYPE_INT16, PROPERTY_NONE, 0},
{ RTL_CONSTASCII_STRINGPARAM ( "ZoomValue"), HANDLE_VIEWSET_ZOOM , CPPUTYPE_INT16, PROPERTY_NONE, 0},
{ 0, 0, 0, CPPUTYPE_UNKNOWN, 0, 0 }
@@ -595,7 +593,6 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
case HANDLE_VIEWSET_TABLE_BOUNDARIES : break;
case HANDLE_VIEWSET_TEXT_BOUNDARIES : 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;
break;
case HANDLE_VIEWSET_ZOOM :
@@ -695,7 +692,6 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, :
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_ZOOM :
bBool = FALSE;
diff --git a/binfilter/inc/bf_sc/unonames.hxx b/binfilter/inc/bf_sc/unonames.hxx
index 9bc0a59..785d9f2 100644
--- a/binfilter/inc/bf_sc/unonames.hxx
+++ b/binfilter/inc/bf_sc/unonames.hxx
@@ -432,7 +432,6 @@ namespace binfilter {
#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/binfilter/inc/bf_sc/viewopti.hxx b/binfilter/inc/bf_sc/viewopti.hxx
index 47e53ad..26ea1c7 100644
--- a/binfilter/inc/bf_sc/viewopti.hxx
+++ b/binfilter/inc/bf_sc/viewopti.hxx
@@ -59,7 +59,6 @@ enum ScViewOption
VOPT_HELPLINES,
VOPT_ANCHOR,
VOPT_PAGEBREAKS,
- VOPT_SOLIDHANDLES,
VOPT_CLIPMARKS,
VOPT_BIGHANDLES
};
diff --git a/binfilter/inc/bf_svx/svdhdl.hxx b/binfilter/inc/bf_svx/svdhdl.hxx
index 1121c0c..25b2d53 100644
--- a/binfilter/inc/bf_svx/svdhdl.hxx
+++ b/binfilter/inc/bf_svx/svdhdl.hxx
@@ -165,7 +165,6 @@ protected:
unsigned bRotateShear : 1;
unsigned bDistortShear : 1;
unsigned bMoveOutside : 1; // Handles nach aussen ruecken (fuer TextEdit)
- unsigned bFineHandles : 1;
private:
SdrHdlList(const SdrHdlList&): aList(1024,64,64) {}
@@ -195,9 +194,6 @@ public:
void SetDistortShear(BOOL bOn) { bDistortShear = bOn; }
BOOL IsDistortShear() const { return bDistortShear; }
-
- void SetFineHdl(BOOL bOn) { bFineHandles = bOn; }
- BOOL IsFineHdl() const { return bFineHandles; }
};
}//end of namespace binfilter
diff --git a/binfilter/inc/bf_svx/svdmrkv.hxx b/binfilter/inc/bf_svx/svdmrkv.hxx
index 7aba237..5e96b3c 100644
--- a/binfilter/inc/bf_svx/svdmrkv.hxx
+++ b/binfilter/inc/bf_svx/svdmrkv.hxx
@@ -224,14 +224,6 @@ public:
// Diese Funktion kostet etwas Zeit, da die MarkList durchsucht werden muss.
const SdrMarkList& GetMarkList() const { return aMark; }
- // 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.
- void SetSolidMarkHdl(BOOL bOn);
-
BOOL HasMarkedPoints() const;
// Zusatzhandles dauerhaft sichtbar schalten
diff --git a/binfilter/inc/bf_sw/unoprnms.hxx b/binfilter/inc/bf_sw/unoprnms.hxx
index 166ca75..4883aa8 100644
--- a/binfilter/inc/bf_sw/unoprnms.hxx
+++ b/binfilter/inc/bf_sw/unoprnms.hxx
@@ -260,7 +260,6 @@ enum SwPropNameIds
/* 0218 */ UNO_NAME_IS_SYNC_HEIGHT_TO_WIDTH,
/* 0219 */ UNO_NAME_SIZE_PROTECTED,
/* 0220 */ UNO_NAME_SMOOTH_SCROLLING,
-/* 0221 */ UNO_NAME_SOLID_MARK_HANDLES,
/* 0222 */ UNO_NAME_TABLES,
/* 0223 */ UNO_NAME_TEXT_FRAMES,
/* 0224 */ UNO_NAME_TEXT_COLUMNS,
diff --git a/binfilter/inc/bf_sw/viewopt.hxx b/binfilter/inc/bf_sw/viewopt.hxx
index 3cfdeef..b52c65f 100644
--- a/binfilter/inc/bf_sw/viewopt.hxx
+++ b/binfilter/inc/bf_sw/viewopt.hxx
@@ -74,7 +74,6 @@ class SwDocShell;
#define VIEWOPT_1_RESERVED1 0x10000000L
#define VIEWOPT_1_VIEWMETACHARS 0x20000000L
#define VIEWOPT_1_PAGEBACK 0x40000000L
-#define VIEWOPT_1_SOLIDMARKHDL 0x80000000L
#define VIEWOPT_CORE2_BLACKFONT 0x00000001L
#define VIEWOPT_CORE2_HIDDENPARA 0x00000002L
@@ -271,11 +270,6 @@ public:
inline void SetPageBack( BOOL b )
{ (b != 0) ? (nCoreOptions |= VIEWOPT_1_PAGEBACK) : ( nCoreOptions &= ~VIEWOPT_1_PAGEBACK); }
- inline BOOL IsSolidMarkHdl() const
- { return nCoreOptions & VIEWOPT_1_SOLIDMARKHDL ? TRUE : FALSE; }
- inline void SetSolidMarkHdl( BOOL b )
- { (b != 0) ? (nCoreOptions |= VIEWOPT_1_SOLIDMARKHDL) : ( nCoreOptions &= ~VIEWOPT_1_SOLIDMARKHDL); }
-
inline BOOL IsBigMarkHdl() const
{ return nCore2Options & VIEWOPT_CORE2_BIGMARKHDL ? TRUE : FALSE;}
inline void SetBigMarkHdl(BOOL b)
More information about the Libreoffice-commits
mailing list