diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-12 14:53:28 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-03-18 14:23:50 +0200 |
commit | fb14be5f8f74f83ba89e15f891ddf1f753dcc62f (patch) | |
tree | beaa4af08b0c3d75bf6e40b21b96c55e0ac1c60a /include/unotest | |
parent | b8ce52aab9459773544f1696cfe6b7b6f171a389 (diff) |
create new 'enum class' SotClipboardFormatId to unify types
of which there are several.
There are some issues here I am unsure of
- the SW and SC and CHART2 modules essentially ignore the enum values and assign their own ids
Perhaps I should change them to use the common values and create new enum values where necessary?
- the sc/qa/ and sq/qa/ and starmath/qa/ code was doing some dodgy stuff. I translated the code to pass down the stuff
numeric values to the underlying code, but perhaps further fixing is necessary?
Change-Id: Ic06d723e404481e3f1bca67c43b70321b764d923
Diffstat (limited to 'include/unotest')
-rw-r--r-- | include/unotest/filters-test.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/unotest/filters-test.hxx b/include/unotest/filters-test.hxx index 476588aff013..5bbc6463545a 100644 --- a/include/unotest/filters-test.hxx +++ b/include/unotest/filters-test.hxx @@ -13,6 +13,7 @@ #include <comphelper/documentconstants.hxx> #include <rtl/ustring.hxx> #include <unotest/detail/unotestdllapi.hxx> +#include <sot/formats.hxx> namespace test { @@ -44,7 +45,7 @@ public: //SfxFilterFlags for SfxFilter unsigned int nFilterFlags = SFX_FILTER_IMPORT, //Clipboard id for SfxFilter - unsigned int nClipboardID = 0, + SotClipboardFormatId nClipboardID = SotClipboardFormatId::NONE, //additional filter version for SfxFilter unsigned int nFilterVersion = 0, //export or import? @@ -55,7 +56,7 @@ public: const OUString &rURL, const OUString &rUserData, unsigned int nFilterFlags, - unsigned int nClipboardID, + SotClipboardFormatId nClipboardID, unsigned int nFilterVersion) = 0; virtual bool save( @@ -63,7 +64,7 @@ public: const OUString &/*rURL*/, const OUString &/*rUserData*/, unsigned int /*nFilterFlags*/, - unsigned int /*nClipboardID*/, + SotClipboardFormatId /*nClipboardID*/, unsigned int /*nFilterVersion*/) { return true; @@ -78,7 +79,7 @@ protected: const OUString &rURL, const OUString &rUserData, unsigned int nFilterFlags, - unsigned int nClipboardID, + SotClipboardFormatId nClipboardID, unsigned int nFilterVersion, bool bExport); }; |