diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-31 16:03:46 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2012-01-31 21:38:58 -0500 |
| commit | c5bb73cae7c172ad0f02f8c67dd57b53337f1d78 (patch) | |
| tree | 67e2cfeb43b6c1803b766039fe49dfb1f438c07c /filter | |
| parent | 90413af046d22d1ea7376da4856846744049d613 (diff) | |
Get the whole thing to build after the method sig change in SdrObject.
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/eschesdo.cxx | 6 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 256b06a1249d..08ef01dd6a97 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -176,9 +176,9 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, break; // #i51348# get shape name - String aShapeName; + rtl::OUString aShapeName; if( const SdrObject* pSdrObj = rObj.GetSdrObject() ) - if( pSdrObj->GetName().Len() > 0 ) + if (!pSdrObj->GetName().isEmpty()) aShapeName = pSdrObj->GetName(); Point aTextRefPoint; @@ -223,7 +223,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, EscherPropertyContainer aPropOpt( mpEscherEx->GetGraphicProvider(), mpPicStrm, aRect100thmm ); // #i51348# shape name - if( aShapeName.Len() > 0 ) + if (!aShapeName.isEmpty()) aPropOpt.AddOpt( ESCHER_Prop_wzName, aShapeName ); if ( InteractionInfo* pInteraction = mpHostAppData ? mpHostAppData->GetInteractionInfo():NULL ) { diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 406b1532c4f0..8f25ac828f30 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4375,7 +4375,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, cons if ( pRet && bGrfRead && !aVisArea.IsEmpty() ) pRet->SetBLIPSizeRectangle( aVisArea ); - if ( !pRet->GetName().Len() ) // SJ 22.02.00 : PPT OLE IMPORT: + if (pRet->GetName().isEmpty()) // SJ 22.02.00 : PPT OLE IMPORT: { // name is already set in ImportOLE !! // JP 01.12.99: SetName before SetModel - because in the other order the Bug 70098 is active if ( ( eFlags & mso_blipflagType ) != mso_blipflagComment ) |