Kaydet (Commit) 5328bb57 authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt

Indentation fixes

Change-Id: Ib508e6f3c89266660e6163bbef2c7f50f5d01806
üst 53f16c39
...@@ -130,22 +130,22 @@ private: ...@@ -130,22 +130,22 @@ private:
long mnBottomBorder; long mnBottomBorder;
long mnLastResizeDY; long mnLastResizeDY;
long mnActivateCount; long mnActivateCount;
sal_uInt16 mnLastFocusItemId; sal_uInt16 mnLastFocusItemId;
sal_uInt16 mnFocusPos; sal_uInt16 mnFocusPos;
sal_uInt16 mnOutStyle; sal_uInt16 mnOutStyle;
sal_uInt16 mnHighItemId; sal_uInt16 mnHighItemId;
sal_uInt16 mnCurItemId; sal_uInt16 mnCurItemId;
sal_uInt16 mnDownItemId; sal_uInt16 mnDownItemId;
sal_uInt16 mnCurPos; sal_uInt16 mnCurPos;
sal_uInt16 mnLines; // total number of toolbox lines sal_uInt16 mnLines; // total number of toolbox lines
sal_uInt16 mnCurLine; // the currently visible line sal_uInt16 mnCurLine; // the currently visible line
sal_uInt16 mnCurLines; // number of lines due to line breaking sal_uInt16 mnCurLines; // number of lines due to line breaking
sal_uInt16 mnVisLines; // number of visible lines (for scrolling) sal_uInt16 mnVisLines; // number of visible lines (for scrolling)
sal_uInt16 mnFloatLines; // number of lines during floating mode sal_uInt16 mnFloatLines; // number of lines during floating mode
sal_uInt16 mnDockLines; sal_uInt16 mnDockLines;
sal_uInt16 mnConfigItem; sal_uInt16 mnConfigItem;
sal_uInt16 mnMouseClicks; sal_uInt16 mnMouseClicks;
sal_uInt16 mnMouseModifier; sal_uInt16 mnMouseModifier;
bool mbDrag:1, bool mbDrag:1,
mbSelection:1, mbSelection:1,
mbCommandDrag:1, mbCommandDrag:1,
...@@ -193,7 +193,7 @@ private: ...@@ -193,7 +193,7 @@ private:
SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
SAL_DLLPRIVATE ImplToolItem* ImplGetItem( sal_uInt16 nId ) const; SAL_DLLPRIVATE ImplToolItem* ImplGetItem( sal_uInt16 nId ) const;
SAL_DLLPRIVATE bool ImplCalcItem(); 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 ImplFormat( bool bResize = false );
SAL_DLLPRIVATE void ImplDrawSpin(vcl::RenderContext& rRenderContext, bool bUpperIn, bool bLowerIn); SAL_DLLPRIVATE void ImplDrawSpin(vcl::RenderContext& rRenderContext, bool bUpperIn, bool bLowerIn);
SAL_DLLPRIVATE void ImplDrawSeparator(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, const Rectangle& rRect); SAL_DLLPRIVATE void ImplDrawSeparator(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, const Rectangle& rRect);
...@@ -201,12 +201,12 @@ private: ...@@ -201,12 +201,12 @@ private:
using Window::ImplInvalidate; using Window::ImplInvalidate;
SAL_DLLPRIVATE void ImplInvalidate( bool bNewCalc = false, bool bFullPaint = false ); SAL_DLLPRIVATE void ImplInvalidate( bool bNewCalc = false, bool bFullPaint = false );
SAL_DLLPRIVATE void ImplUpdateItem( sal_uInt16 nIndex = 0xFFFF ); 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 ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat = false );
SAL_DLLPRIVATE bool ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel = false ); SAL_DLLPRIVATE bool ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel = false );
SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus = false ); SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus = false );
SAL_DLLPRIVATE bool ImplChangeHighlightUpDn( bool bUp, bool bNoCycle = 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 ImplToolItem* ImplGetFirstValidItem( sal_uInt16 nLine );
SAL_DLLPRIVATE bool ImplOpenItem( vcl::KeyCode aKeyCode ); SAL_DLLPRIVATE bool ImplOpenItem( vcl::KeyCode aKeyCode );
SAL_DLLPRIVATE bool ImplActivateItem( vcl::KeyCode aKeyCode ); SAL_DLLPRIVATE bool ImplActivateItem( vcl::KeyCode aKeyCode );
......
...@@ -970,8 +970,7 @@ sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos ) ...@@ -970,8 +970,7 @@ sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos )
return 0; return 0;
} }
void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, sal_uInt16 nLineMode )
sal_uInt16 nLineMode )
{ {
bool mbHorz; bool mbHorz;
long nOneLineSize; long nOneLineSize;
......
...@@ -793,8 +793,7 @@ ToolBoxButtonSize ToolBox::GetToolboxButtonSize() const ...@@ -793,8 +793,7 @@ ToolBoxButtonSize ToolBox::GetToolboxButtonSize() const
return mpData->meButtonSize; return mpData->meButtonSize;
} }
/*static*/ Size /*static*/ Size ToolBox::GetDefaultImageSize(bool bLarge)
ToolBox::GetDefaultImageSize(bool bLarge)
{ {
const long TB_SMALLIMAGESIZE = 16; const long TB_SMALLIMAGESIZE = 16;
if (!bLarge) { if (!bLarge) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment