summaryrefslogtreecommitdiff
path: root/sd/source/filter/html/buttonset.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/filter/html/buttonset.cxx')
-rw-r--r--sd/source/filter/html/buttonset.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index cb382303287f..8f9ec50423a2 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -33,6 +33,7 @@
#include <vcl/virdev.hxx>
#include <vcl/image.hxx>
#include <unotools/pathoptions.hxx>
+#include <tools/diagnose_ex.h>
#include <memory>
@@ -72,7 +73,7 @@ ButtonsImpl::ButtonsImpl( const OUString& rURL )
}
catch( Exception& )
{
- OSL_FAIL("sd::ButtonsImpl::ButtonsImpl(), exception caught!" );
+ TOOLS_WARN_EXCEPTION( "sd", "sd::ButtonsImpl::ButtonsImpl()" );
}
}
@@ -87,7 +88,7 @@ Reference< XInputStream > ButtonsImpl::getInputStream( const OUString& rName )
}
catch( Exception& )
{
- OSL_FAIL( "sd::ButtonsImpl::getInputStream(), exception caught!" );
+ TOOLS_WARN_EXCEPTION( "sd", "sd::ButtonsImpl::getInputStream()" );
}
return xInputStream;
}
@@ -110,7 +111,7 @@ bool ButtonsImpl::getGraphic( const Reference< XGraphicProvider >& xGraphicProvi
}
catch( Exception& )
{
- OSL_FAIL( "sd::ButtonsImpl::getGraphic(), exception caught!" );
+ TOOLS_WARN_EXCEPTION( "sd", "sd::ButtonsImpl::getGraphic()" );
}
return false;
}
@@ -131,7 +132,7 @@ bool ButtonsImpl::copyGraphic( const OUString& rName, const OUString& rPath )
}
catch( Exception& )
{
- OSL_FAIL( "sd::ButtonsImpl::copyGraphic(), exception caught!" );
+ TOOLS_WARN_EXCEPTION( "sd", "sd::ButtonsImpl::copyGraphic()" );
}
return false;
p;id=e8eab43eebecfcaf277d01b1c99ea003199866e4'>cleanup whitespaces due to RTL_CONSTASCII_USTRINGPARAM removalPhilipp Riemer In e2e2cc61144cb22227eebfadff0ea24b51ccfbd0 the method was removed automatically leaving several line breaks etc. as visual noise. 2013-05-06remove usage of RTL_CONSTASCII_USTRINGPARAMLuboš Luňák Mechanical removal of usage together with OUString ctor, done by compiler plugin. Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5 2013-04-24gbuild: drop uses of removed packagesDavid Tardon Change-Id: I400fad08c0ae7b6b34bad63693f54856867e4dac Reviewed-on: https://gerrit.libreoffice.org/3502 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> 2013-04-23execute move of global headersBjoern Michaelsen see https://gerrit.libreoffice.org/#/c/3367/ and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a 2013-04-22re-base on ALv2 code.Michael Meeks 2013-04-07mass removal of rtl:: prefixes for O(U)String*Luboš Luňák Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09 2013-04-04remove HAVE_SFINAE_ANONYMOUS_BROKENLuboš Luňák Since we no longer support the old Apple SDK using gcc-4.0.1, we can remove the cruft to work around its problems. Woohoo. Change-Id: Idf275e76449443f1f0314e75dab993f213a77eb7 2013-03-20use #if instead of #ifdef for testing config_xxx.hxx macrosLuboš Luňák http://lists.freedesktop.org/archives/libreoffice/2013-March/047769.html Change-Id: I81ed4500878ff3193e028410a1f0205e28d17fc3 2013-03-19automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStringsThomas Arnhold Done with a perl regex: s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec Reviewed-on: https://gerrit.libreoffice.org/2832 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org> 2013-03-14remove legacy build.pl prj/build.lst files.Michael Meeks 2013-02-28remove all d.lstMichael Stahl Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885 2013-02-25xmlreader does not depend on any offapi .idl filesStephan Bergmann Change-Id: I5f008ba23c7f55a53d2b39cb235b27208b7743c5 2013-02-19I want HAVE_SFINAE_ANONYMOUS_BROKEN here rather than RTL_FAST_STRINGCaolán McNamara Change-Id: Ie5cd55aa7ba4773f3cffbed924467787596dfc9d 2013-02-19reuse the ConstCharArrayDetector in SpanCaolán McNamara Change-Id: I33bc390aaa8f6e3cc2505632670970038140eb3c 2013-02-19add equals(OString const &text) to SpanChr. Rossmanith useful when removing RTL_CONST_STRINGPARAM Change-Id: Ic131876a3fb38e69185342c4c7a46d536d60c8e5 Reviewed-on: https://gerrit.libreoffice.org/2256 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>