loplugin:unusedmethods

- improvements to the plugin to find more method calls
- improvements to python script to remove more false+
- fix the FORCE_COMPILE_ALL build flag to include code in
the $WORKDIR

Change-Id: I4d6015dcb9b9d60c26f0bcee8abad807177a7836
Reviewed-on: https://gerrit.libreoffice.org/19064
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

117 files changed, 200 insertions, 1985 deletions

diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index cd7c197fa3ec..29fece0132c6 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -468,11 +468,11 @@ class OffSetAccumulator : public PCodeVisitor< T >
 public:
 
     OffSetAccumulator() : m_nNumOp0(0), m_nNumSingleParams(0), m_nNumDoubleParams(0){}
-    virtual void start( sal_uInt8* /*pStart*/ ){}
-    virtual void processOpCode0( SbiOpcode /*eOp*/ ){ ++m_nNumOp0; }
-    virtual void processOpCode1( SbiOpcode /*eOp*/, T /*nOp1*/ ){  ++m_nNumSingleParams; }
-    virtual void processOpCode2( SbiOpcode /*eOp*/, T /*nOp1*/, T /*nOp2*/ ) { ++m_nNumDoubleParams; }
-    virtual void end(){}
+    virtual void start( sal_uInt8* /*pStart*/ ) SAL_OVERRIDE {}
+    virtual void processOpCode0( SbiOpcode /*eOp*/ ) SAL_OVERRIDE { ++m_nNumOp0; }
+    virtual void processOpCode1( SbiOpcode /*eOp*/, T /*nOp1*/ ) SAL_OVERRIDE {  ++m_nNumSingleParams; }
+    virtual void processOpCode2( SbiOpcode /*eOp*/, T /*nOp1*/, T /*nOp2*/ ) SAL_OVERRIDE { ++m_nNumDoubleParams; }
+    virtual void end() SAL_OVERRIDE {}
     S offset()
     {
         T result = 0 ;
@@ -480,25 +480,24 @@ public:
         result = m_nNumOp0 + ( ( sizeof(S) + 1 ) * m_nNumSingleParams ) + ( (( sizeof(S) * 2 )+ 1 )  * m_nNumDoubleParams );
         return std::min(static_cast<T>(max), result);
     }
-   virtual bool processParams(){ return false; }
+   virtual bool processParams() SAL_OVERRIDE { return false; }
 };
 
 
 
 template < class T, class S >
-
 class BufferTransformer : public PCodeVisitor< T >
 {
     sal_uInt8* m_pStart;
     SbiBuffer m_ConvertedBuf;
 public:
     BufferTransformer():m_pStart(NULL), m_ConvertedBuf( NULL, 1024 ) {}
-    virtual void start( sal_uInt8* pStart ){ m_pStart = pStart; }
-    virtual void processOpCode0( SbiOpcode eOp )
+    virtual void start( sal_uInt8* pStart ) SAL_OVERRIDE { m_pStart = pStart; }
+    virtual void processOpCode0( SbiOpcode eOp ) SAL_OVERRIDE
     {
         m_ConvertedBuf += (sal_uInt8)eOp;
     }
-    virtual void processOpCode1( SbiOpcode eOp, T nOp1 )
+    virtual void processOpCode1( SbiOpcode eOp, T nOp1 ) SAL_OVERRIDE
     {
         m_ConvertedBuf += (sal_uInt8)eOp;
         switch( eOp )
@@ -523,7 +522,7 @@ public:
         }
         m_ConvertedBuf += static_cast<S>(nOp1);
     }
-    virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 )
+    virtual void processOpCode2( SbiOpcode eOp, T nOp1, T nOp2 ) SAL_OVERRIDE
     {
         m_ConvertedBuf += (sal_uInt8)eOp;
         if ( eOp == _CASEIS )
@@ -533,8 +532,8 @@ public:
         m_ConvertedBuf += static_cast<S>(nOp2);
 
     }
-    virtual bool processParams(){ return true; }
-    virtual void end() {}
+    virtual bool processParams() SAL_OVERRIDE { return true; }
+    virtual void end() SAL_OVERRIDE {}
     // yeuch, careful here, you can only call
     // GetBuffer on the returned SbiBuffer once, also
     // you (as the caller) get to own the memory
diff --git a/basic/source/inc/rtlproto.hxx b/basic/source/inc/rtlproto.hxx
index 7236f78ed2ad..c4b10837c28d 100644
--- a/basic/source/inc/rtlproto.hxx
+++ b/basic/source/inc/rtlproto.hxx
@@ -138,11 +138,6 @@ extern RTLFUNC(CLEAR_ALLTABS);
 extern RTLFUNC(CLEAR_TAB);
 extern RTLFUNC(SET_TAB);
 
-extern RTLFUNC(LINEPROP);
-extern RTLFUNC(LINE_1);
-extern RTLFUNC(LINE_15);
-extern RTLFUNC(LINE_2);
-
 // Methoden
 
 extern RTLFUNC(CreateObject);
diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx
index 78bd326001c5..221ac9629e2e 100644
--- a/basic/source/runtime/props.cxx
+++ b/basic/source/runtime/props.cxx
@@ -727,35 +727,6 @@ RTLFUNC(SET_TAB)
     rPar.Get(0)->PutInteger(0);
 }
 
-RTLFUNC(LINEPROP)
-{
-    (void)pBasic;
-    (void)bWrite;
-
-    rPar.Get(0)->PutInteger(0);
-}
-RTLFUNC(LINE_1)
-{
-    (void)pBasic;
-    (void)bWrite;
-
-    rPar.Get(0)->PutInteger(1);
-}
-RTLFUNC(LINE_15)
-{
-    (void)pBasic;
-    (void)bWrite;
-
-    rPar.Get(0)->PutInteger(2);
-}
-RTLFUNC(LINE_2)
-{
-    (void)pBasic;
-    (void)bWrite;
-
-    rPar.Get(0)->PutInteger(3);
-}
-
 RTLFUNC(TYP_JUMPEDITFLD)
 {
     (void)pBasic;
diff --git a/basic/source/sbx/sbxconv.hxx b/basic/source/sbx/sbxconv.hxx
index a69b7677e11c..c14a3ac5bc1a 100644
--- a/basic/source/sbx/sbxconv.hxx
+++ b/basic/source/sbx/sbxconv.hxx
@@ -48,7 +48,6 @@ void        ImpPutUInt64( SbxValues*, sal_uInt64 );
 
 sal_Int64   ImpDoubleToSalInt64 ( double d );
 sal_uInt64  ImpDoubleToSalUInt64( double d );
-double      ImpSalInt64ToDouble ( sal_Int64 n );
 double      ImpSalUInt64ToDouble( sal_uInt64 n );
 
 // SBXLNG.CXX
diff --git a/chart2/source/inc/CloneHelper.hxx b/chart2/source/inc/CloneHelper.hxx
index 2545f579c737..24e5f1c25611 100644
--- a/chart2/source/inc/CloneHelper.hxx
+++ b/chart2/source/inc/CloneHelper.hxx
@@ -77,27 +77,6 @@ template< class Interface >
                       CreateRefClone< Interface >());
 }
 
-template< typename  Key, class Interface >
-    void CloneRefPairVector(
-        const ::std::vector< ::std::pair< Key, Interface > > & rSource,
-        ::std::vector< ::std::pair< Key, Interface > > & rDestination )
-{
-    ::std::transform( rSource.begin(), rSource.end(),
-                      ::std::back_inserter( rDestination ),
-                      CreateRefWithKeyClone< Key, Interface >());
-}
-
-/// clones a map of elements with a UNO-Reference as value
-template< typename Key, class Interface >
-    void CloneRefMap(
-        const ::std::map< Key, Interface > & rSource,
-        ::std::map< Key, Interface > & rDestination )
-{
-    ::std::transform( rSource.begin(), rSource.end(),
-                      ::std::inserter( rDestination, rDestination.begin() ),
-                      CreateRefWithKeyClone< const Key, Interface >());
-}
-
 /// clones a UNO-sequence of UNO-References
 template< class Interface >
     void CloneRefSequence(
diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx
index d998069b93ae..89041739a464 100644
--- a/chart2/source/inc/CommonFunctors.hxx
+++ b/chart2/source/inc/CommonFunctors.hxx
@@ -174,21 +174,6 @@ private:
     Value m_aValueToCompareWith;
 };
 
-/** Searches for data in a given map, i.e. not for the key but for the data
-    pointed to by the keys.
-
-    To find a key (value) you can use rMap.find( rValue )
- */
-template< class MapType >
-    inline typename MapType::const_iterator
-    findValueInMap( const MapType & rMap, const typename MapType::mapped_type & rData )
-{
-    return ::std::find_if( rMap.begin(), rMap.end(),
-            [&rData]
-            ( const typename MapType::value_type& cp )
-            { return rData == cp.second; } );
-}
-
 } //  namespace CommonFunctors
 } //  namespace chart
 
diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx
index 4f3232b31dbc..7c7284acf888 100644
--- a/chart2/source/inc/ContainerHelper.hxx
+++ b/chart2/source/inc/ContainerHelper.hxx
@@ -73,32 +73,6 @@ template< class Container >
     return aResult;
 }
 
-/** converts a UNO sequence into a standard container. For convenience see the
-    methods SequenceToVector, etc. below. (In contrast to
-    SequenceToSTLSequenceContainer this works for all standard containers)
-
-    input:  uno::Sequence
-    output: a standard container that has an insert( iterator, key ) method (all
-            standard containers)
-    note:   for containers implementing the Concept of a Sequence (vector, deque,
-            list, slist) use SequenceToSTLSequenceContainer for better speed
-
-    example:
-
-    Sequence< sal_Int32 > aSequence;
-    ::std::set< sal_Int32 > aVector(
-        ContainerToSequence::SequenceToSTLContainer< ::std::set< sal_Int32 > >( aSequence );
-*/
-template< class Container >
-    Container
-    SequenceToSTLContainer( const ::com::sun::star::uno::Sequence< typename Container::value_type > & rSeq )
-{
-    Container aResult;
-    ::std::copy( rSeq.begin(), rSeq.end(),
-                 ::std::inserter< Container >( aResult, aResult.begin()));
-    return aResult;
-}
-
 // concrete container methods for convenience
 
 /** converts a UNO sequence into a standard vector of same value type
@@ -115,20 +89,6 @@ template< typename T >
     return SequenceToSTLSequenceContainer< ::std::vector< T > >( rSeq );
 }
 
-/** converts a UNO sequence into a standard set of same value type
-
-    example:
-
-    Sequence< sal_Int32 > aSequence;
-    ::std::set< sal_Int32 > aVector( ContainerHelper::SequenceToSet( aSequence ));
- */
-template< typename T >
-    ::std::set< T >
-    SequenceToSet( const ::com::sun::star::uno::Sequence< T > & rSeq )
-{
-    return SequenceToSTLContainer< ::std::set< T > >( rSeq );
-}
-
 /** converts the keys of a Pair Associative Container into a UNO sequence
 
     example:
diff --git a/chart2/source/inc/DisposeHelper.hxx b/chart2/source/inc/DisposeHelper.hxx
index d89d31ecb0d2..44b54edc7508 100644
--- a/chart2/source/inc/DisposeHelper.hxx
+++ b/chart2/source/inc/DisposeHelper.hxx
@@ -80,12 +80,6 @@ template< class Container >
     ::std::for_each( rContainer.begin(), rContainer.end(), DisposeFunctor< typename Container::value_type >());
 }
 
-template< class Map >
-    void DisposeAllMapElements( Map & rContainer )
-{
-    ::std::for_each( rContainer.begin(), rContainer.end(), DisposeSecondOfPairFunctor< typename Map::value_type >());
-}
-
 } //  namespace DisposeHelper
 } //  namespace chart
 
diff --git a/chart2/source/inc/EventListenerHelper.hxx b/chart2/source/inc/EventListenerHelper.hxx
index 8872eb87f402..6fe8b9f0e9ff 100644
--- a/chart2/source/inc/EventListenerHelper.hxx
+++ b/chart2/source/inc/EventListenerHelper.hxx
@@ -137,28 +137,6 @@ void addListenerToAllElements(
                          impl::addListenerFunctor< typename Container::value_type >( xListener ));
 }
 
-template< class Container >
-void addListenerToAllMapElements(
-    const Container & rContainer,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XEventListener > & xListener )
-{
-    if( xListener.is())
-        ::std::for_each( rContainer.begin(), rContainer.end(),
-                         impl::addListenerToMappedElementFunctor< typename Container::value_type >( xListener ));
-}
-
-template< typename T >
-void addListenerToAllSequenceElements(
-    const ::com::sun::star::uno::Sequence< T > & rSequence,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XEventListener > & xListener )
-{
-    if( xListener.is())
-        ::std::for_each( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(),
-                         impl::addListenerFunctor< T >( xListener ));
-}
-
 template< class InterfaceRef >
 void removeListener(
     const InterfaceRef & xObject,
@@ -183,28 +161,6 @@ void removeListenerFromAllElements(
                          impl::removeListenerFunctor< typename Container::value_type >( xListener ));
 }
 
-template< class Container >
-void removeListenerFromAllMapElements(
-    const Container & rContainer,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XEventListener > & xListener )
-{
-    if( xListener.is())
-        ::std::for_each( rContainer.begin(), rContainer.end(),
-                         impl::removeListenerFromMappedElementFunctor< typename Container::value_type >( xListener ));
-}
-
-template< typename T >
-void removeListenerFromAllSequenceElements(
-    const ::com::sun::star::uno::Sequence< T > & rSequence,
-    const ::com::sun::star::uno::Reference<
-        ::com::sun::star::lang::XEventListener > & xListener )
-{
-    if( xListener.is())
-        ::std::for_each( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(),
-                         impl::removeListenerFunctor< T >( xListener ));
-}
-
 } //  namespace EventListenerHelper
 } //  namespace chart
 
diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx
index fa62ce58e0d1..31ff68da6093 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -39,9 +39,27 @@ TODO deal with calls to superclass/member constructors from other constructors,
 
 namespace {
 
+struct MyFuncInfo
+{
+    std::string returnType;
+    std::string nameAndParams;
+    std::string sourceLocation;
+
+    bool operator < (const MyFuncInfo &other) const
+    {
+        if (returnType < other.returnType)
+            return true;
+        else if (returnType == other.returnType)
+            return nameAndParams < other.nameAndParams;
+        else
+            return false;
+    }
+};
+
+
 // try to limit the voluminous output a little
-static std::set<std::string> callSet;
-static std::set<std::string> definitionSet;
+static std::set<MyFuncInfo> callSet;
+static std::set<MyFuncInfo> definitionSet;
 
 
 class UnusedMethods:
@@ -57,10 +75,10 @@ public:
         // dump all our output in one write call - this is to try and limit IO "crosstalk" between multiple processes
         // writing to the same logfile
         std::string output;
-        for (const std::string & s : callSet)
-            output += "call:\t" + s + "\t\n";
-        for (const std::string & s : definitionSet)
-            output += "definition:\t" + s + "\t\n";
+        for (const MyFuncInfo & s : callSet)
+            output += "call:\t" + s.returnType + "\t" + s.nameAndParams + "\n";
+        for (const MyFuncInfo & s : definitionSet)
+            output += "definition:\t" + s.returnType + "\t" + s.nameAndParams + "\t" + s.sourceLocation + "\n";
         ofstream myfile;
         myfile.open( SRCDIR "/unusedmethods.log", ios::app | ios::out);
         myfile << output;
@@ -72,9 +90,12 @@ public:
     bool VisitDeclRefExpr( const DeclRefExpr* );
     bool VisitCXXConstructExpr( const CXXConstructExpr* );
     bool VisitVarDecl( const VarDecl* );
+private:
+    void logCallToRootMethods(const FunctionDecl* functionDecl);
+    MyFuncInfo niceName(const FunctionDecl* functionDecl);
 };
 
-static std::string niceName(const FunctionDecl* functionDecl)
+MyFuncInfo UnusedMethods::niceName(const FunctionDecl* functionDecl)
 {
     if (functionDecl->getInstantiatedFromMemberFunction())
         functionDecl = functionDecl->getInstantiatedFromMemberFunction();
@@ -86,31 +107,36 @@ static std::string niceName(const FunctionDecl* functionDecl)
         functionDecl = functionDecl->getTemplateInstantiationPattern();
 #endif
 
-    std::string s =
-        compat::getReturnType(*functionDecl).getCanonicalType().getAsString()
-        + " ";
+    MyFuncInfo aInfo;
+    aInfo.returnType = compat::getReturnType(*functionDecl).getCanonicalType().getAsString();
+
     if (isa<CXXMethodDecl>(functionDecl)) {
         const CXXRecordDecl* recordDecl = dyn_cast<CXXMethodDecl>(functionDecl)->getParent();
-        s += recordDecl->getQualifiedNameAsString();
-        s += "::";
+        aInfo.nameAndParams += recordDecl->getQualifiedNameAsString();
+        aInfo.nameAndParams += "::";
     }
-    s += functionDecl->getNameAsString() + "(";
+    aInfo.nameAndParams += functionDecl->getNameAsString() + "(";
     bool bFirst = true;
     for (const ParmVarDecl *pParmVarDecl : functionDecl->params()) {
         if (bFirst)
             bFirst = false;
         else
-            s += ",";
-        s += pParmVarDecl->getType().getCanonicalType().getAsString();
+            aInfo.nameAndParams += ",";
+        aInfo.nameAndParams += pParmVarDecl->getType().getCanonicalType().getAsString();
     }
-    s += ")";
+    aInfo.nameAndParams += ")";
     if (isa<CXXMethodDecl>(functionDecl) && dyn_cast<CXXMethodDecl>(functionDecl)->isConst()) {
-        s += " const";
+        aInfo.nameAndParams += " const";
     }
-    return s;
+
+    SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( functionDecl->getLocation() );
+    StringRef name = compiler.getSourceManager().getFilename(expansionLoc);
+    aInfo.sourceLocation = std::string(name.substr(strlen(SRCDIR)+1)) + ":" + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc));
+
+    return aInfo;
 }
 
-static void logCallToRootMethods(const FunctionDecl* functionDecl)
+void UnusedMethods::logCallToRootMethods(const FunctionDecl* functionDecl)
 {
     functionDecl = functionDecl->getCanonicalDecl();
     bool bPrinted = false;
@@ -127,8 +153,7 @@ static void logCallToRootMethods(const FunctionDecl* functionDecl)
     }
     if (!bPrinted)
     {
-        std::string s = niceName(functionDecl);
-        callSet.insert(s);
+        callSet.insert(niceName(functionDecl));
     }
 }
 
@@ -170,8 +195,36 @@ bool UnusedMethods::VisitCallExpr(CallExpr* expr)
 
     FunctionDecl* calleeFunctionDecl = expr->getDirectCallee();
     if (calleeFunctionDecl == nullptr) {
+        Expr* callee = expr->getCallee()->IgnoreParenImpCasts();
+        DeclRefExpr* dr = dyn_cast<DeclRefExpr>(callee);
+        if (dr) {
+            calleeFunctionDecl = dyn_cast<FunctionDecl>(dr->getDecl());
+            if (calleeFunctionDecl)
+                goto gotfunc;
+        }
+        /*
+        // ignore case where we can't determine the target of the call because we're inside a template
+        if (isa<CXXDependentScopeMemberExpr>(callee))
+            return true;
+        if (isa<UnresolvedLookupExpr>(callee))
+            return true;
+        if (isa<UnresolvedMemberExpr>(callee))
+            return true;
+        if (isa<DependentScopeDeclRefExpr>(callee))
+            return true;
+        // ignore this, doesn't really exist (side-effect of template expansion on scalar types)
+        if (isa<CXXPseudoDestructorExpr>(callee))
+            return true;
+        expr->dump();
+        std::string name = compiler.getSourceManager().getFilename(expansionLoc);
+        std::string sourceLocation = name + ":" + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc));
+        cout << sourceLocation << endl;
+        throw "Cant touch this";
+        */
         return true;
     }
+
+gotfunc:
     // if we see a call to a function, it may effectively create new code,
     // if the function is templated. However, if we are inside a template function,
     // calling another function on the same template, the same problem occurs.
diff --git a/compilerplugins/clang/unusedmethods.py b/compilerplugins/clang/unusedmethods.py
index 3bc61b8b673c..f2b9e5c4cf54 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -1,8 +1,10 @@
 #!/usr/bin/python
 
 import sys
+import re
 
 definitionSet = set()
+definitionToSourceLocationMap = dict()
 callSet = set()
 # things we need to exclude for reasons like :
 # - it's a weird template thingy that confuses the plugin
@@ -18,91 +20,6 @@ exclusionSet = set([
     "class XMLPropertyBackpatcher<short> & XMLTextImportHelper::GetSequenceIdBP()",
     "void XclExpPivotCache::SaveXml(class XclExpXmlStream &)",
 
-    # used from a yacc lexer
-    "struct unoidl::detail::SourceProviderExpr unoidl::detail::SourceProviderExpr::Float(double)",
-    "struct unoidl::detail::SourceProviderExpr unoidl::detail::SourceProviderExpr::Int(long)",
-    "struct unoidl::detail::SourceProviderExpr unoidl::detail::SourceProviderExpr::Uint(unsigned long)",
-    "struct unoidl::detail::SourceProviderExpr unoidl::detail::SourceProviderExpr::Bool(_Bool)",
-    "class rtl::OUString unoidl::detail::SourceProviderType::getName() const",
-    "_Bool unoidl::detail::SourceProviderType::equals(const struct unoidl::detail::SourceProviderType &) const",
-    "_Bool unoidl::detail::SourceProviderEntityPad::isPublished() const",
-    "_Bool unoidl::detail::SourceProviderInterfaceTypeEntityPad::checkMemberClashes(int,void *,struct unoidl::detail::SourceProviderScannerData *,const class rtl::OUString &,const class rtl::OUString &,_Bool) const",
-    "_Bool unoidl::detail::SourceProviderInterfaceTypeEntityPad::checkBaseClashes(int,void *,struct unoidl::detail::SourceProviderScannerData *,const class rtl::OUString &,const class rtl::Reference<class unoidl::InterfaceTypeEntity> &,_Bool,_Bool,_Bool,class std::__debug::set<class rtl::OUString, struct std::less<class rtl::OUString>, class std::allocator<class rtl::OUString> > *) const",
-    "_Bool unoidl::detail::SourceProviderInterfaceTypeEntityPad::addDirectBase(int,void *,struct unoidl::detail::SourceProviderScannerData *,const struct unoidl::detail::SourceProviderInterfaceTypeEntityPad::DirectBase &,_Bool)",
-    "_Bool unoidl::detail::SourceProviderInterfaceTypeEntityPad::addBase(int,void *,struct unoidl::detail::SourceProviderScannerData *,const class rtl::OUString &,const class rtl::OUString &,const class rtl::Reference<class unoidl::InterfaceTypeEntity> &,_Bool,_Bool)",
-    "_Bool unoidl::detail::SourceProviderInterfaceTypeEntityPad::addDirectMember(int,void *,struct unoidl::detail::SourceProviderScannerData *,const class rtl::OUString &)",
-    "_Bool unoidl::detail::SourceProviderInterfaceTypeEntityPad::addOptionalBaseMembers(int,void *,struct unoidl::detail::SourceProviderScannerData *,const class rtl::OUString &,const class rtl::Reference<class unoidl::InterfaceTypeEntity> &)",
-    "void unoidl::detail::SourceProviderScannerData::setSource(const void *,unsigned long)",
-    "void Idlc::setParseState(enum ParseState)",
-    "_Bool AstDeclaration::isPredefined()",
-    "void Idlc::setOffset(unsigned int,unsigned int)",
-    "_Bool Idlc::isInMainFile()",
-    "void Idlc::setPublished(_Bool)",
-    "enum ParseState Idlc::getParseState()",
-    "void Idlc::setLineNumber(unsigned int)",
-    "void Idlc::incLineNumber()",
-    "void Idlc::setDocumentation(const class rtl::OString &)",
-    "void Idlc::setInMainfile(_Bool)",
-    "void AstInterface::forwardDefined(const class AstInterface &)",
-    "_Bool AstInterface::hasMandatoryInheritedInterfaces() const",
-    "_Bool AstInterface::usesSingleInheritance() const",
-    "struct AstInterface::DoubleDeclarations AstInterface::checkInheritedInterfaceClashes(const class AstInterface *,_Bool) const",
-    "class std::__debug::vector<struct AstInterface::DoubleMemberDeclaration, class std::allocator<struct AstInterface::DoubleMemberDeclaration> > AstInterface::checkMemberClashes(const class AstDeclaration *) const",
-    "void AstOperation::setExceptions(const class std::__debug::list<class AstDeclaration *, class std::allocator<class AstDeclaration *> > *)",
-    "_Bool AstOperation::isConstructor() const",
-    "_Bool AstService::isSingleInterfaceBasedService() const",
-    "void AstService::setSingleInterfaceBasedService()",
-    "void AstService::setDefaultConstructor(_Bool)",
-    "_Bool AstService::checkLastConstructor() const",
-    "class AstScope * AstStack::nextToTop()",
-    "class AstScope * AstStack::bottom()",
-    "const class AstDeclaration * AstStruct::findTypeParameter(const class rtl::OString &) const",
-    "int AstEnum::getEnumValueCount()",
-    "class AstConstant * AstEnum::checkValue(class AstExpression *)",
-    "void ErrorHandler::flagError(enum ErrorCode,unsigned int)",
-    "void ErrorHandler::error0(enum ErrorCode)",
-    "void ErrorHandler::syntaxError(enum ParseState,int,const char *)",
-    "void ErrorHandler::lookupError(enum ErrorCode,const class rtl::OString &,class AstDeclaration *)",
-    "void ErrorHandler::error3(enum ErrorCode,class AstDeclaration *,class AstDeclaration *,class AstDeclaration *)",
-    "void ErrorHandler::warning0(enum WarningCode,const char *)",
-    "void ErrorHandler::coercionError(class AstExpression *,enum ExprType)",
-    "class AstDeclaration * FeInheritanceHeader::getInherits()",
-    "const class std::__debug::vector<class rtl::OString, class std::allocator<class rtl::OString> > & FeInheritanceHeader::getTypeParameters() const",
-    "const class AstType * FeDeclarator::compose(const class AstDeclaration *)",
-    "const class AstType * AstStructInstance::getTypeTemplate() const",
-    "class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class AstDeclaration *>, class std::__debug::list<class AstDeclaration *, class std::allocator<class AstDeclaration *> > > AstStructInstance::getTypeArgumentsBegin() const",
-    "class __gnu_debug::_Safe_iterator<struct std::__cxx1998::_List_const_iterator<class AstDeclaration *>, class std::__debug::list<class AstDeclaration *, class std::allocator<class AstDeclaration *> > > AstStructInstance::getTypeArgumentsEnd() const",
-    "void AstAttribute::setExceptions(const class rtl::OUString *,const class std::__debug::list<class AstDeclaration *, class std::allocator<class AstDeclaration *> > *,const class rtl::OUString *,const class std::__debug::list<class AstDeclaration *, class std::allocator<class AstDeclaration *> > *)",
-
-    "const class rtl::OString & FeDeclarator::getName()",
-    "_Bool FeDeclarator::checkType(const class AstDeclaration *)",
-    "enum connectivity::IParseContext::InternationalKeyCode connectivity::IParseContext::getIntlKeyCode(const class rtl::OString &) const",
-    "void connectivity::OSQLParser::error(const char *)",
-    "int connectivity::OSQLParser::SQLlex()",
-    "void connectivity::OSQLParseNode::insert(unsigned int,class connectivity::OSQLParseNode *)",
-    "const class rtl::OUString & connectivity::OSQLParser::getFieldName() const",
-    "short connectivity::OSQLParser::buildLikeRule(class connectivity::OSQLParseNode *,class connectivity::OSQLParseNode *&,const class connectivity::OSQLParseNode *)",
-    "void connectivity::OSQLParser::reduceLiteral(class connectivity::OSQLParseNode *&,_Bool)",
-    "short connectivity::OSQLParser::buildComparsionRule(class connectivity::OSQLParseNode *&,class connectivity::OSQLParseNode *)",
-    "enum connectivity::IParseContext::InternationalKeyCode connectivity::OSQLScanner::getInternationalTokenID(const char *) const",
-    "class rtl::OString connectivity::OSQLScanner::getStatement() const",
-    "void connectivity::OSQLScanner::SQLyyerror(const char *)",
-    "int connectivity::OSQLScanner::GetCurrentPos() const",
-    "int connectivity::OSQLScanner::SQLyygetc()",
-    "void connectivity::OSQLParser::setParseTree(class connectivity::OSQLParseNode *)",
-    "short connectivity::OSQLParser::buildPredicateRule(class connectivity::OSQLParseNode *&,class connectivity::OSQLParseNode *const,class connectivity::OSQLParseNode *,class connectivity::OSQLParseNode *)",
-    "int connectivity::OSQLScanner::SQLlex()",
-
-    "const struct RSCINST & ObjectStack::Top()",
-    "void ObjectStack::Push(struct RSCINST)",
-    "_Bool RefNode::PutObjNode(class ObjNode *)",
-    "void RscFileInst::SetFileIndex(unsigned long)",
-    "void RscFileInst::SetLineNo(unsigned int)",
-    "class RscDefine * RscFileTab::NewDef(unsigned long,const class rtl::OString &,class RscExpression *,unsigned long)",
-    "class RscDefine * RscFileTab::NewDef(unsigned long,const class rtl::OString &,int,unsigned long)",
-    "class RscTop * RscTypCont::GetRoot()",
-    "class RscTop * RscTypCont::SearchType(unsigned int)",
-    "void RscTypCont::InsertType(class RscTop *)",
 
     # TODO track instantiations of template class constructors
     "void comphelper::IEventProcessor::release()",
@@ -149,68 +66,6 @@ exclusionSet = set([
     "void oox::PropertyMap::dumpCode(class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet>)",
     "void oox::PropertyMap::dumpData(class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet>)",
     "class std::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > writerfilter::ooxml::OOXMLPropertySet::toString()",
-    # called from the writerfilter generated code in $WORKDIR, not sure why it is not being picked up
-    "_Bool writerfilter::ooxml::OOXMLFactory_ns::getElementId(unsigned int,unsigned int,enum writerfilter::ooxml::ResourceType_t &,unsigned int &)",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultIntegerValue()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::positivePercentage(const class rtl::OUString &)",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::positionOffset(const class rtl::OUString &)",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::alignH(const class rtl::OUString &)",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::alignV(const class rtl::OUString &)",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultStringValue()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::clearProps()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::sendPropertiesWithId(const unsigned int &)",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::cr()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::softHyphen()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::noBreakHyphen()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultBooleanValue()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::endField()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::propagateCharacterPropertiesAsSet(const unsigned int &)",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::tab()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::ftnednref()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::ftnednsep()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::ftnedncont()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::pgNum()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::sendRowProperties()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::setLastSectionGroup()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::endTxbxContent()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::setDefaultHexValue()",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleComment()",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleOLE()",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handlePicture()",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleHdrFtr()",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleBreak()",
-    "int writerfilter::ooxml::OOXMLPropertySetEntryToInteger::getValue() const",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::fieldSeparator()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::startField()",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerStream::sendProperty(unsigned int)",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleXNotes()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::propagateTableProperties()",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerTextTableRow::endRow()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::propagateCellProperties()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::endSdt()",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerTextTableCell::endCell()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::propagateRowProperties()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::sendTableProperties()",
-    "_Bool writerfilter::ooxml::OOXMLPropertySetEntryToBool::getValue() const",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::lockField()",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerStream::handleHyperlink()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::setLastParagraphInSection()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::startSdt()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::setHandle()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::sendTableDepth() const",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::startTxbxContent()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::handleLastParagraphInSection()",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerTextTableCell::startCell()",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerTextTableRow::startRow()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::propagateCharacterProperties()",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerProperties::handleFontRel()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::ignore()",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::resolvePropertySetAttrs()",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerXNote::checkId(class std::shared_ptr<class writerfilter::ooxml::OOXMLValue>)",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerTextTableRow::handleGridBefore(class std::shared_ptr<class writerfilter::ooxml::OOXMLValue>)",
-    "void writerfilter::ooxml::OOXMLFastContextHandlerXNote::checkType(class std::shared_ptr<class writerfilter::ooxml::OOXMLValue>)",
-    "void writerfilter::ooxml::OOXMLFastContextHandler::setXNoteId(class std::shared_ptr<class writerfilter::ooxml::OOXMLValue>)",
-
     # deep template magic in SW
     "Ring<value_type> * sw::Ring::Ring_node_traits::get_next(const Ring<value_type> *)",
     "Ring<value_type> * sw::Ring::Ring_node_traits::get_previous(const Ring<value_type> *)",
@@ -219,79 +74,118 @@ exclusionSet = set([
     # I need to teach the plugin that for loops with range expressions call begin() and end()
     "class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwAnchoredObject *const *, class std::__cxx1998::vector<class SwAnchoredObject *, class std::allocator<class SwAnchoredObject *> > >, class std::__debug::vector<class SwAnchoredObject *, class std::allocator<class SwAnchoredObject *> > > SwSortedObjs::begin() const",
     "class __gnu_debug::_Safe_iterator<class __gnu_cxx::__normal_iterator<class SwAnchoredObject *const *, class std::__cxx1998::vector<class SwAnchoredObject *, class std::allocator<class SwAnchoredObject *> > >, class std::__debug::vector<class SwAnchoredObject *, class std::allocator<class SwAnchoredObject *> > > SwSortedObjs::end() const",
+    # loaded by dlopen()
+    "void * getStandardAccessibleFactory()",
+    "void * getSvtAccessibilityComponentFactory()",
+    "struct _rtl_uString * basicide_choose_macro(void *,unsigned char,struct _rtl_uString *)",
+    "void basicide_macro_organizer(short)",
+    "long basicide_handle_basic_error(void *)",
+    "class com::sun::star::uno::XInterface * org_libreoffice_chart2_Chart2ToolboxController(class com::sun::star::uno::XComponentContext *,const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &)",
+    "class com::sun::star::uno::XInterface * org_libreoffice_comp_chart2_sidebar_ChartPanelFactory(class com::sun::star::uno::XComponentContext *,const class com::sun::star::uno::Sequence<class com::sun::star::uno::Any> &)",
+    "class chart::opengl::OpenglShapeFactory * getOpenglShapeFactory()",
+    "class VclAbstractDialogFactory * CreateDialogFactory()",
+    "_Bool GetSpecialCharsForEdit(class vcl::Window *,const class vcl::Font &,class rtl::OUString &)",
+    "const struct ImplTextEncodingData * sal_getFullTextEncodingData(unsigned short)"
     ])
 
 
-# The parsing here is designed to also grab output which is mixed into the output from gbuild.
+# The parsing here is designed to avoid grabbing stuff which is mixed in from gbuild.
 # I have not yet found a way of suppressing the gbuild output.
 with open(sys.argv[1]) as txt:
     for line in txt:
-        if line.find("definition:\t") != -1:
-            idx1 = line.find("definition:\t")
-            idx2 = line.find("\t", idx1+12)
-            clazzName = line[idx1+12 : idx2]
-            definitionSet.add(clazzName)
-        elif line.find("call:\t") != -1:
-            idx1 = line.find("call:\t")
-            idx2 = line.find("\t", idx1+6)
-            clazzName = line[idx1+6 : idx2]
-            callSet.add(clazzName)
+        if line.startswith("definition:\t"):
+            tokens = line.split("\t")
+            funcInfo = (tokens[1], tokens[2])
+            definitionSet.add(funcInfo)
+            definitionToSourceLocationMap[funcInfo] = tokens[3].strip()
+        elif line.startswith("call:\t"):
+            tokens = line.split("\t")
+            callSet.add((tokens[1], tokens[2].strip()))
 
-for clazz in sorted(definitionSet - callSet - exclusionSet):
+tmp1set = set()
+for d in definitionSet:
+    clazz = d[0] + " " + d[1]
+    if clazz in exclusionSet:
+        continue
+    if d in callSet:
+        continue
     # ignore operators, they are normally called from inside STL code
-    if (clazz.find("::operator") != -1):
+    if "::operator" in d[1]:
         continue
     # ignore the custom RTTI stuff
-    if (    (clazz.find("::CreateType()") != -1)
-         or (clazz.find("::IsA(") != -1)
-         or (clazz.find("::Type()") != -1)):
+    if (    ("::CreateType()" in d[1])
+        or ("::IsA(" in d[1])
+        or ("::Type()" in d[1])):
         continue
     # if this method is const, and there is a non-const variant of it, and the non-const variant is in use, then leave it alone
-    if (clazz.startswith("const ") and clazz.endswith(" const")):
-        clazz2 = clazz[6:len(clazz)-6]
-        if (clazz2 in callSet):
+    if d[0].startswith("const ") and d[1].endswith(" const"):
+        if ((d[0][6:],d[1][:-6]) in callSet):
            continue
-    elif (clazz.endswith(" const")):
+    elif clazz.endswith(" const"):
         clazz2 = clazz[:len(clazz)-6] # strip off " const"
-        if (clazz2 in callSet):
+        if ((d[0],clazz2) in callSet):
            continue
-    if (clazz.endswith(" const") and clazz.find("::iterator") != -1):
+    if clazz.endswith(" const") and ("::iterator" in clazz):
         clazz2 = clazz[:len(clazz)-6] # strip off " const"
         clazz2 = clazz2.replace("::const_iterator", "::iterator")
-        if (clazz2 in callSet):
+        if ((d[0],clazz2) in callSet):
            continue
     # if this method is non-const, and there is a const variant of it, and the const variant is in use, then leave it alone
-    if ((not clazz.endswith(" const")) and ("const " + clazz + " const") in callSet):
+    if (not clazz.endswith(" const")) and ((d[0],"const " + clazz + " const") in callSet):
        continue
-    if ((not clazz.endswith(" const")) and clazz.find("::iterator") != -1):
+    if (not clazz.endswith(" const")) and ("::iterator" in clazz):
         clazz2 = clazz.replace("::iterator", "::const_iterator") + " const"
-        if (clazz2 in callSet):
+        if ((d[0],clazz2) in callSet):
            continue
     # There is lots of macro magic going on in SRCDIR/include/sax/fshelper.hxx that should be using C++11 varag templates
-    if clazz.startswith("void sax_fastparser::FastSerializerHelper::"):
+    if d[1].startswith("sax_fastparser::FastSerializerHelper::"):
        continue
     # used by Windows build
-    if (clazz.find("DdeTopic::") != -1 
-        or clazz.find("DdeData::") != -1
-        or clazz.find("DdeService::") != -1
-        or clazz.find("DdeTransaction::") != -1
-        or clazz.find("DdeConnection::") != -1
-        or clazz.find("DdeLink::") != -1
-        or clazz.find("DdeItem::") != -1
-        or clazz.find("DdeGetPutItem::") != -1):
+    if any(x in d[1] for x in ["DdeTopic::", "DdeData::", "DdeService::", "DdeTransaction::", "DdeConnection::", "DdeLink::", "DdeItem::", "DdeGetPutItem::"]):
        continue
     # the include/tools/rtti.hxx stuff
-    if (clazz.find("::StaticType()") != -1
-        or clazz.find("::IsOf(void *(*)(void))") != -1):
+    if ("::StaticType()" in d[1]) or ("::IsOf(void *(*)(void))" in d[1]):
        continue
     # too much template magic here for my plugin
-    if (clazz.find(" cairocanvas::") != -1 
-        or clazz.find(" canvas::") != -1
-        or clazz.find(" oglcanvas::") != -1
-        or clazz.find(" vclcanvas::") != -1):
+    if (   ("cairocanvas::" in d[1])
+        or ("canvas::" in d[1])
+        or ("oglcanvas::" in d[1])
+        or ("vclcanvas::" in d[1])):
        continue
-    print clazz
-    
+    # these are loaded by dlopen() from somewhere
+    if "get_implementation" in d[1]:
+       continue
+    if "component_getFactory" in d[1]:
+       continue
+    if d[0]=="_Bool" and "_supportsService(const class rtl::OUString &)" in d[1]:
+       continue
+    if (d[0]=="class com::sun::star::uno::Reference<class com::sun::star::uno::XInterface>"
+        and "Instance(const class com::sun::star::uno::Reference<class com::sun::star::lang::XMultiServiceFactory> &)" in d[1]):
+       continue
+    # ignore the Java symbols, loaded from the JavaVM
+    if d[1].startswith("Java_"):
+       continue
+    # ignore external code
+    if definitionToSourceLocationMap[d].startswith("external/"):
+       continue
+    # ignore the VCL_BUILDER_DECL_FACTORY stuff
+    if d[0]=="void" and d[1].startswith("make") and ("(class VclPtr<class vcl::Window> &" in d[1]):
+       continue
+
+    tmp1set.add((clazz, definitionToSourceLocationMap[d]))
+
+def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
+    return [int(text) if text.isdigit() else text.lower()
+            for text in re.split(_nsre, s)]
+
+# sort results by name and line number
+tmp1list = sorted(tmp1set, key=lambda v: natural_sort_key(v[1]))
+
+# print out the results
+for t in tmp1list:
+    print t[1]
+    print "    ", t[0]
+
     
 
 # add an empty line at the end to make it easier for the unusedmethodsremove plugin to mmap() the output file 
diff --git a/configmgr/source/modifications.hxx b/configmgr/source/modifications.hxx
index 098992d08fd5..04ad5c34d72e 100644
--- a/configmgr/source/modifications.hxx
+++ b/configmgr/source/modifications.hxx
@@ -45,8 +45,6 @@ public:
 
     void remove(Path const & path);
 
-    void clear() { root_.children.clear(); }
-
     bool empty() const { return root_.children.empty(); }
 
     Node const & getRoot() const { return root_;}
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 3d8cc8b96ddb..056041dea512 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -153,7 +153,7 @@ void writeData_(TempFile &handle, char const * begin, sal_Int32 length) {
 }
 
 void writeValueContent_(TempFile &, bool) SAL_DELETED_FUNCTION;
-    // silence lopluign:salbool
+    // silence loplugin:salbool
 void writeValueContent_(TempFile &handle, sal_Bool value) {
     if (value) {
         writeData_(handle, RTL_CONSTASCII_STRINGPARAM("true"));
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx
index f190dea10f1d..87e66e9fa51a 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.hxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.hxx
@@ -57,9 +57,6 @@ namespace com { namespace sun { namespace star {
 namespace dbaccess
 {
 class DatabaseDocumentLoader;
-// ODatabaseContext
-css::uno::Reference< css::uno::XInterface >
-    ODatabaseContext_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
 
 typedef ::cppu::WeakComponentImplHelper<   css::lang::XServiceInfo
                                        ,   css::sdb::XDatabaseContext
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index e7f41afbda7e..10d13b8aa43e 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -63,9 +63,6 @@ namespace dbaui
 
         virtual void        implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
 
-        inline void enableConnectionURL() { m_pConnectionURL->SetReadOnly(false); }
-        inline void disableConnectionURL() { m_pConnectionURL->SetReadOnly(); }
-
         /** changes the connection URL.
             <p>The new URL must be of the type which is currently selected, only the parts which do not
             affect the type may be changed (compared to the previous URL).</p>
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index cad08bcff1e2..7b221793f111 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -60,16 +60,6 @@ namespace dbaui
         virtual void        implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
         virtual bool        commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) SAL_OVERRIDE;
 
-        inline void enableConnectionURL() { m_pConnectionURL->SetReadOnly(false); }
-        inline void disableConnectionURL() { m_pConnectionURL->SetReadOnly(); }
-
-        /** changes the connection URL.
-            <p>The new URL must be of the type which is currently selected, only the parts which do not
-            affect the type may be changed (compared to the previous URL).</p>
-        */
-        void     changeConnectionURL( const OUString& _rNewDSN );
-        OUString getConnectionURL( ) const;
-
     protected:
         OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId);
         virtual bool checkTestConnection() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 4237fabec45f..58d2a3e2ec5b 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -218,7 +218,6 @@ namespace dbaui
         static VclPtr<OMySQLIntroPageSetup> CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet );
         ConnectionType      getMySQLMode();
         void                SetClickHdl( const Link<OMySQLIntroPageSetup *, void>& rLink ) { maClickHdl = rLink; }
-        DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*);
 
     protected:
         virtual bool FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index f00ba18d059e..c487f2c59d10 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -92,8 +92,6 @@ namespace dbaui
 
         inline css::uno::Reference< css::uno::XComponentContext > getORB() const { return m_xContext; }
 
-        css::uno::Reference< css::sdb::XDatabaseContext > getDatabaseContext() const { return m_xDatabaseContext; }
-
         /** creates a new connection. The caller is responsible to dispose it !!!!
         */
         ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool>      createConnection();
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index 7ce766d8c96f..547e5bcb7b91 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -230,11 +230,6 @@ short ORelationDialog::Execute()
     return nResult;
 }
 
-TTableConnectionData::value_type ORelationDialog::getConnectionData() const
-{
-    return m_pConnData;
-}
-
 void ORelationDialog::setValid(bool _bValid)
 {
     m_pPB_OK->Enable(_bValid);
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index 7aad1f80e3e9..7e5682103130 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -56,7 +56,6 @@ protected:
 
     // methods
     DECL_LINK( ListDblClickHdl, ListBox * );
-    DECL_LINK( CloseHdl,        PushButton * );
     DECL_LINK_TYPED( UserHdl,   Button *, void );
 
     void        FillUserNames();
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index accd6c301d95..b6054d413a55 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -91,7 +91,6 @@ namespace dbaui
 
     private:
         void    impl_initBooleanSettings();
-        DECL_LINK(ClickHdl, Button*);
     };
 
     // GeneratedValuesPage
@@ -127,9 +126,6 @@ namespace dbaui
 
         // <method>OGenericAdministrationPage::fillWindows</method>
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
-
-    private:
-        DECL_LINK( OnCheckBoxClick, CheckBox * );
     };
 
 }
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index ef0c43a7dde4..be5ac35d6b7e 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -43,7 +43,6 @@ public:
     OTableIndex( const OTableIndex& _rSource) : aIndexFileName(_rSource.aIndexFileName) { }
     explicit OTableIndex( const OUString& rFileName ) : aIndexFileName( rFileName ) { }
 
-    void SetIndexFileName( const OUString& rFileName ) { aIndexFileName = rFileName; }
     OUString GetIndexFileName() const { return aIndexFileName; }
 };
 
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index f8e925ee3f7e..938d30dfcb23 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -69,9 +69,6 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent
                                )
     :OWizardMachine(_pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP )
     ,m_pOutSet(NULL)
-    ,m_bResetting(false)
-    ,m_bApplied(false)
-    ,m_bUIEnabled( true )
 {
     m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this));
     m_pImpl->setDataSourceOrName(_aDataSourceName);
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 151044a55a95..0b2ff3a3bbe4 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -109,9 +109,6 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent
     :svt::RoadmapWizard( _pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP )
 
     , m_pOutSet(NULL)
-    , m_bResetting(false)
-    , m_bApplied(false)
-    , m_bUIEnabled( true )
     , m_bIsConnectable( false)
     , m_sRM_IntroText( ModuleRes( STR_PAGETITLE_INTROPAGE ) )
     , m_sRM_dBaseText( ModuleRes( STR_PAGETITLE_DBASE ) )
diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx
index 864a36405238..2fc65b4cff6d 100644
--- a/dbaccess/source/ui/inc/ConnectionLine.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLine.hxx
@@ -56,8 +56,6 @@ namespace dbaui
         bool                RecalcLine();
         void                Draw( OutputDevice* pOutDev );
         bool                CheckHit( const Point& rMousePos ) const;
-        OUString            GetSourceFieldName() const { return m_pData->GetSourceFieldName(); }
-        OUString            GetDestFieldName() const { return m_pData->GetDestFieldName(); }
 
         bool                IsValid() const;
 
diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx
index b222c01753b3..a330b05b781b 100644
--- a/dbaccess/source/ui/inc/JAccess.hxx
+++ b/dbaccess/source/ui/inc/JAccess.hxx
@@ -57,8 +57,6 @@ namespace dbaui
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
         virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-        OJoinTableView* getTableView() const { return m_pTableView; }
-
         void notifyAccessibleEvent(
                     const sal_Int16 _nEventId,
                     const css::uno::Any& _rOldValue,
diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx
index 4a22a2a02994..53ed8ef74c57 100644
--- a/dbaccess/source/ui/inc/JoinDesignView.hxx
+++ b/dbaccess/source/ui/inc/JoinDesignView.hxx
@@ -63,7 +63,6 @@ namespace dbaui
     protected:
         // return the Rectangle where I can paint myself
         virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE;
-        DECL_LINK_TYPED( SplitHdl, Splitter*, void );
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_JOINDESIGNVIEW_HXX
diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx
index 833f2f421ca4..f9c490a7a039 100644
--- a/dbaccess/source/ui/inc/RTableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx
@@ -35,7 +35,6 @@ namespace dbaui
     class ORelationTableConnectionData :    public OTableConnectionData
     {
         friend bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs);
-        friend bool operator!=(const ORelationTableConnectionData& lhs, const ORelationTableConnectionData& rhs) { return !(lhs == rhs); }
 
         ::osl::Mutex    m_aMutex;
 
@@ -50,7 +49,6 @@ namespace dbaui
 
     protected:
         virtual OConnectionLineDataRef CreateLineDataObj() SAL_OVERRIDE;
-        virtual OConnectionLineDataRef CreateLineDataObj( const OConnectionLineData& rConnLineData ) SAL_OVERRIDE;
 
         ORelationTableConnectionData& operator=( const ORelationTableConnectionData& rConnData );
     public:
diff --git a/dbaccess/source/ui/inc/RelControliFace.hxx b/dbaccess/source/ui/inc/RelControliFace.hxx
index 3fa39ed98d98..bace921f45df 100644
--- a/dbaccess/source/ui/inc/RelControliFace.hxx
+++ b/dbaccess/source/ui/inc/RelControliFace.hxx
@@ -29,18 +29,11 @@ namespace dbaui
     public:
         virtual ~IRelationControlInterface(){}
 
-        /** getConnectionData returns the current connection data
-            @return the current connectiondata
-        */
-        virtual TTableConnectionData::value_type getConnectionData() const = 0;
-
         /** setValid set the valid inside, can be used for OK buttons
             @param  _bValid true when the using control allows an update
         */
         virtual void setValid(bool _bValid) = 0;
 
-        virtual css::uno::Reference< css::sdbc::XConnection > getConnection() = 0;
-
         /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists
             @param  _pConnectionData    the connection which exists between the new tables
         */
diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx
index 1d7c81be9df7..db8b2df3a476 100644
--- a/dbaccess/source/ui/inc/RelationController.hxx
+++ b/dbaccess/source/ui/inc/RelationController.hxx
@@ -40,19 +40,15 @@ namespace dbaui
         // execute a feature
         virtual void            Execute(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue>& aArgs) SAL_OVERRIDE;
 
-        ORelationDesignView*    getRelationView() { return static_cast<ORelationDesignView*>( getView() ); }
         void loadData();
         TTableWindowData::value_type existsTable(const OUString& _rComposedTableName,bool _bCase) const;
 
         // load the window positions out of the datasource
         void loadLayoutInformation();
-        void loadTableData(const css::uno::Any& _aTable);
     public:
         ORelationController(const css::uno::Reference< css::uno::XComponentContext >& _rM);
 
         virtual ~ORelationController();
-        // temp
-        void SaveTabWinsPosSize( OJoinTableView::OTableWindowMap* pTabWinList, long nOffsetX, long nOffsetY );
 
         void mergeData(const TTableConnectionData& _aConnectionData);
 
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index 2869d14cddc6..22eac4147ac9 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -63,20 +63,8 @@ namespace dbaui
         virtual ~ORelationDialog();
         virtual void dispose() SAL_OVERRIDE;
 
-        virtual css::uno::Reference< css::sdbc::XConnection > getConnection() SAL_OVERRIDE { return m_xConnection; }
-
         virtual short Execute() SAL_OVERRIDE;
 
-        /** getTableMap gives access to the table window map
-            @retrun the table window from the join view
-        */
-        OJoinTableView::OTableWindowMap* getTableMap() const { return m_pTableMap; }
-
-        /** getConnectionData returns the current connection data
-            @return the current connection data
-        */
-        virtual TTableConnectionData::value_type getConnectionData() const SAL_OVERRIDE;
-
         /** setValid set the valid inside, can be used for OK buttons
             @param  _bValid true when the using control allows an update
         */
diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx
index 03ba4018ce8f..ec4532a0335c 100644
--- a/dbaccess/source/ui/inc/SqlNameEdit.hxx
+++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx
@@ -37,10 +37,6 @@ namespace dbaui
         {
         }
 
-        void setUpperCase(bool _bUpper=true)
-        {
-            m_bOnlyUpperCase = _bUpper;
-        }
         void setAllowedChars(const OUString& _rAllowedChars)
         {
             m_sAllowedChars = _rAllowedChars;
diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx
index ab25f3514d7e..ca23565d6789 100644
--- a/dbaccess/source/ui/inc/TableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/TableConnectionData.hxx
@@ -47,7 +47,6 @@ namespace dbaui
         void    Init();
 
         virtual OConnectionLineDataRef CreateLineDataObj();
-        virtual OConnectionLineDataRef CreateLineDataObj( const OConnectionLineData& rConnLineData );
 
         OTableConnectionData& operator=( const OTableConnectionData& rConnData );
     public:
@@ -95,7 +94,6 @@ namespace dbaui
 
         OUString GetConnName() const { return m_aConnName; }
 
-        void SetConnName( const OUString& rConnName ){ m_aConnName = rConnName; }
         /** Update create a new connection
 
             @return true if successful
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index b8820b37d3ca..891c98816fa1 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -62,7 +62,6 @@ namespace dbaui
         bool checkColumns(bool _bNew)
             throw (css::sdbc::SQLException,
                    css::uno::RuntimeException, std::exception);      // check if we have double column names
-        OUString createUniqueName(const css::uno::Reference< css::container::XNameAccess>& _rxTables,const OUString& _rDefault);
         void appendColumns(css::uno::Reference< css::sdbcx::XColumnsSupplier>& _rxColSup, bool _bNew, bool _bKeyColumns = false);
         void appendPrimaryKey(css::uno::Reference< css::sdbcx::XKeysSupplier>& _rxSup, bool _bNew);
         void alterColumns();
diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx
index c6b3f1d71e05..d3f3eb5e469e 100644
--- a/dbaccess/source/ui/inc/TableDesignControl.hxx
+++ b/dbaccess/source/ui/inc/TableDesignControl.hxx
@@ -51,7 +51,6 @@ namespace dbaui
         virtual void SetCellData( long nRow, sal_uInt16 nColId, const css::uno::Any& _rNewData ) = 0;
         virtual css::uno::Any          GetCellData( long nRow, sal_uInt16 nColId ) = 0;
         virtual void SetControlText( long nRow, sal_uInt16 nColId, const OUString& rText ) = 0;
-        virtual OUString GetControlText( long nRow, sal_uInt16 nColId ) = 0;
 
         virtual OTableDesignView* GetView() const = 0;
 
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index d78f3605cd1d..2c2c778a093e 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
@@ -44,7 +44,6 @@ namespace dbaui
         virtual void dispose() SAL_OVERRIDE;
 
         void SetHelpText( const OUString& rText );
-        OUString GetHelpText() const { return m_sHelpText; }
 
         virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index 9a6fbec1aa73..d1f4ca42ec31 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -37,7 +37,6 @@ namespace dbaui
         VclPtr<OTableEditorCtrl>            m_pEditorCtrl;
 
         void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
-        void ArrangeChildren( long nSplitPos ,Rectangle& rRect);
         DECL_LINK_TYPED( SplitHdl, Splitter*, void );
     protected:
         virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx
index 51ed4e379340..ff555519c3c6 100644
--- a/dbaccess/source/ui/inc/TableWindowAccess.hxx
+++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx
@@ -92,15 +92,6 @@ namespace dbaui
         virtual css::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
         virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
         virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
-        void notifyAccessibleEvent(
-                    const sal_Int16 _nEventId,
-                    const css::uno::Any& _rOldValue,
-                    const css::uno::Any& _rNewValue
-                )
-        {
-            NotifyAccessibleEvent(_nEventId,_rOldValue,_rNewValue);
-        }
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWACCESS_HXX
diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
index 1a30236067b5..d43d731c038a 100644
--- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx
+++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
@@ -45,7 +45,6 @@ class ODbDataSourceAdministrationHelper;
         ::std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
         bool m_bStopExecution; // set when the dialog should not be executed
 
-        DECL_LINK( OKClickHdl, OKButton* );
         SfxItemSet*             m_pOutSet;
     public:
 
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index b5db8375115a..143f1252b608 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -331,7 +331,6 @@ namespace dbaui
         Wizard_Button_Style GetPressedButton() const { return m_ePressed; }
         void                EnableButton(Wizard_Button_Style eStyle, bool bEnable);
         void                AddWizardPage(OWizardPage* pPage); // delete page from OCopyTableWizard
-        void                RemoveWizardPage(OWizardPage* pPage); // Page goes again to user
         void                CheckButtons(); // checks which button can be disabled, enabled
 
         // returns a vector where the position of a column and if the column is in the selection
@@ -370,7 +369,6 @@ namespace dbaui
         */
         OUString getPrimaryKeyName() const { return m_aKeyName; }
 
-        TOTypeInfoSP        getTypeInfo(sal_Int32 _nPos)        const { return m_aTypeInfoIndex[_nPos]->second; }
         const OTypeInfoMap& getTypeInfo()                       const { return m_aTypeInfo; }
 
         TOTypeInfoSP        getDestTypeInfo(sal_Int32 _nPos)    const { return m_aDestTypeInfoIndex[_nPos]->second; }
diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx
index 0903fbff2b8a..098c69ac66ec 100644
--- a/dbaccess/source/ui/inc/adtabdlg.hxx
+++ b/dbaccess/source/ui/inc/adtabdlg.hxx
@@ -83,7 +83,6 @@ namespace dbaui
         virtual ~OAddTableDlg();
         virtual void dispose() SAL_OVERRIDE;
 
-        void DetermineAddTable() { m_pAddButton->Enable( impl_isAddAllowed() ); }
         void Update();
 
         static  OUString  getDialogTitleForContext(
diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx
index 68dc816753e3..d269bae7a7b5 100644
--- a/dbaccess/source/ui/inc/charsets.hxx
+++ b/dbaccess/source/ui/inc/charsets.hxx
@@ -54,8 +54,6 @@ namespace dbaui
         const_iterator  begin() const;
         /// get access to the (last + 1st) element of the charset collection
         const_iterator  end() const;
-        // size of the map
-        sal_Int32   size() const { return OCharsetDisplay_Base::size(); }
 
     protected:
         virtual bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const SAL_OVERRIDE;
@@ -75,7 +73,6 @@ namespace dbaui
     public:
         CharsetDisplayDerefHelper(const CharsetDisplayDerefHelper& _rSource);
 
-        rtl_TextEncoding    getEncoding() const         { return CharsetDisplayDerefHelper_Base::getEncoding(); }
         OUString     getIanaName() const         { return CharsetDisplayDerefHelper_Base::getIanaName(); }
         OUString     getDisplayName() const      { return m_sDisplayName; }
 
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index 6f5af9e5fe2b..f306650acfb2 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -55,16 +55,12 @@ class ODbDataSourceAdministrationHelper;
 class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient
 {
 private:
-    OModuleClient m_aModuleClient;
+    OModuleClient           m_aModuleClient;
     ::std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
     SfxItemSet*             m_pOutSet;
     ::dbaccess::ODsnTypeCollection*
                             m_pCollection;  /// the DSN type collection instance
-    OUString         m_eType;
-
-    bool                m_bResetting : 1;   /// sal_True while we're resetting the pages
-    bool                m_bApplied : 1;     /// sal_True if any changes have been applied while the dialog was executing
-    bool                m_bUIEnabled : 1;   /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/>
+    OUString                m_eType;
 
 public:
     /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed
@@ -101,11 +97,6 @@ protected:
     virtual bool        onFinish() SAL_OVERRIDE;
 
 protected:
-    inline void     disabledUI() { m_bUIEnabled = false; }
-
-    /// select a datasource with a given name, adjust the item set accordingly, and everything like that ..
-    void implSelectDatasource(const OUString& _rRegisteredName);
-    void resetPages(const css::uno::Reference< css::beans::XPropertySet >& _rxDatasource);
 
     enum ApplyResult
     {
@@ -113,9 +104,6 @@ protected:
         AR_LEAVE_UNCHANGED,     // no changes were made
         AR_KEEP                 // don't leave the page (e.g. because an error occurred)
     };
-    /** apply all changes made
-    */
-    ApplyResult implApplyChanges();
 
 private:
     DECL_LINK_TYPED(OnTypeSelected, OGeneralPage&, void);
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 2fea8fb54c16..058e79b274fa 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -60,15 +60,12 @@ class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper,
 {
 
 private:
-    OModuleClient m_aModuleClient;
+    OModuleClient           m_aModuleClient;
     ::std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
     SfxItemSet*             m_pOutSet;
-    OUString         m_sURL;
-    OUString         m_sOldURL;
-    bool                m_bResetting : 1;   /// sal_True while we're resetting the pages
-    bool                m_bApplied : 1;     /// sal_True if any changes have been applied while the dialog was executing
-    bool                m_bUIEnabled : 1;   /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/>
-    bool                m_bIsConnectable : 1;
+    OUString                m_sURL;
+    OUString                m_sOldURL;
+    bool                    m_bIsConnectable : 1;
     OUString                m_sRM_IntroText;
     OUString                m_sRM_dBaseText;
     OUString                m_sRM_TextText;
@@ -135,10 +132,6 @@ protected:
     virtual bool        onFinish() SAL_OVERRIDE;
 
 protected:
-    inline void     disabledUI() { m_bUIEnabled = false; }
-
-    /// select a datasource with a given name, adjust the item set accordingly, and everything like that ..
-    void implSelectDatasource(const OUString& _rRegisteredName);
     void resetPages(const css::uno::Reference< css::beans::XPropertySet >& _rxDatasource);
 
     enum ApplyResult
diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx
index 3366a77f27f1..baa39afd3e4e 100644
--- a/dbaccess/source/ui/inc/indexcollection.hxx
+++ b/dbaccess/source/ui/inc/indexcollection.hxx
@@ -80,9 +80,6 @@ namespace dbaui
         // detach from the container
         void detach();
 
-        // number of contained indexes
-        sal_Int32   size() const { return m_aIndexes.size(); }
-
         /// drop an index, and remove it from the collection
         bool    drop(const Indexes::iterator& _rPos);
         /// simply drop the index described by the name, but don't remove the descriptor from the collection
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 454f1f8c97c3..5121ac52080e 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -168,10 +168,6 @@ namespace dbaui
         bool implDropIndex(SvTreeListEntry* _pEntry, bool _bRemoveFromCollection);
 
         bool implCheckPlausibility(const Indexes::const_iterator& _rPos);
-
-        /** checks if the controls have to be replaced and moved.
-        */
-        void checkControls();
     };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx
index 58bb7c4113d7..bf73aa551cda 100644
--- a/dbaccess/source/ui/inc/paramdialog.hxx
+++ b/dbaccess/source/ui/inc/paramdialog.hxx
@@ -92,8 +92,6 @@ namespace dbaui
     protected:
         void Construct();
 
-        ::connectivity::OSQLParseNode* implPredicateTree(OUString& _rErrorMessage, const OUString& _rStatement, const css::uno::Reference< css::beans::XPropertySet > & _rxField);
-
     private:
         DECL_LINK_TYPED(OnVisitedTimeout, Timer*, void);
         DECL_LINK(OnValueModified, Control*);
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index cdf2ac3d71f0..cf9c2aefc39d 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -70,10 +70,10 @@ namespace dbaui
         /// if we're editing an existing view, this is non-NULL
         css::uno::Reference< css::sdbcx::XAlterView >         m_xAlterView;
 
-        OUString m_sStatement;           // contains the current sql statement
-        OUString m_sUpdateCatalogName;   // catalog for update data
-        OUString m_sUpdateSchemaName;    // schema for update data
-        OUString m_sUpdateTableName;     // table for update data
+        OUString        m_sStatement;           // contains the current sql statement
+        OUString        m_sUpdateCatalogName;   // catalog for update data
+        OUString        m_sUpdateSchemaName;    // schema for update data
+        OUString        m_sUpdateTableName;     // table for update data
         mutable OUString
                         m_sName;                // name of the query
 
@@ -82,12 +82,9 @@ namespace dbaui
         sal_Int32       m_nVisibleRows;     // which rows the selection browse should show
         sal_Int32       m_nSplitPos;        // the position of the splitter
         sal_Int32       m_nCommandType;     // the type of the object we're designing
-        bool        m_bGraphicalDesign; // are we in the graphical design mode (sal_True) or in the text design (sal_False)?
-        bool        m_bDistinct;        // true when you want "select distinct" otherwise false
-        bool        m_bViewAlias;       // show the alias row in the design view
-        bool        m_bViewTable;       // show the table row in the design view
-        bool        m_bViewFunction;    // show the function row in the design view
-        bool        m_bEscapeProcessing;// is true when we shouldn't parse the statement
+        bool            m_bGraphicalDesign; // are we in the graphical design mode (sal_True) or in the text design (sal_False)?
+        bool            m_bDistinct;        // true when you want "select distinct" otherwise false
+        bool            m_bEscapeProcessing;// is true when we shouldn't parse the statement
 
 
         /** returns the container of queries, views, or command definitions, depending on what object type
@@ -114,8 +111,6 @@ namespace dbaui
         void loadViewSettings( const ::comphelper::NamedValueCollection& o_rViewSettings );
         OUString translateStatement( bool _bFireStatementChange = true );
 
-        OUString getDefaultName() const;
-
         void execute_QueryPropDlg();
 
     protected:
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 6d5b73b84c9f..2fb4e710abbe 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -429,11 +429,6 @@ namespace dbaui
 
         void transferChangedControlProperty(const OUString& _rProperty, const css::uno::Any& _rNewValue);
 
-        css::uno::Reference< css::sdbc::XConnection > connectWithStatus(
-            const OUString& _rDataSourceName,
-            void* _pTreeListUserData    // in reality a DBTreeListUserData*, but we do not know this class here...
-        );
-
         // checks whether the given tree entry denotes a data source
         bool impl_isDataSourceEntry( SvTreeListEntry* _pEntry ) const;
 
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
index ba4de09285fd..cdfadf7b87b4 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
@@ -70,11 +70,6 @@ OConnectionLineDataRef OQueryTableConnectionData::CreateLineDataObj()
     return new OConnectionLineData();
 }
 
-OConnectionLineDataRef OQueryTableConnectionData::CreateLineDataObj( const OConnectionLineData& rConnLineData )
-{
-    return new OConnectionLineData( rConnLineData );
-}
-
 void OQueryTableConnectionData::CopyFrom(const OTableConnectionData& rSource)
 {
     // same as in base class, use of (non-virtual) operator=
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
index c511649bf2f4..9561f1dfd36e 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
@@ -39,7 +39,6 @@ namespace dbaui
     protected:
         // for creation and duplication of lines of own type
         virtual OConnectionLineDataRef CreateLineDataObj() SAL_OVERRIDE;
-        virtual OConnectionLineDataRef CreateLineDataObj( const OConnectionLineData& rConnLineData ) SAL_OVERRIDE;
 
         OQueryTableConnectionData& operator=( const OQueryTableConnectionData& rConnData );
     public:
@@ -64,7 +63,6 @@ namespace dbaui
         sal_Int32       GetFieldIndex(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_nDestEntryIndex : m_nFromEntryIndex; }
         void            SetFieldIndex(EConnectionSide nWhich, sal_Int32 nVal) { if (nWhich==JTCS_TO) m_nDestEntryIndex=nVal; else m_nFromEntryIndex=nVal; }
 
-        ETableFieldType GetFieldType(EConnectionSide nWhich) const { return nWhich==JTCS_TO ? m_eDestType : m_eFromType; }
         void            SetFieldType(EConnectionSide nWhich, ETableFieldType eType) { if (nWhich==JTCS_TO) m_eDestType=eType; else m_eFromType=eType; }
 
         void            InitFromDrag(const OTableFieldDescRef& rDragLeft, const OTableFieldDescRef& rDragRight);
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx
index c480b4be4bd1..fd30978d2af2 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.hxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx
@@ -45,8 +45,6 @@ namespace dbaui
         // late Constructor, the base class CREATES Listbox on first call
         virtual bool         Init() SAL_OVERRIDE;
 
-        inline sal_Int32     GetAliasNum() const { return m_nAliasNum; }
-
         bool                 ExistsField(const OUString& strFieldName, OTableFieldDescRef& rInfo);
         bool                 ExistsAVisitedConn() const;
 
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
index af22a64063d2..aea22ac3dec8 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
@@ -51,16 +51,9 @@ namespace dbaui
         void SetTabWin(OQueryTableWindow* pTW) { m_pTabWin = pTW; }
         // now SetOwnership should be invoked
 
-        // access to the managed connections
-        sal_uInt16  ConnCount() { return (sal_uInt16)m_vTableConnection.size(); }
-
         ::std::vector<VclPtr<OTableConnection> >&       GetTabConnList() { return m_vTableConnection; }
 
         void InsertConnection( OTableConnection* pConnection ) { m_vTableConnection.push_back(pConnection); }
-        void RemoveConnection( OTableConnection* pConnection )
-        {
-            m_vTableConnection.erase(::std::remove(m_vTableConnection.begin(),m_vTableConnection.end(),pConnection),m_vTableConnection.end());
-        }
     };
 
 }
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 91164af853ff..a6240cbe6b71 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -55,7 +55,6 @@ using namespace ::com::sun::star::accessibility;
 
 #define DEFAULT_QUERY_COLS  20
 #define DEFAULT_SIZE        GetTextWidth("0") * 30
-#define CHECKBOX_SIZE       10
 #define HANDLE_ID            0
 #define HANDLE_COLUMN_WITDH 70
 #define SORT_COLUMN_NONE    0xFFFFFFFF
@@ -2317,16 +2316,6 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, sal_uInt16 nColId, con
     static_cast<OQueryController&>(getDesignView()->getController()).setModified( sal_True );
 }
 
-sal_uInt32 OSelectionBrowseBox::GetTotalCellWidth(long nRow, sal_uInt16 nColId) const
-{
-
-    long nRowId = GetRealRow(nRow);
-    if (nRowId == BROW_VIS_ROW)
-        return CHECKBOX_SIZE;
-    else
-        return  GetDataWindow().GetTextWidth(GetCellText(nRowId, nColId));
-}
-
 void OSelectionBrowseBox::ColumnResized(sal_uInt16 nColId)
 {
     if (static_cast<OQueryController&>(getDesignView()->getController()).isReadOnly())
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 3999f592633a..fe825dcb4213 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -201,7 +201,6 @@ namespace dbaui
         virtual void                CellModified() SAL_OVERRIDE;
         virtual bool                SaveModified() SAL_OVERRIDE;
         virtual void                Init() SAL_OVERRIDE;
-        sal_uInt32                  GetTotalCellWidth(long nRow, sal_uInt16 nColId) const;
         virtual void                ColumnResized( sal_uInt16 nColId ) SAL_OVERRIDE;
 
         virtual sal_uInt32          GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
index 43fc4eed8880..9278e271033d 100644
--- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
@@ -136,11 +136,6 @@ OConnectionLineDataRef OTableConnectionData::CreateLineDataObj()
     return new OConnectionLineData();
 }
 
-OConnectionLineDataRef OTableConnectionData::CreateLineDataObj( const OConnectionLineData& rConnLineData )
-{
-    return new OConnectionLineData( rConnLineData );
-}
-
 OTableConnectionData* OTableConnectionData::NewInstance() const
 {
     return new OTableConnectionData();
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 9a21da5e71ad..7cca1a54d88b 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -337,9 +337,6 @@ OQueryController::OQueryController(const Reference< XComponentContext >& _rM)
     ,m_nCommandType( CommandType::QUERY )
     ,m_bGraphicalDesign(false)
     ,m_bDistinct(false)
-    ,m_bViewAlias(false)
-    ,m_bViewTable(false)
-    ,m_bViewFunction(false)
     ,m_bEscapeProcessing(true)
 {
     InvalidateAll();
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index ebb3188f6c7d..84c901cbd9a0 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -277,11 +277,6 @@ IMPL_LINK_NOARG_TYPED( DlgQryJoin, NaturalToggleHdl, CheckBox&, void )
     }
 }
 
-TTableConnectionData::value_type DlgQryJoin::getConnectionData() const
-{
-    return m_pConnData;
-}
-
 void DlgQryJoin::setValid(bool _bValid)
 {
     m_pPB_OK->Enable(_bValid || eJoinType == CROSS_JOIN );
diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx
index feca1afc0ed9..eeb8fea63328 100644
--- a/dbaccess/source/ui/querydesign/querydlg.hxx
+++ b/dbaccess/source/ui/querydesign/querydlg.hxx
@@ -72,18 +72,11 @@ namespace dbaui
         virtual void dispose() SAL_OVERRIDE;
         EJoinType GetJoinType() const { return eJoinType; };
 
-        /** getConnectionData returns the current connection data
-            @return the current connectiondata
-        */
-        virtual TTableConnectionData::value_type getConnectionData() const SAL_OVERRIDE;
-
         /** setValid set the valid inside, can be used for OK buttons
             @param  _bValid true when the using control allows an update
         */
         virtual void setValid(bool _bValid) SAL_OVERRIDE;
 
-        virtual css::uno::Reference< css::sdbc::XConnection > getConnection() SAL_OVERRIDE { return m_xConnection; }
-
         /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists
             @param  _pConnectionData    the connection which exists between the new tables
         */
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index 25109418e267..9cc424a45826 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -196,11 +196,6 @@ OConnectionLineDataRef ORelationTableConnectionData::CreateLineDataObj()
     return new OConnectionLineData();
 }
 
-OConnectionLineDataRef ORelationTableConnectionData::CreateLineDataObj( const OConnectionLineData& rConnLineData )
-{
-    return new OConnectionLineData( rConnLineData );
-}
-
 void ORelationTableConnectionData::CopyFrom(const OTableConnectionData& rSource)
 {
     // retract to the (non-virtual) operator= like in the base class
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 6744812fe4d5..90e73412f0fe 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -877,25 +877,6 @@ void OTableEditorCtrl::InsertNewRows( long nRow )
     InvalidateFeatures();
 }
 
-OUString OTableEditorCtrl::GetControlText( long nRow, sal_uInt16 nColId )
-{
-    // Read the Browser Controls
-    if( nColId < FIELD_FIRST_VIRTUAL_COLUMN )
-    {
-        GoToRow( nRow );
-        GoToColumnId( nColId );
-        CellControllerRef xController = Controller();
-        if(xController.Is())
-            return xController->GetWindow().GetText();
-        else
-            return GetCellText(nRow,nColId);
-    }
-
-    // Read the Controls on the Tabpage
-    else
-        return pDescrWin->GetControlText( nColId );
-}
-
 void OTableEditorCtrl::SetControlText( long nRow, sal_uInt16 nColId, const OUString& rText )
 {
     // Set the Browser Controls
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 20f3614bf99e..c7154600c34e 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -118,8 +118,6 @@ namespace dbaui
         void SetPrimaryKey( bool bSet );
         bool IsPrimaryKey();
 
-        DECL_LINK(ControlPreNotifyHdl, NotifyEvent*);
-
     public:
         explicit OTableEditorCtrl(vcl::Window* pParentWin);
         virtual ~OTableEditorCtrl();
@@ -143,7 +141,6 @@ namespace dbaui
         virtual void SetCellData( long nRow, sal_uInt16 nColId, const css::uno::Any& _rSaveData ) SAL_OVERRIDE;
         virtual css::uno::Any  GetCellData( long nRow, sal_uInt16 nColId ) SAL_OVERRIDE;
         virtual void SetControlText( long nRow, sal_uInt16 nColId, const OUString& rText ) SAL_OVERRIDE;
-        virtual OUString GetControlText( long nRow, sal_uInt16 nColId ) SAL_OVERRIDE;
 
         virtual OTableDesignView* GetView() const SAL_OVERRIDE;
 
@@ -175,7 +172,6 @@ namespace dbaui
         virtual void paste() SAL_OVERRIDE;
 
     private:
-        DECL_LINK( StartIndexing, void* );
         DECL_LINK_TYPED( DelayedCut, void*, void );
         DECL_LINK_TYPED( DelayedPaste, void*, void );
         DECL_LINK_TYPED( DelayedDelete, void*, void );
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index e300a483500c..d52d3f021512 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
@@ -70,8 +70,6 @@ namespace dbaui
 
         void SetControlText( sal_uInt16 nControlId, const OUString& rText )
                 { m_pGenPage->SetControlText(nControlId,rText); }
-        OUString GetControlText( sal_uInt16 nControlId )
-                { return m_pGenPage->GetControlText(nControlId); }
 
         // short GetFormatCategory(OFieldDescription* pFieldDescr) { return m_pGenPage ? m_pGenPage->GetFormatCategory(pFieldDescr) : -1; }
         // delivers a CAT_xxx (CAT_NUMBER, CAT_DATE ...) value to a Format set in the field
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 8459fc8ad1db..5e7fdb59cfdf 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1050,11 +1050,6 @@ EditLine& EditLine::operator = ( const EditLine& r )
 }
 
 
-bool operator != ( const EditLine& r1,  const EditLine& r2  )
-{
-    return !( r1 == r2 );
-}
-
 void EditLine::SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH, sal_uInt16 nCrsrH )
 {
     nHeight = nH;
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index f712abd8d309..218fc3503049 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -552,7 +552,6 @@ public:
 
     EditLine&   operator = ( const EditLine& rLine );
     friend bool operator == ( const EditLine& r1,  const EditLine& r2  );
-    friend bool operator != ( const EditLine& r1,  const EditLine& r2  );
 };
 
 
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index c61520d93b23..fbf65eccfabb 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -1624,19 +1624,6 @@ void BibDataManager::RegisterInterceptor( ::bib::BibBeamer* pBibBeamer)
 }
 
 
-bool BibDataManager::HasActiveConnection()const
-{
-    bool bRet = false;
-    Reference< XPropertySet >   xPrSet( m_xForm, UNO_QUERY );
-    if( xPrSet.is() )
-    {
-        Reference< XComponent >  xConnection;
-        xPrSet->getPropertyValue("ActiveConnection") >>= xConnection;
-        bRet = xConnection.is();
-    }
-    return bRet;
-}
-
 bool BibDataManager::HasActiveConnection()
 {
     return getConnection( m_xForm ).is();
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index b5816a6c80dd..c17b047a78a8 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -166,7 +166,6 @@ public:
         OUString                    CreateDBChangeDialog(vcl::Window* pParent);
 
         void                        DispatchDBChangeDialog();
-        bool                        HasActiveConnection() const;
 
         void                        SetView( ::bib::BibView* pView ) { pBibView = pView; }
 
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx
index 5ac12303a6ae..d7f24693d8a7 100644
--- a/extensions/source/propctrlr/commoncontrol.cxx
+++ b/extensions/source/propctrlr/commoncontrol.cxx
@@ -117,24 +117,6 @@ namespace pcr
     }
 
 
-    bool ControlHelper::handlePreNotify(NotifyEvent& rNEvt)
-    {
-        if (MouseNotifyEvent::KEYINPUT == rNEvt.GetType())
-        {
-            const vcl::KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
-            sal_uInt16 nKey = aKeyCode.GetCode();
-
-            if (nKey == KEY_RETURN && !aKeyCode.IsShift())
-            {
-                notifyModifiedValue();
-                impl_activateNextControl_nothrow();
-                return true;
-            }
-        }
-        return false;
-    }
-
-
     IMPL_LINK( ControlHelper, ModifiedHdl, vcl::Window*, /*_pWin*/ )
     {
         if ( m_pModifyListener )
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index b649431adee9..ebb8582fff0a 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -141,9 +141,6 @@ namespace pcr
         inline void activateNextControl() const { impl_activateNextControl_nothrow(); }
 
     public:
-        /// may be used to implement the default handling in PreNotify; returns sal_True if handled
-        bool handlePreNotify(NotifyEvent& _rNEvt);
-
         /// automatically size the window given in the ctor
         void    autoSizeWindow();
 
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index 69588604820b..6a026c7c8278 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -102,14 +102,6 @@ namespace pcr
         inline bool empty() const { return UnoBase::getLength() == 0; }
 
         inline void resize( size_t _newSize ) { UnoBase::realloc( _newSize ); }
-
-        inline iterator erase( iterator _pos )
-        {
-            iterator loop = end();
-            while ( --loop != _pos )
-                *( loop - 1 ) = *loop;
-            resize( size() - 1 );
-        }
     };
 
 
diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx
index 0c4a547d4f48..9ec8d6e69736 100644
--- a/filter/source/pdf/pdfdialog.hxx
+++ b/filter/source/pdf/pdfdialog.hxx
@@ -74,7 +74,6 @@ public:
 
 
 OUString PDFDialog_getImplementationName () throw (RuntimeException);
-Sequence< sal_Int8 > SAL_CALL PDFDialog_getImplementationId() throw(RuntimeException);
 Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames() throw (RuntimeException);
 Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr) throw( Exception );
 
diff --git a/forms/source/inc/listenercontainers.hxx b/forms/source/inc/listenercontainers.hxx
index 6c7c75d10dc2..4e19758936fe 100644
--- a/forms/source/inc/listenercontainers.hxx
+++ b/forms/source/inc/listenercontainers.hxx
@@ -41,9 +41,6 @@ namespace frm
         ::cppu::OWeakObject&    m_rInstigator;
 
     protected:
-        ::cppu::OWeakObject&    getInstigator() { return m_rInstigator; }
-
-    protected:
         inline EventListeners( ::cppu::OWeakObject& _rInstigator, ::osl::Mutex& _rMutex )
             :EventListeners_Base( _rMutex )
             ,m_rInstigator( _rInstigator )
diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx
index db4719564592..e969002f2103 100644
--- a/forms/source/xforms/NameContainer.hxx
+++ b/forms/source/xforms/NameContainer.hxx
@@ -60,13 +60,6 @@ protected:
         return findItem( rName ) != maItems.end();
     }
 
-    T getItem( const OUString& rName )
-    {
-        OSL_ENSURE( hasItem( rName ), "can't get non-existent item" );
-        return maItems[ rName ];
-    }
-
-
     void replace( const OUString& rName,
                   const T& aElement )
     {
diff --git a/forms/source/xforms/xpathlib/xpathlib.hxx b/forms/source/xforms/xpathlib/xpathlib.hxx
index 3965ca740465..57f608b8ecde 100644
--- a/forms/source/xforms/xpathlib/xpathlib.hxx
+++ b/forms/source/xforms/xpathlib/xpathlib.hxx
@@ -55,7 +55,6 @@ void xforms_indexFunction(xmlXPathParserContextPtr ctxt, int nargs);
 
 // String Functions
 void xforms_propertyFunction(xmlXPathParserContextPtr ctxt, int nargs);
-void xforms_versionFunction(xmlXPathParserContextPtr ctxt, int nargs);
 
 // Date and Time Functions
 void xforms_nowFunction(xmlXPathParserContextPtr ctxt, int nargs);
diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx
index ff5f07e1a467..978dc4d255b8 100644
--- a/framework/inc/classes/checkediterator.hxx
+++ b/framework/inc/classes/checkediterator.hxx
@@ -69,71 +69,6 @@ class CheckedIterator
         // interface methods
 
         /*-****************************************************************************************************
-            @short      initialize instance with valid container
-            @descr      Set new container at an instance of this class. The other member will set automatically!
-                        m_pPosition = first element in container
-                        m_eEndState = BEFOREEND
-            @param      "rContainer", must be a valid reference to an existing container.
-            @onerror    An assertion is thrown.
-        *//*-*****************************************************************************************************/
-
-        inline void initialize( const TContainer& rContainer )
-        {
-            // Check incoming parameter. We don't accept all!
-            SAL_WARN_IF( &rContainer==NULL, "fwk", "CheckedIterator::initialize(): Invalid parameter detected!" );
-            SAL_WARN_IF( m_eEndState!=E_UNKNOWN, "fwk", "CheckedIterator::initialize(): Instance already initialized! Don't do it again." );
-
-            if( m_eEndState == E_UNKNOWN )
-            {
-                // Set new container and update other member.
-                m_pContainer = &rContainer;
-                m_eEndState  = E_BEFOREEND;
-                m_pPosition  = m_pContainer->begin();
-            }
-        }
-
-        /*-****************************************************************************************************
-            @short      set internal states to E_END
-            @descr      Sometimes we need a "walking" check-iterator which is initialized with the END-state!
-                        We need it to return one default value if no other ones exist ...
-
-            @seealso    using in class FilterCache!
-        *//*-*****************************************************************************************************/
-
-        inline void setEnd()
-        {
-            m_pContainer = NULL;
-            m_eEndState  = E_END;
-        }
-
-        /*-****************************************************************************************************
-            @short      set internal states to E_AFTEREND
-            @descr      Sometimes we need a "walking" check-iterator which is initialized with AFTEREND-state!
-                        We need it if we don't have a container but must prevent us against further searching!
-
-            @seealso    using in class FilterCache!
-        *//*-*****************************************************************************************************/
-
-        inline void setAfterEnd()
-        {
-            m_pContainer = NULL;
-            m_eEndState  = E_AFTEREND;
-        }
-
-        /*-****************************************************************************************************
-            @short      reset this iterator
-            @descr      It must be called on an already initialized iterator.
-                        Means the member m_pContainer must be valid. Otherwise the reaction
-                        isn't defined.
-        *//*-*****************************************************************************************************/
-
-        inline void reset()
-        {
-            m_eEndState  = E_UNKNOWN;
-            m_pContainer = NULL;
-        }
-
-        /*-****************************************************************************************************
             @short      step to next element in container.
             @descr      If end of container is reached we change our internal "m_eEndState".
                         If end reached for first time; we set it to E_END;
@@ -168,22 +103,6 @@ class CheckedIterator
             return *this;
         }
 
-        /*-****************************************************************************************************
-            @short      support readonly access to container entry
-            @descr      Use it to get the value of current container item.
-            @return     A reference to value of container entry.
-        *//*-*****************************************************************************************************/
-
-        inline typename TContainer::const_iterator getEntry()
-        {
-            // Warn programmer if he forget to initialize these object ...
-            SAL_WARN_IF( m_pContainer==NULL, "fwk", "CheckedIterator::getEntry(): Object not initialized!" );
-            // or try to read a non existing element!
-            SAL_WARN_IF( m_eEndState!=E_BEFOREEND, "fwk", "CheckedIterator::getEntry(): Wrong using of class detected!" );
-
-            return m_pPosition;
-        }
-
     //  private member
 
     private:
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 813940752247..e20b1a313deb 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -315,27 +315,6 @@ class SetNodeHash : public std::unordered_map< OUString                    ,
                                                OUStringHash                  ,
                                                std::equal_to< OUString > >
 {
-
-    // interface
-
-    public:
-
-        // The only way to free ALL memory really!
-
-        inline void free()
-        {
-            SetNodeHash().swap( *this ); // get rid of reserved capacity
-            framework::free(lAddedItems);
-            framework::free(lChangedItems);
-            framework::free(lRemovedItems);
-        }
-
-        // Append changed, added or removed items to special lists
-        // Necessary for saving changes
-
-        void appendChange( const OUString& sName  ,
-                                 EModifyState     eState );
-
     // member
 
     public:
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index 6760033cf451..b748cedf2b8c 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -81,19 +81,6 @@ struct KeyEventEqualsFunc
 
 typedef ::std::vector< OUString > OUStringList;
 
-// search for given element
-template <class T>
-typename std::vector<T>::iterator find( std::vector<T>& vec, const T& sElement )
-{
-    return ::std::find(vec.begin(), vec.end(), sElement);
-}
-
-template <class T>
-typename std::vector<T>::const_iterator find( const std::vector<T>& vec, const T& sElement )
-{
-    return ::std::find(vec.begin(), vec.end(), sElement);
-}
-
 template <class T>
 void free(std::vector<T>& vec)
 {
diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index 1faa79df9a0c..7b389579a6d3 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -35,17 +35,6 @@ namespace framework{
     namespace pattern{
         namespace frame{
 
-inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::uno::Reference< css::frame::XFrame >& xFrame)
-{
-    css::uno::Reference< css::frame::XModel >      xModel;
-    css::uno::Reference< css::frame::XController > xController;
-    if (xFrame.is())
-        xController = xFrame->getController();
-    if (xController.is())
-        xModel = xController->getModel();
-    return xModel;
-}
-
 /** @short  close (or dispose) the given resource.
 
     @descr  It try to close the given resource first.
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 6f7f78ca371f..4227c62d70d7 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -214,7 +214,7 @@ void SAL_CALL JobExecutor::trigger( const OUString& sEvent ) throw(css::uno::Run
     // Optimization!
     // Check if the given event name exist inside configuration and reject wrong requests.
     // This optimization suppress using of the cfg api for getting event and job descriptions ...
-    if (framework::find(m_lEvents, sEvent) == m_lEvents.end())
+    if (std::find(m_lEvents.begin(), m_lEvents.end(), sEvent) == m_lEvents.end())
         return;
 
     // get list of all enabled jobs
@@ -283,7 +283,7 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent
         (aEvent.EventName == EVENT_ON_LOAD)
        )
     {
-        if (find(m_lEvents, EVENT_ON_DOCUMENT_OPENED) != m_lEvents.end())
+        if (std::find(m_lEvents.begin(), m_lEvents.end(), EVENT_ON_DOCUMENT_OPENED) != m_lEvents.end())
             JobData::appendEnabledJobsForEvent(m_xContext, EVENT_ON_DOCUMENT_OPENED, lJobs);
     }
 
@@ -293,12 +293,12 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent
         (aEvent.EventName == EVENT_ON_LOAD_FINISHED)
        )
     {
-        if (find(m_lEvents, EVENT_ON_DOCUMENT_ADDED) != m_lEvents.end())
+        if (std::find(m_lEvents.begin(), m_lEvents.end(), EVENT_ON_DOCUMENT_ADDED) != m_lEvents.end())
             JobData::appendEnabledJobsForEvent(m_xContext, EVENT_ON_DOCUMENT_ADDED, lJobs);
     }
 
     // Add all jobs for "real" notified event too .-)
-    if (find(m_lEvents, aEvent.EventName) != m_lEvents.end())
+    if (std::find(m_lEvents.begin(), m_lEvents.end(), aEvent.EventName) != m_lEvents.end())
         JobData::appendEnabledJobsForEvent(m_xContext, aEvent.EventName, lJobs);
     } /* SAFE */
 
@@ -344,7 +344,7 @@ void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent
         OUString sEvent = ::utl::extractFirstFromConfigurationPath(sValue);
         if (!sEvent.isEmpty())
         {
-            OUStringList::iterator pEvent = find(m_lEvents, sEvent);
+            OUStringList::iterator pEvent = std::find(m_lEvents.begin(), m_lEvents.end(), sEvent);
             if (pEvent == m_lEvents.end())
                 m_lEvents.push_back(sEvent);
         }
@@ -359,7 +359,7 @@ void SAL_CALL JobExecutor::elementRemoved ( const css::container::ContainerEvent
         OUString sEvent = ::utl::extractFirstFromConfigurationPath(sValue);
         if (!sEvent.isEmpty())
         {
-            OUStringList::iterator pEvent = find(m_lEvents, sEvent);
+            OUStringList::iterator pEvent = std::find(m_lEvents.begin(), m_lEvents.end(), sEvent);
             if (pEvent != m_lEvents.end())
                 m_lEvents.erase(pEvent);
         }
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index 3f63fd3bc971..893594c1e7ff 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -636,7 +636,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath)
 
     // avoid duplicates, by removing the writeable path from
     // the user defined path list if it happens to be there too
-    OUStringList::iterator aI = find(aPathVal.lUserPaths, aPathVal.sWritePath);
+    OUStringList::iterator aI = std::find(aPathVal.lUserPaths.begin(), aPathVal.lUserPaths.end(), aPathVal.sWritePath);
     if (aI != aPathVal.lUserPaths.end())
         aPathVal.lUserPaths.erase(aI);
 
@@ -724,8 +724,8 @@ void PathSettings::impl_mergeOldUserPaths(      PathSettings::PathInfo& rPath,
         else
         {
             if (
-                (  find(rPath.lInternalPaths, sOld) == rPath.lInternalPaths.end()) &&
-                (  find(rPath.lUserPaths, sOld)     == rPath.lUserPaths.end()    ) &&
+                (  std::find(rPath.lInternalPaths.begin(), rPath.lInternalPaths.end(), sOld) == rPath.lInternalPaths.end()) &&
+                (  std::find(rPath.lUserPaths.begin(), rPath.lUserPaths.end(), sOld)     == rPath.lUserPaths.end()    ) &&
                 (! rPath.sWritePath.equals(sOld)                                     )
                )
                rPath.lUserPaths.push_back(sOld);
@@ -1056,10 +1056,10 @@ void PathSettings::impl_purgeKnownPaths(PathSettings::PathInfo& rPath,
          ++pIt                                 )
     {
         const OUString& rItem = *pIt;
-        OUStringList::iterator pItem = find(lList, rItem);
+        OUStringList::iterator pItem = std::find(lList.begin(), lList.end(), rItem);
         if (pItem != lList.end())
             lList.erase(pItem);
-        pItem = find(rPath.lUserPaths, rItem);
+        pItem = std::find(rPath.lUserPaths.begin(), rPath.lUserPaths.end(), rItem);
         if (pItem != rPath.lUserPaths.end())
             rPath.lUserPaths.erase(pItem);
     }
@@ -1069,7 +1069,7 @@ void PathSettings::impl_purgeKnownPaths(PathSettings::PathInfo& rPath,
     while ( pIt != rPath.lUserPaths.end() )
     {
         const OUString& rItem = *pIt;
-        OUStringList::iterator pItem = find(lList, rItem);
+        OUStringList::iterator pItem = std::find(lList.begin(), lList.end(), rItem);
         if ( pItem == lList.end() )
         {
             rPath.lUserPaths.erase(pIt);
@@ -1087,13 +1087,13 @@ void PathSettings::impl_purgeKnownPaths(PathSettings::PathInfo& rPath,
          ++pIt                             )
     {
         const OUString& rItem = *pIt;
-        OUStringList::iterator pItem = find(lList, rItem);
+        OUStringList::iterator pItem = std::find(lList.begin(), lList.end(), rItem);
         if (pItem != lList.end())
             lList.erase(pItem);
     }
 
     // Erase the write path from lList
-    OUStringList::iterator pItem = find(lList, rPath.sWritePath);
+    OUStringList::iterator pItem = std::find(lList.begin(), lList.end(), rPath.sWritePath);
     if (pItem != lList.end())
         lList.erase(pItem);
 }
diff --git a/hwpfilter/source/hutil.cxx b/hwpfilter/source/hutil.cxx
index 2faf89897a81..4597f84530c8 100644
--- a/hwpfilter/source/hutil.cxx
+++ b/hwpfilter/source/hutil.cxx
@@ -82,13 +82,4 @@ void str2hstr(const char *c, hchar * i)
 }
 
 
-int hstrlen(const hchar * s)
-{
-    int n = 0;
-
-    while (*s++)
-        n++;
-    return n;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/hutil.h b/hwpfilter/source/hutil.h
index 9f9fbec3a572..d856b74de173 100644
--- a/hwpfilter/source/hutil.h
+++ b/hwpfilter/source/hutil.h
@@ -29,10 +29,6 @@ void    num2roman(int num, char *buf);
  * Transfer 8bit string to 16bit string used internally in hwp
  */
 void    str2hstr(const char *c, hchar *i);
-/**
- * @returns Length of 16bit hwp string
- */
-int hstrlen(const hchar *s);
 
 #endif                                            /* UTIL_H_*/
 
diff --git a/hwpfilter/source/hwplib.h b/hwpfilter/source/hwplib.h
index 87a5bf9f936d..5d1324d537cb 100644
--- a/hwpfilter/source/hwplib.h
+++ b/hwpfilter/source/hwplib.h
@@ -53,12 +53,6 @@ typedef struct
     int   x, y;
 } ZZPoint;
 
-inline void allocPoint(ZZPoint &target, ZZPoint &src)
-{
-     target.x = src.x;
-     target.y = src.y;
-}
-
 /**
  * @short Size
  */
diff --git a/hwpfilter/source/list.hxx b/hwpfilter/source/list.hxx
index e205657a7f48..a605acad0dae 100644
--- a/hwpfilter/source/list.hxx
+++ b/hwpfilter/source/list.hxx
@@ -45,22 +45,6 @@ public:
     /// construct list with one element (pItem) or no element (pItem == NULL)
     LinkedList( T* pItem = 0 );
     ~LinkedList();
-
-    T* find( const int n );   /// return nth element in list
-    T* first();         /// return first element in list
-    T* last();          /// return last element in list
-
-    int count() const;  /// return number of elements in list
-    int empty() const;  /// determine whether list contains any elements
-
-    /// insert pItem into list at position n; at end if n == -1; return count()
-    int insert( T* pItem, int n = -1 );
-
-    /// remove nth element from list
-    T* remove( const int n );
-
-    /// remove given element from list
-    int remove( T* pItem );
 };
 
 /** iterator class for LinkedList<T>. Iterator may travel outside of
@@ -78,19 +62,12 @@ public:
     LinkedListIterator( LinkedList<T>* pList = 0 );
     ~LinkedListIterator();
 
-    T* current();               /// return current element, or NULL if invalid
-    void set( const int n );    /// set iterator to position n
-
-    void reset( );              /// set iterator to first element
-
     // bug-compatible with original LinkedList.h/cxx: Ignore parameter!
     void operator++( int );   /// advance iterator by one step (ignore n !!!)
     void operator--( int );   /// go one step backwards (ignore n !!!)
     void operator++();        /// advance iterator by one step
     void operator--();        /// go one step backwards
 
-private:
-    bool valid();
 };
 
 
@@ -122,98 +99,6 @@ LinkedList<T>::~LinkedList()
 }
 
 template<class T>
-T* LinkedList<T>::find( const int n )
-{
-    ASSERT( n >= 0  &&  n < static_cast<int>( maList.size() ) );
-    return maList[n];
-}
-
-template<class T>
-T* LinkedList<T>::first()
-{
-    return find( 0 );
-}
-
-template<class T>
-T* LinkedList<T>::last()
-{
-    return find( count() - 1 );
-}
-
-template<class T>
-int LinkedList<T>::count() const
-{
-    return static_cast<int>( maList.size() );
-}
-
-template<class T>
-int LinkedList<T>::empty() const
-{
-    return count() == 0;
-}
-
-template<class T>
-int LinkedList<T>::insert( T* pItem, int n )
-{
-    ASSERT( pItem != NULL );
-    ASSERT( n >= -1  &&  n <= static_cast<int>( maList.size() ));
-
-    if( n == -1 )
-    {
-        maList.push_back( pItem );
-    }
-    else
-    {
-        maList.insert( maList.begin() + n, pItem );
-    }
-
-    return static_cast<int>( maList.size() );
-}
-
-template<class T>
-T* LinkedList<T>::remove( const int n )
-{
-    ASSERT( n >= -1  &&  n <= static_cast<int>( maList.size() ) );
-
-    T* pItem = maList[ n ];
-    ASSERT( pItem != NULL );
-
-    maList.erase( maList.begin() + n );
-    return pItem;
-}
-
-template<class T>
-int LinkedList<T>::remove( T* pItem )
-{
-    ASSERT( pItem != NULL );
-
-    int i = 0;
-    typename list_t::iterator aIter = maList.begin();
-    typename list_t::iterator aEnd = maList.end();
-    while( aIter != aEnd  && *aIter != pItem )
-    {
-        ++i;
-        ++aIter;
-    }
-
-    if( aIter != aEnd )
-    {
-        // found!
-        ASSERT( *aIter == pItem );
-        maList.erase( aIter );
-    }
-    else
-    {
-        // else: not found
-        i = -1;
-    }
-
-    return i;
-}
-
-
-
-template<class T>
 LinkedListIterator<T>::LinkedListIterator( LinkedList<T>* pList ) :
     mpList( pList ),
     mnPosition( 0 )
@@ -227,29 +112,6 @@ LinkedListIterator<T>::~LinkedListIterator()
 }
 
 template<class T>
-T* LinkedListIterator<T>::current()
-{
-    return valid() ? mpList->find( mnPosition ) : NULL;
-}
-
-template<class T>
-void LinkedListIterator<T>::set( const int nIndex )
-{
-    ASSERT( mpList != NULL );
-    mnPosition = nIndex;
-    ASSERT( valid() );
-}
-
-
-template<class T>
-void LinkedListIterator<T>::reset()
-{
-    ASSERT( mpList != NULL );
-    mnPosition = 0;
-    ASSERT( valid() );
-}
-
-template<class T>
 void LinkedListIterator<T>::operator++( int )
 {
     ASSERT( mpList != NULL );
@@ -281,14 +143,6 @@ void LinkedListIterator<T>::operator--()
     mnPosition --;
 }
 
-template<class T>
-bool LinkedListIterator<T>::valid()
-{
-    return mpList != NULL
-        && mnPosition >= 0
-        && mnPosition < mpList->count();
-}
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 40e990af6442..fcfc8d0cdd32 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -105,7 +105,6 @@ public:
     {
         return !m_aStr.isEmpty();
     }
-    friend SvStream& operator >> (SvStream &, SvString &);
 
     bool        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
 };
@@ -147,9 +146,6 @@ public:
                     return !(*this == r);
                 }
 
-    sal_uInt16      GetMajorVersion() const { return nMajorVersion; }
-    sal_uInt16      GetMinorVersion() const { return nMinorVersion; }
-
     friend SvStream& operator >> (SvStream &, SvVersion &);
     bool        ReadSvIdl( SvTokenStream & rInStm );
 };
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 04c5ea08d613..fdcd89d565cd 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -44,7 +44,6 @@ public:
 void Init();
 class SvIdlWorkingBase;
 bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand );
-void DeInit();
 
 #endif // INCLUDED_IDL_INC_COMMAND_HXX
 
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 06a79b6f8df4..196b2aae6b11 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -223,13 +223,6 @@ bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
     return false;
 }
 
-SvStream& operator >> (SvStream & rStm, SvString & r )
-{
-    r.setString(read_uInt16_lenPrefixed_uInt8s_ToOString(rStm));
-    return rStm;
-}
-
-
 bool SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
 {
     return SvString::ReadSvIdl( SvHash_HelpText(), rInStm );
diff --git a/idlc/inc/idlc/idlc.hxx b/idlc/inc/idlc/idlc.hxx
index 4a65dc04cdf9..7d92c7f9493e 100644
--- a/idlc/inc/idlc/idlc.hxx
+++ b/idlc/inc/idlc/idlc.hxx
@@ -144,7 +144,6 @@ sal_Int32 produceFile(const OString& filenameBase,
     // filenameBase is filename without ".idl"
 void removeIfExists(const OString& pathname);
 
-OString makeTempName(const OString& prefix, const OString& postfix);
 bool copyFile(const OString* source, const OString& target);
     // a null source means stdin
 
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index 5b77e037a385..cf676ce74637 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -64,9 +64,6 @@ struct FwkMutex: public ::rtl::Static<osl::Mutex, FwkMutex> {};
 rtl::ByteSequence encodeBase16(const rtl::ByteSequence& rawData);
 rtl::ByteSequence decodeBase16(const rtl::ByteSequence& data);
 
-OUString getPlatform();
-
-
 OUString getDirFromFile(const OUString& usFilePath);
 
 enum FileStatus
@@ -94,7 +91,6 @@ FileStatus checkFileURL(const OUString & path);
 
 bool isAccessibilitySupportDesired();
 
-OUString retrieveClassPath( OUString const & macro );
 }
 #endif
 
diff --git a/l10ntools/inc/xrmlex.hxx b/l10ntools/inc/xrmlex.hxx
index e1092433f2b6..7e283118d218 100644
--- a/l10ntools/inc/xrmlex.hxx
+++ b/l10ntools/inc/xrmlex.hxx
@@ -25,14 +25,12 @@
 #include <stdio.h>
 
 extern "C" int WorkOnTokenSet( int, char* );
-extern "C" int Argument( char * );
 extern "C" int InitXrmExport( const char * );
 extern "C" int EndXrmExport();
 extern "C" int GetError();
 extern "C" int SetError();
 extern "C" bool GetOutputFile( int argc, char* argv[]);
 extern "C" FILE *GetXrmFile();
-extern "C" int isQuiet();
 extern "C" const char* getFilename();
 
 #endif
diff --git a/lotuswordpro/source/filter/ut.hxx b/lotuswordpro/source/filter/ut.hxx
index 478336075648..ecded7bb2e73 100644
--- a/lotuswordpro/source/filter/ut.hxx
+++ b/lotuswordpro/source/filter/ut.hxx
@@ -81,19 +81,9 @@ inline UtWord UtGetIntelWord(UtByte * pData)
 inline UtDWord UtGetIntelDWord(UtByte * pData)
 { return pData[0] | pData[1] << 8 | pData[2] << 16 | pData[3] << 24; }
 
-inline void UtPutIntelWord(UtByte * pData, UtWord Val)
-{ pData[0] = Val; pData[1] = Val >> 8; }
-
-inline void UtPutIntelDWord(UtByte * pData, UtDWord Val)
-{ pData[0] = Val; pData[1] = Val >> 8; pData[2] = Val >> 16; pData[3] = Val >> 24; }
-
 inline UtByte UtGetIntelByte(UtByte * pData)
 { return * pData; }
 
-inline void UtPutIntelByte(UtByte * pData, UtByte Val)
-
-{ * pData = Val; }
-
 }
 #endif
 
diff --git a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
index 0f0de07c75cd..514bdf844303 100644
--- a/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfcolumns.hxx
@@ -96,8 +96,6 @@ public:
      */
     void ToXml(IXFStream *pStrm);
 
-    friend bool operator==(XFColumn& c1, XFColumn& c2);
-    friend bool operator!=(XFColumn& c1, XFColumn& c2);
     friend class XFColumns;
 
 private:
@@ -123,8 +121,6 @@ public:
 
     void    ToXml(IXFStream *pStrm);
 
-    friend bool operator==(XFColumnSep& sep1, XFColumnSep& sep2);
-    friend bool operator!=(XFColumnSep& sep1, XFColumnSep& sep2);
     friend class XFColumns;
 private:
     sal_Int32   m_nRelHeight;
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx b/lotuswordpro/source/filter/xfilter/xfutil.cxx
index 92cbf55a0aed..4c6d6ae1889c 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx
@@ -63,15 +63,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <sstream>
 
-OUString   DateTimeToOUString(XFDateTime& dt)
-{
-    OUString aResult = OUString::number(dt.nYear) + "-" + OUString::number(dt.nMonth) + "-" + OUString::number(dt.nDay) +
-        "T" + OUString::number(dt.nHour) + ":" + OUString::number(dt.nMinute) + ":" + OUString::number(dt.nSecond) + "." +
-        OUString::number(dt.nMillSecond);
-
-    return aResult;
-}
-
 OUString   GetTableColName(sal_Int32 col)
 {
     int     remain = 0;
@@ -417,18 +408,6 @@ OUString   GetAlignName(enumXFAlignType align)
     return OUString("");
 }
 
-OUString   GetDrawKind(enumXFDrawKind kind)
-{
-    if( kind == enumXFDrawKindFull )
-        return OUString("full");
-    else if( kind == enumXFDrawKindSection )
-        return OUString("section");
-    else if( kind == enumXFDrawKindCut )
-        return OUString("cut");
-    else    //( kind == enumXFDrawKindArc )
-        return OUString("arc");
-}
-
 OUString   GetPageUsageName(enumXFPageUsage usage)
 {
     OUString sRet;
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.hxx b/lotuswordpro/source/filter/xfilter/xfutil.hxx
index 32a1ec311e5d..8d72ab7257d3 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.hxx
@@ -65,8 +65,6 @@
 #include <rtl/ustring.hxx>
 #include <string>
 
-OUString   DateTimeToOUString(XFDateTime& dt);
-
 OUString   GetTableColName(sal_Int32 col);
 
 OUString   GetUnderlineName(enumXFUnderline type);
@@ -91,8 +89,6 @@ OUString   GetFrameYRel(enumXFFrameYRel rel);
 
 OUString   GetAlignName(enumXFAlignType align);
 
-OUString   GetDrawKind(enumXFDrawKind kind);
-
 OUString   GetPageUsageName(enumXFPageUsage usage);
 
 OUString   GetValueType(enumXFValueType type);
diff --git a/opencl/inc/opencl_device_selection.h b/opencl/inc/opencl_device_selection.h
index 263b8c006b2f..b6a30fd5b01c 100644
--- a/opencl/inc/opencl_device_selection.h
+++ b/opencl/inc/opencl_device_selection.h
@@ -640,21 +640,6 @@ cleanup:
     return DS_SUCCESS;
 }
 
-inline ds_status getNumDeviceWithEmptyScore(ds_profile* profile, unsigned int* num)
-{
-    unsigned int i;
-    if (profile == NULL || num == NULL) return DS_MEMORY_ERROR;
-    *num = 0;
-    for (i = 0; i < profile->numDevices; i++)
-    {
-        if (profile->devices[i].score == NULL)
-        {
-            (*num)++;
-        }
-    }
-    return DS_SUCCESS;
-}
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/inc/regapi.hxx b/registry/inc/regapi.hxx
index 3a9d0e623ceb..31bf1d8ee219 100644
--- a/registry/inc/regapi.hxx
+++ b/registry/inc/regapi.hxx
@@ -25,22 +25,6 @@
 #include <registry/regtype.h>
 #include <registry/regdllapi.h>
 
-/** This function creates the specified key.
-
-    If the key already exists in the registry, the function opens the key only.
-    @param  hKey identifies a currently open key. The key which will be opened or created by this
-                 function is a subkey of the key identified by hKey.
-    @param  keyName points to a null terminated string specifying the name of a key.
-    @param  phNewKey points to a variable that receives the handle of the opened or created key.
-                     The memory to store this variable will be allocated and will be freed by the function
-                     reg_closeKey. If the function fails, phNewKey is NULL.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey,
-                                         rtl_uString* keyName,
-                                         RegKeyHandle* phNewKey);
-
-
 /** This function opens the specified key.
 
     @param  hKey identifies a currently open key. The key which will be opened by this function
@@ -56,48 +40,6 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey,
                                          RegKeyHandle* phOpenKey);
 
 
-
-/** This function opens all subkeys of the specified key.
-
-    @param  hKey identifies a currently open key. The key that subkeys will be opened by this
-                 function is a subkey of the key identified by hKey
-    @param  keyName points to a null terminated string specifying the name of a key whose subkeys
-                    will be opened.
-    @param  pphSubKeys points to a variable that receives an array of all opened subkeys.
-                       The memory to store this variable will be allocated and will be freed by the function
-                       reg_closeSubKeys. If the function fails, pphSubKeys is NULL.
-    @param  pnSubKeys specifies the length of the array (the number of open subkeys).
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openSubKeys(RegKeyHandle hKey,
-                                             rtl_uString* keyName,
-                                             RegKeyHandle** pphSubKeys,
-                                             sal_uInt32* pnSubKeys);
-
-
-/** This function closes all subkeys specified in the array.
-
-    @param  phSubKeys points to a variable that containss an array of all opened subkeys.
-                      The allocated memory of pphSubKeys and all open subkeys will be freed.
-    @param  nSubKeys specifies the length of the array (the number of subkeys to closed).
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeSubKeys(RegKeyHandle* phSubKeys,
-                                               sal_uInt32 nSubKeys);
-
-
-/** This function deletes the specified key.
-
-    @param  hKey identifies a currently open key. The key deleted by this function
-                 is a subkey of the key identified by hKey
-    @param  keyName points to a null terminated string specifying the name of a key which will
-                    be deleted.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_deleteKey(RegKeyHandle hKey,
-                                         rtl_uString* keyName);
-
-
 /** This function closes the specified key.
 
     @param  hKey identifies a currently open key which will be closed by this function.
@@ -107,259 +49,6 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_deleteKey(RegKeyHandle hKey,
 REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey);
 
 
-/** This function returns the name of a key.
-
-    @param  hKey identifies a currently open key which name will be returned.
-    @param  pKeyName contains the keyname if succeeds else an empty string.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName);
-
-
-/** This function sets a value of a key.
-
-    @param  hKey identifies a currently open key. The key which value will be set by this
-                 function is a subkey of the key identified by hKey.
-    @param  keyName points to a null terminated string specifying the name of a key which value
-                    will be set. If keyName is NULL, then the value of the key specified by
-                    hKey will be set.
-    @param  valueType specifies the type of the value.
-    @param  pData points to a memory block containing the data of the value.
-    @param  valueSize specifies the size of pData in bytes
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_setValue(RegKeyHandle hKey,
-                                           rtl_uString* keyName,
-                                           RegValueType valueType,
-                                           RegValue pData,
-                                           sal_uInt32 valueSize);
-
-
-/** This function sets an long list value of a key.
-
-    @param[in]  hKey identifies a currently open key. The key which value will be set by this
-                 function is a subkey of the key identified by hKey.
-    @param[in]  keyName points to a null terminated string specifying the name of a key which value
-                    will be set. If keyName is NULL, then the value of the key specified by
-                    hKey will be set.
-    @param[out]  pValueList points to an array of longs containing the data of the value.
-    @param[out]  len specifies the len of pValueList.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_setLongListValue(RegKeyHandle hKey,
-                                                      rtl_uString* keyName,
-                                                      sal_Int32* pValueList,
-                                                      sal_uInt32 len);
-
-
-/** This function sets an ascii list value of a key.
-
-    @param[in]  hKey identifies a currently open key. The key which value will be set by this
-                 function is a subkey of the key identified by hKey.
-    @param[in]  keyName points to a null terminated string specifying the name of a key which value
-                    will be set. If keyName is NULL, then the value of the key specified by
-                    hKey will be set.
-    @param[in]  pValueList points to an array of sal_Char* containing the data of the value.
-    @param[in]  len specifies the len of pValueList.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_setStringListValue(RegKeyHandle hKey,
-                                                          rtl_uString* keyName,
-                                                          sal_Char** pValueList,
-                                                          sal_uInt32 len);
-
-
-/** This function sets an unicode string list value of a key.
-
-    @param[in]  hKey identifies a currently open key. The key which value will be set by this
-                 function is a subkey of the key identified by hKey.
-    @param[in]  keyName points to a null terminated string specifying the name of a key which value
-                    will be set. If keyName is NULL, then the value of the key specified by
-                    hKey will be set.
-    @param[in]  pValueList points to an array of sal_Unicode* containing the data of the value.
-    @param[in]  len specifies the len of pValueList.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_setUnicodeListValue(RegKeyHandle hKey,
-                                                            rtl_uString* keyName,
-                                                            sal_Unicode** pValueList,
-                                                            sal_uInt32 len);
-
-
-/** This function gets info about type and size of a key value.
-
-    @param  hKey identifies a currently open key. The key which value info will be got by this
-                 function is a subkey of the key identified by hKey.
-    @param  keyName points to a null terminated string specifying the name of a key which value
-                    will be got. If keyName is NULL, then the value info of the key specified by
-                    hKey will be got.
-    @param  pValueType returns the type of the value.
-    @param  pValueSize returns the size of the value in bytes
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getValueInfo(RegKeyHandle hKey,
-                                               rtl_uString* keyName,
-                                               RegValueType* pValueType,
-                                               sal_uInt32* pValueSize);
-
-
-/** This function gets the value of a key.
-
-    @param  hKey identifies a currently open key. The key which value will be got by this
-                 function is a subkey of the key identified by hKey.
-    @param  keyName points to a null terminated string specifying the name of a key which value
-                    will be got. If keyName is NULL, then the value of the key specified by
-                    hKey will be got.
-    @param  pData points to an allocated memory block receiving the data of the value.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getValue(RegKeyHandle hKey,
-                                           rtl_uString* keyName,
-                                           RegValue pData);
-
-
-/** This function gets the long list value of a key.
-
-    @param[in]  hKey identifies a currently open key. The key which value will be got by this
-                 function is a subkey of the key identified by hKey.
-    @param[in]  keyName points to a null terminated string specifying the name of a key which value
-                    will be got. If keyName is NULL, then the value of the key specified by
-                    hKey will be got.
-    @param[out]  pValueList a Pointer to a long value list which returns the data of the value.
-    @param[out]  pLen returns the length of the value list.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getLongListValue(RegKeyHandle hKey,
-                                                      rtl_uString* keyName,
-                                                      sal_Int32** pValueList,
-                                                      sal_uInt32* pLen);
-
-
-/** This function gets the string list value of a key.
-
-    @param[in]  hKey identifies a currently open key. The key whose value will be retrieved by this
-                 function is a subkey of the key identified by hKey.
-    @param[in]  keyName points to a null terminated string specifying the name of a key whose value
-                    will be retrieved. If keyName is NULL, then the value of the key specified by
-                    hKey will be retrieved.
-    @param[out]  pValueList a Pointer to an ascii value list which returns the data of the value.
-    @param[out]  pLen returns the length of the value list.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getStringListValue(RegKeyHandle hKey,
-                                                       rtl_uString* keyName,
-                                                       sal_Char*** pValueList,
-                                                       sal_uInt32* pLen);
-
-
-/** This function gets the unicode list value of a key.
-
-    @param[in]  hKey identifies a currently open key. The key whose value will be retrieved by this
-                 function is a subkey of the key identified by hKey.
-    @param[in]  keyName points to a null terminated string specifying the name of a key whose value
-                    will be retrieved. If keyName is NULL, then the value of the key specified by
-                    hKey will be retrieved.
-    @param[out]  pValueList a Pointer to an unicode value list which returns the data of the value.
-    @param[out]  pLen returns the length of the value list.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getUnicodeListValue(RegKeyHandle hKey,
-                                                         rtl_uString* keyName,
-                                                         sal_Unicode*** pValueList,
-                                                         sal_uInt32* pLen);
-
-
-/** This function frees the memory of a value list.
-
-    @param  valueType specifies the type of the list values.
-    @param  pValueList a Pointer to the value list.
-    @param  len specifies the length of the value list.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType,
-                                                  RegValue pValueList,
-                                                  sal_uInt32 len);
-
-/** This function resolves a keyname.
-
-    @param[in]  hKey identifies a currently open key. The key specified by keyName is a subkey
-                 of the key identified by hKey.
-    @param[in]  keyName points to a null terminated string specifying the relativ name of a key.
-                    The name of hKey together with keyName will be generated.
-    @param[in] firstLinkOnly ignored
-    @param[out]  pResolvedName returns the resolved keyName.
-    @return REG_NO_ERROR if succeeds else an error code.
- */
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey,
-                                                    rtl_uString* keyName,
-                                                   bool firstLinkOnly,
-                                                      rtl_uString** pResolvedName);
-
-/** This function loads registry information from a file and save it under the
-    specified keyName.
-
-    @param  hKey identifies a currently open key. The key which should store the registry information
-                 is a subkey of this key.
-    @param  keyName points to a null terminated string specifying the name of the key which stores the
-                    registry information. If keyName is NULL the registry information will be saved under
-                    the key specified by hKey.
-    @param  regFileName points to a null terminated string specifying the file which contains the
-                        registry information.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey,
-                                         rtl_uString* keyName,
-                                         rtl_uString* regFileName);
-
-
-/** This function saves the registry information under a specified key and all of its subkeys and save
-    it in a registry file.
-
-    @param  hKey identifies a currently open key. The key which information is saved by this
-                 function is a subkey of the key identified by hKey.
-    @param  keyName points to a null terminated string specifying the name of the subkey.
-                    If keyName is NULL the registry information under the key specified by hKey
-                    will be saved in the specified file.
-    @param  regFileName points to a null terminated string specifying the file which will contain the
-                        registry information.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey,
-                                         rtl_uString* keyName,
-                                         rtl_uString* regFileName);
-
-
-/** This function merges the registry information from a specified source with the information of the
-    currently open registry.
-
-    All existing keys will be extended and existing key values will be overwritten.
-    @param  hKey identifies a currently open key. The key which information is merged by this
-                 function is a subkey of the key identified by hKey.
-    @param  keyName points to a null terminated string specifying the name of the key which will be merged.
-                    If keyName is NULL the registry information under the key specified by hKey
-                    is merged with the complete information from the specified file.
-    @param  regFileName points to a null terminated string specifying the file containing the
-                        registry information.
-    @param  bWarnings if TRUE the function returns an error if a key already exists.
-    @param  bReport if TRUE the function reports warnings on stdout if a key already exists.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey,
-                                           rtl_uString* keyName,
-                                           rtl_uString* regFileName,
-                                           bool bWarnings,
-                                           bool bReport);
-
-
-/** This function creates a new registry with the specified name and creates a root key.
-
-    @param  registryName points to a null terminated string specifying the name of the new registry.
-    @param  phRegistry points to a handle of the new registry if the function succeeds otherwise NULL.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName,
-                                               RegHandle* phRegistry);
-
-
 /** This function opens the root key of a registry.
 
     @param  hRegistry identifies a currently open registry whose rootKey will be returned.
@@ -370,15 +59,6 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry,
                                              RegKeyHandle* phRootKey);
 
 
-/** This function returns the name of a registry.
-
-    @param  hRegistry identifies a currently open registry whose name will be returned.
-    @param  pName returns the name of the registry if the function succeeds otherwise an empty string.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName);
-
-
 /** This function opens a registry with the specified name.
 
     @param  registryName points to a null terminated string specifying the name of the registry.
@@ -399,17 +79,6 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryN
 REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry);
 
 
-/** This function destroys a registry.
-
-    @param  hRegistry identifies a currently open registry.
-    @param  registryName specifies a registry name of a registry which should be destroyed. If the
-                         name is NULL the registry itselfs will be destroyed.
-    @return REG_NO_ERROR if succeeds else an error code.
-*/
-REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry,
-                                               rtl_uString* registryName);
-
-
 /** This function reports the complete registry information of a key and all of its subkeys.
 
     All information which are available (keynames, value types, values, ...)
diff --git a/registry/source/reflcnst.hxx b/registry/source/reflcnst.hxx
index ae1acd21d426..468bd549f533 100644
--- a/registry/source/reflcnst.hxx
+++ b/registry/source/reflcnst.hxx
@@ -178,20 +178,6 @@ inline sal_uInt32 readUINT32(const sal_uInt8* buffer, sal_uInt32& v)
     return sizeof(sal_uInt32);
 }
 
-inline sal_uInt32 writeINT64(sal_uInt8* buffer, sal_Int64 v)
-{
-    buffer[0] = (sal_uInt8)((v >> 56) & 0xFF);
-    buffer[1] = (sal_uInt8)((v >> 48) & 0xFF);
-    buffer[2] = (sal_uInt8)((v >> 40) & 0xFF);
-    buffer[3] = (sal_uInt8)((v >> 32) & 0xFF);
-    buffer[4] = (sal_uInt8)((v >> 24) & 0xFF);
-    buffer[5] = (sal_uInt8)((v >> 16) & 0xFF);
-    buffer[6] = (sal_uInt8)((v >> 8) & 0xFF);
-    buffer[7] = (sal_uInt8)((v >> 0) & 0xFF);
-
-    return sizeof(sal_Int64);
-}
-
 inline sal_uInt32 writeUINT64(sal_uInt8* buffer, sal_uInt64 v)
 {
     buffer[0] = (sal_uInt8)((v >> 56) & 0xFF);
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index 8ef134e5318e..97a577e7234f 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -446,80 +446,6 @@ Registry_Api* REGISTRY_CALLTYPE initRegistry_Api()
 }
 
 
-//  reg_loadRegKey
-
-RegError REGISTRY_CALLTYPE reg_loadKey(RegKeyHandle hKey,
-                                       rtl_uString* keyName,
-                                       rtl_uString* regFileName)
-{
-    ORegKey *pKey;
-
-    if (hKey)
-        pKey = static_cast<ORegKey*>(hKey);
-    else
-        return RegError::INVALID_KEY;
-
-    return loadKey(pKey->getRegistry(), hKey, keyName, regFileName);
-}
-
-
-//  reg_saveKey
-
-RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey,
-                                       rtl_uString* keyName,
-                                       rtl_uString* regFileName)
-{
-    ORegKey *pKey;
-
-    if (hKey)
-        pKey = static_cast<ORegKey*>(hKey);
-    else
-        return RegError::INVALID_KEY;
-
-    return saveKey(pKey->getRegistry(), hKey, keyName, regFileName);
-}
-
-
-//  reg_mergeKey
-
-RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey,
-                                        rtl_uString* keyName,
-                                        rtl_uString* regFileName,
-                                        bool bWarnings,
-                                        bool bReport)
-{
-    ORegKey *pKey;
-
-    if (hKey)
-        pKey = static_cast<ORegKey*>(hKey);
-    else
-        return RegError::INVALID_KEY;
-
-    return mergeKey(pKey->getRegistry(), hKey, keyName, regFileName, bWarnings, bReport);
-}
-
-
-//  reg_createRegistry
-
-RegError REGISTRY_CALLTYPE reg_createRegistry(rtl_uString* registryName,
-                                              RegHandle* phRegistry)
-{
-    RegError ret;
-
-    ORegistry* pReg = new ORegistry();
-    if ((ret = pReg->initRegistry(registryName, RegAccessMode::READWRITE, true/*bCreate*/)) != RegError::NO_ERROR)
-    {
-        delete pReg;
-        *phRegistry = NULL;
-        return ret;
-    }
-
-    *phRegistry = pReg;
-
-    return RegError::NO_ERROR;
-}
-
-
 //  reg_openRootKey
 
 RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry,
@@ -530,15 +456,6 @@ RegError REGISTRY_CALLTYPE reg_openRootKey(RegHandle hRegistry,
 
 
 
-//  reg_getName
-
-RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName)
-{
-    return getName(hRegistry, pName);
-}
-
-
-
 //  reg_openRegistry
 
 RegError REGISTRY_CALLTYPE reg_openRegistry(rtl_uString* registryName,
@@ -578,16 +495,6 @@ RegError REGISTRY_CALLTYPE reg_closeRegistry(RegHandle hRegistry)
 
 
 
-//  reg_destroyRegistry
-
-RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry,
-                                               rtl_uString* registryName)
-{
-    return destroyRegistry(hRegistry, registryName);
-}
-
-
-
 //  reg_dumpRegistry
 
 RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey)
diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx
index 52298383fe03..bf61f64db68d 100644
--- a/registry/source/regkey.cxx
+++ b/registry/source/regkey.cxx
@@ -672,19 +672,6 @@ RegError REGISTRY_CALLTYPE freeKeyNames(rtl_uString** pKeyNames,
 
 
 
-//  reg_createKey
-
-RegError REGISTRY_CALLTYPE reg_createKey(RegKeyHandle hKey,
-                                         rtl_uString* keyName,
-                                         RegKeyHandle* phNewKey)
-{
-    if (!hKey)
-         return RegError::INVALID_KEY;
-
-    return createKey(hKey, keyName, phNewKey);
-}
-
-
 //  reg_openKey
 
 RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey,
@@ -698,44 +685,6 @@ RegError REGISTRY_CALLTYPE reg_openKey(RegKeyHandle hKey,
 }
 
 
-//  reg_openSubKeys
-
-RegError REGISTRY_CALLTYPE reg_openSubKeys(RegKeyHandle hKey,
-                                           rtl_uString* keyName,
-                                           RegKeyHandle** pphSubKeys,
-                                           sal_uInt32* pnSubKeys)
-{
-    if (!hKey)
-        return RegError::INVALID_KEY;
-
-    return openSubKeys(hKey, keyName, pphSubKeys, pnSubKeys);
-}
-
-
-//  reg_closeSubKeys
-
-RegError REGISTRY_CALLTYPE reg_closeSubKeys(RegKeyHandle* pphSubKeys,
-                                            sal_uInt32 nSubKeys)
-{
-    if (!pphSubKeys)
-        return RegError::INVALID_KEY;
-
-    return closeSubKeys(pphSubKeys, nSubKeys);
-}
-
-
-//  reg_deleteKey
-
-RegError REGISTRY_CALLTYPE reg_deleteKey(RegKeyHandle hKey,
-                                         rtl_uString* keyName)
-{
-    if (!hKey)
-        return RegError::INVALID_KEY;
-
-    return deleteKey(hKey, keyName);
-}
-
-
 //  reg_closeKey
 
 RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey)
