diff options
Diffstat (limited to 'sw/source/filter/ww8/rtfsdrexport.cxx')
-rw-r--r-- | sw/source/filter/ww8/rtfsdrexport.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index 567ddd664dd3..f016cb0c46fc 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -88,7 +88,7 @@ RtfSdrExport::~RtfSdrExport() delete[] m_pShapeTypeWritten, m_pShapeTypeWritten = NULL; } -void RtfSdrExport::OpenContainer( UINT16 nEscherContainer, int nRecInstance ) +void RtfSdrExport::OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance ) { OSL_TRACE("%s", OSL_THIS_FUNC); @@ -121,7 +121,7 @@ void RtfSdrExport::CloseContainer() EscherEx::CloseContainer(); } -UINT32 RtfSdrExport::EnterGroup( const String& /*rShapeName*/, const Rectangle* /*pRect*/ ) +sal_uInt32 RtfSdrExport::EnterGroup( const String& /*rShapeName*/, const Rectangle* /*pRect*/ ) { OSL_TRACE("%s", OSL_THIS_FUNC); @@ -135,7 +135,7 @@ void RtfSdrExport::LeaveGroup() /* noop */ } -void RtfSdrExport::AddShape( UINT32 nShapeType, UINT32 nShapeFlags, UINT32 /*nShapeId*/ ) +void RtfSdrExport::AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 /*nShapeId*/ ) { OSL_TRACE("%s", OSL_THIS_FUNC); @@ -520,10 +520,10 @@ void RtfSdrExport::WriteOutliner(const OutlinerParaObject& rParaObj) const EditTextObject& rEditObj = rParaObj.GetTextObject(); MSWord_SdrAttrIter aAttrIter( m_rExport, rEditObj, TXT_HFTXTBOX ); - USHORT nPara = rEditObj.GetParagraphCount(); + sal_uInt16 nPara = rEditObj.GetParagraphCount(); m_rAttrOutput.RunText().append('{').append(OOO_STRING_SVTOOLS_RTF_SHPTXT).append(' '); - for (USHORT n = 0; n < nPara; ++n) + for (sal_uInt16 n = 0; n < nPara; ++n) { if( n ) aAttrIter.NextPara( n ); @@ -577,7 +577,7 @@ void RtfSdrExport::EndShape( sal_Int32 nShapeElement ) } } -UINT32 RtfSdrExport::AddSdrObject( const SdrObject& rObj ) +sal_uInt32 RtfSdrExport::AddSdrObject( const SdrObject& rObj ) { m_pSdrObject = &rObj; return EscherEx::AddSdrObject(rObj); |