include/vcl/toolbox.hxx | 38 ++++++++++++++-------------- sc/uiconfig/scalc/toolbar/textobjectbar.xml | 4 +- sw/uiconfig/sweb/toolbar/standardbar.xml | 2 - vcl/source/window/toolbox.cxx | 3 -- vcl/source/window/toolbox2.cxx | 3 -- 5 files changed, 24 insertions(+), 26 deletions(-)
New commits: commit d96261e3e5613c847826d678bd37e4af4983c12e Author: Samuel Mehrbrodt <[email protected]> Date: Wed Nov 18 12:57:29 2015 +0100 Remove redundant toolbar:text labels Change-Id: I9ca5739462742a4e3ec3a034918891e53022d6de diff --git a/sc/uiconfig/scalc/toolbar/textobjectbar.xml b/sc/uiconfig/scalc/toolbar/textobjectbar.xml index 220d3b0..ddc3384 100644 --- a/sc/uiconfig/scalc/toolbar/textobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/textobjectbar.xml @@ -35,8 +35,8 @@ <toolbar:toolbaritem xlink:href=".uno:Shadowed"/> <toolbar:toolbaritem xlink:href=".uno:OutlineFont"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ChangeCaseToLower" toolbar:text="lowercase" toolbar:visible="false"/> - <toolbar:toolbaritem xlink:href=".uno:ChangeCaseToUpper" toolbar:text="UPPERCASE" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:ChangeCaseToLower" toolbar:visible="false"/> + <toolbar:toolbaritem xlink:href=".uno:ChangeCaseToUpper" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Color"/> <toolbar:toolbarseparator/> diff --git a/sw/uiconfig/sweb/toolbar/standardbar.xml b/sw/uiconfig/sweb/toolbar/standardbar.xml index ada23cb..e1b8f0a 100644 --- a/sw/uiconfig/sweb/toolbar/standardbar.xml +++ b/sw/uiconfig/sweb/toolbar/standardbar.xml @@ -64,7 +64,7 @@ <toolbar:toolbaritem xlink:href=".uno:InsertObjectChart"/> <toolbar:toolbaritem xlink:href=".uno:InsertAnnotation"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:SetDocumentProperties" toolbar:text="Properties"/> + <toolbar:toolbaritem xlink:href=".uno:SetDocumentProperties"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ViewDataSourceBrowser" toolbar:visible="false" toolbar:helpid="6660"/> <toolbar:toolbaritem xlink:href=".uno:Zoom" toolbar:visible="false"/> commit 5328bb57e7046ac1790999cec8806a286772a6bb Author: Samuel Mehrbrodt <[email protected]> Date: Wed Nov 18 11:21:59 2015 +0100 Indentation fixes Change-Id: Ib508e6f3c89266660e6163bbef2c7f50f5d01806 diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 4883d07..81f6297 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -130,22 +130,22 @@ private: long mnBottomBorder; long mnLastResizeDY; long mnActivateCount; - sal_uInt16 mnLastFocusItemId; - sal_uInt16 mnFocusPos; - sal_uInt16 mnOutStyle; - sal_uInt16 mnHighItemId; - sal_uInt16 mnCurItemId; - sal_uInt16 mnDownItemId; - sal_uInt16 mnCurPos; - sal_uInt16 mnLines; // total number of toolbox lines - sal_uInt16 mnCurLine; // the currently visible line - sal_uInt16 mnCurLines; // number of lines due to line breaking - sal_uInt16 mnVisLines; // number of visible lines (for scrolling) - sal_uInt16 mnFloatLines; // number of lines during floating mode - sal_uInt16 mnDockLines; - sal_uInt16 mnConfigItem; - sal_uInt16 mnMouseClicks; - sal_uInt16 mnMouseModifier; + sal_uInt16 mnLastFocusItemId; + sal_uInt16 mnFocusPos; + sal_uInt16 mnOutStyle; + sal_uInt16 mnHighItemId; + sal_uInt16 mnCurItemId; + sal_uInt16 mnDownItemId; + sal_uInt16 mnCurPos; + sal_uInt16 mnLines; // total number of toolbox lines + sal_uInt16 mnCurLine; // the currently visible line + sal_uInt16 mnCurLines; // number of lines due to line breaking + sal_uInt16 mnVisLines; // number of visible lines (for scrolling) + sal_uInt16 mnFloatLines; // number of lines during floating mode + sal_uInt16 mnDockLines; + sal_uInt16 mnConfigItem; + sal_uInt16 mnMouseClicks; + sal_uInt16 mnMouseModifier; bool mbDrag:1, mbSelection:1, mbCommandDrag:1, @@ -193,7 +193,7 @@ private: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE ImplToolItem* ImplGetItem( sal_uInt16 nId ) const; SAL_DLLPRIVATE bool ImplCalcItem(); - SAL_DLLPRIVATE sal_uInt16 ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz ); + SAL_DLLPRIVATE sal_uInt16 ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz ); SAL_DLLPRIVATE void ImplFormat( bool bResize = false ); SAL_DLLPRIVATE void ImplDrawSpin(vcl::RenderContext& rRenderContext, bool bUpperIn, bool bLowerIn); SAL_DLLPRIVATE void ImplDrawSeparator(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, const Rectangle& rRect); @@ -201,12 +201,12 @@ private: using Window::ImplInvalidate; SAL_DLLPRIVATE void ImplInvalidate( bool bNewCalc = false, bool bFullPaint = false ); SAL_DLLPRIVATE void ImplUpdateItem( sal_uInt16 nIndex = 0xFFFF ); - SAL_DLLPRIVATE const OUString ImplConvertMenuString( const OUString& rStr ); + SAL_DLLPRIVATE const OUString ImplConvertMenuString( const OUString& rStr ); SAL_DLLPRIVATE bool ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat = false ); SAL_DLLPRIVATE bool ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel = false ); SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus = false ); SAL_DLLPRIVATE bool ImplChangeHighlightUpDn( bool bUp, bool bNoCycle = false ); - SAL_DLLPRIVATE sal_uInt16 ImplGetItemLine( ImplToolItem* pCurrentItem ); + SAL_DLLPRIVATE sal_uInt16 ImplGetItemLine( ImplToolItem* pCurrentItem ); SAL_DLLPRIVATE ImplToolItem* ImplGetFirstValidItem( sal_uInt16 nLine ); SAL_DLLPRIVATE bool ImplOpenItem( vcl::KeyCode aKeyCode ); SAL_DLLPRIVATE bool ImplActivateItem( vcl::KeyCode aKeyCode ); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 3f414c7..01a7305 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -970,8 +970,7 @@ sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos ) return 0; } -void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, - sal_uInt16 nLineMode ) +void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, sal_uInt16 nLineMode ) { bool mbHorz; long nOneLineSize; diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index d8eb328..8899577 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -793,8 +793,7 @@ ToolBoxButtonSize ToolBox::GetToolboxButtonSize() const return mpData->meButtonSize; } -/*static*/ Size -ToolBox::GetDefaultImageSize(bool bLarge) +/*static*/ Size ToolBox::GetDefaultImageSize(bool bLarge) { const long TB_SMALLIMAGESIZE = 16; if (!bLarge) { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
