[Libreoffice-commits] core.git: extensions/source

Stephan Bergmann sbergman at redhat.com
Thu Mar 27 12:00:45 PDT 2014


 extensions/source/propctrlr/commoncontrol.hxx |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit f7c8d7655f9e90df2ad79a379d3877e22db08f89
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 27 19:59:49 2014 +0100

    Work around MSC "'override' cannot be used with 'inline'" bug
    
    Change-Id: I6eeb47699193ee024e975915011b1c3c5483bf9e

diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index cc3a81d..8ff593a 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -205,7 +205,8 @@ namespace pcr
         inline virtual void SAL_CALL disposing();
 
         // IModifyListener
-        inline virtual void modified() SAL_OVERRIDE;
+        virtual void modified() SAL_OVERRIDE
+        { m_aImplControl.setModified(); }
 
         /// returns a typed pointer to our control window
               WindowType* getTypedControlWindow()       { return static_cast< WindowType* >      ( m_aImplControl.getVclControlWindow() ); }
@@ -309,13 +310,6 @@ namespace pcr
 
 
     template< class CONTROL_INTERFACE, class CONTROL_WINDOW >
-    inline void CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::modified()
-    {
-        m_aImplControl.setModified();
-    }
-
-
-    template< class CONTROL_INTERFACE, class CONTROL_WINDOW >
     inline void CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::impl_checkDisposed_throw()
     {
         if ( ComponentBaseClass::rBHelper.bDisposed )


More information about the Libreoffice-commits mailing list