[Libreoffice-commits] .: sw/source unusedcode.easy vbahelper/inc vbahelper/source

[Julien Nabet]

 sw/source/core/doc/docbm.cxx             |   12 ------------
 sw/source/core/inc/MarkManager.hxx       |    3 ---
 unusedcode.easy                          |    2 --
 vbahelper/inc/vbahelper/vbahelper.hxx    |    4 ----
 vbahelper/source/vbahelper/vbahelper.cxx |   17 -----------------
 5 files changed, 38 deletions(-)

New commits:
commit 1ea28ebcf0a7719fd2ba18054c5dfbb1da229348
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Apr 8 13:12:03 2012 +0200

    Dump MarkManager::dumpFieldmarks + extractIntFromAny from vbahelper

diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index fdbddb5..ea2a433 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -304,18 +304,6 @@ namespace sw { namespace mark
     MarkManager::MarkManager(SwDoc& rDoc)
         : m_pDoc(&rDoc)
     { }
-#ifdef DBG_UTIL
-    void MarkManager::dumpFieldmarks( ) const
-    {
-        const_iterator_t pIt = m_vFieldmarks.begin();
-        for (; pIt != m_vFieldmarks.end( ); pIt++)
-        {
-            rtl::OUString str = (*pIt)->ToString();
-            OSL_TRACE("%s\n",
-                ::rtl::OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr());
-        }
-    }
-#endif
     ::sw::mark::IMark* MarkManager::makeMark(const SwPaM& rPaM,
         const ::rtl::OUString& rName,
         const IDocumentMarkAccess::MarkType eType)
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index 1c917c7..6fc8a4d 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -45,9 +45,6 @@ namespace sw { namespace mark
     {
         public:
             MarkManager(/*[in/out]*/ SwDoc& rDoc);
-#ifdef DBG_UTIL
-            void dumpFieldmarks( ) const;
-#endif
             // IDocumentMarkAccess
             virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const ::rtl::OUString& rName, IDocumentMarkAccess::MarkType eMark);
 
diff --git a/unusedcode.easy b/unusedcode.easy
index 6699ed5..7441a3a 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -790,7 +790,6 @@ nullcanvas::SpriteCanvasHelper::backgroundPaint(basegfx::B2DRange const&)
 nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
 nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
 nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
-ooo::vba::extractIntFromAny(com::sun::star::uno::Any const&)
 oox::PropertyMap::dump(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>)
 oox::core::BinaryFilterBase::BinaryFilterBase(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
 oox::core::FilterBase::openSubStorage(rtl::OUString const&, bool) const
@@ -872,4 +871,3 @@ svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry* const&, unsigned short&)
 svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry* const*, unsigned short)
 svxform::SvLBoxEntrySortedArray::Insert(svxform::SvLBoxEntrySortedArray const*, unsigned short, unsigned short)
 svxform::SvLBoxEntrySortedArray::Remove(SvLBoxEntry* const&, unsigned short)
-sw::mark::MarkManager::dumpFieldmarks() const
diff --git a/vbahelper/inc/vbahelper/vbahelper.hxx b/vbahelper/inc/vbahelper/vbahelper.hxx
index 9a3da3c..e9a316b 100644
--- a/vbahelper/inc/vbahelper/vbahelper.hxx
+++ b/vbahelper/inc/vbahelper/vbahelper.hxx
@@ -99,10 +99,6 @@ namespace ooo
         VBAHELPER_DLLPUBLIC void PrintOutHelper( SfxViewShell* pViewShell, const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, sal_Bool bSelection  );
         VBAHELPER_DLLPUBLIC void PrintPreviewHelper( const css::uno::Any& EnableChanges,  SfxViewShell* );
 
-        /** Extracts a 32-bit integer value from the passed Any, which may contain an integer or floating-point value.
-            Throws, if the Any is empty or contains an incompatible type. */
-        VBAHELPER_DLLPUBLIC sal_Int32 extractIntFromAny( const css::uno::Any& rAny ) throw (css::uno::RuntimeException);
-
         /** Extracts a boolean value from the passed Any, which may contain a Boolean or an integer or floating-point value.
             Throws, if the Any is empty or contains an incompatible type. */
         VBAHELPER_DLLPUBLIC bool extractBoolFromAny( const css::uno::Any& rAny ) throw (css::uno::RuntimeException);
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index a8cfb1a..b91ef85 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -476,23 +476,6 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno::
     dispatchExecute( pViewShell, SID_VIEWSHELL1 );
 }
 
-sal_Int32 extractIntFromAny( const uno::Any& rAny ) throw (uno::RuntimeException)
-{
-    switch( rAny.getValueType().getTypeClass() )
-    {
-        case uno::TypeClass_FLOAT:
-            return static_cast< sal_Int32 >( rAny.get< float >() );
-        case uno::TypeClass_DOUBLE:
-            return static_cast< sal_Int32 >( rAny.get< double >() );
-        case uno::TypeClass_BYTE:
-        case uno::TypeClass_SHORT:
-        case uno::TypeClass_LONG:
-            return rAny.get< sal_Int32 >();
-        default:;
-    }
-    throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Invalid type, cannot convert to integer." ) ), 0 );
-}
-
 bool extractBoolFromAny( const uno::Any& rAny ) throw (uno::RuntimeException)
 {
     switch( rAny.getValueType().getTypeClass() )