sc/source/ui/inc/anyrefdg.hxx | 8 ++++----
sc/source/ui/miscdlgs/anyrefdg.cxx | 24 ++++++++++++------------
2 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 0046f706a6f65978fc86e88736fccc14591080c9
Author: Henry Castro <hcas...@collabora.com>
Date: Fri Mar 16 22:13:34 2018 -0400
sc: prefix members of ScRefHandler
Change-Id: I7ba7f17256c244604549321fc4812ce845c28877
Reviewed-on: https://gerrit.libreoffice.org/51451
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Henry Castro <hcas...@collabora.com>
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 254c0539c9a6..556153c672e5 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -114,11 +114,11 @@ public:
private:
ScFormulaReferenceHelper
m_aHelper;
- SfxBindings* pMyBindings;
+ SfxBindings* m_pMyBindings;
- VclPtr<vcl::Window> pActiveWin;
- Idle aIdle;
- OUString aDocName; // document on which the
dialog was opened
+ VclPtr<vcl::Window> m_pActiveWin;
+ Idle m_aIdle;
+ OUString m_aDocName; // document on which the
dialog was opened
DECL_LINK( UpdateFocusHdl, Timer*, void );
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index e2e2bd45e81b..84bf8c23bdf7 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -752,11 +752,11 @@ ScRefHandler::ScRefHandler( vcl::Window &rWindow,
SfxBindings* pB, bool bBindRef
m_rWindow( &rWindow ),
m_bInRefMode( false ),
m_aHelper(this,pB),
- pMyBindings( pB ),
- pActiveWin(nullptr)
+ m_pMyBindings( pB ),
+ m_pActiveWin(nullptr)
{
m_aHelper.SetWindow(m_rWindow.get());
- aIdle.SetInvokeHandler(LINK( this, ScRefHandler, UpdateFocusHdl));
+ m_aIdle.SetInvokeHandler(LINK( this, ScRefHandler, UpdateFocusHdl));
if( bBindRef ) EnterRefMode();
}
@@ -773,9 +773,9 @@ bool ScRefHandler::EnterRefMode()
// even if it's not the current view
SfxObjectShell* pParentDoc = nullptr;
- if ( pMyBindings )
+ if ( m_pMyBindings )
{
- SfxDispatcher* pMyDisp = pMyBindings->GetDispatcher();
+ SfxDispatcher* pMyDisp = m_pMyBindings->GetDispatcher();
if (pMyDisp)
{
SfxViewFrame* pMyViewFrm = pMyDisp->GetFrame();
@@ -791,7 +791,7 @@ bool ScRefHandler::EnterRefMode()
if ( !pParentDoc && pScViewShell ) // use current only if
above fails
pParentDoc = pScViewShell->GetObjectShell();
if ( pParentDoc )
- aDocName = pParentDoc->GetTitle();
+ m_aDocName = pParentDoc->GetTitle();
ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(pScViewShell);
@@ -819,7 +819,7 @@ ScRefHandler::~ScRefHandler()
void ScRefHandler::disposeRefHandler()
{
m_rWindow.clear();
- pActiveWin.clear();
+ m_pActiveWin.clear();
LeaveRefMode();
m_aHelper.dispose();
}
@@ -850,7 +850,7 @@ void ScRefHandler::SwitchToDocument()
if (pCurrent)
{
SfxObjectShell* pObjSh = pCurrent->GetObjectShell();
- if ( pObjSh && pObjSh->GetTitle() == aDocName )
+ if ( pObjSh && pObjSh->GetTitle() == m_aDocName )
{
// right document already visible -> nothing to do
return;
@@ -861,7 +861,7 @@ void ScRefHandler::SwitchToDocument()
while ( pSh )
{
SfxObjectShell* pObjSh = pSh->GetObjectShell();
- if ( pObjSh && pObjSh->GetTitle() == aDocName )
+ if ( pObjSh && pObjSh->GetTitle() == m_aDocName )
{
// switch to first TabViewShell for document
static_cast<ScTabViewShell*>(pSh)->SetActive();
@@ -879,7 +879,7 @@ bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh)
const // pDocSh may be
aCmpName = pDocSh->GetTitle();
// if aDocName isn't initialized, allow
- return ( aDocName.isEmpty() || aDocName == aCmpName );
+ return ( m_aDocName.isEmpty() || m_aDocName == aCmpName );
}
bool ScRefHandler::IsRefInputMode() const
@@ -930,9 +930,9 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit*
pEdit, formula::RefButton*
IMPL_LINK_NOARG(ScRefHandler, UpdateFocusHdl, Timer *, void)
{
- if (pActiveWin)
+ if (m_pActiveWin)
{
- pActiveWin->GrabFocus();
+ m_pActiveWin->GrabFocus();
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
