summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-10-07 14:52:53 +0200
committerNoel Grandin <noel@peralex.com>2013-10-08 10:03:14 +0200
commitbac9d53c92c83c03e2a7478567f5dfe7d2446e99 (patch)
tree607770f60873ffc2e19068f325fa78abec43de34
parentb55c89eff4d503b1591ee99598b9c700d0f9ac0d (diff)
covnert sc/source/filter/xml/*.cxx from String to OUString
Change-Id: I7ad382b7e5a27135eaf27f1756c7d6be78618e1e
-rw-r--r--sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx10
-rw-r--r--sc/source/filter/xml/xmldpimp.cxx2
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx2
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx8
-rw-r--r--sc/source/filter/xml/xmlsceni.cxx2
-rw-r--r--sc/source/filter/xml/xmlwrap.cxx2
6 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index 1ff407b85e9c..9df08986de30 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -453,7 +453,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateInsertAction(ScMyInsActio
OUString aUser;
ConvertInfo(pAction->aInfo, aUser, aDateTime);
- String sComment (pAction->aInfo.sComment);
+ OUString sComment (pAction->aInfo.sComment);
ScChangeAction* pNewAction = new ScChangeActionIns(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
pAction->aBigRange, aUser, aDateTime, sComment, pAction->nActionType);
@@ -466,7 +466,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateDeleteAction(ScMyDelActio
OUString aUser;
ConvertInfo(pAction->aInfo, aUser, aDateTime);
- String sComment (pAction->aInfo.sComment);
+ OUString sComment (pAction->aInfo.sComment);
ScChangeAction* pNewAction = new ScChangeActionDel(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
pAction->aBigRange, aUser, aDateTime, sComment, pAction->nActionType, pAction->nD, pTrack);
@@ -482,7 +482,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateMoveAction(ScMyMoveAction
OUString aUser;
ConvertInfo(pAction->aInfo, aUser, aDateTime);
- String sComment (pAction->aInfo.sComment);
+ OUString sComment (pAction->aInfo.sComment);
ScChangeAction* pNewAction = new ScChangeActionMove(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
pAction->pMoveRanges->aTargetRange, aUser, aDateTime, sComment, pAction->pMoveRanges->aSourceRange , pTrack);
@@ -497,7 +497,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateRejectionAction(ScMyRejAc
OUString aUser;
ConvertInfo(pAction->aInfo, aUser, aDateTime);
- String sComment (pAction->aInfo.sComment);
+ OUString sComment (pAction->aInfo.sComment);
ScChangeAction* pNewAction = new ScChangeActionReject(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
pAction->aBigRange, aUser, aDateTime, sComment);
@@ -514,7 +514,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateContentAction(ScMyContent
OUString aUser;
ConvertInfo(pAction->aInfo, aUser, aDateTime);
- String sComment (pAction->aInfo.sComment);
+ OUString sComment (pAction->aInfo.sComment);
ScChangeAction* pNewAction = new ScChangeActionContent(pAction->nActionNumber, pAction->nActionState, pAction->nRejectingNumber,
pAction->aBigRange, aUser, aDateTime, sComment, aCell, pDoc, pAction->pCellInfo->sInputString);
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index 83f58f7b9e56..271873321d9c 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -546,7 +546,7 @@ void ScXMLDataPilotTableContext::EndElement()
// #i94570# Names have to be unique, or the tables can't be accessed by API.
if ( pDPCollection->GetByName(pDPObject->GetName()) )
- pDPObject->SetName( String() ); // ignore the invalid name, create a new name in AfterXMLLoading
+ pDPObject->SetName( OUString() ); // ignore the invalid name, create a new name in AfterXMLLoading
pDPCollection->InsertNewTable(pDPObject);
SetButtons();
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 38050105616f..28917bf1d96b 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3654,7 +3654,7 @@ void ScXMLExport::exportAnnotationMeta( const uno::Reference < drawing::XShape >
Characters(sAuthor);
}
- String aDate(pCurrentCell->xAnnotation->getDate());
+ OUString aDate(pCurrentCell->xAnnotation->getDate());
if (pDoc)
{
SvNumberFormatter* pNumForm = pDoc->GetFormatTable();
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 1e39316f101f..ac858709a1be 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2412,7 +2412,7 @@ void ScXMLImport::ExamineDefaultStyle()
// The standard format is all-latin if the decimal separator dosen't
// have a different script type
- String aDecSep;
+ OUString aDecSep;
LanguageType nFormatLang = pFormat->GetLanguage();
if ( nFormatLang == LANGUAGE_SYSTEM )
aDecSep = ScGlobal::pLocaleData->getNumDecimalSep();
@@ -2484,7 +2484,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
OUString sOUName;
if (rChangeProps[i].Value >>= sOUName)
{
- String sAuthorName(sOUName);
+ OUString sAuthorName(sOUName);
pViewSettings->SetTheAuthorToShow(sAuthorName);
}
}
@@ -2495,7 +2495,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
OUString sOUComment;
if (rChangeProps[i].Value >>= sOUComment)
{
- String sComment(sOUComment);
+ OUString sComment(sOUComment);
pViewSettings->SetTheComment(sComment);
}
}
@@ -3224,7 +3224,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE
OUString sValue;
if(aSeq[i].Value >>= sValue)
{
- String sTabName(sValue);
+ OUString sTabName(sValue);
SCTAB nTab(0);
if (pDoc->GetTable(sTabName, nTab))
{
diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx
index 19478d29b4f0..c18f13b90459 100644
--- a/sc/source/filter/xml/xmlsceni.cxx
+++ b/sc/source/filter/xml/xmlsceni.cxx
@@ -147,7 +147,7 @@ void ScXMLTableScenarioContext::EndElement()
nFlags |= SC_SCENARIO_VALUE;
if( bProtected )
nFlags |= SC_SCENARIO_PROTECT;
- pDoc->SetScenarioData( nCurrTable, String( sComment ), aBorderColor, nFlags );
+ pDoc->SetScenarioData( nCurrTable, OUString( sComment ), aBorderColor, nFlags );
for( size_t i = 0; i < aScenarioRanges.size(); ++i )
{
ScRange* pRange(aScenarioRanges[ i ]);
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 7a05eb5c12d1..97bdb0d8238a 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -214,7 +214,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo
OSL_FAIL(aError.getStr());
#endif
- String sErr = OUString::number( r.LineNumber ) +
+ OUString sErr = OUString::number( r.LineNumber ) +
"," +
OUString::number( r.ColumnNumber );