diff options
| -rw-r--r-- | toolkit/inc/toolkit/controls/unocontrolmodel.hxx | 11 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 12 | ||||
| -rwxr-xr-x | unusedcode.easy | 1 |
3 files changed, 10 insertions, 14 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() diff --git a/unusedcode.easy b/unusedcode.easy index d1f5e1d7e2bc..938fcd7541e9 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -261,7 +261,6 @@ TempFile::IsValid() const TextEngine::GetLeftMargin() const TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&) TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() -UnoControlModel::UnoControlModel() VCLUnoHelper::CreatePointer() VCLXPrinterServer::getImplementationId() VCLXPrinterServer::getTypes() |