summaryrefslogtreecommitdiff
path: root/writerfilter/source
diff options
context:
space:
mode:
Diffstat (limited to 'writerfilter/source')
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx4
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.cxx15
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx27
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx9
-rw-r--r--writerfilter/source/dmapper/NumberingManager.cxx13
-rw-r--r--writerfilter/source/dmapper/OLEHandler.cxx9
-rw-r--r--writerfilter/source/dmapper/PropertyMap.cxx4
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx4
-rw-r--r--writerfilter/source/dmapper/TableManager.cxx5
-rw-r--r--writerfilter/source/filter/RtfFilter.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLDocumentImpl.cxx36
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx6
12 files changed, 69 insertions, 68 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 195e360a671d..0eef649f96d3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3162,9 +3162,9 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len)
m_pImpl->appendTextPortion( sText, pContext );
}
}
- catch( const uno::RuntimeException& e )
+ catch( const uno::RuntimeException& )
{
- SAL_WARN("writerfilter", "failed. Message :" << e);
+ TOOLS_WARN_EXCEPTION("writerfilter", "");
}
}
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 27a710f5a0b6..f1ca99fc77bf 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -35,6 +35,7 @@
#include "util.hxx"
#include <osl/diagnose.h>
#include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
#include <comphelper/sequence.hxx>
#ifdef DBG_UTIL
@@ -915,9 +916,9 @@ static bool lcl_emptyRow(std::vector<RowSequence_t>& rTableRanges, sal_Int32 nRo
if (bRangesAreNotEqual)
return false;
}
- catch (const lang::IllegalArgumentException& e)
+ catch (const lang::IllegalArgumentException&)
{
- SAL_WARN( "writerfilter.dmapper", "compareRegionStarts() failed: " << e);
+ TOOLS_WARN_EXCEPTION( "writerfilter.dmapper", "compareRegionStarts() failed");
return false;
}
return true;
@@ -1102,18 +1103,16 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel, bool bTab
}
}
}
- catch ( const lang::IllegalArgumentException &e )
+ catch ( const lang::IllegalArgumentException & )
{
- SAL_INFO("writerfilter.dmapper",
- "Conversion to table error: " << e);
+ TOOLS_INFO_EXCEPTION("writerfilter.dmapper", "Conversion to table error");
#ifdef DBG_UTIL
TagLogger::getInstance().chars(std::string("failed to import table!"));
#endif
}
- catch ( const uno::Exception &e )
+ catch ( const uno::Exception & )
{
- SAL_INFO("writerfilter.dmapper",
- "Exception during table creation: " << e);
+ TOOLS_INFO_EXCEPTION("writerfilter.dmapper", "Exception during table creation");
}
// If we have a table with a start and an end position, we should make it a floating one.
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d70ebb443691..1e6a5a1e3f76 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1564,9 +1564,9 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap, con
{
OSL_FAIL( "IllegalArgumentException in DomainMapper_Impl::finishParagraph" );
}
- catch(const uno::Exception& e)
+ catch(const uno::Exception&)
{
- SAL_WARN( "writerfilter.dmapper", "finishParagraph() " << e );
+ TOOLS_WARN_EXCEPTION( "writerfilter.dmapper", "finishParagraph()" );
}
}
@@ -2242,10 +2242,9 @@ void DomainMapper_Impl::PopAnnotation()
}
m_aAnnotationPositions.erase( m_nAnnotationId );
}
- catch (uno::Exception const& e)
+ catch (uno::Exception const&)
{
- SAL_WARN("writerfilter.dmapper",
- "Cannot insert annotation field: " << e);
+ TOOLS_WARN_EXCEPTION("writerfilter.dmapper", "Cannot insert annotation field");
}
m_xAnnotationField.clear();
@@ -2436,9 +2435,9 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
m_bParaChanged = true;
getTableManager().setIsInShape(true);
}
- catch ( const uno::Exception& e )
+ catch ( const uno::Exception& )
{
- SAL_WARN("writerfilter.dmapper", "Exception when adding shape: " << e);
+ TOOLS_WARN_EXCEPTION("writerfilter.dmapper", "Exception when adding shape");
}
}
/*
@@ -4902,9 +4901,9 @@ void DomainMapper_Impl::CloseFieldCommand()
//set the text field if there is any
pContext->SetTextField( uno::Reference< text::XTextField >( xFieldInterface, uno::UNO_QUERY ) );
}
- catch( const uno::Exception& e )
+ catch( const uno::Exception& )
{
- SAL_WARN( "writerfilter.dmapper", "Exception in CloseFieldCommand(): " << e );
+ TOOLS_WARN_EXCEPTION( "writerfilter.dmapper", "Exception in CloseFieldCommand()" );
}
pContext->SetCommandCompleted();
}
@@ -5073,10 +5072,9 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult)
}
}
}
- catch (const uno::Exception& e)
+ catch (const uno::Exception&)
{
- SAL_WARN("writerfilter.dmapper",
- "DomainMapper_Impl::SetFieldResult: " << e);
+ TOOLS_WARN_EXCEPTION("writerfilter.dmapper", "DomainMapper_Impl::SetFieldResult");
}
}
}
@@ -5911,10 +5909,9 @@ uno::Reference<container::XIndexAccess> DomainMapper_Impl::GetCurrentNumberingRu
uno::Reference<beans::XPropertySet> xStyle(xNumberingStyles->getByName(aListName), uno::UNO_QUERY);
xRet.set(xStyle->getPropertyValue("NumberingRules"), uno::UNO_QUERY);
}
- catch (const uno::Exception& e)
+ catch (const uno::Exception&)
{
- SAL_WARN("writerfilter.dmapper",
- "GetCurrentNumberingRules: exception caught: " << e);
+ TOOLS_WARN_EXCEPTION("writerfilter.dmapper", "GetCurrentNumberingRules: exception caught");
}
return xRet;
}
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index d5d09a90dcbb..bf80052e33dd 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -49,6 +49,7 @@
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <rtl/math.hxx>
+#include <tools/diagnose_ex.h>
#include <comphelper/string.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/sequence.hxx>
@@ -377,9 +378,9 @@ public:
xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_TITLE ),
uno::makeAny( title ));
}
- catch( const uno::Exception& e )
+ catch( const uno::Exception& )
{
- SAL_WARN("writerfilter", "failed. Message :" << e);
+ TOOLS_WARN_EXCEPTION("writerfilter", "failed");
}
}
@@ -1387,9 +1388,9 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer
}
}
}
- catch( const uno::Exception& e )
+ catch( const uno::Exception& )
{
- SAL_WARN("writerfilter", "failed. Message :" << e);
+ TOOLS_WARN_EXCEPTION("writerfilter", "");
}
return xGraphicObject;
}
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 666ee674cddc..e5bf229d174e 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -39,6 +39,7 @@
#include <osl/diagnose.h>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
#include <comphelper/sequence.hxx>
#include <comphelper/propertyvalue.hxx>
@@ -624,19 +625,19 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
OUString sNumRulesName = getPropertyName( PROP_NUMBERING_RULES );
xStyle->setPropertyValue( sNumRulesName, uno::makeAny( m_xNumRules ) );
}
- catch( const lang::IllegalArgumentException& e )
+ catch( const lang::IllegalArgumentException& )
{
- SAL_WARN( "writerfilter", e );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "" );
assert( !"Incorrect argument to UNO call" );
}
- catch( const uno::RuntimeException& e )
+ catch( const uno::RuntimeException& )
{
- SAL_WARN( "writerfilter", e );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "" );
assert( !"Incorrect argument to UNO call" );
}
- catch( const uno::Exception& e )
+ catch( const uno::Exception& )
{
- SAL_WARN( "writerfilter", e );
+ TOOLS_WARN_EXCEPTION( "writerfilter", "" );
}
}
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index 8eb6fddeb303..c59e041b28a4 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -27,6 +27,7 @@
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
#include <unotools/mediadescriptor.hxx>
#include <officecfg/Office/Common.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -124,9 +125,9 @@ void OLEHandler::lcl_attribute(Id rName, Value & rVal)
xShapeProps->getPropertyValue( getPropertyName( PROP_BITMAP ) ) >>= m_xReplacement;
}
- catch( const uno::Exception& e )
+ catch( const uno::Exception& )
{
- SAL_WARN("writerfilter", "Exception in OLE Handler: " << e);
+ TOOLS_WARN_EXCEPTION("writerfilter", "Exception in OLE Handler");
}
// No need to set the wrapping here as it's either set in oox or will be set later
}
@@ -175,9 +176,9 @@ void OLEHandler::lcl_sprm(Sprm & rSprm)
if( m_rDomainMapper.IsInHeaderFooter() )
xShapeProps->setPropertyValue("Opaque", uno::makeAny(m_nWrapMode != text::WrapTextMode_THROUGH));
}
- catch( const uno::Exception& e )
+ catch( const uno::Exception& )
{
- SAL_WARN("writerfilter", "Exception in OLE Handler: " << e);
+ TOOLS_WARN_EXCEPTION("writerfilter", "Exception in OLE Handler");
}
}
}
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index 68f1f7119564..a85b80735b1a 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -841,9 +841,9 @@ void SectionPropertyMap::CopyHeaderFooterTextProperty( const uno::Reference< bea
xTxt->copyText( xPrevTxt );
}
- catch ( const uno::Exception& e )
+ catch ( const uno::Exception& )
{
- SAL_INFO( "writerfilter", "An exception occurred in SectionPropertyMap::CopyHeaderFooterTextProperty( ) - " << e );
+ TOOLS_INFO_EXCEPTION( "writerfilter", "An exception occurred in SectionPropertyMap::CopyHeaderFooterTextProperty( )" );
}
}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 3e41aa93404e..bfd535949bf4 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -373,9 +373,9 @@ void StyleSheetTable_Impl::SetPropertiesToDefault(const uno::Reference<style::XS
{
xPropertyState->setPropertyToDefault(aPropertyNames[i]);
}
- catch(const uno::Exception& rException)
+ catch(const uno::Exception&)
{
- SAL_INFO("writerfilter", "setPropertyToDefault(" << aPropertyNames[i] << ") failed: " << rException);
+ TOOLS_INFO_EXCEPTION("writerfilter", "setPropertyToDefault(" << aPropertyNames[i] << ") failed");
}
}
}
diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx
index 8377d356668e..f0194ca499ce 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -23,6 +23,7 @@
#include "util.hxx"
#include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
namespace writerfilter
{
@@ -304,9 +305,9 @@ void TableManager::resolveCurrentTable()
mpTableDataHandler->endTable(mTableDataStack.size() - 1, m_bTableStartsAtCellStart);
}
- catch (css::uno::Exception const& e)
+ catch (css::uno::Exception const&)
{
- SAL_WARN("writerfilter", "resolving of current table failed with: " << e);
+ TOOLS_WARN_EXCEPTION("writerfilter", "resolving of current table failed");
}
}
mState.resetTableProps();
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index a80c82c43e2f..3c1e975d8ad7 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -31,6 +31,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <osl/file.hxx>
#include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
#include <unotools/mediadescriptor.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -153,9 +154,9 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& rDescrip
throw lang::WrappedTargetRuntimeException("",
static_cast<OWeakObject*>(this), anyEx);
}
- catch (const uno::Exception& e)
+ catch (const uno::Exception&)
{
- SAL_INFO("writerfilter", "Exception caught: " << e);
+ TOOLS_INFO_EXCEPTION("writerfilter", "Exception caught");
}
if (xStatusIndicator.is())
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 9601a5311923..e8386c5898ef 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -83,10 +83,10 @@ void OOXMLDocumentImpl::resolveFastSubStream(Stream & rStreamHandler,
{
pStream = OOXMLDocumentFactory::createStream(mpStream, nType);
}
- catch (uno::Exception const& e)
+ catch (uno::Exception const&)
{
- SAL_INFO("writerfilter.ooxml", "resolveFastSubStream: exception while "
- "resolving stream " << nType << " : " << e);
+ TOOLS_INFO_EXCEPTION("writerfilter.ooxml", "resolveFastSubStream: exception while "
+ "resolving stream " << nType);
return;
}
OOXMLStream::Pointer_t savedStream = mpStream;
@@ -137,10 +137,10 @@ uno::Reference<xml::dom::XDocument> OOXMLDocumentImpl::importSubStream(OOXMLStre
{
pStream = OOXMLDocumentFactory::createStream(mpStream, nType);
}
- catch (uno::Exception const& e)
+ catch (uno::Exception const&)
{
- SAL_INFO("writerfilter.ooxml", "importSubStream: exception while "
- "importing stream " << nType << " : " << e);
+ TOOLS_INFO_EXCEPTION("writerfilter.ooxml", "importSubStream: exception while "
+ "importing stream " << nType);
return xRet;
}
@@ -153,10 +153,10 @@ uno::Reference<xml::dom::XDocument> OOXMLDocumentImpl::importSubStream(OOXMLStre
uno::Reference<xml::dom::XDocumentBuilder> xDomBuilder(xml::dom::DocumentBuilder::create(xContext));
xRet = xDomBuilder->parse(xInputStream);
}
- catch (uno::Exception const& e)
+ catch (uno::Exception const&)
{
- SAL_INFO("writerfilter.ooxml", "importSubStream: exception while "
- "parsing stream " << nType << " : " << e);
+ TOOLS_INFO_EXCEPTION("writerfilter.ooxml", "importSubStream: exception while "
+ "parsing stream " << nType);
return xRet;
}
}
@@ -614,10 +614,10 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/)
{
pStream = OOXMLDocumentFactory::createStream(mpStream, OOXMLStream::GLOSSARY);
}
- catch (uno::Exception const& e)
+ catch (uno::Exception const&)
{
- SAL_INFO("writerfilter.ooxml", "resolveGlossaryStream: exception while "
- "createStream for glossary" << OOXMLStream::GLOSSARY << " : " << e);
+ TOOLS_INFO_EXCEPTION("writerfilter.ooxml", "resolveGlossaryStream: exception while "
+ "createStream for glossary" << OOXMLStream::GLOSSARY);
return;
}
uno::Reference<embed::XRelationshipAccess> xRelationshipAccess;
@@ -685,10 +685,10 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/)
uno::Reference<xml::dom::XDocumentBuilder> xDomBuilder(xml::dom::DocumentBuilder::create(xContext));
xDom = xDomBuilder->parse(xInputStream);
}
- catch (uno::Exception const& e)
+ catch (uno::Exception const&)
{
- SAL_INFO("writerfilter.ooxml", "importSubStream: exception while "
- "parsing stream of Type" << nType << " : " << e);
+ TOOLS_INFO_EXCEPTION("writerfilter.ooxml", "importSubStream: exception while "
+ "parsing stream of Type" << nType);
return;
}
@@ -767,10 +767,10 @@ void OOXMLDocumentImpl::resolveEmbeddingsStream(const OOXMLStream::Pointer_t& pS
if (Stream)
resolveEmbeddingsStream(Stream);
}
- catch (uno::Exception const& e)
+ catch (uno::Exception const&)
{
- SAL_INFO("writerfilter.ooxml", "resolveEmbeddingsStream: can't find header/footer whilst "
- "resolving stream " << streamType << " : " << e);
+ TOOLS_INFO_EXCEPTION("writerfilter.ooxml", "resolveEmbeddingsStream: can't find header/footer whilst "
+ "resolving stream " << streamType);
return;
}
}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 43463dabc152..b829c8aa9fd2 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -25,6 +25,7 @@
#include <filter/msfilter/util.hxx>
#include <filter/msfilter/rtfutil.hxx>
#include <comphelper/string.hxx>
+#include <tools/diagnose_ex.h>
#include <tools/globname.hxx>
#include <tools/datetimeutils.hxx>
#include <comphelper/classids.hxx>
@@ -3161,10 +3162,9 @@ RTFError RTFDocumentImpl::popState()
xDocumentPropertyContainer->addProperty(
rKey, beans::PropertyAttribute::REMOVABLE, aValue);
}
- catch (const uno::Exception& rException)
+ catch (const uno::Exception&)
{
- SAL_WARN("writerfilter.rtf",
- "failed to set property " << rKey << ": " << rException);
+ TOOLS_WARN_EXCEPTION("writerfilter.rtf", "failed to set property " << rKey);
}
}
}