summaryrefslogtreecommitdiff
path: root/include/sax
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-07-17 23:49:54 +0200
committerMichael Stahl <mstahl@redhat.com>2015-07-18 22:51:47 +0200
commit0a0f9d71af5247d70012b7d13504bad28a26bde2 (patch)
tree9048fdd399170f2d1f35dace9364aae260bd3644 /include/sax
parent2842c5cfb99d41b36dba52db01ca6cd37d2ef4b0 (diff)
sax: convert MergeMarksEnum to enum class
This should detect if a MergeMarks value is erroneously passed as tag. Change-Id: I7b855a661f182136824cf25f2174a9bcce8ff3d1
Diffstat (limited to 'include/sax')
-rw-r--r--include/sax/fshelper.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index 52d53995b84b..501dbcb7425f 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -60,7 +60,7 @@ const sal_Int32 FSEND_internal = -1; // same as XML_TOKEN_INVALID
namespace sax_fastparser {
-enum MergeMarksEnum { MERGE_MARKS_APPEND = 0, MERGE_MARKS_PREPEND = 1, MERGE_MARKS_POSTPONE = 2, MERGE_MARKS_IGNORE = 3 };
+enum class MergeMarks { APPEND = 0, PREPEND = 1, POSTPONE = 2, IGNORE = 3 };
typedef ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList > XFastAttributeListRef;
@@ -141,7 +141,7 @@ public:
const ::com::sun::star::uno::Sequence< sal_Int32 >& rOrder =
::com::sun::star::uno::Sequence< sal_Int32 >() );
void mergeTopMarks(sal_Int32 nTag,
- MergeMarksEnum eMergeType = MERGE_MARKS_APPEND );
+ MergeMarks eMergeType = MergeMarks::APPEND );
/*
Now create all the overloads in a typesafe way (i.e. without varargs) by creating a number of overloads