@@ -748,172 +697,4 @@ RegError REGISTRY_CALLTYPE reg_closeKey(RegKeyHandle hKey)
 
 
 
-//  reg_getKeyName
-
-RegError REGISTRY_CALLTYPE reg_getKeyName(RegKeyHandle hKey, rtl_uString** pKeyName)
-{
-    if (hKey)
-    {
-        rtl_uString_assign( pKeyName, static_cast<ORegKey*>(hKey)->getName().pData );
-        return RegError::NO_ERROR;
-    } else
-    {
-        rtl_uString_new( pKeyName );
-        return RegError::INVALID_KEY;
-    }
-}
-
-
-//  reg_setValue
-
-RegError REGISTRY_CALLTYPE reg_setValue(RegKeyHandle hKey,
-                                        rtl_uString* keyName,
-                                        RegValueType valueType,
-                                        RegValue pData,
-                                        sal_uInt32 valueSize)
-{
-    if (!hKey)
-        return RegError::INVALID_KEY;
-
-    return setValue(hKey, keyName, valueType, pData, valueSize);
-}
-
-
-//  reg_setLongListValue
-
-RegError REGISTRY_CALLTYPE reg_setLongListValue(RegKeyHandle hKey,
-                                                      rtl_uString* keyName,
-                                                      sal_Int32* pValueList,
-                                                      sal_uInt32 len)
-{
-    if (!hKey)
-        return RegError::INVALID_KEY;
-
-    return setLongListValue(hKey, keyName, pValueList, len);
-}
-
-
-//  reg_setStringListValue
-
-RegError REGISTRY_CALLTYPE reg_setStringListValue(RegKeyHandle hKey,
-                                                          rtl_uString* keyName,
-                                                          sal_Char** pValueList,
-                                                          sal_uInt32 len)
-{
-    if (!hKey)
-        return RegError::INVALID_KEY;
-
-    return setStringListValue(hKey, keyName, pValueList, len);
-}
-
-
-//  reg_setUnicodeListValue
-
-RegError REGISTRY_CALLTYPE reg_setUnicodeListValue(RegKeyHandle hKey,
-                                                            rtl_uString* keyName,
-                                                            sal_Unicode** pValueList,
-                                                            sal_uInt32 len)
-{
-    if (!hKey)
-        return RegError::INVALID_KEY;
-
-    return setUnicodeListValue(hKey, keyName, pValueList, len);
-}
-
-
-//  reg_getValueInfo
-
-RegError REGISTRY_CALLTYPE reg_getValueInfo(RegKeyHandle hKey,
-                                            rtl_uString* keyName,
-                                            RegValueType* pValueType,
-                                            sal_uInt32* pValueSize)
-{
-    if (!hKey)
-        return RegError::INVALID_KEY;
-
-    return getValueInfo(hKey, keyName, pValueType, pValueSize);
-}
-
-
-//  reg_getValueInfo
-
-RegError REGISTRY_CALLTYPE reg_getValue(RegKeyHandle hKey,
-                                        rtl_uString* keyName,
-                                        RegValue pData)
-{
-    if (!hKey)
-        return RegError::INVALID_KEY;
-
-    return getValue(hKey, keyName, pData);
-}
-
-
-//  reg_getLongListValue
-
-RegError REGISTRY_CALLTYPE reg_getLongListValue(RegKeyHandle hKey,
-                                                      rtl_uString* keyName,
-                                                      sal_Int32** pValueList,
-                                                      sal_uInt32* pLen)
-{
-    if (!hKey)
-        return RegError::INVALID_KEY;
-
-    return getLongListValue(hKey, keyName, pValueList, pLen);
-}
-
-
-//  reg_getStringListValue
-
-RegError REGISTRY_CALLTYPE reg_getStringListValue(RegKeyHandle hKey,
-                                                       rtl_uString* keyName,
-                                                       sal_Char*** pValueList,
-                                                       sal_uInt32* pLen)
-{
-    if (!hKey)
-        return RegError::INVALID_KEY;
-
-    return getStringListValue(hKey, keyName, pValueList, pLen);
-}
-
-
-//  reg_getUnicodeListValue
-
-RegError REGISTRY_CALLTYPE reg_getUnicodeListValue(RegKeyHandle hKey,
-                                                         rtl_uString* keyName,
-                                                         sal_Unicode*** pValueList,
-                                                         sal_uInt32* pLen)
-{
-    if (!hKey)
-        return RegError::INVALID_KEY;
-
-    return getUnicodeListValue(hKey, keyName, pValueList, pLen);
-}
-
-
-//  reg_freeValueList
-
-RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType,
-                                                  RegValue pValueList,
-                                                  sal_uInt32 len)
-{
-    if (pValueList)
-        return freeValueList(valueType, pValueList, len);
-    else
-        return RegError::INVALID_VALUE;
-}
-
-
-//  reg_getResolvedKeyName
-
-RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey,
-                                                    rtl_uString* keyName,
-                                                    bool firstLinkOnly,
-                                                      rtl_uString** pResolvedName)
-{
-    if (!hKey)
-        return RegError::INVALID_KEY;
-
-    return getResolvedKeyName(hKey, keyName, firstLinkOnly, pResolvedName);
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index 9e1b619d1061..adad74da4c79 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -400,8 +400,6 @@ namespace reportdesign
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler() const SAL_OVERRIDE;
         virtual bool isEnableSetModified() const SAL_OVERRIDE;
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getContext() const;
-
         ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager2 > getUIConfigurationManager2(  ) throw (::com::sun::star::uno::RuntimeException);
       };
 
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index 9e310e6a65ec..e964353bc284 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -89,10 +89,6 @@ public:
         return lhs;
     }
 };
