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

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 );

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 )

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);
 

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 );