refactor out some com::sun::star typedefs

which mostly serve to make the code harder to read

Change-Id: Ia2a83fee9f850ab6f0bea6305ce8600d6b785fe8

3 files changed, 17 insertions, 34 deletions

diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 01465c72c370..4d04ee005ade 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1447,8 +1447,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_
         if(OUString(_rDesc.szServiceName) == FM_COMPONENT_COMMANDBUTTON)
             nOBJID = OBJ_FM_BUTTON;
 
-        typedef ::com::sun::star::form::submission::XSubmission XSubmission_t;
-        Reference< XSubmission_t > xSubmission(_rDesc.xPropSet, UNO_QUERY);
+        Reference< css::form::submission::XSubmission > xSubmission(_rDesc.xPropSet, UNO_QUERY);
 
         // xform control or submission button?
         if ( !xSubmission.is() )
@@ -1506,8 +1505,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const svx::OXFormsDescriptor &_
             // connect the submission with the submission supplier (aka the button)
             xControlSet->setPropertyValue( FM_PROP_BUTTON_TYPE,
                                            makeAny( FormButtonType_SUBMIT ) );
-            typedef ::com::sun::star::form::submission::XSubmissionSupplier XSubmissionSupplier_t;
-            Reference< XSubmissionSupplier_t > xSubmissionSupplier(pControl->GetUnoControlModel(), UNO_QUERY);
+            Reference< css::form::submission::XSubmissionSupplier > xSubmissionSupplier(pControl->GetUnoControlModel(), UNO_QUERY);
             xSubmissionSupplier->setSubmission(xSubmission);
 
             return pControl;
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 3cc54053b00b..531c67661efc 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -86,32 +86,19 @@ namespace svxform
     class DataNavigatorWindow;
     class AddInstanceDialog;
 
-    typedef ::com::sun::star::uno::Reference<
-                ::com::sun::star::xforms::XFormsUIHelper1 >         XFormsUIHelper1_ref;
-    typedef ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::dom::XNode >                 XNode_ref;
-    typedef ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet >             XPropertySet_ref;
-    typedef ::com::sun::star::uno::Reference<
-                ::com::sun::star::xforms::XModel >                  XModel_ref;
-    typedef ::com::sun::star::uno::Reference<
-                ::com::sun::star::container::XContainer >           XContainer_ref;
-    typedef ::com::sun::star::uno::Reference<
-                ::com::sun::star::container::XNameContainer >       XNameContainer_ref;
-    typedef ::com::sun::star::uno::Reference<
-                ::com::sun::star::frame::XFrame >                   XFrame_ref;
-    typedef ::com::sun::star::uno::Reference<
-                ::com::sun::star::frame::XModel >                   XFrameModel_ref;
-    typedef ::com::sun::star::uno::Reference<
-                ::com::sun::star::xml::dom::events::XEventTarget >  XEventTarget_ref;
-    typedef ::com::sun::star::uno::Reference<
-                ::com::sun::star::xforms::XSubmission >             XSubmission_ref;
-
-    typedef ::com::sun::star::uno::Sequence<
-                ::com::sun::star::beans::PropertyValue >            PropertyValue_seq;
-
-    typedef std::vector< XContainer_ref >                           ContainerList;
-    typedef std::vector< XEventTarget_ref >                         EventTargetList;
+    typedef css::uno::Reference< css::xforms::XFormsUIHelper1 >         XFormsUIHelper1_ref;
+    typedef css::uno::Reference< css::xml::dom::XNode >                 XNode_ref;
+    typedef css::uno::Reference< css::beans::XPropertySet >             XPropertySet_ref;
+    typedef css::uno::Reference< css::xforms::XModel >                  XModel_ref;
+    typedef css::uno::Reference< css::container::XContainer >           XContainer_ref;
+    typedef css::uno::Reference< css::container::XNameContainer >       XNameContainer_ref;
+    typedef css::uno::Reference< css::frame::XFrame >                   XFrame_ref;
+    typedef css::uno::Reference< css::frame::XModel >                   XFrameModel_ref;
+    typedef css::uno::Reference< css::xml::dom::events::XEventTarget >  XEventTarget_ref;
+    typedef css::uno::Reference< css::xforms::XSubmission >             XSubmission_ref;
+    typedef css::uno::Sequence< css::beans::PropertyValue >             PropertyValue_seq;
+    typedef std::vector< XContainer_ref >                               ContainerList;
+    typedef std::vector< XEventTarget_ref >                             EventTargetList;
 
 
     class DataTreeListBox : public SvTreeListBox
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index f523e837ad83..1386769fca04 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -125,14 +125,12 @@ namespace svxform
     class OControlTransferData
     {
     private:
-        typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_uInt32 > > ControlPaths;
-
-    private:
         DataFlavorExVector  m_aCurrentFormats;
 
     protected:
         ListBoxEntrySet     m_aSelectedEntries;
-        ControlPaths        m_aControlPaths;
+        css::uno::Sequence< css::uno::Sequence< sal_uInt32 > >
+                            m_aControlPaths;
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >
                             m_aHiddenControlModels;