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

[Julien Nabet]

 oox/inc/oox/dump/dumperbase.hxx |    7 -----
 oox/source/dump/dumperbase.cxx  |   55 ----------------------------------------
 unusedcode.easy                 |    6 ----
 3 files changed, 68 deletions(-)

New commits:
commit 942acfd678f1599b4dc2b05d9e5b4eca07177459
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Apr 7 01:40:42 2012 +0200

    Some cleaning in oox::dump :
    
    oox::dump::InputObjectBase
    oox::dump::Output

diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index a099886..68df688 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -1066,13 +1066,9 @@ public:
     void                writeString( const ::rtl::OUString& rStr );
     void                writeArray( const sal_uInt8* pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
     void                writeBool( bool bData );
-    void                writeColorABGR( sal_Int32 nColor );
     void                writeDateTime( const ::com::sun::star::util::DateTime& rDateTime );
     void                writeColIndex( sal_Int32 nCol );
     void                writeRowIndex( sal_Int32 nRow );
-    void                writeColRowRange( sal_Int32 nColRow1, sal_Int32 nColRow2 );
-    void                writeColRange( sal_Int32 nCol1, sal_Int32 nCol2 );
-    void                writeRowRange( sal_Int32 nRow1, sal_Int32 nRow2 );
 
     template< typename Type >
     inline void         writeDec( Type nData, sal_Int32 nWidth = 0, sal_Unicode cFill = ' ' )
@@ -1531,9 +1527,6 @@ protected:
     ::rtl::OUString     dumpCharArray( const String& rName, sal_Int32 nLen, rtl_TextEncoding eTextEnc, bool bHideTrailingNul = false );
     ::rtl::OUString     dumpUnicodeArray( const String& rName, sal_Int32 nLen, bool bHideTrailingNul = false );
 
-    ::rtl::OUString     dumpNullCharArray( const String& rName, rtl_TextEncoding eTextEnc );
-    ::rtl::OUString     dumpNullUnicodeArray( const String& rName );
-
     ::com::sun::star::util::DateTime dumpFileTime( const String& rName = EMPTY_STRING );
     ::rtl::OUString     dumpGuid( const String& rName = EMPTY_STRING );
 
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 2aaee5d..1f1cbc2 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -1813,18 +1813,6 @@ void Output::writeBool( bool bData )
     StringHelper::appendBool( maLine, bData );
 }
 
-void Output::writeColorABGR( sal_Int32 nColor )
-{
-    writeChar( 'a' );
-    writeDec( static_cast< sal_uInt8 >( nColor >> 24 ) );
-    writeAscii( ",r" );
-    writeDec( static_cast< sal_uInt8 >( nColor ) );
-    writeAscii( ",g" );
-    writeDec( static_cast< sal_uInt8 >( nColor >> 8 ) );
-    writeAscii( ",b" );
-    writeDec( static_cast< sal_uInt8 >( nColor >> 16 ) );
-}
-
 void Output::writeDateTime( const DateTime& rDateTime )
 {
     writeDec( rDateTime.Year, 4, '0' );
@@ -1850,27 +1838,6 @@ void Output::writeRowIndex( sal_Int32 nRow )
     StringHelper::appendAddrRow( maLine, nRow, true );
 }
 
-void Output::writeColRowRange( sal_Int32 nColRow1, sal_Int32 nColRow2 )
-{
-    writeDec( nColRow1 );
-    writeChar( OOX_DUMP_RANGESEP );
-    writeDec( nColRow2 );
-}
-
-void Output::writeColRange( sal_Int32 nCol1, sal_Int32 nCol2 )
-{
-    writeColIndex( nCol1 );
-    writeChar( OOX_DUMP_RANGESEP );
-    writeColIndex( nCol2 );
-}
-
-void Output::writeRowRange( sal_Int32 nRow1, sal_Int32 nRow2 )
-{
-    writeRowIndex( nRow1 );
-    writeChar( OOX_DUMP_RANGESEP );
-    writeRowIndex( nRow2 );
-}
-
 // ----------------------------------------------------------------------------
 
 bool Output::implIsValid() const
@@ -2385,28 +2352,6 @@ OUString InputObjectBase::dumpUnicodeArray( const String& rName, sal_Int32 nLen,
     return aString;
 }
 
-OUString InputObjectBase::dumpNullCharArray( const String& rName, rtl_TextEncoding eTextEnc )
-{
-    OStringBuffer aBuffer;
-    sal_uInt8 nChar;
-    for( *mxStrm >> nChar; !mxStrm->isEof() && (nChar > 0); *mxStrm >> nChar )
-        aBuffer.append( static_cast< sal_Char >( nChar ) );
-    OUString aString = OStringToOUString( aBuffer.makeStringAndClear(), eTextEnc );
-    writeStringItem( rName( "text" ), aString );
-    return aString;
-}
-
-OUString InputObjectBase::dumpNullUnicodeArray( const String& rName )
-{
-    OUStringBuffer aBuffer;
-    sal_uInt16 nChar;
-    for( *mxStrm >> nChar; !mxStrm->isEof() && (nChar > 0); *mxStrm >> nChar )
-        aBuffer.append( static_cast< sal_Unicode >( nChar ) );
-    OUString aString = aBuffer.makeStringAndClear();
-    writeStringItem( rName( "text" ), aString );
-    return aString;
-}
-
 DateTime InputObjectBase::dumpFileTime( const String& rName )
 {
     DateTime aDateTime;
diff --git a/unusedcode.easy b/unusedcode.easy
index a5e4c50..e7ff3fb 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -798,12 +798,6 @@ oox::PropertyMap::dump(com::sun::star::uno::Reference<com::sun::star::beans::XPr
 oox::core::BinaryFilterBase::BinaryFilterBase(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
 oox::core::FilterBase::openSubStorage(rtl::OUString const&, bool) const
 oox::core::FilterBase::requestEncryptionData(comphelper::IDocPasswordVerifier&) const
-oox::dump::InputObjectBase::dumpNullCharArray(oox::dump::String const&, unsigned short)
-oox::dump::InputObjectBase::dumpNullUnicodeArray(oox::dump::String const&)
-oox::dump::Output::writeColRange(int, int)
-oox::dump::Output::writeColRowRange(int, int)
-oox::dump::Output::writeColorABGR(int)
-oox::dump::Output::writeRowRange(int, int)
 oox::dump::SequenceRecordObjectBase::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&, oox::dump::String const&, oox::dump::String const&)
 oox::dump::StringHelper::appendRange(rtl::OUStringBuffer&, oox::dump::TokenRange const&, bool)
 oox::dump::StringHelper::appendRangeList(rtl::OUStringBuffer&, std::__debug::vector<oox::dump::Range, std::allocator<oox::dump::Range> > const&)