summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-12-08 15:54:14 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-12-08 17:27:26 +0000
commite61521f6cf0a065d23b420c4007ea224c3070052 (patch)
treef506779d08e8ce04af91e8512c27f54c50197323 /sw
parent8228227168a7eb3ebf14629bec87f01536c23970 (diff)
OSL_TRACE -> SAL in sw..ucb
Change-Id: I18f5511f70232d91095ac8527a6c5883c36294f5 Reviewed-on: https://gerrit.libreoffice.org/31762 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/doc/DocumentDeviceManager.cxx2
-rw-r--r--sw/source/core/doc/docbasic.cxx6
-rw-r--r--sw/source/core/doc/docbm.cxx4
-rw-r--r--sw/source/core/text/inftxt.cxx6
-rw-r--r--sw/source/core/unocore/unorefmk.cxx2
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx44
-rw-r--r--sw/source/filter/ww8/docxexport.cxx6
-rw-r--r--sw/source/filter/ww8/docxexportfilter.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx2
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx8
-rw-r--r--sw/source/ui/vba/service.cxx2
-rw-r--r--sw/source/ui/vba/vbaaddins.cxx2
-rw-r--r--sw/source/ui/vba/vbadocument.cxx4
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx8
-rw-r--r--sw/source/ui/vba/vbafield.cxx4
-rw-r--r--sw/source/ui/vba/vbaglobals.cxx18
-rw-r--r--sw/source/ui/vba/vbalisthelper.cxx2
-rw-r--r--sw/source/ui/vba/vbastyles.cxx2
20 files changed, 59 insertions, 71 deletions
diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx
index 1659263e0603..8caf93afa187 100644
--- a/sw/source/core/doc/DocumentDeviceManager.cxx
+++ b/sw/source/core/doc/DocumentDeviceManager.cxx
@@ -284,7 +284,7 @@ SfxPrinter& DocumentDeviceManager::CreatePrinter_() const
OSL_ENSURE( ! mpPrt, "Do not call CreatePrinter_(), call getPrinter() instead" );
#if OSL_DEBUG_LEVEL > 1
- OSL_TRACE( "Printer will be created!" );
+ SAL_INFO("sw", "Printer will be created!" );
#endif
// We create a default SfxPrinter.
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index 80c894bdc20f..e513260595c6 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -117,8 +117,7 @@ bool SwDoc::ExecMacro( const SvxMacro& rMacro, OUString* pRet, SbxArray* pArgs )
Sequence< sal_Int16 > aOutArgsIndex;
Sequence< Any > aOutArgs;
- OSL_TRACE( "SwDoc::ExecMacro URL is %s", OUStringToOString( rMacro.GetMacName(),
- RTL_TEXTENCODING_UTF8).getStr() );
+ SAL_INFO("sw", "SwDoc::ExecMacro URL is " << rMacro.GetMacName() );
eErr = mpDocShell->CallXScript(
rMacro.GetMacName(), *pUnoArgs, aRet, aOutArgsIndex, aOutArgs);
@@ -218,8 +217,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
Sequence< sal_Int16 > aOutArgsIndex;
Sequence< Any > aOutArgs;
- OSL_TRACE( "SwDoc::CallEvent URL is %s", OUStringToOString(
- rMacro.GetMacName(), RTL_TEXTENCODING_UTF8).getStr() );
+ SAL_INFO("sw", "SwDoc::CallEvent URL is " << rMacro.GetMacName() );
nRet += 0 == mpDocShell->CallXScript(
rMacro.GetMacName(), *pUnoArgs,aRet, aOutArgsIndex, aOutArgs) ? 1 : 0;
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 07bf1100beef..9b50b036e17d 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -220,8 +220,6 @@ namespace
{
if(ppCurrentMark->get() == rpMarkToFind.get())
{
- //OSL_TRACE("found mark named '%s'",
- // OUStringToOString(ppCurrentMark->get()->GetName(), RTL_TEXTENCODING_UTF8).getStr());
return ppCurrentMark;
}
++ppCurrentMark;
@@ -249,8 +247,6 @@ namespace
break;
if(IDocumentMarkAccess::GetType(**ppCurrentMark) == eType)
{
- //OSL_TRACE("found mark named '%s'",
- // OUStringToOString(ppCurrentMark->get()->GetName(), RTL_TEXTENCODING_UTF8).getStr());
return ppCurrentMark;
}
}
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 2db0f1997ef7..d06ccd5c00f5 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1143,10 +1143,10 @@ void SwTextPaintInfo::DrawBackBrush( const SwLinePortion &rPor ) const
}
bool bIsStartMark=(1==GetLen() && CH_TXT_ATR_FIELDSTART==GetText()[GetIdx()]);
if(pFieldmark) {
- OSL_TRACE("Found Fieldmark");
- SAL_INFO("sw.core", pFieldmark->ToString() << "\n");
+ SAL_INFO("sw.core", "Found Fieldmark " << pFieldmark->ToString());
}
- if(bIsStartMark) OSL_TRACE("Found StartMark");
+ if(bIsStartMark)
+ SAL_INFO("sw.core", "Found StartMark");
if (OnWin() && (pFieldmark!=nullptr || bIsStartMark) &&
SwViewOption::IsFieldShadings() &&
!GetOpt().IsPagePreview())
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 6a69bedfb79c..3592fc4e6008 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -1539,7 +1539,7 @@ lcl_getPrefixOrSuffix(
uno::UNO_QUERY);
if (!xObject.is()) continue;
if (xEnum->hasMoreElements()) {
- OSL_TRACE("ignoring other odf:Prefix/odf:Suffix statements");
+ SAL_INFO("sw", "ignoring other odf:Prefix/odf:Suffix statements");
}
return xObject->getValue();
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index c4c226d6f34d..8686052ae616 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2195,7 +2195,7 @@ void DocxAttributeOutput::RunText( const OUString& rText, rtl_TextEncoding /*eCh
if ( *pIt < 0x0020 ) // filter out the control codes
{
impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt );
- OSL_TRACE( "Ignored control code %x in a text run.", *pIt );
+ SAL_INFO("sw", "Ignored control code in a text run: " << *pIt );
}
prevUnicode = *pIt;
break;
@@ -2207,12 +2207,12 @@ void DocxAttributeOutput::RunText( const OUString& rText, rtl_TextEncoding /*eCh
void DocxAttributeOutput::RawText(const OUString& /*rText*/, rtl_TextEncoding /*eCharSet*/)
{
- OSL_TRACE("TODO DocxAttributeOutput::RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet )" );
+ SAL_INFO("sw", "TODO DocxAttributeOutput::RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet )" );
}
void DocxAttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby )
{
- OSL_TRACE("TODO DocxAttributeOutput::StartRuby( const SwTextNode& rNode, const SwFormatRuby& rRuby )" );
+ SAL_INFO("sw", "TODO DocxAttributeOutput::StartRuby( const SwTextNode& rNode, const SwFormatRuby& rRuby )" );
EndRun(); // end run before starting ruby to avoid nested runs, and overlap
assert(!m_closeHyperlinkInThisRun); // check that no hyperlink overlaps ruby
assert(!m_closeHyperlinkInPreviousRun);
@@ -2276,7 +2276,7 @@ void DocxAttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 nPos, co
void DocxAttributeOutput::EndRuby()
{
- OSL_TRACE( "TODO DocxAttributeOutput::EndRuby()" );
+ SAL_INFO("sw", "TODO DocxAttributeOutput::EndRuby()" );
EndRun( );
m_pSerializer->endElementNS( XML_w, XML_rubyBase );
m_pSerializer->endElementNS( XML_w, XML_ruby );
@@ -2558,7 +2558,7 @@ void DocxAttributeOutput::StartRedline( const SwRedlineData * pRedlineData )
break;
case nsRedlineType_t::REDLINE_FORMAT:
- OSL_TRACE( "TODO DocxAttributeOutput::StartRedline()" );
+ SAL_INFO("sw", "TODO DocxAttributeOutput::StartRedline()" );
break;
default:
break;
@@ -2581,7 +2581,7 @@ void DocxAttributeOutput::EndRedline( const SwRedlineData * pRedlineData )
break;
case nsRedlineType_t::REDLINE_FORMAT:
- OSL_TRACE( "TODO DocxAttributeOutput::EndRedline()" );
+ SAL_INFO("sw", "TODO DocxAttributeOutput::EndRedline()" );
break;
default:
break;
@@ -2590,7 +2590,7 @@ void DocxAttributeOutput::EndRedline( const SwRedlineData * pRedlineData )
void DocxAttributeOutput::FormatDrop( const SwTextNode& /*rNode*/, const SwFormatDrop& /*rSwFormatDrop*/, sal_uInt16 /*nStyle*/, ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/, ww8::WW8TableNodeInfoInner::Pointer_t )
{
- OSL_TRACE( "TODO DocxAttributeOutput::FormatDrop( const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle )" );
+ SAL_INFO("sw", "TODO DocxAttributeOutput::FormatDrop( const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle )" );
}
void DocxAttributeOutput::ParagraphStyle( sal_uInt16 nStyle )
@@ -3758,17 +3758,17 @@ void DocxAttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointe
void DocxAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
{
- OSL_TRACE( "TODO: DocxAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )" );
+ SAL_INFO("sw", "TODO: DocxAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )" );
}
void DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ )
{
- OSL_TRACE( "TODO: DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )\n" );
+ SAL_INFO("sw", "TODO: DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )\n" );
}
void DocxAttributeOutput::TableRowEnd( sal_uInt32 /*nDepth*/ )
{
- OSL_TRACE( "TODO: DocxAttributeOutput::TableRowEnd( sal_uInt32 nDepth = 1 )" );
+ SAL_INFO("sw", "TODO: DocxAttributeOutput::TableRowEnd( sal_uInt32 nDepth = 1 )" );
}
void DocxAttributeOutput::StartStyles()
@@ -4116,7 +4116,7 @@ void DocxAttributeOutput::EndStyles( sal_uInt16 nNumberOfStyles )
void DocxAttributeOutput::DefaultStyle()
{
// are these the values of enum ww::sti (see ../inc/wwstyles.hxx)?
- OSL_TRACE("TODO DocxAttributeOutput::DefaultStyle()");
+ SAL_INFO("sw", "TODO DocxAttributeOutput::DefaultStyle()");
}
/* Writes <a:srcRect> tag back to document.xml if a file conatins a cropped image.
@@ -4209,7 +4209,7 @@ void DocxAttributeOutput::CacheRelId(BitmapChecksum nChecksum, const OUString& r
void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* pSdrObj )
{
- OSL_TRACE( "TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* pSdrObj ) - some stuff still missing" );
+ SAL_INFO("sw", "TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* pSdrObj ) - some stuff still missing" );
GetSdtEndBefore(pSdrObj);
@@ -4472,7 +4472,7 @@ void DocxAttributeOutput::WritePostponedChart()
if( xChartDoc.is() )
{
- OSL_TRACE("DocxAttributeOutput::WriteOLE2Obj: export chart ");
+ SAL_INFO("sw", "DocxAttributeOutput::WriteOLE2Obj: export chart ");
m_pSerializer->startElementNS( XML_w, XML_drawing,
FSEND );
m_pSerializer->startElementNS( XML_wp, XML_inline,
@@ -5044,9 +5044,9 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const P
}
break;
default:
- OSL_TRACE( "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame& rFrame, const Point& rNdTopLeft ) - frame type '%s'\n",
- rFrame.GetWriterType() == ww8::Frame::eTextBox? "eTextBox":
- ( rFrame.GetWriterType() == ww8::Frame::eOle? "eOle": "???" ) );
+ SAL_INFO("sw", "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame& rFrame, const Point& rNdTopLeft ) - frame type " <<
+ ( rFrame.GetWriterType() == ww8::Frame::eTextBox ? "eTextBox":
+ ( rFrame.GetWriterType() == ww8::Frame::eOle ? "eOle": "???" ) ) );
break;
}
@@ -5460,7 +5460,7 @@ void DocxAttributeOutput::SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectio
break;
default:
- OSL_TRACE( "Unknown section break to write: %d", nC );
+ SAL_INFO("sw", "Unknown section break to write: " << nC );
break;
}
}
@@ -5755,7 +5755,7 @@ void DocxAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, const ::boo
m_pSerializer->singleElementNS( XML_w, XML_pgNumType, xAttrs );
// see 2.6.12 pgNumType (Page Numbering Settings)
- OSL_TRACE( "TODO DocxAttributeOutput::SectionPageNumbering()" );
+ SAL_INFO("sw", "TODO DocxAttributeOutput::SectionPageNumbering()" );
}
void DocxAttributeOutput::SectionType( sal_uInt8 nBreakCode )
@@ -6009,7 +6009,7 @@ void DocxAttributeOutput::NumberingDefinition( sal_uInt16 nId, const SwNumRule &
#if OSL_DEBUG_LEVEL > 1
// TODO ww8 version writes this, anything to do about it here?
if ( rRule.IsContinusNum() )
- OSL_TRACE( "TODO DocxAttributeOutput::NumberingDefinition()" );
+ SAL_INFO("sw", "TODO DocxAttributeOutput::NumberingDefinition()" );
#else
(void) rRule; // to quiet the warning...
#endif
@@ -6418,7 +6418,7 @@ void DocxAttributeOutput::CharWeight( const SvxWeightItem& rWeight )
void DocxAttributeOutput::CharAutoKern( const SvxAutoKernItem& )
{
- OSL_TRACE( "TODO DocxAttributeOutput::CharAutoKern()" );
+ SAL_INFO("sw", "TODO DocxAttributeOutput::CharAutoKern()" );
}
void DocxAttributeOutput::CharAnimatedText( const SvxBlinkItem& rBlink )
@@ -6643,7 +6643,7 @@ void DocxAttributeOutput::RefField( const SwField& rField, const OUString& rRef
void DocxAttributeOutput::HiddenField( const SwField& /*rField*/ )
{
- OSL_TRACE( "TODO DocxAttributeOutput::HiddenField()" );
+ SAL_INFO("sw", "TODO DocxAttributeOutput::HiddenField()" );
}
void DocxAttributeOutput::PostitField( const SwField* pField )
@@ -7292,7 +7292,7 @@ void DocxAttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize )
void DocxAttributeOutput::FormatPaperBin( const SvxPaperBinItem& )
{
- OSL_TRACE( "TODO DocxAttributeOutput::FormatPaperBin()" );
+ SAL_INFO("sw", "TODO DocxAttributeOutput::FormatPaperBin()" );
}
void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace )
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 4954bdb4e59a..0ae22daa9997 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -348,7 +348,7 @@ void DocxExport::DoComboBox(const OUString& rName,
void DocxExport::DoFormText(const SwInputField* /*pField*/)
{
- OSL_TRACE( "TODO DocxExport::ForFormText()" );
+ SAL_INFO("sw", "TODO DocxExport::ForFormText()" );
}
OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr const & m_pSerializer )
@@ -521,12 +521,12 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode )
void DocxExport::OutputGrfNode( const SwGrfNode& )
{
- OSL_TRACE( "TODO DocxExport::OutputGrfNode( const SwGrfNode& )" );
+ SAL_INFO("sw", "TODO DocxExport::OutputGrfNode( const SwGrfNode& )" );
}
void DocxExport::OutputOLENode( const SwOLENode& )
{
- OSL_TRACE( "TODO DocxExport::OutputOLENode( const SwOLENode& )" );
+ SAL_INFO("sw", "TODO DocxExport::OutputOLENode( const SwOLENode& )" );
}
void DocxExport::OutputLinkedOLE( const OUString& )
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index 6072cc57d724..503b5c68c26c 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -39,8 +39,6 @@ DocxExportFilter::DocxExportFilter( const uno::Reference< uno::XComponentContext
bool DocxExportFilter::exportDocument()
{
- OSL_TRACE( "DocxExportFilter::exportDocument()\n" ); // DEBUG remove me
-
// get SwDoc*
uno::Reference< uno::XInterface > xIfc( getModel(), uno::UNO_QUERY );
SwXTextDocument *pTextDoc = dynamic_cast< SwXTextDocument * >( xIfc.get() );
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index a173f1d0b4f9..4b39b7901b66 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -3108,7 +3108,7 @@ void MSWordExportBase::OutputContentNode( const SwContentNode& rNode )
OutputOLENode( *rNode.GetOLENode() );
break;
default:
- OSL_TRACE("Unhandled node, type == %d", (int)rNode.GetNodeType() );
+ SAL_WARN("sw", "Unhandled node, type == " << (int)rNode.GetNodeType() );
break;
}
}
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index a8ffa76d643e..7af628bf19ee 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -79,7 +79,7 @@ using namespace ::com::sun::star;
void WW8Export::OutputGrfNode( const SwGrfNode& /*rNode*/ )
{
- OSL_TRACE("WW8Export::OutputGrfNode( const SwGrfNode& )" );
+ SAL_INFO("sw", "WW8Export::OutputGrfNode( const SwGrfNode& )" );
OSL_ENSURE( m_pParentFrame, "frame not set!" );
if ( m_pParentFrame )
{
@@ -194,7 +194,7 @@ bool WW8Export::TestOleNeedsGraphic(const SwAttrSet& rSet,
void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
{
- OSL_TRACE("WW8Export::OutputOLENode( const SwOLENode& rOLENode )" );
+ SAL_INFO("sw", "WW8Export::OutputOLENode( const SwOLENode& rOLENode )" );
sal_uInt8 *pSpecOLE;
sal_uInt8 *pDataAdr;
short nSize;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e994e4f3ab9f..68894bdb3655 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4755,7 +4755,7 @@ void SwWW8ImplReader::ReadDocInfo()
Sttb aSttb;
m_pTableStream->Seek( m_pWwFib->m_fcSttbfAssoc ); // point at tgc record
if (!aSttb.Read( *m_pTableStream ) )
- OSL_TRACE("** Read of SttbAssoc data failed!!!! ");
+ SAL_WARN("sw", "** Read of SttbAssoc data failed!!!! ");
m_pTableStream->Seek( nCur ); // return to previous position, is that necessary?
#if OSL_DEBUG_LEVEL > 1
aSttb.Print( stderr );
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 1e35bf7d9b27..a4e2f55f1df3 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -134,7 +134,7 @@ void XTextRangeOrNodeIndexPosition::SetAsNodeIndex(
if (!pDoc)
{
- OSL_TRACE("SetAsNodeIndex: no SwDoc");
+ SAL_WARN("sw", "no SwDoc");
return;
}
@@ -454,8 +454,7 @@ Reference<XTextCursor> XMLRedlineImportHelper::CreateRedlineTextSection(
if (!pDoc)
{
- OSL_TRACE("XMLRedlineImportHelper::CreateRedlineTextSection: "
- "no SwDoc => cannot create section.");
+ SAL_WARN("sw", "no SwDoc => cannot create section.");
return nullptr;
}
@@ -592,8 +591,7 @@ void XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo)
if (!pDoc)
{
- OSL_TRACE("XMLRedlineImportHelper::InsertIntoDocument: "
- "no SwDoc => cannot insert redline.");
+ SAL_WARN("sw", "no SwDoc => cannot insert redline.");
return;
}
diff --git a/sw/source/ui/vba/service.cxx b/sw/source/ui/vba/service.cxx
index d39ab2bf2749..f40660b5264f 100644
--- a/sw/source/ui/vba/service.cxx
+++ b/sw/source/ui/vba/service.cxx
@@ -55,7 +55,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL vbaswobj_component_getFactory(
void* pRet = sdecl::component_getFactoryHelper(pImplName,
{&globals::serviceDecl, &::document::serviceDecl,
&wrapformat::serviceDecl, &vbaeventshelper::serviceDecl} );
- OSL_TRACE("Ret is 0x%p", pRet);
+ SAL_INFO("sw", "Ret is " << pRet);
return pRet;
}
diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx
index cbeb87de8a43..8a5a4656072f 100644
--- a/sw/source/ui/vba/vbaaddins.cxx
+++ b/sw/source/ui/vba/vbaaddins.cxx
@@ -36,7 +36,7 @@ static uno::Reference< container::XIndexAccess > lcl_getAddinCollection( const u
SvtPathOptions aPathOpt;
// FIXME: temporary the STARTUP path is located in $OO/basic3.1/program/addin
OUString aAddinPath = aPathOpt.GetAddinPath();
- OSL_TRACE("lcl_getAddinCollection: %s", OUStringToOString( aAddinPath, RTL_TEXTENCODING_UTF8 ).getStr() );
+ SAL_INFO("sw", "lcl_getAddinCollection: " << aAddinPath );
if( xSFA->isFolder( aAddinPath ) )
{
uno::Sequence< OUString > sEntries = xSFA->getFolderContents( aAddinPath, false );
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index b16587ba16f9..56b2fad83bfa 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -443,9 +443,7 @@ SwVbaDocument::getIntrospection( ) throw (uno::RuntimeException, std::exception
uno::Any SAL_CALL
SwVbaDocument::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& /*aParams*/, uno::Sequence< ::sal_Int16 >& /*aOutParamIndex*/, uno::Sequence< uno::Any >& /*aOutParam*/ ) throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException, std::exception)
{
- OSL_TRACE("** SwVbaDocument::invoke( %s ), will barf",
- OUStringToOString( aFunctionName, RTL_TEXTENCODING_UTF8 ).getStr() );
-
+ SAL_INFO("sw", "** will barf " << aFunctionName );
throw uno::RuntimeException(); // unsupported operation
}
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index f21d40d1379d..2135395bc0c3 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -299,7 +299,7 @@ public:
}
catch (const uno::Exception&)
{
- OSL_TRACE("Got exception");
+ SAL_WARN("sw", "Got exception");
}
uno::Any aReturn;
if ( rPropName == "LineCount" ) // special processing needed
@@ -836,7 +836,7 @@ public:
virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) override
{
- OSL_TRACE("hasByName(%s) returns %d", OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ).getStr(), mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) );
+ SAL_INFO("sw", "hasByName(" << aName << ") returns " << mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName ) );
return mxUserDefinedProp->getPropertySetInfo()->hasPropertyByName( aName );
}
@@ -854,13 +854,13 @@ public:
virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) override
{
// create a map of properties ( the key doesn't matter )
- OSL_TRACE("Creating an enumeration");
+ SAL_INFO("sw", "Creating an enumeration");
sal_Int32 key = 0;
sal_Int32 nElem = getCount();
DocProps simpleDocPropSnapShot;
for ( ; key < nElem; ++key )
simpleDocPropSnapShot[ key ].set( getByIndex( key ), uno::UNO_QUERY_THROW );
- OSL_TRACE("After creating the enumeration");
+ SAL_INFO("sw", "After creating the enumeration");
return new DocPropEnumeration( simpleDocPropSnapShot );
}
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index f45b04469766..f5816cdd8c0e 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -322,7 +322,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range,
{
SwVbaReadFieldParams aReadParam(sText);
sFieldName = aReadParam.GetFieldName();
- OSL_TRACE("SwVbaFields::Add, the field name is %s ",OUStringToOString( sFieldName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ SAL_INFO("sw", "the field name is " << sFieldName );
}
uno::Reference< text::XTextContent > xTextField;
@@ -436,7 +436,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const
}
}
aDocProperty = aDocProperty.replaceAll("\"", "");
- OSL_TRACE("SwVbaFields::Create_Field_DocProperty, the document property name is %s ",OUStringToOString( aDocProperty, RTL_TEXTENCODING_UTF8 ).getStr() );
+ SAL_INFO("sw", "SwVbaFields::Create_Field_DocProperty, the document property name is " << aDocProperty );
if( aDocProperty.isEmpty() )
{
throw uno::RuntimeException();
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index 82d8fbaa286d..4b3310c2391f 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -35,19 +35,19 @@ using namespace ::ooo::vba;
SwVbaGlobals::SwVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "WordDocumentContext" )
{
- OSL_TRACE("SwVbaGlobals::SwVbaGlobals()");
- uno::Sequence< beans::PropertyValue > aInitArgs( 2 );
- aInitArgs[ 0 ].Name = "Application";
- aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
- aInitArgs[ 1 ].Name = "WordDocumentContext";
- aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
+ SAL_INFO("sw", "SwVbaGlobals::SwVbaGlobals()");
+ uno::Sequence< beans::PropertyValue > aInitArgs( 2 );
+ aInitArgs[ 0 ].Name = "Application";
+ aInitArgs[ 0 ].Value = uno::makeAny( getApplication() );
+ aInitArgs[ 1 ].Name = "WordDocumentContext";
+ aInitArgs[ 1 ].Value = uno::makeAny( getXSomethingFromArgs< frame::XModel >( aArgs, 0 ) );
- init( aInitArgs );
+ init( aInitArgs );
}
SwVbaGlobals::~SwVbaGlobals()
{
- OSL_TRACE("SwVbaGlobals::~SwVbaGlobals");
+ SAL_INFO("sw", "SwVbaGlobals::~SwVbaGlobals");
}
// XGlobals
@@ -55,7 +55,7 @@ SwVbaGlobals::~SwVbaGlobals()
uno::Reference<word::XApplication > const &
SwVbaGlobals::getApplication() throw (uno::RuntimeException)
{
- OSL_TRACE("In SwVbaGlobals::getApplication");
+ SAL_INFO("sw", "In SwVbaGlobals::getApplication");
if ( !mxApplication.is() )
mxApplication.set( new SwVbaApplication( mxContext) );
diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx
index 051282fe2dce..7a3fd941e13c 100644
--- a/sw/source/ui/vba/vbalisthelper.cxx
+++ b/sw/source/ui/vba/vbalisthelper.cxx
@@ -81,7 +81,7 @@ void SwVbaListHelper::Init() throw( css::uno::RuntimeException )
// get the numbering style
uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( mxTextDocument, uno::UNO_QUERY_THROW );
mxStyleFamily.set( xStyleSupplier->getStyleFamilies()->getByName("NumberingStyles"), uno::UNO_QUERY_THROW );
- OSL_TRACE("SwVbaListHelper::Init: numbering style name: %s", OUStringToOString( msStyleName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ SAL_INFO("sw", "numbering style name: " << msStyleName );
if( mxStyleFamily->hasByName( msStyleName ) )
{
mxStyleProps.set( mxStyleFamily->getByName( msStyleName ), uno::UNO_QUERY_THROW );
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index f371f31082ca..bc88f89016a8 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -342,7 +342,7 @@ SwVbaStyles::Item( const uno::Any& Index1, const uno::Any& Index2 )
}
else
{
- OSL_TRACE("SwVbaStyles::Item: the builtin style type is not implemented");
+ SAL_WARN("sw", "the builtin style type is not implemented");
throw uno::RuntimeException("Not implemented" );
}
}