diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-08-19 13:34:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-08-19 13:34:43 +0200 |
| commit | d21260cdb6e6fa898ed90bafb41ba4fe5dd3140c (patch) | |
| tree | 079d8d3608341ae764e4d879cb692b018ff2135e | |
| parent | 9528fb4a6adb2116a287653cfadc208e6c970fbc (diff) | |
Remove two silly typedefs
Change-Id: Ia7de1cebf6009e770ca1b96bab6d5e121573ccc1
92 files changed, 287 insertions, 295 deletions
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index 67e827fa9cf4..ee42cd0988ea 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -51,7 +51,7 @@ OUString ChartTypeUnoDlg::getImplementationName_Static() throw(uno::RuntimeExcep return OUString(CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME); } -::comphelper::StringSequence SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index 524a87c4e32e..611db51fff52 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -50,7 +50,7 @@ private: virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx index 9dc225f310ea..e81a813a581d 100644 --- a/comphelper/source/misc/types.cxx +++ b/comphelper/source/misc/types.cxx @@ -284,7 +284,7 @@ bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue) } case TypeClass_INTERFACE: { - InterfaceRef aDummy; + css::uno::Reference<css::uno::XInterface> aDummy; bConversionSuccess = tryCompare(pData, _rValue, bRes, aDummy); break; } diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 4a4efbcfa31a..004faa65f972 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -73,7 +73,7 @@ SbaExternalSourceBrowser::~SbaExternalSourceBrowser() } -::comphelper::StringSequence SAL_CALL SbaExternalSourceBrowser::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL SbaExternalSourceBrowser::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -83,9 +83,9 @@ OUString SbaExternalSourceBrowser::getImplementationName_Static() throw(RuntimeE return OUString("org.openoffice.comp.dbu.OFormGridView"); } -::comphelper::StringSequence SbaExternalSourceBrowser::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> SbaExternalSourceBrowser::getSupportedServiceNames_Static() throw(RuntimeException) { - ::comphelper::StringSequence aSupported(1); + css::uno::Sequence<OUString> aSupported(1); aSupported[0] = "com.sun.star.sdb.FormGridView"; return aSupported; } diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index 75f851acabc7..87c8a5af1b21 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -144,7 +144,7 @@ void SbaXFormAdapter::StartListening() Reference< css::beans::XMultiPropertySet > xBroadcaster(m_xMainForm, UNO_QUERY); OUString sEmpty; if (xBroadcaster.is()) - xBroadcaster->addPropertiesChangeListener(::comphelper::StringSequence(&sEmpty, 1), &m_aPropertiesChangeListeners); + xBroadcaster->addPropertiesChangeListener(css::uno::Sequence<OUString>(&sEmpty, 1), &m_aPropertiesChangeListeners); } // log off ourself diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index f1f5589a0bfd..29ca432949cc 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -107,7 +107,7 @@ extern "C" void SAL_CALL createRegistryInfo_SbaXGridControl() static OMultiInstanceAutoRegistration< SbaXGridControl > aAutoRegistration; } -::comphelper::StringSequence SAL_CALL SbaXGridControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL SbaXGridControl::getSupportedServiceNames() throw(std::exception) { return getSupportedServiceNames_Static(); } diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 78f1c49b97bf..c776e6f6d342 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -185,7 +185,7 @@ OUString SAL_CALL SbaTableQueryBrowser::getImplementationName() throw(RuntimeExc return getImplementationName_Static(); } -::comphelper::StringSequence SAL_CALL SbaTableQueryBrowser::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL SbaTableQueryBrowser::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -195,9 +195,9 @@ OUString SbaTableQueryBrowser::getImplementationName_Static() throw(RuntimeExcep return OUString("org.openoffice.comp.dbu.ODatasourceBrowser"); } -::comphelper::StringSequence SbaTableQueryBrowser::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> SbaTableQueryBrowser::getSupportedServiceNames_Static() throw(RuntimeException) { - ::comphelper::StringSequence aSupported(1); + css::uno::Sequence<OUString> aSupported(1); aSupported[0] = "com.sun.star.sdb.DataSourceBrowser"; return aSupported; } diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx index 4a72a136327f..737c8c5ece0b 100644 --- a/dbaccess/source/ui/inc/exsrcbrw.hxx +++ b/dbaccess/source/ui/inc/exsrcbrw.hxx @@ -80,7 +80,7 @@ namespace dbaui // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual ~SbaExternalSourceBrowser(); diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index d12fb09d27af..0ffd2f12910d 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -70,7 +70,7 @@ namespace dbaui // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // need by registration static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 2bf340655d8a..8aad618d0e57 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -179,7 +179,7 @@ namespace dbaui // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XContainerListener virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 617f18405a3d..c365565cffdf 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -48,7 +48,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index 0434dea54c9d..a277d9bd1958 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -47,7 +47,7 @@ namespace dbaui // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); @@ -90,14 +90,14 @@ namespace dbaui return OUString("org.openoffice.comp.dbu.OAdvancedSettingsDialog"); } - ::comphelper::StringSequence SAL_CALL OAdvancedSettingsDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL OAdvancedSettingsDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } - ::comphelper::StringSequence OAdvancedSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) + css::uno::Sequence<OUString> OAdvancedSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) { - ::comphelper::StringSequence aSupported(1); + css::uno::Sequence<OUString> aSupported(1); aSupported[0] = "com.sun.star.sdb.AdvancedDatabaseSettingsDialog"; return aSupported; } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index a667d1f90e56..d39aec3906cd 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -62,14 +62,14 @@ OUString ODBTypeWizDialog::getImplementationName_Static() throw(RuntimeException return OUString("org.openoffice.comp.dbu.ODBTypeWizDialog"); } -::comphelper::StringSequence SAL_CALL ODBTypeWizDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL ODBTypeWizDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } -::comphelper::StringSequence ODBTypeWizDialog::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> ODBTypeWizDialog::getSupportedServiceNames_Static() throw(RuntimeException) { - ::comphelper::StringSequence aSupported(1); + css::uno::Sequence<OUString> aSupported(1); aSupported[0] = "com.sun.star.sdb.DataSourceTypeChangeDialog"; return aSupported; } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index e1193ab19c54..f8dc22ba9c40 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -39,7 +39,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index f13cc2e142e6..c575b4981edf 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -77,14 +77,14 @@ OUString ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeExce return OUString("org.openoffice.comp.dbu.ODBTypeWizDialogSetup"); } -::comphelper::StringSequence SAL_CALL ODBTypeWizDialogSetup::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL ODBTypeWizDialogSetup::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } -::comphelper::StringSequence ODBTypeWizDialogSetup::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> ODBTypeWizDialogSetup::getSupportedServiceNames_Static() throw(RuntimeException) { - ::comphelper::StringSequence aSupported(1); + css::uno::Sequence<OUString> aSupported(1); aSupported[0] = "com.sun.star.sdb.DatabaseWizardDialog"; return aSupported; } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index 0ff240faad6a..aa6b89efb7e8 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -41,7 +41,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index 813736d0ecbf..203f924e9a2d 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -62,14 +62,14 @@ OUString OTableFilterDialog::getImplementationName_Static() throw(RuntimeExcepti return OUString("org.openoffice.comp.dbu.OTableFilterDialog"); } -::comphelper::StringSequence SAL_CALL OTableFilterDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OTableFilterDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } -::comphelper::StringSequence OTableFilterDialog::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> OTableFilterDialog::getSupportedServiceNames_Static() throw(RuntimeException) { - ::comphelper::StringSequence aSupported(1); + css::uno::Sequence<OUString> aSupported(1); aSupported[0] = "com.sun.star.sdb.TableFilterDialog"; return aSupported; } diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 0b036fada0a7..5901a8c6ef26 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -39,7 +39,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index db51ea598542..22b66f5b59e8 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -62,14 +62,14 @@ OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeExcept return OUString("org.openoffice.comp.dbu.OUserSettingsDialog"); } -::comphelper::StringSequence SAL_CALL OUserSettingsDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OUserSettingsDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } -::comphelper::StringSequence OUserSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> OUserSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) { - ::comphelper::StringSequence aSupported(1); + css::uno::Sequence<OUString> aSupported(1); aSupported[0] = "com.sun.star.sdb.UserAdministrationDialog"; return aSupported; } diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index 0923ffcb8ad5..6ecaa148edc0 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -39,7 +39,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index adfe04c33ebe..9b854eb425ca 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -62,14 +62,14 @@ OUString ODataSourcePropertyDialog::getImplementationName_Static() throw(Runtime return OUString("org.openoffice.comp.dbu.ODatasourceAdministrationDialog"); } -::comphelper::StringSequence SAL_CALL ODataSourcePropertyDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL ODataSourcePropertyDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } -::comphelper::StringSequence ODataSourcePropertyDialog::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> ODataSourcePropertyDialog::getSupportedServiceNames_Static() throw(RuntimeException) { - ::comphelper::StringSequence aSupported(1); + css::uno::Sequence<OUString> aSupported(1); aSupported[0] = "com.sun.star.sdb.DatasourceAdministrationDialog"; return aSupported; } diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index 1ee90aee432e..e511940e49fb 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -39,7 +39,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 3ba09f0409a7..05e5a2d75939 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -151,7 +151,7 @@ namespace dbaui public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods static Sequence< OUString > getSupportedServiceNames_Static() throw( RuntimeException ); @@ -423,14 +423,14 @@ OUString CopyTableWizard::getImplementationName_Static() throw(RuntimeException) return OUString( "org.openoffice.comp.dbu.CopyTableWizard" ); } -::comphelper::StringSequence SAL_CALL CopyTableWizard::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL CopyTableWizard::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } -::comphelper::StringSequence CopyTableWizard::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> CopyTableWizard::getSupportedServiceNames_Static() throw(RuntimeException) { - ::comphelper::StringSequence aSupported(1); + css::uno::Sequence<OUString> aSupported(1); aSupported.getArray()[0] = "com.sun.star.sdb.application.CopyTableWizard"; return aSupported; } diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 897974ca7f2d..49b3d8310674 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -73,14 +73,14 @@ OUString OSQLMessageDialog::getImplementationName_Static() throw(RuntimeExceptio return OUString("org.openoffice.comp.dbu.OSQLMessageDialog"); } -::comphelper::StringSequence SAL_CALL OSQLMessageDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OSQLMessageDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } -::comphelper::StringSequence OSQLMessageDialog::getSupportedServiceNames_Static() throw(RuntimeException) +css::uno::Sequence<OUString> OSQLMessageDialog::getSupportedServiceNames_Static() throw(RuntimeException) { - ::comphelper::StringSequence aSupported(1); + css::uno::Sequence<OUString> aSupported(1); aSupported.getArray()[0] = "com.sun.star.sdb.ErrorMessageDialog"; return aSupported; } diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index 990b313b7003..6077f0124b6c 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -101,15 +101,15 @@ namespace abp } - ::comphelper::StringSequence SAL_CALL OABSPilotUno::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL OABSPilotUno::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } - ::comphelper::StringSequence OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException) + css::uno::Sequence<OUString> OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException) { - ::comphelper::StringSequence aSupported(1); + css::uno::Sequence<OUString> aSupported(1); aSupported[0] = "com.sun.star.ui.dialogs.AddressBookSourcePilot"; return aSupported; } diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx index d9ff05739f5c..ba4c6205e8c1 100644 --- a/extensions/source/abpilot/unodialogabp.hxx +++ b/extensions/source/abpilot/unodialogabp.hxx @@ -56,7 +56,7 @@ namespace abp // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index 83a58eea0319..638e97e3066a 100644 --- a/extensions/source/dbpilots/unoautopilot.hxx +++ b/extensions/source/dbpilots/unoautopilot.hxx @@ -61,7 +61,7 @@ namespace dbp return getImplementationName_Static(); } - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return getSupportedServiceNames_Static(); } diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index 7f87be710192..4f374975effe 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -64,15 +64,15 @@ namespace pcr } - ::comphelper::StringSequence SAL_CALL MasterDetailLinkDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL MasterDetailLinkDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_static(); } - ::comphelper::StringSequence MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException) + css::uno::Sequence<OUString> MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException) { - ::comphelper::StringSequence aSupported(1); + css::uno::Sequence<OUString> aSupported(1); aSupported[0] = "com.sun.star.form.MasterDetailLinkDialog"; return aSupported; } diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx index 924b0626deaa..3cb466415146 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx @@ -47,7 +47,7 @@ namespace pcr // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index 37a04881a8e7..96ccc573b564 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -86,15 +86,15 @@ namespace pcr } - ::comphelper::StringSequence SAL_CALL OControlFontDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL OControlFontDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_static(); } - ::comphelper::StringSequence OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException) + css::uno::Sequence<OUString> OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException) { - ::comphelper::StringSequence aSupported(1); + css::uno::Sequence<OUString> aSupported(1); aSupported[0] = "com.sun.star.form.ControlFontDialog"; return aSupported; } diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index f2b204102f41..aa49cd2d579d 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -58,7 +58,7 @@ namespace pcr // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static() throw( ::com::sun::star::uno::RuntimeException ); diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index 98c4b49ad590..d45d3e5d3a22 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -94,15 +94,15 @@ namespace pcr } - ::comphelper::StringSequence SAL_CALL OTabOrderDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL OTabOrderDialog::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_static(); } - ::comphelper::StringSequence OTabOrderDialog::getSupportedServiceNames_static() throw(RuntimeException) + css::uno::Sequence<OUString> OTabOrderDialog::getSupportedServiceNames_static() throw(RuntimeException) { - ::comphelper::StringSequence aSupported(2); + css::uno::Sequence<OUString> aSupported(2); aSupported.getArray()[0] = "com.sun.star.form.ui.TabOrderDialog"; aSupported.getArray()[1] = "com.sun.star.form.TabOrderDialog"; return aSupported; diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 35663f1e6b7b..8257540f6085 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -58,7 +58,7 @@ namespace pcr // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static methods static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static() throw( ::com::sun::star::uno::RuntimeException ); diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 2f318597d94c..9d5f55dc7031 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -113,9 +113,9 @@ IMPLEMENT_DEFAULT_CLONING( OButtonModel ) // XServiceInfo -StringSequence OButtonModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OButtonModel::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OClickableImageBaseModel::getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 2 ); OUString* pArray = aSupported.getArray(); @@ -338,9 +338,9 @@ Sequence<Type> OButtonControl::_getTypes() } -StringSequence OButtonControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OButtonControl::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OClickableImageBaseControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString*pArray = aSupported.getArray(); diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index cd28061b545f..825d8dcb645e 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -59,7 +59,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OButtonModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::io::XPersistObject virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -138,7 +138,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OButtonControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // UNO binding DECLARE_UNO3_AGG_DEFAULTS(OButtonControl, OClickableImageBaseControl) diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index dc4d86fe3e09..d19405e4b430 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -45,9 +45,9 @@ OCheckBoxControl::OCheckBoxControl(const Reference<XComponentContext>& _rxFactor } -StringSequence SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { - StringSequence aSupported = OBoundControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString* pArray = aSupported.getArray(); @@ -84,9 +84,9 @@ IMPLEMENT_DEFAULT_CLONING( OCheckBoxModel ) // XServiceInfo -StringSequence SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { - StringSequence aSupported = OReferenceValueComponent::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OReferenceValueComponent::getSupportedServiceNames(); sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 9 ); diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx index c27e0b200c99..1ce87f4e7ce0 100644 --- a/forms/source/component/CheckBox.hxx +++ b/forms/source/component/CheckBox.hxx @@ -39,7 +39,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OCheckBoxModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -72,7 +72,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OCheckBoxControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 94c7e5f43841..aac57f6f8124 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -36,7 +36,6 @@ #include <comphelper/sequence.hxx> #include <comphelper/property.hxx> #include <comphelper/basicio.hxx> -#include <comphelper/types.hxx> #include <comphelper/servicehelper.hxx> #include "services.hxx" #include "frm_resource.hrc" @@ -63,9 +62,9 @@ const sal_uInt16 OLD_HIDDEN = 0x0004; const sal_uInt16 COMPATIBLE_HIDDEN = 0x0008; -const StringSequence& getColumnTypes() +const css::uno::Sequence<OUString>& getColumnTypes() { - static StringSequence aColumnTypes(10); + static css::uno::Sequence<OUString> aColumnTypes(10); if (aColumnTypes.getConstArray()[0].isEmpty()) { OUString* pNames = aColumnTypes.getArray(); @@ -105,7 +104,7 @@ sal_Int32 getColumnTypeByModelName(const OUString& aModelName) ? aModelName.copy(aModelPrefix.getLength()) : aModelName.copy(aCompatibleModelPrefix.getLength()); - const StringSequence& rColumnTypes = getColumnTypes(); + const css::uno::Sequence<OUString>& rColumnTypes = getColumnTypes(); nTypeId = ::detail::findPos(aColumnType, rColumnTypes); } return nTypeId; @@ -262,7 +261,7 @@ OGridColumn::~OGridColumn() // Free the aggregate if (m_xAggregate.is()) { - InterfaceRef xIface; + css::uno::Reference<css::uno::XInterface> xIface; m_xAggregate->setDelegator(xIface); } diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index ecfa7899c7fd..008b6a1c411a 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -182,7 +182,7 @@ OGridColumn* ClassName::createCloneColumn() const \ #define TYPE_TIMEFIELD 9 // List of all known columns -const StringSequence& getColumnTypes(); +const css::uno::Sequence<OUString>& getColumnTypes(); sal_Int32 getColumnTypeByModelName(const OUString& aModelName); // Columns diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 654d962b49a9..c7dbe980490a 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -82,9 +82,9 @@ Sequence<Type> OComboBoxModel::_getTypes() // XServiceInfo -StringSequence SAL_CALL OComboBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OComboBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { - StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 9 ); @@ -336,7 +336,7 @@ void SAL_CALL OComboBoxModel::write(const Reference<css::io::XObjectOutputStream nAnyMask |= BOUNDCOLUMN; _rxOutStream << nAnyMask; - StringSequence aListSourceSeq(&m_aListSource, 1); + css::uno::Sequence<OUString> aListSourceSeq(&m_aListSource, 1); _rxOutStream << aListSourceSeq; _rxOutStream << (sal_Int16)m_eListSourceType; @@ -402,7 +402,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>& else // nVersion == 4 { m_aListSource.clear(); - StringSequence aListSource; + css::uno::Sequence<OUString> aListSource; _rxInStream >> aListSource; const OUString* pToken = aListSource.getConstArray(); sal_Int32 nLen = aListSource.getLength(); @@ -437,7 +437,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>& && !hasExternalListSource() ) { - setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( StringSequence() ) ); + setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( css::uno::Sequence<OUString>() ) ); } if (nVersion > 0x0004) @@ -634,7 +634,7 @@ void OComboBoxModel::loadData( bool _bForce ) Reference<XNameAccess> xFieldNames = getTableFields(xConnection, m_aListSource); if (xFieldNames.is()) { - StringSequence seqNames = xFieldNames->getElementNames(); + css::uno::Sequence<OUString> seqNames = xFieldNames->getElementNames(); sal_Int32 nFieldsCount = seqNames.getLength(); const OUString* pustrNames = seqNames.getConstArray(); @@ -659,8 +659,8 @@ void OComboBoxModel::loadData( bool _bForce ) return; } - // Create StringSequence for ListBox - StringSequence aStringSeq(aStringList.size()); + // Create css::uno::Sequence<OUString> for ListBox + css::uno::Sequence<OUString> aStringSeq(aStringList.size()); OUString* pStringAry = aStringSeq.getArray(); for (sal_Int32 i = 0; i<aStringSeq.getLength(); ++i) pStringAry[i] = aStringList[i]; @@ -758,7 +758,7 @@ bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset ) if ( bAddToList ) { - StringSequence aStringItemList; + css::uno::Sequence<OUString> aStringItemList; if ( getPropertyValue( PROPERTY_STRINGITEMLIST ) >>= aStringItemList ) { const OUString* pStringItems = aStringItemList.getConstArray(); @@ -867,9 +867,9 @@ OComboBoxControl::OComboBoxControl(const Reference<XComponentContext>& _rxContex } -StringSequence SAL_CALL OComboBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OComboBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception) { - StringSequence aSupported = OBoundControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString* pArray = aSupported.getArray(); diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx index b752c3240f21..e5348fc00240 100644 --- a/forms/source/component/ComboBox.hxx +++ b/forms/source/component/ComboBox.hxx @@ -52,7 +52,7 @@ class OComboBoxModel OUString m_aDefaultText; // DefaultText ::com::sun::star::uno::Any m_aLastKnownValue; - StringSequence m_aDesignModeStringItems; + css::uno::Sequence<OUString> m_aDesignModeStringItems; // upon loading, in some cases we reset fill our string item list ourself. We don't want // to lose the user's items then, so we remember them here. ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter> m_xFormatter; @@ -88,7 +88,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OComboBoxModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // UNO DECLARE_UNO3_AGG_DEFAULTS(OComboBoxModel, OBoundControlModel) @@ -151,7 +151,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OComboBoxControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index bc7975d0b7b4..28844bc3e05d 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -51,9 +51,9 @@ Sequence<Type> OCurrencyControl::_getTypes() } -StringSequence SAL_CALL OCurrencyControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL OCurrencyControl::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString*pArray = aSupported.getArray(); @@ -146,9 +146,9 @@ IMPLEMENT_DEFAULT_CLONING( OCurrencyModel ) // XServiceInfo -StringSequence SAL_CALL OCurrencyModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL OCurrencyModel::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 5 ); diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx index 98230b94b46e..dc51cd899967 100644 --- a/forms/source/component/Currency.hxx +++ b/forms/source/component/Currency.hxx @@ -42,7 +42,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OCurrencyModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::io::XPersistObject virtual OUString SAL_CALL getServiceName() throw ( ::com::sun ::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -81,7 +81,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OCurrencyControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 47488b26cd4e..56d612101f66 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -2346,7 +2346,7 @@ void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( Runt // smartXChild -void SAL_CALL ODatabaseForm::setParent(const InterfaceRef& Parent) throw ( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ODatabaseForm::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw ( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) { // SYNCHRONIZED -----> ::osl::ResettableMutexGuard aGuard(m_aMutex); @@ -3090,7 +3090,7 @@ bool ODatabaseForm::impl_approveRowChange_throw( const EventObject& _rEvent, con sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) throw( RuntimeException, std::exception ) { // is our aggregate calling? - if (event.Source == InterfaceRef(static_cast<XWeak*>(this))) + if (event.Source == css::uno::Reference<css::uno::XInterface>(static_cast<XWeak*>(this))) { // Our aggregate doesn't have any ApproveRowSetListeners (expect ourself), as we re-routed the queryInterface // for XRowSetApproveBroadcaster-interface. @@ -3139,7 +3139,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) thr sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) throw( RuntimeException, std::exception ) { // is our aggregate calling? - if (event.Source == InterfaceRef(static_cast<XWeak*>(this))) + if (event.Source == css::uno::Reference<css::uno::XInterface>(static_cast<XWeak*>(this))) { // Our aggregate doesn't have any ApproveRowSetListeners (expect ourself), as we re-routed the queryInterface // for XRowSetApproveBroadcaster-interface. @@ -3178,7 +3178,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) t sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) throw( RuntimeException, std::exception ) { - if (event.Source == InterfaceRef(static_cast<XWeak*>(this))) // ignore our aggregate as we handle this approve ourself + if (event.Source == css::uno::Reference<css::uno::XInterface>(static_cast<XWeak*>(this))) // ignore our aggregate as we handle this approve ourself { ::osl::ClearableMutexGuard aGuard( m_aMutex ); bool bWasLoaded = isLoaded(); @@ -3433,7 +3433,7 @@ sal_Bool SAL_CALL ODatabaseForm::rowDeleted() throw( SQLException, RuntimeExcept } -InterfaceRef SAL_CALL ODatabaseForm::getStatement() throw( SQLException, RuntimeException, std::exception ) +css::uno::Reference<css::uno::XInterface> SAL_CALL ODatabaseForm::getStatement() throw( SQLException, RuntimeException, std::exception ) { return m_xAggregateAsRowSet->getStatement(); } @@ -4019,7 +4019,7 @@ void ODatabaseForm::implInserted( const ElementDescription* _pElement ) } -void ODatabaseForm::implRemoved(const InterfaceRef& _rxObject) +void ODatabaseForm::implRemoved(const css::uno::Reference<css::uno::XInterface>& _rxObject) { OFormComponents::implRemoved( _rxObject ); diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index 5e6c4ab51e6b..2a5f1d7b7c68 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -276,8 +276,8 @@ public: virtual void SAL_CALL removeSubmitListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XSubmitListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // com::sun::star::container::XChild - virtual InterfaceRef SAL_CALL getParent() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OFormComponents::getParent(); } - virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw ( :: com::sun::star::lang::NoSupportException , ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OFormComponents::getParent(); } + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw ( :: com::sun::star::lang::NoSupportException , ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // com::sun::star::container::XNamed virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -362,7 +362,7 @@ public: virtual sal_Bool SAL_CALL rowUpdated() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL rowInserted() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL rowDeleted() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual InterfaceRef SAL_CALL getStatement() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getStatement() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // com::sun::star::sdbc::XResultSetUpdate virtual void SAL_CALL insertRow() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -443,7 +443,7 @@ protected: // OInterfaceContainer overridables virtual void implInserted( const ElementDescription* _pElement ) SAL_OVERRIDE; - virtual void implRemoved(const InterfaceRef& _rxObject) SAL_OVERRIDE; + virtual void implRemoved(const css::uno::Reference<css::uno::XInterface>& _rxObject) SAL_OVERRIDE; // OPropertyChangeListener virtual void _propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx index ace219607fc5..b28531ee73b4 100644 --- a/forms/source/component/Date.cxx +++ b/forms/source/component/Date.cxx @@ -56,9 +56,9 @@ Sequence<Type> ODateControl::_getTypes() } -StringSequence SAL_CALL ODateControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL ODateControl::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString*pArray = aSupported.getArray(); @@ -120,9 +120,9 @@ IMPLEMENT_DEFAULT_CLONING( ODateModel ) // XServiceInfo -StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL ODateModel::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 9 ); diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx index 2971008ad5ce..f54ac8495200 100644 --- a/forms/source/component/Date.hxx +++ b/forms/source/component/Date.hxx @@ -55,7 +55,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.ODateModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // XPropertySet using OEditBaseModel::getFastPropertyValue; @@ -106,7 +106,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.ODateControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index d52353dfbe50..3c4f6bf6cb0e 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -139,9 +139,9 @@ void OEditControl::disposing() // XServiceInfo -StringSequence OEditControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OEditControl::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 3); OUString*pArray = aSupported.getArray(); @@ -201,7 +201,7 @@ void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( return; Reference<XFormComponent> xFComp(xSet, UNO_QUERY); - InterfaceRef xParent = xFComp->getParent(); + css::uno::Reference<css::uno::XInterface> xParent = xFComp->getParent(); if( !xParent.is() ) return; @@ -252,7 +252,7 @@ IMPL_LINK_NOARG(OEditControl, OnKeyPressed) m_nKeyEvent = 0; Reference<XFormComponent> xFComp(getModel(), UNO_QUERY); - InterfaceRef xParent = xFComp->getParent(); + css::uno::Reference<css::uno::XInterface> xParent = xFComp->getParent(); Reference<XSubmit> xSubmit(xParent, UNO_QUERY); if (xSubmit.is()) xSubmit->submit( Reference<XControl>(), ::com::sun::star::awt::MouseEvent() ); @@ -327,9 +327,9 @@ OUString SAL_CALL OEditModel::getServiceName() throw ( ::com::sun::star::uno::Ru // XServiceInfo -StringSequence SAL_CALL OEditModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL OEditModel::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 9 ); diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index 1d17c00e31b9..52b32b370d7e 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -74,7 +74,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OEditModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( @@ -152,7 +152,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OEditControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::form::XChangeBroadcaster virtual void SAL_CALL addChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx index f03ac9551d09..e4210c5b1eb7 100644 --- a/forms/source/component/EventThread.cxx +++ b/forms/source/component/EventThread.cxx @@ -39,7 +39,7 @@ OComponentEventThread::OComponentEventThread( ::cppu::OComponentHelper* pCompImp // Hold a reference of the Control { - InterfaceRef xIFace(static_cast<XWeak*>(pCompImpl)); + css::uno::Reference<css::uno::XInterface> xIFace(static_cast<XWeak*>(pCompImpl)); m_xComp.set(xIFace, css::uno::UNO_QUERY); } @@ -159,7 +159,7 @@ void OComponentEventThread::run() implStarted( ); // Hold on to ourselves, so that we're not deleted if a dispose is called at some point in time - InterfaceRef xThis(static_cast<XWeak*>(this)); + css::uno::Reference<css::uno::XInterface> xThis(static_cast<XWeak*>(this)); do { diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index 015a9fb641d8..eb6dff10b7fc 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -67,9 +67,9 @@ Sequence<Type> OFileControlModel::_getTypes() // XServiceInfo -StringSequence OFileControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> OFileControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { - StringSequence aSupported = OControlModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString*pArray = aSupported.getArray(); diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx index 80b3ef6ce07d..23a27a062752 100644 --- a/forms/source/component/File.hxx +++ b/forms/source/component/File.hxx @@ -47,7 +47,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OFileControlModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx index b281b509fe74..bf3acda7bf16 100644 --- a/forms/source/component/FixedText.cxx +++ b/forms/source/component/FixedText.cxx @@ -62,9 +62,9 @@ OFixedTextModel::~OFixedTextModel( ) IMPLEMENT_DEFAULT_CLONING( OFixedTextModel ) -StringSequence SAL_CALL OFixedTextModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OFixedTextModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { - StringSequence aSupported = OControlModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString* pArray = aSupported.getArray(); diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx index d6299e42030b..0bbe9e746d87 100644 --- a/forms/source/component/FixedText.hxx +++ b/forms/source/component/FixedText.hxx @@ -37,7 +37,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OFixedTextModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index cc27283a22dc..f2d0ac4aa368 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -1525,7 +1525,7 @@ void SAL_CALL OBoundControlModel::disposing(const com::sun::star::lang::EventObj } // XServiceInfo -StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { return ::comphelper::combineSequences( getAggregateServiceNames(), diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 0d385acbad3d..5a91466a6561 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -201,7 +201,7 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr if( !xSet.is() ) return; Reference<XFormComponent> xFComp(xSet, UNO_QUERY); - InterfaceRef xParent = xFComp->getParent(); + css::uno::Reference<css::uno::XInterface> xParent = xFComp->getParent(); if( !xParent.is() ) return; Reference<com::sun::star::beans::XPropertySet> xFormSet(xParent, UNO_QUERY); @@ -244,16 +244,16 @@ IMPL_LINK_NOARG(OFormattedControl, OnKeyPressed) { m_nKeyEvent = 0; Reference<XFormComponent> xFComp(getModel(), UNO_QUERY); - InterfaceRef xParent = xFComp->getParent(); + css::uno::Reference<css::uno::XInterface> xParent = xFComp->getParent(); Reference<XSubmit> xSubmit(xParent, UNO_QUERY); if (xSubmit.is()) xSubmit->submit( Reference<XControl> (), ::com::sun::star::awt::MouseEvent() ); return 0L; } -StringSequence OFormattedControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OFormattedControl::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_FORMATTEDFIELD; @@ -312,9 +312,9 @@ void SAL_CALL OFormattedModel::disposing() } // XServiceInfo -StringSequence OFormattedModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OFormattedModel::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OEditBaseModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OEditBaseModel::getSupportedServiceNames(); sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 9 ); OUString* pStoreTo = aSupported.getArray() + nOldLen; diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index 3c771d5ad9f5..812f7f252a00 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -74,7 +74,7 @@ class OFormattedModel throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OFormattedModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // XPersistObject virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -165,7 +165,7 @@ class OFormattedModel throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OFormattedControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XEventListener virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index 963ab91a59cf..463320c69334 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -48,7 +48,7 @@ OFormattedFieldWrapper::OFormattedFieldWrapper(const Reference<XComponentContext { } -InterfaceRef OFormattedFieldWrapper::createFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, bool bActAsFormatted) +css::uno::Reference<css::uno::XInterface> OFormattedFieldWrapper::createFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, bool bActAsFormatted) { OFormattedFieldWrapper *pRef = new OFormattedFieldWrapper(_rxFactory); @@ -58,7 +58,7 @@ InterfaceRef OFormattedFieldWrapper::createFormattedFieldWrapper(const ::com::su // (instantiate it directly ..., as the OFormattedModel isn't // registered for any service names anymore) OFormattedModel* pModel = new OFormattedModel(pRef->m_xContext); - InterfaceRef xFormattedModel( + css::uno::Reference<css::uno::XInterface> xFormattedModel( static_cast<XWeak*>(pModel), css::uno::UNO_QUERY); pRef->m_xAggregate = Reference<XAggregation> (xFormattedModel, UNO_QUERY); @@ -76,7 +76,7 @@ InterfaceRef OFormattedFieldWrapper::createFormattedFieldWrapper(const ::com::su pRef->m_xAggregate->setDelegator(static_cast<XWeak*>(pRef)); } - InterfaceRef xRef(*pRef); + css::uno::Reference<css::uno::XInterface> xRef(*pRef); osl_atomic_decrement(&pRef->m_refCount); return xRef; @@ -122,7 +122,7 @@ OFormattedFieldWrapper::~OFormattedFieldWrapper() { // release the aggregated object (if any) if (m_xAggregate.is()) - m_xAggregate->setDelegator(InterfaceRef ()); + m_xAggregate->setDelegator(css::uno::Reference<css::uno::XInterface> ()); } @@ -313,7 +313,7 @@ void OFormattedFieldWrapper::ensureAggregate() { // instantiate an EditModel (the only place where we are allowed to decide that we're an FormattedModel // is in ::read) - InterfaceRef xEditModel = m_xContext->getServiceManager()->createInstanceWithContext(FRM_SUN_COMPONENT_TEXTFIELD, m_xContext); + css::uno::Reference<css::uno::XInterface> xEditModel = m_xContext->getServiceManager()->createInstanceWithContext(FRM_SUN_COMPONENT_TEXTFIELD, m_xContext); if (!xEditModel.is()) { // arghhh ... instantiate it directly ... it's dirty, but we really need this aggregate diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx index 36a8c47aae50..388319dd34c7 100644 --- a/forms/source/component/FormattedFieldWrapper.hxx +++ b/forms/source/component/FormattedFieldWrapper.hxx @@ -59,7 +59,7 @@ public: // to read and write the FormattedModel part // if bActAsFormatted is false, the state is undetermined until somebody calls // ::read or does anything which requires a living aggregate - static InterfaceRef createFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, bool bActAsFormatted); + static css::uno::Reference<css::uno::XInterface> createFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, bool bActAsFormatted); // UNO DECLARE_UNO3_AGG_DEFAULTS(OFormattedFieldWrapper, OWeakAggObject) diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx index 074c8f70ed2f..f5b497e75b4d 100644 --- a/forms/source/component/FormsCollection.cxx +++ b/forms/source/component/FormsCollection.cxx @@ -93,9 +93,9 @@ sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString& _rServiceNa return cppu::supportsService(this, _rServiceName); } -StringSequence SAL_CALL OFormsCollection::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OFormsCollection::getSupportedServiceNames() throw(RuntimeException, std::exception) { - StringSequence aReturn(2); + css::uno::Sequence<OUString> aReturn(2); aReturn[0] = "com.sun.star.form.Forms"; aReturn[1] = "com.sun.star.form.FormComponents"; @@ -127,13 +127,13 @@ void OFormsCollection::disposing() //XChild -void OFormsCollection::setParent(const InterfaceRef& Parent) throw( NoSupportException, RuntimeException, std::exception ) +void OFormsCollection::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw( NoSupportException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); m_xParent = Parent; } -InterfaceRef OFormsCollection::getParent() throw( RuntimeException, std::exception ) +css::uno::Reference<css::uno::XInterface> OFormsCollection::getParent() throw( RuntimeException, std::exception ) { return m_xParent; } diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx index 5398542fa520..b31ab7993222 100644 --- a/forms/source/component/FormsCollection.hxx +++ b/forms/source/component/FormsCollection.hxx @@ -46,7 +46,7 @@ class OFormsCollection ,public OFormsCollection_BASE { ::osl::Mutex m_aMutex; - ::comphelper::InterfaceRef m_xParent; // Parent + css::uno::Reference<css::uno::XInterface> m_xParent; // Parent public: OFormsCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); @@ -68,7 +68,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual StringSequence SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCloneable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -77,8 +77,8 @@ public: virtual void SAL_CALL disposing() SAL_OVERRIDE; // ::com::sun::star::container::XChild - virtual ::comphelper::InterfaceRef SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setParent(const ::comphelper::InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // prevent method hiding using OInterfaceContainer::disposing; diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 81f923db76fb..e13f36bff017 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -166,9 +166,9 @@ void OGridControlModel::cloneColumns( const OGridControlModel* _pOriginalContain } // XServiceInfo -StringSequence OGridControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> OGridControlModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { - StringSequence aSupported = OControlModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 4); aSupported[aSupported.getLength()-4] = "com.sun.star.awt.UnoControlModel"; aSupported[aSupported.getLength()-3] = FRM_SUN_COMPONENT_GRIDCONTROL; @@ -225,7 +225,7 @@ void SAL_CALL OGridControlModel::removeRowSetChangeListener( const Reference< XR } // XChild -void SAL_CALL OGridControlModel::setParent( const InterfaceRef& i_Parent ) throw(NoSupportException, RuntimeException, std::exception) +void SAL_CALL OGridControlModel::setParent( const css::uno::Reference<css::uno::XInterface>& i_Parent ) throw(NoSupportException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); if ( i_Parent == getParent() ) @@ -280,7 +280,7 @@ sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalAr throw IllegalArgumentException(); } } - InterfaceRef xMe = static_cast<XWeak*>(this); + css::uno::Reference<css::uno::XInterface> xMe = static_cast<XWeak*>(this); if (xSel.is()) { Reference<XChild> xAsChild(xSel, UNO_QUERY); @@ -341,7 +341,7 @@ Reference<XPropertySet> OGridControlModel::createColumnById(sal_Int32 nTypeId) } return xReturn; } -StringSequence SAL_CALL OGridControlModel::getColumnTypes() throw ( ::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OGridControlModel::getColumnTypes() throw ( ::com::sun::star::uno::RuntimeException, std::exception) { return frm::getColumnTypes(); } @@ -692,7 +692,7 @@ Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const return aReturn; } -OGridColumn* OGridControlModel::getColumnImplementation(const InterfaceRef& _rxIFace) +OGridColumn* OGridControlModel::getColumnImplementation(const css::uno::Reference<css::uno::XInterface>& _rxIFace) { OGridColumn* pImplementation = NULL; Reference< XUnoTunnel > xUnoTunnel( _rxIFace, UNO_QUERY ); @@ -721,7 +721,7 @@ void OGridControlModel::lostColumn(const Reference< XInterface >& _rxColumn) xBroadcaster->removeSQLErrorListener( this ); } -void OGridControlModel::implRemoved(const InterfaceRef& _rxObject) +void OGridControlModel::implRemoved(const css::uno::Reference<css::uno::XInterface>& _rxObject) { OInterfaceContainer::implRemoved(_rxObject); lostColumn(_rxObject); @@ -916,7 +916,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t // reading the attachment for (sal_Int32 i = 0; i < nLen; i++) { - InterfaceRef xIfc(m_aItems[i], UNO_QUERY); + css::uno::Reference<css::uno::XInterface> xIfc(m_aItems[i], UNO_QUERY); Reference<XPropertySet> xSet(xIfc, UNO_QUERY); Any aHelper; aHelper <<= xSet; diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index a5ed51e6a98d..352154a7bf98 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -105,14 +105,14 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChild - virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OGridControlModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -136,7 +136,7 @@ public: // XGridColumnFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> SAL_CALL createColumn(const OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual StringSequence SAL_CALL getColumnTypes() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getColumnTypes() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -184,12 +184,12 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createColumnById(sal_Int32 nTypeId) const; - static OGridColumn* getColumnImplementation(const InterfaceRef& _rxIFace); + static OGridColumn* getColumnImplementation(const css::uno::Reference<css::uno::XInterface>& _rxIFace); virtual ElementDescription* createElementMetaData( ) SAL_OVERRIDE; protected: - virtual void implRemoved(const InterfaceRef& _rxObject) SAL_OVERRIDE; + virtual void implRemoved(const css::uno::Reference<css::uno::XInterface>& _rxObject) SAL_OVERRIDE; virtual void implInserted( const ElementDescription* _pElement ) SAL_OVERRIDE; virtual void impl_replacedElement( const ::com::sun::star::container::ContainerEvent& _rEvent, diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index 73792e17d25b..e0991979a616 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -57,9 +57,9 @@ OGroupBoxModel::OGroupBoxModel( const OGroupBoxModel* _pOriginal, const Referenc // XServiceInfo -StringSequence SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { - StringSequence aSupported = OControlModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString* pArray = aSupported.getArray(); @@ -128,9 +128,9 @@ OGroupBoxControl::OGroupBoxControl(const Reference<XComponentContext>& _rxFactor } -StringSequence SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception) { - StringSequence aSupported = OControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString* pArray = aSupported.getArray(); diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx index 0c9ebedf3ed8..1bad75a4cbf8 100644 --- a/forms/source/component/GroupBox.hxx +++ b/forms/source/component/GroupBox.hxx @@ -37,7 +37,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OGroupBoxModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -68,7 +68,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OGroupBoxControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index 92b15008532d..78a0ea2b2cd2 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -118,7 +118,7 @@ void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) cons // XServiceInfo -StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { return css::uno::Sequence<OUString>{ FRM_SUN_COMPONENT_HIDDENCONTROL, FRM_SUN_FORMCOMPONENT, diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx index 68a29a5b6318..223e31d08289 100644 --- a/forms/source/component/Hidden.hxx +++ b/forms/source/component/Hidden.hxx @@ -47,7 +47,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OHiddenModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPersistObject virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 7a677d5b2f1f..5e02e96c4100 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -61,9 +61,9 @@ OImageButtonModel::~OImageButtonModel() } // XServiceInfo -StringSequence OImageButtonModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OImageButtonModel::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OClickableImageBaseModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString*pArray = aSupported.getArray(); @@ -150,9 +150,9 @@ Sequence<Type> OImageButtonControl::_getTypes() return aTypes; } -StringSequence OImageButtonControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OImageButtonControl::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OClickableImageBaseControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString*pArray = aSupported.getArray(); diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx index 1d9dd1abd3cd..360795db3374 100644 --- a/forms/source/component/ImageButton.hxx +++ b/forms/source/component/ImageButton.hxx @@ -38,7 +38,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OImageButtonModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::io::XPersistObject virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -70,7 +70,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OImageButtonControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // UNO Binding DECLARE_UNO3_AGG_DEFAULTS(OImageButtonControl, OClickableImageBaseControl) diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 8f66e1b91fb6..cb24bb3e30e4 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -188,9 +188,9 @@ IMPLEMENT_DEFAULT_CLONING( OImageControlModel ) // XServiceInfo -StringSequence OImageControlModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OImageControlModel::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString*pArray = aSupported.getArray(); @@ -723,9 +723,9 @@ Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) throw (R } -StringSequence OImageControlControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OImageControlControl::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString*pArray = aSupported.getArray(); diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index 6122336c1c50..cb0b05ec2b2f 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -80,7 +80,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OImageControlModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; @@ -172,7 +172,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OImageControlControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // XMouseListener virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 752a6181a8b5..a48ec94352f2 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -203,9 +203,9 @@ namespace frm // XServiceInfo - StringSequence SAL_CALL OListBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL OListBoxModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { - StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 9 ); @@ -474,8 +474,8 @@ namespace frm DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_PROP2(BOUNDCOLUMN, sal_Int16, BOUND, MAYBEVOID); DECL_PROP1(LISTSOURCETYPE, ListSourceType, BOUND); - DECL_PROP1(LISTSOURCE, StringSequence, BOUND); - DECL_PROP3(VALUE_SEQ, StringSequence, BOUND, READONLY, TRANSIENT); + DECL_PROP1(LISTSOURCE, css::uno::Sequence<OUString>, BOUND); + DECL_PROP3(VALUE_SEQ, css::uno::Sequence<OUString>, BOUND, READONLY, TRANSIENT); DECL_PROP2(SELECT_VALUE_SEQ, Sequence< Any >, BOUND, TRANSIENT); DECL_PROP2(SELECT_VALUE, Any, BOUND, TRANSIENT); DECL_PROP1(DEFAULT_SELECT_SEQ, Sequence<sal_Int16>, BOUND); @@ -594,7 +594,7 @@ namespace frm _rxInStream >> nAnyMask; // ListSourceSeq - StringSequence aListSourceSeq; + css::uno::Sequence<OUString> aListSourceSeq; if (nVersion == 0x0001) { // Create ListSourceSeq from String @@ -660,7 +660,7 @@ namespace frm && !hasExternalListSource() ) { - setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( StringSequence() ) ); + setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( css::uno::Sequence<OUString>() ) ); } if (nVersion > 3) @@ -932,7 +932,7 @@ namespace frm Reference<XNameAccess> xFieldNames = getTableFields(xConnection, sListSource); if (xFieldNames.is()) { - StringSequence seqNames = xFieldNames->getElementNames(); + css::uno::Sequence<OUString> seqNames = xFieldNames->getElementNames(); ::std::copy( seqNames.getConstArray(), seqNames.getConstArray() + seqNames.getLength(), @@ -1009,7 +1009,7 @@ namespace frm if ( m_eListSourceType != ListSourceType_VALUELIST ) { if ( !hasExternalListSource() ) - setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( StringSequence() ) ); + setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( css::uno::Sequence<OUString>() ) ); m_aListRowSet.dispose(); } @@ -1805,9 +1805,9 @@ namespace frm } - StringSequence SAL_CALL OListBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL OListBoxControl::getSupportedServiceNames() throw(RuntimeException, std::exception) { - StringSequence aSupported = OBoundControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString* pArray = aSupported.getArray(); diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index 35063793dccd..8740da1394a5 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -131,7 +131,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OListBoxModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // UNO Anbindung DECLARE_UNO3_AGG_DEFAULTS(OListBoxModel, OBoundControlModel) @@ -287,7 +287,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OListBoxControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChangeBroadcaster virtual void SAL_CALL addChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index 2d1cb74083fe..e7fb4955d8ff 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -42,9 +42,9 @@ ONumericControl::ONumericControl(const Reference<XComponentContext>& _rxFactory) } -StringSequence ONumericControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> ONumericControl::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString*pArray = aSupported.getArray(); @@ -95,9 +95,9 @@ IMPLEMENT_DEFAULT_CLONING( ONumericModel ) // XServiceInfo -StringSequence ONumericModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> ONumericModel::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 9 ); diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx index 5b97d9e1b361..ad9e6fffb1f4 100644 --- a/forms/source/component/Numeric.hxx +++ b/forms/source/component/Numeric.hxx @@ -42,7 +42,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.ONumericModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::io::XPersistObject virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -79,7 +79,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.ONumericControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index 8631f0deec9a..e4793a0754d5 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -50,9 +50,9 @@ Sequence<Type> OPatternControl::_getTypes() } -StringSequence OPatternControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> OPatternControl::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString*pArray = aSupported.getArray(); @@ -98,9 +98,9 @@ IMPLEMENT_DEFAULT_CLONING( OPatternModel ) // XServiceInfo -StringSequence SAL_CALL OPatternModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL OPatternModel::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 3); OUString*pArray = aSupported.getArray(); diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx index 2f5d6bf57da0..a066f45bfc64 100644 --- a/forms/source/component/Pattern.hxx +++ b/forms/source/component/Pattern.hxx @@ -49,7 +49,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OPatternModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::io::XPersistObject virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -88,7 +88,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OPatternControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index e02f8e45e719..990100f7209d 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -43,9 +43,9 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; -StringSequence SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(RuntimeException, std::exception) { - StringSequence aSupported = OBoundControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString* pArray = aSupported.getArray(); @@ -111,9 +111,9 @@ IMPLEMENT_DEFAULT_CLONING( ORadioButtonModel ) // XServiceInfo -StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(RuntimeException, std::exception) { - StringSequence aSupported = OReferenceValueComponent::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OReferenceValueComponent::getSupportedServiceNames(); sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 9 ); @@ -155,7 +155,7 @@ void ORadioButtonModel::SetSiblingPropsTo(const OUString& rPropName, const Any& sal_Int32 nNumSiblings = xIndexAccess->getCount(); for (sal_Int32 i=0; i<nNumSiblings; ++i) { - Reference<XPropertySet> xSiblingProperties(*static_cast<InterfaceRef const *>(xIndexAccess->getByIndex(i).getValue()), UNO_QUERY); + Reference<XPropertySet> xSiblingProperties(*static_cast<css::uno::Reference<css::uno::XInterface> const *>(xIndexAccess->getByIndex(i).getValue()), UNO_QUERY); if (!xSiblingProperties.is()) continue; if (xMyProps == xSiblingProperties) @@ -230,7 +230,7 @@ void ORadioButtonModel::setControlSource() static_cast<XWeak*>(this), css::uno::UNO_QUERY); for (sal_Int32 i=0; i<xIndexAccess->getCount(); ++i) { - Reference<XPropertySet> xSiblingProperties(*static_cast<InterfaceRef const *>(xIndexAccess->getByIndex(i).getValue()), UNO_QUERY); + Reference<XPropertySet> xSiblingProperties(*static_cast<css::uno::Reference<css::uno::XInterface> const *>(xIndexAccess->getByIndex(i).getValue()), UNO_QUERY); if (!xSiblingProperties.is()) continue; diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx index e57e67286b8d..e6c843a8cb4e 100644 --- a/forms/source/component/RadioButton.hxx +++ b/forms/source/component/RadioButton.hxx @@ -36,7 +36,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.ORadioButtonModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySetHelper virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) @@ -84,7 +84,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.ORadioButtonControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // XControl diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index e09359a36a2d..c2d4b667712b 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.cxx @@ -56,9 +56,9 @@ Sequence<Type> OTimeControl::_getTypes() } -StringSequence SAL_CALL OTimeControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL OTimeControl::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControl::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); OUString*pArray = aSupported.getArray(); @@ -72,9 +72,9 @@ StringSequence SAL_CALL OTimeControl::getSupportedServiceNames() throw(std::exce // XServiceInfo -StringSequence SAL_CALL OTimeModel::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL OTimeModel::getSupportedServiceNames() throw(std::exception) { - StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); + css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames(); sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 9 ); diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx index eddfa1aab36c..25ea155c41ca 100644 --- a/forms/source/component/Time.hxx +++ b/forms/source/component/Time.hxx @@ -56,7 +56,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OTimeModel"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // OControlModel's property handling virtual void describeFixedProperties( @@ -106,7 +106,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.form.OTimeControl"); } - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; }; diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index bef40abf289b..0001bf6836d5 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -738,7 +738,7 @@ namespace frm // changed in a document that is already loaded. There's no way // we can get to the Model during loading. Reference< XModel > xModel; - InterfaceRef xIfc( *this ); + css::uno::Reference<css::uno::XInterface> xIfc( *this ); while( !xModel.is() && xIfc.is() ) { Reference<XChild> xChild( xIfc, UNO_QUERY ); diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 6d2ff7959a63..041a34535bff 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -233,15 +233,15 @@ protected: // XServiceInfo virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; // XServiceInfo - static version - static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); + static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); // XControl - virtual void SAL_CALL setContext(const InterfaceRef& Context) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual InterfaceRef SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setContext(const css::uno::Reference<css::uno::XInterface>& Context) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference<css::awt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<css::awt::XWindowPeer>& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference<css::awt::XWindowPeer> SAL_CALL getPeer() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference<css::awt::XControlModel>& Model) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -336,7 +336,7 @@ protected: ::osl::Mutex m_aMutex; oslInterlockedCount m_lockCount; - InterfaceRef m_xParent; // ParentComponent + css::uno::Reference<css::uno::XInterface> m_xParent; // ParentComponent PropertyBagHelper m_aPropertyBagHelper; const css::uno::Reference<css::uno::XComponentContext>& @@ -407,11 +407,11 @@ public: // XServiceInfo virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; // XSericeInfo - static version(s) - static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); + static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); // XPersistObject virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; @@ -421,8 +421,8 @@ public: read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChild (base of XFormComponent) - virtual InterfaceRef SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -985,10 +985,10 @@ public: virtual void SAL_CALL removeResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual StringSequence SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static version - static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); + static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); // XChild virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 5324ad2f3e11..56542d201e81 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -76,8 +76,8 @@ namespace frm ElementDescription& operator=( const ElementDescription& ) SAL_DELETED_FUNCTION; }; -typedef std::vector<InterfaceRef> OInterfaceArray; -typedef std::unordered_multimap< OUString, InterfaceRef, OUStringHash > OInterfaceMap; +typedef std::vector<css::uno::Reference<css::uno::XInterface>> OInterfaceArray; +typedef std::unordered_multimap< OUString, css::uno::Reference<css::uno::XInterface>, OUStringHash > OInterfaceMap; // OInterfaceContainer @@ -145,7 +145,7 @@ public: // ::com::sun::star::container::XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual StringSequence SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XNameReplace @@ -223,7 +223,7 @@ protected: // called after the object is inserted, but before the "real listeners" are notified virtual void implInserted( const ElementDescription* _pElement ); // called after the object is removed, but before the "real listeners" are notified - virtual void implRemoved(const InterfaceRef& _rxObject); + virtual void implRemoved(const css::uno::Reference<css::uno::XInterface>& _rxObject); /** called after an object was replaced. The default implementation notifies our listeners, after releasing the instance lock. @@ -289,7 +289,7 @@ class OFormComponents :public FormComponentsBase { protected: ::osl::Mutex m_aMutex; - ::comphelper::InterfaceRef m_xParent; + css::uno::Reference<css::uno::XInterface> m_xParent; public: OFormComponents(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); @@ -305,8 +305,8 @@ public: virtual void SAL_CALL disposing() SAL_OVERRIDE; // ::com::sun::star::form::XFormComponent - virtual ::comphelper::InterfaceRef SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setParent(const ::comphelper::InterfaceRef& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener using OInterfaceContainer::disposing; diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index f0bf92bad1c9..4e54c53a382e 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -39,7 +39,6 @@ #include <comphelper/eventattachermgr.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/queryinterface.hxx> #include <tools/debug.hxx> @@ -683,9 +682,9 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) { OInterfaceMap::iterator i = m_aMap.find(::comphelper::getString(evt.OldValue)); if (i != m_aMap.end() && (*i).second != evt.Source) { - InterfaceRef xCorrectType((*i).second); + css::uno::Reference<css::uno::XInterface> xCorrectType((*i).second); m_aMap.erase(i); - m_aMap.insert(::std::pair<const OUString, InterfaceRef >(::comphelper::getString(evt.NewValue),xCorrectType)); + m_aMap.insert(::std::pair<const OUString, css::uno::Reference<css::uno::XInterface> >(::comphelper::getString(evt.NewValue),xCorrectType)); } } } @@ -725,9 +724,9 @@ Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSu } -StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeException, std::exception) +css::uno::Sequence<OUString> SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeException, std::exception) { - StringSequence aNameList(m_aItems.size()); + css::uno::Sequence<OUString> aNameList(m_aItems.size()); OUString* pStringArray = aNameList.getArray(); for (OInterfaceMap::const_iterator i = m_aMap.begin(); i != m_aMap.end(); ++i, ++pStringArray) @@ -836,7 +835,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper else m_aItems.insert( m_aItems.begin() + _nIndex, pElementMetaData->xInterface ); - m_aMap.insert( ::std::pair< const OUString, InterfaceRef >( sName, pElementMetaData->xInterface ) ); + m_aMap.insert( ::std::pair< const OUString, css::uno::Reference<css::uno::XInterface> >( sName, pElementMetaData->xInterface ) ); // announce ourself as parent to the new element pElementMetaData->xChild->setParent(static_cast<XContainer*>(this)); @@ -901,7 +900,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper void OInterfaceContainer::removeElementsNoEvents(sal_Int32 nIndex) { OInterfaceArray::iterator i = m_aItems.begin() + nIndex; - InterfaceRef xElement(*i); + css::uno::Reference<css::uno::XInterface> xElement(*i); OInterfaceMap::iterator j = m_aMap.begin(); while (j != m_aMap.end() && (*j).second != xElement) ++j; @@ -915,7 +914,7 @@ void OInterfaceContainer::removeElementsNoEvents(sal_Int32 nIndex) Reference<XChild> xChild(xElement, UNO_QUERY); if (xChild.is()) - xChild->setParent(InterfaceRef ()); + xChild->setParent(css::uno::Reference<css::uno::XInterface> ()); } @@ -925,7 +924,7 @@ void OInterfaceContainer::implInserted( const ElementDescription* /*_pElement*/ } -void OInterfaceContainer::implRemoved( const InterfaceRef& /*_rxObject*/ ) +void OInterfaceContainer::implRemoved( const css::uno::Reference<css::uno::XInterface>& /*_rxObject*/ ) { // not inrerested in } @@ -961,7 +960,7 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any } // get the old element - InterfaceRef xOldElement( m_aItems[ _nIndex ] ); + css::uno::Reference<css::uno::XInterface> xOldElement( m_aItems[ _nIndex ] ); DBG_ASSERT( xOldElement.get() == Reference< XInterface >( xOldElement, UNO_QUERY ).get(), "OInterfaceContainer::implReplaceByIndex: elements should be held normalized!" ); @@ -973,7 +972,7 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any // remove event knittings if ( m_xEventAttacher.is() ) { - InterfaceRef xNormalized( xOldElement, UNO_QUERY ); + css::uno::Reference<css::uno::XInterface> xNormalized( xOldElement, UNO_QUERY ); m_xEventAttacher->detach( _nIndex, xNormalized ); m_xEventAttacher->removeEntry( _nIndex ); } @@ -986,7 +985,7 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any // give the old element a new (void) parent Reference<XChild> xChild(xOldElement, UNO_QUERY); if (xChild.is()) - xChild->setParent(InterfaceRef ()); + xChild->setParent(css::uno::Reference<css::uno::XInterface> ()); // remove the old one m_aMap.erase(j); @@ -999,7 +998,7 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any aElementMetaData.get()->xPropertySet->addPropertyChangeListener(PROPERTY_NAME, this); // insert the new one - m_aMap.insert( ::std::pair<const OUString, InterfaceRef >( sName, aElementMetaData.get()->xInterface ) ); + m_aMap.insert( ::std::pair<const OUString, css::uno::Reference<css::uno::XInterface> >( sName, aElementMetaData.get()->xInterface ) ); m_aItems[ _nIndex ] = aElementMetaData.get()->xInterface; aElementMetaData.get()->xChild->setParent(static_cast<XContainer*>(this)); @@ -1042,7 +1041,7 @@ void OInterfaceContainer::implRemoveByIndex( const sal_Int32 _nIndex, ::osl::Cle OSL_PRECOND( ( _nIndex >= 0 ) && ( _nIndex < (sal_Int32)m_aItems.size() ), "OInterfaceContainer::implRemoveByIndex: precondition not met (index)!" ); OInterfaceArray::iterator i = m_aItems.begin() + _nIndex; - InterfaceRef xElement(*i); + css::uno::Reference<css::uno::XInterface> xElement(*i); OInterfaceMap::iterator j = m_aMap.begin(); while (j != m_aMap.end() && (*j).second != xElement) ++j; @@ -1053,7 +1052,7 @@ void OInterfaceContainer::implRemoveByIndex( const sal_Int32 _nIndex, ::osl::Cle // remove event knittings if ( m_xEventAttacher.is() ) { - InterfaceRef xNormalized( xElement, UNO_QUERY ); + css::uno::Reference<css::uno::XInterface> xNormalized( xElement, UNO_QUERY ); m_xEventAttacher->detach( _nIndex, xNormalized ); m_xEventAttacher->removeEntry( _nIndex ); } @@ -1064,7 +1063,7 @@ void OInterfaceContainer::implRemoveByIndex( const sal_Int32 _nIndex, ::osl::Cle Reference<XChild> xChild(xElement, UNO_QUERY); if (xChild.is()) - xChild->setParent(InterfaceRef ()); + xChild->setParent(css::uno::Reference<css::uno::XInterface> ()); // notify derived classes implRemoved(xElement); @@ -1325,14 +1324,14 @@ void OFormComponents::disposing() //XChild -void OFormComponents::setParent(const InterfaceRef& Parent) throw( NoSupportException, RuntimeException, std::exception ) +void OFormComponents::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw( NoSupportException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); m_xParent = Parent; } -InterfaceRef OFormComponents::getParent() throw( RuntimeException, std::exception ) +css::uno::Reference<css::uno::XInterface> OFormComponents::getParent() throw( RuntimeException, std::exception ) { return m_xParent; } diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx index 4ffb6c81b307..feeb522c284c 100644 --- a/include/comphelper/types.hxx +++ b/include/comphelper/types.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XComponent.hpp> @@ -37,11 +36,6 @@ namespace com { namespace sun { namespace star { namespace awt { namespace comphelper { - - typedef css::uno::Reference< css::uno::XInterface > InterfaceRef; - typedef css::uno::Sequence< OUString > StringSequence; - - /** compare the two given Anys The comparison is deep, means if one of the Any's contains an Any which contains an Any ..., this is resolved <br/> Other types recognized currently : FontDescriptor, ::com::sun::star::util::Date/Tim/DateTime, css::uno::Sequence<sal_Int8> diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 29832e2f7bef..a8ef263468d8 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -107,7 +107,7 @@ namespace svt // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; // OPropertySetHelper virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index 7489dfbfa315..9ae5cbd38561 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -58,7 +58,7 @@ namespace { // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) SAL_OVERRIDE; @@ -99,9 +99,9 @@ namespace { } - ::comphelper::StringSequence SAL_CALL OAddressBookSourceDialogUno::getSupportedServiceNames() throw(RuntimeException, std::exception) + css::uno::Sequence<OUString> SAL_CALL OAddressBookSourceDialogUno::getSupportedServiceNames() throw(RuntimeException, std::exception) { - ::comphelper::StringSequence aSupported(1); + css::uno::Sequence<OUString> aSupported(1); aSupported.getArray()[0] = "com.sun.star.ui.AddressBookSourceDialog"; return aSupported; } diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index dbd9c3850177..e966cecb9c45 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -386,7 +386,7 @@ OUString SAL_CALL FmXGridControl::getImplementationName() throw(std::exception) return OUString("com.sun.star.form.FmXGridControl"); } -::comphelper::StringSequence SAL_CALL FmXGridControl::getSupportedServiceNames() throw(std::exception) +css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedServiceNames() throw(std::exception) { Sequence< OUString > aServiceNames(2); aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL; @@ -961,10 +961,10 @@ OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException, std::except } -::comphelper::StringSequence SAL_CALL FmXGridControl::getSupportedModes() throw( RuntimeException, std::exception ) +css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedModes() throw( RuntimeException, std::exception ) { Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); - return xPeer.is() ? xPeer->getSupportedModes() : ::comphelper::StringSequence(); + return xPeer.is() ? xPeer->getSupportedModes() : css::uno::Sequence<OUString>(); } @@ -1386,7 +1386,7 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeE else if (pGrid && m_xColumns.is() && m_xColumns->hasElements()) { // next find which column has changed - ::comphelper::InterfaceRef xCurrent; + css::uno::Reference<css::uno::XInterface> xCurrent; sal_Int32 i; for ( i = 0; i < m_xColumns->getCount(); i++) @@ -2377,9 +2377,9 @@ OUString FmXGridPeer::getMode() throw( RuntimeException, std::exception ) } -::comphelper::StringSequence FmXGridPeer::getSupportedModes() throw( RuntimeException, std::exception ) +css::uno::Sequence<OUString> FmXGridPeer::getSupportedModes() throw( RuntimeException, std::exception ) { - static ::comphelper::StringSequence aModes; + static css::uno::Sequence<OUString> aModes; if (!aModes.getLength()) { aModes.realloc(2); @@ -2393,7 +2393,7 @@ OUString FmXGridPeer::getMode() throw( RuntimeException, std::exception ) sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException, std::exception ) { - ::comphelper::StringSequence aModes(getSupportedModes()); + css::uno::Sequence<OUString> aModes(getSupportedModes()); const OUString* pModes = aModes.getConstArray(); for (sal_Int32 i = aModes.getLength(); i > 0; ) { diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 6863c9574601..73cbd3bf269b 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2432,7 +2432,7 @@ void DbComboBox::SetList(const Any& rItems) ComboBoxControl* pField = static_cast<ComboBoxControl*>(m_pWindow.get()); pField->Clear(); - ::comphelper::StringSequence aTest; + css::uno::Sequence<OUString> aTest; if (rItems >>= aTest) { const OUString* pStrings = aTest.getConstArray(); @@ -2553,7 +2553,7 @@ void DbListBox::SetList(const Any& rItems) pField->Clear(); m_bBound = false; - ::comphelper::StringSequence aTest; + css::uno::Sequence<OUString> aTest; if (rItems >>= aTest) { const OUString* pStrings = aTest.getConstArray(); @@ -2716,7 +2716,7 @@ void DbFilterField::PaintCell(OutputDevice& rDev, const Rectangle& rRect) void DbFilterField::SetList(const Any& rItems, bool bComboBox) { - ::comphelper::StringSequence aTest; + css::uno::Sequence<OUString> aTest; rItems >>= aTest; const OUString* pStrings = aTest.getConstArray(); sal_Int32 nItems = aTest.getLength(); @@ -4095,7 +4095,7 @@ void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos) thr } -void SAL_CALL FmXListBoxCell::addItems(const ::comphelper::StringSequence& aItems, sal_Int16 nPos) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::addItems(const css::uno::Sequence<OUString>& aItems, sal_Int16 nPos) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if (m_pBox) @@ -4135,15 +4135,15 @@ OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos) throw( RuntimeExceptio return m_pBox ? OUString(m_pBox->GetEntry(nPos)) : OUString(); } -::comphelper::StringSequence SAL_CALL FmXListBoxCell::getItems() throw( RuntimeException, std::exception ) +css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getItems() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); - ::comphelper::StringSequence aSeq; + css::uno::Sequence<OUString> aSeq; if (m_pBox) { sal_uInt16 nEntries = m_pBox ->GetEntryCount(); - aSeq = ::comphelper::StringSequence( nEntries ); + aSeq = css::uno::Sequence<OUString>( nEntries ); for ( sal_uInt16 n = nEntries; n; ) { --n; @@ -4201,17 +4201,17 @@ OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException, std } -::comphelper::StringSequence SAL_CALL FmXListBoxCell::getSelectedItems() throw( RuntimeException, std::exception ) +css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getSelectedItems() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); - ::comphelper::StringSequence aSeq; + css::uno::Sequence<OUString> aSeq; if (m_pBox) { UpdateFromColumn(); sal_uInt16 nSelEntries = m_pBox->GetSelectEntryCount(); - aSeq = ::comphelper::StringSequence( nSelEntries ); + aSeq = css::uno::Sequence<OUString>( nSelEntries ); for ( sal_uInt16 n = 0; n < nSelEntries; n++ ) aSeq.getArray()[n] = m_pBox->GetSelectEntry( n ); } diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index 23f3de93b60c..d002874235f3 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -25,9 +25,9 @@ using namespace ::com::sun::star::uno; -const ::comphelper::StringSequence& getColumnTypes() +const css::uno::Sequence<OUString>& getColumnTypes() { - static ::comphelper::StringSequence aColumnTypes(10); + static css::uno::Sequence<OUString> aColumnTypes(10); if (aColumnTypes.getConstArray()[0].isEmpty()) { OUString* pNames = aColumnTypes.getArray(); @@ -89,7 +89,7 @@ sal_Int32 getColumnTypeByModelName(const OUString& aModelName) ? aModelName.copy(aModelPrefix.getLength()) : aModelName.copy(aCompatibleModelPrefix.getLength()); - const ::comphelper::StringSequence& rColumnTypes = getColumnTypes(); + const css::uno::Sequence<OUString>& rColumnTypes = getColumnTypes(); nTypeId = lcl_findPos(aColumnType, rColumnTypes); } return nTypeId; diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index eaf48e26b6a2..c905e9a3b8d3 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -53,7 +53,7 @@ namespace svxform Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames() { - ::comphelper::StringSequence aSupported( 1 ); + css::uno::Sequence<OUString> aSupported( 1 ); aSupported.getArray()[0] = "com.sun.star.xforms.ui.dialogs.AddCondition"; return aSupported; } |