diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-11-29 15:58:51 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-11-29 22:35:45 -0500 |
| commit | 0278ebc50e4f1b34657f1e7d51b44b4e73858399 (patch) | |
| tree | f73c362586a0cd319f36df3be7ea8fefcacaf4e4 /sc/inc | |
| parent | 34493546d62eff44c2a0f8111551ce50695e054b (diff) | |
Implemented the new multi-value filter API.
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/datauno.hxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index 94bdfa676e9f..732dd80edd99 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -37,6 +37,8 @@ #include <com/sun/star/sheet/GeneralFunction.hpp> #include <com/sun/star/sheet/XCellRangeReferrer.hpp> #include <com/sun/star/sheet/XSheetFilterDescriptor.hpp> +#include <com/sun/star/sheet/XSheetFilterDescriptor2.hpp> +#include <com/sun/star/sheet/XSheetFilterDescriptor3.hpp> #include <com/sun/star/sheet/XConsolidationDescriptor.hpp> #include <com/sun/star/sheet/XDatabaseRanges.hpp> #include <com/sun/star/sheet/XDatabaseRange.hpp> @@ -50,7 +52,6 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/util/XRefreshable.hpp> -#include <com/sun/star/sheet/XSheetFilterDescriptor2.hpp> #include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase4.hxx> @@ -342,9 +343,10 @@ public: // to uno, all three look the same -class ScFilterDescriptorBase : public cppu::WeakImplHelper4< +class ScFilterDescriptorBase : public cppu::WeakImplHelper5< com::sun::star::sheet::XSheetFilterDescriptor, com::sun::star::sheet::XSheetFilterDescriptor2, + com::sun::star::sheet::XSheetFilterDescriptor3, com::sun::star::beans::XPropertySet, com::sun::star::lang::XServiceInfo >, public SfxListener @@ -354,10 +356,6 @@ private: ScDocShell* pDocSh; public: - static void fillQueryParam( - ScQueryParam& rParam, ScDocument* pDoc, - const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField2>& aFilterFields); - ScFilterDescriptorBase(ScDocShell* pDocShell); virtual ~ScFilterDescriptorBase(); @@ -382,6 +380,13 @@ public: ::com::sun::star::sheet::TableFilterField2 >& aFilterFields ) throw(::com::sun::star::uno::RuntimeException); + // XSheetFilterDescriptor3 + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::TableFilterField3 > SAL_CALL + getFilterFields3() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFilterFields3( const ::com::sun::star::uno::Sequence< + ::com::sun::star::sheet::TableFilterField3 >& aFilterFields ) + throw(::com::sun::star::uno::RuntimeException); + // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() |