[Libreoffice] [PATCH] Removing unused code
Alexander Bergmann
myaddons at gmx.de
Tue Jan 17 04:22:55 PST 2012
---
unusedcode.easy | 8 ----
vcl/inc/vcl/pdfextoutdevdata.hxx | 62 ----------------------------
vcl/inc/vcl/pdfwriter.hxx | 1 -
vcl/source/gdi/pdfextoutdevdata.cxx | 36 ----------------
vcl/source/gdi/pdfwriter.cxx | 5 --
vcl/source/gdi/pdfwriter_impl.cxx | 77 -----------------------------------
vcl/source/gdi/pdfwriter_impl.hxx | 1 -
7 files changed, 0 insertions(+), 190 deletions(-)
diff --git a/unusedcode.easy b/unusedcode.easy
index b1dcbcd..9ce0c21 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1889,13 +1889,5 @@ vcl::MatrixArranger::addChild(boost::shared_ptr<vcl::WindowArranger> const&, uns
vcl::MatrixArranger::addWindow(Window*, unsigned int, unsigned int, int, Size const&)
vcl::MatrixArranger::remove(Window*)
vcl::MatrixArranger::remove(boost::shared_ptr<vcl::WindowArranger> const&)
-vcl::PDFExtOutDevData::EndGroup()
-vcl::PDFExtOutDevData::GetFormsFormat() const
-vcl::PDFExtOutDevData::SetAutoAdvanceTime(unsigned int, int)
-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::drawPolyPolygon(PolyPolygon const&, int, bool)
vcl::unx::GtkPrintWrapper::print_operation_set_has_selection(_GtkPrintOperation*, int) const
vcl::unx::GtkPrintWrapper::print_operation_set_support_selection(_GtkPrintOperation*, int) const
diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx
index c1be576..665303b 100644
--- a/vcl/inc/vcl/pdfextoutdevdata.hxx
+++ b/vcl/inc/vcl/pdfextoutdevdata.hxx
@@ -131,7 +131,6 @@ public :
sal_Bool GetIsExportFormFields() const;
void SetIsExportFormFields( const sal_Bool bExportFormFields );
- sal_Int32 GetFormsFormat() const;
void SetFormsFormat( const sal_Int32 nFormsFormat );
sal_Bool GetIsExportBookmarks() const;
@@ -166,13 +165,6 @@ public :
/** End render output
- This method ends grouped render output without
- further actions.
- */
- void EndGroup();
-
- /** End render output
-
This method ends grouped render output, that can be
represented by a GfxLink. This is typically used for
external graphic files, such as JPEGs, EPS files etc.
@@ -321,49 +313,6 @@ public :
*/
sal_Int32 CreateOutlineItem( sal_Int32 nParent = 0, const rtl::OUString& rText = rtl::OUString(), sal_Int32 nDestID = -1 );
- /** Set an outline item's parent
-
- @param nItem
- specififies which item should be reparented.
-
- @param nNewParent
- specifies which outline item will be the item's new parent.
- Use 0 for reparenting to top level.
-
- @returns
- -1 if the item does not exist
- -2 if the new parent does not exist, item will be reparented to top level.
- */
- sal_Int32 SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent );
-
- /** Set an outline item's title text
-
- @param nItem
- specififies which item should get a new text
-
- @param rText
- sets the title text of the item
-
- @returns
- 0 if the item exists and the text was changed
- -1 if the item does not exist
- */
- sal_Int32 SetOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText );
-
- /** Set an outline item's destination
-
- @param nItem
- specififies which item should get a new dest
-
- @param nDestID
- specifies the item's new destination
-
- @returns
- -1 if the item does not exist
- -2 if the new dest does not exist, dest will remain unchanged
- */
- sal_Int32 SetOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID );
-
/** Create a new note on a page
@param rRect
@@ -518,17 +467,6 @@ public :
*/
void SetAlternateText( const String& rText );
- /** Sets the time in seconds a page will appear before the next
- page is shown automatically
-
- @param nSeconds
- time in seconds the current page will be shown; pass 0 for manual advancement
-
- @param nPageNr
- the page number to apply the autoadvance time to; -1 denotes the current page
- */
- void SetAutoAdvanceTime( sal_uInt32 nSeconds, sal_Int32 nPageNr = -1 );
-
/** Sets the transitional effect to be applied when the current page gets shown.
@param eType
diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx
index b14ebd5..c4a7479 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/vcl/inc/vcl/pdfwriter.hxx
@@ -763,7 +763,6 @@ The following structure describes the permissions used in PDF security
void DrawPixel( const Point& rPt, const Color& rColor );
void DrawPixel( const Point& rPt )
{ DrawPixel( rPt, Color( COL_TRANSPARENT ) ); }
- void DrawPixel( const Polygon& rPts, const Color* pColors = NULL );
void DrawPixel( const Polygon& rPts, const Color& rColor )
{ Push(); SetLineColor( rColor ); DrawPixel( rPts ); Pop(); }
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 23d81a4..67eb537 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -599,10 +599,6 @@ void PDFExtOutDevData::SetIsExportFormFields( const sal_Bool bExportFomtFields )
{
mbExportFormFields = bExportFomtFields;
}
-sal_Int32 PDFExtOutDevData::GetFormsFormat() const
-{
- return mnFormsFormat;
-}
void PDFExtOutDevData::SetFormsFormat( const sal_Int32 nFormsFormat )
{
mnFormsFormat = nFormsFormat;
@@ -721,27 +717,6 @@ sal_Int32 PDFExtOutDevData::CreateOutlineItem( sal_Int32 nParent, const rtl::OUS
mpGlobalSyncData->mParaInts.push_back( nDestID );
return mpGlobalSyncData->mCurId++;
}
-sal_Int32 PDFExtOutDevData::SetOutlineItemParent( sal_Int32 nItem, sal_Int32 nNewParent )
-{
- mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::SetOutlineItemParent );
- mpGlobalSyncData->mParaInts.push_back( nItem );
- mpGlobalSyncData->mParaInts.push_back( nNewParent );
- return 0;
-}
-sal_Int32 PDFExtOutDevData::SetOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText )
-{
- mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::SetOutlineItemText );
- mpGlobalSyncData->mParaInts.push_back( nItem );
- mpGlobalSyncData->mParaOUStrings.push_back( rText );
- return 0;
-}
-sal_Int32 PDFExtOutDevData::SetOutlineItemDest( sal_Int32 nItem, sal_Int32 nDestID )
-{
- mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::SetOutlineItemDest );
- mpGlobalSyncData->mParaInts.push_back( nItem );
- mpGlobalSyncData->mParaInts.push_back( nDestID );
- return 0;
-}
void PDFExtOutDevData::CreateNote( const Rectangle& rRect, const PDFNote& rNote, sal_Int32 nPageNr )
{
mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::CreateNote );
@@ -750,12 +725,6 @@ void PDFExtOutDevData::CreateNote( const Rectangle& rRect, const PDFNote& rNote,
mpGlobalSyncData->mParaPDFNotes.push_back( rNote );
mpGlobalSyncData->mParaInts.push_back( nPageNr == -1 ? mnPage : nPageNr );
}
-void PDFExtOutDevData::SetAutoAdvanceTime( sal_uInt32 nSeconds, sal_Int32 nPageNr )
-{
- mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::SetAutoAdvanceTime );
- mpGlobalSyncData->mParauInts.push_back( nSeconds );
- mpGlobalSyncData->mParaInts.push_back( nPageNr == -1 ? mnPage : nPageNr );
-}
void PDFExtOutDevData::SetPageTransition( PDFWriter::PageTransition eType, sal_uInt32 nMilliSec, sal_Int32 nPageNr )
{
mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::SetPageTransition );
@@ -840,11 +809,6 @@ void PDFExtOutDevData::BeginGroup()
{
mpPageSyncData->PushAction( mrOutDev, PDFExtOutDevDataSync::BeginGroup );
}
-
-void PDFExtOutDevData::EndGroup()
-{
- mpPageSyncData->PushAction( mrOutDev, PDFExtOutDevDataSync::EndGroup );
-}
void PDFExtOutDevData::EndGroup( const Graphic& rGraphic,
sal_uInt8 nTransparency,
const Rectangle& rOutputRect,
diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index 41b8b95..8392dc1 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.cxx
@@ -186,11 +186,6 @@ void PDFWriter::DrawPixel( const Point& rPos, const Color& rColor )
pImplementation->drawPixel( rPos, rColor );
}
-void PDFWriter::DrawPixel( const Polygon& rPts, const Color* pColors )
-{
- pImplementation->drawPixel( rPts, pColors );
-}
-
void PDFWriter::DrawBitmap( const Point& rDestPt, const Size& rDestSize, const Bitmap& rBitmap )
{
pImplementation->drawBitmap( rDestPt, rDestSize, rBitmap );
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 6b52a12..703b6f4 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -10256,83 +10256,6 @@ void PDFWriterImpl::drawWallpaper( const Rectangle& rRect, const Wallpaper& rWal
}
}
-void PDFWriterImpl::drawPolyPolygon( const PolyPolygon& rPolyPoly, sal_Int32 nPattern, bool bEOFill )
-{
- if( nPattern < 0 || nPattern >= (sal_Int32)m_aTilings.size() )
- return;
-
- m_aPages.back().endStream();
- sal_Int32 nXObject = createObject();
- OStringBuffer aNameBuf( 16 );
- aNameBuf.append( "Pol" );
- aNameBuf.append( nXObject );
- OString aObjName( aNameBuf.makeStringAndClear() );
- Rectangle aObjRect;
- if( updateObject( nXObject ) )
- {
- // get bounding rect of object
- PolyPolygon aSubDiv;
- rPolyPoly.AdaptiveSubdivide( aSubDiv );
- aObjRect = aSubDiv.GetBoundRect();
- Rectangle aConvObjRect( aObjRect );
- m_aPages.back().convertRect( aConvObjRect );
-
- // move polypolygon to bottom left of page
- PolyPolygon aLocalPath( rPolyPoly );
- sal_Int32 nPgWd = getReferenceDevice()->ImplGetDPIX() * m_aPages.back().getWidth() / 72;
- sal_Int32 nPgHt = getReferenceDevice()->ImplGetDPIY() * m_aPages.back().getHeight() / 72;
- Size aLogicPgSz = getReferenceDevice()->PixelToLogic( Size( nPgWd, nPgHt ), m_aGraphicsStack.front().m_aMapMode );
- sal_Int32 nXOff = aObjRect.Left();
- sal_Int32 nYOff = aLogicPgSz.Height() - aObjRect.Bottom();
- aLocalPath.Move( -nXOff, nYOff );
-
- // prepare XObject's content stream
- OStringBuffer aStream( 512 );
- aStream.append( "/Pattern cs /P" );
- aStream.append( m_aTilings[ nPattern ].m_nObject );
- aStream.append( " scn\n" );
- m_aPages.back().appendPolyPolygon( aLocalPath, aStream );
- aStream.append( bEOFill ? "f*" : "f" );
- SvMemoryStream aMemStream( aStream.getLength() );
- aMemStream.Write( aStream.getStr(), aStream.getLength() );
- bool bDeflate = compressStream( &aMemStream );
- aMemStream.Seek( STREAM_SEEK_TO_END );
- sal_Int32 nStreamLen = (sal_Int32)aMemStream.Tell();
- aMemStream.Seek( STREAM_SEEK_TO_BEGIN );
-
- // add new XObject to global resource dict
- m_aGlobalResourceDict.m_aXObjects[ aObjName ] = nXObject;
-
- // write XObject
- OStringBuffer aLine( 512 );
- aLine.append( nXObject );
- aLine.append( " 0 obj\n"
- "<</Type/XObject/Subtype/Form/BBox[0 0 " );
- appendFixedInt( aConvObjRect.GetWidth(), aLine );
- aLine.append( ' ' );
- appendFixedInt( aConvObjRect.GetHeight(), aLine );
- aLine.append( "]/Length " );
- aLine.append( nStreamLen );
- if( bDeflate )
- aLine.append( "/Filter/FlateDecode" );
- aLine.append( ">>\n"
- "stream\n" );
- writeBuffer( aLine.getStr(), aLine.getLength() );
- checkAndEnableStreamEncryption( nXObject );
- writeBuffer( aMemStream.GetData(), nStreamLen );
- disableStreamEncryption();
- writeBuffer( "\nendstream\nendobj\n\n", 19 );
- }
- m_aPages.back().beginStream();
- OStringBuffer aLine( 80 );
- aLine.append( "q 1 0 0 1 " );
- m_aPages.back().appendPoint( aObjRect.BottomLeft(), aLine );
- aLine.append( " cm/" );
- aLine.append( aObjName );
- aLine.append( " Do Q\n" );
- writeBuffer( aLine.getStr(), aLine.getLength() );
-}
-
void PDFWriterImpl::updateGraphicsState()
{
OStringBuffer aLine( 256 );
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index fd1c2d7..b5f1167 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -1248,7 +1248,6 @@ public:
void drawTransparent( const PolyPolygon& rPolyPoly, sal_uInt32 nTransparentPercent );
void beginTransparencyGroup();
void endTransparencyGroup( const Rectangle& rBoundingBox, sal_uInt32 nTransparentPercent );
- void drawPolyPolygon( const PolyPolygon& rPolyPoly, sal_Int32 nPattern, bool bEOFill );
void emitComment( const char* pComment );
--
1.7.8.3
More information about the LibreOffice
mailing list