[ooo-build-commit] .: patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Aug 13 04:12:22 PDT 2010
patches/dev300/cws-vmiklos01.diff | 404 ++++++-------
patches/dev300/docx-fixes02.diff | 4
patches/dev300/oox-import-comments-fix-add-annotation.diff | 7
3 files changed, 206 insertions(+), 209 deletions(-)
New commits:
commit ebd7f1cc8fa96fd77db00f0e30bcaad5e33e05c7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 13 13:55:11 2010 +0300
Use OSL_THIS_FUNC instead of the non-portable __PRETTY_FUNCTION__
M patches/dev300/cws-vmiklos01.diff
M patches/dev300/docx-fixes02.diff
M patches/dev300/oox-import-comments-fix-add-annotation.diff
diff --git a/patches/dev300/cws-vmiklos01.diff b/patches/dev300/cws-vmiklos01.diff
index c58ac3e..ae2263f 100644
--- a/patches/dev300/cws-vmiklos01.diff
+++ b/patches/dev300/cws-vmiklos01.diff
@@ -301,7 +301,7 @@ unchanged:
SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
{
-+ OSL_TRACE("%s, pImplName is '%s'", __PRETTY_FUNCTION__, pImplName);
++ OSL_TRACE("%s, pImplName is '%s'", OSL_THIS_FUNC, pImplName);
uno::Reference< lang::XSingleServiceFactory > xFactory;
void* pRet = 0;
@@ -579,7 +579,7 @@ unchanged:
+
+void RtfAttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", 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 ,
@@ -617,7 +617,7 @@ unchanged:
+
+void RtfAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ // Output table/table row/table cell starts if needed
+ if ( pTextNodeInfo.get() )
@@ -664,7 +664,7 @@ unchanged:
+
+void RtfAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ FinishTableRowCell( pTextNodeInfoInner );
+
@@ -694,14 +694,14 @@ unchanged:
+
+void RtfAttributeOutput::EmptyParagraph()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_rExport.Strm() << m_rExport.sNewLine << OOO_STRING_SVTOOLS_RTF_PAR << ' ';
+}
+
+void RtfAttributeOutput::StartParagraphProperties( const SwTxtNode& rNode )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ OSL_ENSURE(m_aStyles.getLength() == 0, "m_aStyles is not empty");
+
+ // output page/section breaks
@@ -738,14 +738,14 @@ unchanged:
+
+void RtfAttributeOutput::EndParagraphProperties()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ m_aStyles.append(m_aStylesEnd.makeStringAndClear());
+ m_rExport.Strm() << m_aStyles.makeStringAndClear();
+}
+
+void RtfAttributeOutput::StartRun( const SwRedlineData* pRedlineData )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aRun.append('{');
+
@@ -757,7 +757,7 @@ unchanged:
+
+void RtfAttributeOutput::EndRun()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ m_aRun.append(m_rExport.sNewLine);
+ m_aRun.append(m_aRunText.makeStringAndClear());
+ m_aRun.append('}');
@@ -765,20 +765,20 @@ unchanged:
+
+void RtfAttributeOutput::StartRunProperties()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ OSL_ENSURE(m_aStyles.getLength() == 0, "m_aStyles is not empty");
+}
+
+void RtfAttributeOutput::EndRunProperties( const SwRedlineData* /*pRedlineData*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", 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", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ RawText( rText, 0, eCharSet );
+}
+
@@ -794,23 +794,23 @@ unchanged:
+
+void RtfAttributeOutput::RawText( const String& rText, bool /*bForceUnicode*/, rtl_TextEncoding eCharSet )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ m_aRunText.append(m_rExport.OutString(rText, eCharSet));
+}
+
+void RtfAttributeOutput::StartRuby( const SwTxtNode& /*rNode*/, const SwFmtRuby& /*rRuby*/ )
+{
-+ OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
++ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+}
+
+void RtfAttributeOutput::EndRuby()
+{
-+ OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
++ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+}
+
+bool RtfAttributeOutput::StartURL( const String& rUrl, const String& rTarget )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append('{');
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_FIELD);
@@ -840,7 +840,7 @@ unchanged:
+
+bool RtfAttributeOutput::EndURL()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ // close the fldrslt group
+ m_aRunText.append('}');
@@ -851,7 +851,7 @@ unchanged:
+
+void RtfAttributeOutput::FieldVanish( const String& /*rTxt*/, ww::eField /*eType*/ )
+{
-+ OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
++ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+}
+
+void RtfAttributeOutput::Redline( const SwRedlineData* pRedline )
@@ -859,7 +859,7 @@ unchanged:
+ if (!pRedline)
+ return;
+
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if (pRedline->GetType() == nsRedlineType_t::REDLINE_INSERT)
+ {
@@ -881,12 +881,12 @@ unchanged:
+
+void RtfAttributeOutput::FormatDrop( const SwTxtNode& /*rNode*/, const SwFmtDrop& /*rSwFmtDrop*/, USHORT /*nStyle*/, ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/, ww8::WW8TableNodeInfoInner::Pointer_t /*pTextNodeInfoInner*/ )
+{
-+ OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
++ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+}
+
+void RtfAttributeOutput::ParagraphStyle( USHORT nStyle )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ OString *pStyle = m_rExport.GetStyle(nStyle);
+ OStringBuffer aStyle;
@@ -902,7 +902,7 @@ unchanged:
+
+void RtfAttributeOutput::TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_INTBL);
+ if ( m_nTableDepth > 1 )
@@ -914,14 +914,14 @@ unchanged:
+
+void RtfAttributeOutput::TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfo*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ /* noop */
+}
+
+void RtfAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( !m_pTableWrt )
+ InitTableHelper( pTableTextNodeInfoInner );
@@ -989,7 +989,7 @@ unchanged:
+
+void RtfAttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ /*
+ * The function name is a bit misleading: given that we write borders
@@ -1045,7 +1045,7 @@ unchanged:
+
+void RtfAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const SwWriteTableRows& aRows = m_pTableWrt->GetRows( );
+ SwWriteTableRow *pRow = aRows[ pTableTextNodeInfoInner->getRow( ) ];
@@ -1066,7 +1066,7 @@ unchanged:
+
+void RtfAttributeOutput::TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
+ const SwTableLine * pTabLine = pTabBox->GetUpper();
@@ -1094,7 +1094,7 @@ unchanged:
+
+void RtfAttributeOutput::TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const SwTableBox * pTabBox = pTableTextNodeInfoInner->getTableBox();
+ const SwTableLine * pTabLine = pTabBox->GetUpper();
@@ -1108,7 +1108,7 @@ unchanged:
+
+void RtfAttributeOutput::TableBidi( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const SwTable * pTable = pTableTextNodeInfoInner->getTable();
+ const SwFrmFmt * pFrmFmt = pTable->GetFrmFmt();
@@ -1121,7 +1121,7 @@ unchanged:
+
+void RtfAttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const SwWriteTableRows& aRows = m_pTableWrt->GetRows( );
+ SwWriteTableRow *pRow = aRows[ pTableTextNodeInfoInner->getRow( ) ];
@@ -1148,14 +1148,14 @@ unchanged:
+
+void RtfAttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t /*pNodeInfo*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ /* noop */
+}
+
+void RtfAttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointer_t pNodeInfoInner )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", 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,
@@ -1166,7 +1166,7 @@ unchanged:
+
+void RtfAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const SwTable *pTable = pTableTextNodeInfoInner->getTable();
+ SwFrmFmt *pFmt = pTable->GetFrmFmt( );
@@ -1196,12 +1196,12 @@ unchanged:
+
+void RtfAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
+{
-+ OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
++ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+}
+
+void RtfAttributeOutput::TableRowEnd( sal_uInt32 /*nDepth*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ /* noop, see EndTableRow() */
+}
@@ -1212,7 +1212,7 @@ unchanged:
+
+void RtfAttributeOutput::InitTableHelper( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ sal_uInt32 nPageSize = 0;
+ bool bRelBoxSize = false;
@@ -1234,7 +1234,7 @@ unchanged:
+
+void RtfAttributeOutput::StartTable( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ /* noop */
+}
@@ -1242,7 +1242,7 @@ unchanged:
+void RtfAttributeOutput::StartTableRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
+{
+ sal_uInt32 nCurrentDepth = pTableTextNodeInfoInner->getDepth();
-+ OSL_TRACE("%s, (depth is %d)", __PRETTY_FUNCTION__, (int)nCurrentDepth);
++ OSL_TRACE("%s, (depth is %d)", OSL_THIS_FUNC, (int)nCurrentDepth);
+
+ TableDefinition(pTableTextNodeInfoInner);
+
@@ -1254,14 +1254,14 @@ unchanged:
+
+void RtfAttributeOutput::StartTableCell( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_bTableCellOpen = true;
+}
+
+void RtfAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ TableDefaultBorders(pTableTextNodeInfoInner);
+ TableBackgrounds(pTableTextNodeInfoInner);
@@ -1270,7 +1270,7 @@ unchanged:
+
+void RtfAttributeOutput::EndTableCell( )
+{
-+ OSL_TRACE("%s, (depth is %d)", __PRETTY_FUNCTION__, (int)m_nTableDepth);
++ OSL_TRACE("%s, (depth is %d)", OSL_THIS_FUNC, (int)m_nTableDepth);
+
+ if ( m_nTableDepth > 1 )
+ m_aAfterRuns.append(OOO_STRING_SVTOOLS_RTF_NESTCELL);
@@ -1283,7 +1283,7 @@ unchanged:
+
+void RtfAttributeOutput::EndTableRow( )
+{
-+ OSL_TRACE("%s, (depth is %d)", __PRETTY_FUNCTION__, (int)m_nTableDepth);
++ OSL_TRACE("%s, (depth is %d)", OSL_THIS_FUNC, (int)m_nTableDepth);
+
+ if ( m_nTableDepth > 1 )
+ {
@@ -1297,7 +1297,7 @@ unchanged:
+
+void RtfAttributeOutput::EndTable()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( m_nTableDepth > 0 )
+ m_nTableDepth--;
@@ -1312,7 +1312,7 @@ unchanged:
+
+void RtfAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool /*bForceEmptyParagraph*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( pInner.get() )
+ {
@@ -1338,7 +1338,7 @@ unchanged:
+
+void RtfAttributeOutput::StartStyles()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", 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");
@@ -1349,7 +1349,7 @@ unchanged:
+
+void RtfAttributeOutput::EndStyles( USHORT /*nNumberOfStyles*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ m_rExport.Strm() << '}';
+ m_rExport.Strm() << m_aStylesheet.makeStringAndClear();
+ m_rExport.Strm() << '}';
@@ -1357,7 +1357,7 @@ unchanged:
+
+void RtfAttributeOutput::DefaultStyle( USHORT /*nStyle*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ /* noop, the default style is always 0 in RTF */
+}
@@ -1365,7 +1365,7 @@ unchanged:
+void RtfAttributeOutput::StartStyle( const String& rName, bool /*bPapFmt*/,
+ USHORT nBase, USHORT nNext, USHORT /*nWwId*/, USHORT nId )
+{
-+ OSL_TRACE("%s, rName = '%s'", __PRETTY_FUNCTION__,
++ OSL_TRACE("%s, rName = '%s'", OSL_THIS_FUNC,
+ OUStringToOString( OUString( rName ), m_rExport.eCurrentEncoding ).getStr());
+
+ m_aStylesheet.append('{');
@@ -1387,7 +1387,7 @@ unchanged:
+
+void RtfAttributeOutput::EndStyle()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ m_aStyles.append(m_aStylesEnd.makeStringAndClear());
+ OString aStyles = m_aStyles.makeStringAndClear();
+ m_rExport.InsStyle(m_nStyleId, aStyles);
@@ -1400,19 +1400,19 @@ unchanged:
+
+void RtfAttributeOutput::StartStyleProperties( bool /*bParProp*/, USHORT /*nStyle*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ /* noop */
+}
+
+void RtfAttributeOutput::EndStyleProperties( bool /*bParProp*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ /* noop */
+}
+
+void RtfAttributeOutput::OutlineNumbering( BYTE nLvl, const SwNumFmt& /*rNFmt*/, const SwFmt& /*rFmt*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( nLvl >= WW8ListManager::nMaxLevel )
+ nLvl = WW8ListManager::nMaxLevel - 1;
@@ -1423,7 +1423,7 @@ unchanged:
+
+void RtfAttributeOutput::PageBreakBefore( bool bBreak )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if (bBreak)
+ {
@@ -1433,7 +1433,7 @@ unchanged:
+
+void RtfAttributeOutput::SectionBreak( BYTE nC, const WW8_SepInfo* pSectionInfo )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ switch (nC)
+ {
@@ -1449,7 +1449,7 @@ unchanged:
+
+void RtfAttributeOutput::StartSection()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_SECT OOO_STRING_SVTOOLS_RTF_SECTD);
+ if (!m_bBufferSectionBreaks)
@@ -1458,7 +1458,7 @@ unchanged:
+
+void RtfAttributeOutput::EndSection()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ /*
+ * noop, \sect must go to StartSection or Word won't notice multiple
@@ -1468,7 +1468,7 @@ unchanged:
+
+void RtfAttributeOutput::SectionFormProtection( bool bProtected )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_SECTUNLOCKED);
+ m_aSectionBreaks.append((sal_Int32)!bProtected);
@@ -1476,7 +1476,7 @@ unchanged:
+
+void RtfAttributeOutput::SectionLineNumbering( ULONG /*nRestartNo*/, const SwLineNumberInfo& rLnNumInfo )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LINEMOD;
+ m_rExport.OutLong(rLnNumInfo.GetCountBy());
@@ -1488,7 +1488,7 @@ unchanged:
+
+void RtfAttributeOutput::SectionTitlePage()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ /*
+ * noop, handled in RtfExport::WriteHeaderFooter()
@@ -1497,7 +1497,7 @@ unchanged:
+
+void RtfAttributeOutput::SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmFmt* /*pFirstPageFmt*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const SvxBoxItem& rBox = pFmt->GetBox();
+ const SvxBorderLine *pLine = rBox.GetTop();
@@ -1524,14 +1524,14 @@ unchanged:
+
+void RtfAttributeOutput::SectionBiDi( bool bBiDi )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_rExport.Strm() << (bBiDi ? OOO_STRING_SVTOOLS_RTF_RTLSECT : OOO_STRING_SVTOOLS_RTF_LTRSECT);
+}
+
+void RtfAttributeOutput::SectionPageNumbering( USHORT nNumType, USHORT nPageRestartNumber )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if (nPageRestartNumber > 0)
+ {
@@ -1558,7 +1558,7 @@ unchanged:
+
+void RtfAttributeOutput::SectionType( BYTE nBreakCode )
+{
-+ OSL_TRACE("%s, nBreakCode = %d", __PRETTY_FUNCTION__, nBreakCode);
++ OSL_TRACE("%s, nBreakCode = %d", OSL_THIS_FUNC, nBreakCode);
+
+ /*
+ * break code: 0 No break, 1 New column
@@ -1580,7 +1580,7 @@ unchanged:
+
+void RtfAttributeOutput::NumberingDefinition( USHORT nId, const SwNumRule &/*rRule*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LISTOVERRIDE;
+ m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LISTID;
@@ -1592,7 +1592,7 @@ unchanged:
+
+void RtfAttributeOutput::StartAbstractNumbering( USHORT nId )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_LIST << OOO_STRING_SVTOOLS_RTF_LISTTEMPLATEID;
+ m_rExport.OutULong( nId );
@@ -1601,7 +1601,7 @@ unchanged:
+
+void RtfAttributeOutput::EndAbstractNumbering()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LISTID;
+ m_rExport.OutULong( m_nListId ) << '}' << m_rExport.sNewLine;
@@ -1620,7 +1620,7 @@ unchanged:
+ sal_Int16 /*nListTabPos*/,
+ const String &rNumberingString )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_rExport.Strm() << m_rExport.sNewLine;
+ if( nLevel > 8 ) // RTF knows only 9 levels
@@ -1708,7 +1708,7 @@ unchanged:
+
+void RtfAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField /*eType*/, const String& rFldCmd, BYTE /*nMode*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ // NEEDSWORK this has beeen tested only with page numbers
+ m_aRunText.append("{" OOO_STRING_SVTOOLS_RTF_FIELD);
@@ -1761,7 +1761,7 @@ unchanged:
+
+void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Point& /*rNdTopLeft*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const SwNode *pNode = rFrame.GetContent();
+ const SwGrfNode *pGrfNode = pNode ? pNode->GetGrfNode() : 0;
@@ -2002,7 +2002,7 @@ unchanged:
+ m_aRun.append("}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " ");
+ }
+ else
-+ OSL_TRACE("%s unhandled form control: '%s'", __PRETTY_FUNCTION__,
++ OSL_TRACE("%s unhandled form control: '%s'", OSL_THIS_FUNC,
+ OUStringToOString(xInfo->getImplementationName(), m_rExport.eCurrentEncoding).getStr());
+ m_aRun.append('}');
+ }
@@ -2024,14 +2024,14 @@ unchanged:
+ }
+ break;
+ default:
-+ OSL_TRACE("%s: unknown type (%d)", __PRETTY_FUNCTION__, rFrame.GetWriterType());
++ OSL_TRACE("%s: unknown type (%d)", OSL_THIS_FUNC, rFrame.GetWriterType());
+ break;
+ }
+}
+
+void RtfAttributeOutput::CharCaseMap( const SvxCaseMapItem& rCaseMap )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ switch ( rCaseMap.GetValue() )
+ {
@@ -2052,7 +2052,7 @@ unchanged:
+
+void RtfAttributeOutput::CharColor( const SvxColorItem& rColor )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const Color aColor( rColor.GetValue() );
+
@@ -2062,7 +2062,7 @@ unchanged:
+
+void RtfAttributeOutput::CharContour( const SvxContourItem& rContour )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_OUTL);
+ if ( !rContour.GetValue() )
@@ -2071,7 +2071,7 @@ unchanged:
+
+void RtfAttributeOutput::CharCrossedOut( const SvxCrossedOutItem& rCrossedOut )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ switch ( rCrossedOut.GetStrikeout() )
+ {
@@ -2094,7 +2094,7 @@ unchanged:
+
+void RtfAttributeOutput::CharEscapement( const SvxEscapementItem& rEsc )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const char * pUpDn;
+
@@ -2144,7 +2144,7 @@ unchanged:
+
+void RtfAttributeOutput::CharFont( const SvxFontItem& rFont)
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_LOCH);
+ m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_F);
@@ -2154,7 +2154,7 @@ unchanged:
+
+void RtfAttributeOutput::CharFontSize( const SvxFontHeightItem& rFontSize)
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ switch ( rFontSize.Which() )
+ {
@@ -2175,7 +2175,7 @@ unchanged:
+
+void RtfAttributeOutput::CharKerning( const SvxKerningItem& rKerning )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ // in quater points then in twips
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_EXPND);
@@ -2186,7 +2186,7 @@ unchanged:
+
+void RtfAttributeOutput::CharLanguage( const SvxLanguageItem& rLanguage )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ switch (rLanguage.Which())
+ {
@@ -2207,7 +2207,7 @@ unchanged:
+
+void RtfAttributeOutput::CharPosture( const SvxPostureItem& rPosture )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_I);
+ if ( rPosture.GetPosture() == ITALIC_NONE )
@@ -2216,7 +2216,7 @@ unchanged:
+
+void RtfAttributeOutput::CharShadow( const SvxShadowedItem& rShadow )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SHAD);
+ if ( !rShadow.GetValue() )
@@ -2225,7 +2225,7 @@ unchanged:
+
+void RtfAttributeOutput::CharUnderline( const SvxUnderlineItem& rUnderline )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const char* pStr = 0;
+ const SfxPoolItem* pItem = m_rExport.HasItem( RES_CHRATR_WORDLINEMODE );
@@ -2301,7 +2301,7 @@ unchanged:
+
+void RtfAttributeOutput::CharWeight( const SvxWeightItem& rWeight )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_B);
+ if ( rWeight.GetWeight() != WEIGHT_BOLD )
@@ -2310,7 +2310,7 @@ unchanged:
+
+void RtfAttributeOutput::CharAutoKern( const SvxAutoKernItem& rAutoKern)
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_KERNING);
+ m_aStyles.append((sal_Int32) (rAutoKern.GetValue() ? 1 : 0));
@@ -2318,7 +2318,7 @@ unchanged:
+
+void RtfAttributeOutput::CharAnimatedText( const SvxBlinkItem& rBlink )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ANIMTEXT);
+ m_aStyles.append((sal_Int32) (rBlink.GetValue() ? 2 : 0));
@@ -2326,7 +2326,7 @@ unchanged:
+
+void RtfAttributeOutput::CharBackground( const SvxBrushItem& rBrush )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if( !rBrush.GetColor().GetTransparency() )
+ {
@@ -2337,7 +2337,7 @@ unchanged:
+
+void RtfAttributeOutput::CharFontCJK( const SvxFontItem& rFont )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HICH);
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AF);
@@ -2346,21 +2346,21 @@ unchanged:
+
+void RtfAttributeOutput::CharFontSizeCJK( const SvxFontHeightItem& rFontSize )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ CharFontSize( rFontSize );
+}
+
+void RtfAttributeOutput::CharLanguageCJK( const SvxLanguageItem& rLanguageItem )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ CharLanguage( rLanguageItem );
+}
+
+void RtfAttributeOutput::CharPostureCJK( const SvxPostureItem& rPosture )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_I);
+ if ( rPosture.GetPosture() == ITALIC_NONE )
@@ -2369,7 +2369,7 @@ unchanged:
+
+void RtfAttributeOutput::CharWeightCJK( const SvxWeightItem& rWeight )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_B);
+ if ( rWeight.GetWeight() != WEIGHT_BOLD )
@@ -2378,7 +2378,7 @@ unchanged:
+
+void RtfAttributeOutput::CharFontCTL( const SvxFontItem& rFont )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_DBCH);
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AF);
@@ -2387,21 +2387,21 @@ unchanged:
+
+void RtfAttributeOutput::CharFontSizeCTL( const SvxFontHeightItem& rFontSize )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ CharFontSize( rFontSize );
+}
+
+void RtfAttributeOutput::CharLanguageCTL( const SvxLanguageItem& rLanguageItem )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ CharLanguage( rLanguageItem );
+}
+
+void RtfAttributeOutput::CharPostureCTL( const SvxPostureItem& rPosture)
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AI);
+ if ( rPosture.GetPosture() == ITALIC_NONE )
@@ -2410,7 +2410,7 @@ unchanged:
+
+void RtfAttributeOutput::CharWeightCTL( const SvxWeightItem& rWeight )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AB);
+ if ( rWeight.GetWeight() != WEIGHT_BOLD )
@@ -2419,7 +2419,7 @@ unchanged:
+
+void RtfAttributeOutput::CharRotate( const SvxCharRotateItem& rRotate)
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HORZVERT);
+ m_aStyles.append((sal_Int32)(rRotate.IsFitToLine() ? 1 : 0));
@@ -2427,7 +2427,7 @@ unchanged:
+
+void RtfAttributeOutput::CharEmphasisMark( const SvxEmphasisMarkItem& rEmphasisMark )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const sal_Char* pStr;
+ switch( rEmphasisMark.GetEmphasisMark())
@@ -2441,7 +2441,7 @@ unchanged:
+
+void RtfAttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if( rTwoLines.GetValue() )
+ {
@@ -2467,7 +2467,7 @@ unchanged:
+
+void RtfAttributeOutput::CharScaleWidth( const SvxCharScaleWidthItem& rScaleWidth )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CHARSCALEX);
+ m_aStyles.append((sal_Int32)rScaleWidth.GetValue());
@@ -2475,7 +2475,7 @@ unchanged:
+
+void RtfAttributeOutput::CharRelief( const SvxCharReliefItem& rRelief )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const sal_Char* pStr;
+ switch (rRelief.GetValue())
@@ -2497,7 +2497,7 @@ unchanged:
+
+void RtfAttributeOutput::CharHidden( const SvxCharHiddenItem& rHidden )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_V);
+ if ( !rHidden.GetValue() )
@@ -2506,7 +2506,7 @@ unchanged:
+
+void RtfAttributeOutput::TextINetFormat( const SwFmtINetFmt& rURL )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if( rURL.GetValue().Len() )
+ {
@@ -2526,7 +2526,7 @@ unchanged:
+
+void RtfAttributeOutput::TextCharFormat( const SwFmtCharFmt& rCharFmt )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ USHORT nStyle = m_rExport.GetId( *rCharFmt.GetCharFmt() );
+ OString* pString = m_rExport.GetStyle(nStyle);
@@ -2544,7 +2544,7 @@ unchanged:
+
+void RtfAttributeOutput::TextFootnote_Impl( const SwFmtFtn& rFootnote )
+{
-+ OSL_TRACE("%s start", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s start", OSL_THIS_FUNC);
+
+ m_aRun.append("{" OOO_STRING_SVTOOLS_RTF_SUPER " ");
+ WriteTextFootnoteNumStr(rFootnote);
@@ -2573,12 +2573,12 @@ unchanged:
+ m_aRun.append("}");
+ m_aRun.append("}");
+
-+ OSL_TRACE("%s end", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s end", OSL_THIS_FUNC);
+}
+
+void RtfAttributeOutput::ParaLineSpacing_Impl( short nSpace, short nMulti )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_SL);
+ m_aStyles.append((sal_Int32)nSpace);
@@ -2589,7 +2589,7 @@ unchanged:
+
+void RtfAttributeOutput::ParaAdjust( const SvxAdjustItem& rAdjust )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ switch ( rAdjust.GetAdjust() )
+ {
@@ -2613,7 +2613,7 @@ unchanged:
+
+void RtfAttributeOutput::ParaSplit( const SvxFmtSplitItem& rSplit )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if( !rSplit.GetValue() )
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_KEEP);
@@ -2621,7 +2621,7 @@ unchanged:
+
+void RtfAttributeOutput::ParaWidows( const SvxWidowsItem& rWidows )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if (rWidows.GetValue())
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_WIDCTLPAR);
@@ -2631,7 +2631,7 @@ unchanged:
+
+void RtfAttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStop )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ long nOffset = ((SvxLRSpaceItem&)m_rExport.GetItem( RES_LR_SPACE )).GetTxtLeft();
+ for( USHORT n = 0; n < rTabStop.Count(); n++ )
@@ -2685,7 +2685,7 @@ unchanged:
+
+void RtfAttributeOutput::ParaHyphenZone( const SvxHyphenZoneItem& rHyphenZone )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ sal_Int32 nFlags = rHyphenZone.IsHyphen() ? 1 : 0;
+ if( rHyphenZone.IsPageEnd() )
@@ -2705,7 +2705,7 @@ unchanged:
+
+void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( USHRT_MAX == nNumId || 0 == nNumId || 0 == pTxtNd)
+ return;
@@ -2792,7 +2792,7 @@ unchanged:
+
+void RtfAttributeOutput::ParaScriptSpace( const SfxBoolItem& rScriptSpace )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if (!rScriptSpace.GetValue( ))
+ return;
@@ -2815,7 +2815,7 @@ unchanged:
+
+void RtfAttributeOutput::ParaVerticalAlign( const SvxParaVertAlignItem& rAlign )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const char* pStr;
+ switch ( rAlign.GetValue() )
@@ -2832,12 +2832,12 @@ unchanged:
+
+void RtfAttributeOutput::ParaSnapToGrid( const SvxParaGridItem& /*rGrid*/ )
+{
-+ OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
++ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+}
+
+void RtfAttributeOutput::FormatFrameSize( const SwFmtFrmSize& rSize )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( m_rExport.bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax )
+ {
@@ -2869,12 +2869,12 @@ unchanged:
+
+void RtfAttributeOutput::FormatPaperBin( const SvxPaperBinItem& )
+{
-+ OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
++ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+}
+
+void RtfAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( !m_rExport.bOutFlyFrmAttrs )
+ {
@@ -2911,7 +2911,7 @@ unchanged:
+
+void RtfAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( !m_rExport.bOutFlyFrmAttrs )
+ {
@@ -2942,7 +2942,7 @@ unchanged:
+
+void RtfAttributeOutput::FormatSurround( const SwFmtSurround& rSurround )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( m_rExport.bOutFlyFrmAttrs && !m_rExport.bRTFFlySyntax )
+ {
@@ -2958,7 +2958,7 @@ unchanged:
+
+void RtfAttributeOutput::FormatVertOrientation( const SwFmtVertOrient& rFlyVert )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( m_rExport.bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax )
+ {
@@ -2996,7 +2996,7 @@ unchanged:
+
+void RtfAttributeOutput::FormatHorizOrientation( const SwFmtHoriOrient& rFlyHori )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( m_rExport.bOutFlyFrmAttrs && m_rExport.bRTFFlySyntax )
+ {
@@ -3034,7 +3034,7 @@ unchanged:
+
+void RtfAttributeOutput::FormatAnchor( const SwFmtAnchor& rAnchor )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( !m_rExport.bRTFFlySyntax )
+ {
@@ -3057,7 +3057,7 @@ unchanged:
+
+void RtfAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if( !rBrush.GetColor().GetTransparency() )
+ {
@@ -3068,7 +3068,7 @@ unchanged:
+
+void RtfAttributeOutput::FormatBox( const SvxBoxItem& rBox )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ static USHORT __READONLY_DATA aBorders[] = {
+ BOX_LINE_TOP, BOX_LINE_LEFT, BOX_LINE_BOTTOM, BOX_LINE_RIGHT };
@@ -3121,7 +3121,7 @@ unchanged:
+
+void RtfAttributeOutput::FormatColumns_Impl( USHORT nCols, const SwFmtCol& rCol, bool bEven, SwTwips nPageSize )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_COLS;
+ m_rExport.OutLong( nCols );
@@ -3154,7 +3154,7 @@ unchanged:
+
+void RtfAttributeOutput::FormatKeep( const SvxFmtKeepItem& rItem )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if( rItem.GetValue() )
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_KEEPN);
@@ -3162,12 +3162,12 @@ unchanged:
+
+void RtfAttributeOutput::FormatTextGrid( const SwTextGridItem& /*rGrid*/ )
+{
-+ OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
++ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+}
+
+void RtfAttributeOutput::FormatLineNumbering( const SwFmtLineNumber& rNumbering )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( !rNumbering.IsCount( ) )
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_NOLINE);
@@ -3175,7 +3175,7 @@ unchanged:
+
+void RtfAttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDirection )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if (!m_rExport.bOutPageDescs)
+ {
@@ -3188,27 +3188,27 @@ unchanged:
+
+void RtfAttributeOutput::WriteExpand( const SwField* /*pFld*/ )
+{
-+ OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
++ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+}
+
+void RtfAttributeOutput::RefField( const SwField& /*rFld*/, const String& /*rRef*/ )
+{
-+ OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
++ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+}
+
+void RtfAttributeOutput::HiddenField( const SwField& /*rFld*/ )
+{
-+ OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
++ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+}
+
+void RtfAttributeOutput::SetField( const SwField& /*rFld*/, ww::eField /*eType*/, const String& /*rCmd*/ )
+{
-+ OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
++ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+}
+
+void RtfAttributeOutput::PostitField( const SwField* pFld )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ const SwPostItField& rPFld = *(SwPostItField*)pFld;
+
@@ -3244,12 +3244,12 @@ unchanged:
+ m_bBufferSectionBreaks( false ),
+ m_bBufferSectionHeaders( false )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+}
+
+RtfAttributeOutput::~RtfAttributeOutput()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+}
+
+MSWordExportBase& RtfAttributeOutput::GetExport()
@@ -3262,7 +3262,7 @@ unchanged:
+/// Start the font.
+void RtfAttributeOutput::StartFont( const String& rFamilyName ) const
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_rExport.Strm() << OUStringToOString( OUString( rFamilyName ), m_rExport.eCurrentEncoding ).getStr();
+}
@@ -3270,7 +3270,7 @@ unchanged:
+/// End the font.
+void RtfAttributeOutput::EndFont() const
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_rExport.Strm() << ";}";
+}
@@ -3278,7 +3278,7 @@ unchanged:
+/// Alternate name for the font.
+void RtfAttributeOutput::FontAlternateName( const String& rName ) const
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", 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 ) << '}';
@@ -3287,7 +3287,7 @@ unchanged:
+/// Font charset.
+void RtfAttributeOutput::FontCharset( sal_uInt8 nCharSet ) const
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_FCHARSET;
+ m_rExport.OutULong( nCharSet );
@@ -3297,7 +3297,7 @@ unchanged:
+/// Font family.
+void RtfAttributeOutput::FontFamilyType( FontFamily eFamily, const wwFont &rFont ) const
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_rExport.Strm() << '{' << OOO_STRING_SVTOOLS_RTF_F;
+
@@ -3328,7 +3328,7 @@ unchanged:
+/// Font pitch.
+void RtfAttributeOutput::FontPitchType( FontPitch ePitch ) const
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_FPRQ;
+
@@ -3478,7 +3478,7 @@ unchanged:
+
+void RtfAttributeOutput::FlyFrameOLEData( SwOLENode& rOLENode )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ uno::Reference < embed::XEmbeddedObject > xObj(const_cast<SwOLENode&>(rOLENode).GetOLEObj().GetOleRef());
+ sal_Int64 nAspect = rOLENode.GetAspect();
@@ -3521,7 +3521,7 @@ unchanged:
+
+void RtfAttributeOutput::FlyFrameOLE( SwOLENode& rOLENode, const Size& rSize )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ SvMemoryStream aStream;
+ const sal_uInt8* pGraphicAry = 0;
@@ -3561,7 +3561,7 @@ unchanged:
+
+void RtfAttributeOutput::FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size& rSize )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ SvMemoryStream aStream;
+ const sal_uInt8* pGraphicAry = 0;
@@ -4403,7 +4403,7 @@ unchanged:
+
+void RtfExport::AppendBookmarks( const SwTxtNode& rNode, xub_StrLen nAktPos, xub_StrLen nLen )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ std::vector< OUString > aStarts;
+ std::vector< OUString > aEnds;
@@ -4431,7 +4431,7 @@ unchanged:
+
+void RtfExport::AppendBookmark( const OUString& rName, bool /*bSkip*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ std::vector<OUString> aStarts;
+ std::vector<OUString> aEnds;
@@ -4444,7 +4444,7 @@ unchanged:
+
+void RtfExport::WriteChar( sal_Unicode )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ /* WriteChar() has nothing to do for rtf. */
+}
@@ -4494,7 +4494,7 @@ unchanged:
+
+void RtfExport::WriteNumbering()
+{
-+ OSL_TRACE("%s start", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s start", OSL_THIS_FUNC);
+
+ if ( !pUsedNumTbl )
+ return; // no numbering is used
@@ -4507,12 +4507,12 @@ unchanged:
+ NumberingDefinitions();
+ Strm() << '}';
+
-+ OSL_TRACE("%s end", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s end", OSL_THIS_FUNC);
+}
+
+void RtfExport::WriteRevTab()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ int nRevAuthors = pDoc->GetRedlineTbl().Count();
+
@@ -4540,7 +4540,7 @@ unchanged:
+void RtfExport::WriteHeadersFooters( BYTE nHeadFootFlags,
+ const SwFrmFmt& rFmt, const SwFrmFmt& rLeftFmt, const SwFrmFmt& rFirstPageFmt, BYTE /*nBreakCode*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ // headers
+ if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_EVEN )
@@ -4565,19 +4565,19 @@ unchanged:
+
+void RtfExport::OutputField( const SwField* pFld, ww::eField eFldType, const String& rFldCmd, BYTE nMode )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_pAttrOutput->WriteField_Impl( pFld, eFldType, rFldCmd, nMode );
+}
+
+void RtfExport::WriteFormData( const ::sw::mark::IFieldmark& /*rFieldmark*/ )
+{
-+ OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
++ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+}
+
+void RtfExport::WriteHyperlinkData( const ::sw::mark::IFieldmark& /*rFieldmark*/ )
+{
-+ OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
++ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+}
+
+void RtfExport::DoComboBox(const rtl::OUString& /*rName*/,
@@ -4586,21 +4586,21 @@ unchanged:
+ const rtl::OUString& /*rSelected*/,
+ uno::Sequence<rtl::OUString>& /*rListItems*/)
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ // this is handled in RtfAttributeOutput::OutputFlyFrame_Impl
+}
+
+void RtfExport::DoFormText(const SwInputField* /*pFld*/)
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ // this is hanled in RtfAttributeOutput::OutputFlyFrame_Impl
+}
+
+ULONG RtfExport::ReplaceCr( BYTE )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ // Completely unused for Rtf export... only here for code sharing
+ // purpose with binary export
@@ -4617,21 +4617,21 @@ unchanged:
+
+void RtfExport::WriteStyles()
+{
-+ OSL_TRACE("%s start", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s start", OSL_THIS_FUNC);
+ pStyles->OutputStylesTable();
-+ OSL_TRACE("%s end", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s end", OSL_THIS_FUNC);
+}
+
+void RtfExport::WriteMainText()
+{
-+ OSL_TRACE("%s start", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s start", OSL_THIS_FUNC);
+ WriteText();
-+ OSL_TRACE("%s end", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s end", OSL_THIS_FUNC);
+}
+
+void RtfExport::WriteInfo()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ Strm() << '{' << OOO_STRING_SVTOOLS_RTF_INFO;
+
+ SwDocShell *pDocShell(pDoc->GetDocShell());
@@ -4669,7 +4669,7 @@ unchanged:
+
+void RtfExport::WritePageDescTable()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ // Write page descriptions (page styles)
+ USHORT nSize = pDoc->GetPageDescCnt();
@@ -4926,7 +4926,7 @@ unchanged:
+ const SwNode& rNd, const SwFmtPageDesc* pNewPgDescFmt,
+ const SwPageDesc* pNewPgDesc )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ const SwSectionFmt* pFmt = GetSectionFormat( rNd );
+ const ULONG nLnNm = GetSectionLineNo( pSet, rNd );
+
@@ -4944,7 +4944,7 @@ unchanged:
+{
+ bool bRet( false );
+
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if (SFX_ITEM_SET != rFmt.GetItemState(RES_PARATR_NUMRULE, false))
+ {
@@ -4965,21 +4965,21 @@ unchanged:
+
+void RtfExport::OutputGrfNode( const SwGrfNode& )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ /* noop, see RtfAttributeOutput::FlyFrameGraphic */
+}
+
+void RtfExport::OutputOLENode( const SwOLENode& )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ /* noop, see RtfAttributeOutput::FlyFrameOLE */
+}
+
+void RtfExport::AppendSection( const SwPageDesc* pPageDesc, const SwSectionFmt* pFmt, ULONG nLnNum )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_pSections->AppendSection( pPageDesc, pFmt, nLnNum );
+ AttrOutput().SectionBreak( msword::PageBreak, m_pSections->CurrentSectionInfo() );
@@ -5147,7 +5147,7 @@ unchanged:
+
+OString RtfExport::OutString(const String &rStr, rtl_TextEncoding eDestEnc)
+{
-+ OSL_TRACE("%s, rStr = '%s'", __PRETTY_FUNCTION__,
++ OSL_TRACE("%s, rStr = '%s'", OSL_THIS_FUNC,
+ OUStringToOString( OUString( rStr ), eCurrentEncoding ).getStr());
+ OStringBuffer aBuf;
+ int nUCMode = 1;
@@ -5175,7 +5175,7 @@ unchanged:
+{
+ 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)", __PRETTY_FUNCTION__, (*it).first, rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue());
++ OSL_TRACE("%s returning %d (%d,%d,%d)", OSL_THIS_FUNC, (*it).first, rColor.GetRed(), rColor.GetGreen(), rColor.GetBlue());
+ return (*it).first;
+ }
+ OSL_ENSURE( FALSE, "No such Color in m_aColTbl!" );
@@ -5354,7 +5354,7 @@ unchanged:
+
+void RtfExport::OutPageDescription( const SwPageDesc& rPgDsc, BOOL bWriteReset, BOOL bCheckForFirstPage )
+{
-+ OSL_TRACE("%s start", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s start", OSL_THIS_FUNC);
+ const SwPageDesc *pSave = pAktPageDesc;
+
+ pAktPageDesc = &rPgDsc;
@@ -5404,7 +5404,7 @@ unchanged:
+
+ pAktPageDesc = pSave;
+ //bOutPageDesc = bOldOut;
-+ OSL_TRACE("%s end", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s end", OSL_THIS_FUNC);
+}
+
+void RtfExport::WriteHeaderFooter(const SfxPoolItem& rItem, bool bHeader)
@@ -5422,7 +5422,7 @@ unchanged:
+ return;
+ }
+
-+ OSL_TRACE("%s start", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s start", OSL_THIS_FUNC);
+
+ Strm() << (bHeader ? OOO_STRING_SVTOOLS_RTF_HEADERY : OOO_STRING_SVTOOLS_RTF_FOOTERY);
+ OutLong( pAktPageDesc->GetMaster().
@@ -5438,16 +5438,16 @@ unchanged:
+ WriteHeaderFooterText(pAktPageDesc->GetMaster(), bHeader);
+ Strm() << '}';
+
-+ OSL_TRACE("%s end", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s end", OSL_THIS_FUNC);
+}
+
+void RtfExport::WriteHeaderFooter(const SwFrmFmt& rFmt, bool bHeader, const sal_Char* pStr)
+{
-+ OSL_TRACE("%s start", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s start", OSL_THIS_FUNC);
+
+ m_pAttrOutput->WriteHeaderFooter_Impl( rFmt, bHeader, pStr );
+
-+ OSL_TRACE("%s end", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s end", OSL_THIS_FUNC);
+}
+
+class SwRTFWriter : public Writer
@@ -5460,7 +5460,7 @@ unchanged:
+
+SwRTFWriter::SwRTFWriter( const String& /*rFltName*/, const String & rBaseURL )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ SetBaseURL( rBaseURL );
+}
+
@@ -5469,7 +5469,7 @@ unchanged:
+
+ULONG SwRTFWriter::WriteStream()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ RtfExport aExport( NULL, pDoc, new SwPaM( *pCurPam->End(), *pCurPam->Start() ), pCurPam, this );
+ aExport.ExportDocument( true );
+ return 0;
@@ -5477,7 +5477,7 @@ unchanged:
+
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL ExportRTF( const String& rFltName, const String& rBaseURL, WriterRef& xRet )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ xRet = new SwRTFWriter( rFltName, rBaseURL );
+}
+
@@ -5757,7 +5757,7 @@ unchanged:
+sal_Bool RtfExportFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor )
+ throw (uno::RuntimeException)
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ MediaDescriptor aMediaDesc = aDescriptor;
+ ::uno::Reference< io::XStream > xStream =
@@ -5991,7 +5991,7 @@ unchanged:
+sal_Bool RtfImportFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor )
+ throw (uno::RuntimeException)
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ MediaDescriptor aMediaDesc = aDescriptor;
+ ::uno::Reference< io::XInputStream > xInputStream =
@@ -6240,7 +6240,7 @@ unchanged:
+
+void RtfSdrExport::OpenContainer( UINT16 nEscherContainer, int nRecInstance )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ EscherEx::OpenContainer( nEscherContainer, nRecInstance );
+
@@ -6256,7 +6256,7 @@ unchanged:
+
+void RtfSdrExport::CloseContainer()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( mRecTypes.back() == ESCHER_SpContainer )
+ {
@@ -6273,21 +6273,21 @@ unchanged:
+
+UINT32 RtfSdrExport::EnterGroup( const String& /*rShapeName*/, const Rectangle* /*pRect*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ return GenerateShapeId();
+}
+
+void RtfSdrExport::LeaveGroup()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ /* noop */
+}
+
+void RtfSdrExport::AddShape( UINT32 nShapeType, UINT32 nShapeFlags, UINT32 /*nShapeId*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ m_nShapeType = nShapeType;
+ m_nShapeFlags = nShapeFlags;
@@ -6325,7 +6325,7 @@ unchanged:
+
+void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( m_nShapeType == ESCHER_ShpInst_Nil )
+ return;
@@ -6492,7 +6492,7 @@ unchanged:
+ case 0x8000: // end
+ break;
+ default:
-+ OSL_TRACE("%s: unhandled segment '%x' in the path", __PRETTY_FUNCTION__, nSeg);
++ OSL_TRACE("%s: unhandled segment '%x' in the path", OSL_THIS_FUNC, nSeg);
+ break;
+ }
+ }
@@ -6509,7 +6509,7 @@ unchanged:
+ m_aShapeProps.insert(std::pair<OString,OString>(OString("pSegmentInfo"), aSegmentInfo.makeStringAndClear()));
+ }
+ else
-+ OSL_TRACE("%s: unhandled shape path, missing either pVertices or pSegmentInfo", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s: unhandled shape path, missing either pVertices or pSegmentInfo", OSL_THIS_FUNC);
+ }
+ break;
+ case ESCHER_Prop_shapePath:
@@ -6541,7 +6541,7 @@ unchanged:
+ 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)", __PRETTY_FUNCTION__, nId, it->nPropValue);
++ OSL_TRACE("%s: unhandled property: %d (value: %d)", OSL_THIS_FUNC, nId, it->nPropValue);
+ break;
+ }
+ }
@@ -6549,7 +6549,7 @@ unchanged:
+
+void RtfSdrExport::AddLineDimensions( const Rectangle& rRectangle )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", 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))));
@@ -6577,7 +6577,7 @@ unchanged:
+
+void RtfSdrExport::AddRectangleDimensions( rtl::OStringBuffer& rBuffer, const Rectangle& rRectangle )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", 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))));
@@ -6590,7 +6590,7 @@ unchanged:
+
+void RtfSdrExport::AddShapeAttribute( sal_Int32 /*nAttribute*/, const rtl::OString& /*rValue*/ )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ /* noop */
+}
@@ -6599,7 +6599,7 @@ unchanged:
+
+sal_Int32 RtfSdrExport::StartShape()
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( m_nShapeType == ESCHER_ShpInst_Nil )
+ return -1;
@@ -6657,7 +6657,7 @@ unchanged:
+
+void RtfSdrExport::WriteOutliner(const OutlinerParaObject& rParaObj)
+{
-+ OSL_TRACE("%s start", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s start", OSL_THIS_FUNC);
+
+ const EditTextObject& rEditObj = rParaObj.GetTextObject();
+ MSWord_SdrAttrIter aAttrIter( m_rExport, rEditObj, TXT_HFTXTBOX );
@@ -6705,12 +6705,12 @@ unchanged:
+ }
+ m_rAttrOutput.RunText().append(OOO_STRING_SVTOOLS_RTF_PAR).append('}');
+
-+ OSL_TRACE("%s end", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s end", OSL_THIS_FUNC);
+}
+
+void RtfSdrExport::EndShape( sal_Int32 nShapeElement )
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+
+ if ( nShapeElement >= 0 )
+ {
@@ -7422,7 +7422,7 @@ unchanged:
+sal_Bool RtfFilter::filter( const uno::Sequence< beans::PropertyValue >& aDescriptor )
+ throw (uno::RuntimeException)
+{
-+ OSL_TRACE("%s", __PRETTY_FUNCTION__);
++ OSL_TRACE("%s", OSL_THIS_FUNC);
+ if( m_xSrcDoc.is() )
+ {
+ uno::Reference< lang::XMultiServiceFactory > xMSF(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW);
diff --git a/patches/dev300/docx-fixes02.diff b/patches/dev300/docx-fixes02.diff
index 2aee53f..c078a63 100644
--- a/patches/dev300/docx-fixes02.diff
+++ b/patches/dev300/docx-fixes02.diff
@@ -770,7 +770,7 @@ index 81cba2f..6265c14 100644
-void RtfAttributeOutput::StartRuby( const SwTxtNode& /*rNode*/, const SwFmtRuby& /*rRuby*/ )
+void RtfAttributeOutput::StartRuby( const SwTxtNode& /*rNode*/, xub_StrLen /*nPos*/, const SwFmtRuby& /*rRuby*/ )
{
- OSL_TRACE("TODO: %s", __PRETTY_FUNCTION__);
+ OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
}
@@ -998,7 +998,7 @@ void RtfAttributeOutput::DefaultStyle( USHORT /*nStyle*/ )
}
@@ -779,7 +779,7 @@ index 81cba2f..6265c14 100644
- USHORT nBase, USHORT nNext, USHORT /*nWwId*/, USHORT nId )
+ USHORT nBase, USHORT nNext, USHORT /*nWwId*/, USHORT nId, bool /*bAutoUpdate*/ )
{
- OSL_TRACE("%s, rName = '%s'", __PRETTY_FUNCTION__,
+ OSL_TRACE("%s, rName = '%s'", OSL_THIS_FUNC,
OUStringToOString( OUString( rName ), m_rExport.eCurrentEncoding ).getStr());
diff --git sw/source/filter/ww8/rtfattributeoutput.hxx sw/source/filter/ww8/rtfattributeoutput.hxx
index 4cb1b9c..24ee150 100644
diff --git a/patches/dev300/oox-import-comments-fix-add-annotation.diff b/patches/dev300/oox-import-comments-fix-add-annotation.diff
index a5c432e..611bb95 100644
--- a/patches/dev300/oox-import-comments-fix-add-annotation.diff
+++ b/patches/dev300/oox-import-comments-fix-add-annotation.diff
@@ -97,7 +97,7 @@ new file mode 100644
index 0000000..3128890
--- /dev/null
+++ oox/source/xls/commentsfragment.cxx
-@@ -0,0 +1,169 @@
+@@ -0,0 +1,166 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -138,9 +138,6 @@ index 0000000..3128890
+using ::rtl::OUString;
+using ::oox::core::RecordInfo;
+
-+#if !defined (__GNUC__)
-+#define __PRETTY_FUNCTION__ __FUNCTION__
-+#endif /* ! __GNUC__ */
+#define OUSTRING_CSTR( str ) \
+ rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ).getStr()
+
@@ -229,7 +226,7 @@ index 0000000..3128890
+ {
+ if (nRecId == OOBIN_ID_COMMENT)
+ // TODO: parse REF
-+ OSL_TRACE( "%s: REF:%s", __PRETTY_FUNCTION__, OUSTRING_CSTR( maRef ));
++ OSL_TRACE( "%s: REF:%s", OSL_THIS_FUNC, OUSTRING_CSTR( maRef ));
+ return nRecId == OOBIN_ID_COMMENT;
+ }
+ case OOBIN_ID_COMMENT:
More information about the ooo-build-commit
mailing list