diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-09-07 11:13:47 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-09-07 12:55:45 +0200 |
commit | 801a657ea62365974d96033e95e2fa6174f751cc (patch) | |
tree | 2fe0af3a915245b5c3fb7845f371f3a3845685ff /sc/source/ui | |
parent | 8d36b558beb0c88d186b027f16c5d7d2da3afa59 (diff) |
iString to OUString in some calc core code
Change-Id: I25fc70cfd01f5ad25f7362157796d3ddf06139e1
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/unoobj/chart2uno.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/unoobj/fmtuno.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/view/cellsh2.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/tabview3.cxx | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index afd174325031..f052423367dd 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -732,7 +732,7 @@ void Chart2Positioner::createPositionMap() bool bExternal = ScRefTokenHelper::isExternalRef(pToken); sal_uInt16 nFileId = bExternal ? pToken->GetIndex() : 0; - String aTabName = bExternal ? pToken->GetString() : String(); + OUString aTabName = bExternal ? pToken->GetString() : OUString(); ScComplexRefData aData; if( !ScRefTokenHelper::getDoubleRefDataFromToken(aData, *itr) ) @@ -960,7 +960,7 @@ private: return false; bool bExternal = ScRefTokenHelper::isExternalRef(pToken); sal_uInt16 nFileId = bExternal ? pToken->GetIndex() : 0; - String aTabName = bExternal ? pToken->GetString() : String(); + OUString aTabName = bExternal ? pToken->GetString() : OUString(); // In saving to XML, we don't prepend address with '$'. setRelative(aData.Ref1); diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 51aa29aa585c..8f633140fa3e 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -624,7 +624,7 @@ ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, sal_uLong nKey, { // Eintrag aus dem Dokument lesen... - sal_Bool bFound = false; + bool bFound = false; if ( pDoc && nKey ) { const ScValidationData* pData = pDoc->GetValidationEntry( nKey ); @@ -650,7 +650,7 @@ ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, sal_uLong nKey, if (nValMode != SC_VALID_ANY && pDoc->IsInExternalReferenceMarking()) pData->MarkUsedExternalReferences(); - bFound = sal_True; + bFound = true; } } if (!bFound) @@ -716,10 +716,10 @@ void ScTableValidationObj::ClearData_Impl() maExprNmsp1.Erase(); maExprNmsp2.Erase(); meGrammar1 = meGrammar2 = FormulaGrammar::GRAM_UNSPECIFIED; // will be overriden when needed - aInputTitle.Erase(); - aInputMessage.Erase(); - aErrorTitle.Erase(); - aErrorMessage.Erase(); + aInputTitle = OUString(); + aInputMessage = OUString(); + aErrorTitle = OUString(); + aErrorMessage = OUString(); } ScTableValidationObj::~ScTableValidationObj() diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 3246cf050df0..a1403185e17b 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -755,10 +755,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) sal_Bool bBlank = sal_True; sal_Int16 nListType = ValidListType::UNSORTED; sal_Bool bShowHelp = false; - String aHelpTitle, aHelpText; + OUString aHelpTitle, aHelpText; sal_Bool bShowError = false; ScValidErrorStyle eErrStyle = SC_VALERR_STOP; - String aErrTitle, aErrText; + OUString aErrTitle, aErrText; ScDocument* pDoc = GetViewData()->GetDocument(); SCCOL nCurX = GetViewData()->GetCurX(); diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 30750750a697..cd99e5b54f92 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -615,8 +615,8 @@ void ScTabView::TestHintWindow() { const ScValidationData* pData = pDoc->GetValidationEntry( pItem->GetValue() ); OSL_ENSURE(pData,"ValidationData nicht gefunden"); - String aTitle, aMessage; - if ( pData && pData->GetInput( aTitle, aMessage ) && aMessage.Len() > 0 ) + OUString aTitle, aMessage; + if ( pData && pData->GetInput( aTitle, aMessage ) && !aMessage.isEmpty() ) { //! Abfrage, ob an gleicher Stelle !!!! |