summaryrefslogtreecommitdiff
path: root/svx/source/inc
diff options
context:
space:
mode:
authorOcke Janssen <oj@openoffice.org>2000-11-15 13:55:12 +0000
committerOcke Janssen <oj@openoffice.org>2000-11-15 13:55:12 +0000
commit5a423d53448edd451a2c1adae386a3ca6a38d47e (patch)
tree401e9985433cf323008730f2c90429c974c31279 /svx/source/inc
parentaa7e43d64acc727c4de30fa4381e396f33a1045c (diff)
enable drag&drop
Diffstat (limited to 'svx/source/inc')
-rw-r--r--svx/source/inc/fmpgeimp.hxx22
-rw-r--r--svx/source/inc/fmvwimp.hxx6
2 files changed, 13 insertions, 15 deletions
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index e792488d9931..c9d7ed343616 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fmpgeimp.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: fs $ $Date: 2000-10-20 14:12:06 $
+ * last change: $Author: oj $ $Date: 2000-11-15 14:55:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,10 +61,9 @@
#ifndef _SVX_FMUNOPGE_HXX
#define _SVX_FMUNOPGE_HXX
-#ifndef _COM_SUN_STAR_SDB_XDATABASEACCESS_HPP_
-#include <com/sun/star/sdb/XDatabaseAccess.hpp>
+#ifndef _COM_SUN_STAR_SDBC_XDATASOURCE_HPP_
+#include <com/sun/star/sdbc/XDataSource.hpp>
#endif
-
#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
#include <com/sun/star/container/XNameAccess.hpp>
#endif
@@ -116,13 +115,10 @@ class FmFormPageImpl
friend class FmFormObj;
friend class FmXFormShell;
- ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> xCurrentForm; // aktuelles Formular
-
+ ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> xCurrentForm; // aktuelles Formular
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer> xForms; // Liste aller Forms
-
- FmFormPage* pPage;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> xModel;
-
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> xModel;
+ FmFormPage* pPage;
UniString m_sPageId;
protected:
@@ -141,7 +137,7 @@ public:
// Defaults fuer ein Object setzen
// Eindeutigen Namen, Zuordnen zu einer Form falls noch nicht erfolgt
::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> SetDefaults(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& rContent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseAccess>& rDatabase = ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseAccess>(),
+ const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>& rDatabase = ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>(),
const ::rtl::OUString& rDBTitle = ::rtl::OUString(),
const ::rtl::OUString& rCursorSource = ::rtl::OUString(),
sal_Int32 nCommandType = 0);
@@ -161,7 +157,7 @@ protected:
void fillList(FmObjectList& rList, const SdrObjList& rObjList, sal_Bool bConnected) const;
::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> FindForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& rForm,
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseAccess>& rDatabase,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>& rDatabase,
const ::rtl::OUString& rCursorSource,
sal_Int32 nCommandType);
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 04d13e8e6a23..1d25ec1c3874 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fmvwimp.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: oj $ $Date: 2000-11-06 07:19:53 $
+ * last change: $Author: oj $ $Date: 2000-11-15 14:55:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -218,6 +218,8 @@ public:
FmWinRecList::const_iterator findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& rCC ) const;
const FmWinRecList& getWindowList() const {return m_aWinList;}
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() { return m_xORB; }
protected:
FmWinRecList::iterator findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& rCC );
void addWindow(const SdrPageViewWinRec*);