diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-03-31 14:22:00 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-03-31 20:08:54 +0200 |
| commit | 5db69fcd9d236756c6588cb327510679cd41e9bf (patch) | |
| tree | 736621d0a578db710c1ff55f546d9bd68ddbafe3 /sw | |
| parent | 41b72adab4da7ad793e60a6959e48a8dd42dbde4 (diff) | |
sw: prefix members of SwOleClient
Change-Id: I60fe718c489fc47d667534560241a8b3eb5f20a6
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/swcli.hxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/swcli.cxx | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx index a8eb9f9baf91..90b384eafaa7 100644 --- a/sw/inc/swcli.hxx +++ b/sw/inc/swcli.hxx @@ -29,8 +29,8 @@ class SwEditWin; class SwOleClient : public SfxInPlaceClient { - bool bInDoVerb; - bool bOldCheckForOLEInCaption; + bool m_IsInDoVerb; + bool m_IsOldCheckForOLEInCaption; virtual void ObjectAreaChanged() SAL_OVERRIDE; virtual void RequestNewObjectArea( Rectangle& ) SAL_OVERRIDE; @@ -40,9 +40,9 @@ class SwOleClient : public SfxInPlaceClient public: SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& ); - void SetInDoVerb( bool bFlag ) { bInDoVerb = bFlag; } + void SetInDoVerb(bool const bFlag) { m_IsInDoVerb = bFlag; } - bool IsCheckForOLEInCaption() const { return bOldCheckForOLEInCaption; } + bool IsCheckForOLEInCaption() const { return m_IsOldCheckForOLEInCaption; } virtual void FormatChanged() SAL_OVERRIDE; }; diff --git a/sw/source/uibase/uiview/swcli.cxx b/sw/source/uibase/uiview/swcli.cxx index f47b0117309e..5ce19ed798a2 100644 --- a/sw/source/uibase/uiview/swcli.cxx +++ b/sw/source/uibase/uiview/swcli.cxx @@ -32,9 +32,10 @@ using namespace com::sun::star; -SwOleClient::SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& xObj ) : - SfxInPlaceClient( pView, pWin, xObj.GetViewAspect() ), bInDoVerb( false ), - bOldCheckForOLEInCaption( pView->GetWrtShell().IsCheckForOLEInCaption() ) +SwOleClient::SwOleClient(SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& xObj) + : SfxInPlaceClient( pView, pWin, xObj.GetViewAspect() ) + , m_IsInDoVerb(false) + , m_IsOldCheckForOLEInCaption(pView->GetWrtShell().IsCheckForOLEInCaption()) { SetObject( xObj.GetObject() ); } @@ -93,7 +94,7 @@ void SwOleClient::ObjectAreaChanged() void SwOleClient::ViewChanged() { - if ( bInDoVerb ) + if (m_IsInDoVerb) return; if ( GetAspect() == embed::Aspects::MSOLE_ICON ) |