summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extensions/source/bibliography/datman.cxx6
-rw-r--r--extensions/source/bibliography/datman.hxx6
-rw-r--r--extensions/source/bibliography/framectr.cxx6
-rw-r--r--extensions/source/bibliography/framectr.hxx6
-rw-r--r--extensions/source/bibliography/general.cxx4
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx6
6 files changed, 17 insertions, 17 deletions
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 5a901447865f..fa2b4c094fb3 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -1801,13 +1801,13 @@ void BibDataManager::SetToolbar(BibToolBar* pSet)
/* -----------------------------08.05.2002 09:26------------------------------
---------------------------------------------------------------------------*/
-uno::Reference< form::XFormController > BibDataManager::GetFormController()
+uno::Reference< form::runtime::XFormController > BibDataManager::GetFormController()
{
if(!m_xFormCtrl.is())
{
Reference< lang::XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory();
- m_xFormCtrl = uno::Reference< form::XFormController > (
- xMgr->createInstance(C2U("com.sun.star.form.FormController")), UNO_QUERY);
+ m_xFormCtrl = uno::Reference< form::runtime::XFormController > (
+ xMgr->createInstance(C2U("com.sun.star.form.runtime.FormController")), UNO_QUERY);
m_xFormCtrl->setModel(uno::Reference< awt::XTabControllerModel > (getForm(), UNO_QUERY));
// #100312# -------------
m_xFormDispatch = uno::Reference< frame::XDispatch > ( m_xFormCtrl, UNO_QUERY);
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index 6f5bb6834e5c..17608142b6ab 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -35,7 +35,7 @@
#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
-#include <com/sun/star/form/XFormController.hpp>
+#include <com/sun/star/form/runtime/XFormController.hpp>
#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <com/sun/star/form/XLoadable.hpp>
@@ -98,7 +98,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > m_xGridModel;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSourceProps;
::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xParser;
- ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > m_xFormCtrl;
+ ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > m_xFormCtrl;
// #100312# -------------------
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xFormDispatch;
BibInterceptorHelper* m_pInterceptorHelper;
@@ -191,7 +191,7 @@ public:
const rtl::OUString& GetIdentifierMapping();
void ResetIdentifierMapping() {sIdentifierMapping = rtl::OUString();}
- ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > GetFormController();
+ ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController();
// #100312# ----------
void RegisterInterceptor( ::bib::BibBeamer* pBibBeamer);
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 6f9826153fc8..c1547c952873 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -56,7 +56,7 @@
#endif
#include <comphelper/processfactory.hxx>
#include <com/sun/star/form/XConfirmDeleteListener.hpp>
-#include <com/sun/star/form/XFormController.hpp>
+#include <com/sun/star/form/runtime/XFormController.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
@@ -390,7 +390,7 @@ sal_Bool canInsertRecords(const Reference< beans::XPropertySet>& _rxCursorSet)
/* -----------------------------08.05.2002 08:58------------------------------
---------------------------------------------------------------------------*/
-sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::XFormController>& xController)
+sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::XFormController>& xController)
{
if (!xController.is())
return sal_False;
@@ -598,7 +598,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
}
else if(aCommand.EqualsAscii("Bib/InsertRecord"))
{
- Reference<form::XFormController > xFormCtrl = pDatMan->GetFormController();
+ Reference<form::runtime::XFormController > xFormCtrl = pDatMan->GetFormController();
if(SaveModified(xFormCtrl))
{
try
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index ac7ce58a8f49..c1b1c3f1bcc4 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -44,9 +44,9 @@
class BibDataManager;
class BibFrameCtrl_Impl;
namespace com{namespace sun{namespace star{
- namespace form{
+ namespace form { namespace runtime {
class XFormController;
- }
+ } }
}}}
class BibStatusDispatch
{
@@ -83,7 +83,7 @@ friend class BibFrameCtrl_Impl;
DECL_STATIC_LINK( BibFrameController_Impl, DisposeHdl, void* );
- sal_Bool SaveModified(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController>& xController);
+ sal_Bool SaveModified(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& xController);
public:
BibFrameController_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > & xComponent,
BibDataManager* pDatMan);
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 293c3af7b186..e072279f9656 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -429,7 +429,7 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
uno::Reference< sdbc::XRowSet > xRowSet(pDatMan->getForm(), UNO_QUERY);
if(xRowSet.is())
xRowSet->addRowSetListener(xPosListener);
- uno::Reference< form::XFormController > xFormCtrl = pDatMan->GetFormController();
+ uno::Reference< form::runtime::XFormController > xFormCtrl = pDatMan->GetFormController();
xFormCtrl->setContainer(xCtrlContnr);
xFormCtrl->activateTabOrder();
@@ -466,7 +466,7 @@ BibGeneralPage::~BibGeneralPage()
---------------------------------------------------------------------------*/
void BibGeneralPage::CommitActiveControl()
{
- uno::Reference< form::XFormController > xFormCtrl = pDatMan->GetFormController();
+ uno::Reference< form::runtime::XFormController > xFormCtrl = pDatMan->GetFormController();
uno::Reference< awt::XControl > xCurr = xFormCtrl->getCurrentControl();
if(xCurr.is())
{
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 05d0984349b4..e2d1ff5d308d 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -55,7 +55,7 @@
#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/form/FormComponentType.hpp>
#include <com/sun/star/form/XForm.hpp>
-#include <com/sun/star/form/XFormController.hpp>
+#include <com/sun/star/form/runtime/XFormController.hpp>
#include <com/sun/star/inspection/PropertyControlType.hpp>
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/script/XEventAttacherManager.hpp>
@@ -118,7 +118,7 @@ namespace pcr
using ::com::sun::star::container::XNameContainer;
using ::com::sun::star::awt::XTabControllerModel;
using ::com::sun::star::form::XForm;
- using ::com::sun::star::form::XFormController;
+ using ::com::sun::star::form::runtime::XFormController;
using ::com::sun::star::beans::UnknownPropertyException;
using ::com::sun::star::uno::makeAny;
using ::com::sun::star::container::NoSuchElementException;
@@ -1155,7 +1155,7 @@ namespace pcr
m_aContext.createComponent( (const rtl::OUString&)SERVICE_FORMCONTROLLER ), UNO_QUERY_THROW );
xController->setModel( xComponentAsTCModel );
- xReturn = xController.get();
+ xReturn = xController;
}
else
{
generated by cgit (git 2.34.1) at 2024-08-09 07:36:58 +0000