[Libreoffice-commits] .: 12 commits - connectivity/inc connectivity/source cui/source dbaccess/source embeddedobj/source extensions/source forms/source fpicker/source framework/inc framework/source offapi/com offapi/UnoApi_offapi.mk reportdesign/source sfx2/source starmath/source svx/source sw/source toolkit/inc toolkit/source unotools/inc unotools/source uui/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Jan 8 22:09:15 PST 2013
connectivity/inc/connectivity/DriversConfig.hxx | 9
connectivity/inc/connectivity/dbtools.hxx | 2
connectivity/source/commontools/DriversConfig.cxx | 6
connectivity/source/commontools/dbmetadata.cxx | 2
connectivity/source/commontools/dbtools2.cxx | 4
connectivity/source/drivers/hsqldb/HDriver.cxx | 27 -
connectivity/source/drivers/jdbc/JConnection.cxx | 4
connectivity/source/inc/hsqldb/HDriver.hxx | 5
connectivity/source/manager/mdrivermanager.cxx | 2
cui/source/options/connpoolconfig.cxx | 8
dbaccess/source/core/dataaccess/databaseregistrations.cxx | 4
dbaccess/source/core/dataaccess/documentdefinition.cxx | 2
dbaccess/source/core/misc/dsntypes.cxx | 8
dbaccess/source/filter/xml/xmlExport.cxx | 5
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx | 3
dbaccess/source/filter/xml/xmlfilter.cxx | 4
dbaccess/source/inc/dsntypes.hxx | 6
dbaccess/source/inc/stringconstants.hrc | 1
dbaccess/source/inc/stringconstants.inc | 1
dbaccess/source/ui/app/AppController.cxx | 4
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2
dbaccess/source/ui/browser/dbtreeview.cxx | 4
dbaccess/source/ui/browser/dbtreeview.hxx | 3
dbaccess/source/ui/browser/unodatbr.cxx | 4
dbaccess/source/ui/control/dbtreelistbox.cxx | 8
dbaccess/source/ui/control/marktree.cxx | 8
dbaccess/source/ui/control/tabletree.cxx | 8
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 4
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 5
dbaccess/source/ui/dlg/ConnectionPage.cxx | 2
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 8
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 14
dbaccess/source/ui/dlg/DbAdminImpl.hxx | 22 -
dbaccess/source/ui/dlg/DriverSettings.cxx | 4
dbaccess/source/ui/dlg/DriverSettings.hxx | 2
dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 3
dbaccess/source/ui/dlg/UserAdmin.cxx | 6
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 10
dbaccess/source/ui/dlg/adminpages.hxx | 4
dbaccess/source/ui/dlg/adtabdlg.cxx | 2
dbaccess/source/ui/dlg/advancedsettings.cxx | 10
dbaccess/source/ui/dlg/dbadmin.cxx | 8
dbaccess/source/ui/dlg/dbwiz.cxx | 9
dbaccess/source/ui/dlg/dbwizsetup.cxx | 32 +-
dbaccess/source/ui/dlg/detailpages.cxx | 4
dbaccess/source/ui/dlg/generalpage.cxx | 4
dbaccess/source/ui/dlg/tablespage.cxx | 11
dbaccess/source/ui/inc/IItemSetHelper.hxx | 2
dbaccess/source/ui/inc/TablesSingleDlg.hxx | 6
dbaccess/source/ui/inc/UserAdminDlg.hxx | 4
dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 4
dbaccess/source/ui/inc/dbadmin.hxx | 4
dbaccess/source/ui/inc/dbtreelistbox.hxx | 8
dbaccess/source/ui/inc/dbwiz.hxx | 4
dbaccess/source/ui/inc/dbwizsetup.hxx | 4
dbaccess/source/ui/inc/marktree.hxx | 8
dbaccess/source/ui/inc/tabletree.hxx | 2
dbaccess/source/ui/misc/WNameMatch.cxx | 2
dbaccess/source/ui/misc/dsmeta.cxx | 4
dbaccess/source/ui/tabledesign/TEditControl.cxx | 3
dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 2
dbaccess/source/ui/uno/ColumnControl.cxx | 16 -
dbaccess/source/ui/uno/ColumnControl.hxx | 4
dbaccess/source/ui/uno/DBTypeWizDlg.cxx | 2
dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 2
dbaccess/source/ui/uno/TableFilterDlg.cxx | 2
dbaccess/source/ui/uno/UserSettingsDlg.cxx | 2
dbaccess/source/ui/uno/admindlg.cxx | 2
dbaccess/source/ui/uno/composerdialogs.cxx | 17 +
dbaccess/source/ui/uno/composerdialogs.hxx | 2
dbaccess/source/ui/uno/unoadmin.cxx | 3
embeddedobj/source/commonembedding/miscobj.cxx | 3
embeddedobj/source/general/docholder.cxx | 32 --
embeddedobj/source/inc/docholder.hxx | 5
extensions/source/abpilot/abspilot.cxx | 9
extensions/source/abpilot/fieldmappingimpl.cxx | 24 -
extensions/source/abpilot/fieldmappingimpl.hxx | 11
extensions/source/propctrlr/formcomponenthandler.cxx | 8
extensions/source/propctrlr/propertyhandler.cxx | 4
forms/source/component/Filter.cxx | 19 -
forms/source/component/Filter.hxx | 5
forms/source/richtext/richtextcontrol.cxx | 8
forms/source/richtext/richtextcontrol.hxx | 4
forms/source/runtime/formoperations.cxx | 21 -
forms/source/solar/component/navbarcontrol.cxx | 8
forms/source/solar/component/navbarcontrol.hxx | 3
fpicker/source/office/iodlg.cxx | 4
framework/inc/classes/actiontriggercontainer.hxx | 2
framework/inc/classes/actiontriggerpropertyset.hxx | 3
framework/inc/classes/actiontriggerseparatorpropertyset.hxx | 3
framework/inc/classes/rootactiontriggercontainer.hxx | 2
framework/inc/framework/actiontriggerhelper.hxx | 2
framework/inc/helper/propertysetcontainer.hxx | 6
framework/source/fwe/classes/actiontriggercontainer.cxx | 10
framework/source/fwe/classes/actiontriggerpropertyset.cxx | 2
framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx | 2
framework/source/fwe/classes/rootactiontriggercontainer.cxx | 10
framework/source/fwe/helper/actiontriggerhelper.cxx | 3
framework/source/fwe/helper/propertysetcontainer.cxx | 2
offapi/UnoApi_offapi.mk | 3
offapi/com/sun/star/embed/HatchWindowFactory.idl | 38 ++
offapi/com/sun/star/report/ReportEngine.idl | 37 ++
offapi/com/sun/star/sdb/OrderDialog.idl | 49 +++
offapi/com/sun/star/ucb/AnyCompareFactory.idl | 6
reportdesign/source/core/api/ReportEngineJFree.cxx | 4
reportdesign/source/inc/stringconstants.hrc | 1
reportdesign/source/shared/stringconstants.cxx | 1
reportdesign/source/ui/report/ReportController.cxx | 7
reportdesign/source/ui/report/propbrw.cxx | 6
sfx2/source/dialog/filtergrouping.cxx | 4
sfx2/source/doc/doctempl.cxx | 9
sfx2/source/view/viewsh.cxx | 2
starmath/source/mathmlexport.cxx | 28 -
starmath/source/mathmlexport.hxx | 7
svx/source/fmcomp/fmgridif.cxx | 2
svx/source/form/databaselocationinput.cxx | 4
svx/source/form/fmPropBrw.cxx | 6
svx/source/form/fmcontrollayout.cxx | 4
svx/source/form/fmsrccfg.cxx | 2
svx/source/form/formcontroller.cxx | 5
sw/source/ui/fldui/fldtdlg.cxx | 4
toolkit/inc/toolkit/controls/animatedimages.hxx | 5
toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx | 8
toolkit/inc/toolkit/controls/dialogcontrol.hxx | 16 -
toolkit/inc/toolkit/controls/formattedcontrol.hxx | 4
toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx | 2
toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx | 3
toolkit/inc/toolkit/controls/roadmapcontrol.hxx | 4
toolkit/inc/toolkit/controls/spinningprogress.hxx | 2
toolkit/inc/toolkit/controls/tabpagecontainer.hxx | 4
toolkit/inc/toolkit/controls/tabpagemodel.hxx | 4
toolkit/inc/toolkit/controls/tkscrollbar.hxx | 4
toolkit/inc/toolkit/controls/tksimpleanimation.hxx | 4
toolkit/inc/toolkit/controls/tkspinbutton.hxx | 4
toolkit/inc/toolkit/controls/tkthrobber.hxx | 4
toolkit/inc/toolkit/controls/unocontrol.hxx | 6
toolkit/inc/toolkit/controls/unocontrolbase.hxx | 10
toolkit/inc/toolkit/controls/unocontrolcontainer.hxx | 5
toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx | 2
toolkit/inc/toolkit/controls/unocontrolmodel.hxx | 8
toolkit/inc/toolkit/controls/unocontrols.hxx | 78 ++---
toolkit/source/controls/animatedimages.cxx | 6
toolkit/source/controls/controlmodelcontainerbase.cxx | 94 +++---
toolkit/source/controls/dialogcontrol.cxx | 20 -
toolkit/source/controls/formattedcontrol.cxx | 8
toolkit/source/controls/grid/gridcontrol.cxx | 22 -
toolkit/source/controls/grid/gridcontrol.hxx | 4
toolkit/source/controls/roadmapcontrol.cxx | 6
toolkit/source/controls/spinningprogress.cxx | 4
toolkit/source/controls/tabpagecontainer.cxx | 16 -
toolkit/source/controls/tabpagemodel.cxx | 8
toolkit/source/controls/tkscrollbar.cxx | 6
toolkit/source/controls/tksimpleanimation.cxx | 6
toolkit/source/controls/tkspinbutton.cxx | 6
toolkit/source/controls/tkthrobber.cxx | 6
toolkit/source/controls/tree/treecontrol.cxx | 12
toolkit/source/controls/tree/treecontrol.hxx | 4
toolkit/source/controls/unocontrol.cxx | 24 -
toolkit/source/controls/unocontrolcontainer.cxx | 8
toolkit/source/controls/unocontrolcontainermodel.cxx | 2
toolkit/source/controls/unocontrolmodel.cxx | 8
toolkit/source/controls/unocontrols.cxx | 148 +++++-----
toolkit/source/helper/registerservices.cxx | 135 ++++-----
toolkit/source/helper/vclunohelper.cxx | 5
unotools/inc/unotools/confignode.hxx | 4
unotools/inc/unotools/configvaluecontainer.hxx | 4
unotools/source/config/confignode.cxx | 4
unotools/source/config/configvaluecontainer.cxx | 8
uui/source/iahndl-authentication.cxx | 8
uui/source/iahndl-filter.cxx | 28 -
uui/source/iahndl-ssl.cxx | 28 -
uui/source/iahndl.cxx | 18 -
uui/source/iahndl.hxx | 10
uui/source/interactionhandler.cxx | 13
uui/source/interactionhandler.hxx | 6
uui/source/requeststringresolver.cxx | 10
uui/source/requeststringresolver.hxx | 7
uui/source/sslwarndlg.cxx | 6
uui/source/sslwarndlg.hxx | 8
uui/source/unknownauthdlg.cxx | 6
uui/source/unknownauthdlg.hxx | 8
181 files changed, 912 insertions(+), 860 deletions(-)
New commits:
commit 46fe5e5e06dba9a450f9339b0bf662547a6966e4
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jan 7 11:05:58 2013 +0200
fdo#46808, convert UnoControl and sub-classes to XComponentContext
Change-Id: I4ade267a44620f5a3af8009ac57a2456c62b83bc
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index 2a71d35..7682a61 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -23,6 +23,7 @@
#include "apitools.hxx"
#include <com/sun/star/awt/PosSize.hpp>
#include "dbu_reghelper.hxx"
+#include <comphelper/processfactory.hxx>
extern "C" void SAL_CALL createRegistryInfo_OColumnControl()
{
@@ -38,12 +39,19 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc;
-OColumnControl::OColumnControl(const Reference<XMultiServiceFactory>& _rxFactory)
- :UnoControl( _rxFactory )
+OColumnControl::OColumnControl(const Reference<XComponentContext>& rxContext)
+ :UnoControl(), m_xContext(rxContext)
{
}
// -----------------------------------------------------------------------------
-IMPLEMENT_SERVICE_INFO2_STATIC(OColumnControl,SERVICE_CONTROLDEFAULT.ascii,"com.sun.star.awt.UnoControl","com.sun.star.sdb.ColumnDescriptorControl")
+IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(OColumnControl, SERVICE_CONTROLDEFAULT.ascii)
+IMPLEMENT_SERVICE_INFO_SUPPORTS(OColumnControl)
+IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(OColumnControl, "com.sun.star.awt.UnoControl","com.sun.star.sdb.ColumnDescriptorControl")
+
+Reference< XInterface > SAL_CALL OColumnControl::Create(const Reference< XMultiServiceFactory >& _rxORB)
+{
+ return static_cast< XServiceInfo* >(new OColumnControl(comphelper::getComponentContext(_rxORB)));
+}
// -----------------------------------------------------------------------------
::rtl::OUString OColumnControl::GetComponentServiceName()
{
@@ -65,7 +73,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit
pParentWin = pParent->GetWindow();
}
- OColumnPeer* pPeer = new OColumnPeer( pParentWin, maContext.getUNOContext() );
+ OColumnPeer* pPeer = new OColumnPeer( pParentWin, m_xContext );
OSL_ENSURE(pPeer != NULL, "FmXGridControl::createPeer : imp_CreatePeer didn't return a peer !");
setPeer( pPeer );
diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx
index 374dd0a..02db6c2 100644
--- a/dbaccess/source/ui/uno/ColumnControl.hxx
+++ b/dbaccess/source/ui/uno/ColumnControl.hxx
@@ -26,8 +26,10 @@ namespace dbaui
{
class OColumnControl : public UnoControl
{
+ private:
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xContext;
public:
- OColumnControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory);
+ OColumnControl(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext);
// UnoControl
virtual ::rtl::OUString GetComponentServiceName();
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index b8a1d1f..8a64e8b 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -92,10 +92,11 @@ namespace frm
// OFilterControl
//=====================================================================
//---------------------------------------------------------------------
- OFilterControl::OFilterControl( const Reference< XMultiServiceFactory >& _rxORB )
- :UnoControl( _rxORB )
+ OFilterControl::OFilterControl( const Reference< XComponentContext >& _rxORB )
+ :UnoControl()
,m_aTextListeners( *this )
- ,m_aParser( comphelper::getComponentContext(_rxORB) )
+ ,m_xContext( _rxORB )
+ ,m_aParser( _rxORB )
,m_nControlClass( FormComponentType::TEXTFIELD )
,m_bFilterList( sal_False )
,m_bMultiLine( sal_False )
@@ -122,11 +123,11 @@ namespace frm
{
// we can create one from the connection, if it's an SDB connection
- Reference< XNumberFormatsSupplier > xFormatSupplier = ::dbtools::getNumberFormats( m_xConnection, sal_True, maContext.getUNOContext() );
+ Reference< XNumberFormatsSupplier > xFormatSupplier = ::dbtools::getNumberFormats( m_xConnection, sal_True, m_xContext );
if ( xFormatSupplier.is() )
{
- m_xFormatter.set(NumberFormatter::create(maContext.getUNOContext()), UNO_QUERY_THROW );
+ m_xFormatter.set(NumberFormatter::create(m_xContext), UNO_QUERY_THROW );
m_xFormatter->attachNumberFormatsSupplier( xFormatSupplier );
}
}
@@ -342,7 +343,7 @@ namespace frm
sItemText = itemPos->second;
if ( !sItemText.isEmpty() )
{
- ::dbtools::OPredicateInputController aPredicateInput( maContext.getUNOContext(), m_xConnection, getParseContext() );
+ ::dbtools::OPredicateInputController aPredicateInput( m_xContext, m_xConnection, getParseContext() );
::rtl::OUString sErrorMessage;
OSL_VERIFY( aPredicateInput.normalizePredicateString( sItemText, m_xField, &sErrorMessage ) );
}
@@ -527,7 +528,7 @@ namespace frm
aNewText = aNewText.trim();
if ( !aNewText.isEmpty() )
{
- ::dbtools::OPredicateInputController aPredicateInput( maContext.getUNOContext(), m_xConnection, getParseContext() );
+ ::dbtools::OPredicateInputController aPredicateInput( m_xContext, m_xConnection, getParseContext() );
::rtl::OUString sErrorMessage;
if ( !aPredicateInput.normalizePredicateString( aNewText, m_xField, &sErrorMessage ) )
{
@@ -743,7 +744,7 @@ namespace frm
{
try
{
- Reference< XExecutableDialog > xErrorDialog = ErrorMessageDialog::create( maContext.getUNOContext(), "", m_xMessageParent, makeAny(_rExcept));
+ Reference< XExecutableDialog > xErrorDialog = ErrorMessageDialog::create( m_xContext, "", m_xMessageParent, makeAny(_rExcept));
xErrorDialog->execute();
}
catch( const Exception& )
@@ -897,7 +898,7 @@ namespace frm
//---------------------------------------------------------------------
Reference< XInterface > SAL_CALL OFilterControl::Create( const Reference< XMultiServiceFactory >& _rxFactory )
{
- return static_cast< XServiceInfo* >( new OFilterControl( _rxFactory ) );
+ return static_cast< XServiceInfo* >( new OFilterControl( comphelper::getComponentContext(_rxFactory) ) );
}
//.........................................................................
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index 1c13c10..4387764 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.hxx
@@ -60,6 +60,7 @@ namespace frm
{
TextListenerMultiplexer m_aTextListeners;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xField;
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
@@ -77,12 +78,10 @@ namespace frm
sal_Bool m_bFilterListFilled : 1;
private:
-// OFilterControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);
-
void implInitFilterList();
public:
- OFilterControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB );
+ OFilterControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB );
DECLARE_UNO3_AGG_DEFAULTS(OFilterControl,OWeakAggObject);
::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 288dc5a..730d793 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -94,8 +94,8 @@ namespace frm
//==================================================================
DBG_NAME( ORichTextControl )
//------------------------------------------------------------------
- ORichTextControl::ORichTextControl( const Reference< XMultiServiceFactory >& _rxORB )
- :UnoEditControl( _rxORB )
+ ORichTextControl::ORichTextControl()
+ :UnoEditControl()
{
DBG_CTOR( ORichTextControl, NULL );
}
@@ -294,9 +294,9 @@ namespace frm
}
//------------------------------------------------------------------
- Reference< XInterface > SAL_CALL ORichTextControl::Create( const Reference< XMultiServiceFactory >& _rxFactory )
+ Reference< XInterface > SAL_CALL ORichTextControl::Create( const Reference< XMultiServiceFactory >& )
{
- return *( new ORichTextControl( _rxFactory ) );
+ return *( new ORichTextControl() );
}
//--------------------------------------------------------------------
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index 4260335..365a85f 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -49,9 +49,7 @@ namespace frm
,public ORichTextControl_Base
{
public:
- ORichTextControl(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB
- );
+ ORichTextControl();
protected:
~ORichTextControl();
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 092f885..6f86eee 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -94,8 +94,8 @@ namespace frm
//==================================================================
DBG_NAME( ONavigationBarControl )
//------------------------------------------------------------------
- ONavigationBarControl::ONavigationBarControl( const Reference< XMultiServiceFactory >& _rxORB )
- :UnoControl( _rxORB )
+ ONavigationBarControl::ONavigationBarControl( const Reference< XComponentContext >& _rxORB)
+ :UnoControl(), m_xContext(_rxORB)
{
DBG_CTOR( ONavigationBarControl, NULL );
}
@@ -170,7 +170,7 @@ namespace frm
}
// create the peer
- ONavigationBarPeer* pPeer = ONavigationBarPeer::Create( maContext.getLegacyServiceFactory(), pParentWin, getModel() );
+ ONavigationBarPeer* pPeer = ONavigationBarPeer::Create( Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW), pParentWin, getModel() );
DBG_ASSERT( pPeer, "ONavigationBarControl::createPeer: invalid peer returned!" );
if ( pPeer )
// by definition, the returned component is aquired once
@@ -234,7 +234,7 @@ namespace frm
//------------------------------------------------------------------
Reference< XInterface > SAL_CALL ONavigationBarControl::Create( const Reference< XMultiServiceFactory >& _rxFactory )
{
- return *( new ONavigationBarControl( _rxFactory ) );
+ return *( new ONavigationBarControl( comphelper::getComponentContext(_rxFactory) ) );
}
//------------------------------------------------------------------
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index 4188b3dc..78af8e4 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -46,9 +46,10 @@ namespace frm
:public UnoControl
,public ONavigationBarControl_Base
{
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
public:
ONavigationBarControl(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB
);
protected:
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index a45e6c4..5c5b6cb 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -356,7 +356,7 @@ Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference
DBG_NAME(FmXGridControl )
//------------------------------------------------------------------------------
FmXGridControl::FmXGridControl(const Reference< XMultiServiceFactory >& _rxFactory)
- :UnoControl( _rxFactory)
+ :UnoControl()
,m_aModifyListeners(*this, GetMutex())
,m_aUpdateListeners(*this, GetMutex())
,m_aContainerListeners(*this, GetMutex())
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 0aaa3bf..600c8ff 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -472,8 +472,7 @@ class FmXAutoControl: public UnoControl
friend Reference< XInterface > SAL_CALL FmXAutoControl_NewInstance_Impl();
public:
- FmXAutoControl( const ::comphelper::ComponentContext& i_context )
- :UnoControl( i_context.getLegacyServiceFactory() )
+ FmXAutoControl() :UnoControl()
{
}
@@ -1447,7 +1446,7 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields)
&& ::comphelper::getBOOL( xField->getPropertyValue( FM_PROP_AUTOINCREMENT ) )
)
{
- replaceControl( xControl, new FmXAutoControl( m_aContext ) );
+ replaceControl( xControl, new FmXAutoControl() );
}
}
}
diff --git a/toolkit/inc/toolkit/controls/animatedimages.hxx b/toolkit/inc/toolkit/controls/animatedimages.hxx
index 6faa701..1ae4718 100644
--- a/toolkit/inc/toolkit/controls/animatedimages.hxx
+++ b/toolkit/inc/toolkit/controls/animatedimages.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/awt/XAnimation.hpp>
#include <com/sun/star/awt/XAnimatedImages.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
@@ -48,7 +49,7 @@ namespace toolkit
class AnimatedImagesControl : public AnimatedImagesControl_Base
{
public:
- AnimatedImagesControl( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > const & i_factory );
+ AnimatedImagesControl();
::rtl::OUString GetComponentServiceName();
// XAnimation
@@ -84,7 +85,7 @@ namespace toolkit
class AnimatedImagesControlModel : public AnimatedImagesControlModel_Base
{
public:
- AnimatedImagesControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > const & i_factory );
+ AnimatedImagesControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & i_factory );
AnimatedImagesControlModel( const AnimatedImagesControlModel& i_copySource );
virtual UnoControlModel* Clone() const;
diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
index 3a7e598..84063b7 100644
--- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
@@ -99,7 +99,7 @@ protected:
void updateUserFormChildren( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xAllChildren, const rtl::OUString& aName, ChildOperation Operation, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xTarget ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
public:
- ControlModelContainerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ ControlModelContainerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
ControlModelContainerBase( const ControlModelContainerBase& rModel );
~ControlModelContainerBase();
@@ -218,6 +218,7 @@ class ControlContainerBase : public ContainerControl_IBase
{
::Size ImplGetSizePixel( const ::Size& inSize );
protected:
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
bool mbSizeModified;
bool mbPosModified;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController > mxTabController;
@@ -229,10 +230,13 @@ protected:
void ImplUpdateResourceResolver();
void ImplStartListingForResourceEvents();
+#ifdef _MSC_VER
+ // just implemented to let the various FooImplInheritanceHelper compile
ControlContainerBase();
+#endif
public:
- ControlContainerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ ControlContainerBase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
~ControlContainerBase();
DECLIMPL_SERVICEINFO_DERIVED( ControlContainerBase, UnoControlBase, "toolkit.ControlContainerBase" )
diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
index bd01be3..b9861b5 100644
--- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
@@ -46,7 +46,7 @@ protected:
// ::cppu::OPropertySetHelper
void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception);
public:
- UnoControlDialogModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlDialogModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlDialogModel( const UnoControlDialogModel& rModel );
~UnoControlDialogModel();
@@ -76,7 +76,7 @@ private:
public:
- UnoDialogControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoDialogControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
~UnoDialogControl();
::rtl::OUString GetComponentServiceName();
@@ -125,7 +125,7 @@ protected:
class UnoMultiPageModel : public ControlModelContainerBase
{
public:
- UnoMultiPageModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoMultiPageModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
~UnoMultiPageModel();
UnoMultiPageModel( const UnoMultiPageModel& rModel );
@@ -153,7 +153,7 @@ class UnoMultiPageControl : public ControlContainerBase
TabListenerMultiplexer maTabListeners;
void bindPage( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl );
public:
- UnoMultiPageControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoMultiPageControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
~UnoMultiPageControl();
::rtl::OUString GetComponentServiceName();
@@ -200,7 +200,7 @@ protected:
class UnoPageModel : public ControlModelContainerBase
{
public:
- UnoPageModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoPageModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
~UnoPageModel();
UnoPageModel( const UnoPageModel& rModel );
@@ -222,7 +222,7 @@ protected:
class UnoPageControl : public ControlContainerBase
{
public:
- UnoPageControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoPageControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
~UnoPageControl();
::rtl::OUString GetComponentServiceName();
@@ -234,7 +234,7 @@ public:
class UnoFrameModel : public ControlModelContainerBase
{
public:
- UnoFrameModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoFrameModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
~UnoFrameModel();
UnoFrameModel( const UnoFrameModel& rModel );
@@ -255,7 +255,7 @@ class UnoFrameControl : public ControlContainerBase
protected:
virtual void ImplSetPosSize( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& rxCtrl );
public:
- UnoFrameControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoFrameControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
~UnoFrameControl();
::rtl::OUString GetComponentServiceName();
diff --git a/toolkit/inc/toolkit/controls/formattedcontrol.hxx b/toolkit/inc/toolkit/controls/formattedcontrol.hxx
index fec447e..53a6230 100644
--- a/toolkit/inc/toolkit/controls/formattedcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/formattedcontrol.hxx
@@ -59,7 +59,7 @@ namespace toolkit
) throw (::com::sun::star::uno::Exception);
public:
- UnoControlFormattedFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlFormattedFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlFormattedFieldModel( const UnoControlFormattedFieldModel& rModel )
:UnoControlModel( rModel )
{
@@ -105,7 +105,7 @@ namespace toolkit
class UnoFormattedFieldControl : public UnoSpinFieldControl
{
public:
- UnoFormattedFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoFormattedFieldControl();
::rtl::OUString GetComponentServiceName();
// ::com::sun::star::awt::XTextListener
diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx
index 206bdc0..9470177 100644
--- a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx
+++ b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx
@@ -183,7 +183,7 @@ namespace com { namespace sun { namespace star {
,public ::comphelper::OAggregationArrayUsageHelper< OTemplateInstanceDisambiguation< CONTROLMODEL > >
{
public:
- OGeometryControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ OGeometryControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory );
private:
OGeometryControlModel(::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance);
diff --git a/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx b/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
index 285aa73..658c741 100644
--- a/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
+++ b/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
@@ -24,7 +24,7 @@
//====================================================================
//--------------------------------------------------------------------
template <class CONTROLMODEL>
-OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+OGeometryControlModel<CONTROLMODEL>::OGeometryControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory )
:OGeometryControlModel_Base(new CONTROLMODEL( i_factory ) )
{
}
@@ -79,5 +79,4 @@ OGeometryControlModel_Base* OGeometryControlModel<CONTROLMODEL>::createClone_Imp
return new OGeometryControlModel<CONTROLMODEL>(_rxAggregateInstance);
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx
index abafbae..ca55be0 100644
--- a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx
@@ -102,7 +102,7 @@ namespace toolkit
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlRoadmapModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlRoadmapModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory );
UnoControlRoadmapModel( const UnoControlRoadmapModel& rModel ) :
UnoControlRoadmapModel_Base( rModel ),
UnoControlRoadmapModel_IBase( rModel ),
@@ -159,7 +159,7 @@ namespace toolkit
private:
ItemListenerMultiplexer maItemListeners;
public:
- UnoRoadmapControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoRoadmapControl();
::rtl::OUString GetComponentServiceName();
void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) { UnoControlBase::disposing( Source ); }
diff --git a/toolkit/inc/toolkit/controls/spinningprogress.hxx b/toolkit/inc/toolkit/controls/spinningprogress.hxx
index e991488..7db4798 100644
--- a/toolkit/inc/toolkit/controls/spinningprogress.hxx
+++ b/toolkit/inc/toolkit/controls/spinningprogress.hxx
@@ -34,7 +34,7 @@ namespace toolkit
class SpinningProgressControlModel : public SpinningProgressControlModel_Base
{
public:
- SpinningProgressControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > const & i_factory );
+ SpinningProgressControlModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & i_factory );
SpinningProgressControlModel( const SpinningProgressControlModel& i_copySource );
virtual UnoControlModel* Clone() const;
diff --git a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx b/toolkit/inc/toolkit/controls/tabpagecontainer.hxx
index a713d3e..6664182 100644
--- a/toolkit/inc/toolkit/controls/tabpagecontainer.hxx
+++ b/toolkit/inc/toolkit/controls/tabpagecontainer.hxx
@@ -58,7 +58,7 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
public:
- UnoControlTabPageContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlTabPageContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory );
UnoControlTabPageContainerModel( const UnoControlTabPageContainerModel& rModel ) : UnoControlTabPageContainerModel_Base( rModel ),maContainerListeners( *this ) {;}
UnoControlModel* Clone() const { return new UnoControlTabPageContainerModel( *this ); }
@@ -106,7 +106,7 @@ typedef ::cppu::AggImplInheritanceHelper1 < ControlContainerBase
class UnoControlTabPageContainer : public UnoControlTabPageContainer_Base
{
public:
- UnoControlTabPageContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlTabPageContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
::rtl::OUString GetComponentServiceName();
// ::com::sun::star::lang::XComponent
diff --git a/toolkit/inc/toolkit/controls/tabpagemodel.hxx b/toolkit/inc/toolkit/controls/tabpagemodel.hxx
index 045f0c9..73cd566 100644
--- a/toolkit/inc/toolkit/controls/tabpagemodel.hxx
+++ b/toolkit/inc/toolkit/controls/tabpagemodel.hxx
@@ -38,7 +38,7 @@ protected:
::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const;
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlTabPageModel( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > const & i_factory);
+ UnoControlTabPageModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & i_factory);
// ::com::sun::star::io::XPersistObject
::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException);
@@ -67,7 +67,7 @@ private:
bool m_bWindowListener;
public:
- UnoControlTabPage( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlTabPage( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
~UnoControlTabPage();
::rtl::OUString GetComponentServiceName();
diff --git a/toolkit/inc/toolkit/controls/tkscrollbar.hxx b/toolkit/inc/toolkit/controls/tkscrollbar.hxx
index 5bc5b2c..3ed68ff 100644
--- a/toolkit/inc/toolkit/controls/tkscrollbar.hxx
+++ b/toolkit/inc/toolkit/controls/tkscrollbar.hxx
@@ -42,7 +42,7 @@ namespace toolkit
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlScrollBarModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlScrollBarModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory );
UnoControlScrollBarModel( const UnoControlScrollBarModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlScrollBarModel( *this ); }
@@ -68,7 +68,7 @@ namespace toolkit
AdjustmentListenerMultiplexer maAdjustmentListeners;
public:
- UnoScrollBarControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoScrollBarControl();
::rtl::OUString GetComponentServiceName();
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); }
diff --git a/toolkit/inc/toolkit/controls/tksimpleanimation.hxx b/toolkit/inc/toolkit/controls/tksimpleanimation.hxx
index 95b847c..368922e 100644
--- a/toolkit/inc/toolkit/controls/tksimpleanimation.hxx
+++ b/toolkit/inc/toolkit/controls/tksimpleanimation.hxx
@@ -43,7 +43,7 @@ namespace toolkit
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoSimpleAnimationControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoSimpleAnimationControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory );
UnoSimpleAnimationControlModel( const UnoSimpleAnimationControlModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoSimpleAnimationControlModel( *this ); }
@@ -72,7 +72,7 @@ namespace toolkit
private:
public:
- UnoSimpleAnimationControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoSimpleAnimationControl();
::rtl::OUString GetComponentServiceName();
// XSimpleAnimation
diff --git a/toolkit/inc/toolkit/controls/tkspinbutton.hxx b/toolkit/inc/toolkit/controls/tkspinbutton.hxx
index 5b418e7..44da1f7 100644
--- a/toolkit/inc/toolkit/controls/tkspinbutton.hxx
+++ b/toolkit/inc/toolkit/controls/tkspinbutton.hxx
@@ -43,7 +43,7 @@ namespace toolkit
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoSpinButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoSpinButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory );
UnoSpinButtonModel( const UnoSpinButtonModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoSpinButtonModel( *this ); }
@@ -74,7 +74,7 @@ namespace toolkit
AdjustmentListenerMultiplexer maAdjustmentListeners;
public:
- UnoSpinButtonControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoSpinButtonControl();
::rtl::OUString GetComponentServiceName();
DECLARE_UNO3_AGG_DEFAULTS( UnoSpinButtonControl, UnoControlBase );
diff --git a/toolkit/inc/toolkit/controls/tkthrobber.hxx b/toolkit/inc/toolkit/controls/tkthrobber.hxx
index 5113610..379e3b4 100644
--- a/toolkit/inc/toolkit/controls/tkthrobber.hxx
+++ b/toolkit/inc/toolkit/controls/tkthrobber.hxx
@@ -43,7 +43,7 @@ namespace toolkit
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoThrobberControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoThrobberControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory );
UnoThrobberControlModel( const UnoThrobberControlModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoThrobberControlModel( *this ); }
@@ -72,7 +72,7 @@ namespace toolkit
private:
public:
- UnoThrobberControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoThrobberControl();
::rtl::OUString GetComponentServiceName();
DECLARE_UNO3_AGG_DEFAULTS( UnoThrobberControl, UnoControlBase );
diff --git a/toolkit/inc/toolkit/controls/unocontrol.hxx b/toolkit/inc/toolkit/controls/unocontrol.hxx
index a2470f6..fae1c00 100644
--- a/toolkit/inc/toolkit/controls/unocontrol.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrol.hxx
@@ -86,7 +86,6 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer > mxVclWindowPeer; // just to avoid the query_interface thing
protected:
- const ::comphelper::ComponentContext maContext;
EventListenerMultiplexer maDisposeListeners;
WindowListenerMultiplexer maWindowListeners;
FocusListenerMultiplexer maFocusListeners;
@@ -136,11 +135,8 @@ protected:
virtual sal_Bool requiresNewPeer( const ::rtl::OUString& _rPropertyName ) const;
-protected:
- UnoControl();
-
public:
- UnoControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControl();
~UnoControl();
UnoControlComponentInfos& GetComponentInfos() { return maComponentInfos; }
diff --git a/toolkit/inc/toolkit/controls/unocontrolbase.hxx b/toolkit/inc/toolkit/controls/unocontrolbase.hxx
index 1b45648..bf539ed 100644
--- a/toolkit/inc/toolkit/controls/unocontrolbase.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolbase.hxx
@@ -31,15 +31,7 @@
class TOOLKIT_DLLPUBLIC UnoControlBase : public UnoControl
{
protected:
- UnoControlBase() //do not use! needed by MSVC at compile time to satisfy AggImplInheritanceHelper5
- {
- assert(false);
- }
-protected:
- UnoControlBase( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
- :UnoControl( i_factory )
- {
- }
+ UnoControlBase() :UnoControl() {}
sal_Bool ImplHasProperty( sal_uInt16 nProp );
sal_Bool ImplHasProperty( const ::rtl::OUString& aPropertyName );
diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
index e8763ca..ac62181 100644
--- a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
@@ -56,9 +56,8 @@ protected:
void ImplActivateTabControllers();
public:
- UnoControlContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
- UnoControlContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory,
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xPeer );
+ UnoControlContainer();
+ UnoControlContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xPeer );
~UnoControlContainer();
diff --git a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
index f15a049..b8f8bd2 100644
--- a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
@@ -37,7 +37,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlContainerModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory );
UnoControlContainerModel( const UnoControlContainerModel& rModel ) : UnoControlModel( rModel ) {}
UnoControlModel* Clone() const { return new UnoControlContainerModel( *this ); }
diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
index 416b728..19777a9 100644
--- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
@@ -67,7 +67,7 @@ private:
EventListenerMultiplexer maDisposeListeners;
protected:
- const ::comphelper::ComponentContext maContext;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
protected:
void ImplRegisterProperty( sal_uInt16 nPropType );
@@ -100,18 +100,20 @@ protected:
) const;
protected:
+#ifdef _MSC_VER
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 >() )
+ , maContext( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() )
{
assert(false);
}
+#endif
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::uno::XComponentContext >& rxContext );
UnoControlModel( const UnoControlModel& rModel );
virtual UnoControlModel* Clone() const = 0;
diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx
index cb5256f..08eb00c 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx
@@ -86,7 +86,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlEditModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlEditModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlEditModel( const UnoControlEditModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlEditModel( *this ); }
@@ -128,7 +128,7 @@ private:
public:
- UnoEditControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoEditControl();
::rtl::OUString GetComponentServiceName();
TextListenerMultiplexer& GetTextListeners() { return maTextListeners; }
@@ -190,7 +190,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlFileControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlFileControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlFileControlModel( const UnoControlFileControlModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlFileControlModel( *this ); }
@@ -211,7 +211,7 @@ public:
class UnoFileControl : public UnoEditControl
{
public:
- UnoFileControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoFileControl();
::rtl::OUString GetComponentServiceName();
// ::com::sun::star::lang::XServiceInfo
@@ -230,8 +230,8 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj;
protected:
- GraphicControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
- :UnoControlModel( i_factory )
+ GraphicControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
+ :UnoControlModel( rxContext )
,mbAdjustingImagePosition( false )
,mbAdjustingGraphic( false )
{
@@ -258,7 +258,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlButtonModel( const UnoControlButtonModel& rModel ) : GraphicControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlButtonModel( *this ); }
@@ -291,7 +291,7 @@ private:
public:
- UnoButtonControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoButtonControl();
::rtl::OUString GetComponentServiceName();
void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
@@ -336,7 +336,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlImageControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlImageControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlImageControlModel( const UnoControlImageControlModel& rModel ) : GraphicControlModel( rModel ), mbAdjustingImageScaleMode( false ) { }
UnoControlModel* Clone() const { return new UnoControlImageControlModel( *this ); }
@@ -368,7 +368,7 @@ private:
public:
- UnoImageControlControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoImageControlControl();
::rtl::OUString GetComponentServiceName();
void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException);
@@ -396,7 +396,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlRadioButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlRadioButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlRadioButtonModel( const UnoControlRadioButtonModel& rModel ) : GraphicControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlRadioButtonModel( *this ); }
@@ -430,7 +430,7 @@ private:
public:
- UnoRadioButtonControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoRadioButtonControl();
::rtl::OUString GetComponentServiceName();
void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
@@ -475,7 +475,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlCheckBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlCheckBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlCheckBoxModel( const UnoControlCheckBoxModel& rModel ) : GraphicControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlCheckBoxModel( *this ); }
@@ -508,7 +508,7 @@ private:
public:
- UnoCheckBoxControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoCheckBoxControl();
~UnoCheckBoxControl(){;}
::rtl::OUString GetComponentServiceName();
@@ -556,7 +556,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlFixedHyperlinkModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlFixedHyperlinkModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlFixedHyperlinkModel( const UnoControlFixedHyperlinkModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlFixedHyperlinkModel( *this ); }
@@ -582,7 +582,7 @@ private:
ActionListenerMultiplexer maActionListeners;
public:
- UnoFixedHyperlinkControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoFixedHyperlinkControl();
::rtl::OUString GetComponentServiceName();
@@ -630,7 +630,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlFixedTextModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlFixedTextModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlFixedTextModel( const UnoControlFixedTextModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlFixedTextModel( *this ); }
@@ -654,7 +654,7 @@ class UnoFixedTextControl : public UnoControlBase,
public ::com::sun::star::awt::XLayoutConstrains
{
public:
- UnoFixedTextControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoFixedTextControl();
::rtl::OUString GetComponentServiceName();
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); }
@@ -695,7 +695,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlGroupBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlGroupBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlGroupBoxModel( const UnoControlGroupBoxModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlGroupBoxModel( *this ); }
@@ -717,7 +717,7 @@ public:
class UnoGroupBoxControl : public UnoControlBase
{
public:
- UnoGroupBoxControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoGroupBoxControl();
::rtl::OUString GetComponentServiceName();
sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException);
@@ -745,7 +745,7 @@ protected:
public:
UnoControlListBoxModel(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
ConstructorMode const i_mode = ConstructDefault
);
UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource );
@@ -844,7 +844,7 @@ typedef ::cppu::AggImplInheritanceHelper5 < UnoControlBase
class TOOLKIT_DLLPUBLIC UnoListBoxControl : public UnoListBoxControl_Base
{
public:
- UnoListBoxControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoListBoxControl();
::rtl::OUString GetComponentServiceName();
void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
@@ -921,7 +921,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlComboBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlComboBoxModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlComboBoxModel( const UnoControlComboBoxModel& rModel ) : UnoControlListBoxModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlComboBoxModel( *this ); }
@@ -954,7 +954,7 @@ private:
public:
- UnoComboBoxControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoComboBoxControl();
::rtl::OUString GetComponentServiceName();
void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& Toolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent ) throw(::com::sun::star::uno::RuntimeException);
@@ -1020,7 +1020,7 @@ private:
sal_Bool mbRepeat;
public:
- UnoSpinFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoSpinFieldControl();
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoEditControl::queryInterface(rType); }
::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
@@ -1058,7 +1058,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlDateFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlDateFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlDateFieldModel( const UnoControlDateFieldModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlDateFieldModel( *this ); }
@@ -1085,7 +1085,7 @@ private:
sal_Int32 mnLast;
sal_Bool mbLongFormat;
public:
- UnoDateFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoDateFieldControl();
::rtl::OUString GetComponentServiceName();
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
@@ -1134,7 +1134,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlTimeFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlTimeFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlTimeFieldModel( const UnoControlTimeFieldModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlTimeFieldModel( *this ); }
@@ -1161,7 +1161,7 @@ private:
sal_Int32 mnLast;
public:
- UnoTimeFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoTimeFieldControl();
::rtl::OUString GetComponentServiceName();
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
@@ -1209,7 +1209,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlNumericFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlNumericFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlNumericFieldModel( const UnoControlNumericFieldModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlNumericFieldModel( *this ); }
@@ -1236,7 +1236,7 @@ private:
double mnLast;
public:
- UnoNumericFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoNumericFieldControl();
::rtl::OUString GetComponentServiceName();
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
@@ -1286,7 +1286,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlCurrencyFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlCurrencyFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlCurrencyFieldModel( const UnoControlCurrencyFieldModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlCurrencyFieldModel( *this ); }
@@ -1313,7 +1313,7 @@ private:
double mnLast;
public:
- UnoCurrencyFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoCurrencyFieldControl();
::rtl::OUString GetComponentServiceName();
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
@@ -1362,7 +1362,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlPatternFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlPatternFieldModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlPatternFieldModel( const UnoControlPatternFieldModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlPatternFieldModel( *this ); }
@@ -1388,7 +1388,7 @@ protected:
void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal );
public:
- UnoPatternFieldControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoPatternFieldControl();
::rtl::OUString GetComponentServiceName();
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoSpinFieldControl::queryInterface(rType); }
@@ -1423,7 +1423,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlProgressBarModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlProgressBarModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlProgressBarModel( const UnoControlProgressBarModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlProgressBarModel( *this ); }
@@ -1445,7 +1445,7 @@ class UnoProgressBarControl : public UnoControlBase,
public ::com::sun::star::awt::XProgressBar
{
public:
- UnoProgressBarControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoProgressBarControl();
::rtl::OUString GetComponentServiceName();
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { return UnoControlBase::queryInterface(rType); }
@@ -1479,7 +1479,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoControlFixedLineModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoControlFixedLineModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
UnoControlFixedLineModel( const UnoControlFixedLineModel& rModel ) : UnoControlModel( rModel ) {;}
UnoControlModel* Clone() const { return new UnoControlFixedLineModel( *this ); }
@@ -1501,7 +1501,7 @@ public:
class UnoFixedLineControl : public UnoControlBase
{
public:
- UnoFixedLineControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoFixedLineControl();
::rtl::OUString GetComponentServiceName();
sal_Bool SAL_CALL isTransparent( ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index cbab233..18231f4 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -66,8 +66,8 @@ namespace toolkit
//= AnimatedImagesControl
//==================================================================================================================
//------------------------------------------------------------------------------------------------------------------
- AnimatedImagesControl::AnimatedImagesControl( Reference< XMultiServiceFactory > const & i_factory )
- :AnimatedImagesControl_Base( i_factory )
+ AnimatedImagesControl::AnimatedImagesControl()
+ :AnimatedImagesControl_Base()
{
}
@@ -229,7 +229,7 @@ namespace toolkit
//= AnimatedImagesControlModel
//==================================================================================================================
//------------------------------------------------------------------------------------------------------------------
- AnimatedImagesControlModel::AnimatedImagesControlModel( Reference< XMultiServiceFactory > const & i_factory )
+ AnimatedImagesControlModel::AnimatedImagesControlModel( Reference< com::sun::star::uno::XComponentContext > const & i_factory )
:AnimatedImagesControlModel_Base( i_factory )
,m_pData( new AnimatedImagesControlModel_Data )
{
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index cfa436e..2a9cbf8 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -212,8 +212,8 @@ static const ::rtl::OUString& getStepPropertyName( )
// ----------------------------------------------------
// class ControlModelContainerBase
// ----------------------------------------------------
-ControlModelContainerBase::ControlModelContainerBase( const Reference< XMultiServiceFactory >& i_factory )
- :ControlModelContainer_IBase( i_factory )
+ControlModelContainerBase::ControlModelContainerBase( const Reference< XComponentContext >& rxContext )
+ :ControlModelContainer_IBase( rxContext )
,maContainerListeners( *this )
,maChangeListeners ( GetMutex() )
,mbGroupsUpToDate( sal_False )
@@ -332,83 +332,79 @@ Reference< XInterface > ControlModelContainerBase::createInstance( const ::rtl::
OGeometryControlModel_Base* pNewModel = NULL;
- const Reference< XMultiServiceFactory > xFactory( maContext.getLegacyServiceFactory() );
if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlEditModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlEditModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlEditModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlFormattedFieldModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlFormattedFieldModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlFormattedFieldModel >( m_xContext);
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlFileControlModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlFileControlModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlFileControlModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlButtonModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlButtonModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlButtonModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlImageControlModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlImageControlModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlImageControlModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlRadioButtonModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlRadioButtonModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlRadioButtonModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlCheckBoxModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlCheckBoxModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlCheckBoxModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoControlFixedHyperlinkModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlFixedHyperlinkModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlFixedHyperlinkModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoControlFixedTextModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlFixedTextModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlFixedTextModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlGroupBoxModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlGroupBoxModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlGroupBoxModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlListBoxModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlListBoxModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlListBoxModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlComboBoxModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlComboBoxModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlComboBoxModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlDateFieldModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlDateFieldModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlDateFieldModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlTimeFieldModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlTimeFieldModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlTimeFieldModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlNumericFieldModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlNumericFieldModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlNumericFieldModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlCurrencyFieldModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlCurrencyFieldModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlCurrencyFieldModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlPatternFieldModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlPatternFieldModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlPatternFieldModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlProgressBarModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlProgressBarModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlProgressBarModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlScrollBarModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlScrollBarModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlScrollBarModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlFixedLineModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlFixedLineModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlFixedLineModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName2_UnoControlRoadmapModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlRoadmapModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlRoadmapModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName_TreeControlModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoTreeModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoTreeModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName_GridControlModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoGridModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoGridModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoControlTabPageContainerModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlTabPageContainerModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlTabPageContainerModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoMultiPageModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoMultiPageModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoMultiPageModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoControlTabPageModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoControlTabPageModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoControlTabPageModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoPageModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoPageModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoPageModel >( m_xContext );
else if ( aServiceSpecifier.compareToAscii( szServiceName_UnoFrameModel ) == 0 )
- pNewModel = new OGeometryControlModel< UnoFrameModel >( xFactory );
+ pNewModel = new OGeometryControlModel< UnoFrameModel >( m_xContext );
if ( !pNewModel )
{
- if ( xFactory.is() )
+ Reference< XInterface > xObject = m_xContext->getServiceManager()->createInstanceWithContext(aServiceSpecifier, m_xContext);
+ Reference< XServiceInfo > xSI( xObject, UNO_QUERY );
+ Reference< XCloneable > xCloneAccess( xSI, UNO_QUERY );
+ Reference< XAggregation > xAgg( xCloneAccess, UNO_QUERY );
+ if ( xAgg.is() )
{
- Reference< XInterface > xObject = xFactory->createInstance( aServiceSpecifier );
- Reference< XServiceInfo > xSI( xObject, UNO_QUERY );
- Reference< XCloneable > xCloneAccess( xSI, UNO_QUERY );
- Reference< XAggregation > xAgg( xCloneAccess, UNO_QUERY );
- if ( xAgg.is() )
+ if ( xSI->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel"))) )
{
- if ( xSI->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlModel"))) )
- {
- // release 3 of the 4 references we have to the object
- xAgg.clear();
- xSI.clear();
- xObject.clear();
+ // release 3 of the 4 references we have to the object
+ xAgg.clear();
+ xSI.clear();
+ xObject.clear();
- pNewModel = new OCommonGeometryControlModel( xCloneAccess, aServiceSpecifier );
- }
+ pNewModel = new OCommonGeometryControlModel( xCloneAccess, aServiceSpecifier );
}
}
}
@@ -1358,8 +1354,9 @@ throw ( RuntimeException )
// ----------------------------------------------------
// class DialogContainerControl
// ----------------------------------------------------
-ControlContainerBase::ControlContainerBase( const Reference< XMultiServiceFactory >& i_factory )
- :ContainerControl_IBase( i_factory )
+ControlContainerBase::ControlContainerBase( const Reference< XComponentContext >& rxContext )
+ :ContainerControl_IBase()
+ ,m_xContext(rxContext)
,mbSizeModified(false)
,mbPosModified(false)
{
@@ -1385,8 +1382,7 @@ void ControlContainerBase::ImplInsertControl( Reference< XControlModel >& rxMode
::rtl::OUString aDefCtrl;
xP->getPropertyValue( GetPropertyName( BASEPROPERTY_DEFAULTCONTROL ) ) >>= aDefCtrl;
- Reference < XControl > xCtrl;
- maContext.createComponent( aDefCtrl, xCtrl );
+ Reference < XControl > xCtrl( m_xContext->getServiceManager()->createInstanceWithContext(aDefCtrl, m_xContext), UNO_QUERY );
DBG_ASSERT( xCtrl.is(), "ControlContainerBase::ImplInsertControl: could not create the control!" );
if ( xCtrl.is() )
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 1d711d3..7ad8b7e 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -146,8 +146,8 @@ public:
// ----------------------------------------------------
// class UnoControlDialogModel
// ----------------------------------------------------
-UnoControlDialogModel::UnoControlDialogModel( const Reference< XMultiServiceFactory >& i_factory )
- :ControlModelContainerBase( i_factory )
+UnoControlDialogModel::UnoControlDialogModel( const Reference< XComponentContext >& rxContext )
+ :ControlModelContainerBase( rxContext )
{
ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
// ImplRegisterProperty( BASEPROPERTY_BORDER );
@@ -279,8 +279,8 @@ void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32
// = class UnoDialogControl
// ============================================================================
-UnoDialogControl::UnoDialogControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
- :UnoDialogControl_Base( i_factory )
+UnoDialogControl::UnoDialogControl( const uno::Reference< uno::XComponentContext >& rxContext )
+ :UnoDialogControl_Base( rxContext )
,maTopWindowListeners( *this )
,mbWindowListener(false)
{
@@ -626,7 +626,7 @@ void UnoDialogControl::ImplModelPropertiesChanged( const Sequence< PropertyChang
// ----------------------------------------------------
// class MultiPageControl
// ----------------------------------------------------
-UnoMultiPageControl::UnoMultiPageControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory) : ControlContainerBase( i_factory ), maTabListeners( *this )
+UnoMultiPageControl::UnoMultiPageControl( const uno::Reference< uno::XComponentContext >& rxContext ) : ControlContainerBase(rxContext), maTabListeners( *this )
{
maComponentInfos.nWidth = 280;
maComponentInfos.nHeight = 400;
@@ -825,7 +825,7 @@ void UnoMultiPageControl::impl_createControlPeerIfNecessary( const uno::Refer
// ------------- UnoMultiPageModel -----------------
-UnoMultiPageModel::UnoMultiPageModel( const Reference< XMultiServiceFactory >& i_factory ) : ControlModelContainerBase( i_factory )
+UnoMultiPageModel::UnoMultiPageModel( const Reference< XComponentContext >& rxContext ) : ControlModelContainerBase( rxContext )
{
ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
@@ -929,7 +929,7 @@ sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl( ) throw (RuntimeException
// ----------------------------------------------------
// class UnoPageControl
// ----------------------------------------------------
-UnoPageControl::UnoPageControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory ) : ControlContainerBase( i_factory )
+UnoPageControl::UnoPageControl( const uno::Reference< uno::XComponentContext >& rxContext ) : ControlContainerBase(rxContext)
{
maComponentInfos.nWidth = 280;
maComponentInfos.nHeight = 400;
@@ -947,7 +947,7 @@ UnoPageControl::~UnoPageControl()
// ------------- UnoPageModel -----------------
-UnoPageModel::UnoPageModel( const Reference< XMultiServiceFactory >& i_factory ) : ControlModelContainerBase( i_factory )
+UnoPageModel::UnoPageModel( const Reference< XComponentContext >& rxContext ) : ControlModelContainerBase( rxContext )
{
ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
@@ -1036,7 +1036,7 @@ sal_Bool SAL_CALL UnoPageModel::getGroupControl( ) throw (RuntimeException)
// ----------------------------------------------------
// class UnoFrameControl
// ----------------------------------------------------
-UnoFrameControl::UnoFrameControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory ) : ControlContainerBase( i_factory )
+UnoFrameControl::UnoFrameControl( const uno::Reference< uno::XComponentContext >& rxContext ) : ControlContainerBase(rxContext)
{
maComponentInfos.nWidth = 280;
maComponentInfos.nHeight = 400;
@@ -1112,7 +1112,7 @@ void UnoFrameControl::ImplSetPosSize( Reference< XControl >& rxCtrl )
// ------------- UnoFrameModel -----------------
-UnoFrameModel::UnoFrameModel( const Reference< XMultiServiceFactory >& i_factory ) : ControlModelContainerBase( i_factory )
+UnoFrameModel::UnoFrameModel( const Reference< XComponentContext >& rxContext ) : ControlModelContainerBase( rxContext )
{
ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index 79e905b..bb7bd38 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -112,8 +112,8 @@ namespace toolkit
// = UnoControlFormattedFieldModel
// ===================================================================
// -------------------------------------------------------------------
- UnoControlFormattedFieldModel::UnoControlFormattedFieldModel( const Reference< XMultiServiceFactory >& i_factory )
- :UnoControlModel( i_factory )
+ UnoControlFormattedFieldModel::UnoControlFormattedFieldModel( const Reference< XComponentContext >& rxContext )
+ :UnoControlModel( rxContext )
,m_bRevokedAsClient( false )
,m_bSettingValueAndText( false )
{
@@ -421,8 +421,8 @@ namespace toolkit
// = UnoFormattedFieldControl
// ===================================================================
// -------------------------------------------------------------------
- UnoFormattedFieldControl::UnoFormattedFieldControl( const Reference< XMultiServiceFactory >& i_factory )
- :UnoSpinFieldControl( i_factory )
+ UnoFormattedFieldControl::UnoFormattedFieldControl()
+ :UnoSpinFieldControl()
{
}
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 94f1d9e..22bc2d7 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -68,8 +68,8 @@ namespace
}
//----------------------------------------------------------------------------------------------------------------------
-UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
- :UnoControlModel( i_factory )
+UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
+ :UnoControlModel( rxContext )
{
ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
ImplRegisterProperty( BASEPROPERTY_BORDER );
@@ -89,8 +89,8 @@ UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::
ImplRegisterProperty( BASEPROPERTY_GRID_SHOWCOLUMNHEADER );
ImplRegisterProperty( BASEPROPERTY_COLUMN_HEADER_HEIGHT );
ImplRegisterProperty( BASEPROPERTY_ROW_HEIGHT );
- ImplRegisterProperty( BASEPROPERTY_GRID_DATAMODEL, makeAny( lcl_getDefaultDataModel_throw( maContext ) ) );
- ImplRegisterProperty( BASEPROPERTY_GRID_COLUMNMODEL, makeAny( lcl_getDefaultColumnModel_throw( maContext ) ) );
+ ImplRegisterProperty( BASEPROPERTY_GRID_DATAMODEL, makeAny( lcl_getDefaultDataModel_throw( m_xContext ) ) );
+ ImplRegisterProperty( BASEPROPERTY_GRID_COLUMNMODEL, makeAny( lcl_getDefaultColumnModel_throw( m_xContext ) ) );
ImplRegisterProperty( BASEPROPERTY_GRID_SELECTIONMODE );
ImplRegisterProperty( BASEPROPERTY_FONTRELIEF );
ImplRegisterProperty( BASEPROPERTY_FONTEMPHASISMARK );
@@ -128,7 +128,7 @@ UnoGridModel::UnoGridModel( const UnoGridModel& rModel )
DBG_UNHANDLED_EXCEPTION();
}
if ( !xDataModel.is() )
- xDataModel = lcl_getDefaultDataModel_throw( maContext );
+ xDataModel = lcl_getDefaultDataModel_throw( m_xContext );
UnoControlModel::setFastPropertyValue_NoBroadcast( BASEPROPERTY_GRID_DATAMODEL, makeAny( xDataModel ) );
// do *not* use setFastPropertyValue here: The UnoControlModel ctor did a simple copy of all property values,
// so before this call here, we share our data model with the own of the clone source. setFastPropertyValue,
@@ -147,7 +147,7 @@ UnoGridModel::UnoGridModel( const UnoGridModel& rModel )
DBG_UNHANDLED_EXCEPTION();
}
if ( !xColumnModel.is() )
- xColumnModel = lcl_getDefaultColumnModel_throw( maContext );
+ xColumnModel = lcl_getDefaultColumnModel_throw( m_xContext );
UnoControlModel::setFastPropertyValue_NoBroadcast( BASEPROPERTY_GRID_COLUMNMODEL, makeAny( xColumnModel ) );
// same comment as above: do not use our own setPropertyValue here.
}
@@ -270,8 +270,8 @@ Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo( ) throw(Runtime
//======================================================================================================================
//= UnoGridControl
//======================================================================================================================
-UnoGridControl::UnoGridControl( const Reference< XMultiServiceFactory >& i_factory )
- :UnoGridControl_Base( i_factory )
+UnoGridControl::UnoGridControl()
+ :UnoGridControl_Base()
,m_aSelectionListeners( *this )
,m_pEventForwarder( new GridEventForwarder( *this ) )
{
@@ -447,14 +447,14 @@ void SAL_CALL UnoGridControl::removeSelectionListener(const ::com::sun::star::un
}//namespace toolkit
-Reference< XInterface > SAL_CALL GridControl_CreateInstance( const Reference< XMultiServiceFactory >& i_factory )
+Reference< XInterface > SAL_CALL GridControl_CreateInstance( const Reference< XMultiServiceFactory >& )
{
- return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoGridControl( i_factory ) );
+ return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoGridControl() );
}
Reference< XInterface > SAL_CALL GridControlModel_CreateInstance( const Reference< XMultiServiceFactory >& i_factory )
{
- return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoGridModel( i_factory ) );
+ return Reference < XInterface >( ( ::cppu::OWeakObject* ) new ::toolkit::UnoGridModel( comphelper::getComponentContext(i_factory) ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index 383d36e..607d455 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -47,7 +47,7 @@ protected:
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
public:
- UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory );
UnoGridModel( const UnoGridModel& rModel );
UnoControlModel* Clone() const;
@@ -79,7 +79,7 @@ typedef ::cppu::ImplInheritanceHelper2 < UnoControlBase
class UnoGridControl : public UnoGridControl_Base
{
public:
- UnoGridControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory );
+ UnoGridControl();
::rtl::OUString GetComponentServiceName();
// ::com::sun::star::lang::XComponent
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 1afd7c9..04049a0 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -54,7 +54,7 @@ static void lcl_throwIndexOutOfBoundsException( )
// = UnoControlRoadmapModel
// ===================================================================
// -------------------------------------------------------------------
- UnoControlRoadmapModel::UnoControlRoadmapModel( const Reference< XMultiServiceFactory >& i_factory )
+ UnoControlRoadmapModel::UnoControlRoadmapModel( const Reference< XComponentContext >& i_factory )
:UnoControlRoadmapModel_Base( i_factory )
,maContainerListeners( *this )
{
@@ -358,8 +358,8 @@ static void lcl_throwIndexOutOfBoundsException( )
// = UnoRoadmapControl
// ===================================================================
// -------------------------------------------------------------------
- UnoRoadmapControl::UnoRoadmapControl( const Reference< XMultiServiceFactory >& i_factory )
- :UnoControlRoadmap_Base( i_factory )
+ UnoRoadmapControl::UnoRoadmapControl()
+ :UnoControlRoadmap_Base()
,maItemListeners( *this )
{
}
diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx
index 2c4513d..ed57513 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -45,14 +45,14 @@ namespace toolkit
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Type;
using ::com::sun::star::beans::XPropertySetInfo;
- using ::com::sun::star::lang::XMultiServiceFactory;
+ using ::com::sun::star::uno::XComponentContext;
/** === end UNO using === **/
//==================================================================================================================
//= SpinningProgressControlModel
//==================================================================================================================
//------------------------------------------------------------------------------------------------------------------
- SpinningProgressControlModel::SpinningProgressControlModel( Reference< XMultiServiceFactory > const & i_factory )
+ SpinningProgressControlModel::SpinningProgressControlModel( Reference< XComponentContext > const & i_factory )
:SpinningProgressControlModel_Base( i_factory )
{
// default image sets
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index 073dc03..071685c 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -46,7 +46,7 @@ using ::com::sun::star::awt::tab::XTabPageModel;
// ----------------------------------------------------
// class UnoControlTabPageContainerModel
// ----------------------------------------------------
-UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Reference< XMultiServiceFactory >& i_factory )
+UnoControlTabPageContainerModel::UnoControlTabPageContainerModel( const Reference< XComponentContext >& i_factory )
:UnoControlTabPageContainerModel_Base( i_factory )
,maContainerListeners( *this )
{
@@ -97,7 +97,7 @@ Reference< ::com::sun::star::beans::XPropertySetInfo > UnoControlTabPageContaine
namespace
{
- Reference< XTabPageModel > lcl_createTabPageModel( ::comphelper::ComponentContext const & i_context,
+ Reference< XTabPageModel > lcl_createTabPageModel( Reference<XComponentContext> const & i_context,
Sequence< Any > const & i_initArguments, Reference< XPropertySet > const & i_parentModel )
{
try
@@ -108,9 +108,9 @@ namespace
Reference< XInterface > xInstance;
if ( isGeometryControlModel )
- xInstance = *( new OGeometryControlModel< UnoControlTabPageModel >( i_context.getLegacyServiceFactory() ) );
+ xInstance = *( new OGeometryControlModel< UnoControlTabPageModel >( i_context ) );
else
- xInstance = *( new UnoControlTabPageModel( i_context.getLegacyServiceFactory() ) );
+ xInstance = *( new UnoControlTabPageModel( i_context ) );
Reference< XTabPageModel > const xTabPageModel( xInstance, UNO_QUERY_THROW );
Reference< XInitialization > const xInit( xTabPageModel, UNO_QUERY_THROW );
@@ -134,7 +134,7 @@ Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::createTabPa
{
Sequence< Any > aInitArgs(1);
aInitArgs[0] <<= i_tabPageID;
- return lcl_createTabPageModel( maContext, aInitArgs, this );
+ return lcl_createTabPageModel( m_xContext, aInitArgs, this );
}
Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage( ::sal_Int16 i_tabPageID, const ::rtl::OUString& i_resourceURL ) throw (RuntimeException)
@@ -142,7 +142,7 @@ Reference< XTabPageModel > SAL_CALL UnoControlTabPageContainerModel::loadTabPage
Sequence< Any > aInitArgs(2);
aInitArgs[0] <<= i_tabPageID;
aInitArgs[1] <<= i_resourceURL;
- return lcl_createTabPageModel( maContext, aInitArgs, this );
+ return lcl_createTabPageModel( m_xContext, aInitArgs, this );
}
void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex, const com::sun::star::uno::Any& aElement) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException)
@@ -220,8 +220,8 @@ void UnoControlTabPageContainerModel::removeContainerListener( const Reference<
// ----------------------------------------------------
// class UnoControlTabPageContainer
// ----------------------------------------------------
-UnoControlTabPageContainer::UnoControlTabPageContainer( const Reference< XMultiServiceFactory >& i_factory )
- :UnoControlTabPageContainer_Base( i_factory )
+UnoControlTabPageContainer::UnoControlTabPageContainer( const uno::Reference< uno::XComponentContext >& rxContext )
+ :UnoControlTabPageContainer_Base(rxContext)
,m_aTabPageListeners( *this )
{
}
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index fd7703d..78e3a27 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -64,7 +64,7 @@ using namespace ::com::sun::star::util;
// ----------------------------------------------------
// class UnoControlTabPageModel
// ----------------------------------------------------
-UnoControlTabPageModel::UnoControlTabPageModel( Reference< XMultiServiceFactory > const & i_factory )
+UnoControlTabPageModel::UnoControlTabPageModel( Reference< XComponentContext > const & i_factory )
:ControlModelContainerBase( i_factory )
{
ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
@@ -131,7 +131,7 @@ void SAL_CALL UnoControlTabPageModel::initialize (const Sequence<Any>& rArgument
::rtl::OUString sURL;
if ( !( rArguments[ 1 ] >>= sURL ))
throw lang::IllegalArgumentException();
- Reference<container::XNameContainer > xDialogModel = awt::UnoControlDialogModelProvider::create( maContext.getUNOContext(),sURL);
+ Reference<container::XNameContainer > xDialogModel = awt::UnoControlDialogModelProvider::create( m_xContext, sURL );
if ( xDialogModel.is() )
{
Sequence< ::rtl::OUString> aNames = xDialogModel->getElementNames();
@@ -183,8 +183,8 @@ Sequence<rtl::OUString> SAL_CALL UnoControlTabPageModel_getSupportedServiceNames
// = class UnoControlTabPage
// ============================================================================
-UnoControlTabPage::UnoControlTabPage( const Reference< XMultiServiceFactory >& i_factory )
- :UnoControlTabPage_Base( i_factory )
+UnoControlTabPage::UnoControlTabPage( const uno::Reference< uno::XComponentContext >& rxContext )
+ :UnoControlTabPage_Base(rxContext)
,m_bWindowListener(false)
{
maComponentInfos.nWidth = 280;
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index e71a74e..f2293bc 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -36,7 +36,7 @@ namespace toolkit
//= UnoControlScrollBarModel
//====================================================================
//--------------------------------------------------------------------
- UnoControlScrollBarModel::UnoControlScrollBarModel( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
+ UnoControlScrollBarModel::UnoControlScrollBarModel( const uno::Reference< uno::XComponentContext >& i_factory )
:UnoControlModel( i_factory )
{
UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXScrollBar );
@@ -86,8 +86,8 @@ namespace toolkit
//====================================================================
//= UnoControlScrollBarModel
//====================================================================
- UnoScrollBarControl::UnoScrollBarControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
- :UnoControlBase( i_factory )
+ UnoScrollBarControl::UnoScrollBarControl()
+ :UnoControlBase()
,maAdjustmentListeners( *this )
{
}
diff --git a/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx
index 09a7f40..1b893b1 100644
--- a/toolkit/source/controls/tksimpleanimation.cxx
+++ b/toolkit/source/controls/tksimpleanimation.cxx
@@ -33,7 +33,7 @@ namespace toolkit
//= UnoSimpleAnimationControlModel
//====================================================================
//--------------------------------------------------------------------
- UnoSimpleAnimationControlModel::UnoSimpleAnimationControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_factory )
+ UnoSimpleAnimationControlModel::UnoSimpleAnimationControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory )
:UnoControlModel( i_factory )
{
ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
@@ -111,8 +111,8 @@ namespace toolkit
//= UnoSimpleAnimationControl
//====================================================================
//--------------------------------------------------------------------
- UnoSimpleAnimationControl::UnoSimpleAnimationControl( const uno::Reference< lang::XMultiServiceFactory >& i_factory )
- :UnoSimpleAnimationControl_Base( i_factory )
+ UnoSimpleAnimationControl::UnoSimpleAnimationControl()
+ :UnoSimpleAnimationControl_Base()
{
}
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index b86ce17..ef5a966 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -39,7 +39,7 @@ namespace toolkit
//= UnoSpinButtonModel
//====================================================================
//--------------------------------------------------------------------
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list