Kaydet (Commit) 5db69fcd authored tarafından Michael Stahl's avatar Michael Stahl

sw: prefix members of SwOleClient

Change-Id: I60fe718c489fc47d667534560241a8b3eb5f20a6
üst 41b72ada
......@@ -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;
};
......
......@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment