summaryrefslogtreecommitdiff
path: root/sc/source/filter/excel
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter/excel')
-rw-r--r--sc/source/filter/excel/xechart.cxx6
-rw-r--r--sc/source/filter/excel/xecontent.cxx2
-rw-r--r--sc/source/filter/excel/xehelper.cxx4
-rw-r--r--sc/source/filter/excel/xelink.cxx4
-rw-r--r--sc/source/filter/excel/xichart.cxx2
-rw-r--r--sc/source/filter/excel/xicontent.cxx2
-rw-r--r--sc/source/filter/excel/xihelper.cxx2
-rw-r--r--sc/source/filter/excel/xlroot.cxx2
8 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index d5ea624983c5..9888f5af4b14 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -1152,9 +1152,9 @@ void XclExpChFrLabelProps::Convert( const ScfPropertySet& rPropSet, bool bShowSe
::set_flag( maData.mnFlags, EXC_CHFRLABELPROPS_SHOWBUBBLE, bShowBubble );
// label value separator
- rPropSet.GetStringProperty( maData.maSeparator, EXC_CHPROP_LABELSEPARATOR );
- if( maData.maSeparator.Len() == 0 )
- maData.maSeparator = String( sal_Unicode( ' ' ) );
+ maData.maSeparator = rPropSet.GetStringProperty( EXC_CHPROP_LABELSEPARATOR );
+ if( maData.maSeparator.isEmpty() )
+ maData.maSeparator = rtl::OUString(' ');
}
void XclExpChFrLabelProps::WriteBody( XclExpStream& rStrm )
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 101eb6a98504..bc7445b67062 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1264,7 +1264,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
String aToken( aString.GetToken( 0, '\n', nStringIx ) );
if( nToken > 0 )
{
- mxString1->Append( '\0' );
+ mxString1->Append(rtl::OUString(static_cast<sal_Unicode>('\0')));
sFormulaBuf.append( (sal_Unicode) ',' );
}
mxString1->Append( aToken );
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 62490f5e0e8e..b2a68d467265 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -564,7 +564,7 @@ void XclExpStringHelper::AppendString( XclExpString& rXclString, const XclExpRoo
void XclExpStringHelper::AppendChar( XclExpString& rXclString, const XclExpRoot& rRoot, sal_Unicode cChar )
{
if( rRoot.GetBiff() == EXC_BIFF8 )
- rXclString.Append( cChar );
+ rXclString.Append( rtl::OUString(cChar) );
else
rXclString.AppendByte( cChar, rRoot.GetTextEncoding() );
}
@@ -863,7 +863,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico
else
{
String aPortionText( mrEE.GetText( aSel ) );
- aPortionText.SearchAndReplaceAll( String( '&' ), String( RTL_CONSTASCII_USTRINGPARAM( "&&" ) ) );
+ aPortionText.SearchAndReplaceAll( rtl::OUString('&'), rtl::OUString("&&") );
// #i17440# space between font height and numbers in text
if( bFontHtChanged && aParaText.Len() && aPortionText.Len() )
{
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 882f8dcdbd14..e75f626aa670 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -1333,14 +1333,14 @@ void XclExpExternSheetBase::WriteExtNameBuffer( XclExpStream& rStrm )
XclExpExternSheet::XclExpExternSheet( const XclExpRoot& rRoot, sal_Unicode cCode ) :
XclExpExternSheetBase( rRoot, EXC_ID_EXTERNSHEET )
{
- Init( String( cCode ) );
+ Init( rtl::OUString(cCode) );
}
XclExpExternSheet::XclExpExternSheet( const XclExpRoot& rRoot, const String& rTabName ) :
XclExpExternSheetBase( rRoot, EXC_ID_EXTERNSHEET )
{
// reference to own sheet: \03<sheetname>
- Init( String( EXC_EXTSH_TABNAME ).Append( rTabName ) );
+ Init(rtl::OUString(EXC_EXTSH_TABNAME) + rTabName);
}
void XclExpExternSheet::Save( XclExpStream& rStrm )
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 63318655a360..01384ad3e387 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -1119,7 +1119,7 @@ void XclImpChText::ConvertDataLabel( ScfPropertySet& rPropSet, const XclChTypeIn
// create API struct for label values, set API label separator
cssc2::DataPointLabel aPointLabel( bShowValue, bShowPercent, bShowCateg, bShowSymbol );
rPropSet.SetProperty( EXC_CHPROP_LABEL, aPointLabel );
- String aSep = mxLabelProps ? mxLabelProps->maSeparator : String( sal_Unicode( '\n' ) );
+ String aSep = mxLabelProps ? mxLabelProps->maSeparator : rtl::OUString('\n');
if( aSep.Len() == 0 )
aSep = CREATE_STRING( "; " );
rPropSet.SetStringProperty( EXC_CHPROP_LABELSEPARATOR, aSep );
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index a6bb268877df..424b91b2fc0c 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -358,7 +358,7 @@ void XclImpHyperlink::ConvertToValidTabName(String& rUrl)
// the 1st character must be '#'.
return;
- String aNewUrl(sal_Unicode('#')), aTabName;
+ String aNewUrl(rtl::OUString('#')), aTabName;
bool bInQuote = false;
bool bQuoteTabName = false;
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index 7b9846b1cd93..034a72738641 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -560,7 +560,7 @@ void XclImpHFConverter::InsertField( const SvxFieldItem& rFieldItem )
void XclImpHFConverter::InsertLineBreak()
{
ESelection& rSel = GetCurrSel();
- mrEE.QuickInsertText( String( '\n' ), ESelection( rSel.nEndPara, rSel.nEndPos, rSel.nEndPara, rSel.nEndPos ) );
+ mrEE.QuickInsertText( rtl::OUString('\n'), ESelection( rSel.nEndPara, rSel.nEndPos, rSel.nEndPara, rSel.nEndPos ) );
++rSel.nEndPara;
rSel.nEndPos = 0;
GetCurrInfo().mnHeight += GetCurrMaxLineHeight();
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index a3168c652619..66b5e33993b2 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -225,7 +225,7 @@ void XclRoot::SetCharWidth( const XclFontData& rFontData )
aFont.SetCharSet( rFontData.GetFontEncoding() );
aFont.SetWeight( rFontData.GetScWeight() );
pPrinter->SetFont( aFont );
- mrData.mnCharWidth = pPrinter->GetTextWidth( String( '0' ) );
+ mrData.mnCharWidth = pPrinter->GetTextWidth( rtl::OUString('0') );
}
if( mrData.mnCharWidth <= 0 )
{
generated by cgit (git 2.34.1) at 2024-07-15 21:50:44 +0000