From 09279fe3dad24ab58121e4f0a9564d252b64d81a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 2 Sep 2011 16:53:53 +0100 Subject: remove recently unused methods --- vcl/inc/vcl/canvastools.hxx | 6 ----- vcl/source/gdi/pdfwriter_impl.cxx | 48 --------------------------------------- vcl/source/gdi/pdfwriter_impl.hxx | 3 --- vcl/source/helper/canvastools.cxx | 17 -------------- 4 files changed, 74 deletions(-) (limited to 'vcl') diff --git a/vcl/inc/vcl/canvastools.hxx b/vcl/inc/vcl/canvastools.hxx index e2ceed90bb7e..516dfacfad8a 100644 --- a/vcl/inc/vcl/canvastools.hxx +++ b/vcl/inc/vcl/canvastools.hxx @@ -98,12 +98,6 @@ namespace vcl ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, const ::PolyPolygon& inputPolyPolygon ); - /** Create an VCL/Tools polygon from a point sequence - */ - ::Polygon VCL_DLLPUBLIC polygonFromPoint2DSequence( - const ::com::sun::star::uno::Sequence< - ::com::sun::star::geometry::RealPoint2D >& rPoints ); - // Bitmap conversions // =================================================================== diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 1b73da6fbe46..23d3cb4e9748 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -10263,49 +10263,6 @@ void PDFWriterImpl::drawWallpaper( const Rectangle& rRect, const Wallpaper& rWal } } -void PDFWriterImpl::beginPattern( const Rectangle& rCellRect ) -{ - beginRedirect( new SvMemoryStream(), rCellRect ); -} - -sal_Int32 PDFWriterImpl::endPattern( const SvtGraphicFill::Transform& rTransform ) -{ - Rectangle aConvertRect( getRedirectTargetRect() ); - DBG_ASSERT( aConvertRect.GetWidth() != 0 && aConvertRect.GetHeight() != 0, "empty cell rectangle in pattern" ); - - // get scaling between current mapmode and PDF output - Size aScaling( lcl_convert( m_aGraphicsStack.front().m_aMapMode, m_aMapMode, getReferenceDevice(), Size( 10000, 10000 ) ) ); - double fSX = (double(aScaling.Width()) / 10000.0); - double fSY = (double(aScaling.Height()) / 10000.0); - - // transform translation part of matrix - Size aTranslation( (long)rTransform.matrix[2], (long)rTransform.matrix[5] ); - aTranslation = lcl_convert( m_aGraphicsStack.front().m_aMapMode, m_aMapMode, getReferenceDevice(), aTranslation ); - - sal_Int32 nTilingId = m_aTilings.size(); - m_aTilings.push_back( TilingEmit() ); - TilingEmit& rTile = m_aTilings.back(); - rTile.m_nObject = createObject(); - rTile.m_aResources = m_aOutputStreams.front().m_aResourceDict; - rTile.m_aTransform.matrix[0] = rTransform.matrix[0] * fSX; - rTile.m_aTransform.matrix[1] = rTransform.matrix[1] * fSY; - rTile.m_aTransform.matrix[2] = aTranslation.Width(); - rTile.m_aTransform.matrix[3] = rTransform.matrix[3] * fSX; - rTile.m_aTransform.matrix[4] = rTransform.matrix[4] * fSY; - rTile.m_aTransform.matrix[5] = -aTranslation.Height(); - // caution: endRedirect pops the stream, so do this last - rTile.m_pTilingStream = dynamic_cast(endRedirect()); - // FIXME: bound rect will not work with rotated matrix - rTile.m_aRectangle = Rectangle( Point(0,0), aConvertRect.GetSize() ); - rTile.m_aCellSize = aConvertRect.GetSize(); - - OStringBuffer aObjName( 16 ); - aObjName.append( 'P' ); - aObjName.append( rTile.m_nObject ); - pushResource( ResPattern, aObjName.makeStringAndClear(), rTile.m_nObject ); - return nTilingId; -} - void PDFWriterImpl::drawPolyPolygon( const PolyPolygon& rPolyPoly, sal_Int32 nPattern, bool bEOFill ) { if( nPattern < 0 || nPattern >= (sal_Int32)m_aTilings.size() ) @@ -11210,11 +11167,6 @@ bool PDFWriterImpl::setCurrentStructureElement( sal_Int32 nEle ) return bSuccess; } -sal_Int32 PDFWriterImpl::getCurrentStructureElement() -{ - return m_nCurrentStructElement; -} - bool PDFWriterImpl::setStructureAttribute( enum PDFWriter::StructAttribute eAttr, enum PDFWriter::StructAttributeValue eVal ) { if( !m_aContext.Tagged ) diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 09c68b166536..4397d7c5c0c4 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -1250,8 +1250,6 @@ public: void drawTransparent( const PolyPolygon& rPolyPoly, sal_uInt32 nTransparentPercent ); void beginTransparencyGroup(); void endTransparencyGroup( const Rectangle& rBoundingBox, sal_uInt32 nTransparentPercent ); - void beginPattern( const Rectangle& rCell ); - sal_Int32 endPattern( const SvtGraphicFill::Transform& rTransform ); void drawPolyPolygon( const PolyPolygon& rPolyPoly, sal_Int32 nPattern, bool bEOFill ); void emitComment( const char* pComment ); @@ -1286,7 +1284,6 @@ public: sal_Int32 beginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias ); void endStructureElement(); bool setCurrentStructureElement( sal_Int32 nElement ); - sal_Int32 getCurrentStructureElement(); bool setStructureAttribute( enum PDFWriter::StructAttribute eAttr, enum PDFWriter::StructAttributeValue eVal ); bool setStructureAttributeNumerical( enum PDFWriter::StructAttribute eAttr, sal_Int32 nValue ); void setStructureBoundingBox( const Rectangle& rRect ); diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 158fba86527b..cddc1b513d1a 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -113,23 +113,6 @@ namespace vcl //--------------------------------------------------------------------------------------- - ::Polygon polygonFromPoint2DSequence( const uno::Sequence< geometry::RealPoint2D >& points ) - { - RTL_LOGFILE_CONTEXT( aLog, "::vcl::unotools::polygonFromPoint2DSequence()" ); - - const sal_uInt16 nCurrSize( sal::static_int_cast(points.getLength()) ); - - ::Polygon aPoly( nCurrSize ); - - sal_uInt16 nCurrPoint; - for( nCurrPoint=0; nCurrPoint xBitmapFromBitmap( const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/, const ::Bitmap& inputBitmap ) { -- cgit