[Libreoffice-commits] .: 2 commits - sfx2/source tools/bootstrp unusedcode.easy

[Caolán McNamara]

 sfx2/source/doc/doctempl.cxx |   50 -------------------------------------------
 tools/bootstrp/cppdep.cxx    |   10 --------
 tools/bootstrp/cppdep.hxx    |    1 
 unusedcode.easy              |    4 +--
 4 files changed, 3 insertions(+), 62 deletions(-)

New commits:
commit 3aeeb8fb5d5342b73f1b2f8dde9f270b46bd94c2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 17 15:31:50 2011 +0100

    remove freshly unused code

diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index a1fb5fc..378d489 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -200,7 +200,6 @@ public:
 
     DocTempl_EntryData_Impl*     GetEntry( size_t nIndex ) const;
     DocTempl_EntryData_Impl*     GetEntry( const OUString& rName ) const;
-    DocTempl_EntryData_Impl*     GetByTargetURL( const OUString& rName ) const;
 
     const OUString&     GetTitle() const { return maTitle; }
     const OUString&     GetTargetURL();
@@ -265,7 +264,6 @@ public:
                             { return maRegions.size(); }
     RegionData_Impl*    GetRegion( const OUString& rName ) const;
     RegionData_Impl*    GetRegion( size_t nIndex ) const;
-    size_t              GetRegionPos( const OUString& rTitle, sal_Bool& rFound ) const;
 
     sal_Bool            GetTitleFromURL( const OUString& rURL, OUString& aTitle );
     sal_Bool            InsertRegion( RegionData_Impl *pData, size_t nPos = size_t(-1) );
@@ -1881,18 +1879,6 @@ DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( const OUString& rName ) cons
 }
 
 // -----------------------------------------------------------------------
-DocTempl_EntryData_Impl* RegionData_Impl::GetByTargetURL( const OUString& rName ) const
-{
-    for ( size_t i = 0, n = maEntries.size(); i < n; ++i )
-    {
-        DocTempl_EntryData_Impl *pEntry = maEntries[ i ];
-        if ( pEntry->GetTargetURL() == rName )
-            return pEntry;
-    }
-    return NULL;
-}
-
-// -----------------------------------------------------------------------
 DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( size_t nIndex ) const
 {
     if ( nIndex < maEntries.size() )
@@ -2140,42 +2126,6 @@ void SfxDocTemplate_Impl::ReInitFromComponent()
 }
 
 // -----------------------------------------------------------------------
-size_t SfxDocTemplate_Impl::GetRegionPos( const OUString& rTitle, sal_Bool& rFound ) const
-{
-    int     nCompVal = 1;
-    size_t  nStart = 0;
-    size_t  nEnd = maRegions.size() - 1;
-    size_t  nMid = 0;
-
-    RegionData_Impl* pMid;
-
-    while ( nCompVal && ( nStart <= nEnd ) )
-    {
-        nMid = ( nEnd - nStart ) / 2 + nStart;
-        pMid = maRegions[ nMid ];
-
-        nCompVal = pMid->Compare( rTitle );
-
-        if ( nCompVal < 0 )     // pMid < pData
-            nStart = nMid + 1;
-        else
-            nEnd = nMid - 1;
-    }
-
-    if ( nCompVal == 0 )
-        rFound = sal_True;
-    else
-    {
-        if ( nCompVal < 0 )     // pMid < pData
-            nMid++;
-
-        rFound = sal_False;
-    }
-
-    return nMid;
-}
-
-// -----------------------------------------------------------------------
 sal_Bool SfxDocTemplate_Impl::InsertRegion( RegionData_Impl *pNew, size_t nPos )
 {
     ::osl::MutexGuard   aGuard( maMutex );
diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx
index e291777..a5a64fd 100644
--- a/tools/bootstrp/cppdep.cxx
+++ b/tools/bootstrp/cppdep.cxx
@@ -39,14 +39,6 @@
 #include <comphelper/string.hxx>
 #include "cppdep.hxx"
 
-CppDep::CppDep( ByteString aFileName )
-{
-    aSourceFile = aFileName;
-
-    pSearchPath = new ByteStringList;
-    pFileList = new ByteStringList;
-}
-
 CppDep::CppDep()
 {
     pSources = new ByteStringList;
@@ -245,7 +237,7 @@ rtl::OString CppDep::IsIncludeStatement(rtl::OString aLine)
 
 int main( int argc, char **argv )
 {
-    CppDep *pDep = new CppDep( "cppdep.cxx" );
+    CppDep *pDep = new CppDep();
     pDep->AddSearchPath(".");
     pDep->AddSearchPath("/usr/include");
     pDep->AddSearchPath("/usr/local/include");
diff --git a/tools/bootstrp/cppdep.hxx b/tools/bootstrp/cppdep.hxx
index 2d80074..ca41dea 100644
--- a/tools/bootstrp/cppdep.hxx
+++ b/tools/bootstrp/cppdep.hxx
@@ -47,7 +47,6 @@ protected:
 
     rtl::OString IsIncludeStatement(rtl::OString aLine);
 public:
-                    CppDep( ByteString aFileName );
                     CppDep();
                     virtual ~CppDep();
     virtual void    Execute();
commit f0bb814a7c2a513602dbf399889d622e569b98a2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 17 15:31:19 2011 +0100

    regenerate list

diff --git a/unusedcode.easy b/unusedcode.easy
index 091f61a..125d038 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1918,8 +1918,8 @@ XclRoot::GetPixelXFromHmm(int) const
 XclRoot::GetPixelYFromHmm(int) const
 XclTokenArray::XclTokenArray(std::vector<unsigned char, std::allocator<unsigned char> >&, bool)
 XclTokenArrayIterator::Init()
-XclTools::GetBuiltInStyleName(String const&)
-XclTools::GetSbMacroUrl(String const&, String const&, SfxObjectShell*)
+XclTools::GetBuiltInStyleName(rtl::OUString const&)
+XclTools::GetSbMacroUrl(rtl::OUString const&, rtl::OUString const&, SfxObjectShell*)
 XmlSec::GetDateTimeString(rtl::OUString const&, rtl::OUString const&)
 XmlSecStatusBarControl::GetDefItemWidth(StatusBar&)
 ZipPackageStream::SetBaseEncryptionData(rtl::Reference<BaseEncryptionData> const&)