[Libreoffice-commits] .: sw/source
Miklos Vajna
vmiklos at kemper.freedesktop.org
Wed Dec 28 15:39:39 PST 2011
sw/source/filter/ww8/rtfattributeoutput.cxx | 297 +++++++++++++---------------
sw/source/filter/ww8/rtfexport.cxx | 74 +++---
sw/source/filter/ww8/rtfexportfilter.cxx | 2
sw/source/filter/ww8/rtfimportfilter.cxx | 2
sw/source/filter/ww8/rtfsdrexport.cxx | 30 +-
5 files changed, 202 insertions(+), 203 deletions(-)
New commits:
commit a4ab175d5a05e1172deeb9a06a852e5209a530fc
Author: Miklos Vajna <vmiklos at frugalware.org>
Date: Thu Dec 29 00:38:01 2011 +0100
RTF export: replace OSL_TRACE(...) by SAL_INFO("sw",...)
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 9ade064..17fff9a 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -34,6 +34,7 @@
#include "fmtcntnt.hxx"
#include "fchrfmt.hxx"
+#include <rtl/oustringostreaminserter.hxx>
#include <svtools/rtfkeywd.hxx>
#include <editeng/fontitem.hxx>
@@ -199,7 +200,7 @@ static OString OutBorderLine(RtfExport &rExport, const SvxBorderLine* pLine,
void RtfAttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
/*
You would have thought that
m_rExport.Strm() << (bIsRTL ? OOO_STRING_SVTOOLS_RTF_RTLCH : OOO_STRING_SVTOOLS_RTF_LTRCH); would be sufficent here ,
@@ -237,7 +238,7 @@ void RtfAttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript )
void RtfAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
// Output table/table row/table cell starts if needed
if ( pTextNodeInfo.get() )
@@ -286,7 +287,7 @@ void RtfAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextN
void RtfAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
FinishTableRowCell( pTextNodeInfoInner );
@@ -316,14 +317,14 @@ void RtfAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTe
void RtfAttributeOutput::EmptyParagraph()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << m_rExport.sNewLine << OOO_STRING_SVTOOLS_RTF_PAR << ' ';
}
void RtfAttributeOutput::StartParagraphProperties( const SwTxtNode& rNode )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
OSL_ENSURE(m_aStyles.getLength() == 0, "m_aStyles is not empty");
// output page/section breaks
@@ -363,14 +364,14 @@ void RtfAttributeOutput::StartParagraphProperties( const SwTxtNode& rNode )
void RtfAttributeOutput::EndParagraphProperties()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(m_aStylesEnd.makeStringAndClear());
m_rExport.Strm() << m_aStyles.makeStringAndClear().getStr();
}
void RtfAttributeOutput::StartRun( const SwRedlineData* pRedlineData )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aRun.append('{');
@@ -382,7 +383,7 @@ void RtfAttributeOutput::StartRun( const SwRedlineData* pRedlineData )
void RtfAttributeOutput::EndRun()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aRun.append(m_rExport.sNewLine);
m_aRun.append(m_aRunText.makeStringAndClear());
m_aRun.append('}');
@@ -390,20 +391,20 @@ void RtfAttributeOutput::EndRun()
void RtfAttributeOutput::StartRunProperties()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
OSL_ENSURE(m_aStyles.getLength() == 0, "m_aStyles is not empty");
}
void RtfAttributeOutput::EndRunProperties( const SwRedlineData* /*pRedlineData*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(m_aStylesEnd.makeStringAndClear());
m_aRun.append(m_aStyles.makeStringAndClear());
}
void RtfAttributeOutput::RunText( const String& rText, rtl_TextEncoding eCharSet )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
RawText( rText, 0, eCharSet );
}
@@ -419,23 +420,23 @@ OStringBuffer& RtfAttributeOutput::Styles()
void RtfAttributeOutput::RawText( const String& rText, bool /*bForceUnicode*/, rtl_TextEncoding eCharSet )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aRunText.append(m_rExport.OutString(rText, eCharSet));
}
void RtfAttributeOutput::StartRuby( const SwTxtNode& /*rNode*/, xub_StrLen /*nPos*/, const SwFmtRuby& /*rRuby*/ )
{
- OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+ SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::EndRuby()
{
- OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+ SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
}
bool RtfAttributeOutput::StartURL( const String& rUrl, const String& rTarget )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append('{');
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_FIELD);
@@ -466,7 +467,7 @@ bool RtfAttributeOutput::StartURL( const String& rUrl, const String& rTarget )
bool RtfAttributeOutput::EndURL()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
// close the fldrslt group
if (m_bHadFieldResult)
@@ -478,7 +479,7 @@ bool RtfAttributeOutput::EndURL()
void RtfAttributeOutput::FieldVanish( const String& /*rTxt*/, ww::eField /*eType*/ )
{
- OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+ SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::Redline( const SwRedlineData* pRedline )
@@ -486,7 +487,7 @@ void RtfAttributeOutput::Redline( const SwRedlineData* pRedline )
if (!pRedline)
return;
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if (pRedline->GetType() == nsRedlineType_t::REDLINE_INSERT)
{
@@ -508,12 +509,12 @@ void RtfAttributeOutput::Redline( const SwRedlineData* pRedline )
void RtfAttributeOutput::FormatDrop( const SwTxtNode& /*rNode*/, const SwFmtDrop& /*rSwFmtDrop*/, sal_uInt16 /*nStyle*/, ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/, ww8::WW8TableNodeInfoInner::Pointer_t /*pTextNodeInfoInner*/ )
{
- OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+ SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::ParagraphStyle( sal_uInt16 nStyle )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
OString *pStyle = m_rExport.GetStyle(nStyle);
OStringBuffer aStyle;
@@ -529,7 +530,7 @@ void RtfAttributeOutput::ParagraphStyle( sal_uInt16 nStyle )
void RtfAttributeOutput::TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_INTBL);
if ( m_nTableDepth > 1 )
@@ -542,14 +543,14 @@ void RtfAttributeOutput::TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t /*
void RtfAttributeOutput::TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfo*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
/* noop */
}
void RtfAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( !m_pTableWrt )
InitTableHelper( pTableTextNodeInfoInner );
@@ -630,7 +631,7 @@ void RtfAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
void RtfAttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
/*
* The function name is a bit misleading: given that we write borders
@@ -686,7 +687,7 @@ void RtfAttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointe
void RtfAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const SwWriteTableRows& aRows = m_pTableWrt->GetRows( );
SwWriteTableRow *pRow = aRows[ pTableTextNodeInfoInner->getRow( ) ];
@@ -707,7 +708,7 @@ void RtfAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
void RtfAttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
const SwTableLine * pTabLine = pTabBox->GetUpper();
@@ -735,7 +736,7 @@ void RtfAttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTab
void RtfAttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
const SwTableLine * pTabLine = pTabBox->GetUpper();
@@ -749,7 +750,7 @@ void RtfAttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pT
void RtfAttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const SwTable * pTable = pTableTextNodeInfoInner->getTable();
const SwFrmFmt * pFrmFmt = pTable->GetFrmFmt();
@@ -762,7 +763,7 @@ void RtfAttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTable
void RtfAttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const SwWriteTableRows& aRows = m_pTableWrt->GetRows( );
SwWriteTableRow *pRow = aRows[ pTableTextNodeInfoInner->getRow( ) ];
@@ -789,14 +790,14 @@ void RtfAttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_
void RtfAttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t /*pNodeInfo*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
/* noop */
}
void RtfAttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
// This is called when the nested table ends in a cell, and there's no
// paragraph benhind that; so we must check for the ends of cell, rows,
@@ -807,7 +808,7 @@ void RtfAttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer
void RtfAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const SwTable *pTable = pTableTextNodeInfoInner->getTable();
SwFrmFmt *pFmt = pTable->GetFrmFmt( );
@@ -837,12 +838,12 @@ void RtfAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t
void RtfAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
{
- OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+ SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::TableRowEnd( sal_uInt32 /*nDepth*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
/* noop, see EndTableRow() */
}
@@ -853,7 +854,7 @@ void RtfAttributeOutput::TableRowEnd( sal_uInt32 /*nDepth*/ )
void RtfAttributeOutput::InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
sal_uInt32 nPageSize = 0;
bool bRelBoxSize = false;
@@ -875,7 +876,7 @@ void RtfAttributeOutput::InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t
void RtfAttributeOutput::StartTable( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
// To trigger calling InitTableHelper()
delete m_pTableWrt, m_pTableWrt = NULL;
@@ -884,7 +885,7 @@ void RtfAttributeOutput::StartTable( ww8::WW8TableNodeInfoInner::Pointer_t /*pTa
void RtfAttributeOutput::StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
sal_uInt32 nCurrentDepth = pTableTextNodeInfoInner->getDepth();
- OSL_TRACE("%s, (depth is %d)", OSL_THIS_FUNC, (int)nCurrentDepth);
+ SAL_INFO("sw", OSL_THIS_FUNC << ", (depth is " << nCurrentDepth << ")");
TableDefinition(pTableTextNodeInfoInner);
@@ -913,14 +914,14 @@ void RtfAttributeOutput::StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t pT
void RtfAttributeOutput::StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_bTableCellOpen = true;
}
void RtfAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
TableDefaultBorders(pTableTextNodeInfoInner);
TableBackgrounds(pTableTextNodeInfoInner);
@@ -929,7 +930,7 @@ void RtfAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Pointe
void RtfAttributeOutput::EndTableCell( )
{
- OSL_TRACE("%s, (depth is %d)", OSL_THIS_FUNC, (int)m_nTableDepth);
+ SAL_INFO("sw", OSL_THIS_FUNC << ", (depth is " << m_nTableDepth << ")");
if (!m_bWroteCellInfo)
{
@@ -949,7 +950,7 @@ void RtfAttributeOutput::EndTableCell( )
void RtfAttributeOutput::EndTableRow( )
{
- OSL_TRACE("%s, (depth is %d)", OSL_THIS_FUNC, (int)m_nTableDepth);
+ SAL_INFO("sw", OSL_THIS_FUNC << ", (depth is " << m_nTableDepth << ")");
if ( m_nTableDepth > 1 )
{
@@ -976,7 +977,7 @@ void RtfAttributeOutput::EndTableRow( )
void RtfAttributeOutput::EndTable()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( m_nTableDepth > 0 ) {
m_nTableDepth--;
@@ -993,7 +994,7 @@ void RtfAttributeOutput::EndTable()
void RtfAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool /*bForceEmptyParagraph*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( pInner.get() )
{
@@ -1019,7 +1020,7 @@ void RtfAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer
void RtfAttributeOutput::StartStyles()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << m_rExport.sNewLine << '{' << OOO_STRING_SVTOOLS_RTF_COLORTBL;
m_rExport.OutColorTable();
OSL_ENSURE(m_aStylesheet.getLength() == 0, "m_aStylesheet is not empty");
@@ -1030,7 +1031,7 @@ void RtfAttributeOutput::StartStyles()
void RtfAttributeOutput::EndStyles( sal_uInt16 /*nNumberOfStyles*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << '}';
m_rExport.Strm() << m_aStylesheet.makeStringAndClear().getStr();
m_rExport.Strm() << '}';
@@ -1038,7 +1039,7 @@ void RtfAttributeOutput::EndStyles( sal_uInt16 /*nNumberOfStyles*/ )
void RtfAttributeOutput::DefaultStyle( sal_uInt16 /*nStyle*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
/* noop, the default style is always 0 in RTF */
}
@@ -1047,8 +1048,7 @@ void RtfAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 /*nWwId*/, sal_uInt16 nId,
bool /* bAutoUpdate */ )
{
- OSL_TRACE("%s, rName = '%s'", OSL_THIS_FUNC,
- OUStringToOString( OUString( rName ), m_rExport.eCurrentEncoding ).getStr());
+ SAL_INFO("sw", OSL_THIS_FUNC << ", rName = '" << OUString(rName) << "'");
m_aStylesheet.append('{');
if (bPapFmt)
@@ -1072,7 +1072,7 @@ void RtfAttributeOutput::StartStyle( const String& rName, bool bPapFmt,
void RtfAttributeOutput::EndStyle()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(m_aStylesEnd.makeStringAndClear());
OString aStyles = m_aStyles.makeStringAndClear();
m_rExport.InsStyle(m_nStyleId, aStyles);
@@ -1085,19 +1085,19 @@ void RtfAttributeOutput::EndStyle()
void RtfAttributeOutput::StartStyleProperties( bool /*bParProp*/, sal_uInt16 /*nStyle*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
/* noop */
}
void RtfAttributeOutput::EndStyleProperties( bool /*bParProp*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
/* noop */
}
void RtfAttributeOutput::OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt& /*rNFmt*/, const SwFmt& /*rFmt*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( nLvl >= WW8ListManager::nMaxLevel )
nLvl = WW8ListManager::nMaxLevel - 1;
@@ -1110,7 +1110,7 @@ void RtfAttributeOutput::OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt& /*rNF
void RtfAttributeOutput::PageBreakBefore( bool bBreak )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if (bBreak)
{
@@ -1120,7 +1120,7 @@ void RtfAttributeOutput::PageBreakBefore( bool bBreak )
void RtfAttributeOutput::SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
switch (nC)
{
@@ -1136,7 +1136,7 @@ void RtfAttributeOutput::SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSection
void RtfAttributeOutput::StartSection()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_SECT OOO_STRING_SVTOOLS_RTF_SECTD);
if (!m_bBufferSectionBreaks)
@@ -1145,7 +1145,7 @@ void RtfAttributeOutput::StartSection()
void RtfAttributeOutput::EndSection()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
/*
* noop, \sect must go to StartSection or Word won't notice multiple
@@ -1155,7 +1155,7 @@ void RtfAttributeOutput::EndSection()
void RtfAttributeOutput::SectionFormProtection( bool bProtected )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED);
m_aSectionBreaks.append((sal_Int32)!bProtected);
@@ -1163,7 +1163,7 @@ void RtfAttributeOutput::SectionFormProtection( bool bProtected )
void RtfAttributeOutput::SectionLineNumbering( sal_uLong /*nRestartNo*/, const SwLineNumberInfo& rLnNumInfo )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LINEMOD;
m_rExport.OutLong(rLnNumInfo.GetCountBy());
@@ -1175,7 +1175,7 @@ void RtfAttributeOutput::SectionLineNumbering( sal_uLong /*nRestartNo*/, const S
void RtfAttributeOutput::SectionTitlePage()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
/*
* noop, handled in RtfExport::WriteHeaderFooter()
@@ -1184,7 +1184,7 @@ void RtfAttributeOutput::SectionTitlePage()
void RtfAttributeOutput::SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* /*pFirstPageFmt*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const SvxBoxItem& rBox = pFmt->GetBox();
const SvxBorderLine *pLine = rBox.GetTop();
@@ -1211,14 +1211,14 @@ void RtfAttributeOutput::SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFm
void RtfAttributeOutput::SectionBiDi( bool bBiDi )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << (bBiDi ? OOO_STRING_SVTOOLS_RTF_RTLSECT : OOO_STRING_SVTOOLS_RTF_LTRSECT);
}
void RtfAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, sal_uInt16 nPageRestartNumber )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if (nPageRestartNumber > 0)
{
@@ -1245,7 +1245,7 @@ void RtfAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, sal_uInt16 n
void RtfAttributeOutput::SectionType( sal_uInt8 nBreakCode )
{
- OSL_TRACE("%s, nBreakCode = %d", OSL_THIS_FUNC, nBreakCode);
+ SAL_INFO("sw", OSL_THIS_FUNC << ", nBreakCode = " << nBreakCode);
/*
* break code: 0 No break, 1 New column
@@ -1267,7 +1267,7 @@ void RtfAttributeOutput::SectionType( sal_uInt8 nBreakCode )
void RtfAttributeOutput::NumberingDefinition( sal_uInt16 nId, const SwNumRule &/*rRule*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE;
m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LISTID;
@@ -1279,7 +1279,7 @@ void RtfAttributeOutput::NumberingDefinition( sal_uInt16 nId, const SwNumRule &/
void RtfAttributeOutput::StartAbstractNumbering( sal_uInt16 nId )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LIST << OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID;
m_rExport.OutULong( nId );
@@ -1288,7 +1288,7 @@ void RtfAttributeOutput::StartAbstractNumbering( sal_uInt16 nId )
void RtfAttributeOutput::EndAbstractNumbering()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LISTID;
m_rExport.OutULong( m_nListId ) << '}' << m_rExport.sNewLine;
@@ -1307,7 +1307,7 @@ void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
sal_Int16 /*nListTabPos*/,
const String &rNumberingString )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << m_rExport.sNewLine;
if( nLevel > 8 ) // RTF knows only 9 levels
@@ -1396,7 +1396,7 @@ void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
void RtfAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField /*eType*/, const String& rFldCmd, sal_uInt8 /*nMode*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
// If there are no field instructions, don't export it as a field.
bool bHasInstructions = rFldCmd.Len() > 0;
@@ -1456,7 +1456,7 @@ void RtfAttributeOutput::WriteHeaderFooter_Impl( const SwFrmFmt& rFmt, bool bHea
void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Point& /*rNdTopLeft*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const SwNode *pNode = rFrame.GetContent();
const SwGrfNode *pGrfNode = pNode ? pNode->GetGrfNode() : 0;
@@ -1744,8 +1744,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
m_aRun.append("}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " ");
}
else
- OSL_TRACE("%s unhandled form control: '%s'", OSL_THIS_FUNC,
- OUStringToOString(xInfo->getImplementationName(), m_rExport.eCurrentEncoding).getStr());
+ SAL_INFO("sw", OSL_THIS_FUNC << " unhandled form control: '" << xInfo->getImplementationName()<< "'");
m_aRun.append('}');
}
}
@@ -1766,14 +1765,14 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi
}
break;
default:
- OSL_TRACE("%s: unknown type (%d)", OSL_THIS_FUNC, rFrame.GetWriterType());
+ SAL_INFO("sw", OSL_THIS_FUNC << ": unknown type (" << (int)rFrame.GetWriterType() << ")");
break;
}
}
void RtfAttributeOutput::CharCaseMap( const SvxCaseMapItem& rCaseMap )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
switch ( rCaseMap.GetValue() )
{
@@ -1794,7 +1793,7 @@ void RtfAttributeOutput::CharCaseMap( const SvxCaseMapItem& rCaseMap )
void RtfAttributeOutput::CharColor( const SvxColorItem& rColor )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const Color aColor( rColor.GetValue() );
@@ -1804,7 +1803,7 @@ void RtfAttributeOutput::CharColor( const SvxColorItem& rColor )
void RtfAttributeOutput::CharContour( const SvxContourItem& rContour )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_OUTL);
if ( !rContour.GetValue() )
@@ -1813,7 +1812,7 @@ void RtfAttributeOutput::CharContour( const SvxContourItem& rContour )
void RtfAttributeOutput::CharCrossedOut( const SvxCrossedOutItem& rCrossedOut )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
switch ( rCrossedOut.GetStrikeout() )
{
@@ -1836,7 +1835,7 @@ void RtfAttributeOutput::CharCrossedOut( const SvxCrossedOutItem& rCrossedOut )
void RtfAttributeOutput::CharEscapement( const SvxEscapementItem& rEsc )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const char * pUpDn;
@@ -1886,7 +1885,7 @@ void RtfAttributeOutput::CharEscapement( const SvxEscapementItem& rEsc )
void RtfAttributeOutput::CharFont( const SvxFontItem& rFont)
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_LOCH);
m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_F);
@@ -1896,7 +1895,7 @@ void RtfAttributeOutput::CharFont( const SvxFontItem& rFont)
void RtfAttributeOutput::CharFontSize( const SvxFontHeightItem& rFontSize)
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
switch ( rFontSize.Which() )
{
@@ -1917,7 +1916,7 @@ void RtfAttributeOutput::CharFontSize( const SvxFontHeightItem& rFontSize)
void RtfAttributeOutput::CharKerning( const SvxKerningItem& rKerning )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
// in quater points then in twips
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_EXPND);
@@ -1928,7 +1927,7 @@ void RtfAttributeOutput::CharKerning( const SvxKerningItem& rKerning )
void RtfAttributeOutput::CharLanguage( const SvxLanguageItem& rLanguage )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
switch (rLanguage.Which())
{
@@ -1949,7 +1948,7 @@ void RtfAttributeOutput::CharLanguage( const SvxLanguageItem& rLanguage )
void RtfAttributeOutput::CharPosture( const SvxPostureItem& rPosture )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_I);
if ( rPosture.GetPosture() == ITALIC_NONE )
@@ -1958,7 +1957,7 @@ void RtfAttributeOutput::CharPosture( const SvxPostureItem& rPosture )
void RtfAttributeOutput::CharShadow( const SvxShadowedItem& rShadow )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SHAD);
if ( !rShadow.GetValue() )
@@ -1967,7 +1966,7 @@ void RtfAttributeOutput::CharShadow( const SvxShadowedItem& rShadow )
void RtfAttributeOutput::CharUnderline( const SvxUnderlineItem& rUnderline )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const char* pStr = 0;
const SfxPoolItem* pItem = m_rExport.HasItem( RES_CHRATR_WORDLINEMODE );
@@ -2043,7 +2042,7 @@ void RtfAttributeOutput::CharUnderline( const SvxUnderlineItem& rUnderline )
void RtfAttributeOutput::CharWeight( const SvxWeightItem& rWeight )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_B);
if ( rWeight.GetWeight() != WEIGHT_BOLD )
@@ -2052,7 +2051,7 @@ void RtfAttributeOutput::CharWeight( const SvxWeightItem& rWeight )
void RtfAttributeOutput::CharAutoKern( const SvxAutoKernItem& rAutoKern)
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_KERNING);
m_aStyles.append((sal_Int32) (rAutoKern.GetValue() ? 1 : 0));
@@ -2060,7 +2059,7 @@ void RtfAttributeOutput::CharAutoKern( const SvxAutoKernItem& rAutoKern)
void RtfAttributeOutput::CharAnimatedText( const SvxBlinkItem& rBlink )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ANIMTEXT);
m_aStyles.append((sal_Int32) (rBlink.GetValue() ? 2 : 0));
@@ -2068,7 +2067,7 @@ void RtfAttributeOutput::CharAnimatedText( const SvxBlinkItem& rBlink )
void RtfAttributeOutput::CharBackground( const SvxBrushItem& rBrush )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if( !rBrush.GetColor().GetTransparency() )
{
@@ -2079,7 +2078,7 @@ void RtfAttributeOutput::CharBackground( const SvxBrushItem& rBrush )
void RtfAttributeOutput::CharFontCJK( const SvxFontItem& rFont )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HICH);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AF);
@@ -2088,21 +2087,21 @@ void RtfAttributeOutput::CharFontCJK( const SvxFontItem& rFont )
void RtfAttributeOutput::CharFontSizeCJK( const SvxFontHeightItem& rFontSize )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
CharFontSize( rFontSize );
}
void RtfAttributeOutput::CharLanguageCJK( const SvxLanguageItem& rLanguageItem )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
CharLanguage( rLanguageItem );
}
void RtfAttributeOutput::CharPostureCJK( const SvxPostureItem& rPosture )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_I);
if ( rPosture.GetPosture() == ITALIC_NONE )
@@ -2111,7 +2110,7 @@ void RtfAttributeOutput::CharPostureCJK( const SvxPostureItem& rPosture )
void RtfAttributeOutput::CharWeightCJK( const SvxWeightItem& rWeight )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_B);
if ( rWeight.GetWeight() != WEIGHT_BOLD )
@@ -2120,7 +2119,7 @@ void RtfAttributeOutput::CharWeightCJK( const SvxWeightItem& rWeight )
void RtfAttributeOutput::CharFontCTL( const SvxFontItem& rFont )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_DBCH);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AF);
@@ -2129,21 +2128,21 @@ void RtfAttributeOutput::CharFontCTL( const SvxFontItem& rFont )
void RtfAttributeOutput::CharFontSizeCTL( const SvxFontHeightItem& rFontSize )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
CharFontSize( rFontSize );
}
void RtfAttributeOutput::CharLanguageCTL( const SvxLanguageItem& rLanguageItem )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
CharLanguage( rLanguageItem );
}
void RtfAttributeOutput::CharPostureCTL( const SvxPostureItem& rPosture)
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AI);
if ( rPosture.GetPosture() == ITALIC_NONE )
@@ -2152,7 +2151,7 @@ void RtfAttributeOutput::CharPostureCTL( const SvxPostureItem& rPosture)
void RtfAttributeOutput::CharWeightCTL( const SvxWeightItem& rWeight )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AB);
if ( rWeight.GetWeight() != WEIGHT_BOLD )
@@ -2161,7 +2160,7 @@ void RtfAttributeOutput::CharWeightCTL( const SvxWeightItem& rWeight )
void RtfAttributeOutput::CharRotate( const SvxCharRotateItem& rRotate)
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HORZVERT);
m_aStyles.append((sal_Int32)(rRotate.IsFitToLine() ? 1 : 0));
@@ -2169,7 +2168,7 @@ void RtfAttributeOutput::CharRotate( const SvxCharRotateItem& rRotate)
void RtfAttributeOutput::CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const sal_Char* pStr;
switch( rEmphasisMark.GetEmphasisMark())
@@ -2183,7 +2182,7 @@ void RtfAttributeOutput::CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisM
void RtfAttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if( rTwoLines.GetValue() )
{
@@ -2209,7 +2208,7 @@ void RtfAttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines )
void RtfAttributeOutput::CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CHARSCALEX);
m_aStyles.append((sal_Int32)rScaleWidth.GetValue());
@@ -2217,7 +2216,7 @@ void RtfAttributeOutput::CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidt
void RtfAttributeOutput::CharRelief( const SvxCharReliefItem& rRelief )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const sal_Char* pStr;
switch (rRelief.GetValue())
@@ -2239,7 +2238,7 @@ void RtfAttributeOutput::CharRelief( const SvxCharReliefItem& rRelief )
void RtfAttributeOutput::CharHidden( const SvxCharHiddenItem& rHidden )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_V);
if ( !rHidden.GetValue() )
@@ -2248,7 +2247,7 @@ void RtfAttributeOutput::CharHidden( const SvxCharHiddenItem& rHidden )
void RtfAttributeOutput::TextINetFormat( const SwFmtINetFmt& rURL )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if( rURL.GetValue().Len() )
{
@@ -2269,7 +2268,7 @@ void RtfAttributeOutput::TextINetFormat( const SwFmtINetFmt& rURL )
void RtfAttributeOutput::TextCharFormat( const SwFmtCharFmt& rCharFmt )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
sal_uInt16 nStyle = m_rExport.GetId( *rCharFmt.GetCharFmt() );
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CS);
@@ -2289,7 +2288,7 @@ void RtfAttributeOutput::WriteTextFootnoteNumStr(const SwFmtFtn& rFootnote)
void RtfAttributeOutput::TextFootnote_Impl( const SwFmtFtn& rFootnote )
{
- OSL_TRACE("%s start", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " start");
m_aRun.append("{" OOO_STRING_SVTOOLS_RTF_SUPER " ");
WriteTextFootnoteNumStr(rFootnote);
@@ -2318,12 +2317,12 @@ void RtfAttributeOutput::TextFootnote_Impl( const SwFmtFtn& rFootnote )
m_aRun.append("}");
m_aRun.append("}");
- OSL_TRACE("%s end", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " end");
}
void RtfAttributeOutput::ParaLineSpacing_Impl( short nSpace, short nMulti )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SL);
m_aStyles.append((sal_Int32)nSpace);
@@ -2334,7 +2333,7 @@ void RtfAttributeOutput::ParaLineSpacing_Impl( short nSpace, short nMulti )
void RtfAttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
switch ( rAdjust.GetAdjust() )
{
@@ -2358,7 +2357,7 @@ void RtfAttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
void RtfAttributeOutput::ParaSplit( const SvxFmtSplitItem& rSplit )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if( !rSplit.GetValue() )
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_KEEP);
@@ -2366,7 +2365,7 @@ void RtfAttributeOutput::ParaSplit( const SvxFmtSplitItem& rSplit )
void RtfAttributeOutput::ParaWidows( const SvxWidowsItem& rWidows )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if (rWidows.GetValue())
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_WIDCTLPAR);
@@ -2376,7 +2375,7 @@ void RtfAttributeOutput::ParaWidows( const SvxWidowsItem& rWidows )
void RtfAttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStop )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
long nOffset = ((SvxLRSpaceItem&)m_rExport.GetItem( RES_LR_SPACE )).GetTxtLeft();
for( sal_uInt16 n = 0; n < rTabStop.Count(); n++ )
@@ -2430,7 +2429,7 @@ void RtfAttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStop )
void RtfAttributeOutput::ParaHyphenZone( const SvxHyphenZoneItem& rHyphenZone )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
sal_Int32 nFlags = rHyphenZone.IsHyphen() ? 1 : 0;
if( rHyphenZone.IsPageEnd() )
@@ -2450,7 +2449,7 @@ void RtfAttributeOutput::ParaHyphenZone( const SvxHyphenZoneItem& rHyphenZone )
void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( USHRT_MAX == nNumId || 0 == nNumId || 0 == pTxtNd)
return;
@@ -2532,7 +2531,7 @@ void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL
void RtfAttributeOutput::ParaScriptSpace( const SfxBoolItem& rScriptSpace )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if (!rScriptSpace.GetValue( ))
return;
@@ -2549,7 +2548,7 @@ void RtfAttributeOutput::ParaScriptSpace( const SfxBoolItem& rScriptSpace )
void RtfAttributeOutput::ParaVerticalAlign( const SvxParaVertAlignItem& rAlign )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const char* pStr;
switch ( rAlign.GetValue() )
@@ -2566,12 +2565,12 @@ void RtfAttributeOutput::ParaVerticalAlign( const SvxParaVertAlignItem& rAlign )
void RtfAttributeOutput::ParaSnapToGrid( const SvxParaGridItem& /*rGrid*/ )
{
- OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+ SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( m_rExport.bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax )
{
@@ -2603,12 +2602,12 @@ void RtfAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
void RtfAttributeOutput::FormatPaperBin( const SvxPaperBinItem& )
{
- OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+ SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( !m_rExport.bOutFlyFrmAttrs )
{
@@ -2651,7 +2650,7 @@ void RtfAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
void RtfAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( !m_rExport.bOutFlyFrmAttrs )
{
@@ -2705,7 +2704,7 @@ void RtfAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
void RtfAttributeOutput::FormatSurround( const SwFmtSurround& rSurround )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( m_rExport.bOutFlyFrmAttrs && !m_rExport.bRTFFlySyntax )
{
@@ -2721,7 +2720,7 @@ void RtfAttributeOutput::FormatSurround( const SwFmtSurround& rSurround )
void RtfAttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( m_rExport.bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax )
{
@@ -2759,7 +2758,7 @@ void RtfAttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert
void RtfAttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHori )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( m_rExport.bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax )
{
@@ -2797,7 +2796,7 @@ void RtfAttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHori
void RtfAttributeOutput::FormatAnchor( const SwFmtAnchor& rAnchor )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( !m_rExport.bRTFFlySyntax )
{
@@ -2820,7 +2819,7 @@ void RtfAttributeOutput::FormatAnchor( const SwFmtAnchor& rAnchor )
void RtfAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if( !rBrush.GetColor().GetTransparency() )
{
@@ -2831,7 +2830,7 @@ void RtfAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
void RtfAttributeOutput::FormatBox( const SvxBoxItem& rBox )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
static sal_uInt16 aBorders[] = {
BOX_LINE_TOP, BOX_LINE_LEFT, BOX_LINE_BOTTOM, BOX_LINE_RIGHT };
@@ -2873,7 +2872,7 @@ void RtfAttributeOutput::FormatBox( const SvxBoxItem& rBox )
void RtfAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol& rCol, bool bEven, SwTwips nPageSize )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_COLS;
m_rExport.OutLong( nCols );
@@ -2906,7 +2905,7 @@ void RtfAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol& r
void RtfAttributeOutput::FormatKeep( const SvxFmtKeepItem& rItem )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if( rItem.GetValue() )
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_KEEPN);
@@ -2914,12 +2913,12 @@ void RtfAttributeOutput::FormatKeep( const SvxFmtKeepItem& rItem )
void RtfAttributeOutput::FormatTextGrid( const SwTextGridItem& /*rGrid*/ )
{
- OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+ SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::FormatLineNumbering( const SwFmtLineNumber& rNumbering )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( !rNumbering.IsCount( ) )
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_NOLINE);
@@ -2927,7 +2926,7 @@ void RtfAttributeOutput::FormatLineNumbering( const SwFmtLineNumber& rNumbering
void RtfAttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDirection )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if (!m_rExport.bOutPageDescs)
{
@@ -2940,29 +2939,29 @@ void RtfAttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir
void RtfAttributeOutput::WriteExpand( const SwField* pFld )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
String sCmd;
m_rExport.OutputField(pFld, ww::eUNKNOWN, sCmd);
}
void RtfAttributeOutput::RefField( const SwField& /*rFld*/, const String& /*rRef*/ )
{
- OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+ SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::HiddenField( const SwField& /*rFld*/ )
{
- OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+ SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::SetField( const SwField& /*rFld*/, ww::eField /*eType*/, const String& /*rCmd*/ )
{
- OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+ SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
}
void RtfAttributeOutput::PostitField( const SwField* pFld )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const SwPostItField& rPFld = *(SwPostItField*)pFld;
@@ -3002,12 +3001,12 @@ RtfAttributeOutput::RtfAttributeOutput( RtfExport &rExport )
m_bWroteCellInfo( false ),
m_bHadFieldResult( false )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
}
RtfAttributeOutput::~RtfAttributeOutput()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
}
MSWordExportBase& RtfAttributeOutput::GetExport()
@@ -3020,7 +3019,7 @@ MSWordExportBase& RtfAttributeOutput::GetExport()
/// Start the font.
void RtfAttributeOutput::StartFont( const String& rFamilyName ) const
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << OUStringToOString( OUString( rFamilyName ), m_rExport.eCurrentEncoding ).getStr();
}
@@ -3028,7 +3027,7 @@ void RtfAttributeOutput::StartFont( const String& rFamilyName ) const
/// End the font.
void RtfAttributeOutput::EndFont() const
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << ";}";
}
@@ -3036,7 +3035,7 @@ void RtfAttributeOutput::EndFont() const
/// Alternate name for the font.
void RtfAttributeOutput::FontAlternateName( const String& rName ) const
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_FALT << ' ';
m_rExport.Strm() << OUStringToOString( OUString( rName ), m_rExport.eCurrentEncoding ).getStr() << '}';
@@ -3045,7 +3044,7 @@ void RtfAttributeOutput::FontAlternateName( const String& rName ) const
/// Font charset.
void RtfAttributeOutput::FontCharset( sal_uInt8 nCharSet ) const
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_FCHARSET;
m_rExport.OutULong( nCharSet );
@@ -3055,7 +3054,7 @@ void RtfAttributeOutput::FontCharset( sal_uInt8 nCharSet ) const
/// Font family.
void RtfAttributeOutput::FontFamilyType( FontFamily eFamily, const wwFont &rFont ) const
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_F;
@@ -3086,7 +3085,7 @@ void RtfAttributeOutput::FontFamilyType( FontFamily eFamily, const wwFont &rFont
/// Font pitch.
void RtfAttributeOutput::FontPitchType( FontPitch ePitch ) const
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_FPRQ;
@@ -3261,7 +3260,7 @@ static OString ExportPICT( const SwFlyFrmFmt* pFlyFrmFmt, const Size &rOrig, con
void RtfAttributeOutput::FlyFrameOLEData( SwOLENode& rOLENode )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
uno::Reference < embed::XEmbeddedObject > xObj(const_cast<SwOLENode&>(rOLENode).GetOLEObj().GetOleRef());
sal_Int64 nAspect = rOLENode.GetAspect();
@@ -3304,7 +3303,7 @@ void RtfAttributeOutput::FlyFrameOLEData( SwOLENode& rOLENode )
void RtfAttributeOutput::FlyFrameOLE( const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
SvMemoryStream aStream;
const sal_uInt8* pGraphicAry = 0;
@@ -3344,7 +3343,7 @@ void RtfAttributeOutput::FlyFrameOLE( const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode&
void RtfAttributeOutput::FlyFrameGraphic( const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode& rGrfNode)
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
SvMemoryStream aStream;
const sal_uInt8* pGraphicAry = 0;
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 195cb8e..e1d55e2 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -60,6 +60,7 @@
#include "ww8par.hxx"
#include <comphelper/string.hxx>
+#include <rtl/oustringostreaminserter.hxx>
#include <svtools/rtfkeywd.hxx>
#include <unotools/configmgr.hxx>
@@ -139,7 +140,7 @@ bool RtfExport::CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich
void RtfExport::AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xub_StrLen nLen )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
std::vector< OUString > aStarts;
std::vector< OUString > aEnds;
@@ -167,7 +168,7 @@ void RtfExport::AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xub
void RtfExport::AppendBookmark( const OUString& rName, bool /*bSkip*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
std::vector<OUString> aStarts;
std::vector<OUString> aEnds;
@@ -180,7 +181,7 @@ void RtfExport::AppendBookmark( const OUString& rName, bool /*bSkip*/ )
void RtfExport::WriteChar( sal_Unicode )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
/* WriteChar() has nothing to do for rtf. */
}
@@ -230,7 +231,7 @@ void RtfExport::BuildNumbering()
void RtfExport::WriteNumbering()
{
- OSL_TRACE("%s start", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " start");
if ( !pUsedNumTbl )
return; // no numbering is used
@@ -243,12 +244,12 @@ void RtfExport::WriteNumbering()
NumberingDefinitions();
Strm() << '}';
- OSL_TRACE("%s end", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " end");
}
void RtfExport::WriteRevTab()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
int nRevAuthors = pDoc->GetRedlineTbl().Count();
@@ -282,7 +283,7 @@ void RtfExport::WriteRevTab()
void RtfExport::WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, sal_uInt8 /*nBreakCode*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
// headers
if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_EVEN )
@@ -307,19 +308,19 @@ void RtfExport::WriteHeadersFooters( sal_uInt8 nHeadFootFlags,
void RtfExport::OutputField( const SwField* pFld, ww::eField eFldType, const String& rFldCmd, sal_uInt8 nMode )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_pAttrOutput->WriteField_Impl( pFld, eFldType, rFldCmd, nMode );
}
void RtfExport::WriteFormData( const ::sw::mark::IFieldmark& /*rFieldmark*/ )
{
- OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+ SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
}
void RtfExport::WriteHyperlinkData( const ::sw::mark::IFieldmark& /*rFieldmark*/ )
{
- OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+ SAL_INFO("sw", "TODO: " << OSL_THIS_FUNC);
}
void RtfExport::DoComboBox(const rtl::OUString& /*rName*/,
@@ -328,14 +329,14 @@ void RtfExport::DoComboBox(const rtl::OUString& /*rName*/,
const rtl::OUString& /*rSelected*/,
uno::Sequence<rtl::OUString>& /*rListItems*/)
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
// this is handled in RtfAttributeOutput::OutputFlyFrame_Impl
}
void RtfExport::DoFormText(const SwInputField* pFld )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
::rtl::OUString sResult = pFld->ExpandField(pDoc->IsClipBoard());
::rtl::OUString sHelp( pFld->GetHelp() );
@@ -362,7 +363,7 @@ void RtfExport::DoFormText(const SwInputField* pFld )
sal_uLong RtfExport::ReplaceCr( sal_uInt8 )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
// Completely unused for Rtf export... only here for code sharing
// purpose with binary export
@@ -379,22 +380,22 @@ void RtfExport::WriteFonts()
void RtfExport::WriteStyles()
{
- OSL_TRACE("%s start", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " start");
pStyles->OutputStylesTable();
- OSL_TRACE("%s end", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " end");
}
void RtfExport::WriteMainText()
{
- OSL_TRACE("%s start", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " start");
pCurPam->GetPoint()->nNode = pDoc->GetNodes().GetEndOfContent().StartOfSectionNode()->GetIndex();
WriteText();
- OSL_TRACE("%s end", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " end");
}
void RtfExport::WriteInfo()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
Strm() << '{' << OOO_STRING_SVTOOLS_RTF_INFO;
SwDocShell *pDocShell(pDoc->GetDocShell());
@@ -430,7 +431,7 @@ void RtfExport::WriteInfo()
void RtfExport::WritePageDescTable()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
// Write page descriptions (page styles)
sal_uInt16 nSize = pDoc->GetPageDescCnt();
@@ -687,7 +688,7 @@ void RtfExport::PrepareNewPageDesc( const SfxItemSet* pSet,
const SwNode& rNd, const SwFmtPageDesc* pNewPgDescFmt,
const SwPageDesc* pNewPgDesc )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
const SwSectionFmt* pFmt = GetSectionFormat( rNd );
const sal_uLong nLnNm = GetSectionLineNo( pSet, rNd );
@@ -705,7 +706,7 @@ bool RtfExport::DisallowInheritingOutlineNumbering( const SwFmt& rFmt )
{
bool bRet( false );
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if (SFX_ITEM_SET != rFmt.GetItemState(RES_PARATR_NUMRULE, false))
{
@@ -726,21 +727,21 @@ bool RtfExport::DisallowInheritingOutlineNumbering( const SwFmt& rFmt )
void RtfExport::OutputGrfNode( const SwGrfNode& )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
/* noop, see RtfAttributeOutput::FlyFrameGraphic */
}
void RtfExport::OutputOLENode( const SwOLENode& )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
/* noop, see RtfAttributeOutput::FlyFrameOLE */
}
void RtfExport::OutputLinkedOLE( const rtl::OUString& )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
}
void RtfExport::OutputTextNode( const SwTxtNode& rNode )
@@ -751,7 +752,7 @@ void RtfExport::OutputTextNode( const SwTxtNode& rNode )
void RtfExport::AppendSection( const SwPageDesc* pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_pSections->AppendSection( pPageDesc, pFmt, nLnNum );
AttrOutput().SectionBreak( msword::PageBreak, m_pSections->CurrentSectionInfo() );
@@ -921,8 +922,7 @@ OString RtfExport::OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEn
OString RtfExport::OutString(const String &rStr, rtl_TextEncoding eDestEnc)
{
- OSL_TRACE("%s, rStr = '%s'", OSL_THIS_FUNC,
- OUStringToOString( OUString( rStr ), eDestEnc ).getStr());
+ SAL_INFO("sw", OSL_THIS_FUNC << ", rStr = '" << OUString(rStr) << "'");
OStringBuffer aBuf;
int nUCMode = 1;
for (xub_StrLen n = 0; n < rStr.Len(); ++n)
@@ -949,7 +949,7 @@ sal_uInt16 RtfExport::GetColor( const Color& rColor ) const
{
for (RtfColorTbl::const_iterator it=m_aColTbl.begin() ; it != m_aColTbl.end(); ++it )
if ((*it).second == rColor) {
- OSL_TRACE("%s returning %d (%d,%d,%d)", OSL_THIS_FUNC, (*it).first, rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue());
+ SAL_INFO("sw", OSL_THIS_FUNC << " returning " << (*it).first << " (" << rColor.GetRed() << "," << rColor.GetGreen() << "," << rColor.GetBlue() << ")");
return (*it).first;
}
OSL_FAIL( "No such Color in m_aColTbl!" );
@@ -1149,7 +1149,7 @@ const String* RtfExport::GetRedline( sal_uInt16 nId )
void RtfExport::OutPageDescription( const SwPageDesc& rPgDsc, sal_Bool bWriteReset, sal_Bool bCheckForFirstPage )
{
- OSL_TRACE("%s start", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " start");
const SwPageDesc *pSave = pAktPageDesc;
pAktPageDesc = &rPgDsc;
@@ -1198,7 +1198,7 @@ void RtfExport::OutPageDescription( const SwPageDesc& rPgDsc, sal_Bool bWriteRes
AttrOutput().SectionPageNumbering(pAktPageDesc->GetNumType().GetNumberingType(), 0);
pAktPageDesc = pSave;
- OSL_TRACE("%s end", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " end");
}
void RtfExport::WriteHeaderFooter(const SfxPoolItem& rItem, bool bHeader)
@@ -1216,7 +1216,7 @@ void RtfExport::WriteHeaderFooter(const SfxPoolItem& rItem, bool bHeader)
return;
}
- OSL_TRACE("%s start", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " start");
const sal_Char* pStr = (bHeader ? OOO_STRING_SVTOOLS_RTF_HEADER : OOO_STRING_SVTOOLS_RTF_FOOTER);
/* is this a title page? */
@@ -1229,16 +1229,16 @@ void RtfExport::WriteHeaderFooter(const SfxPoolItem& rItem, bool bHeader)
WriteHeaderFooterText(pAktPageDesc->GetMaster(), bHeader);
Strm() << '}';
- OSL_TRACE("%s end", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " end");
}
void RtfExport::WriteHeaderFooter(const SwFrmFmt& rFmt, bool bHeader, const sal_Char* pStr, bool bTitlepg)
{
- OSL_TRACE("%s start", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " start");
m_pAttrOutput->WriteHeaderFooter_Impl( rFmt, bHeader, pStr, bTitlepg );
- OSL_TRACE("%s end", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " end");
}
/// Glue class to call RtfExport as an internal filter, needed by copy&paste support.
@@ -1255,7 +1255,7 @@ class SwRTFWriter : public Writer
SwRTFWriter::SwRTFWriter( const String& rFltName, const String & rBaseURL )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
SetBaseURL( rBaseURL );
// export outline nodes, only (send outline to clipboard/presentation)
m_bOutOutlineOnly = 'O' == rFltName.GetChar( 0 );
@@ -1266,7 +1266,7 @@ SwRTFWriter::~SwRTFWriter()
sal_uLong SwRTFWriter::WriteStream()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
RtfExport aExport( NULL, pDoc, new SwPaM( *pCurPam->End(), *pCurPam->Start() ), pCurPam, this, m_bOutOutlineOnly );
aExport.ExportDocument( true );
return 0;
@@ -1274,7 +1274,7 @@ sal_uLong SwRTFWriter::WriteStream()
extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL ExportRTF( const String& rFltName, const String& rBaseURL, WriterRef& xRet )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
xRet = new SwRTFWriter( rFltName, rBaseURL );
}
diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx
index 7c59694..7c974ee 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -52,7 +52,7 @@ RtfExportFilter::~RtfExportFilter()
sal_Bool RtfExportFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor )
throw (uno::RuntimeException)
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
MediaDescriptor aMediaDesc = aDescriptor;
::uno::Reference< io::XStream > xStream =
diff --git a/sw/source/filter/ww8/rtfimportfilter.cxx b/sw/source/filter/ww8/rtfimportfilter.cxx
index 211a509..49ad284 100644
--- a/sw/source/filter/ww8/rtfimportfilter.cxx
+++ b/sw/source/filter/ww8/rtfimportfilter.cxx
@@ -54,7 +54,7 @@ RtfImportFilter::~RtfImportFilter()
sal_Bool RtfImportFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor )
throw (uno::RuntimeException)
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
MediaDescriptor aMediaDesc = aDescriptor;
::uno::Reference< io::XInputStream > xInputStream =
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index badda4e..dc1b67b 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -80,7 +80,7 @@ RtfSdrExport::~RtfSdrExport()
void RtfSdrExport::OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
EscherEx::OpenContainer( nEscherContainer, nRecInstance );
@@ -96,7 +96,7 @@ void RtfSdrExport::OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance
void RtfSdrExport::CloseContainer()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( mRecTypes.back() == ESCHER_SpContainer )
{
@@ -113,21 +113,21 @@ void RtfSdrExport::CloseContainer()
sal_uInt32 RtfSdrExport::EnterGroup( const String& /*rShapeName*/, const Rectangle* /*pRect*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
return GenerateShapeId();
}
void RtfSdrExport::LeaveGroup()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
/* noop */
}
void RtfSdrExport::AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 /*nShapeId*/ )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
m_nShapeType = nShapeType;
m_nShapeFlags = nShapeFlags;
@@ -165,7 +165,7 @@ inline sal_Int32 impl_GetPointComponent( const sal_uInt8* &pVal, sal_uInt16 nPoi
void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( m_nShapeType == ESCHER_ShpInst_Nil )
return;
@@ -333,7 +333,7 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
case 0x8000: // end
break;
default:
- OSL_TRACE("%s: unhandled segment '%x' in the path", OSL_THIS_FUNC, nSeg);
+ SAL_INFO("sw", OSL_THIS_FUNC << ": unhandled segment '" << nSeg << "' in the path");
break;
}
}
@@ -350,7 +350,7 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
m_aShapeProps.insert(std::pair<OString,OString>(OString("pSegmentInfo"), aSegmentInfo.makeStringAndClear()));
}
else
- OSL_TRACE("%s: unhandled shape path, missing either pVertices or pSegmentInfo", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << ": unhandled shape path, missing either pVertices or pSegmentInfo");
}
break;
case ESCHER_Prop_shapePath:
@@ -382,7 +382,7 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
m_aShapeProps.insert(std::pair<OString,OString>(OString("txflTextFlow"), OString::valueOf(sal_Int32(it->nPropValue))));
break;
default:
- OSL_TRACE("%s: unhandled property: %d (value: %d)", OSL_THIS_FUNC, nId, it->nPropValue);
+ SAL_INFO("sw", OSL_THIS_FUNC << ": unhandled property: " << nId << " (value: " << it->nPropValue << ")");
break;
}
}
@@ -390,7 +390,7 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe
void RtfSdrExport::AddLineDimensions( const Rectangle& rRectangle )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
// We get the position relative to (the current?) character
m_aShapeProps.insert(std::pair<OString,OString>(OString("posrelh"), OString::valueOf(sal_Int32(3))));
@@ -418,7 +418,7 @@ void RtfSdrExport::AddLineDimensions( const Rectangle& rRectangle )
void RtfSdrExport::AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Rectangle& rRectangle )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
// We get the position relative to (the current?) character
m_aShapeProps.insert(std::pair<OString,OString>(OString("posrelh"), OString::valueOf(sal_Int32(3))));
@@ -440,7 +440,7 @@ void lcl_AppendSP( ::rtl::OStringBuffer& rRunText, const char cName[], const ::r
}
sal_Int32 RtfSdrExport::StartShape()
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( m_nShapeType == ESCHER_ShpInst_Nil )
return -1;
@@ -498,7 +498,7 @@ sal_Int32 RtfSdrExport::StartShape()
void RtfSdrExport::WriteOutliner(const OutlinerParaObject& rParaObj)
{
- OSL_TRACE("%s start", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " start");
const EditTextObject& rEditObj = rParaObj.GetTextObject();
MSWord_SdrAttrIter aAttrIter( m_rExport, rEditObj, TXT_HFTXTBOX );
@@ -546,12 +546,12 @@ void RtfSdrExport::WriteOutliner(const OutlinerParaObject& rParaObj)
}
m_rAttrOutput.RunText().append(OOO_STRING_SVTOOLS_RTF_PAR).append('}');
- OSL_TRACE("%s end", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC << " end");
}
void RtfSdrExport::EndShape( sal_Int32 nShapeElement )
{
- OSL_TRACE("%s", OSL_THIS_FUNC);
+ SAL_INFO("sw", OSL_THIS_FUNC);
if ( nShapeElement >= 0 )
{
More information about the Libreoffice-commits
mailing list