include/vcl/dockwin.hxx | 14 +++++++------- include/vcl/syswin.hxx | 4 ++-- vcl/inc/brdwin.hxx | 2 +- vcl/source/window/brdwin.cxx | 8 ++++---- vcl/source/window/dockmgr.cxx | 6 +++--- vcl/source/window/dockwin.cxx | 6 +++--- vcl/source/window/syswin.cxx | 6 +++--- 7 files changed, 23 insertions(+), 23 deletions(-)
New commits: commit 50bd9482c72ab848c7336955a2b8f890b9cad5ab Author: Tor Lillqvist <t...@collabora.com> Date: Wed Mar 12 16:34:21 2014 +0200 Spelling fix: pined Change-Id: I7e9e0a3c03e6158894787f6eb072bebdbee0fcad diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 7330209..21d7fd4 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -110,7 +110,7 @@ private: mbLastFloatMode:1, mbStartFloat:1, mbTrackDock:1, - mbPined:1, + mbPinned:1, mbRollUp:1, mbDockBtn:1, mbHideBtn:1, @@ -255,7 +255,7 @@ private: mbLastFloatMode:1, mbStartFloat:1, mbTrackDock:1, - mbPined:1, + mbPinned:1, mbRollUp:1, mbDockBtn:1, mbHideBtn:1; @@ -301,7 +301,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); void SetPin( bool bPin ); - bool IsPined() const; + bool IsPinned() const; void RollUp(); void RollDown(); @@ -347,14 +347,14 @@ inline void DockingWindow::SetPin( bool bPin ) { if ( mpFloatWin ) mpFloatWin->SetPin( bPin ); - mbPined = bPin; + mbPinned = bPin; } -inline bool DockingWindow::IsPined() const +inline bool DockingWindow::IsPinned() const { if ( mpFloatWin ) - return mpFloatWin->IsPined(); - return mbPined; + return mpFloatWin->IsPinned(); + return mbPinned; } inline void DockingWindow::RollUp() diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index e63c5af..50bdd55 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -143,7 +143,7 @@ private: Size maOrgSize; Size maRollUpOutSize; Size maMinOutSize; - bool mbPined; + bool mbPinned; bool mbRollUp; bool mbRollFunc; bool mbDockBtn; @@ -197,7 +197,7 @@ public: bool IsTitleButtonVisible( sal_uInt16 nButton ) const; void SetPin( bool bPin ); - bool IsPined() const { return mbPined; } + bool IsPinned() const { return mbPinned; } void RollUp(); void RollDown(); diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 296b415..d0055c9 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -95,7 +95,7 @@ private: bool mbFloatWindow; bool mbSmallOutBorder; bool mbFrameBorder; - bool mbPined; + bool mbPinned; bool mbRollUp; bool mbMenuHide; bool mbDockBtn; diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index c88719e..aca9456 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -598,7 +598,7 @@ bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const Track if ( pBorderWindow->ImplGetClientWindow()->IsSystemWindow() ) { SystemWindow* pClientWindow = (SystemWindow*)(pBorderWindow->ImplGetClientWindow()); - pClientWindow->SetPin( !pClientWindow->IsPined() ); + pClientWindow->SetPin( !pClientWindow->IsPinned() ); pClientWindow->Pin(); } } @@ -1828,7 +1828,7 @@ void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* p !pData->maPinRect.IsEmpty() ) { Image aImage; - ImplGetPinImage( pData->mnPinState, pBorderWindow->mbPined, aImage ); + ImplGetPinImage( pData->mnPinState, pBorderWindow->mbPinned, aImage ); Size aImageSize = aImage.GetSizePixel(); long nRectHeight = pData->maPinRect.GetHeight(); Point aPos( pData->maPinRect.TopLeft() ); @@ -1917,7 +1917,7 @@ void ImplBorderWindow::ImplInit( Window* pParent, mnMaxHeight = SHRT_MAX; mnRollHeight = 0; mnOrgMenuHeight = 0; - mbPined = false; + mbPinned = false; mbRollUp = false; mbMenuHide = false; mbDockBtn = false; @@ -2259,7 +2259,7 @@ void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle ) void ImplBorderWindow::SetPin( bool bPin ) { - mbPined = bPin; + mbPinned = bPin; InvalidateBorder(); } diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 102547f..4e62e93 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -896,7 +896,7 @@ void ImplDockingWindowWrapper::ImplInitData() mbDockCanceled = false; mbFloatPrevented = false; mbDocking = false; - mbPined = false; + mbPinned = false; mbRollUp = false; mbDockBtn = false; mbHideBtn = false; @@ -1283,7 +1283,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode ) // pass on DockingData to FloatingWindow pWin->ShowTitleButton( TITLE_BUTTON_DOCKING, mbDockBtn ); pWin->ShowTitleButton( TITLE_BUTTON_HIDE, mbHideBtn ); - pWin->SetPin( mbPined ); + pWin->SetPin( mbPinned ); if ( mbRollUp ) pWin->RollUp(); else @@ -1307,7 +1307,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode ) maFloatPos = mpFloatWin->GetPosPixel(); mbDockBtn = mpFloatWin->IsTitleButtonVisible( TITLE_BUTTON_DOCKING ); mbHideBtn = mpFloatWin->IsTitleButtonVisible( TITLE_BUTTON_HIDE ); - mbPined = mpFloatWin->IsPined(); + mbPinned = mpFloatWin->IsPinned(); mbRollUp = mpFloatWin->IsRollUp(); maRollUpOutSize = mpFloatWin->GetRollUpOutputSizePixel(); maMinOutSize = mpFloatWin->GetMinOutputSizePixel(); diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 4d08935..c8d0cb7 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -312,7 +312,7 @@ void DockingWindow::ImplInitDockingWindowData() mbDockPrevented = false; mbFloatPrevented = false; mbDocking = false; - mbPined = false; + mbPinned = false; mbRollUp = false; mbDockBtn = false; mbHideBtn = false; @@ -764,7 +764,7 @@ void DockingWindow::SetFloatingMode( bool bFloatMode ) // pass on DockingData to FloatingWindow pWin->ShowTitleButton( TITLE_BUTTON_DOCKING, mbDockBtn ); pWin->ShowTitleButton( TITLE_BUTTON_HIDE, mbHideBtn ); - pWin->SetPin( mbPined ); + pWin->SetPin( mbPinned ); if ( mbRollUp ) pWin->RollUp(); else @@ -786,7 +786,7 @@ void DockingWindow::SetFloatingMode( bool bFloatMode ) maFloatPos = mpFloatWin->GetPosPixel(); mbDockBtn = mpFloatWin->IsTitleButtonVisible( TITLE_BUTTON_DOCKING ); mbHideBtn = mpFloatWin->IsTitleButtonVisible( TITLE_BUTTON_HIDE ); - mbPined = mpFloatWin->IsPined(); + mbPinned = mpFloatWin->IsPinned(); mbRollUp = mpFloatWin->IsRollUp(); maRollUpOutSize = mpFloatWin->GetRollUpOutputSizePixel(); maMinOutSize = mpFloatWin->GetMinOutputSizePixel(); diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 4d6063f..06635c8 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -75,7 +75,7 @@ SystemWindow::SystemWindow( WindowType nType ) : mpWindowImpl->mnActivateMode = ACTIVATE_MODE_GRABFOCUS; mpMenuBar = NULL; - mbPined = false; + mbPinned = false; mbRollUp = false; mbRollFunc = false; mbDockBtn = false; @@ -344,9 +344,9 @@ bool SystemWindow::IsTitleButtonVisible( sal_uInt16 nButton ) const void SystemWindow::SetPin( bool bPin ) { - if ( bPin != mbPined ) + if ( bPin != mbPinned ) { - mbPined = bPin; + mbPinned = bPin; if ( mpWindowImpl->mpBorderWindow ) ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->SetPin( bPin ); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits