diff options
| -rw-r--r-- | include/svx/svdoole2.hxx | 10 | ||||
| -rw-r--r-- | sd/source/core/sdpage.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 18 |
3 files changed, 16 insertions, 16 deletions
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index af3c0f746bb3..76c705adf9cf 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -60,7 +60,7 @@ protected: svt::EmbeddedObjectRef xObjRef; Graphic* pGraphic; - String aProgName; + OUString aProgName; // Due to compatibility at SdrTextObj for now bool bFrame:1; @@ -110,13 +110,13 @@ public: // OLE object has got a separate PersistName member now; // !!! use ::SetPersistName( ... ) only, if you know what you do !!! - String GetPersistName() const; - void SetPersistName( const String& rPersistName ); + OUString GetPersistName() const; + void SetPersistName( const OUString& rPersistName ); // 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 String& rNam) { aProgName=rNam; } - const String& GetProgName() const { return aProgName; } + void SetProgName(const OUString& rNam) { aProgName=rNam; } + const OUString& GetProgName() const { return aProgName; } bool IsEmpty() const; void SetObjRef(const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rNewObjRef); diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 66f3eae8af46..5c431fc91262 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1459,10 +1459,10 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto { if( ((eKind == PRESOBJ_CHART) && - ( pOle2->GetProgName().EqualsAscii( "StarChart" ) || pOle2->IsChart() ) ) + ( pOle2->GetProgName() == "StarChart" || pOle2->IsChart() ) ) || ((eKind == PRESOBJ_CALC) && - ( pOle2->GetProgName().EqualsAscii( "StarCalc" ) || pOle2->IsCalc() ) ) ) + ( pOle2->GetProgName() == "StarCalc" || pOle2->IsCalc() ) ) ) { bFound = true; } diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 82389c4756fd..7a99354e3555 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -675,7 +675,7 @@ class SdrOle2ObjImpl public: // TODO/LATER: do we really need this pointer? GraphicObject* pGraphicObject; - String aPersistName; // name of object in persist + OUString aPersistName; // name of object in persist SdrLightEmbeddedClient_Impl* pLightClient; // must be registered as client only using AddOwnLightClient() call // New local var to avoid repeated loading if load of OLE2 fails @@ -1042,7 +1042,7 @@ void SdrOle2Obj::Reconnect_Impl() void SdrOle2Obj::Connect_Impl() { - if( pModel && mpImpl->aPersistName.Len() ) + if( pModel && !mpImpl->aPersistName.isEmpty() ) { try { @@ -1176,7 +1176,7 @@ void SdrOle2Obj::Disconnect() void SdrOle2Obj::RemoveListeners_Impl() { - if( xObjRef.is() && mpImpl->aPersistName.Len() ) + if( xObjRef.is() && !mpImpl->aPersistName.isEmpty() ) { try { @@ -1207,7 +1207,7 @@ void SdrOle2Obj::Disconnect_Impl() { try { - if ( pModel && mpImpl->aPersistName.Len() ) + if ( pModel && !mpImpl->aPersistName.isEmpty() ) { if( pModel->IsInDestruction() ) { @@ -1535,9 +1535,9 @@ SdrObject* SdrOle2Obj::getFullDragClone() const // ----------------------------------------------------------------------------- -void SdrOle2Obj::SetPersistName( const String& rPersistName ) +void SdrOle2Obj::SetPersistName( const OUString& rPersistName ) { - DBG_ASSERT( !mpImpl->aPersistName.Len(), "Persist name changed!"); + DBG_ASSERT( mpImpl->aPersistName.isEmpty(), "Persist name changed!"); mpImpl->aPersistName = rPersistName; mpImpl->mbLoadingOLEObjectFailed = false; @@ -1548,14 +1548,14 @@ void SdrOle2Obj::SetPersistName( const String& rPersistName ) void SdrOle2Obj::AbandonObject() { - mpImpl->aPersistName.Erase(); + mpImpl->aPersistName = ""; mpImpl->mbLoadingOLEObjectFailed = false; SetObjRef(0); } // ----------------------------------------------------------------------------- -String SdrOle2Obj::GetPersistName() const +OUString SdrOle2Obj::GetPersistName() const { return mpImpl->aPersistName; } @@ -1998,7 +1998,7 @@ sal_Bool SdrOle2Obj::Unload() void SdrOle2Obj::GetObjRef_Impl() { - if ( !xObjRef.is() && mpImpl->aPersistName.Len() && pModel && pModel->GetPersist() ) + if ( !xObjRef.is() && !mpImpl->aPersistName.isEmpty() && pModel && pModel->GetPersist() ) { // Only try loading if it did not went wrong up to now if(!mpImpl->mbLoadingOLEObjectFailed) |