Kaydet (Commit) a05d6ac2 authored tarafından Noel Grandin's avatar Noel Grandin

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 e51fa143.
üst 97bf7c6c
...@@ -320,15 +320,6 @@ inline typename o3tl::typed_flags<E>::Self operator ^=( ...@@ -320,15 +320,6 @@ inline typename o3tl::typed_flags<E>::Self operator ^=(
return lhs; return lhs;
} }
/*
* Make the declaration sites a little less verbose
*/
#define DECLARE_TYPED_FLAGS(T,V) \
namespace o3tl \
{ \
template<> struct typed_flags<T> : is_typed_flags<T,V> {}; \
} \
#endif /* INCLUDED_O3TL_TYPED_FLAGS_SET_HXX */ #endif /* INCLUDED_O3TL_TYPED_FLAGS_SET_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -61,8 +61,10 @@ enum class XMLShapeExportFlags { ...@@ -61,8 +61,10 @@ enum class XMLShapeExportFlags {
// When setting the flag below a callout shape is exported as office:annotation // When setting the flag below a callout shape is exported as office:annotation
ANNOTATION = 0x0040, 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 #define SEF_DEFAULT XMLShapeExportFlags::POSITION|XMLShapeExportFlags::SIZE
......
...@@ -81,7 +81,11 @@ enum class SvXMLErrorFlags { ...@@ -81,7 +81,11 @@ enum class SvXMLErrorFlags {
ERROR_OCCURRED = 0x0002, ERROR_OCCURRED = 0x0002,
WARNING_OCCURRED = 0x0004, 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 com { namespace sun { namespace star {
namespace uno { template<class X> class Sequence; } namespace uno { template<class X> class Sequence; }
......
...@@ -102,7 +102,10 @@ enum class SvXMLExportFlags { ...@@ -102,7 +102,10 @@ enum class SvXMLExportFlags {
OASIS = 0x8000, OASIS = 0x8000,
ALL = 0x0fff 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< class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6<
::com::sun::star::document::XFilter, ::com::sun::star::document::XFilter,
......
...@@ -38,7 +38,10 @@ enum class SvXmlExportFlags { ...@@ -38,7 +38,10 @@ enum class SvXmlExportFlags {
// even if its empty // even if its empty
IGN_WS = 0x0008 IGN_WS = 0x0008
}; };
DECLARE_TYPED_FLAGS(SvXmlExportFlags, 0x000f) namespace o3tl
{
template<> struct typed_flags<SvXmlExportFlags> : is_typed_flags<SvXmlExportFlags, 0xf> {};
}
class SvXMLUnitConverter; class SvXMLUnitConverter;
class SvXMLAttributeList; class SvXMLAttributeList;
......
...@@ -97,7 +97,10 @@ enum class SvXMLImportFlags { ...@@ -97,7 +97,10 @@ enum class SvXMLImportFlags {
EMBEDDED = 0x0100, EMBEDDED = 0x0100,
ALL = 0xffff 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< class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper7<
......
...@@ -18,7 +18,10 @@ using namespace ::o3tl; ...@@ -18,7 +18,10 @@ using namespace ::o3tl;
enum class ConfigurationChangedHint { NONE, ONE, TWO }; enum class ConfigurationChangedHint { NONE, ONE, TWO };
DECLARE_TYPED_FLAGS(ConfigurationChangedHint, 0xff) namespace o3tl
{
template<> struct typed_flags< ConfigurationChangedHint> : is_typed_flags< ConfigurationChangedHint, 0xFF> {};
}
class typed_flags_test : public CppUnit::TestFixture class typed_flags_test : public CppUnit::TestFixture
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment