[Libreoffice-commits] .: Branch 'libreoffice-3-6' - toolkit/inc

[Libreoffice Gerrit user]

 toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 1cb77e94960d77b1d9cc9f06afa77cbe5920f282
Author: Noel Power <noel.power at suse.com>
Date:   Thu Dec 20 17:28:53 2012 +0000

    fix dialog language support mess fdo#42978
    
    during some rework ( not sure if it was me or not ) we try to register
    ControlContainerBase on construction as a XModifyListener ( but it's not ). Patch
    make ControlContainerBase implement XModifyListener now. iirc the code in question
    was moved from UnoDialogControl at some stage and it appears some balls were
    dropped :-)
    
    Change-Id: Ifc7084bd7260ceb06334117582facb95bafb6fed
    Reviewed-on: https://gerrit.libreoffice.org/1535
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
index d307c2a..3edf817 100644
--- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/resource/XStringResourceResolver.hpp>
 #include <cppuhelper/implbase8.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase3.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
 #include <toolkit/controls/unocontrolmodel.hxx>
 #include <toolkit/controls/unocontrolcontainer.hxx>
@@ -216,9 +216,10 @@ class ResourceListener  :public ::com::sun::star::util::XModifyListener,
         bool                                                                                    m_bListening;
 };
 
-typedef ::cppu::AggImplInheritanceHelper2   < UnoControlContainer
+typedef ::cppu::AggImplInheritanceHelper3   < UnoControlContainer
                             ,   ::com::sun::star::container::XContainerListener
                             ,   ::com::sun::star::util::XChangesListener
+                            ,   ::com::sun::star::util::XModifyListener
                             >   ContainerControl_IBase;
 
 class ControlContainerBase : public ContainerControl_IBase
@@ -259,6 +260,10 @@ public:
     // ::com::sun::star::awt::XControl
     sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model ) throw(::com::sun::star::uno::RuntimeException);
     void SAL_CALL setDesignMode( sal_Bool bOn ) throw(::com::sun::star::uno::RuntimeException);
+    // XModifyListener
+    // Using a dummy/no-op implementation here, not sure if every container control needs
+    // to implement this, certainly Dialog does, lets see about others
+    virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) {}
 protected:
     virtual void ImplModelPropertiesChanged( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& rEvents ) throw(::com::sun::star::uno::RuntimeException);
     virtual void removingControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl );