[Libreoffice-commits] .: 3 commits - framework/source svx/source xmloff/source

Thomas Arnhold tarnhold at kemper.freedesktop.org
Wed Jul 20 07:38:30 PDT 2011


 framework/source/lomenubar/exports.cxx     |   12 ----
 svx/source/svdraw/svdpage.cxx              |   16 -----
 xmloff/source/chart/SchXMLTableContext.cxx |   81 -----------------------------
 3 files changed, 109 deletions(-)

New commits:
commit 0ac5615d280d55d2a3e382e79b7e80d4f545f593
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Jul 19 15:38:18 2011 +0200

    callcatcher: remove unused writeInfo

diff --git a/framework/source/lomenubar/exports.cxx b/framework/source/lomenubar/exports.cxx
index 8bc6ae6..372db6f 100644
--- a/framework/source/lomenubar/exports.cxx
+++ b/framework/source/lomenubar/exports.cxx
@@ -40,18 +40,6 @@
 
 namespace css = ::com::sun::star;
 
-static void writeInfo(const css::uno::Reference< css::registry::XRegistryKey >& xRegistryKey       ,
-                      const char*                                               pImplementationName,
-                      const char*                                               pServiceName       )
-{
-    ::rtl::OUStringBuffer sKey(256);
-    sKey.append     (::rtl::OUString::createFromAscii(pImplementationName));
-    sKey.appendAscii("/UNO/SERVICES/");
-    sKey.append     (::rtl::OUString::createFromAscii(pServiceName));
-
-    xRegistryKey->createKey(sKey.makeStringAndClear());
-}
-
 extern "C"
 {
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL lomenubar_component_getFactory(const sal_Char* pImplName      ,
commit 2a1b747f4f54f1d6860a55f61edce76f2b6c60f9
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Jul 19 15:36:58 2011 +0200

    callcatcher: remove unused methods

diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index a79420c..eaa386b 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -76,71 +76,6 @@ const OUString lcl_aCategoriesRange( RTL_CONSTASCII_USTRINGPARAM("categories"));
 typedef ::std::multimap< ::rtl::OUString, ::rtl::OUString >
     lcl_tOriginalRangeToInternalRangeMap;
 
-Sequence< OUString > lcl_getCategoriesFromTable( const SchXMLTable & rTable, bool bHasLabels )
-{
-    sal_Int32 nNumRows( static_cast< sal_Int32 >( rTable.aData.size()));
-    OSL_ENSURE( static_cast< size_t >( nNumRows ) == rTable.aData.size(), "Table too big" );
-
-    sal_Int32 nOffset(bHasLabels ? 1 : 0);
-    Sequence< OUString > aResult( nNumRows - nOffset );
-    sal_Int32 i=nOffset;
-    for( ; i<nNumRows; ++i )
-    {
-        if( !rTable.aData[i].empty() && (rTable.aData[i].front().eType == SCH_CELL_TYPE_STRING ))
-            aResult[i - nOffset] = rTable.aData[i].front().aString;
-    }
-    return aResult;
-}
-
-std::vector< Reference< chart2::XAxis > > lcl_getAxesHoldingCategoriesFromDiagram(
-    const Reference< chart2::XDiagram > & xDiagram )
-{
-    std::vector< Reference< chart2::XAxis > > aRet;
-
-    Reference< chart2::XAxis > xResult;
-    // return first x-axis as fall-back
-    Reference< chart2::XAxis > xFallBack;
-    try
-    {
-        Reference< chart2::XCoordinateSystemContainer > xCooSysCnt(
-            xDiagram, uno::UNO_QUERY_THROW );
-        Sequence< Reference< chart2::XCoordinateSystem > > aCooSysSeq(
-            xCooSysCnt->getCoordinateSystems());
-        for( sal_Int32 i=0; i<aCooSysSeq.getLength(); ++i )
-        {
-            Reference< chart2::XCoordinateSystem > xCooSys( aCooSysSeq[i] );
-            OSL_ASSERT( xCooSys.is());
-            for( sal_Int32 nN = xCooSys->getDimension(); nN--; )
-            {
-                const sal_Int32 nMaximumScaleIndex = xCooSys->getMaximumAxisIndexByDimension(nN);
-                for(sal_Int32 nI=0; nI<=nMaximumScaleIndex; ++nI)
-                {
-                    Reference< chart2::XAxis > xAxis = xCooSys->getAxisByDimension( nN,nI );
-                    OSL_ASSERT( xAxis.is());
-                    if( xAxis.is())
-                    {
-                        chart2::ScaleData aScaleData = xAxis->getScaleData();
-                        if( aScaleData.Categories.is() || (aScaleData.AxisType == chart2::AxisType::CATEGORY) )
-                        {
-                            aRet.push_back(xAxis);
-                        }
-                        if( (nN == 0) && !xFallBack.is())
-                            xFallBack.set( xAxis );
-                    }
-                }
-            }
-        }
-    }
-    catch( uno::Exception & )
-    {
-    }
-
-    if( aRet.empty())
-        aRet.push_back(xFallBack);
-
-    return aRet;
-}
-
 struct lcl_ApplyCellToData : public ::std::unary_function< SchXMLCell, void >
 {
     lcl_ApplyCellToData( Sequence< double > & rOutData ) :
@@ -175,22 +110,6 @@ private:
     double m_fNaN;
 };
 
-Sequence< Sequence< double > > lcl_getSwappedArray( const Sequence< Sequence< double > > & rData )
-{
-    sal_Int32 nOldOuterSize = rData.getLength();
-    sal_Int32 nOldInnerSize = (nOldOuterSize == 0 ? 0 : rData[0].getLength());
-    Sequence< Sequence< double > > aResult( nOldInnerSize );
-
-    for( sal_Int32 i=0; i<nOldInnerSize; ++i )
-        aResult[i].realloc( nOldOuterSize );
-
-    for( sal_Int32 nOuter=0; nOuter<nOldOuterSize; ++nOuter )
-        for( sal_Int32 nInner=0; nInner<nOldInnerSize; ++nInner )
-            aResult[nInner][nOuter] = rData[nOuter][nInner];
-
-    return aResult;
-}
-
 void lcl_fillRangeMapping(
     const SchXMLTable & rTable,
     lcl_tOriginalRangeToInternalRangeMap & rOutRangeMap,
commit aed59b78bcd5251092356c519a1e000de8772192
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Tue Jul 19 15:28:09 2011 +0200

    callcatcher: remove unused DumpObjectList

diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 920f42d..4a2209b 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -71,22 +71,6 @@
 
 using namespace ::com::sun::star;
 
-namespace {
-void DumpObjectList (const ::std::vector<SdrObjectWeakRef>& rContainer)
-{
-    ::std::vector<SdrObjectWeakRef>::const_iterator iObject (rContainer.begin());
-    ::std::vector<SdrObjectWeakRef>::const_iterator iEnd (rContainer.end());
-    for (int nIndex=0 ; iObject!=iEnd; ++iObject,++nIndex)
-    {
-        const SdrObject* pObject = iObject->get();
-        OSL_TRACE("%d : %x, %s", nIndex,
-            pObject,
-            ::rtl::OUStringToOString(pObject->GetName(),RTL_TEXTENCODING_UTF8).getStr());
-    }
-}
-}
-
-
 class SdrObjList::WeakSdrObjectContainerType
     : public ::std::vector<SdrObjectWeakRef>
 {


More information about the Libreoffice-commits mailing list