diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-29 09:22:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-29 08:20:23 +0000 |
| commit | b8aa1def37b62091f15bf09529104ca38333d5f5 (patch) | |
| tree | c9e61d8b33d24283a8639ac3d4269801d5e7e69f /sw/source/filter/ww8 | |
| parent | 53a156fc3b500f5647493319acb264ba24b2b3fb (diff) | |
convert ND constants to o3tl::typed_flags
Change-Id: I5fe3df5515017ec24db1184e8aca823714fcfdb3
Reviewed-on: https://gerrit.libreoffice.org/31343
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/writerhelper.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 15 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 4 |
4 files changed, 12 insertions, 15 deletions
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index 5d38ce1b4907..5b7f5a921c73 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -221,11 +221,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 b654cdb1ffa7..645116c938ce 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -2915,10 +2915,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 87173dbef028..94839edb59e3 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -3099,20 +3099,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/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index c777532778b8..ecd2326968a4 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2674,7 +2674,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)); @@ -2967,7 +2967,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. |