diff options
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/vcl/outdev.hxx | 31 | ||||
| -rw-r--r-- | vcl/inc/vcl/pdfwriter.hxx | 8 | ||||
| -rw-r--r-- | vcl/inc/vcl/print.hxx | 21 | ||||
| -rw-r--r-- | vcl/inc/vcl/salgdi.hxx | 3 | ||||
| -rw-r--r-- | vcl/inc/vcl/window.h | 4 |
5 files changed, 39 insertions, 28 deletions
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index 761657067543..6d8f9f70492d 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -1087,6 +1087,37 @@ public: LanguageType eLang, ULONG nFlags, const OutputDevice* pOutDev = NULL ); + + /** helper method removing transparencies from a metafile (e.g. for printing) + + @returns + true: transparencies were removed + false: output metafile is unchanged input metafile + + @attention this is a member method, so current state can influence the result ! + */ + bool RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, GDIMetaFile& rOutMtf, + long nMaxBmpDPIX, long nMaxBmpDPIY, + bool bReduceTransparency, + bool bTransparencyAutoMode, + bool bDownsampleBitmaps + ); + /** Retrieve downsampled and cropped bitmap + + @attention This method ignores negative rDstSz values, thus + mirroring must happen outside this method (e.g. in DrawBitmap) + */ + Bitmap GetDownsampledBitmap( const Size& rDstSz, + const Point& rSrcPt, const Size& rSrcSz, + const Bitmap& rBmp, long nMaxBmpDPIX, long nMaxBmpDPIY ); + /** Retrieve downsampled and cropped bitmapEx + + @attention This method ignores negative rDstSz values, thus + mirroring must happen outside this method (e.g. in DrawBitmapEx) + */ + BitmapEx GetDownsampledBitmapEx( const Size& rDstSz, + const Point& rSrcPt, const Size& rSrcSz, + const BitmapEx& rBmpEx, long nMaxBmpDPIX, long nMaxBmpDPIY ); }; #endif // _SV_OUTDEV_HXX diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx index 80bcda8968c1..c69553b8f3de 100644 --- a/vcl/inc/vcl/pdfwriter.hxx +++ b/vcl/inc/vcl/pdfwriter.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: pdfwriter.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.86.1 $ * * This file is part of OpenOffice.org. * @@ -224,7 +224,11 @@ public: // a form action was exported that is not suitable for PDF/A // the action was skipped - Warning_FormAction_Omitted_PDFA + Warning_FormAction_Omitted_PDFA, + + // transparent objects were converted to a bitmap in order + // to removetransparencies from the output + Warning_Transparency_Converted }; struct VCL_DLLPUBLIC AnyWidget diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx index c6a4a6c1adf9..2f579f4e4dc2 100644 --- a/vcl/inc/vcl/print.hxx +++ b/vcl/inc/vcl/print.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: print.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.86.1 $ * * This file is part of OpenOffice.org. * @@ -47,7 +47,6 @@ class SalPrinter; class VirtualDevice; class Window; class ImplQPrinter; -class RmPrinter; struct ImplPrivatePrinterData; namespace com { namespace sun { namespace star { namespace uno { @@ -273,24 +272,6 @@ private: #ifdef _SPOOLPRINTER_EXT public: - void GetPreparedMetaFile( const GDIMetaFile& rInMtf, GDIMetaFile& rOutMtf, - long nMaxBmpDPIX, long nMaxBmpDPIY ); - /** Retrieve downsampled and cropped bitmap - - @attention This method ignores negative rDstSz values, thus - mirroring must happen outside this method (e.g. in DrawBitmap) - */ - Bitmap GetPreparedBitmap( const Size& rDstSz, - const Point& rSrcPt, const Size& rSrcSz, - const Bitmap& rBmp, long nMaxBmpDPIX, long nMaxBmpDPIY ); - /** Retrieve downsampled and cropped bitmapEx - - @attention This method ignores negative rDstSz values, thus - mirroring must happen outside this method (e.g. in DrawBitmapEx) - */ - BitmapEx GetPreparedBitmapEx( const Size& rDstSz, - const Point& rSrcPt, const Size& rSrcSz, - const BitmapEx& rBmpEx, long nMaxBmpDPIX, long nMaxBmpDPIY ); void DrawGradientEx( OutputDevice* pOut, const Rectangle& rRect, const Gradient& rGradient ); void DrawGradientEx( OutputDevice* pOut, const PolyPolygon& rPolyPoly, const Gradient& rGradient ); diff --git a/vcl/inc/vcl/salgdi.hxx b/vcl/inc/vcl/salgdi.hxx index 207bfbf1e46f..b651a8d02ade 100644 --- a/vcl/inc/vcl/salgdi.hxx +++ b/vcl/inc/vcl/salgdi.hxx @@ -191,9 +191,6 @@ public: // get device resolution virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) = 0; - // get resolution for fonts (an implementations specific adjustment, - // ideally would be the same as the Resolution) - virtual void GetScreenFontResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) = 0; // get the depth of the device virtual USHORT GetBitCount() = 0; // get the width of the device diff --git a/vcl/inc/vcl/window.h b/vcl/inc/vcl/window.h index de70cedf5083..d745f3dcf081 100644 --- a/vcl/inc/vcl/window.h +++ b/vcl/inc/vcl/window.h @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: window.h,v $ - * $Revision: 1.7 $ + * $Revision: 1.6.86.2 $ * * This file is part of OpenOffice.org. * @@ -165,8 +165,6 @@ struct ImplFrameData ImplFontCache* mpFontCache; // Font-Cache for this frame sal_Int32 mnDPIX; // Original Screen Resolution sal_Int32 mnDPIY; // Original Screen Resolution - sal_Int32 mnFontDPIX; // Original Font Resolution - sal_Int32 mnFontDPIY; // Original Font Resolution ImplMapRes maMapUnitRes; // for LogicUnitToPixel ULONG mnAllSaveBackSize; // Groesse aller Bitmaps fuer Hintergrund-Sicherung ULONG mnFocusId; // FocusId for PostUserLink |