Clean up function declarations and some unused functions

Change-Id: I63c4c61847fea4500b667a5ea9f2b32207692033

19 files changed, 98 insertions, 47 deletions

diff --git a/basic/inc/sb.hxx b/basic/inc/sb.hxx
index 6a3c2f7e06a3..cd028f7985dc 100644
--- a/basic/inc/sb.hxx
+++ b/basic/inc/sb.hxx
@@ -28,6 +28,9 @@
 
 #include "sbprop.hxx"
 
+// create object from user-type  (+StringID+StringID)
+SbxObject* createUserTypeImpl( const OUString& rClassName );
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index b8cc7cfb2255..09486cf594da 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -393,7 +393,6 @@ private:
 public:
     BasicLibInfo();
 
-    bool              IsReference() const     { return bReference; }
     bool&             IsReference()           { return bReference; }
 
     bool              IsExtern() const        { return ! aStorageName.equalsAscii(szImbedded); }
@@ -424,7 +423,6 @@ public:
     const OUString&   GetPassword() const                 { return aPassword; }
     void              SetPassword( const OUString& rNewPassword )
                                                         { aPassword = rNewPassword; }
-    bool              IsPasswordVerified() const          { return bPasswordVerified; }
     void              SetPasswordVerified()               { bPasswordVerified = true; }
 
     static BasicLibInfo*    Create( SotStorageStream& rSStream );
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index ff1d60cb37c1..16fc4bd351ec 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -56,7 +56,7 @@
 #include <basic/sbuno.hxx>
 #include <runtime.hxx>
 #include <sbintern.hxx>
-
+#include <eventatt.hxx>
 
 #include <cppuhelper/implbase1.hxx>
 using namespace ::com::sun::star;
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 41781f7a5d34..913237ca2439 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -34,20 +34,10 @@ using namespace cppu;
 
 struct SbCompare_UString_PropertyValue_Impl
 {
-   bool operator() (const OUString& lhs, PropertyValue const & rhs)
-   {
-      return lhs.compareTo(rhs.Name) < 0;
-   }
    bool operator() (PropertyValue const & lhs, const OUString& rhs)
    {
       return lhs.Name.compareTo(rhs) < 0;
    }
-#ifdef DBG_UTIL
-   bool operator() (PropertyValue const & lhs, const PropertyValue& rhs)
-   {
-       return lhs.Name.compareTo(rhs.Name) < 0;
-   }
-#endif
 };
 
 extern "C" int SAL_CALL SbCompare_UString_Property_Impl( const void *arg1, const void *arg2 )
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 526a01337c97..0acfc92a7c1d 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -459,8 +459,6 @@ SbxBase* SbOLEFactory::Create( sal_uInt16, sal_uInt32 )
     return NULL;
 }
 
