cui/source/options/treeopt.cxx | 8 ++++---- swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-)
New commits: commit 5f6b19760865d1f7720466416a69cc2d29f13b59 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Sep 8 12:10:43 2014 +0100 mediawiki options went missing regression from 34bcf9b498bccb5c924f4cec850ff15d88df6f07 Change-Id: Ibd0645bd218c81da110b3704a530e3849b761fb4 Date: Wed Aug 13 10:08:31 2014 +0200 java: remove dead methods found by UCDetector diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java index 22b344e..959cf99 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java @@ -68,7 +68,18 @@ public final class WikiEditorImpl extends WeakBase m_aSettings = Settings.getSettings( m_xContext ); } + public static XSingleComponentFactory __getComponentFactory( String sImplementationName ) + { + XSingleComponentFactory xFactory = null; + + if ( sImplementationName.equals( m_implementationName ) ) + xFactory = Factory.createComponentFactory( WikiEditorImpl.class, m_serviceNames ); + else if ( sImplementationName.equals( WikiOptionsEventHandlerImpl.m_sImplementationName ) ) + xFactory = Factory.createComponentFactory( WikiOptionsEventHandlerImpl.class, + WikiOptionsEventHandlerImpl.m_pServiceNames ); + return xFactory; + } // com.sun.star.lang.XServiceInfo: public String getImplementationName() commit 9d4ed5737f2c6f73b02e5878cd3f8cc013443b34 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Sep 8 11:20:33 2014 +0100 don't make reason for exception a mystery Change-Id: I3a3a2273dc0f97931dd6ddfd9492d5a883448aa3 diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index d7293b8..292a5ee 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -2250,13 +2250,13 @@ void ExtensionsTabPage::CreateDialogWithHandler() } } } - catch ( ::com::sun::star::lang::IllegalArgumentException& ) + catch (const css::lang::IllegalArgumentException& e) { - SAL_WARN( "cui.options", "ExtensionsTabPage::CreateDialogWithHandler(): illegal argument" ); + SAL_WARN("cui.options", "ExtensionsTabPage::CreateDialogWithHandler(): illegal argument:" << e.Message); } - catch ( Exception& ) + catch (const Exception& e) { - SAL_WARN( "cui.options", "ExtensionsTabPage::CreateDialogWithHandler(): exception of XDialogProvider2::createDialogWithHandler()" ); + SAL_WARN( "cui.options", "ExtensionsTabPage::CreateDialogWithHandler(): exception of XDialogProvider2::createDialogWithHandler(): " << e.Message); } }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits