5 files changed, 14 insertions, 17 deletions
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 65b6775fcac1..3e15c394adef 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -224,11 +224,11 @@ namespace ww8
                     }
                     switch (rNd.GetNodeType())
                     {
-                        case ND_GRFNODE:
+                        case SwNodeType::Grf:
                             meWriterType = eGraphic;
                             maSize = rNd.GetNoTextNode()->GetTwipSize();
                             break;
-                        case ND_OLENODE:
+                        case SwNodeType::Ole:
                             meWriterType = eOle;
                             maSize = rNd.GetNoTextNode()->GetTwipSize();
                             break;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 5cc7259a38b5..8790bea99a05 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2847,10 +2847,10 @@ sal_Int32 SwEscherEx::WriteFlyFrame(const DrawObj &rObj, sal_uInt32 &rShapeId,
         SwNodeIndex aIdx( *pNdIdx, 1 );
         switch( aIdx.GetNode().GetNodeType() )
         {
-        case ND_GRFNODE:
+        case SwNodeType::Grf:
             nBorderThick = WriteGrfFlyFrame( rFormat, rShapeId = GenerateShapeId() );
             break;
-        case ND_OLENODE:
+        case SwNodeType::Ole:
             nBorderThick = WriteOLEFlyFrame( rFormat, rShapeId = GenerateShapeId() );
             break;
         default:
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 1765fbc373ad..bf84372aefd2 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -3119,20 +3119,17 @@ void MSWordExportBase::OutputContentNode( const SwContentNode& rNode )
 {
     switch ( rNode.GetNodeType() )
     {
-        case ND_TEXTNODE:
-        {
-            const SwTextNode& rTextNode = *rNode.GetTextNode();
-            OutputTextNode( rTextNode );
-        }
-        break;
-        case ND_GRFNODE:
+        case SwNodeType::Text:
+            OutputTextNode( *rNode.GetTextNode() );
+            break;
+        case SwNodeType::Grf:
             OutputGrfNode( *rNode.GetGrfNode() );
             break;
-        case ND_OLENODE:
+        case SwNodeType::Ole:
             OutputOLENode( *rNode.GetOLENode() );
             break;
         default:
-            OSL_TRACE("Unhandled node, type == %d", rNode.GetNodeType() );
+            OSL_TRACE("Unhandled node, type == %d", (int)rNode.GetNodeType() );
             break;
     }
 }
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index dbcfdc32aedd..dead560dfb6f 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -457,11 +457,11 @@ void SwWW8ImplReader::PicRead(SvStream *pDataStream, WW8_PIC *pPic,
 
 namespace
 {
-    sal_uInt8 GetNodeType(SwFrameFormat &rSource)
+    SwNodeType GetNodeType(SwFrameFormat &rSource)
     {
         const SwNodeIndex* pNodeIndex = rSource.GetContent().GetContentIdx();
         if (!pNodeIndex)
-            return 0;
+            return SwNodeType::NONE;
         const SwNode& rCSttNd = pNodeIndex->GetNode();
         SwNodeRange aRg(rCSttNd, 1, *rCSttNd.EndOfSectionNode());
         return aRg.aStart.GetNode().GetNodeType();
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index ba9c7e8d743d..83b8a5fbb1a8 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2797,7 +2797,7 @@ void WW8TabDesc::ParkPaM()
         {
             m_pIo->m_pPaM->GetPoint()->nNode = nSttNd;
         }
-        while (m_pIo->m_pPaM->GetNode().GetNodeType() != ND_TEXTNODE && ++nSttNd < nEndNd);
+        while (m_pIo->m_pPaM->GetNode().GetNodeType() != SwNodeType::Text && ++nSttNd < nEndNd);
 
         m_pIo->m_pPaM->GetPoint()->nContent.Assign(m_pIo->m_pPaM->GetContentNode(), 0);
         m_pIo->m_rDoc.SetTextFormatColl(*m_pIo->m_pPaM, const_cast<SwTextFormatColl*>(m_pIo->m_pDfltTextFormatColl));
@@ -3048,7 +3048,7 @@ void WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
             {
                 m_pIo->m_pPaM->GetPoint()->nNode = nSttNd;
             }
-            while (m_pIo->m_pPaM->GetNode().GetNodeType() != ND_TEXTNODE && ++nSttNd < nEndNd);
+            while (m_pIo->m_pPaM->GetNode().GetNodeType() != SwNodeType::Text && ++nSttNd < nEndNd);
             m_pIo->m_pPaM->GetPoint()->nContent.Assign(m_pIo->m_pPaM->GetContentNode(), 0);
             // Precautionally set now, otherwise the style is not set for cells
             // that are inserted for margin balancing.