diff options
Diffstat (limited to 'sc/inc/fmtuno.hxx')
| -rw-r--r-- | sc/inc/fmtuno.hxx | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index 328c19a8ec05..6632ce25e7df 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -88,18 +88,17 @@ class ScTableConditionalFormat : public cppu::WeakImplHelper5< private: std::vector<ScTableConditionalEntry*> aEntries; - ScTableConditionalEntry* GetObjectByIndex_Impl(USHORT nIndex) const; + ScTableConditionalEntry* GetObjectByIndex_Impl(sal_uInt16 nIndex) const; void AddEntry_Impl(const ScCondFormatEntryItem& aEntry); ScTableConditionalFormat(); // disable public: - ScTableConditionalFormat(ScDocument* pDoc, ULONG nKey, + ScTableConditionalFormat(ScDocument* pDoc, sal_uLong nKey, formula::FormulaGrammar::Grammar eGrammar); virtual ~ScTableConditionalFormat(); void FillFormat( ScConditionalFormat& rFormat, ScDocument* pDoc, formula::FormulaGrammar::Grammar eGrammar) const; - void DataChanged(); // XSheetConditionalEntries virtual void SAL_CALL addNew( const ::com::sun::star::uno::Sequence< @@ -161,13 +160,11 @@ class ScTableConditionalEntry : public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo > { private: - ScTableConditionalFormat* pParent; ScCondFormatEntryItem aData; ScTableConditionalEntry(); // disabled public: - ScTableConditionalEntry(ScTableConditionalFormat* pPar, - const ScCondFormatEntryItem& aItem); + ScTableConditionalEntry(const ScCondFormatEntryItem& aItem); virtual ~ScTableConditionalEntry(); void GetData(ScCondFormatEntryItem& rData) const; @@ -217,7 +214,7 @@ class ScTableValidationObj : public cppu::WeakImplHelper5< { private: SfxItemPropertySet aPropSet; - USHORT nMode; // enum ScConditionMode + sal_uInt16 nMode; // enum ScConditionMode String aExpr1; String aExpr2; String maExprNmsp1; @@ -228,14 +225,14 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > aTokens2; ScAddress aSrcPos; String aPosString; // formula position as text - USHORT nValMode; // enum ScValidationMode - BOOL bIgnoreBlank; + sal_uInt16 nValMode; // enum ScValidationMode + sal_Bool bIgnoreBlank; sal_Int16 nShowList; - BOOL bShowInput; + sal_Bool bShowInput; String aInputTitle; String aInputMessage; - BOOL bShowError; - USHORT nErrorStyle; // enum ScValidErrorStyle + sal_Bool bShowError; + sal_uInt16 nErrorStyle; // enum ScValidErrorStyle String aErrorTitle; String aErrorMessage; @@ -243,13 +240,12 @@ private: ScTableValidationObj(); // disabled public: - ScTableValidationObj(ScDocument* pDoc, ULONG nKey, + ScTableValidationObj(ScDocument* pDoc, sal_uLong nKey, const formula::FormulaGrammar::Grammar eGrammar); virtual ~ScTableValidationObj(); ScValidationData* CreateValidationData( ScDocument* pDoc, formula::FormulaGrammar::Grammar eGrammar ) const; - void DataChanged(); // XSheetCondition virtual ::com::sun::star::sheet::ConditionOperator SAL_CALL getOperator() |