fdo#46808, Convert form::TabOrderDialog service to new style

The service already existed, it just needed an IDL file.

Change-Id: I10219da7292db5e746a89028ddc4fabb069ac388

3 files changed, 34 insertions, 1 deletions

diff --git a/extensions/source/propctrlr/pcr.component b/extensions/source/propctrlr/pcr.component
index c0e466b6e603..a070985819c8 100644
--- a/extensions/source/propctrlr/pcr.component
+++ b/extensions/source/propctrlr/pcr.component
@@ -78,5 +78,6 @@
   </implementation>
   <implementation name="org.openoffice.comp.form.ui.OTabOrderDialog">
     <service name="com.sun.star.form.ui.TabOrderDialog"/>
+    <service name="com.sun.star.form.TabOrderDialog"/>
   </implementation>
 </component>
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index adf013ef2fc7..117b6ac6814c 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -98,8 +98,9 @@ namespace pcr
     //---------------------------------------------------------------------
     ::comphelper::StringSequence OTabOrderDialog::getSupportedServiceNames_static() throw(RuntimeException)
     {
-        ::comphelper::StringSequence aSupported(1);
+        ::comphelper::StringSequence aSupported(2);
         aSupported.getArray()[0] = OUString(  "com.sun.star.form.ui.TabOrderDialog"  );
+        aSupported.getArray()[1] = OUString(  "com.sun.star.form.TabOrderDialog"  );
         return aSupported;
     }
 
@@ -130,6 +131,34 @@ namespace pcr
         return new TabOrderDialog( _pParent, m_xTabbingModel, m_xControlContext, m_aContext );
     }
 
+    void OTabOrderDialog::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException)
+    {
+        Reference<css::awt::XTabControllerModel> xTabbingModel;
+        Reference<css::awt::XControlContainer> xControlContext;
+        Reference<css::awt::XWindow> xParentWindow;
+        if (aArguments.getLength() == 3 && (aArguments[0] >>= xTabbingModel) && (aArguments[1] >>= xControlContext) && (aArguments[2] >>= xParentWindow))
+        {
+            Sequence< Any > aNewArguments( 3 );
+            aNewArguments[0] <<= NamedValue(
+                OUString( "TabbingModel" ),
+                makeAny( xTabbingModel )
+            );
+            aNewArguments[1] <<= NamedValue(
+                OUString( "ControlContext" ),
+                makeAny( xControlContext )
+            );
+            aNewArguments[2] <<= NamedValue(
+                OUString( "ParentWindow"  ),
+                makeAny( xParentWindow )
+            );
+            OTabOrderDialog_DBase::initialize(aNewArguments);
+        }
+        else
+            OTabOrderDialog_DBase::initialize(aArguments);
+    }
+
+
+
 //........................................................................
 }   // namespace pcr
 //........................................................................
diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx
index 8c10693aa711..c401cccf2661 100644
--- a/extensions/source/propctrlr/pcrunodialogs.hxx
+++ b/extensions/source/propctrlr/pcrunodialogs.hxx
@@ -66,6 +66,9 @@ namespace pcr
         static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
                 SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&);
 
+        // XInitialization
+        virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+
         // XPropertySet
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException);
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();