fdo#84938: convert ERROR_ #defines to 'enum class'

Change-Id: Ie76bac6b91a9faa4f9ff7dbdf2b455ea9016cf72

include/xmloff/xmlerror.hxx

@@ -22,6 +22,7 @@
 
 #include <com/sun/star/xml/sax/SAXParseException.hpp>
 #include <sal/types.h>
+#include <o3tl/typed_flags_set.hxx>
 
 #include <vector>
 
@@ -79,11 +80,16 @@
 
 // 16bit error flag constants for use in the
 // SvXMLExport/SvXMLImport error flags
-#define ERROR_NO                0x0000
-#define ERROR_DO_NOTHING        0x0001
-#define ERROR_ERROR_OCCURRED     0x0002
-#define ERROR_WARNING_OCCURRED   0x0004
-
+enum class SvXMLErrorFlags {
+    NO                = 0x0000,
+    DO_NOTHING        = 0x0001,
+    ERROR_OCCURRED    = 0x0002,
+    WARNING_OCCURRED  = 0x0004,
+};
+namespace o3tl
+{
+    template<> struct typed_flags<SvXMLErrorFlags> : is_typed_flags<SvXMLErrorFlags, 0x7> {};
+}
 
 
 

include/xmloff/xmlexp.hxx

@@ -73,6 +73,7 @@ class XMLSettingsExportHelper;
 class XMLImageMapExport;
 class XMLErrors;
 class LanguageTag;
+enum class SvXMLErrorFlags;
 
 // Shapes in Writer cannot be named via context menu (#i51726#)
 #include <unotools/moduleoptions.hxx>
@@ -158,7 +159,7 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6<
     SAL_DLLPRIVATE void _InitCtor();
 
     SvXMLExportFlags  mnExportFlags;
-    sal_uInt16        mnErrorFlags;
+    SvXMLErrorFlags   mnErrorFlags;
 
 public:
 
@@ -545,7 +546,7 @@ public:
         const ::com::sun::star::uno::Sequence< OUString> & rMsgParams);
 
     /** return current error flags (logical 'or' of all error flags so far) */
-    sal_uInt16 GetErrorFlags()  { return mnErrorFlags; }
+    SvXMLErrorFlags GetErrorFlags()  { return mnErrorFlags; }
 
     virtual void DisposingModel();
 

include/xmloff/xmlimp.hxx

@@ -74,6 +74,7 @@ class XMLFontStylesContext;
 class XMLEventImportHelper;
 class XMLErrors;
 class StyleMap;
+enum class SvXMLErrorFlags;
 
 typedef std::vector<SvXMLImportContext *> SvXMLImportContexts_Impl;
 typedef std::vector< ::css::uno::Reference< ::css::xml::sax::XFastContextHandler>>
@@ -157,7 +158,7 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper7<
     SAL_DLLPRIVATE void _InitCtor();
 
     SvXMLImportFlags  mnImportFlags;
-    sal_uInt16  mnErrorFlags;
+    SvXMLErrorFlags  mnErrorFlags;
     std::set< OUString > embeddedFontUrlsKnown;
 
 protected:
@@ -415,7 +416,7 @@ public:
                                   const OUString& rMsg2 );
 
     /** return current error flags */
-    sal_uInt16 GetErrorFlags()  { return mnErrorFlags; }
+    SvXMLErrorFlags GetErrorFlags()  { return mnErrorFlags; }
 
     virtual void DisposingModel();
 

xmloff/source/core/xmlexp.cxx

@@ -455,7 +455,7 @@ SvXMLExport::SvXMLExport(
     mbExtended( false ),
     meClass( eClass ),
     mnExportFlags( nExportFlags ),
-    mnErrorFlags( ERROR_NO ),
+    mnErrorFlags( SvXMLErrorFlags::NO ),
     msWS( GetXMLToken(XML_WS) ),
     mbSaveLinkedSections(true)
 {
@@ -486,7 +486,7 @@ SvXMLExport::SvXMLExport(
     mbExtended( false ),
     meClass( XML_TOKEN_INVALID ),
     mnExportFlags( SvXMLExportFlags::NONE ),
-    mnErrorFlags( ERROR_NO ),
+    mnErrorFlags( SvXMLErrorFlags::NO ),
     msWS( GetXMLToken(XML_WS) ),
     mbSaveLinkedSections(true)
 {
@@ -525,7 +525,7 @@ SvXMLExport::SvXMLExport(
     mbExtended( false ),
     meClass( XML_TOKEN_INVALID ),
     mnExportFlags( SvXMLExportFlags::NONE ),
-    mnErrorFlags( ERROR_NO ),
+    mnErrorFlags( SvXMLErrorFlags::NO ),
     msWS( GetXMLToken(XML_WS) ),
     mbSaveLinkedSections(true)
 {
@@ -864,7 +864,7 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue
     }
 
     // return true only if no error occurred
-    return (GetErrorFlags() & (ERROR_DO_NOTHING|ERROR_ERROR_OCCURRED)) == 0;
+    return (GetErrorFlags() & (SvXMLErrorFlags::DO_NOTHING|SvXMLErrorFlags::ERROR_OCCURRED)) == SvXMLErrorFlags::NO;
 }
 
 void SAL_CALL SvXMLExport::cancel() throw(uno::RuntimeException, std::exception)
@@ -2248,7 +2248,7 @@ void SvXMLExport::StartElement(sal_uInt16 nPrefix,
 void SvXMLExport::StartElement(const OUString& rName,
                         bool bIgnWSOutside )
 {
-    if ((mnErrorFlags & ERROR_DO_NOTHING) != ERROR_DO_NOTHING)
+    if ((mnErrorFlags & SvXMLErrorFlags::DO_NOTHING) != SvXMLErrorFlags::DO_NOTHING)
     {
         try
         {
@@ -2276,7 +2276,7 @@ void SvXMLExport::StartElement(const OUString& rName,
 
 void SvXMLExport::Characters(const OUString& rChars)
 {
-    if ((mnErrorFlags & ERROR_DO_NOTHING) != ERROR_DO_NOTHING)
+    if ((mnErrorFlags & SvXMLErrorFlags::DO_NOTHING) != SvXMLErrorFlags::DO_NOTHING)
     {
         try
         {
@@ -2321,7 +2321,7 @@ void SvXMLExport::EndElement(const OUString& rName,
     SAL_WARN_IF(!mpImpl->mNamespaceMaps.empty() &&
         (mpImpl->mNamespaceMaps.top().second >= mpImpl->mDepth), "xmloff.core", "SvXMLExport: NamespaceMaps corrupted");
 
-    if ((mnErrorFlags & ERROR_DO_NOTHING) != ERROR_DO_NOTHING)
+    if ((mnErrorFlags & SvXMLErrorFlags::DO_NOTHING) != SvXMLErrorFlags::DO_NOTHING)
     {
         try
         {
@@ -2344,7 +2344,7 @@ void SvXMLExport::IgnorableWhitespace()
     if ((mnExportFlags & SvXMLExportFlags::PRETTY) != SvXMLExportFlags::PRETTY)
         return;
 
-    if ((mnErrorFlags & ERROR_DO_NOTHING) != ERROR_DO_NOTHING)
+    if ((mnErrorFlags & SvXMLErrorFlags::DO_NOTHING) != SvXMLErrorFlags::DO_NOTHING)
     {
         try
         {
@@ -2371,11 +2371,11 @@ void SvXMLExport::SetError(
 
     // maintain error flags
     if ( ( nId & XMLERROR_FLAG_ERROR ) != 0 )
-        mnErrorFlags |= ERROR_ERROR_OCCURRED;
+        mnErrorFlags |= SvXMLErrorFlags::ERROR_OCCURRED;
     if ( ( nId & XMLERROR_FLAG_WARNING ) != 0 )
-        mnErrorFlags |= ERROR_WARNING_OCCURRED;
+        mnErrorFlags |= SvXMLErrorFlags::WARNING_OCCURRED;
     if ( ( nId & XMLERROR_FLAG_SEVERE ) != 0 )
-        mnErrorFlags |= ERROR_DO_NOTHING;
+        mnErrorFlags |= SvXMLErrorFlags::DO_NOTHING;
 
     // create error lsit on demand
     if ( mpXMLErrors == NULL )

xmloff/source/core/xmlimp.cxx

@@ -428,7 +428,7 @@ SvXMLImport::SvXMLImport(
     mpXMLErrors( NULL ),
     mpStyleMap(0),
     mnImportFlags( nImportFlags ),
-    mnErrorFlags(0),
+    mnErrorFlags(SvXMLErrorFlags::NO),
     mbIsFormsSupported( true ),
     mbIsTableShapeSupported( false ),
     mbIsGraphicLoadOnDemandSupported( true )
@@ -1776,11 +1776,11 @@ void SvXMLImport::SetError(
 {
     // maintain error flags
     if ( ( nId & XMLERROR_FLAG_ERROR ) != 0 )
-        mnErrorFlags |= ERROR_ERROR_OCCURRED;
+        mnErrorFlags |= SvXMLErrorFlags::ERROR_OCCURRED;
     if ( ( nId & XMLERROR_FLAG_WARNING ) != 0 )
-        mnErrorFlags |= ERROR_WARNING_OCCURRED;
+        mnErrorFlags |= SvXMLErrorFlags::WARNING_OCCURRED;
     if ( ( nId & XMLERROR_FLAG_SEVERE ) != 0 )
-        mnErrorFlags |= ERROR_DO_NOTHING;
+        mnErrorFlags |= SvXMLErrorFlags::DO_NOTHING;
 
     // create error list on demand
     if ( mpXMLErrors == NULL )