fpicker/source/aqua/SalAquaFilePicker.hxx | 5 +++-- fpicker/source/win32/filepicker/FilePicker.hxx | 5 +++-- writerfilter/source/dmapper/NumberingManager.cxx | 12 +++++++----- 3 files changed, 13 insertions(+), 9 deletions(-)
New commits: commit 503ee06fb843ac4ace017fde1b8a10c3c0501bc6 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 19 10:34:46 2013 +0200 fix up some of my fdo#46808 changes ... It turns out removing XInitialisation was a bad idea. Change-Id: I6a08f3f769ffc9017e94e8463a97cb18d39aa677 diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx index f1e4f23..d38a0a2 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.hxx +++ b/fpicker/source/aqua/SalAquaFilePicker.hxx @@ -20,7 +20,7 @@ #ifndef _SALAQUAFILEPICKER_HXX_ #define _SALAQUAFILEPICKER_HXX_ -#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/compbase4.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> @@ -47,9 +47,10 @@ // class declaration //---------------------------------------------------------- -typedef ::cppu::WeakComponentImplHelper3 < +typedef ::cppu::WeakComponentImplHelper4 < ::com::sun::star::ui::dialogs::XFilePicker3, ::com::sun::star::ui::dialogs::XFilePickerControlAccess, + ::com::sun::star::lang::XInitialization, ::com::sun::star::lang::XServiceInfo > SalAquaFilePicker_Base; class SalAquaFilePicker : diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx index 83b7ecd..73bc3d5 100644 --- a/fpicker/source/win32/filepicker/FilePicker.hxx +++ b/fpicker/source/win32/filepicker/FilePicker.hxx @@ -20,7 +20,7 @@ #ifndef _FILEPICKER_HXX_ #define _FILEPICKER_HXX_ -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase6.hxx> #include <osl/mutex.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ui/dialogs/XFilePicker2.hpp> @@ -52,11 +52,12 @@ protected: osl::Mutex m_rbHelperMtx; }; -typedef ::cppu::WeakComponentImplHelper5 < +typedef ::cppu::WeakComponentImplHelper6 < ::com::sun::star::ui::dialogs::XFilePicker2, ::com::sun::star::ui::dialogs::XFilePicker3, ::com::sun::star::ui::dialogs::XFilePickerControlAccess, ::com::sun::star::ui::dialogs::XFilePreview, + ::com::sun::star::lang::XInitialization, ::com::sun::star::lang::XServiceInfo > CFilePicker_Base; class CFilePicker : commit a00f11b97b9fca70e6ed50fdc82ac731f4c47c90 Author: Noel Grandin <n...@peralex.com> Date: Tue Feb 19 10:34:18 2013 +0200 log the exception here instead of just asserting .. to make future debugging easier. Change-Id: I8efc8d8d6f228d9a36d8bb0aebe57913f2af5637 diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 23b7225..0f74fa7 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -511,7 +511,7 @@ uno::Reference< container::XNameContainer > lcl_getUnoNumberingStyles( oFamily >>= xStyles; } - catch ( const uno::Exception ) + catch ( const uno::Exception & ) { } @@ -645,13 +645,15 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper, OUString sNumRulesName = aPropNameSupplier.GetName( PROP_NUMBERING_RULES ); xStyle->setPropertyValue( sNumRulesName, uno::makeAny( m_xNumRules ) ); } - catch( const lang::IllegalArgumentException& ) + catch( const lang::IllegalArgumentException& e ) { - assert( !"Incorrect argument to UNO call" ); + SAL_WARN( "writerfilter", "Exception: " << e.Message ); + assert( !"Incorrect argument to UNO call" ); } - catch( const uno::RuntimeException& ) + catch( const uno::RuntimeException& e ) { - assert( !"Incorrect argument to UNO call" ); + SAL_WARN( "writerfilter", "Exception: " << e.Message ); + assert( !"Incorrect argument to UNO call" ); } catch( const uno::Exception& e ) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits