[Libreoffice-commits] .: 3 commits - sdext/source unusedcode.easy

Michael Meeks michael at kemper.freedesktop.org
Mon Feb 13 07:21:42 PST 2012


 sdext/source/pdfimport/pdfiadaptor.cxx           |   16 ----------------
 sdext/source/pdfimport/pdfiadaptor.hxx           |    3 ---
 sdext/source/pdfimport/tree/drawtreevisiting.cxx |   12 ------------
 sdext/source/pdfimport/tree/drawtreevisiting.hxx |    1 -
 sdext/source/pdfimport/tree/pdfiprocessor.cxx    |   10 ----------
 sdext/source/pdfimport/tree/pdfiprocessor.hxx    |    1 -
 unusedcode.easy                                  |    3 ---
 7 files changed, 46 deletions(-)

New commits:
commit 4001370ba5900dd0a0ec04c62f5aeb347bde025a
Author: Kate Goss <katherine.goss at gmail.com>
Date:   Sat Feb 11 16:56:17 2012 +0000

    Remove unused pdfi::PDFIRawAdaptor::odfConvert

diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index 1fc25d8..1d1a3ad 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -260,22 +260,6 @@ bool PDFIRawAdaptor::parse( const uno::Reference<io::XInputStream>&       xInput
     return bSuccess;
 }
 
-bool PDFIRawAdaptor::odfConvert( const rtl::OUString&                          rURL,
-                                 const uno::Reference<io::XOutputStream>&      xOutput,
-                                 const uno::Reference<task::XStatusIndicator>& xStatus )
-{
-    XmlEmitterSharedPtr pEmitter = createOdfEmitter(xOutput);
-    const bool bSuccess = parse(uno::Reference<io::XInputStream>(),
-                                uno::Reference<task::XInteractionHandler>(),
-                                rtl::OUString(),
-                                xStatus,pEmitter,rURL);
-
-    // tell input stream that it is no longer needed
-    xOutput->closeOutput();
-
-    return bSuccess;
-}
-
 // XImportFilter
 sal_Bool SAL_CALL PDFIRawAdaptor::importer( const uno::Sequence< beans::PropertyValue >&        rSourceData,
                                             const uno::Reference< xml::sax::XDocumentHandler >& rHdl,
diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx
index d9d6d71..d2b2943 100644
--- a/sdext/source/pdfimport/pdfiadaptor.hxx
+++ b/sdext/source/pdfimport/pdfiadaptor.hxx
@@ -121,9 +121,6 @@ namespace pdfi
             @param xStatus
             Optional status indicator
          */
-        bool odfConvert( const rtl::OUString&                                                          rURL,
-                         const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>&      xOutput,
-                         const com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator>& xStatus );
 
         // XImportFilter
         virtual sal_Bool SAL_CALL importer( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rSourceData,
diff --git a/unusedcode.easy b/unusedcode.easy
index 777b6e1..b28ead7 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1420,7 +1420,6 @@ oox::xls::WorksheetHelper::getRow(int) const
 oox::xls::WorksheetHelper::getRows(oox::ValueRange const&) const
 oox::xls::WorksheetHelper::putFormulaString(com::sun::star::table::CellAddress const&, rtl::OUString const&) const
 oox::xls::Xf::hasAnyUsedFlags() const
-pdfi::PDFIRawAdaptor::odfConvert(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> const&, com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const&)
 psp::GetCommandLineTokenCount(rtl::OString const&)
 psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&)
 psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&)
commit c424b5dc32bd9313d725f3689696ff63847cf487
Author: Kate Goss <katherine.goss at gmail.com>
Date:   Sat Feb 11 16:44:09 2012 +0000

    Remove unused pdfi::PDFIProcessor::sortDocument(bool)

diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 2e933e5..985e5f0 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -908,16 +908,6 @@ void PDFIProcessor::endIndicator()
         m_xStatusIndicator->end();
 }
 
-void PDFIProcessor::sortDocument( bool bDeep )
-{
-    for( std::list< Element* >::iterator it = m_pDocument->Children.begin();
-         it != m_pDocument->Children.end(); ++it )
-    {
-        if( dynamic_cast<PageElement*>(*it) != NULL )
-            sortElements( *it, bDeep );
-    }
-}
-
 static bool lr_tb_sort( Element* pLeft, Element* pRight )
 {
     // first: top-bottom sorting
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 349a4a9..314988d 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -109,7 +109,6 @@ namespace pdfi
         sal_Int32 getFontId( const FontAttributes& rAttr ) const;
 
         void sortElements( Element* pElement, bool bDeep = false );
-        void sortDocument( bool bDeep = false );
 
         rtl::OUString mirrorString( const rtl::OUString& i_rInString );
 
diff --git a/unusedcode.easy b/unusedcode.easy
index 198cf8d..777b6e1 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1420,7 +1420,6 @@ oox::xls::WorksheetHelper::getRow(int) const
 oox::xls::WorksheetHelper::getRows(oox::ValueRange const&) const
 oox::xls::WorksheetHelper::putFormulaString(com::sun::star::table::CellAddress const&, rtl::OUString const&) const
 oox::xls::Xf::hasAnyUsedFlags() const
-pdfi::PDFIProcessor::sortDocument(bool)
 pdfi::PDFIRawAdaptor::odfConvert(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> const&, com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const&)
 psp::GetCommandLineTokenCount(rtl::OString const&)
 psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&)
commit 20370a163bbbe12bf60de6e891fb2537ab3cbcea
Author: Kate Goss <katherine.goss at gmail.com>
Date:   Sat Feb 11 16:31:27 2012 +0000

    Remove unused pdfi::DrawXmlEmitter::GetBreakIterator()

diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index fd08894..2913878 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -68,18 +68,6 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >
     return mxBreakIter;
 }
 
-const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& DrawXmlEmitter::GetBreakIterator()
-{
-    if ( !mxBreakIter.is() )
-    {
-        Reference< XComponentContext > xContext( m_rEmitContext.m_xContext, uno::UNO_SET_THROW );
-        Reference< XMultiComponentFactory > xMSF(  xContext->getServiceManager(), uno::UNO_SET_THROW );
-    Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")), xContext);
-        mxBreakIter = uno::Reference< i18n::XBreakIterator >( xInterface, uno::UNO_QUERY );
-    }
-    return mxBreakIter;
-}
-
 const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification >& DrawXmlEmitter::GetCharacterClassification()
 {
     if ( !mxCharClass.is() )
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.hxx b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
index e957448..eb9bc23 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
@@ -107,7 +107,6 @@ namespace pdfi
                              );
 
     public:
-    const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& GetBreakIterator();
     const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification >& GetCharacterClassification();
         enum DocType{ DRAW_DOC, IMPRESS_DOC };
         explicit DrawXmlEmitter(EmitContext& rEmitContext, DocType eDocType, PDFIProcessor& rProc ) :
diff --git a/unusedcode.easy b/unusedcode.easy
index 519d737..198cf8d 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1420,7 +1420,6 @@ oox::xls::WorksheetHelper::getRow(int) const
 oox::xls::WorksheetHelper::getRows(oox::ValueRange const&) const
 oox::xls::WorksheetHelper::putFormulaString(com::sun::star::table::CellAddress const&, rtl::OUString const&) const
 oox::xls::Xf::hasAnyUsedFlags() const
-pdfi::DrawXmlEmitter::GetBreakIterator()
 pdfi::PDFIProcessor::sortDocument(bool)
 pdfi::PDFIRawAdaptor::odfConvert(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> const&, com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const&)
 psp::GetCommandLineTokenCount(rtl::OString const&)


More information about the Libreoffice-commits mailing list