From f7c8d7655f9e90df2ad79a379d3877e22db08f89 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 27 Mar 2014 19:59:49 +0100 Subject: [PATCH] Work around MSC "'override' cannot be used with 'inline'" bug Change-Id: I6eeb47699193ee024e975915011b1c3c5483bf9e --- extensions/source/propctrlr/commoncontrol.hxx | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index cc3a81dc1d4b..8ff593a72b2a 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() ); } @@ -308,13 +309,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() {