-/** returns the object type depending on the service name
-    @param  _xComponent the report component
-*/
-REPORTDESIGN_DLLPUBLIC sal_uInt16 getObjectType(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
 typedef ::std::pair< OUString, std::shared_ptr<AnyConverter> > TPropertyConverter;
 typedef std::map<OUString, TPropertyConverter> TPropertyNamePair;
 /** returns the property name map for the given property id
@@ -109,12 +105,6 @@ template < typename T> T getStyleProperty(const ::com::sun::star::uno::Reference
     return nReturn;
 }
 
-template<typename T> void setStyleProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,const OUString& _sPropertyName,const T& _aValue)
-{
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xProp(getUsedStyle(_xReport),::com::sun::star::uno::UNO_QUERY);
-    if ( xProp.is() )
-        xProp->setPropertyValue(_sPropertyName,::com::sun::star::uno::makeAny(_aValue));
-}
 }
 
 #endif // INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index c7c9ffb0b591..238727edd64f 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -2672,11 +2672,6 @@ uno::Reference< document::XDocumentProperties > SAL_CALL OReportDefinition::getD
     return m_pImpl->m_xDocumentProperties;
 }
 
-uno::Reference< uno::XComponentContext > OReportDefinition::getContext() const
-{
-    return m_aProps->m_xContext;
-}
-
 uno::Any SAL_CALL OReportDefinition::getTransferData( const datatransfer::DataFlavor& aFlavor ) throw (datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception)
 {
     uno::Any aResult;
diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx
index 63b923340d30..d80581efaacf 100644
--- a/reportdesign/source/core/inc/Tools.hxx
+++ b/reportdesign/source/core/inc/Tools.hxx
@@ -43,12 +43,6 @@ namespace reportdesign
             ::comphelper::disposeComponent(_xSection);
     }
 
-    /** gets the properties which should be removed form the property set implementation.
-     *
-     * \return A sequence of all properties which should be removed for none char able implementations.
-     */
-    ::com::sun::star::uno::Sequence< OUString > lcl_getCharOptionals();
-
     /** uses the XChild interface to get the section from any child of it.
      *
      * \param _xReportComponent A report component which is a child of the section.
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index c0fee43b6ac0..41bdb042a8fa 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -116,8 +116,6 @@ namespace rptui
         */
         void    setMarked(bool _bMark);
 
-        OViewsWindow* getViewsWindow() const { return m_pParent; }
-
         /** zoom the ruler and view windows
         */
         void zoom(const Fraction& _aZoom);
diff --git a/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index 91a46dce284e..ca5d3fe3aefd 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.hxx
@@ -41,8 +41,6 @@ enum RSCBYTEORDER_TYPE { RSC_BIGENDIAN, RSC_LITTLEENDIAN, RSC_SYSTEMENDIAN };
 // Function Forwards
 OString GetTmpFileName();
 
-bool Append(FILE * fDest, OString &raSourceFile);
-
 OString OutputFile(const OString &rInput, const char * ext);
 
 char * ResponseFile( RscPtrPtr * ppCmd, char ** ppArgv,
diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h
index 927f1ba061b8..ca2464c73e76 100644
--- a/rsc/source/rscpp/cpp.h
+++ b/rsc/source/rscpp/cpp.h
@@ -286,19 +286,15 @@ int hasdirectory( char*, char*, int );
 int openfile( char* );
 
 /* cpp3.c */
-int openfiles( char* filename );
 void addfile( FILE* fp, char* filename );
 void setincdirs( void );
 int AddInclude( char* pIncStr );
-int getredirection( int argc, char** argv );
-void zap_uc( char* ap );
 
 void initdefines( void );
 int dooptions( int argc, char* argv[] );
 int readoptions( char* filename, char*** pfargv );
 
 /* cpp4.c */
-void dodefines( void );
 void checkparm( int c, DEFBUF* dp );
 int expcollect( void );
 void expstuff( DEFBUF* dp );
@@ -337,8 +333,6 @@ FILEINFO* getfile( size_t bufsize, char* name );
 char *getmem( size_t size );
 DEFBUF* lookid( int c );
 DEFBUF* defendel( char* name, int delete );
-void dunpdef( char* why );
-void dumpadef( char* why, DEFBUF* dp );
 int get( void );
 int cget( void );
 void unget( void );
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 9c062b82b531..460ca2cc552e 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -131,11 +131,6 @@ SAL_WARN_UNUSED_RESULT inline SCTAB SanitizeTab( SCTAB nTab )
     return nTab < 0 ? 0 : (nTab > MAXTAB ? MAXTAB : nTab);
 }
 
-SAL_WARN_UNUSED_RESULT inline SCTAB SanitizeTab( SCTAB nTab, SCTAB nMaxTab )
-{
-    return nTab < 0 ? 0 : (nTab > nMaxTab ? nMaxTab : nTab);
-}
-
 //  ScAddress
 // The old cell address is combined in one UINT32:
 // +---+---+-------+
diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx
index bcf784a85964..14b2aa92535c 100644
--- a/sc/inc/bigrange.hxx
+++ b/sc/inc/bigrange.hxx
@@ -192,9 +192,6 @@ public:
                         { return (aStart == r.aStart) && (aEnd == r.aEnd); }
     bool            operator!=( const ScBigRange& r ) const
                         { return !operator==( r ); }
-
-    friend inline SvStream& WriteScBigRange( SvStream& rStream, const ScBigRange& rRange );
-    friend inline SvStream& ReadScBigRange( SvStream& rStream, ScBigRange& rRange );
 };
 
 inline bool ScBigRange::In( const ScBigAddress& rAddr ) const
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index 1d28a60f93a7..29337eafc764 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -67,8 +67,6 @@ struct SC_DLLPUBLIC ScCalcConfig
     bool operator!= (const ScCalcConfig& r) const;
 };
 
