1 files changed, 7 insertions, 23 deletions
diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx
index d6283034c226..b8f7fb11d87e 100644
--- a/forms/source/xforms/submission.hxx
+++ b/forms/source/xforms/submission.hxx
@@ -17,12 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_HXX
-#define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_HXX
+#pragma once
 
 #include <cppuhelper/implbase.hxx>
 #include "propertysetbase.hxx"
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
 #include <com/sun/star/xml/dom/XDocumentFragment.hpp>
 #include <com/sun/star/xml/xpath/XXPathObject.hpp>
@@ -53,7 +51,6 @@ namespace xforms
  */
 typedef cppu::ImplInheritanceHelper<
     PropertySetBase,
-    css::lang::XUnoTunnel,
     css::xforms::XSubmission
 > Submission_t;
 
@@ -79,7 +76,7 @@ class Submission : public Submission_t
 private:
 
     /// the Model to which this Submission belongs; may be NULL
-    css::uno::Reference<css::xforms::XModel> mxModel;
+    rtl::Reference<Model> mxModel;
 
     // this will extract the document from the model that will be submitted
     css::uno::Reference< css::xml::dom::XDocumentFragment >
@@ -90,15 +87,17 @@ private:
 
 public:
     Submission();
-    virtual ~Submission() throw() override;
+    virtual ~Submission() noexcept override;
 
 
     // property methods: get/set value
 
 
     /// get XForms model
-    css::uno::Reference<css::xforms::XModel>
-        getModel() const { return mxModel;}
+    css::uno::Reference<css::xforms::XModel> getModel() const;
+
+    /// get the model implementation
+    xforms::Model* getModelImpl() const { return mxModel.get(); }
 
     /// set XForms model
     void setModel(
@@ -153,9 +152,6 @@ public:
      * @returns if submission was successful */
     bool doSubmit( const css::uno::Reference< css::task::XInteractionHandler >& aHandler );
 
-    // helpers for UNO tunnel
-    static css::uno::Sequence<sal_Int8> getUnoTunnelId();
-
 private:
 
     /// check whether object is live, and throw suitable exception if not
@@ -164,9 +160,6 @@ private:
     /// @throws css::uno::RuntimeException
     void liveCheck();
 
-    /// get the model implementation
-    xforms::Model* getModelImpl() const;
-
 protected:
 
 
@@ -196,13 +189,6 @@ public:
     virtual void SAL_CALL setName( const OUString& ) override;
 
 
-    // XUnoTunnel
-
-
-    virtual sal_Int64 SAL_CALL getSomething(
-        const css::uno::Sequence<sal_Int8>& ) override;
-
-
     // XSubmission
 
 
@@ -230,6 +216,4 @@ public:
 
 } // namespace xforms
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */