summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sax/fshelper.hxx4
-rw-r--r--oox/source/export/vmlexport.cxx2
-rw-r--r--sax/source/tools/fastserializer.cxx20
-rw-r--r--sax/source/tools/fastserializer.hxx6
-rw-r--r--sax/source/tools/fshelper.cxx2
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx18
6 files changed, 26 insertions, 26 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
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 84b3737a3b6b..5568f56b71f9 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -863,7 +863,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect
}
}
- m_pSerializer->mergeTopMarks(Tag_Commit, sax_fastparser::MERGE_MARKS_POSTPONE );
+ m_pSerializer->mergeTopMarks(Tag_Commit, sax_fastparser::MergeMarks::POSTPONE );
}
OString VMLExport::ShapeIdString( sal_uInt32 nId )
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index 66466e9b6b90..32c0358ec618 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -402,7 +402,7 @@ namespace sax_fastparser {
#endif
void FastSaxSerializer::mergeTopMarks(
- sal_Int32 const nTag, sax_fastparser::MergeMarksEnum const eMergeType)
+ sal_Int32 const nTag, sax_fastparser::MergeMarks const eMergeType)
{
SAL_WARN_IF(mbMarkStackEmpty, "sax", "Empty mark stack - nothing to merge");
assert(!mbMarkStackEmpty); // should never happen
@@ -428,7 +428,7 @@ namespace sax_fastparser {
// flush, so that we get everything in getData()
maCachedOutputStream.flush();
- if ( maMarkStack.size() == 1 && eMergeType != MERGE_MARKS_IGNORE)
+ if (maMarkStack.size() == 1 && eMergeType != MergeMarks::IGNORE)
{
#ifdef DBG_UTIL
while (!maMarkStack.top()->m_DebugEndedElements.empty())
@@ -460,14 +460,14 @@ namespace sax_fastparser {
#ifdef DBG_UTIL
switch (eMergeType)
{
- case MERGE_MARKS_APPEND:
+ case MergeMarks::APPEND:
lcl_DebugMergeAppend(
maMarkStack.top()->m_DebugEndedElements,
maMarkStack.top()->m_DebugStartedElements,
topDebugEndedElements,
topDebugStartedElements);
break;
- case MERGE_MARKS_PREPEND:
+ case MergeMarks::PREPEND:
if (dynamic_cast<ForSort*>(maMarkStack.top().get())) // argh...
{
lcl_DebugMergeAppend(
@@ -485,14 +485,14 @@ namespace sax_fastparser {
maMarkStack.top()->m_DebugStartedElements);
}
break;
- case MERGE_MARKS_POSTPONE:
+ case MergeMarks::POSTPONE:
lcl_DebugMergeAppend(
maMarkStack.top()->m_DebugPostponedEndedElements,
maMarkStack.top()->m_DebugPostponedStartedElements,
topDebugEndedElements,
topDebugStartedElements);
break;
- case MERGE_MARKS_IGNORE:
+ case MergeMarks::IGNORE:
break;
}
#endif
@@ -508,10 +508,10 @@ namespace sax_fastparser {
switch ( eMergeType )
{
- case MERGE_MARKS_APPEND: maMarkStack.top()->append( aMerge ); break;
- case MERGE_MARKS_PREPEND: maMarkStack.top()->prepend( aMerge ); break;
- case MERGE_MARKS_POSTPONE: maMarkStack.top()->postpone( aMerge ); break;
- case MERGE_MARKS_IGNORE : break;
+ case MergeMarks::APPEND: maMarkStack.top()->append( aMerge ); break;
+ case MergeMarks::PREPEND: maMarkStack.top()->prepend( aMerge ); break;
+ case MergeMarks::POSTPONE: maMarkStack.top()->postpone( aMerge ); break;
+ case MergeMarks::IGNORE: break;
}
}
diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
index 5fcbef51b6df..1f30313def4d 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -125,7 +125,7 @@ public:
p, r, t, [text], /t, rPr, [something], /rPr, /r, /p,
simply do
p, r, mark(), t, [text], /t, mark(), rPr, [something], /rPr,
- mergeTopMarks( MERGE_MARKS_PREPEND ), mergeTopMarks( MERGE_MARKS_APPEND ), /r, /p
+ mergeTopMarks( MergeMarks::PREPEND ), mergeTopMarks( MergeMarks::APPEND ), /r, /p
and you are done.
@param nTag debugging aid to ensure mark and merge match in LIFO order
@@ -142,7 +142,7 @@ public:
Writes the result to the output stream if the mark stack becomes empty
by the operation.
- When the MERGE_MARKS_POSTPONE is specified, the merge happens just
+ When the MergeMarks::POSTPONE is specified, the merge happens just
before the next merge.
@param nTag debugging aid to ensure mark and merge match in LIFO order
@@ -150,7 +150,7 @@ public:
@see mark()
*/
void mergeTopMarks(sal_Int32 nTag,
- sax_fastparser::MergeMarksEnum eMergeType = sax_fastparser::MERGE_MARKS_APPEND);
+ sax_fastparser::MergeMarks eMergeType = sax_fastparser::MergeMarks::APPEND);
private:
/** Helper class to cache data and write in chunks to XOutputStream or ForMerge::append.
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index 46d87644d471..75a6fa052d32 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -160,7 +160,7 @@ void FastSerializerHelper::mark(
}
void FastSerializerHelper::mergeTopMarks(
- sal_Int32 const nTag, MergeMarksEnum const eMergeType)
+ sal_Int32 const nTag, MergeMarks const eMergeType)
{
mpSerializer->mergeTopMarks(nTag, eMergeType);
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0771d0270f36..e185158248bd 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -580,7 +580,7 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT
if(aFramePrTextbox.empty())
m_pSerializer->mergeTopMarks(Tag_StartParagraph_1);
else
- m_pSerializer->mergeTopMarks(Tag_StartParagraph_1, sax_fastparser::MERGE_MARKS_IGNORE);
+ m_pSerializer->mergeTopMarks(Tag_StartParagraph_1, sax_fastparser::MergeMarks::IGNORE);
// Write framePr
if(!aFramePrTextbox.empty())
@@ -676,7 +676,7 @@ void DocxAttributeOutput::WriteSdtBlock( sal_Int32& nSdtPrToken,
m_pSerializer->startElementNS( XML_w, XML_sdtContent, FSEND );
// prepend the tags since the sdt start mark before the paragraph
- m_pSerializer->mergeTopMarks(Tag_WriteSdtBlock, sax_fastparser::MERGE_MARKS_PREPEND);
+ m_pSerializer->mergeTopMarks(Tag_WriteSdtBlock, sax_fastparser::MergeMarks::PREPEND);
// write the ending tags after the paragraph
if (bPara)
@@ -1023,7 +1023,7 @@ void DocxAttributeOutput::EndParagraphProperties(const SfxItemSet& rParagraphMar
// merge the properties _before_ the run (strictly speaking, just
// after the start of the paragraph)
- m_pSerializer->mergeTopMarks(Tag_StartParagraphProperties, sax_fastparser::MERGE_MARKS_PREPEND);
+ m_pSerializer->mergeTopMarks(Tag_StartParagraphProperties, sax_fastparser::MergeMarks::PREPEND);
}
void DocxAttributeOutput::SetStateOfFlyFrame( FlyProcessingState nStateOfFlyFrame )
@@ -1218,7 +1218,7 @@ void DocxAttributeOutput::EndRun()
{
RunText(OUString("\t")) ;
}
- m_pSerializer->mergeTopMarks(Tag_EndRun_1, sax_fastparser::MERGE_MARKS_PREPEND); // merges with "postponed run start", see above
+ m_pSerializer->mergeTopMarks(Tag_EndRun_1, sax_fastparser::MergeMarks::PREPEND); // merges with "postponed run start", see above
// write the run start + the run content
m_pSerializer->mergeTopMarks(Tag_StartRun_2); // merges the "actual run start"
@@ -1247,7 +1247,7 @@ void DocxAttributeOutput::EndRun()
{
m_pSerializer->mark(Tag_EndRun_2);
EndSdtBlock();
- m_pSerializer->mergeTopMarks(Tag_EndRun_2, sax_fastparser::MERGE_MARKS_PREPEND);
+ m_pSerializer->mergeTopMarks(Tag_EndRun_2, sax_fastparser::MergeMarks::PREPEND);
}
m_pSerializer->mergeTopMarks(Tag_StartRun_1);
@@ -1993,7 +1993,7 @@ void DocxAttributeOutput::EndRunProperties( const SwRedlineData* pRedlineData )
// merge the properties _before_ the run text (strictly speaking, just
// after the start of the run)
- m_pSerializer->mergeTopMarks(Tag_StartRunProperties, sax_fastparser::MERGE_MARKS_PREPEND);
+ m_pSerializer->mergeTopMarks(Tag_StartRunProperties, sax_fastparser::MergeMarks::PREPEND);
}
void DocxAttributeOutput::GetSdtEndBefore(const SdrObject* pSdrObj)
@@ -2401,7 +2401,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedlineData)
m_pSerializer->endElementNS( XML_w, XML_rPr );
- m_pSerializer->mergeTopMarks(Tag_Redline_1, sax_fastparser::MERGE_MARKS_PREPEND);
+ m_pSerializer->mergeTopMarks(Tag_Redline_1, sax_fastparser::MergeMarks::PREPEND);
}
}
}
@@ -2452,7 +2452,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedlineData)
m_pSerializer->endElementNS( XML_w, XML_pPr );
- m_pSerializer->mergeTopMarks(Tag_Redline_2, sax_fastparser::MERGE_MARKS_PREPEND);
+ m_pSerializer->mergeTopMarks(Tag_Redline_2, sax_fastparser::MergeMarks::PREPEND);
}
}
}
@@ -5024,7 +5024,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
break;
}
- m_pSerializer->mergeTopMarks(Tag_OutputFlyFrame, sax_fastparser::MERGE_MARKS_POSTPONE);
+ m_pSerializer->mergeTopMarks(Tag_OutputFlyFrame, sax_fastparser::MergeMarks::POSTPONE);
}
bool DocxAttributeOutput::IsDiagram( const SdrObject* sdrObject )
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-26 18:31:07 +0000