[Libreoffice-commits] .: 2 commits - unusedcode.easy vcl/inc vcl/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Sep 2 08:54:43 PDT 2011
unusedcode.easy | 1
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 -------------
5 files changed, 1 insertion(+), 74 deletions(-)
New commits:
commit 09279fe3dad24ab58121e4f0a9564d252b64d81a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 2 16:53:53 2011 +0100
remove recently unused methods
diff --git a/unusedcode.easy b/unusedcode.easy
index 8dd7e15..fbf665d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -3123,10 +3123,7 @@ vcl::PDFExtOutDevData::SetOutlineItemDest(int, int)
vcl::PDFExtOutDevData::SetOutlineItemParent(int, int)
vcl::PDFExtOutDevData::SetOutlineItemText(int, rtl::OUString const&)
vcl::PDFWriter::DrawPixel(Polygon const&, Color const*)
-vcl::PDFWriterImpl::beginPattern(Rectangle const&)
vcl::PDFWriterImpl::drawPolyPolygon(PolyPolygon const&, int, bool)
-vcl::PDFWriterImpl::endPattern(SvtGraphicFill::Transform const&)
-vcl::PDFWriterImpl::getCurrentStructureElement()
vcl::PrintDialog::getCopyCount()
vcl::PrinterController::PrinterController()
vcl::PrinterController::enableUIOption(rtl::OUString const&, bool)
@@ -3136,7 +3133,6 @@ vcl::PrinterOptionsHelper::setValue(rtl::OUString const&, com::sun::star::uno::A
vcl::RenderGraphic::RenderGraphic(boost::shared_array<unsigned char> const&, unsigned int, rtl::OUString const&)
vcl::RowOrColumn::remove(Window*)
vcl::RowOrColumn::remove(boost::shared_ptr<vcl::WindowArranger> const&)
-vcl::unotools::polygonFromPoint2DSequence(com::sun::star::uno::Sequence<com::sun::star::geometry::RealPoint2D> const&)
void ScCompressedArrayIterator<int, unsigned short>::Follow<unsigned char>(ScCompressedArrayIterator<int, unsigned char> const&)
writerfilter::TagLogger::attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, com::sun::star::uno::Any)
writerfilter::TagLogger::attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int)
diff --git a/vcl/inc/vcl/canvastools.hxx b/vcl/inc/vcl/canvastools.hxx
index e2ceed9..516dfac 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 1b73da6..23d3cb4 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<SvMemoryStream*>(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 09c68b1..4397d7c 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 158fba8..cddc1b5 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<sal_uInt16>(points.getLength()) );
-
- ::Polygon aPoly( nCurrSize );
-
- sal_uInt16 nCurrPoint;
- for( nCurrPoint=0; nCurrPoint<nCurrSize; ++nCurrPoint )
- aPoly[nCurrPoint] = pointFromRealPoint2D( points[nCurrPoint] );
-
- return aPoly;
- }
-
- //---------------------------------------------------------------------------------------
-
uno::Reference< rendering::XBitmap > xBitmapFromBitmap( const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/,
const ::Bitmap& inputBitmap )
{
commit 535125950b25de0363fc2b5a4115f5804ec50b44
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 2 15:05:31 2011 +0100
regenerate list
diff --git a/unusedcode.easy b/unusedcode.easy
index 18da9c4..8dd7e15 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -3123,6 +3123,10 @@ vcl::PDFExtOutDevData::SetOutlineItemDest(int, int)
vcl::PDFExtOutDevData::SetOutlineItemParent(int, int)
vcl::PDFExtOutDevData::SetOutlineItemText(int, rtl::OUString const&)
vcl::PDFWriter::DrawPixel(Polygon const&, Color const*)
+vcl::PDFWriterImpl::beginPattern(Rectangle const&)
+vcl::PDFWriterImpl::drawPolyPolygon(PolyPolygon const&, int, bool)
+vcl::PDFWriterImpl::endPattern(SvtGraphicFill::Transform const&)
+vcl::PDFWriterImpl::getCurrentStructureElement()
vcl::PrintDialog::getCopyCount()
vcl::PrinterController::PrinterController()
vcl::PrinterController::enableUIOption(rtl::OUString const&, bool)
@@ -3132,6 +3136,7 @@ vcl::PrinterOptionsHelper::setValue(rtl::OUString const&, com::sun::star::uno::A
vcl::RenderGraphic::RenderGraphic(boost::shared_array<unsigned char> const&, unsigned int, rtl::OUString const&)
vcl::RowOrColumn::remove(Window*)
vcl::RowOrColumn::remove(boost::shared_ptr<vcl::WindowArranger> const&)
+vcl::unotools::polygonFromPoint2DSequence(com::sun::star::uno::Sequence<com::sun::star::geometry::RealPoint2D> const&)
void ScCompressedArrayIterator<int, unsigned short>::Follow<unsigned char>(ScCompressedArrayIterator<int, unsigned char> const&)
writerfilter::TagLogger::attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, com::sun::star::uno::Any)
writerfilter::TagLogger::attribute(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unsigned int)
More information about the Libreoffice-commits
mailing list