[Libreoffice-commits] core.git: extensions/Library_ldapbe2.mk extensions/source
Stephan Bergmann
sbergman at redhat.com
Sun Apr 13 14:44:56 PDT 2014
extensions/Library_ldapbe2.mk | 1
extensions/source/abpilot/abpservices.cxx | 9 -
extensions/source/abpilot/datasourcehandling.cxx | 8 -
extensions/source/abpilot/unodialogabp.cxx | 2
extensions/source/abpilot/unodialogabp.hxx | 1
extensions/source/config/ldap/ldapaccess.cxx | 7 -
extensions/source/dbpilots/dbpservices.cxx | 11 --
extensions/source/dbpilots/dbpservices.hxx | 37 +++++++
extensions/source/dbpilots/wizardservices.cxx | 2
extensions/source/logging/consolehandler.cxx | 1
extensions/source/logging/csvformatter.cxx | 1
extensions/source/logging/filehandler.cxx | 1
extensions/source/logging/log_services.cxx | 11 --
extensions/source/logging/log_services.hxx | 37 +++++++
extensions/source/logging/logger.cxx | 1
extensions/source/logging/plaintextformatter.cxx | 1
extensions/source/plugin/unx/npnapi.cxx | 4
extensions/source/plugin/unx/npwrap.cxx | 4
extensions/source/plugin/unx/npwrap.hxx | 31 ++++++
extensions/source/propctrlr/MasterDetailLinkDialog.cxx | 1
extensions/source/propctrlr/browserlistbox.cxx | 8 -
extensions/source/propctrlr/buttonnavigationhandler.cxx | 1
extensions/source/propctrlr/cellbindinghandler.cxx | 1
extensions/source/propctrlr/composeduiupdate.cxx | 8 -
extensions/source/propctrlr/controlfontdialog.cxx | 1
extensions/source/propctrlr/defaultforminspection.cxx | 1
extensions/source/propctrlr/defaulthelpprovider.cxx | 1
extensions/source/propctrlr/editpropertyhandler.cxx | 1
extensions/source/propctrlr/eformspropertyhandler.cxx | 1
extensions/source/propctrlr/eventhandler.cxx | 1
extensions/source/propctrlr/formcomponenthandler.cxx | 1
extensions/source/propctrlr/formcontroller.cxx | 1
extensions/source/propctrlr/formgeometryhandler.cxx | 2
extensions/source/propctrlr/formlinkdialog.cxx | 1
extensions/source/propctrlr/genericpropertyhandler.cxx | 10 --
extensions/source/propctrlr/objectinspectormodel.cxx | 1
extensions/source/propctrlr/pcrservices.cxx | 27 -----
extensions/source/propctrlr/pcrservices.hxx | 53 +++++++++++
extensions/source/propctrlr/pcrunodialogs.cxx | 1
extensions/source/propctrlr/propcontroller.cxx | 1
extensions/source/propctrlr/stringrepresentation.cxx | 9 +
extensions/source/propctrlr/submissionhandler.cxx | 3
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 3
extensions/source/update/check/updatecheck.cxx | 3
extensions/source/update/check/updatecheckjob.cxx | 4
45 files changed, 218 insertions(+), 97 deletions(-)
New commits:
commit a6611be6bc145a9f538a9f1bbe6d40f32ebad1c9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun Apr 13 23:44:29 2014 +0200
Clean up function declarations and some unused functions
Change-Id: Ie81d270267b6c3c3620ade62eb393b28d995a654
diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index a2d46fe..0eb2699 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_system_win32_libs,ldapbe2,\
))
else # 0S!=WNT
$(eval $(call gb_Library_use_externals,ldapbe2,\
+ boost_headers \
openldap \
nss3 \
plc4 \
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx
index 4a2ef7f..efa0867 100644
--- a/extensions/source/abpilot/abpservices.cxx
+++ b/extensions/source/abpilot/abpservices.cxx
@@ -18,20 +18,13 @@
*/
#include "componentmodule.hxx"
-
-
+#include "unodialogabp.hxx"
using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-
-
-extern "C" void SAL_CALL createRegistryInfo_OABSPilotUno();
-
-
-
extern "C" void SAL_CALL abp_initializeModule()
{
static sal_Bool s_bInit = sal_False;
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index c5ded23..c8372da 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -23,6 +23,7 @@
#include "componentmodule.hxx"
#include "datasourcehandling.hxx"
+#include <boost/noncopyable.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/frame/XStorable.hpp>
@@ -160,18 +161,13 @@ namespace abp
//= ODataSourceContextImpl
- struct ODataSourceContextImpl
+ struct ODataSourceContextImpl: private boost::noncopyable
{
Reference< XComponentContext > xORB;
Reference< XNameAccess > xContext; /// the UNO data source context
StringBag aDataSourceNames; /// for quicker name checks (without the UNO overhead)
ODataSourceContextImpl( const Reference< XComponentContext >& _rxORB ) : xORB( _rxORB ) { }
- ODataSourceContextImpl( const ODataSourceContextImpl& _rSource )
- :xORB ( _rSource.xORB )
- ,xContext ( _rSource.xContext )
- {
- }
};
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index f3e3bd5..1ed507b 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -24,7 +24,7 @@
#include <comphelper/sequence.hxx>
#include <vcl/msgbox.hxx>
-extern "C" void SAL_CALL createRegistryInfo_OABSPilotUno()
+void SAL_CALL createRegistryInfo_OABSPilotUno()
{
static ::abp::OMultiInstanceAutoRegistration< ::abp::OABSPilotUno > aAutoRegistration;
}
diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx
index dc24fad..8844798 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -91,6 +91,7 @@ namespace abp
} // namespace abp
+extern "C" void SAL_CALL createRegistryInfo_OABSPilotUno();
#endif // EXTENSIONS_ABP_UNODIALOG_HXX
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index 984bdc8..405c721 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -20,6 +20,7 @@
#include "ldapaccess.hxx"
+#include <boost/noncopyable.hpp>
#include <rtl/ustrbuf.hxx>
#include <rtl/strbuf.hxx>
@@ -29,7 +30,7 @@ namespace extensions { namespace config { namespace ldap {
typedef int LdapErrCode;
-struct LdapMessageHolder
+struct LdapMessageHolder: private boost::noncopyable
{
LdapMessageHolder() : msg(0) {}
~LdapMessageHolder()
@@ -39,10 +40,6 @@ struct LdapMessageHolder
}
LDAPMessage * msg;
-
-private:
- LdapMessageHolder(LdapMessageHolder const&);
- void operator=(LdapMessageHolder const&);
};
LdapConnection::~LdapConnection()
diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx
index ea88412..ede2523 100644
--- a/extensions/source/dbpilots/dbpservices.cxx
+++ b/extensions/source/dbpilots/dbpservices.cxx
@@ -18,22 +18,13 @@
*/
#include "componentmodule.hxx"
-
-
+#include "dbpservices.hxx"
using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-
-
-extern "C" void SAL_CALL createRegistryInfo_OGroupBoxWizard();
-extern "C" void SAL_CALL createRegistryInfo_OListComboWizard();
-extern "C" void SAL_CALL createRegistryInfo_OGridWizard();
-
-
-
extern "C" void SAL_CALL dbp_initializeModule()
{
static sal_Bool s_bInit = sal_False;
diff --git a/extensions/source/dbpilots/dbpservices.hxx b/extensions/source/dbpilots/dbpservices.hxx
new file mode 100644
index 0000000..bdc6cbc
--- /dev/null
+++ b/extensions/source/dbpilots/dbpservices.hxx
@@ -0,0 +1,37 @@
+/* -*- 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_EXTENSIONS_SOURCE_DBPILOTS_DBPSERVICES_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_DBPSERVICES_HXX
+
+#include <sal/config.h>
+
+#include <sal/types.h>
+
+extern "C" {
+
+void SAL_CALL createRegistryInfo_OGridWizard();
+void SAL_CALL createRegistryInfo_OGroupBoxWizard();
+void SAL_CALL createRegistryInfo_OListComboWizard();
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx
index e52eb28..4c0e3dd 100644
--- a/extensions/source/dbpilots/wizardservices.cxx
+++ b/extensions/source/dbpilots/wizardservices.cxx
@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+#include "dbpservices.hxx"
#include "wizardservices.hxx"
#include "unoautopilot.hxx"
#include "groupboxwiz.hxx"
diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index 740ffb3..81b28e37 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -19,6 +19,7 @@
#include "log_module.hxx"
+#include "log_services.hxx"
#include "methodguard.hxx"
#include "loghandler.hxx"
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index 7a1034b..da152f8 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -19,6 +19,7 @@
#include "log_module.hxx"
+#include "log_services.hxx"
#include <stdio.h>
#include <string>
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index 5f94982..c82175f 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -19,6 +19,7 @@
#include "log_module.hxx"
+#include "log_services.hxx"
#include "methodguard.hxx"
#include "loghandler.hxx"
diff --git a/extensions/source/logging/log_services.cxx b/extensions/source/logging/log_services.cxx
index 74231ba..1b667d7 100644
--- a/extensions/source/logging/log_services.cxx
+++ b/extensions/source/logging/log_services.cxx
@@ -18,19 +18,10 @@
*/
#include "log_module.hxx"
-
+#include "log_services.hxx"
namespace logging
{
-
-
-
- extern void createRegistryInfo_LoggerPool();
- extern void createRegistryInfo_FileHandler();
- extern void createRegistryInfo_ConsoleHandler();
- extern void createRegistryInfo_PlainTextFormatter();
- extern void createRegistryInfo_CsvFormatter();
-
static void initializeModule()
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
diff --git a/extensions/source/logging/log_services.hxx b/extensions/source/logging/log_services.hxx
new file mode 100644
index 0000000..bdca2d5
--- /dev/null
+++ b/extensions/source/logging/log_services.hxx
@@ -0,0 +1,37 @@
+/* -*- 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_EXTENSIONS_SOURCE_LOGGING_LOG_SERVICES_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOG_SERVICES_HXX
+
+#include <sal/config.h>
+
+namespace logging {
+
+void createRegistryInfo_LoggerPool();
+void createRegistryInfo_FileHandler();
+void createRegistryInfo_ConsoleHandler();
+void createRegistryInfo_PlainTextFormatter();
+void createRegistryInfo_CsvFormatter();
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index 527be5c..6d7c3f8 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -19,6 +19,7 @@
#include "log_module.hxx"
+#include "log_services.hxx"
#include "logrecord.hxx"
#include "loggerconfig.hxx"
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 4ba9016..b044978 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -19,6 +19,7 @@
#include "log_module.hxx"
+#include "log_services.hxx"
#include <stdio.h>
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index 2a4f33a..3345acd 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -42,6 +42,8 @@
#include <config_vclplug.h>
+#include <npwrap.hxx>
+
extern PluginConnector* pConnector;
extern XtAppContext app_context;
extern int wakeup_fd[];
@@ -51,8 +53,6 @@ extern Display* pXtAppDisplay;
extern int nAppArguments;
extern char** pAppArguments;
-void* CreateNewShell( void**, XLIB_Window );
-
// begin Netscape plugin api calls
extern "C" {
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index afed65b..196d913 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -45,6 +45,8 @@
#include <config_vclplug.h>
+#include <npwrap.hxx>
+
PluginConnector* pConnector = NULL;
int nAppArguments = 0;
@@ -55,8 +57,6 @@ Display* pXtAppDisplay = NULL;
extern oslModule pPluginLib;
extern NPError (*pNP_Shutdown)();
-void LoadAdditionalLibs(const char*);
-
XtAppContext app_context;
Widget topLevel = NULL, topBox = NULL;
int wakeup_fd[2] = { 0, 0 };
diff --git a/extensions/source/plugin/unx/npwrap.hxx b/extensions/source/plugin/unx/npwrap.hxx
new file mode 100644
index 0000000..d2b6c96
--- /dev/null
+++ b/extensions/source/plugin/unx/npwrap.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_EXTENSIONS_SOURCE_PLUGIN_UNX_NPWRAP_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PLUGIN_UNX_NPWRAP_HXX
+
+#include <sal/config.h>
+
+void* CreateNewShell( void** pShellReturn, XLIB_Window aParentWindow );
+
+void LoadAdditionalLibs(const char*);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index 3f50b2e..788aabb 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -19,6 +19,7 @@
#include "MasterDetailLinkDialog.hxx"
#include "formlinkdialog.hxx"
+#include "pcrservices.hxx"
extern "C" void SAL_CALL createRegistryInfo_MasterDetailLinkDialog()
{
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 8332a34..5f77e06 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -24,6 +24,7 @@
#include "linedescriptor.hxx"
#include "inspectorhelpwindow.hxx"
+#include <boost/noncopyable.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/inspection/PropertyControlType.hpp>
@@ -82,7 +83,7 @@ namespace pcr
//= SharedNotifier
- class SharedNotifier
+ class SharedNotifier: private boost::noncopyable
{
private:
static ::osl::Mutex& getMutex();
@@ -91,11 +92,6 @@ namespace pcr
public:
static const ::rtl::Reference< ::comphelper::AsyncEventNotifier >&
getNotifier();
-
- private:
- SharedNotifier(); // never implemented
- SharedNotifier( const SharedNotifier& ); // never implemented
- SharedNotifier& operator=( const SharedNotifier& ); // never implemented
};
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx
index 158aa95..9e8de62 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.cxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx
@@ -20,6 +20,7 @@
#include "buttonnavigationhandler.hxx"
#include "formstrings.hxx"
#include "formmetadata.hxx"
+#include "pcrservices.hxx"
#include "pushbuttonnavigation.hxx"
#include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp>
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index 745a7af..5ce7378 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -21,6 +21,7 @@
#include "formstrings.hxx"
#include "formmetadata.hxx"
#include "cellbindinghelper.hxx"
+#include "pcrservices.hxx"
#include <com/sun/star/form/binding/XValueBinding.hpp>
#include <com/sun/star/table/CellAddress.hpp>
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index 89fbab3..bc15bcc 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -19,6 +19,7 @@
#include "composeduiupdate.hxx"
+#include <boost/noncopyable.hpp>
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/inspection/PropertyLineElement.hpp>
@@ -76,7 +77,8 @@ namespace pcr
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::inspection::XObjectInspectorUI
> CachedInspectorUI_Base;
- struct CachedInspectorUI : public CachedInspectorUI_Base
+ struct CachedInspectorUI:
+ public CachedInspectorUI_Base, private boost::noncopyable
{
private:
::osl::Mutex m_aMutex;
@@ -170,10 +172,6 @@ namespace pcr
void impl_notifySingleUIChange() const;
private:
- CachedInspectorUI( const CachedInspectorUI& ); // never implemented
- CachedInspectorUI& operator=( const CachedInspectorUI& ); // never implemented
-
- private:
class MethodGuard;
friend class MethodGuard;
class MethodGuard : public ::osl::MutexGuard
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index 603bccd..54f1a38 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -23,6 +23,7 @@
#include "fontdialog.hxx"
#include "formstrings.hxx"
#include "pcrcommon.hxx"
+#include "pcrservices.hxx"
extern "C" void SAL_CALL createRegistryInfo_OControlFontDialog()
{
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index 728a14e..3f91084 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -19,6 +19,7 @@
#include "defaultforminspection.hxx"
#include "pcrcommon.hxx"
+#include "pcrservices.hxx"
#include "propresid.hrc"
#include "formresid.hrc"
#include "modulepcr.hxx"
diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx
index de0f7a0..3e09a79 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.cxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.cxx
@@ -20,6 +20,7 @@
#include "defaulthelpprovider.hxx"
#include "pcrcommon.hxx"
+#include "pcrservices.hxx"
#include "modulepcr.hxx"
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index 9087088..27b1366 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -20,6 +20,7 @@
#include "editpropertyhandler.hxx"
#include "formstrings.hxx"
#include "formmetadata.hxx"
+#include "pcrservices.hxx"
#include <com/sun/star/inspection/XObjectInspectorUI.hpp>
#include <tools/debug.hxx>
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index ad08611..abe9139 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -20,6 +20,7 @@
#include "eformspropertyhandler.hxx"
#include "formstrings.hxx"
#include "formmetadata.hxx"
+#include "pcrservices.hxx"
#include "propctrlr.hrc"
#include "formbrowsertools.hxx"
#include "eformshelper.hxx"
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 5065796..9c3c98a 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -19,6 +19,7 @@
#include "eventhandler.hxx"
+#include "pcrservices.hxx"
#include "propctrlr.hrc"
#include "formbrowsertools.hxx"
#include "formresid.hrc"
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 071f085..ab7f34e 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -19,6 +19,7 @@
#include "controltype.hxx"
+#include "pcrservices.hxx"
#include "propctrlr.hrc"
#include "extensio.hrc"
#include "fontdialog.hxx"
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index d83de3d..d47c23f 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -19,6 +19,7 @@
#include "formcontroller.hxx"
#include "pcrcommon.hxx"
+#include "pcrservices.hxx"
#include "formstrings.hxx"
#include "defaultforminspection.hxx"
#include "propctrlr.hrc"
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 091c046..5fc3a9d 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+#include "pcrservices.hxx"
#include "propertyhandler.hxx"
#include "formmetadata.hxx"
#include "formstrings.hxx"
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 5a1fb98..ac27c97 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -73,7 +73,6 @@ namespace pcr
FieldLinkRow( Window* _pParent, const ResId& _rId );
inline void SetLinkChangeHandler( const Link& _rHdl ) { m_aLinkChangeHandler = _rHdl; }
- inline const Link& GetLinkChangeHandler( ) const { return m_aLinkChangeHandler; }
enum LinkParticipant
{
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 860d869..f2c614b 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -20,7 +20,9 @@
#include "genericpropertyhandler.hxx"
#include "formmetadata.hxx"
#include "handlerhelper.hxx"
+#include "pcrservices.hxx"
+#include <boost/noncopyable.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/reflection/XEnumTypeDescription.hpp>
#include <com/sun/star/beans/theIntrospection.hpp>
@@ -60,7 +62,8 @@ namespace pcr
using ::com::sun::star::awt::XActionListener;
using ::com::sun::star::awt::ActionEvent;
- class EnumRepresentation : public IPropertyEnumRepresentation
+ class EnumRepresentation:
+ public IPropertyEnumRepresentation, private boost::noncopyable
{
private:
oslInterlockedCount m_refCount;
@@ -82,11 +85,6 @@ namespace pcr
private:
void impl_getValues( Sequence< sal_Int32 >& _out_rValues ) const;
-
- private:
- EnumRepresentation(); // never implemented
- EnumRepresentation( const EnumRepresentation& ); // never implemented
- EnumRepresentation& operator=( const EnumRepresentation& ); // never implemented
};
EnumRepresentation::EnumRepresentation( const Reference< XComponentContext >& _rxContext, const Type& _rEnumType )
diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx
index baa653a..0f0f076 100644
--- a/extensions/source/propctrlr/objectinspectormodel.cxx
+++ b/extensions/source/propctrlr/objectinspectormodel.cxx
@@ -19,6 +19,7 @@
#include "modulepcr.hxx"
#include "pcrcommon.hxx"
+#include "pcrservices.hxx"
#include "inspectormodelbase.hxx"
#include <com/sun/star/ucb/AlreadyInitializedException.hpp>
diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx
index 17b4749..964b114 100644
--- a/extensions/source/propctrlr/pcrservices.cxx
+++ b/extensions/source/propctrlr/pcrservices.cxx
@@ -19,38 +19,13 @@
#include "modulepcr.hxx"
-
-
+#include "pcrservices.hxx"
using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-
-
-extern "C" void SAL_CALL createRegistryInfo_OPropertyBrowserController();
-extern "C" void SAL_CALL createRegistryInfo_FormController();
-extern "C" void SAL_CALL createRegistryInfo_DefaultFormComponentInspectorModel();
-extern "C" void SAL_CALL createRegistryInfo_DefaultHelpProvider();
-extern "C" void SAL_CALL createRegistryInfo_OControlFontDialog();
-extern "C" void SAL_CALL createRegistryInfo_OTabOrderDialog();
-extern "C" void SAL_CALL createRegistryInfo_CellBindingPropertyHandler();
-extern "C" void SAL_CALL createRegistryInfo_ButtonNavigationHandler();
-extern "C" void SAL_CALL createRegistryInfo_EditPropertyHandler();
-extern "C" void SAL_CALL createRegistryInfo_FormComponentPropertyHandler();
-extern "C" void SAL_CALL createRegistryInfo_EFormsPropertyHandler();
-extern "C" void SAL_CALL createRegistryInfo_XSDValidationPropertyHandler();
-extern "C" void SAL_CALL createRegistryInfo_EventHandler();
-extern "C" void SAL_CALL createRegistryInfo_GenericPropertyHandler();
-extern "C" void SAL_CALL createRegistryInfo_ObjectInspectorModel();
-extern "C" void SAL_CALL createRegistryInfo_SubmissionPropertyHandler();
-extern "C" void SAL_CALL createRegistryInfo_StringRepresentation();
-extern "C" void SAL_CALL createRegistryInfo_MasterDetailLinkDialog();
-extern "C" void SAL_CALL createRegistryInfo_FormGeometryHandler();
-
-
-
extern "C" void SAL_CALL pcr_initializeModule()
{
static sal_Bool s_bInit = sal_False;
diff --git a/extensions/source/propctrlr/pcrservices.hxx b/extensions/source/propctrlr/pcrservices.hxx
new file mode 100644
index 0000000..68dbd88
--- /dev/null
+++ b/extensions/source/propctrlr/pcrservices.hxx
@@ -0,0 +1,53 @@
+/* -*- 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_EXTENSIONS_SOURCE_PROPCTRLR_PCRSERVICES_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PCRSERVICES_HXX
+
+#include <sal/config.h>
+
+#include <sal/types.h>
+
+extern "C" {
+
+void SAL_CALL createRegistryInfo_ButtonNavigationHandler();
+void SAL_CALL createRegistryInfo_CellBindingPropertyHandler();
+void SAL_CALL createRegistryInfo_DefaultFormComponentInspectorModel();
+void SAL_CALL createRegistryInfo_DefaultHelpProvider();
+void SAL_CALL createRegistryInfo_EFormsPropertyHandler();
+void SAL_CALL createRegistryInfo_EditPropertyHandler();
+void SAL_CALL createRegistryInfo_EventHandler();
+void SAL_CALL createRegistryInfo_FormComponentPropertyHandler();
+void SAL_CALL createRegistryInfo_FormController();
+void SAL_CALL createRegistryInfo_FormGeometryHandler();
+void SAL_CALL createRegistryInfo_GenericPropertyHandler();
+void SAL_CALL createRegistryInfo_MasterDetailLinkDialog();
+void SAL_CALL createRegistryInfo_OControlFontDialog();
+void SAL_CALL createRegistryInfo_OPropertyBrowserController();
+void SAL_CALL createRegistryInfo_OTabOrderDialog();
+void SAL_CALL createRegistryInfo_ObjectInspectorModel();
+void SAL_CALL createRegistryInfo_StringRepresentation();
+void SAL_CALL createRegistryInfo_SubmissionPropertyHandler();
+void SAL_CALL createRegistryInfo_XSDValidationPropertyHandler();
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index 4f60af8..de4ebe6 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/beans/NamedValue.hpp>
+#include "pcrservices.hxx"
#include "pcrunodialogs.hxx"
#include "formstrings.hxx"
#include "pcrstrings.hxx"
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index b0029b6..fafa76a 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "pcrservices.hxx"
#include "propcontroller.hxx"
#include "pcrstrings.hxx"
#include "standardcontrol.hxx"
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index 1e6e546..20573c0 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -18,6 +18,8 @@
*/
#include "sal/config.h"
+
+#include "boost/noncopyable.hpp"
#include "cppuhelper/factory.hxx"
#include "cppuhelper/implementationentry.hxx"
#include "cppuhelper/implbase3.hxx"
@@ -35,6 +37,7 @@
#include <comphelper/sequenceasvector.hxx>
#include <connectivity/dbconversion.hxx>
#include "formresid.hrc"
+#include "pcrservices.hxx"
#include <tools/debug.hxx>
#include <tools/StringListResource.hxx>
#include <comphelper/types.hxx>
@@ -65,7 +68,8 @@ class StringRepresentation:
public ::cppu::WeakImplHelper3<
lang::XServiceInfo,
inspection::XStringRepresentation,
- lang::XInitialization>
+ lang::XInitialization>,
+ private boost::noncopyable
{
public:
explicit StringRepresentation(uno::Reference< uno::XComponentContext > const & context);
@@ -83,9 +87,6 @@ public:
virtual void SAL_CALL initialize(const uno::Sequence< uno::Any > & aArguments) throw (uno::RuntimeException, uno::Exception, std::exception) SAL_OVERRIDE;
private:
- StringRepresentation(StringRepresentation &); // not defined
- void operator =(StringRepresentation &); // not defined
-
virtual ~StringRepresentation() {}
/** converts a generic value into a string representation
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index 34431c9..6a1f491 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include "pcrservices.hxx"
#include "submissionhandler.hxx"
#include "formmetadata.hxx"
#include "formstrings.hxx"
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 36b86e2..f0baf09 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include "pcrservices.hxx"
#include "xsdvalidationpropertyhandler.hxx"
#include "formstrings.hxx"
#include "formmetadata.hxx"
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index e42ccfa..1d7337b 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -70,8 +70,9 @@ namespace uno = com::sun::star::uno ;
#define PROPERTY_CLICK_HDL "MenuClickHDL"
#define PROPERTY_SHOW_MENUICON "MenuIconVisible"
+#if defined WNT
extern "C" bool SAL_CALL WNT_hasInternetConnection();
-
+#endif
// Returns the URL of the release note for the given position
OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloadEnabled)
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 4d78598..6a2699a 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -77,10 +77,6 @@ public:
static uno::Sequence< OUString > getServiceNames();
static OUString getImplName();
- // Allows runtime exceptions to be thrown by const methods
- inline SAL_CALL operator uno::Reference< uno::XInterface > () const
- { return const_cast< cppu::OWeakObject * > (static_cast< cppu::OWeakObject const * > (this)); };
-
// XJob
virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&)
throw (lang::IllegalArgumentException, uno::Exception, std::exception) SAL_OVERRIDE;
More information about the Libreoffice-commits
mailing list