[Libreoffice-commits] core.git: chart2/source comphelper/source dbaccess/source extensions/source forms/source include/comphelper include/svtools svtools/source svx/source
Stephan Bergmann
sbergman at redhat.com
Wed Aug 19 04:35:24 PDT 2015
chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx | 2
chart2/source/controller/inc/dlg_ChartType_UNO.hxx | 2
comphelper/source/misc/types.cxx | 2
dbaccess/source/ui/browser/exsrcbrw.cxx | 6 +-
dbaccess/source/ui/browser/formadapter.cxx | 2
dbaccess/source/ui/browser/sbagrid.cxx | 2
dbaccess/source/ui/browser/unodatbr.cxx | 6 +-
dbaccess/source/ui/inc/exsrcbrw.hxx | 2
dbaccess/source/ui/inc/sbagrid.hxx | 2
dbaccess/source/ui/inc/unodatbr.hxx | 2
dbaccess/source/ui/inc/unosqlmessage.hxx | 2
dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 8 +--
dbaccess/source/ui/uno/DBTypeWizDlg.cxx | 6 +-
dbaccess/source/ui/uno/DBTypeWizDlg.hxx | 2
dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 6 +-
dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 2
dbaccess/source/ui/uno/TableFilterDlg.cxx | 6 +-
dbaccess/source/ui/uno/TableFilterDlg.hxx | 2
dbaccess/source/ui/uno/UserSettingsDlg.cxx | 6 +-
dbaccess/source/ui/uno/UserSettingsDlg.hxx | 2
dbaccess/source/ui/uno/admindlg.cxx | 6 +-
dbaccess/source/ui/uno/admindlg.hxx | 2
dbaccess/source/ui/uno/copytablewizard.cxx | 8 +--
dbaccess/source/ui/uno/unosqlmessage.cxx | 6 +-
extensions/source/abpilot/unodialogabp.cxx | 6 +-
extensions/source/abpilot/unodialogabp.hxx | 2
extensions/source/dbpilots/unoautopilot.hxx | 2
extensions/source/propctrlr/MasterDetailLinkDialog.cxx | 6 +-
extensions/source/propctrlr/MasterDetailLinkDialog.hxx | 2
extensions/source/propctrlr/controlfontdialog.cxx | 6 +-
extensions/source/propctrlr/controlfontdialog.hxx | 2
extensions/source/propctrlr/pcrunodialogs.cxx | 6 +-
extensions/source/propctrlr/pcrunodialogs.hxx | 2
forms/source/component/Button.cxx | 8 +--
forms/source/component/Button.hxx | 4 -
forms/source/component/CheckBox.cxx | 8 +--
forms/source/component/CheckBox.hxx | 4 -
forms/source/component/Columns.cxx | 9 +---
forms/source/component/Columns.hxx | 2
forms/source/component/ComboBox.cxx | 22 +++++-----
forms/source/component/ComboBox.hxx | 6 +-
forms/source/component/Currency.cxx | 8 +--
forms/source/component/Currency.hxx | 4 -
forms/source/component/DatabaseForm.cxx | 12 ++---
forms/source/component/DatabaseForm.hxx | 8 +--
forms/source/component/Date.cxx | 8 +--
forms/source/component/Date.hxx | 4 -
forms/source/component/Edit.cxx | 12 ++---
forms/source/component/Edit.hxx | 4 -
forms/source/component/EventThread.cxx | 4 -
forms/source/component/File.cxx | 4 -
forms/source/component/File.hxx | 2
forms/source/component/FixedText.cxx | 4 -
forms/source/component/FixedText.hxx | 2
forms/source/component/FormComponent.cxx | 2
forms/source/component/FormattedField.cxx | 12 ++---
forms/source/component/FormattedField.hxx | 4 -
forms/source/component/FormattedFieldWrapper.cxx | 10 ++--
forms/source/component/FormattedFieldWrapper.hxx | 2
forms/source/component/FormsCollection.cxx | 8 +--
forms/source/component/FormsCollection.hxx | 8 +--
forms/source/component/Grid.cxx | 16 +++----
forms/source/component/Grid.hxx | 10 ++--
forms/source/component/GroupBox.cxx | 8 +--
forms/source/component/GroupBox.hxx | 4 -
forms/source/component/Hidden.cxx | 2
forms/source/component/Hidden.hxx | 2
forms/source/component/ImageButton.cxx | 8 +--
forms/source/component/ImageButton.hxx | 4 -
forms/source/component/ImageControl.cxx | 8 +--
forms/source/component/ImageControl.hxx | 4 -
forms/source/component/ListBox.cxx | 20 ++++-----
forms/source/component/ListBox.hxx | 4 -
forms/source/component/Numeric.cxx | 8 +--
forms/source/component/Numeric.hxx | 4 -
forms/source/component/Pattern.cxx | 8 +--
forms/source/component/Pattern.hxx | 4 -
forms/source/component/RadioButton.cxx | 12 ++---
forms/source/component/RadioButton.hxx | 4 -
forms/source/component/Time.cxx | 8 +--
forms/source/component/Time.hxx | 4 -
forms/source/component/clickableimage.cxx | 2
forms/source/inc/FormComponent.hxx | 22 +++++-----
forms/source/inc/InterfaceContainer.hxx | 14 +++---
forms/source/misc/InterfaceContainer.cxx | 35 ++++++++---------
include/comphelper/types.hxx | 6 --
include/svtools/genericunodialog.hxx | 2
svtools/source/uno/addrtempuno.cxx | 6 +-
svx/source/fmcomp/fmgridif.cxx | 14 +++---
svx/source/fmcomp/gridcell.cxx | 20 ++++-----
svx/source/fmcomp/gridcols.cxx | 6 +-
svx/source/form/xfm_addcondition.cxx | 2
92 files changed, 287 insertions(+), 295 deletions(-)
New commits:
commit d21260cdb6e6fa898ed90bafb41ba4fe5dd3140c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Aug 19 13:34:43 2015 +0200
Remove two silly typedefs
Change-Id: Ia7de1cebf6009e770ca1b96bab6d5e121573ccc1
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index 67e827f..ee42cd0 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 524a87c..611db51 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 9dc225f..e81a813 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 4a4efbc..004faa6 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 75f851a..87c8a5a 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 f1f5589..29ca432 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 78f1c49..c776e6f 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 4a72a13..737c8c5 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 d12fb09..0ffd2f1 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 2bf3406..8aad618 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 617f184..c365565 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 0434dea..a277d9b 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 a667d1f..d39aec3 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 e1193ab..f8dc22b 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 f13cc2e..c575b49 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 0ff240f..aa6b89e 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 813736d..203f924 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 0b036fa..5901a8c 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 db51ea5..22b66f5 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 0923ffc..6ecaa14 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 adfe04c..9b854eb 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 1ee90ae..e511940 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 3ba09f0..05e5a2d 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 897974c..49b3d83 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 990b313..6077f01 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 d9ff057..ba4c620 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 83a58ee..638e97e 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 7f87be7..4f37497 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 924b062..3cb4664 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 37a0488..96ccc57 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 f2b2041..aa49cd2 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 98c4b49..d45d3e5 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 35663f1..8257540 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 2f31859..9d5f55d 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 cd28061..825d8dc 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 dc4d86f..d19405e 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 c27e0b2..1ce87f4 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 94c7e5f..aac57f6 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 ecfa789..008b6a1 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 654d962..c7dbe98 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 b752c32..e5348fc 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 bc7975d..28844bc 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 98230b9..dc51cd8 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 47488b2..56d6121 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 5e6c4ab..2a5f1d7 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 ace2196..b28531e 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 2971008..f54ac84 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 d52353d..3c4f6bf 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 1d17c00..52b32b3 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 f03ac95..e4210c5 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 015a9fb..eb6dff1 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 80b3ef6..23a27a0 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 b281b50..bf3acda 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 d6299e4..0bbe9e7 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 cc27283..f2d0ac4 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 0d385ac..5a91466 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 3c771d5..812f7f2 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 963ab91..463320c 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 36a8c47..388319d 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 074c8f7..f5b497e 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 5398542..b31ab79 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 81f923d..e13f36b 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 a5ed51e..352154a 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 73792e1..e099197 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 0c9ebed..1bad75a 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 92b1500..78a0ea2 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 68a29a5..223e31d 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 7a677d5..5e02e96 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 1d9dd1a..360795d 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 8f66e1b..cb24bb3 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 6122336..cb0b05e 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 752a618..a48ec94 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 3506379..8740da1 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 2d1cb74..e7fb495 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 5b97d9e..ad9e6ff 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;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list