summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/inc/filter.hxx2
-rw-r--r--sc/source/filter/excel/excform.cxx2
-rw-r--r--sc/source/filter/excel/excform8.cxx2
-rw-r--r--sc/source/filter/excel/exctools.cxx10
-rw-r--r--sc/source/filter/excel/xilink.cxx2
-rw-r--r--sc/source/filter/inc/eeimport.hxx2
-rw-r--r--sc/source/filter/inc/excdefs.hxx4
-rw-r--r--sc/source/filter/inc/excform.hxx4
-rw-r--r--sc/source/filter/inc/excscen.hxx12
-rw-r--r--sc/source/filter/rtf/eeimpars.cxx2
10 files changed, 21 insertions, 21 deletions
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index 8953892c3a24..6f6607322bd9 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -74,7 +74,7 @@ enum ExportFormatExcel { ExpBiff2, ExpBiff3, ExpBiff4, ExpBiff4W, ExpBiff5, ExpB
class ScEEAbsImport {
public:
virtual ~ScEEAbsImport() {}
- virtual sal_uLong Read( SvStream& rStream, const String& rBaseURL ) = 0;
+ virtual sal_uLong Read( SvStream& rStream, const OUString& rBaseURL ) = 0;
virtual ScRange GetRange() = 0;
virtual void WriteToDocument(
bool bSizeColsRows = false, double nOutputFactor = 1.0,
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index b605741c914a..a2df17e82eea 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -1327,7 +1327,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
}
ConvErr ExcelToSc::ConvertExternName( const ScTokenArray*& /*rpArray*/, XclImpStream& /*rStrm*/, sal_Size /*nFormulaLen*/,
- const String& /*rUrl*/, const vector<String>& /*rTabNames*/ )
+ const OUString& /*rUrl*/, const vector<OUString>& /*rTabNames*/ )
{
// not implemented ...
return ConvErrNi;
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index 23493ab74157..e52cb4dc9820 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -1255,7 +1255,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
}
ConvErr ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen,
- const String& rUrl, const vector<String>& rTabNames )
+ const OUString& rUrl, const vector<OUString>& rTabNames )
{
if( !GetDocShell() )
return ConvErrNi;
diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx
index e0bbfebefe6b..b053ac3a7d83 100644
--- a/sc/source/filter/excel/exctools.cxx
+++ b/sc/source/filter/excel/exctools.cxx
@@ -187,19 +187,19 @@ ExcScenario::ExcScenario( XclImpStream& rIn, const RootData& rR )
rIn.Ignore( 1 ); // statt nUser!
if( nName )
- pName = new String( rIn.ReadUniString( nName ) );
+ pName = new OUString( rIn.ReadUniString( nName ) );
else
{
- pName = new String( RTL_CONSTASCII_USTRINGPARAM( "Scenery" ) );
+ pName = new OUString( "Scenery" );
rIn.Ignore( 1 );
}
- pUserName = new String( rIn.ReadUniString() );
+ pUserName = new OUString( rIn.ReadUniString() );
if( nComment )
- pComment = new String( rIn.ReadUniString() );
+ pComment = new OUString( rIn.ReadUniString() );
else
- pComment = new String;
+ pComment = new OUString;
sal_uInt16 n = nCref;
sal_uInt16 nC, nR;
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index d72e734d2f47..f7119dc3c4ed 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -371,7 +371,7 @@ XclImpExtName::XclImpExtName( const XclImpSupbook& rSupbook, XclImpStream& rStrm
const ScTokenArray* pArray = NULL;
sal_uInt16 nFmlaLen;
rStrm >> nFmlaLen;
- vector<String> aTabNames;
+ vector<OUString> aTabNames;
sal_uInt16 nCount = rSupbook.GetTabCount();
aTabNames.reserve(nCount);
for (sal_uInt16 i = 0; i < nCount; ++i)
diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx
index d01d72cb5e8e..d51b0c4790d9 100644
--- a/sc/source/filter/inc/eeimport.hxx
+++ b/sc/source/filter/inc/eeimport.hxx
@@ -51,7 +51,7 @@ public:
ScEEImport( ScDocument* pDoc, const ScRange& rRange );
virtual ~ScEEImport();
- virtual sal_uLong Read( SvStream& rStream, const String& rBaseURL );
+ virtual sal_uLong Read( SvStream& rStream, const OUString& rBaseURL );
virtual ScRange GetRange() { return maRange; }
virtual void WriteToDocument( bool bSizeColsRows = false,
double nOutputFactor = 1.0,
diff --git a/sc/source/filter/inc/excdefs.hxx b/sc/source/filter/inc/excdefs.hxx
index bd84cedb72e4..41f56d5c47a2 100644
--- a/sc/source/filter/inc/excdefs.hxx
+++ b/sc/source/filter/inc/excdefs.hxx
@@ -59,8 +59,8 @@ const sal_uInt8 EXC_AFOPER_GREATEREQUAL = 0x06;
// defines for change tracking ================================================
-#define EXC_STREAM_USERNAMES String( "User Names" )
-#define EXC_STREAM_REVLOG String( "Revision Log" )
+#define EXC_STREAM_USERNAMES OUString( "User Names" )
+#define EXC_STREAM_REVLOG OUString( "Revision Log" )
// opcodes
#define EXC_CHTR_OP_COLFLAG 0x0001
diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx
index 11254a0914e0..3d1d9c9764e6 100644
--- a/sc/source/filter/inc/excform.hxx
+++ b/sc/source/filter/inc/excform.hxx
@@ -57,7 +57,7 @@ public:
virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula );
virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen,
- const String& rUrl, const ::std::vector<String>& rTabNames );
+ const OUString& rUrl, const ::std::vector<OUString>& rTabNames );
virtual sal_Bool GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen );
@@ -134,7 +134,7 @@ public:
virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula );
virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen,
- const String& rUrl, const ::std::vector<String>& rTabNames );
+ const OUString& rUrl, const ::std::vector<OUString>& rTabNames );
static inline sal_Bool IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 );
diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx
index 2765d22048f1..49a6e4240deb 100644
--- a/sc/source/filter/inc/excscen.hxx
+++ b/sc/source/filter/inc/excscen.hxx
@@ -32,16 +32,16 @@ class XclImpStream;
class ExcScenarioCell
{
private:
- String aValue;
+ OUString aValue;
public:
const sal_uInt16 nCol;
const sal_uInt16 nRow;
ExcScenarioCell( const sal_uInt16 nC, const sal_uInt16 nR );
- inline void SetValue( const String& rVal ) { aValue = rVal; }
+ inline void SetValue( const OUString& rVal ) { aValue = rVal; }
- inline const String& GetValue( void ) const { return aValue; }
+ inline const OUString& GetValue( void ) const { return aValue; }
};
class ExcScenario
@@ -56,9 +56,9 @@ public:
protected:
- String* pName;
- String* pComment;
- String* pUserName;
+ OUString* pName;
+ OUString* pComment;
+ OUString* pUserName;
sal_uInt8 nProtected;
const sal_uInt16 nTab;
boost::ptr_vector<ExcScenarioCell> aEntries;
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index fd97da61f100..dd15ff067b27 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -83,7 +83,7 @@ ScEEImport::~ScEEImport()
}
-sal_uLong ScEEImport::Read( SvStream& rStream, const String& rBaseURL )
+sal_uLong ScEEImport::Read( SvStream& rStream, const OUString& rBaseURL )
{
sal_uLong nErr = mpParser->Read( rStream, rBaseURL );
generated by cgit (git 2.34.1) at 2024-12-29 14:04:11 +0000