mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove two silly typedefs

Browse Source 
Change-Id: Ia7de1cebf6009e770ca1b96bab6d5e121573ccc1
This commit is contained in:
Stephan Bergmann 2015-08-19 13:34:43 +02:00
parent 9528fb4a6a
commit d21260cdb6
92 changed files with 287 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
View File

@ -51,7 +51,7 @@ OUString ChartTypeUnoDlg::getImplementationName_Static() throw(uno::RuntimeExcep
return OUString(CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME); 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(); return getSupportedServiceNames_Static();
} }

2
chart2/source/controller/inc/dlg_ChartType_UNO.hxx
View File

@ -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; virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
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 // 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; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

2
comphelper/source/misc/types.cxx
View File

@ -284,7 +284,7 @@ bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue)
} }
case TypeClass_INTERFACE: case TypeClass_INTERFACE:
{ {
InterfaceRef aDummy; css::uno::Reference<css::uno::XInterface> aDummy;
bConversionSuccess = tryCompare(pData, _rValue, bRes, aDummy); bConversionSuccess = tryCompare(pData, _rValue, bRes, aDummy);
break; break;
} }

6
dbaccess/source/ui/browser/exsrcbrw.cxx
View File

@ -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(); return getSupportedServiceNames_Static();
} }
@ -83,9 +83,9 @@ OUString SbaExternalSourceBrowser::getImplementationName_Static() throw(RuntimeE
return OUString("org.openoffice.comp.dbu.OFormGridView"); 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"; aSupported[0] = "com.sun.star.sdb.FormGridView";
return aSupported; return aSupported;
} }

2
dbaccess/source/ui/browser/formadapter.cxx
View File

@ -144,7 +144,7 @@ void SbaXFormAdapter::StartListening()
Reference< css::beans::XMultiPropertySet > xBroadcaster(m_xMainForm, UNO_QUERY); Reference< css::beans::XMultiPropertySet > xBroadcaster(m_xMainForm, UNO_QUERY);
OUString sEmpty; OUString sEmpty;
if (xBroadcaster.is()) if (xBroadcaster.is())
xBroadcaster->addPropertiesChangeListener(::comphelper::StringSequence(&sEmpty, 1), &m_aPropertiesChangeListeners); xBroadcaster->addPropertiesChangeListener(css::uno::Sequence<OUString>(&sEmpty, 1), &m_aPropertiesChangeListeners);
} }
// log off ourself // log off ourself

2
dbaccess/source/ui/browser/sbagrid.cxx
View File

@ -107,7 +107,7 @@ extern "C" void SAL_CALL createRegistryInfo_SbaXGridControl()
static OMultiInstanceAutoRegistration< SbaXGridControl > aAutoRegistration; 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(); return getSupportedServiceNames_Static();
} }

6
dbaccess/source/ui/browser/unodatbr.cxx
View File

@ -185,7 +185,7 @@ OUString SAL_CALL SbaTableQueryBrowser::getImplementationName() throw(RuntimeExc
return getImplementationName_Static(); 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(); return getSupportedServiceNames_Static();
} }
@ -195,9 +195,9 @@ OUString SbaTableQueryBrowser::getImplementationName_Static() throw(RuntimeExcep
return OUString("org.openoffice.comp.dbu.ODatasourceBrowser"); 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"; aSupported[0] = "com.sun.star.sdb.DataSourceBrowser";
return aSupported; return aSupported;
} }

2
dbaccess/source/ui/inc/exsrcbrw.hxx
View File

@ -80,7 +80,7 @@ namespace dbaui
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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: protected:
virtual ~SbaExternalSourceBrowser(); virtual ~SbaExternalSourceBrowser();

2
dbaccess/source/ui/inc/sbagrid.hxx
View File

@ -70,7 +70,7 @@ namespace dbaui
// css::lang::XServiceInfo // css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; 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 // need by registration
static OUString getImplementationName_Static() throw( css::uno::RuntimeException ); static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );

2
dbaccess/source/ui/inc/unodatbr.hxx
View File

@ -179,7 +179,7 @@ namespace dbaui
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 // XContainerListener
virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;

2
dbaccess/source/ui/inc/unosqlmessage.hxx
View File

@ -48,7 +48,7 @@ public:
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 // XServiceInfo - static methods
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );

8
dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
View File

@ -47,7 +47,7 @@ namespace dbaui
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 // XServiceInfo - static methods
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
@ -90,14 +90,14 @@ namespace dbaui
return OUString("org.openoffice.comp.dbu.OAdvancedSettingsDialog"); 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(); 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"; aSupported[0] = "com.sun.star.sdb.AdvancedDatabaseSettingsDialog";
return aSupported; return aSupported;
} }

6
dbaccess/source/ui/uno/DBTypeWizDlg.cxx
View File

@ -62,14 +62,14 @@ OUString ODBTypeWizDialog::getImplementationName_Static() throw(RuntimeException
return OUString("org.openoffice.comp.dbu.ODBTypeWizDialog"); 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(); 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"; aSupported[0] = "com.sun.star.sdb.DataSourceTypeChangeDialog";
return aSupported; return aSupported;
} }

2
dbaccess/source/ui/uno/DBTypeWizDlg.hxx
View File

@ -39,7 +39,7 @@ public:
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 // XServiceInfo - static methods
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );

6
dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
View File

@ -77,14 +77,14 @@ OUString ODBTypeWizDialogSetup::getImplementationName_Static() throw(RuntimeExce
return OUString("org.openoffice.comp.dbu.ODBTypeWizDialogSetup"); 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(); 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"; aSupported[0] = "com.sun.star.sdb.DatabaseWizardDialog";
return aSupported; return aSupported;
} }

2
dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
View File

@ -41,7 +41,7 @@ public:
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 // XServiceInfo - static methods
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );

6
dbaccess/source/ui/uno/TableFilterDlg.cxx
View File

@ -62,14 +62,14 @@ OUString OTableFilterDialog::getImplementationName_Static() throw(RuntimeExcepti
return OUString("org.openoffice.comp.dbu.OTableFilterDialog"); 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(); 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"; aSupported[0] = "com.sun.star.sdb.TableFilterDialog";
return aSupported; return aSupported;
} }

2
dbaccess/source/ui/uno/TableFilterDlg.hxx
View File

@ -39,7 +39,7 @@ public:
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 // XServiceInfo - static methods
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );

6
dbaccess/source/ui/uno/UserSettingsDlg.cxx
View File

@ -62,14 +62,14 @@ OUString OUserSettingsDialog::getImplementationName_Static() throw(RuntimeExcept
return OUString("org.openoffice.comp.dbu.OUserSettingsDialog"); 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(); 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"; aSupported[0] = "com.sun.star.sdb.UserAdministrationDialog";
return aSupported; return aSupported;
} }

2
dbaccess/source/ui/uno/UserSettingsDlg.hxx
View File

@ -39,7 +39,7 @@ public:
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 // XServiceInfo - static methods
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );

6
dbaccess/source/ui/uno/admindlg.cxx
View File

@ -62,14 +62,14 @@ OUString ODataSourcePropertyDialog::getImplementationName_Static() throw(Runtime
return OUString("org.openoffice.comp.dbu.ODatasourceAdministrationDialog"); 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(); 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"; aSupported[0] = "com.sun.star.sdb.DatasourceAdministrationDialog";
return aSupported; return aSupported;
} }

2
dbaccess/source/ui/uno/admindlg.hxx
View File

@ -39,7 +39,7 @@ public:
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 // XServiceInfo - static methods
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException ); static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );

8
dbaccess/source/ui/uno/copytablewizard.cxx
View File

@ -151,7 +151,7 @@ namespace dbaui
public: public:
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; 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 // XServiceInfo - static methods
static Sequence< OUString > getSupportedServiceNames_Static() throw( RuntimeException ); static Sequence< OUString > getSupportedServiceNames_Static() throw( RuntimeException );
@ -423,14 +423,14 @@ OUString CopyTableWizard::getImplementationName_Static() throw(RuntimeException)
return OUString( "org.openoffice.comp.dbu.CopyTableWizard" ); 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(); 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"; aSupported.getArray()[0] = "com.sun.star.sdb.application.CopyTableWizard";
return aSupported; return aSupported;
} }

6
dbaccess/source/ui/uno/unosqlmessage.cxx
View File

@ -73,14 +73,14 @@ OUString OSQLMessageDialog::getImplementationName_Static() throw(RuntimeExceptio
return OUString("org.openoffice.comp.dbu.OSQLMessageDialog"); 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(); 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"; aSupported.getArray()[0] = "com.sun.star.sdb.ErrorMessageDialog";
return aSupported; return aSupported;
} }

6
extensions/source/abpilot/unodialogabp.cxx
View File

@ -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(); 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"; aSupported[0] = "com.sun.star.ui.dialogs.AddressBookSourcePilot";
return aSupported; return aSupported;
} }

2
extensions/source/abpilot/unodialogabp.hxx
View File

@ -56,7 +56,7 @@ namespace abp
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
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 // XServiceInfo - static methods
static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException );

2
extensions/source/dbpilots/unoautopilot.hxx
View File

@ -61,7 +61,7 @@ namespace dbp
return getImplementationName_Static(); 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(); return getSupportedServiceNames_Static();
} }

