diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-01-04 18:12:06 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-04 18:14:14 +0100 |
| commit | a0d2c3c59fbe9324395152e544890fe298b60432 (patch) | |
| tree | 3da2fa24c54c655f70096f73c7cd9b117daf190f | |
| parent | 6d0b3fe0911c3dda143a64f186d85d1fc3af60bb (diff) | |
adapt RtfSdrExport and oox::vml::VMLExport to filter changes
| -rw-r--r-- | oox/inc/oox/export/vmlexport.hxx | 2 | ||||
| -rw-r--r-- | oox/source/export/vmlexport.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfsdrexport.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfsdrexport.hxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/oox/inc/oox/export/vmlexport.hxx b/oox/inc/oox/export/vmlexport.hxx index 54296a04d8fe..29ccdab1dbcb 100644 --- a/oox/inc/oox/export/vmlexport.hxx +++ b/oox/inc/oox/export/vmlexport.hxx @@ -111,7 +111,7 @@ private: virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 ); virtual void CloseContainer(); - virtual sal_uInt32 EnterGroup( const String& rShapeName, const Rectangle* pBoundRect = 0 ); + virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = 0 ); virtual void LeaveGroup(); virtual void AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0 ); diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index b843baffcd5d..407180c8ec53 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -99,7 +99,7 @@ void VMLExport::CloseContainer() EscherEx::CloseContainer(); } -sal_uInt32 VMLExport::EnterGroup( const String& rShapeName, const Rectangle* pRect ) +sal_uInt32 VMLExport::EnterGroup( const OUString& rShapeName, const Rectangle* pRect ) { sal_uInt32 nShapeId = GenerateShapeId(); @@ -108,8 +108,8 @@ sal_uInt32 VMLExport::EnterGroup( const String& rShapeName, const Rectangle* pRe pAttrList->add( XML_id, ShapeIdString( nShapeId ) ); - if ( rShapeName.Len() ) - pAttrList->add( XML_alt, OUStringToOString( OUString( rShapeName ), RTL_TEXTENCODING_UTF8 ) ); + if ( rShapeName.getLength() ) + pAttrList->add( XML_alt, OUStringToOString( rShapeName, RTL_TEXTENCODING_UTF8 ) ); // style if ( pRect ) diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index 91fe3002b267..2ca7ed621049 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -82,7 +82,7 @@ void RtfSdrExport::CloseContainer() EscherEx::CloseContainer(); } -sal_uInt32 RtfSdrExport::EnterGroup( const String& /*rShapeName*/, const Rectangle* /*pRect*/ ) +sal_uInt32 RtfSdrExport::EnterGroup( const OUString& /*rShapeName*/, const Rectangle* /*pRect*/ ) { SAL_INFO("sw.rtf", OSL_THIS_FUNC); diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx index 69c25d2cc624..12eafbf122b2 100644 --- a/sw/source/filter/ww8/rtfsdrexport.hxx +++ b/sw/source/filter/ww8/rtfsdrexport.hxx @@ -82,7 +82,7 @@ private: virtual void CloseContainer(); using EscherEx::EnterGroup; - virtual sal_uInt32 EnterGroup( const String& rShapeName, const Rectangle* pBoundRect = 0 ); + virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = 0 ); virtual void LeaveGroup(); virtual void AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0 ); |