diff options
author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-03 09:41:02 +0100 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2011-02-03 09:41:02 +0100 |
commit | 2e21a7ec4b9aea1c64025896558e5d73e34271cc (patch) | |
tree | 138b2a5e31d749832f3c7f4402e5006b12ce0555 /toolkit/source/controls/unocontrolcontainer.cxx | |
parent | 99ff7a9fb521895d6ba18ca4ca92d7eb0c3524fd (diff) | |
parent | 0fd19afca7b8063a964032704a9ac6f4ee6e7911 (diff) |
pulled and merged DEV300.m99
Diffstat (limited to 'toolkit/source/controls/unocontrolcontainer.cxx')
-rw-r--r-- | toolkit/source/controls/unocontrolcontainer.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 3afe3a90f1ee..bdbdc9aae7f1 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -412,13 +412,16 @@ void SAL_CALL DialogStepChangedListener::propertyChange( const beans::PropertyC // ---------------------------------------------------- // class UnoControlContainer // ---------------------------------------------------- -UnoControlContainer::UnoControlContainer() : maCListeners( *this ) +UnoControlContainer::UnoControlContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory ) + :UnoControlContainer_Base( i_factory ) + ,maCListeners( *this ) { mpControls = new UnoControlHolderList; } -UnoControlContainer::UnoControlContainer( uno::Reference< awt::XWindowPeer > xP ) - : maCListeners( *this ) +UnoControlContainer::UnoControlContainer( const uno::Reference< lang::XMultiServiceFactory >& i_factory, const uno::Reference< awt::XWindowPeer >& xP ) + :UnoControlContainer_Base( i_factory ) + ,maCListeners( *this ) { setPeer( xP ); mbDisposePeer = sal_False; |