[Libreoffice-commits] .: oox/inc oox/source sw/source

[Libreoffice Gerrit user]

 oox/inc/oox/export/vmlexport.hxx      |    2 +-
 oox/source/export/vmlexport.cxx       |    6 +++---
 sw/source/filter/ww8/rtfsdrexport.cxx |    2 +-
 sw/source/filter/ww8/rtfsdrexport.hxx |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a0d2c3c59fbe9324395152e544890fe298b60432
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Jan 4 18:12:06 2013 +0100

    adapt RtfSdrExport and oox::vml::VMLExport to filter changes

diff --git a/oox/inc/oox/export/vmlexport.hxx b/oox/inc/oox/export/vmlexport.hxx
index 54296a0..29ccdab 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 b843baf..407180c 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 91fe300..2ca7ed6 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 69c25d2..12eafbf 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 );