6
extensions/source/propctrlr/MasterDetailLinkDialog.cxx
View File

@ -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(); 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"; aSupported[0] = "com.sun.star.form.MasterDetailLinkDialog";
return aSupported; return aSupported;
} }

2
extensions/source/propctrlr/MasterDetailLinkDialog.hxx
View File

@ -47,7 +47,7 @@ namespace pcr
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
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 // 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; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

6
extensions/source/propctrlr/controlfontdialog.cxx
View File

@ -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(); 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"; aSupported[0] = "com.sun.star.form.ControlFontDialog";
return aSupported; return aSupported;
} }

2
extensions/source/propctrlr/controlfontdialog.hxx
View File

@ -58,7 +58,7 @@ namespace pcr
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
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 // XServiceInfo - static methods
static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static() throw( ::com::sun::star::uno::RuntimeException );

6
extensions/source/propctrlr/pcrunodialogs.cxx
View File

@ -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(); 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()[0] = "com.sun.star.form.ui.TabOrderDialog";
aSupported.getArray()[1] = "com.sun.star.form.TabOrderDialog"; aSupported.getArray()[1] = "com.sun.star.form.TabOrderDialog";
return aSupported; return aSupported;

2
extensions/source/propctrlr/pcrunodialogs.hxx
View File

@ -58,7 +58,7 @@ namespace pcr
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
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 // XServiceInfo - static methods
static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static() throw( ::com::sun::star::uno::RuntimeException );

8
forms/source/component/Button.cxx
View File

@ -113,9 +113,9 @@ IMPLEMENT_DEFAULT_CLONING( OButtonModel )
// XServiceInfo // 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 ); aSupported.realloc( aSupported.getLength() + 2 );
OUString* pArray = aSupported.getArray(); 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); aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray(); OUString*pArray = aSupported.getArray();

4
forms/source/component/Button.hxx
View File

@ -59,7 +59,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OButtonModel"); } { 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 // ::com::sun::star::io::XPersistObject
virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OButtonControl"); } { 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 // UNO binding
DECLARE_UNO3_AGG_DEFAULTS(OButtonControl, OClickableImageBaseControl) DECLARE_UNO3_AGG_DEFAULTS(OButtonControl, OClickableImageBaseControl)

8
forms/source/component/CheckBox.cxx
View File

@ -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); aSupported.realloc(aSupported.getLength() + 2);
OUString* pArray = aSupported.getArray(); OUString* pArray = aSupported.getArray();
@ -84,9 +84,9 @@ IMPLEMENT_DEFAULT_CLONING( OCheckBoxModel )
// XServiceInfo // 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(); sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 9 ); aSupported.realloc( nOldLen + 9 );

4
forms/source/component/CheckBox.hxx
View File

@ -39,7 +39,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OCheckBoxModel"); } { 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 // XPersistObject
virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OCheckBoxControl"); } { 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;
}; };

9
forms/source/component/Columns.cxx
View File

@ -36,7 +36,6 @@
#include <comphelper/sequence.hxx> #include <comphelper/sequence.hxx>
#include <comphelper/property.hxx> #include <comphelper/property.hxx>
#include <comphelper/basicio.hxx> #include <comphelper/basicio.hxx>
#include <comphelper/types.hxx>
#include <comphelper/servicehelper.hxx> #include <comphelper/servicehelper.hxx>
#include "services.hxx" #include "services.hxx"
#include "frm_resource.hrc" #include "frm_resource.hrc"
@ -63,9 +62,9 @@ const sal_uInt16 OLD_HIDDEN = 0x0004;
const sal_uInt16 COMPATIBLE_HIDDEN = 0x0008; 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()) if (aColumnTypes.getConstArray()[0].isEmpty())
{ {
OUString* pNames = aColumnTypes.getArray(); OUString* pNames = aColumnTypes.getArray();
@ -105,7 +104,7 @@ sal_Int32 getColumnTypeByModelName(const OUString& aModelName)
? aModelName.copy(aModelPrefix.getLength()) ? aModelName.copy(aModelPrefix.getLength())
: aModelName.copy(aCompatibleModelPrefix.getLength()); : aModelName.copy(aCompatibleModelPrefix.getLength());
const StringSequence& rColumnTypes = getColumnTypes(); const css::uno::Sequence<OUString>& rColumnTypes = getColumnTypes();
nTypeId = ::detail::findPos(aColumnType, rColumnTypes); nTypeId = ::detail::findPos(aColumnType, rColumnTypes);
} }
return nTypeId; return nTypeId;
@ -262,7 +261,7 @@ OGridColumn::~OGridColumn()
// Free the aggregate // Free the aggregate
if (m_xAggregate.is()) if (m_xAggregate.is())
{ {
InterfaceRef xIface; css::uno::Reference<css::uno::XInterface> xIface;
m_xAggregate->setDelegator(xIface); m_xAggregate->setDelegator(xIface);
} }

2
forms/source/component/Columns.hxx
View File

@ -182,7 +182,7 @@ OGridColumn* ClassName::createCloneColumn() const \
#define TYPE_TIMEFIELD 9 #define TYPE_TIMEFIELD 9
// List of all known columns // List of all known columns
const StringSequence& getColumnTypes(); const css::uno::Sequence<OUString>& getColumnTypes();
sal_Int32 getColumnTypeByModelName(const OUString& aModelName); sal_Int32 getColumnTypeByModelName(const OUString& aModelName);
// Columns // Columns

22
forms/source/component/ComboBox.cxx
View File

@ -82,9 +82,9 @@ Sequence<Type> OComboBoxModel::_getTypes()
// XServiceInfo // 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(); sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 9 ); aSupported.realloc( nOldLen + 9 );
@ -336,7 +336,7 @@ void SAL_CALL OComboBoxModel::write(const Reference<css::io::XObjectOutputStream
nAnyMask |= BOUNDCOLUMN; nAnyMask |= BOUNDCOLUMN;
_rxOutStream << nAnyMask; _rxOutStream << nAnyMask;
StringSequence aListSourceSeq(&m_aListSource, 1); css::uno::Sequence<OUString> aListSourceSeq(&m_aListSource, 1);
_rxOutStream << aListSourceSeq; _rxOutStream << aListSourceSeq;
_rxOutStream << (sal_Int16)m_eListSourceType; _rxOutStream << (sal_Int16)m_eListSourceType;
@ -402,7 +402,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>&
else // nVersion == 4 else // nVersion == 4
{ {
m_aListSource.clear(); m_aListSource.clear();
StringSequence aListSource; css::uno::Sequence<OUString> aListSource;
_rxInStream >> aListSource; _rxInStream >> aListSource;
const OUString* pToken = aListSource.getConstArray(); const OUString* pToken = aListSource.getConstArray();
sal_Int32 nLen = aListSource.getLength(); sal_Int32 nLen = aListSource.getLength();
@ -437,7 +437,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>&
&& !hasExternalListSource() && !hasExternalListSource()
) )
{ {
setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( StringSequence() ) ); setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( css::uno::Sequence<OUString>() ) );
} }
if (nVersion > 0x0004) if (nVersion > 0x0004)
@ -634,7 +634,7 @@ void OComboBoxModel::loadData( bool _bForce )
Reference<XNameAccess> xFieldNames = getTableFields(xConnection, m_aListSource); Reference<XNameAccess> xFieldNames = getTableFields(xConnection, m_aListSource);
if (xFieldNames.is()) if (xFieldNames.is())
{ {
StringSequence seqNames = xFieldNames->getElementNames(); css::uno::Sequence<OUString> seqNames = xFieldNames->getElementNames();
sal_Int32 nFieldsCount = seqNames.getLength(); sal_Int32 nFieldsCount = seqNames.getLength();
const OUString* pustrNames = seqNames.getConstArray(); const OUString* pustrNames = seqNames.getConstArray();
@ -659,8 +659,8 @@ void OComboBoxModel::loadData( bool _bForce )
return; return;
} }
// Create StringSequence for ListBox // Create css::uno::Sequence<OUString> for ListBox
StringSequence aStringSeq(aStringList.size()); css::uno::Sequence<OUString> aStringSeq(aStringList.size());
OUString* pStringAry = aStringSeq.getArray(); OUString* pStringAry = aStringSeq.getArray();
for (sal_Int32 i = 0; i<aStringSeq.getLength(); ++i) for (sal_Int32 i = 0; i<aStringSeq.getLength(); ++i)
pStringAry[i] = aStringList[i]; pStringAry[i] = aStringList[i];
@ -758,7 +758,7 @@ bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset )
if ( bAddToList ) if ( bAddToList )
{ {
StringSequence aStringItemList; css::uno::Sequence<OUString> aStringItemList;
if ( getPropertyValue( PROPERTY_STRINGITEMLIST ) >>= aStringItemList ) if ( getPropertyValue( PROPERTY_STRINGITEMLIST ) >>= aStringItemList )
{ {
const OUString* pStringItems = aStringItemList.getConstArray(); 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); aSupported.realloc(aSupported.getLength() + 2);
OUString* pArray = aSupported.getArray(); OUString* pArray = aSupported.getArray();

6
forms/source/component/ComboBox.hxx
View File

@ -52,7 +52,7 @@ class OComboBoxModel
OUString m_aDefaultText; // DefaultText OUString m_aDefaultText; // DefaultText
::com::sun::star::uno::Any m_aLastKnownValue; ::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 // 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. // to lose the user's items then, so we remember them here.
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter> m_xFormatter; ::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 throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OComboBoxModel"); } { 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 // UNO
DECLARE_UNO3_AGG_DEFAULTS(OComboBoxModel, OBoundControlModel) DECLARE_UNO3_AGG_DEFAULTS(OComboBoxModel, OBoundControlModel)
@ -151,7 +151,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OComboBoxControl"); } { 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;
}; };

8
forms/source/component/Currency.cxx
View File

@ -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); aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray(); OUString*pArray = aSupported.getArray();
@ -146,9 +146,9 @@ IMPLEMENT_DEFAULT_CLONING( OCurrencyModel )
// XServiceInfo // 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(); sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 5 ); aSupported.realloc( nOldLen + 5 );

