step 0 of an UNOization of the css.form.(X)FormController implementation: move the API to css.form.runtime, so we can later add new API chunks without breaking compatibility of the existing API in css.form

4 files changed, 9 insertions, 10 deletions

diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 8df4139a3d..b5a092b87e 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -263,7 +263,7 @@
 #include "com/sun/star/form/XDatabaseParameterListener.hpp"
 #include "com/sun/star/form/XForm.hpp"
 #include "com/sun/star/form/XFormComponent.hpp"
-#include "com/sun/star/form/XFormController.hpp"
+#include "com/sun/star/form/runtime/XFormController.hpp"
 #include "com/sun/star/form/XFormControllerListener.hpp"
 #include "com/sun/star/form/XFormsSupplier.hpp"
 #include "com/sun/star/form/XFormsSupplier2.hpp"
diff --git a/svx/inc/svx/fmdpage.hxx b/svx/inc/svx/fmdpage.hxx
index eab9b42ce9..64a2b70034 100644
--- a/svx/inc/svx/fmdpage.hxx
+++ b/svx/inc/svx/fmdpage.hxx
@@ -31,11 +31,6 @@
 #define _SVX_FMDPAGE_HXX
 
 #include <com/sun/star/form/XFormsSupplier2.hpp>
-#include <com/sun/star/form/XForm.hpp>
-#include <com/sun/star/form/XImageProducerSupplier.hpp>
-#include <com/sun/star/form/XFormController.hpp>
-#include <com/sun/star/form/XFormComponent.hpp>
-#include <com/sun/star/form/XFormControllerListener.hpp>
 #include <svx/unopage.hxx>
 #include <comphelper/uno3.hxx>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/fmshell.hxx b/svx/inc/svx/fmshell.hxx
index fdcbdd58b6..4caea7cd4c 100644
--- a/svx/inc/svx/fmshell.hxx
+++ b/svx/inc/svx/fmshell.hxx
@@ -58,7 +58,9 @@ class SdrUnoObj;
 
 namespace com { namespace sun { namespace star { namespace form {
     class XForm;
-    class XFormController;
+    namespace runtime {
+        class XFormController;
+    }
 } } } }
 
 //========================================================================
@@ -147,7 +149,7 @@ public:
         const OutputDevice& _rDevice,
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _out_rxControl
     ) const;
-    ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > GetFormController(
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController(
         const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm,
         const SdrView& _rView,
         const OutputDevice& _rDevice
diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx
index c580abae5a..94aa09686e 100644
--- a/svx/inc/svx/fmview.hxx
+++ b/svx/inc/svx/fmview.hxx
@@ -54,7 +54,9 @@ namespace svx {
 class SdrUnoObj;
 namespace com { namespace sun { namespace star { namespace form {
     class XForm;
-    class XFormController;
+    namespace runtime {
+        class XFormController;
+    }
 } } } }
 
 class SVX_DLLPUBLIC FmFormView : public E3dView
@@ -125,7 +127,7 @@ public:
 
     /** returns the form controller for a given form and a given device
     */
-    SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController >
+    SVX_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >
             GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const;
 
     // SdrView