-SC_DLLPUBLIC std::ostream& operator<<(std::ostream& rStream, const ScCalcConfig& rConfig);
-
 SC_DLLPUBLIC OUString ScOpCodeSetToSymbolicString(const ScCalcConfig::OpCodeSet& rOpCodes);
 SC_DLLPUBLIC ScCalcConfig::OpCodeSet ScStringToOpCodeSet(const OUString& rOpCodes);
 
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index c876aeebfaf2..88bdb277a4f8 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -449,11 +449,6 @@ class ScChangeActionDelMoveEntry : public ScChangeActionLinkEntry
         ScChangeActionMove* pMove,
         short nFrom, short nTo );
 
-    ScChangeActionDelMoveEntry* GetNext()
-                            {
-                                return static_cast<ScChangeActionDelMoveEntry*>(
-                                    ScChangeActionLinkEntry::GetNext());
-                            }
     inline ScChangeActionMove* GetMove();
 
 public:
@@ -483,8 +478,6 @@ class ScChangeActionDel : public ScChangeAction
     ScChangeActionDel( const ScRange& rRange, SCsCOL nDx, SCsROW nDy, ScChangeTrack* );
     virtual ~ScChangeActionDel();
 
-    ScChangeActionIns*  GetCutOffInsert() { return pCutOff; }
-
     virtual void                AddContent( ScChangeActionContent* ) SAL_OVERRIDE;
     virtual void                DeleteCellEntries() SAL_OVERRIDE;
 
diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx
index f2c4c20ed835..7ea3212cd734 100644
--- a/sc/inc/convuno.hxx
+++ b/sc/inc/convuno.hxx
@@ -137,13 +137,6 @@ inline bool operator==(
         (rApiAddress1.Sheet == rApiAddress2.Sheet);
 }
 
-inline bool operator!=(
-        const ::com::sun::star::table::CellAddress& rApiAddress1,
-        const ::com::sun::star::table::CellAddress& rApiAddress2 )
-{
-    return !(rApiAddress1 == rApiAddress2);
-}
-
 inline bool operator==(
         const ::com::sun::star::table::CellRangeAddress& rApiRange1,
         const ::com::sun::star::table::CellRangeAddress& rApiRange2 )
diff --git a/sc/inc/mtvcellfunc.hxx b/sc/inc/mtvcellfunc.hxx
index 54ffc9b03067..d0fd9a1cd734 100644
--- a/sc/inc/mtvcellfunc.hxx
+++ b/sc/inc/mtvcellfunc.hxx
@@ -42,24 +42,6 @@ ProcessFormula(
 }
 
 template<typename _Func>
-typename CellStoreType::iterator
-ProcessFormulaNumeric(
-    const CellStoreType::iterator& itPos, CellStoreType& rStore, SCROW nRow1, SCROW nRow2, _Func& rFunc)
-{
-    FuncElseNoOp<size_t> aElse;
-    return ProcessElements2<
-        CellStoreType, numeric_block, formula_block, _Func, FuncElseNoOp<size_t> >(
-            itPos, rStore, nRow1, nRow2, rFunc, aElse);
-}
-
-template<typename _Func>
-void ProcessEditText(CellStoreType& rStore, _Func& rFunc)
-{
-    FuncElseNoOp<size_t> aElse;
-    ProcessElements1<CellStoreType, edittext_block, _Func, FuncElseNoOp<size_t> >(rStore, rFunc, aElse);
-}
-
-template<typename _Func>
 CellStoreType::iterator
 ProcessEditText(const CellStoreType::iterator& itPos, CellStoreType& rStore, SCROW nRow1, SCROW nRow2, _Func& rFunc)
 {
@@ -112,18 +94,6 @@ ParseAllNonEmpty(
             itPos, rCells, nRow1, nRow2, rFunc, aElse);
 }
 
-template<typename _FuncElem, typename _FuncElse>
-typename CellStoreType::const_iterator
-ParseAllNonEmpty(
-    const typename CellStoreType::const_iterator& itPos, const CellStoreType& rCells,
-    SCROW nRow1, SCROW nRow2, _FuncElem& rFuncElem, _FuncElse& rFuncElse)
-{
-    return ParseElements4<CellStoreType,
-        numeric_block, string_block, edittext_block, formula_block,
-        _FuncElem, _FuncElse>(
-            itPos, rCells, nRow1, nRow2, rFuncElem, rFuncElse);
-}
-
 template<typename _Func>
 typename CellStoreType::const_iterator
 ParseFormulaNumeric(
diff --git a/sc/inc/mtvfunctions.hxx b/sc/inc/mtvfunctions.hxx
index 2f701de0efa4..028e73c96aae 100644
--- a/sc/inc/mtvfunctions.hxx
+++ b/sc/inc/mtvfunctions.hxx
@@ -374,155 +374,6 @@ void ProcessElements2(_StoreT& rStore, _FuncElem& rFuncElem, _FuncElse& rFuncEls
     }
 }
 
-template<typename _StoreT, typename _Blk1, typename _Blk2, typename _FuncElem, typename _FuncElse>
-typename _StoreT::iterator
-ProcessElements2(
-    const typename _StoreT::iterator& itPos, _StoreT& rStore,
-    typename _StoreT::size_type nStart, typename _StoreT::size_type nEnd,
-    _FuncElem& rFuncElem, _FuncElse& rFuncElse)
-{
-    typedef std::pair<typename _StoreT::iterator, typename _StoreT::size_type> PositionType;
-
-    PositionType aPos = rStore.position(itPos, nStart);
-    typename _StoreT::iterator it = aPos.first;
-    typename _StoreT::size_type nOffset = aPos.second;
-    typename _StoreT::size_type nDataSize = 0;
-    typename _StoreT::size_type nTopRow = nStart;
-
-    for (; it != rStore.end() && nTopRow <= nEnd; ++it, nOffset = 0, nTopRow += nDataSize)
-    {
-        bool bLastBlock = false;
-        nDataSize = it->size - nOffset;
-        if (nTopRow + nDataSize - 1 > nEnd)
-        {
-            // Truncate the block.
-            nDataSize = nEnd - nTopRow + 1;
-            bLastBlock = true;
-        }
-
-        switch (it->type)
-        {
-            case _Blk1::block_type:
-                EachElem<_Blk1, typename _Blk1::iterator>(*it, nOffset, nDataSize, rFuncElem);
-            break;
-            case _Blk2::block_type:
-                EachElem<_Blk2, typename _Blk2::iterator>(*it, nOffset, nDataSize, rFuncElem);
-            break;
-            default:
-                rFuncElse(it->type, nTopRow, nDataSize);
-        }
-
-        if (bLastBlock)
-            break;
-    }
-
-    return it;
-}
-
-template<typename _StoreT, typename _Blk1, typename _Blk2, typename _Blk3, typename _FuncElem, typename _FuncElse>
-void ProcessElements3(_StoreT& rStore, _FuncElem& rFuncElem, _FuncElse& rFuncElse)
-{
-    typename _StoreT::size_type nTopRow = 0, nDataSize = 0;
-    typename _StoreT::iterator it = rStore.begin(), itEnd = rStore.end();
-    for (; it != itEnd; ++it, nTopRow += nDataSize)
-    {
-        nDataSize = it->size;
-        switch (it->type)
-        {
-            case _Blk1::block_type:
-                EachElem<_Blk1, typename _Blk1::iterator>(*it, rFuncElem);
-            break;
-            case _Blk2::block_type:
-                EachElem<_Blk2, typename _Blk2::iterator>(*it, rFuncElem);
-            break;
-            case _Blk3::block_type:
-                EachElem<_Blk3, typename _Blk3::iterator>(*it, rFuncElem);
-            break;
-            default:
-                rFuncElse(it->type, nTopRow, nDataSize);
-        }
-    }
-}
-
-template<typename _StoreT, typename _Blk1, typename _Blk2, typename _Blk3, typename _Blk4, typename _FuncElem, typename _FuncElse>
-void ProcessElements4(_StoreT& rStore, _FuncElem& rFuncElem, _FuncElse& rFuncElse)
-{
-    typename _StoreT::size_type nTopRow = 0, nDataSize = 0;
-    typename _StoreT::iterator it = rStore.begin(), itEnd = rStore.end();
-    for (; it != itEnd; ++it, nTopRow += nDataSize)
-    {
-        nDataSize = it->size;
-        switch (it->type)
-        {
-            case _Blk1::block_type:
-                EachElem<_Blk1, typename _Blk1::iterator>(*it, rFuncElem);
-            break;
-            case _Blk2::block_type:
-                EachElem<_Blk2, typename _Blk2::iterator>(*it, rFuncElem);
-            break;
-            case _Blk3::block_type:
-                EachElem<_Blk3, typename _Blk3::iterator>(*it, rFuncElem);
-            break;
-            case _Blk4::block_type:
-                EachElem<_Blk4, typename _Blk4::iterator>(*it, rFuncElem);
-            break;
-            default:
-                rFuncElse(it->type, nTopRow, nDataSize);
-        }
-    }
-}
-
-template<typename _StoreT, typename _Blk1, typename _Blk2, typename _Blk3, typename _Blk4, typename _FuncElem, typename _FuncElse>
-typename _StoreT::iterator
-ProcessElements4(
-    const typename _StoreT::iterator& itPos, _StoreT& rStore,
-    typename _StoreT::size_type nStart, typename _StoreT::size_type nEnd,
-    _FuncElem& rFuncElem, _FuncElse& rFuncElse)
-{
-    typedef std::pair<typename _StoreT::iterator, typename _StoreT::size_type> PositionType;
-
-    PositionType aPos = rStore.position(itPos, nStart);
-    typename _StoreT::iterator it = aPos.first;
-    typename _StoreT::size_type nOffset = aPos.second;
-    typename _StoreT::size_type nDataSize = 0;
-    typename _StoreT::size_type nTopRow = nStart;
-
-    for (; it != rStore.end() && nTopRow <= nEnd; ++it, nOffset = 0, nTopRow += nDataSize)
-    {
-        bool bLastBlock = false;
-        nDataSize = it->size - nOffset;
-        if (nTopRow + nDataSize - 1 > nEnd)
-        {
-            // Truncate the block.
-            nDataSize = nEnd - nTopRow + 1;
-            bLastBlock = true;
-        }
-
-        switch (it->type)
-        {
-            case _Blk1::block_type:
-                EachElem<_Blk1, typename _Blk1::iterator>(*it, nOffset, nDataSize, rFuncElem);
-            break;
-            case _Blk2::block_type:
-                EachElem<_Blk2, typename _Blk2::iterator>(*it, nOffset, nDataSize, rFuncElem);
-            break;
-            case _Blk3::block_type:
-                EachElem<_Blk3, typename _Blk3::iterator>(*it, nOffset, nDataSize, rFuncElem);
-            break;
-            case _Blk4::block_type:
-                EachElem<_Blk4, typename _Blk4::iterator>(*it, nOffset, nDataSize, rFuncElem);
-            break;
-            default:
-                rFuncElse(it->type, nTopRow, nDataSize);
-        }
-
-        if (bLastBlock)
-            break;
-    }
-
-    return it;
-}
-
 template<typename _StoreT, typename _Blk1, typename _FuncElem, typename _FuncElse>
 std::pair<typename _StoreT::const_iterator, typename _StoreT::size_type>
 FindElement1(
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 6a9e81c24c94..062e618a5ce2 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -48,7 +48,6 @@ public:
                             sal_Unicode cDelimiter = 0 ) const;
 
     void            Join( const ScRange&, bool bIsInList = false );
-    void            Join( const ScRangeList& );
 
     bool            UpdateReference( UpdateRefMode, ScDocument*,
                                      const ScRange& rWhere,
diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx
index a2a6ed82cf6c..1f040054fede 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -117,38 +117,6 @@ bool ScCalcConfig::operator!= (const ScCalcConfig& r) const
     return !operator==(r);
 }
 
-namespace {
-
-OUString StringConversionToString(ScCalcConfig::StringConversion eConv)
-{
-    switch (eConv)
-    {
-    case ScCalcConfig::StringConversion::ILLEGAL: return OUString("ILLEGAL");
-    case ScCalcConfig::StringConversion::ZERO: return OUString("ZERO");
-    case ScCalcConfig::StringConversion::UNAMBIGUOUS: return OUString("UNAMBIGUOUS");
-    case ScCalcConfig::StringConversion::LOCALE: return OUString("LOCALE");
-    default: return OUString::number((int) eConv);
-    }
-}
-
-} // anonymous namespace
-
-std::ostream& operator<<(std::ostream& rStream, const ScCalcConfig& rConfig)
-{
-    rStream << "{"
-        "StringRefAddressSyntax=" << rConfig.meStringRefAddressSyntax << ","
-        "StringConversion=" << StringConversionToString(rConfig.meStringConversion) << ","
-        "EmptyStringAsZero=" << (rConfig.mbEmptyStringAsZero?"Y":"N") << ","
-        "HasStringRefSyntax=" << (rConfig.mbHasStringRefSyntax?"Y":"N") << ","
-        "OpenCLSubsetOnly=" << (rConfig.mbOpenCLSubsetOnly?"Y":"N") << ","
-        "OpenCLAutoSelect=" << (rConfig.mbOpenCLAutoSelect?"Y":"N") << ","
-        "OpenCLDevice='" << rConfig.maOpenCLDevice << "',"
-        "OpenCLMinimumFormulaGroupSize=" << rConfig.mnOpenCLMinimumFormulaGroupSize << ","
-        "OpenCLSubsetOpCodes={" << ScOpCodeSetToSymbolicString(rConfig.mpOpenCLSubsetOpCodes) << "},"
-        "}";
-    return rStream;
-}
-
 OUString ScOpCodeSetToSymbolicString(const ScCalcConfig::OpCodeSet& rOpCodes)
 {
     OUStringBuffer result;
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 5a0882ebeab6..8942f8779b85 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -344,15 +344,6 @@ void ScRangeList::Join( const ScRange& r, bool bIsInList )
         Append( r );
 }
 
-void ScRangeList::Join( const ScRangeList& r )
-{
-    if (this == &r)
-        return;
-
-    for (auto const& it : r.maRanges)
-        Join( *it );
-}
-
 bool ScRangeList::operator==( const ScRangeList& r ) const
 {
     if ( this == &r )
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index b4b9060e55d8..9edac3db9cf5 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -209,7 +209,7 @@ endif
 
 gb_GenCObject_get_source = $(WORKDIR)/$(1).c
 
-$(call gb_GenCObject_get_target,%) :
+$(call gb_GenCObject_get_target,%) : $(gb_FORCE_COMPILE_ALL_TARGET)
 	$(call gb_Output_announce,$*.c,$(true),C  ,3)
 	test -f $(call gb_GenCObject_get_source,$*) || (echo "Missing generated source file $(call gb_GenCObject_get_source,$*)" && false)
 	$(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$(call gb_GenCObject_get_source,$*),$(call gb_GenCObject_get_dep_target,$*),$(COMPILER_PLUGINS))
@@ -231,7 +231,7 @@ endif
 
 gb_GenCxxObject_get_source = $(WORKDIR)/$(1).$(gb_LinkTarget_CXX_SUFFIX_$(call gb_LinkTarget__get_workdir_linktargetname,$(2)))
 
-$(call gb_GenCxxObject_get_target,%) :
+$(call gb_GenCxxObject_get_target,%) : $(gb_FORCE_COMPILE_ALL_TARGET)
 	$(call gb_Output_announce,$(subst $(BUILDDIR)/,,$(GEN_CXX_SOURCE)),$(true),CXX,3)
 	test -f $(GEN_CXX_SOURCE) || (echo "Missing generated source file $(GEN_CXX_SOURCE)" && false)
 	$(eval $(gb_CxxObject__set_pchflags))