diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-24 16:21:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-24 20:09:49 +0100 |
| commit | d8f145d1ebe8836f559ba47a1978063d922c6294 (patch) | |
| tree | 8e41ae3f5ea25ab45a894bf72b04dfc133ce7d6c /toolkit | |
| parent | 2d2b19dea1ab401b1b4971ff5b12b87bb11fd666 (diff) | |
save the next guy from getting caught with msvc template requirements
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/inc/toolkit/controls/unocontrolmodel.hxx | 11 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 12 |
2 files changed, 10 insertions, 13 deletions
diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx index 99722b775ce1..e0d6aa874317 100644 --- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx @@ -109,7 +109,16 @@ protected: ) const; protected: - UnoControlModel(); + UnoControlModel() //do not use! needed by MSVC at compile time to satisfy WeakAggImplHelper7 + : UnoControlModel_Base() + , MutexAndBroadcastHelper() + , OPropertySetHelper( BrdcstHelper ) + , maDisposeListeners( *this ) + , maContext( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >() ) + { + assert(false); + } + public: UnoControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory ); UnoControlModel( const UnoControlModel& rModel ); diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 2d0a2fdf832c..9b2490300927 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -122,18 +122,6 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId, // ---------------------------------------------------- // class UnoControlModel // ---------------------------------------------------- -UnoControlModel::UnoControlModel() - :UnoControlModel_Base() - ,MutexAndBroadcastHelper() - ,OPropertySetHelper( BrdcstHelper ) - ,maDisposeListeners( *this ) - ,maContext( ::comphelper::getProcessServiceFactory() ) -{ - OSL_ENSURE( false, "UnoControlModel::UnoControlModel: not implemented. Well, not really." ); - // just implemented to let the various FooImplInheritanceHelper compile, you should use the - // version taking a service factory -} - UnoControlModel::UnoControlModel( const Reference< XMultiServiceFactory >& i_factory ) :UnoControlModel_Base() ,MutexAndBroadcastHelper() |