From 0696c0aa742c57ae93733bd43c694d847c2bcd7e Mon Sep 17 00:00:00 2001 From: August Sodora Date: Tue, 20 Dec 2011 14:45:49 -0500 Subject: callcatcher: Remove unused code --- unusedcode.easy | 8 ------- vcl/inc/printdlg.hxx | 1 - vcl/inc/vcl/arrange.hxx | 2 -- vcl/inc/vcl/canvastools.hxx | 24 --------------------- vcl/source/helper/canvastools.cxx | 44 --------------------------------------- vcl/source/window/arrange.cxx | 32 ---------------------------- vcl/source/window/printdlg.cxx | 5 ----- 7 files changed, 116 deletions(-) diff --git a/unusedcode.easy b/unusedcode.easy index 825f042e8594..7053f8a7f9b3 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -2148,14 +2148,6 @@ vcl::PDFExtOutDevData::SetOutlineItemParent(int, int) vcl::PDFExtOutDevData::SetOutlineItemText(int, rtl::OUString const&) vcl::PDFWriter::DrawPixel(Polygon const&, Color const*) vcl::PDFWriterImpl::drawPolyPolygon(PolyPolygon const&, int, bool) -vcl::PrintDialog::getCopyCount() -vcl::RowOrColumn::remove(Window*) -vcl::RowOrColumn::remove(boost::shared_ptr const&) -vcl::unotools::xBitmapFromBitmap(com::sun::star::uno::Reference const&, Bitmap const&) -vcl::unotools::xPolyPolygonFromPolyPolygon(com::sun::star::uno::Reference const&, PolyPolygon const&) -vcl::unotools::xPolyPolygonFromPolygon(com::sun::star::uno::Reference const&, Polygon const&) vcl::unx::GtkPrintWrapper::print_operation_set_has_selection(_GtkPrintOperation*, int) const vcl::unx::GtkPrintWrapper::print_operation_set_support_selection(_GtkPrintOperation*, int) const void ScCompressedArrayIterator::Follow(ScCompressedArrayIterator const&) -writerfilter::TagLogger::attribute(std::basic_string, std::allocator > const&, rtl::OUString const&) -writerfilter::TagLogger::chars(std::basic_string, std::allocator > const&) diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 7aea96b43e54..b754dad2969f 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -295,7 +295,6 @@ namespace vcl virtual ~PrintDialog(); bool isPrintToFile(); - int getCopyCount(); bool isCollate(); bool isSingleJobs(); diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx index 5568cc3b05d8..46df6af6b76c 100644 --- a/vcl/inc/vcl/arrange.hxx +++ b/vcl/inc/vcl/arrange.hxx @@ -251,13 +251,11 @@ namespace vcl // add a managed window at the given index // an index smaller than zero means add the window at the end size_t addWindow( Window*, sal_Int32 i_nExpandPrio = 0, const Size& i_rMinSize = Size(), size_t i_nIndex = ~0 ); - void remove( Window* ); size_t addChild( boost::shared_ptr const &, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 ); // convenience: use for addChild( new WindowArranger( ... ) ) constructs size_t addChild( WindowArranger* i_pNewChild, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 ) { return addChild( boost::shared_ptr( i_pNewChild ), i_nExpandPrio, i_nIndex ); } - void remove( boost::shared_ptr const & ); long getBorderWidth() const { return m_nBorderWidth; } }; diff --git a/vcl/inc/vcl/canvastools.hxx b/vcl/inc/vcl/canvastools.hxx index 7c9653e1f200..8bb1ffd613a9 100644 --- a/vcl/inc/vcl/canvastools.hxx +++ b/vcl/inc/vcl/canvastools.hxx @@ -81,33 +81,9 @@ namespace vcl { namespace unotools { - // Polygon conversions - // =================================================================== - - /** Create an XPolyPolygon from VCL/Tools polygon - */ - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > - VCL_DLLPUBLIC xPolyPolygonFromPolygon( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, - const ::Polygon& inputPolygon ); - - /** Create an XPolyPolygon from VCL/Tools polyPolygon - */ - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > - VCL_DLLPUBLIC xPolyPolygonFromPolyPolygon( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, - const ::PolyPolygon& inputPolyPolygon ); - // Bitmap conversions // =================================================================== - /** Create an XBitmap from VCL Bitmap - */ - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > - VCL_DLLPUBLIC xBitmapFromBitmap( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, - const ::Bitmap& inputBitmap ); - /** Create an XBitmap from VCL BitmapEx */ ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index b2128130a676..b8dce8d6ecb4 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -79,48 +79,6 @@ namespace vcl { namespace unotools { - // #i79917# removed helpers bezierSequenceFromPolygon and - // pointSequenceFromPolygon here - // Also all helpers using tools Polygon and PolyPolygon will get mapped to the - // B2DPolygon helpers for these cases, see comments with the same TaskID below. - // TODO: Remove those wrapped methods - - //--------------------------------------------------------------------------------------- - - uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromPolygon( const uno::Reference< rendering::XGraphicDevice >& xGraphicDevice, - const ::Polygon& inputPolygon ) - { - RTL_LOGFILE_CONTEXT( aLog, "::vcl::unotools::xPolyPolygonFromPolygon()" ); - - // #i79917# map to basegfx - const basegfx::B2DPolygon aB2DPolygon(inputPolygon.getB2DPolygon()); - return basegfx::unotools::xPolyPolygonFromB2DPolygon(xGraphicDevice, aB2DPolygon); - } - - //--------------------------------------------------------------------------------------- - - uno::Reference< rendering::XPolyPolygon2D > xPolyPolygonFromPolyPolygon( const uno::Reference< rendering::XGraphicDevice >& xGraphicDevice, - const ::PolyPolygon& inputPolyPolygon ) - { - RTL_LOGFILE_CONTEXT( aLog, "::vcl::unotools::xPolyPolygonFromPolyPolygon()" ); - - // #i79917# map to basegfx - const basegfx::B2DPolyPolygon aB2DPolyPolygon(inputPolyPolygon.getB2DPolyPolygon()); - return basegfx::unotools::xPolyPolygonFromB2DPolyPolygon(xGraphicDevice, aB2DPolyPolygon); - } - - //--------------------------------------------------------------------------------------- - - uno::Reference< rendering::XBitmap > xBitmapFromBitmap( const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/, - const ::Bitmap& inputBitmap ) - { - RTL_LOGFILE_CONTEXT( aLog, "::vcl::unotools::xBitmapFromBitmap()" ); - - return new vcl::unotools::VclCanvasBitmap( BitmapEx( inputBitmap ) ); - } - - //--------------------------------------------------------------------------------------- - uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx( const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/, const ::BitmapEx& inputBitmap ) { @@ -129,8 +87,6 @@ namespace vcl return new vcl::unotools::VclCanvasBitmap( inputBitmap ); } - //--------------------------------------------------------------------------------------- - namespace { inline bool operator==( const rendering::IntegerBitmapLayout& rLHS, diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx index 11ca774113e6..847abf272aed 100644 --- a/vcl/source/window/arrange.cxx +++ b/vcl/source/window/arrange.cxx @@ -524,38 +524,6 @@ size_t RowOrColumn::addChild( boost::shared_ptr const & i_pChild return nIndex; } -void RowOrColumn::remove( Window* i_pWindow ) -{ - if( i_pWindow ) - { - for( std::vector< WindowArranger::Element >::iterator it = m_aElements.begin(); - it != m_aElements.end(); ++it ) - { - if( it->m_pElement == i_pWindow ) - { - m_aElements.erase( it ); - return; - } - } - } -} - -void RowOrColumn::remove( boost::shared_ptr const & i_pChild ) -{ - if( i_pChild ) - { - for( std::vector< WindowArranger::Element >::iterator it = m_aElements.begin(); - it != m_aElements.end(); ++it ) - { - if( it->m_pChild == i_pChild ) - { - m_aElements.erase( it ); - return; - } - } - } -} - // ---------------------------------------- // vcl::LabeledElement //----------------------------------------- diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index b1c9b4b9bf16..06096839461b 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1028,11 +1028,6 @@ bool PrintDialog::isPrintToFile() return maOptionsPage.maToFileBox.IsChecked(); } -int PrintDialog::getCopyCount() -{ - return static_cast(maJobPage.maCopyCountField.GetValue()); -} - bool PrintDialog::isCollate() { return maJobPage.maCopyCountField.GetValue() > 1 ? maJobPage.maCollateBox.IsChecked() : sal_False; -- cgit v1.2.3