String to rtl::OUString.

sc/source/filter/excel/xiescher.cxx

@@ -392,7 +392,9 @@ void XclImpDrawObjBase::SetAnchor( const XclObjAnchor& rAnchor )
     mbHasAnchor = true;
 }
 
-void XclImpDrawObjBase::SetDffData( const DffObjData& rDffObjData, const String& rObjName, const String& rHyperlink, bool bVisible, bool bAutoMargin )
+void XclImpDrawObjBase::SetDffData(
+    const DffObjData& rDffObjData, const rtl::OUString& rObjName, const rtl::OUString& rHyperlink,
+    bool bVisible, bool bAutoMargin )
 {
     mnDffShapeId = rDffObjData.nShapeId;
     mnDffFlags = rDffObjData.nSpFlags;
@@ -483,8 +485,7 @@ void XclImpDrawObjBase::PreProcessSdrObject( XclImpDffConverter& rDffConv, SdrOb
 
     // macro and hyperlink
     // removed oracle/sun check for mbSimpleMacro ( no idea what its for )
-    if( (maMacroName.Len() > 0 ) ||
- (maHyperlink.Len() > 0) )
+    if (!maMacroName.isEmpty() || !maHyperlink.isEmpty())
     {
         if( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( &rSdrObj, sal_True ) )
         {
@@ -519,7 +520,7 @@ void XclImpDrawObjBase::ReadName5( XclImpStream& rStrm, sal_uInt16 nNameLen )
 
 void XclImpDrawObjBase::ReadMacro3( XclImpStream& rStrm, sal_uInt16 nMacroSize )
 {
-    maMacroName.Erase();
+    maMacroName = rtl::OUString();
     rStrm.Ignore( nMacroSize );
     // skip padding byte for word boundaries, not contained in nMacroSize
     if( rStrm.GetRecPos() & 1 ) rStrm.Ignore( 1 );
@@ -527,19 +528,19 @@ void XclImpDrawObjBase::ReadMacro3( XclImpStream& rStrm, sal_uInt16 nMacroSize )
 
 void XclImpDrawObjBase::ReadMacro4( XclImpStream& rStrm, sal_uInt16 nMacroSize )
 {
-    maMacroName.Erase();
+    maMacroName = rtl::OUString();
     rStrm.Ignore( nMacroSize );
 }
 
 void XclImpDrawObjBase::ReadMacro5( XclImpStream& rStrm, sal_uInt16 nMacroSize )
 {
-    maMacroName.Erase();
+    maMacroName = rtl::OUString();
     rStrm.Ignore( nMacroSize );
 }
 
 void XclImpDrawObjBase::ReadMacro8( XclImpStream& rStrm )
 {
-    maMacroName.Erase();
+    maMacroName = rtl::OUString();
     if( rStrm.GetRecLeft() > 6 )
     {
         // macro is stored in a tNameXR token containing a link to a defined name

sc/source/filter/inc/xiescher.hxx

@@ -80,7 +80,9 @@ public:
     /** Sets the object anchor explicitly. */
     void                SetAnchor( const XclObjAnchor& rAnchor );
     /** Sets shape data from DFF stream. */
-    void                SetDffData( const DffObjData& rDffObjData, const String& rObjName, const String& rHyperlink, bool bVisible, bool bAutoMargin );
+    void                SetDffData(
+        const DffObjData& rDffObjData, const rtl::OUString& rObjName, const rtl::OUString& rHyperlink,
+        bool bVisible, bool bAutoMargin );
 
     /** If set to false, the SdrObject will not be created, processed, or inserted into the draw page. */
     inline void         SetProcessSdrObj( bool bProcess ) { mbProcessSdr = bProcess; }
@@ -96,7 +98,7 @@ public:
     /** Returns the name of this object, may generate a default name. */
     virtual rtl::OUString GetObjName() const;
     /** Returns associated macro name, if set, otherwise zero length string. */
-    inline const String& GetMacroName() const { return maMacroName; }
+    inline const rtl::OUString& GetMacroName() const { return maMacroName; }
 
     /** Returns the shape identifier used in the DFF stream. */
     inline sal_uInt32   GetDffShapeId() const { return mnDffShapeId; }
@@ -193,8 +195,8 @@ private:
     sal_uInt32          mnDffShapeId;   /// Shape ID from DFF stream.
     sal_uInt32          mnDffFlags;     /// Shape flags from DFF stream.
     rtl::OUString       maObjName;      /// Name of the object.
-    String              maMacroName;    /// Name of an attached macro.
-    String              maHyperlink;    /// On-click hyperlink URL.
+    rtl::OUString       maMacroName;    /// Name of an attached macro.
+    rtl::OUString       maHyperlink;    /// On-click hyperlink URL.
     bool                mbHasAnchor;    /// true = maAnchor is initialized.
     bool                mbHidden;       /// true = Object is hidden.
     bool                mbVisible;      /// true = Object is visible.

sc/source/filter/inc/xltools.hxx

@@ -195,7 +195,7 @@ public:
         @descr  Ignores any characters following a valid representation of a built-in name.
         @param pcBuiltIn  (out-param) If not 0, the index of the built-in name will be returned here.
         @return  true = passed string is a built-in name; false = user-defined name. */
-    static sal_Unicode  GetBuiltInDefNameIndex( const String& rDefName );
+    static sal_Unicode  GetBuiltInDefNameIndex( const rtl::OUString& rDefName );
 
     // built-in style names ---------------------------------------------------
 
@@ -204,13 +204,13 @@ public:
         @param rName  Default name for unknown styles.
         @param nLevel  The zero-based outline level for RowLevel and ColLevel styles.
         @return  The style name or an empty string, if the parameters are not valid. */
-    static String       GetBuiltInStyleName( sal_uInt8 nStyleId, const String& rName, sal_uInt8 nLevel );
+    static rtl::OUString GetBuiltInStyleName( sal_uInt8 nStyleId, const rtl::OUString& rName, sal_uInt8 nLevel );
     /** Returns the passed style name with a special built-in prefix. */
-    static String       GetBuiltInStyleName( const String& rStyleName );
+    static rtl::OUString GetBuiltInStyleName( const rtl::OUString& rStyleName );
     /** Returns true, if the passed string is a name of an Excel built-in style.
         @param pnStyleId  If not 0, the found style identifier will be returned here.
         @param pnNextChar  If not 0, the index of the char after the evaluated substring will be returned here. */
-    static bool         IsBuiltInStyleName( const String& rStyleName, sal_uInt8* pnStyleId = 0, xub_StrLen* pnNextChar = 0 );
+    static bool         IsBuiltInStyleName( const rtl::OUString& rStyleName, sal_uInt8* pnStyleId = 0, sal_Int32* pnNextChar = 0 );
     /** Returns the Excel built-in style identifier of a passed style name.
         @param rnStyleId  The style identifier is returned here.
         @param rnLevel  The zero-based outline level for RowLevel and ColLevel styles is returned here.
@@ -218,7 +218,7 @@ public:
         @return  true = passed string is a built-in style name, false = user style. */
     static bool         GetBuiltInStyleId(
                             sal_uInt8& rnStyleId, sal_uInt8& rnLevel,
-                            const String& rStyleName );
+                            const rtl::OUString& rStyleName );
 
     // conditional formatting style names -------------------------------------
 
@@ -227,10 +227,10 @@ public:
         @param nFormat  The zero-based index of the conditional formatting.
         @param nCondition  The zero-based index of the condition.
         @return  A style sheet name in the form "Excel_CondFormat_<sheet>_<format>_<condition>". */
-    static String       GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition );
+    static rtl::OUString GetCondFormatStyleName( SCTAB nScTab, sal_Int32 nFormat, sal_uInt16 nCondition );
     /** Returns true, if the passed string is a name of a conditional format style created by Excel import.
         @param pnNextChar  If not 0, the index of the char after the evaluated substring will be returned here. */
-    static bool         IsCondFormatStyleName( const String& rStyleName, xub_StrLen* pnNextChar = 0 );
+    static bool         IsCondFormatStyleName( const rtl::OUString& rStyleName );
 
     // stream handling --------------------------------------------------------
 
@@ -240,20 +240,20 @@ public:
     // Basic macro names ------------------------------------------------------
 
     /** Returns the full StarBasic macro URL from an Excel macro name. */
-    static ::rtl::OUString GetSbMacroUrl( const String& rMacroName, SfxObjectShell* pDocShell = 0 );
+    static ::rtl::OUString GetSbMacroUrl( const rtl::OUString& rMacroName, SfxObjectShell* pDocShell = 0 );
     /** Returns the full StarBasic macro URL from an Excel module and macro name. */
-    static ::rtl::OUString GetSbMacroUrl( const String& rModuleName, const String& rMacroName, SfxObjectShell* pDocShell = 0 );
+    static ::rtl::OUString GetSbMacroUrl( const rtl::OUString& rModuleName, const rtl::OUString& rMacroName, SfxObjectShell* pDocShell = 0 );
     /** Returns the Excel macro name from a full StarBasic macro URL. */
-    static String       GetXclMacroName( const ::rtl::OUString& rSbMacroUrl );
+    static ::rtl::OUString GetXclMacroName( const ::rtl::OUString& rSbMacroUrl );
 
 // ------------------------------------------------------------------------
 private:
-    static const String maDefNamePrefix;            /// Prefix for built-in defined names.
-    static const String maDefNamePrefixXml;         /// Prefix for built-in defined names for OOX
-    static const String maStyleNamePrefix1;         /// Prefix for built-in cell style names.
-    static const String maStyleNamePrefix2;         /// Prefix for built-in cell style names from OOX filter.
-    static const String maCFStyleNamePrefix1;       /// Prefix for cond. formatting style names.
-    static const String maCFStyleNamePrefix2;       /// Prefix for cond. formatting style names from OOX filter.
+    static const ::rtl::OUString maDefNamePrefix;      /// Prefix for built-in defined names.
+    static const ::rtl::OUString maDefNamePrefixXml;   /// Prefix for built-in defined names for OOX
+    static const ::rtl::OUString maStyleNamePrefix1;   /// Prefix for built-in cell style names.
+    static const ::rtl::OUString maStyleNamePrefix2;   /// Prefix for built-in cell style names from OOX filter.
+    static const ::rtl::OUString maCFStyleNamePrefix1; /// Prefix for cond. formatting style names.
+    static const ::rtl::OUString maCFStyleNamePrefix2; /// Prefix for cond. formatting style names from OOX filter.
     static const ::rtl::OUString maSbMacroPrefix;   /// Prefix for StarBasic macros.
     static const ::rtl::OUString maSbMacroSuffix;   /// Suffix for StarBasic macros.