4
forms/source/component/Currency.hxx
View File

@ -42,7 +42,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OCurrencyModel"); } { 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 // ::com::sun::star::io::XPersistObject
virtual OUString SAL_CALL getServiceName() throw ( ::com::sun ::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OCurrencyControl"); } { 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;
}; };

12
forms/source/component/DatabaseForm.cxx
View File

@ -2346,7 +2346,7 @@ void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( Runt
// smartXChild // 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 -----> // SYNCHRONIZED ----->
::osl::ResettableMutexGuard aGuard(m_aMutex); ::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 ) sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) throw( RuntimeException, std::exception )
{ {
// is our aggregate calling? // 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 // Our aggregate doesn't have any ApproveRowSetListeners (expect ourself), as we re-routed the queryInterface
// for XRowSetApproveBroadcaster-interface. // 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 ) sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) throw( RuntimeException, std::exception )
{ {
// is our aggregate calling? // 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 // Our aggregate doesn't have any ApproveRowSetListeners (expect ourself), as we re-routed the queryInterface
// for XRowSetApproveBroadcaster-interface. // 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 ) 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 ); ::osl::ClearableMutexGuard aGuard( m_aMutex );
bool bWasLoaded = isLoaded(); 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(); 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 ); OFormComponents::implRemoved( _rxObject );

8
forms/source/component/DatabaseForm.hxx
View File

@ -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; 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 // com::sun::star::container::XChild
virtual InterfaceRef SAL_CALL getParent() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OFormComponents::getParent(); } 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 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;
// com::sun::star::container::XNamed // com::sun::star::container::XNamed
virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 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 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 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 // 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; 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 // OInterfaceContainer overridables
virtual void implInserted( const ElementDescription* _pElement ) SAL_OVERRIDE; 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 // OPropertyChangeListener
virtual void _propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void _propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;

8
forms/source/component/Date.cxx
View File

@ -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); aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray(); OUString*pArray = aSupported.getArray();
@ -120,9 +120,9 @@ IMPLEMENT_DEFAULT_CLONING( ODateModel )
// XServiceInfo // 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(); sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 9 ); aSupported.realloc( nOldLen + 9 );

4
forms/source/component/Date.hxx
View File

@ -55,7 +55,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.ODateModel"); } { 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 // XPropertySet
using OEditBaseModel::getFastPropertyValue; using OEditBaseModel::getFastPropertyValue;
@ -106,7 +106,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.ODateControl"); } { 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;
}; };

12
forms/source/component/Edit.cxx
View File

@ -139,9 +139,9 @@ void OEditControl::disposing()
// XServiceInfo // 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); aSupported.realloc(aSupported.getLength() + 3);
OUString*pArray = aSupported.getArray(); OUString*pArray = aSupported.getArray();
@ -201,7 +201,7 @@ void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw (
return; return;
Reference<XFormComponent> xFComp(xSet, UNO_QUERY); Reference<XFormComponent> xFComp(xSet, UNO_QUERY);
InterfaceRef xParent = xFComp->getParent(); css::uno::Reference<css::uno::XInterface> xParent = xFComp->getParent();
if( !xParent.is() ) if( !xParent.is() )
return; return;
@ -252,7 +252,7 @@ IMPL_LINK_NOARG(OEditControl, OnKeyPressed)
m_nKeyEvent = 0; m_nKeyEvent = 0;
Reference<XFormComponent> xFComp(getModel(), UNO_QUERY); 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); Reference<XSubmit> xSubmit(xParent, UNO_QUERY);
if (xSubmit.is()) if (xSubmit.is())
xSubmit->submit( Reference<XControl>(), ::com::sun::star::awt::MouseEvent() ); 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 // 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(); sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 9 ); aSupported.realloc( nOldLen + 9 );

4
forms/source/component/Edit.hxx
View File

@ -74,7 +74,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OEditModel"); } { 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 // OControlModel's property handling
virtual void describeFixedProperties( virtual void describeFixedProperties(
@ -152,7 +152,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OEditControl"); } { 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 // ::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; 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;

4
forms/source/component/EventThread.cxx
View File

@ -39,7 +39,7 @@ OComponentEventThread::OComponentEventThread( ::cppu::OComponentHelper* pCompImp
// Hold a reference of the Control // 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); m_xComp.set(xIFace, css::uno::UNO_QUERY);
} }
@ -159,7 +159,7 @@ void OComponentEventThread::run()
implStarted( ); implStarted( );
// Hold on to ourselves, so that we're not deleted if a dispose is called at some point in time // 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 do
{ {

4
forms/source/component/File.cxx
View File

@ -67,9 +67,9 @@ Sequence<Type> OFileControlModel::_getTypes()
// XServiceInfo // 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); aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray(); OUString*pArray = aSupported.getArray();

2
forms/source/component/File.hxx
View File

@ -47,7 +47,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OFileControlModel"); } { 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 // OComponentHelper
virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SAL_CALL disposing() SAL_OVERRIDE;

4
forms/source/component/FixedText.cxx
View File

@ -62,9 +62,9 @@ OFixedTextModel::~OFixedTextModel( )
IMPLEMENT_DEFAULT_CLONING( 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); aSupported.realloc(aSupported.getLength() + 2);
OUString* pArray = aSupported.getArray(); OUString* pArray = aSupported.getArray();

2
forms/source/component/FixedText.hxx
View File

@ -37,7 +37,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OFixedTextModel"); } { 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 // XPersistObject
virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

2
forms/source/component/FormComponent.cxx
View File

@ -1525,7 +1525,7 @@ void SAL_CALL OBoundControlModel::disposing(const com::sun::star::lang::EventObj
} }
// XServiceInfo // 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( return ::comphelper::combineSequences(
getAggregateServiceNames(), getAggregateServiceNames(),

12
forms/source/component/FormattedField.cxx
View File

@ -201,7 +201,7 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr
if( !xSet.is() ) if( !xSet.is() )
return; return;
Reference<XFormComponent> xFComp(xSet, UNO_QUERY); Reference<XFormComponent> xFComp(xSet, UNO_QUERY);
InterfaceRef xParent = xFComp->getParent(); css::uno::Reference<css::uno::XInterface> xParent = xFComp->getParent();
if( !xParent.is() ) if( !xParent.is() )
return; return;
Reference<com::sun::star::beans::XPropertySet> xFormSet(xParent, UNO_QUERY); Reference<com::sun::star::beans::XPropertySet> xFormSet(xParent, UNO_QUERY);
@ -244,16 +244,16 @@ IMPL_LINK_NOARG(OFormattedControl, OnKeyPressed)
{ {
m_nKeyEvent = 0; m_nKeyEvent = 0;
Reference<XFormComponent> xFComp(getModel(), UNO_QUERY); 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); Reference<XSubmit> xSubmit(xParent, UNO_QUERY);
if (xSubmit.is()) if (xSubmit.is())
xSubmit->submit( Reference<XControl> (), ::com::sun::star::awt::MouseEvent() ); xSubmit->submit( Reference<XControl> (), ::com::sun::star::awt::MouseEvent() );
return 0L; 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); aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray(); OUString*pArray = aSupported.getArray();
pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_FORMATTEDFIELD; pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_FORMATTEDFIELD;
@ -312,9 +312,9 @@ void SAL_CALL OFormattedModel::disposing()
} }
// XServiceInfo // 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(); sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 9 ); aSupported.realloc( nOldLen + 9 );
OUString* pStoreTo = aSupported.getArray() + nOldLen; OUString* pStoreTo = aSupported.getArray() + nOldLen;

4
forms/source/component/FormattedField.hxx
View File

@ -74,7 +74,7 @@ class OFormattedModel
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OFormattedModel"); } { 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 // 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; 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 throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OFormattedControl"); } { 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 // ::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; virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

10
forms/source/component/FormattedFieldWrapper.cxx
View File

@ -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); OFormattedFieldWrapper *pRef = new OFormattedFieldWrapper(_rxFactory);
@ -58,7 +58,7 @@ InterfaceRef OFormattedFieldWrapper::createFormattedFieldWrapper(const ::com::su
// (instantiate it directly ..., as the OFormattedModel isn't // (instantiate it directly ..., as the OFormattedModel isn't
// registered for any service names anymore) // registered for any service names anymore)
OFormattedModel* pModel = new OFormattedModel(pRef->m_xContext); OFormattedModel* pModel = new OFormattedModel(pRef->m_xContext);
InterfaceRef xFormattedModel( css::uno::Reference<css::uno::XInterface> xFormattedModel(
static_cast<XWeak*>(pModel), css::uno::UNO_QUERY); static_cast<XWeak*>(pModel), css::uno::UNO_QUERY);
pRef->m_xAggregate = Reference<XAggregation> (xFormattedModel, 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)); 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); osl_atomic_decrement(&pRef->m_refCount);
return xRef; return xRef;
@ -122,7 +122,7 @@ OFormattedFieldWrapper::~OFormattedFieldWrapper()
{ {
// release the aggregated object (if any) // release the aggregated object (if any)
if (m_xAggregate.is()) 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 // instantiate an EditModel (the only place where we are allowed to decide that we're an FormattedModel
// is in ::read) // 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()) if (!xEditModel.is())
{ {
// arghhh ... instantiate it directly ... it's dirty, but we really need this aggregate // arghhh ... instantiate it directly ... it's dirty, but we really need this aggregate

2
forms/source/component/FormattedFieldWrapper.hxx
View File

@ -59,7 +59,7 @@ public:
// to read and write the FormattedModel part // to read and write the FormattedModel part
// if bActAsFormatted is false, the state is undetermined until somebody calls // if bActAsFormatted is false, the state is undetermined until somebody calls
// ::read or does anything which requires a living aggregate // ::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 // UNO
DECLARE_UNO3_AGG_DEFAULTS(OFormattedFieldWrapper, OWeakAggObject) DECLARE_UNO3_AGG_DEFAULTS(OFormattedFieldWrapper, OWeakAggObject)

8
forms/source/component/FormsCollection.cxx
View File

@ -93,9 +93,9 @@ sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString& _rServiceNa
return cppu::supportsService(this, _rServiceName); 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[0] = "com.sun.star.form.Forms";
aReturn[1] = "com.sun.star.form.FormComponents"; aReturn[1] = "com.sun.star.form.FormComponents";
@ -127,13 +127,13 @@ void OFormsCollection::disposing()
//XChild //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 ); ::osl::MutexGuard aGuard( m_aMutex );
m_xParent = Parent; 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; return m_xParent;
} }

8
forms/source/component/FormsCollection.hxx
View File

@ -46,7 +46,7 @@ class OFormsCollection
,public OFormsCollection_BASE ,public OFormsCollection_BASE
{ {
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
::comphelper::InterfaceRef m_xParent; // Parent css::uno::Reference<css::uno::XInterface> m_xParent; // Parent
public: public:
OFormsCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); OFormsCollection(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory);
@ -68,7 +68,7 @@ public:
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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 // 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; 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; virtual void SAL_CALL disposing() SAL_OVERRIDE;
// ::com::sun::star::container::XChild // ::com::sun::star::container::XChild
virtual ::comphelper::InterfaceRef SAL_CALL getParent() throw(::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 ::comphelper::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;
// prevent method hiding // prevent method hiding
using OInterfaceContainer::disposing; using OInterfaceContainer::disposing;

16
forms/source/component/Grid.cxx
View File

@ -166,9 +166,9 @@ void OGridControlModel::cloneColumns( const OGridControlModel* _pOriginalContain
} }
// XServiceInfo // 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.realloc(aSupported.getLength() + 4);
aSupported[aSupported.getLength()-4] = "com.sun.star.awt.UnoControlModel"; aSupported[aSupported.getLength()-4] = "com.sun.star.awt.UnoControlModel";
aSupported[aSupported.getLength()-3] = FRM_SUN_COMPONENT_GRIDCONTROL; aSupported[aSupported.getLength()-3] = FRM_SUN_COMPONENT_GRIDCONTROL;
@ -225,7 +225,7 @@ void SAL_CALL OGridControlModel::removeRowSetChangeListener( const Reference< XR
} }
// XChild // 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 ); ::osl::ClearableMutexGuard aGuard( m_aMutex );
if ( i_Parent == getParent() ) if ( i_Parent == getParent() )
@ -280,7 +280,7 @@ sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalAr
throw IllegalArgumentException(); throw IllegalArgumentException();
} }
} }
InterfaceRef xMe = static_cast<XWeak*>(this); css::uno::Reference<css::uno::XInterface> xMe = static_cast<XWeak*>(this);
if (xSel.is()) if (xSel.is())
{ {
Reference<XChild> xAsChild(xSel, UNO_QUERY); Reference<XChild> xAsChild(xSel, UNO_QUERY);
@ -341,7 +341,7 @@ Reference<XPropertySet> OGridControlModel::createColumnById(sal_Int32 nTypeId)
} }
return xReturn; 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(); return frm::getColumnTypes();
} }
@ -692,7 +692,7 @@ Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
return aReturn; return aReturn;
} }
OGridColumn* OGridControlModel::getColumnImplementation(const InterfaceRef& _rxIFace) OGridColumn* OGridControlModel::getColumnImplementation(const css::uno::Reference<css::uno::XInterface>& _rxIFace)
{ {
OGridColumn* pImplementation = NULL; OGridColumn* pImplementation = NULL;
Reference< XUnoTunnel > xUnoTunnel( _rxIFace, UNO_QUERY ); Reference< XUnoTunnel > xUnoTunnel( _rxIFace, UNO_QUERY );
@ -721,7 +721,7 @@ void OGridControlModel::lostColumn(const Reference< XInterface >& _rxColumn)
xBroadcaster->removeSQLErrorListener( this ); xBroadcaster->removeSQLErrorListener( this );
} }
void OGridControlModel::implRemoved(const InterfaceRef& _rxObject) void OGridControlModel::implRemoved(const css::uno::Reference<css::uno::XInterface>& _rxObject)
{ {
OInterfaceContainer::implRemoved(_rxObject); OInterfaceContainer::implRemoved(_rxObject);
lostColumn(_rxObject); lostColumn(_rxObject);
@ -916,7 +916,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t
// reading the attachment // reading the attachment
for (sal_Int32 i = 0; i < nLen; i++) 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); Reference<XPropertySet> xSet(xIfc, UNO_QUERY);
Any aHelper; Any aHelper;
aHelper <<= xSet; aHelper <<= xSet;

10
forms/source/component/Grid.hxx
View File

@ -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; 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 // 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 // XServiceInfo
OUString SAL_CALL getImplementationName() OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OGridControlModel"); } { 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 // 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; 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 // 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 ::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 // XPersistObject
virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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; ::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; virtual ElementDescription* createElementMetaData( ) SAL_OVERRIDE;
protected: 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 implInserted( const ElementDescription* _pElement ) SAL_OVERRIDE;
virtual void impl_replacedElement( virtual void impl_replacedElement(
const ::com::sun::star::container::ContainerEvent& _rEvent, const ::com::sun::star::container::ContainerEvent& _rEvent,

8
forms/source/component/GroupBox.cxx
View File

@ -57,9 +57,9 @@ OGroupBoxModel::OGroupBoxModel( const OGroupBoxModel* _pOriginal, const Referenc
// XServiceInfo // 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); aSupported.realloc(aSupported.getLength() + 2);
OUString* pArray = aSupported.getArray(); 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); aSupported.realloc(aSupported.getLength() + 2);
OUString* pArray = aSupported.getArray(); OUString* pArray = aSupported.getArray();

4
forms/source/component/GroupBox.hxx
View File

@ -37,7 +37,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OGroupBoxModel"); } { 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 // XPersistObject
virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OGroupBoxControl"); } { 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;
}; };

2
forms/source/component/Hidden.cxx
View File

@ -118,7 +118,7 @@ void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) cons
// XServiceInfo // 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>{ return css::uno::Sequence<OUString>{
FRM_SUN_COMPONENT_HIDDENCONTROL, FRM_SUN_FORMCOMPONENT, FRM_SUN_COMPONENT_HIDDENCONTROL, FRM_SUN_FORMCOMPONENT,

2
forms/source/component/Hidden.hxx
View File

@ -47,7 +47,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OHiddenModel"); } { 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 // XPersistObject
virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

8
forms/source/component/ImageButton.cxx
View File

@ -61,9 +61,9 @@ OImageButtonModel::~OImageButtonModel()
} }
// XServiceInfo // 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); aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray(); OUString*pArray = aSupported.getArray();
@ -150,9 +150,9 @@ Sequence<Type> OImageButtonControl::_getTypes()
return aTypes; 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); aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray(); OUString*pArray = aSupported.getArray();

4
forms/source/component/ImageButton.hxx
View File

@ -38,7 +38,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OImageButtonModel"); } { 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 // ::com::sun::star::io::XPersistObject
virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; 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 throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OImageButtonControl"); } { 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 // UNO Binding
DECLARE_UNO3_AGG_DEFAULTS(OImageButtonControl, OClickableImageBaseControl) DECLARE_UNO3_AGG_DEFAULTS(OImageButtonControl, OClickableImageBaseControl)

8
forms/source/component/ImageControl.cxx
View File

@ -188,9 +188,9 @@ IMPLEMENT_DEFAULT_CLONING( OImageControlModel )
// XServiceInfo // 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); aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray(); 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); aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray(); OUString*pArray = aSupported.getArray();

4
forms/source/component/ImageControl.hxx
View File

@ -80,7 +80,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OImageControlModel"); } { 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 // OComponentHelper
virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SAL_CALL disposing() SAL_OVERRIDE;
@ -172,7 +172,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OImageControlControl"); } { 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 // XMouseListener
virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

20
forms/source/component/ListBox.cxx
View File

@ -203,9 +203,9 @@ namespace frm
// XServiceInfo // 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(); sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 9 ); aSupported.realloc( nOldLen + 9 );
@ -474,8 +474,8 @@ namespace frm
DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_PROP1(TABINDEX, sal_Int16, BOUND);
DECL_PROP2(BOUNDCOLUMN, sal_Int16, BOUND, MAYBEVOID); DECL_PROP2(BOUNDCOLUMN, sal_Int16, BOUND, MAYBEVOID);
DECL_PROP1(LISTSOURCETYPE, ListSourceType, BOUND); DECL_PROP1(LISTSOURCETYPE, ListSourceType, BOUND);
DECL_PROP1(LISTSOURCE, StringSequence, BOUND); DECL_PROP1(LISTSOURCE, css::uno::Sequence<OUString>, BOUND);
DECL_PROP3(VALUE_SEQ, StringSequence, BOUND, READONLY, TRANSIENT); DECL_PROP3(VALUE_SEQ, css::uno::Sequence<OUString>, BOUND, READONLY, TRANSIENT);
DECL_PROP2(SELECT_VALUE_SEQ, Sequence< Any >, BOUND, TRANSIENT); DECL_PROP2(SELECT_VALUE_SEQ, Sequence< Any >, BOUND, TRANSIENT);
DECL_PROP2(SELECT_VALUE, Any, BOUND, TRANSIENT); DECL_PROP2(SELECT_VALUE, Any, BOUND, TRANSIENT);
DECL_PROP1(DEFAULT_SELECT_SEQ, Sequence<sal_Int16>, BOUND); DECL_PROP1(DEFAULT_SELECT_SEQ, Sequence<sal_Int16>, BOUND);
@ -594,7 +594,7 @@ namespace frm
_rxInStream >> nAnyMask; _rxInStream >> nAnyMask;
// ListSourceSeq // ListSourceSeq
StringSequence aListSourceSeq; css::uno::Sequence<OUString> aListSourceSeq;
if (nVersion == 0x0001) if (nVersion == 0x0001)
{ {
// Create ListSourceSeq from String // Create ListSourceSeq from String
@ -660,7 +660,7 @@ namespace frm
&& !hasExternalListSource() && !hasExternalListSource()
) )
{ {
setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( StringSequence() ) ); setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( css::uno::Sequence<OUString>() ) );
} }
if (nVersion > 3) if (nVersion > 3)
@ -932,7 +932,7 @@ namespace frm
Reference<XNameAccess> xFieldNames = getTableFields(xConnection, sListSource); Reference<XNameAccess> xFieldNames = getTableFields(xConnection, sListSource);
if (xFieldNames.is()) if (xFieldNames.is())
{ {
StringSequence seqNames = xFieldNames->getElementNames(); css::uno::Sequence<OUString> seqNames = xFieldNames->getElementNames();
::std::copy( ::std::copy(
seqNames.getConstArray(), seqNames.getConstArray(),
seqNames.getConstArray() + seqNames.getLength(), seqNames.getConstArray() + seqNames.getLength(),
@ -1009,7 +1009,7 @@ namespace frm
if ( m_eListSourceType != ListSourceType_VALUELIST ) if ( m_eListSourceType != ListSourceType_VALUELIST )
{ {
if ( !hasExternalListSource() ) if ( !hasExternalListSource() )
setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( StringSequence() ) ); setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( css::uno::Sequence<OUString>() ) );
m_aListRowSet.dispose(); 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); aSupported.realloc(aSupported.getLength() + 2);
OUString* pArray = aSupported.getArray(); OUString* pArray = aSupported.getArray();

4
forms/source/component/ListBox.hxx
View File

@ -131,7 +131,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OListBoxModel"); } { 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 // UNO Anbindung
DECLARE_UNO3_AGG_DEFAULTS(OListBoxModel, OBoundControlModel) DECLARE_UNO3_AGG_DEFAULTS(OListBoxModel, OBoundControlModel)
@ -287,7 +287,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OListBoxControl"); } { 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 // 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; 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;

8
forms/source/component/Numeric.cxx
View File

@ -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); aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray(); OUString*pArray = aSupported.getArray();
@ -95,9 +95,9 @@ IMPLEMENT_DEFAULT_CLONING( ONumericModel )
// XServiceInfo // 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(); sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 9 ); aSupported.realloc( nOldLen + 9 );

4
forms/source/component/Numeric.hxx
View File

@ -42,7 +42,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.ONumericModel"); } { 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 // ::com::sun::star::io::XPersistObject
virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@ -79,7 +79,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.ONumericControl"); } { return OUString("com.sun.star.form.ONumericControl"); }
virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
}; };

8
forms/source/component/Pattern.cxx
View File

@ -50,9 +50,9 @@ Sequence<Type> OPatternControl::_getTypes()
} }
StringSequence OPatternControl::getSupportedServiceNames() throw(std::exception) css::uno::Sequence<OUString> OPatternControl::getSupportedServiceNames() throw(std::exception)
{ {
StringSequence aSupported = OBoundControl::getSupportedServiceNames(); css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 2); aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray(); OUString*pArray = aSupported.getArray();
@ -98,9 +98,9 @@ IMPLEMENT_DEFAULT_CLONING( OPatternModel )
// XServiceInfo // XServiceInfo
StringSequence SAL_CALL OPatternModel::getSupportedServiceNames() throw(std::exception) css::uno::Sequence<OUString> SAL_CALL OPatternModel::getSupportedServiceNames() throw(std::exception)
{ {
StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 3); aSupported.realloc(aSupported.getLength() + 3);
OUString*pArray = aSupported.getArray(); OUString*pArray = aSupported.getArray();

4
forms/source/component/Pattern.hxx
View File

@ -49,7 +49,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OPatternModel"); } { return OUString("com.sun.star.form.OPatternModel"); }
virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
// ::com::sun::star::io::XPersistObject // ::com::sun::star::io::XPersistObject
virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@ -88,7 +88,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OPatternControl"); } { return OUString("com.sun.star.form.OPatternControl"); }
virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
}; };

12
forms/source/component/RadioButton.cxx
View File

