summaryrefslogtreecommitdiff
path: root/sc/inc/fmtuno.hxx
diff options
context:
space:
mode:
authorMuthu Subramanian K <sumuthu@novell.com>2011-02-15 20:10:10 +0530
committerMuthu Subramanian K <sumuthu@novell.com>2011-02-15 20:23:39 +0530
commitf833cc946d73631bb82a56e3eedf6a669dd1b797 (patch)
treeaf6034433ec36211fcf617bdbf42cf2d95487f08 /sc/inc/fmtuno.hxx
parent8456140a92624f1ea51fe4672bf7bd3deb246aaa (diff)
XLSX import of duplicate-conditional formatting.
Diffstat (limited to 'sc/inc/fmtuno.hxx')
-rw-r--r--sc/inc/fmtuno.hxx15
1 files changed, 12 insertions, 3 deletions
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index cded07b92349..82548d5c736a 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -36,6 +36,7 @@
#include <svl/itemprop.hxx>
#include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
#include <com/sun/star/sheet/XSheetCondition.hpp>
+#include <com/sun/star/sheet/XSheetCondition2.hpp>
#include <com/sun/star/sheet/XSheetConditionalEntry.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -48,7 +49,7 @@
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase4.hxx>
#include <cppuhelper/implbase5.hxx>
-
+#include <com/sun/star/sheet/ConditionOperator2.hpp>
class ScDocument;
class ScTableConditionalEntry;
@@ -153,7 +154,7 @@ public:
class ScTableConditionalEntry : public cppu::WeakImplHelper3<
- com::sun::star::sheet::XSheetCondition,
+ com::sun::star::sheet::XSheetCondition2,
com::sun::star::sheet::XSheetConditionalEntry,
com::sun::star::lang::XServiceInfo >
{
@@ -172,8 +173,12 @@ public:
// XSheetCondition
virtual ::com::sun::star::sheet::ConditionOperator SAL_CALL getOperator()
throw(::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getConditionOperator()
+ throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setOperator( ::com::sun::star::sheet::ConditionOperator nOperator )
throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setConditionOperator( sal_Int32 nOperator )
+ throw(::com::sun::star::uno::RuntimeException);
virtual ::rtl::OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setFormula1( const ::rtl::OUString& aFormula1 )
throw(::com::sun::star::uno::RuntimeException);
@@ -202,7 +207,7 @@ public:
class ScTableValidationObj : public cppu::WeakImplHelper5<
- com::sun::star::sheet::XSheetCondition,
+ com::sun::star::sheet::XSheetCondition2,
com::sun::star::sheet::XMultiFormulaTokens,
com::sun::star::beans::XPropertySet,
com::sun::star::lang::XUnoTunnel,
@@ -247,8 +252,12 @@ public:
// XSheetCondition
virtual ::com::sun::star::sheet::ConditionOperator SAL_CALL getOperator()
throw(::com::sun::star::uno::RuntimeException);
+ virtual sal_Int32 SAL_CALL getConditionOperator()
+ throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setOperator( ::com::sun::star::sheet::ConditionOperator nOperator )
throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setConditionOperator( sal_Int32 nOperator )
+ throw(::com::sun::star::uno::RuntimeException);
virtual ::rtl::OUString SAL_CALL getFormula1() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setFormula1( const ::rtl::OUString& aFormula1 )
throw(::com::sun::star::uno::RuntimeException);