[Libreoffice-commits] .: svgio/inc svgio/source svtools/inc svtools/source unusedcode.easy

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Nov 21 06:10:22 PST 2012


 svgio/inc/svgio/svgreader/svgdocument.hxx        |    1 -
 svgio/inc/svgio/svgreader/svgstyleattributes.hxx |    1 -
 svgio/source/svgreader/svgdocument.cxx           |    8 --------
 svgio/source/svgreader/svgstyleattributes.cxx    |   13 -------------
 svgio/source/svgreader/svgtextpathnode.cxx       |   15 ---------------
 svtools/inc/svtools/treelist.hxx                 |    1 -
 svtools/source/contnr/treelist.cxx               |    5 -----
 unusedcode.easy                                  |    4 ----
 8 files changed, 48 deletions(-)

New commits:
commit 42925ee1fd33bcbcf8359404d4abf687acc79315
Author: Enrico Weigelt, metux ITS <metuxitservice at googlemail.com>
Date:   Thu Nov 15 13:33:56 2012 +0100

    dropped dead code from svg
    
    Change-Id: I73244d54f182f44c08a942dee95ff11b53a24f5a
    Reviewed-on: https://gerrit.libreoffice.org/1078
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx b/svgio/inc/svgio/svgreader/svgdocument.hxx
index ae30fe4..b8d29ac 100644
--- a/svgio/inc/svgio/svgreader/svgdocument.hxx
+++ b/svgio/inc/svgio/svgreader/svgdocument.hxx
@@ -68,7 +68,6 @@ namespace svgio
 
             /// add/remove styles to mapper
             void addSvgStyleAttributesToMapper(const rtl::OUString& rStr, const SvgStyleAttributes& rSvgStyleAttributes);
-            void removeSvgStyleAttributesFromMapper(const rtl::OUString& rStr);
 
             /// find a style by it's Id
             bool hasSvgStyleAttributesById() const { return !maIdStyleTokenMapperList.empty(); }
diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 6678958..042fa66 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -304,7 +304,6 @@ namespace svgio
 
             /// fill rule content
             bool getFillRule() const;
-            void setFillRule(const bool* pFillRule = 0);
 
             /// fill StrokeDasharray content
             const SvgNumberVector& getStrokeDasharray() const;
diff --git a/svgio/source/svgreader/svgdocument.cxx b/svgio/source/svgreader/svgdocument.cxx
index e5dd4ac..d8c379d 100644
--- a/svgio/source/svgreader/svgdocument.cxx
+++ b/svgio/source/svgreader/svgdocument.cxx
@@ -87,14 +87,6 @@ namespace svgio
             }
         }
 
-        void SvgDocument::removeSvgStyleAttributesFromMapper(const rtl::OUString& rStr)
-        {
-            if(rStr.getLength())
-            {
-                maIdStyleTokenMapperList.erase(rStr);
-            }
-        }
-
         const SvgStyleAttributes* SvgDocument::findSvgStyleAttributesById(const rtl::OUString& rStr) const
         {
             const IdStyleTokenMapper::const_iterator aResult(maIdStyleTokenMapperList.find(rStr));
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index 1a2755e..07845df 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -2049,19 +2049,6 @@ namespace svgio
             return true;
         }
 
-        void SvgStyleAttributes::setFillRule(const bool* pFillRule)
-        {
-            if(pFillRule)
-            {
-                maFillRuleSet = true;
-                maFillRule = *pFillRule;
-            }
-            else
-            {
-                maFillRuleSet = false;
-            }
-        }
-
         const SvgNumberVector& SvgStyleAttributes::getStrokeDasharray() const
         {
             if(!maStrokeDasharray.empty())
diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx
index ba7de86..c06b6b7 100644
--- a/svgio/source/svgreader/svgtextpathnode.cxx
+++ b/svgio/source/svgreader/svgtextpathnode.cxx
@@ -72,23 +72,8 @@ namespace svgio
 
             // read access to evtl. advanced position
             double getPosition() const { return mfPosition; }
-
-            // get length of given text
-            double getLength(const rtl::OUString& rText) const;
         };
 
-        double pathTextBreakupHelper::getLength(const rtl::OUString& rText) const
-        {
-            const sal_uInt32 nLength(rText.getLength());
-
-            if(nLength)
-            {
-                return getTextLayouter().getTextWidth(rText, 0, nLength);
-            }
-
-            return 0.0;
-        }
-
         void pathTextBreakupHelper::freeB2DCubicBezierHelper()
         {
             if(mpB2DCubicBezierHelper)
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 96c78bb..9886207 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -324,7 +324,6 @@ public:
                         SvListView();   // Sets the Model to 0
     virtual             ~SvListView();
     void                Clear();
-    SvTreeList*         GetModel() const;
     virtual void        SetModel( SvTreeList* );
     virtual void        ModelNotification(
                             sal_uInt16 nActionId,
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index d86928c..b18f1c0 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1264,11 +1264,6 @@ void SvListView::Clear()
     }
 }
 
-SvTreeList* SvListView::GetModel() const
-{
-    return pModel;
-}
-
 void SvListView::SetModel( SvTreeList* pNewModel )
 {
     DBG_CHKTHIS(SvListView,0);
diff --git a/unusedcode.easy b/unusedcode.easy
index 52a55b5..b227222 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -10,7 +10,6 @@ ScMenuFloatingWindow::getDoc()
 ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
 ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
 String::String(unsigned short)
-SvListView::GetModel() const
 SvTreeList::GetChildIterators(SvTreeListEntry const*) const
 SvtGraphicStroke::toString() const
 TextEngine::GetLeftMargin() const
@@ -58,9 +57,6 @@ sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
 sd::ViewShellBase::CreateInstance(SfxViewFrame*, SfxViewShell*)
 std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector()
 std::__cxx1998::vector<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::~vector()
-svgio::svgreader::SvgDocument::removeSvgStyleAttributesFromMapper(rtl::OUString const&)
-svgio::svgreader::SvgStyleAttributes::setFillRule(bool const*)
-svgio::svgreader::pathTextBreakupHelper::getLength(rtl::OUString const&) const
 test::BootstrapFixtureBase::getPathFromWorkdir(char const*)
 test::BootstrapFixtureBase::getURLFromWorkdir(char const*)
 unicode::isAlphaDigit(unsigned short)


More information about the Libreoffice-commits mailing list