diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-12-06 10:43:38 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2013-12-06 11:55:41 -0500 |
commit | 1d85c8df2fb9cb25fc524485339ae9f11e8da676 (patch) | |
tree | 949a4e234256702ab355a52952c633333b6f6a50 /sc/inc/dpobject.hxx | |
parent | map homogeneous to opposite of non-homogeneous (diff) | |
download | core-1d85c8df2fb9cb25fc524485339ae9f11e8da676.tar.gz core-1d85c8df2fb9cb25fc524485339ae9f11e8da676.zip |
fdo#69518: Correctly handle the old constraint syntax.
We apparently support this syntax for ODF-backward compatibility.
To fix this, I resurrected ScDPObject::ParseFilters() which was removed as
unused, adjusted it for the String->OUString change, and changed the filter
data structure to the UNO one rather than using the old one we no longer use
elsewhere.
Change-Id: If52b38aaa1e8b208fb0ef9d92a6e853decdf43e3
Diffstat (limited to 'sc/inc/dpobject.hxx')
-rw-r--r-- | sc/inc/dpobject.hxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index b2f6e380d8c9..1683480d7d2b 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -183,6 +183,12 @@ public: const OUString& rDataFieldName, std::vector<com::sun::star::sheet::DataPilotFieldFilter>& rFilters); + bool ParseFilters( + OUString& rDataFieldName, + std::vector<com::sun::star::sheet::DataPilotFieldFilter>& rFilters, + std::vector<com::sun::star::sheet::GeneralFunction>& rFilterFuncs, + const OUString& rFilterList ); + void GetMemberResultNames(ScDPUniqueStringSet& rNames, long nDimension); void ToggleDetails(const ::com::sun::star::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj); |