@ -43,9 +43,9 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::form::binding; using namespace ::com::sun::star::form::binding;
StringSequence SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(RuntimeException, std::exception) css::uno::Sequence<OUString> SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(RuntimeException, std::exception)
{ {
StringSequence aSupported = OBoundControl::getSupportedServiceNames(); css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 2); aSupported.realloc(aSupported.getLength() + 2);
OUString* pArray = aSupported.getArray(); OUString* pArray = aSupported.getArray();
@ -111,9 +111,9 @@ IMPLEMENT_DEFAULT_CLONING( ORadioButtonModel )
// XServiceInfo // XServiceInfo
StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(RuntimeException, std::exception) css::uno::Sequence<OUString> SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(RuntimeException, std::exception)
{ {
StringSequence aSupported = OReferenceValueComponent::getSupportedServiceNames(); css::uno::Sequence<OUString> aSupported = OReferenceValueComponent::getSupportedServiceNames();
sal_Int32 nOldLen = aSupported.getLength(); sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 9 ); aSupported.realloc( nOldLen + 9 );
@ -155,7 +155,7 @@ void ORadioButtonModel::SetSiblingPropsTo(const OUString& rPropName, const Any&
sal_Int32 nNumSiblings = xIndexAccess->getCount(); sal_Int32 nNumSiblings = xIndexAccess->getCount();
for (sal_Int32 i=0; i<nNumSiblings; ++i) for (sal_Int32 i=0; i<nNumSiblings; ++i)
{ {
Reference<XPropertySet> xSiblingProperties(*static_cast<InterfaceRef const *>(xIndexAccess->getByIndex(i).getValue()), UNO_QUERY); Reference<XPropertySet> xSiblingProperties(*static_cast<css::uno::Reference<css::uno::XInterface> const *>(xIndexAccess->getByIndex(i).getValue()), UNO_QUERY);
if (!xSiblingProperties.is()) if (!xSiblingProperties.is())
continue; continue;
if (xMyProps == xSiblingProperties) if (xMyProps == xSiblingProperties)
@ -230,7 +230,7 @@ void ORadioButtonModel::setControlSource()
static_cast<XWeak*>(this), css::uno::UNO_QUERY); static_cast<XWeak*>(this), css::uno::UNO_QUERY);
for (sal_Int32 i=0; i<xIndexAccess->getCount(); ++i) for (sal_Int32 i=0; i<xIndexAccess->getCount(); ++i)
{ {
Reference<XPropertySet> xSiblingProperties(*static_cast<InterfaceRef const *>(xIndexAccess->getByIndex(i).getValue()), UNO_QUERY); Reference<XPropertySet> xSiblingProperties(*static_cast<css::uno::Reference<css::uno::XInterface> const *>(xIndexAccess->getByIndex(i).getValue()), UNO_QUERY);
if (!xSiblingProperties.is()) if (!xSiblingProperties.is())
continue; continue;

4
forms/source/component/RadioButton.hxx
View File

@ -36,7 +36,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.ORadioButtonModel"); } { return OUString("com.sun.star.form.ORadioButtonModel"); }
virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// OPropertySetHelper // OPropertySetHelper
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
@ -84,7 +84,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.ORadioButtonControl"); } { return OUString("com.sun.star.form.ORadioButtonControl"); }
virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
protected: protected:
// XControl // XControl

8
forms/source/component/Time.cxx
View File

@ -56,9 +56,9 @@ Sequence<Type> OTimeControl::_getTypes()
} }
StringSequence SAL_CALL OTimeControl::getSupportedServiceNames() throw(std::exception) css::uno::Sequence<OUString> SAL_CALL OTimeControl::getSupportedServiceNames() throw(std::exception)
{ {
StringSequence aSupported = OBoundControl::getSupportedServiceNames(); css::uno::Sequence<OUString> aSupported = OBoundControl::getSupportedServiceNames();
aSupported.realloc(aSupported.getLength() + 2); aSupported.realloc(aSupported.getLength() + 2);
OUString*pArray = aSupported.getArray(); OUString*pArray = aSupported.getArray();
@ -72,9 +72,9 @@ StringSequence SAL_CALL OTimeControl::getSupportedServiceNames() throw(std::exce
// XServiceInfo // XServiceInfo
StringSequence SAL_CALL OTimeModel::getSupportedServiceNames() throw(std::exception) css::uno::Sequence<OUString> SAL_CALL OTimeModel::getSupportedServiceNames() throw(std::exception)
{ {
StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); css::uno::Sequence<OUString> aSupported = OBoundControlModel::getSupportedServiceNames();
sal_Int32 nOldLen = aSupported.getLength(); sal_Int32 nOldLen = aSupported.getLength();
aSupported.realloc( nOldLen + 9 ); aSupported.realloc( nOldLen + 9 );

4
forms/source/component/Time.hxx
View File

@ -56,7 +56,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OTimeModel"); } { return OUString("com.sun.star.form.OTimeModel"); }
virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
// OControlModel's property handling // OControlModel's property handling
virtual void describeFixedProperties( virtual void describeFixedProperties(
@ -106,7 +106,7 @@ public:
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{ return OUString("com.sun.star.form.OTimeControl"); } { return OUString("com.sun.star.form.OTimeControl"); }
virtual StringSequence SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE;
}; };

2
forms/source/component/clickableimage.cxx
View File

@ -738,7 +738,7 @@ namespace frm
// changed in a document that is already loaded. There's no way // changed in a document that is already loaded. There's no way
// we can get to the Model during loading. // we can get to the Model during loading.
Reference< XModel > xModel; Reference< XModel > xModel;
InterfaceRef xIfc( *this ); css::uno::Reference<css::uno::XInterface> xIfc( *this );
while( !xModel.is() && xIfc.is() ) while( !xModel.is() && xIfc.is() )
{ {
Reference<XChild> xChild( xIfc, UNO_QUERY ); Reference<XChild> xChild( xIfc, UNO_QUERY );

22
forms/source/inc/FormComponent.hxx
View File

@ -233,15 +233,15 @@ protected:
// XServiceInfo // XServiceInfo
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) 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;
virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0;
// XServiceInfo - static version // XServiceInfo - static version
static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException);
// XControl // XControl
virtual void SAL_CALL setContext(const InterfaceRef& Context) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setContext(const css::uno::Reference<css::uno::XInterface>& Context) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual InterfaceRef SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference<css::awt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<css::awt::XWindowPeer>& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference<css::awt::XToolkit>& Toolkit, const ::com::sun::star::uno::Reference<css::awt::XWindowPeer>& Parent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference<css::awt::XWindowPeer> SAL_CALL getPeer() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference<css::awt::XWindowPeer> SAL_CALL getPeer() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference<css::awt::XControlModel>& Model) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference<css::awt::XControlModel>& Model) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@ -336,7 +336,7 @@ protected:
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
oslInterlockedCount m_lockCount; oslInterlockedCount m_lockCount;
InterfaceRef m_xParent; // ParentComponent css::uno::Reference<css::uno::XInterface> m_xParent; // ParentComponent
PropertyBagHelper m_aPropertyBagHelper; PropertyBagHelper m_aPropertyBagHelper;
const css::uno::Reference<css::uno::XComponentContext>& const css::uno::Reference<css::uno::XComponentContext>&
@ -407,11 +407,11 @@ public:
// XServiceInfo // XServiceInfo
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) 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;
virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0;
// XSericeInfo - static version(s) // XSericeInfo - static version(s)
static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException);
// XPersistObject // XPersistObject
virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0;
@ -421,8 +421,8 @@ public:
read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XChild (base of XFormComponent) // XChild (base of XFormComponent)
virtual InterfaceRef SAL_CALL getParent() throw(::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 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;
// XEventListener // XEventListener
virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@ -985,10 +985,10 @@ public:
virtual void SAL_CALL removeResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeResetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XResetListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual StringSequence SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo - static version // XServiceInfo - static version
static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException);
// XChild // XChild
virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;

14
forms/source/inc/InterfaceContainer.hxx
View File

@ -76,8 +76,8 @@ namespace frm
ElementDescription& operator=( const ElementDescription& ) SAL_DELETED_FUNCTION; ElementDescription& operator=( const ElementDescription& ) SAL_DELETED_FUNCTION;
}; };
typedef std::vector<InterfaceRef> OInterfaceArray; typedef std::vector<css::uno::Reference<css::uno::XInterface>> OInterfaceArray;
typedef std::unordered_multimap< OUString, InterfaceRef, OUStringHash > OInterfaceMap; typedef std::unordered_multimap< OUString, css::uno::Reference<css::uno::XInterface>, OUStringHash > OInterfaceMap;
// OInterfaceContainer // OInterfaceContainer
@ -145,7 +145,7 @@ public:
// ::com::sun::star::container::XNameAccess // ::com::sun::star::container::XNameAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual StringSequence SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ::com::sun::star::container::XNameReplace // ::com::sun::star::container::XNameReplace
@ -223,7 +223,7 @@ protected:
// called after the object is inserted, but before the "real listeners" are notified // called after the object is inserted, but before the "real listeners" are notified
virtual void implInserted( const ElementDescription* _pElement ); virtual void implInserted( const ElementDescription* _pElement );
// called after the object is removed, but before the "real listeners" are notified // called after the object is removed, but before the "real listeners" are notified
virtual void implRemoved(const InterfaceRef& _rxObject); virtual void implRemoved(const css::uno::Reference<css::uno::XInterface>& _rxObject);
/** called after an object was replaced. The default implementation notifies our listeners, after releasing /** called after an object was replaced. The default implementation notifies our listeners, after releasing
the instance lock. the instance lock.
@ -289,7 +289,7 @@ class OFormComponents :public FormComponentsBase
{ {
protected: protected:
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
::comphelper::InterfaceRef m_xParent; css::uno::Reference<css::uno::XInterface> m_xParent;
public: public:
OFormComponents(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory); OFormComponents(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory);
@ -305,8 +305,8 @@ public:
virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SAL_CALL disposing() SAL_OVERRIDE;
// ::com::sun::star::form::XFormComponent // ::com::sun::star::form::XFormComponent
virtual ::comphelper::InterfaceRef SAL_CALL getParent() throw(::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 ::comphelper::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;
// XEventListener // XEventListener
using OInterfaceContainer::disposing; using OInterfaceContainer::disposing;

35
forms/source/misc/InterfaceContainer.cxx
View File

@ -39,7 +39,6 @@
#include <comphelper/eventattachermgr.hxx> #include <comphelper/eventattachermgr.hxx>
#include <comphelper/property.hxx> #include <comphelper/property.hxx>
#include <comphelper/sequence.hxx> #include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
#include <tools/debug.hxx> #include <tools/debug.hxx>
@ -683,9 +682,9 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) {
OInterfaceMap::iterator i = m_aMap.find(::comphelper::getString(evt.OldValue)); OInterfaceMap::iterator i = m_aMap.find(::comphelper::getString(evt.OldValue));
if (i != m_aMap.end() && (*i).second != evt.Source) if (i != m_aMap.end() && (*i).second != evt.Source)
{ {
InterfaceRef xCorrectType((*i).second); css::uno::Reference<css::uno::XInterface> xCorrectType((*i).second);
m_aMap.erase(i); m_aMap.erase(i);
m_aMap.insert(::std::pair<const OUString, InterfaceRef >(::comphelper::getString(evt.NewValue),xCorrectType)); m_aMap.insert(::std::pair<const OUString, css::uno::Reference<css::uno::XInterface> >(::comphelper::getString(evt.NewValue),xCorrectType));
} }
} }
} }
@ -725,9 +724,9 @@ Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSu
} }
StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeException, std::exception) css::uno::Sequence<OUString> SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeException, std::exception)
{ {
StringSequence aNameList(m_aItems.size()); css::uno::Sequence<OUString> aNameList(m_aItems.size());
OUString* pStringArray = aNameList.getArray(); OUString* pStringArray = aNameList.getArray();
for (OInterfaceMap::const_iterator i = m_aMap.begin(); i != m_aMap.end(); ++i, ++pStringArray) for (OInterfaceMap::const_iterator i = m_aMap.begin(); i != m_aMap.end(); ++i, ++pStringArray)
@ -836,7 +835,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
else else
m_aItems.insert( m_aItems.begin() + _nIndex, pElementMetaData->xInterface ); m_aItems.insert( m_aItems.begin() + _nIndex, pElementMetaData->xInterface );
m_aMap.insert( ::std::pair< const OUString, InterfaceRef >( sName, pElementMetaData->xInterface ) ); m_aMap.insert( ::std::pair< const OUString, css::uno::Reference<css::uno::XInterface> >( sName, pElementMetaData->xInterface ) );
// announce ourself as parent to the new element // announce ourself as parent to the new element
pElementMetaData->xChild->setParent(static_cast<XContainer*>(this)); pElementMetaData->xChild->setParent(static_cast<XContainer*>(this));
@ -901,7 +900,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
void OInterfaceContainer::removeElementsNoEvents(sal_Int32 nIndex) void OInterfaceContainer::removeElementsNoEvents(sal_Int32 nIndex)
{ {
OInterfaceArray::iterator i = m_aItems.begin() + nIndex; OInterfaceArray::iterator i = m_aItems.begin() + nIndex;
InterfaceRef xElement(*i); css::uno::Reference<css::uno::XInterface> xElement(*i);
OInterfaceMap::iterator j = m_aMap.begin(); OInterfaceMap::iterator j = m_aMap.begin();
while (j != m_aMap.end() && (*j).second != xElement) ++j; while (j != m_aMap.end() && (*j).second != xElement) ++j;
@ -915,7 +914,7 @@ void OInterfaceContainer::removeElementsNoEvents(sal_Int32 nIndex)
Reference<XChild> xChild(xElement, UNO_QUERY); Reference<XChild> xChild(xElement, UNO_QUERY);
if (xChild.is()) if (xChild.is())
xChild->setParent(InterfaceRef ()); xChild->setParent(css::uno::Reference<css::uno::XInterface> ());
} }
@ -925,7 +924,7 @@ void OInterfaceContainer::implInserted( const ElementDescription* /*_pElement*/
} }
void OInterfaceContainer::implRemoved( const InterfaceRef& /*_rxObject*/ ) void OInterfaceContainer::implRemoved( const css::uno::Reference<css::uno::XInterface>& /*_rxObject*/ )
{ {
// not inrerested in // not inrerested in
} }
@ -961,7 +960,7 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any
} }
// get the old element // get the old element
InterfaceRef xOldElement( m_aItems[ _nIndex ] ); css::uno::Reference<css::uno::XInterface> xOldElement( m_aItems[ _nIndex ] );
DBG_ASSERT( xOldElement.get() == Reference< XInterface >( xOldElement, UNO_QUERY ).get(), DBG_ASSERT( xOldElement.get() == Reference< XInterface >( xOldElement, UNO_QUERY ).get(),
"OInterfaceContainer::implReplaceByIndex: elements should be held normalized!" ); "OInterfaceContainer::implReplaceByIndex: elements should be held normalized!" );
@ -973,7 +972,7 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any
// remove event knittings // remove event knittings
if ( m_xEventAttacher.is() ) if ( m_xEventAttacher.is() )
{ {
InterfaceRef xNormalized( xOldElement, UNO_QUERY ); css::uno::Reference<css::uno::XInterface> xNormalized( xOldElement, UNO_QUERY );
m_xEventAttacher->detach( _nIndex, xNormalized ); m_xEventAttacher->detach( _nIndex, xNormalized );
m_xEventAttacher->removeEntry( _nIndex ); m_xEventAttacher->removeEntry( _nIndex );
} }
@ -986,7 +985,7 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any
// give the old element a new (void) parent // give the old element a new (void) parent
Reference<XChild> xChild(xOldElement, UNO_QUERY); Reference<XChild> xChild(xOldElement, UNO_QUERY);
if (xChild.is()) if (xChild.is())
xChild->setParent(InterfaceRef ()); xChild->setParent(css::uno::Reference<css::uno::XInterface> ());
// remove the old one // remove the old one
m_aMap.erase(j); m_aMap.erase(j);
@ -999,7 +998,7 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any
aElementMetaData.get()->xPropertySet->addPropertyChangeListener(PROPERTY_NAME, this); aElementMetaData.get()->xPropertySet->addPropertyChangeListener(PROPERTY_NAME, this);
// insert the new one // insert the new one
m_aMap.insert( ::std::pair<const OUString, InterfaceRef >( sName, aElementMetaData.get()->xInterface ) ); m_aMap.insert( ::std::pair<const OUString, css::uno::Reference<css::uno::XInterface> >( sName, aElementMetaData.get()->xInterface ) );
m_aItems[ _nIndex ] = aElementMetaData.get()->xInterface; m_aItems[ _nIndex ] = aElementMetaData.get()->xInterface;
aElementMetaData.get()->xChild->setParent(static_cast<XContainer*>(this)); aElementMetaData.get()->xChild->setParent(static_cast<XContainer*>(this));
@ -1042,7 +1041,7 @@ void OInterfaceContainer::implRemoveByIndex( const sal_Int32 _nIndex, ::osl::Cle
OSL_PRECOND( ( _nIndex >= 0 ) && ( _nIndex < (sal_Int32)m_aItems.size() ), "OInterfaceContainer::implRemoveByIndex: precondition not met (index)!" ); OSL_PRECOND( ( _nIndex >= 0 ) && ( _nIndex < (sal_Int32)m_aItems.size() ), "OInterfaceContainer::implRemoveByIndex: precondition not met (index)!" );
OInterfaceArray::iterator i = m_aItems.begin() + _nIndex; OInterfaceArray::iterator i = m_aItems.begin() + _nIndex;
InterfaceRef xElement(*i); css::uno::Reference<css::uno::XInterface> xElement(*i);
OInterfaceMap::iterator j = m_aMap.begin(); OInterfaceMap::iterator j = m_aMap.begin();
while (j != m_aMap.end() && (*j).second != xElement) ++j; while (j != m_aMap.end() && (*j).second != xElement) ++j;
@ -1053,7 +1052,7 @@ void OInterfaceContainer::implRemoveByIndex( const sal_Int32 _nIndex, ::osl::Cle
// remove event knittings // remove event knittings
if ( m_xEventAttacher.is() ) if ( m_xEventAttacher.is() )
{ {
InterfaceRef xNormalized( xElement, UNO_QUERY ); css::uno::Reference<css::uno::XInterface> xNormalized( xElement, UNO_QUERY );
m_xEventAttacher->detach( _nIndex, xNormalized ); m_xEventAttacher->detach( _nIndex, xNormalized );
m_xEventAttacher->removeEntry( _nIndex ); m_xEventAttacher->removeEntry( _nIndex );
} }
@ -1064,7 +1063,7 @@ void OInterfaceContainer::implRemoveByIndex( const sal_Int32 _nIndex, ::osl::Cle
Reference<XChild> xChild(xElement, UNO_QUERY); Reference<XChild> xChild(xElement, UNO_QUERY);
if (xChild.is()) if (xChild.is())
xChild->setParent(InterfaceRef ()); xChild->setParent(css::uno::Reference<css::uno::XInterface> ());
// notify derived classes // notify derived classes
implRemoved(xElement); implRemoved(xElement);
@ -1325,14 +1324,14 @@ void OFormComponents::disposing()
//XChild //XChild
void OFormComponents::setParent(const InterfaceRef& Parent) throw( NoSupportException, RuntimeException, std::exception ) void OFormComponents::setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw( NoSupportException, RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
m_xParent = Parent; m_xParent = Parent;
} }
InterfaceRef OFormComponents::getParent() throw( RuntimeException, std::exception ) css::uno::Reference<css::uno::XInterface> OFormComponents::getParent() throw( RuntimeException, std::exception )
{ {
return m_xParent; return m_xParent;
} }

6
include/comphelper/types.hxx
View File

@ -22,7 +22,6 @@
#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XComponent.hpp>
@ -37,11 +36,6 @@ namespace com { namespace sun { namespace star { namespace awt {
namespace comphelper namespace comphelper
{ {
typedef css::uno::Reference< css::uno::XInterface > InterfaceRef;
typedef css::uno::Sequence< OUString > StringSequence;
/** compare the two given Anys /** compare the two given Anys
The comparison is deep, means if one of the Any's contains an Any which contains an Any ..., this is resolved <br/> The comparison is deep, means if one of the Any's contains an Any which contains an Any ..., this is resolved <br/>
Other types recognized currently : FontDescriptor, ::com::sun::star::util::Date/Tim/DateTime, css::uno::Sequence<sal_Int8> Other types recognized currently : FontDescriptor, ::com::sun::star::util::Date/Tim/DateTime, css::uno::Sequence<sal_Int8>

2
include/svtools/genericunodialog.hxx
View File

@ -107,7 +107,7 @@ namespace svt
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0;
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0;
// OPropertySetHelper // OPropertySetHelper
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;

6
svtools/source/uno/addrtempuno.cxx
View File

@ -58,7 +58,7 @@ namespace {
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE;
// XPropertySet // XPropertySet
virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) SAL_OVERRIDE;
@ -99,9 +99,9 @@ namespace {
} }
::comphelper::StringSequence SAL_CALL OAddressBookSourceDialogUno::getSupportedServiceNames() throw(RuntimeException, std::exception) css::uno::Sequence<OUString> SAL_CALL OAddressBookSourceDialogUno::getSupportedServiceNames() throw(RuntimeException, std::exception)
{ {
::comphelper::StringSequence aSupported(1); css::uno::Sequence<OUString> aSupported(1);
aSupported.getArray()[0] = "com.sun.star.ui.AddressBookSourceDialog"; aSupported.getArray()[0] = "com.sun.star.ui.AddressBookSourceDialog";
return aSupported; return aSupported;
} }

14
svx/source/fmcomp/fmgridif.cxx
View File

@ -386,7 +386,7 @@ OUString SAL_CALL FmXGridControl::getImplementationName() throw(std::exception)
return OUString("com.sun.star.form.FmXGridControl"); return OUString("com.sun.star.form.FmXGridControl");
} }
::comphelper::StringSequence SAL_CALL FmXGridControl::getSupportedServiceNames() throw(std::exception) css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedServiceNames() throw(std::exception)
{ {
Sequence< OUString > aServiceNames(2); Sequence< OUString > aServiceNames(2);
aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL; aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL;
@ -961,10 +961,10 @@ OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException, std::except
} }
::comphelper::StringSequence SAL_CALL FmXGridControl::getSupportedModes() throw( RuntimeException, std::exception ) css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedModes() throw( RuntimeException, std::exception )
{ {
Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY);
return xPeer.is() ? xPeer->getSupportedModes() : ::comphelper::StringSequence(); return xPeer.is() ? xPeer->getSupportedModes() : css::uno::Sequence<OUString>();
} }
@ -1386,7 +1386,7 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeE
else if (pGrid && m_xColumns.is() && m_xColumns->hasElements()) else if (pGrid && m_xColumns.is() && m_xColumns->hasElements())
{ {
// next find which column has changed // next find which column has changed
::comphelper::InterfaceRef xCurrent; css::uno::Reference<css::uno::XInterface> xCurrent;
sal_Int32 i; sal_Int32 i;
for ( i = 0; i < m_xColumns->getCount(); i++) for ( i = 0; i < m_xColumns->getCount(); i++)
@ -2377,9 +2377,9 @@ OUString FmXGridPeer::getMode() throw( RuntimeException, std::exception )
} }
::comphelper::StringSequence FmXGridPeer::getSupportedModes() throw( RuntimeException, std::exception ) css::uno::Sequence<OUString> FmXGridPeer::getSupportedModes() throw( RuntimeException, std::exception )
{ {
static ::comphelper::StringSequence aModes; static css::uno::Sequence<OUString> aModes;
if (!aModes.getLength()) if (!aModes.getLength())
{ {
aModes.realloc(2); aModes.realloc(2);
@ -2393,7 +2393,7 @@ OUString FmXGridPeer::getMode() throw( RuntimeException, std::exception )
sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException, std::exception ) sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException, std::exception )
{ {
::comphelper::StringSequence aModes(getSupportedModes()); css::uno::Sequence<OUString> aModes(getSupportedModes());
const OUString* pModes = aModes.getConstArray(); const OUString* pModes = aModes.getConstArray();
for (sal_Int32 i = aModes.getLength(); i > 0; ) for (sal_Int32 i = aModes.getLength(); i > 0; )
{ {

20
svx/source/fmcomp/gridcell.cxx
View File

@ -2432,7 +2432,7 @@ void DbComboBox::SetList(const Any& rItems)
ComboBoxControl* pField = static_cast<ComboBoxControl*>(m_pWindow.get()); ComboBoxControl* pField = static_cast<ComboBoxControl*>(m_pWindow.get());
pField->Clear(); pField->Clear();
::comphelper::StringSequence aTest; css::uno::Sequence<OUString> aTest;
if (rItems >>= aTest) if (rItems >>= aTest)
{ {
const OUString* pStrings = aTest.getConstArray(); const OUString* pStrings = aTest.getConstArray();
@ -2553,7 +2553,7 @@ void DbListBox::SetList(const Any& rItems)
pField->Clear(); pField->Clear();
m_bBound = false; m_bBound = false;
::comphelper::StringSequence aTest; css::uno::Sequence<OUString> aTest;
if (rItems >>= aTest) if (rItems >>= aTest)
{ {
const OUString* pStrings = aTest.getConstArray(); const OUString* pStrings = aTest.getConstArray();
@ -2716,7 +2716,7 @@ void DbFilterField::PaintCell(OutputDevice& rDev, const Rectangle& rRect)
void DbFilterField::SetList(const Any& rItems, bool bComboBox) void DbFilterField::SetList(const Any& rItems, bool bComboBox)
{ {
::comphelper::StringSequence aTest; css::uno::Sequence<OUString> aTest;
rItems >>= aTest; rItems >>= aTest;
const OUString* pStrings = aTest.getConstArray(); const OUString* pStrings = aTest.getConstArray();
sal_Int32 nItems = aTest.getLength(); sal_Int32 nItems = aTest.getLength();
@ -4095,7 +4095,7 @@ void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos) thr
} }
void SAL_CALL FmXListBoxCell::addItems(const ::comphelper::StringSequence& aItems, sal_Int16 nPos) throw( RuntimeException, std::exception ) void SAL_CALL FmXListBoxCell::addItems(const css::uno::Sequence<OUString>& aItems, sal_Int16 nPos) throw( RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
if (m_pBox) if (m_pBox)
@ -4135,15 +4135,15 @@ OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos) throw( RuntimeExceptio
return m_pBox ? OUString(m_pBox->GetEntry(nPos)) : OUString(); return m_pBox ? OUString(m_pBox->GetEntry(nPos)) : OUString();
} }
::comphelper::StringSequence SAL_CALL FmXListBoxCell::getItems() throw( RuntimeException, std::exception ) css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getItems() throw( RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
::comphelper::StringSequence aSeq; css::uno::Sequence<OUString> aSeq;
if (m_pBox) if (m_pBox)
{ {
sal_uInt16 nEntries = m_pBox ->GetEntryCount(); sal_uInt16 nEntries = m_pBox ->GetEntryCount();
aSeq = ::comphelper::StringSequence( nEntries ); aSeq = css::uno::Sequence<OUString>( nEntries );
for ( sal_uInt16 n = nEntries; n; ) for ( sal_uInt16 n = nEntries; n; )
{ {
--n; --n;
@ -4201,17 +4201,17 @@ OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException, std
} }
::comphelper::StringSequence SAL_CALL FmXListBoxCell::getSelectedItems() throw( RuntimeException, std::exception ) css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getSelectedItems() throw( RuntimeException, std::exception )
{ {
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
::comphelper::StringSequence aSeq; css::uno::Sequence<OUString> aSeq;
if (m_pBox) if (m_pBox)
{ {
UpdateFromColumn(); UpdateFromColumn();
sal_uInt16 nSelEntries = m_pBox->GetSelectEntryCount(); sal_uInt16 nSelEntries = m_pBox->GetSelectEntryCount();
aSeq = ::comphelper::StringSequence( nSelEntries ); aSeq = css::uno::Sequence<OUString>( nSelEntries );
for ( sal_uInt16 n = 0; n < nSelEntries; n++ ) for ( sal_uInt16 n = 0; n < nSelEntries; n++ )
aSeq.getArray()[n] = m_pBox->GetSelectEntry( n ); aSeq.getArray()[n] = m_pBox->GetSelectEntry( n );
} }

6
svx/source/fmcomp/gridcols.cxx
View File

@ -25,9 +25,9 @@
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
const ::comphelper::StringSequence& getColumnTypes() const css::uno::Sequence<OUString>& getColumnTypes()
{ {
static ::comphelper::StringSequence aColumnTypes(10); static css::uno::Sequence<OUString> aColumnTypes(10);
if (aColumnTypes.getConstArray()[0].isEmpty()) if (aColumnTypes.getConstArray()[0].isEmpty())
{ {
OUString* pNames = aColumnTypes.getArray(); OUString* pNames = aColumnTypes.getArray();
@ -89,7 +89,7 @@ sal_Int32 getColumnTypeByModelName(const OUString& aModelName)
? aModelName.copy(aModelPrefix.getLength()) ? aModelName.copy(aModelPrefix.getLength())
: aModelName.copy(aCompatibleModelPrefix.getLength()); : aModelName.copy(aCompatibleModelPrefix.getLength());
const ::comphelper::StringSequence& rColumnTypes = getColumnTypes(); const css::uno::Sequence<OUString>& rColumnTypes = getColumnTypes();
nTypeId = lcl_findPos(aColumnType, rColumnTypes); nTypeId = lcl_findPos(aColumnType, rColumnTypes);
} }
return nTypeId; return nTypeId;

2
svx/source/form/xfm_addcondition.cxx
View File

@ -53,7 +53,7 @@ namespace svxform
Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames() Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames()
{ {
::comphelper::StringSequence aSupported( 1 ); css::uno::Sequence<OUString> aSupported( 1 );
aSupported.getArray()[0] = "com.sun.star.xforms.ui.dialogs.AddCondition"; aSupported.getArray()[0] = "com.sun.star.xforms.ui.dialogs.AddCondition";
return aSupported; return aSupported;
} }