Revert "create a macro to tidy up the declaration sites of o3tl::typed_flags_set"

sberg did not like this macro, let's see if I can find a better
solution.

This reverts commit e51fa143587d018b75db08e60cf27ff932b1cf8d.

5 files changed, 21 insertions, 6 deletions

diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index f068f71a5af3..83aafd5587e3 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -61,8 +61,10 @@ enum class XMLShapeExportFlags {
 // When setting the flag below a callout shape is exported as office:annotation
      ANNOTATION = 0x0040,
 };
-DECLARE_TYPED_FLAGS(XMLShapeExportFlags, 0x007f)
-
+namespace o3tl
+{
+    template<> struct typed_flags<XMLShapeExportFlags> : is_typed_flags<XMLShapeExportFlags, 0x7f> {};
+}
 
 #define SEF_DEFAULT         XMLShapeExportFlags::POSITION|XMLShapeExportFlags::SIZE
 
diff --git a/include/xmloff/xmlerror.hxx b/include/xmloff/xmlerror.hxx
index cb3c979c2817..853af45923af 100644
--- a/include/xmloff/xmlerror.hxx
+++ b/include/xmloff/xmlerror.hxx
@@ -81,7 +81,11 @@ enum class SvXMLErrorFlags {
     ERROR_OCCURRED    = 0x0002,
     WARNING_OCCURRED  = 0x0004,
 };
-DECLARE_TYPED_FLAGS(SvXMLErrorFlags, 0x0007)
+
+namespace o3tl
+{
+    template<> struct typed_flags<SvXMLErrorFlags> : is_typed_flags<SvXMLErrorFlags, 0x7> {};
+}
 
 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 4d7d933e8aa7..ad738eb55513 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -102,7 +102,10 @@ enum class SvXMLExportFlags {
     OASIS                    = 0x8000,
     ALL                      = 0x0fff
 };
-DECLARE_TYPED_FLAGS(SvXMLExportFlags, 0x8fff)
+namespace o3tl
+{
+    template<> struct typed_flags<SvXMLExportFlags> : is_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 7739a557bc4d..9a67145d01fb 100644
--- a/include/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
@@ -38,7 +38,10 @@ enum class SvXmlExportFlags {
                            // even if its empty
     IGN_WS      = 0x0008
 };
-DECLARE_TYPED_FLAGS(SvXmlExportFlags, 0x000f)
+namespace o3tl
+{
+    template<> struct typed_flags<SvXmlExportFlags> : is_typed_flags<SvXmlExportFlags, 0xf> {};
+}
 
 class SvXMLUnitConverter;
 class SvXMLAttributeList;
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 2619d3ec5c1f..ceb6f782fefb 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -97,7 +97,10 @@ enum class SvXMLImportFlags {
     EMBEDDED        = 0x0100,
     ALL             = 0xffff
 };
-DECLARE_TYPED_FLAGS(SvXMLImportFlags, 0xffff)
+namespace o3tl
+{
+    template<> struct typed_flags<SvXMLImportFlags> : is_typed_flags<SvXMLImportFlags, 0xffff> {};
+}
 
 
 class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper7<