summaryrefslogtreecommitdiff
path: root/vcl/generic/print
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-02 16:45:44 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-02 16:54:18 +0300
commit50bf123ddbeb457b89636621a99c971834adf3ab (patch)
treeb7782261998ca0b6bece98543e2c66e3c96f4d3c /vcl/generic/print
parentdb1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff)
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/generic/print')
-rw-r--r--vcl/generic/print/bitmap_gfx.cxx1
-rw-r--r--vcl/generic/print/common_gfx.cxx3
-rw-r--r--vcl/generic/print/genprnpsp.cxx6
-rw-r--r--vcl/generic/print/genpspgraphics.cxx29
-rw-r--r--vcl/generic/print/glyphset.cxx2
-rw-r--r--vcl/generic/print/glyphset.hxx1
-rw-r--r--vcl/generic/print/printerjob.cxx3
-rw-r--r--vcl/generic/print/prtsetup.cxx22
-rw-r--r--vcl/generic/print/psputil.cxx2
-rw-r--r--vcl/generic/print/text_gfx.cxx1
10 files changed, 0 insertions, 70 deletions
diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/generic/print/bitmap_gfx.cxx
index e3f6f44e1e4f..4b7017b6b70f 100644
--- a/vcl/generic/print/bitmap_gfx.cxx
+++ b/vcl/generic/print/bitmap_gfx.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "psputil.hxx"
#include "generic/printergfx.hxx"
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index 3b1f87e88ebb..c5cc108c5e8e 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/generic/print/common_gfx.cxx
@@ -436,7 +436,6 @@ PrinterGfx::DrawPolyPolygon (sal_uInt32 nPoly, const sal_uInt32* pSizes, const P
if ( !nPoly || !pPaths || !(maFillColor.Is() || maLineColor.Is()))
return;
-
// setup closed path
for( unsigned int i = 0; i < nPoly; i++ )
{
@@ -597,7 +596,6 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints,
if ( !nPoly || !pPtAry || !pPoints || !(maFillColor.Is() || maLineColor.Is()))
return;
-
for (unsigned int i=0; i<nPoly;i++)
{
sal_uInt32 nPoints = pPoints[i];
@@ -654,7 +652,6 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints,
PSGRestore();
}
-
/*
* postscript generating routines
*/
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index d6e891192e2e..12ffe7a1f03b 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
/**
this file implements the sal printer interface ( SalPrinter, SalInfoPrinter
and some printer relevant methods of SalInstance and SalGraphicsData )
@@ -64,7 +63,6 @@
using namespace psp;
using namespace com::sun::star;
-
/*
* static helpers
*/
@@ -717,7 +715,6 @@ void PspSalInfoPrinter::GetPageInfo(
int left = 0, top = 0, right = 0, bottom = 0;
int nDPI = aData.m_aContext.getRenderResolution();
-
if( aData.m_eOrientation == psp::orientation::Portrait )
{
aData.m_aContext.getPageSize( aPaper, width, height );
@@ -1268,7 +1265,6 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo
return true;
}
-
class PrinterUpdate
{
static Timer* pPrinterUpdateTimer;
@@ -1293,8 +1289,6 @@ void PrinterUpdate::doUpdate()
pInst->PostPrintersChanged();
}
-
-
IMPL_STATIC_LINK_NOINSTANCE( PrinterUpdate, UpdateTimerHdl, void*, EMPTYARG )
{
if( nActiveJobs < 1 )
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 5a6aecd5b2eb..33846e2f88c3 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -58,7 +58,6 @@
using namespace psp;
-
// ----- Implementation of PrinterBmp by means of SalBitmap/BitmapBuffer ---------------
class SalPrinterBmp : public psp::PrinterBmp
@@ -558,8 +557,6 @@ void GenPspGraphics::invert(long,long,long,long,SalInvert)
OSL_FAIL("Warning: PrinterGfx::Invert() not implemented");
}
-
-
class ImplPspFontData : public PhysicalFontFace
{
private:
@@ -574,23 +571,17 @@ public:
static bool CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( PSPFD_MAGIC ); }
};
-
-
ImplPspFontData::ImplPspFontData( const psp::FastPrintFontInfo& rInfo )
: PhysicalFontFace( GenPspGraphics::Info2DevFontAttributes(rInfo), PSPFD_MAGIC ),
mnFontId( rInfo.m_nID )
{}
-
-
ImplFontEntry* ImplPspFontData::CreateFontInstance( FontSelectPattern& rFSD ) const
{
ImplServerFontEntry* pEntry = new ImplServerFontEntry( rFSD );
return pEntry;
}
-
-
class PspFontLayout : public GenericSalLayout
{
public:
@@ -608,8 +599,6 @@ private:
bool mbArtBold;
};
-
-
PspFontLayout::PspFontLayout( ::psp::PrinterGfx& rGfx )
: mrPrinterGfx( rGfx )
{
@@ -621,8 +610,6 @@ PspFontLayout::PspFontLayout( ::psp::PrinterGfx& rGfx )
mbArtBold = mrPrinterGfx.GetArtificialBold();
}
-
-
bool PspFontLayout::LayoutText( ImplLayoutArgs& rArgs )
{
mbVertical = ((rArgs.mnFlags & SAL_LAYOUT_VERTICAL) != 0);
@@ -721,8 +708,6 @@ void PspServerFontLayout::InitFont() const
mnOrientation, mbVertical, mbArtItalic, mbArtBold );
}
-
-
static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx, bool bIsPspServerFontLayout )
{
const int nMaxGlyphs = 200;
@@ -778,16 +763,12 @@ static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx
}
}
-
-
void PspFontLayout::InitFont() const
{
mrPrinterGfx.SetFont( mnFontID, mnFontHeight, mnFontWidth,
mnOrientation, mbVertical, mbArtItalic, mbArtBold );
}
-
-
void PspFontLayout::DrawText( SalGraphics& ) const
{
DrawPrinterLayout( *this, mrPrinterGfx, false );
@@ -1002,8 +983,6 @@ SalLayout* GenPspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
return pLayout;
}
-
-
bool GenPspGraphics::CreateFontSubset(
const OUString& rToFile,
const PhysicalFontFace* pFont,
@@ -1032,8 +1011,6 @@ bool GenPspGraphics::CreateFontSubset(
return bSuccess;
}
-
-
const Ucs2SIntMap* GenPspGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded )
{
// in this context the pFont->GetFontId() is a valid PSP
@@ -1045,8 +1022,6 @@ const Ucs2SIntMap* GenPspGraphics::GetFontEncodingVector( const PhysicalFontFace
return GenPspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded );
}
-
-
void GenPspGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
bool bVertical,
Int32Vector& rWidths,
@@ -1085,7 +1060,6 @@ void GenPspGraphics::DoGetGlyphWidths( psp::fontID aFont,
rMgr.getGlyphWidths( aFont, bVertical, rWidths, rUnicodeEnc );
}
-
ImplDevFontAttributes GenPspGraphics::Info2DevFontAttributes( const psp::FastPrintFontInfo& rInfo )
{
ImplDevFontAttributes aDFA;
@@ -1161,8 +1135,6 @@ namespace vcl
}
}
-
-
void GenPspGraphics::AnnounceFonts( PhysicalFontCollection* pFontCollection, const psp::FastPrintFontInfo& aInfo )
{
int nQuality = 0;
@@ -1215,7 +1187,6 @@ bool GenPspGraphics::drawTransformedBitmap(
return false;
}
-
bool GenPspGraphics::drawAlphaRect( long, long, long, long, sal_uInt8 )
{
return false;
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index adf08a3cd34f..9a87b7e26c62 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "glyphset.hxx"
#include "psputil.hxx"
@@ -43,7 +42,6 @@
using namespace vcl;
using namespace psp;
-
GlyphSet::GlyphSet (sal_Int32 nFontID, bool bVertical)
: mnFontID (nFontID),
mbVertical (bVertical)
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx
index f5cec42d9c0e..d8cd49d22be3 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/generic/print/glyphset.hxx
@@ -118,7 +118,6 @@ public:
bool PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< OString >& rSuppliedFonts );
};
-
} /* namespace psp */
#endif
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 9575169fb1fe..48d996729e73 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -47,7 +46,6 @@
using namespace psp;
-
// forward declaration
#define nBLOCKSIZE 0x2000
@@ -580,7 +578,6 @@ PrinterJob::InitPaperSize (const JobData& rJobSetup)
mfYScale = -1.0 * (double)72.0 / (double)mnResolution;
}
-
bool
PrinterJob::StartPage (const JobData& rJobSetup)
{
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index 32f4c6ccc7ab..ea93c2df1abf 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -67,8 +67,6 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con
rBox.SelectEntry( m_aInvalidString );
}
-
-
/*
* RTSDialog
*/
@@ -128,8 +126,6 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl )
return 0;
}
-
-
IMPL_LINK( RTSDialog, ClickButton, Button*, pButton )
{
if( pButton == m_pOKButton )
@@ -156,8 +152,6 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton )
return 0;
}
-
-
/*
* RTSPaperPage
*/
@@ -194,14 +188,10 @@ RTSPaperPage::RTSPaperPage(RTSDialog* pParent)
update();
}
-
-
RTSPaperPage::~RTSPaperPage()
{
}
-
-
void RTSPaperPage::update()
{
const PPDKey* pKey = NULL;
@@ -247,8 +237,6 @@ void RTSPaperPage::update()
}
}
-
-
IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
{
const PPDKey* pKey = NULL;
@@ -281,8 +269,6 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
return 0;
}
-
-
/*
* RTSDevicePage
*/
@@ -371,14 +357,10 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent )
}
}
-
-
RTSDevicePage::~RTSDevicePage()
{
}
-
-
void RTSDevicePage::update()
{
}
@@ -407,8 +389,6 @@ sal_uLong RTSDevicePage::getColorDevice()
return 0;
}
-
-
sal_uLong RTSDevicePage::getLevel()
{
sal_uLong nLevel = (sal_uLong)m_pLevelBox->GetEntryData( m_pLevelBox->GetSelectEntryPos() );
@@ -417,8 +397,6 @@ sal_uLong RTSDevicePage::getLevel()
return nLevel < 10 ? nLevel-1 : 0;
}
-
-
sal_uLong RTSDevicePage::getPDFDevice()
{
sal_uLong nLevel = (sal_uLong)m_pLevelBox->GetEntryData( m_pLevelBox->GetSelectEntryPos() );
diff --git a/vcl/generic/print/psputil.cxx b/vcl/generic/print/psputil.cxx
index 3c409d9c6e57..9d47556fb3d4 100644
--- a/vcl/generic/print/psputil.cxx
+++ b/vcl/generic/print/psputil.cxx
@@ -89,7 +89,6 @@ getAlignedHexValueOf (sal_Int32 nValue, sal_Char* pBuffer)
return nRet;
}
-
sal_Int32
getValueOf (sal_Int32 nValue, sal_Char* pBuffer)
{
@@ -245,7 +244,6 @@ ConverterFactory& GetConverterFactory()
return theConverterFactory::get();
}
-
} /* namespace psp */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx
index 71662cf58ac6..40a7dad60558 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <math.h>
#include "psputil.hxx"