[Libreoffice-commits] core.git: unusedcode.easy writerfilter/source

Miklos Vajna vmiklos at collabora.co.uk
Mon Apr 20 00:33:15 PDT 2015


 unusedcode.easy                                  |    3 -
 writerfilter/source/dmapper/TDefTableHandler.cxx |   46 -----------------------
 writerfilter/source/dmapper/TDefTableHandler.hxx |    3 -
 3 files changed, 52 deletions(-)

New commits:
commit 5e16ece1dd59caf7229a7db3504712cedd9a9775
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Apr 20 09:12:24 2015 +0200

    writerfilter: remove newly unused methods
    
    Change-Id: Ie15422d7936cd84d5c4a07a5b75fdb02efc6ea1e

diff --git a/unusedcode.easy b/unusedcode.easy
index 26c96f6..5914c9c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -112,6 +112,3 @@ vclcanvas::CanvasHelper::setData(com::sun::star::uno::Sequence<signed char> cons
 vclcanvas::CanvasHelper::setPixel(com::sun::star::uno::Sequence<signed char> const&, com::sun::star::rendering::IntegerBitmapLayout const&, com::sun::star::geometry::IntegerPoint2D const&)
 vclcanvas::DeviceHelper::enterFullScreenMode(bool)
 vclcanvas::SpriteDeviceHelper::createBuffers(int)
-writerfilter::dmapper::TDefTableHandler::getCellCount() const
-writerfilter::dmapper::TDefTableHandler::getRowProperties() const
-writerfilter::dmapper::TDefTableHandler::getTableWidth() const
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index 18746ce..677781b 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -418,35 +418,6 @@ void TDefTableHandler::lcl_sprm(Sprm & rSprm)
     }
 }
 
-
-PropertyMapPtr  TDefTableHandler::getRowProperties() const
-{
-    PropertyMapPtr pPropertyMap(new PropertyMap);
-
-    // Writer only wants the separators, Word provides also the outer border positions
-    if( m_aCellBorderPositions.size() > 2 )
-    {
-        //determine table width
-        double nFullWidth = m_aCellBorderPositions[m_aCellBorderPositions.size() - 1] - m_aCellBorderPositions[0];
-        //the positions have to be distibuted in a range of 10000
-        const double nFullWidthRelative = 10000.;
-        uno::Sequence< text::TableColumnSeparator > aSeparators( m_aCellBorderPositions.size() - 2 );
-        text::TableColumnSeparator* pSeparators = aSeparators.getArray();
-        for( sal_uInt32 nBorder = 1; nBorder < m_aCellBorderPositions.size() - 1; ++nBorder )
-        {
-            sal_Int16 nRelPos =
-                sal::static_int_cast< sal_Int16 >(double(m_aCellBorderPositions[nBorder]) * nFullWidthRelative / nFullWidth );
-
-            pSeparators[nBorder - 1].Position =  nRelPos;
-            pSeparators[nBorder - 1].IsVisible = sal_True;
-        }
-        pPropertyMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, uno::makeAny( aSeparators ) );
-    }
-
-    return pPropertyMap;
-}
-
-
 void TDefTableHandler::fillCellProperties(
             size_t nCell, ::std::shared_ptr< TablePropertyMap > pCellProperties ) const
 {
@@ -476,23 +447,6 @@ void TDefTableHandler::fillCellProperties(
 }
 
 
-sal_Int32 TDefTableHandler::getTableWidth() const
-{
-    sal_Int32 nWidth = 0;
-    if( m_aCellBorderPositions.size() > 1 )
-    {
-        //determine table width
-        nWidth = m_aCellBorderPositions[m_aCellBorderPositions.size() - 1] - m_aCellBorderPositions[0];
-    }
-    return nWidth;
-}
-
-
-size_t TDefTableHandler::getCellCount() const
-{
-    return m_aCellVertAlign.size();
-}
-
 void TDefTableHandler::enableInteropGrabBag(const OUString& aName)
 {
     m_aInteropGrabBagName = aName;
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx
index 65a6f56..18fd424 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -73,10 +73,7 @@ public:
     TDefTableHandler();
     virtual ~TDefTableHandler();
 
-    size_t                                      getCellCount() const;
     void                                        fillCellProperties( size_t nCell, ::std::shared_ptr< TablePropertyMap > pCellProperties) const;
-    ::std::shared_ptr<PropertyMap>            getRowProperties() const;
-    sal_Int32                                   getTableWidth() const;
     void enableInteropGrabBag(const OUString& aName);
     css::beans::PropertyValue getInteropGrabBag(const OUString& aName = OUString());
     static OUString getBorderTypeString(sal_Int32 nType);


More information about the Libreoffice-commits mailing list