rework callcatcher makefile to build subsequentcheck tests

Change-Id: Idda0262e62e42817b8c0502a38ee16913495233c

7 files changed, 13 insertions, 43 deletions

diff --git a/Makefile b/Makefile
index e3463fdc08e7..3220d9f10e35 100644
--- a/Makefile
+++ b/Makefile
@@ -477,11 +477,11 @@ docs:
 findunusedcode:
 	@which callcatcher > /dev/null 2>&1 || \
 	    (echo "callcatcher not installed" && false)
-	@sed -e s,$$INPATH,callcatcher,g $(SRCDIR)/config_host.mk > $(SRCDIR)/config_host_callcatcher.mk
+	@sed -e s,$$INPATH,callcatcher,g $(SRCDIR)/config_host.mk | sed -e s,"export OOO_JUNIT_JAR=.*","export OOO_JUNIT_JAR=",g > $(SRCDIR)/config_host_callcatcher.mk
 	@mkdir -p $(SRCDIR)/solenv/callcatcher/bin && \
 	    ln -sf $(SRCDIR)/solenv/$(INPATH)/bin/dmake \
 		$(SRCDIR)/solenv/callcatcher/bin/dmake
-	@$(GNUMAKE) -f $(SOLARENV)/bin/callcatcher.Makefile
+	@$(GNUMAKE) -f $(SOLARENV)/bin/callcatcher.Makefile findunusedcode
 	@grep ::.*\( unusedcode.all \
               | grep -v ^Atom \
               | grep -v ^boost:: \
diff --git a/canvas/inc/canvas/propertysethelper.hxx b/canvas/inc/canvas/propertysethelper.hxx
index 182a3930f1f2..0630ca7ac662 100644
--- a/canvas/inc/canvas/propertysethelper.hxx
+++ b/canvas/inc/canvas/propertysethelper.hxx
@@ -106,10 +106,6 @@ namespace canvas
          */
         PropertySetHelper();
 
-        /** Create helper with given name/value map
-         */
-        explicit PropertySetHelper( const InputMap& rMap );
-
         /** Init helper with new name/value map
 
             @param rMap
diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx
index 96438c89fade..1c4faa68f781 100644
--- a/canvas/source/tools/propertysethelper.cxx
+++ b/canvas/source/tools/propertysethelper.cxx
@@ -71,13 +71,6 @@ namespace canvas
     {
     }
 
-    PropertySetHelper::PropertySetHelper( const InputMap& rMap ) :
-        mpMap(),
-        maMapEntries()
-    {
-        initProperties(rMap);
-    }
-
     void PropertySetHelper::initProperties( const InputMap& rMap )
     {
         mpMap.reset();
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index c8fe1649b8cd..7a7c2b912799 100644
--- a/solenv/bin/callcatcher.Makefile
+++ b/solenv/bin/callcatcher.Makefile
@@ -20,12 +20,16 @@ export LIBMGR:=callarchive $(LIBMGR)
 endif
 export dbglevel:=2
 
+include $(SOLARENV)/gbuild/gbuild.mk
 
-all:
+findunusedcode:
 	cd instsetoo_native && \
-	$(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
-	@callanalyse $(WORKDIR)/LinkTarget/*/* \
-	*/$(OUTPATH)/bin/* \
-	*/$(OUTPATH)/lib/* > unusedcode.all
+        $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
+	ooinstall -l $(DEVINSTALLDIR)/opt
+	$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post subsequentcheck
+	callanalyse \
+        $(WORKDIR)/LinkTarget/*/* \
+	    */$(OUTPATH)/bin/* \
+	    */$(OUTPATH)/lib/* > unusedcode.all
 
 # vim: set noet sw=4 ts=4:
diff --git a/test/inc/test/xmldiff.hxx b/test/inc/test/xmldiff.hxx
index 8a3d93d83061..0d768ae08fdb 100644
--- a/test/inc/test/xmldiff.hxx
+++ b/test/inc/test/xmldiff.hxx
@@ -80,8 +80,6 @@ struct tolerance
 class OOO_DLLPUBLIC_TEST XMLDiff
 {
 public:
-    XMLDiff(const std::string& file1, const std::string& file2, const std::string& toleranceFile);
-    XMLDiff(const std::string& file1, const std::string& file2);
     XMLDiff(const char* pFileName, const char* pContent, int size, const char* pToleranceFileName);
     ~XMLDiff();
 
diff --git a/test/source/diff/diff.cxx b/test/source/diff/diff.cxx
index 574805dc9c68..00e144436e61 100644
--- a/test/source/diff/diff.cxx
+++ b/test/source/diff/diff.cxx
@@ -39,23 +39,6 @@
 #include <cppunit/extensions/HelperMacros.h>
 #endif
 
-XMLDiff::XMLDiff(const std::string& file1, const std::string& file2, const std::string& toleranceFile)
-{
-    xmlFile1 = xmlParseFile(file1.c_str());
-    xmlFile2 = xmlParseFile(file2.c_str());
-
-    xmlDocPtr xmlToleranceFile = xmlParseFile(toleranceFile.c_str());
-
-    loadToleranceFile(xmlToleranceFile);
-    xmlFreeDoc(xmlToleranceFile);
-}
-
-XMLDiff::XMLDiff(const std::string& file1, const std::string& file2)
-{
-    xmlFile1 = xmlParseFile(file1.c_str());
-    xmlFile2 = xmlParseFile(file2.c_str());
-}
-
 XMLDiff::XMLDiff( const char* pFileName, const char* pContent, int size, const char* pToleranceFile)
 {
     xmlFile1 = xmlParseFile(pFileName);
diff --git a/unusedcode.easy b/unusedcode.easy
index 519093fdedef..56b1d1ebe80f 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -17,8 +17,6 @@ MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
 MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
 MSDffImportRecords::Remove(SvxMSDffImportRec* const&, unsigned short)
 MSDffImportRecords::Remove(unsigned short, unsigned short)
-Matrix3d::Inverse() const
-Matrix3d::Matrix3d()
 PopupMenu::SetSelectedEntry(unsigned short)
 PropBrwMgr::GetChildWindowId()
 SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
@@ -647,9 +645,10 @@ binfilter::_ZSortFlys::Remove(binfilter::_ZSortFly const&, unsigned short)
 binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const&, unsigned short)
 binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const*, unsigned short, unsigned short)
 binfilter::_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::_ZSortFly const&, void*), void*)
+cairocanvas::CanvasHelper::flush() const
+cairocanvas::CanvasHelper::getPalette()
 cairocanvas::SpriteDeviceHelper::getSurface()
 cairocanvas::TextLayout::draw(_cairo*)
-canvas::PropertySetHelper::PropertySetHelper(std::__debug::vector<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry, std::allocator<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry> > const&)
 canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
 canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&, basegfx::B2IRange const&, basegfx::B2IRange const&)
 cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&)
@@ -686,9 +685,6 @@ formula::FormulaListBox::FormulaListBox(Window*, long)
 formula::FormulaTokenIterator::First()
 jfw_plugin::VendorBase::createInstance()
 jfw_plugin::VendorBase::getJavaExePaths(int*)
-nullcanvas::CanvasFont::getFontMatrix() const
-nullcanvas::CanvasHelper::flush() const
-nullcanvas::CanvasHelper::getPalette()
 nullcanvas::SpriteCanvasHelper::backgroundPaint(basegfx::B2DRange const&)
 nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
 nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)