summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-06 23:59:52 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-07 08:54:40 +0100
commit0d1eb4ab6c1093bb1cc94be73c1640b92a75521d (patch)
tree85b513f0f4b66820c57dd041093db2cfc4a47e5a /sd
parentc42d6682723230a2d86a0ef218496b35fab1db06 (diff)
ByteString->rtl::OString
Diffstat (limited to 'sd')
-rw-r--r--sd/source/filter/eppt/epptbase.hxx2
-rw-r--r--sd/source/filter/eppt/epptso.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index 79244e8e2811..ae4433d3e3a6 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -139,7 +139,7 @@ class PPTExBulletProvider
public :
- sal_uInt16 GetId( const ByteString& rUniqueId, Size& rGraphicSize );
+ sal_uInt16 GetId( const rtl::OString& rUniqueId, Size& rGraphicSize );
PPTExBulletProvider();
~PPTExBulletProvider();
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index da2ebfe09e3d..c0c81fd62be7 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -132,11 +132,11 @@ PPTExBulletProvider::~PPTExBulletProvider()
delete pGraphicProv;
}
-sal_uInt16 PPTExBulletProvider::GetId( const ByteString& rUniqueId, Size& rGraphicSize )
+sal_uInt16 PPTExBulletProvider::GetId( const rtl::OString& rUniqueId, Size& rGraphicSize )
{
sal_uInt16 nRetValue = 0xffff;
- if ( rUniqueId.Len() )
+ if ( !rUniqueId.isEmpty() )
{
Rectangle aRect;
GraphicObject aGraphicObject( rUniqueId );