diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-10 13:53:37 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-10 14:13:58 -0400 |
| commit | 11c682057550b6551940e762d3b403586e1f5ea8 (patch) | |
| tree | eb7435389aa482eddbf69c3ed66fdbd3edd5d238 | |
| parent | cf470718ca5e906ae4c6da3fad3698872f97ee6f (diff) | |
Move "prog name" (whatever it is) to the impl class.
Change-Id: Ifa4f2f2f923d4800cf5fd540631204492ace1936
| -rw-r--r-- | include/svx/svdoole2.hxx | 6 | ||||
| -rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 5ddf315966cd..9fad1a30f656 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -65,8 +65,6 @@ protected: private: SdrOle2ObjImpl* mpImpl; - OUString aProgName; - // Due to compatibility at SdrTextObj for now bool bFrame:1; bool bInDestruction:1; @@ -117,8 +115,8 @@ public: // One can add an application name to a SdrOle2Obj, which can be queried for // later on (SD needs this for presentation objects). - void SetProgName(const OUString& rNam) { aProgName=rNam; } - const OUString& GetProgName() const { return aProgName; } + void SetProgName( const OUString& rName ); + const OUString& GetProgName() const; bool IsEmpty() const; void SetObjRef(const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rNewObjRef); diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 69f327f6e750..0206b06db255 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -673,6 +673,7 @@ public: Graphic* mpGraphic; // TODO/LATER: do we really need this pointer? GraphicObject* mpGraphicObject; + OUString maProgName; OUString aPersistName; // name of object in persist SdrLightEmbeddedClient_Impl* pLightClient; // must be registered as client only using AddOwnLightClient() call @@ -875,7 +876,15 @@ void SdrOle2Obj::SetGraphic(const Graphic* pGrf) SetGraphic_Impl( pGrf ); } +void SdrOle2Obj::SetProgName( const OUString& rName ) +{ + mpImpl->maProgName = rName; +} +const OUString& SdrOle2Obj::GetProgName() const +{ + return mpImpl->maProgName; +} bool SdrOle2Obj::IsEmpty() const { @@ -1666,7 +1675,7 @@ SdrOle2Obj& SdrOle2Obj::assignFrom( SetClosedObj( rObj.IsClosedObj() ); mpImpl->aPersistName = rOle2Obj.mpImpl->aPersistName; - aProgName = rOle2Obj.aProgName; + mpImpl->maProgName = rOle2Obj.mpImpl->maProgName; bFrame = rOle2Obj.bFrame; if (rOle2Obj.mpImpl->mpGraphic) |