summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/source/filter/excel/xlroot.cxx5
-rw-r--r--sc/source/ui/docshell/docsh8.cxx4
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx8
-rw-r--r--sc/source/ui/miscdlgs/solverutil.cxx5
-rw-r--r--sc/source/ui/unoobj/docuno.cxx1
-rw-r--r--sc/source/ui/unoobj/exceldetect.cxx5
-rw-r--r--sc/source/ui/vba/vbarange.cxx5
7 files changed, 19 insertions, 14 deletions
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index a1cdf88b5f45..7d054c52204c 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -34,6 +34,7 @@
#include <sfx2/sfxsids.hrc>
#include <vcl/font.hxx>
#include <vcl/settings.hxx>
+#include <tools/diagnose_ex.h>
#include <editeng/editstat.hxx>
#include <scitems.hxx>
@@ -151,9 +152,9 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
mfScreenPixelX = (aDeviceInfo.PixelPerMeterX > 0) ? (100000.0 / aDeviceInfo.PixelPerMeterX) : 50.0;
mfScreenPixelY = (aDeviceInfo.PixelPerMeterY > 0) ? (100000.0 / aDeviceInfo.PixelPerMeterY) : 50.0;
}
- catch( const Exception& e)
+ catch( const Exception&)
{
- SAL_WARN( "sc", "XclRootData::XclRootData - cannot get output device info: " << e );
+ TOOLS_WARN_EXCEPTION( "sc", "XclRootData::XclRootData - cannot get output device info");
}
}
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index bf2c490b41c9..8705b5bc8c3b 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -33,6 +33,7 @@
#include <rtl/tencinfo.h>
#include <sal/log.hxx>
#include <osl/diagnose.h>
+#include <tools/diagnose_ex.h>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
@@ -985,8 +986,7 @@ ErrCode ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncoding
catch ( const sdbc::SQLException& aException )
{
sal_Int32 nError = aException.ErrorCode;
- SAL_WARN("sc", "ScDocShell::DBaseExport: SQLException ErrorCode: " << nError << ", SQLState: " << aException.SQLState <<
- ", Message: " << aException);
+ TOOLS_WARN_EXCEPTION("sc", "ScDocShell::DBaseExport");
if (nError == 22018 || nError == 22001)
{
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index ce2860bd149a..c062c0c8f936 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -41,6 +41,7 @@
#include <sfx2/msg.hxx>
#include <scmod.hxx>
#include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
#include <comphelper/storagehelper.hxx>
#include <comphelper/propertysequence.hxx>
@@ -194,14 +195,13 @@ void lcl_ChartInit(const uno::Reference <embed::XEmbeddedObject>& xObj, ScViewDa
{
xReceiver->setArguments( aArgs );
}
- catch (const lang::IllegalArgumentException& e)
+ catch (const lang::IllegalArgumentException&)
{
// Can happen for invalid aRangeString, in which case a Chart
// will be created nevertheless and the range string can be
// edited.
- SAL_WARN("sc.ui",
- "lcl_ChartInit - caught IllegalArgumentException with message \"" << e << "\","
- " might be due to aRangeString: " << aRangeString);
+ TOOLS_WARN_EXCEPTION("sc.ui",
+ "lcl_ChartInit - caught IllegalArgumentException might be due to aRangeString: " << aRangeString);
}
// don't create chart listener here (range may be modified in chart dialog)
diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx
index 64a982598815..3cddf1effbd5 100644
--- a/sc/source/ui/miscdlgs/solverutil.cxx
+++ b/sc/source/ui/miscdlgs/solverutil.cxx
@@ -30,6 +30,7 @@
#include <osl/diagnose.h>
#include <comphelper/processfactory.hxx>
#include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
using namespace com::sun::star;
@@ -83,9 +84,9 @@ void ScSolverUtil::GetImplementations( uno::Sequence<OUString>& rImplNames,
rDescriptions[nCount] = sDescription;
++nCount;
}
- catch (const css::uno::Exception& e)
+ catch (const css::uno::Exception&)
{
- SAL_INFO("sc.ui", "ScSolverUtil::GetImplementations: cannot instantiate: " << sName << ", because: " << e);
+ TOOLS_INFO_EXCEPTION("sc.ui", "ScSolverUtil::GetImplementations: cannot instantiate: " << sName);
}
}
}
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 3c399a6bc8ec..119683f8a9a2 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -31,6 +31,7 @@
#include <svx/svdpage.hxx>
#include <svx/svxids.hrc>
#include <svx/unoshape.hxx>
+#include <tools/diagnose_ex.h>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/propertysequence.hxx>
diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx
index 7d3d817f708e..4cb287e607d0 100644
--- a/sc/source/ui/unoobj/exceldetect.cxx
+++ b/sc/source/ui/unoobj/exceldetect.cxx
@@ -23,6 +23,7 @@
#include <unotools/mediadescriptor.hxx>
#include <sot/storage.hxx>
#include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
using namespace com::sun::star;
using utl::MediaDescriptor;
@@ -73,9 +74,9 @@ bool hasStream(const uno::Reference<io::XInputStream>& xInStream, const OUString
return false;
return xStorage->IsStream(rName);
}
- catch (const css::ucb::ContentCreationException &e)
+ catch (const css::ucb::ContentCreationException &)
{
- SAL_WARN("sc", "hasStream caught " << e);
+ TOOLS_WARN_EXCEPTION("sc", "hasStream");
}
return false;
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 42b3ea9300d6..dfe74c5f694e 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -26,6 +26,7 @@
#include <o3tl/any.hxx>
#include <sfx2/objsh.hxx>
#include <sal/log.hxx>
+#include <tools/diagnose_ex.h>
#include <com/sun/star/script/ArrayWrapper.hpp>
#include <com/sun/star/script/XTypeConverter.hpp>
@@ -1550,9 +1551,9 @@ ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter )
visitArray( setter );
}
}
- catch ( const uno::Exception& e )
+ catch ( const uno::Exception& )
{
- SAL_WARN("sc", "Bahhh, caught " << e );
+ TOOLS_WARN_EXCEPTION("sc", "Bahhh, caught" );
}
}
else
generated by cgit (git 2.34.1) at 2024-07-05 07:11:03 +0000