-SbUnoObject* createOLEObject_Impl( const OUString& aType );  // sbunoobj.cxx
-
 SbxObject* SbOLEFactory::CreateObject( const OUString& rClassName )
 {
     SbxObject* pRet = createOLEObject_Impl( rClassName );
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 9a0d83ccb824..74f5fec8ec69 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -70,6 +70,8 @@
 #include <com/sun/star/script/XAutomationInvocation.hpp>
 #include <basic/codecompletecache.hxx>
 
+#include <rtlproto.hxx>
+
 using com::sun::star::uno::Reference;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -468,8 +470,6 @@ struct ObjectItem
 {
     SbxObjectRef    m_xNativeObj;
 
-    ObjectItem( void )
-    {}
     ObjectItem( SbxObject* pNativeObj )
         : m_xNativeObj( pNativeObj )
     {}
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 616b1a1bbc30..668c2529c787 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -20,6 +20,7 @@
 
 #include <list>
 
+#include <boost/noncopyable.hpp>
 #include <vcl/svapp.hxx>
 #include <tools/stream.hxx>
 #include <svl/brdcst.hxx>
@@ -455,10 +456,10 @@ bool getDefaultVBAMode( StarBASIC* pb )
     return xVBACompat.is() && xVBACompat->getVBACompatibilityMode();
 }
 
-class AsyncQuitHandler
+class AsyncQuitHandler: private boost::noncopyable
 {
     AsyncQuitHandler() {}
-    AsyncQuitHandler( const AsyncQuitHandler&);
+
 public:
     static AsyncQuitHandler& instance()
     {
@@ -2265,7 +2266,8 @@ typedef ::cppu::WeakImplHelper3<
     awt::XWindowListener,
     document::XEventListener > FormObjEventListener_BASE;
 
-class FormObjEventListenerImpl : public FormObjEventListener_BASE
+class FormObjEventListenerImpl:
+    public FormObjEventListener_BASE, private boost::noncopyable
 {
     SbUserFormModule* mpUserForm;
     uno::Reference< lang::XComponent > mxComponent;
@@ -2275,9 +2277,6 @@ class FormObjEventListenerImpl : public FormObjEventListener_BASE
     bool mbActivated;
     bool mbShowing;
 
-    FormObjEventListenerImpl(const FormObjEventListenerImpl&); // not defined
-    FormObjEventListenerImpl& operator=(const FormObjEventListenerImpl&); // not defined
-
 public:
     FormObjEventListenerImpl( SbUserFormModule* pUserForm, const uno::Reference< lang::XComponent >& xComponent, const uno::Reference< frame::XModel >& xModel ) :
         mpUserForm( pUserForm ), mxComponent( xComponent), mxModel( xModel ),
diff --git a/basic/source/inc/eventatt.hxx b/basic/source/inc/eventatt.hxx
new file mode 100644
index 000000000000..881290814787
--- /dev/null
+++ b/basic/source/inc/eventatt.hxx
@@ -0,0 +1,35 @@
+/* -*- 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_BASIC_SOURCE_INC_EVENTATT_HXX
+#define INCLUDED_BASIC_SOURCE_INC_EVENTATT_HXX
+
+#include <sal/config.h>
+
+class SbxArray;
+class StarBASIC;
+
+// Instantiate "com.sun.star.awt.UnoControlDialog" on basis
+// of a DialogLibrary entry: Convert from XML-ByteSequence
+// and attach events.
+void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, bool bWrite );
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/runtime/rtlproto.hxx b/basic/source/inc/rtlproto.hxx
index 0fab192ae196..0fab192ae196 100644
--- a/basic/source/runtime/rtlproto.hxx
+++ b/basic/source/inc/rtlproto.hxx
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index fac4613d1fb0..cbbe3ff95c60 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -460,6 +460,8 @@ void implStepRenameUCB( const OUString& aSource, const OUString& aDest );
 void implStepRenameOSL( const OUString& aSource, const OUString& aDest );
 bool IsBaseIndexOne();
 
+void removeDimAsNewRecoverItem( SbxVariable* pVar );
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index bb0eade36bba..b805ec751b40 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -420,6 +420,13 @@ SbxVariable* getDefaultProp( SbxVariable* pRef );
 
 bool checkUnoObjectType( SbUnoObject* refVal, const OUString& aClass );
 
+SbUnoObject* createOLEObject_Impl( const OUString& aType );
+
+// #55226 ship additional information
+bool handleToStringForCOMObjects( SbxObject* pObj, SbxValue* pVal );
+
+void registerComListenerVariableForBasic( SbxVariable* pVar, StarBASIC* pBasic );
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 6d36037dae38..d9b2a298b60a 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -46,7 +46,7 @@
 #include "sbunoobj.hxx"
 #include "propacc.hxx"
 #include <sal/log.hxx>
-
+#include <eventatt.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
@@ -1607,11 +1607,6 @@ RTLFUNC(EqualUnoObjects)
     RTL_Impl_EqualUnoObjects( pBasic, rPar, bWrite );
 }
 
-// Instantiate "com.sun.star.awt.UnoControlDialog" on basis
-// of a DialogLibrary entry: Convert from XML-ByteSequence
-// and attach events. Implemented in classes\eventatt.cxx
-void RTL_Impl_CreateUnoDialog( StarBASIC* pBasic, SbxArray& rPar, bool bWrite );
-
 RTLFUNC(CreateUnoDialog)
 {
     (void)pBasic;
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 261d01f2af45..42e1110b156e 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -63,6 +63,7 @@
 #include "opcodes.hxx"
 #include "runtime.hxx"
 #include "sb.hrc"
+#include "sb.hxx"
 #include "sbintern.hxx"
 #include "sbunoobj.hxx"
 #include <basic/codecompletecache.hxx>
@@ -4495,10 +4496,6 @@ void SbiRuntime::StepDCREATE_IMPL( sal_uInt32 nOp1, sal_uInt32 nOp2 )
     }
 }
 
-// create object from user-type  (+StringID+StringID)
-
-SbxObject* createUserTypeImpl( const OUString& rClassName );  // sb.cxx
-
 void SbiRuntime::StepTCREATE( sal_uInt32 nOp1, sal_uInt32 nOp2 )
 {
     OUString aName( pImg->GetString( static_cast<short>( nOp1 ) ) );
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 8b222e9e086f..4d65e4170698 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -22,6 +22,7 @@
 #include <tools/stream.hxx>
 
 #include <basic/sbx.hxx>
+#include "sbunoobj.hxx"
 #include "sbxconv.hxx"
 #include "runtime.hxx"
 
@@ -232,9 +233,6 @@ SbxValue* SbxValue::TheRealValue() const
     return TheRealValue( true );
 }
 
-// #55226 ship additional information
-bool handleToStringForCOMObjects( SbxObject* pObj, SbxValue* pVal );    // sbunoobj.cxx
-
 SbxValue* SbxValue::TheRealValue( bool bObjInObjError ) const
 {
     SbxValue* p = (SbxValue*) this;
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index c49ad3914abb..c0de91f74e40 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -21,8 +21,10 @@
 #include <svl/brdcst.hxx>
 
 #include <basic/sbx.hxx>
+#include "runtime.hxx"
 #include "sbxres.hxx"
 #include "sbxconv.hxx"
+#include "sbunoobj.hxx"
 #include <math.h>
 #include <ctype.h>
 
@@ -66,8 +68,6 @@ SbxVariable::SbxVariable() : SbxValue()
     nHash = 0;
 }
 
-void registerComListenerVariableForBasic( SbxVariable* pVar, StarBASIC* pBasic );
-
 SbxVariable::SbxVariable( const SbxVariable& r )
     : SvRefBase( r ),
       SbxValue( r ),
@@ -110,8 +110,6 @@ SbxVariable::SbxVariable( SbxDataType t, void* p ) : SbxValue( t, p )
     nHash = 0;
 }
 
-void removeDimAsNewRecoverItem( SbxVariable* pVar );
-
 SbxVariable::~SbxVariable()
 {
 #ifndef DISABLE_SCRIPTING
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 15415c251109..a759eea503da 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/document/GraphicObjectResolver.hpp>
 #include "dlgcont.hxx"
 #include "sbmodule.hxx"
+#include "sbservices.hxx"
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
 #include <osl/mutex.hxx>
diff --git a/basic/source/uno/sbservices.cxx b/basic/source/uno/sbservices.cxx
index bc4dcb5f1862..e3eafb958ea4 100644
--- a/basic/source/uno/sbservices.cxx
+++ b/basic/source/uno/sbservices.cxx
@@ -18,16 +18,10 @@
  */
 
 #include "sbmodule.hxx"
-
+#include "sbservices.hxx"
 
 namespace basic
 {
-
-
-
-    extern void createRegistryInfo_SfxDialogLibraryContainer();
-    extern void createRegistryInfo_SfxScriptLibraryContainer();
-
     static void initializeModule()
     {
         static bool bInitialized( false );
diff --git a/basic/source/uno/sbservices.hxx b/basic/source/uno/sbservices.hxx
new file mode 100644
index 000000000000..a344b27f734a
--- /dev/null
+++ b/basic/source/uno/sbservices.hxx
@@ -0,0 +1,35 @@
+/* -*- 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_BASIC_SOURCE_UNO_SBSERVICES_HXX
+#define INCLUDED_BASIC_SOURCE_UNO_SBSERVICES_HXX
+
+#include <sal/config.h>
+
+namespace basic {
+
+void createRegistryInfo_SfxDialogLibraryContainer();
+
+void createRegistryInfo_SfxScriptLibraryContainer();
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index c7117ef41824..486eb96652c1 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -19,6 +19,7 @@
 
 #include "scriptcont.hxx"
 #include "sbmodule.hxx"
+#include "sbservices.hxx"
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>