String to rtl::OUString in the xls pivot table import code.

6 files changed, 84 insertions, 86 deletions

diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index afe46d8a56de..60e2166b4189 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -147,9 +147,9 @@ XclExpPCItem::XclExpPCItem( bool bValue ) :
 
 // ----------------------------------------------------------------------------
 
-bool XclExpPCItem::EqualsText( const String& rText ) const
+bool XclExpPCItem::EqualsText( const rtl::OUString& rText ) const
 {
-    return (rText.Len() == 0) ? IsEmpty() : (GetText() && (*GetText() == rText));
+    return rText.isEmpty() ? IsEmpty() : (GetText() && (*GetText() == rText));
 }
 
 bool XclExpPCItem::EqualsDouble( double fValue ) const
@@ -171,7 +171,7 @@ bool XclExpPCItem::EqualsBool( bool bValue ) const
 
 void XclExpPCItem::WriteBody( XclExpStream& rStrm )
 {
-    if( const String* pText = GetText() )
+    if( const rtl::OUString* pText = GetText() )
     {
         rStrm << XclExpString( *pText );
     }
@@ -291,7 +291,7 @@ const XclExpPCItem* XclExpPCField::GetItem( sal_uInt16 nItemIdx ) const
     return GetVisItemList().GetRecord( nItemIdx ).get();
 }
 
-sal_uInt16 XclExpPCField::GetItemIndex( const String& rItemName ) const
+sal_uInt16 XclExpPCField::GetItemIndex( const rtl::OUString& rItemName ) const
 {
     const XclExpPCItemList& rItemList = GetVisItemList();
     for( size_t nPos = 0, nSize = rItemList.GetSize(); nPos < nSize; ++nPos )
@@ -356,7 +356,8 @@ void XclExpPCField::InitStandardField( const ScRange& rRange )
     ScAddress aPos( rRange.aStart );
     rDoc.GetString( aPos.Col(), aPos.Row(), aPos.Tab(), maFieldInfo.maName );
     // #i76047# maximum field name length in pivot cache is 255
-    maFieldInfo.maName.Erase( ::std::min( maFieldInfo.maName.Len(), EXC_PC_MAXSTRLEN ) );
+    if (maFieldInfo.maName.getLength() > EXC_PC_MAXSTRLEN)
+        maFieldInfo.maName = maFieldInfo.maName.copy(0, EXC_PC_MAXSTRLEN);
 
     // loop over all cells, create pivot cache items
     for( aPos.IncRow(); (aPos.Row() <= rRange.aEnd.Row()) && (maOrigItemList.GetSize() < EXC_PC_MAXITEMCOUNT); aPos.IncRow() )
@@ -778,7 +779,7 @@ XclExpPCField* XclExpPivotCache::GetFieldAcc( sal_uInt16 nFieldIdx )
     return maFieldList.GetRecord( nFieldIdx ).get();
 }
 
