diff options
| -rw-r--r-- | sc/inc/validat.hxx | 5 | ||||
| -rw-r--r-- | sc/source/core/data/validat.cxx | 94 |
2 files changed, 49 insertions, 50 deletions
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index c66c92916089..ccf50a6ca6ed 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -75,8 +75,6 @@ private: OUString aErrorTitle; OUString aErrorMessage; - bool bIsUsed; // temporary during saving - bool DoMacro( const ScAddress& rPos, const OUString& rInput, ScFormulaCell* pCell, Window* pParent ) const; @@ -145,9 +143,6 @@ public: sal_uInt32 GetKey() const { return nKey; } void SetKey(sal_uInt32 nNew) { nKey = nNew; } // only if not inserted! - void SetUsed(bool bSet) { bIsUsed = bSet; } - bool IsUsed() const { return bIsUsed; } - bool EqualEntries( const ScValidationData& r ) const; // for undo // sort (using std::set) by index diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 878dc0ab306d..7ca9589e1c2f 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -57,59 +57,63 @@ using namespace formula; // ScValidationData::ScValidationData( ScValidationMode eMode, ScConditionMode eOper, - const OUString& rExpr1, const OUString& rExpr2, - ScDocument* pDocument, const ScAddress& rPos, - const OUString& rExprNmsp1, const OUString& rExprNmsp2, - FormulaGrammar::Grammar eGrammar1, FormulaGrammar::Grammar eGrammar2 ) : - ScConditionEntry( eOper, rExpr1, rExpr2, pDocument, rPos, rExprNmsp1, rExprNmsp2, eGrammar1, eGrammar2 ), - nKey( 0 ), - eDataMode( eMode ), - eErrorStyle( SC_VALERR_STOP ), - mnListType( ValidListType::UNSORTED ) + const OUString& rExpr1, const OUString& rExpr2, + ScDocument* pDocument, const ScAddress& rPos, + const OUString& rExprNmsp1, const OUString& rExprNmsp2, + FormulaGrammar::Grammar eGrammar1, + FormulaGrammar::Grammar eGrammar2 ) + : ScConditionEntry( eOper, rExpr1, rExpr2, pDocument, rPos, rExprNmsp1, + rExprNmsp2, eGrammar1, eGrammar2 ) + , nKey( 0 ) + , eDataMode( eMode ) + , bShowInput(false) + , bShowError(false) + , eErrorStyle( SC_VALERR_STOP ) + , mnListType( ValidListType::UNSORTED ) { - bShowInput = bShowError = false; } ScValidationData::ScValidationData( ScValidationMode eMode, ScConditionMode eOper, - const ScTokenArray* pArr1, const ScTokenArray* pArr2, - ScDocument* pDocument, const ScAddress& rPos ) : - ScConditionEntry( eOper, pArr1, pArr2, pDocument, rPos ), - nKey( 0 ), - eDataMode( eMode ), - eErrorStyle( SC_VALERR_STOP ), - mnListType( ValidListType::UNSORTED ) -{ - bShowInput = bShowError = false; -} - -ScValidationData::ScValidationData( const ScValidationData& r ) : - ScConditionEntry( r ), - nKey( r.nKey ), - eDataMode( r.eDataMode ), - bShowInput( r.bShowInput ), - bShowError( r.bShowError ), - eErrorStyle( r.eErrorStyle ), - mnListType( r.mnListType ), - aInputTitle( r.aInputTitle ), - aInputMessage( r.aInputMessage ), - aErrorTitle( r.aErrorTitle ), - aErrorMessage( r.aErrorMessage ) + const ScTokenArray* pArr1, const ScTokenArray* pArr2, + ScDocument* pDocument, const ScAddress& rPos ) + : ScConditionEntry( eOper, pArr1, pArr2, pDocument, rPos ) + , nKey( 0 ) + , eDataMode( eMode ) + , bShowInput(false) + , bShowError(false) + , eErrorStyle( SC_VALERR_STOP ) + , mnListType( ValidListType::UNSORTED ) +{ +} + +ScValidationData::ScValidationData( const ScValidationData& r ) + : ScConditionEntry( r ) + , nKey( r.nKey ) + , eDataMode( r.eDataMode ) + , bShowInput( r.bShowInput ) + , bShowError( r.bShowError ) + , eErrorStyle( r.eErrorStyle ) + , mnListType( r.mnListType ) + , aInputTitle( r.aInputTitle ) + , aInputMessage( r.aInputMessage ) + , aErrorTitle( r.aErrorTitle ) + , aErrorMessage( r.aErrorMessage ) { // Formeln per RefCount kopiert } -ScValidationData::ScValidationData( ScDocument* pDocument, const ScValidationData& r ) : - ScConditionEntry( pDocument, r ), - nKey( r.nKey ), - eDataMode( r.eDataMode ), - bShowInput( r.bShowInput ), - bShowError( r.bShowError ), - eErrorStyle( r.eErrorStyle ), - mnListType( r.mnListType ), - aInputTitle( r.aInputTitle ), - aInputMessage( r.aInputMessage ), - aErrorTitle( r.aErrorTitle ), - aErrorMessage( r.aErrorMessage ) +ScValidationData::ScValidationData( ScDocument* pDocument, const ScValidationData& r ) + : ScConditionEntry( pDocument, r ) + , nKey( r.nKey ) + , eDataMode( r.eDataMode ) + , bShowInput( r.bShowInput ) + , bShowError( r.bShowError ) + , eErrorStyle( r.eErrorStyle ) + , mnListType( r.mnListType ) + , aInputTitle( r.aInputTitle ) + , aInputMessage( r.aInputMessage ) + , aErrorTitle( r.aErrorTitle ) + , aErrorMessage( r.aErrorMessage ) { // Formeln wirklich kopiert } |