diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-07-25 20:35:59 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-26 09:01:30 +0100 |
commit | a307e03946cca3a8e93b37eb9113721bc4e512bb (patch) | |
tree | 74840d663f7fb7035c52c1ba8b6e033e82f45f90 /svx/source/svdraw/svdograf.cxx | |
parent | b14688f07f2d2e1e53cf0b99bd2f7a055e2ddb3d (diff) |
convert TakeObjNamePlural family to OUString
Change-Id: I947e47934677a4f9ced0bfc0db3932bcbbb25f36
Diffstat (limited to 'svx/source/svdraw/svdograf.cxx')
-rw-r--r-- | svx/source/svdraw/svdograf.cxx | 74 |
1 files changed, 39 insertions, 35 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index fb550c168561..65ef13a0278d 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -766,53 +766,57 @@ OUString SdrGrafObj::TakeObjNameSingul() const return sName.makeStringAndClear(); } -void SdrGrafObj::TakeObjNamePlural( XubString& rName ) const +OUString SdrGrafObj::TakeObjNamePlural() const { - if(pGraphic) - { - const SvgDataPtr& rSvgDataPtr = pGraphic->GetGraphic().getSvgData(); + if(!pGraphic) + return OUString(); - if(rSvgDataPtr.get()) - { - rName = ImpGetResStr(STR_ObjNamePluralGRAFSVG); - } - else + const SvgDataPtr& rSvgDataPtr = pGraphic->GetGraphic().getSvgData(); + + OUStringBuffer sName; + + if(rSvgDataPtr.get()) + { + sName.append(ImpGetResStr(STR_ObjNamePluralGRAFSVG)); + } + else + { + switch( pGraphic->GetType() ) { - switch( pGraphic->GetType() ) + case GRAPHIC_BITMAP: { - case GRAPHIC_BITMAP: - { - const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ? - ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPTRANSLNK : STR_ObjNamePluralGRAFBMPTRANS ) : - ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPLNK : STR_ObjNamePluralGRAFBMP ) ); + const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ? + ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPTRANSLNK : STR_ObjNamePluralGRAFBMPTRANS ) : + ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPLNK : STR_ObjNamePluralGRAFBMP ) ); - rName=ImpGetResStr( nId ); - } - break; + sName.append(ImpGetResStr(nId)); + } + break; - case GRAPHIC_GDIMETAFILE: - rName=ImpGetResStr( IsLinkedGraphic() ? STR_ObjNamePluralGRAFMTFLNK : STR_ObjNamePluralGRAFMTF ); - break; + case GRAPHIC_GDIMETAFILE: + sName.append(ImpGetResStr(IsLinkedGraphic() ? STR_ObjNamePluralGRAFMTFLNK : STR_ObjNamePluralGRAFMTF)); + break; - case GRAPHIC_NONE: - rName=ImpGetResStr( IsLinkedGraphic() ? STR_ObjNamePluralGRAFNONELNK : STR_ObjNamePluralGRAFNONE ); - break; + case GRAPHIC_NONE: + sName.append(ImpGetResStr(IsLinkedGraphic() ? STR_ObjNamePluralGRAFNONELNK : STR_ObjNamePluralGRAFNONE)); + break; - default: - rName=ImpGetResStr( IsLinkedGraphic() ? STR_ObjNamePluralGRAFLNK : STR_ObjNamePluralGRAF ); - break; - } + default: + sName.append(ImpGetResStr(IsLinkedGraphic() ? STR_ObjNamePluralGRAFLNK : STR_ObjNamePluralGRAF)); + break; } + } - const String aName(GetName()); + const OUString aName(GetName()); - if( aName.Len() ) - { - rName.AppendAscii( " '" ); - rName += aName; - rName += sal_Unicode( '\'' ); - } + if (!aName.isEmpty()) + { + sName.append(" '"); + sName.append(aName); + sName.append('\''); } + + return sName.makeStringAndClear(); } SdrObject* SdrGrafObj::getFullDragClone() const |