mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

This reverts commit e51fa143587d018b75db08e60cf27ff932b1cf8d.
This commit is contained in:
Noel Grandin 2015-08-25 11:24:15 +02:00
parent 97bf7c6cc7
commit a05d6ac2a2
7 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/o3tl/typed_flags_set.hxx
View File

@ -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: */

6
include/xmloff/shapeexport.hxx
View File

@ -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

6
include/xmloff/xmlerror.hxx
View File

@ -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; }

5
include/xmloff/xmlexp.hxx
View File

@ -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,

5
include/xmloff/xmlexppr.hxx
View File

@ -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;

5
include/xmloff/xmlimp.hxx
View File

@ -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<

5
o3tl/qa/test-typed_flags.cxx
View File

@ -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
{