[Libreoffice-commits] core.git: dbaccess/source
Stephan Bergmann
sbergman at redhat.com
Sun Apr 13 13:41:27 PDT 2014
dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 8 -
dbaccess/source/core/dataaccess/commanddefinition.cxx | 1
dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx | 1
dbaccess/source/core/dataaccess/databasedocument.cxx | 1
dbaccess/source/core/dataaccess/databaseregistrations.cxx | 2
dbaccess/source/core/dataaccess/datasource.cxx | 1
dbaccess/source/core/inc/services.hxx | 40 ++++++++
dbaccess/source/core/misc/services.cxx | 9 -
dbaccess/source/ext/macromigration/dbmm_services.cxx | 3
dbaccess/source/ext/macromigration/docinteraction.cxx | 5 -
dbaccess/source/ext/macromigration/macromigrationwizard.cxx | 1
dbaccess/source/ext/macromigration/macromigrationwizard.hxx | 33 ++++++
dbaccess/source/ext/macromigration/migrationengine.cxx | 6 -
dbaccess/source/ext/macromigration/migrationlog.cxx | 7 -
dbaccess/source/filter/xml/dbloader2.cxx | 1
dbaccess/source/filter/xml/xmlExport.cxx | 1
dbaccess/source/filter/xml/xmlfilter.cxx | 10 +-
dbaccess/source/filter/xml/xmlservices.cxx | 13 --
dbaccess/source/filter/xml/xmlservices.hxx | 40 ++++++++
dbaccess/source/sdbtools/connection/connectiontools.cxx | 1
dbaccess/source/sdbtools/connection/objectnames.cxx | 6 -
dbaccess/source/sdbtools/inc/sdbt_services.hxx | 31 ++++++
dbaccess/source/sdbtools/misc/sdbt_services.cxx | 3
dbaccess/source/ui/app/AppController.cxx | 1
dbaccess/source/ui/app/AppControllerGen.cxx | 27 -----
dbaccess/source/ui/browser/dbloader.cxx | 1
dbaccess/source/ui/browser/exsrcbrw.cxx | 1
dbaccess/source/ui/browser/sbagrid.cxx | 1
dbaccess/source/ui/browser/unodatbr.cxx | 1
dbaccess/source/ui/control/toolboxcontroller.cxx | 1
dbaccess/source/ui/dlg/indexdialog.cxx | 2
dbaccess/source/ui/inc/uiservices.hxx | 59 ++++++++++++
dbaccess/source/ui/misc/uiservices.cxx | 31 ------
dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 1
dbaccess/source/ui/relationdesign/RelationController.cxx | 1
dbaccess/source/ui/tabledesign/TEditControl.cxx | 5 -
dbaccess/source/ui/tabledesign/TableController.cxx | 1
dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 3
dbaccess/source/ui/uno/ColumnControl.cxx | 1
dbaccess/source/ui/uno/ColumnModel.cxx | 1
dbaccess/source/ui/uno/DBTypeWizDlg.cxx | 1
dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 1
dbaccess/source/ui/uno/TableFilterDlg.cxx | 1
dbaccess/source/ui/uno/UserSettingsDlg.cxx | 1
dbaccess/source/ui/uno/admindlg.cxx | 1
dbaccess/source/ui/uno/copytablewizard.cxx | 17 ---
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 1
dbaccess/source/ui/uno/unoDirectSql.cxx | 3
dbaccess/source/ui/uno/unosqlmessage.cxx | 1
49 files changed, 256 insertions(+), 133 deletions(-)
New commits:
commit ae59446aabbb99fe3c92865428812fd884f2579c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun Apr 13 22:40:55 2014 +0200
Clean up function declarations and some unused functions
Change-Id: Ie4f6197e42db298b4a3dcb6befdbd72dff6ea2b7
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index 11a9692..bd10672 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -21,7 +21,9 @@
#include "apitools.hxx"
#include "dbastrings.hrc"
#include "module_dba.hxx"
+#include "services.hxx"
+#include <boost/noncopyable.hpp>
#include <tools/debug.hxx>
#include <osl/diagnose.h>
#include <comphelper/sequence.hxx>
@@ -51,12 +53,10 @@ namespace dbaccess
/// helper class for column property change events which holds the OComponentDefinition weak
typedef ::cppu::WeakImplHelper1 < XPropertyChangeListener > TColumnPropertyListener_BASE;
-class OColumnPropertyListener : public TColumnPropertyListener_BASE
+class OColumnPropertyListener:
+ public TColumnPropertyListener_BASE, private boost::noncopyable
{
OComponentDefinition* m_pComponent;
-
- OColumnPropertyListener(const OColumnPropertyListener&);
- void operator =(const OColumnPropertyListener&);
protected:
virtual ~OColumnPropertyListener(){}
public:
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index ac6b1b8..8efc222 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -21,6 +21,7 @@
#include "apitools.hxx"
#include "dbastrings.hrc"
#include "module_dba.hxx"
+#include "services.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index af1c8da..33e675f 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -19,6 +19,7 @@
#include "dbastrings.hrc"
#include "module_dba.hxx"
+#include "services.hxx"
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 5ed028b..9270176 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -23,6 +23,7 @@
#include "databasedocument.hxx"
#include "dbastrings.hrc"
#include "module_dba.hxx"
+#include "services.hxx"
#include "documenteventexecutor.hxx"
#include "databasecontext.hxx"
#include "documentcontainer.hxx"
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 626de42..56142a3 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -27,6 +27,8 @@
#include <tools/urlobj.hxx>
#include <unotools/confignode.hxx>
+#include <databaseregistrations.hxx>
+
namespace dbaccess
{
using ::com::sun::star::uno::Reference;
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 5f18204b..3d65363 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -19,6 +19,7 @@
#include "datasource.hxx"
#include "module_dba.hxx"
+#include "services.hxx"
#include "userinformation.hxx"
#include "commandcontainer.hxx"
#include "dbastrings.hrc"
diff --git a/dbaccess/source/core/inc/services.hxx b/dbaccess/source/core/inc/services.hxx
new file mode 100644
index 0000000..41fcee7
--- /dev/null
+++ b/dbaccess/source/core/inc/services.hxx
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_SERVICES_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_SERVICES_HXX
+
+#include <sal/config.h>
+
+#include <sal/types.h>
+
+extern "C" {
+
+void SAL_CALL createRegistryInfo_DataAccessDescriptorFactory();
+void SAL_CALL createRegistryInfo_OCommandDefinition();
+void SAL_CALL createRegistryInfo_OComponentDefinition();
+void SAL_CALL createRegistryInfo_ODatabaseDocument();
+void SAL_CALL createRegistryInfo_ODatabaseSource();
+void SAL_CALL createRegistryInfo_ORowSet();
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index 750ddcd..5e2e11b 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -25,19 +25,12 @@
#include "dbadllapi.hxx"
#include <../dataaccess/databasecontext.hxx>
+#include <services.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-// registry functions
-extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition();
-extern "C" void SAL_CALL createRegistryInfo_OComponentDefinition();
-extern "C" void SAL_CALL createRegistryInfo_ORowSet();
-extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument();
-extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource();
-extern "C" void SAL_CALL createRegistryInfo_DataAccessDescriptorFactory();
-
namespace dba{
::cppu::ImplementationEntry entries[] = {
{
diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx
index e73b334..332d829 100644
--- a/dbaccess/source/ext/macromigration/dbmm_services.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx
@@ -18,12 +18,11 @@
*/
#include "dbmm_module.hxx"
+#include "macromigrationwizard.hxx"
namespace dbmm
{
- extern void createRegistryInfo_MacroMigrationDialogService();
-
static void initializeModule()
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx
index c5a9766..3faefe2 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.cxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.cxx
@@ -53,11 +53,6 @@ namespace dbmm
{
Reference< XInteractionHandler > xHandler;
- InteractionHandler_Data( const Reference< XInteractionHandler >& _rxHandler )
- :xHandler( _rxHandler )
- {
- }
-
InteractionHandler_Data( const Reference<XComponentContext>& _rContext )
:xHandler( ::com::sun::star::task::InteractionHandler::createWithParent(_rContext, 0), UNO_QUERY )
{
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index 57397e8..4913bcd 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -20,6 +20,7 @@
#include "dbmm_module.hxx"
#include "dbmm_global.hrc"
#include "macromigrationdialog.hxx"
+#include "macromigrationwizard.hxx"
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx
new file mode 100644
index 0000000..3c0bb6c
--- /dev/null
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONWIZARD_HXX
+#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONWIZARD_HXX
+
+#include <sal/config.h>
+
+namespace dbmm {
+
+void createRegistryInfo_MacroMigrationDialogService();
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index f8c0e3a..fb401c0 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -785,12 +785,6 @@ namespace dbmm
{
}
- PhaseGuard( ProgressMixer& _rMixer, const PhaseID _nID, const sal_uInt32 _nPhaseRange )
- :m_rMixer( _rMixer )
- {
- start( _nID, _nPhaseRange );
- }
-
~PhaseGuard()
{
m_rMixer.endPhase();
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx
index e17ec8d..82be373 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -38,13 +38,6 @@ namespace dbmm
OUString sOldName;
OUString sNewName;
- LibraryEntry()
- :eType( eBasic )
- ,sOldName()
- ,sNewName()
- {
- }
-
LibraryEntry( const ScriptType& _eType, const OUString& _rOldName, const OUString& _rNewName )
:eType( _eType )
,sOldName( _rOldName )
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index c07d0fd..d91b392 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -18,6 +18,7 @@
*/
#include "flt_reghelper.hxx"
+#include "xmlservices.hxx"
#include "xmlstrings.hrc"
#include <com/sun/star/beans/NamedValue.hpp>
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 36acf9f..4471e58 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -19,6 +19,7 @@
#include "xmlExport.hxx"
#include "xmlAutoStyle.hxx"
+#include "xmlservices.hxx"
#include "flt_reghelper.hxx"
#include <sax/tools/converter.hxx>
#include <xmloff/ProgressBarHelper.hxx>
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index f253d60..ec538fa 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
#include <config_features.h>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
@@ -26,6 +29,7 @@
#include <jvmaccess/virtualmachine.hxx>
#endif
#include "xmlfilter.hxx"
+#include "xmlservices.hxx"
#include "flt_reghelper.hxx"
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
@@ -171,12 +175,12 @@ namespace dbaxml
delete this;
}
- class DatasourceURLListener : public ::cppu::WeakImplHelper1< beans::XPropertyChangeListener >
+ class DatasourceURLListener:
+ public cppu::WeakImplHelper1<beans::XPropertyChangeListener>,
+ private boost::noncopyable
{
uno::Reference< uno::XComponentContext > m_xContext;
::dbaccess::ODsnTypeCollection m_aTypeCollection;
- DatasourceURLListener(const DatasourceURLListener&);
- void operator =(const DatasourceURLListener&);
protected:
virtual ~DatasourceURLListener(){}
public:
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx
index 35b6294..b90a801 100644
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/dbaccess/source/filter/xml/xmlservices.cxx
@@ -20,24 +20,13 @@
#include <cppuhelper/factory.hxx>
#include <osl/diagnose.h>
#include "flt_reghelper.hxx"
+#include "xmlservices.hxx"
using namespace ::dbaxml;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-
-
-// registry functions
-extern "C" void SAL_CALL createRegistryInfo_ODBFilter();
-extern "C" void SAL_CALL createRegistryInfo_ODBFilterExport();
-extern "C" void SAL_CALL createRegistryInfo_OSettingsExport();
-extern "C" void SAL_CALL createRegistryInfo_OFullExport();
-extern "C" void SAL_CALL createRegistryInfo_DBContentLoader2();
-extern "C" void SAL_CALL createRegistryInfo_DBTypeDetection();
-extern "C" void SAL_CALL writeDBLoaderInfo2(void* pRegistryKey);
-
-
extern "C" void SAL_CALL createRegistryInfo_dbaxml()
{
static sal_Bool bInit = sal_False;
diff --git a/dbaccess/source/filter/xml/xmlservices.hxx b/dbaccess/source/filter/xml/xmlservices.hxx
new file mode 100644
index 0000000..8176d8c
--- /dev/null
+++ b/dbaccess/source/filter/xml/xmlservices.hxx
@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLSERVICES_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLSERVICES_HXX
+
+#include <sal/config.h>
+
+#include <sal/types.h>
+
+extern "C" {
+
+void SAL_CALL createRegistryInfo_DBContentLoader2();
+void SAL_CALL createRegistryInfo_DBTypeDetection();
+void SAL_CALL createRegistryInfo_ODBFilter();
+void SAL_CALL createRegistryInfo_ODBFilterExport();
+void SAL_CALL createRegistryInfo_OFullExport();
+void SAL_CALL createRegistryInfo_OSettingsExport();
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index 58252eb..1f70020 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -18,6 +18,7 @@
*/
#include "connectiontools.hxx"
+#include "sdbt_services.hxx"
#include "tablename.hxx"
#include "objectnames.hxx"
#include "datasourcemetadata.hxx"
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index ff7f0ce..1e5dc0b 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -34,6 +34,7 @@
#include <cppuhelper/exc_hlp.hxx>
#include <rtl/ustrbuf.hxx>
+#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
namespace sdbtools
@@ -232,7 +233,7 @@ namespace sdbtools
};
// NameCheckFactory
- class NameCheckFactory
+ class NameCheckFactory: private boost::noncopyable
{
public:
/** creates an INameValidation instance which can be used to check the existence of query or table names
@@ -282,9 +283,6 @@ namespace sdbtools
);
private:
- NameCheckFactory(); // never implemented
-
- private:
static void verifyCommandType( sal_Int32 _nCommandType );
};
diff --git a/dbaccess/source/sdbtools/inc/sdbt_services.hxx b/dbaccess/source/sdbtools/inc/sdbt_services.hxx
new file mode 100644
index 0000000..a6491e2
--- /dev/null
+++ b/dbaccess/source/sdbtools/inc/sdbt_services.hxx
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_SDBT_SERVICES_HXX
+#define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_SDBT_SERVICES_HXX
+
+#include <sal/config.h>
+
+#include <sal/types.h>
+
+extern "C" void SAL_CALL createRegistryInfo_ConnectionTools();
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
index 03eba5f..55b25fd 100644
--- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
+++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
@@ -18,6 +18,7 @@
*/
#include "module_sdbt.hxx"
+#include "sdbt_services.hxx"
using ::com::sun::star::lang::XMultiServiceFactory;
using ::com::sun::star::registry::XRegistryKey;
@@ -25,8 +26,6 @@ using ::com::sun::star::registry::InvalidRegistryException;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
-extern "C" void SAL_CALL createRegistryInfo_ConnectionTools();
-
extern "C" void SAL_CALL sdbt_initializeModule()
{
static sal_Bool s_bInit = sal_False;
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index e044432..9493a2c 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -21,6 +21,7 @@
#include "dbustrings.hrc"
#include "advancedsettingsdlg.hxx"
#include "subcomponentmanager.hxx"
+#include "uiservices.hxx"
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/container/XChild.hpp>
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 0370aff..c15c149 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -91,33 +91,6 @@ using ::com::sun::star::ui::XContextMenuInterceptor;
namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition;
-class CloseChecker : public ::cppu::WeakImplHelper1< com::sun::star::lang::XEventListener >
-{
- bool m_bClosed;
-
-public:
- CloseChecker()
- :m_bClosed( false )
- {
- }
-
- virtual ~CloseChecker()
- {
- }
-
- bool isClosed()
- {
- return true;
- }
-
- // interface XEventListener
- virtual void SAL_CALL disposing( const EventObject& /*Source*/ ) throw( RuntimeException, std::exception ) SAL_OVERRIDE
- {
- m_bClosed = true;
- }
-
-};
-
void OApplicationController::convertToView(const OUString& _sName)
{
try
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 272c42f..dcfd8af 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -19,6 +19,7 @@
#include "dbu_reghelper.hxx"
#include "dbustrings.hrc"
+#include "uiservices.hxx"
#include "UITools.hxx"
#include <com/sun/star/container/XChild.hpp>
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index f97c16a..9a450b6 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -18,6 +18,7 @@
*/
#include "exsrcbrw.hxx"
+#include "uiservices.hxx"
#include <com/sun/star/form/FormComponentType.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/form/XGridColumnFactory.hpp>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 4186ab4..29987bb 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -18,6 +18,7 @@
*/
#include "sbagrid.hrc"
+#include "uiservices.hxx"
#include <svx/svxids.hrc>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 24cfc47..a6887b7 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -27,6 +27,7 @@
#include "dbu_reghelper.hxx"
#include "dbustrings.hrc"
#include "dlgsave.hxx"
+#include "uiservices.hxx"
#include "HtmlReader.hxx"
#include "imageprovider.hxx"
#include "listviewitems.hxx"
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 9332118..079bb8f 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -18,6 +18,7 @@
*/
#include "toolboxcontroller.hxx"
+#include "uiservices.hxx"
#include <com/sun/star/ui/ImageType.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index c5e5ca6..d6f948a 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -87,8 +87,6 @@ namespace dbaui
{
}
- extern sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const OUString& _sAllowedChars);
-
bool DbaIndexList::EditedEntry( SvTreeListEntry* _pEntry, const OUString& _rNewText )
{
// first check if this is valid SQL92 name
diff --git a/dbaccess/source/ui/inc/uiservices.hxx b/dbaccess/source/ui/inc/uiservices.hxx
new file mode 100644
index 0000000..d013e7a
--- /dev/null
+++ b/dbaccess/source/ui/inc/uiservices.hxx
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_UISERVICES_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_UISERVICES_HXX
+
+#include <sal/config.h>
+
+#include <sal/types.h>
+
+extern "C" {
+
+void SAL_CALL createRegistryInfo_ComposerDialogs();
+void SAL_CALL createRegistryInfo_CopyTableWizard();
+void SAL_CALL createRegistryInfo_DBContentLoader();
+void SAL_CALL createRegistryInfo_LimitBoxController();
+void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog();
+void SAL_CALL createRegistryInfo_OBrowser();
+void SAL_CALL createRegistryInfo_OColumnControl();
+void SAL_CALL createRegistryInfo_OColumnControlModel();
+void SAL_CALL createRegistryInfo_ODBApplication();
+void SAL_CALL createRegistryInfo_ODBTypeWizDialog();
+void SAL_CALL createRegistryInfo_ODBTypeWizDialogSetup();
+void SAL_CALL createRegistryInfo_ODataSourcePropertyDialog();
+void SAL_CALL createRegistryInfo_ODirectSQLDialog();
+void SAL_CALL createRegistryInfo_OFormGridView();
+void SAL_CALL createRegistryInfo_OInteractionHandler();
+void SAL_CALL createRegistryInfo_OQueryControl();
+void SAL_CALL createRegistryInfo_ORelationControl();
+void SAL_CALL createRegistryInfo_OSQLMessageDialog();
+void SAL_CALL createRegistryInfo_OTableControl();
+void SAL_CALL createRegistryInfo_OTableFilterDialog();
+void SAL_CALL createRegistryInfo_OTextConnectionSettingsDialog();
+void SAL_CALL createRegistryInfo_OToolboxController();
+void SAL_CALL createRegistryInfo_OUserSettingsDialog();
+void SAL_CALL createRegistryInfo_OViewControl();
+void SAL_CALL createRegistryInfo_SbaXGridControl();
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx
index 2a95483..bff738c 100644
--- a/dbaccess/source/ui/misc/uiservices.cxx
+++ b/dbaccess/source/ui/misc/uiservices.cxx
@@ -20,42 +20,13 @@
#include <cppuhelper/factory.hxx>
#include <osl/diagnose.h>
#include "dbu_reghelper.hxx"
+#include "uiservices.hxx"
using namespace ::dbaui;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-
-
-// registry functions
-extern "C" void SAL_CALL createRegistryInfo_OTableFilterDialog();
-extern "C" void SAL_CALL createRegistryInfo_ODataSourcePropertyDialog();
-extern "C" void SAL_CALL createRegistryInfo_OSQLMessageDialog();
-extern "C" void SAL_CALL createRegistryInfo_OBrowser();
-extern "C" void SAL_CALL createRegistryInfo_OFormGridView();
-extern "C" void SAL_CALL createRegistryInfo_DBContentLoader();
-extern "C" void SAL_CALL createRegistryInfo_OInteractionHandler();
-extern "C" void SAL_CALL createRegistryInfo_SbaXGridControl();
-extern "C" void SAL_CALL createRegistryInfo_OQueryControl();
-extern "C" void SAL_CALL createRegistryInfo_OViewControl();
-extern "C" void SAL_CALL createRegistryInfo_OTableControl();
-extern "C" void SAL_CALL createRegistryInfo_ORelationControl();
-extern "C" void SAL_CALL createRegistryInfo_ComposerDialogs();
-extern "C" void SAL_CALL createRegistryInfo_ODBApplication();
-extern "C" void SAL_CALL createRegistryInfo_ODirectSQLDialog();
-extern "C" void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog();
-extern "C" void SAL_CALL createRegistryInfo_ODBTypeWizDialog();
-extern "C" void SAL_CALL createRegistryInfo_OUserSettingsDialog();
-extern "C" void SAL_CALL createRegistryInfo_ODBTypeWizDialogSetup();
-extern "C" void SAL_CALL createRegistryInfo_OColumnControlModel();
-extern "C" void SAL_CALL createRegistryInfo_OColumnControl();
-extern "C" void SAL_CALL createRegistryInfo_OToolboxController();
-extern "C" void SAL_CALL createRegistryInfo_CopyTableWizard();
-extern "C" void SAL_CALL createRegistryInfo_OTextConnectionSettingsDialog();
-extern "C" void SAL_CALL createRegistryInfo_LimitBoxController();
-
-
extern "C" void SAL_CALL createRegistryInfo_DBU()
{
static sal_Bool bInit = sal_False;
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 3675b34..cb616d4 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -8,6 +8,7 @@
*/
#include "limitboxcontroller.hxx"
+#include "uiservices.hxx"
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 22a6b75..261f687 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -22,6 +22,7 @@
#include <map>
#include "dbu_reghelper.hxx"
+#include "uiservices.hxx"
#include <sfx2/sfxsids.hrc>
#include "dbu_rel.hrc"
#include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 531e0b7..af8a96d 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -61,11 +61,6 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::sdb;
-namespace dbaui
-{
- extern OUString GetTypeString( sal_uInt16 nType );
-}
-
// TYPEINIT1(OTableEditorCtrl, DBView);
#define HANDLE_ID 0
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 0bc7256..a8335de 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -33,6 +33,7 @@
#include "dsmeta.hxx"
#include "indexdialog.hxx"
#include "sqlmessage.hxx"
+#include "uiservices.hxx"
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index f6614bd..c6d9882 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include "uiservices.hxx"
#include "unoadmin.hxx"
#include "dbu_reghelper.hxx"
#include "advancedsettingsdlg.hxx"
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index e5dbc9a..a91c094 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -20,6 +20,7 @@
#include "ColumnControl.hxx"
#include "ColumnPeer.hxx"
#include "dbustrings.hrc"
+#include "uiservices.hxx"
#include "apitools.hxx"
#include <com/sun/star/awt/PosSize.hpp>
#include "dbu_reghelper.hxx"
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx
index 9247eaf..0407174 100644
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@@ -18,6 +18,7 @@
*/
#include "ColumnModel.hxx"
+#include "uiservices.hxx"
#include <com/sun/star/awt/FontRelief.hpp>
#include <com/sun/star/awt/FontEmphasisMark.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
index 230f6b0..ef1d0cd 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx
@@ -18,6 +18,7 @@
*/
#include "dbu_reghelper.hxx"
+#include "uiservices.hxx"
#include "DBTypeWizDlg.hxx"
#include "dbwiz.hxx"
#include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index 130bd12..9b030e4 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -18,6 +18,7 @@
*/
#include "dbu_reghelper.hxx"
+#include "uiservices.hxx"
#include <com/sun/star/document/XEventListener.hpp>
#include <com/sun/star/container/XSet.hpp>
#include "DBTypeWizDlgSetup.hxx"
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx
index 6c4594d..0a2d346 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.cxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx
@@ -18,6 +18,7 @@
*/
#include "dbu_reghelper.hxx"
+#include "uiservices.hxx"
#include "TableFilterDlg.hxx"
#include "TablesSingleDlg.hxx"
#include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
index 79ea897..4ab1a5f 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx
@@ -18,6 +18,7 @@
*/
#include "dbu_reghelper.hxx"
+#include "uiservices.hxx"
#include "UserSettingsDlg.hxx"
#include "UserAdminDlg.hxx"
#include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx
index 6f1a781..e14a46f 100644
--- a/dbaccess/source/ui/uno/admindlg.cxx
+++ b/dbaccess/source/ui/uno/admindlg.cxx
@@ -18,6 +18,7 @@
*/
#include "dbu_reghelper.hxx"
+#include "uiservices.hxx"
#include "admindlg.hxx"
#include "dbadmin.hxx"
#include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 4f690a5..da7ac7e 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -23,6 +23,7 @@
#include "dbustrings.hrc"
#include "moduledbu.hxx"
#include "sqlmessage.hxx"
+#include "uiservices.hxx"
#include "WCopyTable.hxx"
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -210,14 +211,6 @@ namespace dbaui
OCopyTableWizard&
impl_getDialog_throw();
- /** returns our typed dialog
-
- @throws ::com::sun::star::uno::RuntimeException
- if we don't have a dialog at the moment the method is called
- */
- const OCopyTableWizard&
- impl_getDialog_throw() const;
-
/** ensures the given argument sequence contains a valid data access descriptor at the given position
@param _rAllArgs
the arguments as passed to ->initialize
@@ -565,14 +558,6 @@ OCopyTableWizard& CopyTableWizard::impl_getDialog_throw()
return *pWizard;
}
-const OCopyTableWizard& CopyTableWizard::impl_getDialog_throw() const
-{
- const OCopyTableWizard* pWizard = dynamic_cast< const OCopyTableWizard* >( m_pDialog );
- if ( !pWizard )
- throw DisposedException( OUString(), *const_cast< CopyTableWizard* >( this ) );
- return *pWizard;
-}
-
void CopyTableWizard::impl_attributesToDialog_nothrow( OCopyTableWizard& _rDialog ) const
{
// primary key column
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index e8ef525..2f807f8 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -18,6 +18,7 @@
*/
#include "textconnectionsettings.hxx"
+#include "uiservices.hxx"
#include "dbu_reghelper.hxx"
#include "moduledbu.hxx"
#include "apitools.hxx"
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx
index 6ae7c80..bc58efb 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include "uiservices.hxx"
#include "unoDirectSql.hxx"
#include "dbu_reghelper.hxx"
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx
index a4beaa6..f13270e 100644
--- a/dbaccess/source/ui/uno/unosqlmessage.cxx
+++ b/dbaccess/source/ui/uno/unosqlmessage.cxx
@@ -18,6 +18,7 @@
*/
#include "sqlmessage.hxx"
+#include "uiservices.hxx"
#include "unosqlmessage.hxx"
#include "dbu_reghelper.hxx"
#include "dbustrings.hrc"
More information about the Libreoffice-commits
mailing list