Kaydet (Commit) d8f145d1 authored tarafından Caolán McNamara's avatar Caolán McNamara

save the next guy from getting caught with msvc template requirements

üst 2d2b19de
...@@ -109,7 +109,16 @@ protected: ...@@ -109,7 +109,16 @@ protected:
) const; ) const;
protected: 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: public:
UnoControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory ); UnoControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
UnoControlModel( const UnoControlModel& rModel ); UnoControlModel( const UnoControlModel& rModel );
......
...@@ -122,18 +122,6 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId, ...@@ -122,18 +122,6 @@ static void lcl_ImplMergeFontProperty( FontDescriptor& rFD, sal_uInt16 nPropId,
// ---------------------------------------------------- // ----------------------------------------------------
// class UnoControlModel // 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::UnoControlModel( const Reference< XMultiServiceFactory >& i_factory )
:UnoControlModel_Base() :UnoControlModel_Base()
,MutexAndBroadcastHelper() ,MutexAndBroadcastHelper()
......
...@@ -261,7 +261,6 @@ TempFile::IsValid() const ...@@ -261,7 +261,6 @@ TempFile::IsValid() const
TextEngine::GetLeftMargin() const TextEngine::GetLeftMargin() const
TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&) TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&)
TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
UnoControlModel::UnoControlModel()
VCLUnoHelper::CreatePointer() VCLUnoHelper::CreatePointer()
VCLXPrinterServer::getImplementationId() VCLXPrinterServer::getImplementationId()
VCLXPrinterServer::getTypes() VCLXPrinterServer::getTypes()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment