Commits

Philipp Lohmann [pl]  committed 9ea1236

vcl122: #i117746# remove unused psp::PrinterGfx methods .

  • Participants
  • Parent commits 76c8d76

Comments (0)

Files changed (6)

File vcl/inc/printergfx.hxx

     std::list< GlyphSet > maPS3Font;
 
     sal_Int32       mnFontID;
-    sal_Int32       mnFallbackID;
     sal_Int32       mnTextAngle;
     bool           mbTextVertical;
     PrintFontManager& mrFontMgr; 
     fontID          getCharMetric (const Font3 &rFont, sal_Unicode n_char, 
                                    CharacterMetric *p_bbox);
     fontID          getFontSubstitute () const;
-    fontID          getFallbackID () const { return mnFallbackID; }
 
     bool            mbStrictSO52Compatibility;
 public:
     void            PSRotate (sal_Int32 nAngle);
     void            PSTranslate (const Point& rPoint);
     void            PSMoveTo (const Point& rPoint);
-    void            PSRMoveTo (sal_Int32 nDx, sal_Int32 nDy = 0);
     void            PSScale (double fScaleX, double fScaleY);
     void            PSLineTo(const Point& rPoint );
     void            PSPointOp (const Point& rPoint, const sal_Char* pOperator);
     void            Clear();
 
     // query depth and size 
-    void            GetResolution (sal_Int32 &rDpiX, sal_Int32 &rDpiY) const;
     sal_uInt16      GetBitCount ();
 
     // clip region
     // image drawing
     void            DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc, 
                                 const PrinterBmp& rBitmap);
-    void            DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc, 
-                                const PrinterBmp& rBitmap, 
-                                const PrinterBmp& rTransBitmap);
-    void            DrawMask   (const Rectangle& rDest, const Rectangle& rSrc, 
-                                const PrinterBmp &rBitmap, PrinterColor& rMaskColor);
 
     // font and text handling
     sal_uInt16      SetFont (
                              bool bArtItalic,
                              bool bArtBold
                              );
-    sal_uInt16      SetFallbackFont ( sal_Int32 nFontID );
     sal_Int32       GetFontAngle () const
     { return mnTextAngle; }
     sal_Int32       GetFontID () const
     sal_Int32       GetCharWidth (sal_uInt16 nFrom, sal_uInt16 nTo, 
                                   long *pWidthArray);
     const ::std::list< KernPair >& getKernPairs( bool bVertical = false ) const;
-    // advanced font handling
-    sal_Bool        GetGlyphBoundRect (sal_Unicode c, Rectangle& rOutRect);
-    sal_uInt32      GetGlyphOutline (sal_Unicode c, 
-                                     sal_uInt16 **ppPolySizes, Point **ppPoints, 
-                                     sal_uInt8 **ppFlags);
 
     // for CTL
     void			DrawGlyphs( const Point& rPoint,

File vcl/inc/printerjob.hxx

     sal_uInt16      GetPostscriptLevel (const JobData *pJobData = NULL) const;
     sal_Bool        IsColorPrinter () const;
 
-    osl::File*      GetDocumentHeader ();
-    osl::File*      GetDocumentTrailer ();
     osl::File*      GetCurrentPageHeader ();
     osl::File*      GetCurrentPageBody ();
 
 
     sal_Bool		StartPage (const JobData& rJobSetup);
     sal_Bool        EndPage ();
-
-    sal_uInt32      GetErrorCode ();
 };
 
 }  /* namespace psp */

File vcl/unx/generic/printergfx/bitmap_gfx.cxx

     PSGRestore ();
 }
 
-/* XXX does not work XXX */
-void
-PrinterGfx::DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc, 
-                        const PrinterBmp& /*rBitmap*/, const PrinterBmp& /*rTransBitmap*/)
-{
-    double fScaleX = (double)rDest.GetWidth() / (double)rSrc.GetWidth();
-    double fScaleY = (double)rDest.GetHeight() / (double)rSrc.GetHeight();
-
-    PSGSave ();
-    PSTranslate (rDest.BottomLeft());
-    PSScale (fScaleX, fScaleY); 
-    PSGRestore ();
-}
-
-/* XXX does not work XXX */
-void
-PrinterGfx::DrawMask   (const Rectangle& rDest, const Rectangle& rSrc, 
-                        const PrinterBmp &/*rBitmap*/, PrinterColor& /*rMaskColor*/)
-{
-    double fScaleX = (double)rDest.GetWidth() / (double)rSrc.GetWidth();
-    double fScaleY = (double)rDest.GetHeight() / (double)rSrc.GetHeight();
-
-    PSGSave ();
-    PSTranslate (rDest.BottomLeft());
-    PSScale (fScaleX, fScaleY); 
-    PSGRestore ();
-}
-
 /*
  *
  * Implementation: PS Level 1

File vcl/unx/generic/printergfx/common_gfx.cxx

     return sal_True;
 }
 
-void
-PrinterGfx::GetResolution (sal_Int32 &rDpiX, sal_Int32 &rDpiY) const
-{
-    rDpiX = mnDpi;
-    rDpiY = mnDpi;
-}
-
 sal_uInt16
 PrinterGfx::GetBitCount ()
 {
         mpPageHeader (NULL),
         mpPageBody (NULL),
         mnFontID (0),
-        mnFallbackID (0),
         mnTextAngle (0),
         mbTextVertical (false),
         mrFontMgr (PrintFontManager::get()),
     PSPointOp (rPoint, "lineto");
 }
 
-void
-PrinterGfx::PSRMoveTo (sal_Int32 nDx, sal_Int32 nDy)
-{
-    Point aPoint(nDx, nDy);
-    PSPointOp (aPoint, "rmoveto");
-}
-
 /* get a compressed representation of the path information */
 
 #define DEBUG_BINPATH 0

File vcl/unx/generic/printergfx/printerjob.cxx

 }
 
 osl::File*
-PrinterJob::GetDocumentHeader ()
-{
-    return mpJobHeader;
-}
-
-osl::File*
-PrinterJob::GetDocumentTrailer ()
-{
-    return mpJobTrailer;
-}
-
-osl::File*
 PrinterJob::GetCurrentPageHeader ()
 {
     return maHeaderList.back();
 namespace psp
 {
 
-/* check whether the given name points to a directory which is 
-   usable for the user */
-sal_Bool
-existsTmpDir (const char* pName)
-{
-    struct stat aFileStatus;
-
-    if (pName == NULL)
-        return sal_False;
-    if (stat(pName, &aFileStatus) != 0)
-        return sal_False;
-    if (! S_ISDIR(aFileStatus.st_mode))
-        return sal_False;
-
-    return access(pName, W_OK | R_OK) == 0 ? sal_True : sal_False; 
-}
-
 /* return the username in the given buffer */
 sal_Bool
 getUserName (char* pName, int nSize)
     return sal_True;
 }
 
-sal_uInt32
-PrinterJob::GetErrorCode ()
-{
-    /* TODO */
-    return 0;
-}
-
 struct less_ppd_key : public ::std::binary_function<double, double, bool>
 {
     bool operator()(const PPDKey* left, const PPDKey* right) 

File vcl/unx/generic/printergfx/text_gfx.cxx

 {
 	mpFont[0] = rGfx.getFontSubstitute();
 	mpFont[1] = rGfx.GetFontID(); 
-	mpFont[2] = rGfx.getFallbackID();
-	// mpFont[2] = rGfx.GetFontID();
+	mpFont[2] = 0;
 
    	PrintFontManager &rMgr = PrintFontManager::get(); 
 	mbSymbol = mpFont[1] != -1 ? 
     return 0;
 }
 
-sal_uInt16      
-PrinterGfx::SetFallbackFont ( sal_Int32 nFontID )
-{
-    mnFallbackID = nFontID;
-    return 0;
-}
-
 void PrinterGfx::drawGlyphs(
                             const Point& rPoint,
                             sal_uInt32* pGlyphIds,
     }
     return mrFontMgr.getKernPairs( nFont, bVertical );
 }
-
-/*
- * advanced glyph handling
- */
-
-sal_Bool    
-PrinterGfx::GetGlyphBoundRect (sal_Unicode /*c*/, Rectangle& /*rOutRect*/)
-{
-    return 0;
-}
-
-sal_uInt32  
-PrinterGfx::GetGlyphOutline (sal_Unicode /*c*/, 
-                             sal_uInt16 **/*ppPolySizes*/, Point **/*ppPoints*/, sal_uInt8 **/*ppFlags*/)
-{
-    return 0;
-}
-
 /*
  * spool the converted truetype fonts to the page header after the page body is 
  * complete