-XclExpPCField* XclExpPivotCache::GetFieldAcc( const String& rFieldName )
+XclExpPCField* XclExpPivotCache::GetFieldAcc( const rtl::OUString& rFieldName )
 {
     XclExpPCField* pField = 0;
     for( size_t nPos = 0, nSize = maFieldList.GetSize(); !pField && (nPos < nSize); ++nPos )
@@ -984,9 +985,9 @@ XclExpPTItem::XclExpPTItem( sal_uInt16 nItemType, sal_uInt16 nCacheIdx, bool bUs
     maItemInfo.maVisName.mbUseCache = bUseCache;
 }
 
-const String& XclExpPTItem::GetItemName() const
+rtl::OUString XclExpPTItem::GetItemName() const
 {
-    return mpCacheItem ? mpCacheItem->ConvertToText() : EMPTY_STRING;
+    return mpCacheItem ? mpCacheItem->ConvertToText() : rtl::OUString();
 }
 
 void XclExpPTItem::SetPropertiesFromMember( const ScDPSaveMember& rSaveMem )
@@ -1024,9 +1025,9 @@ XclExpPTField::XclExpPTField( const XclExpPivotTable& rPTable, sal_uInt16 nCache
 
 // data access ----------------------------------------------------------------
 
-const String& XclExpPTField::GetFieldName() const
+rtl::OUString XclExpPTField::GetFieldName() const
 {
-    return mpCacheField ? mpCacheField->GetFieldName() : EMPTY_STRING;
+    return mpCacheField ? mpCacheField->GetFieldName() : rtl::OUString();
 }
 
 sal_uInt16 XclExpPTField::GetFieldIndex() const
@@ -1042,7 +1043,7 @@ sal_uInt16 XclExpPTField::GetLastDataInfoIndex() const
     return static_cast< sal_uInt16 >( maDataInfoVec.size() - 1 );
 }
 
-sal_uInt16 XclExpPTField::GetItemIndex( const String& rName, sal_uInt16 nDefaultIdx ) const
+sal_uInt16 XclExpPTField::GetItemIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const
 {
     for( size_t nPos = 0, nSize = maItemList.GetSize(); nPos < nSize; ++nPos )
         if( maItemList.GetRecord( nPos )->GetItemName() == rName )
@@ -1230,7 +1231,7 @@ void XclExpPTField::Save( XclExpStream& rStrm )
 
 // private --------------------------------------------------------------------
 
-XclExpPTItem* XclExpPTField::GetItemAcc( const String& rName )
+XclExpPTItem* XclExpPTField::GetItemAcc( const rtl::OUString& rName )
 {
     XclExpPTItem* pItem = 0;
     for( size_t nPos = 0, nSize = maItemList.GetSize(); !pItem && (nPos < nSize); ++nPos )
@@ -1324,12 +1325,12 @@ const XclExpPTField* XclExpPivotTable::GetField( sal_uInt16 nFieldIdx ) const
     return (nFieldIdx == EXC_SXIVD_DATA) ? &maDataOrientField : maFieldList.GetRecord( nFieldIdx ).get();
 }
 
-const XclExpPTField* XclExpPivotTable::GetField( const String& rName ) const
+const XclExpPTField* XclExpPivotTable::GetField( const rtl::OUString& rName ) const
 {
     return const_cast< XclExpPivotTable* >( this )->GetFieldAcc( rName );
 }
 
-sal_uInt16 XclExpPivotTable::GetDataFieldIndex( const String& rName, sal_uInt16 nDefaultIdx ) const
+sal_uInt16 XclExpPivotTable::GetDataFieldIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const
 {
     for( XclPTDataFieldPosVec::const_iterator aIt = maDataFields.begin(), aEnd = maDataFields.end(); aIt != aEnd; ++aIt )
         if( const XclExpPTField* pField = GetField( aIt->first ) )
@@ -1507,7 +1508,7 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm )
 
 // private --------------------------------------------------------------------
 
-XclExpPTField* XclExpPivotTable::GetFieldAcc( const String& rName )
+XclExpPTField* XclExpPivotTable::GetFieldAcc( const rtl::OUString& rName )
 {
     XclExpPTField* pField = 0;
     for( size_t nPos = 0, nSize = maFieldList.GetSize(); !pField && (nPos < nSize); ++nPos )
@@ -1672,7 +1673,7 @@ void XclExpPivotTable::Finalize()
 
 void XclExpPivotTable::WriteSxview( XclExpStream& rStrm ) const
 {
-    rStrm.StartRecord( EXC_ID_SXVIEW, 46 + maPTInfo.maTableName.Len() + maPTInfo.maDataName.Len() );
+    rStrm.StartRecord( EXC_ID_SXVIEW, 46 + maPTInfo.maTableName.getLength() + maPTInfo.maDataName.getLength() );
     rStrm << maPTInfo;
     rStrm.EndRecord();
 }
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index 89465817d665..4b517705ff95 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -106,7 +106,7 @@ void lclSetValue( const XclImpRoot& rRoot, const ScAddress& rScPos, double fValu
 void XclImpPCItem::WriteToSource( const XclImpRoot& rRoot, const ScAddress& rScPos ) const
 {
     ScDocument& rDoc = rRoot.GetDoc();
-    if( const String* pText = GetText() )
+    if( const rtl::OUString* pText = GetText() )
         rDoc.SetString( rScPos.Col(), rScPos.Row(), rScPos.Tab(), *pText );
     else if( const double* pfValue = GetDouble() )
         rDoc.SetValue( rScPos.Col(), rScPos.Row(), rScPos.Tab(), *pfValue );
@@ -199,12 +199,12 @@ XclImpPCField::~XclImpPCField()
 
 // general field/item access --------------------------------------------------
 
-const String& XclImpPCField::GetFieldName( const ScfStringVec& rVisNames ) const
+const rtl::OUString& XclImpPCField::GetFieldName( const ScfStringVec& rVisNames ) const
 {
     if( IsGroupChildField() && (mnFieldIdx < rVisNames.size()) )
     {
-        const String& rVisName = rVisNames[ mnFieldIdx ];
-        if( rVisName.Len() > 0 )
+        const rtl::OUString& rVisName = rVisNames[ mnFieldIdx ];
+        if (!rVisName.isEmpty())
             return rVisName;
     }
     return maFieldInfo.maName;
@@ -398,7 +398,7 @@ void XclImpPCField::ReadSxgroupinfo( XclImpStream& rStrm )
 
 void XclImpPCField::ConvertGroupField( ScDPSaveData& rSaveData, const ScfStringVec& rVisNames ) const
 {
-    if( GetFieldName( rVisNames ).Len() > 0 )
+    if (!GetFieldName(rVisNames).isEmpty())
     {
         if( IsStdGroupField() )
             ConvertStdGroupField( rSaveData, rVisNames );
@@ -898,12 +898,12 @@ XclImpPTItem::XclImpPTItem( const XclImpPCField* pCacheField ) :
 {
 }
 
-const String* XclImpPTItem::GetItemName() const
+const rtl::OUString* XclImpPTItem::GetItemName() const
 {
     if( mpCacheField )
         if( const XclImpPCItem* pCacheItem = mpCacheField->GetItem( maItemInfo.mnCacheIdx ) )
             //! TODO: use XclImpPCItem::ConvertToText(), if all conversions are available
-            return pCacheItem->IsEmpty() ? &String::EmptyString() : pCacheItem->GetText();
+            return pCacheItem->IsEmpty() ? NULL : pCacheItem->GetText();
     return 0;
 }
 
@@ -914,7 +914,7 @@ void XclImpPTItem::ReadSxvi( XclImpStream& rStrm )
 
 void XclImpPTItem::ConvertItem( ScDPSaveDimension& rSaveDim ) const
 {
-    if( const String* pItemName = GetItemName() )
+    if (const rtl::OUString* pItemName = GetItemName())
     {
         ScDPSaveMember& rMember = *rSaveDim.GetMemberByName( *pItemName );
         rMember.SetIsVisible( !::get_flag( maItemInfo.mnFlags, EXC_SXVI_HIDDEN ) );
@@ -940,16 +940,16 @@ const XclImpPCField* XclImpPTField::GetCacheField() const
     return xPCache ? xPCache->GetField( maFieldInfo.mnCacheIdx ) : 0;
 }
 
-const String& XclImpPTField::GetFieldName() const
+rtl::OUString XclImpPTField::GetFieldName() const
 {
     const XclImpPCField* pField = GetCacheField();
-    return pField ? pField->GetFieldName( mrPTable.GetVisFieldNames() ) : String::EmptyString();
+    return pField ? pField->GetFieldName( mrPTable.GetVisFieldNames() ) : rtl::OUString();
 }
 
-const String& XclImpPTField::GetVisFieldName() const
+rtl::OUString XclImpPTField::GetVisFieldName() const
 {
-    const String* pVisName = maFieldInfo.GetVisName();
-    return pVisName ? *pVisName : String::EmptyString();
+    const rtl::OUString* pVisName = maFieldInfo.GetVisName();
+    return pVisName ? *pVisName : rtl::OUString();
 }
 
 const XclImpPTItem* XclImpPTField::GetItem( sal_uInt16 nItemIdx ) const
@@ -957,7 +957,7 @@ const XclImpPTItem* XclImpPTField::GetItem( sal_uInt16 nItemIdx ) const
     return (nItemIdx < maItems.size()) ? maItems[ nItemIdx ].get() : 0;
 }
 
-const String* XclImpPTField::GetItemName( sal_uInt16 nItemIdx ) const
+const rtl::OUString* XclImpPTField::GetItemName( sal_uInt16 nItemIdx ) const
 {
     const XclImpPTItem* pItem = GetItem( nItemIdx );
     return pItem ? pItem->GetItemName() : 0;
@@ -1006,12 +1006,9 @@ void XclImpPTField::ConvertPageField( ScDPSaveData& rSaveData ) const
     OSL_ENSURE( maFieldInfo.mnAxes & EXC_SXVD_AXIS_PAGE, "XclImpPTField::ConvertPageField - no page field" );
     if( ScDPSaveDimension* pSaveDim = ConvertRCPField( rSaveData ) )
     {
-        const String* pName = GetItemName( maPageInfo.mnSelItem );
+        const rtl::OUString* pName = GetItemName( maPageInfo.mnSelItem );
         if (pName)
-        {
-            const OUString aName(*pName);
-            pSaveDim->SetCurrentPage(&aName);
-        }
+            pSaveDim->SetCurrentPage(pName);
     }
 }
 
@@ -1103,8 +1100,8 @@ ScDPSaveDimension* XclImpPTField::ConvertRCPField( ScDPSaveData& rSaveData ) con
     ConvertFieldInfo( rSaveDim );
 
     // visible name
-    if( const String* pVisName = maFieldInfo.GetVisName() )
-        if( pVisName->Len() > 0 )
+    if (const rtl::OUString* pVisName = maFieldInfo.GetVisName())
+        if (!pVisName->isEmpty())
             rSaveDim.SetLayoutName( *pVisName );
 
     // subtotal function(s)
@@ -1166,8 +1163,8 @@ void XclImpPTField::ConvertDataField( ScDPSaveDimension& rSaveDim, const XclPTDa
 void XclImpPTField::ConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, const XclPTDataFieldInfo& rDataInfo ) const
 {
     // visible name
-    if( const String* pVisName = rDataInfo.GetVisName() )
-        if( pVisName->Len() > 0 )
+    if (const rtl::OUString* pVisName = rDataInfo.GetVisName())
+        if (!pVisName->isEmpty())
             rSaveDim.SetLayoutName( *pVisName );
 
     // aggregation function
@@ -1185,7 +1182,7 @@ void XclImpPTField::ConvertDataFieldInfo( ScDPSaveDimension& rSaveDim, const Xcl
             aFieldRef.ReferenceField = pRefField->GetFieldName();
             aFieldRef.ReferenceItemType = rDataInfo.GetApiRefItemType();
             if( aFieldRef.ReferenceItemType == ::com::sun::star::sheet::DataPilotFieldReferenceItemType::NAMED )
-                if( const String* pRefItemName = pRefField->GetItemName( rDataInfo.mnRefItem ) )
+                if (const rtl::OUString* pRefItemName = pRefField->GetItemName(rDataInfo.mnRefItem))
                     aFieldRef.ReferenceItemName = *pRefItemName;
         }
 
@@ -1238,11 +1235,11 @@ const XclImpPTField* XclImpPivotTable::GetDataField( sal_uInt16 nDataFieldIdx )
     return 0;
 }
 
-const String& XclImpPivotTable::GetDataFieldName( sal_uInt16 nDataFieldIdx ) const
+rtl::OUString XclImpPivotTable::GetDataFieldName( sal_uInt16 nDataFieldIdx ) const
 {
     if( const XclImpPTField* pField = GetDataField( nDataFieldIdx ) )
         return pField->GetFieldName();
-    return EMPTY_STRING;
+    return rtl::OUString();
 }
 
 // records --------------------------------------------------------------------
@@ -1437,10 +1434,10 @@ void XclImpPivotTable::Convert()
     // create the DataPilot
     ScDPObject* pDPObj = new ScDPObject( GetDocPtr() );
     pDPObj->SetName( maPTInfo.maTableName );
-    if (maPTInfo.maDataName.Len() > 0)
+    if (!maPTInfo.maDataName.isEmpty())
         aSaveData.GetDataLayoutDimension()->SetLayoutName(maPTInfo.maDataName);
 
-    if (maPTViewEx9Info.maGrandTotalName.Len() > 0)
+    if (!maPTViewEx9Info.maGrandTotalName.isEmpty())
         aSaveData.SetGrandTotalName(maPTViewEx9Info.maGrandTotalName);
 
     pDPObj->SetSaveData( aSaveData );
diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx
index 5d2c4fed5d72..854c5805f594 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -60,10 +60,10 @@ XclPCItem::~XclPCItem()
 void XclPCItem::SetEmpty()
 {
     meType = EXC_PCITEM_EMPTY;
-    maText.Erase();
+    maText = rtl::OUString();
 }
 
-void XclPCItem::SetText( const String& rText )
+void XclPCItem::SetText( const rtl::OUString& rText )
 {
     meType = EXC_PCITEM_TEXT;
     maText = rText;
@@ -73,7 +73,7 @@ void XclPCItem::SetDouble( double fValue )
 {
     meType = EXC_PCITEM_DOUBLE;
     //! TODO convert double to string
-    maText.Erase();
+    maText = rtl::OUString();
     mfValue = fValue;
 }
 
@@ -81,14 +81,14 @@ void XclPCItem::SetDateTime( const DateTime& rDateTime )
 {
     meType = EXC_PCITEM_DATETIME;
     //! TODO convert date to string
-    maText.Erase();
+    maText = rtl::OUString();
     maDateTime = rDateTime;
 }
 
 void XclPCItem::SetInteger( sal_Int16 nValue )
 {
     meType = EXC_PCITEM_INTEGER;
-    maText = String::CreateFromInt32( nValue );
+    maText = rtl::OUString::valueOf(static_cast<sal_Int32>(nValue));
     mnValue = nValue;
 }
 
@@ -96,7 +96,7 @@ void XclPCItem::SetError( sal_uInt16 nError )
 {
     meType = EXC_PCITEM_ERROR;
     //! TODO convert error to string
-    maText.Erase();
+    maText = rtl::OUString();
     mnError = nError;
 }
 
@@ -104,7 +104,7 @@ void XclPCItem::SetBool( bool bValue )
 {
     meType = EXC_PCITEM_BOOL;
     //! TODO convert boolean to string
-    maText.Erase();
+    maText = rtl::OUString();
     mbValue = bValue;
 }
 
@@ -132,7 +132,7 @@ bool XclPCItem::IsEmpty() const
     return meType == EXC_PCITEM_EMPTY;
 }
 
-const String* XclPCItem::GetText() const
+const rtl::OUString* XclPCItem::GetText() const
 {
     return (meType == EXC_PCITEM_TEXT) ? &maText : 0;
 }
@@ -187,7 +187,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPCFieldInfo& rInfo )
     if( rStrm.GetRecLeft() >= 3 )
         rInfo.maName = rStrm.ReadUniString();
     else
-        rInfo.maName.Erase();
+        rInfo.maName = rtl::OUString();
     return rStrm;
 }
 
@@ -402,7 +402,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPTCachedName& rCachedName )
     rStrm >> nStrLen;
     rCachedName.mbUseCache = nStrLen == EXC_PT_NOSTRING;
     if( rCachedName.mbUseCache )
-        rCachedName.maName.Erase();
+        rCachedName.maName = rtl::OUString();
     else
         rCachedName.maName = rStrm.ReadUniString( nStrLen );
     return rStrm;
@@ -419,15 +419,15 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTCachedName& rCachedNam
 
 // ----------------------------------------------------------------------------
 
-const String* XclPTVisNameInfo::GetVisName() const
+const rtl::OUString* XclPTVisNameInfo::GetVisName() const
 {
     return HasVisName() ? &maVisName.maName : 0;
 }
 
-void XclPTVisNameInfo::SetVisName( const String& rName )
+void XclPTVisNameInfo::SetVisName( const rtl::OUString& rName )
 {
     maVisName.maName = rName;
-    maVisName.mbUseCache = rName.Len() == 0;
+    maVisName.mbUseCache = rName.isEmpty();
 }
 
 // Field item settings ========================================================
diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx
index b25609a2fbc4..a3472bc850a5 100644
--- a/sc/source/filter/inc/xepivot.hxx
+++ b/sc/source/filter/inc/xepivot.hxx
@@ -59,7 +59,7 @@ public:
 
     inline sal_uInt16   GetTypeFlag() const { return mnTypeFlag; }
 
-    bool                EqualsText( const String& rText ) const;
+    bool                EqualsText( const rtl::OUString& rText ) const;
     bool                EqualsDouble( double fValue ) const;
     bool                EqualsDateTime( const DateTime& rDateTime ) const;
     bool                EqualsBool( bool bValue ) const;
@@ -95,14 +95,14 @@ public:
     void                ConvertToNumGroup( const ScDPObject& rDPObj, const ScDPSaveNumGroupDimension& rNumGroupDim );
 
     /** Returns the name of this cache field. */
-    inline const String& GetFieldName() const { return maFieldInfo.maName; }
+    inline const rtl::OUString& GetFieldName() const { return maFieldInfo.maName; }
 
     /** Returns the number of visible items of this field. */
     sal_uInt16          GetItemCount() const;
     /** Returns the specified pivot cache item (returns visible items in groupings). */
     const XclExpPCItem* GetItem( sal_uInt16 nItemIdx ) const;
     /** Returns the index of a pivot cache item, or EXC_PC_NOITEM on error. */
-    sal_uInt16          GetItemIndex( const String& rItemName ) const;
+    sal_uInt16          GetItemIndex( const rtl::OUString& rItemName ) const;
 
     /** Returns the size an item index needs to write out. */
     sal_Size            GetIndexSize() const;
@@ -210,7 +210,7 @@ private:
     /** Returns read/write access to a pivot cache field. */
     XclExpPCField*      GetFieldAcc( sal_uInt16 nFieldIdx );
     /** Returns read/write access to a pivot cache field. */
-    XclExpPCField*      GetFieldAcc( const String& rFieldName );
+    XclExpPCField*      GetFieldAcc( const rtl::OUString& rFieldName );
 
     /** Adds all pivot cache fields. */
     void                AddFields( const ScDPObject& rDPObj );
@@ -269,7 +269,7 @@ public:
     explicit            XclExpPTItem( sal_uInt16 nItemType, sal_uInt16 nCacheIdx, bool bUseCache );
 
     /** Returns the internal name of this item. */
-    const String&       GetItemName() const;
+    rtl::OUString       GetItemName() const;
 
     /** Fills this item with properties from the passed save member. */
     void                SetPropertiesFromMember( const ScDPSaveMember& rSaveMem );
@@ -293,7 +293,7 @@ public:
     // data access ------------------------------------------------------------
 
     /** Returns the name of this field. */
-    const String&       GetFieldName() const;
+    rtl::OUString       GetFieldName() const;
     /** Returns the pivot table field list index of this field. */
     sal_uInt16          GetFieldIndex() const;
 
@@ -302,7 +302,7 @@ public:
 
     /** Returns the list index of an item by its name.
         @param nDefaultIdx  This value will be returned, if the item could not be found. */
-    sal_uInt16          GetItemIndex( const String& rName, sal_uInt16 nDefaultIdx ) const;
+    sal_uInt16          GetItemIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const;
 
     // fill data --------------------------------------------------------------
 
@@ -327,7 +327,7 @@ public:
     // ------------------------------------------------------------------------
 private:
     /** Returns an item by its name. */
-    XclExpPTItem*       GetItemAcc( const String& rName );
+    XclExpPTItem*       GetItemAcc( const rtl::OUString& rName );
 
     /** Appends a special item describing a field subtotal entry. */
     void                AppendSubtotalItem( sal_uInt16 nItemType );
@@ -367,11 +367,11 @@ public:
     /** Returns a pivot table field by its name. */
     const XclExpPTField* GetField( sal_uInt16 nFieldIdx ) const;
     /** Returns a pivot table field by its name. */
-    const XclExpPTField* GetField( const String& rName ) const;
+    const XclExpPTField* GetField( const rtl::OUString& rName ) const;
 
     /** Returns the data-field-only index of the first data field with the passed name.
         @param nDefaultIdx  This value will be returned, if the field could not be found. */
-    sal_uInt16          GetDataFieldIndex( const String& rName, sal_uInt16 nDefaultIdx ) const;
+    sal_uInt16          GetDataFieldIndex( const rtl::OUString& rName, sal_uInt16 nDefaultIdx ) const;
 
     /** Writes the entire pivot table. */
     virtual void        Save( XclExpStream& rStrm );
@@ -380,7 +380,7 @@ public:
     // ------------------------------------------------------------------------
 private:
     /** Returns a pivot table field by its name. */
-    XclExpPTField*      GetFieldAcc( const String& rName );
+    XclExpPTField*      GetFieldAcc( const rtl::OUString& rName );
     /** Returns a pivot table field corresponding to the passed save dimension. */
     XclExpPTField*      GetFieldAcc( const ScDPSaveDimension& rSaveDim );
 
diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx
index ee5d03b76b8a..edbe19371da7 100644
--- a/sc/source/filter/inc/xipivot.hxx
+++ b/sc/source/filter/inc/xipivot.hxx
@@ -86,7 +86,7 @@ public:
     // general field/item access ----------------------------------------------
 
     /** Returns the name of the field, uses the passed visible name if supported. */
-    const String&       GetFieldName( const ScfStringVec& rVisNames ) const;
+    const rtl::OUString& GetFieldName( const ScfStringVec& rVisNames ) const;
 
     /** Returns the base field if this is a grouping field. */
     const XclImpPCField* GetGroupBaseField() const;
@@ -224,7 +224,7 @@ public:
     explicit            XclImpPTItem( const XclImpPCField* pCacheField );
 
     /** Returns the internal name of the item or 0, if no name could be found. */
-    const String*       GetItemName() const;
+    const rtl::OUString* GetItemName() const;
 
     /** Reads an SXVI record containing data of this item. */
     void                ReadSxvi( XclImpStream& rStrm );
@@ -251,14 +251,14 @@ public:
     /** Returns the corresponding pivot cache field of this field. */
     const XclImpPCField* GetCacheField() const;
     /** Returns the name of this field that is used to create the Calc dimensions. */
-    const String&       GetFieldName() const;
+    rtl::OUString        GetFieldName() const;
     /** Returns the internally set visible name of this field. */
-    const String&       GetVisFieldName() const;
+    rtl::OUString        GetVisFieldName() const;
 
     /** Returns the specified item. */
     const XclImpPTItem* GetItem( sal_uInt16 nItemIdx ) const;
     /** Returns the internal name of the specified item. */
-    const String*       GetItemName( sal_uInt16 nItemIdx ) const;
+    const rtl::OUString* GetItemName( sal_uInt16 nItemIdx ) const;
 
     /** Returns the flags of the axes this field is part of. */
     inline sal_uInt16   GetAxes() const { return maFieldInfo.mnAxes; }
@@ -335,7 +335,7 @@ public:
     const String&       GetFieldName( sal_uInt16 nFieldIdx ) const;
 
     const XclImpPTField* GetDataField( sal_uInt16 nDataFieldIdx ) const;
-    const String&       GetDataFieldName( sal_uInt16 nDataFieldIdx ) const;
+    rtl::OUString GetDataFieldName( sal_uInt16 nDataFieldIdx ) const;
 
     // records ----------------------------------------------------------------
 
diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index bed377d1b941..1a888688d246 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -387,7 +387,7 @@ public:
     /** Sets the item to 'empty' type. */
     void                SetEmpty();
     /** Sets the item to 'text' type and adds the passed text. */
-    void                SetText( const String& rText );
+    void                SetText( const rtl::OUString& rText );
     /** Sets the item to 'double' type and adds the passed value. */
     void                SetDouble( double fValue );
     /** Sets the item to 'date/time' type and adds the passed date. */
@@ -402,7 +402,7 @@ public:
     /** Returns the current item type. */
     inline XclPCItemType GetType() const { return meType; }
     /** Returns the text representation of the item. */
-    inline const String& ConvertToText() const { return maText; }
+    inline const rtl::OUString& ConvertToText() const { return maText; }
 
     /** Returns true, if the passed iterm equals this item. */
     bool                IsEqual( const XclPCItem& rItem ) const;
@@ -410,7 +410,7 @@ public:
     /** Returns true, if the item type is 'empty'. */
     bool                IsEmpty() const;
     /** Returns pointer to text, if the item type is 'text', otherwise 0. */
-    const String*       GetText() const;
+    const rtl::OUString* GetText() const;
     /** Returns pointer to value, if the item type is 'double', otherwise 0. */
     const double*       GetDouble() const;
     /** Returns pointer to date, if the item type is 'date/time', otherwise 0. */
@@ -424,7 +424,7 @@ public:
 
 private:
     XclPCItemType       meType;         /// Type of the item.
-    String              maText;         /// Text representation of the item.
+    rtl::OUString       maText;         /// Text representation of the item.
     DateTime            maDateTime;     /// Value of a date/time item.
     union
     {
@@ -443,7 +443,7 @@ inline bool operator!=( const XclPCItem& rLeft, const XclPCItem& rRight ) { retu
 /** Contains data for a pivot cache field (SXFIELD record). */
 struct XclPCFieldInfo
 {
-    String              maName;         /// Name of the pivot cache field.
+    rtl::OUString       maName;         /// Name of the pivot cache field.
     sal_uInt16          mnFlags;        /// Various flags.
     sal_uInt16          mnGroupChild;   /// Field containing grouping info for this field.
     sal_uInt16          mnGroupBase;    /// Base field if this field contains grouping info.
@@ -542,7 +542,7 @@ struct XclPCInfo
     sal_uInt16          mnStdFields;    /// Number of standard pivot cache fields.
     sal_uInt16          mnTotalFields;  /// Number of all fields (standard, grouped, calculated).
     sal_uInt16          mnSrcType;      /// Database type.
-    String              maUserName;     /// Name of user who last modified the cache.
+    rtl::OUString       maUserName;     /// Name of user who last modified the cache.
 
     explicit            XclPCInfo();
 };
@@ -559,7 +559,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPCInfo& rInfo );
 /** A name for various pivot table info structs. Includes 'use cache' state. */
 struct XclPTCachedName
 {
-    String              maName;         /// The visible name, if used.
+    rtl::OUString       maName;         /// The visible name, if used.
     bool                mbUseCache;     /// true = Use name in cache instead of maName.
 
     inline explicit     XclPTCachedName() : mbUseCache( true ) {}
@@ -578,9 +578,9 @@ struct XclPTVisNameInfo
     /** Returns true, if the name is set explicitly (maVisName.mbUseCache is false). */
     inline bool         HasVisName() const { return !maVisName.mbUseCache; }
     /** Returns the name, if set explicitly (maVisName.mbUseCache is false). */
-    const String*       GetVisName() const;
+    const rtl::OUString* GetVisName() const;
     /** Sets the visible name and enables usage of cache if name is empty. */
-    void                SetVisName( const String& rName );
+    void                SetVisName( const rtl::OUString& rName );
 };
 
 // Field item settings ========================================================
@@ -719,8 +719,8 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTDataFieldInfo& rInfo )
 /** Contains data for a pivot table (SXVIEW record). */
 struct XclPTInfo
 {
-    String              maTableName;        /// The name of the pivot table.
-    String              maDataName;         /// The visible name of the data field.
+    rtl::OUString       maTableName;        /// The name of the pivot table.
+    rtl::OUString       maDataName;         /// The visible name of the data field.
     XclRange            maOutXclRange;      /// Output range.
     XclAddress          maDataXclPos;       /// First cell containing data.
     sal_uInt16          mnFirstHeadRow;     /// First heading row.
@@ -770,7 +770,7 @@ struct XclPTViewEx9Info
     sal_uInt32          mbReport;           /// 2 for report* fmts ?
     sal_uInt8           mnAutoFormat;       /// AutoFormat ID
     sal_uInt8           mnGridLayout;       /// 0 == gridlayout, 0x10 == modern
-    String              maGrandTotalName;
+    rtl::OUString       maGrandTotalName;
 
     explicit            XclPTViewEx9Info();
     void                Init( const ScDPObject& rDPObj );