summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/CustomAnimationCloner.cxx8
-rw-r--r--sd/source/filter/html/htmlex.cxx5
-rw-r--r--sd/source/ui/remotecontrol/Receiver.cxx10
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx39
-rw-r--r--sd/source/ui/view/drviews1.cxx3
5 files changed, 36 insertions, 29 deletions
diff --git a/sd/source/core/CustomAnimationCloner.cxx b/sd/source/core/CustomAnimationCloner.cxx
index 7a3cd8238421..3eae00b4819c 100644
--- a/sd/source/core/CustomAnimationCloner.cxx
+++ b/sd/source/core/CustomAnimationCloner.cxx
@@ -36,6 +36,8 @@
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/ref.hxx>
#include <sal/log.hxx>
+#include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
#include <animations/animationnodehelper.hxx>
#include <svx/svditer.hxx>
@@ -123,7 +125,7 @@ namespace sd
catch( Exception& )
{
SAL_WARN( "sd", "sd::CustomAnimationClonerImpl::Clone(), "
- "exception caught: " << comphelper::anyToString( cppu::getCaughtException() ) );
+ "exception caught: " << exceptionToString( cppu::getCaughtException() ) );
Reference< XAnimationNode > xEmpty;
return xEmpty;
}
@@ -200,7 +202,7 @@ namespace sd
{
SAL_WARN( "sd", "sd::CustomAnimationClonerImpl::transformNode(), "
"exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
}
@@ -271,7 +273,7 @@ namespace sd
{
SAL_WARN( "sd", "sd::CustomAnimationClonerImpl::transformValue(), "
"exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
return rValue;
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index a8afa9567e42..0344c277ee10 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -75,6 +75,7 @@
#include <comphelper/anytostring.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
+#include <tools/diagnose_ex.h>
#include <drawdoc.hxx>
#include <DrawDocShell.hxx>
@@ -3058,7 +3059,7 @@ bool HtmlExport::checkFileExists( Reference< css::ucb::XSimpleFileAccess3 > cons
catch( css::uno::Exception& )
{
SAL_WARN( "sd", "sd::HtmlExport::checkFileExists(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
return false;
@@ -3109,7 +3110,7 @@ bool HtmlExport::checkForExistingFiles()
catch( Exception& )
{
SAL_WARN( "sd", "sd::HtmlExport::checkForExistingFiles(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
bFound = false;
}
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx
index 042a63006f78..04b50f9a3936 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -22,6 +22,8 @@
#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <vcl/svapp.hxx>
+#include <tools/diagnose_ex.h>
using namespace sd;
using namespace ::osl;
@@ -146,7 +148,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
catch ( Exception& )
{
SAL_WARN( "sdremote", "sd::SlideShowImpl::setPointerPosition(), "
- "exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
+ "exception caught: " << exceptionToString( cppu::getCaughtException() ));
}
if (xSlideShow.is()) try
@@ -160,7 +162,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
catch ( Exception& )
{
SAL_WARN( "sdremote", "sd::SlideShowImpl::setPointerMode(), "
- "exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
+ "exception caught: " << exceptionToString( cppu::getCaughtException() ));
}
SAL_INFO( "sdremote", "Pointer started, we display the pointer on screen" );
@@ -179,7 +181,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
catch ( Exception& )
{
SAL_WARN( "sdremote", "sd::SlideShowImpl::setPointerMode(), "
- "exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
+ "exception caught: " << exceptionToString( cppu::getCaughtException() ));
}
SAL_INFO( "sdremote", "Pointer dismissed, we hide the pointer on screen" );
@@ -204,7 +206,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
catch ( Exception& )
{
SAL_WARN( "sdremote", "sd::SlideShowImpl::setPointerPosition(), "
- "exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
+ "exception caught: " << exceptionToString( cppu::getCaughtException() ));
}
}
else if ( aCommand[0] == "presentation_resume" )
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index f8b049c28b35..96b108113543 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -38,6 +38,7 @@
#include <svl/urihelper.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <tools/diagnose_ex.h>
#include <sfx2/infobar.hxx>
#include <sfx2/request.hxx>
@@ -312,7 +313,7 @@ bool AnimationSlideController::getSlideAPI( sal_Int32 nSlideNumber, Reference< X
{
SAL_WARN( "sd", "sd::AnimationSlideController::getSlideAPI(), "
"exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
return false;
@@ -605,7 +606,7 @@ void SAL_CALL SlideshowImpl::disposing()
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::stop(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
mxShow.clear();
@@ -819,7 +820,7 @@ bool SlideshowImpl::startPreview(
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::startPreview(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
bRet = false;
}
@@ -1019,7 +1020,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx const * pPresSettings )
catch (const Exception&)
{
SAL_WARN( "sd", "sd::SlideshowImpl::startShow(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
bRet = false;
}
@@ -1089,7 +1090,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::startShowImpl(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
return false;
}
}
@@ -1123,7 +1124,7 @@ void SlideshowImpl::paint()
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::paint(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
}
@@ -1198,7 +1199,7 @@ void SlideshowImpl::removeShapeEvents()
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::removeShapeEvents(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
}
@@ -1227,7 +1228,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber)
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::registerShapeEvents(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
}
@@ -1299,7 +1300,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes > const & xShapes )
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::registerShapeEvents(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
}
@@ -1365,7 +1366,7 @@ void SAL_CALL SlideshowImpl::pause()
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::pause(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
}
@@ -1395,7 +1396,7 @@ void SAL_CALL SlideshowImpl::resume()
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::resume(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
#ifdef ENABLE_SDREMOTE
RemoteServer::presentationStarted( this );
@@ -1703,7 +1704,7 @@ void SlideshowImpl::updateSlideShow()
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::updateSlideShow(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
}
@@ -1828,7 +1829,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
{
bRet = false;
SAL_WARN( "sd", "sd::SlideshowImpl::keyInput(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
return bRet;
@@ -2209,7 +2210,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow()
catch( uno::Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::createSlideShow(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
return xShow;
@@ -2390,7 +2391,7 @@ void SlideshowImpl::resize( const Size& rSize )
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::resize(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
}
@@ -2654,7 +2655,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen )
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::setUsePen(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
}
@@ -2699,7 +2700,7 @@ void SlideshowImpl::setEraseAllInk(bool bEraseAllInk)
catch( Exception& )
{
SAL_WARN( "sd.slideshow", "sd::SlideshowImpl::setEraseAllInk(), "
- "exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
+ "exception caught: " << exceptionToString( cppu::getCaughtException() ));
}
}
}
@@ -2897,7 +2898,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects)
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::gotoPreviousSlide(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
}
@@ -2982,7 +2983,7 @@ void SAL_CALL SlideshowImpl::stopSound( )
catch( Exception& )
{
SAL_WARN( "sd", "sd::SlideshowImpl::stopSound(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
}
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 5a18278f635a..f8d688959e07 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -44,6 +44,7 @@
#include <svx/fmglob.hxx>
#include <editeng/outliner.hxx>
#include <svx/dialogs.hrc>
+#include <tools/diagnose_ex.h>
#include <view/viewoverlaymanager.hxx>
@@ -249,7 +250,7 @@ void DrawViewShell::SelectionHasChanged()
catch( css::uno::Exception& )
{
SAL_WARN( "sd", "sd::DrawViewShell::SelectionHasChanged(), exception caught: "
- << comphelper::anyToString( cppu::getCaughtException() ) );
+ << exceptionToString( cppu::getCaughtException() ) );
}
if( HasCurrentFunction() )
generated by cgit (git 2.34.1) at 2024-07-23 13:31:20 +0000