[Libreoffice-commits] core.git: include/vcl sw/source vcl/generic vcl/source
Chris Sherlock
chris.sherlock79 at gmail.com
Thu Apr 24 19:28:11 PDT 2014
include/vcl/outdev.hxx | 4 ++--
sw/source/core/docnode/ndnotxt.cxx | 4 ++--
sw/source/core/view/vprint.cxx | 2 +-
vcl/generic/print/genprnpsp.cxx | 4 ++--
vcl/source/filter/wmf/emfwr.cxx | 2 +-
vcl/source/gdi/pdfwriter_impl.cxx | 10 +++++-----
vcl/source/gdi/print3.cxx | 10 +++++-----
vcl/source/outdev/font.cxx | 2 +-
vcl/source/window/decoview.cxx | 4 ++--
vcl/source/window/printdlg.cxx | 2 +-
vcl/source/window/window.cxx | 8 ++++----
11 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 927617d69a25cffffd96aed8aa14a738b2ba6983
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Fri Apr 25 12:18:31 2014 +1000
Renamed ImplGetDPI(X|Y) to GetDPI(X|Y)
Change-Id: If76b99589ddd83431593404c1034b8b726bc3f9b
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 377208f..e4b40ce 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -434,13 +434,13 @@ public:
@returns x-axis DPI value
*/
- SAL_DLLPRIVATE sal_Int32 ImplGetDPIX() const { return mnDPIX; }
+ SAL_DLLPRIVATE sal_Int32 GetDPIX() const { return mnDPIX; }
/** Get the output device's DPI y-axis value.
@returns y-axis DPI value
*/
- SAL_DLLPRIVATE sal_Int32 ImplGetDPIY() const { return mnDPIY; }
+ SAL_DLLPRIVATE sal_Int32 GetDPIY() const { return mnDPIY; }
///@}
/** @name Clipping functions
diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
index ef9b2af..46286b6 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -160,8 +160,8 @@ const PolyPolygon *SwNoTxtNode::HasContour() const
// #i102238#
if ( nGrfDPIx != 0 && nGrfDPIy != 0 )
{
- rPoly[i] = Point( rPoly[i].getX() * pOutDev->ImplGetDPIX() / nGrfDPIx,
- rPoly[i].getY() * pOutDev->ImplGetDPIY() / nGrfDPIy );
+ rPoly[i] = Point( rPoly[i].getX() * pOutDev->GetDPIX() / nGrfDPIx,
+ rPoly[i].getY() * pOutDev->GetDPIY() / nGrfDPIy );
}
}
else
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 0022fff..cd08f4c 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -542,7 +542,7 @@ sal_Bool SwViewShell::PrintOrPDFExport(
long nShiftY = (nOrigHeight-nNewHeight)/2;
pRecorder->Scale(fScale, fScale);
pRecorder->WindStart();
- pRecorder->Move(0, nShiftY, pOutDev->ImplGetDPIX(), pOutDev->ImplGetDPIY());
+ pRecorder->Move(0, nShiftY, pOutDev->GetDPIX(), pOutDev->GetDPIY());
pRecorder->WindStart();
}
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index c1331d2..fc85e21 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -1069,8 +1069,8 @@ bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJo
bool bAborted = false;
PDFNewJobParameters aLastParm;
- aContext.DPIx = pPrinter->ImplGetDPIX();
- aContext.DPIy = pPrinter->ImplGetDPIY();
+ aContext.DPIx = pPrinter->GetDPIX();
+ aContext.DPIy = pPrinter->GetDPIY();
for( int nPage = 0; nPage < nAllPages && ! bAborted; nPage++ )
{
if( nPage == nAllPages-1 )
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index e518cdd..3563f0e 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -319,7 +319,7 @@ bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pFilterConf
ImplEndRecord();
ImplBeginRecord( WIN_EMR_SETVIEWPORTEXTEX );
- m_rStm.WriteInt32( (sal_Int32) maVDev.ImplGetDPIX() ).WriteInt32( (sal_Int32) maVDev.ImplGetDPIY() );
+ m_rStm.WriteInt32( (sal_Int32) maVDev.GetDPIX() ).WriteInt32( (sal_Int32) maVDev.GetDPIY() );
ImplEndRecord();
ImplBeginRecord( WIN_EMR_SETWINDOWEXTEX );
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 6dcaf0a..e2d5226 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1654,7 +1654,7 @@ bool PDFWriterImpl::PDFPage::appendLineInfo( const LineInfo& rInfo, OStringBuffe
else if( rInfo.GetWidth() == 0 )
{
// "pixel" line
- appendDouble( 72.0/double(m_pWriter->getReferenceDevice()->ImplGetDPIX()), rBuffer );
+ appendDouble( 72.0/double(m_pWriter->getReferenceDevice()->GetDPIX()), rBuffer );
rBuffer.append( " w\n" );
}
@@ -2271,7 +2271,7 @@ sal_Int32 PDFWriterImpl::newPage( sal_Int32 nPageWidth, sal_Int32 nPageHeight, P
// setup global graphics state
// linewidth is "1 pixel" by default
OStringBuffer aBuf( 16 );
- appendDouble( 72.0/double(getReferenceDevice()->ImplGetDPIX()), aBuf );
+ appendDouble( 72.0/double(getReferenceDevice()->GetDPIX()), aBuf );
aBuf.append( " w\n" );
writeBuffer( aBuf.getStr(), aBuf.getLength() );
@@ -4745,7 +4745,7 @@ Font PDFWriterImpl::drawFieldBorder( PDFWidget& rIntern,
{
if( rWidget.Border && rWidget.BorderColor == Color( COL_TRANSPARENT ) )
{
- sal_Int32 nDelta = getReferenceDevice()->ImplGetDPIX() / 500;
+ sal_Int32 nDelta = getReferenceDevice()->GetDPIX() / 500;
if( nDelta < 1 )
nDelta = 1;
setLineColor( Color( COL_TRANSPARENT ) );
@@ -9301,9 +9301,9 @@ void PDFWriterImpl::drawPixel( const Point& rPoint, const Color& rColor )
OStringBuffer aLine( 20 );
m_aPages.back().appendPoint( rPoint, aLine );
aLine.append( ' ' );
- appendDouble( 1.0/double(getReferenceDevice()->ImplGetDPIX()), aLine );
+ appendDouble( 1.0/double(getReferenceDevice()->GetDPIX()), aLine );
aLine.append( ' ' );
- appendDouble( 1.0/double(getReferenceDevice()->ImplGetDPIY()), aLine );
+ appendDouble( 1.0/double(getReferenceDevice()->GetDPIY()), aLine );
aLine.append( " re f\n" );
writeBuffer( aLine.getStr(), aLine.getLength() );
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index d64213e..ad7a8ba 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -1074,7 +1074,7 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
o_rMtf.WindStart();
long nDX = (aPaperSize.Width() - aPageSize.aSize.Width()) / 2;
long nDY = (aPaperSize.Height() - aPageSize.aSize.Height()) / 2;
- o_rMtf.Move( nDX, nDY, mpImplData->mpPrinter->ImplGetDPIX(), mpImplData->mpPrinter->ImplGetDPIY() );
+ o_rMtf.Move( nDX, nDY, mpImplData->mpPrinter->GetDPIX(), mpImplData->mpPrinter->GetDPIY() );
o_rMtf.WindStart();
o_rMtf.SetPrefSize( aPaperSize );
aPageSize.aSize = aPaperSize;
@@ -1161,7 +1161,7 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte
long nOffY = (aSubPageSize.Height() - long(double(aPageSize.aSize.Height()) * fScale)) / 2;
long nX = rMPS.nLeftMargin + nOffX + nAdvX * nCellX;
long nY = rMPS.nTopMargin + nOffY + nAdvY * nCellY;
- aPageFile.Move( nX, nY, mpImplData->mpPrinter->ImplGetDPIX(), mpImplData->mpPrinter->ImplGetDPIY() );
+ aPageFile.Move( nX, nY, mpImplData->mpPrinter->GetDPIX(), mpImplData->mpPrinter->GetDPIY() );
aPageFile.WindStart();
// calculate border rectangle
Rectangle aSubPageRect( Point( nX, nY ),
@@ -1193,8 +1193,8 @@ int PrinterController::getFilteredPageCount()
sal_uLong PrinterController::removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFile& o_rOut )
{
sal_uLong nRestoreDrawMode = mpImplData->mpPrinter->GetDrawMode();
- sal_Int32 nMaxBmpDPIX = mpImplData->mpPrinter->ImplGetDPIX();
- sal_Int32 nMaxBmpDPIY = mpImplData->mpPrinter->ImplGetDPIY();
+ sal_Int32 nMaxBmpDPIX = mpImplData->mpPrinter->GetDPIX();
+ sal_Int32 nMaxBmpDPIY = mpImplData->mpPrinter->GetDPIY();
const PrinterOptions& rPrinterOptions = mpImplData->mpPrinter->GetPrinterOptions();
@@ -1290,7 +1290,7 @@ void PrinterController::printFilteredPage( int i_nPage )
{
Point aPageOffset( mpImplData->mpPrinter->GetPageOffset() );
aPageFile.WindStart();
- aPageFile.Move( -aPageOffset.X(), -aPageOffset.Y(), mpImplData->mpPrinter->ImplGetDPIX(), mpImplData->mpPrinter->ImplGetDPIY() );
+ aPageFile.Move( -aPageOffset.X(), -aPageOffset.Y(), mpImplData->mpPrinter->GetDPIX(), mpImplData->mpPrinter->GetDPIY() );
}
GDIMetaFile aCleanedFile;
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 30dad6e..abec782 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1431,7 +1431,7 @@ void ImplFontMetricData::ImplInitTextLineSize( const OutputDevice* pDev )
/* #117909#
* add some pixels to minimum double line distance on higher resolution devices
*/
- long nMin2LineDY = 1 + pDev->ImplGetDPIY()/150;
+ long nMin2LineDY = 1 + pDev->GetDPIY()/150;
if ( n2LineDY < nMin2LineDY )
n2LineDY = nMin2LineDY;
long n2LineDY2 = n2LineDY/2;
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index d16295e..ad68d45 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -421,8 +421,8 @@ void ImplDrawSymbol( OutputDevice* pDev, Rectangle nRect, const SymbolType eType
void ImplDrawDPILineRect( OutputDevice *const pDev, Rectangle& rRect,
const Color *const pColor, const bool bRound = false )
{
- long nLineWidth = pDev->ImplGetDPIX()/300;
- long nLineHeight = pDev->ImplGetDPIY()/300;
+ long nLineWidth = pDev->GetDPIX()/300;
+ long nLineHeight = pDev->GetDPIY()/300;
if ( !nLineWidth )
nLineWidth = 1;
if ( !nLineHeight )
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index e7a4284..00e9e5f 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1334,7 +1334,7 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache )
mpPreviewWindow->setPreview( aMtf, aCurPageSize,
aPrt->GetPaperName( false ),
nPages > 0 ? OUString() : maNoPageStr,
- aPrt->ImplGetDPIX(), aPrt->ImplGetDPIY(),
+ aPrt->GetDPIX(), aPrt->GetDPIY(),
aPrt->GetPrinterOptions().IsConvertToGreyscales()
);
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 320f95a..05875e5 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -9256,10 +9256,10 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
mbDevOutput = true;
const OutputDevice *pOutDev = GetOutDev();
- long nOldDPIX = pOutDev->ImplGetDPIX();
- long nOldDPIY = pOutDev->ImplGetDPIY();
- mnDPIX = i_pTargetOutDev->ImplGetDPIX();
- mnDPIY = i_pTargetOutDev->ImplGetDPIY();
+ long nOldDPIX = pOutDev->GetDPIX();
+ long nOldDPIY = pOutDev->GetDPIY();
+ mnDPIX = i_pTargetOutDev->GetDPIX();
+ mnDPIY = i_pTargetOutDev->GetDPIY();
bool bOutput = IsOutputEnabled();
EnableOutput();
More information about the Libreoffice-commits
mailing list