include/o3tl/typed_flags_set.hxx | 9 --------- include/xmloff/shapeexport.hxx | 6 ++++-- include/xmloff/xmlerror.hxx | 6 +++++- include/xmloff/xmlexp.hxx | 5 ++++- include/xmloff/xmlexppr.hxx | 5 ++++- include/xmloff/xmlimp.hxx | 5 ++++- o3tl/qa/test-typed_flags.cxx | 5 ++++- 7 files changed, 25 insertions(+), 16 deletions(-)
New commits: commit a05d6ac2a2a97081c6e9af1f9c8137fd91e739b6 Author: Noel Grandin <n...@peralex.com> Date: Tue Aug 25 11:24:15 2015 +0200 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. diff --git a/include/o3tl/typed_flags_set.hxx b/include/o3tl/typed_flags_set.hxx index d3ac7e2..0aab70b 100644 --- a/include/o3tl/typed_flags_set.hxx +++ b/include/o3tl/typed_flags_set.hxx @@ -320,15 +320,6 @@ inline typename o3tl::typed_flags<E>::Self operator ^=( 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 */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx index f068f71..83aafd5 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 cb3c979..853af45 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 4d7d933..ad738eb 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 7739a55..9a67145 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 2619d3e..ceb6f782 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< diff --git a/o3tl/qa/test-typed_flags.cxx b/o3tl/qa/test-typed_flags.cxx index c8bc27b..d2a4154 100644 --- a/o3tl/qa/test-typed_flags.cxx +++ b/o3tl/qa/test-typed_flags.cxx @@ -18,7 +18,10 @@ using namespace ::o3tl; 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 { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits