[Libreoffice-commits] core.git: include/sfx2 sfx2/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon Apr 18 07:15:51 UTC 2016
include/sfx2/viewfrm.hxx | 22 +--
sfx2/source/view/viewfrm.cxx | 262 +++++++++++++++++++++---------------------
sfx2/source/view/viewfrm2.cxx | 20 +--
3 files changed, 152 insertions(+), 152 deletions(-)
New commits:
commit 98b6e3875b1ef377d57b5507651cd2abc17d0d89
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Apr 18 08:42:54 2016 +0200
SfxViewFrame: rename members missing their prefixes
Change-Id: Ib690fed0a0ab76325370c2ca42d4e25c4d0a2882
Reviewed-on: https://gerrit.libreoffice.org/24186
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index d02b56b..3a3e8dd 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -64,12 +64,12 @@ namespace basegfx
class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener
{
- struct SfxViewFrame_Impl* pImp;
+ struct SfxViewFrame_Impl* m_pImp;
- SfxObjectShellRef xObjSh;
- SfxDispatcher* pDispatcher;
- SfxBindings* pBindings;
- sal_uInt16 nAdjustPosPixelLock;
+ SfxObjectShellRef m_xObjSh;
+ SfxDispatcher* m_pDispatcher;
+ SfxBindings* m_pBindings;
+ sal_uInt16 m_nAdjustPosPixelLock;
private:
SAL_DLLPRIVATE void Construct_Impl( SfxObjectShell *pObjSh=nullptr );
@@ -113,20 +113,20 @@ public:
SfxViewFrame* GetParentViewFrame() const;
using SfxShell::GetDispatcher;
- SfxDispatcher* GetDispatcher() { return pDispatcher; }
- SfxBindings& GetBindings() { return *pBindings; }
- const SfxBindings& GetBindings() const { return *pBindings; }
+ SfxDispatcher* GetDispatcher() { return m_pDispatcher; }
+ SfxBindings& GetBindings() { return *m_pBindings; }
+ const SfxBindings& GetBindings() const { return *m_pBindings; }
vcl::Window& GetWindow() const;
SfxProgress* GetProgress() const;
SfxObjectShell* GetObjectShell() const
- { return xObjSh; }
+ { return m_xObjSh; }
void LockAdjustPosSizePixel()
- { nAdjustPosPixelLock++; }
+ { m_nAdjustPosPixelLock++; }
void UnlockAdjustPosSizePixel()
- { nAdjustPosPixelLock--; }
+ { m_nAdjustPosPixelLock--; }
void DoAdjustPosSizePixel( SfxViewShell * pSh,
const Point &rPos, const Size &rSize );
void Show();
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index c4ac752..ef0316b 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -204,12 +204,12 @@ static bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHa
void SfxViewFrame::SetDowning_Impl()
{
- pImp->bIsDowning = true;
+ m_pImp->bIsDowning = true;
}
bool SfxViewFrame::IsDowning_Impl() const
{
- return pImp->bIsDowning;
+ return m_pImp->bIsDowning;
}
class SfxViewNotificatedFrameList_Impl :
@@ -547,7 +547,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
if( pForceReloadItem && !pForceReloadItem->GetValue() &&
!pSh->GetMedium()->IsExpired() )
return;
- if( pImp->bReloading || pSh->IsInModalMode() )
+ if( m_pImp->bReloading || pSh->IsInModalMode() )
return;
// AutoLoad is prohibited if possible
@@ -557,7 +557,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
return;
SfxObjectShellLock xOldObj( pSh );
- pImp->bReloading = true;
+ m_pImp->bReloading = true;
const SfxStringItem* pURLItem = rReq.GetArg<SfxStringItem>(SID_FILE_NAME);
// Open as editable?
bool bForEdit = !pSh->IsReadOnly();
@@ -823,7 +823,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
// Record as not done
rReq.Done();
rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), false));
- pImp->bReloading = false;
+ m_pImp->bReloading = false;
return;
}
}
@@ -1005,21 +1005,21 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
void SfxViewFrame::PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell )
{
i_rViewShell.PopSubShells_Impl();
- sal_uInt16 nLevel = pDispatcher->GetShellLevel( i_rViewShell );
+ sal_uInt16 nLevel = m_pDispatcher->GetShellLevel( i_rViewShell );
if ( nLevel != USHRT_MAX )
{
if ( nLevel )
{
// more sub shells on the stack, which were not affected by PopSubShells_Impl
- SfxShell *pSubShell = pDispatcher->GetShell( nLevel-1 );
+ SfxShell *pSubShell = m_pDispatcher->GetShell( nLevel-1 );
if ( pSubShell == i_rViewShell.GetSubShell() )
// "real" sub shells will be deleted elsewhere
- pDispatcher->Pop( *pSubShell, SfxDispatcherPopFlags::POP_UNTIL );
+ m_pDispatcher->Pop( *pSubShell, SfxDispatcherPopFlags::POP_UNTIL );
else
- pDispatcher->Pop( *pSubShell, SfxDispatcherPopFlags::POP_UNTIL | SfxDispatcherPopFlags::POP_DELETE );
+ m_pDispatcher->Pop( *pSubShell, SfxDispatcherPopFlags::POP_UNTIL | SfxDispatcherPopFlags::POP_DELETE );
}
- pDispatcher->Pop( i_rViewShell );
- pDispatcher->Flush();
+ m_pDispatcher->Pop( i_rViewShell );
+ m_pDispatcher->Flush();
}
}
@@ -1042,7 +1042,7 @@ void SfxViewFrame::PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell )
*/
void SfxViewFrame::ReleaseObjectShell_Impl()
{
- DBG_ASSERT( xObjSh.Is(), "no SfxObjectShell to release!" );
+ DBG_ASSERT( m_xObjSh.Is(), "no SfxObjectShell to release!" );
GetFrame().ReleasingComponent_Impl();
if ( GetWindow().HasChildPathFocus( true ) )
@@ -1064,28 +1064,28 @@ void SfxViewFrame::ReleaseObjectShell_Impl()
OSL_FAIL("No Shell");
#endif
- if ( xObjSh.Is() )
+ if ( m_xObjSh.Is() )
{
- pDispatcher->Pop( *xObjSh );
- SfxModule* pModule = xObjSh->GetModule();
+ m_pDispatcher->Pop( *m_xObjSh );
+ SfxModule* pModule = m_xObjSh->GetModule();
if( pModule )
- pDispatcher->RemoveShell_Impl( *pModule );
- pDispatcher->Flush();
- EndListening( *xObjSh );
-
- Notify( *xObjSh, SfxSimpleHint(SFX_HINT_TITLECHANGED) );
- Notify( *xObjSh, SfxSimpleHint(SFX_HINT_DOCCHANGED) );
-
- if ( 1 == xObjSh->GetOwnerLockCount() && pImp->bObjLocked && xObjSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED )
- xObjSh->DoClose();
- SfxObjectShellRef xDyingObjSh = xObjSh;
- xObjSh.Clear();
- if( ( GetFrameType() & SFXFRAME_HASTITLE ) && pImp->nDocViewNo )
- xDyingObjSh->GetNoSet_Impl().ReleaseIndex(pImp->nDocViewNo-1);
- if ( pImp->bObjLocked )
+ m_pDispatcher->RemoveShell_Impl( *pModule );
+ m_pDispatcher->Flush();
+ EndListening( *m_xObjSh );
+
+ Notify( *m_xObjSh, SfxSimpleHint(SFX_HINT_TITLECHANGED) );
+ Notify( *m_xObjSh, SfxSimpleHint(SFX_HINT_DOCCHANGED) );
+
+ if ( 1 == m_xObjSh->GetOwnerLockCount() && m_pImp->bObjLocked && m_xObjSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED )
+ m_xObjSh->DoClose();
+ SfxObjectShellRef xDyingObjSh = m_xObjSh;
+ m_xObjSh.Clear();
+ if( ( GetFrameType() & SFXFRAME_HASTITLE ) && m_pImp->nDocViewNo )
+ xDyingObjSh->GetNoSet_Impl().ReleaseIndex(m_pImp->nDocViewNo-1);
+ if ( m_pImp->bObjLocked )
{
xDyingObjSh->OwnerLock( false );
- pImp->bObjLocked = false;
+ m_pImp->bObjLocked = false;
}
}
@@ -1118,7 +1118,7 @@ void SfxViewFrame::DoActivate( bool bUI )
{
SfxGetpApp();
- pDispatcher->DoActivate_Impl( bUI, nullptr );
+ m_pDispatcher->DoActivate_Impl( bUI, nullptr );
// If this ViewFrame has got a parent and this is not a parent of the
// old ViewFrames, it gets a ParentActivate.
@@ -1127,7 +1127,7 @@ void SfxViewFrame::DoActivate( bool bUI )
SfxViewFrame *pFrame = GetParentViewFrame();
while ( pFrame )
{
- pFrame->pDispatcher->DoParentActivate_Impl();
+ pFrame->m_pDispatcher->DoParentActivate_Impl();
pFrame = pFrame->GetParentViewFrame();
}
}
@@ -1136,7 +1136,7 @@ void SfxViewFrame::DoActivate( bool bUI )
void SfxViewFrame::DoDeactivate(bool bUI, SfxViewFrame* pNewFrame )
{
SfxGetpApp();
- pDispatcher->DoDeactivate_Impl( bUI, pNewFrame );
+ m_pDispatcher->DoDeactivate_Impl( bUI, pNewFrame );
// If this ViewFrame has got a parent and this is not a parent of the
// new ViewFrames, it gets a ParentDeactivate.
@@ -1146,7 +1146,7 @@ void SfxViewFrame::DoDeactivate(bool bUI, SfxViewFrame* pNewFrame )
while ( pFrame )
{
if ( !pNewFrame || !pNewFrame->GetFrame().IsParent( &pFrame->GetFrame() ) )
- pFrame->pDispatcher->DoParentDeactivate_Impl();
+ pFrame->m_pDispatcher->DoParentDeactivate_Impl();
pFrame = pFrame->GetParentViewFrame();
}
}
@@ -1154,7 +1154,7 @@ void SfxViewFrame::DoDeactivate(bool bUI, SfxViewFrame* pNewFrame )
void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh )
{
- if( pSh && !nAdjustPosPixelLock )
+ if( pSh && !m_nAdjustPosPixelLock )
{
if ( GetViewShell() && GetWindow().IsVisible() )
{
@@ -1176,7 +1176,7 @@ void SfxViewFrame::SetBorderPixelImpl
)
{
- pImp->aBorder = rBorder;
+ m_pImp->aBorder = rBorder;
if ( IsResizeInToOut_Impl() && !GetFrame().IsInPlace() )
{
@@ -1211,7 +1211,7 @@ void SfxViewFrame::SetBorderPixelImpl
const SvBorder& SfxViewFrame::GetBorderPixelImpl() const
{
- return pImp->aBorder;
+ return m_pImp->aBorder;
}
void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
@@ -1229,7 +1229,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
UpdateTitle();
- if ( !xObjSh.Is() )
+ if ( !m_xObjSh.Is() )
break;
// Switch r/o?
@@ -1237,7 +1237,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
rBind.Invalidate( SID_RELOAD );
SfxDispatcher *pDispat = GetDispatcher();
bool bWasReadOnly = pDispat->GetReadOnly_Impl();
- bool bIsReadOnly = xObjSh->IsReadOnly();
+ bool bIsReadOnly = m_xObjSh->IsReadOnly();
if ( bWasReadOnly != bIsReadOnly )
{
// Then also TITLE_CHANGED
@@ -1259,7 +1259,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
pDispat->Update_Impl(true);
}
- Enable( !xObjSh->IsInModalMode() );
+ Enable( !m_xObjSh->IsInModalMode() );
break;
}
@@ -1279,7 +1279,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
break;
case SFX_HINT_DYING:
// when the Object is being deleted, destroy the view too
- if ( xObjSh.Is() )
+ if ( m_xObjSh.Is() )
ReleaseObjectShell_Impl();
else
GetFrame().DoClose();
@@ -1307,7 +1307,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
case SFX_EVENT_OPENDOC:
case SFX_EVENT_CREATEDOC:
{
- if ( !xObjSh.Is() )
+ if ( !m_xObjSh.Is() )
break;
SfxBindings& rBind = GetBindings();
@@ -1315,9 +1315,9 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
rBind.Invalidate( SID_EDITDOC );
const SfxViewShell *pVSh;
const SfxShell *pFSh;
- if ( !xObjSh->IsReadOnly() ||
- ( xObjSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED &&
- (pVSh = xObjSh->GetViewShell()) &&
+ if ( !m_xObjSh->IsReadOnly() ||
+ ( m_xObjSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED &&
+ (pVSh = m_xObjSh->GetViewShell()) &&
(pFSh = pVSh->GetFormShell()) &&
!pFSh->IsDesignMode()))
{
@@ -1343,10 +1343,10 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
}
}
- if (SfxClassificationHelper::IsClassified(xObjSh->getDocProperties()))
+ if (SfxClassificationHelper::IsClassified(m_xObjSh->getDocProperties()))
{
// Document has BAILS properties, display an infobar accordingly.
- SfxClassificationHelper aHelper(xObjSh->getDocProperties());
+ SfxClassificationHelper aHelper(m_xObjSh->getDocProperties());
aHelper.UpdateInfobar(*this);
}
@@ -1371,48 +1371,48 @@ IMPL_LINK_NOARG_TYPED(SfxViewFrame, SwitchReadOnlyHandler, Button*, void)
void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh )
{
- pImp->bResizeInToOut = true;
- pImp->bDontOverwriteResizeInToOut = false;
- pImp->bObjLocked = false;
- pImp->pFocusWin = nullptr;
- pImp->pActiveChild = nullptr;
- pImp->nCurViewId = 0;
- pImp->bReloading = false;
- pImp->bIsDowning = false;
- pImp->bModal = false;
- pImp->bEnabled = true;
- pImp->nDocViewNo = 0;
- pImp->aMargin = Size( -1, -1 );
- pImp->pWindow = nullptr;
+ m_pImp->bResizeInToOut = true;
+ m_pImp->bDontOverwriteResizeInToOut = false;
+ m_pImp->bObjLocked = false;
+ m_pImp->pFocusWin = nullptr;
+ m_pImp->pActiveChild = nullptr;
+ m_pImp->nCurViewId = 0;
+ m_pImp->bReloading = false;
+ m_pImp->bIsDowning = false;
+ m_pImp->bModal = false;
+ m_pImp->bEnabled = true;
+ m_pImp->nDocViewNo = 0;
+ m_pImp->aMargin = Size( -1, -1 );
+ m_pImp->pWindow = nullptr;
SetPool( &SfxGetpApp()->GetPool() );
- pDispatcher = new SfxDispatcher(this);
+ m_pDispatcher = new SfxDispatcher(this);
if ( !GetBindings().GetDispatcher() )
- GetBindings().SetDispatcher( pDispatcher );
+ GetBindings().SetDispatcher( m_pDispatcher );
- xObjSh = pObjSh;
- if ( xObjSh.Is() && xObjSh->IsPreview() )
+ m_xObjSh = pObjSh;
+ if ( m_xObjSh.Is() && m_xObjSh->IsPreview() )
SetQuietMode_Impl( true );
if ( pObjSh )
{
- pDispatcher->Push( *SfxGetpApp() );
- SfxModule* pModule = xObjSh->GetModule();
+ m_pDispatcher->Push( *SfxGetpApp() );
+ SfxModule* pModule = m_xObjSh->GetModule();
if( pModule )
- pDispatcher->Push( *pModule );
- pDispatcher->Push( *this );
- pDispatcher->Push( *pObjSh );
- pDispatcher->Flush();
+ m_pDispatcher->Push( *pModule );
+ m_pDispatcher->Push( *this );
+ m_pDispatcher->Push( *pObjSh );
+ m_pDispatcher->Flush();
StartListening( *pObjSh );
Notify( *pObjSh, SfxSimpleHint(SFX_HINT_TITLECHANGED) );
Notify( *pObjSh, SfxSimpleHint(SFX_HINT_DOCCHANGED) );
- pDispatcher->SetReadOnly_Impl( pObjSh->IsReadOnly() );
+ m_pDispatcher->SetReadOnly_Impl( pObjSh->IsReadOnly() );
}
else
{
- pDispatcher->Push( *SfxGetpApp() );
- pDispatcher->Push( *this );
- pDispatcher->Flush();
+ m_pDispatcher->Push( *SfxGetpApp() );
+ m_pDispatcher->Push( *this );
+ m_pDispatcher->Flush();
}
SfxViewFrameArr_Impl &rViewArr = SfxGetpApp()->GetViewFrames_Impl();
@@ -1430,18 +1430,18 @@ SfxViewFrame::SfxViewFrame
SfxFrame& rFrame,
SfxObjectShell* pObjShell
)
- : pImp( new SfxViewFrame_Impl( rFrame ) )
- , pDispatcher(nullptr)
- , pBindings( new SfxBindings )
- , nAdjustPosPixelLock( 0 )
+ : m_pImp( new SfxViewFrame_Impl( rFrame ) )
+ , m_pDispatcher(nullptr)
+ , m_pBindings( new SfxBindings )
+ , m_nAdjustPosPixelLock( 0 )
{
rFrame.SetCurrentViewFrame_Impl( this );
rFrame.SetFrameType_Impl( GetFrameType() | SFXFRAME_HASTITLE );
Construct_Impl( pObjShell );
- pImp->pWindow = VclPtr<SfxFrameViewWindow_Impl>::Create( this, rFrame.GetWindow() );
- pImp->pWindow->SetSizePixel( rFrame.GetWindow().GetOutputSizePixel() );
+ m_pImp->pWindow = VclPtr<SfxFrameViewWindow_Impl>::Create( this, rFrame.GetWindow() );
+ m_pImp->pWindow->SetSizePixel( rFrame.GetWindow().GetOutputSizePixel() );
rFrame.SetOwnsBindings_Impl( true );
rFrame.CreateWorkWindow_Impl();
}
@@ -1459,8 +1459,8 @@ SfxViewFrame::~SfxViewFrame()
// The Bindings delete the Frame!
KillDispatcher_Impl();
- pImp->pWindow.disposeAndClear();
- pImp->pFocusWin.clear();
+ m_pImp->pWindow.disposeAndClear();
+ m_pImp->pFocusWin.clear();
if ( GetFrame().GetCurrentViewFrame() == this )
GetFrame().SetCurrentViewFrame_Impl( nullptr );
@@ -1474,23 +1474,23 @@ SfxViewFrame::~SfxViewFrame()
// Delete Member
KillDispatcher_Impl();
- delete pImp;
+ delete m_pImp;
}
// Remove and delete the Dispatcher.
void SfxViewFrame::KillDispatcher_Impl()
{
- SfxModule* pModule = xObjSh.Is() ? xObjSh->GetModule() : nullptr;
- if ( xObjSh.Is() )
+ SfxModule* pModule = m_xObjSh.Is() ? m_xObjSh->GetModule() : nullptr;
+ if ( m_xObjSh.Is() )
ReleaseObjectShell_Impl();
- if ( pDispatcher )
+ if ( m_pDispatcher )
{
if( pModule )
- pDispatcher->Pop( *pModule, SfxDispatcherPopFlags::POP_UNTIL );
+ m_pDispatcher->Pop( *pModule, SfxDispatcherPopFlags::POP_UNTIL );
else
- pDispatcher->Pop( *this );
- DELETEZ(pDispatcher);
+ m_pDispatcher->Pop( *this );
+ DELETEZ(m_pDispatcher);
}
}
@@ -1566,14 +1566,14 @@ void SfxViewFrame::DoAdjustPosSizePixel //! divide on Inner.../Outer...
{
// Components do not use this Method!
- if( pSh && pSh->GetWindow() && !nAdjustPosPixelLock )
+ if( pSh && pSh->GetWindow() && !m_nAdjustPosPixelLock )
{
- nAdjustPosPixelLock++;
- if ( pImp->bResizeInToOut )
+ m_nAdjustPosPixelLock++;
+ if ( m_pImp->bResizeInToOut )
pSh->InnerResizePixel( rPos, rSize );
else
pSh->OuterResizePixel( rPos, rSize );
- nAdjustPosPixelLock--;
+ m_nAdjustPosPixelLock--;
}
}
@@ -1598,7 +1598,7 @@ void SfxViewFrame::SetViewShell_Impl( SfxViewShell *pVSh )
// Hack: InPlaceMode
if ( pVSh )
- pImp->bResizeInToOut = false;
+ m_pImp->bResizeInToOut = false;
}
/* [Description]
@@ -1613,27 +1613,27 @@ SfxViewFrame* SfxViewFrame::GetParentViewFrame_Impl() const
void SfxViewFrame::ForceOuterResize_Impl()
{
- if ( !pImp->bDontOverwriteResizeInToOut )
- pImp->bResizeInToOut = true;
+ if ( !m_pImp->bDontOverwriteResizeInToOut )
+ m_pImp->bResizeInToOut = true;
}
bool SfxViewFrame::IsResizeInToOut_Impl() const
{
- return pImp->bResizeInToOut;
+ return m_pImp->bResizeInToOut;
}
void SfxViewFrame::GetDocNumber_Impl()
{
DBG_ASSERT( GetObjectShell(), "No Document!" );
GetObjectShell()->SetNamedVisibility_Impl();
- pImp->nDocViewNo = GetObjectShell()->GetNoSet_Impl().GetFreeIndex()+1;
+ m_pImp->nDocViewNo = GetObjectShell()->GetNoSet_Impl().GetFreeIndex()+1;
}
void SfxViewFrame::Enable( bool bEnable )
{
- if ( bEnable != pImp->bEnabled )
+ if ( bEnable != m_pImp->bEnabled )
{
- pImp->bEnabled = bEnable;
+ m_pImp->bEnabled = bEnable;
// e.g. InPlace-Frames have a parent...
SfxViewFrame *pParent = GetParentViewFrame_Impl();
@@ -1645,8 +1645,8 @@ void SfxViewFrame::Enable( bool bEnable )
{
vcl::Window *pWindow = &GetFrame().GetTopFrame().GetWindow();
if ( !bEnable )
- pImp->bWindowWasEnabled = pWindow->IsInputEnabled();
- if ( !bEnable || pImp->bWindowWasEnabled )
+ m_pImp->bWindowWasEnabled = pWindow->IsInputEnabled();
+ if ( !bEnable || m_pImp->bWindowWasEnabled )
pWindow->EnableInput( bEnable );
}
@@ -1677,14 +1677,14 @@ void SfxViewFrame::Show()
{
// First lock the objectShell so that UpdateTitle() is valid:
// IsVisible() == true (:#)
- if ( xObjSh.Is() )
+ if ( m_xObjSh.Is() )
{
- xObjSh->GetMedium()->GetItemSet()->ClearItem( SID_HIDDEN );
- if ( !pImp->bObjLocked )
+ m_xObjSh->GetMedium()->GetItemSet()->ClearItem( SID_HIDDEN );
+ if ( !m_pImp->bObjLocked )
LockObjectShell_Impl();
// Adjust Doc-Shell title number, get unique view-no
- if ( 0 == pImp->nDocViewNo )
+ if ( 0 == m_pImp->nDocViewNo )
{
GetDocNumber_Impl();
UpdateTitle();
@@ -1702,17 +1702,17 @@ void SfxViewFrame::Show()
bool SfxViewFrame::IsVisible() const
{
- return pImp->bObjLocked;
+ return m_pImp->bObjLocked;
}
void SfxViewFrame::LockObjectShell_Impl()
{
- DBG_ASSERT( !pImp->bObjLocked, "Wrong Locked status!" );
+ DBG_ASSERT( !m_pImp->bObjLocked, "Wrong Locked status!" );
DBG_ASSERT( GetObjectShell(), "No Document!" );
GetObjectShell()->OwnerLock(true);
- pImp->bObjLocked = true;
+ m_pImp->bObjLocked = true;
}
@@ -1774,19 +1774,19 @@ void SfxViewFrame::SetQuietMode_Impl( bool bOn )
SfxObjectShell* SfxViewFrame::GetObjectShell()
{
- return xObjSh;
+ return m_xObjSh;
}
const Size& SfxViewFrame::GetMargin_Impl() const
{
- return pImp->aMargin;
+ return m_pImp->aMargin;
}
void SfxViewFrame::SetActiveChildFrame_Impl( SfxViewFrame *pViewFrame )
{
- if ( pViewFrame != pImp->pActiveChild )
+ if ( pViewFrame != m_pImp->pActiveChild )
{
- pImp->pActiveChild = pViewFrame;
+ m_pImp->pActiveChild = pViewFrame;
Reference< XFramesSupplier > xFrame( GetFrame().GetFrameInterface(), UNO_QUERY );
Reference< XFrame > xActive;
@@ -1800,7 +1800,7 @@ void SfxViewFrame::SetActiveChildFrame_Impl( SfxViewFrame *pViewFrame )
SfxViewFrame* SfxViewFrame::GetActiveChildFrame_Impl() const
{
- SfxViewFrame *pViewFrame = pImp->pActiveChild;
+ SfxViewFrame *pViewFrame = m_pImp->pActiveChild;
return pViewFrame;
}
@@ -2124,12 +2124,12 @@ bool SfxViewFrame::SwitchToViewShell_Impl
void SfxViewFrame::SetCurViewId_Impl( const sal_uInt16 i_nID )
{
- pImp->nCurViewId = i_nID;
+ m_pImp->nCurViewId = i_nID;
}
sal_uInt16 SfxViewFrame::GetCurViewId() const
{
- return pImp->nCurViewId;
+ return m_pImp->nCurViewId;
}
/* [Description]
@@ -2313,7 +2313,7 @@ void SfxViewFrame::StateView_Impl
{
case SID_VIEWSHELL:
{
- rSet.Put( SfxUInt16Item( nWhich, pImp->nCurViewId ) );
+ rSet.Put( SfxUInt16Item( nWhich, m_pImp->nCurViewId ) );
break;
}
@@ -2330,7 +2330,7 @@ void SfxViewFrame::StateView_Impl
SfxViewFactory &rViewFactory =
GetObjectShell()->GetFactory().GetViewFactory(nViewNo);
rSet.Put( SfxBoolItem(
- nWhich, pImp->nCurViewId == rViewFactory.GetOrdinal() ) );
+ nWhich, m_pImp->nCurViewId == rViewFactory.GetOrdinal() ) );
}
else
rSet.DisableItem( nWhich );
@@ -2373,7 +2373,7 @@ SfxViewFrame* SfxViewFrame::GetParentViewFrame() const
*/
SfxFrame& SfxViewFrame::GetFrame() const
{
- return pImp->rFrame;
+ return m_pImp->rFrame;
}
SfxViewFrame* SfxViewFrame::GetTopViewFrame() const
@@ -2383,7 +2383,7 @@ SfxViewFrame* SfxViewFrame::GetTopViewFrame() const
vcl::Window& SfxViewFrame::GetWindow() const
{
- return pImp->pWindow ? *pImp->pWindow : GetFrame().GetWindow();
+ return m_pImp->pWindow ? *m_pImp->pWindow : GetFrame().GetWindow();
}
bool SfxViewFrame::DoClose()
@@ -2393,34 +2393,34 @@ bool SfxViewFrame::DoClose()
OUString SfxViewFrame::GetActualPresentationURL_Impl() const
{
- if ( xObjSh.Is() )
- return xObjSh->GetMedium()->GetName();
+ if ( m_xObjSh.Is() )
+ return m_xObjSh->GetMedium()->GetName();
return OUString();
}
void SfxViewFrame::SetModalMode( bool bModal )
{
- pImp->bModal = bModal;
- if ( xObjSh.Is() )
+ m_pImp->bModal = bModal;
+ if ( m_xObjSh.Is() )
{
- for ( SfxViewFrame* pFrame = SfxViewFrame::GetFirst( xObjSh );
- !bModal && pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, xObjSh ) )
- bModal = pFrame->pImp->bModal;
- xObjSh->SetModalMode_Impl( bModal );
+ for ( SfxViewFrame* pFrame = SfxViewFrame::GetFirst( m_xObjSh );
+ !bModal && pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, m_xObjSh ) )
+ bModal = pFrame->m_pImp->bModal;
+ m_xObjSh->SetModalMode_Impl( bModal );
}
}
bool SfxViewFrame::IsInModalMode() const
{
- return pImp->bModal || GetFrame().GetWindow().IsInModalMode();
+ return m_pImp->bModal || GetFrame().GetWindow().IsInModalMode();
}
void SfxViewFrame::Resize( bool bForce )
{
Size aSize = GetWindow().GetOutputSizePixel();
- if ( bForce || aSize != pImp->aSize )
+ if ( bForce || aSize != m_pImp->aSize )
{
- pImp->aSize = aSize;
+ m_pImp->aSize = aSize;
SfxViewShell *pShell = GetViewShell();
if ( pShell )
{
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index bddaede..14e0fe5 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -118,7 +118,7 @@ void SfxViewFrame::UpdateTitle()
{
const SfxObjectFactory &rFact = GetObjectShell()->GetFactory();
- pImp->aFactoryName = OUString::createFromAscii(rFact.GetShortName());
+ m_pImp->aFactoryName = OUString::createFromAscii(rFact.GetShortName());
SfxObjectShell *pObjSh = GetObjectShell();
if ( !pObjSh )
@@ -134,16 +134,16 @@ void SfxViewFrame::UpdateTitle()
aURL = aTmp.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
}
- if ( aURL != pImp->aActualURL )
+ if ( aURL != m_pImp->aActualURL )
// URL has changed
- pImp->aActualURL = aURL;
+ m_pImp->aActualURL = aURL;
// SbxObjects name
OUString aSbxName = pObjSh->SfxShell::GetName();
if ( IsVisible() )
{
aSbxName += ":";
- aSbxName += OUString::number(pImp->nDocViewNo);
+ aSbxName += OUString::number(m_pImp->nDocViewNo);
}
SetName( aSbxName );
@@ -208,8 +208,8 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
OUString aFactName;
if ( pFactoryItem )
aFactName = pFactoryItem->GetValue();
- else if ( !pImp->aFactoryName.isEmpty() )
- aFactName = pImp->aFactoryName;
+ else if ( !m_pImp->aFactoryName.isEmpty() )
+ aFactName = m_pImp->aFactoryName;
else
{
OSL_FAIL("Missing argument!");
@@ -295,10 +295,10 @@ void SfxViewFrame::GetState_Impl( SfxItemSet &rSet )
{
case SID_NEWDOCDIRECT :
{
- if ( !pImp->aFactoryName.isEmpty() )
+ if ( !m_pImp->aFactoryName.isEmpty() )
{
OUString aFact("private:factory/");
- aFact += pImp->aFactoryName;
+ aFact += m_pImp->aFactoryName;
rSet.Put( SfxStringItem( nWhich, aFact ) );
}
break;
@@ -390,7 +390,7 @@ void SfxViewFrame::Activate( bool bMDI )
{
DBG_ASSERT(GetViewShell(), "No Shell");
if ( bMDI )
- pImp->bActive = true;
+ m_pImp->bActive = true;
//(mba): here maybe as in Beanframe NotifyEvent ?!
}
@@ -398,7 +398,7 @@ void SfxViewFrame::Deactivate( bool bMDI )
{
DBG_ASSERT(GetViewShell(), "No Shell");
if ( bMDI )
- pImp->bActive = false;
+ m_pImp->bActive = false;
//(mba): here maybe as in Beanframe NotifyEvent ?!
}
More information about the Libreoffice-commits
mailing list