Made available under the MPL/LGPLv3+
From 4e1c72fa61e3e8d754ff3e47afe435286dcf467b Mon Sep 17 00:00:00 2001 From: Kate Goss <katherine.g...@gmail.com> Date: Sat, 11 Feb 2012 16:31:27 +0000 Subject: [PATCH 1/3] Remove unused pdfi::DrawXmlEmitter::GetBreakIterator()
--- sdext/source/pdfimport/tree/drawtreevisiting.cxx | 12 ------------ sdext/source/pdfimport/tree/drawtreevisiting.hxx | 1 - unusedcode.easy | 1 - 3 files changed, 0 insertions(+), 14 deletions(-) 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 0b128a6..3e65bce 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1386,7 +1386,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&) -- 1.7.9
From 481c35cf2b6cc3a0c0f1914a265544619d75010e Mon Sep 17 00:00:00 2001 From: Kate Goss <katherine.g...@gmail.com> Date: Sat, 11 Feb 2012 16:44:09 +0000 Subject: [PATCH 2/3] Remove unused pdfi::PDFIProcessor::sortDocument(bool) --- sdext/source/pdfimport/tree/pdfiprocessor.cxx | 10 ---------- sdext/source/pdfimport/tree/pdfiprocessor.hxx | 1 - unusedcode.easy | 1 - 3 files changed, 0 insertions(+), 12 deletions(-) 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 3e65bce..b3a6ddd 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1386,7 +1386,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&) -- 1.7.9
From 22f31cc938d722a634e431ac230f708b50dff821 Mon Sep 17 00:00:00 2001 From: Kate Goss <katherine.g...@gmail.com> Date: Sat, 11 Feb 2012 16:56:17 +0000 Subject: [PATCH 3/3] Remove unused pdfi::PDFIRawAdaptor::odfConvert --- sdext/source/pdfimport/pdfiadaptor.cxx | 16 ---------------- sdext/source/pdfimport/pdfiadaptor.hxx | 3 --- unusedcode.easy | 1 - 3 files changed, 0 insertions(+), 20 deletions(-) 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 b3a6ddd..ef60e2e 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1386,7 +1386,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&) -- 1.7.9
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice