More String to rtl::OUString conversion while I'm at it.

sc/inc/dpdimsave.hxx

@@ -102,9 +102,9 @@ public:
     const ScDPNumGroupInfo& GetDateInfo() const { return aDateInfo; }
 
     rtl::OUString CreateGroupName( const rtl::OUString& rPrefix );
-    const ScDPSaveGroupItem* GetNamedGroup( const String& rGroupName ) const;
-    ScDPSaveGroupItem* GetNamedGroupAcc( const String& rGroupName );
-    void    RemoveFromGroups( const String& rItemName );
+    const ScDPSaveGroupItem* GetNamedGroup( const rtl::OUString& rGroupName ) const;
+    ScDPSaveGroupItem* GetNamedGroupAcc( const rtl::OUString& rGroupName );
+    void    RemoveFromGroups( const rtl::OUString& rItemName );
     void RemoveGroup(const rtl::OUString& rGroupName);
     bool    IsEmpty() const;
     bool HasOnlyHidden(const ScDPUniqueStringSet& rVisible);
@@ -113,24 +113,24 @@ public:
     const ScDPSaveGroupItem* GetGroupByIndex( long nIndex ) const;
     ScDPSaveGroupItem* GetGroupAccByIndex( long nIndex );
 
-    void    Rename( const String& rNewName );
+    void    Rename( const rtl::OUString& rNewName );
 };
 
 class SC_DLLPUBLIC ScDPSaveNumGroupDimension
 {
-    String              aDimensionName;
+    rtl::OUString       aDimensionName;
     ScDPNumGroupInfo    aGroupInfo;
     ScDPNumGroupInfo    aDateInfo;
     sal_Int32           nDatePart;
 
 public:
-                ScDPSaveNumGroupDimension( const String& rName, const ScDPNumGroupInfo& rInfo );
-                ScDPSaveNumGroupDimension( const String& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart );
+                ScDPSaveNumGroupDimension( const rtl::OUString& rName, const ScDPNumGroupInfo& rInfo );
+                ScDPSaveNumGroupDimension( const rtl::OUString& rName, const ScDPNumGroupInfo& rDateInfo, sal_Int32 nPart );
                 ~ScDPSaveNumGroupDimension();
 
     void        AddToData( ScDPGroupTableData& rData ) const;
 
-    const String& GetDimensionName() const  { return aDimensionName; }
+    const rtl::OUString& GetDimensionName() const  { return aDimensionName; }
     const ScDPNumGroupInfo& GetInfo() const { return aGroupInfo; }
 
     sal_Int32   GetDatePart() const             { return nDatePart; }
@@ -150,42 +150,42 @@ public:
 
     void    WriteToData( ScDPGroupTableData& rData ) const;
 
-    String  CreateGroupDimName(
+    rtl::OUString CreateGroupDimName(
         const rtl::OUString& rSourceName, const ScDPObject& rObject, bool bAllowSource,
         const ::std::vector<rtl::OUString>* pDeletedNames );
 
-    String  CreateDateGroupDimName(
+    rtl::OUString CreateDateGroupDimName(
         sal_Int32 nDatePart, const ScDPObject& rObject, bool bAllowSource,
         const ::std::vector<rtl::OUString>* pDeletedNames );
 
     void    AddGroupDimension( const ScDPSaveGroupDimension& rGroupDim );
     void    ReplaceGroupDimension( const ScDPSaveGroupDimension& rGroupDim );
-    void    RemoveGroupDimension( const String& rGroupDimName );
+    void    RemoveGroupDimension( const rtl::OUString& rGroupDimName );
 
     void    AddNumGroupDimension( const ScDPSaveNumGroupDimension& rGroupDim );
     void    ReplaceNumGroupDimension( const ScDPSaveNumGroupDimension& rGroupDim );
-    void    RemoveNumGroupDimension( const String& rGroupDimName );
+    void    RemoveNumGroupDimension( const rtl::OUString& rGroupDimName );
 
-    const ScDPSaveGroupDimension* GetGroupDimForBase( const String& rBaseDimName ) const;
-    const ScDPSaveGroupDimension* GetNamedGroupDim( const String& rGroupDimName ) const;
-    const ScDPSaveGroupDimension* GetFirstNamedGroupDim( const String& rBaseDimName ) const;
-    const ScDPSaveGroupDimension* GetNextNamedGroupDim( const String& rGroupDimName ) const;
-    const ScDPSaveNumGroupDimension* GetNumGroupDim( const String& rGroupDimName ) const;
+    const ScDPSaveGroupDimension* GetGroupDimForBase( const rtl::OUString& rBaseDimName ) const;
+    const ScDPSaveGroupDimension* GetNamedGroupDim( const rtl::OUString& rGroupDimName ) const;
+    const ScDPSaveGroupDimension* GetFirstNamedGroupDim( const rtl::OUString& rBaseDimName ) const;
+    const ScDPSaveGroupDimension* GetNextNamedGroupDim( const rtl::OUString& rGroupDimName ) const;
+    const ScDPSaveNumGroupDimension* GetNumGroupDim( const rtl::OUString& rGroupDimName ) const;
 
-    ScDPSaveGroupDimension* GetGroupDimAccForBase( const String& rBaseDimName );
-    ScDPSaveGroupDimension* GetNamedGroupDimAcc( const String& rGroupDimName );
-    ScDPSaveGroupDimension* GetFirstNamedGroupDimAcc( const String& rBaseDimName );
-    ScDPSaveGroupDimension* GetNextNamedGroupDimAcc( const String& rGroupDimName );
+    ScDPSaveGroupDimension* GetGroupDimAccForBase( const rtl::OUString& rBaseDimName );
+    ScDPSaveGroupDimension* GetNamedGroupDimAcc( const rtl::OUString& rGroupDimName );
+    ScDPSaveGroupDimension* GetFirstNamedGroupDimAcc( const rtl::OUString& rBaseDimName );
+    ScDPSaveGroupDimension* GetNextNamedGroupDimAcc( const rtl::OUString& rGroupDimName );
 
-    ScDPSaveNumGroupDimension* GetNumGroupDimAcc( const String& rGroupDimName );
+    ScDPSaveNumGroupDimension* GetNumGroupDimAcc( const rtl::OUString& rGroupDimName );
 
     bool    HasGroupDimensions() const;
 
-    sal_Int32 CollectDateParts( const String& rBaseDimName ) const;
+    sal_Int32 CollectDateParts( const rtl::OUString& rBaseDimName ) const;
 
 private:
     typedef ::std::vector< ScDPSaveGroupDimension >         ScDPSaveGroupDimVec;
-    typedef ::std::map< String, ScDPSaveNumGroupDimension > ScDPSaveNumGroupDimMap;
+    typedef ::std::map<rtl::OUString, ScDPSaveNumGroupDimension> ScDPSaveNumGroupDimMap;
 
     ScDPDimensionSaveData& operator=( const ScDPDimensionSaveData& );