diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-22 15:23:50 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-07-15 23:40:19 +0000 |
| commit | e51fa143587d018b75db08e60cf27ff932b1cf8d (patch) | |
| tree | efef96fb683eca20cd9eb65a8794264784efc950 /include/xmloff | |
| parent | e1b123896d5b0a96c2959b6b6768c7cffabafd4f (diff) | |
create a macro to tidy up the declaration sites of o3tl::typed_flags_set
Change-Id: Ifb8fd4fd5128188420f1dfda6b6f695160d5e77a
Reviewed-on: https://gerrit.libreoffice.org/15865
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'include/xmloff')
| -rw-r--r-- | include/xmloff/shapeexport.hxx | 6 | ||||
| -rw-r--r-- | include/xmloff/xmlerror.hxx | 6 | ||||
| -rw-r--r-- | include/xmloff/xmlexp.hxx | 5 | ||||
| -rw-r--r-- | include/xmloff/xmlexppr.hxx | 5 | ||||
| -rw-r--r-- | include/xmloff/xmlimp.hxx | 5 |
5 files changed, 6 insertions, 21 deletions
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx index 83aafd5587e3..f068f71a5af3 100644 --- a/include/xmloff/shapeexport.hxx +++ b/include/xmloff/shapeexport.hxx @@ -61,10 +61,8 @@ enum class XMLShapeExportFlags { // When setting the flag below a callout shape is exported as office:annotation ANNOTATION = 0x0040, }; -namespace o3tl -{ - template<> struct typed_flags<XMLShapeExportFlags> : is_typed_flags<XMLShapeExportFlags, 0x7f> {}; -} +DECLARE_TYPED_FLAGS(XMLShapeExportFlags, 0x007f) + #define SEF_DEFAULT XMLShapeExportFlags::POSITION|XMLShapeExportFlags::SIZE diff --git a/include/xmloff/xmlerror.hxx b/include/xmloff/xmlerror.hxx index 853af45923af..cb3c979c2817 100644 --- a/include/xmloff/xmlerror.hxx +++ b/include/xmloff/xmlerror.hxx @@ -81,11 +81,7 @@ enum class SvXMLErrorFlags { ERROR_OCCURRED = 0x0002, WARNING_OCCURRED = 0x0004, }; - -namespace o3tl -{ - template<> struct typed_flags<SvXMLErrorFlags> : is_typed_flags<SvXMLErrorFlags, 0x7> {}; -} +DECLARE_TYPED_FLAGS(SvXMLErrorFlags, 0x0007) namespace com { namespace sun { namespace star { namespace uno { template<class X> class Sequence; } diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index ad738eb55513..4d7d933e8aa7 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -102,10 +102,7 @@ enum class SvXMLExportFlags { OASIS = 0x8000, ALL = 0x0fff }; -namespace o3tl -{ - template<> struct typed_flags<SvXMLExportFlags> : is_typed_flags<SvXMLExportFlags, 0x8fff> {}; -} +DECLARE_TYPED_FLAGS(SvXMLExportFlags, 0x8fff) class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6< ::com::sun::star::document::XFilter, diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx index 9a67145d01fb..7739a557bc4d 100644 --- a/include/xmloff/xmlexppr.hxx +++ b/include/xmloff/xmlexppr.hxx @@ -38,10 +38,7 @@ enum class SvXmlExportFlags { // even if its empty IGN_WS = 0x0008 }; -namespace o3tl -{ - template<> struct typed_flags<SvXmlExportFlags> : is_typed_flags<SvXmlExportFlags, 0xf> {}; -} +DECLARE_TYPED_FLAGS(SvXmlExportFlags, 0x000f) class SvXMLUnitConverter; class SvXMLAttributeList; diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index ceb6f782fefb..2619d3ec5c1f 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -97,10 +97,7 @@ enum class SvXMLImportFlags { EMBEDDED = 0x0100, ALL = 0xffff }; -namespace o3tl -{ - template<> struct typed_flags<SvXMLImportFlags> : is_typed_flags<SvXMLImportFlags, 0xffff> {}; -} +DECLARE_TYPED_FLAGS(SvXMLImportFlags, 0xffff) class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper7< |