summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/source/filter/excel/xecontent.cxx4
-rw-r--r--sc/source/filter/excel/xehelper.cxx4
-rw-r--r--sc/source/filter/excel/xeroot.cxx2
-rw-r--r--sc/source/filter/excel/xipage.cxx4
-rw-r--r--sc/source/filter/excel/xistyle.cxx6
-rw-r--r--sc/source/filter/excel/xlescher.cxx6
-rw-r--r--sc/source/filter/excel/xlformula.cxx22
-rw-r--r--sc/source/filter/excel/xlpage.cxx4
-rw-r--r--sc/source/filter/excel/xlroot.cxx10
-rw-r--r--sc/source/filter/excel/xlstyle.cxx6
-rw-r--r--sc/source/filter/excel/xltracer.cxx4
-rw-r--r--sc/source/filter/inc/xlconst.hxx12
-rw-r--r--sc/source/filter/inc/xlescher.hxx4
-rw-r--r--sc/source/filter/inc/xlformula.hxx12
-rw-r--r--sc/source/filter/inc/xlpage.hxx4
-rw-r--r--sc/source/filter/inc/xlpivot.hxx2
-rw-r--r--sc/source/filter/inc/xlroot.hxx20
-rw-r--r--sc/source/filter/inc/xlstyle.hxx6
-rw-r--r--sc/source/filter/inc/xltracer.hxx2
19 files changed, 67 insertions, 67 deletions
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 46ccfd0a03a7..e30f6d7294cb 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1556,7 +1556,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
{
if( pValData->GetDataMode() == SC_VALID_LIST )
{
- String aString;
+ OUString aString;
if( XclTokenArrayHelper::GetStringList( aString, *xScTokArr, '\n' ) )
{
OUStringBuffer sFormulaBuf;
@@ -1569,7 +1569,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
sal_Int32 nStringIx = 0;
for( xub_StrLen nToken = 0; nToken < nTokenCnt; ++nToken )
{
- String aToken( aString.GetToken( 0, '\n', nStringIx ) );
+ String aToken( aString.getToken( 0, '\n', nStringIx ) );
if( nToken > 0 )
{
mxString1->Append(OUString(static_cast<sal_Unicode>('\0')));
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 2a2e2dc46fd6..8c491a022753 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -750,8 +750,8 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico
(aNewData.mnWeight > EXC_FONTWGHT_NORMAL) ? WEIGHT_BOLD : WEIGHT_NORMAL,
aNewData.mbItalic ? ITALIC_NORMAL : ITALIC_NONE ) );
aNewData.maStyle = pFontList->GetStyleName( aFontInfo );
- if( aNewData.maStyle.Len() )
- aParaText += "," + OUString(aNewData.maStyle);
+ if( !aNewData.maStyle.isEmpty() )
+ aParaText += "," + aNewData.maStyle;
}
aParaText += "\"";
}
diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx
index b72503f8f3d4..521879cb879b 100644
--- a/sc/source/filter/excel/xeroot.cxx
+++ b/sc/source/filter/excel/xeroot.cxx
@@ -351,7 +351,7 @@ uno::Sequence< beans::NamedValue > XclExpRoot::GetEncryptionData() const
uno::Sequence< beans::NamedValue > XclExpRoot::GenerateDefaultEncryptionData() const
{
uno::Sequence< beans::NamedValue > aEncryptionData;
- if ( GetDefaultPassword().Len() > 0 )
+ if ( !GetDefaultPassword().isEmpty() )
aEncryptionData = GenerateEncryptionData( GetDefaultPassword() );
return aEncryptionData;
diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx
index dcc4168938a0..2894a80c6478 100644
--- a/sc/source/filter/excel/xipage.cxx
+++ b/sc/source/filter/excel/xipage.cxx
@@ -279,7 +279,7 @@ void XclImpPageSettings::Finalize()
XclImpHFConverter aHFConv( GetRoot() );
// header
- bool bHasHeader = (maData.maHeader.Len() != 0);
+ bool bHasHeader = !maData.maHeader.isEmpty();
SvxSetItem aHdrSetItem( GETITEM( rItemSet, SvxSetItem, ATTR_PAGE_HEADERSET ) );
SfxItemSet& rHdrItemSet = aHdrSetItem.GetItemSet();
rHdrItemSet.Put( SfxBoolItem( ATTR_PAGE_ON, bHasHeader ) );
@@ -315,7 +315,7 @@ void XclImpPageSettings::Finalize()
rItemSet.Put( aHdrSetItem );
// footer
- bool bHasFooter = (maData.maFooter.Len() != 0);
+ bool bHasFooter = !maData.maFooter.isEmpty();
SvxSetItem aFtrSetItem( GETITEM( rItemSet, SvxSetItem, ATTR_PAGE_FOOTERSET ) );
SfxItemSet& rFtrItemSet = aFtrSetItem.GetItemSet();
rFtrItemSet.Put( SfxBoolItem( ATTR_PAGE_ON, bHasFooter ) );
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 74cf2a429a53..197727e4c27c 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -191,7 +191,7 @@ void XclImpFont::SetFontData( const XclFontData& rFontData, bool bHasCharSet )
{
maData = rFontData;
mbHasCharSet = bHasCharSet;
- if( maData.maStyle.Len() )
+ if( !maData.maStyle.isEmpty() )
{
if( SfxObjectShell* pDocShell = GetDocShell() )
{
@@ -206,7 +206,7 @@ void XclImpFont::SetFontData( const XclFontData& rFontData, bool bHasCharSet )
}
}
}
- maData.maStyle.Erase();
+ maData.maStyle = "";
}
GuessScriptType();
SetAllUsedFlags( true );
@@ -663,7 +663,7 @@ void XclImpNumFmtBuffer::CreateScFormats()
sal_Int32 nCheckPos;
short nType = NUMBERFORMAT_DEFINED;
sal_uInt32 nKey;
- if( rNumFmt.maFormat.Len() )
+ if( !rNumFmt.maFormat.isEmpty() )
{
OUString aFormat( rNumFmt.maFormat );
rFormatter.PutandConvertEntry( aFormat, nCheckPos,
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index 00def4658a36..56fbb5587169 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -318,9 +318,9 @@ spTbxListenerData[] =
} // namespace
bool XclControlHelper::FillMacroDescriptor( ScriptEventDescriptor& rDescriptor,
- XclTbxEventType eEventType, const String& rXclMacroName, SfxObjectShell* pDocShell )
+ XclTbxEventType eEventType, const OUString& rXclMacroName, SfxObjectShell* pDocShell )
{
- if( rXclMacroName.Len() > 0 )
+ if( !rXclMacroName.isEmpty() )
{
rDescriptor.ListenerType = OUString::createFromAscii( spTbxListenerData[ eEventType ].mpcListenerType );
rDescriptor.EventMethod = OUString::createFromAscii( spTbxListenerData[ eEventType ].mpcEventMethod );
@@ -331,7 +331,7 @@ bool XclControlHelper::FillMacroDescriptor( ScriptEventDescriptor& rDescriptor,
return false;
}
-String XclControlHelper::ExtractFromMacroDescriptor(
+OUString XclControlHelper::ExtractFromMacroDescriptor(
const ScriptEventDescriptor& rDescriptor, XclTbxEventType eEventType, SfxObjectShell* /*pShell*/ )
{
if( (!rDescriptor.ScriptCode.isEmpty()) &&
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 8d2c77a03752..e18dcc857f9f 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -33,11 +33,11 @@ using namespace ::formula;
// Function data ==============================================================
-String XclFunctionInfo::GetMacroFuncName() const
+OUString XclFunctionInfo::GetMacroFuncName() const
{
if( IsMacroFunc() )
return String( mpcMacroName, RTL_TEXTENCODING_UTF8 );
- return EMPTY_STRING;
+ return OUString();
}
// abbreviations for function return token class
@@ -517,7 +517,7 @@ const XclFunctionInfo* XclFunctionProvider::GetFuncInfoFromXclFunc( sal_uInt16 n
return (aIt == maXclFuncMap.end()) ? 0 : aIt->second;
}
-const XclFunctionInfo* XclFunctionProvider::GetFuncInfoFromXclMacroName( const String& rXclMacroName ) const
+const XclFunctionInfo* XclFunctionProvider::GetFuncInfoFromXclMacroName( const OUString& rXclMacroName ) const
{
// only in import filter allowed, but do not test maXclMacroNameMap, it may be empty for old BIFF versions
OSL_ENSURE( !maXclFuncMap.empty(), "XclFunctionProvider::GetFuncInfoFromXclMacroName - wrong filter" );
@@ -703,24 +703,24 @@ void XclTokenArrayIterator::SkipSpaces()
// strings and string lists ---------------------------------------------------
-bool XclTokenArrayHelper::GetTokenString( String& rString, const FormulaToken& rScToken )
+bool XclTokenArrayHelper::GetTokenString( OUString& rString, const FormulaToken& rScToken )
{
bool bIsStr = (rScToken.GetType() == svString) && (rScToken.GetOpCode() == ocPush);
if( bIsStr ) rString = rScToken.GetString();
return bIsStr;
}
-bool XclTokenArrayHelper::GetString( String& rString, const ScTokenArray& rScTokArr )
+bool XclTokenArrayHelper::GetString( OUString& rString, const ScTokenArray& rScTokArr )
{
XclTokenArrayIterator aIt( rScTokArr, true );
// something is following the string token -> error
return aIt.Is() && GetTokenString( rString, *aIt ) && !++aIt;
}
-bool XclTokenArrayHelper::GetStringList( String& rStringList, const ScTokenArray& rScTokArr, sal_Unicode cSep )
+bool XclTokenArrayHelper::GetStringList( OUString& rStringList, const ScTokenArray& rScTokArr, sal_Unicode cSep )
{
bool bRet = true;
- String aString;
+ OUString aString;
XclTokenArrayIterator aIt( rScTokArr, true );
enum { STATE_START, STATE_STR, STATE_SEP, STATE_END } eState = STATE_START;
while( eState != STATE_END ) switch( eState )
@@ -730,12 +730,12 @@ bool XclTokenArrayHelper::GetStringList( String& rStringList, const ScTokenArray
break;
case STATE_STR:
bRet = GetTokenString( aString, *aIt );
- if( bRet ) rStringList.Append( aString );
+ if( bRet ) rStringList += aString ;
eState = (bRet && (++aIt).Is()) ? STATE_SEP : STATE_END;
break;
case STATE_SEP:
bRet = aIt->GetOpCode() == ocSep;
- if( bRet ) rStringList.Append( cSep );
+ if( bRet ) rStringList += OUString(cSep);
eState = (bRet && (++aIt).Is()) ? STATE_STR : STATE_END;
break;
default:;
@@ -745,7 +745,7 @@ bool XclTokenArrayHelper::GetStringList( String& rStringList, const ScTokenArray
void XclTokenArrayHelper::ConvertStringToList( ScTokenArray& rScTokArr, sal_Unicode cStringSep, bool bTrimLeadingSpaces )
{
- String aString;
+ OUString aString;
if( GetString( aString, rScTokArr ) )
{
rScTokArr.Clear();
@@ -753,7 +753,7 @@ void XclTokenArrayHelper::ConvertStringToList( ScTokenArray& rScTokArr, sal_Unic
sal_Int32 nStringIx = 0;
for( xub_StrLen nToken = 0; nToken < nTokenCnt; ++nToken )
{
- String aToken( aString.GetToken( 0, cStringSep, nStringIx ) );
+ String aToken( aString.getToken( 0, cStringSep, nStringIx ) );
if( bTrimLeadingSpaces )
aToken = comphelper::string::stripStart(aToken, ' ');
if( nToken > 0 )
diff --git a/sc/source/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxx
index 9f88f19a1da9..83ca60e6a88b 100644
--- a/sc/source/filter/excel/xlpage.cxx
+++ b/sc/source/filter/excel/xlpage.cxx
@@ -175,8 +175,8 @@ void XclPageData::SetDefaults()
maHorPageBreaks.clear();
maVerPageBreaks.clear();
mxBrushItem.reset();
- maHeader.Erase();
- maFooter.Erase();
+ maHeader = "";
+ maFooter = "";
mfLeftMargin = mfRightMargin = XclTools::GetInchFromHmm( EXC_MARGIN_DEFAULT_LR );
mfTopMargin = mfBottomMargin = XclTools::GetInchFromHmm( EXC_MARGIN_DEFAULT_TB );
mfHeaderMargin = mfFooterMargin = XclTools::GetInchFromHmm( EXC_MARGIN_DEFAULT_HF );
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index b21bb240d20f..75edc1836420 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -101,7 +101,7 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
mbExport( bExport )
{
maUserName = SvtUserOptions().GetLastName();
- if( maUserName.Len() == 0 )
+ if( maUserName.isEmpty() )
maUserName = "Calc";
switch( ScGlobal::GetDefaultScriptType() )
@@ -243,26 +243,26 @@ bool XclRoot::HasVbaStorage() const
return xRootStrg.Is() && xRootStrg->IsContained( EXC_STORAGE_VBA_PROJECT );
}
-SotStorageRef XclRoot::OpenStorage( SotStorageRef xStrg, const String& rStrgName ) const
+SotStorageRef XclRoot::OpenStorage( SotStorageRef xStrg, const OUString& rStrgName ) const
{
return mrData.mbExport ?
ScfTools::OpenStorageWrite( xStrg, rStrgName ) :
ScfTools::OpenStorageRead( xStrg, rStrgName );
}
-SotStorageRef XclRoot::OpenStorage( const String& rStrgName ) const
+SotStorageRef XclRoot::OpenStorage( const OUString& rStrgName ) const
{
return OpenStorage( GetRootStorage(), rStrgName );
}
-SotStorageStreamRef XclRoot::OpenStream( SotStorageRef xStrg, const String& rStrmName ) const
+SotStorageStreamRef XclRoot::OpenStream( SotStorageRef xStrg, const OUString& rStrmName ) const
{
return mrData.mbExport ?
ScfTools::OpenStorageStreamWrite( xStrg, rStrmName ) :
ScfTools::OpenStorageStreamRead( xStrg, rStrmName );
}
-SotStorageStreamRef XclRoot::OpenStream( const String& rStrmName ) const
+SotStorageStreamRef XclRoot::OpenStream( const OUString& rStrmName ) const
{
return OpenStream( GetRootStorage(), rStrmName );
}
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index 94a2550f165e..5db4602486e2 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -189,7 +189,7 @@ XclFontData::XclFontData( const SvxFont& rFont )
void XclFontData::Clear()
{
maName = "";
- maStyle.Erase();
+ maStyle = "";
maColor.SetColor( COL_AUTO );
mnHeight = 0;
mnWeight = EXC_FONTWGHT_DONTKNOW;
@@ -203,7 +203,7 @@ void XclFontData::Clear()
void XclFontData::FillFromVclFont( const Font& rFont )
{
maName = XclTools::GetXclFontName( rFont.GetName() ); // substitute with MS fonts
- maStyle.Erase();
+ maStyle = "";
maColor = rFont.GetColor();
SetScUnderline( rFont.GetUnderline() );
mnEscapem = EXC_FONTESC_NONE;
@@ -1491,7 +1491,7 @@ void XclNumFmtBuffer::InitializeImport()
maFmtMap.clear();
}
-void XclNumFmtBuffer::InsertFormat( sal_uInt16 nXclNumFmt, const String& rFormat )
+void XclNumFmtBuffer::InsertFormat( sal_uInt16 nXclNumFmt, const OUString& rFormat )
{
XclNumFmt& rNumFmt = maFmtMap[ nXclNumFmt ];
rNumFmt.maFormat = rFormat;
diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx
index 7250053ec69a..5a83ae37c5de 100644
--- a/sc/source/filter/excel/xltracer.cxx
+++ b/sc/source/filter/excel/xltracer.cxx
@@ -24,13 +24,13 @@
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::PropertyValue;
-XclTracer::XclTracer( const String& rDocUrl )
+XclTracer::XclTracer( const OUString& rDocUrl )
: mbEnabled(false)
, maFirstTimes(eTraceLength,true)
{
Sequence< PropertyValue > aConfigData( 1 );
aConfigData[ 0 ].Name = "DocumentURL";
- aConfigData[ 0 ].Value <<= OUString( rDocUrl );
+ aConfigData[ 0 ].Value <<= rDocUrl;
}
XclTracer::~XclTracer()
diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx
index fc7a6627a333..1fccc6aa2a4f 100644
--- a/sc/source/filter/inc/xlconst.hxx
+++ b/sc/source/filter/inc/xlconst.hxx
@@ -76,13 +76,13 @@ const SCTAB SCTAB_GLOBAL = SCTAB_MAX; /// A Calc sheet
// Storage/stream names -------------------------------------------------------
-#define EXC_STORAGE_OLE_LINKED String( "LNK" )
-#define EXC_STORAGE_OLE_EMBEDDED String( "MBD" )
-#define EXC_STORAGE_VBA_PROJECT String( "_VBA_PROJECT_CUR" )
+#define EXC_STORAGE_OLE_LINKED OUString( "LNK" )
+#define EXC_STORAGE_OLE_EMBEDDED OUString( "MBD" )
+#define EXC_STORAGE_VBA_PROJECT OUString( "_VBA_PROJECT_CUR" )
-#define EXC_STREAM_BOOK String( "Book" )
-#define EXC_STREAM_WORKBOOK String( "Workbook" )
-#define EXC_STREAM_CTLS String( "Ctls" )
+#define EXC_STREAM_BOOK OUString( "Book" )
+#define EXC_STREAM_WORKBOOK OUString( "Workbook" )
+#define EXC_STREAM_CTLS OUString( "Ctls" )
// Encoded URLs ---------------------------------------------------------------
diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx
index cb7df45cac9b..5ecd2726f9ca 100644
--- a/sc/source/filter/inc/xlescher.hxx
+++ b/sc/source/filter/inc/xlescher.hxx
@@ -419,10 +419,10 @@ public:
static bool FillMacroDescriptor(
::com::sun::star::script::ScriptEventDescriptor& rDescriptor,
XclTbxEventType eEventType,
- const String& rXclMacroName,
+ const OUString& rXclMacroName,
SfxObjectShell* pDocShell = 0 );
/** Tries to extract an Excel macro name from the passed macro descriptor. */
- static String ExtractFromMacroDescriptor(
+ static OUString ExtractFromMacroDescriptor(
const ::com::sun::star::script::ScriptEventDescriptor& rDescriptor,
XclTbxEventType eEventType, SfxObjectShell* pShell = NULL );
};
diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx
index 0a90e085dbcc..50eac341172b 100644
--- a/sc/source/filter/inc/xlformula.hxx
+++ b/sc/source/filter/inc/xlformula.hxx
@@ -322,7 +322,7 @@ struct XclFunctionInfo
/** Returns true, if the function is simulated by a macro call. */
inline bool IsMacroFunc() const { return mpcMacroName != 0; }
/** Returns the name of the external function as string. */
- String GetMacroFuncName() const;
+ OUString GetMacroFuncName() const;
};
// ----------------------------------------------------------------------------
@@ -338,7 +338,7 @@ public:
/** Returns the function data for an Excel function index, or 0 on error. */
const XclFunctionInfo* GetFuncInfoFromXclFunc( sal_uInt16 nXclFunc ) const;
/** Returns the function data for an Excel function simulated by a macro call, or 0 on error. */
- const XclFunctionInfo* GetFuncInfoFromXclMacroName( const String& rXclMacroName ) const;
+ const XclFunctionInfo* GetFuncInfoFromXclMacroName( const OUString& rXclMacroName ) const;
/** Returns the function data for a Calc opcode, or 0 on error. */
const XclFunctionInfo* GetFuncInfoFromOpCode( OpCode eOpCode ) const;
@@ -348,7 +348,7 @@ private:
private:
typedef ::std::map< sal_uInt16, const XclFunctionInfo* > XclFuncMap;
- typedef ::std::map< String, const XclFunctionInfo* > XclMacroNameMap;
+ typedef ::std::map< OUString, const XclFunctionInfo* > XclMacroNameMap;
typedef ::std::map< OpCode, const XclFunctionInfo* > ScFuncMap;
XclFuncMap maXclFuncMap; /// Maps Excel function indexes to function data.
@@ -499,12 +499,12 @@ public:
/** Tries to extract a string from the passed token.
@param rString (out-parameter) The string contained in the token.
@return true = Passed token is a string token, rString parameter is valid. */
- static bool GetTokenString( String& rString, const ::formula::FormulaToken& rScToken );
+ static bool GetTokenString( OUString& rString, const ::formula::FormulaToken& rScToken );
/** Parses the passed formula and tries to find a single string token, i.e. "abc".
@param rString (out-parameter) The string contained in the formula.
@return true = String token found, rString parameter is valid. */
- static bool GetString( String& rString, const ScTokenArray& rScTokArr );
+ static bool GetString( OUString& rString, const ScTokenArray& rScTokArr );
/** Parses the passed formula and tries to find a string token list, i.e. "abc";"def";"ghi".
@descr Returns the unquoted (!) strings in a single string, separated with the
@@ -513,7 +513,7 @@ public:
@param rStringList (out-parameter) All strings contained in the formula as list.
@param cSep List separator character.
@return true = String token list found, rString parameter is valid. */
- static bool GetStringList( String& rStringList, const ScTokenArray& rScTokArr, sal_Unicode cSep );
+ static bool GetStringList( OUString& rStringList, const ScTokenArray& rScTokArr, sal_Unicode cSep );
/** Tries to convert a formula that consists of a single string token to a list of strings.
@descr Example: The formula ="abc\ndef\nghi" will be converted to the formula
diff --git a/sc/source/filter/inc/xlpage.hxx b/sc/source/filter/inc/xlpage.hxx
index 2f5599fef736..31a5116e2807 100644
--- a/sc/source/filter/inc/xlpage.hxx
+++ b/sc/source/filter/inc/xlpage.hxx
@@ -98,8 +98,8 @@ struct XclPageData : private boost::noncopyable
ScfUInt16Vec maHorPageBreaks; /// Horizontal page breaks.
ScfUInt16Vec maVerPageBreaks; /// Vertical page breaks.
SvxBrushItemPtr mxBrushItem; /// Background bitmap.
- String maHeader; /// Excel header string (empty = off).
- String maFooter; /// Excel footer string (empty = off).
+ OUString maHeader; /// Excel header string (empty = off).
+ OUString maFooter; /// Excel footer string (empty = off).
double mfLeftMargin; /// Left margin in inches.
double mfRightMargin; /// Right margin in inches.
double mfTopMargin; /// Top margin in inches.
diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx
index eea36a8a94ef..2f14e1c15fa3 100644
--- a/sc/source/filter/inc/xlpivot.hxx
+++ b/sc/source/filter/inc/xlpivot.hxx
@@ -41,7 +41,7 @@ class XclExpStream;
// misc -----------------------------------------------------------------------
-#define EXC_STORAGE_PTCACHE String( "_SX_DB_CUR" )
+#define EXC_STORAGE_PTCACHE OUString( "_SX_DB_CUR" )
// strings
const sal_uInt16 EXC_PT_NOSTRING = 0xFFFF;
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index f2cf2d33aaea..9e734964055e 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -83,9 +83,9 @@ struct XclRootData
SotStorageRef mxRootStrg; /// The root OLE storage of imported/exported file.
ScDocument& mrDoc; /// The source or destination document.
OUString maDocUrl; /// Document URL of imported/exported file.
- String maBasePath; /// Base path of imported/exported file (path of maDocUrl).
- String maUserName; /// Current user name.
- const String maDefPassword; /// The default password used for stream encryption.
+ OUString maBasePath; /// Base path of imported/exported file (path of maDocUrl).
+ OUString maUserName; /// Current user name.
+ const OUString maDefPassword; /// The default password used for stream encryption.
rtl_TextEncoding meTextEnc; /// Text encoding to import/export byte strings.
LanguageType meSysLang; /// System language.
LanguageType meDocLang; /// Document language (import: from file, export: from system).
@@ -180,12 +180,12 @@ public:
/** Returns the document URL of the imported/exported file. */
inline const OUString& GetDocUrl() const { return mrData.maDocUrl; }
/** Returns the base path of the imported/exported file. */
- inline const String& GetBasePath() const { return mrData.maBasePath; }
+ inline const OUString& GetBasePath() const { return mrData.maBasePath; }
/** Returns the current user name. */
- inline const String& GetUserName() const { return mrData.maUserName; }
+ inline const OUString& GetUserName() const { return mrData.maUserName; }
/** Returns the default password used for stream encryption. */
- inline const String& GetDefaultPassword() const { return mrData.maDefPassword; }
+ inline const OUString& GetDefaultPassword() const { return mrData.maDefPassword; }
/** Requests and verifies a password from the medium or the user. */
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >
RequestEncryptionData( ::comphelper::IDocPasswordVerifier& rVerifier ) const;
@@ -197,13 +197,13 @@ public:
bool HasVbaStorage() const;
/** Tries to open a storage as child of the specified storage for reading or writing. */
- SotStorageRef OpenStorage( SotStorageRef xStrg, const String& rStrgName ) const;
+ SotStorageRef OpenStorage( SotStorageRef xStrg, const OUString& rStrgName ) const;
/** Tries to open a storage as child of the root storage for reading or writing. */
- SotStorageRef OpenStorage( const String& rStrgName ) const;
+ SotStorageRef OpenStorage( const OUString& rStrgName ) const;
/** Tries to open a new stream in the specified storage for reading or writing. */
- SotStorageStreamRef OpenStream( SotStorageRef xStrg, const String& rStrmName ) const;
+ SotStorageStreamRef OpenStream( SotStorageRef xStrg, const OUString& rStrmName ) const;
/** Tries to open a new stream in the root storage for reading or writing. */
- SotStorageStreamRef OpenStream( const String& rStrmName ) const;
+ SotStorageStreamRef OpenStream( const OUString& rStrmName ) const;
/** Returns the destination document (import) or source document (export). */
inline ScDocument& GetDoc() const { return mrData.mrDoc; }
diff --git a/sc/source/filter/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx
index 9cd2a2e3002f..d0fb72bbc0d8 100644
--- a/sc/source/filter/inc/xlstyle.hxx
+++ b/sc/source/filter/inc/xlstyle.hxx
@@ -288,7 +288,7 @@ class SvxFont;
struct XclFontData
{
OUString maName; /// Font name.
- String maStyle; /// String with styles (bold, italic).
+ OUString maStyle; /// String with styles (bold, italic).
Color maColor; /// Font color.
sal_uInt16 mnHeight; /// Font height in twips (1/20 of a point).
sal_uInt16 mnWeight; /// Boldness: 400=normal, 700=bold.
@@ -444,7 +444,7 @@ private:
struct XclNumFmt
{
- String maFormat; /// Format string, may be empty (meOffset used then).
+ OUString maFormat; /// Format string, may be empty (meOffset used then).
NfIndexTableOffset meOffset; /// SvNumberFormatter format index, if maFormat is empty.
LanguageType meLanguage; /// Language type to be set with the number format.
};
@@ -469,7 +469,7 @@ protected:
inline const XclNumFmtMap& GetFormatMap() const { return maFmtMap; }
/** Inserts a new number format for the specified Excel format index. */
- void InsertFormat( sal_uInt16 nXclNumFmt, const String& rFormat );
+ void InsertFormat( sal_uInt16 nXclNumFmt, const OUString& rFormat );
private:
/** Inserts built-in number formats for the current system language. */
diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx
index c465c86ee1e9..0340f854ec31 100644
--- a/sc/source/filter/inc/xltracer.hxx
+++ b/sc/source/filter/inc/xltracer.hxx
@@ -78,7 +78,7 @@ struct XclTracerDetails
class XclTracer
{
public:
- explicit XclTracer( const String& rDocUrl );
+ explicit XclTracer( const OUString& rDocUrl );
virtual ~XclTracer();
/** Returns true, if tracing is enabled. */
generated by cgit (git 2.34.1) at 2024-07-30 14:47:17 +0000