[Libreoffice-commits] core.git: include/sfx2 sfx2/source
Xisco Fauli
anistenis at gmail.com
Sun May 22 15:09:17 UTC 2016
include/sfx2/dockwin.hxx | 2
sfx2/source/dialog/dockwin.cxx | 414 ++++++++++++++++++++---------------------
2 files changed, 207 insertions(+), 209 deletions(-)
New commits:
commit 5ff0bef5caa0b310b8e177cef2cba4034661f8d0
Author: Xisco Fauli <anistenis at gmail.com>
Date: Sun May 22 15:24:32 2016 +0200
tdf#89329: use unique_ptr for pImpl in dockwin
Change-Id: Id5e2496d218d15ddc571ff49d4bf5b86fa4aae3d
Reviewed-on: https://gerrit.libreoffice.org/25307
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 2b83cce..0329481 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -45,7 +45,7 @@ private:
SfxBindings* pBindings;
Size aFloatSize;
SfxChildWindow* pMgr;
- SfxDockingWindow_Impl* pImp;
+ std::unique_ptr< SfxDockingWindow_Impl > pImpl;
SfxDockingWindow(SfxDockingWindow &) = delete;
void operator =(SfxDockingWindow &) = delete;
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 86870f2..9e3821e 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -438,17 +438,17 @@ void SfxDockingWindow::Resize()
{
DockingWindow::Resize();
Invalidate();
- if ( pImp && pImp->bConstructed && pMgr )
+ if ( pImpl && pImpl->bConstructed && pMgr )
{
if ( IsFloatingMode() )
{
// start timer for saving window status information
- pImp->aMoveIdle.Start();
+ pImpl->aMoveIdle.Start();
}
else
{
Size aSize( GetSizePixel() );
- switch ( pImp->GetDockAlignment() )
+ switch ( pImpl->GetDockAlignment() )
{
case SfxChildAlignment::LEFT:
case SfxChildAlignment::FIRSTLEFT:
@@ -456,8 +456,8 @@ void SfxDockingWindow::Resize()
case SfxChildAlignment::RIGHT:
case SfxChildAlignment::FIRSTRIGHT:
case SfxChildAlignment::LASTRIGHT:
- pImp->nHorizontalSize = aSize.Width();
- pImp->aSplitSize = aSize;
+ pImpl->nHorizontalSize = aSize.Width();
+ pImpl->aSplitSize = aSize;
break;
case SfxChildAlignment::TOP:
case SfxChildAlignment::LOWESTTOP:
@@ -465,8 +465,8 @@ void SfxDockingWindow::Resize()
case SfxChildAlignment::BOTTOM:
case SfxChildAlignment::HIGHESTBOTTOM:
case SfxChildAlignment::LOWESTBOTTOM:
- pImp->nVerticalSize = aSize.Height();
- pImp->aSplitSize = aSize;
+ pImpl->nVerticalSize = aSize.Height();
+ pImpl->aSplitSize = aSize;
break;
default:
break;
@@ -485,13 +485,13 @@ void SfxDockingWindow::Resize()
*/
bool SfxDockingWindow::PrepareToggleFloatingMode()
{
- if (!pImp || !pImp->bConstructed)
+ if (!pImpl || !pImpl->bConstructed)
return true;
if ( (Application::IsInModalMode() && IsFloatingMode()) || !pMgr )
return false;
- if ( pImp->bDockingPrevented )
+ if ( pImpl->bDockingPrevented )
return false;
if (!IsFloatingMode())
@@ -500,19 +500,19 @@ bool SfxDockingWindow::PrepareToggleFloatingMode()
if ( CheckAlignment(GetAlignment(),SfxChildAlignment::NOALIGNMENT) != SfxChildAlignment::NOALIGNMENT )
return false;
- if ( pImp->pSplitWin )
+ if ( pImpl->pSplitWin )
{
// The DockingWindow is inside a SplitWindow and will be teared of.
- pImp->pSplitWin->RemoveWindow(this/*, sal_False*/);
- pImp->pSplitWin = nullptr;
+ pImpl->pSplitWin->RemoveWindow(this/*, sal_False*/);
+ pImpl->pSplitWin = nullptr;
}
}
else if ( pMgr )
{
- pImp->aWinState = GetFloatingWindow()->GetWindowState();
+ pImpl->aWinState = GetFloatingWindow()->GetWindowState();
// Test if it is allowed to dock,
- if (CheckAlignment(GetAlignment(),pImp->GetLastAlignment()) == SfxChildAlignment::NOALIGNMENT)
+ if (CheckAlignment(GetAlignment(),pImpl->GetLastAlignment()) == SfxChildAlignment::NOALIGNMENT)
return false;
// Test, if the Workwindow allows for docking at the moment.
@@ -529,13 +529,13 @@ bool SfxDockingWindow::PrepareToggleFloatingMode()
This virtual method of the DockingWindow class sets the internal data of
the SfxDockingWindow and ensures the correct alignment on the parent window.
Through PrepareToggleFloatMode and Initialize it is ensured that
- pImp-> GetLastAlignment() always delivers an allowed alignment. If this
+ pImpl-> GetLastAlignment() always delivers an allowed alignment. If this
method is overridden by a derived class, then first the
SfxDockingWindow::ToggleFloatingMode() must be called.
*/
void SfxDockingWindow::ToggleFloatingMode()
{
- if ( !pImp || !pImp->bConstructed || !pMgr )
+ if ( !pImpl || !pImpl->bConstructed || !pMgr )
return; // No Handler call
// Remember old alignment and then switch.
@@ -545,63 +545,63 @@ void SfxDockingWindow::ToggleFloatingMode()
SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
SfxChildIdentifier eIdent = SfxChildIdentifier::DOCKINGWINDOW;
- if ( pImp->bSplitable )
+ if ( pImpl->bSplitable )
eIdent = SfxChildIdentifier::SPLITWINDOW;
if (IsFloatingMode())
{
SetAlignment(SfxChildAlignment::NOALIGNMENT);
- if ( !pImp->aWinState.isEmpty() )
- GetFloatingWindow()->SetWindowState( pImp->aWinState );
+ if ( !pImpl->aWinState.isEmpty() )
+ GetFloatingWindow()->SetWindowState( pImpl->aWinState );
else
GetFloatingWindow()->SetOutputSizePixel( GetFloatingSize() );
}
else
{
- if (pImp->GetDockAlignment() == eLastAlign)
+ if (pImpl->GetDockAlignment() == eLastAlign)
{
// If ToggleFloatingMode was called, but the DockAlignment still
// is unchanged, then this means that it must have been a toggling
// through DClick, so use last alignment
- SetAlignment (pImp->GetLastAlignment());
- if ( !pImp->bSplitable )
+ SetAlignment (pImpl->GetLastAlignment());
+ if ( !pImpl->bSplitable )
SetSizePixel( CalcDockingSize(GetAlignment()) );
}
else
{
// Toggling was triggered by dragging
- pImp->nLine = pImp->nDockLine;
- pImp->nPos = pImp->nDockPos;
- SetAlignment (pImp->GetDockAlignment());
+ pImpl->nLine = pImpl->nDockLine;
+ pImpl->nPos = pImpl->nDockPos;
+ SetAlignment (pImpl->GetDockAlignment());
}
- if ( pImp->bSplitable )
+ if ( pImpl->bSplitable )
{
// The DockingWindow is now in a SplitWindow
- pImp->pSplitWin = pWorkWin->GetSplitWindow_Impl(GetAlignment());
+ pImpl->pSplitWin = pWorkWin->GetSplitWindow_Impl(GetAlignment());
// The LastAlignment is still the last docked
- SfxSplitWindow *pSplit = pWorkWin->GetSplitWindow_Impl(pImp->GetLastAlignment());
+ SfxSplitWindow *pSplit = pWorkWin->GetSplitWindow_Impl(pImpl->GetLastAlignment());
DBG_ASSERT( pSplit, "LastAlignment is not correct!" );
- if ( pSplit && pSplit != pImp->pSplitWin )
+ if ( pSplit && pSplit != pImpl->pSplitWin )
pSplit->ReleaseWindow_Impl(this);
- if ( pImp->GetDockAlignment() == eLastAlign )
- pImp->pSplitWin->InsertWindow( this, pImp->aSplitSize );
+ if ( pImpl->GetDockAlignment() == eLastAlign )
+ pImpl->pSplitWin->InsertWindow( this, pImpl->aSplitSize );
else
- pImp->pSplitWin->InsertWindow( this, pImp->aSplitSize, pImp->nLine, pImp->nPos, pImp->bNewLine );
- if ( !pImp->pSplitWin->IsFadeIn() )
- pImp->pSplitWin->FadeIn();
+ pImpl->pSplitWin->InsertWindow( this, pImpl->aSplitSize, pImpl->nLine, pImpl->nPos, pImpl->bNewLine );
+ if ( !pImpl->pSplitWin->IsFadeIn() )
+ pImpl->pSplitWin->FadeIn();
}
}
// Keep the old alignment for the next toggle; set it only now due to the
// unregister SplitWindow!
- pImp->SetLastAlignment(eLastAlign);
+ pImpl->SetLastAlignment(eLastAlign);
// Reset DockAlignment, if EndDocking is still called
- pImp->SetDockAlignment(GetAlignment());
+ pImpl->SetDockAlignment(GetAlignment());
// Dock or undock SfxChildWindow correctly.
pWorkWin->ConfigChild_Impl( eIdent, SfxDockingConfig::TOGGLEFLOATMODE, pMgr->GetType() );
@@ -616,22 +616,22 @@ void SfxDockingWindow::ToggleFloatingMode()
*/
void SfxDockingWindow::StartDocking()
{
- if ( !pImp || !pImp->bConstructed || !pMgr )
+ if ( !pImpl || !pImpl->bConstructed || !pMgr )
return;
SfxChildIdentifier eIdent = SfxChildIdentifier::DOCKINGWINDOW;
- if ( pImp->bSplitable )
+ if ( pImpl->bSplitable )
eIdent = SfxChildIdentifier::SPLITWINDOW;
SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
pWorkWin->ConfigChild_Impl( eIdent, SfxDockingConfig::SETDOCKINGRECTS, pMgr->GetType() );
- pImp->SetDockAlignment(GetAlignment());
+ pImpl->SetDockAlignment(GetAlignment());
- if ( pImp->pSplitWin )
+ if ( pImpl->pSplitWin )
{
// Get the current docking data
- pImp->pSplitWin->GetWindowPos(this, pImp->nLine, pImp->nPos);
- pImp->nDockLine = pImp->nLine;
- pImp->nDockPos = pImp->nPos;
- pImp->bNewLine = false;
+ pImpl->pSplitWin->GetWindowPos(this, pImpl->nLine, pImpl->nPos);
+ pImpl->nDockLine = pImpl->nLine;
+ pImpl->nDockPos = pImpl->nPos;
+ pImpl->bNewLine = false;
}
}
@@ -647,14 +647,14 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
if ( Application::IsInModalMode() )
return true;
- if ( !pImp || !pImp->bConstructed || !pMgr )
+ if ( !pImpl || !pImpl->bConstructed || !pMgr )
{
rRect.SetSize( Size() );
return IsFloatingMode();
}
SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
- if ( pImp->bDockingPrevented || !pWorkWin->IsInternalDockingAllowed() )
+ if ( pImpl->bDockingPrevented || !pWorkWin->IsInternalDockingAllowed() )
return false;
bool bFloatMode = false;
@@ -665,38 +665,38 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
SfxChildAlignment eAlign = CalcAlignment(rPos, rRect);
if (eAlign == SfxChildAlignment::NOALIGNMENT)
bFloatMode = true;
- pImp->SetDockAlignment(eAlign);
+ pImpl->SetDockAlignment(eAlign);
}
else
{
// Mouse is not within OuterRect: must be FloatingWindow
// Is this allowed?
- if (CheckAlignment(pImp->GetDockAlignment(),SfxChildAlignment::NOALIGNMENT) != SfxChildAlignment::NOALIGNMENT)
+ if (CheckAlignment(pImpl->GetDockAlignment(),SfxChildAlignment::NOALIGNMENT) != SfxChildAlignment::NOALIGNMENT)
return false;
bFloatMode = true;
- if ( SfxChildAlignment::NOALIGNMENT != pImp->GetDockAlignment() )
+ if ( SfxChildAlignment::NOALIGNMENT != pImpl->GetDockAlignment() )
{
// Due to a bug the rRect may only be changed when the
// alignment is changed!
- pImp->SetDockAlignment(SfxChildAlignment::NOALIGNMENT);
+ pImpl->SetDockAlignment(SfxChildAlignment::NOALIGNMENT);
rRect.SetSize(CalcDockingSize(SfxChildAlignment::NOALIGNMENT));
}
}
- if ( !pImp->bSplitable )
+ if ( !pImpl->bSplitable )
{
// For individually docked window the position is set through the
// alignment and the docking rectangle.
Size aSize = rRect.GetSize();
Point aPos;
- switch ( pImp->GetDockAlignment() )
+ switch ( pImpl->GetDockAlignment() )
{
case SfxChildAlignment::LEFT:
case SfxChildAlignment::FIRSTLEFT:
case SfxChildAlignment::LASTLEFT:
aPos = aInnerRect.TopLeft();
- if ( pImp->GetDockAlignment() == GetAlignment() )
+ if ( pImpl->GetDockAlignment() == GetAlignment() )
aPos.X() -= aSize.Width();
break;
@@ -704,7 +704,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
case SfxChildAlignment::LOWESTTOP:
case SfxChildAlignment::HIGHESTTOP:
aPos = Point(aOuterRect.Left(), aInnerRect.Top());
- if ( pImp->GetDockAlignment() == GetAlignment() )
+ if ( pImpl->GetDockAlignment() == GetAlignment() )
aPos.Y() -= aSize.Height();
break;
@@ -713,7 +713,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
case SfxChildAlignment::LASTRIGHT:
aPos = Point(aInnerRect.Right() - rRect.GetSize().Width(),
aInnerRect.Top());
- if ( pImp->GetDockAlignment() == GetAlignment() )
+ if ( pImpl->GetDockAlignment() == GetAlignment() )
aPos.X() += aSize.Width();
break;
@@ -722,7 +722,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
case SfxChildAlignment::LOWESTBOTTOM:
aPos = Point(aOuterRect.Left(),
aInnerRect.Bottom() - rRect.GetSize().Height());
- if ( pImp->GetDockAlignment() == GetAlignment() )
+ if ( pImpl->GetDockAlignment() == GetAlignment() )
aPos.Y() += aSize.Height();
break;
default:
@@ -741,12 +741,12 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
*/
void SfxDockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode )
{
- if ( !pImp || !pImp->bConstructed || IsDockingCanceled() || !pMgr )
+ if ( !pImpl || !pImpl->bConstructed || IsDockingCanceled() || !pMgr )
return;
SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
bool bReArrange = false;
- if ( pImp->bSplitable )
+ if ( pImpl->bSplitable )
{
// If the alignment changes and the window is in a docked state in a
// SplitWindow, then it must be re-registered. If it is docked again,
@@ -758,49 +758,49 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode )
if ( bReArrange )
{
- if ( GetAlignment() != pImp->GetDockAlignment() )
+ if ( GetAlignment() != pImpl->GetDockAlignment() )
{
// before Show() is called must the reassignment have been made,
// therefore the base class can not be called
- if ( IsFloatingMode() || !pImp->bSplitable )
+ if ( IsFloatingMode() || !pImpl->bSplitable )
Show( false, ShowFlags::NoFocusChange );
// Set the size for toggling.
- pImp->aSplitSize = rRect.GetSize();
+ pImpl->aSplitSize = rRect.GetSize();
if ( IsFloatingMode() )
{
SetFloatingMode( bFloatMode );
- if ( IsFloatingMode() || !pImp->bSplitable )
+ if ( IsFloatingMode() || !pImpl->bSplitable )
Show( true, ShowFlags::NoFocusChange );
}
else
{
- pImp->pSplitWin->RemoveWindow(this,false);
- pImp->nLine = pImp->nDockLine;
- pImp->nPos = pImp->nDockPos;
- pImp->pSplitWin->ReleaseWindow_Impl(this);
- pImp->pSplitWin = pWorkWin->GetSplitWindow_Impl(pImp->GetDockAlignment());
- pImp->pSplitWin->InsertWindow( this, pImp->aSplitSize, pImp->nDockLine, pImp->nDockPos, pImp->bNewLine );
- if ( !pImp->pSplitWin->IsFadeIn() )
- pImp->pSplitWin->FadeIn();
+ pImpl->pSplitWin->RemoveWindow(this,false);
+ pImpl->nLine = pImpl->nDockLine;
+ pImpl->nPos = pImpl->nDockPos;
+ pImpl->pSplitWin->ReleaseWindow_Impl(this);
+ pImpl->pSplitWin = pWorkWin->GetSplitWindow_Impl(pImpl->GetDockAlignment());
+ pImpl->pSplitWin->InsertWindow( this, pImpl->aSplitSize, pImpl->nDockLine, pImpl->nDockPos, pImpl->bNewLine );
+ if ( !pImpl->pSplitWin->IsFadeIn() )
+ pImpl->pSplitWin->FadeIn();
}
}
- else if ( pImp->nLine != pImp->nDockLine || pImp->nPos != pImp->nDockPos || pImp->bNewLine )
+ else if ( pImpl->nLine != pImpl->nDockLine || pImpl->nPos != pImpl->nDockPos || pImpl->bNewLine )
{
// Moved within Splitwindows
- if ( pImp->nLine != pImp->nDockLine )
- pImp->aSplitSize = rRect.GetSize();
- pImp->pSplitWin->MoveWindow( this, pImp->aSplitSize, pImp->nDockLine, pImp->nDockPos, pImp->bNewLine );
+ if ( pImpl->nLine != pImpl->nDockLine )
+ pImpl->aSplitSize = rRect.GetSize();
+ pImpl->pSplitWin->MoveWindow( this, pImpl->aSplitSize, pImpl->nDockLine, pImpl->nDockPos, pImpl->bNewLine );
}
}
else
{
- pImp->bEndDocked = true;
+ pImpl->bEndDocked = true;
DockingWindow::EndDocking(rRect, bFloatMode);
- pImp->bEndDocked = false;
+ pImpl->bEndDocked = false;
}
- SetAlignment( IsFloatingMode() ? SfxChildAlignment::NOALIGNMENT : pImp->GetDockAlignment() );
+ SetAlignment( IsFloatingMode() ? SfxChildAlignment::NOALIGNMENT : pImpl->GetDockAlignment() );
}
/* [Description]
@@ -824,8 +824,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
vcl::Window* pParent, WinBits nWinBits) :
DockingWindow (pParent, nWinBits),
pBindings(pBindinx),
- pMgr(pCW),
- pImp(nullptr)
+ pMgr(pCW)
{
if ( !GetHelpId().isEmpty() )
{
@@ -845,22 +844,22 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
}
}
- pImp = new SfxDockingWindow_Impl;
- pImp->bConstructed = false;
- pImp->pSplitWin = nullptr;
- pImp->bEndDocked = false;
- pImp->bDockingPrevented = false;
+ pImpl.reset( new SfxDockingWindow_Impl );
+ pImpl->bConstructed = false;
+ pImpl->pSplitWin = nullptr;
+ pImpl->bEndDocked = false;
+ pImpl->bDockingPrevented = false;
- pImp->bSplitable = true;
+ pImpl->bSplitable = true;
// Initially set to default, the alignment is set in the subclass
- pImp->nLine = pImp->nDockLine = 0;
- pImp->nPos = pImp->nDockPos = 0;
- pImp->bNewLine = false;
- pImp->SetDockAlignment(SfxChildAlignment::NOALIGNMENT);
- pImp->SetLastAlignment(SfxChildAlignment::NOALIGNMENT);
- pImp->aMoveIdle.SetPriority(SchedulerPriority::RESIZE);
- pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxDockingWindow,TimerHdl));
+ pImpl->nLine = pImpl->nDockLine = 0;
+ pImpl->nPos = pImpl->nDockPos = 0;
+ pImpl->bNewLine = false;
+ pImpl->SetDockAlignment(SfxChildAlignment::NOALIGNMENT);
+ pImpl->SetLastAlignment(SfxChildAlignment::NOALIGNMENT);
+ pImpl->aMoveIdle.SetPriority(SchedulerPriority::RESIZE);
+ pImpl->aMoveIdle.SetIdleHdl(LINK(this,SfxDockingWindow,TimerHdl));
}
/** Constructor for the SfxDockingWindow class. A SfxChildWindow will be
@@ -871,7 +870,6 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
: DockingWindow(pParent, rID, rUIXMLDescription)
, pBindings(pBindinx)
, pMgr(pCW)
- , pImp(nullptr)
{
if ( !GetHelpId().isEmpty() )
{
@@ -891,22 +889,22 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
}
}
- pImp = new SfxDockingWindow_Impl;
- pImp->bConstructed = false;
- pImp->pSplitWin = nullptr;
- pImp->bEndDocked = false;
- pImp->bDockingPrevented = false;
+ pImpl.reset( new SfxDockingWindow_Impl );
+ pImpl->bConstructed = false;
+ pImpl->pSplitWin = nullptr;
+ pImpl->bEndDocked = false;
+ pImpl->bDockingPrevented = false;
- pImp->bSplitable = true;
+ pImpl->bSplitable = true;
// Initially set to default, the alignment is set in the subclass
- pImp->nLine = pImp->nDockLine = 0;
- pImp->nPos = pImp->nDockPos = 0;
- pImp->bNewLine = false;
- pImp->SetDockAlignment(SfxChildAlignment::NOALIGNMENT);
- pImp->SetLastAlignment(SfxChildAlignment::NOALIGNMENT);
- pImp->aMoveIdle.SetPriority(SchedulerPriority::RESIZE);
- pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxDockingWindow,TimerHdl));
+ pImpl->nLine = pImpl->nDockLine = 0;
+ pImpl->nPos = pImpl->nDockPos = 0;
+ pImpl->bNewLine = false;
+ pImpl->SetDockAlignment(SfxChildAlignment::NOALIGNMENT);
+ pImpl->SetLastAlignment(SfxChildAlignment::NOALIGNMENT);
+ pImpl->aMoveIdle.SetPriority(SchedulerPriority::RESIZE);
+ pImpl->aMoveIdle.SetIdleHdl(LINK(this,SfxDockingWindow,TimerHdl));
}
/** Initialization of the SfxDockingDialog class via a SfxChildWinInfo.
@@ -918,23 +916,23 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
{
if ( !pMgr )
{
- pImp->SetDockAlignment( SfxChildAlignment::NOALIGNMENT );
- pImp->bConstructed = true;
+ pImpl->SetDockAlignment( SfxChildAlignment::NOALIGNMENT );
+ pImpl->bConstructed = true;
return;
}
if (pInfo && (pInfo->nFlags & SfxChildWindowFlags::FORCEDOCK))
- pImp->bDockingPrevented = true;
+ pImpl->bDockingPrevented = true;
- pImp->aSplitSize = GetOutputSizePixel();
+ pImpl->aSplitSize = GetOutputSizePixel();
if ( !GetFloatingSize().Width() )
{
Size aMinSize( GetMinOutputSizePixel() );
- SetFloatingSize( pImp->aSplitSize );
- if ( pImp->aSplitSize.Width() < aMinSize.Width() )
- pImp->aSplitSize.Width() = aMinSize.Width();
- if ( pImp->aSplitSize.Height() < aMinSize.Height() )
- pImp->aSplitSize.Height() = aMinSize.Height();
+ SetFloatingSize( pImpl->aSplitSize );
+ if ( pImpl->aSplitSize.Width() < aMinSize.Width() )
+ pImpl->aSplitSize.Width() = aMinSize.Width();
+ if ( pImpl->aSplitSize.Height() < aMinSize.Height() )
+ pImpl->aSplitSize.Height() = aMinSize.Height();
}
bool bVertHorzRead( false );
@@ -963,11 +961,11 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
if ( !aStr.isEmpty() )
{
// accept window state only if alignment is also set
- pImp->aWinState = pInfo->aWinState;
+ pImpl->aWinState = pInfo->aWinState;
// check for valid alignment
SfxChildAlignment eLocalAlignment = (SfxChildAlignment) (sal_uInt16) aStr.toInt32();
- if ( pImp->bDockingPrevented )
+ if ( pImpl->bDockingPrevented )
// docking prevented, ignore old configuration and take alignment from default
aStr.clear();
else
@@ -986,7 +984,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
if ( nPos != -1 )
{
aStr = aStr.copy(nPos+1);
- pImp->SetLastAlignment( (SfxChildAlignment) (sal_uInt16) aStr.toInt32() );
+ pImpl->SetLastAlignment( (SfxChildAlignment) (sal_uInt16) aStr.toInt32() );
}
nPos = aStr.indexOf(',');
@@ -995,13 +993,13 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
// get split size and position in SplitWindow
Point aPos;
aStr = aStr.copy(nPos+1);
- if ( GetPosSizeFromString( aStr, aPos, pImp->aSplitSize ) )
+ if ( GetPosSizeFromString( aStr, aPos, pImpl->aSplitSize ) )
{
- pImp->nLine = pImp->nDockLine = (sal_uInt16) aPos.X();
- pImp->nPos = pImp->nDockPos = (sal_uInt16) aPos.Y();
- pImp->nVerticalSize = pImp->aSplitSize.Height();
- pImp->nHorizontalSize = pImp->aSplitSize.Width();
- if ( GetSplitSizeFromString( aStr, pImp->aSplitSize ))
+ pImpl->nLine = pImpl->nDockLine = (sal_uInt16) aPos.X();
+ pImpl->nPos = pImpl->nDockPos = (sal_uInt16) aPos.Y();
+ pImpl->nVerticalSize = pImpl->aSplitSize.Height();
+ pImpl->nHorizontalSize = pImpl->aSplitSize.Width();
+ if ( GetSplitSizeFromString( aStr, pImpl->aSplitSize ))
bVertHorzRead = true;
}
}
@@ -1013,8 +1011,8 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
if ( !bVertHorzRead )
{
- pImp->nVerticalSize = pImp->aSplitSize.Height();
- pImp->nHorizontalSize = pImp->aSplitSize.Width();
+ pImpl->nVerticalSize = pImpl->aSplitSize.Height();
+ pImpl->nHorizontalSize = pImpl->aSplitSize.Width();
}
SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
@@ -1031,7 +1029,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
}
// detect floating mode
- // toggeling mode will not execute code in handlers, because pImp->bConstructed is not set yet
+ // toggeling mode will not execute code in handlers, because pImpl->bConstructed is not set yet
bool bFloatMode = IsFloatingMode();
if ( bFloatMode != ((GetAlignment() == SfxChildAlignment::NOALIGNMENT)) )
{
@@ -1039,8 +1037,8 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
SetFloatingMode( bFloatMode );
if ( bFloatMode )
{
- if ( !pImp->aWinState.isEmpty() )
- GetFloatingWindow()->SetWindowState( pImp->aWinState );
+ if ( !pImpl->aWinState.isEmpty() )
+ GetFloatingWindow()->SetWindowState( pImpl->aWinState );
else
GetFloatingWindow()->SetOutputSizePixel( GetFloatingSize() );
}
@@ -1049,7 +1047,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
if ( IsFloatingMode() )
{
// validate last alignment
- SfxChildAlignment eLastAlign = pImp->GetLastAlignment();
+ SfxChildAlignment eLastAlign = pImpl->GetLastAlignment();
if ( eLastAlign == SfxChildAlignment::NOALIGNMENT)
eLastAlign = CheckAlignment(eLastAlign, SfxChildAlignment::LEFT);
if ( eLastAlign == SfxChildAlignment::NOALIGNMENT)
@@ -1058,17 +1056,17 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
eLastAlign = CheckAlignment(eLastAlign, SfxChildAlignment::TOP);
if ( eLastAlign == SfxChildAlignment::NOALIGNMENT)
eLastAlign = CheckAlignment(eLastAlign, SfxChildAlignment::BOTTOM);
- pImp->SetLastAlignment(eLastAlign);
+ pImpl->SetLastAlignment(eLastAlign);
}
else
{
// docked window must have NOALIGNMENT as last alignment
- pImp->SetLastAlignment(SfxChildAlignment::NOALIGNMENT);
+ pImpl->SetLastAlignment(SfxChildAlignment::NOALIGNMENT);
- if ( pImp->bSplitable )
+ if ( pImpl->bSplitable )
{
- pImp->pSplitWin = pWorkWin->GetSplitWindow_Impl(GetAlignment());
- pImp->pSplitWin->InsertWindow(this, pImp->aSplitSize);
+ pImpl->pSplitWin = pWorkWin->GetSplitWindow_Impl(GetAlignment());
+ pImpl->pSplitWin->InsertWindow(this, pImpl->aSplitSize);
}
else
{
@@ -1082,14 +1080,14 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
}
// save alignment
- pImp->SetDockAlignment( GetAlignment() );
+ pImpl->SetDockAlignment( GetAlignment() );
}
void SfxDockingWindow::Initialize_Impl()
{
if ( !pMgr )
{
- pImp->bConstructed = true;
+ pImpl->bConstructed = true;
return;
}
@@ -1118,12 +1116,12 @@ void SfxDockingWindow::Initialize_Impl()
if ( pFloatWin )
{
// initialize floating window
- if ( pImp->aWinState.isEmpty() )
+ if ( pImpl->aWinState.isEmpty() )
// window state never set before, get if from defaults
- pImp->aWinState = pFloatWin->GetWindowState();
+ pImpl->aWinState = pFloatWin->GetWindowState();
// trick: use VCL method SetWindowState to adjust position and size
- pFloatWin->SetWindowState( pImp->aWinState );
+ pFloatWin->SetWindowState( pImpl->aWinState );
Size aSize(pFloatWin->GetSizePixel());
// remember floating size for calculating alignment and tracking rectangle
@@ -1132,7 +1130,7 @@ void SfxDockingWindow::Initialize_Impl()
}
// allow calling of docking handlers
- pImp->bConstructed = true;
+ pImpl->bConstructed = true;
}
/** Fills a SfxChildWinInfo with specific data from SfxDockingWindow,
@@ -1143,32 +1141,32 @@ void SfxDockingWindow::Initialize_Impl()
*/
void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const
{
- if (!pMgr || !pImp)
+ if (!pMgr || !pImpl)
return;
- if (GetFloatingWindow() && pImp->bConstructed)
- pImp->aWinState = GetFloatingWindow()->GetWindowState();
+ if (GetFloatingWindow() && pImpl->bConstructed)
+ pImpl->aWinState = GetFloatingWindow()->GetWindowState();
- rInfo.aWinState = pImp->aWinState;
+ rInfo.aWinState = pImpl->aWinState;
rInfo.aExtraString = "AL:(";
rInfo.aExtraString += OUString::number((sal_uInt16) GetAlignment());
rInfo.aExtraString += ",";
- rInfo.aExtraString += OUString::number ((sal_uInt16) pImp->GetLastAlignment());
- if ( pImp->bSplitable )
+ rInfo.aExtraString += OUString::number ((sal_uInt16) pImpl->GetLastAlignment());
+ if ( pImpl->bSplitable )
{
- Point aPos(pImp->nLine, pImp->nPos);
+ Point aPos(pImpl->nLine, pImpl->nPos);
rInfo.aExtraString += ",";
rInfo.aExtraString += OUString::number( aPos.X() );
rInfo.aExtraString += "/";
rInfo.aExtraString += OUString::number( aPos.Y() );
rInfo.aExtraString += "/";
- rInfo.aExtraString += OUString::number( pImp->nHorizontalSize );
+ rInfo.aExtraString += OUString::number( pImpl->nHorizontalSize );
rInfo.aExtraString += "/";
- rInfo.aExtraString += OUString::number( pImp->nVerticalSize );
+ rInfo.aExtraString += OUString::number( pImpl->nVerticalSize );
rInfo.aExtraString += ",";
- rInfo.aExtraString += OUString::number( pImp->aSplitSize.Width() );
+ rInfo.aExtraString += OUString::number( pImpl->aSplitSize.Width() );
rInfo.aExtraString += ";";
- rInfo.aExtraString += OUString::number( pImp->aSplitSize.Height() );
+ rInfo.aExtraString += OUString::number( pImpl->aSplitSize.Height() );
}
rInfo.aExtraString += ")";
@@ -1182,7 +1180,7 @@ SfxDockingWindow::~SfxDockingWindow()
void SfxDockingWindow::dispose()
{
ReleaseChildWindow_Impl();
- delete pImp; pImp = nullptr;
+ pImpl.reset();
DockingWindow::dispose();
}
@@ -1191,8 +1189,8 @@ void SfxDockingWindow::ReleaseChildWindow_Impl()
if ( pMgr && pMgr->GetFrame() == pBindings->GetActiveFrame() )
pBindings->SetActiveFrame( nullptr );
- if ( pMgr && pImp->pSplitWin && pImp->pSplitWin->IsItemValid( GetType() ) )
- pImp->pSplitWin->RemoveWindow(this);
+ if ( pMgr && pImpl->pSplitWin && pImpl->pSplitWin->IsItemValid( GetType() ) )
+ pImpl->pSplitWin->RemoveWindow(this);
pMgr=nullptr;
}
@@ -1220,15 +1218,15 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
if ( !pWorkWin->IsDockingAllowed() )
{
rRect.SetSize( aFloatingSize );
- return pImp->GetDockAlignment();
+ return pImpl->GetDockAlignment();
}
// calculate borders to shrink inner area before checking for intersection with tracking rectangle
long nLRBorder, nTBBorder;
- if ( pImp->bSplitable )
+ if ( pImpl->bSplitable )
{
// take the smaller size of docked and floating mode
- Size aSize = pImp->aSplitSize;
+ Size aSize = pImpl->aSplitSize;
if ( GetFloatingSize().Height() < aSize.Height() )
aSize.Height() = GetFloatingSize().Height();
if ( GetFloatingSize().Width() < aSize.Width() )
@@ -1262,7 +1260,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
// calculate alignment resulting from docking rectangle
bool bBecomesFloating = false;
- SfxChildAlignment eDockAlign = pImp->GetDockAlignment();
+ SfxChildAlignment eDockAlign = pImpl->GetDockAlignment();
Rectangle aDockingRect( rRect );
if ( !IsFloatingMode() )
{
@@ -1299,7 +1297,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
if ( bBecomesFloating )
{
- eDockAlign = CheckAlignment(pImp->GetDockAlignment(),SfxChildAlignment::NOALIGNMENT);
+ eDockAlign = CheckAlignment(pImpl->GetDockAlignment(),SfxChildAlignment::NOALIGNMENT);
}
else
{
@@ -1358,7 +1356,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
bool bForbidden = true;
if ( aInPosTL.X() <= 0)
{
- eDockAlign = CheckAlignment(pImp->GetDockAlignment(),SfxChildAlignment::LEFT);
+ eDockAlign = CheckAlignment(pImpl->GetDockAlignment(),SfxChildAlignment::LEFT);
bForbidden = ( eDockAlign != SfxChildAlignment::LEFT &&
eDockAlign != SfxChildAlignment::FIRSTLEFT &&
eDockAlign != SfxChildAlignment::LASTLEFT );
@@ -1366,7 +1364,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
if ( bForbidden && aInPosTL.Y() <= 0)
{
- eDockAlign = CheckAlignment(pImp->GetDockAlignment(),SfxChildAlignment::TOP);
+ eDockAlign = CheckAlignment(pImpl->GetDockAlignment(),SfxChildAlignment::TOP);
bForbidden = ( eDockAlign != SfxChildAlignment::TOP &&
eDockAlign != SfxChildAlignment::HIGHESTTOP &&
eDockAlign != SfxChildAlignment::LOWESTTOP );
@@ -1374,7 +1372,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
if ( bForbidden && aInPosBR.X() >= aInSize.Width())
{
- eDockAlign = CheckAlignment(pImp->GetDockAlignment(),SfxChildAlignment::RIGHT);
+ eDockAlign = CheckAlignment(pImpl->GetDockAlignment(),SfxChildAlignment::RIGHT);
bForbidden = ( eDockAlign != SfxChildAlignment::RIGHT &&
eDockAlign != SfxChildAlignment::FIRSTRIGHT &&
eDockAlign != SfxChildAlignment::LASTRIGHT );
@@ -1382,7 +1380,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
if ( bForbidden && aInPosBR.Y() >= aInSize.Height())
{
- eDockAlign = CheckAlignment(pImp->GetDockAlignment(),SfxChildAlignment::BOTTOM);
+ eDockAlign = CheckAlignment(pImpl->GetDockAlignment(),SfxChildAlignment::BOTTOM);
bForbidden = ( eDockAlign != SfxChildAlignment::BOTTOM &&
eDockAlign != SfxChildAlignment::HIGHESTBOTTOM &&
eDockAlign != SfxChildAlignment::LOWESTBOTTOM );
@@ -1390,7 +1388,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
// the calculated alignment was rejected by the window -> take floating mode
if ( bForbidden )
- eDockAlign = CheckAlignment(pImp->GetDockAlignment(),SfxChildAlignment::NOALIGNMENT);
+ eDockAlign = CheckAlignment(pImpl->GetDockAlignment(),SfxChildAlignment::NOALIGNMENT);
}
}
@@ -1399,10 +1397,10 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
// In the FloatingMode the tracking rectangle will get the floating
// size. Due to a bug the rRect may only be changed when the
// alignment is changed!
- if ( eDockAlign != pImp->GetDockAlignment() )
+ if ( eDockAlign != pImpl->GetDockAlignment() )
aDockingRect.SetSize( aFloatingSize );
}
- else if ( pImp->bSplitable )
+ else if ( pImpl->bSplitable )
{
sal_uInt16 nLine, nPos;
SfxSplitWindow *pSplitWin = pWorkWin->GetSplitWindow_Impl(eDockAlign);
@@ -1410,35 +1408,35 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
if ( pSplitWin->GetWindowPos( aPos, nLine, nPos ) )
{
// mouse over splitwindow, get line and position
- pImp->nDockLine = nLine;
- pImp->nDockPos = nPos;
- pImp->bNewLine = false;
+ pImpl->nDockLine = nLine;
+ pImpl->nDockPos = nPos;
+ pImpl->bNewLine = false;
}
else
{
// mouse touches inner border -> create new line
- if ( eDockAlign == GetAlignment() && pImp->pSplitWin &&
- pImp->nLine == pImp->pSplitWin->GetLineCount()-1 && pImp->pSplitWin->GetWindowCount(pImp->nLine) == 1 )
+ if ( eDockAlign == GetAlignment() && pImpl->pSplitWin &&
+ pImpl->nLine == pImpl->pSplitWin->GetLineCount()-1 && pImpl->pSplitWin->GetWindowCount(pImpl->nLine) == 1 )
{
// if this window is the only one in the last line, it can't be docked as new line in the same splitwindow
- pImp->nDockLine = pImp->nLine;
- pImp->nDockPos = pImp->nPos;
- pImp->bNewLine = false;
+ pImpl->nDockLine = pImpl->nLine;
+ pImpl->nDockPos = pImpl->nPos;
+ pImpl->bNewLine = false;
}
else
{
// create new line
- pImp->nDockLine = pSplitWin->GetLineCount();
- pImp->nDockPos = 0;
- pImp->bNewLine = true;
+ pImpl->nDockLine = pSplitWin->GetLineCount();
+ pImpl->nDockPos = 0;
+ pImpl->bNewLine = true;
}
}
- bool bChanged = pImp->nLine != pImp->nDockLine || pImp->nPos != pImp->nDockPos || eDockAlign != GetAlignment();
+ bool bChanged = pImpl->nLine != pImpl->nDockLine || pImpl->nPos != pImpl->nDockPos || eDockAlign != GetAlignment();
if ( !bChanged && !IsFloatingMode() )
{
// window only slightly moved, no change of any property
- rRect.SetSize( pImp->aSplitSize );
+ rRect.SetSize( pImpl->aSplitSize );
rRect.SetPos( aDockingRect.TopLeft() );
return eDockAlign;
}
@@ -1449,11 +1447,11 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
Size aInnerSize = GetInnerRect().GetSize();
if ( eDockAlign == SfxChildAlignment::LEFT || eDockAlign == SfxChildAlignment::RIGHT )
{
- if ( pImp->bNewLine )
+ if ( pImpl->bNewLine )
{
// set height to height of free area
aSize.Height() = aInnerSize.Height();
- aSize.Width() = pImp->nHorizontalSize;
+ aSize.Width() = pImpl->nHorizontalSize;
if ( eDockAlign == SfxChildAlignment::LEFT )
{
aPoint = aInnerRect.TopLeft();
@@ -1468,16 +1466,16 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
{
// get width from splitwindow
aSize.Width() = pSplitWin->GetLineSize(nLine);
- aSize.Height() = pImp->aSplitSize.Height();
+ aSize.Height() = pImpl->aSplitSize.Height();
}
}
else
{
- if ( pImp->bNewLine )
+ if ( pImpl->bNewLine )
{
// set width to width of free area
aSize.Width() = aInnerSize.Width();
- aSize.Height() = pImp->nVerticalSize;
+ aSize.Height() = pImpl->nVerticalSize;
if ( eDockAlign == SfxChildAlignment::TOP )
{
aPoint = aInnerRect.TopLeft();
@@ -1492,7 +1490,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
{
// get height from splitwindow
aSize.Height() = pSplitWin->GetLineSize(nLine);
- aSize.Width() = pImp->aSplitSize.Width();
+ aSize.Width() = pImpl->aSplitSize.Width();
}
}
@@ -1503,7 +1501,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
{
// window can be docked, but outside our splitwindows
// tracking rectangle only needs to be modified if alignment was changed
- if ( eDockAlign != pImp->GetDockAlignment() )
+ if ( eDockAlign != pImpl->GetDockAlignment() )
{
switch ( eDockAlign )
{
@@ -1626,7 +1624,7 @@ bool SfxDockingWindow::Close()
*/
void SfxDockingWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
{
- if (pImp->bSplitable || IsFloatingMode())
+ if (pImpl->bSplitable || IsFloatingMode())
return;
Rectangle aRect(Point(0, 0), GetOutputSizePixel());
@@ -1673,19 +1671,19 @@ void SfxDockingWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle
*/
void SfxDockingWindow::SetMinOutputSizePixel( const Size& rSize )
{
- pImp->aMinSize = rSize;
+ pImpl->aMinSize = rSize;
DockingWindow::SetMinOutputSizePixel( rSize );
}
/** Set the minimum size which is returned.*/
const Size& SfxDockingWindow::GetMinOutputSizePixel() const
{
- return pImp->aMinSize;
+ return pImpl->aMinSize;
}
bool SfxDockingWindow::Notify( NotifyEvent& rEvt )
{
- if ( !pImp )
+ if ( !pImpl )
return DockingWindow::Notify( rEvt );
if ( rEvt.GetType() == MouseNotifyEvent::GETFOCUS )
@@ -1693,8 +1691,8 @@ bool SfxDockingWindow::Notify( NotifyEvent& rEvt )
if (pMgr != nullptr)
pBindings->SetActiveFrame( pMgr->GetFrame() );
- if ( pImp->pSplitWin )
- pImp->pSplitWin->SetActiveWindow_Impl( this );
+ if ( pImpl->pSplitWin )
+ pImpl->pSplitWin->SetActiveWindow_Impl( this );
else if (pMgr != nullptr)
pMgr->Activate_Impl();
@@ -1731,42 +1729,42 @@ SplitWindowItemFlags SfxDockingWindow::GetWinBits_Impl() const
void SfxDockingWindow::SetItemSize_Impl( const Size& rSize )
{
- pImp->aSplitSize = rSize;
+ pImpl->aSplitSize = rSize;
SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
SfxChildIdentifier eIdent = SfxChildIdentifier::DOCKINGWINDOW;
- if ( pImp->bSplitable )
+ if ( pImpl->bSplitable )
eIdent = SfxChildIdentifier::SPLITWINDOW;
pWorkWin->ConfigChild_Impl( eIdent, SfxDockingConfig::ALIGNDOCKINGWINDOW, pMgr->GetType() );
}
void SfxDockingWindow::Disappear_Impl()
{
- if ( pImp->pSplitWin && pImp->pSplitWin->IsItemValid( GetType() ) )
- pImp->pSplitWin->RemoveWindow(this);
+ if ( pImpl->pSplitWin && pImpl->pSplitWin->IsItemValid( GetType() ) )
+ pImpl->pSplitWin->RemoveWindow(this);
}
void SfxDockingWindow::Reappear_Impl()
{
- if ( pImp->pSplitWin && !pImp->pSplitWin->IsItemValid( GetType() ) )
+ if ( pImpl->pSplitWin && !pImpl->pSplitWin->IsItemValid( GetType() ) )
{
- pImp->pSplitWin->InsertWindow( this, pImp->aSplitSize );
+ pImpl->pSplitWin->InsertWindow( this, pImpl->aSplitSize );
}
}
bool SfxDockingWindow::IsAutoHide_Impl() const
{
- if ( pImp->pSplitWin )
- return !pImp->pSplitWin->IsFadeIn();
+ if ( pImpl->pSplitWin )
+ return !pImpl->pSplitWin->IsFadeIn();
else
return false;
}
void SfxDockingWindow::AutoShow_Impl()
{
- if ( pImp->pSplitWin )
+ if ( pImpl->pSplitWin )
{
- pImp->pSplitWin->FadeIn();
+ pImpl->pSplitWin->FadeIn();
}
}
@@ -1780,20 +1778,20 @@ void SfxDockingWindow::StateChanged( StateChangedType nStateChange )
void SfxDockingWindow::Move()
{
- if ( pImp )
- pImp->aMoveIdle.Start();
+ if ( pImpl )
+ pImpl->aMoveIdle.Start();
}
IMPL_LINK_NOARG_TYPED(SfxDockingWindow, TimerHdl, Idle *, void)
{
- pImp->aMoveIdle.Stop();
+ pImpl->aMoveIdle.Stop();
if ( IsReallyVisible() && IsFloatingMode() )
{
if( !GetFloatingWindow()->IsRollUp() )
SetFloatingSize( GetOutputSizePixel() );
- pImp->aWinState = GetFloatingWindow()->GetWindowState();
+ pImpl->aWinState = GetFloatingWindow()->GetWindowState();
SfxChildIdentifier eIdent = SfxChildIdentifier::DOCKINGWINDOW;
- if ( pImp->bSplitable )
+ if ( pImpl->bSplitable )
eIdent = SfxChildIdentifier::SPLITWINDOW;
SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl();
pWorkWin->ConfigChild_Impl( eIdent, SfxDockingConfig::ALIGNDOCKINGWINDOW, pMgr->GetType() );
More information about the Libreoffice-commits
mailing list