diff options
| -rw-r--r-- | sc/inc/fmtuno.hxx | 46 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/fmtuno.cxx | 20 |
2 files changed, 33 insertions, 33 deletions
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index 5006bd2c56a9..9e7f5258069a 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -52,14 +52,14 @@ class ScValidationData; struct ScCondFormatEntryItem { - ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > maTokens1; - ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > maTokens2; - String maExpr1; - String maExpr2; - String maExprNmsp1; - String maExprNmsp2; - String maPosStr; // formula position as text - String maStyle; // display name as stored in ScStyleSheet + css::uno::Sequence< css::sheet::FormulaToken > maTokens1; + css::uno::Sequence< css::sheet::FormulaToken > maTokens2; + OUString maExpr1; + OUString maExpr2; + OUString maExprNmsp1; + OUString maExprNmsp2; + OUString maPosStr; // formula position as text + OUString maStyle; // display name as stored in ScStyleSheet ScAddress maPos; formula::FormulaGrammar::Grammar meGrammar1; // grammar used with maExpr1 formula::FormulaGrammar::Grammar meGrammar2; // grammar used with maExpr2 @@ -205,27 +205,27 @@ class ScTableValidationObj : public cppu::WeakImplHelper5< { private: SfxItemPropertySet aPropSet; - sal_uInt16 nMode; // enum ScConditionMode - String aExpr1; - String aExpr2; - String maExprNmsp1; - String maExprNmsp2; + sal_uInt16 nMode; // enum ScConditionMode + OUString aExpr1; + OUString aExpr2; + OUString maExprNmsp1; + OUString maExprNmsp2; formula::FormulaGrammar::Grammar meGrammar1; // grammar used with aExpr1 and aExpr2 formula::FormulaGrammar::Grammar meGrammar2; // grammar used with aExpr1 and aExpr2 ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens1; ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens2; ScAddress aSrcPos; - String aPosString; // formula position as text - sal_uInt16 nValMode; // enum ScValidationMode - sal_Bool bIgnoreBlank; + OUString aPosString; // formula position as text + sal_uInt16 nValMode; // enum ScValidationMode + sal_Bool bIgnoreBlank; sal_Int16 nShowList; - sal_Bool bShowInput; - OUString aInputTitle; - OUString aInputMessage; - sal_Bool bShowError; - sal_uInt16 nErrorStyle; // enum ScValidErrorStyle - OUString aErrorTitle; - OUString aErrorMessage; + sal_Bool bShowInput; + OUString aInputTitle; + OUString aInputMessage; + sal_Bool bShowError; + sal_uInt16 nErrorStyle; // enum ScValidErrorStyle + OUString aErrorTitle; + OUString aErrorMessage; void ClearData_Impl(); diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 8f633140fa3e..301c4b025468 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -220,7 +220,7 @@ void ScTableConditionalFormat::FillFormat( ScConditionalFormat& rFormat, ScCondFormatEntry* pCoreEntry = new ScCondFormatEntry( aData.meMode, aData.maExpr1, aData.maExpr2, pDoc, aData.maPos, aData.maStyle, aData.maExprNmsp1, aData.maExprNmsp2, eGrammar1, eGrammar2 ); - if ( aData.maPosStr.Len() ) + if ( !aData.maPosStr.isEmpty() ) pCoreEntry->SetSrcString( aData.maPosStr ); if ( aData.maTokens1.getLength() ) @@ -286,7 +286,7 @@ void SAL_CALL ScTableConditionalFormat::addNew( aEntry.maExpr1 = aStrVal; else if ( rProp.Value >>= aTokens ) { - aEntry.maExpr1.Erase(); + aEntry.maExpr1 = ""; aEntry.maTokens1 = aTokens; } } @@ -298,7 +298,7 @@ void SAL_CALL ScTableConditionalFormat::addNew( aEntry.maExpr2 = aStrVal; else if ( rProp.Value >>= aTokens ) { - aEntry.maExpr2.Erase(); + aEntry.maExpr2 = ""; aEntry.maTokens2 = aTokens; } } @@ -695,7 +695,7 @@ ScValidationData* ScTableValidationObj::CreateValidationData( ScDocument* pDoc, if (!bShowError) pRet->ResetError(); - if ( aPosString.Len() ) + if ( !aPosString.isEmpty() ) pRet->SetSrcString( aPosString ); return pRet; @@ -711,10 +711,10 @@ void ScTableValidationObj::ClearData_Impl() bShowError = false; nErrorStyle = SC_VALERR_STOP; aSrcPos.Set(0,0,0); - aExpr1.Erase(); - aExpr2.Erase(); - maExprNmsp1.Erase(); - maExprNmsp2.Erase(); + aExpr1 = ""; + aExpr2 = ""; + maExprNmsp1 = ""; + maExprNmsp2 = ""; meGrammar1 = meGrammar2 = FormulaGrammar::GRAM_UNSPECIFIED; // will be overriden when needed aInputTitle = OUString(); aInputMessage = OUString(); @@ -819,12 +819,12 @@ void SAL_CALL ScTableValidationObj::setTokens( sal_Int32 nIndex, const uno::Sequ if (nIndex == 0) { aTokens1 = aTokens; - aExpr1.Erase(); + aExpr1 = ""; } else if (nIndex == 1) { aTokens2 = aTokens; - aExpr2.Erase(); + aExpr2 = ""; } } |