[Libreoffice-commits] .: 3 commits - sax/inc sax/source unusedcode.easy vcl/generic

[Caolán McNamara]

 sax/inc/sax/fshelper.hxx              |    5 ---
 sax/source/tools/fshelper.cxx         |   48 ----------------------------------
 unusedcode.easy                       |    4 --
 vcl/generic/fontmanager/fontsubst.cxx |    2 -
 4 files changed, 1 insertion(+), 58 deletions(-)

New commits:
commit d3253a0efdf0405790aaaa062f91b6dc164b1f2d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 16 20:58:00 2012 +0000

    remove unimplemented methods from headers

diff --git a/sax/inc/sax/fshelper.hxx b/sax/inc/sax/fshelper.hxx
index 89cf818..73d04eb 100644
--- a/sax/inc/sax/fshelper.hxx
+++ b/sax/inc/sax/fshelper.hxx
@@ -56,10 +56,6 @@ public:
 
     ~FastSerializerHelper();
 
-    void startElement(const char* elementName, ...);
-    void singleElement(const char* elementName, ...);
-    void endElement(const char* elementName);
-
     void startElementV(sal_Int32 elementTokenId, va_list args);
     void singleElementV(sal_Int32 elementTokenId, va_list args);
 
@@ -75,7 +71,6 @@ public:
     inline void endElementNS(sal_Int32 namespaceTokenId, sal_Int32 elementTokenId)
         { endElement( FSNS( namespaceTokenId, elementTokenId ) ); }
 
-    void singleElement(const char* elementName, XFastAttributeListRef xAttrList);
     inline void singleElement(sal_Int32 elementTokenId, XFastAttributeListRef xAttrList)
         { singleElementV(elementTokenId, xAttrList); }
     void singleElementV(sal_Int32 elementTokenId, XFastAttributeListRef xAttrList);
commit 0d7e73ac445d2e3fc8ed5ff2d6cf289d2b367a56
Author: Alexander Bergmann <myaddons at gmx.de>
Date:   Mon Jan 16 12:26:11 2012 +0100

    Removing unused code

diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index 89c2b1a..6cdd39d 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -29,49 +29,6 @@ FastSerializerHelper::~FastSerializerHelper()
     delete mpSerializer;
 }
 
-void FastSerializerHelper::startElement(const char* elementName, ...)
-{
-    FastAttributeList* pAttrList = new FastAttributeList( mxTokenHandler );
-    va_list args;
-    va_start(args, elementName);
-    while (true)
-    {
-        const char* pName = va_arg(args, const char*);
-        if (!pName)
-            break;
-        const char* pValue = va_arg(args, const char*);
-        if (pValue)
-            pAttrList->addUnknown(pName, pValue);
-    }
-    va_end(args);
-    const com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> xAttrList(pAttrList);
-    mpSerializer->startUnknownElement(::rtl::OUString(), ::rtl::OUString::createFromAscii(elementName), xAttrList);
-}
-
-void FastSerializerHelper::singleElement(const char* elementName, ...)
-{
-    FastAttributeList* pAttrList = new FastAttributeList( mxTokenHandler );
-    va_list args;
-    va_start(args, elementName);
-    while (true)
-    {
-        const char* pName = va_arg(args, const char*);
-        if (!pName)
-            break;
-        const char* pValue = va_arg(args, const char*);
-        if (pValue)
-            pAttrList->addUnknown(pName, pValue);
-    }
-    va_end(args);
-    const com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> xAttrList(pAttrList);
-    mpSerializer->singleUnknownElement(::rtl::OUString(), ::rtl::OUString::createFromAscii(elementName), xAttrList);
-}
-
-void FastSerializerHelper::endElement(const char* elementName)
-{
-    mpSerializer->endUnknownElement(::rtl::OUString(), ::rtl::OUString::createFromAscii(elementName));
-}
-
 void FastSerializerHelper::startElementV(sal_Int32 elementTokenId, va_list args)
 {
     FastAttributeList* pAttrList = new FastAttributeList( mxTokenHandler );
@@ -119,11 +76,6 @@ void FastSerializerHelper::startElementV(sal_Int32 elementTokenId, XFastAttribut
 }
 
 
-void FastSerializerHelper::singleElement(const char* elementName, XFastAttributeListRef xAttrList)
-{
-    mpSerializer->singleUnknownElement(::rtl::OUString(), ::rtl::OUString::createFromAscii(elementName), xAttrList);
-}
-
 void FastSerializerHelper::singleElementV(sal_Int32 elementTokenId, XFastAttributeListRef xAttrList)
 {
     mpSerializer->singleFastElement(elementTokenId, xAttrList);
diff --git a/unusedcode.easy b/unusedcode.easy
index 87e2618..b1dcbcd 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1776,10 +1776,6 @@ sax::Converter::clearUndefinedChars(rtl::OUString&, rtl::OUString const&)
 sax::Converter::convertAny(com::sun::star::uno::Any&, rtl::OUString const&, rtl::OUString const&)
 sax::Converter::convertDouble(double&, rtl::OUString const&, short)
 sax::Converter::convertNumber64(rtl::OUStringBuffer&, long)
-sax_fastparser::FastSerializerHelper::endElement(char const*)
-sax_fastparser::FastSerializerHelper::singleElement(char const*, ...)
-sax_fastparser::FastSerializerHelper::singleElement(char const*, com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList>)
-sax_fastparser::FastSerializerHelper::startElement(char const*, ...)
 sd::CopyDlg::LinkStubReset(void*, void*)
 sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
 sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
commit c5e155523ad84b8757db4379496e41e3e3faf781
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jan 16 19:50:47 2012 +0000

    typo

diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index 1086531..4f3ec48 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -152,7 +152,7 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa
     //Note: see fdo#41556 if you feel compelled to cache the results here,
     //remember that fontconfig can return e.g. an italic font for a non-italic
     //input and/or different fonts depending on fontsize, bold, etc settings so
-    //don't cache just on the name, cache on all the input and be don't just
+    //don't cache just on the name, cache on all the input and don't just
     //return the original selection data with the fontname updated
     rtl::OUString aDummy;
     const FontSelectPattern aOut = GetFcSubstitute( rFontSelData, aDummy );