From 0a0f9d71af5247d70012b7d13504bad28a26bde2 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 17 Jul 2015 23:49:54 +0200 Subject: sax: convert MergeMarksEnum to enum class This should detect if a MergeMarks value is erroneously passed as tag. Change-Id: I7b855a661f182136824cf25f2174a9bcce8ff3d1 --- include/sax/fshelper.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/sax') 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 -- cgit v1.2.3