Clean up function declarations and some unused functions

Change-Id: Ie81d270267b6c3c3620ade62eb393b28d995a654

44 files changed, 217 insertions, 97 deletions

diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx
index 4a2ef7fe53c5..efa0867c4441 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 c5ded237a463..c8372da0895e 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 f3e3bd5dadcb..1ed507b60dc2 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 dc24fad4e860..8844798f578a 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 984bdc88e956..405c721b5174 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 ea8841218874..ede2523fecf9 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 000000000000..bdc6cbcb6690
--- /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 e52eb28b6d87..4c0e3dd0fce2 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 740ffb3eea52..81b28e377c7c 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 7a1034bb38fa..da152f8667af 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 5f94982d5b10..c82175f7d6a9 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 74231ba6622a..1b667d7c1f40 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 000000000000..bdca2d5efc4d
--- /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 527be5c0f6d9..6d7c3f8a843d 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 4ba90165a1fd..b044978e4a5b 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 2a4f33a12dcf..3345acda1a20 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 afed65bbfc88..196d913ba3c7 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 000000000000..d2b6c96ba77b
--- /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 3f50b2efde26..788aabbc4ed2 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 8332a341b4a5..5f77e069610a 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 158aa9503430..9e8de62367f0 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 745a7afbd8d4..5ce737887f49 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 89fbab34b28f..bc15bcc438d4 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 603bccdacadc..54f1a3819cb6 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 728a14e6ac80..3f9108464ee3 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 de0f7a07ebc2..3e09a79a9181 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 9087088b6052..27b1366b0584 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 ad0861174342..abe9139d9720 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 506579679b41..9c3c98abe222 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 071f085ed91b..ab7f34e0bf31 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 d83de3d7f20b..d47c23fc4944 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 091c0466b894..5fc3a9d40dfc 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 5a1fb98f54e4..ac27c97ed313 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 860d8692d42f..f2c614bd4c00 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 baa653a00290..0f0f07653e5f 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 17b4749f0fc3..964b114dbb45 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 000000000000..68dbd88c7e86
--- /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 4f60af8f50ed..de4ebe669192 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 b0029b69013f..fafa76aeb1a2 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 1e6e54622cbd..20573c0dc4bc 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 34431c9b82f5..6a1f491bacf0 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 36b86e2c9a1b..f0baf0969c48 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 e42ccfa05ed1..1d7337b70a05 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 4d785981d636..6a2699aafab4 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;