summaryrefslogtreecommitdiffstats
path: root/vcl/generic
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2014-02-24 01:53:13 +1100
committerCaolán McNamara <caolanm@redhat.com>2014-02-28 03:19:47 -0600
commit381f8a5673b70e31fda2739da25f3863895ae665 (patch)
treed9366671e0e2794164ef6cbffbf3e53242139efb /vcl/generic
parentI guess const was intended here. (diff)
downloadcore-381f8a5673b70e31fda2739da25f3863895ae665.tar.gz
core-381f8a5673b70e31fda2739da25f3863895ae665.zip
sal_Bool -> bool in mostly vcl module
Conflicts: include/vcl/settings.hxx svtools/source/table/tablecontrol_impl.cxx sw/source/core/frmedt/fecopy.cxx vcl/inc/canvasbitmap.hxx vcl/inc/headless/svpframe.hxx vcl/inc/unx/salframe.h vcl/inc/win/salframe.h vcl/inc/win/salprn.h vcl/inc/win/salvd.h vcl/osx/DragSource.cxx vcl/osx/DragSource.hxx vcl/osx/DropTarget.cxx vcl/osx/DropTarget.hxx vcl/osx/OSXTransferable.cxx vcl/osx/OSXTransferable.hxx vcl/osx/clipboard.cxx vcl/osx/clipboard.hxx vcl/osx/salprn.cxx vcl/qa/cppunit/canvasbitmaptest.cxx vcl/source/components/fontident.cxx vcl/source/control/edit.cxx vcl/source/control/spinfld.cxx vcl/source/gdi/gdimtf.cxx vcl/source/gdi/virdev.cxx vcl/source/helper/canvasbitmap.cxx vcl/source/window/dockwin.cxx vcl/unx/generic/dtrans/X11_selection.hxx vcl/unx/kde/UnxFilePicker.cxx vcl/unx/kde/UnxFilePicker.hxx vcl/unx/kde4/KDE4FilePicker.cxx vcl/unx/kde4/KDE4FilePicker.hxx vcl/unx/kde4/KDESalFrame.hxx Change-Id: I9866d985da86dea2a56feff23f91c1467a1636b0 Reviewed-on: https://gerrit.libreoffice.org/8219 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/generic')
-rw-r--r--vcl/generic/glyphs/gcach_ftyp.cxx4
-rw-r--r--vcl/generic/print/common_gfx.cxx6
-rw-r--r--vcl/generic/print/genprnpsp.cxx8
-rw-r--r--vcl/generic/print/glyphset.cxx2
-rw-r--r--vcl/generic/print/printerjob.cxx4
5 files changed, 12 insertions, 12 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 4c2443b51e54..93cb40ec8ac8 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1138,7 +1138,7 @@ bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
((FT_OutlineGlyphRec*)pGlyphFT)->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
FT_Render_Mode nRenderMode = FT_RENDER_MODE_MONO;
- rc = FT_Glyph_To_Bitmap( &pGlyphFT, nRenderMode, NULL, sal_True );
+ rc = FT_Glyph_To_Bitmap( &pGlyphFT, nRenderMode, NULL, true );
if( rc != FT_Err_Ok )
{
FT_Done_Glyph( pGlyphFT );
@@ -1261,7 +1261,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
bool bEmbedded = (pGlyphFT->format == FT_GLYPH_FORMAT_BITMAP);
if( !bEmbedded )
{
- rc = FT_Glyph_To_Bitmap( &pGlyphFT, FT_RENDER_MODE_NORMAL, NULL, sal_True );
+ rc = FT_Glyph_To_Bitmap( &pGlyphFT, FT_RENDER_MODE_NORMAL, NULL, true );
if( rc != FT_Err_Ok )
{
FT_Done_Glyph( pGlyphFT );
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index ae8943cbd937..e7bb64467c10 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/generic/print/common_gfx.cxx
@@ -60,7 +60,7 @@ PrinterGfx::Init (PrinterJob &rPrinterJob)
mnDpi = rPrinterJob.GetResolution();
rPrinterJob.GetScale (mfScaleX, mfScaleY);
const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rPrinterJob.GetPrinterName() ) );
- mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False;
+ mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? true : false ) : false;
return true;
}
@@ -72,13 +72,13 @@ PrinterGfx::Init (const JobData& rData)
mpPageBody = NULL;
mnDepth = rData.m_nColorDepth;
mnPSLevel = rData.m_nPSLevel ? rData.m_nPSLevel : (rData.m_pParser ? rData.m_pParser->getLanguageLevel() : 2 );
- mbColor = rData.m_nColorDevice ? ( rData.m_nColorDevice == -1 ? sal_False : sal_True ) : (( rData.m_pParser ? (rData.m_pParser->isColorDevice() ? sal_True : sal_False ) : sal_True ) );
+ mbColor = rData.m_nColorDevice ? ( rData.m_nColorDevice == -1 ? false : true ) : (( rData.m_pParser ? (rData.m_pParser->isColorDevice() ? true : false ) : true ) );
int nRes = rData.m_aContext.getRenderResolution();
mnDpi = nRes;
mfScaleX = (double)72.0 / (double)mnDpi;
mfScaleY = (double)72.0 / (double)mnDpi;
const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rData.m_aPrinterName ) );
- mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False;
+ mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? true : false ) : false;
return true;
}
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 3fb28d2f17e2..f49af9aa7ce7 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -951,7 +951,7 @@ bool PspSalPrinter::StartJob(
#endif
m_aPrinterGfx.Init( m_aJobData );
- return m_aPrintJob.StartJob( ! m_aTmpFile.isEmpty() ? m_aTmpFile : m_aFileName, nMode, rJobName, rAppName, m_aJobData, &m_aPrinterGfx, bDirect ) ? sal_True : sal_False;
+ return m_aPrintJob.StartJob( ! m_aTmpFile.isEmpty() ? m_aTmpFile : m_aFileName, nMode, rJobName, rAppName, m_aJobData, &m_aPrinterGfx, bDirect ) ? true : false;
}
bool PspSalPrinter::EndJob()
@@ -986,12 +986,12 @@ bool PspSalPrinter::EndJob()
bool PspSalPrinter::AbortJob()
{
- bool bAbort = m_aPrintJob.AbortJob() ? sal_True : sal_False;
+ bool bAbort = m_aPrintJob.AbortJob() ? true : false;
GetSalData()->m_pInstance->jobEndedPrinterUpdate();
return bAbort;
}
-SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, sal_Bool )
+SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, bool )
{
OSL_TRACE("PspSalPrinter::StartPage");
@@ -1018,7 +1018,7 @@ bool PspSalPrinter::EndPage()
bool bResult = m_aPrintJob.EndPage();
m_aPrinterGfx.Clear();
OSL_TRACE("PspSalPrinter::EndPage");
- return bResult ? sal_True : sal_False;
+ return bResult ? true : false;
}
sal_uLong PspSalPrinter::GetErrorCode()
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index abb4b9d835a5..adf08a3cd34f 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -855,7 +855,7 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42
#else
(void)rOutFile; (void)rGfx; (void)bAllowType42; (void)rSuppliedFonts;
# warning FIXME: Missing OpenTTFontFile outside of Unix ...
- return sal_False;
+ return false;
#endif
}
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 6e15280f830f..b6ef32f69d2a 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -157,9 +157,9 @@ PrinterJob::IsColorPrinter () const
bool bColor = false;
if( m_aLastJobData.m_nColorDevice )
- bColor = m_aLastJobData.m_nColorDevice == -1 ? sal_False : sal_True;
+ bColor = m_aLastJobData.m_nColorDevice == -1 ? false : true;
else if( m_aLastJobData.m_pParser )
- bColor = m_aLastJobData.m_pParser->isColorDevice() ? sal_True : sal_False;
+ bColor = m_aLastJobData.m_pParser->isColorDevice() ? true : false;
return bColor;
}