fdo#46808, convert form::Forms to new style

Change-Id: I966ed18d45dc8a04c97a703d3c83382714025f2c

4 files changed, 15 insertions, 10 deletions

diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 3221e644a376..9b1265026c74 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -23,6 +23,7 @@
 #include <svtools/transfer.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/form/XForms.hpp>
 #include <tools/link.hxx>
 
 #include <svx/svxdllapi.h>
@@ -137,7 +138,7 @@ namespace svxform
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >
                             m_aHiddenControlModels;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+        ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms >
                             m_xFormsRoot;       // the root of the forms collection where the entries we represent reside
                                                 // this uniquely identifies the page and the document
 
@@ -171,7 +172,7 @@ namespace svxform
         size_t  onEntryRemoved( SvTreeListEntry* _pEntry );
 
         void setFormsRoot(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxFormsRoot
+            const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms >& _rxFormsRoot
             ) { m_xFormsRoot = _rxFormsRoot; }
 
         void buildPathFormat(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot);
@@ -192,7 +193,7 @@ namespace svxform
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >
                                     hiddenControls() const { return m_aHiddenControlModels; }
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
+        ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms >
                                 getFormsRoot() const { return m_xFormsRoot; }
     };
 
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 1b20fe4f666d..67e4adf6ca24 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -359,7 +359,7 @@ namespace svxform
 
         ImageList                   m_aNormalImages;
 
-        void UpdateContent( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xForms );
+        void UpdateContent( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms >& xForms );
         FmControlData* CreateControlData( ::com::sun::star::form::XFormComponent* pFormComponent );
 
         void InsertForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm, sal_uInt32 nRelPos);
@@ -395,7 +395,7 @@ namespace svxform
         void Clear();
         void SetModified( sal_Bool bMod=sal_True );
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >    GetForms() const;
+        ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms >    GetForms() const;
         FmFormShell*        GetFormShell() const { return m_pFormShell; }
         FmFormPage*         GetFormPage() const { return m_pFormPage; }
         FmEntryData*        FindData( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElement, FmEntryDataList* pDataList, sal_Bool bRecurs=sal_True );
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 5bbd02aa01ec..5e77e56eb5d2 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -20,8 +20,9 @@
 #define _SVX_FMOBJ_HXX
 
 #include <svx/svdouno.hxx>
-#include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
+#include <com/sun/star/form/XForms.hpp>
+#include <com/sun/star/script/ScriptEventDescriptor.hpp>
 
 //==================================================================
 // FmFormObj
@@ -36,7 +37,7 @@ class FmFormObj: public SdrUnoObj
     // Informationen fuer die Controlumgebung
     // werden nur vorgehalten, wenn ein Object sich nicht in einer Objectliste befindet
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>     m_xParent;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >    m_xEnvironmentHistory;
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms >                  m_xEnvironmentHistory;
     sal_Int32           m_nPos;
 
     OutputDevice*       m_pLastKnownRefDevice;
@@ -78,7 +79,9 @@ public:
 
     virtual void clonedFrom(const FmFormObj* _pSource);
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> ensureModelEnv(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rSourceContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> _rTopLevelDestContainer);
+    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> ensureModelEnv(
+                  const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rSourceContainer,
+                  const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& _rTopLevelDestContainer);
 
     /** returns the FmFormObj behind the given SdrObject
 
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index db53cc09bf8c..57a3ad0826e7 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/form/XFormComponent.hpp>
 #include <com/sun/star/form/XForm.hpp>
+#include <com/sun/star/form/XForms.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -49,7 +50,7 @@ class SVX_DLLPRIVATE FmFormPageImpl
 {
     ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >,SdrObject* > m_aComponentMap;
     ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >               xCurrentForm;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xForms;
+    ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms >              m_xForms;
     ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XMap >       m_aControlShapeMap;
 
     FmFormPage&     m_rPage;
@@ -90,7 +91,7 @@ public:
     inline  sal_Bool    hasEverBeenActivated( ) const { return !m_bFirstActivation; }
     inline  void        setHasBeenActivated( ) { m_bFirstActivation = sal_False; }
 
-    const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& getForms( bool _bForceCreate = true );
+    const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& getForms( bool _bForceCreate = true );
 
     void        SetFormsCreationHdl( const Link& _rFormsCreationHdl ) { m_aFormsCreationHdl = _rFormsCreationHdl; }
     const Link& GetFormsCreationHdl() const { return m_aFormsCreationHdl; }