sc/source/filter/excel/excform8.cxx | 6 ++--
sc/source/filter/excel/impop.cxx | 4 +-
sc/source/filter/excel/xepivot.cxx | 10 +++----
sc/source/filter/excel/xestyle.cxx | 16 +++++------
sc/source/filter/excel/xicontent.cxx | 50 +++++++++++++++++------------------
sc/source/filter/excel/xihelper.cxx | 44 ++++++++++++------------------
sc/source/filter/excel/xilink.cxx | 14 ++++-----
sc/source/filter/excel/xipivot.cxx | 6 ++--
sc/source/filter/inc/xicontent.hxx | 2 -
sc/source/filter/inc/xihelper.hxx | 11 ++-----
sc/source/filter/inc/xilink.hxx | 2 -
sc/source/filter/inc/xipivot.hxx | 6 ++--
12 files changed, 79 insertions(+), 92 deletions(-)
New commits:
commit 01ea5d7f6c92055a9a131c124f899968bb7c4023
Author: Ricardo Montania <rica...@linuxafundo.com.br>
Date: Tue Jun 18 16:57:15 2013 -0300
String.AppendAscii() cleanup in sc
Change-Id: I99e8834085573238f0d1d49576f73e945abc44d3
diff --git a/sc/source/filter/excel/excform8.cxx
b/sc/source/filter/excel/excform8.cxx
index 4cd9dce..8efbc1a 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -94,8 +94,8 @@ ExcelToSc8::~ExcelToSc8()
bool ExcelToSc8::GetExternalFileIdFromXti( sal_uInt16 nIxti, sal_uInt16&
rFileId ) const
{
- const String* pFileUrl = rLinkMan.GetSupbookUrl(nIxti);
- if (!pFileUrl || pFileUrl->Len() == 0 || !GetDocShell())
+ const OUString* pFileUrl = rLinkMan.GetSupbookUrl(nIxti);
+ if (!pFileUrl || pFileUrl->isEmpty() || !GetDocShell())
return false;
String aFileUrl = ScGlobal::GetAbsDocName(*pFileUrl, GetDocShell());
@@ -123,7 +123,7 @@ bool ExcelToSc8::Read3DTabReference( sal_uInt16 nIxti,
SCTAB& rFirstTab, SCTAB&
bool ExcelToSc8::HandleOleLink(sal_uInt16 nXtiIndex, const XclImpExtName&
rExtName, ExternalTabInfo& rExtInfo)
{
- const String* pUrl = rLinkMan.GetSupbookUrl(nXtiIndex);
+ const OUString* pUrl = rLinkMan.GetSupbookUrl(nXtiIndex);
if (!pUrl)
return false;
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 1c12861..2cf90d2 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -459,9 +459,9 @@ void ImportExcel::SheetPassword( void )
void ImportExcel::Externsheet( void )
{
- String aUrl, aTabName;
+ OUString aUrl, aTabName;
bool bSameWorkBook;
- String aEncodedUrl( aIn.ReadByteString( false ) );
+ OUString aEncodedUrl( aIn.ReadByteString( false ) );
XclImpUrlHelper::DecodeUrl( aUrl, aTabName, bSameWorkBook, *pExcRoot->pIR,
aEncodedUrl );
mnLastRefIdx = pExcRoot->pExtSheetBuff->Add( aUrl, aTabName, bSameWorkBook
);
}
diff --git a/sc/source/filter/excel/xepivot.cxx
b/sc/source/filter/excel/xepivot.cxx
index 4653e2d..a3f269b 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -920,9 +920,9 @@ namespace {
// ----------------------------------------------------------------------------
/** Returns a display string for a data field containing the field name and
aggregation function. */
-String lclGetDataFieldCaption( const String& rFieldName, GeneralFunction eFunc
)
+OUString lclGetDataFieldCaption( const OUString& rFieldName, GeneralFunction
eFunc )
{
- String aCaption;
+ OUString aCaption;
sal_uInt16 nResIdx = 0;
using namespace ::com::sun::star::sheet;
@@ -942,9 +942,9 @@ String lclGetDataFieldCaption( const String& rFieldName,
GeneralFunction eFunc )
default:;
}
if( nResIdx )
- aCaption.Assign( ScGlobal::GetRscString( nResIdx ) ).AppendAscii(
RTL_CONSTASCII_STRINGPARAM( " - " ) );
- aCaption.Append( rFieldName );
- return aCaption;
+ aCaption = ScGlobal::GetRscString( nResIdx ) + " - ";
+ aCaption += rFieldName;
+ return( aCaption );
}
// ----------------------------------------------------------------------------
diff --git a/sc/source/filter/excel/xestyle.cxx
b/sc/source/filter/excel/xestyle.cxx
index 3976927..8158af5 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1308,9 +1308,9 @@ void XclExpNumFmtBuffer::WriteFormatRecord( XclExpStream&
rStrm, const XclExpNum
namespace {
-String GetNumberFormatCode(XclRoot& rRoot, const sal_uInt16 nScNumFmt,
SvNumberFormatter* xFormatter, NfKeywordTable* pKeywordTable)
+OUString GetNumberFormatCode(XclRoot& rRoot, const sal_uInt16 nScNumFmt,
SvNumberFormatter* xFormatter, NfKeywordTable* pKeywordTable)
{
- String aFormatStr;
+ OUString aFormatStr;
if( const SvNumberformat* pEntry = rRoot.GetFormatter().GetEntry(
nScNumFmt ) )
{
@@ -1320,9 +1320,9 @@ String GetNumberFormatCode(XclRoot& rRoot, const
sal_uInt16 nScNumFmt, SvNumberF
Color* pColor = 0;
OUString aTemp;
const_cast< SvNumberformat* >( pEntry )->GetOutputString( 1.0,
aTemp, &pColor );
- aFormatStr.Append( '"' ).Append( aTemp ).AppendAscii( "\";\""
).Append( aTemp ).AppendAscii( "\";\"" );
+ aFormatStr += "\"" + aTemp + "\";\"" + aTemp + "\";\"";
const_cast< SvNumberformat* >( pEntry )->GetOutputString( 0.0,
aTemp, &pColor );
- aFormatStr.Append( aTemp ).Append( '"' );
+ aFormatStr += aTemp + "\"";
}
else
{
@@ -1339,17 +1339,17 @@ String GetNumberFormatCode(XclRoot& rRoot, const
sal_uInt16 nScNumFmt, SvNumberF
}
aFormatStr = pEntry->GetMappedFormatstring( *pKeywordTable,
*xFormatter->GetLocaleData() );
- if( aFormatStr.EqualsAscii( "Standard" ) )
- aFormatStr.AssignAscii( "General" );
+ if( aFormatStr.equalsAscii( "Standard" ) )
+ aFormatStr = "General";
}
}
else
{
OSL_FAIL( "XclExpNumFmtBuffer::WriteFormatRecord - format not found" );
- aFormatStr.AssignAscii( "General" );
+ aFormatStr = "General";
}
- return aFormatStr;
+ return( aFormatStr );
}
}
diff --git a/sc/source/filter/excel/xicontent.cxx
b/sc/source/filter/excel/xicontent.cxx
index e9430bf..6b40aba 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -98,10 +98,10 @@ namespace {
/** Reads character array and stores it into rString.
@param nChars Number of following characters (not byte count!).
@param b16Bit true = 16-bit characters, false = 8-bit characters. */
-void lclAppendString32( String& rString, XclImpStream& rStrm, sal_uInt32
nChars, bool b16Bit )
+void lclAppendString32( OUString& rString, XclImpStream& rStrm, sal_uInt32
nChars, bool b16Bit )
{
sal_uInt16 nReadChars = ulimit_cast< sal_uInt16 >( nChars );
- rString.Append( rStrm.ReadRawUniString( nReadChars, b16Bit ) );
+ rString += rStrm.ReadRawUniString( nReadChars, b16Bit );
// ignore remaining chars
sal_Size nIgnore = nChars - nReadChars;
if( b16Bit )
@@ -111,7 +111,7 @@ void lclAppendString32( String& rString, XclImpStream&
rStrm, sal_uInt32 nChars,
/** Reads 32-bit string length and the character array and stores it into
rString.
@param b16Bit true = 16-bit characters, false = 8-bit characters. */
-void lclAppendString32( String& rString, XclImpStream& rStrm, bool b16Bit )
+void lclAppendString32( OUString& rString, XclImpStream& rStrm, bool b16Bit )
{
lclAppendString32( rString, rStrm, rStrm.ReaduInt32(), b16Bit );
}
@@ -130,24 +130,24 @@ void lclIgnoreString32( XclImpStream& rStrm, bool b16Bit )
/** Converts a path to an absolute path.
@param rPath The source path. The resulting path is returned here.
@param nLevel Number of parent directories to add in front of the path. */
-void lclGetAbsPath( String& rPath, sal_uInt16 nLevel, SfxObjectShell*
pDocShell )
+void lclGetAbsPath( OUString& rPath, sal_uInt16 nLevel, SfxObjectShell*
pDocShell )
{
- String aTmpStr;
+ OUStringBuffer aTmpStr;
while( nLevel )
{
- aTmpStr.AppendAscii( "../" );
+ aTmpStr.append( "../" );
--nLevel;
}
- aTmpStr += rPath;
+ aTmpStr.append( rPath );
if( pDocShell )
{
bool bWasAbs = false;
- rPath = pDocShell->GetMedium()->GetURLObject().smartRel2Abs( aTmpStr,
bWasAbs ).GetMainURL( INetURLObject::NO_DECODE );
+ rPath = pDocShell->GetMedium()->GetURLObject().smartRel2Abs(
aTmpStr.makeStringAndClear(), bWasAbs ).GetMainURL( INetURLObject::NO_DECODE );
// full path as stored in SvxURLField must be encoded
}
else
- rPath = aTmpStr;
+ rPath = aTmpStr.makeStringAndClear();
}
/** Inserts the URL into a text cell. Does not modify value or formula cells.
*/
@@ -226,7 +226,7 @@ void XclImpHyperlink::ReadHlink( XclImpStream& rStrm )
rStrm.GetRoot().GetXFRangeBuffer().SetHyperlink( aXclRange, aString );
}
-String XclImpHyperlink::ReadEmbeddedData( XclImpStream& rStrm )
+OUString XclImpHyperlink::ReadEmbeddedData( XclImpStream& rStrm )
{
const XclImpRoot& rRoot = rStrm.GetRoot();
SfxObjectShell* pDocShell = rRoot.GetDocShell();
@@ -242,9 +242,9 @@ String XclImpHyperlink::ReadEmbeddedData( XclImpStream&
rStrm )
OSL_ENSURE( aGuid == XclTools::maGuidStdLink,
"XclImpHyperlink::ReadEmbeddedData - unknown header GUID" );
SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr< String > xLongName; // link / file name
- ::std::auto_ptr< String > xShortName; // 8.3-representation of file name
- ::std::auto_ptr< String > xTextMark; // text mark
+ ::std::auto_ptr< OUString > xLongName; // link / file name
+ ::std::auto_ptr< OUString > xShortName; // 8.3-representation of file
name
+ ::std::auto_ptr< OUString > xTextMark; // text mark
SAL_WNODEPRECATED_DECLARATIONS_POP
// description (ignore)
@@ -261,7 +261,7 @@ String XclImpHyperlink::ReadEmbeddedData( XclImpStream&
rStrm )
// UNC path
if( ::get_flag( nFlags, EXC_HLINK_UNC ) )
{
- xLongName.reset( new String );
+ xLongName.reset( new OUString );
lclAppendString32( *xLongName, rStrm, true );
lclGetAbsPath( *xLongName, 0, pDocShell );
}
@@ -274,7 +274,7 @@ String XclImpHyperlink::ReadEmbeddedData( XclImpStream&
rStrm )
{
sal_uInt16 nLevel = 0; // counter for level to climb down in path
rStrm >> nLevel;
- xShortName.reset( new String );
+ xShortName.reset( new OUString );
lclAppendString32( *xShortName, rStrm, false );
rStrm.Ignore( 24 );
@@ -286,7 +286,7 @@ String XclImpHyperlink::ReadEmbeddedData( XclImpStream&
rStrm )
rStrm >> nStrLen;
nStrLen /= 2; // it's byte count here...
rStrm.Ignore( 2 );
- xLongName.reset( new String );
+ xLongName.reset( new OUString );
lclAppendString32( *xLongName, rStrm, nStrLen, true );
lclGetAbsPath( *xLongName, nLevel, pDocShell );
}
@@ -298,7 +298,7 @@ String XclImpHyperlink::ReadEmbeddedData( XclImpStream&
rStrm )
sal_uInt32 nStrLen(0);
rStrm >> nStrLen;
nStrLen /= 2; // it's byte count here...
- xLongName.reset( new String );
+ xLongName.reset( new OUString );
lclAppendString32( *xLongName, rStrm, nStrLen, true );
if( !::get_flag( nFlags, EXC_HLINK_ABS ) )
lclGetAbsPath( *xLongName, 0, pDocShell );
@@ -312,7 +312,7 @@ String XclImpHyperlink::ReadEmbeddedData( XclImpStream&
rStrm )
// text mark
if( ::get_flag( nFlags, EXC_HLINK_MARK ) )
{
- xTextMark.reset( new String );
+ xTextMark.reset( new OUString );
lclAppendString32( *xTextMark, rStrm, true );
}
@@ -323,20 +323,20 @@ String XclImpHyperlink::ReadEmbeddedData( XclImpStream&
rStrm )
if( !xLongName.get() && xShortName.get() )
xLongName = xShortName;
else if( !xLongName.get() && xTextMark.get() )
- xLongName.reset( new String );
+ xLongName.reset( new OUString );
if( xLongName.get() )
{
if( xTextMark.get() )
{
- if( xLongName->Len() == 0 )
- xTextMark->SearchAndReplaceAll( '!', '.' );
- xLongName->Append( '#' );
- xLongName->Append( *xTextMark );
+ if( xLongName->isEmpty() )
+ xTextMark.reset( new OUString( xTextMark->replace( '!', '.' )
) );
+ xLongName.reset( new OUString( *xLongName + "#" ) );
+ xLongName.reset( new OUString( *xLongName + *xTextMark ) );
}
- return *xLongName;
+ return( *xLongName );
}
- return String::EmptyString();
+ return( OUString() );
}
void XclImpHyperlink::ConvertToValidTabName(String& rUrl)
diff --git a/sc/source/filter/excel/xihelper.cxx
b/sc/source/filter/excel/xihelper.cxx
index 824f4c4..2dc0b0b 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -596,22 +596,22 @@ void XclImpHFConverter::SetNewPortion( XclImpHFPortion
eNew )
namespace {
-void lclAppendUrlChar( String& rUrl, sal_Unicode cChar )
+void lclAppendUrlChar( OUString& rUrl, sal_Unicode cChar )
{
// encode special characters
switch( cChar )
{
- case '#': rUrl.AppendAscii( "%23" ); break;
- case '%': rUrl.AppendAscii( "%25" ); break;
- default: rUrl.Append( cChar );
+ case '#': rUrl += "%23"; break;
+ case '%': rUrl += "%25"; break;
+ default: rUrl += OUString( cChar );
}
}
} // namespace
void XclImpUrlHelper::DecodeUrl(
- String& rUrl, String& rTabName, bool& rbSameWb,
- const XclImpRoot& rRoot, const String& rEncodedUrl )
+ OUString& rUrl, OUString& rTabName, bool& rbSameWb,
+ const XclImpRoot& rRoot, const OUString& rEncodedUrl )
{
enum
{
@@ -630,7 +630,7 @@ void XclImpUrlHelper::DecodeUrl(
if( (aDosBase.Len() > 2) && aDosBase.EqualsAscii( ":\\", 1, 2 ) )
cCurrDrive = aDosBase.GetChar( 0 );
- const sal_Unicode* pChar = rEncodedUrl.GetBuffer();
+ const sal_Unicode* pChar = rEncodedUrl.getStr();
while( *pChar )
{
switch( eState )
@@ -674,35 +674,35 @@ void XclImpUrlHelper::DecodeUrl(
{
++pChar;
if( *pChar == '@' )
- rUrl.AppendAscii( "\\\\" );
+ rUrl += "\\\\";
else
{
lclAppendUrlChar( rUrl, *pChar );
- rUrl.AppendAscii( ":\\" );
+ rUrl += ":\\";
}
}
else
- rUrl.AppendAscii( "<NULL-DRIVE!>" );
+ rUrl += "<NULL-DRIVE!>";
}
break;
case EXC_URL_DRIVEROOT:
if( cCurrDrive )
{
lclAppendUrlChar( rUrl, cCurrDrive );
- rUrl.Append( ':' );
+ rUrl += ":";
}
// run through
case EXC_URL_SUBDIR:
if( bEncoded )
- rUrl.Append( '\\' );
+ rUrl += "\\";
else // control character in raw name -> DDE link
{
- rUrl.Append( EXC_DDE_DELIM );
+ rUrl += OUString( EXC_DDE_DELIM );
eState = xlUrlRaw;
}
break;
case EXC_URL_PARENTDIR:
- rUrl.AppendAscii( "..\\" );
+ rUrl += "..\\";
break;
case EXC_URL_RAW:
{
@@ -739,7 +739,7 @@ void XclImpUrlHelper::DecodeUrl(
// --- sheet name ---
case xlUrlSheetName:
- rTabName.Append( *pChar );
+ rTabName += OUString( *pChar );
break;
// --- raw read mode ---
@@ -754,21 +754,13 @@ void XclImpUrlHelper::DecodeUrl(
}
void XclImpUrlHelper::DecodeUrl(
- String& rUrl, bool& rbSameWb, const XclImpRoot& rRoot, const String&
rEncodedUrl )
-{
- String aTabName;
- DecodeUrl( rUrl, aTabName, rbSameWb, rRoot, rEncodedUrl );
- OSL_ENSURE( !aTabName.Len(), "XclImpUrlHelper::DecodeUrl - sheet name
ignored" );
-}
-
-void XclImpUrlHelper::DecodeUrl(
OUString& rUrl, bool& rbSameWb, const XclImpRoot& rRoot, const OUString&
rEncodedUrl )
{
- String aTabName;
- String aUrl;
+ OUString aTabName;
+ OUString aUrl;
DecodeUrl( aUrl, aTabName, rbSameWb, rRoot, rEncodedUrl );
rUrl = aUrl;
- OSL_ENSURE( !aTabName.Len(), "XclImpUrlHelper::DecodeUrl - sheet name
ignored" );
+ OSL_ENSURE( aTabName.isEmpty(), "XclImpUrlHelper::DecodeUrl - sheet name
ignored" );
}
bool XclImpUrlHelper::DecodeLink( String& rApplic, String& rTopic, const
String rEncUrl )
diff --git a/sc/source/filter/excel/xilink.cxx
b/sc/source/filter/excel/xilink.cxx
index 7ccc4ae..813b64da 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -105,7 +105,7 @@ public:
inline XclSupbookType GetType() const { return meType; }
/** Returns the URL of the external document. */
- inline const String& GetXclUrl() const { return maXclUrl; }
+ inline const OUString& GetXclUrl() const { return maXclUrl; }
/** Returns the external name specified by an index from the Excel
document (one-based). */
const XclImpExtName* GetExternName( sal_uInt16 nXclIndex ) const;
@@ -129,7 +129,7 @@ private:
XclImpSupbookTabList maSupbTabList; /// All sheet names of the
document.
XclImpExtNameList maExtNameList; /// All external names of the
document.
- String maXclUrl; /// URL of the external document
(Excel mode).
+ OUString maXclUrl; /// URL of the external document
(Excel mode).
String maFilterName; /// Detected filer name.
String maFilterOpt; /// Detected filer options.
XclSupbookType meType; /// Type of the supbook record.
@@ -185,7 +185,7 @@ public:
/** Returns the absolute file URL of a supporting workbook specified by
the index. */
- const String* GetSupbookUrl( sal_uInt16 nXtiIndex ) const;
+ const OUString* GetSupbookUrl( sal_uInt16 nXtiIndex ) const;
const String& GetSupbookTabName( sal_uInt16 nXti, sal_uInt16 nXtiTab
) const;
@@ -632,11 +632,11 @@ XclImpSupbook::XclImpSupbook( XclImpStream& rStrm ) :
return;
}
- String aEncUrl( rStrm.ReadUniString() );
+ OUString aEncUrl( rStrm.ReadUniString() );
bool bSelf = false;
XclImpUrlHelper::DecodeUrl( maXclUrl, bSelf, GetRoot(), aEncUrl );
- if( maXclUrl.EqualsIgnoreCaseAscii( "\010EUROTOOL.XLA" ) )
+ if( maXclUrl.equalsIgnoreAsciiCase( "\010EUROTOOL.XLA" ) )
{
meType = EXC_SBTYPE_EUROTOOL;
maSupbTabList.push_back( new XclImpSupbookTab( maXclUrl ) );
@@ -809,7 +809,7 @@ const XclImpExtName* XclImpLinkManagerImpl::GetExternName(
sal_uInt16 nXtiIndex,
return pSupbook ? pSupbook->GetExternName( nExtName ) : 0;
}
-const String* XclImpLinkManagerImpl::GetSupbookUrl( sal_uInt16 nXtiIndex )
const
+const OUString* XclImpLinkManagerImpl::GetSupbookUrl( sal_uInt16 nXtiIndex )
const
{
const XclImpSupbook* p = GetSupbook( nXtiIndex );
if (!p)
@@ -911,7 +911,7 @@ const XclImpExtName* XclImpLinkManager::GetExternName(
sal_uInt16 nXtiIndex, sal
return mxImpl->GetExternName( nXtiIndex, nExtName );
}
-const String* XclImpLinkManager::GetSupbookUrl( sal_uInt16 nXtiIndex ) const
+const OUString* XclImpLinkManager::GetSupbookUrl( sal_uInt16 nXtiIndex ) const
{
return mxImpl->GetSupbookUrl(nXtiIndex);
}
diff --git a/sc/source/filter/excel/xipivot.cxx
b/sc/source/filter/excel/xipivot.cxx
index a79d05a..ad39d02 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -625,12 +625,12 @@ void XclImpPivotCache::ReadDconref( XclImpStream& rStrm )
/* Read DCONREF only once (by checking maTabName), there may be other
DCONREF records in another context. Read reference only if a leading
SXVS record is present (by checking mnSrcType). */
- if( (maTabName.Len() > 0) || (mnSrcType != EXC_SXVS_SHEET) )
+ if( !maTabName.isEmpty() || (mnSrcType != EXC_SXVS_SHEET) )
return;
XclRange aXclRange( ScAddress::UNINITIALIZED );
aXclRange.Read( rStrm, false );
- String aEncUrl = rStrm.ReadUniString();
+ OUString aEncUrl = rStrm.ReadUniString();
XclImpUrlHelper::DecodeUrl( maUrl, maTabName, mbSelfRef, GetRoot(),
aEncUrl );
@@ -704,7 +704,7 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream&
rStrm )
nScTab = rDoc.GetTableCount();
rDoc.MakeTable( nScTab );
OUStringBuffer aDummyName(OUString("DPCache"));
- if( maTabName.Len() > 0 )
+ if( maTabName.getLength() > 0 )
aDummyName.append( '_' ).append( maTabName );
OUString aName = aDummyName.makeStringAndClear();
rDoc.CreateValidTabName( aName );
diff --git a/sc/source/filter/inc/xicontent.hxx
b/sc/source/filter/inc/xicontent.hxx
index 851673a..46493ba 100644
--- a/sc/source/filter/inc/xicontent.hxx
+++ b/sc/source/filter/inc/xicontent.hxx
@@ -78,7 +78,7 @@ public:
static void ReadHlink( XclImpStream& rStrm );
/** Reads the (undocumented) embedded hyperlink data and returns the URL.
*/
- static String ReadEmbeddedData( XclImpStream& rStrm );
+ static OUString ReadEmbeddedData( XclImpStream& rStrm );
/** Inserts the URL into a range of cells. Does not modify value or
formula cells. */
static void InsertUrl( const XclImpRoot& rRoot, const XclRange&
rXclRange, const String& rUrl );
diff --git a/sc/source/filter/inc/xihelper.hxx
b/sc/source/filter/inc/xihelper.hxx
index ed6426d..07e3772 100644
--- a/sc/source/filter/inc/xihelper.hxx
+++ b/sc/source/filter/inc/xihelper.hxx
@@ -250,21 +250,16 @@ public:
@param rbSameWb Returns true, if the URL is a reference to the own
workbook.
@param rEncodedUrl An encoded URL from Excel. */
static void DecodeUrl(
- String& rUrl,
- String& rTabName,
+ OUString& rUrl,
+ OUString& rTabName,
bool& rbSameWb,
const XclImpRoot& rRoot,
- const String& rEncodedUrl );
+ const OUString& rEncodedUrl );
/** Decodes an encoded external document URL without sheet name.
@param rUrl Returns the decoded file name incl. path.
@param rbSameWb Returns true, if the URL is a reference to the own
workbook.
@param rEncodedUrl An encoded URL from Excel. */
- static void DecodeUrl(
- String& rUrl,
- bool& rbSameWb,
- const XclImpRoot& rRoot,
- const String& rEncodedUrl );
static void DecodeUrl(
OUString& rUrl,
diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx
index 985e6ee..bacc26b 100644
--- a/sc/source/filter/inc/xilink.hxx
+++ b/sc/source/filter/inc/xilink.hxx
@@ -202,7 +202,7 @@ public:
/** Returns the specified external name or 0 on error. */
const XclImpExtName* GetExternName( sal_uInt16 nXtiIndex, sal_uInt16
nExtName ) const;
- const String* GetSupbookUrl( sal_uInt16 nXtiIndex ) const;
+ const OUString* GetSupbookUrl( sal_uInt16 nXtiIndex ) const;
const String& GetSupbookTabName( sal_uInt16 nXti, sal_uInt16 nXtiTab )
const;
diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx
index b670e38..07014e9 100644
--- a/sc/source/filter/inc/xipivot.hxx
+++ b/sc/source/filter/inc/xipivot.hxx
@@ -191,9 +191,9 @@ private:
XclPCInfo maPCInfo; /// Pivot cache settings (SXDB
record).
XclImpPCFieldVec maFields; /// List of pivot cache fields.
ScRange maSrcRange; /// Source range in the
spreadsheet.
- String maUrl; /// URL of the source data.
- String maTabName; /// Sheet name of the source data.
- OUString maSrcRangeName; /// Name of the source data range.
+ OUString maUrl; /// URL of the source data.
+ OUString maTabName; /// Sheet name of the source data.
+ OUString maSrcRangeName; /// Name of the source data range.
sal_uInt16 mnStrmId; /// Pivot cache stream identifier.
sal_uInt16 mnSrcType; /// Source data type.
bool mbSelfRef; /// true = Source data from own
document.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
