String to rtl::OUString.

8 files changed, 17 insertions, 17 deletions

diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index bf7bea0ba723..356df1ca028e 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -198,7 +198,7 @@ public:
 
     void        AddGroupDimension( const ScDPGroupDimension& rGroup );
     void        SetNumGroupDimension( long nIndex, const ScDPNumGroupDimension& rGroup );
-    long        GetDimensionIndex( const String& rName );
+    long        GetDimensionIndex( const rtl::OUString& rName );
 
     ScDocument* GetDocument()   { return pDoc; }
 
@@ -208,7 +208,7 @@ public:
     virtual const ScDPItemData* GetMemberById( long nDim, long nId);
     virtual long Compare( long nDim, long nDataId1, long nDataId2);
 
-    virtual String                  getDimensionName(long nColumn);
+    virtual rtl::OUString           getDimensionName(long nColumn);
     virtual sal_Bool                    getIsDataLayoutDimension(long nColumn);
     virtual sal_Bool                    IsDateDimension(long nDim);
     virtual sal_uLong                  GetNumberFormat(long nDim);
diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx
index 8be0cb9904fc..81d198ce345a 100644
--- a/sc/inc/dpsdbtab.hxx
+++ b/sc/inc/dpsdbtab.hxx
@@ -74,7 +74,7 @@ public:
     virtual ~ScDatabaseDPData();
 
     virtual long                    GetColumnCount();
-    virtual String                  getDimensionName(long nColumn);
+    virtual rtl::OUString           getDimensionName(long nColumn);
     virtual sal_Bool                    getIsDataLayoutDimension(long nColumn);
     virtual sal_Bool                    IsDateDimension(long nDim);
     virtual void                    DisposeData();
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index 7264f0cdbdc3..9df0d72e8f09 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -113,7 +113,7 @@ public:
     virtual ~ScSheetDPData();
 
     virtual long                    GetColumnCount();
-    virtual String                  getDimensionName(long nColumn);
+    virtual rtl::OUString           getDimensionName(long nColumn);
     virtual sal_Bool                    getIsDataLayoutDimension(long nColumn);
     virtual sal_Bool                    IsDateDimension(long nDim);
     virtual sal_uLong                   GetNumberFormat(long nDim);
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 31d32fe25706..e64f3fc8d0f8 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -135,7 +135,7 @@ public:
 
     virtual long                    GetColumnCount() = 0;
     virtual   const std::vector< SCROW >& GetColumnEntries( long nColumn ) ;
-    virtual String                  getDimensionName(long nColumn) = 0;
+    virtual rtl::OUString           getDimensionName(long nColumn) = 0;
     virtual sal_Bool                    getIsDataLayoutDimension(long nColumn) = 0;
     virtual sal_Bool                    IsDateDimension(long nDim) = 0;
     virtual sal_uLong                   GetNumberFormat(long nDim);
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 7888331deafa..bb66bf8ce98b 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -1039,10 +1039,10 @@ void ScDPGroupTableData::SetNumGroupDimension( long nIndex, const ScDPNumGroupDi
     }
 }
 
-long ScDPGroupTableData::GetDimensionIndex( const String& rName )
+long ScDPGroupTableData::GetDimensionIndex( const rtl::OUString& rName )
 {
-    for (long i=0; i<nSourceCount; i++)                         // nSourceCount excludes data layout
-        if ( pSourceData->getDimensionName(i) == rName )        //! ignore case?
+    for (long i = 0; i < nSourceCount; ++i)                         // nSourceCount excludes data layout
+        if (pSourceData->getDimensionName(i).equals(rName))        //! ignore case?
             return i;
     return -1;  // none
 }
@@ -1113,7 +1113,7 @@ const ScDPItemData* ScDPGroupTableData::GetMemberById( long nDim, long nId )
     return pSourceData->GetMemberById( nDim, nId );
 }
 
-String ScDPGroupTableData::getDimensionName(long nColumn)
+rtl::OUString ScDPGroupTableData::getDimensionName(long nColumn)
 {
     if ( nColumn >= nSourceCount )
     {
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index c67c3b9dc258..a4e732bc9ea1 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -101,7 +101,7 @@ long ScDatabaseDPData::GetColumnCount()
 }
 
 
-String ScDatabaseDPData::getDimensionName(long nColumn)
+rtl::OUString ScDatabaseDPData::getDimensionName(long nColumn)
 {
     if (getIsDataLayoutDimension(nColumn))
     {
@@ -111,7 +111,7 @@ String ScDatabaseDPData::getDimensionName(long nColumn)
     }
 
     CreateCacheTable();
-    return aCacheTable.getFieldName((SCCOL)nColumn);
+    return aCacheTable.getFieldName(static_cast<SCCOL>(nColumn));
 }
 
 sal_Bool ScDatabaseDPData::getIsDataLayoutDimension(long nColumn)
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index b0e2ffe0ed78..bde9ea0ca6f7 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -97,7 +97,7 @@ long ScSheetDPData::GetColumnCount()
     return aCacheTable.getColSize();
 }
 
-String ScSheetDPData::getDimensionName(long nColumn)
+rtl::OUString ScSheetDPData::getDimensionName(long nColumn)
 {
     CreateCacheTable();
     if (getIsDataLayoutDimension(nColumn))
@@ -109,11 +109,11 @@ String ScSheetDPData::getDimensionName(long nColumn)
     else if (nColumn >= aCacheTable.getColSize())
     {
         OSL_FAIL("getDimensionName: invalid dimension");
-        return String();
+        return rtl::OUString();
     }
     else
     {
-        return  aCacheTable.getFieldName((SCCOL)nColumn);
+        return aCacheTable.getFieldName(static_cast<SCCOL>(nColumn));
     }
 }
 
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 2cd05c64583a..9b6aa650de1b 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -450,10 +450,10 @@ Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<s
     for (sal_Int32 i = 0; i < nFilterCount; ++i)
     {
         const sheet::DataPilotFieldFilter& rFilter = aFilters[i];
-        String aFieldName( rFilter.FieldName );
+        const rtl::OUString& aFieldName = rFilter.FieldName;
         for (long nCol = 0; nCol < nColumnCount; ++nCol)
         {
-            if ( aFieldName == pData->getDimensionName(nCol) )
+            if (aFieldName.equals(pData->getDimensionName(nCol)))
             {
                 ScDPDimension* pDim = GetDimensionsObject()->getByIndex( nCol );
                 ScDPMembers* pMembers = pDim->GetHierarchiesObject()->getByIndex(0)->
@@ -473,7 +473,7 @@ Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<s
     }
 
     // Take into account the visibilities of field members.
-    ScDPResultVisibilityData aResVisData(/*rSharedString, */this);
+    ScDPResultVisibilityData aResVisData(this);
     pRowResRoot->FillVisibilityData(aResVisData);
     pColResRoot->FillVisibilityData(aResVisData);
     aResVisData.fillFieldFilters(aFilterCriteria);