diff options
Diffstat (limited to 'vcl')
241 files changed, 5230 insertions, 5214 deletions
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 004f17e30ddb..afd6ed58f8f3 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -233,7 +233,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr table[ i ] = 256*nPage + i; int nCharacters = nPage < 255 ? 256 : 254; - MapString( pTTFont, table, nCharacters, NULL, 0 ); + MapString( pTTFont, table, nCharacters, NULL, false ); TTSimpleGlyphMetrics* pMetrics = GetTTSimpleCharMetrics( pTTFont, nPage*256, nCharacters, 0 ); if( pMetrics ) { @@ -252,7 +252,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr for( i = 0; i < 256; i++ ) table_vert[ i ] = 256*nPage + i; - MapString( pTTFont, table_vert, nCharacters, NULL, 1 ); + MapString( pTTFont, table_vert, nCharacters, NULL, true ); pMetrics = GetTTSimpleCharMetrics( pTTFont, nPage*256, nCharacters, 1 ); if( pMetrics ) { diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx index 84d3afcef575..ae8943cbd937 100644 --- a/vcl/generic/print/common_gfx.cxx +++ b/vcl/generic/print/common_gfx.cxx @@ -48,7 +48,7 @@ GraphicsStatus::GraphicsStatus() : * non graphics graphics routines */ -sal_Bool +bool PrinterGfx::Init (PrinterJob &rPrinterJob) { mpPageHeader = rPrinterJob.GetCurrentPageHeader (); @@ -62,10 +62,10 @@ PrinterGfx::Init (PrinterJob &rPrinterJob) const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rPrinterJob.GetPrinterName() ) ); mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False; - return sal_True; + return true; } -sal_Bool +bool PrinterGfx::Init (const JobData& rData) { mpPageHeader = NULL; @@ -80,7 +80,7 @@ PrinterGfx::Init (const JobData& rData) const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rData.m_aPrinterName ) ); mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False; - return sal_True; + return true; } sal_uInt16 @@ -97,7 +97,7 @@ PrinterGfx::PrinterGfx() : mnTextAngle (0), mbTextVertical (false), mrFontMgr (PrintFontManager::get()), - mbCompressBmp (sal_True), + mbCompressBmp (true), maFillColor (0xff,0,0), maTextColor (0,0,0), maLineColor (0, 0xff, 0) @@ -127,11 +127,11 @@ PrinterGfx::Clear() maLineColor = PrinterColor(); maFillColor = PrinterColor(); maTextColor = PrinterColor(); - mbCompressBmp = sal_True; + mbCompressBmp = true; mnDpi = 300; mnDepth = 24; mnPSLevel = 2; - mbColor = sal_True; + mbColor = true; mnTextAngle = 0; maClipRegion.clear(); @@ -157,19 +157,19 @@ PrinterGfx::BeginSetClipRegion( sal_uInt32 ) maClipRegion.clear(); } -sal_Bool +bool PrinterGfx::UnionClipRegion (sal_Int32 nX,sal_Int32 nY,sal_Int32 nDX,sal_Int32 nDY) { if( nDX && nDY ) maClipRegion.push_back (Rectangle(Point(nX,nY ), Size(nDX,nDY))); - return sal_True; + return true; } -sal_Bool +bool PrinterGfx::JoinVerticalClipRectangles( std::list< Rectangle >::iterator& it, Point& rOldPoint, sal_Int32& rColumn ) { - sal_Bool bSuccess = sal_False; + bool bSuccess = false; std::list< Rectangle >::iterator tempit, nextit; nextit = it; @@ -267,7 +267,7 @@ PrinterGfx::JoinVerticalClipRectangles( std::list< Rectangle >::iterator& it, ++tempit; maClipRegion.erase( it ); it = tempit; - bSuccess = sal_True; + bSuccess = true; } return bSuccess; } @@ -1127,15 +1127,15 @@ PrinterGfx::PSComment( const sal_Char* pComment ) } } -sal_Bool +bool PrinterGfx::DrawEPS( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize ) { if( nSize == 0 ) - return sal_True; + return true; if( ! mpPageBody ) - return sal_False; + return false; - sal_Bool bSuccess = sal_False; + bool bSuccess = false; // first search the BoundingBox of the EPS data SvMemoryStream aStream( pPtr, nSize, STREAM_READ ); diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 160a3b5ad45b..501260b22608 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -560,15 +560,15 @@ void PspSalInfoPrinter::ReleaseGraphics( SalGraphics* pGraphics ) return; } -sal_Bool PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup ) +bool PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup ) { if( ! pFrame || ! pJobSetup ) - return sal_False; + return false; getPaLib(); if( ! pSetupFunction ) - return sal_False; + return false; PrinterInfoManager& rManager = PrinterInfoManager::get(); @@ -594,9 +594,9 @@ sal_Bool PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup ) // copy everything to job setup copyJobDataToJobSetup( pJobSetup, aInfo ); JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, m_aJobData ); - return sal_True; + return true; } - return sal_False; + return false; } // This function gets the driver data and puts it into pJobSetup @@ -604,21 +604,21 @@ sal_Bool PspSalInfoPrinter::Setup( SalFrame* pFrame, ImplJobSetup* pJobSetup ) // data should be merged into the driver data // If pJobSetup->mpDriverData IS NULL, then the driver defaults // should be merged into the independent data -sal_Bool PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup ) +bool PspSalInfoPrinter::SetPrinterData( ImplJobSetup* pJobSetup ) { if( pJobSetup->mpDriverData ) return SetData( ~0, pJobSetup ); copyJobDataToJobSetup( pJobSetup, m_aJobData ); - return sal_True; + return true; } // This function merges the independ driver data // and sets the new independ data in pJobSetup // Only the data must be changed, where the bit // in nGetDataFlags is set -sal_Bool PspSalInfoPrinter::SetData( +bool PspSalInfoPrinter::SetData( sal_uLong nSetDataFlags, ImplJobSetup* pJobSetup ) { @@ -657,7 +657,7 @@ sal_Bool PspSalInfoPrinter::SetData( } if( ! ( pKey && pValue && aData.m_aContext.setValue( pKey, pValue, false ) == pValue ) ) - return sal_False; + return false; } // merge paperbin if necessary @@ -717,10 +717,10 @@ sal_Bool PspSalInfoPrinter::SetData( m_aJobData = aData; copyJobDataToJobSetup( pJobSetup, aData ); - return sal_True; + return true; } - return sal_False; + return false; } void PspSalInfoPrinter::GetPageInfo( @@ -879,7 +879,7 @@ static OUString getTmpName() return aSys; } -sal_Bool PspSalPrinter::StartJob( +bool PspSalPrinter::StartJob( const OUString* pFileName, const OUString& rJobName, const OUString& rAppName, @@ -954,11 +954,11 @@ sal_Bool PspSalPrinter::StartJob( return m_aPrintJob.StartJob( ! m_aTmpFile.isEmpty() ? m_aTmpFile : m_aFileName, nMode, rJobName, rAppName, m_aJobData, &m_aPrinterGfx, bDirect ) ? sal_True : sal_False; } -sal_Bool PspSalPrinter::EndJob() +bool PspSalPrinter::EndJob() { - sal_Bool bSuccess = sal_False; + bool bSuccess = false; if( m_bIsPDFWriterJob ) - bSuccess = sal_True; + bSuccess = true; else { bSuccess = m_aPrintJob.EndJob(); @@ -984,9 +984,9 @@ sal_Bool PspSalPrinter::EndJob() return bSuccess; } -sal_Bool PspSalPrinter::AbortJob() +bool PspSalPrinter::AbortJob() { - sal_Bool bAbort = m_aPrintJob.AbortJob() ? sal_True : sal_False; + bool bAbort = m_aPrintJob.AbortJob() ? sal_True : sal_False; GetSalData()->m_pInstance->jobEndedPrinterUpdate(); return bAbort; } @@ -1013,9 +1013,9 @@ SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, sal_Bool ) return m_pGraphics; } -sal_Bool PspSalPrinter::EndPage() +bool PspSalPrinter::EndPage() { - sal_Bool bResult = m_aPrintJob.EndPage(); + bool bResult = m_aPrintJob.EndPage(); m_aPrinterGfx.Clear(); OSL_TRACE("PspSalPrinter::EndPage"); return bResult ? sal_True : sal_False; @@ -1060,14 +1060,14 @@ struct PDFPrintFile , maParameters( i_rNewParameters ) {} }; -sal_Bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJobName, const OUString& i_rAppName, +bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i_rJobName, const OUString& i_rAppName, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ) { OSL_TRACE( "StartJob with controller: pFilename = %s", i_pFileName ? OUStringToOString( *i_pFileName, RTL_TEXTENCODING_UTF8 ).getStr() : "<nil>" ); // mark for endjob m_bIsPDFWriterJob = true; // reset IsLastPage - i_rController.setLastPage( sal_False ); + i_rController.setLastPage( false ); // update job data if( i_pSetupData ) @@ -1077,7 +1077,7 @@ sal_Bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i m_aJobData.m_nPDFDevice = 1; // possibly create one job for collated output - sal_Bool bSinglePrintJobs = sal_False; + bool bSinglePrintJobs = false; beans::PropertyValue* pSingleValue = i_rController.getValue( OUString( "PrintCollateAsSingleJobs" ) ); if( pSingleValue ) { @@ -1120,7 +1120,7 @@ sal_Bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i for( int nPage = 0; nPage < nAllPages && ! bAborted; nPage++ ) { if( nPage == nAllPages-1 ) - i_rController.setLastPage( sal_True ); + i_rController.setLastPage( true ); // get the page's metafile GDIMetaFile aPageFile; @@ -1131,7 +1131,7 @@ sal_Bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i if( nPage != nAllPages-1 ) { i_rController.createProgressDialog(); - i_rController.setLastPage( sal_True ); + i_rController.setLastPage( true ); i_rController.getFilteredPageFile( nPage, aPageFile ); } } @@ -1289,7 +1289,7 @@ sal_Bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i } } - return sal_True; + return true; } diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index 10f663f137cc..f4e4dc3d5701 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -464,26 +464,26 @@ bool GenPspGraphics::drawPolyLine( return false; } -sal_Bool GenPspGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +bool GenPspGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) { m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry); - return sal_True; + return true; } -sal_Bool GenPspGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +bool GenPspGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) { m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry); - return sal_True; + return true; } -sal_Bool GenPspGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, +bool GenPspGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) { // Point must be equal to SalPoint! see vcl/inc/salgtype.hxx m_pPrinterGfx->DrawPolyPolygonBezier (nPoly, pPoints, (Point**)pPtAry, (sal_uInt8**)pFlgAry); - return sal_True; + return true; } void GenPspGraphics::invert( sal_uInt32, @@ -493,7 +493,7 @@ void GenPspGraphics::invert( sal_uInt32, DBG_ASSERT( false, "Error: PrinterGfx::Invert() not implemented" ); } -sal_Bool GenPspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) +bool GenPspGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) { return m_pPrinterGfx->DrawEPS( Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ), pPtr, nSize ); } @@ -1008,7 +1008,7 @@ SalLayout* GenPspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe //-------------------------------------------------------------------------- -sal_Bool GenPspGraphics::CreateFontSubset( +bool GenPspGraphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, sal_GlyphId* pGlyphIds, diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx index 96b965762f62..abb4b9d835a5 100644 --- a/vcl/generic/print/glyphset.cxx +++ b/vcl/generic/print/glyphset.cxx @@ -44,7 +44,7 @@ using namespace vcl; using namespace psp; -GlyphSet::GlyphSet (sal_Int32 nFontID, sal_Bool bVertical) +GlyphSet::GlyphSet (sal_Int32 nFontID, bool bVertical) : mnFontID (nFontID), mbVertical (bVertical) { @@ -79,7 +79,7 @@ GlyphSet::IsVertical () return mbVertical; } -sal_Bool +bool GlyphSet::GetCharID ( sal_Unicode nChar, unsigned char* nOutGlyphID, @@ -90,7 +90,7 @@ GlyphSet::GetCharID ( || AddCharID (nChar, nOutGlyphID, nOutGlyphSetID); } -sal_Bool +bool GlyphSet::GetGlyphID ( sal_GlyphId nGlyph, sal_Unicode nUnicode, @@ -102,7 +102,7 @@ GlyphSet::GetGlyphID ( || AddGlyphID (nGlyph, nUnicode, nOutGlyphID, nOutGlyphSetID); } -sal_Bool +bool GlyphSet::LookupCharID ( sal_Unicode nChar, unsigned char* nOutGlyphID, @@ -124,16 +124,16 @@ GlyphSet::LookupCharID ( // success: found the unicode char, return the glyphid and the glyphsetid *nOutGlyphSetID = nGlyphSetID; *nOutGlyphID = (*aGlyph).second; - return sal_True; + return true; } } *nOutGlyphSetID = -1; *nOutGlyphID = 0; - return sal_False; + return false; } -sal_Bool +bool GlyphSet::LookupGlyphID ( sal_GlyphId nGlyph, unsigned char* nOutGlyphID, @@ -155,13 +155,13 @@ GlyphSet::LookupGlyphID ( // success: found the glyph id, return the mapped glyphid and the glyphsetid *nOutGlyphSetID = nGlyphSetID; *nOutGlyphID = (*aGlyph).second; - return sal_True; + return true; } } *nOutGlyphSetID = -1; *nOutGlyphID = 0; - return sal_False; + return false; } unsigned char @@ -209,7 +209,7 @@ GlyphSet::AddNotdef (glyph_map_t &rGlyphMap) if (rGlyphMap.empty()) rGlyphMap[0] = 0; } -sal_Bool +bool GlyphSet::AddCharID ( sal_Unicode nChar, unsigned char* nOutGlyphID, @@ -264,10 +264,10 @@ GlyphSet::AddCharID ( *nOutGlyphID = aGlyphSet [nChar]; } - return sal_True; + return true; } -sal_Bool +bool GlyphSet::AddGlyphID ( sal_GlyphId nGlyph, sal_Unicode nUnicode, @@ -321,7 +321,7 @@ GlyphSet::AddGlyphID ( *nOutGlyphID = aGlyphSet [nGlyph]; } - return sal_True; + return true; } OString @@ -464,7 +464,7 @@ void GlyphSet::DrawGlyphs( const sal_Unicode* pUnicodes, sal_Int16 nLen, const sal_Int32* pDeltaArray, - const sal_Bool bUseGlyphs) + const bool bUseGlyphs) { unsigned char *pGlyphID = (unsigned char*)alloca (nLen * sizeof(unsigned char)); sal_Int32 *pGlyphSetID = (sal_Int32*)alloca (nLen * sizeof(sal_Int32)); @@ -607,17 +607,17 @@ GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint, return; } - DrawGlyphs( rGfx, rPoint, NULL, pStr, nLen, pDeltaArray, sal_False); + DrawGlyphs( rGfx, rPoint, NULL, pStr, nLen, pDeltaArray, false); } -sal_Bool +bool GlyphSet::PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx) { // only for ps fonts if (meBaseType != fonttype::Type1) - return sal_False; + return false; if (mnBaseEncoding == RTL_TEXTENCODING_SYMBOL) - return sal_False; + return false; PrintFontManager &rMgr = rGfx.GetFontMgr(); @@ -695,7 +695,7 @@ GlyphSet::PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx) PSDefineReencodedFont (pOutFile, nGlyphSetID); } - return sal_True; + return true; } struct EncEntry @@ -745,12 +745,12 @@ static void CreatePSUploadableFont( TrueTypeFont* pSrcFont, FILE* pTmpFile, &aRequestedGlyphs[0], &aEncoding[0], nGlyphCount, NULL ); } -sal_Bool +bool GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42, std::list< OString >& rSuppliedFonts ) { // only for truetype fonts if (meBaseType != fonttype::TrueType) - return sal_False; + return false; #if defined( UNX ) TrueTypeFont *pTTFont; @@ -758,10 +758,10 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42 int nFace = rGfx.GetFontMgr().getFontFaceNumber(mnFontID); sal_Int32 nSuccess = OpenTTFontFile(aTTFileName.getStr(), nFace, &pTTFont); if (nSuccess != SF_OK) - return sal_False; + return false; FILE* pTmpFile = tmpfile(); if (pTmpFile == NULL) - return sal_False; + return false; // array of unicode source characters sal_Unicode pUChars[256]; @@ -851,7 +851,7 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42 CloseTTFont (pTTFont); fclose (pTmpFile); - return sal_True; + return true; #else (void)rOutFile; (void)rGfx; (void)bAllowType42; (void)rSuppliedFonts; # warning FIXME: Missing OpenTTFontFile outside of Unix ... diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx index 934ff31fe86c..f5cec42d9c0e 100644 --- a/vcl/generic/print/glyphset.hxx +++ b/vcl/generic/print/glyphset.hxx @@ -41,7 +41,7 @@ class GlyphSet private: sal_Int32 mnFontID; - sal_Bool mbVertical; + bool mbVertical; OString maBaseName; fonttype::type meBaseType; rtl_TextEncoding mnBaseEncoding; @@ -64,18 +64,18 @@ private: void PSDefineReencodedFont (osl::File* pOutFile, sal_Int32 nGlyphSetID); - sal_Bool GetCharID (sal_Unicode nChar, + bool GetCharID (sal_Unicode nChar, unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID); - sal_Bool LookupCharID (sal_Unicode nChar, + bool LookupCharID (sal_Unicode nChar, unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID); - sal_Bool AddCharID (sal_Unicode nChar, + bool AddCharID (sal_Unicode nChar, unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID); - sal_Bool GetGlyphID (sal_GlyphId nGlyphId, sal_Unicode nUnicode, + bool GetGlyphID (sal_GlyphId nGlyphId, sal_Unicode nUnicode, unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID); - sal_Bool LookupGlyphID (sal_GlyphId nGlyphId, + bool LookupGlyphID (sal_GlyphId nGlyphId, unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID); - sal_Bool AddGlyphID (sal_GlyphId nGlyphId, sal_Unicode nUnicode, + bool AddGlyphID (sal_GlyphId nGlyphId, sal_Unicode nUnicode, unsigned char* nOutGlyphID, sal_Int32* nOutGlyphSetID); void AddNotdef (char_map_t &rCharMap); @@ -91,7 +91,7 @@ private: public: - GlyphSet (sal_Int32 nFontID, sal_Bool bVertical); + GlyphSet (sal_Int32 nFontID, bool bVertical); ~GlyphSet (); sal_Int32 GetFontID (); @@ -113,9 +113,9 @@ public: const sal_Unicode* pUnicodes, sal_Int16 nLen, const sal_Int32* pDeltaArray, - sal_Bool bUseGlyphs=sal_True); - sal_Bool PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx); - sal_Bool PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< OString >& rSuppliedFonts ); + bool bUseGlyphs=true); + bool PSUploadEncoding(osl::File* pOutFile, PrinterGfx &rGfx); + bool PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAsType42, std::list< OString >& rSuppliedFonts ); }; diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx index e18d769fa2e8..6e15280f830f 100644 --- a/vcl/generic/print/printerjob.cxx +++ b/vcl/generic/print/printerjob.cxx @@ -55,15 +55,15 @@ using namespace psp; namespace psp { -sal_Bool +bool AppendPS (FILE* pDst, osl::File* pSrc, unsigned char* pBuffer, sal_uInt32 nBlockSize = nBLOCKSIZE) { if ((pDst == NULL) || (pSrc == NULL)) - return sal_False; + return false; if (pSrc->setPos(osl_Pos_Absolut, 0) != osl::FileBase::E_None) - return sal_False; + return false; if (nBlockSize == 0) nBlockSize = nBLOCKSIZE; @@ -80,7 +80,7 @@ AppendPS (FILE* pDst, osl::File* pSrc, unsigned char* pBuffer, } while ((nIn > 0) && (nIn == nOut)); - return sal_True; + return true; } } // namespace psp @@ -129,7 +129,7 @@ sal_uInt16 PrinterJob::GetDepth () const { sal_Int32 nLevel = GetPostscriptLevel(); - sal_Bool bColor = IsColorPrinter (); + bool bColor = IsColorPrinter (); return nLevel > 1 && bColor ? 24 : 8; } @@ -151,10 +151,10 @@ PrinterJob::GetPostscriptLevel (const JobData *pJobData) const return nPSLevel; } -sal_Bool +bool PrinterJob::IsColorPrinter () const { - sal_Bool bColor = sal_False; + bool bColor = false; if( m_aLastJobData.m_nColorDevice ) bColor = m_aLastJobData.m_nColorDevice == -1 ? sal_False : sal_True; @@ -298,7 +298,7 @@ static bool isAscii( const OUString& rStr ) return true; } -sal_Bool +bool PrinterJob::StartJob ( const OUString& rFileName, int nMode, @@ -325,7 +325,7 @@ PrinterJob::StartJob ( mpJobHeader = CreateSpoolFile (OUString("psp_head"), aExt); mpJobTrailer = CreateSpoolFile (OUString("psp_tail"), aExt); if( ! (mpJobHeader && mpJobTrailer) ) // existing files are removed in destructor - return sal_False; + return false; // write document header according to Document Structuring Conventions (DSC) WritePS (mpJobHeader, @@ -406,15 +406,15 @@ PrinterJob::StartJob ( m_aLastJobData.m_pParser = NULL; m_aLastJobData.m_aContext.setParser( NULL ); - return sal_True; + return true; } -sal_Bool +bool PrinterJob::EndJob () { // no pages ? that really means no print job if( maPageList.empty() ) - return sal_False; + return false; // write document setup (done here because it // includes the accumulated fonts @@ -422,7 +422,7 @@ PrinterJob::EndJob () writeSetup( mpJobHeader, m_aDocumentJobData ); m_pGraphics->OnEndJob(); if( ! (mpJobHeader && mpJobTrailer) ) - return sal_False; + return false; // write document trailer according to Document Structuring Conventions (DSC) OStringBuffer aTrailer(512); @@ -447,7 +447,7 @@ PrinterJob::EndJob () FILE* pDestFILE = NULL; /* create a destination either as file or as a pipe */ - sal_Bool bSpoolToFile = !maFileName.isEmpty(); + bool bSpoolToFile = !maFileName.isEmpty(); if (bSpoolToFile) { const OString aFileName = OUStringToOString (maFileName, @@ -462,7 +462,7 @@ PrinterJob::EndJob () { close( nFile ); unlink( aFileName.getStr() ); - return sal_False; + return false; } } else @@ -472,14 +472,14 @@ PrinterJob::EndJob () pDestFILE = fopen (aFileName.getStr(), "w"); if (pDestFILE == NULL) - return sal_False; + return false; } else { PrinterInfoManager& rPrinterInfoManager = PrinterInfoManager::get (); pDestFILE = rPrinterInfoManager.startSpool( m_aLastJobData.m_aPrinterName, m_bQuickJob ); if (pDestFILE == NULL) - return sal_False; + return false; } /* spool the document parts to the destination */ @@ -489,7 +489,7 @@ PrinterJob::EndJob () AppendPS (pDestFILE, mpJobHeader, pBuffer); mpJobHeader->close(); - sal_Bool bSuccess = sal_True; + bool bSuccess = true; std::list< osl::File* >::iterator pPageBody; std::list< osl::File* >::iterator pPageHead; for (pPageBody = maPageList.begin(), pPageHead = maHeaderList.begin(); @@ -506,7 +506,7 @@ PrinterJob::EndJob () } } else - bSuccess = sal_False; + bSuccess = false; if( *pPageBody ) { osl::File::RC nError = (*pPageBody)->open(osl_File_OpenFlag_Read); @@ -517,7 +517,7 @@ PrinterJob::EndJob () } } else - bSuccess = sal_False; + bSuccess = false; } AppendPS (pDestFILE, mpJobTrailer, pBuffer); @@ -533,18 +533,18 @@ PrinterJob::EndJob () if (!rPrinterInfoManager.endSpool( m_aLastJobData.m_aPrinterName, maJobTitle, pDestFILE, m_aDocumentJobData, true )) { - bSuccess = sal_False; + bSuccess = false; } } return bSuccess; } -sal_Bool +bool PrinterJob::AbortJob () { m_pGraphics->OnEndJob(); - return sal_False; + return false; } void @@ -581,7 +581,7 @@ PrinterJob::InitPaperSize (const JobData& rJobSetup) } -sal_Bool +bool PrinterJob::StartPage (const JobData& rJobSetup) { InitPaperSize (rJobSetup); @@ -596,7 +596,7 @@ PrinterJob::StartPage (const JobData& rJobSetup) maPageList.push_back (pPageBody); if( ! (pPageHeader && pPageBody) ) - return sal_False; + return false; // write page header according to Document Structuring Conventions (DSC) WritePS (pPageHeader, "%%Page: "); @@ -652,7 +652,7 @@ PrinterJob::StartPage (const JobData& rJobSetup) return false; } -sal_Bool +bool PrinterJob::EndPage () { m_pGraphics->OnEndPage(); @@ -661,7 +661,7 @@ PrinterJob::EndPage () osl::File* pPageBody = maPageList.back(); if( ! (pPageBody && pPageHeader) ) - return sal_False; + return false; // copy page to paper and write page trailer according to DSC @@ -677,7 +677,7 @@ PrinterJob::EndPage () pPageHeader->close(); pPageBody->close(); - return sal_True; + return true; } struct less_ppd_key : public ::std::binary_function<double, double, bool> diff --git a/vcl/generic/print/psputil.cxx b/vcl/generic/print/psputil.cxx index e6bd2c467c76..3c409d9c6e57 100644 --- a/vcl/generic/print/psputil.cxx +++ b/vcl/generic/print/psputil.cxx @@ -44,7 +44,7 @@ sal_Int32 getAlignedHexValueOf (sal_Int32 nValue, sal_Char* pBuffer) { // get sign - sal_Bool bNegative = nValue < 0; + bool bNegative = nValue < 0; nValue = bNegative ? -nValue : nValue; // get required buffer size, must be a multiple of two @@ -134,7 +134,7 @@ appendStr (const sal_Char* pSrc, sal_Char* pDst) * copy strings to file */ -sal_Bool +bool WritePS (osl::File* pFile, const sal_Char* pString) { sal_uInt64 nInLength = rtl_str_getLength (pString); @@ -146,7 +146,7 @@ WritePS (osl::File* pFile, const sal_Char* pString) return nInLength == nOutLength; } -sal_Bool +bool WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength) { sal_uInt64 nOutLength = 0; @@ -157,7 +157,7 @@ WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength) return nInLength == nOutLength; } -sal_Bool +bool WritePS (osl::File* pFile, const OString &rString) { sal_uInt64 nInLength = rString.getLength(); @@ -169,7 +169,7 @@ WritePS (osl::File* pFile, const OString &rString) return nInLength == nOutLength; } -sal_Bool +bool WritePS (osl::File* pFile, const OUString &rString) { return WritePS (pFile, OUStringToOString(rString, RTL_TEXTENCODING_ASCII_US)); diff --git a/vcl/generic/print/psputil.hxx b/vcl/generic/print/psputil.hxx index c2092c17b76a..01a2d4f3cb31 100644 --- a/vcl/generic/print/psputil.hxx +++ b/vcl/generic/print/psputil.hxx @@ -41,10 +41,10 @@ sal_Int32 getAlignedHexValueOf (sal_Int32 nValue, sal_Char* pBuffer); sal_Int32 getValueOf (sal_Int32 nValue, sal_Char* pBuffer); sal_Int32 appendStr (const sal_Char* pSrc, sal_Char* pDst); -sal_Bool WritePS (osl::File* pFile, const sal_Char* pString); -sal_Bool WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength); -sal_Bool WritePS (osl::File* pFile, const OString &rString); -sal_Bool WritePS (osl::File* pFile, const OUString &rString); +bool WritePS (osl::File* pFile, const sal_Char* pString); +bool WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64 nInLength); +bool WritePS (osl::File* pFile, const OString &rString); +bool WritePS (osl::File* pFile, const OUString &rString); class ConverterFactory { diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx index 0b1d4e65c623..71662cf58ac6 100644 --- a/vcl/generic/print/text_gfx.cxx +++ b/vcl/generic/print/text_gfx.cxx @@ -598,7 +598,7 @@ PrinterGfx::drawText( } int -PrinterGfx::getCharWidth (sal_Bool b_vert, sal_Unicode n_char, CharacterMetric *p_bbox) +PrinterGfx::getCharWidth (bool b_vert, sal_Unicode n_char, CharacterMetric *p_bbox) { b_vert = b_vert && (getVerticalDeltaAngle(n_char) != 0); int w = b_vert ? p_bbox->height : p_bbox->width; diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index b0073712f665..db5d08d88866 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -182,10 +182,10 @@ void SvpSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) delete pSvpGraphics; } -sal_Bool SvpSalFrame::PostEvent( void* pData ) +bool SvpSalFrame::PostEvent( void* pData ) { m_pInstance->PostEvent( this, pData, SALEVENT_USEREVENT ); - return sal_True; + return true; } void SvpSalFrame::PostPaint(bool bImmediate) const @@ -354,7 +354,7 @@ void SvpSalFrame::SetWindowState( const SalFrameState *pState ) } } -sal_Bool SvpSalFrame::GetWindowState( SalFrameState* pState ) +bool SvpSalFrame::GetWindowState( SalFrameState* pState ) { pState->mnState = WINDOWSTATE_STATE_NORMAL; pState->mnX = maGeometry.nX; @@ -363,7 +363,7 @@ sal_Bool SvpSalFrame::GetWindowState( SalFrameState* pState ) pState->mnHeight = maGeometry.nHeight; pState->mnMask = _FRAMESTATE_MASK_GEOMETRY | WINDOWSTATE_MASK_STATE; - return sal_True; + return true; } void SvpSalFrame::ShowFullScreen( sal_Bool, sal_Int32 ) @@ -418,9 +418,9 @@ OUString SvpSalFrame::GetKeyName( sal_uInt16 ) return OUString(); } -sal_Bool SvpSalFrame::MapUnicodeToKeyCode( sal_Unicode, LanguageType, KeyCode& ) +bool SvpSalFrame::MapUnicodeToKeyCode( sal_Unicode, LanguageType, KeyCode& ) { - return sal_False; + return false; } LanguageType SvpSalFrame::GetInputLanguage() diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index a1122e55dbe5..5279c18e6bce 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -531,26 +531,26 @@ bool SvpSalGraphics::drawPolyLine( return false; } -sal_Bool SvpSalGraphics::drawPolyLineBezier( sal_uInt32, +bool SvpSalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const sal_uInt8* ) { - return sal_False; + return false; } -sal_Bool SvpSalGraphics::drawPolygonBezier( sal_uInt32, +bool SvpSalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const sal_uInt8* ) { - return sal_False; + return false; } -sal_Bool SvpSalGraphics::drawPolyPolygonBezier( sal_uInt32, +bool SvpSalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*, const SalPoint* const*, const sal_uInt8* const* ) { - return sal_False; + return false; } bool SvpSalGraphics::drawPolyPolygon( const basegfx::B2DPolyPolygon&, double /*fTransparency*/ ) @@ -728,9 +728,9 @@ void SvpSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInve dbgOut( m_aDevice ); } -sal_Bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong ) +bool SvpSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong ) { - return sal_False; + return false; } SystemGraphicsData SvpSalGraphics::GetGraphicsData() const diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx index f50db9a69ec9..e09433900158 100644 --- a/vcl/headless/svpprn.cxx +++ b/vcl/headless/svpprn.cxx @@ -271,9 +271,9 @@ GenPspGraphics *SvpSalInstance::CreatePrintGraphics() return new GenPspGraphics(); } -sal_Bool SvpSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* ) +bool SvpSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* ) { - return sal_False; + return false; } SvpSalPrinter::SvpSalPrinter( SalInfoPrinter* pInfoPrinter ) diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index 29c823d50283..22c786ca6a2a 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -302,7 +302,7 @@ bool SvpSalGraphics::AddTempDevFont( ImplDevFontList*, } -sal_Bool SvpSalGraphics::CreateFontSubset( +bool SvpSalGraphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, sal_GlyphId* pGlyphIds, diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx index 56c7ed73e92b..6d5cfbc25fcf 100644 --- a/vcl/headless/svpvd.cxx +++ b/vcl/headless/svpvd.cxx @@ -47,12 +47,12 @@ void SvpSalVirtualDevice::ReleaseGraphics( SalGraphics* pGraphics ) delete pGraphics; } -sal_Bool SvpSalVirtualDevice::SetSize( long nNewDX, long nNewDY ) +bool SvpSalVirtualDevice::SetSize( long nNewDX, long nNewDY ) { return SetSizeUsingBuffer( nNewDX, nNewDY, basebmp::RawMemorySharedArray() ); } -sal_Bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray &pBuffer ) +bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray &pBuffer ) { B2IVector aDevSize( nNewDX, nNewDY ); if( aDevSize.getX() == 0 ) diff --git a/vcl/inc/accel.h b/vcl/inc/accel.h index d1ccb875baa0..e3e92c78a8a5 100644 --- a/vcl/inc/accel.h +++ b/vcl/inc/accel.h @@ -31,7 +31,7 @@ public: KeyCode maKeyCode; Accelerator* mpAccel; Accelerator* mpAutoAccel; - sal_Bool mbEnabled; + bool mbEnabled; }; void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 ); diff --git a/vcl/inc/accmgr.hxx b/vcl/inc/accmgr.hxx index 98dd74f9c6ed..4645cb27abc2 100644 --- a/vcl/inc/accmgr.hxx +++ b/vcl/inc/accmgr.hxx @@ -41,13 +41,13 @@ public: } ~ImplAccelManager(); - sal_Bool InsertAccel( Accelerator* pAccel ); + bool InsertAccel( Accelerator* pAccel ); void RemoveAccel( Accelerator* pAccel ); - void EndSequence( sal_Bool bCancel = sal_False ); - void FlushAccel() { EndSequence( sal_True ); } + void EndSequence( bool bCancel = false ); + void FlushAccel() { EndSequence( true ); } - sal_Bool IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ); + bool IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ); }; #endif // INCLUDED_VCL_INC_ACCMGR_HXX diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 051200458349..296b415f7b19 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -92,16 +92,16 @@ private: long mnOrgMenuHeight; sal_uInt16 mnTitleType; sal_uInt16 mnBorderStyle; - sal_Bool mbFloatWindow; - sal_Bool mbSmallOutBorder; - sal_Bool mbFrameBorder; - sal_Bool mbPined; - sal_Bool mbRollUp; - sal_Bool mbMenuHide; - sal_Bool mbDockBtn; - sal_Bool mbHideBtn; - sal_Bool mbMenuBtn; - sal_Bool mbDisplayActive; + bool mbFloatWindow; + bool mbSmallOutBorder; + bool mbFrameBorder; + bool mbPined; + bool mbRollUp; + bool mbMenuHide; + bool mbDockBtn; + bool mbHideBtn; + bool mbMenuBtn; + bool mbDisplayActive; using Window::ImplInit; void ImplInit( Window* pParent, @@ -136,27 +136,27 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); void InitView(); - void UpdateView( sal_Bool bNewView, const Size& rNewOutSize ); + void UpdateView( bool bNewView, const Size& rNewOutSize ); void InvalidateBorder(); using Window::Draw; void Draw( const Rectangle& rRect, OutputDevice* pDev, const Point& rPos ); - void SetDisplayActive( sal_Bool bActive ); - sal_Bool IsDisplayActive() const { return mbDisplayActive; } + void SetDisplayActive( bool bActive ); + bool IsDisplayActive() const { return mbDisplayActive; } void SetTitleType( sal_uInt16 nTitleType, const Size& rSize ); void SetBorderStyle( sal_uInt16 nStyle ); sal_uInt16 GetBorderStyle() const { return mnBorderStyle; } - void SetPin( sal_Bool bPin ); - void SetRollUp( sal_Bool bRollUp, const Size& rSize ); + void SetPin( bool bPin ); + void SetRollUp( bool bRollUp, const Size& rSize ); void SetCloser(); - void SetDockButton( sal_Bool bDockButton ); - void SetHideButton( sal_Bool bHideButton ); - void SetMenuButton( sal_Bool bMenuButton ); + void SetDockButton( bool bDockButton ); + void SetHideButton( bool bHideButton ); + void SetMenuButton( bool bMenuButton ); void UpdateMenuHeight(); void SetMenuBarWindow( Window* pWindow ); - void SetMenuBarMode( sal_Bool bHide ); + void SetMenuBarMode( bool bHide ); void SetMinOutputSize( long nWidth, long nHeight ) { mnMinWidth = nWidth; mnMinHeight = nHeight; } @@ -208,9 +208,9 @@ struct ImplBorderFrameData sal_uInt16 mnHideState; sal_uInt16 mnHelpState; sal_uInt16 mnTitleType; - sal_Bool mbFloatWindow; - sal_Bool mbDragFull; - sal_Bool mbTitleClipped; + bool mbFloatWindow; + bool mbDragFull; + bool mbTitleClipped; }; class ImplBorderWindowView @@ -218,9 +218,9 @@ class ImplBorderWindowView public: virtual ~ImplBorderWindowView(); - virtual sal_Bool MouseMove( const MouseEvent& rMEvt ); - virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt ); - virtual sal_Bool Tracking( const TrackingEvent& rTEvt ); + virtual bool MouseMove( const MouseEvent& rMEvt ); + virtual bool MouseButtonDown( const MouseEvent& rMEvt ); + virtual bool Tracking( const TrackingEvent& rTEvt ); virtual OUString RequestHelp( const Point& rPos, Rectangle& rHelpRect ); virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ) = 0; @@ -232,9 +232,9 @@ public: void ImplInitTitle( ImplBorderFrameData* pData ); sal_uInt16 ImplHitTest( ImplBorderFrameData* pData, const Point& rPos ); - sal_Bool ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt ); - sal_Bool ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt ); - sal_Bool ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt ); + bool ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt ); + bool ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt ); + bool ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt ); OUString ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect ); long ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const; }; @@ -283,9 +283,9 @@ public: ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow ); ~ImplStdBorderWindowView(); - virtual sal_Bool MouseMove( const MouseEvent& rMEvt ); - virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt ); - virtual sal_Bool Tracking( const TrackingEvent& rTEvt ); + virtual bool MouseMove( const MouseEvent& rMEvt ); + virtual bool MouseButtonDown( const MouseEvent& rMEvt ); + virtual bool Tracking( const TrackingEvent& rTEvt ); virtual OUString RequestHelp( const Point& rPos, Rectangle& rHelpRect ); virtual Rectangle GetMenuRect() const; diff --git a/vcl/inc/cvtsvm.hxx b/vcl/inc/cvtsvm.hxx index dd92f8edd699..5c5e006fdfa1 100644 --- a/vcl/inc/cvtsvm.hxx +++ b/vcl/inc/cvtsvm.hxx @@ -83,7 +83,7 @@ private: SAL_DLLPRIVATE void ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ); SAL_DLLPRIVATE void ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ); SAL_DLLPRIVATE sal_uLong ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, - VirtualDevice& rSaveVDev, sal_Bool& rRop_0_1, + VirtualDevice& rSaveVDev, bool& rRop_0_1, Color& rLineCol, ::std::stack<Color*>& rLineColStack, rtl_TextEncoding& rActualCharSet ); diff --git a/vcl/inc/dndlcon.hxx b/vcl/inc/dndlcon.hxx index dcda3c5419d8..3d6c6b617c83 100644 --- a/vcl/inc/dndlcon.hxx +++ b/vcl/inc/dndlcon.hxx @@ -36,7 +36,7 @@ class DNDListenerContainer : public ::vcl::unohelper::MutexHelper, ::com::sun::star::datatransfer::dnd::XDropTargetDropContext, ::com::sun::star::datatransfer::dnd::XDropTarget > { - sal_Bool m_bActive; + bool m_bActive; sal_Int8 m_nDefaultActions; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext > m_xDropTargetDragContext; diff --git a/vcl/inc/generic/gendisp.hxx b/vcl/inc/generic/gendisp.hxx index 285a9dc2e70a..4aa5f356e2cf 100644 --- a/vcl/inc/generic/gendisp.hxx +++ b/vcl/inc/generic/gendisp.hxx @@ -68,7 +68,7 @@ public: virtual bool DispatchInternalEvent(); bool HasUserEvents() const; - sal_Bool MouseCaptured( const SalFrame *pFrameData ) const + bool MouseCaptured( const SalFrame *pFrameData ) const { return m_pCapture == pFrameData; } SalFrame* GetCaptureFrame() const { return m_pCapture; } diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h index b63f8b43f88c..539c2b4fadd0 100644 --- a/vcl/inc/generic/genprn.h +++ b/vcl/inc/generic/genprn.h @@ -40,9 +40,9 @@ public: // overload all pure virtual methods virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); - virtual sal_Bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); - virtual sal_Bool SetPrinterData( ImplJobSetup* pSetupData ); - virtual sal_Bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ); + virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); + virtual bool SetPrinterData( ImplJobSetup* pSetupData ); + virtual bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ); virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, long& rPageOffX, long& rPageOffY, @@ -76,22 +76,22 @@ public: virtual ~PspSalPrinter(); // overload all pure virtual methods - virtual sal_Bool StartJob( const OUString* pFileName, + virtual bool StartJob( const OUString* pFileName, const OUString& rJobName, const OUString& rAppName, sal_uIntPtr nCopies, bool bCollate, bool bDirect, ImplJobSetup* pSetupData ); - virtual sal_Bool StartJob( const OUString*, + virtual bool StartJob( const OUString*, const OUString&, const OUString&, ImplJobSetup*, vcl::PrinterController& i_rController ); - virtual sal_Bool EndJob(); - virtual sal_Bool AbortJob(); + virtual bool EndJob(); + virtual bool AbortJob(); virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ); - virtual sal_Bool EndPage(); + virtual bool EndPage(); virtual sal_uIntPtr GetErrorCode(); }; diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 044cb123fb21..9a2c8c559796 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -97,7 +97,7 @@ public: virtual void ClearDevFontCache(); virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); - virtual sal_Bool CreateFontSubset( const OUString& rToFile, + virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, sal_GlyphId* pGlyphIDs, sal_uInt8* pEncoding, @@ -137,13 +137,13 @@ public: const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, com::sun::star::drawing::LineCap); - virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, + virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, + virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, + virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ); @@ -172,7 +172,7 @@ public: virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); + virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); virtual bool filterText( const OUString& rOrigText, OUString& rNewText, sal_Int32 nIndex, sal_Int32& rLen, sal_Int32& rCutStart, sal_Int32& rCutStop ); virtual bool drawAlphaBitmap( const SalTwoRect&, diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/generic/printergfx.hxx index 77ac4676b2fc..dee151c6541d 100644 --- a/vcl/inc/generic/printergfx.hxx +++ b/vcl/inc/generic/printergfx.hxx @@ -75,7 +75,7 @@ public: ~PrinterColor () {} - sal_Bool Is () const + bool Is () const { return meColorspace != eInvalid; } ColorSpace GetColorSpace () const @@ -86,14 +86,14 @@ public: { return mnGreen; } sal_uInt16 GetBlue () const { return mnBlue; } - sal_Bool operator== (const PrinterColor& aColor) const + bool operator== (const PrinterColor& aColor) const { return aColor.Is() && this->Is() && mnRed == aColor.mnRed && mnGreen == aColor.mnGreen && mnBlue == aColor.mnBlue; } - sal_Bool operator!= (const PrinterColor& aColor) const + bool operator!= (const PrinterColor& aColor) const { return ! (aColor==*this); } PrinterColor& operator= (const PrinterColor& aColor) { @@ -189,8 +189,8 @@ private: sal_uInt16 mnDepth; sal_uInt16 mnPSLevel; - sal_Bool mbColor; - sal_Bool mbUploadPS42Fonts; + bool mbColor; + bool mbUploadPS42Fonts; osl::File* mpPageHeader; osl::File* mpPageBody; @@ -219,7 +219,7 @@ private: /* bitmap drawing implementation */ - sal_Bool mbCompressBmp; + bool mbCompressBmp; void DrawPS1GrayImage (const PrinterBmp& rBitmap, const Rectangle& rArea); void writePS2ImageHeader (const Rectangle& rArea, psp::ImageType nType); @@ -232,7 +232,7 @@ private: /* clip region */ std::list< Rectangle > maClipRegion; - sal_Bool JoinVerticalClipRectangles( std::list< Rectangle >::iterator& it, + bool JoinVerticalClipRectangles( std::list< Rectangle >::iterator& it, Point& aOldPoint, sal_Int32& nColumn ); /* color settings */ @@ -247,7 +247,7 @@ private: /* font */ friend class Font2; - int getCharWidth (sal_Bool b_vert, sal_Unicode n_char, + int getCharWidth (bool b_vert, sal_Unicode n_char, CharacterMetric *p_bbox); fontID getCharMetric (const Font2 &rFont, sal_Unicode n_char, CharacterMetric *p_bbox); @@ -321,8 +321,8 @@ public: public: PrinterGfx(); ~PrinterGfx(); - sal_Bool Init (PrinterJob &rPrinterSpec); - sal_Bool Init (const JobData& rData); + bool Init (PrinterJob &rPrinterSpec); + bool Init (const JobData& rData); void Clear(); // query depth @@ -331,7 +331,7 @@ public: // clip region void ResetClipRegion (); void BeginSetClipRegion (sal_uInt32); - sal_Bool UnionClipRegion (sal_Int32 nX, sal_Int32 nY, + bool UnionClipRegion (sal_Int32 nX, sal_Int32 nY, sal_Int32 nDX, sal_Int32 nDY); void EndSetClipRegion (); @@ -364,7 +364,7 @@ public: const sal_uInt8* const* pFlgAry); // eps - sal_Bool DrawEPS ( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize); + bool DrawEPS ( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize); // image drawing void DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc, diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/generic/printerjob.hxx index 5c521bb37675..c9ea6b7b5d92 100644 --- a/vcl/inc/generic/printerjob.hxx +++ b/vcl/inc/generic/printerjob.hxx @@ -89,7 +89,7 @@ public: // for usage in PrinterGfx void GetScale (double &rXScale, double &rYScale) const; sal_uInt16 GetDepth () const; sal_uInt16 GetPostscriptLevel (const JobData *pJobData = NULL) const; - sal_Bool IsColorPrinter () const; + bool IsColorPrinter () const; osl::File* GetCurrentPageHeader (); osl::File* GetCurrentPageBody (); @@ -114,7 +114,7 @@ public: * the quick command for spooling should be used instead * of the normal command */ - sal_Bool StartJob (const OUString& rFileName, + bool StartJob (const OUString& rFileName, int nMode, const OUString& rJobName, const OUString& rAppName, @@ -122,12 +122,12 @@ public: PrinterGfx* pGraphics, bool bIsQuickJob ); - sal_Bool EndJob (); + bool EndJob (); - sal_Bool AbortJob (); + bool AbortJob (); - sal_Bool StartPage (const JobData& rJobSetup); - sal_Bool EndPage (); + bool StartPage (const JobData& rJobSetup); + bool EndPage (); }; } /* namespace psp */ diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 865fd280b1c5..c4e88c312fb2 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -79,7 +79,7 @@ public: virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); - virtual sal_Bool PostEvent( void* pData ); + virtual bool PostEvent( void* pData ); virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); @@ -96,7 +96,7 @@ public: virtual void GetWorkArea( Rectangle& rRect ); virtual SalFrame* GetParent() const; virtual void SetWindowState( const SalFrameState* pState ); - virtual sal_Bool GetWindowState( SalFrameState* pState ); + virtual bool GetWindowState( SalFrameState* pState ); virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ); virtual void StartPresentation( sal_Bool bStart ); virtual void SetAlwaysOnTop( sal_Bool bOnTop ); @@ -110,7 +110,7 @@ public: virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); virtual OUString GetKeyName( sal_uInt16 nKeyCode ); - virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual void UpdateSettings( AllSettings& rSettings ); virtual void Beep(); diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 94a5c1ce4e52..9733e49bf18c 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -155,7 +155,7 @@ public: virtual void GetDevFontList( ImplDevFontList* ); virtual void ClearDevFontCache(); virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); - virtual sal_Bool CreateFontSubset( const OUString& rToFile, + virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, sal_GlyphId* pGlyphIds, sal_uInt8* pEncoding, @@ -194,13 +194,13 @@ public: virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ); - virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, + virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, + virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, + virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ); @@ -230,7 +230,7 @@ public: virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ); + virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ); virtual SystemGraphicsData GetGraphicsData() const; virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx index d9ac08f8fb6c..2c404ee2b048 100644 --- a/vcl/inc/headless/svpprn.hxx +++ b/vcl/inc/headless/svpprn.hxx @@ -30,7 +30,7 @@ class SvpSalInfoPrinter : public PspSalInfoPrinter { public: - virtual sal_Bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); + virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); }; class SvpSalPrinter : public PspSalPrinter diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx index 6a0b031c132a..a896db8300d4 100644 --- a/vcl/inc/headless/svpvd.hxx +++ b/vcl/inc/headless/svpvd.hxx @@ -44,8 +44,8 @@ public: virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); - virtual sal_Bool SetSize( long nNewDX, long nNewDY ); - virtual sal_Bool SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray &pBuffer ); + virtual bool SetSize( long nNewDX, long nNewDY ); + virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray &pBuffer ); virtual void GetSize( long& rWidth, long& rHeight ); }; diff --git a/vcl/inc/idlemgr.hxx b/vcl/inc/idlemgr.hxx index 432748f4a682..02fc85ec0985 100644 --- a/vcl/inc/idlemgr.hxx +++ b/vcl/inc/idlemgr.hxx @@ -36,7 +36,7 @@ public: ImplIdleMgr(); ~ImplIdleMgr(); - sal_Bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ); + bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ); void RemoveIdleHdl( const Link& rLink ); void RestartIdler() diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 58d6f9ccdbfd..cb90e5de30df 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -50,7 +50,7 @@ struct ImplEntryType OUString maStr; Image maImage; void* mpUserData; - sal_Bool mbIsSelected; + bool mbIsSelected; long mnFlags; long mnHeight; @@ -60,7 +60,7 @@ struct ImplEntryType mnFlags( 0 ), mnHeight( 0 ) { - mbIsSelected = sal_False; + mbIsSelected = false; mpUserData = NULL; } @@ -69,7 +69,7 @@ struct ImplEntryType mnFlags( 0 ), mnHeight( 0 ) { - mbIsSelected = sal_False; + mbIsSelected = false; mpUserData = NULL; } @@ -78,7 +78,7 @@ struct ImplEntryType mnFlags( 0 ), mnHeight( 0 ) { - mbIsSelected = sal_False; + mbIsSelected = false; mpUserData = NULL; } }; @@ -95,7 +95,7 @@ private: sal_uInt16 mnMaxMRUCount; Link maSelectionChangedHdl; - sal_Bool mbCallSelectionChangedHdl; + bool mbCallSelectionChangedHdl; boost::ptr_vector<ImplEntryType> maEntries; ImplEntryType* GetEntry( sal_uInt16 nPos ) const @@ -109,14 +109,14 @@ public: ImplEntryList( Window* pWindow ); ~ImplEntryList(); - sal_uInt16 InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry, sal_Bool bSort ); + sal_uInt16 InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry, bool bSort ); void RemoveEntry( sal_uInt16 nPos ); const ImplEntryType* GetEntryPtr( sal_uInt16 nPos ) const { return (const ImplEntryType*) GetEntry( nPos ); } ImplEntryType* GetMutableEntryPtr( sal_uInt16 nPos ) const { return GetEntry( nPos ); } void Clear(); - sal_uInt16 FindMatchingEntry( const OUString& rStr, sal_uInt16 nStart = 0, sal_Bool bForward = sal_True, sal_Bool bLazy = sal_True ) const; - sal_uInt16 FindEntry( const OUString& rStr, sal_Bool bSearchMRUArea = sal_False ) const; + sal_uInt16 FindMatchingEntry( const OUString& rStr, sal_uInt16 nStart = 0, bool bForward = true, bool bLazy = true ) const; + sal_uInt16 FindEntry( const OUString& rStr, bool bSearchMRUArea = false ) const; sal_uInt16 FindEntry( const void* pData ) const; /// helper: add up heights up to index nEndIndex. @@ -127,11 +127,11 @@ public: long GetEntryHeight( sal_uInt16 nPos ) const; sal_uInt16 GetEntryCount() const { return (sal_uInt16)maEntries.size(); } - sal_Bool HasImages() const { return mnImages ? sal_True : sal_False; } + bool HasImages() const { return mnImages ? sal_True : sal_False; } OUString GetEntryText( sal_uInt16 nPos ) const; - sal_Bool HasEntryImage( sal_uInt16 nPos ) const; + bool HasEntryImage( sal_uInt16 nPos ) const; Image GetEntryImage( sal_uInt16 nPos ) const; void SetEntryData( sal_uInt16 nPos, void* pNewData ); @@ -140,12 +140,12 @@ public: void SetEntryFlags( sal_uInt16 nPos, long nFlags ); long GetEntryFlags( sal_uInt16 nPos ) const; - void SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ); + void SelectEntry( sal_uInt16 nPos, bool bSelect ); sal_uInt16 GetSelectEntryCount() const; OUString GetSelectEntry( sal_uInt16 nIndex ) const; sal_uInt16 GetSelectEntryPos( sal_uInt16 nIndex ) const; - sal_Bool IsEntryPosSelected( sal_uInt16 nIndex ) const; + bool IsEntryPosSelected( sal_uInt16 nIndex ) const; void SetLastSelected( sal_uInt16 nPos ) { mnLastSelected = nPos; } sal_uInt16 GetLastSelected() const { return mnLastSelected; } @@ -155,7 +155,7 @@ public: void SetSelectionChangedHdl( const Link& rLnk ) { maSelectionChangedHdl = rLnk; } - void SetCallSelectionChangedHdl( sal_Bool bCall ) { mbCallSelectionChangedHdl = bCall; } + void SetCallSelectionChangedHdl( bool bCall ) { mbCallSelectionChangedHdl = bCall; } void SetMRUCount( sal_uInt16 n ) { mnMRUCount = n; } sal_uInt16 GetMRUCount() const { return mnMRUCount; } @@ -250,8 +250,8 @@ protected: virtual void GetFocus(); virtual void LoseFocus(); - sal_Bool SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False, sal_Bool bSelectPosChange = sal_False ); - void ImplPaint( sal_uInt16 nPos, sal_Bool bErase = sal_False, bool bLayout = false ); + bool SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, bool bShift = false, bool bCtrl = false, bool bSelectPosChange = false ); + void ImplPaint( sal_uInt16 nPos, bool bErase = false, bool bLayout = false ); void ImplDoPaint( const Rectangle& rRect, bool bLayout = false ); void ImplCalcMetrics(); void ImplUpdateEntryMetrics( ImplEntryType& rEntry ); @@ -280,14 +280,14 @@ public: sal_uInt16 GetDisplayLineCount() const; void SetEntryFlags( sal_uInt16 nPos, long nFlags ); - void DrawEntry( sal_uInt16 nPos, sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos = sal_False, bool bLayout = false ); + void DrawEntry( sal_uInt16 nPos, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos = false, bool bLayout = false ); - void SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ); + void SelectEntry( sal_uInt16 nPos, bool bSelect ); void DeselectAll(); sal_uInt16 GetEntryPosForPoint( const Point& rPoint ) const; sal_uInt16 GetLastVisibleEntry() const; - sal_Bool ProcessKeyInput( const KeyEvent& rKEvt ); + bool ProcessKeyInput( const KeyEvent& rKEvt ); void SetTopEntry( sal_uInt16 nTop ); sal_uInt16 GetTopEntry() const { return mnTop; } @@ -297,7 +297,7 @@ public: void SetProminentEntryType( ProminentEntry eType ) { meProminentType = eType; } ProminentEntry GetProminentEntryType() const { return meProminentType; } using Window::IsVisible; - sal_Bool IsVisible( sal_uInt16 nEntry ) const; + bool IsVisible( sal_uInt16 nEntry ) const; long GetLeftIndent() const { return mnLeft; } void SetLeftIndent( long n ); @@ -361,7 +361,7 @@ public: bool IsReadOnly() const { return mbReadOnly; } using Control::ImplInitSettings; - void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); sal_uInt16 ImplGetTextStyle() const; /// pb: #106948# explicit mirroring for calc @@ -430,13 +430,13 @@ public: void SetEntryFlags( sal_uInt16 nPos, long nFlags ); - void SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ); + void SelectEntry( sal_uInt16 nPos, bool bSelect ); void SetNoSelection(); void ResetCurrentPos() { maLBWindow.ResetCurrentPos(); } sal_uInt16 GetCurrentPos() const { return maLBWindow.GetCurrentPos(); } - sal_Bool ProcessKeyInput( const KeyEvent& rKEvt ) { return maLBWindow.ProcessKeyInput( rKEvt ); } - sal_Bool HandleWheelAsCursorTravel( const CommandEvent& rCEvt ); + bool ProcessKeyInput( const KeyEvent& rKEvt ) { return maLBWindow.ProcessKeyInput( rKEvt ); } + bool HandleWheelAsCursorTravel( const CommandEvent& rCEvt ); void SetSeparatorPos( sal_uInt16 n ) { maLBWindow.SetSeparatorPos( n ); } sal_uInt16 GetSeparatorPos() const { return maLBWindow.GetSeparatorPos(); } @@ -445,7 +445,7 @@ public: sal_uInt16 GetTopEntry() const { return maLBWindow.GetTopEntry(); } void ShowProminentEntry( sal_uInt16 nPos ) { maLBWindow.ShowProminentEntry( nPos ); } using Window::IsVisible; - sal_Bool IsVisible( sal_uInt16 nEntry ) const { return maLBWindow.IsVisible( nEntry ); } + bool IsVisible( sal_uInt16 nEntry ) const { return maLBWindow.IsVisible( nEntry ); } void SetProminentEntryType( ProminentEntry eType ) { maLBWindow.SetProminentEntryType( eType ); } ProminentEntry GetProminentEntryType() const { return maLBWindow.GetProminentEntryType(); } @@ -454,18 +454,18 @@ public: void SetLeftIndent( sal_uInt16 n ) { maLBWindow.SetLeftIndent( n ); } void ScrollHorz( short nDiff ) { maLBWindow.ScrollHorz( nDiff ); } - void SetTravelSelect( sal_Bool bTravelSelect ) { maLBWindow.SetTravelSelect( bTravelSelect ); } - sal_Bool IsTravelSelect() const { return maLBWindow.IsTravelSelect(); } - sal_Bool IsTrackingSelect() const { return maLBWindow.IsTrackingSelect(); } + void SetTravelSelect( bool bTravelSelect ) { maLBWindow.SetTravelSelect( bTravelSelect ); } + bool IsTravelSelect() const { return maLBWindow.IsTravelSelect(); } + bool IsTrackingSelect() const { return maLBWindow.IsTrackingSelect(); } - void EnableMultiSelection( sal_Bool bMulti, sal_Bool bStackMode ) { maLBWindow.EnableMultiSelection( bMulti, bStackMode ); } - sal_Bool IsMultiSelectionEnabled() const { return maLBWindow.IsMultiSelectionEnabled(); } + void EnableMultiSelection( bool bMulti, bool bStackMode ) { maLBWindow.EnableMultiSelection( bMulti, bStackMode ); } + bool IsMultiSelectionEnabled() const { return maLBWindow.IsMultiSelectionEnabled(); } - void SetMultiSelectionSimpleMode( sal_Bool bSimple ) { maLBWindow.SetMultiSelectionSimpleMode( bSimple ); } - sal_Bool IsMultiSelectionSimpleMode() const { return maLBWindow.IsMultiSelectionSimpleMode(); } + void SetMultiSelectionSimpleMode( bool bSimple ) { maLBWindow.SetMultiSelectionSimpleMode( bSimple ); } + bool IsMultiSelectionSimpleMode() const { return maLBWindow.IsMultiSelectionSimpleMode(); } - void SetReadOnly( sal_Bool b ) { maLBWindow.SetReadOnly( b ); } - sal_Bool IsReadOnly() const { return maLBWindow.IsReadOnly(); } + void SetReadOnly( bool b ) { maLBWindow.SetReadOnly( b ); } + bool IsReadOnly() const { return maLBWindow.IsReadOnly(); } Size CalcSize( sal_uInt16 nMaxLines ) const { return maLBWindow.CalcSize( nMaxLines ); } @@ -488,8 +488,8 @@ public: void SetListItemSelectHdl( const Link& rLink ) { maLBWindow.SetListItemSelectHdl( rLink ); } const Link& GetListItemSelectHdl() const { return maLBWindow.GetListItemSelectHdl(); } void SetSelectionChangedHdl( const Link& rLnk ) { maLBWindow.GetEntryList()->SetSelectionChangedHdl( rLnk ); } - void SetCallSelectionChangedHdl( sal_Bool bCall ) { maLBWindow.GetEntryList()->SetCallSelectionChangedHdl( bCall ); } - sal_Bool IsSelectionChanged() const { return maLBWindow.IsSelectionChanged(); } + void SetCallSelectionChangedHdl( bool bCall ) { maLBWindow.GetEntryList()->SetCallSelectionChangedHdl( bCall ); } + bool IsSelectionChanged() const { return maLBWindow.IsSelectionChanged(); } sal_uInt16 GetSelectModifier() const { return maLBWindow.GetSelectModifier(); } void SetMRUEntries( const OUString& rEntries, sal_Unicode cSep ); @@ -514,7 +514,7 @@ private: Size maPrefSz; sal_uInt16 mnDDLineCount; sal_uInt16 mnPopupModeStartSaveSelection; - sal_Bool mbAutoWidth; + bool mbAutoWidth; protected: virtual bool PreNotify( NotifyEvent& rNEvt ); @@ -527,11 +527,11 @@ public: void SetPrefSize( const Size& rSz ) { maPrefSz = rSz; } const Size& GetPrefSize() const { return maPrefSz; } - void SetAutoWidth( sal_Bool b ) { mbAutoWidth = b; } - sal_Bool IsAutoWidth() const { return mbAutoWidth; } + void SetAutoWidth( bool b ) { mbAutoWidth = b; } + bool IsAutoWidth() const { return mbAutoWidth; } Size CalcFloatSize(); - void StartFloat( sal_Bool bStartTracking ); + void StartFloat( bool bStartTracking ); virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); @@ -602,7 +602,7 @@ public: void EnableUserDraw( bool bUserDraw ) { mbUserDrawEnabled = bUserDraw; } bool IsUserDrawEnabled() const { return mbUserDrawEnabled; } - void DrawEntry( sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos = sal_False, bool bLayout = false ); + void DrawEntry( bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos = false, bool bLayout = false ); bool GetEdgeBlending() const { return mbEdgeBlending; } void SetEdgeBlending(bool bNew) { mbEdgeBlending = bNew; } @@ -611,7 +611,7 @@ public: class ImplBtn : public PushButton { private: - sal_Bool mbDown; + bool mbDown; Link maMBDownHdl; @@ -627,7 +627,7 @@ public: }; -void ImplInitFieldSettings( Window* pWin, sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); +void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBackground ); void ImplInitDropDownButton( PushButton* pButton ); #endif // INCLUDED_VCL_INC_ILSTBOX_HXX diff --git a/vcl/inc/image.h b/vcl/inc/image.h index a59c865b23ed..370e19f46cca 100644 --- a/vcl/inc/image.h +++ b/vcl/inc/image.h @@ -119,7 +119,7 @@ struct ImplImageRefData ImplImageRefData() {} // Um Warning zu umgehen ~ImplImageRefData(); - sal_Bool IsEqual( const ImplImageRefData& rData ); + bool IsEqual( const ImplImageRefData& rData ); }; // ---------------- @@ -134,7 +134,7 @@ struct ImplImageData ImplImageData( const BitmapEx& rBmpEx ); ~ImplImageData(); - sal_Bool IsEqual( const ImplImageData& rData ); + bool IsEqual( const ImplImageData& rData ); }; // ------------- diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx index 31b6e4329b09..c0eb805090f8 100644 --- a/vcl/inc/impbmp.hxx +++ b/vcl/inc/impbmp.hxx @@ -43,16 +43,16 @@ public: void ImplSetSalBitmap( SalBitmap* pSalBitmap ); SalBitmap* ImplGetSalBitmap() const { return mpSalBitmap; } - sal_Bool ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ); - sal_Bool ImplCreate( const ImpBitmap& rImpBitmap ); - sal_Bool ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics ); - sal_Bool ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount ); + bool ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ); + bool ImplCreate( const ImpBitmap& rImpBitmap ); + bool ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics ); + bool ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount ); Size ImplGetSize() const; sal_uInt16 ImplGetBitCount() const; - BitmapBuffer* ImplAcquireBuffer( sal_Bool bReadOnly ); - void ImplReleaseBuffer( BitmapBuffer* pBuffer, sal_Bool bReadOnly ); + BitmapBuffer* ImplAcquireBuffer( bool bReadOnly ); + void ImplReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ); sal_uLong ImplGetRefCount() const { return mnRefCount; } void ImplIncRefCount() { mnRefCount++; } diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 0bdd8edb2969..75bc9267acb7 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -75,7 +75,7 @@ private: FontEmphasisMark meEmphasisMark; short mnOrientation; FontKerning mnKerning; - sal_Bool mbWordLine:1, + bool mbWordLine:1, mbOutline:1, mbConfigLookup:1, // there was a config lookup mbShadow:1, diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx index 6926aee63c64..931bf6b355f5 100644 --- a/vcl/inc/impgraph.hxx +++ b/vcl/inc/impgraph.hxx @@ -64,8 +64,8 @@ private: sal_uLong mnDocFilePos; mutable sal_uLong mnSizeBytes; sal_uLong mnRefCount; - sal_Bool mbSwapOut; - sal_Bool mbSwapUnderway; + bool mbSwapOut; + bool mbSwapUnderway; // SvgData support SvgDataPtr maSvgData; @@ -82,20 +82,20 @@ private: virtual ~ImpGraphic(); ImpGraphic& operator=( const ImpGraphic& rImpGraphic ); - sal_Bool operator==( const ImpGraphic& rImpGraphic ) const; - sal_Bool operator!=( const ImpGraphic& rImpGraphic ) const { return !( *this == rImpGraphic ); } + bool operator==( const ImpGraphic& rImpGraphic ) const; + bool operator!=( const ImpGraphic& rImpGraphic ) const { return !( *this == rImpGraphic ); } - void ImplClearGraphics( sal_Bool bCreateSwapInfo ); + void ImplClearGraphics( bool bCreateSwapInfo ); void ImplClear(); GraphicType ImplGetType() const; void ImplSetDefaultType(); - sal_Bool ImplIsSupportedGraphic() const; + bool ImplIsSupportedGraphic() const; - sal_Bool ImplIsTransparent() const; - sal_Bool ImplIsAlpha() const; - sal_Bool ImplIsAnimated() const; - sal_Bool ImplIsEPS() const; + bool ImplIsTransparent() const; + bool ImplIsAlpha() const; + bool ImplIsAnimated() const; + bool ImplIsEPS() const; Bitmap ImplGetBitmap(const GraphicConversionParameters& rParameters) const; BitmapEx ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const; @@ -141,24 +141,24 @@ private: const OUString& ImplGetDocFileName() const; sal_uLong ImplGetDocFilePos() const; - sal_Bool ImplReadEmbedded( SvStream& rIStream, sal_Bool bSwap = sal_False ); - sal_Bool ImplWriteEmbedded( SvStream& rOStream ); + bool ImplReadEmbedded( SvStream& rIStream, bool bSwap = false ); + bool ImplWriteEmbedded( SvStream& rOStream ); - sal_Bool ImplSwapIn(); - sal_Bool ImplSwapIn( SvStream* pIStm ); + bool ImplSwapIn(); + bool ImplSwapIn( SvStream* pIStm ); - sal_Bool ImplSwapOut(); - sal_Bool ImplSwapOut( SvStream* pOStm ); + bool ImplSwapOut(); + bool ImplSwapOut( SvStream* pOStm ); - sal_Bool ImplIsSwapOut() const; + bool ImplIsSwapOut() const; void ImplSetLink( const GfxLink& ); GfxLink ImplGetLink(); - sal_Bool ImplIsLink() const; + bool ImplIsLink() const; sal_uLong ImplGetChecksum() const; - sal_Bool ImplExportNative( SvStream& rOStm ) const; + bool ImplExportNative( SvStream& rOStm ) const; friend SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic ); friend SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ); diff --git a/vcl/inc/octree.hxx b/vcl/inc/octree.hxx index f81f1e5fd798..186e4406fac1 100644 --- a/vcl/inc/octree.hxx +++ b/vcl/inc/octree.hxx @@ -36,7 +36,7 @@ typedef struct OctreeNode OctreeNode* pNext; OctreeNode* pNextInCache; sal_uInt16 nPalIndex; - sal_Bool bLeaf; + bool bLeaf; } NODE; typedef NODE* PNODE; diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index e142f0ab0101..11e4ea0e8907 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -226,7 +226,7 @@ namespace vcl Size maDetailsCollapsedSize; Size maDetailsExpandedSize; - sal_Bool mbShowLayoutPage; + bool mbShowLayoutPage; Size getJobPageSize(); void updateNup(); diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index 41b510f7e879..a30ca80c277a 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -115,7 +115,7 @@ public: // Event must be destroyed, when Frame is destroyed // When Event is called, SalInstance::Yield() must be returned - virtual sal_Bool PostEvent( void* pData ) = 0; + virtual bool PostEvent( void* pData ) = 0; virtual void SetTitle( const OUString& rTitle ) = 0; virtual void SetIcon( sal_uInt16 nIcon ) = 0; @@ -142,7 +142,7 @@ public: const SalFrameGeometry& GetUnmirroredGeometry() const { return maGeometry; } virtual void SetWindowState( const SalFrameState* pState ) = 0; - virtual sal_Bool GetWindowState( SalFrameState* pState ) = 0; + virtual bool GetWindowState( SalFrameState* pState ) = 0; virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ) = 0; // Enable/Disable ScreenSaver, SystemAgents, ... @@ -173,7 +173,7 @@ public: // returns in 'rKeyCode' the single keycode that translates to the given unicode when using a keyboard layout of language 'aLangType' // returns sal_False if no mapping exists or function not supported // this is required for advanced menu support - virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) = 0; + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) = 0; // returns the input language used for the last key stroke // may be LANGUAGE_DONTKNOW if not supported by the OS diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 7c3ffdb005e8..3c4d04709432 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -110,9 +110,9 @@ protected: const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, com::sun::star::drawing::LineCap) = 0; - virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0; - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0; - virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) = 0; + virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0; + virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0; + virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) = 0; // CopyArea --> No RasterOp, but ClipRegion virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, @@ -139,15 +139,15 @@ protected: virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) = 0; virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ) = 0; - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) = 0; + virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) = 0; // native widget rendering methods that require mirroring - virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, bool& rIsInside ); - virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption ); - virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, + virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); @@ -260,7 +260,7 @@ public: // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" - virtual sal_Bool CreateFontSubset( const OUString& rToFile, + virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, sal_GlyphId* pGlyphIDs, sal_uInt8* pEncoding, @@ -352,7 +352,7 @@ public: void mirror( long& nX, const OutputDevice *pOutDev, bool bBack = false ) const; void mirror( long& nX, long& nWidth, const OutputDevice *pOutDev, bool bBack = false ) const; - sal_Bool mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack = false ) const; + bool mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack = false ) const; void mirror( Rectangle& rRect, const OutputDevice*, bool bBack = false ) const; void mirror( Region& rRgn, const OutputDevice *pOutDev, bool bBack = false ) const; void mirror( ImplControlValue&, const OutputDevice*, bool bBack = false ) const; @@ -385,15 +385,15 @@ public: com::sun::star::drawing::LineCap i_eLineCap, const OutputDevice* i_pOutDev); - sal_Bool DrawPolyLineBezier( sal_uInt32 nPoints, + bool DrawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice *pOutDev ); - sal_Bool DrawPolygonBezier( sal_uInt32 nPoints, + bool DrawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice *pOutDev ); - sal_Bool DrawPolyPolygonBezier( sal_uInt32 nPoly, + bool DrawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry, @@ -443,7 +443,7 @@ public: SalInvert nFlags, const OutputDevice *pOutDev ); - sal_Bool DrawEPS( long nX, long nY, + bool DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize, @@ -452,10 +452,10 @@ public: // native widget rendering functions // Query the platform layer for control support - virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); // Query the native control to determine if it was acted upon - sal_Bool HitTestNativeControl( ControlType nType, + bool HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, @@ -463,7 +463,7 @@ public: const OutputDevice *pOutDev ); // Request rendering of a particular control and/or part - sal_Bool DrawNativeControl( ControlType nType, + bool DrawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -472,7 +472,7 @@ public: const OutputDevice *pOutDev ); // Query the native control's actual drawing region (including adornment) - sal_Bool GetNativeControlRegion( ControlType nType, + bool GetNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx index 2a15583dbbfa..6515fc2fab0f 100644 --- a/vcl/inc/salmenu.hxx +++ b/vcl/inc/salmenu.hxx @@ -65,7 +65,7 @@ public: SalMenu() {} virtual ~SalMenu(); - virtual sal_Bool VisibleMenuBar() = 0; // must return sal_True to actually DISPLAY native menu bars + virtual bool VisibleMenuBar() = 0; // must return sal_True to actually DISPLAY native menu bars // otherwise only menu messages are processed (eg, OLE on Windows) virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) = 0; diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index 302200a6a9c2..219e2ce026fe 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -39,10 +39,10 @@ class VCL_PLUGIN_PUBLIC SalObject { void* m_pInst; SALOBJECTPROC m_pCallback; - sal_Bool m_bMouseTransparent:1, + bool m_bMouseTransparent:1, m_bEraseBackground:1; public: - SalObject() : m_pInst( NULL ), m_pCallback( NULL ), m_bMouseTransparent( sal_False ), m_bEraseBackground( sal_True ) {} + SalObject() : m_pInst( NULL ), m_pCallback( NULL ), m_bMouseTransparent( false ), m_bEraseBackground( true ) {} virtual ~SalObject(); virtual void ResetClipRegion() = 0; @@ -67,13 +67,13 @@ public: { m_pInst = pInst; m_pCallback = pProc; } long CallCallback( sal_uInt16 nEvent, const void* pEvent ) { return m_pCallback ? m_pCallback( m_pInst, this, nEvent, pEvent ) : 0; } - void SetMouseTransparent( sal_Bool bMouseTransparent ) + void SetMouseTransparent( bool bMouseTransparent ) { m_bMouseTransparent = bMouseTransparent; } - sal_Bool IsMouseTransparent() + bool IsMouseTransparent() { return m_bMouseTransparent; } - void EnableEraseBackground( sal_Bool bEnable ) + void EnableEraseBackground( bool bEnable ) { m_bEraseBackground = bEnable; } - sal_Bool IsEraseBackgroundEnabled() + bool IsEraseBackgroundEnabled() { return m_bEraseBackground; } }; diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx index 3e96c557122f..ce003ff17354 100644 --- a/vcl/inc/salprn.hxx +++ b/vcl/inc/salprn.hxx @@ -61,15 +61,15 @@ public: virtual SalGraphics* GetGraphics() = 0; virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0; - virtual sal_Bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) = 0; + virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) = 0; // This function set the driver data and // set the new indepen data in pSetupData - virtual sal_Bool SetPrinterData( ImplJobSetup* pSetupData ) = 0; + virtual bool SetPrinterData( ImplJobSetup* pSetupData ) = 0; // This function merged the indepen driver data // and set the new indepen data in pSetupData // Only the data must changed, where the bit // in nFlags is set - virtual sal_Bool SetData( sal_uLong nFlags, ImplJobSetup* pSetupData ) = 0; + virtual bool SetData( sal_uLong nFlags, ImplJobSetup* pSetupData ) = 0; virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, @@ -90,7 +90,7 @@ public: SalPrinter() {} virtual ~SalPrinter(); - virtual sal_Bool StartJob( const OUString* pFileName, + virtual bool StartJob( const OUString* pFileName, const OUString& rJobName, const OUString& rAppName, sal_uLong nCopies, @@ -100,16 +100,16 @@ public: // implement for pull model print systems only, // default implementations (see salvtables.cxx) just returns sal_False - virtual sal_Bool StartJob( const OUString* pFileName, + virtual bool StartJob( const OUString* pFileName, const OUString& rJobName, const OUString& rAppName, ImplJobSetup* pSetupData, vcl::PrinterController& rController ); - virtual sal_Bool EndJob() = 0; - virtual sal_Bool AbortJob() = 0; + virtual bool EndJob() = 0; + virtual bool AbortJob() = 0; virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ) = 0; - virtual sal_Bool EndPage() = 0; + virtual bool EndPage() = 0; virtual sal_uLong GetErrorCode() = 0; }; diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx index 2720e34f99bc..736ee06822a5 100644 --- a/vcl/inc/salvd.hxx +++ b/vcl/inc/salvd.hxx @@ -37,10 +37,10 @@ public: virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0; // Set new size, without saving the old contents - virtual sal_Bool SetSize( long nNewDX, long nNewDY ) = 0; + virtual bool SetSize( long nNewDX, long nNewDY ) = 0; // Set new size using a buffer at the given address - virtual sal_Bool SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray & /* pBuffer */ ) + virtual bool SetSizeUsingBuffer( long nNewDX, long nNewDY, const basebmp::RawMemorySharedArray & /* pBuffer */ ) { // Only the headless virtual device has an implementation that uses pBuffer. return SetSize( nNewDX, nNewDY ); diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index b592a6ab7768..22b71c6b9d94 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -155,11 +155,11 @@ struct SalWheelMouseEvent long mnNotchDelta; // Number of fixed rotations sal_uLong mnScrollLines; // Actual number of lines to scroll sal_uInt16 mnCode; // SV-Modifiercode (KEY_SHIFT|KEY_MOD1|KEY_MOD2|MOUSE_LEFT|MOUSE_MIDDLE|MOUSE_RIGHT) - sal_Bool mbHorz; // Horizontal - sal_Bool mbDeltaIsPixel; // delta value is a pixel value (on touch devices) + bool mbHorz; // Horizontal + bool mbDeltaIsPixel; // delta value is a pixel value (on touch devices) SalWheelMouseEvent() - : mnTime( 0 ), mnX( 0 ), mnY( 0 ), mnDelta( 0 ), mnNotchDelta( 0 ), mnScrollLines( 0 ), mnCode( 0 ), mbHorz( sal_False ), mbDeltaIsPixel( sal_False ) + : mnTime( 0 ), mnX( 0 ), mnY( 0 ), mnDelta( 0 ), mnNotchDelta( 0 ), mnScrollLines( 0 ), mnCode( 0 ), mbHorz( false ), mbDeltaIsPixel( false ) {} }; diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx index c86b5a271a68..ba69bda08d9b 100644 --- a/vcl/inc/sft.hxx +++ b/vcl/inc/sft.hxx @@ -505,7 +505,7 @@ namespace vcl * MapString() replaces the UCS-2 characters in str with glyphIDs. * @ingroup sft */ - int VCL_DLLPUBLIC MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, int bvertical); + int VCL_DLLPUBLIC MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, bool bvertical); /** * Maps a Unicode (UCS-2) character to a glyph ID and returns it. Missing glyph has diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index ec9c475c5395..f46bf003f9cc 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -134,11 +134,11 @@ struct ImplSVAppData sal_uInt16 mnSysWinMode; // Mode, when SystemWindows should be created sal_uInt16 mnLayout; // --- RTL-Flags --- currently not used, only for testing short mnDialogScaleX; // Scale X-Positions and sizes in Dialogs - sal_Bool mbInAppMain; // is Application::Main() on stack - sal_Bool mbInAppExecute; // is Application::Execute() on stack - sal_Bool mbAppQuit; // is Application::Quit() called - sal_Bool mbSettingsInit; // sal_True: Settings are initialized - sal_Bool mbNoYield; // Application::Yield will not wait for events if the queue is empty + bool mbInAppMain; // is Application::Main() on stack + bool mbInAppExecute; // is Application::Execute() on stack + bool mbAppQuit; // is Application::Quit() called + bool mbSettingsInit; // sal_True: Settings are initialized + bool mbNoYield; // Application::Yield will not wait for events if the queue is empty // essentially that makes it the same as Application::Reschedule Application::DialogCancelMode meDialogCancel; // sal_True: All Dialog::Execute() calls will be terminated immediately with return sal_False long mnDefaultLayoutBorder; // default value in pixel for layout distances used @@ -175,7 +175,7 @@ struct ImplSVGDIData long mnRealAppFontX; // AppFont X-Numenator for 40/tel Width long mnAppFontX; // AppFont X-Numenator for 40/tel Width + DialogScaleX long mnAppFontY; // AppFont Y-Numenator for 80/tel Height - sal_Bool mbFontSubChanged; // sal_True: FontSubstitution was changed between Begin/End + bool mbFontSubChanged; // sal_True: FontSubstitution was changed between Begin/End bool mbNativeFontConfig; // true: do not override UI font bool mbNoXORClipping; // true: do not use XOR to achieve clipping effects }; @@ -200,9 +200,9 @@ struct ImplSVWinData Window* mpAutoScrollWin; // window, that is in AutoScrollMode mode sal_uInt16 mnTrackFlags; // tracking flags sal_uInt16 mnAutoScrollFlags; // auto scroll flags - sal_Bool mbNoDeactivate; // sal_True: do not execute Deactivate - sal_Bool mbNoSaveFocus; // sal_True: menus must not save/restore focus - sal_Bool mbNoSaveBackground; // sal_True: save background is unnecessary or even less performant + bool mbNoDeactivate; // sal_True: do not execute Deactivate + bool mbNoSaveFocus; // sal_True: menus must not save/restore focus + bool mbNoSaveBackground; // sal_True: save background is unnecessary or even less performant }; @@ -236,16 +236,16 @@ struct ImplSVCtrlData struct ImplSVHelpData { - sal_Bool mbContextHelp : 1; // is ContextHelp enabled - sal_Bool mbExtHelp : 1; // is ExtendedHelp enabled - sal_Bool mbExtHelpMode : 1; // is in ExtendedHelp Mode - sal_Bool mbOldBalloonMode : 1; // BallonMode, befor ExtHelpMode started - sal_Bool mbBalloonHelp : 1; // is BalloonHelp enabled - sal_Bool mbQuickHelp : 1; // is QuickHelp enabled - sal_Bool mbSetKeyboardHelp : 1; // tiphelp was activated by keyboard - sal_Bool mbKeyboardHelp : 1; // tiphelp was activated by keyboard - sal_Bool mbAutoHelpId : 1; // generate HelpIds - sal_Bool mbRequestingHelp : 1; // In Window::RequestHelp + bool mbContextHelp : 1; // is ContextHelp enabled + bool mbExtHelp : 1; // is ExtendedHelp enabled + bool mbExtHelpMode : 1; // is in ExtendedHelp Mode + bool mbOldBalloonMode : 1; // BallonMode, befor ExtHelpMode started + bool mbBalloonHelp : 1; // is BalloonHelp enabled + bool mbQuickHelp : 1; // is QuickHelp enabled + bool mbSetKeyboardHelp : 1; // tiphelp was activated by keyboard + bool mbKeyboardHelp : 1; // tiphelp was activated by keyboard + bool mbAutoHelpId : 1; // generate HelpIds + bool mbRequestingHelp : 1; // In Window::RequestHelp HelpTextWindow* mpHelpWin; // HelpWindow sal_uLong mnLastHelpHideTime; // ticks of last show }; @@ -308,7 +308,7 @@ struct ImplSVData SalInstance* mpDefInst; // Default SalInstance Application* mpApp; // pApp WorkWindow* mpDefaultWin; // Default-Window - sal_Bool mbDeInit; // Is VCL deinitializing + bool mbDeInit; // Is VCL deinitializing sal_uLong mnThreadCount; // is VCL MultiThread enabled ImplConfigData* mpFirstConfigData; // Zeiger auf ersten Config-Block ImplTimerData* mpFirstTimerData; // list of all running timers @@ -318,8 +318,8 @@ struct ImplSVData ResMgr* mpResMgr; // SV-Resource-Manager sal_uLong mnTimerPeriod; // current timer period sal_uLong mnTimerUpdate; // TimerCallbackProcs on stack - sal_Bool mbNotAllTimerCalled;// sal_True: Es muessen noch Timer abgearbeitet werden - sal_Bool mbNoCallTimer; // sal_True: No Timeout calls + bool mbNotAllTimerCalled;// sal_True: Es muessen noch Timer abgearbeitet werden + bool mbNoCallTimer; // sal_True: No Timeout calls ImplSVAppData maAppData; // indepen data for class Application ImplSVGDIData maGDIData; // indepen data for Output classes ImplSVWinData maWinData; // indepen data for Windows classes @@ -330,7 +330,7 @@ struct ImplSVData Window* mpIntroWindow; // the splash screen DockingManager* mpDockingManager; BlendFrameCache* mpBlendFrameCache; - sal_Bool mbIsTestTool; + bool mbIsTestTool; oslThreadIdentifier mnMainThreadId; rtl::Reference< vcl::DisplayConnection > mxDisplayConnection; @@ -377,18 +377,18 @@ struct ImplDelData { ImplDelData* mpNext; const Window* mpWindow; - sal_Bool mbDel; + bool mbDel; ImplDelData( const Window* pWindow = NULL ) - : mpNext( NULL ), mpWindow( NULL ), mbDel( sal_False ) + : mpNext( NULL ), mpWindow( NULL ), mbDel( false ) { if( pWindow ) AttachToWindow( pWindow ); } virtual ~ImplDelData(); bool IsDead() const { - DBG_ASSERT( mbDel == sal_False, "object deleted while in use !" ); - return (mbDel!=sal_False); + DBG_ASSERT( mbDel == false, "object deleted while in use !" ); + return mbDel; } private: @@ -402,7 +402,7 @@ struct ImplSVEvent Link* mpLink; Window* mpWindow; ImplDelData maDelData; - sal_Bool mbCall; + bool mbCall; }; #endif // INCLUDED_VCL_INC_SVDATA_HXX diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index 6c8bd8e39621..bfffe7bcffd6 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -95,24 +95,24 @@ struct ImplToolItem // the default size is the precomputed size for standard items // ie those that are just ordinary buttons (no windows or text etc.) // bCheckMaxWidth indicates that item windows must not exceed maxWidth in which case they will be painted as buttons - Size GetSize( sal_Bool bHorz, sal_Bool bCheckMaxWidth, long maxWidth, const Size& rDefaultSize ); + Size GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth, const Size& rDefaultSize ); // only useful for buttons: returns if the text or image part or both can be drawn according to current button drawing style - void DetermineButtonDrawStyle( ButtonType eButtonType, sal_Bool& rbImage, sal_Bool& rbText ) const; + void DetermineButtonDrawStyle( ButtonType eButtonType, bool& rbImage, bool& rbText ) const; // returns the rectangle which contains the drop down arrow // or an empty rect if there is none // bHorz denotes the toolbox alignment - Rectangle GetDropDownRect( sal_Bool bHorz ) const; + Rectangle GetDropDownRect( bool bHorz ) const; // returns sal_True if the toolbar item is currently clipped, which can happen for docked toolbars - sal_Bool IsClipped() const; + bool IsClipped() const; // returns sal_True if the toolbar item is currently hidden i.e. they are unchecked in the toolbar Customize menu - sal_Bool IsItemHidden() const; + bool IsItemHidden() const; private: - void init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits, sal_Bool bEmptyBtn); + void init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits, bool bEmptyBtn); }; namespace vcl @@ -163,7 +163,7 @@ struct ImplToolBoxPrivateData vcl::IImageListProvider* mpImageListProvider; vcl::ImageListType meImageListType; - sal_Bool mbIsLocked:1, // keeps last lock state from ImplDockingWindowWrapper + bool mbIsLocked:1, // keeps last lock state from ImplDockingWindowWrapper mbAssumeDocked:1, // only used during calculations to override current floating/popup mode mbAssumeFloating:1, mbAssumePopupMode:1, diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 0cf197a7d70d..bd2fd96dbbc8 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -323,7 +323,7 @@ public: // and false else; if true was returned the event should // be swallowed bool Dispatch( const XEvent* pEvent ); - void grabPointer( sal_Bool bGrab, sal_Bool bOwnerEvents = sal_False ); + void grabPointer( bool bGrab, bool bOwnerEvents = false ); GtkSalDisplay* getDisplay(); GdkDisplay* getGdkDisplay(); @@ -356,7 +356,7 @@ public: // Event must be destroyed, when Frame is destroyed // When Event is called, SalInstance::Yield() must be returned - virtual sal_Bool PostEvent( void* pData ); + virtual bool PostEvent( void* pData ); virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); @@ -379,7 +379,7 @@ public: virtual void GetWorkArea( Rectangle& rRect ); virtual SalFrame* GetParent() const; virtual void SetWindowState( const SalFrameState* pState ); - virtual sal_Bool GetWindowState( SalFrameState* pState ); + virtual bool GetWindowState( SalFrameState* pState ); virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ); // Enable/Disable ScreenSaver, SystemAgents, ... virtual void StartPresentation( sal_Bool bStart ); @@ -405,7 +405,7 @@ public: virtual void EndExtTextInput( sal_uInt16 nFlags ); virtual OUString GetKeyName( sal_uInt16 nKeyCode ); - virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); // returns the input language used for the last key stroke // may be LANGUAGE_DONTKNOW if not supported by the OS diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 628221bf1f94..d3c540b0307f 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -42,12 +42,12 @@ public: long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, sal_uInt16 /*nFlags*/ ); - virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, + virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); - virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, + virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, @@ -130,17 +130,17 @@ public: // will be set when UI theme was changed - static sal_Bool bThemeChanged; - static sal_Bool bNeedPixmapPaint; + static bool bThemeChanged; + static bool bNeedPixmapPaint; // native widget methods - virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); - virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, bool& rIsInside ) SAL_OVERRIDE; - virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, + virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); @@ -163,115 +163,115 @@ protected: typedef std::list< Rectangle > clipList; GdkPixmap* NWGetPixmapFromScreen( Rectangle srcRect ); - sal_Bool NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect ); + bool NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect ); - sal_Bool NWPaintGTKArrow( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKArrow( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKListHeader( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKListHeader( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKFixedLine( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKFixedLine( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKButtonReal( GtkWidget* button, GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKButtonReal( GtkWidget* button, GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKScrollbar( ControlType nType, ControlPart nPart, + bool NWPaintGTKScrollbar( ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, + bool NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKTabItem( ControlType nType, ControlPart nPart, + bool NWPaintGTKTabItem( ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKProgress( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKProgress( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - sal_Bool NWPaintGTKListNode( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + bool NWPaintGTKListNode( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx index 99fd9cb3f8a0..39ef5b80222a 100644 --- a/vcl/inc/unx/gtk/gtkobject.hxx +++ b/vcl/inc/unx/gtk/gtkobject.hxx @@ -40,7 +40,7 @@ class GtkSalObject : public SalObject static gboolean signalFocus( GtkWidget*, GdkEventFocus*, gpointer ); static void signalDestroy( GtkWidget*, gpointer ); public: - GtkSalObject( GtkSalFrame* pParent, sal_Bool bShow = sal_True ); + GtkSalObject( GtkSalFrame* pParent, bool bShow = true ); virtual ~GtkSalObject(); // overload all pure virtual methods diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx index 2550dd38052f..8e955a32d1d7 100644 --- a/vcl/inc/unx/gtk/gtkprn.hxx +++ b/vcl/inc/unx/gtk/gtkprn.hxx @@ -24,11 +24,11 @@ public: GtkSalPrinter(SalInfoPrinter* i_pInfoPrinter); using PspSalPrinter::StartJob; - virtual sal_Bool StartJob( + virtual bool StartJob( const OUString* i_pFileName, const OUString& i_rJobName, const OUString& i_rAppName, ImplJobSetup* io_pSetupData, vcl::PrinterController& io_rController); - virtual sal_Bool EndJob(); + virtual bool EndJob(); private: bool impl_doJob( diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 4b2ac33dc26f..aa99268f82f8 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -40,7 +40,7 @@ class GtkSalMenu : public SalMenu private: std::vector< GtkSalMenuItem* > maItems; - sal_Bool mbMenuBar; + bool mbMenuBar; Menu* mpVCLMenu; GtkSalMenu* mpOldSalMenu; GtkSalMenu* mpParentSalMenu; @@ -55,10 +55,10 @@ private: void ActivateAllSubmenus(MenuBar* pMenuBar); public: - GtkSalMenu( sal_Bool bMenuBar ); + GtkSalMenu( bool bMenuBar ); virtual ~GtkSalMenu(); - virtual sal_Bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars + virtual bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars // otherwise only menu messages are processed (eg, OLE on Windows) virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ); @@ -83,7 +83,7 @@ public: virtual GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; } virtual void SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; } virtual GActionGroup* GetActionGroup() { return mpActionGroup; } - virtual sal_Bool IsItemVisible( unsigned nPos ); + virtual bool IsItemVisible( unsigned nPos ); void NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText ); void NativeSetItemCommand( unsigned nSection, @@ -100,7 +100,7 @@ public: void DispatchCommand( gint itemId, const gchar* aCommand ); void Activate(); void Deactivate( const gchar* aMenuCommand ); - void Display( sal_Bool bVisible ); + void Display( bool bVisible ); bool PrepUpdate(); void Update(); // Update this menu only. void UpdateFull(); // Update full menu hierarchy from this menu. @@ -114,7 +114,7 @@ public: sal_uInt16 mnId; // Item ID MenuItemType mnType; // Item type - sal_Bool mbVisible; // Item visibility. + bool mbVisible; // Item visibility. Menu* mpVCLMenu; // VCL Menu into which this menu item is inserted GtkSalMenu* mpParentMenu; // The menu into which this menu item is inserted GtkSalMenu* mpSubMenu; // Submenu of this item (if defined) diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx index 2c5f13942ca9..76b21925383f 100644 --- a/vcl/inc/unx/i18n_xkb.hxx +++ b/vcl/inc/unx/i18n_xkb.hxx @@ -27,7 +27,7 @@ class VCLPLUG_GEN_PUBLIC SalI18N_KeyboardExtension { private: - sal_Bool mbUseExtension; + bool mbUseExtension; sal_uInt32 mnDefaultGroup; sal_uInt32 mnGroup; int mnEventBase; @@ -39,9 +39,9 @@ public: SalI18N_KeyboardExtension( Display *pDisplay ); inline ~SalI18N_KeyboardExtension(); - inline sal_Bool UseExtension() const ; // server and client support the + inline bool UseExtension() const ; // server and client support the // extension - inline void UseExtension( sal_Bool bState );// used to disable the Extension + inline void UseExtension( bool bState );// used to disable the Extension void Dispatch( XEvent *pEvent ); // keep track of group changes @@ -59,14 +59,14 @@ SalI18N_KeyboardExtension::~SalI18N_KeyboardExtension() { } -inline sal_Bool +inline bool SalI18N_KeyboardExtension::UseExtension() const { return mbUseExtension; } inline void -SalI18N_KeyboardExtension::UseExtension( sal_Bool bState ) +SalI18N_KeyboardExtension::UseExtension( bool bState ) { mbUseExtension = mbUseExtension && bState; } diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 00fcd3ee6869..b9a38daa8f7f 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -139,11 +139,11 @@ public: inline Pixel GetUsed() const { return m_nUsed; } inline int GetClass() const { return m_aVisual.GetClass(); } - sal_Bool GetXPixels( XColor &rColor, + bool GetXPixels( XColor &rColor, int r, int g, int b ) const; - inline sal_Bool GetXPixel( XColor &rColor, + inline bool GetXPixel( XColor &rColor, int r, int g, int b ) const; @@ -262,7 +262,7 @@ protected: XLIB_Cursor aPointerCache_[POINTER_COUNT]; // Keyboard - sal_Bool bNumLockFromXS_; // Num Lock handled by X Server + bool bNumLockFromXS_; // Num Lock handled by X Server int nNumLockIndex_; // modifier index in modmap int nNumLockMask_; // keyevent state mask for KeySym nShiftKeySym_; // first shift modifier @@ -290,7 +290,7 @@ protected: void addXineramaScreenUnique( int i, long i_nX, long i_nY, long i_nWidth, long i_nHeight ); public: static SalDisplay *GetSalDisplay( Display* display ); - static sal_Bool BestVisual( Display *pDisp, + static bool BestVisual( Display *pDisp, int nScreen, XVisualInfo &rVI ); @@ -340,7 +340,7 @@ public: const Size& GetScreenSize( SalX11Screen nXScreen ) const { return getDataForScreen( nXScreen ).m_aSize; } srv_vendor_t GetServerVendor() const { return meServerVendor; } void SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); } - sal_Bool IsDisplay() const { return !!pXLib_; } + bool IsDisplay() const { return !!pXLib_; } GC GetMonoGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aMonoGC; } GC GetCopyGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aCopyGC; } GC GetAndInvertedGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aAndInvertedGC; } @@ -376,7 +376,7 @@ public: unsigned int GetXScreenCount() const { return m_aScreens.size(); } const std::list< SalFrame* >& getFrames() const { return m_aFrames; } - sal_Bool IsNumLockFromXS() const { return bNumLockFromXS_; } + bool IsNumLockFromXS() const { return bNumLockFromXS_; } std::list< SalObject* >& getSalObjects() { return m_aSalObjects; } @@ -403,7 +403,7 @@ public: virtual void Yield(); virtual void PostUserEvent(); - sal_Bool IsEvent(); + bool IsEvent(); void SetupInput( SalI18N_InputMethod *pInputMethod ); }; diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index bb6253f3f34f..d76218b918dc 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -89,11 +89,11 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame Rectangle maRestorePosSize; sal_uIntPtr nStyle_; SalExtStyle mnExtStyle; - sal_Bool bAlwaysOnTop_; - sal_Bool bViewable_; - sal_Bool bMapped_; - sal_Bool mbInShow; - sal_Bool bDefaultPosition_; // client is centered initially + bool bAlwaysOnTop_; + bool bViewable_; + bool bMapped_; + bool mbInShow; + bool bDefaultPosition_; // client is centered initially bool m_bXEmbed; int nVisibility_; int m_nWorkArea; @@ -192,7 +192,7 @@ public: sal_uIntPtr GetStyle() const { return nStyle_; } XLIB_Cursor GetCursor() const { return hCursor_; } - sal_Bool IsCaptured() const { return nCaptured_ == 1; } + bool IsCaptured() const { return nCaptured_ == 1; } #if !defined(__synchronous_extinput__) void HandleExtTextEvent (XClientMessageEvent *pEvent); #endif @@ -217,7 +217,7 @@ public: // call with false to setup graphics with window (GetWindow()) virtual void updateGraphics( bool bClear ); - virtual sal_Bool PostEvent( void* pData ); + virtual bool PostEvent( void* pData ); virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); @@ -234,7 +234,7 @@ public: virtual void GetWorkArea( Rectangle& rRect ); virtual SalFrame* GetParent() const; virtual void SetWindowState( const SalFrameState* pState ); - virtual sal_Bool GetWindowState( SalFrameState* pState ); + virtual bool GetWindowState( SalFrameState* pState ); virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nMonitor ); virtual void StartPresentation( sal_Bool bStart ); virtual void SetAlwaysOnTop( sal_Bool bOnTop ); @@ -248,7 +248,7 @@ public: virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); virtual OUString GetKeyName( sal_uInt16 nKeyCode ); - virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); + virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual void UpdateSettings( AllSettings& rSettings ); virtual void Beep(); diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 962c32e60e3f..e6426b226231 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -108,9 +108,9 @@ protected: SalColor nTextColor_; Pixel nTextPixel_; - sal_Bool bFontVertical_; + bool bFontVertical_; - sal_Bool bDisableGraphite_; + bool bDisableGraphite_; GC pBrushGC_; // Brush attributes SalColor nBrushColor_; @@ -125,20 +125,20 @@ protected: GC pStippleGC_; GC pTrackingGC_; - sal_Bool bWindow_ : 1; // is Window - sal_Bool bPrinter_ : 1; // is Printer - sal_Bool bVirDev_ : 1; // is VirDev - sal_Bool bPenGC_ : 1; // is Pen GC valid - sal_Bool bFontGC_ : 1; // is Font GC valid - sal_Bool bBrushGC_ : 1; // is Brush GC valid - sal_Bool bMonoGC_ : 1; // is Mono GC valid - sal_Bool bCopyGC_ : 1; // is Copy GC valid - sal_Bool bInvertGC_ : 1; // is Invert GC valid - sal_Bool bInvert50GC_ : 1; // is Invert50 GC valid - sal_Bool bStippleGC_ : 1; // is Stipple GC valid - sal_Bool bTrackingGC_ : 1; // is Tracking GC valid + bool bWindow_ : 1; // is Window + bool bPrinter_ : 1; // is Printer + bool bVirDev_ : 1; // is VirDev + bool bPenGC_ : 1; // is Pen GC valid + bool bFontGC_ : 1; // is Font GC valid + bool bBrushGC_ : 1; // is Brush GC valid + bool bMonoGC_ : 1; // is Mono GC valid + bool bCopyGC_ : 1; // is Copy GC valid + bool bInvertGC_ : 1; // is Invert GC valid + bool bInvert50GC_ : 1; // is Invert50 GC valid + bool bStippleGC_ : 1; // is Stipple GC valid + bool bTrackingGC_ : 1; // is Tracking GC valid bool bXORMode_ : 1; // is ROP XOR Mode set - sal_Bool bDitherBrush_ : 1; // is solid or tile + bool bDitherBrush_ : 1; // is solid or tile using SalGraphics::SetClipRegion; void SetClipRegion( GC pGC, @@ -156,7 +156,7 @@ protected: GC pGC, bool bClose ); - sal_Bool GetDitherPixmap ( SalColor nSalColor ); + bool GetDitherPixmap ( SalColor nSalColor ); inline GC GetMonoGC( Pixmap hPixmap ); inline GC GetCopyGC(); @@ -233,7 +233,7 @@ public: virtual void GetDevFontList( ImplDevFontList* ); virtual void ClearDevFontCache(); virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ); - virtual sal_Bool CreateFontSubset( const OUString& rToFile, + virtual bool CreateFontSubset( const OUString& rToFile, const PhysicalFontFace*, sal_GlyphId* pGlyphIDs, sal_uInt8* pEncoding, @@ -277,13 +277,13 @@ public: virtual bool drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency ); #if 1 // TODO: remove these obselete methods - virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, + virtual bool drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, + virtual bool drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, + virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ); @@ -314,7 +314,7 @@ public: virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); + virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h index 3b545bff969f..5b398ae984c4 100644 --- a/vcl/inc/unx/salmenu.h +++ b/vcl/inc/unx/salmenu.h @@ -29,7 +29,7 @@ public: X11SalMenu() {} virtual ~X11SalMenu(); - virtual sal_Bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars + virtual bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars // otherwise only menu messages are processed (eg, OLE on Windows) virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ); diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h index dc65ba5185d9..e8b71eefaa93 100644 --- a/vcl/inc/unx/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -64,10 +64,10 @@ public: XLIB_Window maSecondary; Colormap maColormap; SalClipRegion maClipRegion; - sal_Bool mbVisible; + bool mbVisible; static VCL_DLLPUBLIC bool Dispatch( XEvent* pEvent ); - static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); + static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = sal_True ); X11SalObject(); virtual ~X11SalObject(); diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h index fe6afd432b32..b1210b3a5243 100644 --- a/vcl/inc/unx/salvd.h +++ b/vcl/inc/unx/salvd.h @@ -41,14 +41,14 @@ class X11SalVirtualDevice : public SalVirtualDevice int nDX_; int nDY_; sal_uInt16 nDepth_; - sal_Bool bGraphics_; // is Graphics used - sal_Bool bExternPixmap_; + bool bGraphics_; // is Graphics used + bool bExternPixmap_; public: X11SalVirtualDevice(); virtual ~X11SalVirtualDevice(); - sal_Bool Init( SalDisplay *pDisplay, + bool Init( SalDisplay *pDisplay, long nDX, long nDY, sal_uInt16 nBitCount, SalX11Screen nXScreen, @@ -66,7 +66,7 @@ public: { return pDisplay_; } - sal_Bool IsDisplay() const + bool IsDisplay() const { return pDisplay_->IsDisplay(); } @@ -80,7 +80,7 @@ public: virtual void ReleaseGraphics( SalGraphics* pGraphics ); // Set new size, without saving the old contents - virtual sal_Bool SetSize( long nNewDX, long nNewDY ); + virtual bool SetSize( long nNewDX, long nNewDY ); virtual void GetSize( long& rWidth, long& rHeight ); }; diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 05b5abb8cc16..279fc27c3518 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -100,15 +100,15 @@ struct ImplWinData sal_uInt16* mpExtOldAttrAry; Rectangle* mpCursorRect; long mnCursorExtWidth; - sal_Bool mbVertical; + bool mbVertical; Rectangle* mpCompositionCharRects; long mnCompositionCharRects; Rectangle* mpFocusRect; Rectangle* mpTrackRect; sal_uInt16 mnTrackFlags; sal_uInt16 mnIsTopWindow; - sal_Bool mbMouseOver; // tracks mouse over for native widget paint effect - sal_Bool mbEnableNativeWidget; // toggle native widget rendering + bool mbMouseOver; // tracks mouse over for native widget paint effect + bool mbEnableNativeWidget; // toggle native widget rendering ::std::list< Window* > maTopWindowChildren; }; @@ -119,7 +119,7 @@ struct ImplOverlapData Region* mpSaveBackRgn; // saved region, which must be invalidated Window* mpNextBackWin; // next window with saved background sal_uIntPtr mnSaveBackSize; // bitmap size of saved background - sal_Bool mbSaveBack; // sal_True: save background + bool mbSaveBack; // sal_True: save background sal_uInt8 mnTopLevel; // Level for Overlap-Window }; @@ -158,16 +158,16 @@ struct ImplFrameData sal_uInt16 mnMouseCode; // mouse code sal_uInt16 mnMouseMode; // mouse mode MapUnit meMapUnit; // last MapUnit for LogicUnitToPixel - sal_Bool mbHasFocus; // focus - sal_Bool mbInMouseMove; // is MouseMove on stack - sal_Bool mbMouseIn; // is Mouse inside the frame - sal_Bool mbStartDragCalled; // is command startdrag called - sal_Bool mbNeedSysWindow; // set, when FrameSize <= IMPL_MIN_NEEDSYSWIN - sal_Bool mbMinimized; // set, when FrameSize <= 0 - sal_Bool mbStartFocusState; // FocusState, when sending the event - sal_Bool mbInSysObjFocusHdl; // within a SysChildren's GetFocus handler - sal_Bool mbInSysObjToTopHdl; // within a SysChildren's ToTop handler - sal_Bool mbSysObjFocus; // does a SysChild have focus + bool mbHasFocus; // focus + bool mbInMouseMove; // is MouseMove on stack + bool mbMouseIn; // is Mouse inside the frame + bool mbStartDragCalled; // is command startdrag called + bool mbNeedSysWindow; // set, when FrameSize <= IMPL_MIN_NEEDSYSWIN + bool mbMinimized; // set, when FrameSize <= 0 + bool mbStartFocusState; // FocusState, when sending the event + bool mbInSysObjFocusHdl; // within a SysChildren's GetFocus handler + bool mbInSysObjToTopHdl; // within a SysChildren's ToTop handler + bool mbSysObjFocus; // does a SysChild have focus ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > mxDragSource; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > mxDropTarget; @@ -175,7 +175,7 @@ struct ImplFrameData ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxClipboard; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxSelection; - sal_Bool mbInternalDragGestureRecognizer; + bool mbInternalDragGestureRecognizer; }; struct ImplAccessibleInfos @@ -371,7 +371,7 @@ public: // helper methods -bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouseLeave, +bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeave, long nX, long nY, sal_uIntPtr nMsgTime, sal_uInt16 nCode, sal_uInt16 nMode ); void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ); diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 17208ba9b287..690a8225064c 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -107,7 +107,7 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp, xBmp->getSize().Width == 200 && xBmp->getSize().Height == 200); CPPUNIT_ASSERT_MESSAGE( "alpha state mismatch", - xBmp->hasAlpha() == aContainedBmpEx.IsTransparent()); + bool(xBmp->hasAlpha()) == aContainedBmpEx.IsTransparent()); CPPUNIT_ASSERT_MESSAGE( "getScaledBitmap() failed", xBmp->getScaledBitmap( geometry::RealSize2D(500,500), sal_False ).is()); diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 217a2c747d64..79df6f7bf75b 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -346,7 +346,7 @@ private: public: DbgWindow(); - virtual sal_Bool Close(); + virtual bool Close(); virtual void Resize(); virtual bool PreNotify( NotifyEvent& rNEvt ); void InsertLine( const OUString& rLine ); @@ -455,7 +455,7 @@ DbgWindow::DbgWindow() : // ----------------------------------------------------------------------- -sal_Bool DbgWindow::Close() +bool DbgWindow::Close() { // remember window position OString aState( GetWindowState() ); @@ -469,7 +469,7 @@ sal_Bool DbgWindow::Close() delete this; ImplGetSVData()->maWinData.mpDbgWin = NULL; - return sal_True; + return true; } // ----------------------------------------------------------------------- @@ -626,7 +626,7 @@ DbgDialog::DbgDialog() : maXtorThis.Show(); maXtorThis.SetText("T~his"); if ( pData->nTestFlags & DBG_TEST_XTOR_THIS ) - maXtorThis.Check( sal_True ); + maXtorThis.Check( true ); maXtorThis.SetPosSizePixel( LogicToPixel( Point( 10, 15 ), aAppMap ), aButtonSize ); } @@ -635,7 +635,7 @@ DbgDialog::DbgDialog() : maXtorFunc.Show(); maXtorFunc.SetText("~Function"); if ( pData->nTestFlags & DBG_TEST_XTOR_FUNC ) - maXtorFunc.Check( sal_True ); + maXtorFunc.Check( true ); maXtorFunc.SetPosSizePixel( LogicToPixel( Point( 75, 15 ), aAppMap ), aButtonSize ); } @@ -644,7 +644,7 @@ DbgDialog::DbgDialog() : maXtorExit.Show(); maXtorExit.SetText("E~xit"); if ( pData->nTestFlags & DBG_TEST_XTOR_EXIT ) - maXtorExit.Check( sal_True ); + maXtorExit.Check( true ); maXtorExit.SetPosSizePixel( LogicToPixel( Point( 140, 15 ), aAppMap ), aButtonSize ); } @@ -653,7 +653,7 @@ DbgDialog::DbgDialog() : maXtorReport.Show(); maXtorReport.SetText("~Report"); if ( pData->nTestFlags & DBG_TEST_XTOR_REPORT ) - maXtorReport.Check( sal_True ); + maXtorReport.Check( true ); maXtorReport.SetPosSizePixel( LogicToPixel( Point( 205, 15 ), aAppMap ), aButtonSize ); } @@ -662,7 +662,7 @@ DbgDialog::DbgDialog() : maXtorTrace.Show(); maXtorTrace.SetText("~Trace"); if ( pData->nTestFlags & DBG_TEST_XTOR_TRACE ) - maXtorTrace.Check( sal_True ); + maXtorTrace.Check( true ); maXtorTrace.SetPosSizePixel( LogicToPixel( Point( 270, 15 ), aAppMap ), aButtonSize ); } @@ -678,7 +678,7 @@ DbgDialog::DbgDialog() : maProf.Show(); maProf.SetText("~Profiling"); if ( pData->nTestFlags & DBG_TEST_PROFILING ) - maProf.Check( sal_True ); + maProf.Check( true ); maProf.SetPosSizePixel( LogicToPixel( Point( 10, 95 ), aAppMap ), aButtonSize ); } @@ -687,7 +687,7 @@ DbgDialog::DbgDialog() : maRes.Show(); maRes.SetText("~Resourcen"); if ( pData->nTestFlags & DBG_TEST_RESOURCE ) - maRes.Check( sal_True ); + maRes.Check( true ); maRes.SetPosSizePixel( LogicToPixel( Point( 75, 95 ), aAppMap ), aButtonSize ); } @@ -696,7 +696,7 @@ DbgDialog::DbgDialog() : maDialog.Show(); maDialog.SetText("~Dialog"); if ( pData->nTestFlags & DBG_TEST_DIALOG ) - maDialog.Check( sal_True ); + maDialog.Check( true ); maDialog.SetPosSizePixel( LogicToPixel( Point( 140, 95 ), aAppMap ), aButtonSize ); } @@ -705,7 +705,7 @@ DbgDialog::DbgDialog() : maBoldAppFont.Show(); maBoldAppFont.SetText("~Bold AppFont"); if ( pData->nTestFlags & DBG_TEST_BOLDAPPFONT ) - maBoldAppFont.Check( sal_True ); + maBoldAppFont.Check( true ); maBoldAppFont.SetPosSizePixel( LogicToPixel( Point( 205, 95 ), aAppMap ), aButtonSize ); maBoldAppFont.SaveValue(); @@ -730,7 +730,7 @@ DbgDialog::DbgDialog() : maOverwrite.Show(); maOverwrite.SetText("Overwrite ~File"); if ( pData->bOverwrite ) - maOverwrite.Check( sal_True ); + maOverwrite.Check( true ); maOverwrite.SetPosSizePixel( LogicToPixel( Point( 205, 130 ), aAppMap ), aButtonSize ); } @@ -739,7 +739,7 @@ DbgDialog::DbgDialog() : maHookOSLBox.Show(); maHookOSLBox.SetText("Reroute osl debug ~messages"); if ( pData->bHookOSLAssert ) - maHookOSLBox.Check( sal_True ); + maHookOSLBox.Check( true ); maHookOSLBox.SetPosSizePixel( LogicToPixel( Point( 10, 240 ), aAppMap ), LogicToPixel( Size( 100, 12 ), aAppMap ) ); } @@ -1075,7 +1075,7 @@ DbgInfoDialog::DbgInfoDialog( Window* pParent, bool bHelpText ) : void DbgInfoDialog::SetInfoText( const OUString& rStr ) { - maListBox.SetUpdateMode( sal_False ); + maListBox.SetUpdateMode( false ); maListBox.Clear(); OUString aStr = convertLineEnd(rStr, LINEEND_LF); sal_Int32 nStrIndex = 0; @@ -1118,7 +1118,7 @@ void DbgInfoDialog::SetInfoText( const OUString& rStr ) nStrIndex = nFoundIndex+1; } while ( nFoundIndex != -1 ); - maListBox.SetUpdateMode( sal_True ); + maListBox.SetUpdateMode( true ); } // ======================================================================= diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 69a0836584d1..d70bb7335d17 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -61,14 +61,14 @@ Help::~Help() // ----------------------------------------------------------------------- -sal_Bool Help::Start( const OUString&, const Window* ) +bool Help::Start( const OUString&, const Window* ) { - return sal_False; + return false; } -sal_Bool Help::SearchKeyword( const OUString& ) +bool Help::SearchKeyword( const OUString& ) { - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -82,19 +82,19 @@ OUString Help::GetHelpText( const OUString&, const Window* ) void Help::EnableContextHelp() { - ImplGetSVData()->maHelpData.mbContextHelp = sal_True; + ImplGetSVData()->maHelpData.mbContextHelp = true; } // ----------------------------------------------------------------------- void Help::DisableContextHelp() { - ImplGetSVData()->maHelpData.mbContextHelp = sal_False; + ImplGetSVData()->maHelpData.mbContextHelp = false; } // ----------------------------------------------------------------------- -sal_Bool Help::IsContextHelpEnabled() +bool Help::IsContextHelpEnabled() { return ImplGetSVData()->maHelpData.mbContextHelp; } @@ -103,129 +103,129 @@ sal_Bool Help::IsContextHelpEnabled() void Help::EnableExtHelp() { - ImplGetSVData()->maHelpData.mbExtHelp = sal_True; + ImplGetSVData()->maHelpData.mbExtHelp = true; } // ----------------------------------------------------------------------- void Help::DisableExtHelp() { - ImplGetSVData()->maHelpData.mbExtHelp = sal_False; + ImplGetSVData()->maHelpData.mbExtHelp = false; } // ----------------------------------------------------------------------- -sal_Bool Help::IsExtHelpEnabled() +bool Help::IsExtHelpEnabled() { return ImplGetSVData()->maHelpData.mbExtHelp; } // ----------------------------------------------------------------------- -sal_Bool Help::StartExtHelp() +bool Help::StartExtHelp() { ImplSVData* pSVData = ImplGetSVData(); if ( pSVData->maHelpData.mbExtHelp && !pSVData->maHelpData.mbExtHelpMode ) { - pSVData->maHelpData.mbExtHelpMode = sal_True; + pSVData->maHelpData.mbExtHelpMode = true; pSVData->maHelpData.mbOldBalloonMode = pSVData->maHelpData.mbBalloonHelp; - pSVData->maHelpData.mbBalloonHelp = sal_True; + pSVData->maHelpData.mbBalloonHelp = true; if ( pSVData->maWinData.mpAppWin ) pSVData->maWinData.mpAppWin->ImplGenerateMouseMove(); - return sal_True; + return true; } - return sal_False; + return false; } // ----------------------------------------------------------------------- -sal_Bool Help::EndExtHelp() +bool Help::EndExtHelp() { ImplSVData* pSVData = ImplGetSVData(); if ( pSVData->maHelpData.mbExtHelp && pSVData->maHelpData.mbExtHelpMode ) { - pSVData->maHelpData.mbExtHelpMode = sal_False; + pSVData->maHelpData.mbExtHelpMode = false; pSVData->maHelpData.mbBalloonHelp = pSVData->maHelpData.mbOldBalloonMode; if ( pSVData->maWinData.mpAppWin ) pSVData->maWinData.mpAppWin->ImplGenerateMouseMove(); - return sal_True; + return true; } - return sal_False; + return false; } // ----------------------------------------------------------------------- void Help::EnableBalloonHelp() { - ImplGetSVData()->maHelpData.mbBalloonHelp = sal_True; + ImplGetSVData()->maHelpData.mbBalloonHelp = true; } // ----------------------------------------------------------------------- void Help::DisableBalloonHelp() { - ImplGetSVData()->maHelpData.mbBalloonHelp = sal_False; + ImplGetSVData()->maHelpData.mbBalloonHelp = false; } // ----------------------------------------------------------------------- -sal_Bool Help::IsBalloonHelpEnabled() +bool Help::IsBalloonHelpEnabled() { return ImplGetSVData()->maHelpData.mbBalloonHelp; } // ----------------------------------------------------------------------- -sal_Bool Help::ShowBalloon( Window* pParent, +bool Help::ShowBalloon( Window* pParent, const Point& rScreenPos, const OUString& rHelpText ) { ImplShowHelpWindow( pParent, HELPWINSTYLE_BALLOON, 0, rHelpText, OUString(), rScreenPos ); - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool Help::ShowBalloon( Window* pParent, +bool Help::ShowBalloon( Window* pParent, const Point& rScreenPos, const Rectangle& rRect, const OUString& rHelpText ) { ImplShowHelpWindow( pParent, HELPWINSTYLE_BALLOON, 0, rHelpText, OUString(), rScreenPos, &rRect ); - return sal_True; + return true; } // ----------------------------------------------------------------------- void Help::EnableQuickHelp() { - ImplGetSVData()->maHelpData.mbQuickHelp = sal_True; + ImplGetSVData()->maHelpData.mbQuickHelp = true; } // ----------------------------------------------------------------------- void Help::DisableQuickHelp() { - ImplGetSVData()->maHelpData.mbQuickHelp = sal_False; + ImplGetSVData()->maHelpData.mbQuickHelp = false; } // ----------------------------------------------------------------------- -sal_Bool Help::IsQuickHelpEnabled() +bool Help::IsQuickHelpEnabled() { return ImplGetSVData()->maHelpData.mbQuickHelp; } // ----------------------------------------------------------------------- -sal_Bool Help::ShowQuickHelp( Window* pParent, +bool Help::ShowQuickHelp( Window* pParent, const Rectangle& rScreenRect, const OUString& rHelpText, const OUString& rLongHelpText, @@ -234,7 +234,7 @@ sal_Bool Help::ShowQuickHelp( Window* pParent, ImplShowHelpWindow( pParent, HELPWINSTYLE_QUICK, nStyle, rHelpText, rLongHelpText, pParent->OutputToScreenPixel( pParent->GetPointerPosPixel() ), &rScreenRect ); - return sal_True; + return true; } // ----------------------------------------------------------------------- @@ -297,7 +297,7 @@ HelpTextWindow::HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt maHelpText( rText ) { SetType( WINDOW_HELPTEXTWINDOW ); - ImplSetMouseTransparent( sal_True ); + ImplSetMouseTransparent( true ); mnHelpWinStyle = nHelpWinStyle; mnStyle = nStyle; // on windows this will raise the application window, because help windows are system windows now @@ -310,9 +310,9 @@ HelpTextWindow::HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt SetTextAlign( ALIGN_TOP ); if ( IsNativeControlSupported( CTRL_TOOLTIP, PART_ENTIRE_CONTROL ) ) { - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); SetBackground(); } else @@ -334,7 +334,7 @@ HelpTextWindow::HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt ImplSVData* pSVData = ImplGetSVData(); if ( pSVData->maHelpData.mbSetKeyboardHelp ) - pSVData->maHelpData.mbKeyboardHelp = sal_True; + pSVData->maHelpData.mbKeyboardHelp = true; const HelpSettings& rHelpSettings = pParent->GetSettings().GetHelpSettings(); maShowTimer.SetTimeoutHdl( LINK( this, HelpTextWindow, TimerHdl ) ); @@ -632,7 +632,7 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime ) if( pHelpWin->IsVisible() ) pWindow->Invalidate( aInvRect ); pSVData->maHelpData.mpHelpWin = NULL; - pSVData->maHelpData.mbKeyboardHelp = sal_False; + pSVData->maHelpData.mbKeyboardHelp = false; pHelpWin->Hide(); delete pHelpWin; if( bUpdateHideTime ) diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 82f0cb3b1434..40585a81ed71 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -40,7 +40,7 @@ vcl::I18nHelper::I18nHelper( const ::com::sun::star::uno::Reference< ::com::sun m_xContext = rxContext; mpLocaleDataWrapper = NULL; mpTransliterationWrapper= NULL; - mbTransliterateIgnoreCase = sal_False; + mbTransliterateIgnoreCase = false; } vcl::I18nHelper::~I18nHelper() @@ -119,7 +119,7 @@ sal_Int32 vcl::I18nHelper::CompareString( const OUString& rStr1, const OUString& { // Change mbTransliterateIgnoreCase and destroy the warpper, next call to // ImplGetTransliterationWrapper() will create a wrapper with the correct bIgnoreCase - ((vcl::I18nHelper*)this)->mbTransliterateIgnoreCase = sal_False; + ((vcl::I18nHelper*)this)->mbTransliterateIgnoreCase = false; delete ((vcl::I18nHelper*)this)->mpTransliterationWrapper; ((vcl::I18nHelper*)this)->mpTransliterationWrapper = NULL; } @@ -130,7 +130,7 @@ sal_Int32 vcl::I18nHelper::CompareString( const OUString& rStr1, const OUString& return ImplGetTransliterationWrapper().compareString( aStr1, aStr2 ); } -sal_Bool vcl::I18nHelper::MatchString( const OUString& rStr1, const OUString& rStr2 ) const +bool vcl::I18nHelper::MatchString( const OUString& rStr1, const OUString& rStr2 ) const { ::osl::Guard< ::osl::Mutex > aGuard( ((vcl::I18nHelper*)this)->maMutex ); @@ -138,7 +138,7 @@ sal_Bool vcl::I18nHelper::MatchString( const OUString& rStr1, const OUString& rS { // Change mbTransliterateIgnoreCase and destroy the warpper, next call to // ImplGetTransliterationWrapper() will create a wrapper with the correct bIgnoreCase - ((vcl::I18nHelper*)this)->mbTransliterateIgnoreCase = sal_True; + ((vcl::I18nHelper*)this)->mbTransliterateIgnoreCase = true; delete ((vcl::I18nHelper*)this)->mpTransliterationWrapper; ((vcl::I18nHelper*)this)->mpTransliterationWrapper = NULL; } @@ -148,11 +148,11 @@ sal_Bool vcl::I18nHelper::MatchString( const OUString& rStr1, const OUString& rS return ImplGetTransliterationWrapper().isMatch( aStr1, aStr2 ); } -sal_Bool vcl::I18nHelper::MatchMnemonic( const OUString& rString, sal_Unicode cMnemonicChar ) const +bool vcl::I18nHelper::MatchMnemonic( const OUString& rString, sal_Unicode cMnemonicChar ) const { ::osl::Guard< ::osl::Mutex > aGuard( ((vcl::I18nHelper*)this)->maMutex ); - sal_Bool bEqual = sal_False; + bool bEqual = false; sal_Int32 n = rString.indexOf( '~' ); if ( n != -1 ) { @@ -163,7 +163,7 @@ sal_Bool vcl::I18nHelper::MatchMnemonic( const OUString& rString, sal_Unicode cM } -OUString vcl::I18nHelper::GetNum( long nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep, sal_Bool bTrailingZeros ) const +OUString vcl::I18nHelper::GetNum( long nNumber, sal_uInt16 nDecimals, bool bUseThousandSep, bool bTrailingZeros ) const { return ImplGetLocaleDataWrapper().getNum( nNumber, nDecimals, bUseThousandSep, bTrailingZeros ); } diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx index 419b5d05f4ef..4f7ba2306ce6 100644 --- a/vcl/source/app/idlemgr.cxx +++ b/vcl/source/app/idlemgr.cxx @@ -56,14 +56,14 @@ ImplIdleMgr::~ImplIdleMgr() // ----------------------------------------------------------------------- -sal_Bool ImplIdleMgr::InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ) +bool ImplIdleMgr::InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ) { size_t nPos = (size_t)-1; size_t n = mpIdleList->size(); for ( size_t i = 0; i < n; ++i ) { // we need to check each element to verify that rLink isn't in the array if ( (*mpIdleList)[ i ]->maIdleHdl == rLink ) { - return sal_False; + return false; } if ( nPriority <= (*mpIdleList)[ i ]->mnPriority ) { nPos = i; @@ -87,7 +87,7 @@ sal_Bool ImplIdleMgr::InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ) if ( !maTimer.IsActive() ) maTimer.Start(); - return sal_True; + return true; } // ----------------------------------------------------------------------- diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 6601446e97f2..8ed1ec84f73b 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -106,10 +106,10 @@ SalPrinter::~SalPrinter() { } -sal_Bool SalPrinter::StartJob( const OUString*, const OUString&, const OUString&, +bool SalPrinter::StartJob( const OUString*, const OUString&, const OUString&, ImplJobSetup*, vcl::PrinterController& ) { - return sal_False; + return false; } SalInfoPrinter::~SalInfoPrinter() diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 3f5c9c7e0b44..85f76e6be8c2 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -68,7 +68,7 @@ ImplMouseData::ImplMouseData() mnDragLinkCode = KEY_SHIFT | KEY_MOD1; mnContextMenuCode = MOUSE_RIGHT; mnContextMenuClicks = 1; - mbContextMenuDown = sal_True; + mbContextMenuDown = true; mnMiddleButtonAction = MOUSE_MIDDLE_AUTOSCROLL; mnScrollRepeat = 100; mnButtonStartRepeat = 370; @@ -170,10 +170,10 @@ void MouseSettings::CopyData() // ----------------------------------------------------------------------- -sal_Bool MouseSettings::operator ==( const MouseSettings& rSet ) const +bool MouseSettings::operator ==( const MouseSettings& rSet ) const { if ( mpData == rSet.mpData ) - return sal_True; + return true; if ( (mpData->mnOptions == rSet.mpData->mnOptions) && (mpData->mnDoubleClkTime == rSet.mpData->mnDoubleClkTime) && @@ -196,9 +196,9 @@ sal_Bool MouseSettings::operator ==( const MouseSettings& rSet ) const (mpData->mnMenuDelay == rSet.mpData->mnMenuDelay) && (mpData->mnFollow == rSet.mpData->mnFollow) && (mpData->mnWheelBehavior == rSet.mpData->mnWheelBehavior ) ) - return sal_True; + return true; else - return sal_False; + return false; } // ======================================================================= @@ -229,7 +229,7 @@ ImplStyleData::ImplStyleData() : mnAutoMnemonic = 1; mnToolbarIconSize = STYLE_TOOLBAR_ICONSIZE_UNKNOWN; mnSymbolsStyle = STYLE_SYMBOLS_AUTO; - mnUseImagesInMenus = STYLE_MENUIMAGES_AUTO; + mnUseImagesInMenus = AUTO_STATE_AUTO; mnPreferredSymbolsStyle = STYLE_SYMBOLS_AUTO; mpFontOptions = NULL; mnEdgeBlending = 35; @@ -446,15 +446,15 @@ void ImplStyleData::SetStandardStyles() mnFloatTitleHeight = 13; mnTearOffTitleHeight = 8; mnMenuBarHeight = 14; - mnHighContrast = 0; - mnUseSystemUIFonts = 1; - mnUseFlatBorders = 0; - mnUseFlatMenus = 0; - mbPreferredUseImagesInMenus = sal_True; - mnSkipDisabledInMenus = (sal_uInt16)sal_False; - mbHideDisabledMenuItems = sal_False; - mbAcceleratorsInContextMenus = sal_True; - mbPrimaryButtonWarpsSlider = sal_False; + mnHighContrast = false; + mnUseSystemUIFonts = true; + mnUseFlatBorders = false; + mnUseFlatMenus = false; + mbPreferredUseImagesInMenus = true; + mnSkipDisabledInMenus = false; + mbHideDisabledMenuItems = false; + mbAcceleratorsInContextMenus = true; + mbPrimaryButtonWarpsSlider = false; Gradient aGrad( GradientStyle_LINEAR, DEFAULT_WORKSPACE_GRADIENT_START_COLOR, DEFAULT_WORKSPACE_GRADIENT_END_COLOR ); maWorkspaceGradient = Wallpaper( aGrad ); @@ -710,15 +710,17 @@ bool StyleSettings::CheckSymbolStyle( sal_uLong nStyle ) const // ----------------------------------------------------------------------- -sal_Bool StyleSettings::GetUseImagesInMenus() const +bool StyleSettings::GetUseImagesInMenus() const { // icon mode selected in Tools -> Options... -> OpenOffice.org -> View - sal_uInt16 nStyle = mpData->mnUseImagesInMenus; - - if ( nStyle == STYLE_MENUIMAGES_AUTO ) + switch (mpData->mnUseImagesInMenus) { + case AUTO_STATE_OFF: + return false; + case AUTO_STATE_ON: + return true; + case AUTO_STATE_AUTO: return GetPreferredUseImagesInMenus(); - - return (sal_Bool)nStyle; + } } // ----------------------------------------------------------------------- @@ -881,10 +883,10 @@ void StyleSettings::CopyData() // ----------------------------------------------------------------------- -sal_Bool StyleSettings::operator ==( const StyleSettings& rSet ) const +bool StyleSettings::operator ==( const StyleSettings& rSet ) const { if ( mpData == rSet.mpData ) - return sal_True; + return true; if ( (mpData->mnOptions == rSet.mpData->mnOptions) && (mpData->mnAutoMnemonic == rSet.mpData->mnAutoMnemonic) && @@ -991,9 +993,9 @@ sal_Bool StyleSettings::operator ==( const StyleSettings& rSet ) const (mpData->maListBoxPreviewDefaultPixelSize == rSet.mpData->maListBoxPreviewDefaultPixelSize) && (mpData->mnListBoxPreviewDefaultLineWidth == rSet.mpData->mnListBoxPreviewDefaultLineWidth) && (mpData->mbPreviewUsesCheckeredBackground == rSet.mpData->mbPreviewUsesCheckeredBackground)) - return sal_True; + return true; else - return sal_False; + return false; } // ======================================================================= @@ -1001,8 +1003,8 @@ sal_Bool StyleSettings::operator ==( const StyleSettings& rSet ) const ImplMiscData::ImplMiscData() { mnRefCount = 1; - mnEnableATT = sal::static_int_cast<sal_uInt16>(~0U); - mnDisablePrinting = sal::static_int_cast<sal_uInt16>(~0U); + mnEnableATT = AUTO_STATE_AUTO; + mnDisablePrinting = AUTO_STATE_AUTO; static const char* pEnv = getenv("SAL_DECIMALSEP_ENABLED" ); // set default without UI mbEnableLocalizedDecimalSep = (pEnv != NULL) ? sal_True : sal_False; } @@ -1080,41 +1082,41 @@ void MiscSettings::CopyData() // ----------------------------------------------------------------------- -sal_Bool MiscSettings::operator ==( const MiscSettings& rSet ) const +bool MiscSettings::operator ==( const MiscSettings& rSet ) const { if ( mpData == rSet.mpData ) - return sal_True; + return true; if ( (mpData->mnEnableATT == rSet.mpData->mnEnableATT ) && (mpData->mnDisablePrinting == rSet.mpData->mnDisablePrinting ) && (mpData->mbEnableLocalizedDecimalSep == rSet.mpData->mbEnableLocalizedDecimalSep ) ) - return sal_True; + return true; else - return sal_False; + return false; } // ----------------------------------------------------------------------- -sal_Bool MiscSettings::GetDisablePrinting() const +bool MiscSettings::GetDisablePrinting() const { - if( mpData->mnDisablePrinting == (sal_uInt16)~0 ) + if( mpData->mnDisablePrinting == AUTO_STATE_AUTO ) { OUString aEnable = vcl::SettingsConfigItem::get()-> getValue( OUString( "DesktopManagement" ), OUString( "DisablePrinting" ) ); - mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCase("true") ? 1 : 0; + mpData->mnDisablePrinting = aEnable.equalsIgnoreAsciiCase("true") ? AUTO_STATE_ON : AUTO_STATE_OFF; } - return (sal_Bool)mpData->mnDisablePrinting; + return mpData->mnDisablePrinting != AUTO_STATE_OFF; } // ----------------------------------------------------------------------- -sal_Bool MiscSettings::GetEnableATToolSupport() const +bool MiscSettings::GetEnableATToolSupport() const { #ifdef WNT - if( mpData->mnEnableATT == (sal_uInt16)~0 ) + if( mpData->mnEnableATT == AUTO_STATE_AUTO ) { // Check in the Windows registry if an AT tool wants Accessibility support to // be activated .. @@ -1134,10 +1136,21 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const switch (dwType) { case REG_SZ: - mpData->mnEnableATT = ((0 == stricmp((const char *) Data, "1")) || (0 == stricmp((const char *) Data, "true"))); + mpData->mnEnableATT = ((0 == stricmp((const char *) Data, "1")) || (0 == stricmp((const char *) Data, "true"))) ? AUTO_STATE_ON : AUTO_STATE_OFF; break; case REG_DWORD: - mpData->mnEnableATT = (sal_uInt16) (((DWORD *) Data)[0]); + switch (((DWORD *) Data)[0]) { + case 0: + mpData->mnEnableATT = AUTO_STATE_OFF; + break; + case 1: + mpData->mnEnableATT = AUTO_STATE_ON; + break; + default: + mpData->mnEnableATT = AUTO_STATE_AUTO; + //TODO: or AUTO_STATE_ON? + break; + } break; default: // Unsupported registry type @@ -1150,7 +1163,7 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const } #endif - if( mpData->mnEnableATT == (sal_uInt16)~0 ) + if( mpData->mnEnableATT == AUTO_STATE_AUTO ) { static const char* pEnv = getenv("SAL_ACCESSIBILITY_ENABLED" ); if( !pEnv || !*pEnv ) @@ -1159,21 +1172,21 @@ sal_Bool MiscSettings::GetEnableATToolSupport() const vcl::SettingsConfigItem::get()-> getValue( OUString( "Accessibility" ), OUString( "EnableATToolSupport" ) ); - mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCase("true") ? 1 : 0; + mpData->mnEnableATT = aEnable.equalsIgnoreAsciiCase("true") ? AUTO_STATE_ON : AUTO_STATE_OFF; } else { - mpData->mnEnableATT = 1; + mpData->mnEnableATT = AUTO_STATE_ON; } } - return (sal_Bool)mpData->mnEnableATT; + return mpData->mnEnableATT != AUTO_STATE_OFF; } #ifdef WNT void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable ) { - if ( bEnable != mpData->mnEnableATT ) + if ( (bEnable ? AUTO_STATE_ON : AUTO_STATE_OFF) != mpData->mnEnableATT ) { if( bEnable && !ImplInitAccessBridge() ) return; @@ -1218,18 +1231,18 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable ) setValue( OUString( "Accessibility" ), OUString( "EnableATToolSupport" ), bEnable ? OUString("true") : OUString("false" ) ); - mpData->mnEnableATT = bEnable ? 1 : 0; + mpData->mnEnableATT = bEnable ? AUTO_STATE_ON : AUTO_STATE_OFF; } } #endif -void MiscSettings::SetEnableLocalizedDecimalSep( sal_Bool bEnable ) +void MiscSettings::SetEnableLocalizedDecimalSep( bool bEnable ) { CopyData(); mpData->mbEnableLocalizedDecimalSep = bEnable; } -sal_Bool MiscSettings::GetEnableLocalizedDecimalSep() const +bool MiscSettings::GetEnableLocalizedDecimalSep() const { return mpData->mbEnableLocalizedDecimalSep; } @@ -1319,18 +1332,18 @@ void HelpSettings::CopyData() // ----------------------------------------------------------------------- -sal_Bool HelpSettings::operator ==( const HelpSettings& rSet ) const +bool HelpSettings::operator ==( const HelpSettings& rSet ) const { if ( mpData == rSet.mpData ) - return sal_True; + return true; if ( (mpData->mnOptions == rSet.mpData->mnOptions ) && (mpData->mnTipDelay == rSet.mpData->mnTipDelay ) && (mpData->mnTipTimeout == rSet.mpData->mnTipTimeout ) && (mpData->mnBalloonDelay == rSet.mpData->mnBalloonDelay ) ) - return sal_True; + return true; else - return sal_False; + return false; } // ======================================================================= @@ -1539,11 +1552,11 @@ sal_uLong AllSettings::GetChangeFlags( const AllSettings& rSet ) const // ----------------------------------------------------------------------- -sal_Bool AllSettings::operator ==( const AllSettings& rSet ) const +bool AllSettings::operator ==( const AllSettings& rSet ) const { if ( mpData == rSet.mpData ) - return sal_True; + return true; if ( (mpData->maMouseSettings == rSet.mpData->maMouseSettings) && (mpData->maStyleSettings == rSet.mpData->maStyleSettings) && @@ -1553,10 +1566,10 @@ sal_Bool AllSettings::operator ==( const AllSettings& rSet ) const (mpData->maLocale == rSet.mpData->maLocale) && (mpData->mnWindowUpdate == rSet.mpData->mnWindowUpdate) ) { - return sal_True; + return true; } else - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -1612,7 +1625,7 @@ namespace OUString("org.openoffice.Office.Common/I18N/CTL") ); // note: case sensitive ! if ( aNode.isValid() ) { - sal_Bool bTmp = sal_Bool(); + bool bTmp = bool(); ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("UIMirroring") ); if( aValue >>= bTmp ) { @@ -1720,7 +1733,7 @@ void AllSettings::LocaleSettingsChanged( sal_uInt32 nHint ) if ( nHint & SYSLOCALEOPTIONS_HINT_DECSEP ) { MiscSettings aMiscSettings = aAllSettings.GetMiscSettings(); - sal_Bool bIsDecSepAsLocale = aAllSettings.mpData->maSysLocale.GetOptions().IsDecimalSeparatorAsLocale(); + bool bIsDecSepAsLocale = aAllSettings.mpData->maSysLocale.GetOptions().IsDecimalSeparatorAsLocale(); if ( aMiscSettings.GetEnableLocalizedDecimalSep() != bIsDecSepAsLocale ) { aMiscSettings.SetEnableLocalizedDecimalSep( bIsDecSepAsLocale ); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 28171684cdd8..83f0332693d7 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -206,7 +206,7 @@ Application::~Application() GlobalDeInitTools(); } -sal_Bool Application::QueryExit() +bool Application::QueryExit() { WorkWindow* pAppWin = ImplGetSVData()->maWinData.mpAppWin; @@ -214,7 +214,7 @@ sal_Bool Application::QueryExit() if ( pAppWin ) return pAppWin->Close(); else - return sal_True; + return true; } void Application::UserEvent( sal_uLong, void* ) @@ -336,12 +336,12 @@ const KeyCode* Application::GetReservedKeyCode( sal_uLong i ) void Application::Execute() { ImplSVData* pSVData = ImplGetSVData(); - pSVData->maAppData.mbInAppExecute = sal_True; + pSVData->maAppData.mbInAppExecute = true; while ( !pSVData->maAppData.mbAppQuit ) Application::Yield(); - pSVData->maAppData.mbInAppExecute = sal_False; + pSVData->maAppData.mbInAppExecute = false; } inline void ImplYield( bool i_bWait, bool i_bAllEvents ) @@ -395,7 +395,7 @@ void Application::Yield() IMPL_STATIC_LINK_NOINSTANCE( ImplSVAppData, ImplQuitMsg, void*, EMPTYARG ) { - ImplGetSVData()->maAppData.mbAppQuit = sal_True; + ImplGetSVData()->maAppData.mbAppQuit = true; return 0; } @@ -427,17 +427,17 @@ void Application::AcquireSolarMutex( sal_uLong nCount ) pSVData->mpDefInst->AcquireYieldMutex( nCount ); } -sal_Bool Application::IsInMain() +bool Application::IsInMain() { return ImplGetSVData()->maAppData.mbInAppMain; } -sal_Bool Application::IsInExecute() +bool Application::IsInExecute() { return ImplGetSVData()->maAppData.mbInAppExecute; } -sal_Bool Application::IsInModalMode() +bool Application::IsInModalMode() { return (ImplGetSVData()->maAppData.mnModalMode != 0); } @@ -459,7 +459,7 @@ sal_uLong Application::GetLastInputInterval() extern int nImplSysDialog; -sal_Bool Application::IsUICaptured() +bool Application::IsUICaptured() { ImplSVData* pSVData = ImplGetSVData(); @@ -468,9 +468,9 @@ sal_Bool Application::IsUICaptured() // D&D active !!! if ( pSVData->maWinData.mpCaptureWin || pSVData->maWinData.mpTrackWin || pSVData->maWinData.mpFirstFloat || nImplSysDialog ) - return sal_True; + return true; else - return sal_False; + return false; } void Application::OverrideSystemSettings( AllSettings& /*rSettings*/ ) @@ -489,10 +489,10 @@ void Application::MergeSystemSettings( AllSettings& rSettings ) { // side effect: ImplUpdateGlobalSettings does an ImplGetFrame()->UpdateSettings pWindow->ImplUpdateGlobalSettings( *pSVData->maAppData.mpSettings ); - pSVData->maAppData.mbSettingsInit = sal_True; + pSVData->maAppData.mbSettingsInit = true; } // side effect: ImplUpdateGlobalSettings does an ImplGetFrame()->UpdateSettings - pWindow->ImplUpdateGlobalSettings( rSettings, sal_False ); + pWindow->ImplUpdateGlobalSettings( rSettings, false ); } } @@ -561,7 +561,7 @@ void Application::SetSettings( const AllSettings& rSettings ) Window* pClientWin = pFrame; while ( pClientWin->ImplGetClientWindow() ) pClientWin = pClientWin->ImplGetClientWindow(); - pClientWin->UpdateSettings( rSettings, sal_True ); + pClientWin->UpdateSettings( rSettings, true ); Window* pTempWin = pFrame->mpWindowImpl->mpFrameData->mpFirstOverlap; while ( pTempWin ) @@ -570,7 +570,7 @@ void Application::SetSettings( const AllSettings& rSettings ) pClientWin = pTempWin; while ( pClientWin->ImplGetClientWindow() ) pClientWin = pClientWin->ImplGetClientWindow(); - pClientWin->UpdateSettings( rSettings, sal_True ); + pClientWin->UpdateSettings( rSettings, true ); pTempWin = pTempWin->mpWindowImpl->mpNextOverlap; } @@ -698,13 +698,13 @@ void Application::RemoveKeyListener( const Link& rKeyListener ) pSVData->maAppData.mpKeyListeners->removeListener( rKeyListener ); } -sal_Bool Application::HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ) +bool Application::HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ) { // let listeners process the key event VclWindowEvent aEvent( pWin, nEvent, (void *) pKeyEvent ); ImplSVData* pSVData = ImplGetSVData(); - sal_Bool bProcessed = sal_False; + bool bProcessed = false; if ( pSVData->maAppData.mpKeyListeners ) bProcessed = pSVData->maAppData.mpKeyListeners->Process( &aEvent ); @@ -931,23 +931,23 @@ sal_uLong Application::PostUserEvent( const Link& rLink, void* pCaller ) return nEventId; } -sal_Bool Application::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller ) +bool Application::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller ) { ImplSVEvent* pSVEvent = new ImplSVEvent; pSVEvent->mnEvent = 0; pSVEvent->mpData = pCaller; pSVEvent->mpLink = new Link( rLink ); pSVEvent->mpWindow = NULL; - pSVEvent->mbCall = sal_True; + pSVEvent->mbCall = true; rEventId = (sal_uLong)pSVEvent; Window* pDefWindow = ImplGetDefaultWindow(); if ( pDefWindow && pDefWindow->ImplGetFrame()->PostEvent( pSVEvent ) ) - return sal_True; + return true; else { rEventId = 0; delete pSVEvent; - return sal_False; + return false; } } @@ -969,11 +969,11 @@ void Application::RemoveUserEvent( sal_uLong nUserEvent ) pSVEvent->mpWindow = NULL; } - pSVEvent->mbCall = sal_False; + pSVEvent->mbCall = false; } } -sal_Bool Application::InsertIdleHdl( const Link& rLink, sal_uInt16 nPrio ) +bool Application::InsertIdleHdl( const Link& rLink, sal_uInt16 nPrio ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1236,7 +1236,7 @@ unsigned int Application::GetBestScreen( const Rectangle& i_rRect ) return nBestMatchScreen; } -sal_Bool Application::InsertAccel( Accelerator* pAccel ) +bool Application::InsertAccel( Accelerator* pAccel ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1263,17 +1263,17 @@ Help* Application::GetHelp() return ImplGetSVData()->maAppData.mpHelp; } -void Application::EnableAutoHelpId( sal_Bool bEnabled ) +void Application::EnableAutoHelpId( bool bEnabled ) { ImplGetSVData()->maHelpData.mbAutoHelpId = bEnabled; } -sal_Bool Application::IsAutoHelpIdEnabled() +bool Application::IsAutoHelpIdEnabled() { return ImplGetSVData()->maHelpData.mbAutoHelpId; } -void Application::EnableAutoMnemonic( sal_Bool bEnabled ) +void Application::EnableAutoMnemonic( bool bEnabled ) { AllSettings aSettings = GetSettings(); StyleSettings aStyle = aSettings.GetStyleSettings(); @@ -1282,7 +1282,7 @@ void Application::EnableAutoMnemonic( sal_Bool bEnabled ) SetSettings( aSettings ); } -sal_Bool Application::IsAutoMnemonicEnabled() +bool Application::IsAutoMnemonicEnabled() { return GetSettings().GetStyleSettings().GetAutoMnemonic(); } @@ -1373,7 +1373,7 @@ void Application::SetDialogCancelMode( DialogCancelMode mode ) ImplGetSVData()->maAppData.meDialogCancel = mode; } -sal_Bool Application::IsDialogCancelEnabled() +bool Application::IsDialogCancelEnabled() { return ImplGetSVData()->maAppData.meDialogCancel != DIALOG_CANCEL_OFF; } @@ -1391,7 +1391,7 @@ sal_uInt16 Application::GetSystemWindowMode() ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > Application::GetVCLToolkit() { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > xT; - UnoWrapperBase* pWrapper = Application::GetUnoWrapper( sal_True ); + UnoWrapperBase* pWrapper = Application::GetUnoWrapper( true ); if ( pWrapper ) xT = pWrapper->GetVCLToolkit(); return xT; @@ -1407,7 +1407,7 @@ extern "C" { static void SAL_CALL thisModule() {} } #endif -UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist ) +UnoWrapperBase* Application::GetUnoWrapper( bool bCreateIfNotExist ) { ImplSVData* pSVData = ImplGetSVData(); static bool bAlreadyTriedToCreate = false; @@ -1420,7 +1420,7 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool bCreateIfNotExist ) #else "tk", #endif - sal_True ); + true ); oslModule hTkLib = osl_loadModuleRelative( &thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT ); if ( hTkLib ) @@ -1543,7 +1543,7 @@ void Application::EnableHeadlessMode( bool dialogsAreFatal ) dialogsAreFatal ? DIALOG_CANCEL_FATAL : DIALOG_CANCEL_SILENT ); } -sal_Bool Application::IsHeadlessModeEnabled() +bool Application::IsHeadlessModeEnabled() { return IsDialogCancelEnabled(); } diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 95eebf0337ee..d9d25d7623b9 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -82,7 +82,7 @@ void ImplInitSVData() // init global instance data memset( pImplSVData, 0, sizeof( ImplSVData ) ); - pImplSVData->maHelpData.mbAutoHelpId = sal_True; + pImplSVData->maHelpData.mbAutoHelpId = true; pImplSVData->maNWFData.maMenuBarHighlightTextColor = Color( COL_TRANSPARENT ); // mark default layout border as unitialized diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 7acd92f10dfa..1191ef41186a 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -156,9 +156,9 @@ int ImplSVMain() if( bInit ) { // call application main - pSVData->maAppData.mbInAppMain = sal_True; + pSVData->maAppData.mbInAppMain = true; nReturn = pSVData->mpApp->Main(); - pSVData->maAppData.mbInAppMain = sal_False; + pSVData->maAppData.mbInAppMain = false; } if( pSVData->mxDisplayConnection.is() ) @@ -187,7 +187,7 @@ int ImplSVMain() int SVMain() { // #i47888# allow for alternative initialization as required for e.g. MacOSX - extern sal_Bool ImplSVMainHook( int* ); + extern bool ImplSVMainHook( int* ); int nRet; if( !Application::IsConsoleOnly() && ImplSVMainHook( &nRet ) ) @@ -352,7 +352,7 @@ VCLUnoWrapperDeleter::disposing(lang::EventObject const& /* rSource */) void DeInitVCL() { ImplSVData* pSVData = ImplGetSVData(); - pSVData->mbDeInit = sal_True; + pSVData->mbDeInit = true; vcl::DeleteOnDeinitBase::ImplDeleteOnDeInit(); diff --git a/vcl/source/app/svmainhook.cxx b/vcl/source/app/svmainhook.cxx index e4799d1608df..a8e29a909f23 100644 --- a/vcl/source/app/svmainhook.cxx +++ b/vcl/source/app/svmainhook.cxx @@ -22,9 +22,9 @@ #ifndef MACOSX // MacOSX implementation of ImplSVMainHook is in osx/salinst.cxx -sal_Bool ImplSVMainHook( int * ) +bool ImplSVMainHook( int * ) { - return sal_False; // indicate that ImplSVMainHook is not implemented + return false; // indicate that ImplSVMainHook is not implemented } #endif diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 512386a12c8a..2f4ff80eee25 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -92,7 +92,7 @@ void Timer::ImplTimerCallbackProc() return; pSVData->mnTimerUpdate++; - pSVData->mbNotAllTimerCalled = sal_True; + pSVData->mbNotAllTimerCalled = true; // find timer where the timer handler needs to be called pTimerData = pSVData->mpFirstTimerData; @@ -188,7 +188,7 @@ void Timer::ImplTimerCallbackProc() ImplStartTimer( pSVData, nMinPeriod ); pSVData->mnTimerUpdate--; - pSVData->mbNotAllTimerCalled = sal_False; + pSVData->mbNotAllTimerCalled = false; } Timer::Timer(): diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx index d5e4e0838b25..24f40a2ddd92 100644 --- a/vcl/source/app/unohelp.cxx +++ b/vcl/source/app/unohelp.cxx @@ -45,7 +45,7 @@ uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacte return i18n::CharacterClassification::create( comphelper::getProcessComponentContext() ); } -OUString vcl::unohelper::CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD ) +OUString vcl::unohelper::CreateLibraryName( const sal_Char* pModName, bool bSUPD ) { // create variable library name suffixes OUString aDLLSuffix = OUString::createFromAscii( SAL_STRINGIFY( DLLPOSTFIX ) ); diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx index 26bbb5eec7a5..50c6b00c9cdd 100644 --- a/vcl/source/app/vclevent.cxx +++ b/vcl/source/app/vclevent.cxx @@ -80,12 +80,12 @@ void VclEventListeners::Call( VclSimpleEvent* pEvent ) const } } -sal_Bool VclEventListeners::Process( VclSimpleEvent* pEvent ) const +bool VclEventListeners::Process( VclSimpleEvent* pEvent ) const { if ( m_aListeners.empty() ) - return sal_False; + return false; - sal_Bool bProcessed = sal_False; + bool bProcessed = false; // Copy the list, because this can be destroyed when calling a Link... std::list<Link> aCopy( m_aListeners ); std::list<Link>::iterator aIter( aCopy.begin() ); @@ -94,7 +94,7 @@ sal_Bool VclEventListeners::Process( VclSimpleEvent* pEvent ) const { if( (*aIter).Call( pEvent ) != 0 ) { - bProcessed = sal_True; + bProcessed = true; break; } ++aIter; diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 361f775de517..ffeab10531d2 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -158,7 +158,7 @@ OUString Button::GetStandardText( StandardButtonType eButton ) } // ----------------------------------------------------------------------- -sal_Bool Button::SetModeImage( const Image& rImage ) +bool Button::SetModeImage( const Image& rImage ) { if ( rImage != mpButtonData->maImage ) { @@ -166,7 +166,7 @@ sal_Bool Button::SetModeImage( const Image& rImage ) StateChanged( STATE_CHANGE_DATA ); queue_resize(); } - return sal_True; + return true; } // ----------------------------------------------------------------------- @@ -176,7 +176,7 @@ const Image Button::GetModeImage( ) const } // ----------------------------------------------------------------------- -sal_Bool Button::HasImage() const +bool Button::HasImage() const { return !!(mpButtonData->maImage); } @@ -249,7 +249,7 @@ sal_uInt16 Button::ImplGetTextStyle( OUString& rText, WinBits nWinStyle, // ----------------------------------------------------------------------- void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos, - Size& rSize, sal_Bool bLayout, + Size& rSize, bool bLayout, sal_uLong nImageSep, sal_uLong nDrawFlags, sal_uInt16 nTextStyle, Rectangle *pSymbolRect, bool bAddImageSep ) @@ -577,7 +577,7 @@ void Button::SetSmallSymbol(bool bSmall) } // ----------------------------------------------------------------------- -void Button::EnableImageDisplay( sal_Bool bEnable ) +void Button::EnableImageDisplay( bool bEnable ) { if( bEnable ) mpButtonData->mnButtonState &= ~BUTTON_DRAW_NOIMAGE; @@ -586,7 +586,7 @@ void Button::EnableImageDisplay( sal_Bool bEnable ) } // ----------------------------------------------------------------------- -void Button::EnableTextDisplay( sal_Bool bEnable ) +void Button::EnableTextDisplay( bool bEnable ) { if( bEnable ) mpButtonData->mnButtonState &= ~BUTTON_DRAW_NOTEXT; @@ -629,8 +629,8 @@ void PushButton::ImplInitPushButtonData() meState = STATE_NOCHECK; meSaveValue = STATE_NOCHECK; mnDDStyle = 0; - mbPressed = sal_False; - mbInUserDraw = sal_False; + mbPressed = false; + mbInUserDraw = false; } // ----------------------------------------------------------------------- @@ -643,7 +643,7 @@ void PushButton::ImplInit( Window* pParent, WinBits nStyle ) if ( nStyle & WB_NOLIGHTBORDER ) ImplGetButtonState() |= BUTTON_DRAW_NOLIGHTBORDER; - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); } // ----------------------------------------------------------------------- @@ -684,8 +684,8 @@ const Color& PushButton::GetCanonicalTextColor( const StyleSettings& _rStyle ) c // ----------------------------------------------------------------------- -void PushButton::ImplInitSettings( sal_Bool bFont, - sal_Bool bForeground, sal_Bool bBackground ) +void PushButton::ImplInitSettings( bool bFont, + bool bForeground, bool bBackground ) { Button::ImplInitSettings( bFont, bForeground ); @@ -698,18 +698,18 @@ void PushButton::ImplInitSettings( sal_Bool bFont, if ( IsNativeControlSupported( CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL ) || (GetStyle() & WB_FLATBUTTON) != 0 ) { - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); mpWindowImpl->mbUseNativeFocus = (GetStyle() & WB_FLATBUTTON) ? false : ImplGetSVData()->maNWFData.mbNoFocusRects; } else { - EnableChildTransparentMode( sal_False ); + EnableChildTransparentMode( false ); SetParentClipMode( 0 ); - SetPaintTransparent( sal_False ); + SetPaintTransparent( false ); } } } @@ -744,7 +744,7 @@ void PushButton::ImplDrawPushButtonFrame( Window* pDev, // ----------------------------------------------------------------------- -sal_Bool PushButton::ImplHitTestPushButton( Window* pDev, +bool PushButton::ImplHitTestPushButton( Window* pDev, const Point& rPos ) { Point aTempPoint; @@ -958,7 +958,7 @@ void PushButton::ImplDrawPushButton( bool bLayout ) Size aOutSz( GetOutputSizePixel() ); Rectangle aRect( aPoint, aOutSz ); Rectangle aInRect = aRect; - sal_Bool bNativeOK = sal_False; + bool bNativeOK = false; // adjust style if button should be rendered 'pressed' if ( mbPressed ) @@ -999,11 +999,11 @@ void PushButton::ImplDrawPushButton( bool bLayout ) { Edit* pEdit = static_cast<Edit*>(GetParent()); if( pEdit->ImplUseNativeBorder( pEdit->GetStyle() ) ) - bNativeOK = sal_True; + bNativeOK = true; } else if( GetParent()->IsNativeControlSupported( aCtrlType, HAS_BACKGROUND_TEXTURE) ) { - bNativeOK = sal_True; + bNativeOK = true; } if( !bNativeOK && GetParent()->IsNativeControlSupported( aCtrlType, PART_BUTTON_DOWN ) ) { @@ -1038,7 +1038,7 @@ void PushButton::ImplDrawPushButton( bool bLayout ) if( ! bRollOver && ! HasFocus() ) bDrawMenuSep = false; } - if ( (bNativeOK=IsNativeControlSupported(CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL)) == sal_True ) + if ( (bNativeOK=IsNativeControlSupported(CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL)) ) { PushButtonValue aControlValue; Rectangle aCtrlRegion( aInRect ); @@ -1094,7 +1094,7 @@ void PushButton::ImplDrawPushButton( bool bLayout ) ShowFocus( ImplGetFocusRect() ); } - if ( bNativeOK == sal_False ) + if ( !bNativeOK ) { // draw PushButtonFrame, aInRect has content size afterwards if( (GetStyle() & WB_FLATBUTTON) ) @@ -1125,14 +1125,14 @@ void PushButton::ImplDrawPushButton( bool bLayout ) // ----------------------------------------------------------------------- -void PushButton::ImplSetDefButton( sal_Bool bSet ) +void PushButton::ImplSetDefButton( bool bSet ) { Size aSize( GetSizePixel() ); Point aPos( GetPosPixel() ); int dLeft(0), dRight(0), dTop(0), dBottom(0); bool bSetPos = false; - if ( (IsNativeControlSupported(CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL)) == sal_True ) + if ( IsNativeControlSupported(CTRL_PUSHBUTTON, PART_ENTIRE_CONTROL) ) { Rectangle aBound, aCont; Rectangle aCtrlRect( 0, 0, 80, 20 ); // use a constant size to avoid accumulating @@ -1185,7 +1185,7 @@ void PushButton::ImplSetDefButton( sal_Bool bSet ) // ----------------------------------------------------------------------- -sal_Bool PushButton::ImplIsDefButton() const +bool PushButton::ImplIsDefButton() const { return (ImplGetButtonState() & BUTTON_DRAW_DEFAULT) != 0; } @@ -1268,11 +1268,11 @@ void PushButton::Tracking( const TrackingEvent& rTEvt ) { if ( IsChecked() ) { - Check( sal_False ); + Check( false ); ImplGetButtonState() &= ~BUTTON_DRAW_PRESSED; } else - Check( sal_True ); + Check( true ); } } else @@ -1357,11 +1357,11 @@ void PushButton::KeyUp( const KeyEvent& rKEvt ) { if ( IsChecked() ) { - Check( sal_False ); + Check( false ); ImplGetButtonState() &= ~BUTTON_DRAW_PRESSED; } else - Check( sal_True ); + Check( true ); Toggle(); } @@ -1499,17 +1499,17 @@ void PushButton::StateChanged( StateChangedType nType ) else if ( (nType == STATE_CHANGE_ZOOM) || (nType == STATE_CHANGE_CONTROLFONT) ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); Invalidate(); } } @@ -1525,7 +1525,7 @@ void PushButton::DataChanged( const DataChangedEvent& rDCEvt ) ((rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) { - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); Invalidate(); } } @@ -1659,7 +1659,7 @@ void PushButton::SetState( TriState eState ) // ----------------------------------------------------------------------- -void PushButton::SetPressed( sal_Bool bPressed ) +void PushButton::SetPressed( bool bPressed ) { if ( mbPressed != bPressed ) { @@ -1929,10 +1929,10 @@ void HelpButton::Click() void RadioButton::ImplInitRadioButtonData() { - mbChecked = sal_False; - mbSaveValue = sal_False; - mbRadioCheck = sal_True; - mbStateChanged = sal_False; + mbChecked = false; + mbSaveValue = false; + mbRadioCheck = true; + mbStateChanged = false; } // ----------------------------------------------------------------------- @@ -1942,7 +1942,7 @@ void RadioButton::ImplInit( Window* pParent, WinBits nStyle ) nStyle = ImplInitStyle( pParent->GetWindow( WINDOW_LASTCHILD ), nStyle ); Button::ImplInit( pParent, nStyle, NULL ); - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); } // ----------------------------------------------------------------------- @@ -1977,8 +1977,8 @@ const Color& RadioButton::GetCanonicalTextColor( const StyleSettings& _rStyle ) // ----------------------------------------------------------------------- -void RadioButton::ImplInitSettings( sal_Bool bFont, - sal_Bool bForeground, sal_Bool bBackground ) +void RadioButton::ImplInitSettings( bool bFont, + bool bForeground, bool bBackground ) { Button::ImplInitSettings( bFont, bForeground ); @@ -1988,18 +1988,18 @@ void RadioButton::ImplInitSettings( sal_Bool bFont, if ( !IsControlBackground() && (pParent->IsChildTransparentModeEnabled() || IsNativeControlSupported( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL ) ) ) { - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); SetBackground(); if( IsNativeControlSupported( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL ) ) mpWindowImpl->mbUseNativeFocus = ImplGetSVData()->maNWFData.mbNoFocusRects; } else { - EnableChildTransparentMode( sal_False ); + EnableChildTransparentMode( false ); SetParentClipMode( 0 ); - SetPaintTransparent( sal_False ); + SetPaintTransparent( false ); if ( IsControlBackground() ) SetBackground( GetControlBackground() ); @@ -2032,10 +2032,10 @@ void RadioButton::ImplInvalidateOrDrawRadioButtonState() void RadioButton::ImplDrawRadioButtonState() { - sal_Bool bNativeOK = sal_False; + bool bNativeOK = false; // no native drawing for image radio buttons - if ( !maImage && (bNativeOK=IsNativeControlSupported(CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL)) == sal_True ) + if ( !maImage && (bNativeOK=IsNativeControlSupported(CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL)) ) { ImplControlValue aControlValue( mbChecked ? BUTTONVALUE_ON : BUTTONVALUE_OFF ); Rectangle aCtrlRect( maStateRect.TopLeft(), maStateRect.GetSize() ); @@ -2054,7 +2054,7 @@ void RadioButton::ImplDrawRadioButtonState() } - if ( bNativeOK == sal_False ) + if ( !bNativeOK ) { // kein Image-RadioButton if ( !maImage ) @@ -2078,7 +2078,7 @@ void RadioButton::ImplDrawRadioButtonState() const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); Rectangle aImageRect = maStateRect; Size aImageSize = maImage.GetSizePixel(); - sal_Bool bEnabled = IsEnabled(); + bool bEnabled = IsEnabled(); sal_uInt16 nButtonStyle = FRAME_DRAW_DOUBLEIN; aImageSize.Width() = CalcZoom( aImageSize.Width() ); @@ -2297,7 +2297,7 @@ void RadioButton::ImplDrawRadioButton( bool bLayout ) ImplDraw( this, 0, Point(), GetOutputSizePixel(), aImageSize, maStateRect, maMouseRect, bLayout ); - if( !bLayout || (IsNativeControlSupported(CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL)==sal_True) ) + if( !bLayout || IsNativeControlSupported(CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL) ) { if ( !maImage && HasFocus() ) ShowFocus( ImplGetFocusRect() ); @@ -2410,7 +2410,7 @@ void RadioButton::ImplUncheckAllOther() { ImplDelData aDelData; pWindow->ImplAddDel( &aDelData ); - pWindow->SetState( sal_False ); + pWindow->SetState( false ); if ( aDelData.IsDead() ) return; pWindow->ImplRemoveDel( &aDelData ); @@ -2423,10 +2423,10 @@ void RadioButton::ImplUncheckAllOther() // ----------------------------------------------------------------------- -void RadioButton::ImplCallClick( sal_Bool bGrabFocus, sal_uInt16 nFocusFlags ) +void RadioButton::ImplCallClick( bool bGrabFocus, sal_uInt16 nFocusFlags ) { mbStateChanged = !mbChecked; - mbChecked = sal_True; + mbChecked = true; mpWindowImpl->mnStyle |= WB_TABSTOP; ImplInvalidateOrDrawRadioButtonState(); ImplDelData aDelData; @@ -2447,7 +2447,7 @@ void RadioButton::ImplCallClick( sal_Bool bGrabFocus, sal_uInt16 nFocusFlags ) if ( aDelData.IsDead() ) return; ImplRemoveDel( &aDelData ); - mbStateChanged = sal_False; + mbStateChanged = false; } // ----------------------------------------------------------------------- @@ -2483,7 +2483,7 @@ void RadioButton::ImplLoadRes( const ResId& rResId ) //anderer Wert als Default ? sal_uInt16 nChecked = ReadShortRes(); if ( nChecked ) - SetState( sal_True ); + SetState( true ); } // ----------------------------------------------------------------------- @@ -2747,17 +2747,17 @@ void RadioButton::StateChanged( StateChangedType nType ) else if ( (nType == STATE_CHANGE_ZOOM) || (nType == STATE_CHANGE_CONTROLFONT) ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); Invalidate(); } } @@ -2773,7 +2773,7 @@ void RadioButton::DataChanged( const DataChangedEvent& rDCEvt ) ((rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) { - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); Invalidate(); } } @@ -2815,7 +2815,7 @@ void RadioButton::Toggle() // ----------------------------------------------------------------------- -sal_Bool RadioButton::SetModeRadioImage( const Image& rImage ) +bool RadioButton::SetModeRadioImage( const Image& rImage ) { if ( rImage != maImage ) { @@ -2823,7 +2823,7 @@ sal_Bool RadioButton::SetModeRadioImage( const Image& rImage ) StateChanged( STATE_CHANGE_DATA ); queue_resize(); } - return sal_True; + return true; } // ----------------------------------------------------------------------- @@ -2835,7 +2835,7 @@ const Image& RadioButton::GetModeRadioImage( ) const // ----------------------------------------------------------------------- -void RadioButton::SetState( sal_Bool bCheck ) +void RadioButton::SetState( bool bCheck ) { // TabStop-Flag richtig mitfuehren if ( bCheck ) @@ -2892,7 +2892,7 @@ bool RadioButton::set_property(const OString &rKey, const OString &rValue) // ----------------------------------------------------------------------- -void RadioButton::Check( sal_Bool bCheck ) +void RadioButton::Check( bool bCheck ) { // TabStop-Flag richtig mitfuehren if ( bCheck ) @@ -3131,7 +3131,7 @@ void CheckBox::ImplInitCheckBoxData() { meState = STATE_NOCHECK; meSaveValue = STATE_NOCHECK; - mbTriState = sal_False; + mbTriState = false; } // ----------------------------------------------------------------------- @@ -3141,7 +3141,7 @@ void CheckBox::ImplInit( Window* pParent, WinBits nStyle ) nStyle = ImplInitStyle( pParent->GetWindow( WINDOW_LASTCHILD ), nStyle ); Button::ImplInit( pParent, nStyle, NULL ); - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); } // ----------------------------------------------------------------------- @@ -3171,8 +3171,8 @@ const Color& CheckBox::GetCanonicalTextColor( const StyleSettings& _rStyle ) con // ----------------------------------------------------------------------- -void CheckBox::ImplInitSettings( sal_Bool bFont, - sal_Bool bForeground, sal_Bool bBackground ) +void CheckBox::ImplInitSettings( bool bFont, + bool bForeground, bool bBackground ) { Button::ImplInitSettings( bFont, bForeground ); @@ -3182,18 +3182,18 @@ void CheckBox::ImplInitSettings( sal_Bool bFont, if ( !IsControlBackground() && (pParent->IsChildTransparentModeEnabled() || IsNativeControlSupported( CTRL_CHECKBOX, PART_ENTIRE_CONTROL ) ) ) { - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); SetBackground(); if( IsNativeControlSupported( CTRL_CHECKBOX, PART_ENTIRE_CONTROL ) ) ImplGetWindowImpl()->mbUseNativeFocus = ImplGetSVData()->maNWFData.mbNoFocusRects; } else { - EnableChildTransparentMode( sal_False ); + EnableChildTransparentMode( false ); SetParentClipMode( 0 ); - SetPaintTransparent( sal_False ); + SetPaintTransparent( false ); if ( IsControlBackground() ) SetBackground( GetControlBackground() ); @@ -3214,7 +3214,7 @@ void CheckBox::ImplLoadRes( const ResId& rResId ) sal_uInt16 nChecked = ReadShortRes(); //anderer Wert als Default ? if( nChecked ) - Check( sal_True ); + Check( true ); } } @@ -3759,17 +3759,17 @@ void CheckBox::StateChanged( StateChangedType nType ) else if ( (nType == STATE_CHANGE_ZOOM) || (nType == STATE_CHANGE_CONTROLFONT) ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); Invalidate(); } } @@ -3785,7 +3785,7 @@ void CheckBox::DataChanged( const DataChangedEvent& rDCEvt ) ((rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) { - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); Invalidate(); } } @@ -3851,7 +3851,7 @@ bool CheckBox::set_property(const OString &rKey, const OString &rValue) // ----------------------------------------------------------------------- -void CheckBox::EnableTriState( sal_Bool bTriState ) +void CheckBox::EnableTriState( bool bTriState ) { if ( mbTriState != bTriState ) { @@ -4100,7 +4100,7 @@ ImageRadioButton::~ImageRadioButton() TriStateBox::TriStateBox( Window* pParent, WinBits nStyle ) : CheckBox( pParent, nStyle ) { - EnableTriState( sal_True ); + EnableTriState( true ); } // ----------------------------------------------------------------------- diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 7fda64fae340..b6d8c9bc851e 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -107,9 +107,9 @@ void ComboBox::ImplInitComboBoxData() mpFloatWin = NULL; mnDDHeight = 0; - mbDDAutoSize = sal_True; - mbSyntheticModify = sal_False; - mbMatchCase = sal_False; + mbDDAutoSize = true; + mbSyntheticModify = false; + mbMatchCase = false; mcMultiSep = ';'; m_nMaxWidthChars = -1; } @@ -167,7 +167,7 @@ void ComboBox::ImplInit( Window* pParent, WinBits nStyle ) if( nStyle & WB_DROPDOWN ) { mpFloatWin = new ImplListBoxFloatingWindow( this ); - mpFloatWin->SetAutoWidth( sal_True ); + mpFloatWin->SetAutoWidth( true ); mpFloatWin->SetPopupModeEndHdl( LINK( this, ComboBox, ImplPopupModeEndHdl ) ); mpBtn = new ImplBtn( this, WB_NOLIGHTBORDER | WB_RECTSTYLE ); @@ -190,10 +190,10 @@ void ComboBox::ImplInit( Window* pParent, WinBits nStyle ) } mpSubEdit = new Edit( this, nEditStyle ); - mpSubEdit->EnableRTL( sal_False ); + mpSubEdit->EnableRTL( false ); SetSubEdit( mpSubEdit ); mpSubEdit->SetPosPixel( Point() ); - EnableAutocomplete( sal_True ); + EnableAutocomplete( true ); mpSubEdit->Show(); Window* pLBParent = this; @@ -216,7 +216,7 @@ void ComboBox::ImplInit( Window* pParent, WinBits nStyle ) ImplCalcEditHeight(); - SetCompoundControl( sal_True ); + SetCompoundControl( true ); } // ----------------------------------------------------------------------- @@ -249,7 +249,7 @@ void ComboBox::ImplLoadRes( const ResId& rResId ) // ----------------------------------------------------------------------- -void ComboBox::EnableAutocomplete( sal_Bool bEnable, sal_Bool bMatchCase ) +void ComboBox::EnableAutocomplete( bool bEnable, bool bMatchCase ) { mbMatchCase = bMatchCase; @@ -261,7 +261,7 @@ void ComboBox::EnableAutocomplete( sal_Bool bEnable, sal_Bool bMatchCase ) // ----------------------------------------------------------------------- -sal_Bool ComboBox::IsAutocompleteEnabled() const +bool ComboBox::IsAutocompleteEnabled() const { return mpSubEdit->GetAutocompleteHdl().IsSet(); } @@ -275,10 +275,10 @@ IMPL_LINK_NOARG(ComboBox, ImplClickBtnHdl) if ( !mpImplLB->GetEntryList()->GetMRUCount() ) ImplUpdateFloatSelection(); else - mpImplLB->SelectEntry( 0 , sal_True ); - mpBtn->SetPressed( sal_True ); + mpImplLB->SelectEntry( 0 , true ); + mpBtn->SetPressed( true ); SetSelection( Selection( 0, SELECTION_MAX ) ); - mpFloatWin->StartFloat( sal_True ); + mpFloatWin->StartFloat( true ); ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN ); ImplClearLayoutData(); @@ -296,9 +296,9 @@ IMPL_LINK_NOARG(ComboBox, ImplPopupModeEndHdl) { if ( !mpImplLB->GetEntryList()->IsEntryPosSelected( mpFloatWin->GetPopupModeStartSaveSelection() ) ) { - mpImplLB->SelectEntry( mpFloatWin->GetPopupModeStartSaveSelection(), sal_True ); - sal_Bool bTravelSelect = mpImplLB->IsTravelSelect(); - mpImplLB->SetTravelSelect( sal_True ); + mpImplLB->SelectEntry( mpFloatWin->GetPopupModeStartSaveSelection(), true ); + bool bTravelSelect = mpImplLB->IsTravelSelect(); + mpImplLB->SetTravelSelect( true ); Select(); mpImplLB->SetTravelSelect( bTravelSelect ); } @@ -308,7 +308,7 @@ IMPL_LINK_NOARG(ComboBox, ImplPopupModeEndHdl) if( mpImplLB ) mpImplLB->GetMainWindow()->ImplClearLayoutData(); - mpBtn->SetPressed( sal_False ); + mpBtn->SetPressed( false ); ImplCallEventListeners( VCLEVENT_DROPDOWN_CLOSE ); return 0; } @@ -333,12 +333,12 @@ IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit ) if ( nStart == LISTBOX_ENTRY_NOTFOUND ) nStart = 0; - sal_Bool bForward = sal_True; + bool bForward = true; if ( eAction == AUTOCOMPLETE_TABFORWARD ) nStart++; else if ( eAction == AUTOCOMPLETE_TABBACKWARD ) { - bForward = sal_False; + bForward = false; nStart = nStart ? nStart - 1 : mpImplLB->GetEntryList()->GetEntryCount()-1; } @@ -346,18 +346,18 @@ IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit ) if( ! mbMatchCase ) { // Try match case insensitive from current position - nPos = mpImplLB->GetEntryList()->FindMatchingEntry( aStartText, nStart, bForward, sal_True ); + nPos = mpImplLB->GetEntryList()->FindMatchingEntry( aStartText, nStart, bForward, true ); if ( nPos == LISTBOX_ENTRY_NOTFOUND ) // Try match case insensitive, but from start - nPos = mpImplLB->GetEntryList()->FindMatchingEntry( aStartText, bForward ? 0 : (mpImplLB->GetEntryList()->GetEntryCount()-1), bForward, sal_True ); + nPos = mpImplLB->GetEntryList()->FindMatchingEntry( aStartText, bForward ? 0 : (mpImplLB->GetEntryList()->GetEntryCount()-1), bForward, true ); } if ( nPos == LISTBOX_ENTRY_NOTFOUND ) // Try match full from current position - nPos = mpImplLB->GetEntryList()->FindMatchingEntry( aStartText, nStart, bForward, sal_False ); + nPos = mpImplLB->GetEntryList()->FindMatchingEntry( aStartText, nStart, bForward, false ); if ( nPos == LISTBOX_ENTRY_NOTFOUND ) // Match full, but from start - nPos = mpImplLB->GetEntryList()->FindMatchingEntry( aStartText, bForward ? 0 : (mpImplLB->GetEntryList()->GetEntryCount()-1), bForward, sal_False ); + nPos = mpImplLB->GetEntryList()->FindMatchingEntry( aStartText, bForward ? 0 : (mpImplLB->GetEntryList()->GetEntryCount()-1), bForward, false ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -374,7 +374,7 @@ IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit ) IMPL_LINK_NOARG(ComboBox, ImplSelectHdl) { - sal_Bool bPopup = IsInDropDown(); + bool bPopup = IsInDropDown(); bool bCallSelect = false; if ( mpImplLB->IsSelectionChanged() || bPopup ) { @@ -453,9 +453,9 @@ IMPL_LINK_NOARG(ComboBox, ImplSelectHdl) if ( bCallSelect ) { mpSubEdit->SetModifyFlag(); - mbSyntheticModify = sal_True; + mbSyntheticModify = true; Modify(); - mbSyntheticModify = sal_False; + mbSyntheticModify = false; Select(); } @@ -511,11 +511,11 @@ void ComboBox::ToggleDropDown() if ( !mpImplLB->GetEntryList()->GetMRUCount() ) ImplUpdateFloatSelection(); else - mpImplLB->SelectEntry( 0 , sal_True ); + mpImplLB->SelectEntry( 0 , true ); ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); - mpBtn->SetPressed( sal_True ); + mpBtn->SetPressed( true ); SetSelection( Selection( 0, SELECTION_MAX ) ); - mpFloatWin->StartFloat( sal_True ); + mpFloatWin->StartFloat( true ); ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN ); } } @@ -556,7 +556,7 @@ void ComboBox::EnableAutoSize( bool bAuto ) // ----------------------------------------------------------------------- -void ComboBox::EnableDDAutoWidth( sal_Bool b ) +void ComboBox::EnableDDAutoWidth( bool b ) { if ( mpFloatWin ) mpFloatWin->SetAutoWidth( b ); @@ -780,11 +780,11 @@ bool ComboBox::Notify( NotifyEvent& rNEvt ) if( ( nKeyCode == KEY_DOWN ) && mpFloatWin && !mpFloatWin->IsInPopupMode() && aKeyEvt.GetKeyCode().IsMod2() ) { ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); - mpBtn->SetPressed( sal_True ); + mpBtn->SetPressed( true ); if ( mpImplLB->GetEntryList()->GetMRUCount() ) - mpImplLB->SelectEntry( 0 , sal_True ); + mpImplLB->SelectEntry( 0 , true ); SetSelection( Selection( 0, SELECTION_MAX ) ); - mpFloatWin->StartFloat( sal_False ); + mpFloatWin->StartFloat( false ); ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN ); nDone = true; } @@ -815,7 +815,7 @@ bool ComboBox::Notify( NotifyEvent& rNEvt ) { if( mpFloatWin->HasChildPathFocus() ) mpSubEdit->GrabFocus(); - else if ( mpFloatWin->IsInPopupMode() && !HasChildPathFocus( sal_True ) ) + else if ( mpFloatWin->IsInPopupMode() && !HasChildPathFocus( true ) ) mpFloatWin->EndPopupMode(); } else if( (rNEvt.GetType() == EVENT_COMMAND) && @@ -879,12 +879,12 @@ void ComboBox::Modify() void ComboBox::ImplUpdateFloatSelection() { // move text in the ListBox into the visible region - mpImplLB->SetCallSelectionChangedHdl( sal_False ); + mpImplLB->SetCallSelectionChangedHdl( false ); if ( !IsMultiSelectionEnabled() ) { OUString aSearchStr( mpSubEdit->GetText() ); sal_uInt16 nSelect = LISTBOX_ENTRY_NOTFOUND; - sal_Bool bSelect = sal_True; + bool bSelect = true; if ( mpImplLB->GetCurrentPos() != LISTBOX_ENTRY_NOTFOUND ) { @@ -898,7 +898,7 @@ void ComboBox::ImplUpdateFloatSelection() if ( nSelect == LISTBOX_ENTRY_NOTFOUND ) { nSelect = mpImplLB->GetEntryList()->FindMatchingEntry( aSearchStr ); - bSelect = sal_False; + bSelect = false; } if( nSelect != LISTBOX_ENTRY_NOTFOUND ) @@ -911,7 +911,7 @@ void ComboBox::ImplUpdateFloatSelection() { nSelect = mpImplLB->GetEntryList()->GetSelectEntryPos( 0 ); if( nSelect != LISTBOX_ENTRY_NOTFOUND ) - mpImplLB->SelectEntry( nSelect, sal_False ); + mpImplLB->SelectEntry( nSelect, false ); mpImplLB->ResetCurrentPos(); } } @@ -922,7 +922,7 @@ void ComboBox::ImplUpdateFloatSelection() for ( sal_uInt16 n = 0; n < mpImplLB->GetEntryList()->GetEntryCount(); n++ ) mpImplLB->SelectEntry( n, aSelInText.count( n ) ); } - mpImplLB->SetCallSelectionChangedHdl( sal_True ); + mpImplLB->SetCallSelectionChangedHdl( true ); } // ----------------------------------------------------------------------- @@ -1002,29 +1002,29 @@ sal_uInt16 ComboBox::GetEntryCount() const // ----------------------------------------------------------------------- -sal_Bool ComboBox::IsTravelSelect() const +bool ComboBox::IsTravelSelect() const { return mpImplLB->IsTravelSelect(); } // ----------------------------------------------------------------------- -sal_Bool ComboBox::IsInDropDown() const +bool ComboBox::IsInDropDown() const { return mpFloatWin && mpFloatWin->IsInPopupMode(); } // ----------------------------------------------------------------------- -void ComboBox::EnableMultiSelection( sal_Bool bMulti ) +void ComboBox::EnableMultiSelection( bool bMulti ) { - mpImplLB->EnableMultiSelection( bMulti, sal_False ); - mpImplLB->SetMultiSelectionSimpleMode( sal_True ); + mpImplLB->EnableMultiSelection( bMulti, false ); + mpImplLB->SetMultiSelectionSimpleMode( true ); } // ----------------------------------------------------------------------- -sal_Bool ComboBox::IsMultiSelectionEnabled() const +bool ComboBox::IsMultiSelectionEnabled() const { return mpImplLB->IsMultiSelectionEnabled(); } @@ -1197,7 +1197,7 @@ void ComboBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { - mpImplLB->GetMainWindow()->ImplInitSettings( sal_True, sal_True, sal_True ); + mpImplLB->GetMainWindow()->ImplInitSettings( true, true, true ); Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); @@ -1212,8 +1212,8 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, s // Border/Background pDev->SetLineColor(); pDev->SetFillColor(); - sal_Bool bBorder = !(nFlags & WINDOW_DRAW_NOBORDER ) && (GetStyle() & WB_BORDER); - sal_Bool bBackground = !(nFlags & WINDOW_DRAW_NOBACKGROUND) && IsControlBackground(); + bool bBorder = !(nFlags & WINDOW_DRAW_NOBORDER ) && (GetStyle() & WB_BORDER); + bool bBackground = !(nFlags & WINDOW_DRAW_NOBACKGROUND) && IsControlBackground(); if ( bBorder || bBackground ) { Rectangle aRect( aPos, aSize ); @@ -1322,14 +1322,14 @@ void ComboBox::SetUserItemSize( const Size& rSz ) // ----------------------------------------------------------------------- -void ComboBox::EnableUserDraw( sal_Bool bUserDraw ) +void ComboBox::EnableUserDraw( bool bUserDraw ) { mpImplLB->GetMainWindow()->EnableUserDraw( bUserDraw ); } // ----------------------------------------------------------------------- -void ComboBox::DrawEntry( const UserDrawEvent& rEvt, sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos ) +void ComboBox::DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos ) { DBG_ASSERT( rEvt.GetDevice() == mpImplLB->GetMainWindow(), "DrawEntry?!" ); mpImplLB->GetMainWindow()->DrawEntry( rEvt.GetItemId(), bDrawImage, bDrawText, bDrawTextAtImagePos ); @@ -1453,12 +1453,12 @@ sal_uInt16 ComboBox::GetSelectEntryPos( sal_uInt16 nIndex ) const return nPos; } // ----------------------------------------------------------------------------- -sal_Bool ComboBox::IsEntryPosSelected( sal_uInt16 nPos ) const +bool ComboBox::IsEntryPosSelected( sal_uInt16 nPos ) const { return mpImplLB->GetEntryList()->IsEntryPosSelected( nPos + mpImplLB->GetEntryList()->GetMRUCount() ); } // ----------------------------------------------------------------------------- -void ComboBox::SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect) +void ComboBox::SelectEntryPos( sal_uInt16 nPos, bool bSelect) { if ( nPos < mpImplLB->GetEntryList()->GetEntryCount() ) mpImplLB->SelectEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), bSelect ); diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 330d9b4a6384..84e25feb4cfb 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -357,7 +357,7 @@ void Control::AppendLayoutData( const Control& rSubControl ) const // ----------------------------------------------------------------- -sal_Bool Control::ImplCallEventListenersAndHandler( sal_uLong nEvent, const Link& rHandler, void* pCaller ) +bool Control::ImplCallEventListenersAndHandler( sal_uLong nEvent, const Link& rHandler, void* pCaller ) { ImplDelData aCheckDelete; ImplAddDel( &aCheckDelete ); @@ -370,10 +370,10 @@ sal_Bool Control::ImplCallEventListenersAndHandler( sal_uLong nEvent, const Lin if ( !aCheckDelete.IsDead() ) { ImplRemoveDel( &aCheckDelete ); - return sal_False; + return false; } } - return sal_True; + return true; } // ----------------------------------------------------------------- @@ -495,7 +495,7 @@ const Color& Control::GetCanonicalTextColor( const StyleSettings& _rStyle ) cons } // ----------------------------------------------------------------- -void Control::ImplInitSettings( const sal_Bool _bFont, const sal_Bool _bForeground ) +void Control::ImplInitSettings( const bool _bFont, const bool _bForeground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 131f1c507cfc..165d73885552 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -310,21 +310,21 @@ void Edit::ImplInitEditData() mnWidthInChars = -1; mnMaxWidthChars = -1; meAutocompleteAction = AUTOCOMPLETE_KEYINPUT; - mbModified = sal_False; - mbInternModified = sal_False; - mbReadOnly = sal_False; - mbInsertMode = sal_True; - mbClickedInSelection = sal_False; - mbActivePopup = sal_False; - mbIsSubEdit = sal_False; - mbInMBDown = sal_False; + mbModified = false; + mbInternModified = false; + mbReadOnly = false; + mbInsertMode = true; + mbClickedInSelection = false; + mbActivePopup = false; + mbIsSubEdit = false; + mbInMBDown = false; mpDDInfo = NULL; mpIMEInfos = NULL; mcEchoChar = 0; // --- RTL --- no default mirroring for Edit controls // note: controls that use a subedit will revert this (SpinField, ComboBox) - EnableRTL( sal_False ); + EnableRTL( false ); vcl::unohelper::DragAndDropWrapper* pDnDWrapper = new vcl::unohelper::DragAndDropWrapper( this ); mxDnDListener = pDnDWrapper; @@ -371,7 +371,7 @@ void Edit::ImplInit( Window* pParent, WinBits nStyle ) SetCursor( new Cursor ); SetPointer( Pointer( POINTER_TEXT ) ); - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); uno::Reference< datatransfer::dnd::XDragGestureListener> xDGL( mxDnDListener, uno::UNO_QUERY ); uno::Reference< datatransfer::dnd::XDragGestureRecognizer > xDGR = GetDragGestureRecognizer(); @@ -399,7 +399,7 @@ WinBits Edit::ImplInitStyle( WinBits nStyle ) // ----------------------------------------------------------------------- -sal_Bool Edit::IsCharInput( const KeyEvent& rKeyEvent ) +bool Edit::IsCharInput( const KeyEvent& rKeyEvent ) { // In the future we must use new Unicode functions for this sal_Unicode cCharCode = rKeyEvent.GetCharCode(); @@ -413,13 +413,13 @@ sal_Bool Edit::IsCharInput( const KeyEvent& rKeyEvent ) void Edit::ImplModified() { - mbModified = sal_True; + mbModified = true; Modify(); } // ----------------------------------------------------------------------- -void Edit::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) +void Edit::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -573,7 +573,7 @@ void Edit::ImplRepaint(bool bLayout) const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); if ( IsEnabled() ) - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); if ( !IsEnabled() || bPaintPlaceholderText ) SetTextColor( rStyleSettings.GetDisableColor() ); @@ -810,7 +810,7 @@ void Edit::ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uI maSelection.Min() = aSelection.Min(); maSelection.Max() = aSelection.Min(); ImplAlignAndPaint(); - mbInternModified = sal_True; + mbInternModified = true; } // ----------------------------------------------------------------------- @@ -873,7 +873,7 @@ bool Edit::ImplTruncateToMaxLen( OUString& rStr, sal_Int32 nSelectionLen ) const // ----------------------------------------------------------------------- -void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, sal_Bool bIsUserInput ) +void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, bool bIsUserInput ) { Selection aSelection( maSelection ); aSelection.Justify(); @@ -971,7 +971,7 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, sal_B } ImplAlignAndPaint(); - mbInternModified = sal_True; + mbInternModified = true; } // ----------------------------------------------------------------------- @@ -995,7 +995,7 @@ void Edit::ImplSetText( const OUString& rText, const Selection* pNewSelection ) ImplAlign(); if ( pNewSelection ) - ImplSetSelection( *pNewSelection, sal_False ); + ImplSetSelection( *pNewSelection, false ); if ( mnXOffset && !pNewSelection ) maSelection.Max() = 0; @@ -1142,7 +1142,7 @@ void Edit::ImplPaintBorder( long nXStart, long nXEnd ) // ----------------------------------------------------------------------- -void Edit::ImplShowCursor( sal_Bool bOnlyIfVisible ) +void Edit::ImplShowCursor( bool bOnlyIfVisible ) { if ( !IsUpdateMode() || ( bOnlyIfVisible && !IsReallyVisible() ) ) return; @@ -1334,7 +1334,7 @@ sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos ) const // ----------------------------------------------------------------------- -void Edit::ImplSetCursorPos( sal_Int32 nChar, sal_Bool bSelect ) +void Edit::ImplSetCursorPos( sal_Int32 nChar, bool bSelect ) { Selection aSelection( maSelection ); aSelection.Max() = nChar; @@ -1426,7 +1426,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt ) if ( rMEvt.GetClicks() < 4 ) { - mbClickedInSelection = sal_False; + mbClickedInSelection = false; if ( rMEvt.GetClicks() == 3 ) { ImplSetSelection( Selection( 0, EDIT_NOLIMIT) ); @@ -1442,7 +1442,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt ) ImplCopyToSelectionClipboard(); } else if ( !rMEvt.IsShift() && HasFocus() && aSelection.IsInside( nCharPos ) ) - mbClickedInSelection = sal_True; + mbClickedInSelection = true; else if ( rMEvt.IsLeft() ) ImplSetCursorPos( nCharPos, rMEvt.IsShift() ); @@ -1450,9 +1450,9 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt ) StartTracking( STARTTRACK_SCROLLREPEAT ); } - mbInMBDown = sal_True; // then do not select all in GetFocus + mbInMBDown = true; // then do not select all in GetFocus GrabFocus(); - mbInMBDown = sal_False; + mbInMBDown = false; } // ----------------------------------------------------------------------- @@ -1462,8 +1462,8 @@ void Edit::MouseButtonUp( const MouseEvent& rMEvt ) if ( mbClickedInSelection && rMEvt.IsLeft() ) { sal_Int32 nCharPos = ImplGetCharPos( rMEvt.GetPosPixel() ); - ImplSetCursorPos( nCharPos, sal_False ); - mbClickedInSelection = sal_False; + ImplSetCursorPos( nCharPos, false ); + mbClickedInSelection = false; } else if ( rMEvt.IsMiddle() && !mbReadOnly && ( GetSettings().GetMouseSettings().GetMiddleButtonAction() == MOUSE_MIDDLE_PASTESELECTION ) ) @@ -1483,8 +1483,8 @@ void Edit::Tracking( const TrackingEvent& rTEvt ) if ( mbClickedInSelection ) { sal_Int32 nCharPos = ImplGetCharPos( rTEvt.GetMouseEvent().GetPosPixel() ); - ImplSetCursorPos( nCharPos, sal_False ); - mbClickedInSelection = sal_False; + ImplSetCursorPos( nCharPos, false ); + mbClickedInSelection = false; } else if ( rTEvt.GetMouseEvent().IsLeft() ) { @@ -1496,7 +1496,7 @@ void Edit::Tracking( const TrackingEvent& rTEvt ) if( !mbClickedInSelection ) { sal_Int32 nCharPos = ImplGetCharPos( rTEvt.GetMouseEvent().GetPosPixel() ); - ImplSetCursorPos( nCharPos, sal_True ); + ImplSetCursorPos( nCharPos, true ); } } @@ -1506,13 +1506,13 @@ void Edit::Tracking( const TrackingEvent& rTEvt ) // ----------------------------------------------------------------------- -sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) +bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) { - sal_Bool bDone = sal_False; + bool bDone = false; sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction(); - mbInternModified = sal_False; + mbInternModified = false; if ( eFunc != KEYFUNC_DONTKNOW ) { @@ -1524,7 +1524,7 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) { Cut(); ImplModified(); - bDone = sal_True; + bDone = true; } } break; @@ -1534,7 +1534,7 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) if ( !(GetStyle() & WB_PASSWORD) ) { Copy(); - bDone = sal_True; + bDone = true; } } break; @@ -1544,7 +1544,7 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) if ( !mbReadOnly ) { Paste(); - bDone = sal_True; + bDone = true; } } break; @@ -1554,7 +1554,7 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) if ( !mbReadOnly ) { Undo(); - bDone = sal_True; + bDone = true; } } break; @@ -1569,7 +1569,7 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) if ( nCode == KEY_A ) { ImplSetSelection( Selection( 0, maText.getLength() ) ); - bDone = sal_True; + bDone = true; } else if ( rKEvt.GetKeyCode().IsShift() && (nCode == KEY_S) ) { @@ -1583,7 +1583,7 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) ImplInsertText( aChars ); ImplModified(); } - bDone = sal_True; + bDone = true; } } } @@ -1595,7 +1595,7 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) case com::sun::star::awt::Key::SELECT_ALL: { ImplSetSelection( Selection( 0, maText.getLength() ) ); - bDone = sal_True; + bDone = true; } break; @@ -1726,7 +1726,7 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) } } - bDone = sal_True; + bDone = true; } } break; @@ -1768,7 +1768,7 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) ImplDelete( maSelection, nDel, nMode ); if ( maText.getLength() != nOldLen ) ImplModified(); - bDone = sal_True; + bDone = true; } } break; @@ -1778,7 +1778,7 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) if ( !mpIMEInfos && !mbReadOnly && !rKEvt.GetKeyCode().IsMod2() ) { SetInsertMode( !mbInsertMode ); - bDone = sal_True; + bDone = true; } } break; @@ -1813,10 +1813,10 @@ sal_Bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) { if ( IsCharInput( rKEvt ) ) { - bDone = sal_True; // read characters also when in ReadOnly + bDone = true; // read characters also when in ReadOnly if ( !mbReadOnly ) { - ImplInsertText(OUString(rKEvt.GetCharCode()), 0, sal_True); + ImplInsertText(OUString(rKEvt.GetCharCode()), 0, true); if ( maAutocompleteHdl.IsSet() ) { if ( (maSelection.Min() == maSelection.Max()) && (maSelection.Min() == maText.getLength()) ) @@ -1883,7 +1883,7 @@ void Edit::Resize() void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); @@ -2085,22 +2085,22 @@ void Edit::Command( const CommandEvent& rCEvt ) if ( !maSelection.Len() ) { - pPopup->EnableItem( SV_MENU_EDIT_CUT, sal_False ); - pPopup->EnableItem( SV_MENU_EDIT_COPY, sal_False ); - pPopup->EnableItem( SV_MENU_EDIT_DELETE, sal_False ); + pPopup->EnableItem( SV_MENU_EDIT_CUT, false ); + pPopup->EnableItem( SV_MENU_EDIT_COPY, false ); + pPopup->EnableItem( SV_MENU_EDIT_DELETE, false ); } if ( IsReadOnly() ) { - pPopup->EnableItem( SV_MENU_EDIT_CUT, sal_False ); - pPopup->EnableItem( SV_MENU_EDIT_PASTE, sal_False ); - pPopup->EnableItem( SV_MENU_EDIT_DELETE, sal_False ); - pPopup->EnableItem( SV_MENU_EDIT_INSERTSYMBOL, sal_False ); + pPopup->EnableItem( SV_MENU_EDIT_CUT, false ); + pPopup->EnableItem( SV_MENU_EDIT_PASTE, false ); + pPopup->EnableItem( SV_MENU_EDIT_DELETE, false ); + pPopup->EnableItem( SV_MENU_EDIT_INSERTSYMBOL, false ); } else { // only paste if text available in clipboard - sal_Bool bData = sal_False; + bool bData = false; uno::Reference< datatransfer::clipboard::XClipboard > xClipboard = GetClipboard(); if ( xClipboard.is() ) { @@ -2118,9 +2118,9 @@ void Edit::Command( const CommandEvent& rCEvt ) } if ( maUndoText == maText.getStr() ) - pPopup->EnableItem( SV_MENU_EDIT_UNDO, sal_False ); + pPopup->EnableItem( SV_MENU_EDIT_UNDO, false ); if ( ( maSelection.Min() == 0 ) && ( maSelection.Max() == maText.getLength() ) ) - pPopup->EnableItem( SV_MENU_EDIT_SELECTALL, sal_False ); + pPopup->EnableItem( SV_MENU_EDIT_SELECTALL, false ); if ( !pImplFncGetSpecialChars ) { sal_uInt16 nPos = pPopup->GetItemPos( SV_MENU_EDIT_INSERTSYMBOL ); @@ -2128,7 +2128,7 @@ void Edit::Command( const CommandEvent& rCEvt ) pPopup->RemoveItem( nPos-1 ); } - mbActivePopup = sal_True; + mbActivePopup = true; Selection aSaveSel = GetSelection(); // if someone changes selection in Get/LoseFocus, e.g. URL bar Point aPos = rCEvt.GetMousePosPixel(); if ( !rCEvt.IsMouseEvent() ) @@ -2176,7 +2176,7 @@ void Edit::Command( const CommandEvent& rCEvt ) } break; } - mbActivePopup = sal_False; + mbActivePopup = false; } else if ( rCEvt.GetCommand() == COMMAND_STARTEXTTEXTINPUT ) { @@ -2188,12 +2188,12 @@ void Edit::Command( const CommandEvent& rCEvt ) } else if ( rCEvt.GetCommand() == COMMAND_ENDEXTTEXTINPUT ) { - sal_Bool bInsertMode = !mpIMEInfos->bWasCursorOverwrite; + bool bInsertMode = !mpIMEInfos->bWasCursorOverwrite; delete mpIMEInfos; mpIMEInfos = NULL; // set font without attributes, because it will not be re-initialised in Repaint anymore - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); SetInsertMode( bInsertMode ); @@ -2325,10 +2325,10 @@ void Edit::StateChanged( StateChangedType nType ) mnXOffset = 0; // if GrabFocus before while size was still wrong ImplAlign(); if ( !mpSubEdit ) - ImplShowCursor( sal_False ); + ImplShowCursor( false ); } // update background (eventual SetPaintTransparent) - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); } else if ( nType == STATE_CHANGE_ENABLE ) { @@ -2381,8 +2381,8 @@ void Edit::StateChanged( StateChangedType nType ) { if ( !mpSubEdit ) { - ImplInitSettings( sal_True, sal_False, sal_False ); - ImplShowCursor( sal_True ); + ImplInitSettings( true, false, false ); + ImplShowCursor( true ); Invalidate(); } } @@ -2390,7 +2390,7 @@ void Edit::StateChanged( StateChangedType nType ) { if ( !mpSubEdit ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); ImplShowCursor(); Invalidate(); } @@ -2399,7 +2399,7 @@ void Edit::StateChanged( StateChangedType nType ) { if ( !mpSubEdit ) { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } } @@ -2407,7 +2407,7 @@ void Edit::StateChanged( StateChangedType nType ) { if ( !mpSubEdit ) { - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); Invalidate(); } } @@ -2426,8 +2426,8 @@ void Edit::DataChanged( const DataChangedEvent& rDCEvt ) { if ( !mpSubEdit ) { - ImplInitSettings( sal_True, sal_True, sal_True ); - ImplShowCursor( sal_True ); + ImplInitSettings( true, true, true ); + ImplShowCursor( true ); Invalidate(); } } @@ -2539,7 +2539,7 @@ void Edit::SetEchoChar( sal_Unicode c ) void Edit::SetReadOnly( sal_Bool bReadOnly ) { - if ( mbReadOnly != bReadOnly ) + if ( mbReadOnly != bool(bReadOnly) ) { mbReadOnly = bReadOnly; if ( mpSubEdit ) @@ -2560,7 +2560,7 @@ void Edit::SetAutocompleteHdl( const Link& rHdl ) // ----------------------------------------------------------------------- -void Edit::SetInsertMode( sal_Bool bInsert ) +void Edit::SetInsertMode( bool bInsert ) { if ( bInsert != mbInsertMode ) { @@ -2574,7 +2574,7 @@ void Edit::SetInsertMode( sal_Bool bInsert ) // ----------------------------------------------------------------------- -sal_Bool Edit::IsInsertMode() const +bool Edit::IsInsertMode() const { if ( mpSubEdit ) return mpSubEdit->IsInsertMode(); @@ -2613,7 +2613,7 @@ void Edit::SetSelection( const Selection& rSelection ) // ----------------------------------------------------------------------- -void Edit::ImplSetSelection( const Selection& rSelection, sal_Bool bPaint ) +void Edit::ImplSetSelection( const Selection& rSelection, bool bPaint ) { if ( mpSubEdit ) mpSubEdit->ImplSetSelection( rSelection ); @@ -2830,9 +2830,9 @@ OUString Edit::GetPlaceholderText() const void Edit::SetModifyFlag() { if ( mpSubEdit ) - mpSubEdit->mbModified = sal_True; + mpSubEdit->mbModified = true; else - mbModified = sal_True; + mbModified = true; } // ----------------------------------------------------------------------- @@ -2840,9 +2840,9 @@ void Edit::SetModifyFlag() void Edit::ClearModifyFlag() { if ( mpSubEdit ) - mpSubEdit->mbModified = sal_False; + mpSubEdit->mbModified = false; else - mbModified = sal_False; + mbModified = false; } // ----------------------------------------------------------------------- @@ -2853,7 +2853,7 @@ void Edit::SetSubEdit( Edit* pEdit ) if ( mpSubEdit ) { SetPointer( POINTER_ARROW ); // Nur das SubEdit hat den BEAM... - mpSubEdit->mbIsSubEdit = sal_True; + mpSubEdit->mbIsSubEdit = true; mpSubEdit->SetReadOnly( mbReadOnly ); } @@ -2999,8 +2999,8 @@ PopupMenu* Edit::CreatePopupMenu() pPopup->SetAccelKey( SV_MENU_EDIT_COPY, KeyCode( KEYFUNC_COPY ) ); pPopup->SetAccelKey( SV_MENU_EDIT_PASTE, KeyCode( KEYFUNC_PASTE ) ); pPopup->SetAccelKey( SV_MENU_EDIT_DELETE, KeyCode( KEYFUNC_DELETE ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_SELECTALL, KeyCode( KEY_A, sal_False, sal_True, sal_False, sal_False ) ); - pPopup->SetAccelKey( SV_MENU_EDIT_INSERTSYMBOL, KeyCode( KEY_S, sal_True, sal_True, sal_False, sal_False ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_SELECTALL, KeyCode( KEY_A, false, true, false, false ) ); + pPopup->SetAccelKey( SV_MENU_EDIT_INSERTSYMBOL, KeyCode( KEY_S, true, true, false, false ) ); } return pPopup; } @@ -3081,7 +3081,7 @@ void Edit::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& { SolarMutexGuard aVclGuard; - sal_Bool bChanges = sal_False; + bool bChanges = false; if ( !mbReadOnly && mpDDInfo ) { ImplHideDDCursor(); @@ -3109,7 +3109,7 @@ void Edit::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& OUString aText; aData >>= aText; ImplInsertText( aText ); - bChanges = sal_True; + bChanges = true; ImplModified(); } } diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 09eeeb8f6530..ffe59c8794bd 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -263,8 +263,8 @@ static void ImplUpdateSeparators( const OUString& rOldDecSep, const OUString& rN if( bChangeDec || bChangeTh ) { - sal_Bool bUpdateMode = pEdit->IsUpdateMode(); - pEdit->SetUpdateMode( sal_False ); + bool bUpdateMode = pEdit->IsUpdateMode(); + pEdit->SetUpdateMode( false ); OUString aText = pEdit->GetText(); ImplUpdateSeparatorString( aText, rOldDecSep, rNewDecSep, rOldThSep, rNewThSep ); pEdit->SetText( aText ); @@ -295,11 +295,11 @@ FormatterBase::FormatterBase( Edit* pField ) { mpField = pField; mpLocaleDataWrapper = NULL; - mbReformat = sal_False; - mbStrictFormat = sal_False; - mbEmptyFieldValue = sal_False; - mbEmptyFieldValueEnabled = sal_False; - mbDefaultLocale = sal_True; + mbReformat = false; + mbStrictFormat = false; + mbEmptyFieldValue = false; + mbEmptyFieldValueEnabled = false; + mbDefaultLocale = true; } FormatterBase::~FormatterBase() @@ -330,7 +330,7 @@ void FormatterBase::ReformatAll() Reformat(); }; -void FormatterBase::SetStrictFormat( sal_Bool bStrict ) +void FormatterBase::SetStrictFormat( bool bStrict ) { if ( bStrict != mbStrictFormat ) { @@ -343,7 +343,7 @@ void FormatterBase::SetStrictFormat( sal_Bool bStrict ) void FormatterBase::SetLocale( const lang::Locale& rLocale ) { ImplGetLocaleDataWrapper().setLanguageTag( LanguageTag( rLocale) ); - mbDefaultLocale = sal_False; + mbDefaultLocale = false; ReformatAll(); } @@ -394,7 +394,7 @@ void FormatterBase::ImplSetText( const OUString& rText, Selection* pNewSelection mpField->SetText( rText, aSel ); } - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); } } @@ -402,19 +402,19 @@ void FormatterBase::SetEmptyFieldValue() { if ( mpField ) mpField->SetText( OUString() ); - mbEmptyFieldValue = sal_True; + mbEmptyFieldValue = true; } -sal_Bool FormatterBase::IsEmptyFieldValue() const +bool FormatterBase::IsEmptyFieldValue() const { return (!mpField || mpField->GetText().isEmpty()); } -sal_Bool NumericFormatter::ImplNumericReformat( const OUString& rStr, sal_Int64& rValue, +bool NumericFormatter::ImplNumericReformat( const OUString& rStr, sal_Int64& rValue, OUString& rOutStr ) { if ( !ImplNumericGetValue( rStr, rValue, GetDecimalDigits(), ImplGetLocaleDataWrapper() ) ) - return sal_True; + return true; else { sal_Int64 nTempVal = rValue; @@ -429,14 +429,14 @@ sal_Bool NumericFormatter::ImplNumericReformat( const OUString& rStr, sal_Int64& if ( !GetErrorHdl().Call( this ) ) { mnCorrectedValue = 0; - return sal_False; + return false; } else mnCorrectedValue = 0; } rOutStr = CreateFieldText( nTempVal ); - return sal_True; + return true; } } @@ -449,8 +449,8 @@ void NumericFormatter::ImplInit() mnCorrectedValue = 0; mnDecimalDigits = 2; mnType = FORMAT_NUMERIC; - mbThousandSep = sal_True; - mbShowTrailingZeros = sal_True; + mbThousandSep = true; + mbShowTrailingZeros = true; // for fields mnSpinSize = 1; @@ -480,7 +480,7 @@ void NumericFormatter::ImplLoadRes( const ResId& rResId ) mnMax = pMgr->ReadLong(); if ( NUMERICFORMATTER_STRICTFORMAT & nMask ) - SetStrictFormat( (sal_Bool)pMgr->ReadShort() ); + SetStrictFormat( pMgr->ReadShort() != 0 ); if ( NUMERICFORMATTER_DECIMALDIGITS & nMask ) SetDecimalDigits( pMgr->ReadShort() ); @@ -496,7 +496,7 @@ void NumericFormatter::ImplLoadRes( const ResId& rResId ) } if ( NUMERICFORMATTER_NOTHOUSANDSEP & nMask ) - SetUseThousandSep( !(sal_Bool)pMgr->ReadShort() ); + SetUseThousandSep( pMgr->ReadShort() == 0 ); } } @@ -518,7 +518,7 @@ void NumericFormatter::SetMax( sal_Int64 nNewMax ) ReformatAll(); } -void NumericFormatter::SetUseThousandSep( sal_Bool bValue ) +void NumericFormatter::SetUseThousandSep( bool bValue ) { mbThousandSep = bValue; ReformatAll(); @@ -530,7 +530,7 @@ void NumericFormatter::SetDecimalDigits( sal_uInt16 nDigits ) ReformatAll(); } -void NumericFormatter::SetShowTrailingZeros( sal_Bool bShowTrailingZeros ) +void NumericFormatter::SetShowTrailingZeros( bool bShowTrailingZeros ) { if ( mbShowTrailingZeros != bShowTrailingZeros ) { @@ -548,7 +548,7 @@ void NumericFormatter::SetValue( sal_Int64 nNewValue ) { SetUserValue( nNewValue ); mnFieldValue = mnLastValue; - SetEmptyFieldValueData( sal_False ); + SetEmptyFieldValueData( false ); } OUString NumericFormatter::CreateFieldText( sal_Int64 nValue ) const @@ -593,14 +593,14 @@ sal_Int64 NumericFormatter::GetValue() const return mnLastValue; } -sal_Bool NumericFormatter::IsValueModified() const +bool NumericFormatter::IsValueModified() const { if ( ImplGetEmptyFieldValue() ) return !IsEmptyFieldValue(); else if ( GetValue() != mnFieldValue ) - return sal_True; + return true; else - return sal_False; + return false; } sal_Int64 NumericFormatter::Normalize( sal_Int64 nValue ) const @@ -640,7 +640,7 @@ void NumericFormatter::Reformat() OUString aStr; sal_Int64 nTemp = mnLastValue; - sal_Bool bOK = ImplNumericReformat( GetField()->GetText(), nTemp, aStr ); + bool bOK = ImplNumericReformat( GetField()->GetText(), nTemp, aStr ); mnLastValue = nTemp; if ( !bOK ) return; @@ -791,7 +791,7 @@ bool NumericField::PreNotify( NotifyEvent& rNEvt ) bool NumericField::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); else if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) ) @@ -820,7 +820,7 @@ void NumericField::DataChanged( const DataChangedEvent& rDCEvt ) void NumericField::Modify() { - MarkToBeReformatted( sal_True ); + MarkToBeReformatted( true ); SpinField::Modify(); } @@ -943,7 +943,7 @@ bool NumericBox::PreNotify( NotifyEvent& rNEvt ) bool NumericBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); else if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) ) @@ -972,7 +972,7 @@ void NumericBox::DataChanged( const DataChangedEvent& rDCEvt ) void NumericBox::Modify() { - MarkToBeReformatted( sal_True ); + MarkToBeReformatted( true ); ComboBox::Modify(); } @@ -980,7 +980,7 @@ void NumericBox::ReformatAll() { sal_Int64 nValue; OUString aStr; - SetUpdateMode( sal_False ); + SetUpdateMode( false ); sal_uInt16 nEntryCount = GetEntryCount(); for ( sal_uInt16 i=0; i < nEntryCount; i++ ) { @@ -989,7 +989,7 @@ void NumericBox::ReformatAll() InsertEntry( aStr, i ); } NumericFormatter::Reformat(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } void NumericBox::InsertValue( sal_Int64 nValue, sal_uInt16 nPos ) @@ -1337,10 +1337,10 @@ static bool ImplMetricGetValue( const OUString& rStr, double& rValue, sal_Int64 return true; } -sal_Bool MetricFormatter::ImplMetricReformat( const OUString& rStr, double& rValue, OUString& rOutStr ) +bool MetricFormatter::ImplMetricReformat( const OUString& rStr, double& rValue, OUString& rOutStr ) { if ( !ImplMetricGetValue( rStr, rValue, mnBaseValue, GetDecimalDigits(), ImplGetLocaleDataWrapper(), meUnit ) ) - return sal_True; + return true; else { double nTempVal = rValue; @@ -1356,14 +1356,14 @@ sal_Bool MetricFormatter::ImplMetricReformat( const OUString& rStr, double& rVal if ( !GetErrorHdl().Call( this ) ) { mnCorrectedValue = 0; - return sal_False; + return false; } else mnCorrectedValue = 0; } rOutStr = CreateFieldText( (sal_Int64)nTempVal ); - return sal_True; + return true; } } @@ -1541,7 +1541,7 @@ void MetricFormatter::Reformat() OUString aStr; // caution: precision loss in double cast double nTemp = (double)mnLastValue; - sal_Bool bOK = ImplMetricReformat( aText, nTemp, aStr ); + bool bOK = ImplMetricReformat( aText, nTemp, aStr ); mnLastValue = (sal_Int64)nTemp; if ( !bOK ) @@ -1689,7 +1689,7 @@ bool MetricField::PreNotify( NotifyEvent& rNEvt ) bool MetricField::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); else if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) ) @@ -1718,7 +1718,7 @@ void MetricField::DataChanged( const DataChangedEvent& rDCEvt ) void MetricField::Modify() { - MarkToBeReformatted( sal_True ); + MarkToBeReformatted( true ); SpinField::Modify(); } @@ -1790,7 +1790,7 @@ bool MetricBox::PreNotify( NotifyEvent& rNEvt ) bool MetricBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); else if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) ) @@ -1819,7 +1819,7 @@ void MetricBox::DataChanged( const DataChangedEvent& rDCEvt ) void MetricBox::Modify() { - MarkToBeReformatted( sal_True ); + MarkToBeReformatted( true ); ComboBox::Modify(); } @@ -1827,7 +1827,7 @@ void MetricBox::ReformatAll() { double nValue; OUString aStr; - SetUpdateMode( sal_False ); + SetUpdateMode( false ); sal_uInt16 nEntryCount = GetEntryCount(); for ( sal_uInt16 i=0; i < nEntryCount; i++ ) { @@ -1836,7 +1836,7 @@ void MetricBox::ReformatAll() InsertEntry( aStr, i ); } MetricFormatter::Reformat(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } void MetricBox::CustomConvert() @@ -1899,11 +1899,11 @@ inline bool ImplCurrencyGetValue( const OUString& rStr, sal_Int64& rValue, return ImplNumericGetValue( rStr, rValue, nDecDigits, rWrapper, true ); } -sal_Bool CurrencyFormatter::ImplCurrencyReformat( const OUString& rStr, OUString& rOutStr ) +bool CurrencyFormatter::ImplCurrencyReformat( const OUString& rStr, OUString& rOutStr ) { sal_Int64 nValue; if ( !ImplNumericGetValue( rStr, nValue, GetDecimalDigits(), ImplGetLocaleDataWrapper(), true ) ) - return sal_True; + return true; else { sal_Int64 nTempVal = nValue; @@ -1918,14 +1918,14 @@ sal_Bool CurrencyFormatter::ImplCurrencyReformat( const OUString& rStr, OUString if ( !GetErrorHdl().Call( this ) ) { mnCorrectedValue = 0; - return sal_False; + return false; } else mnCorrectedValue = 0; } rOutStr = CreateFieldText( nTempVal ); - return sal_True; + return true; } } @@ -1952,7 +1952,7 @@ void CurrencyFormatter::SetValue( sal_Int64 nNewValue ) { SetUserValue( nNewValue ); mnFieldValue = mnLastValue; - SetEmptyFieldValueData( sal_False ); + SetEmptyFieldValueData( false ); } OUString CurrencyFormatter::CreateFieldText( sal_Int64 nValue ) const @@ -1984,7 +1984,7 @@ void CurrencyFormatter::Reformat() return; OUString aStr; - sal_Bool bOK = ImplCurrencyReformat( GetField()->GetText(), aStr ); + bool bOK = ImplCurrencyReformat( GetField()->GetText(), aStr ); if ( !bOK ) return; @@ -2024,7 +2024,7 @@ bool CurrencyField::PreNotify( NotifyEvent& rNEvt ) bool CurrencyField::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); else if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) ) @@ -2053,7 +2053,7 @@ void CurrencyField::DataChanged( const DataChangedEvent& rDCEvt ) void CurrencyField::Modify() { - MarkToBeReformatted( sal_True ); + MarkToBeReformatted( true ); SpinField::Modify(); } @@ -2106,7 +2106,7 @@ bool CurrencyBox::PreNotify( NotifyEvent& rNEvt ) bool CurrencyBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); else if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) ) @@ -2135,14 +2135,14 @@ void CurrencyBox::DataChanged( const DataChangedEvent& rDCEvt ) void CurrencyBox::Modify() { - MarkToBeReformatted( sal_True ); + MarkToBeReformatted( true ); ComboBox::Modify(); } void CurrencyBox::ReformatAll() { OUString aStr; - SetUpdateMode( sal_False ); + SetUpdateMode( false ); sal_uInt16 nEntryCount = GetEntryCount(); for ( sal_uInt16 i=0; i < nEntryCount; i++ ) { @@ -2151,7 +2151,7 @@ void CurrencyBox::ReformatAll() InsertEntry( aStr, i ); } CurrencyFormatter::Reformat(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } sal_Int64 CurrencyBox::GetValue() const diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index d4c537b34a11..0568ad4c9d1b 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -450,10 +450,10 @@ static sal_Int32 ImplPatternRightPos( const OUString& rStr, const OString& rEdit static bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, const OString& rEditMask, const OUString& rLiteralMask, - sal_Bool bStrictFormat, + bool bStrictFormat, sal_uInt16 nFormatFlags, bool bSameMask, - sal_Bool& rbInKeyInput ) + bool& rbInKeyInput ) { if ( rEditMask.isEmpty() || !bStrictFormat ) return false; @@ -462,7 +462,7 @@ static bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, KeyCode aCode = rKEvt.GetKeyCode(); sal_Unicode cChar = rKEvt.GetCharCode(); sal_uInt16 nKeyCode = aCode.GetCode(); - sal_Bool bShift = aCode.IsShift(); + bool bShift = aCode.IsShift(); sal_Int32 nCursorPos = static_cast<sal_Int32>(aOldSel.Max()); sal_Int32 nNewPos; sal_Int32 nTempPos; @@ -579,11 +579,11 @@ static bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, { if ( bSameMask ) aStr = ImplPatternReformat( aStr.toString(), rEditMask, rLiteralMask, nFormatFlags ); - rbInKeyInput = sal_True; + rbInKeyInput = true; pEdit->SetText( aStr.toString(), Selection( nNewPos ) ); pEdit->SetModifyFlag(); pEdit->Modify(); - rbInKeyInput = sal_False; + rbInKeyInput = false; } else pEdit->SetSelection( Selection( nNewPos ) ); @@ -704,12 +704,12 @@ static bool ImplPatternProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, if ( !bError ) { - rbInKeyInput = sal_True; + rbInKeyInput = true; Selection aNewSel( ImplPatternRightPos( aStr.toString(), rEditMask, nFormatFlags, bSameMask, nNewPos ) ); pEdit->SetText( aStr.toString(), aNewSel ); pEdit->SetModifyFlag(); pEdit->Modify(); - rbInKeyInput = sal_False; + rbInKeyInput = false; } } @@ -772,7 +772,7 @@ PatternFormatter::PatternFormatter() { mnFormatFlags = 0; mbSameMask = true; - mbInPattKeyInput = sal_False; + mbInPattKeyInput = false; } PatternFormatter::~PatternFormatter() @@ -792,7 +792,7 @@ void PatternFormatter::SetString( const OUString& rStr ) if ( GetField() ) { GetField()->SetText( rStr ); - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); } } @@ -810,7 +810,7 @@ void PatternFormatter::Reformat() { ImplSetText( ImplPatternReformat( GetField()->GetText(), m_aEditMask, maLiteralMask, mnFormatFlags ) ); if ( !mbSameMask && IsStrictFormat() && !GetField()->IsReadOnly() ) - GetField()->SetInsertMode( sal_False ); + GetField()->SetInsertMode( false ); } } @@ -841,7 +841,7 @@ bool PatternField::PreNotify( NotifyEvent& rNEvt ) bool PatternField::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); else if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) ) @@ -858,7 +858,7 @@ void PatternField::Modify() if ( IsStrictFormat() ) ImplPatternProcessStrictModify( GetField(), GetEditMask(), GetLiteralMask(), GetFormatFlags(), ImplIsSameMask() ); else - MarkToBeReformatted( sal_True ); + MarkToBeReformatted( true ); } SpinField::Modify(); @@ -891,7 +891,7 @@ bool PatternBox::PreNotify( NotifyEvent& rNEvt ) bool PatternBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); else if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) ) @@ -908,7 +908,7 @@ void PatternBox::Modify() if ( IsStrictFormat() ) ImplPatternProcessStrictModify( GetField(), GetEditMask(), GetLiteralMask(), GetFormatFlags(), ImplIsSameMask() ); else - MarkToBeReformatted( sal_True ); + MarkToBeReformatted( true ); } ComboBox::Modify(); @@ -917,7 +917,7 @@ void PatternBox::Modify() void PatternBox::ReformatAll() { OUString aStr; - SetUpdateMode( sal_False ); + SetUpdateMode( false ); sal_uInt16 nEntryCount = GetEntryCount(); for ( sal_uInt16 i=0; i < nEntryCount; i++ ) { @@ -926,7 +926,7 @@ void PatternBox::ReformatAll() InsertEntry( aStr, i ); } PatternFormatter::Reformat(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } static ExtDateFieldFormat ImplGetExtFormat( DateFormat eOld ) @@ -1111,11 +1111,11 @@ static bool ImplDateGetValue( const OUString& rStr, Date& rDate, ExtDateFieldFor return false; } -sal_Bool DateFormatter::ImplDateReformat( const OUString& rStr, OUString& rOutStr, const AllSettings& rSettings ) +bool DateFormatter::ImplDateReformat( const OUString& rStr, OUString& rOutStr, const AllSettings& rSettings ) { Date aDate( 0, 0, 0 ); - if ( !ImplDateGetValue( rStr, aDate, GetExtDateFormat(sal_True), ImplGetLocaleDataWrapper(), GetCalendarWrapper(), GetFieldSettings() ) ) - return sal_True; + if ( !ImplDateGetValue( rStr, aDate, GetExtDateFormat(true), ImplGetLocaleDataWrapper(), GetCalendarWrapper(), GetFieldSettings() ) ) + return true; Date aTempDate = aDate; if ( aTempDate > GetMax() ) @@ -1129,7 +1129,7 @@ sal_Bool DateFormatter::ImplDateReformat( const OUString& rStr, OUString& rOutSt if( !GetErrorHdl().Call( this ) ) { maCorrectedDate = Date( Date::SYSTEM ); - return sal_False; + return false; } else maCorrectedDate = Date( Date::SYSTEM ); @@ -1137,7 +1137,7 @@ sal_Bool DateFormatter::ImplDateReformat( const OUString& rStr, OUString& rOutSt rOutStr = ImplGetDateAsText( aTempDate, rSettings ); - return sal_True; + return true; } OUString DateFormatter::ImplGetDateAsText( const Date& rDate, @@ -1176,7 +1176,7 @@ OUString DateFormatter::ImplGetDateAsText( const Date& rDate, sal_Unicode aBuf[128]; sal_Unicode* pBuf = aBuf; - OUString aDateSep = ImplGetDateSep( ImplGetLocaleDataWrapper(), GetExtDateFormat( sal_True ) ); + OUString aDateSep = ImplGetDateSep( ImplGetLocaleDataWrapper(), GetExtDateFormat( true ) ); sal_uInt16 nDay = rDate.GetDay(); sal_uInt16 nMonth = rDate.GetMonth(); sal_uInt16 nYear = rDate.GetYear(); @@ -1185,7 +1185,7 @@ OUString DateFormatter::ImplGetDateAsText( const Date& rDate, if ( !bShowCentury ) nYear %= 100; - switch ( GetExtDateFormat( sal_True ) ) + switch ( GetExtDateFormat( true ) ) { case XTDATEF_SYSTEM_LONG: { @@ -1232,7 +1232,7 @@ OUString DateFormatter::ImplGetDateAsText( const Date& rDate, return OUString(aBuf, pBuf-aBuf); } -static void ImplDateIncrementDay( Date& rDate, sal_Bool bUp ) +static void ImplDateIncrementDay( Date& rDate, bool bUp ) { DateFormatter::ExpandCentury( rDate ); @@ -1248,7 +1248,7 @@ static void ImplDateIncrementDay( Date& rDate, sal_Bool bUp ) } } -static void ImplDateIncrementMonth( Date& rDate, sal_Bool bUp ) +static void ImplDateIncrementMonth( Date& rDate, bool bUp ) { DateFormatter::ExpandCentury( rDate ); @@ -1286,7 +1286,7 @@ static void ImplDateIncrementMonth( Date& rDate, sal_Bool bUp ) rDate.SetDay( nDaysInMonth ); } -static void ImplDateIncrementYear( Date& rDate, sal_Bool bUp ) +static void ImplDateIncrementYear( Date& rDate, bool bUp ) { DateFormatter::ExpandCentury( rDate ); @@ -1318,12 +1318,12 @@ static void ImplDateIncrementYear( Date& rDate, sal_Bool bUp ) } } -sal_Bool DateFormatter::ImplAllowMalformedInput() const +bool DateFormatter::ImplAllowMalformedInput() const { return !IsEnforceValidValue(); } -void DateField::ImplDateSpinArea( sal_Bool bUp ) +void DateField::ImplDateSpinArea( bool bUp ) { // increment days if all is selected if ( GetField() ) @@ -1338,7 +1338,7 @@ void DateField::ImplDateSpinArea( sal_Bool bUp ) { sal_Int8 nDateArea = 0; - ExtDateFieldFormat eFormat = GetExtDateFormat( sal_True ); + ExtDateFieldFormat eFormat = GetExtDateFormat( true ); if ( eFormat == XTDATEF_SYSTEM_LONG ) { eFormat = ImplGetExtFormat( ImplGetLocaleDataWrapper().getLongDateFormat() ); @@ -1415,8 +1415,8 @@ void DateField::ImplDateSpinArea( sal_Bool bUp ) void DateFormatter::ImplInit() { - mbLongFormat = sal_False; - mbShowDateCentury = sal_True; + mbLongFormat = false; + mbShowDateCentury = true; mpCalendarWrapper = NULL; mnDateFormat = 0xFFFF; mnExtDateFormat = XTDATEF_SYSTEM_SHORT; @@ -1428,7 +1428,7 @@ DateFormatter::DateFormatter() : maMin( 1, 1, 1900 ), maMax( 31, 12, 2200 ), maCorrectedDate( Date::SYSTEM ), - mbEnforceValidValue( sal_True ) + mbEnforceValidValue( true ) { ImplInit(); } @@ -1451,10 +1451,10 @@ void DateFormatter::ImplLoadRes( const ResId& rResId ) pMgr->Increment( pMgr->GetObjSize( (RSHEADER_TYPE*)pMgr->GetClass() ) ); } if ( DATEFORMATTER_LONGFORMAT & nMask ) - mbLongFormat = (sal_Bool)pMgr->ReadShort(); + mbLongFormat = pMgr->ReadShort() != 0; if ( DATEFORMATTER_STRICTFORMAT & nMask ) - SetStrictFormat( (sal_Bool)pMgr->ReadShort() ); + SetStrictFormat( pMgr->ReadShort() != 0 ); if ( DATEFORMATTER_VALUE & nMask ) { @@ -1499,7 +1499,7 @@ void DateFormatter::SetExtDateFormat( ExtDateFieldFormat eFormat ) ReformatAll(); } -ExtDateFieldFormat DateFormatter::GetExtDateFormat( sal_Bool bResolveSystemFormat ) const +ExtDateFieldFormat DateFormatter::GetExtDateFormat( bool bResolveSystemFormat ) const { ExtDateFieldFormat eDateFormat = (ExtDateFieldFormat)mnExtDateFormat; @@ -1539,7 +1539,7 @@ void DateFormatter::SetMax( const Date& rNewMax ) ReformatAll(); } -void DateFormatter::SetLongFormat( sal_Bool bLong ) +void DateFormatter::SetLongFormat( bool bLong ) { mbLongFormat = bLong; @@ -1557,7 +1557,7 @@ void DateFormatter::SetLongFormat( sal_Bool bLong ) ReformatAll(); } -void DateFormatter::SetShowDateCentury( sal_Bool bShowDateCentury ) +void DateFormatter::SetShowDateCentury( bool bShowDateCentury ) { mbShowDateCentury = bShowDateCentury; @@ -1664,7 +1664,7 @@ Date DateFormatter::GetDate() const if ( GetField() ) { - if ( ImplDateGetValue( GetField()->GetText(), aDate, GetExtDateFormat(sal_True), ImplGetLocaleDataWrapper(), GetCalendarWrapper(), GetFieldSettings() ) ) + if ( ImplDateGetValue( GetField()->GetText(), aDate, GetExtDateFormat(true), ImplGetLocaleDataWrapper(), GetCalendarWrapper(), GetFieldSettings() ) ) { if ( aDate > maMax ) aDate = maMax; @@ -1696,20 +1696,20 @@ void DateFormatter::SetEmptyDate() FormatterBase::SetEmptyFieldValue(); } -sal_Bool DateFormatter::IsEmptyDate() const +bool DateFormatter::IsEmptyDate() const { - sal_Bool bEmpty = FormatterBase::IsEmptyFieldValue(); + bool bEmpty = FormatterBase::IsEmptyFieldValue(); if ( GetField() && MustBeReformatted() && IsEmptyFieldValueEnabled() ) { if ( GetField()->GetText().isEmpty() ) { - bEmpty = sal_True; + bEmpty = true; } else if ( !maLastDate.GetDate() ) { Date aDate( Date::EMPTY ); - bEmpty = !ImplDateGetValue( GetField()->GetText(), aDate, GetExtDateFormat(sal_True), ImplGetLocaleDataWrapper(), GetCalendarWrapper(), GetFieldSettings() ); + bEmpty = !ImplDateGetValue( GetField()->GetText(), aDate, GetExtDateFormat(true), ImplGetLocaleDataWrapper(), GetCalendarWrapper(), GetFieldSettings() ); } } return bEmpty; @@ -1724,14 +1724,14 @@ void DateFormatter::Reformat() return; OUString aStr; - sal_Bool bOK = ImplDateReformat( GetField()->GetText(), aStr, GetFieldSettings() ); + bool bOK = ImplDateReformat( GetField()->GetText(), aStr, GetFieldSettings() ); if( !bOK ) return; if ( !aStr.isEmpty() ) { ImplSetText( aStr ); - ImplDateGetValue( aStr, maLastDate, GetExtDateFormat(sal_True), ImplGetLocaleDataWrapper(), GetCalendarWrapper(), GetFieldSettings() ); + ImplDateGetValue( aStr, maLastDate, GetExtDateFormat(true), ImplGetLocaleDataWrapper(), GetCalendarWrapper(), GetFieldSettings() ); } else { @@ -1742,7 +1742,7 @@ void DateFormatter::Reformat() else { ImplSetText( OUString() ); - SetEmptyFieldValueData( sal_True ); + SetEmptyFieldValueData( true ); } } } @@ -1828,7 +1828,7 @@ bool DateField::PreNotify( NotifyEvent& rNEvt ) ( GetExtDateFormat() != XTDATEF_SYSTEM_LONG ) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { - if ( ImplDateProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), GetExtDateFormat( sal_True ), ImplGetLocaleDataWrapper() ) ) + if ( ImplDateProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), GetExtDateFormat( true ), ImplGetLocaleDataWrapper() ) ) return true; } @@ -1838,7 +1838,7 @@ bool DateField::PreNotify( NotifyEvent& rNEvt ) bool DateField::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); else if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { if ( MustBeReformatted() ) @@ -1854,7 +1854,7 @@ bool DateField::Notify( NotifyEvent& rNEvt ) else { Date aDate( 0, 0, 0 ); - if ( ImplDateGetValue( GetText(), aDate, GetExtDateFormat(sal_True), ImplGetLocaleDataWrapper(), GetCalendarWrapper(), GetFieldSettings() ) ) + if ( ImplDateGetValue( GetText(), aDate, GetExtDateFormat(true), ImplGetLocaleDataWrapper(), GetCalendarWrapper(), GetFieldSettings() ) ) // even with strict text analysis, our text is a valid date -> do a complete // reformat Reformat(); @@ -1863,7 +1863,7 @@ bool DateField::Notify( NotifyEvent& rNEvt ) else if ( !bTextLen && IsEmptyFieldValueEnabled() ) { ResetLastDate(); - SetEmptyFieldValueData( sal_True ); + SetEmptyFieldValueData( true ); } } } @@ -1885,19 +1885,19 @@ void DateField::DataChanged( const DataChangedEvent& rDCEvt ) void DateField::Modify() { - MarkToBeReformatted( sal_True ); + MarkToBeReformatted( true ); SpinField::Modify(); } void DateField::Up() { - ImplDateSpinArea( sal_True ); + ImplDateSpinArea( true ); SpinField::Up(); } void DateField::Down() { - ImplDateSpinArea( sal_False ); + ImplDateSpinArea( false ); SpinField::Down(); } @@ -1931,7 +1931,7 @@ bool DateBox::PreNotify( NotifyEvent& rNEvt ) ( GetExtDateFormat() != XTDATEF_SYSTEM_LONG ) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { - if ( ImplDateProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), GetExtDateFormat( sal_True ), ImplGetLocaleDataWrapper() ) ) + if ( ImplDateProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), GetExtDateFormat( true ), ImplGetLocaleDataWrapper() ) ) return true; } @@ -1953,7 +1953,7 @@ void DateBox::DataChanged( const DataChangedEvent& rDCEvt ) bool DateBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); else if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { if ( MustBeReformatted() ) @@ -1964,7 +1964,7 @@ bool DateBox::Notify( NotifyEvent& rNEvt ) else if ( !bTextLen && IsEmptyFieldValueEnabled() ) { ResetLastDate(); - SetEmptyFieldValueData( sal_True ); + SetEmptyFieldValueData( true ); } } } @@ -1974,14 +1974,14 @@ bool DateBox::Notify( NotifyEvent& rNEvt ) void DateBox::Modify() { - MarkToBeReformatted( sal_True ); + MarkToBeReformatted( true ); ComboBox::Modify(); } void DateBox::ReformatAll() { OUString aStr; - SetUpdateMode( sal_False ); + SetUpdateMode( false ); sal_uInt16 nEntryCount = GetEntryCount(); for ( sal_uInt16 i=0; i < nEntryCount; i++ ) { @@ -1990,11 +1990,11 @@ void DateBox::ReformatAll() InsertEntry( aStr, i ); } DateFormatter::Reformat(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } static bool ImplTimeProcessKeyInput( Edit*, const KeyEvent& rKEvt, - sal_Bool bStrictFormat, sal_Bool bDuration, + bool bStrictFormat, bool bDuration, TimeFieldFormat eFormat, const LocaleDataWrapper& rLocaleDataWrapper ) { @@ -2033,7 +2033,7 @@ static bool ImplIsOnlyDigits( const OUStringBuffer& _rStr ) return true; } -static bool ImplIsValidTimePortion( sal_Bool _bSkipInvalidCharacters, const OUStringBuffer& _rStr ) +static bool ImplIsValidTimePortion( bool _bSkipInvalidCharacters, const OUStringBuffer& _rStr ) { if ( !_bSkipInvalidCharacters ) { @@ -2043,7 +2043,7 @@ static bool ImplIsValidTimePortion( sal_Bool _bSkipInvalidCharacters, const OUSt return true; } -static bool ImplCutTimePortion( OUStringBuffer& _rStr, sal_Int32 _nSepPos, sal_Bool _bSkipInvalidCharacters, short* _pPortion ) +static bool ImplCutTimePortion( OUStringBuffer& _rStr, sal_Int32 _nSepPos, bool _bSkipInvalidCharacters, short* _pPortion ) { OUString sPortion(_rStr.getStr(), _nSepPos ); _rStr = _nSepPos < _rStr.getLength() @@ -2056,8 +2056,8 @@ static bool ImplCutTimePortion( OUStringBuffer& _rStr, sal_Int32 _nSepPos, sal_B } static bool ImplTimeGetValue( const OUString& rStr, Time& rTime, - TimeFieldFormat eFormat, sal_Bool bDuration, - const LocaleDataWrapper& rLocaleDataWrapper, sal_Bool _bSkipInvalidCharacters = sal_True ) + TimeFieldFormat eFormat, bool bDuration, + const LocaleDataWrapper& rLocaleDataWrapper, bool _bSkipInvalidCharacters = true ) { OUStringBuffer aStr = rStr; short nHour = 0; @@ -2251,11 +2251,11 @@ static bool ImplTimeGetValue( const OUString& rStr, Time& rTime, return true; } -sal_Bool TimeFormatter::ImplTimeReformat( const OUString& rStr, OUString& rOutStr ) +bool TimeFormatter::ImplTimeReformat( const OUString& rStr, OUString& rOutStr ) { Time aTime( 0, 0, 0 ); if ( !ImplTimeGetValue( rStr, aTime, GetFormat(), IsDuration(), ImplGetLocaleDataWrapper() ) ) - return sal_True; + return true; Time aTempTime = aTime; if ( aTempTime > GetMax() ) @@ -2269,18 +2269,18 @@ sal_Bool TimeFormatter::ImplTimeReformat( const OUString& rStr, OUString& rOutSt if ( !GetErrorHdl().Call( this ) ) { maCorrectedTime = Time( Time::SYSTEM ); - return sal_False; + return false; } else maCorrectedTime = Time( Time::SYSTEM ); } - sal_Bool bSecond = sal_False; - sal_Bool b100Sec = sal_False; + bool bSecond = false; + bool b100Sec = false; if ( meFormat != TIMEF_NONE ) - bSecond = sal_True; + bSecond = true; if ( meFormat == TIMEF_100TH_SEC ) - b100Sec = sal_True; + b100Sec = true; if ( meFormat == TIMEF_SEC_CS ) { @@ -2316,14 +2316,14 @@ sal_Bool TimeFormatter::ImplTimeReformat( const OUString& rStr, OUString& rOutSt } } - return sal_True; + return true; } -sal_Bool TimeFormatter::ImplAllowMalformedInput() const +bool TimeFormatter::ImplAllowMalformedInput() const { return !IsEnforceValidValue(); } -void TimeField::ImplTimeSpinArea( sal_Bool bUp ) +void TimeField::ImplTimeSpinArea( bool bUp ) { if ( GetField() ) { @@ -2399,7 +2399,7 @@ void TimeField::ImplTimeSpinArea( sal_Bool bUp ) void TimeFormatter::ImplInit() { meFormat = TIMEF_NONE; - mbDuration = sal_False; + mbDuration = false; mnTimeFormat = HOUR_24; // Should become a ExtTimeFieldFormat in next implementation, merge with mbDuration and meFormat } @@ -2408,7 +2408,7 @@ TimeFormatter::TimeFormatter() : maMin( 0, 0 ), maMax( 23, 59, 59, 999999999 ), maCorrectedTime( Time::SYSTEM ), - mbEnforceValidValue( sal_True ), + mbEnforceValidValue( true ), maFieldTime( 0, 0 ) { ImplInit(); @@ -2437,10 +2437,10 @@ void TimeFormatter::ImplLoadRes( const ResId& rResId ) meFormat = (TimeFieldFormat)pMgr->ReadLong(); if ( TIMEFORMATTER_DURATION & nMask ) - mbDuration = (sal_Bool)pMgr->ReadShort(); + mbDuration = pMgr->ReadShort() != 0; if ( TIMEFORMATTER_STRICTFORMAT & nMask ) - SetStrictFormat( (sal_Bool)pMgr->ReadShort() ); + SetStrictFormat( pMgr->ReadShort() != 0 ); if ( TIMEFORMATTER_VALUE & nMask ) { @@ -2495,7 +2495,7 @@ void TimeFormatter::SetFormat( TimeFieldFormat eNewFormat ) ReformatAll(); } -void TimeFormatter::SetDuration( sal_Bool bNewDuration ) +void TimeFormatter::SetDuration( bool bNewDuration ) { mbDuration = bNewDuration; ReformatAll(); @@ -2505,7 +2505,7 @@ void TimeFormatter::SetTime( const Time& rNewTime ) { SetUserTime( rNewTime ); maFieldTime = maLastTime; - SetEmptyFieldValueData( sal_False ); + SetEmptyFieldValueData( false ); } void TimeFormatter::ImplNewFieldValue( const Time& rTime ) @@ -2549,12 +2549,12 @@ void TimeFormatter::ImplSetUserTime( const Time& rNewTime, Selection* pNewSelect if ( GetField() ) { OUString aStr; - sal_Bool bSec = sal_False; - sal_Bool b100Sec = sal_False; + bool bSec = false; + bool b100Sec = false; if ( meFormat != TIMEF_NONE ) - bSec = sal_True; + bSec = true; if ( meFormat == TIMEF_100TH_SEC || meFormat == TIMEF_SEC_CS ) - b100Sec = sal_True; + b100Sec = true; if ( meFormat == TIMEF_SEC_CS ) { sal_uLong n = aNewTime.GetHour() * 3600L; @@ -2606,7 +2606,7 @@ Time TimeFormatter::GetTime() const if ( GetField() ) { - sal_Bool bAllowMailformed = ImplAllowMalformedInput(); + bool bAllowMailformed = ImplAllowMalformedInput(); if ( ImplTimeGetValue( GetField()->GetText(), aTime, GetFormat(), IsDuration(), ImplGetLocaleDataWrapper(), !bAllowMailformed ) ) { if ( aTime > GetMax() ) @@ -2635,7 +2635,7 @@ void TimeFormatter::Reformat() return; OUString aStr; - sal_Bool bOK = ImplTimeReformat( GetField()->GetText(), aStr ); + bool bOK = ImplTimeReformat( GetField()->GetText(), aStr ); if ( !bOK ) return; @@ -2717,7 +2717,7 @@ bool TimeField::PreNotify( NotifyEvent& rNEvt ) bool TimeField::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); else if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) ) @@ -2727,7 +2727,7 @@ bool TimeField::Notify( NotifyEvent& rNEvt ) else { Time aTime( 0, 0, 0 ); - if ( ImplTimeGetValue( GetText(), aTime, GetFormat(), IsDuration(), ImplGetLocaleDataWrapper(), sal_False ) ) + if ( ImplTimeGetValue( GetText(), aTime, GetFormat(), IsDuration(), ImplGetLocaleDataWrapper(), false ) ) // even with strict text analysis, our text is a valid time -> do a complete // reformat Reformat(); @@ -2752,19 +2752,19 @@ void TimeField::DataChanged( const DataChangedEvent& rDCEvt ) void TimeField::Modify() { - MarkToBeReformatted( sal_True ); + MarkToBeReformatted( true ); SpinField::Modify(); } void TimeField::Up() { - ImplTimeSpinArea( sal_True ); + ImplTimeSpinArea( true ); SpinField::Up(); } void TimeField::Down() { - ImplTimeSpinArea( sal_False ); + ImplTimeSpinArea( false ); SpinField::Down(); } @@ -2787,40 +2787,40 @@ void TimeField::SetExtFormat( ExtTimeFieldFormat eFormat ) case EXTTIMEF_24H_SHORT: { SetTimeFormat( HOUR_24 ); - SetDuration( sal_False ); + SetDuration( false ); SetFormat( TIMEF_NONE ); } break; case EXTTIMEF_24H_LONG: { SetTimeFormat( HOUR_24 ); - SetDuration( sal_False ); + SetDuration( false ); SetFormat( TIMEF_SEC ); } break; case EXTTIMEF_12H_SHORT: { SetTimeFormat( HOUR_12 ); - SetDuration( sal_False ); + SetDuration( false ); SetFormat( TIMEF_NONE ); } break; case EXTTIMEF_12H_LONG: { SetTimeFormat( HOUR_12 ); - SetDuration( sal_False ); + SetDuration( false ); SetFormat( TIMEF_SEC ); } break; case EXTTIMEF_DURATION_SHORT: { - SetDuration( sal_True ); + SetDuration( true ); SetFormat( TIMEF_NONE ); } break; case EXTTIMEF_DURATION_LONG: { - SetDuration( sal_True ); + SetDuration( true ); SetFormat( TIMEF_SEC ); } break; @@ -2858,7 +2858,7 @@ bool TimeBox::PreNotify( NotifyEvent& rNEvt ) bool TimeBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); else if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) ) @@ -2882,14 +2882,14 @@ void TimeBox::DataChanged( const DataChangedEvent& rDCEvt ) void TimeBox::Modify() { - MarkToBeReformatted( sal_True ); + MarkToBeReformatted( true ); ComboBox::Modify(); } void TimeBox::ReformatAll() { OUString aStr; - SetUpdateMode( sal_False ); + SetUpdateMode( false ); sal_uInt16 nEntryCount = GetEntryCount(); for ( sal_uInt16 i=0; i < nEntryCount; i++ ) { @@ -2898,7 +2898,7 @@ void TimeBox::ReformatAll() InsertEntry( aStr, i ); } TimeFormatter::Reformat(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 7020ab79cf12..fe988dd0637c 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -91,7 +91,7 @@ void FixedText::ImplInit( Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); Control::ImplInit( pParent, nStyle, NULL ); - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); } // ----------------------------------------------------------------------- @@ -118,8 +118,8 @@ const Color& FixedText::GetCanonicalTextColor( const StyleSettings& _rStyle ) co // ----------------------------------------------------------------------- -void FixedText::ImplInitSettings( sal_Bool bFont, - sal_Bool bForeground, sal_Bool bBackground ) +void FixedText::ImplInitSettings( bool bFont, + bool bForeground, bool bBackground ) { Control::ImplInitSettings( bFont, bForeground ); @@ -128,16 +128,16 @@ void FixedText::ImplInitSettings( sal_Bool bFont, Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); SetBackground(); } else { - EnableChildTransparentMode( sal_False ); + EnableChildTransparentMode( false ); SetParentClipMode( 0 ); - SetPaintTransparent( sal_False ); + SetPaintTransparent( false ); if ( IsControlBackground() ) SetBackground( GetControlBackground() ); @@ -268,7 +268,7 @@ void FixedText::Paint( const Rectangle& ) void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); @@ -330,24 +330,24 @@ void FixedText::StateChanged( StateChangedType nType ) if ( (GetPrevStyle() & FIXEDTEXT_VIEW_STYLE) != (GetStyle() & FIXEDTEXT_VIEW_STYLE) ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); Invalidate(); } } else if ( (nType == STATE_CHANGE_ZOOM) || (nType == STATE_CHANGE_CONTROLFONT) ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); Invalidate(); } } @@ -363,7 +363,7 @@ void FixedText::DataChanged( const DataChangedEvent& rDCEvt ) ((rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) { - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); Invalidate(); } } @@ -511,7 +511,7 @@ SelectableFixedText::SelectableFixedText(Window* pParent, WinBits nStyle) // make it transparent SetControlBackground(); SetBackground(); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); } // ----------------------------------------------------------------------- @@ -529,7 +529,7 @@ void FixedLine::ImplInit( Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); Control::ImplInit( pParent, nStyle, NULL ); - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); } // ----------------------------------------------------------------------- @@ -556,8 +556,8 @@ const Color& FixedLine::GetCanonicalTextColor( const StyleSettings& _rStyle ) co // ----------------------------------------------------------------------- -void FixedLine::ImplInitSettings( sal_Bool bFont, - sal_Bool bForeground, sal_Bool bBackground ) +void FixedLine::ImplInitSettings( bool bFont, + bool bForeground, bool bBackground ) { Control::ImplInitSettings( bFont, bForeground ); @@ -566,16 +566,16 @@ void FixedLine::ImplInitSettings( sal_Bool bFont, Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); SetBackground(); } else { - EnableChildTransparentMode( sal_False ); + EnableChildTransparentMode( false ); SetParentClipMode( 0 ); - SetPaintTransparent( sal_False ); + SetPaintTransparent( false ); if ( IsControlBackground() ) SetBackground( GetControlBackground() ); @@ -737,17 +737,17 @@ void FixedLine::StateChanged( StateChangedType nType ) (nType == STATE_CHANGE_STYLE) || (nType == STATE_CHANGE_CONTROLFONT) ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); Invalidate(); } } @@ -763,7 +763,7 @@ void FixedLine::DataChanged( const DataChangedEvent& rDCEvt ) ((rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) { - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); Invalidate(); } } @@ -800,16 +800,16 @@ void FixedBitmap::ImplInitSettings() Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); SetBackground(); } else { - EnableChildTransparentMode( sal_False ); + EnableChildTransparentMode( false ); SetParentClipMode( 0 ); - SetPaintTransparent( sal_False ); + SetPaintTransparent( false ); if ( IsControlBackground() ) SetBackground( GetControlBackground() ); @@ -974,7 +974,7 @@ void FixedBitmap::SetBitmap( const Bitmap& rBitmap ) void FixedImage::ImplInit( Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); - mbInUserDraw = sal_False; + mbInUserDraw = false; Control::ImplInit( pParent, nStyle, NULL ); ImplInitSettings(); } @@ -995,16 +995,16 @@ void FixedImage::ImplInitSettings() Window* pParent = GetParent(); if ( pParent && pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); SetBackground(); } else { - EnableChildTransparentMode( sal_False ); + EnableChildTransparentMode( false ); SetParentClipMode( 0 ); - SetPaintTransparent( sal_False ); + SetPaintTransparent( false ); if ( IsControlBackground() ) SetBackground( GetControlBackground() ); @@ -1082,10 +1082,10 @@ void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, } } - mbInUserDraw = sal_True; + mbInUserDraw = true; UserDrawEvent aUDEvt( pDev, Rectangle( rPos, rSize ), 0, nStyle ); UserDraw( aUDEvt ); - mbInUserDraw = sal_False; + mbInUserDraw = false; } // ----------------------------------------------------------------------- @@ -1194,10 +1194,10 @@ void FixedImage::SetImage( const Image& rImage ) // ----------------------------------------------------------------------- -sal_Bool FixedImage::SetModeImage( const Image& rImage ) +bool FixedImage::SetModeImage( const Image& rImage ) { SetImage( rImage ); - return sal_True; + return true; } // ----------------------------------------------------------------------- diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index 3cd6c3d54721..8e1ef5bf1f51 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -39,8 +39,8 @@ void GroupBox::ImplInit( Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); Control::ImplInit( pParent, nStyle, NULL ); - SetMouseTransparent( sal_True ); - ImplInitSettings( sal_True, sal_True, sal_True ); + SetMouseTransparent( true ); + ImplInitSettings( true, true, true ); } // ----------------------------------------------------------------------- @@ -67,8 +67,8 @@ const Color& GroupBox::GetCanonicalTextColor( const StyleSettings& _rStyle ) con // ----------------------------------------------------------------------- -void GroupBox::ImplInitSettings( sal_Bool bFont, - sal_Bool bForeground, sal_Bool bBackground ) +void GroupBox::ImplInitSettings( bool bFont, + bool bForeground, bool bBackground ) { Control::ImplInitSettings( bFont, bForeground ); @@ -79,16 +79,16 @@ void GroupBox::ImplInitSettings( sal_Bool bFont, !(pParent->GetStyle() & WB_CLIPCHILDREN) ) && !IsControlBackground() ) { - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); SetBackground(); } else { - EnableChildTransparentMode( sal_False ); + EnableChildTransparentMode( false ); SetParentClipMode( 0 ); - SetPaintTransparent( sal_False ); + SetPaintTransparent( false ); if ( IsControlBackground() ) SetBackground( GetControlBackground() ); @@ -280,17 +280,17 @@ void GroupBox::StateChanged( StateChangedType nType ) else if ( (nType == STATE_CHANGE_ZOOM) || (nType == STATE_CHANGE_CONTROLFONT) ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); Invalidate(); } } @@ -306,7 +306,7 @@ void GroupBox::DataChanged( const DataChangedEvent& rDCEvt ) ((rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) { - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); Invalidate(); } } diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index a3b69126677f..9d1b2f60cabf 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star; // ======================================================================= -void ImplInitFieldSettings( Window* pWin, sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) +void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = pWin->GetSettings().GetStyleSettings(); @@ -98,7 +98,7 @@ ImplEntryList::ImplEntryList( Window* pWindow ) mnLastSelected = LISTBOX_ENTRY_NOTFOUND; mnSelectionAnchor = LISTBOX_ENTRY_NOTFOUND; mnImages = 0; - mbCallSelectionChangedHdl = sal_True; + mbCallSelectionChangedHdl = true; mnMRUCount = 0; mnMaxMRUCount = 0; @@ -121,7 +121,7 @@ void ImplEntryList::Clear() // ----------------------------------------------------------------------- -void ImplEntryList::SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ) +void ImplEntryList::SelectEntry( sal_uInt16 nPos, bool bSelect ) { if (nPos < maEntries.size()) { @@ -151,7 +151,7 @@ namespace }; } -sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry, sal_Bool bSort ) +sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry, bool bSort ) { if ( !!pNewEntry->maImage ) mnImages++; @@ -266,7 +266,7 @@ void ImplEntryList::RemoveEntry( sal_uInt16 nPos ) // ----------------------------------------------------------------------- -sal_uInt16 ImplEntryList::FindEntry( const OUString& rString, sal_Bool bSearchMRUArea ) const +sal_uInt16 ImplEntryList::FindEntry( const OUString& rString, bool bSearchMRUArea ) const { sal_uInt16 nEntries = maEntries.size(); for ( sal_uInt16 n = bSearchMRUArea ? 0 : GetMRUCount(); n < nEntries; n++ ) @@ -280,7 +280,7 @@ sal_uInt16 ImplEntryList::FindEntry( const OUString& rString, sal_Bool bSearchMR // ----------------------------------------------------------------------- -sal_uInt16 ImplEntryList::FindMatchingEntry( const OUString& rStr, sal_uInt16 nStart, sal_Bool bForward, sal_Bool bLazy ) const +sal_uInt16 ImplEntryList::FindMatchingEntry( const OUString& rStr, sal_uInt16 nStart, bool bForward, bool bLazy ) const { sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND; sal_uInt16 nEntryCount = GetEntryCount(); @@ -297,7 +297,7 @@ sal_uInt16 ImplEntryList::FindMatchingEntry( const OUString& rStr, sal_uInt16 nS bool bMatch; if ( bLazy ) { - bMatch = rI18nHelper.MatchString( rStr, pImplEntry->maStr ) != 0; + bMatch = rI18nHelper.MatchString( rStr, pImplEntry->maStr ); } else { @@ -382,9 +382,9 @@ OUString ImplEntryList::GetEntryText( sal_uInt16 nPos ) const // ----------------------------------------------------------------------- -sal_Bool ImplEntryList::HasEntryImage( sal_uInt16 nPos ) const +bool ImplEntryList::HasEntryImage( sal_uInt16 nPos ) const { - sal_Bool bImage = sal_False; + bool bImage = false; ImplEntryType* pImplEntry = GetEntry( nPos ); if ( pImplEntry ) bImage = !!pImplEntry->maImage; @@ -484,7 +484,7 @@ sal_uInt16 ImplEntryList::GetSelectEntryPos( sal_uInt16 nIndex ) const // ----------------------------------------------------------------------- -sal_Bool ImplEntryList::IsEntryPosSelected( sal_uInt16 nIndex ) const +bool ImplEntryList::IsEntryPosSelected( sal_uInt16 nIndex ) const { ImplEntryType* pImplEntry = GetEntry( nIndex ); return pImplEntry ? pImplEntry->mbIsSelected : sal_False; @@ -570,7 +570,7 @@ ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) : SetTextFillColor(); SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetFieldColor() ) ); - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); ImplCalcMetrics(); } @@ -583,7 +583,7 @@ ImplListBoxWindow::~ImplListBoxWindow() // ----------------------------------------------------------------------- -void ImplListBoxWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) +void ImplListBoxWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { ImplInitFieldSettings( this, bFont, bForeground, bBackground ); } @@ -761,16 +761,16 @@ void ImplListBoxWindow::ImplCallSelect() sal_uInt16 nSelected = GetEntryList()->GetSelectEntryPos( 0 ); sal_uInt16 nMRUCount = GetEntryList()->GetMRUCount(); OUString aSelected = GetEntryList()->GetEntryText( nSelected ); - sal_uInt16 nFirstMatchingEntryPos = GetEntryList()->FindEntry( aSelected, sal_True ); + sal_uInt16 nFirstMatchingEntryPos = GetEntryList()->FindEntry( aSelected, true ); if ( nFirstMatchingEntryPos || !nMRUCount ) { - sal_Bool bSelectNewEntry = sal_False; + bool bSelectNewEntry = false; if ( nFirstMatchingEntryPos < nMRUCount ) { RemoveEntry( nFirstMatchingEntryPos ); nMRUCount--; if ( nFirstMatchingEntryPos == nSelected ) - bSelectNewEntry = sal_True; + bSelectNewEntry = true; } else if ( nMRUCount == GetEntryList()->GetMaxMRUCount() ) { @@ -782,7 +782,7 @@ void ImplListBoxWindow::ImplCallSelect() ImplEntryType* pNewEntry = new ImplEntryType( aSelected ); pNewEntry->mbIsSelected = bSelectNewEntry; - GetEntryList()->InsertEntry( 0, pNewEntry, sal_False ); + GetEntryList()->InsertEntry( 0, pNewEntry, false ); ImplUpdateEntryMetrics( *pNewEntry ); GetEntryList()->SetMRUCount( ++nMRUCount ); SetSeparatorPos( nMRUCount ? nMRUCount-1 : 0 ); @@ -872,16 +872,16 @@ sal_uInt16 ImplListBoxWindow::GetEntryPosForPoint( const Point& rPoint ) const // ----------------------------------------------------------------------- -sal_Bool ImplListBoxWindow::IsVisible( sal_uInt16 i_nEntry ) const +bool ImplListBoxWindow::IsVisible( sal_uInt16 i_nEntry ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( i_nEntry >= mnTop ) { if( mpEntryList->GetAddedHeight( i_nEntry, mnTop ) < PixelToLogic( GetSizePixel() ).Height() ) { - bRet = sal_True; + bRet = true; } } @@ -929,7 +929,7 @@ void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt ) mnCurrentPos = nSelect; mbTrackingSelect = true; - sal_Bool bCurPosChange = (mnCurrentPos != nSelect); + bool bCurPosChange = (mnCurrentPos != nSelect); SelectEntries( nSelect, LET_MBDOWN, rMEvt.IsShift(), rMEvt.IsMod1() ,bCurPosChange); mbTrackingSelect = false; if ( mbGrabFocus ) @@ -992,7 +992,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) ( ( nSelect != mnCurrentPos ) || !GetEntryList()->GetSelectEntryCount() || ( nSelect != GetEntryList()->GetSelectEntryPos( 0 ) ) ) ) { mbTrackingSelect = true; - if ( SelectEntries( nSelect, LET_TRACKING, sal_False, sal_False ) ) + if ( SelectEntries( nSelect, LET_TRACKING, false, false ) ) { if ( mbStackMode ) // #87072# { @@ -1037,13 +1037,13 @@ void ImplListBoxWindow::DeselectAll() while ( GetEntryList()->GetSelectEntryCount() ) { sal_uInt16 nS = GetEntryList()->GetSelectEntryPos( 0 ); - SelectEntry( nS, sal_False ); + SelectEntry( nS, false ); } } // ----------------------------------------------------------------------- -void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ) +void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, bool bSelect ) { if( (mpEntryList->IsEntryPosSelected( nPos ) != bSelect) && mpEntryList->IsEntrySelectable( nPos ) ) { @@ -1057,12 +1057,12 @@ void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ) if( nDeselect != LISTBOX_ENTRY_NOTFOUND ) { //SelectEntryPos( nDeselect, sal_False ); - GetEntryList()->SelectEntry( nDeselect, sal_False ); + GetEntryList()->SelectEntry( nDeselect, false ); if ( IsUpdateMode() && IsReallyVisible() ) - ImplPaint( nDeselect, sal_True ); + ImplPaint( nDeselect, true ); } } - mpEntryList->SelectEntry( nPos, sal_True ); + mpEntryList->SelectEntry( nPos, true ); mnCurrentPos = nPos; if ( ( nPos != LISTBOX_ENTRY_NOTFOUND ) && IsUpdateMode() ) { @@ -1085,8 +1085,8 @@ void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ) } else { - mpEntryList->SelectEntry( nPos, sal_False ); - ImplPaint( nPos, sal_True ); + mpEntryList->SelectEntry( nPos, false ); + ImplPaint( nPos, true ); } mbSelectionChanged = true; } @@ -1094,10 +1094,10 @@ void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ) // ----------------------------------------------------------------------- -sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, sal_Bool bShift, sal_Bool bCtrl, sal_Bool bSelectPosChange /*=FALSE*/ ) +bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, bool bShift, bool bCtrl, bool bSelectPosChange /*=FALSE*/ ) { bool bFocusChanged = false; - sal_Bool bSelectionChanged = sal_False; + bool bSelectionChanged = false; if( IsEnabled() && mpEntryList->IsEntrySelectable( nSelect ) ) { @@ -1107,10 +1107,10 @@ sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLE sal_uInt16 nDeselect = mpEntryList->GetSelectEntryPos( 0 ); if( nSelect != nDeselect ) { - SelectEntry( nSelect, sal_True ); + SelectEntry( nSelect, true ); mpEntryList->SetLastSelected( nSelect ); bFocusChanged = true; - bSelectionChanged = sal_True; + bSelectionChanged = true; } } // MultiListBox without Modifier @@ -1119,12 +1119,12 @@ sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLE sal_uInt16 nEntryCount = mpEntryList->GetEntryCount(); for ( sal_uInt16 nPos = 0; nPos < nEntryCount; nPos++ ) { - sal_Bool bSelect = nPos == nSelect; + bool bSelect = nPos == nSelect; if ( mpEntryList->IsEntryPosSelected( nPos ) != bSelect ) { SelectEntry( nPos, bSelect ); bFocusChanged = true; - bSelectionChanged = sal_True; + bSelectionChanged = true; } } mpEntryList->SetLastSelected( nSelect ); @@ -1136,7 +1136,7 @@ sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLE // Space for selection change if( !bShift && ( ( eLET == LET_KEYSPACE ) || ( eLET == LET_MBDOWN ) ) ) { - sal_Bool bSelect = ( mbStackMode && IsMouseMoveSelect() ) ? sal_True : !mpEntryList->IsEntryPosSelected( nSelect ); + bool bSelect = ( mbStackMode && IsMouseMoveSelect() ) ? sal_True : !mpEntryList->IsEntryPosSelected( nSelect ); if ( mbStackMode ) { sal_uInt16 n; @@ -1144,12 +1144,12 @@ sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLE { // All entries before nSelect must be selected... for ( n = 0; n < nSelect; n++ ) - SelectEntry( n, sal_True ); + SelectEntry( n, true ); } if ( !bSelect ) { for ( n = nSelect+1; n < mpEntryList->GetEntryCount(); n++ ) - SelectEntry( n, sal_False ); + SelectEntry( n, false ); } } SelectEntry( nSelect, bSelect ); @@ -1158,7 +1158,7 @@ sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLE if ( !mpEntryList->IsEntryPosSelected( nSelect ) ) mpEntryList->SetSelectionAnchor( LISTBOX_ENTRY_NOTFOUND ); bFocusChanged = true; - bSelectionChanged = sal_True; + bSelectionChanged = true; } else if( ( ( eLET == LET_TRACKING ) && ( nSelect != mnCurrentPos ) ) || ( (bShift||mbStackMode) && ( ( eLET == LET_KEYMOVE ) || ( eLET == LET_MBDOWN ) ) ) ) @@ -1180,8 +1180,8 @@ sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLE { if ( !mpEntryList->IsEntryPosSelected( n ) ) { - SelectEntry( n, sal_True ); - bSelectionChanged = sal_True; + SelectEntry( n, true ); + bSelectionChanged = true; } } @@ -1195,8 +1195,8 @@ sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLE { if ( mpEntryList->IsEntryPosSelected( n ) ) { - SelectEntry( n, sal_False ); - bSelectionChanged = sal_True; + SelectEntry( n, false ); + bSelectionChanged = true; } } } @@ -1206,8 +1206,8 @@ sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLE { if ( mpEntryList->IsEntryPosSelected( n ) ) { - SelectEntry( n, sal_False ); - bSelectionChanged = sal_True; + SelectEntry( n, false ); + bSelectionChanged = true; } } } @@ -1218,7 +1218,7 @@ sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLE else if( eLET != LET_TRACKING ) { ImplHideFocusRect(); - ImplPaint( nSelect, sal_True ); + ImplPaint( nSelect, true ); bFocusChanged = true; } } @@ -1255,7 +1255,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) { Point aPoint; Rectangle aRect( aPoint, GetOutputSizePixel() ); - sal_Bool bInside = aRect.IsInside( rTEvt.GetMouseEvent().GetPosPixel() ); + bool bInside = aRect.IsInside( rTEvt.GetMouseEvent().GetPosPixel() ); if( rTEvt.IsTrackingCanceled() || rTEvt.IsTrackingEnded() ) // MouseButtonUp { @@ -1270,7 +1270,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) if ( !mbMulti ) { mbTrackingSelect = true; - SelectEntry( mnTrackingSaveSelection, sal_True ); + SelectEntry( mnTrackingSaveSelection, true ); mbTrackingSelect = false; if ( mnTrackingSaveSelection != LISTBOX_ENTRY_NOTFOUND ) { @@ -1288,7 +1288,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) } else { - sal_Bool bTrackOrQuickClick = mbTrack; + bool bTrackOrQuickClick = mbTrack; if( !mbTrack ) { if ( bInside ) @@ -1299,7 +1299,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) // this case only happens, if the mouse button is pressed very briefly if( rTEvt.IsTrackingEnded() && mbTrack ) { - bTrackOrQuickClick = sal_True; + bTrackOrQuickClick = true; mbTrack = false; } } @@ -1308,8 +1308,8 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) { MouseEvent aMEvt = rTEvt.GetMouseEvent(); Point aPt( aMEvt.GetPosPixel() ); - sal_Bool bShift = aMEvt.IsShift(); - sal_Bool bCtrl = aMEvt.IsMod1(); + bool bShift = aMEvt.IsShift(); + bool bCtrl = aMEvt.IsMod1(); sal_uInt16 nSelect = LISTBOX_ENTRY_NOTFOUND; if( aPt.Y() < 0 ) @@ -1360,7 +1360,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) if ( !mbMulti && GetEntryList()->GetSelectEntryCount() ) { mbTrackingSelect = true; - SelectEntry( GetEntryList()->GetSelectEntryPos( 0 ), sal_False ); + SelectEntry( GetEntryList()->GetSelectEntryPos( 0 ), false ); mbTrackingSelect = false; } else if ( mbStackMode ) @@ -1369,14 +1369,14 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) { if ( ( rTEvt.GetMouseEvent().GetPosPixel().Y() < 0 ) || ( rTEvt.GetMouseEvent().GetPosPixel().Y() > GetOutputSizePixel().Height() ) ) { - sal_Bool bSelectionChanged = sal_False; + bool bSelectionChanged = false; if ( ( rTEvt.GetMouseEvent().GetPosPixel().Y() < 0 ) && !mnCurrentPos ) { if ( mpEntryList->IsEntryPosSelected( 0 ) ) { - SelectEntry( 0, sal_False ); - bSelectionChanged = sal_True; + SelectEntry( 0, false ); + bSelectionChanged = true; nSelect = LISTBOX_ENTRY_NOTFOUND; } @@ -1428,7 +1428,7 @@ void ImplListBoxWindow::KeyInput( const KeyEvent& rKEvt ) // ----------------------------------------------------------------------- -sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) +bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) { // entry to be selected sal_uInt16 nSelect = LISTBOX_ENTRY_NOTFOUND; @@ -1436,10 +1436,10 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) KeyCode aKeyCode = rKEvt.GetKeyCode(); - sal_Bool bShift = aKeyCode.IsShift(); - sal_Bool bCtrl = aKeyCode.IsMod1() || aKeyCode.IsMod3(); - sal_Bool bMod2 = aKeyCode.IsMod2(); - sal_Bool bDone = sal_False; + bool bShift = aKeyCode.IsShift(); + bool bCtrl = aKeyCode.IsMod1() || aKeyCode.IsMod3(); + bool bMod2 = aKeyCode.IsMod2(); + bool bDone = false; switch( aKeyCode.GetCode() ) { @@ -1465,7 +1465,7 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) if( ( nSelect != LISTBOX_ENTRY_NOTFOUND ) && ( nSelect < mnTop ) ) SetTopEntry( mnTop-1 ); - bDone = sal_True; + bDone = true; } maQuickSelectionEngine.Reset(); } @@ -1492,7 +1492,7 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) if( ( nSelect != LISTBOX_ENTRY_NOTFOUND ) && ( nSelect >= GetLastVisibleEntry() ) ) SetTopEntry( mnTop+1 ); - bDone = sal_True; + bDone = true; } maQuickSelectionEngine.Reset(); } @@ -1523,7 +1523,7 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) // find first selectable starting from mnTop looking foreward nSelect = mpEntryList->FindFirstSelectable( mnTop, true ); } - bDone = sal_True; + bDone = true; } maQuickSelectionEngine.Reset(); } @@ -1557,7 +1557,7 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) // find first selectable starting from nTmp looking backwards nSelect = mpEntryList->FindFirstSelectable( nTmp, false ); } - bDone = sal_True; + bDone = true; } maQuickSelectionEngine.Reset(); } @@ -1577,7 +1577,7 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) if( mnTop != 0 ) SetTopEntry( 0 ); - bDone = sal_True; + bDone = true; } } maQuickSelectionEngine.Reset(); @@ -1604,7 +1604,7 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) if( nCount > nCurVis ) SetTopEntry( nCount - nCurVis ); } - bDone = sal_True; + bDone = true; } maQuickSelectionEngine.Reset(); } @@ -1615,7 +1615,7 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) if ( !bCtrl && !bMod2 ) { ScrollHorz( -HORZ_SCROLL ); - bDone = sal_True; + bDone = true; } maQuickSelectionEngine.Reset(); } @@ -1626,7 +1626,7 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) if ( !bCtrl && !bMod2 ) { ScrollHorz( HORZ_SCROLL ); - bDone = sal_True; + bDone = true; } maQuickSelectionEngine.Reset(); } @@ -1638,7 +1638,7 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) { mnSelectModifier = rKEvt.GetKeyCode().GetModifier(); ImplCallSelect(); - bDone = sal_False; // do not catch RETURN + bDone = false; // do not catch RETURN } maQuickSelectionEngine.Reset(); } @@ -1653,7 +1653,7 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) nSelect = mnCurrentPos; eLET = LET_KEYSPACE; } - bDone = sal_True; + bDone = true; } maQuickSelectionEngine.Reset(); } @@ -1664,12 +1664,12 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) if( bCtrl && mbMulti ) { // paint only once - sal_Bool bUpdates = IsUpdateMode(); - SetUpdateMode( sal_False ); + bool bUpdates = IsUpdateMode(); + SetUpdateMode( false ); sal_uInt16 nEntryCount = mpEntryList->GetEntryCount(); for( sal_uInt16 i = 0; i < nEntryCount; i++ ) - SelectEntry( i, sal_True ); + SelectEntry( i, true ); // restore update mode SetUpdateMode( bUpdates ); @@ -1677,7 +1677,7 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) maQuickSelectionEngine.Reset(); - bDone = sal_True; + bDone = true; break; } } @@ -1701,7 +1701,7 @@ sal_Bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt ) DBG_ASSERT( !mpEntryList->IsEntryPosSelected( nSelect ) || mbMulti, "ImplListBox: Selecting same Entry" ); if( nSelect >= mpEntryList->GetEntryCount() ) nSelect = mpEntryList->GetEntryCount()-1; - sal_Bool bCurPosChange = (mnCurrentPos != nSelect); + bool bCurPosChange = (mnCurrentPos != nSelect); mnCurrentPos = nSelect; if(SelectEntries( nSelect, eLET, bShift, bCtrl, bCurPosChange)) { @@ -1772,7 +1772,7 @@ void ImplListBoxWindow::SelectEntry( ::vcl::StringEntryIdentifier _entry ) // actually select mnCurrentPos = nSelect; - if ( SelectEntries( nSelect, LET_KEYMOVE, sal_False, sal_False ) ) + if ( SelectEntries( nSelect, LET_KEYMOVE, false, false ) ) { mbTravelSelect = true; mnSelectModifier = 0; @@ -1783,7 +1783,7 @@ void ImplListBoxWindow::SelectEntry( ::vcl::StringEntryIdentifier _entry ) // ----------------------------------------------------------------------- -void ImplListBoxWindow::ImplPaint( sal_uInt16 nPos, sal_Bool bErase, bool bLayout ) +void ImplListBoxWindow::ImplPaint( sal_uInt16 nPos, bool bErase, bool bLayout ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -1806,7 +1806,7 @@ void ImplListBoxWindow::ImplPaint( sal_uInt16 nPos, sal_Bool bErase, bool bLayou } else { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); if( !IsEnabled() ) SetTextColor( rStyleSettings.GetDisableColor() ); SetTextFillColor(); @@ -1834,13 +1834,13 @@ void ImplListBoxWindow::ImplPaint( sal_uInt16 nPos, sal_Bool bErase, bool bLayou } else { - DrawEntry( nPos, sal_True, sal_True, sal_False, bLayout ); + DrawEntry( nPos, true, true, false, bLayout ); } } // ----------------------------------------------------------------------- -void ImplListBoxWindow::DrawEntry( sal_uInt16 nPos, sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos, bool bLayout ) +void ImplListBoxWindow::DrawEntry( sal_uInt16 nPos, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos, bool bLayout ) { const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nPos ); if( ! pEntry ) @@ -1973,7 +1973,7 @@ void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout ) { sal_uInt16 nCount = mpEntryList->GetEntryCount(); - sal_Bool bShowFocusRect = mbHasFocusRect; + bool bShowFocusRect = mbHasFocusRect; if ( mbHasFocusRect && ! bLayout ) ImplHideFocusRect(); @@ -1986,7 +1986,7 @@ void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout ) if( nY + pEntry->mnHeight >= rRect.Top() && nY <= rRect.Bottom() + mnMaxHeight ) { - ImplPaint( i, sal_False, bLayout ); + ImplPaint( i, false, bLayout ); } nY += pEntry->mnHeight; } @@ -2027,7 +2027,7 @@ void ImplListBoxWindow::Resize() { Control::Resize(); - sal_Bool bShowFocusRect = mbHasFocusRect; + bool bShowFocusRect = mbHasFocusRect; if ( bShowFocusRect ) ImplHideFocusRect(); @@ -2183,7 +2183,7 @@ void ImplListBoxWindow::StateChanged( StateChangedType nType ) if ( nType == STATE_CHANGE_ZOOM ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); ImplCalcMetrics(); Invalidate(); } @@ -2194,18 +2194,18 @@ void ImplListBoxWindow::StateChanged( StateChangedType nType ) } else if ( nType == STATE_CHANGE_CONTROLFONT ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); ImplCalcMetrics(); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); Invalidate(); } ImplClearLayoutData(); @@ -2223,7 +2223,7 @@ void ImplListBoxWindow::DataChanged( const DataChangedEvent& rDCEvt ) (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) { ImplClearLayoutData(); - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); ImplCalcMetrics(); Invalidate(); } @@ -2336,7 +2336,7 @@ void ImplListBox::SetEntryFlags( sal_uInt16 nPos, long nFlags ) // ----------------------------------------------------------------------- -void ImplListBox::SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ) +void ImplListBox::SelectEntry( sal_uInt16 nPos, bool bSelect ) { maLBWindow.SelectEntry( nPos, bSelect ); } @@ -2535,7 +2535,7 @@ void ImplListBox::ImplResizeControls() // pb: #106948# explicit mirroring for calc // Scrollbar on left or right side? - sal_Bool bMirroring = maLBWindow.IsMirroring(); + bool bMirroring = maLBWindow.IsMirroring(); Point aWinPos( bMirroring && mbVScroll ? nSBWidth : 0, 0 ); maLBWindow.SetPosSizePixel( aWinPos, aInnerSz ); @@ -2590,7 +2590,7 @@ void ImplListBox::StateChanged( StateChangedType nType ) } else if ( ( nType == STATE_CHANGE_UPDATEMODE ) || ( nType == STATE_CHANGE_DATA ) ) { - sal_Bool bUpdate = IsUpdateMode(); + bool bUpdate = IsUpdateMode(); maLBWindow.SetUpdateMode( bUpdate ); if ( bUpdate && IsReallyVisible() ) ImplCheckScrollBars(); @@ -2667,9 +2667,9 @@ const Wallpaper& ImplListBox::GetDisplayBackground() const // ----------------------------------------------------------------------- -sal_Bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt ) +bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt ) { - sal_Bool bDone = sal_False; + bool bDone = false; if ( rCEvt.GetCommand() == COMMAND_WHEEL ) { const CommandWheelData* pData = rCEvt.GetWheelData(); @@ -2702,7 +2702,7 @@ void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep ) if ( GetEntryList()->FindEntry( aEntry ) != LISTBOX_ENTRY_NOTFOUND ) { ImplEntryType* pNewEntry = new ImplEntryType( aEntry ); - maLBWindow.GetEntryList()->InsertEntry( nMRUCount++, pNewEntry, sal_False ); + maLBWindow.GetEntryList()->InsertEntry( nMRUCount++, pNewEntry, false ); bChanges = true; } } @@ -2813,7 +2813,7 @@ void ImplWin::ImplDraw( bool bLayout ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - sal_Bool bNativeOK = sal_False; + bool bNativeOK = false; if( ! bLayout ) { @@ -2840,11 +2840,11 @@ void ImplWin::ImplDraw( bool bLayout ) Point aPoint( -nLeft, -nTop ); Rectangle aCtrlRegion( aPoint - GetPosPixel(), pWin->GetSizePixel() ); - sal_Bool bMouseOver = sal_False; + bool bMouseOver = false; if( GetParent() ) { Window *pChild = GetParent()->GetWindow( WINDOW_FIRSTCHILD ); - while( pChild && (bMouseOver = pChild->IsMouseOver()) == sal_False ) + while( pChild && !(bMouseOver = pChild->IsMouseOver()) ) pChild = pChild->GetWindow( WINDOW_NEXT ); } @@ -2914,7 +2914,7 @@ void ImplWin::ImplDraw( bool bLayout ) } else { - DrawEntry( sal_True, sal_True, sal_False, bLayout ); + DrawEntry( true, true, false, bLayout ); } } @@ -2927,7 +2927,7 @@ void ImplWin::Paint( const Rectangle& ) // ----------------------------------------------------------------------- -void ImplWin::DrawEntry( sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos, bool bLayout ) +void ImplWin::DrawEntry( bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos, bool bLayout ) { long nBorder = 1; Size aOutSz = GetOutputSizePixel(); @@ -3051,7 +3051,7 @@ void ImplWin::LoseFocus() ImplBtn::ImplBtn( Window* pParent, WinBits nWinStyle ) : PushButton( pParent, nWinStyle ), - mbDown ( sal_False ) + mbDown ( false ) { } @@ -3071,7 +3071,7 @@ void ImplBtn::MouseButtonDown( const MouseEvent& ) if( IsEnabled() ) { MBDown(); - mbDown = sal_True; + mbDown = true; } } @@ -3082,7 +3082,7 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) : { mpImplLB = NULL; mnDDLineCount = 0; - mbAutoWidth = sal_False; + mbAutoWidth = false; mnPopupModeStartSaveSelection = LISTBOX_ENTRY_NOTFOUND; @@ -3107,7 +3107,7 @@ bool ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_LOSEFOCUS ) { - if( !GetParent()->HasChildPathFocus( sal_True ) ) + if( !GetParent()->HasChildPathFocus( true ) ) EndPopupMode(); } @@ -3234,7 +3234,7 @@ Size ImplListBoxFloatingWindow::CalcFloatSize() // ----------------------------------------------------------------------- -void ImplListBoxFloatingWindow::StartFloat( sal_Bool bStartTracking ) +void ImplListBoxFloatingWindow::StartFloat( bool bStartTracking ) { if( !IsInPopupMode() ) { diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index a7e735452a45..4bd5e43fba47 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -51,7 +51,7 @@ static BigInt ImplPower10( sal_uInt16 n ) return nValue; } -static OUString ImplGetCurr( const LocaleDataWrapper& rLocaleDataWrapper, const BigInt &rNumber, sal_uInt16 nDigits, const OUString& rCurrSymbol, sal_Bool bShowThousandSep ) +static OUString ImplGetCurr( const LocaleDataWrapper& rLocaleDataWrapper, const BigInt &rNumber, sal_uInt16 nDigits, const OUString& rCurrSymbol, bool bShowThousandSep ) { DBG_ASSERT( nDigits < 10, "LongCurrency may only have 9 decimal places" ); @@ -98,7 +98,7 @@ static OUString ImplGetCurr( const LocaleDataWrapper& rLocaleDataWrapper, const } static bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt, - sal_Bool bStrictFormat, sal_Bool bThousandSep, + bool bStrictFormat, bool bThousandSep, const LocaleDataWrapper& rLocaleDataWrapper ) { if ( !bStrictFormat ) @@ -122,13 +122,13 @@ static bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt, static bool ImplNumericGetValue( const OUString& rStr, BigInt& rValue, sal_uInt16 nDecDigits, const LocaleDataWrapper& rLocaleDataWrapper, - sal_Bool bCurrency = sal_False ) + bool bCurrency = false ) { OUString aStr = rStr; OUStringBuffer aStr1; OUStringBuffer aStr2; sal_Int32 nDecPos; - sal_Bool bNegative = sal_False; + bool bNegative = false; // On empty string if ( rStr.isEmpty() ) @@ -152,7 +152,7 @@ static bool ImplNumericGetValue( const OUString& rStr, BigInt& rValue, if ( bCurrency ) { if ( (aStr[ 0 ] == '(') && (aStr[ aStr.getLength()-1 ] == ')') ) - bNegative = sal_True; + bNegative = true; if ( !bNegative ) { for (sal_Int32 i=0; i < aStr.getLength(); i++ ) @@ -161,7 +161,7 @@ static bool ImplNumericGetValue( const OUString& rStr, BigInt& rValue, break; else if ( aStr[ i ] == '-' ) { - bNegative = sal_True; + bNegative = true; break; } } @@ -178,7 +178,7 @@ static bool ImplNumericGetValue( const OUString& rStr, BigInt& rValue, break; else if ( aStr[ i ] == '-' ) { - bNegative = sal_True; + bNegative = true; break; } } @@ -188,7 +188,7 @@ static bool ImplNumericGetValue( const OUString& rStr, BigInt& rValue, else { if ( aStr1[ 0 ] == '-' ) - bNegative = sal_True; + bNegative = true; } // delete unwanted characters @@ -245,10 +245,10 @@ static bool ImplNumericGetValue( const OUString& rStr, BigInt& rValue, } static bool ImplLongCurrencyProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, - sal_Bool, sal_Bool bUseThousandSep, const LocaleDataWrapper& rLocaleDataWrapper ) + bool, bool bUseThousandSep, const LocaleDataWrapper& rLocaleDataWrapper ) { // There's no StrictFormat that makes sense here, thus allow all chars - return ImplNumericProcessKeyInput( pEdit, rKEvt, sal_False, bUseThousandSep, rLocaleDataWrapper ); + return ImplNumericProcessKeyInput( pEdit, rKEvt, false, bUseThousandSep, rLocaleDataWrapper ); } } // namespace @@ -256,7 +256,7 @@ static bool ImplLongCurrencyProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt, inline bool ImplLongCurrencyGetValue( const OUString& rStr, BigInt& rValue, sal_uInt16 nDecDigits, const LocaleDataWrapper& rLocaleDataWrapper ) { - return ImplNumericGetValue( rStr, rValue, nDecDigits, rLocaleDataWrapper, sal_True ); + return ImplNumericGetValue( rStr, rValue, nDecDigits, rLocaleDataWrapper, true ); } bool ImplLongCurrencyReformat( const OUString& rStr, BigInt nMin, BigInt nMax, @@ -265,7 +265,7 @@ bool ImplLongCurrencyReformat( const OUString& rStr, BigInt nMin, BigInt nMax, LongCurrencyFormatter& rFormatter ) { BigInt nValue; - if ( !ImplNumericGetValue( rStr, nValue, nDecDigits, rLocaleDataWrapper, sal_True ) ) + if ( !ImplNumericGetValue( rStr, nValue, nDecDigits, rLocaleDataWrapper, true ) ) return true; else { @@ -304,7 +304,7 @@ void LongCurrencyFormatter::ImpInit() mnCorrectedValue = 0; mnDecimalDigits = 0; mnType = FORMAT_LONGCURRENCY; - mbThousandSep = sal_True; + mbThousandSep = true; SetDecimalDigits( 0 ); } @@ -332,7 +332,7 @@ void LongCurrencyFormatter::SetValue( BigInt nNewValue ) { SetUserValue( nNewValue ); mnFieldValue = mnLastValue; - SetEmptyFieldValueData( sal_False ); + SetEmptyFieldValueData( false ); } void LongCurrencyFormatter::SetUserValue( BigInt nNewValue ) @@ -355,7 +355,7 @@ void LongCurrencyFormatter::SetUserValue( BigInt nNewValue ) } else GetField()->SetText( aStr ); - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); } BigInt LongCurrencyFormatter::GetValue() const @@ -393,7 +393,7 @@ void LongCurrencyFormatter::Reformat() if ( !aStr.isEmpty() ) { GetField()->SetText( aStr ); - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); ImplLongCurrencyGetValue( aStr, mnLastValue, GetDecimalDigits(), GetLocaleDataWrapper() ); } else @@ -417,7 +417,7 @@ void LongCurrencyFormatter::SetMax( BigInt nNewMax ) ReformatAll(); } -void LongCurrencyFormatter::SetUseThousandSep( sal_Bool b ) +void LongCurrencyFormatter::SetUseThousandSep( bool b ) { mbThousandSep = b; ReformatAll(); @@ -491,7 +491,7 @@ bool LongCurrencyField::Notify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_GETFOCUS ) { - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); } else if( rNEvt.GetType() == EVENT_LOSEFOCUS ) { @@ -507,7 +507,7 @@ bool LongCurrencyField::Notify( NotifyEvent& rNEvt ) void LongCurrencyField::Modify() { - MarkToBeReformatted( sal_True ); + MarkToBeReformatted( true ); SpinField::Modify(); } @@ -574,7 +574,7 @@ bool LongCurrencyBox::Notify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_GETFOCUS ) { - MarkToBeReformatted( sal_False ); + MarkToBeReformatted( false ); } else if( rNEvt.GetType() == EVENT_LOSEFOCUS ) { @@ -589,14 +589,14 @@ bool LongCurrencyBox::Notify( NotifyEvent& rNEvt ) void LongCurrencyBox::Modify() { - MarkToBeReformatted( sal_True ); + MarkToBeReformatted( true ); ComboBox::Modify(); } void LongCurrencyBox::ReformatAll() { OUString aStr; - SetUpdateMode( sal_False ); + SetUpdateMode( false ); sal_uInt16 nEntryCount = GetEntryCount(); for ( sal_uInt16 i=0; i < nEntryCount; i++ ) { @@ -607,7 +607,7 @@ void LongCurrencyBox::ReformatAll() InsertEntry( aStr, i ); } LongCurrencyFormatter::Reformat(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index 060db316c115..bf87289c1677 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -136,7 +136,7 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle ) } mpFloatWin = new ImplListBoxFloatingWindow( this ); - mpFloatWin->SetAutoWidth( sal_True ); + mpFloatWin->SetAutoWidth( true ); mpFloatWin->SetPopupModeEndHdl( LINK( this, ListBox, ImplPopupModeEndHdl ) ); mpFloatWin->GetDropTarget()->addDropTargetListener(xDrop); @@ -180,7 +180,7 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle ) else mpImplLB->GetMainWindow()->AllowGrabFocus( true ); - SetCompoundControl( sal_True ); + SetCompoundControl( true ); } @@ -217,7 +217,7 @@ void ListBox::ImplLoadRes( const ResId& rResId ) IMPL_LINK_NOARG(ListBox, ImplSelectHdl) { - sal_Bool bPopup = IsInDropDown(); + bool bPopup = IsInDropDown(); if( IsDropDownBox() ) { if( !mpImplLB->IsTravelSelect() ) @@ -316,8 +316,8 @@ IMPL_LINK_NOARG(ListBox, ImplClickBtnHdl) { ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); mpImplWin->GrabFocus(); - mpBtn->SetPressed( sal_True ); - mpFloatWin->StartFloat( sal_True ); + mpBtn->SetPressed( true ); + mpFloatWin->StartFloat( true ); ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN ); ImplClearLayoutData(); @@ -338,9 +338,9 @@ IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl) if ( ( mpFloatWin->GetPopupModeStartSaveSelection() != LISTBOX_ENTRY_NOTFOUND ) && !IsEntryPosSelected( mpFloatWin->GetPopupModeStartSaveSelection() ) ) { - mpImplLB->SelectEntry( mpFloatWin->GetPopupModeStartSaveSelection(), sal_True ); - sal_Bool bTravelSelect = mpImplLB->IsTravelSelect(); - mpImplLB->SetTravelSelect( sal_True ); + mpImplLB->SelectEntry( mpFloatWin->GetPopupModeStartSaveSelection(), true ); + bool bTravelSelect = mpImplLB->IsTravelSelect(); + mpImplLB->SetTravelSelect( true ); ImplDelData aCheckDelete; ImplAddDel( &aCheckDelete ); @@ -359,7 +359,7 @@ IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl) if( mpImplWin ) mpImplWin->ImplClearLayoutData(); - mpBtn->SetPressed( sal_False ); + mpBtn->SetPressed( false ); ImplCallEventListeners( VCLEVENT_DROPDOWN_CLOSE ); return 0; } @@ -375,8 +375,8 @@ void ListBox::ToggleDropDown() { ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); mpImplWin->GrabFocus(); - mpBtn->SetPressed( sal_True ); - mpFloatWin->StartFloat( sal_True ); + mpBtn->SetPressed( true ); + mpFloatWin->StartFloat( true ); ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN ); } } @@ -385,7 +385,7 @@ void ListBox::ToggleDropDown() void ListBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { - mpImplLB->GetMainWindow()->ImplInitSettings( sal_True, sal_True, sal_True ); + mpImplLB->GetMainWindow()->ImplInitSettings( true, true, true ); Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); @@ -483,7 +483,7 @@ void ListBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sa for ( sal_uInt16 n = 0; n < nLines; n++ ) { sal_uInt16 nEntry = n+mpImplLB->GetTopEntry(); - sal_Bool bSelected = mpImplLB->GetEntryList()->IsEntryPosSelected( nEntry ); + bool bSelected = mpImplLB->GetEntryList()->IsEntryPosSelected( nEntry ); if ( bSelected ) { pDev->SetFillColor( COL_BLACK ); @@ -563,7 +563,7 @@ void ListBox::DataChanged( const DataChangedEvent& rDCEvt ) if ( mpImplWin ) { mpImplWin->SetSettings( GetSettings() ); // If not yet set... - ImplInitFieldSettings( mpImplWin, sal_True, sal_True, sal_True ); + ImplInitFieldSettings( mpImplWin, true, true, true ); mpBtn->SetSettings( GetSettings() ); ImplInitDropDownButton( mpBtn ); @@ -594,7 +594,7 @@ void ListBox::EnableAutoSize( bool bAuto ) } -void ListBox::EnableDDAutoWidth( sal_Bool b ) +void ListBox::EnableDDAutoWidth( bool b ) { if ( mpFloatWin ) mpFloatWin->SetAutoWidth( b ); @@ -884,7 +884,7 @@ void ListBox::StateChanged( StateChangedType nType ) { SetStyle( ImplInitStyle( GetStyle() ) ); mpImplLB->GetMainWindow()->EnableSort( ( GetStyle() & WB_SORT ) ? sal_True : sal_False ); - sal_Bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) ? sal_True : sal_False; + bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) ? sal_True : sal_False; mpImplLB->SetMultiSelectionSimpleMode( bSimpleMode ); } else if( nType == STATE_CHANGE_MIRRORING ) @@ -920,8 +920,8 @@ bool ListBox::PreNotify( NotifyEvent& rNEvt ) aKeyEvt.GetKeyCode().IsMod2() ) { ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); - mpBtn->SetPressed( sal_True ); - mpFloatWin->StartFloat( sal_False ); + mpBtn->SetPressed( true ); + mpFloatWin->StartFloat( false ); ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN ); nDone = true; } @@ -963,7 +963,7 @@ bool ListBox::PreNotify( NotifyEvent& rNEvt ) } else if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { - if ( IsInDropDown() && !HasChildPathFocus( sal_True ) ) + if ( IsInDropDown() && !HasChildPathFocus( true ) ) mpFloatWin->EndPopupMode(); } else if ( (rNEvt.GetType() == EVENT_COMMAND) && @@ -1132,19 +1132,19 @@ bool ListBox::IsEntrySelected(const OUString& rStr) const } -sal_Bool ListBox::IsEntryPosSelected( sal_uInt16 nPos ) const +bool ListBox::IsEntryPosSelected( sal_uInt16 nPos ) const { return mpImplLB->GetEntryList()->IsEntryPosSelected( nPos + mpImplLB->GetEntryList()->GetMRUCount() ); } -void ListBox::SelectEntry( const OUString& rStr, sal_Bool bSelect ) +void ListBox::SelectEntry( const OUString& rStr, bool bSelect ) { SelectEntryPos( GetEntryPos( rStr ), bSelect ); } -void ListBox::SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect ) +void ListBox::SelectEntryPos( sal_uInt16 nPos, bool bSelect ) { if ( nPos < mpImplLB->GetEntryList()->GetEntryCount() ) { @@ -1203,13 +1203,13 @@ sal_uInt16 ListBox::GetTopEntry() const } -sal_Bool ListBox::IsTravelSelect() const +bool ListBox::IsTravelSelect() const { return mpImplLB->IsTravelSelect(); } -sal_Bool ListBox::IsInDropDown() const +bool ListBox::IsInDropDown() const { return mpFloatWin && mpFloatWin->IsInPopupMode(); } @@ -1224,19 +1224,19 @@ Rectangle ListBox::GetBoundingRectangle( sal_uInt16 nItem ) const } -void ListBox::EnableMultiSelection( sal_Bool bMulti ) +void ListBox::EnableMultiSelection( bool bMulti ) { - EnableMultiSelection( bMulti, sal_False ); + EnableMultiSelection( bMulti, false ); } -void ListBox::EnableMultiSelection( sal_Bool bMulti, sal_Bool bStackSelection ) +void ListBox::EnableMultiSelection( bool bMulti, bool bStackSelection ) { mpImplLB->EnableMultiSelection( bMulti, bStackSelection ); // WB_SIMPLEMODE: // The MultiListBox behaves just like a normal ListBox // MultiSelection is possible via corresponding additional keys - sal_Bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) ? sal_True : sal_False; + bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) ? sal_True : sal_False; mpImplLB->SetMultiSelectionSimpleMode( bSimpleMode ); // In a MultiSelection, we can't see us travelling without focus @@ -1245,7 +1245,7 @@ void ListBox::EnableMultiSelection( sal_Bool bMulti, sal_Bool bStackSelection ) } -sal_Bool ListBox::IsMultiSelectionEnabled() const +bool ListBox::IsMultiSelectionEnabled() const { return mpImplLB->IsMultiSelectionEnabled(); } @@ -1440,7 +1440,7 @@ void ListBox::UserDraw( const UserDrawEvent& ) } -void ListBox::DrawEntry( const UserDrawEvent& rEvt, sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos ) +void ListBox::DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos ) { if ( rEvt.GetDevice() == mpImplLB->GetMainWindow() ) mpImplLB->GetMainWindow()->DrawEntry( rEvt.GetItemId(), bDrawImage, bDrawText, bDrawTextAtImagePos ); @@ -1457,7 +1457,7 @@ void ListBox::SetUserItemSize( const Size& rSz ) } -void ListBox::EnableUserDraw( sal_Bool bUserDraw ) +void ListBox::EnableUserDraw( bool bUserDraw ) { mpImplLB->GetMainWindow()->EnableUserDraw( bUserDraw ); if ( mpImplWin ) @@ -1465,7 +1465,7 @@ void ListBox::EnableUserDraw( sal_Bool bUserDraw ) } -void ListBox::SetReadOnly( sal_Bool bReadOnly ) +void ListBox::SetReadOnly( bool bReadOnly ) { if ( mpImplLB->IsReadOnly() != bReadOnly ) { @@ -1475,7 +1475,7 @@ void ListBox::SetReadOnly( sal_Bool bReadOnly ) } -sal_Bool ListBox::IsReadOnly() const +bool ListBox::IsReadOnly() const { return mpImplLB->IsReadOnly(); } @@ -1577,7 +1577,7 @@ MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) : ListBox( WINDOW_MULTILISTBOX ) { ImplInit( pParent, nStyle ); - EnableMultiSelection( sal_True ); + EnableMultiSelection( true ); } @@ -1591,7 +1591,7 @@ MultiListBox::MultiListBox( Window* pParent, const ResId& rResId ) : if ( !(nStyle & WB_HIDE ) ) Show(); - EnableMultiSelection( sal_True ); + EnableMultiSelection( true ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 922ffc7e1d6a..16955e89e5c0 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -56,10 +56,10 @@ void MenuButton::ImplExecuteMenu() Point aPos( 0, 1 ); Size aSize = GetSizePixel(); Rectangle aRect( aPos, aSize ); - SetPressed( sal_True ); + SetPressed( true ); EndSelection(); mnCurItemId = mpMenu->Execute( this, aRect, POPUPMENU_EXECUTE_DOWN ); - SetPressed( sal_False ); + SetPressed( false ); if ( mnCurItemId ) { Select(); diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx index c1cc320648e8..fdedef589fca 100644 --- a/vcl/source/control/morebtn.cxx +++ b/vcl/source/control/morebtn.cxx @@ -36,7 +36,7 @@ void MoreButton::ImplInit( Window* pParent, WinBits nStyle ) mpMBData = new ImplMoreButtonData; mnDelta = 0; meUnit = MAP_PIXEL; - mbState = sal_False; + mbState = false; mpMBData->mpItemList = NULL; @@ -99,7 +99,7 @@ void MoreButton::ImplLoadRes( const ResId& rResId ) if ( nObjMask & RSC_MOREBUTTON_STATE ) { // Don't call method as Dialog should not be switched over - mbState = (sal_Bool)ReadShortRes(); + mbState = ReadShortRes() != 0; // SetText( GetText() ); ShowState(); } diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index 21af040341e6..2940d28a2518 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -28,9 +28,9 @@ void ProgressBar::ImplInit() { mnPercent = 0; - mbCalcNew = sal_True; + mbCalcNew = true; - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); } static WinBits clearProgressBarBorder( Window* pParent, WinBits nOrgStyle ) @@ -66,8 +66,8 @@ ProgressBar::~ProgressBar() { } -void ProgressBar::ImplInitSettings( sal_Bool bFont, - sal_Bool bForeground, sal_Bool bBackground ) +void ProgressBar::ImplInitSettings( bool bFont, + bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -89,8 +89,8 @@ void ProgressBar::ImplInitSettings( sal_Bool bFont, { if( (GetStyle() & WB_BORDER) ) SetBorderStyle( WINDOW_BORDER_REMOVEBORDER ); - EnableChildTransparentMode( sal_True ); - SetPaintTransparent( sal_True ); + EnableChildTransparentMode( true ); + SetPaintTransparent( true ); SetBackground(); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); } @@ -131,7 +131,7 @@ void ProgressBar::ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ) { if ( mbCalcNew ) { - mbCalcNew = sal_False; + mbCalcNew = false; Size aSize = GetOutputSizePixel(); mnPrgsHeight = aSize.Height()-(PROGRESSBAR_WIN_OFFSET*2); @@ -164,7 +164,7 @@ void ProgressBar::Paint( const Rectangle& ) void ProgressBar::Resize() { - mbCalcNew = sal_True; + mbCalcNew = true; if ( IsReallyVisible() ) Invalidate(); } @@ -175,7 +175,7 @@ void ProgressBar::SetValue( sal_uInt16 nNewPercent ) if ( nNewPercent < mnPercent ) { - mbCalcNew = sal_True; + mbCalcNew = true; mnPercent = nNewPercent; if ( IsReallyVisible() ) { @@ -203,12 +203,12 @@ void ProgressBar::StateChanged( StateChangedType nType ) */ if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); Invalidate(); } @@ -220,7 +220,7 @@ void ProgressBar::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); Invalidate(); } diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx index 14bbac1a2e25..d0b72391261f 100644 --- a/vcl/source/control/quickselectionengine.cxx +++ b/vcl/source/control/quickselectionengine.cxx @@ -85,7 +85,7 @@ namespace vcl StringEntryIdentifier pStartedWith = pSearchEntry; while ( pSearchEntry ) { - if ( rI18nHelper.MatchString( _searchString, sEntryText ) != 0 ) + if ( rI18nHelper.MatchString( _searchString, sEntryText ) ) break; pSearchEntry = _engineData.rEntryList.NextEntry( pSearchEntry, sEntryText ); diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index f79812f193e8..386c57e0b030 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -96,8 +96,8 @@ void ScrollBar::ImplInit( Window* pParent, WinBits nStyle ) mnStateFlags = 0; meScrollType = SCROLL_DONTKNOW; meDDScrollType = SCROLL_DONTKNOW; - mbCalcSize = sal_True; - mbFullDrag = 0; + mbCalcSize = true; + mbFullDrag = false; if( !mpData ) // TODO: remove when maTrackRect is no longer in mpData { @@ -118,7 +118,7 @@ void ScrollBar::ImplInit( Window* pParent, WinBits nStyle ) void ScrollBar::ImplInitStyle( WinBits nStyle ) { if ( nStyle & WB_DRAG ) - mbFullDrag = sal_True; + mbFullDrag = true; else mbFullDrag = (GetSettings().GetStyleSettings().GetDragFullOptions() & DRAGFULL_OPTION_SCROLL) != 0; } @@ -169,7 +169,7 @@ void ScrollBar::ImplLoadRes( const ResId& rResId ) } -void ScrollBar::ImplUpdateRects( sal_Bool bUpdate ) +void ScrollBar::ImplUpdateRects( bool bUpdate ) { sal_uInt16 nOldStateFlags = mnStateFlags; Rectangle aOldPage1Rect = maPage1Rect; @@ -302,7 +302,7 @@ long ScrollBar::ImplCalcThumbPosPix( long nPos ) } -void ScrollBar::ImplCalc( sal_Bool bUpdate ) +void ScrollBar::ImplCalc( bool bUpdate ) { const Size aSize = GetOutputSizePixel(); const long nMinThumbSize = GetSettings().GetStyleSettings().GetMinThumbSize(); @@ -401,7 +401,7 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) if ( !mnThumbPixRange ) maThumbRect.SetEmpty(); - mbCalcSize = sal_False; + mbCalcSize = false; Size aNewSize = getCurrentCalcSize(); if (aOldSize != aNewSize) @@ -445,7 +445,7 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate ) if ( bUpdate && HasPaintEvent() ) { Invalidate(); - bUpdate = sal_False; + bUpdate = false; } ImplUpdateRects( bUpdate ); } @@ -477,7 +477,7 @@ void ScrollBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& /* rSiz // - force recalculate if ( mbCalcSize ) - ImplCalc( sal_False ); + ImplCalc( false ); maBtn1Rect+=aPos; maBtn2Rect+=aPos; @@ -489,17 +489,17 @@ void ScrollBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& /* rSiz ImplDraw( SCRBAR_DRAW_ALL, pDev ); pDev->Pop(); - mbCalcSize = sal_True; + mbCalcSize = true; } -sal_Bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags ) +bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags ) { ScrollbarValue scrValue; - sal_Bool bNativeOK = IsNativeControlSupported(CTRL_SCROLLBAR, PART_ENTIRE_CONTROL); + bool bNativeOK = IsNativeControlSupported(CTRL_SCROLLBAR, PART_ENTIRE_CONTROL); if( !bNativeOK ) - return sal_False; + return false; bool bHorz = (GetStyle() & WB_HORZ ? true : false); @@ -661,11 +661,11 @@ void ScrollBar::ImplDraw( sal_uInt16 nDrawFlags, OutputDevice* pOutDev ) sal_uInt16 nStyle; const StyleSettings& rStyleSettings = pOutDev->GetSettings().GetStyleSettings(); SymbolType eSymbolType; - sal_Bool bEnabled = IsEnabled(); + bool bEnabled = IsEnabled(); // Finish some open calculations (if any) if ( mbCalcSize ) - ImplCalc( sal_False ); + ImplCalc( false ); Window *pWin = NULL; if( pOutDev->GetOutDevType() == OUTDEV_WINDOW ) @@ -770,7 +770,7 @@ void ScrollBar::ImplDraw( sal_uInt16 nDrawFlags, OutputDevice* pOutDev ) } -long ScrollBar::ImplScroll( long nNewPos, sal_Bool bCallEndScroll ) +long ScrollBar::ImplScroll( long nNewPos, bool bCallEndScroll ) { long nOldPos = mnThumbPos; SetThumbPos( nNewPos ); @@ -787,7 +787,7 @@ long ScrollBar::ImplScroll( long nNewPos, sal_Bool bCallEndScroll ) } -long ScrollBar::ImplDoAction( sal_Bool bCallEndScroll ) +long ScrollBar::ImplDoAction( bool bCallEndScroll ) { long nDelta = 0; @@ -816,10 +816,10 @@ long ScrollBar::ImplDoAction( sal_Bool bCallEndScroll ) } -void ScrollBar::ImplDoMouseAction( const Point& rMousePos, sal_Bool bCallAction ) +void ScrollBar::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) { sal_uInt16 nOldStateFlags = mnStateFlags; - sal_Bool bAction = sal_False; + bool bAction = false; bool bHorizontal = ( GetStyle() & WB_HORZ )? true: false; bool bIsInside = false; @@ -888,7 +888,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, sal_Bool bCallAction if ( nOldStateFlags != mnStateFlags ) ImplDraw( mnDragDraw, this ); if ( bAction ) - ImplDoAction( sal_False ); + ImplDoAction( false ); } void ScrollBar::ImplDragThumb( const Point& rMousePos ) @@ -1157,9 +1157,9 @@ void ScrollBar::Paint( const Rectangle& ) void ScrollBar::Resize() { Control::Resize(); - mbCalcSize = sal_True; + mbCalcSize = true; if ( IsReallyVisible() ) - ImplCalc( sal_False ); + ImplCalc( false ); Invalidate(); } @@ -1216,17 +1216,17 @@ void ScrollBar::StateChanged( StateChangedType nType ) Control::StateChanged( nType ); if ( nType == STATE_CHANGE_INITSHOW ) - ImplCalc( sal_False ); + ImplCalc( false ); else if ( nType == STATE_CHANGE_DATA ) { if ( IsReallyVisible() && IsUpdateMode() ) - ImplCalc( sal_True ); + ImplCalc( true ); } else if ( nType == STATE_CHANGE_UPDATEMODE ) { if ( IsReallyVisible() && IsUpdateMode() ) { - ImplCalc( sal_False ); + ImplCalc( false ); Invalidate(); } } @@ -1243,8 +1243,8 @@ void ScrollBar::StateChanged( StateChangedType nType ) if ( (GetPrevStyle() & SCRBAR_VIEW_STYLE) != (GetStyle() & SCRBAR_VIEW_STYLE) ) { - mbCalcSize = sal_True; - ImplCalc( sal_False ); + mbCalcSize = true; + ImplCalc( false ); Invalidate(); } } @@ -1258,8 +1258,8 @@ void ScrollBar::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - mbCalcSize = sal_True; - ImplCalc( sal_False ); + mbCalcSize = true; + ImplCalc( false ); Invalidate(); } } @@ -1328,7 +1328,7 @@ bool ScrollBar::PreNotify( NotifyEvent& rNEvt ) aClipRegion.Union( *pLastRect ); // Support for 3-button scroll bars - sal_Bool bHas3Buttons = IsNativeControlSupported( CTRL_SCROLLBAR, HAS_THREE_BUTTONS ); + bool bHas3Buttons = IsNativeControlSupported( CTRL_SCROLLBAR, HAS_THREE_BUTTONS ); if ( bHas3Buttons && ( pRect == &maBtn1Rect || pLastRect == &maBtn1Rect ) ) { aClipRegion.Union( maBtn2Rect ); @@ -1366,7 +1366,7 @@ long ScrollBar::DoScroll( long nNewPos ) SAL_INFO("vcl.scrollbar", "DoScroll(" << nNewPos << ")"); meScrollType = SCROLL_DRAG; - long nDelta = ImplScroll( nNewPos, sal_True ); + long nDelta = ImplScroll( nNewPos, true ); meScrollType = SCROLL_DONTKNOW; return nDelta; } @@ -1380,7 +1380,7 @@ long ScrollBar::DoScrollAction( ScrollType eScrollType ) return 0; meScrollType = eScrollType; - long nDelta = ImplDoAction( sal_True ); + long nDelta = ImplDoAction( true ); meScrollType = SCROLL_DONTKNOW; return nDelta; } @@ -1453,7 +1453,7 @@ void ScrollBar::SetVisibleSize( long nNewSize ) Size ScrollBar::GetOptimalSize() const { if (mbCalcSize) - const_cast<ScrollBar*>(this)->ImplCalc(sal_False); + const_cast<ScrollBar*>(this)->ImplCalc(false); Size aRet = getCurrentCalcSize(); diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index 2b9dde815806..a942545ec792 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -69,8 +69,8 @@ void Slider::ImplInit( Window* pParent, WinBits nStyle ) mnDragDraw = 0; mnStateFlags = 0; meScrollType = SCROLL_DONTKNOW; - mbCalcSize = sal_True; - mbFullDrag = sal_True; + mbCalcSize = true; + mbFullDrag = true; Control::ImplInit( pParent, nStyle, NULL ); @@ -93,16 +93,16 @@ void Slider::ImplInitSettings() Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); SetBackground(); } else { - EnableChildTransparentMode( sal_False ); + EnableChildTransparentMode( false ); SetParentClipMode( 0 ); - SetPaintTransparent( sal_False ); + SetPaintTransparent( false ); if ( IsControlBackground() ) SetBackground( GetControlBackground() ); @@ -113,7 +113,7 @@ void Slider::ImplInitSettings() // ----------------------------------------------------------------------- -void Slider::ImplUpdateRects( sal_Bool bUpdate ) +void Slider::ImplUpdateRects( bool bUpdate ) { Rectangle aOldThumbRect = maThumbRect; bool bInvalidateAll = false; @@ -250,7 +250,7 @@ long Slider::ImplCalcThumbPosPix( long nPos ) // ----------------------------------------------------------------------- -void Slider::ImplCalc( sal_Bool bUpdate ) +void Slider::ImplCalc( bool bUpdate ) { bool bInvalidateAll = false; @@ -305,7 +305,7 @@ void Slider::ImplCalc( sal_Bool bUpdate ) (nOldChannelPixBottom != mnChannelPixBottom) ) bInvalidateAll = true; - mbCalcSize = sal_False; + mbCalcSize = false; } if ( mnThumbPixRange ) @@ -314,7 +314,7 @@ void Slider::ImplCalc( sal_Bool bUpdate ) if ( bUpdate && bInvalidateAll ) { Invalidate(); - bUpdate = sal_False; + bUpdate = false; } ImplUpdateRects( bUpdate ); } @@ -326,11 +326,11 @@ void Slider::ImplDraw( sal_uInt16 nDrawFlags ) DecorationView aDecoView( this ); sal_uInt16 nStyle; const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - sal_Bool bEnabled = IsEnabled(); + bool bEnabled = IsEnabled(); // do missing calculations if ( mbCalcSize ) - ImplCalc( sal_False ); + ImplCalc( false ); ControlPart nPart = (GetStyle() & WB_HORZ) ? PART_TRACK_HORZ_AREA : PART_TRACK_VERT_AREA; ControlState nState = ( IsEnabled() ? CTRL_STATE_ENABLED : 0 ) | ( HasFocus() ? CTRL_STATE_FOCUSED : 0 ); @@ -461,7 +461,7 @@ void Slider::ImplDraw( sal_uInt16 nDrawFlags ) // ----------------------------------------------------------------------- -sal_Bool Slider::ImplIsPageUp( const Point& rPos ) +bool Slider::ImplIsPageUp( const Point& rPos ) { Size aSize = GetOutputSizePixel(); Rectangle aRect = maChannel1Rect; @@ -480,7 +480,7 @@ sal_Bool Slider::ImplIsPageUp( const Point& rPos ) // ----------------------------------------------------------------------- -sal_Bool Slider::ImplIsPageDown( const Point& rPos ) +bool Slider::ImplIsPageDown( const Point& rPos ) { Size aSize = GetOutputSizePixel(); Rectangle aRect = maChannel2Rect; @@ -499,7 +499,7 @@ sal_Bool Slider::ImplIsPageDown( const Point& rPos ) // ----------------------------------------------------------------------- -long Slider::ImplSlide( long nNewPos, sal_Bool bCallEndSlide ) +long Slider::ImplSlide( long nNewPos, bool bCallEndSlide ) { long nOldPos = mnThumbPos; SetThumbPos( nNewPos ); @@ -517,7 +517,7 @@ long Slider::ImplSlide( long nNewPos, sal_Bool bCallEndSlide ) // ----------------------------------------------------------------------- -long Slider::ImplDoAction( sal_Bool bCallEndSlide ) +long Slider::ImplDoAction( bool bCallEndSlide ) { long nDelta = 0; @@ -551,10 +551,10 @@ long Slider::ImplDoAction( sal_Bool bCallEndSlide ) // ----------------------------------------------------------------------- -void Slider::ImplDoMouseAction( const Point& rMousePos, sal_Bool bCallAction ) +void Slider::ImplDoMouseAction( const Point& rMousePos, bool bCallAction ) { sal_uInt16 nOldStateFlags = mnStateFlags; - sal_Bool bAction = sal_False; + bool bAction = false; switch ( meScrollType ) { @@ -597,7 +597,7 @@ void Slider::ImplDoMouseAction( const Point& rMousePos, sal_Bool bCallAction ) if ( bAction ) { - if ( ImplDoAction( sal_False ) ) + if ( ImplDoAction( false ) ) { // Update the channel complete if ( mnDragDraw & SLIDER_DRAW_CHANNEL ) @@ -619,7 +619,7 @@ long Slider::ImplDoSlide( long nNewPos ) return 0; meScrollType = SCROLL_DRAG; - long nDelta = ImplSlide( nNewPos, sal_True ); + long nDelta = ImplSlide( nNewPos, true ); meScrollType = SCROLL_DONTKNOW; return nDelta; } @@ -634,7 +634,7 @@ long Slider::ImplDoSlideAction( ScrollType eScrollType ) return 0; meScrollType = eScrollType; - long nDelta = ImplDoAction( sal_True ); + long nDelta = ImplDoAction( true ); meScrollType = SCROLL_DONTKNOW; return nDelta; } @@ -715,7 +715,7 @@ void Slider::MouseButtonUp( const MouseEvent& ) ImplDraw( mnDragDraw ); mnDragDraw = 0; - ImplDoAction( sal_True ); + ImplDoAction( true ); meScrollType = SCROLL_DONTKNOW; } } @@ -861,9 +861,9 @@ void Slider::Paint( const Rectangle& ) void Slider::Resize() { Control::Resize(); - mbCalcSize = sal_True; + mbCalcSize = true; if ( IsReallyVisible() ) - ImplCalc( sal_False ); + ImplCalc( false ); Invalidate(); } @@ -881,17 +881,17 @@ void Slider::StateChanged( StateChangedType nType ) Control::StateChanged( nType ); if ( nType == STATE_CHANGE_INITSHOW ) - ImplCalc( sal_False ); + ImplCalc( false ); else if ( nType == STATE_CHANGE_DATA ) { if ( IsReallyVisible() && IsUpdateMode() ) - ImplCalc( sal_True ); + ImplCalc( true ); } else if ( nType == STATE_CHANGE_UPDATEMODE ) { if ( IsReallyVisible() && IsUpdateMode() ) { - ImplCalc( sal_False ); + ImplCalc( false ); Invalidate(); } } @@ -907,8 +907,8 @@ void Slider::StateChanged( StateChangedType nType ) if ( (GetPrevStyle() & SLIDER_VIEW_STYLE) != (GetStyle() & SLIDER_VIEW_STYLE) ) { - mbCalcSize = sal_True; - ImplCalc( sal_False ); + mbCalcSize = true; + ImplCalc( false ); Invalidate(); } } diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index aff23a3a0f8d..6d6d7dbc256f 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -27,10 +27,10 @@ void SpinButton::ImplInit( Window* pParent, WinBits nStyle ) { - mbUpperIn = sal_False; - mbLowerIn = sal_False; - mbInitialUp = sal_False; - mbInitialDown = sal_False; + mbUpperIn = false; + mbLowerIn = false; + mbInitialUp = false; + mbInitialDown = false; mnMinRange = 0; mnMaxRange = 100; @@ -43,9 +43,9 @@ void SpinButton::ImplInit( Window* pParent, WinBits nStyle ) mbRepeat = 0 != ( nStyle & WB_REPEAT ); if ( nStyle & WB_HSCROLL ) - mbHorz = sal_True; + mbHorz = true; else - mbHorz = sal_False; + mbHorz = false; Control::ImplInit( pParent, nStyle, NULL ); } @@ -54,7 +54,7 @@ void SpinButton::ImplInit( Window* pParent, WinBits nStyle ) SpinButton::SpinButton( Window* pParent, WinBits nStyle ) :Control( WINDOW_SPINBUTTON ) - ,mbUpperIsFocused( sal_False ) + ,mbUpperIsFocused( false ) { ImplInit( pParent, nStyle ); } @@ -94,7 +94,7 @@ void SpinButton::Up() mnValue += mnValueStep; StateChanged( STATE_CHANGE_DATA ); - ImplMoveFocus( sal_True ); + ImplMoveFocus( true ); } ImplCallEventListenersAndHandler( VCLEVENT_SPINBUTTON_UP, maUpHdlLink, this ); @@ -109,7 +109,7 @@ void SpinButton::Down() mnValue -= mnValueStep; StateChanged( STATE_CHANGE_DATA ); - ImplMoveFocus( sal_False ); + ImplMoveFocus( false ); } ImplCallEventListenersAndHandler( VCLEVENT_SPINBUTTON_DOWN, maDownHdlLink, this ); @@ -179,9 +179,9 @@ void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, aUpperRect += aPos; aLowerRect += aPos; - ImplDrawSpinButton( pDev, aUpperRect, aLowerRect, sal_False, sal_False, + ImplDrawSpinButton( pDev, aUpperRect, aLowerRect, false, false, IsEnabled() && ImplIsUpperEnabled(), - IsEnabled() && ImplIsLowerEnabled(), mbHorz, sal_True ); + IsEnabled() && ImplIsLowerEnabled(), mbHorz, true ); pDev->Pop(); } @@ -190,10 +190,10 @@ void SpinButton::Paint( const Rectangle& ) { HideFocus(); - sal_Bool bEnable = IsEnabled(); + bool bEnable = IsEnabled(); ImplDrawSpinButton( this, maUpperRect, maLowerRect, mbUpperIn, mbLowerIn, bEnable && ImplIsUpperEnabled(), - bEnable && ImplIsLowerEnabled(), mbHorz, sal_True ); + bEnable && ImplIsLowerEnabled(), mbHorz, true ); if ( HasFocus() ) ShowFocus( maFocusRect ); @@ -205,14 +205,14 @@ void SpinButton::MouseButtonDown( const MouseEvent& rMEvt ) { if ( maUpperRect.IsInside( rMEvt.GetPosPixel() ) && ( ImplIsUpperEnabled() ) ) { - mbUpperIn = sal_True; - mbInitialUp = sal_True; + mbUpperIn = true; + mbInitialUp = true; Invalidate( maUpperRect ); } else if ( maLowerRect.IsInside( rMEvt.GetPosPixel() ) && ( ImplIsLowerEnabled() ) ) { - mbLowerIn = sal_True; - mbInitialDown = sal_True; + mbLowerIn = true; + mbInitialDown = true; Invalidate( maLowerRect ); } @@ -238,20 +238,20 @@ void SpinButton::MouseButtonUp( const MouseEvent& ) if ( mbUpperIn ) { - mbUpperIn = sal_False; + mbUpperIn = false; Invalidate( maUpperRect ); Update(); Up(); } else if ( mbLowerIn ) { - mbLowerIn = sal_False; + mbLowerIn = false; Invalidate( maLowerRect ); Update(); Down(); } - mbInitialUp = mbInitialDown = sal_False; + mbInitialUp = mbInitialDown = false; } // ----------------------------------------------------------------------- @@ -264,15 +264,15 @@ void SpinButton::MouseMove( const MouseEvent& rMEvt ) if ( !maUpperRect.IsInside( rMEvt.GetPosPixel() ) && mbUpperIn && mbInitialUp ) { - mbUpperIn = sal_False; + mbUpperIn = false; maRepeatTimer.Stop(); Invalidate( maUpperRect ); Update(); } else if ( !maLowerRect.IsInside( rMEvt.GetPosPixel() ) && - mbLowerIn & mbInitialDown ) + mbLowerIn && mbInitialDown ) { - mbLowerIn = sal_False; + mbLowerIn = false; maRepeatTimer.Stop(); Invalidate( maLowerRect ); Update(); @@ -280,7 +280,7 @@ void SpinButton::MouseMove( const MouseEvent& rMEvt ) else if ( maUpperRect.IsInside( rMEvt.GetPosPixel() ) && !mbUpperIn && mbInitialUp ) { - mbUpperIn = sal_True; + mbUpperIn = true; if ( mbRepeat ) maRepeatTimer.Start(); Invalidate( maUpperRect ); @@ -289,7 +289,7 @@ void SpinButton::MouseMove( const MouseEvent& rMEvt ) else if ( maLowerRect.IsInside( rMEvt.GetPosPixel() ) && !mbLowerIn && mbInitialDown ) { - mbLowerIn = sal_True; + mbLowerIn = true; if ( mbRepeat ) maRepeatTimer.Start(); Invalidate( maLowerRect ); @@ -349,7 +349,7 @@ void SpinButton::StateChanged( StateChangedType nType ) case STATE_CHANGE_STYLE: { - sal_Bool bNewRepeat = 0 != ( GetStyle() & WB_REPEAT ); + bool bNewRepeat = 0 != ( GetStyle() & WB_REPEAT ); if ( bNewRepeat != mbRepeat ) { if ( maRepeatTimer.IsActive() ) @@ -360,7 +360,7 @@ void SpinButton::StateChanged( StateChangedType nType ) mbRepeat = bNewRepeat; } - sal_Bool bNewHorz = 0 != ( GetStyle() & WB_HSCROLL ); + bool bNewHorz = 0 != ( GetStyle() & WB_HSCROLL ); if ( bNewHorz != mbHorz ) { mbHorz = bNewHorz; @@ -449,21 +449,21 @@ void SpinButton::LoseFocus() // ----------------------------------------------------------------------- -sal_Bool SpinButton::ImplMoveFocus( sal_Bool _bUpper ) +bool SpinButton::ImplMoveFocus( bool _bUpper ) { if ( _bUpper == mbUpperIsFocused ) - return sal_False; + return false; HideFocus(); ImplCalcFocusRect( _bUpper ); if ( HasFocus() ) ShowFocus( maFocusRect ); - return sal_True; + return true; } // ----------------------------------------------------------------------- -void SpinButton::ImplCalcFocusRect( sal_Bool _bUpper ) +void SpinButton::ImplCalcFocusRect( bool _bUpper ) { maFocusRect = _bUpper ? maUpperRect : maLowerRect; // inflate by some pixels diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 146b174d15a7..3e72b136c363 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -35,8 +35,8 @@ namespace { void ImplGetSpinbuttonValue( Window *pWin, const Rectangle& rUpperRect, const Rectangle& rLowerRect, - sal_Bool bUpperIn, sal_Bool bLowerIn, - sal_Bool bUpperEnabled, sal_Bool bLowerEnabled, sal_Bool bHorz, + bool bUpperIn, bool bLowerIn, + bool bUpperEnabled, bool bLowerEnabled, bool bHorz, SpinbuttonValue& rValue ) { // convert spinbutton data to a SpinbuttonValue structure for native painting @@ -75,9 +75,9 @@ void ImplGetSpinbuttonValue( Window *pWin, const Rectangle& rUpperRect, } -sal_Bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) +bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) { - sal_Bool bNativeOK = sal_False; + bool bNativeOK = false; if( pWin->IsNativeControlSupported(CTRL_SPINBOX, PART_ENTIRE_CONTROL) && // there is just no useful native support for spinfields with dropdown @@ -126,9 +126,9 @@ sal_Bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbutt return bNativeOK; } -sal_Bool ImplDrawNativeSpinbuttons( Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) +bool ImplDrawNativeSpinbuttons( Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) { - sal_Bool bNativeOK = sal_False; + bool bNativeOK = false; if( pWin->IsNativeControlSupported(CTRL_SPINBUTTONS, PART_ENTIRE_CONTROL) ) { @@ -144,8 +144,8 @@ sal_Bool ImplDrawNativeSpinbuttons( Window *pWin, const SpinbuttonValue& rSpinbu void ImplDrawSpinButton( OutputDevice* pOutDev, const Rectangle& rUpperRect, const Rectangle& rLowerRect, - sal_Bool bUpperIn, sal_Bool bLowerIn, - sal_Bool bUpperEnabled, sal_Bool bLowerEnabled, sal_Bool bHorz, sal_Bool bMirrorHorz ) + bool bUpperIn, bool bLowerIn, + bool bUpperEnabled, bool bLowerEnabled, bool bHorz, bool bMirrorHorz ) { DecorationView aDecoView( pOutDev ); @@ -188,7 +188,7 @@ void ImplDrawSpinButton( OutputDevice* pOutDev, if ( bUpperIn ) nTempStyle |= BUTTON_DRAW_PRESSED; - sal_Bool bNativeOK = sal_False; + bool bNativeOK = false; Rectangle aUpRect; if( pOutDev->GetOutDevType() == OUTDEV_WINDOW ) @@ -293,14 +293,14 @@ void ImplDrawSpinButton( OutputDevice* pOutDev, void SpinField::ImplInitSpinFieldData() { mpEdit = NULL; - mbSpin = sal_False; - mbRepeat = sal_False; - mbUpperIn = sal_False; - mbLowerIn = sal_False; - mbInitialUp = sal_False; - mbInitialDown = sal_False; - mbNoSelect = sal_False; - mbInDropDown = sal_False; + mbSpin = false; + mbRepeat = false; + mbUpperIn = false; + mbLowerIn = false; + mbInitialUp = false; + mbInitialDown = false; + mbNoSelect = false; + mbInDropDown = false; } // -------------------------------------------------------------------- @@ -311,7 +311,7 @@ void SpinField::ImplInit( Window* pParent, WinBits nWinStyle ) if ( nWinStyle & (WB_SPIN|WB_DROPDOWN) ) { - mbSpin = sal_True; + mbSpin = true; // Some themes want external spin buttons, therefore the main // spinfield should not overdraw the border between its encapsulated @@ -325,7 +325,7 @@ void SpinField::ImplInit( Window* pParent, WinBits nWinStyle ) else mpEdit = new Edit( this, WB_NOBORDER ); - mpEdit->EnableRTL( sal_False ); + mpEdit->EnableRTL( false ); mpEdit->SetPosPixel( Point() ); mpEdit->Show(); SetSubEdit( mpEdit ); @@ -333,9 +333,9 @@ void SpinField::ImplInit( Window* pParent, WinBits nWinStyle ) maRepeatTimer.SetTimeoutHdl( LINK( this, SpinField, ImplTimeout ) ); maRepeatTimer.SetTimeout( GetSettings().GetMouseSettings().GetButtonStartRepeat() ); if ( nWinStyle & WB_REPEAT ) - mbRepeat = sal_True; + mbRepeat = true; - SetCompoundControl( sal_True ); + SetCompoundControl( true ); } } @@ -410,7 +410,7 @@ void SpinField::MouseButtonDown( const MouseEvent& rMEvt ) { if ( !HasFocus() && ( !mpEdit || !mpEdit->HasFocus() ) ) { - mbNoSelect = sal_True; + mbNoSelect = true; GrabFocus(); } @@ -418,14 +418,14 @@ void SpinField::MouseButtonDown( const MouseEvent& rMEvt ) { if ( maUpperRect.IsInside( rMEvt.GetPosPixel() ) ) { - mbUpperIn = sal_True; - mbInitialUp = sal_True; + mbUpperIn = true; + mbInitialUp = true; Invalidate( maUpperRect ); } else if ( maLowerRect.IsInside( rMEvt.GetPosPixel() ) ) { - mbLowerIn = sal_True; - mbInitialDown = sal_True; + mbLowerIn = true; + mbInitialDown = true; Invalidate( maLowerRect ); } else if ( maDropDownRect.IsInside( rMEvt.GetPosPixel() ) ) @@ -453,20 +453,20 @@ void SpinField::MouseButtonDown( const MouseEvent& rMEvt ) void SpinField::MouseButtonUp( const MouseEvent& rMEvt ) { ReleaseMouse(); - mbInitialUp = mbInitialDown = sal_False; + mbInitialUp = mbInitialDown = false; maRepeatTimer.Stop(); maRepeatTimer.SetTimeout( GetSettings().GetMouseSettings().GetButtonStartRepeat() ); if ( mbUpperIn ) { - mbUpperIn = sal_False; + mbUpperIn = false; Invalidate( maUpperRect ); Update(); Up(); } else if ( mbLowerIn ) { - mbLowerIn = sal_False; + mbLowerIn = false; Invalidate( maLowerRect ); Update(); Down(); @@ -483,7 +483,7 @@ void SpinField::MouseMove( const MouseEvent& rMEvt ) { if ( mbInitialUp ) { - sal_Bool bNewUpperIn = maUpperRect.IsInside( rMEvt.GetPosPixel() ); + bool bNewUpperIn = maUpperRect.IsInside( rMEvt.GetPosPixel() ); if ( bNewUpperIn != mbUpperIn ) { if ( bNewUpperIn ) @@ -501,7 +501,7 @@ void SpinField::MouseMove( const MouseEvent& rMEvt ) } else if ( mbInitialDown ) { - sal_Bool bNewLowerIn = maLowerRect.IsInside( rMEvt.GetPosPixel() ); + bool bNewLowerIn = maLowerRect.IsInside( rMEvt.GetPosPixel() ); if ( bNewLowerIn != mbLowerIn ) { if ( bNewLowerIn ) @@ -637,7 +637,7 @@ void SpinField::Paint( const Rectangle& rRect ) { if ( mbSpin ) { - sal_Bool bEnable = IsEnabled(); + bool bEnable = IsEnabled(); ImplDrawSpinButton( this, maUpperRect, maLowerRect, mbUpperIn, mbLowerIn, bEnable, bEnable ); } @@ -693,7 +693,7 @@ void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rec if ( !(aSize.Height() & 0x01) ) nBottom1--; - sal_Bool bNativeRegionOK = sal_False; + bool bNativeRegionOK = false; Rectangle aContentUp, aContentDown; if ( (pDev->GetOutDevType() == OUTDEV_WINDOW) && @@ -832,9 +832,9 @@ void SpinField::StateChanged( StateChangedType nType ) else if ( nType == STATE_CHANGE_STYLE ) { if ( GetStyle() & WB_REPEAT ) - mbRepeat = sal_True; + mbRepeat = true; else - mbRepeat = sal_False; + mbRepeat = false; } else if ( nType == STATE_CHANGE_ZOOM ) { @@ -847,21 +847,21 @@ void SpinField::StateChanged( StateChangedType nType ) { if ( mpEdit ) mpEdit->SetControlFont( GetControlFont() ); - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) { if ( mpEdit ) mpEdit->SetControlForeground( GetControlForeground() ); - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { if ( mpEdit ) mpEdit->SetControlBackground( GetControlBackground() ); - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); Invalidate(); } else if( nType == STATE_CHANGE_MIRRORING ) @@ -951,15 +951,15 @@ bool SpinField::PreNotify( NotifyEvent& rNEvt ) void SpinField::EndDropDown() { - mbInDropDown = sal_False; + mbInDropDown = false; Paint( Rectangle( Point(), GetOutputSizePixel() ) ); } // ----------------------------------------------------------------------- -sal_Bool SpinField::ShowDropDown( sal_Bool ) +bool SpinField::ShowDropDown( sal_Bool ) { - return sal_False; + return false; } Size SpinField::CalcMinimumSizeForText(const OUString &rString) const @@ -1091,7 +1091,7 @@ void SpinField::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, if ( GetStyle() & WB_SPIN ) { - ImplDrawSpinButton( pDev, aUp, aDown, sal_False, sal_False, sal_True, sal_True ); + ImplDrawSpinButton( pDev, aUp, aDown, false, false, true, true ); } pDev->Pop(); diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index b8ccac827576..152449e242a5 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -110,15 +110,15 @@ void TabControl::ImplInit( Window* pParent, WinBits nStyle ) mnMaxPageWidth = 0; mnActPageId = 0; mnCurPageId = 0; - mbFormat = sal_True; - mbRestoreHelpId = sal_False; - mbRestoreUnqId = sal_False; - mbSmallInvalidate = sal_False; + mbFormat = true; + mbRestoreHelpId = false; + mbRestoreUnqId = false; + mbSmallInvalidate = false; mpTabCtrlData = new ImplTabCtrlData; mpTabCtrlData->mpListBox = NULL; - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); if( (nStyle & WB_DROPDOWN) ) { @@ -131,7 +131,7 @@ void TabControl::ImplInit( Window* pParent, WinBits nStyle ) // if the tabcontrol is drawn (ie filled) by a native widget, make sure all contols will have transparent background // otherwise they will paint with a wrong background if( IsNativeControlSupported(CTRL_TAB_PANE, PART_ENTIRE_CONTROL) ) - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); if ( pParent->IsDialog() ) pParent->AddChildEventListener( LINK( this, TabControl, ImplWindowEventListener ) ); @@ -152,8 +152,8 @@ const Color& TabControl::GetCanonicalTextColor( const StyleSettings& _rStyle ) c // ----------------------------------------------------------------------- -void TabControl::ImplInitSettings( sal_Bool bFont, - sal_Bool bForeground, sal_Bool bBackground ) +void TabControl::ImplInitSettings( bool bFont, + bool bForeground, bool bBackground ) { Control::ImplInitSettings( bFont, bForeground ); @@ -168,17 +168,17 @@ void TabControl::ImplInitSettings( sal_Bool bFont, { // set transparent mode for NWF tabcontrols to have // the background always cleared properly - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); SetBackground(); ImplGetWindowImpl()->mbUseNativeFocus = ImplGetSVData()->maNWFData.mbNoFocusRects; } else { - EnableChildTransparentMode( sal_False ); + EnableChildTransparentMode( false ); SetParentClipMode( 0 ); - SetPaintTransparent( sal_False ); + SetPaintTransparent( false ); if ( IsControlBackground() ) SetBackground( GetControlBackground() ); @@ -461,7 +461,7 @@ Rectangle TabControl::ImplGetTabRect( sal_uInt16 nItemPos, long nWidth, long nHe if ( mbFormat || (mnLastWidth != nWidth) || (mnLastHeight != nHeight) ) { Font aFont( GetFont() ); - aFont.SetTransparent( sal_True ); + aFont.SetTransparent( true ); SetFont( aFont ); Size aSize; @@ -524,7 +524,7 @@ Rectangle TabControl::ImplGetTabRect( sal_uInt16 nItemPos, long nWidth, long nHe Rectangle aNewRect( Point( nX, nY ), aSize ); if ( mbSmallInvalidate && (it->maRect != aNewRect) ) - mbSmallInvalidate = sal_False; + mbSmallInvalidate = false; it->maRect = aNewRect; it->mnLine = nLines; it->mbFullVisible = true; @@ -621,7 +621,7 @@ Rectangle TabControl::ImplGetTabRect( sal_uInt16 nItemPos, long nWidth, long nHe mnLastWidth = nWidth; mnLastHeight = nHeight; - mbFormat = sal_False; + mbFormat = false; } return size_t(nItemPos) < mpTabCtrlData->maItemList.size() ? mpTabCtrlData->maItemList[nItemPos].maRect : Rectangle(); @@ -693,12 +693,12 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ) // also set the help id of the parent window to that of the tab page if ( GetHelpId().isEmpty() ) { - mbRestoreHelpId = sal_True; + mbRestoreHelpId = true; pCtrlParent->SetHelpId( pPage->GetHelpId() ); } if ( pCtrlParent->GetUniqueId().isEmpty() ) { - mbRestoreUnqId = sal_True; + mbRestoreUnqId = true; pCtrlParent->SetUniqueId( pPage->GetUniqueId() ); } @@ -735,7 +735,7 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ) // ----------------------------------------------------------------------- -sal_Bool TabControl::ImplPosCurTabPage() +bool TabControl::ImplPosCurTabPage() { // resize/position current TabPage ImplTabItem* pItem = ImplGetItem( GetCurPageId() ); @@ -745,19 +745,19 @@ sal_Bool TabControl::ImplPosCurTabPage() { Rectangle aRectNoTab( (const Point&)Point( 0, 0 ), GetSizePixel() ); pItem->mpTabPage->SetPosSizePixel( aRectNoTab.TopLeft(), aRectNoTab.GetSize() ); - return sal_True; + return true; } Rectangle aRect = ImplGetTabRect( TAB_PAGERECT ); pItem->mpTabPage->SetPosSizePixel( aRect.TopLeft(), aRect.GetSize() ); - return sal_True; + return true; } - return sal_False; + return false; } // ----------------------------------------------------------------------- -void TabControl::ImplActivateTabPage( sal_Bool bNext ) +void TabControl::ImplActivateTabPage( bool bNext ) { sal_uInt16 nCurPos = GetPagePos( GetCurPageId() ); @@ -851,7 +851,7 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo bool bLeftBorder = true; bool bRightBorder = true; sal_uInt16 nOff; - sal_Bool bNativeOK = sal_False; + bool bNativeOK = false; sal_uInt16 nOff2 = 0; sal_uInt16 nOff3 = 0; @@ -890,7 +890,7 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo } } - if( !bLayout && (bNativeOK = IsNativeControlSupported(CTRL_TAB_ITEM, PART_ENTIRE_CONTROL)) == sal_True ) + if( !bLayout && (bNativeOK = IsNativeControlSupported(CTRL_TAB_ITEM, PART_ENTIRE_CONTROL)) ) { Rectangle aCtrlRegion( pItem->maRect ); ControlState nState = 0; @@ -989,7 +989,7 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo // set font accordingly, current item is painted bold // we set the font attributes always before drawing to be re-entrant (DrawNativeControl may trigger additional paints) Font aFont( GetFont() ); - aFont.SetTransparent( sal_True ); + aFont.SetTransparent( true ); SetFont( aFont ); Size aTabSize = aRect.GetSize(); @@ -1043,7 +1043,7 @@ bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) { if ( (nKeyCode == KEY_TAB) || (nKeyCode == KEY_PAGEUP) ) { - ImplActivateTabPage( sal_False ); + ImplActivateTabPage( false ); nRet = true; } } @@ -1051,7 +1051,7 @@ bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) { if ( (nKeyCode == KEY_TAB) || (nKeyCode == KEY_PAGEDOWN) ) { - ImplActivateTabPage( sal_True ); + ImplActivateTabPage( true ); nRet = true; } } @@ -1117,7 +1117,7 @@ void TabControl::KeyInput( const KeyEvent& rKEvt ) if ( (nKeyCode == KEY_LEFT) || (nKeyCode == KEY_RIGHT) ) { - sal_Bool bNext = (nKeyCode == KEY_RIGHT); + bool bNext = (nKeyCode == KEY_RIGHT); ImplActivateTabPage( bNext ); } } @@ -1176,8 +1176,8 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) aRect.Right()+=10; } - sal_Bool bNativeOK = sal_False; - if( ! bLayout && (bNativeOK = IsNativeControlSupported( CTRL_TAB_PANE, PART_ENTIRE_CONTROL) ) == sal_True ) + bool bNativeOK = false; + if( ! bLayout && (bNativeOK = IsNativeControlSupported( CTRL_TAB_PANE, PART_ENTIRE_CONTROL) ) ) { const ImplControlValue aControlValue; @@ -1312,7 +1312,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) ImplShowFocus(); if( ! bLayout ) - mbSmallInvalidate = sal_True; + mbSmallInvalidate = true; } // ----------------------------------------------------------------------- @@ -1336,10 +1336,10 @@ void TabControl::setAllocation(const Size &rAllocation) mpTabCtrlData->mpListBox->SetPosSizePixel( aNewPos, aNewSize ); } - mbFormat = sal_True; + mbFormat = true; // resize/position active TabPage - sal_Bool bTabPage = ImplPosCurTabPage(); + bool bTabPage = ImplPosCurTabPage(); // check what needs to be invalidated Size aNewSize = rAllocation; @@ -1350,7 +1350,7 @@ void TabControl::setAllocation(const Size &rAllocation) if ( !it->mbFullVisible || (it->maRect.Right()-2 >= nNewWidth) ) { - mbSmallInvalidate = sal_False; + mbSmallInvalidate = false; break; } } @@ -1579,17 +1579,17 @@ void TabControl::StateChanged( StateChangedType nType ) else if ( (nType == STATE_CHANGE_ZOOM) || (nType == STATE_CHANGE_CONTROLFONT) ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); Invalidate(); } } @@ -1605,7 +1605,7 @@ void TabControl::DataChanged( const DataChangedEvent& rDCEvt ) ((rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) { - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); Invalidate(); } } @@ -1796,7 +1796,7 @@ void TabControl::InsertPage( sal_uInt16 nPageId, const OUString& rText, pItem->maText = rText; pItem->mbFullVisible = false; - mbFormat = sal_True; + mbFormat = true; if ( IsUpdateMode() ) Invalidate(); @@ -1845,7 +1845,7 @@ void TabControl::RemovePage( sal_uInt16 nPageId ) } } - mbFormat = sal_True; + mbFormat = true; if ( IsUpdateMode() ) Invalidate(); @@ -1867,7 +1867,7 @@ void TabControl::Clear() ImplFreeLayoutData(); - mbFormat = sal_True; + mbFormat = true; if ( IsUpdateMode() ) Invalidate(); @@ -1883,7 +1883,7 @@ void TabControl::EnablePage( sal_uInt16 i_nPageId, bool i_bEnable ) if ( pItem && pItem->mbEnabled != i_bEnable ) { pItem->mbEnabled = i_bEnable; - mbFormat = sal_True; + mbFormat = true; if( mpTabCtrlData->mpListBox ) mpTabCtrlData->mpListBox->SetEntryFlags( GetPagePos( i_nPageId ), i_bEnable ? 0 : (LISTBOX_ENTRY_FLAG_DISABLE_SELECTION | LISTBOX_ENTRY_FLAG_DRAW_DISABLED) ); @@ -1993,7 +1993,7 @@ void TabControl::SetCurPageId( sal_uInt16 nPageId ) mnActPageId = nPageId; else { - mbFormat = sal_True; + mbFormat = true; sal_uInt16 nOldId = mnCurPageId; mnCurPageId = nPageId; ImplChangeTabPage( nPageId, nOldId ); @@ -2086,7 +2086,7 @@ void TabControl::SetPageText( sal_uInt16 nPageId, const OUString& rText ) if ( pItem && pItem->maText != rText ) { pItem->maText = rText; - mbFormat = sal_True; + mbFormat = true; if( mpTabCtrlData->mpListBox ) { sal_uInt16 nPos = GetPagePos( nPageId ); @@ -2186,7 +2186,7 @@ void TabControl::SetPageImage( sal_uInt16 i_nPageId, const Image& i_rImage ) if ( pItem ) { pItem->maTabImage = i_rImage; - mbFormat = sal_True; + mbFormat = true; if ( IsUpdateMode() ) Invalidate(); } diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index b1be3c353eee..96d95352f3d0 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -44,7 +44,7 @@ namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode; Throbber::Throbber( Window* i_parentWindow, WinBits i_style, const ImageSet i_imageSet ) :ImageControl( i_parentWindow, i_style ) - ,mbRepeat( sal_True ) + ,mbRepeat( true ) ,mnStepTime( 100 ) ,mnCurStep( 0 ) ,mnStepCount( 0 ) @@ -59,7 +59,7 @@ Throbber::Throbber( Window* i_parentWindow, WinBits i_style, const ImageSet i_im Throbber::Throbber( Window* i_parentWindow, const ResId& i_resId, const ImageSet i_imageSet ) :ImageControl( i_parentWindow, i_resId ) - ,mbRepeat( sal_True ) + ,mbRepeat( true ) ,mnStepTime( 100 ) ,mnCurStep( 0 ) ,mnStepCount( 0 ) diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index fd91bd11e023..30c8dc49db7e 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -72,7 +72,7 @@ public: sal_uInt8 GetRightToLeft() const { return nRightToLeft; } sal_uInt8& GetRightToLeft() { return nRightToLeft; } - sal_Bool IsRightToLeft() const { return (nRightToLeft&1); } + bool IsRightToLeft() const { return (nRightToLeft&1); } bool HasValidSize() const { return nWidth != (-1); } }; @@ -88,7 +88,7 @@ public: ~TETextPortionList(); void Reset(); - sal_uInt16 FindPortion( sal_uInt16 nCharPos, sal_uInt16& rPortionStart, sal_Bool bPreferStartingPortion = sal_False ); + sal_uInt16 FindPortion( sal_uInt16 nCharPos, sal_uInt16& rPortionStart, bool bPreferStartingPortion = false ); sal_uInt16 GetPortionStartIndex( sal_uInt16 nPortion ); void DeleteFromPortion( sal_uInt16 nDelFrom ); }; @@ -126,10 +126,10 @@ public: mbInvalid = true; } - sal_Bool IsIn( sal_uInt16 nIndex ) const + bool IsIn( sal_uInt16 nIndex ) const { return ( (nIndex >= mnStart ) && ( nIndex < mnEnd ) ); } - sal_Bool IsIn( sal_uInt16 nIndex, sal_Bool bInclEnd ) const + bool IsIn( sal_uInt16 nIndex, bool bInclEnd ) const { return ( ( nIndex >= mnStart ) && ( bInclEnd ? ( nIndex <= mnEnd ) : ( nIndex < mnEnd ) ) ); } void SetStart( sal_uInt16 n ) { mnStart = n; } @@ -229,7 +229,7 @@ public: std::vector<TEWritingDirectionInfo>& GetWritingDirectionInfos() { return maWritingDirectionInfos; } - sal_uInt16 GetLineNumber( sal_uInt16 nIndex, sal_Bool bInclEnd ); + sal_uInt16 GetLineNumber( sal_uInt16 nIndex, bool bInclEnd ); void CorrectValuesBehindLastFormattedLine( sal_uInt16 nLastFormattedLine ); }; @@ -255,9 +255,9 @@ public: virtual void CreateAnchor(); - virtual sal_Bool SetCursorAtPoint( const Point& rPointPixel, sal_Bool bDontSelectAtCursor = sal_False ); + virtual bool SetCursorAtPoint( const Point& rPointPixel, sal_Bool bDontSelectAtCursor = sal_False ); - virtual sal_Bool IsSelectionAtPoint( const Point& rPointPixel ); + virtual bool IsSelectionAtPoint( const Point& rPointPixel ); virtual void DeselectAll(); virtual void DeselectAtPoint( const Point& ); @@ -285,14 +285,14 @@ struct TextDDInfo Cursor maCursor; TextPaM maDropPos; - sal_Bool mbStarterOfDD; - sal_Bool mbVisCursor; + bool mbStarterOfDD; + bool mbVisCursor; TextDDInfo() { maCursor.SetStyle( CURSOR_SHADOW ); - mbStarterOfDD = sal_False; - mbVisCursor = sal_False; + mbStarterOfDD = false; + mbVisCursor = false; } }; diff --git a/vcl/source/edit/textdata.cxx b/vcl/source/edit/textdata.cxx index 6ac9459a26f4..892ffc1f4dba 100644 --- a/vcl/source/edit/textdata.cxx +++ b/vcl/source/edit/textdata.cxx @@ -73,7 +73,7 @@ void TETextPortionList::DeleteFromPortion( sal_uInt16 nDelFrom ) erase( begin() + nDelFrom, end() ); } -sal_uInt16 TETextPortionList::FindPortion( sal_uInt16 nCharPos, sal_uInt16& nPortionStart, sal_Bool bPreferStartingPortion ) +sal_uInt16 TETextPortionList::FindPortion( sal_uInt16 nCharPos, sal_uInt16& nPortionStart, bool bPreferStartingPortion ) { // find left portion at nCharPos at portion border sal_uInt16 nTmpPos = 0; @@ -163,7 +163,7 @@ void TEParaPortion::MarkSelectionInvalid( sal_uInt16 nStart, sal_uInt16 /*nEnd*/ mbSimple = false; } -sal_uInt16 TEParaPortion::GetLineNumber( sal_uInt16 nChar, sal_Bool bInclEnd ) +sal_uInt16 TEParaPortion::GetLineNumber( sal_uInt16 nChar, bool bInclEnd ) { for ( sal_uInt16 nLine = 0; nLine < maLines.size(); nLine++ ) { diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx index c2a4b74ceeec..698e521c32b5 100644 --- a/vcl/source/edit/textdoc.cxx +++ b/vcl/source/edit/textdoc.cxx @@ -47,7 +47,7 @@ TextCharAttrib::~TextCharAttrib() TextCharAttribList::TextCharAttribList() { - mbHasEmptyAttribs = sal_False; + mbHasEmptyAttribs = false; } TextCharAttribList::~TextCharAttribList() @@ -55,7 +55,7 @@ TextCharAttribList::~TextCharAttribList() // PTRARR_DEL } -void TextCharAttribList::Clear( sal_Bool bDestroyAttribs ) +void TextCharAttribList::Clear( bool bDestroyAttribs ) { if ( bDestroyAttribs ) for(iterator it = begin(); it != end(); ++it) @@ -67,7 +67,7 @@ void TextCharAttribList::Clear( sal_Bool bDestroyAttribs ) void TextCharAttribList::InsertAttrib( TextCharAttrib* pAttrib ) { if ( pAttrib->IsEmpty() ) - mbHasEmptyAttribs = sal_True; + mbHasEmptyAttribs = true; const sal_uInt16 nCount = size(); const sal_uInt16 nStart = pAttrib->GetStart(); // maybe better for Comp.Opt. @@ -124,18 +124,18 @@ TextCharAttrib* TextCharAttribList::FindNextAttrib( sal_uInt16 nWhich, sal_uInt1 return NULL; } -sal_Bool TextCharAttribList::HasAttrib( sal_uInt16 nWhich ) const +bool TextCharAttribList::HasAttrib( sal_uInt16 nWhich ) const { for ( sal_uInt16 nAttr = size(); nAttr; ) { const TextCharAttrib* pAttr = GetAttrib( --nAttr ); if ( pAttr->Which() == nWhich ) - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool TextCharAttribList::HasBoundingAttrib( sal_uInt16 nBound ) +bool TextCharAttribList::HasBoundingAttrib( sal_uInt16 nBound ) { // backwards; if one ends there and the next starts there // ==> the starting one counts @@ -144,12 +144,12 @@ sal_Bool TextCharAttribList::HasBoundingAttrib( sal_uInt16 nBound ) TextCharAttrib* pAttr = GetAttrib( --nAttr ); if ( pAttr->GetEnd() < nBound ) - return sal_False; + return false; if ( ( pAttr->GetStart() == nBound ) || ( pAttr->GetEnd() == nBound ) ) - return sal_True; + return true; } - return sal_False; + return false; } TextCharAttrib* TextCharAttribList::FindEmptyAttrib( sal_uInt16 nWhich, sal_uInt16 nPos ) @@ -182,7 +182,7 @@ void TextCharAttribList::DeleteEmptyAttribs() nAttr--; } } - mbHasEmptyAttribs = sal_False; + mbHasEmptyAttribs = false; } TextNode::TextNode( const OUString& rText ) : @@ -310,7 +310,7 @@ void TextNode::CollapsAttribs( sal_uInt16 nIndex, sal_uInt16 nDeleted ) nAttr--; } else if ( pAttrib->IsEmpty() ) - maCharAttribs.HasEmptyAttribs() = sal_True; + maCharAttribs.HasEmptyAttribs() = true; } if ( bResort ) @@ -335,7 +335,7 @@ void TextNode::RemoveText( sal_uInt16 nPos, sal_uInt16 nChars ) CollapsAttribs( nPos, nChars ); } -TextNode* TextNode::Split( sal_uInt16 nPos, sal_Bool bKeepEndingAttribs ) +TextNode* TextNode::Split( sal_uInt16 nPos, bool bKeepEndingAttribs ) { OUString aNewText; if ( nPos < maText.getLength() ) @@ -545,7 +545,7 @@ TextPaM TextDoc::InsertText( const TextPaM& rPaM, const OUString& rStr ) return aPaM; } -TextPaM TextDoc::InsertParaBreak( const TextPaM& rPaM, sal_Bool bKeepEndingAttribs ) +TextPaM TextDoc::InsertParaBreak( const TextPaM& rPaM, bool bKeepEndingAttribs ) { TextNode* pNode = maTextNodes.GetObject( rPaM.GetPara() ); TextNode* pNew = pNode->Split( rPaM.GetIndex(), bKeepEndingAttribs ); @@ -579,20 +579,20 @@ TextPaM TextDoc::RemoveChars( const TextPaM& rPaM, sal_uInt16 nChars ) return rPaM; } -sal_Bool TextDoc::IsValidPaM( const TextPaM& rPaM ) +bool TextDoc::IsValidPaM( const TextPaM& rPaM ) { if ( rPaM.GetPara() >= maTextNodes.Count() ) { OSL_FAIL( "PaM: Para out of range" ); - return sal_False; + return false; } TextNode * pNode = maTextNodes.GetObject( rPaM.GetPara() ); if ( rPaM.GetIndex() > pNode->GetText().getLength() ) { OSL_FAIL( "PaM: Index out of range" ); - return sal_False; + return false; } - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/edit/textdoc.hxx b/vcl/source/edit/textdoc.hxx index e00cafddd664..06623ce218dd 100644 --- a/vcl/source/edit/textdoc.hxx +++ b/vcl/source/edit/textdoc.hxx @@ -37,7 +37,7 @@ public: class TextCharAttribList : private TextCharAttribs { private: - sal_Bool mbHasEmptyAttribs; + bool mbHasEmptyAttribs; TextCharAttribList( const TextCharAttribList& ) : TextCharAttribs() {} @@ -45,7 +45,7 @@ public: TextCharAttribList(); ~TextCharAttribList(); - void Clear( sal_Bool bDestroyAttribs ); + void Clear( bool bDestroyAttribs ); sal_uInt16 Count() const { return TextCharAttribs::size(); } TextCharAttrib* GetAttrib( sal_uInt16 n ) const { return TextCharAttribs::operator[]( n ); } @@ -56,14 +56,14 @@ public: void DeleteEmptyAttribs(); void ResortAttribs(); - sal_Bool HasEmptyAttribs() const { return mbHasEmptyAttribs; } - sal_Bool& HasEmptyAttribs() { return mbHasEmptyAttribs; } + bool HasEmptyAttribs() const { return mbHasEmptyAttribs; } + bool& HasEmptyAttribs() { return mbHasEmptyAttribs; } TextCharAttrib* FindAttrib( sal_uInt16 nWhich, sal_uInt16 nPos ); TextCharAttrib* FindNextAttrib( sal_uInt16 nWhich, sal_uInt16 nFromPos, sal_uInt16 nMaxPos = 0xFFFF ) const; TextCharAttrib* FindEmptyAttrib( sal_uInt16 nWhich, sal_uInt16 nPos ); - sal_Bool HasAttrib( sal_uInt16 nWhich ) const; - sal_Bool HasBoundingAttrib( sal_uInt16 nBound ); + bool HasAttrib( sal_uInt16 nWhich ) const; + bool HasBoundingAttrib( sal_uInt16 nBound ); }; @@ -91,7 +91,7 @@ public: void InsertText( sal_uInt16 nPos, sal_Unicode c ); void RemoveText( sal_uInt16 nPos, sal_uInt16 nChars ); - TextNode* Split( sal_uInt16 nPos, sal_Bool bKeepEndigAttribs ); + TextNode* Split( sal_uInt16 nPos, bool bKeepEndigAttribs ); void Append( const TextNode& rNode ); }; @@ -117,7 +117,7 @@ public: TextPaM InsertText( const TextPaM& rPaM, sal_Unicode c ); TextPaM InsertText( const TextPaM& rPaM, const OUString& rStr ); - TextPaM InsertParaBreak( const TextPaM& rPaM, sal_Bool bKeepEndingAttribs ); + TextPaM InsertParaBreak( const TextPaM& rPaM, bool bKeepEndingAttribs ); TextPaM ConnectParagraphs( TextNode* pLeft, TextNode* pRight ); sal_uLong GetTextLen( const sal_Unicode* pSep, const TextSelection* pSel = NULL ) const; @@ -127,7 +127,7 @@ public: void SetLeftMargin( sal_uInt16 n ) { mnLeftMargin = n; } sal_uInt16 GetLeftMargin() const { return mnLeftMargin; } - sal_Bool IsValidPaM( const TextPaM& rPaM ); + bool IsValidPaM( const TextPaM& rPaM ); }; #endif // INCLUDED_VCL_SOURCE_EDIT_TEXTDOC_HXX diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index cbd0f9847189..985347cb0b42 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -70,15 +70,15 @@ TextEngine::TextEngine() mpViews = new TextViews; mpActiveView = NULL; - mbIsFormatting = sal_False; - mbFormatted = sal_False; - mbUpdate = sal_True; - mbModified = sal_False; - mbUndoEnabled = sal_False; - mbIsInUndo = sal_False; - mbDowning = sal_False; - mbRightToLeft = sal_False; - mbHasMultiLineParas = sal_False; + mbIsFormatting = false; + mbFormatted = false; + mbUpdate = true; + mbModified = false; + mbUndoEnabled = false; + mbIsInUndo = false; + mbDowning = false; + mbRightToLeft = false; + mbHasMultiLineParas = false; meAlign = TXTALIGN_LEFT; @@ -102,7 +102,7 @@ TextEngine::TextEngine() maTextColor = COL_BLACK; Font aFont; - aFont.SetTransparent( sal_False ); + aFont.SetTransparent( false ); Color aFillColor( aFont.GetFillColor() ); aFillColor.SetTransparency( 0 ); aFont.SetFillColor( aFillColor ); @@ -111,7 +111,7 @@ TextEngine::TextEngine() TextEngine::~TextEngine() { - mbDowning = sal_True; + mbDowning = true; delete mpIdleFormatter; delete mpDoc; @@ -188,7 +188,7 @@ void TextEngine::SetFont( const Font& rFont ) // Do not allow transparent fonts because of selection // (otherwise delete the background in ImplPaint later differently) - maFont.SetTransparent( sal_False ); + maFont.SetTransparent( false ); // Tell VCL not to use the font color, use text color from OutputDevice maFont.SetColor( COL_TRANSPARENT ); Color aFillColor( maFont.GetFillColor() ); @@ -306,7 +306,7 @@ sal_uInt16 TextEngine::GetTextLen( sal_uLong nPara ) const return mpDoc->GetNodes().GetObject( nPara )->GetText().getLength(); } -void TextEngine::SetUpdateMode( sal_Bool bUpdate ) +void TextEngine::SetUpdateMode( bool bUpdate ) { if ( bUpdate != mbUpdate ) { @@ -320,9 +320,9 @@ void TextEngine::SetUpdateMode( sal_Bool bUpdate ) } } -sal_Bool TextEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent ) +bool TextEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent ) { - sal_Bool bDoesChange = sal_False; + bool bDoesChange = false; KeyFuncType eFunc = rKeyEvent.GetKeyCode().GetFunction(); if ( eFunc != KEYFUNC_DONTKNOW ) @@ -332,7 +332,7 @@ sal_Bool TextEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent ) case KEYFUNC_UNDO: case KEYFUNC_REDO: case KEYFUNC_CUT: - case KEYFUNC_PASTE: bDoesChange = sal_True; + case KEYFUNC_PASTE: bDoesChange = true; break; default: // might get handled below eFunc = KEYFUNC_DONTKNOW; @@ -346,14 +346,14 @@ sal_Bool TextEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent ) case KEY_BACKSPACE: { if ( !rKeyEvent.GetKeyCode().IsMod2() ) - bDoesChange = sal_True; + bDoesChange = true; } break; case KEY_RETURN: case KEY_TAB: { if ( !rKeyEvent.GetKeyCode().IsMod1() && !rKeyEvent.GetKeyCode().IsMod2() ) - bDoesChange = sal_True; + bDoesChange = true; } break; default: @@ -365,15 +365,15 @@ sal_Bool TextEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent ) return bDoesChange; } -sal_Bool TextEngine::IsSimpleCharInput( const KeyEvent& rKeyEvent ) +bool TextEngine::IsSimpleCharInput( const KeyEvent& rKeyEvent ) { if( rKeyEvent.GetCharCode() >= 32 && rKeyEvent.GetCharCode() != 127 && KEY_MOD1 != (rKeyEvent.GetKeyCode().GetModifier() & ~KEY_SHIFT) && // (ssa) #i45714#: KEY_MOD2 != (rKeyEvent.GetKeyCode().GetModifier() & ~KEY_SHIFT) ) // check for Ctrl and Alt separately { - return sal_True; + return true; } - return sal_False; + return false; } void TextEngine::ImpInitDoc() @@ -392,7 +392,7 @@ void TextEngine::ImpInitDoc() TEParaPortion* pIniPortion = new TEParaPortion( pNode ); mpTEParaPortions->Insert( pIniPortion, (sal_uLong)0 ); - mbFormatted = sal_False; + mbFormatted = false; ImpParagraphRemoved( TEXT_PARA_ALL ); ImpParagraphInserted( 0 ); @@ -447,9 +447,9 @@ void TextEngine::SetText( const OUString& rText ) { ImpRemoveText(); - sal_Bool bUndoCurrentlyEnabled = IsUndoEnabled(); + bool bUndoCurrentlyEnabled = IsUndoEnabled(); // the manually inserted text cannot be reversed by the user - EnableUndo( sal_False ); + EnableUndo( false ); TextPaM aStartPaM( 0, 0 ); TextSelection aEmptySel( aStartPaM, aStartPaM ); @@ -639,7 +639,7 @@ uno::Reference < i18n::XExtendedInputSequenceChecker > TextEngine::GetInputSeque return mxISC; } -sal_Bool TextEngine::IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const +bool TextEngine::IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const { SvtCTLOptions aCTLOptions; @@ -663,12 +663,12 @@ sal_Bool TextEngine::IsInputSequenceCheckingRequired( sal_Unicode c, const TextS return bIsSequenceChecking; } -TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, sal_Unicode c, sal_Bool bOverwrite ) +TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, sal_Unicode c, bool bOverwrite ) { - return ImpInsertText( c, rCurSel, bOverwrite, sal_False ); + return ImpInsertText( c, rCurSel, bOverwrite, false ); } -TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, sal_Bool bOverwrite, sal_Bool bIsUserInput ) +TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, bool bOverwrite, bool bIsUserInput ) { DBG_ASSERT( c != '\n', "InsertText: NewLine!" ); DBG_ASSERT( c != '\r', "InsertText: NewLine!" ); @@ -751,7 +751,7 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, if ( IsUndoEnabled() && !IsInUndo() ) { TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, OUString(c) ); - sal_Bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False; + bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False; InsertUndo( pNewUndo, bTryMerge ); } @@ -822,7 +822,7 @@ TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, const OUString& return aPaM; } -TextPaM TextEngine::ImpInsertParaBreak( const TextSelection& rCurSel, sal_Bool bKeepEndingAttribs ) +TextPaM TextEngine::ImpInsertParaBreak( const TextSelection& rCurSel, bool bKeepEndingAttribs ) { TextPaM aPaM; if ( rCurSel.HasRange() ) @@ -833,7 +833,7 @@ TextPaM TextEngine::ImpInsertParaBreak( const TextSelection& rCurSel, sal_Bool b return ImpInsertParaBreak( aPaM, bKeepEndingAttribs ); } -TextPaM TextEngine::ImpInsertParaBreak( const TextPaM& rPaM, sal_Bool bKeepEndingAttribs ) +TextPaM TextEngine::ImpInsertParaBreak( const TextPaM& rPaM, bool bKeepEndingAttribs ) { if ( IsUndoEnabled() && !IsInUndo() ) InsertUndo( new TextUndoSplitPara( this, rPaM.GetPara(), rPaM.GetIndex() ) ); @@ -861,7 +861,7 @@ TextPaM TextEngine::ImpInsertParaBreak( const TextPaM& rPaM, sal_Bool bKeepEndin return aPaM; } -Rectangle TextEngine::PaMtoEditCursor( const TextPaM& rPaM, sal_Bool bSpecial ) +Rectangle TextEngine::PaMtoEditCursor( const TextPaM& rPaM, bool bSpecial ) { DBG_ASSERT( GetUpdateMode(), "PaMtoEditCursor: GetUpdateMode()" ); @@ -887,7 +887,7 @@ Rectangle TextEngine::PaMtoEditCursor( const TextPaM& rPaM, sal_Bool bSpecial ) return aEditCursor; } -Rectangle TextEngine::GetEditCursor( const TextPaM& rPaM, sal_Bool bSpecial, sal_Bool bPreferPortionStart ) +Rectangle TextEngine::GetEditCursor( const TextPaM& rPaM, bool bSpecial, bool bPreferPortionStart ) { if ( !IsFormatted() && !IsFormatting() ) FormatAndUpdate(); @@ -940,16 +940,16 @@ Rectangle TextEngine::GetEditCursor( const TextPaM& rPaM, sal_Bool bSpecial, sal return aEditCursor; } -long TextEngine::ImpGetXPos( sal_uLong nPara, TextLine* pLine, sal_uInt16 nIndex, sal_Bool bPreferPortionStart ) +long TextEngine::ImpGetXPos( sal_uLong nPara, TextLine* pLine, sal_uInt16 nIndex, bool bPreferPortionStart ) { DBG_ASSERT( ( nIndex >= pLine->GetStart() ) && ( nIndex <= pLine->GetEnd() ) , "ImpGetXPos: Bad parameters!" ); - sal_Bool bDoPreferPortionStart = bPreferPortionStart; + bool bDoPreferPortionStart = bPreferPortionStart; // Assure that the portion belongs to this line if ( nIndex == pLine->GetStart() ) - bDoPreferPortionStart = sal_True; + bDoPreferPortionStart = true; else if ( nIndex == pLine->GetEnd() ) - bDoPreferPortionStart = sal_False; + bDoPreferPortionStart = false; TEParaPortion* pParaPortion = mpTEParaPortions->GetObject( nPara ); @@ -985,7 +985,7 @@ long TextEngine::ImpGetXPos( sal_uLong nPara, TextLine* pLine, sal_uInt16 nIndex // nX += pNextPortion->GetWidth(); // End of the tab portion, use start of next for cursor pos DBG_ASSERT( !bPreferPortionStart, "ImpGetXPos: How can we get here!" ); - nX = ImpGetXPos( nPara, pLine, nIndex, sal_True ); + nX = ImpGetXPos( nPara, pLine, nIndex, true ); } } @@ -1039,9 +1039,9 @@ const TextCharAttrib* TextEngine::FindCharAttrib( const TextPaM& rPaM, sal_uInt1 return pAttr; } -sal_Bool TextEngine::HasAttrib( sal_uInt16 nWhich ) const +bool TextEngine::HasAttrib( sal_uInt16 nWhich ) const { - sal_Bool bAttr = sal_False; + bool bAttr = false; for ( sal_uLong n = mpDoc->GetNodes().Count(); --n && !bAttr; ) { TextNode* pNode = mpDoc->GetNodes().GetObject( n ); @@ -1050,7 +1050,7 @@ sal_Bool TextEngine::HasAttrib( sal_uInt16 nWhich ) const return bAttr; } -TextPaM TextEngine::GetPaM( const Point& rDocPos, sal_Bool bSmart ) +TextPaM TextEngine::GetPaM( const Point& rDocPos, bool bSmart ) { DBG_ASSERT( GetUpdateMode(), "GetPaM: GetUpdateMode()" ); @@ -1078,7 +1078,7 @@ TextPaM TextEngine::GetPaM( const Point& rDocPos, sal_Bool bSmart ) return TextPaM( nLastNode, pLast->GetText().getLength() ); } -sal_uInt16 TextEngine::ImpFindIndex( sal_uLong nPortion, const Point& rPosInPara, sal_Bool bSmart ) +sal_uInt16 TextEngine::ImpFindIndex( sal_uLong nPortion, const Point& rPosInPara, bool bSmart ) { DBG_ASSERT( IsFormatted(), "GetPaM: Not formatted" ); TEParaPortion* pPortion = mpTEParaPortions->GetObject( nPortion ); @@ -1112,7 +1112,7 @@ sal_uInt16 TextEngine::ImpFindIndex( sal_uLong nPortion, const Point& rPosInPara return nCurIndex; } -sal_uInt16 TextEngine::GetCharPos( sal_uLong nPortion, sal_uInt16 nLine, long nXPos, sal_Bool ) +sal_uInt16 TextEngine::GetCharPos( sal_uLong nPortion, sal_uInt16 nLine, long nXPos, bool ) { TEParaPortion* pPortion = mpTEParaPortions->GetObject( nPortion ); @@ -1327,7 +1327,7 @@ sal_uLong TextEngine::GetParagraphCount() const return mpDoc->GetNodes().Count(); } -void TextEngine::EnableUndo( sal_Bool bEnable ) +void TextEngine::EnableUndo( bool bEnable ) { // delete list when switching mode if ( bEnable != IsUndoEnabled() ) @@ -1358,7 +1358,7 @@ void TextEngine::UndoActionEnd() GetUndoManager().LeaveListAction(); } -void TextEngine::InsertUndo( TextUndo* pUndo, sal_Bool bTryMerge ) +void TextEngine::InsertUndo( TextUndo* pUndo, bool bTryMerge ) { DBG_ASSERT( !IsInUndo(), "InsertUndo: in Undo mode!" ); GetUndoManager().AddUndoAction( pUndo, bTryMerge ); @@ -1452,7 +1452,7 @@ void TextEngine::SeekCursor( sal_uLong nPara, sal_uInt16 nPos, Font& rFont, Outp const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); rFont.SetColor( rStyleSettings.GetHighlightTextColor() ); rFont.SetFillColor( rStyleSettings.GetHighlightColor() ); - rFont.SetTransparent( sal_False ); + rFont.SetTransparent( false ); } else if ( nAttr & EXTTEXTINPUT_ATTR_GRAYWAVELINE ) { @@ -1485,8 +1485,8 @@ void TextEngine::IdleFormatAndUpdate( TextView* pCurView, sal_uInt16 nMaxTimerRe void TextEngine::TextModified() { - mbFormatted = sal_False; - mbModified = sal_True; + mbFormatted = false; + mbModified = true; } void TextEngine::UpdateViews( TextView* pCurView ) @@ -1547,7 +1547,7 @@ void TextEngine::FormatFullDoc() sal_Int32 nLen = pTEParaPortion->GetNode()->GetText().getLength(); pTEParaPortion->MarkSelectionInvalid( 0, nLen ); } - mbFormatted = sal_False; + mbFormatted = false; FormatDoc(); } @@ -1556,8 +1556,8 @@ void TextEngine::FormatDoc() if ( IsFormatted() || !GetUpdateMode() || IsFormatting() ) return; - mbIsFormatting = sal_True; - mbHasMultiLineParas = sal_False; + mbIsFormatting = true; + mbHasMultiLineParas = false; long nY = 0; bool bGrow = false; @@ -1608,7 +1608,7 @@ void TextEngine::FormatDoc() } nY += CalcParaHeight( nPara ); if ( !mbHasMultiLineParas && pTEParaPortion->GetLines().size() > 1 ) - mbHasMultiLineParas = sal_True; + mbHasMultiLineParas = true; } if ( !maInvalidRect.IsEmpty() ) @@ -1630,13 +1630,13 @@ void TextEngine::FormatDoc() mnCurTextHeight = nNewHeight; if ( nDiff ) { - mbFormatted = sal_True; + mbFormatted = true; ImpTextHeightChanged(); } } - mbIsFormatting = sal_False; - mbFormatted = sal_True; + mbIsFormatting = false; + mbFormatted = true; ImpTextFormatted(); } @@ -2020,9 +2020,9 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan Font aFont; SeekCursor( nPara, nIndex+1, aFont, pOutDev ); if( bTransparent ) - aFont.SetTransparent( sal_True ); + aFont.SetTransparent( true ); else if ( pSelection ) - aFont.SetTransparent( sal_False ); + aFont.SetTransparent( false ); pOutDev->SetFont( aFont ); sal_uInt16 nTmpIndex = nIndex; @@ -2150,7 +2150,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan } } -sal_Bool TextEngine::CreateLines( sal_uLong nPara ) +bool TextEngine::CreateLines( sal_uLong nPara ) { // sal_Bool: changing Height of Paragraph Yes/No - sal_True/sal_False @@ -2501,10 +2501,10 @@ OUString TextEngine::GetWord( const TextPaM& rCursorPos, TextPaM* pStartOfWord ) return aWord; } -sal_Bool TextEngine::Read( SvStream& rInput, const TextSelection* pSel ) +bool TextEngine::Read( SvStream& rInput, const TextSelection* pSel ) { - sal_Bool bUpdate = GetUpdateMode(); - SetUpdateMode( sal_False ); + bool bUpdate = GetUpdateMode(); + SetUpdateMode( false ); UndoActionStart(); TextSelection aSel; @@ -2521,7 +2521,7 @@ sal_Bool TextEngine::Read( SvStream& rInput, const TextSelection* pSel ) aSel = ImpDeleteText( aSel ); OString aLine; - sal_Bool bDone = rInput.ReadLine( aLine ); + bool bDone = rInput.ReadLine( aLine ); OUString aTmpStr(OStringToOUString(aLine, rInput.GetStreamCharSet())); while ( bDone ) { @@ -2546,7 +2546,7 @@ sal_Bool TextEngine::Read( SvStream& rInput, const TextSelection* pSel ) return rInput.GetError() ? sal_False : sal_True; } -sal_Bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, sal_Bool bHTML ) +bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, bool bHTML ) { TextSelection aSel; if ( pSel ) @@ -2634,19 +2634,19 @@ sal_Bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, sal_Bo return rOutput.GetError() ? sal_False : sal_True; } -void TextEngine::RemoveAttribs( sal_uLong nPara, sal_Bool bIdleFormatAndUpdate ) +void TextEngine::RemoveAttribs( sal_uLong nPara, bool bIdleFormatAndUpdate ) { if ( nPara < mpDoc->GetNodes().Count() ) { TextNode* pNode = mpDoc->GetNodes().GetObject( nPara ); if ( pNode->GetCharAttribs().Count() ) { - pNode->GetCharAttribs().Clear( sal_True ); + pNode->GetCharAttribs().Clear( true ); TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPara ); pTEParaPortion->MarkSelectionInvalid( 0, pNode->GetText().getLength() ); - mbFormatted = sal_False; + mbFormatted = false; if ( bIdleFormatAndUpdate ) IdleFormatAndUpdate( NULL, 0xFFFF ); @@ -2655,7 +2655,7 @@ void TextEngine::RemoveAttribs( sal_uLong nPara, sal_Bool bIdleFormatAndUpdate ) } } } -void TextEngine::RemoveAttribs( sal_uLong nPara, sal_uInt16 nWhich, sal_Bool bIdleFormatAndUpdate ) +void TextEngine::RemoveAttribs( sal_uLong nPara, sal_uInt16 nWhich, bool bIdleFormatAndUpdate ) { if ( nPara < mpDoc->GetNodes().Count() ) { @@ -2671,7 +2671,7 @@ void TextEngine::RemoveAttribs( sal_uLong nPara, sal_uInt16 nWhich, sal_Bool bId } TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPara ); pTEParaPortion->MarkSelectionInvalid( 0, pNode->GetText().getLength() ); - mbFormatted = sal_False; + mbFormatted = false; if(bIdleFormatAndUpdate) IdleFormatAndUpdate( NULL, 0xFFFF ); else @@ -2698,13 +2698,13 @@ void TextEngine::RemoveAttrib( sal_uLong nPara, const TextCharAttrib& rAttrib ) } TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPara ); pTEParaPortion->MarkSelectionInvalid( 0, pNode->GetText().getLength() ); - mbFormatted = sal_False; + mbFormatted = false; FormatAndUpdate( NULL ); } } } -void TextEngine::SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_Bool bIdleFormatAndUpdate ) +void TextEngine::SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd, bool bIdleFormatAndUpdate ) { // For now do not check if Attributes overlap! @@ -2726,7 +2726,7 @@ void TextEngine::SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 pNode->GetCharAttribs().InsertAttrib( new TextCharAttrib( rAttr, nStart, nEnd ) ); pTEParaPortion->MarkSelectionInvalid( nStart, nEnd ); - mbFormatted = sal_False; + mbFormatted = false; if ( bIdleFormatAndUpdate ) IdleFormatAndUpdate( NULL, 0xFFFF ); else @@ -2932,7 +2932,7 @@ LocaleDataWrapper* TextEngine::ImpGetLocaleDataWrapper() return mpLocaleDataWrapper; } -void TextEngine::SetRightToLeft( sal_Bool bR2L ) +void TextEngine::SetRightToLeft( bool bR2L ) { if ( mbRightToLeft != bR2L ) { @@ -3084,7 +3084,7 @@ long TextEngine::ImpGetPortionXOffset( sal_uLong nPara, TextLine* pLine, sal_uIn return nX; } -void TextEngine::ImpInitLayoutMode( OutputDevice* pOutDev, sal_Bool bDrawingR2LPortion ) +void TextEngine::ImpInitLayoutMode( OutputDevice* pOutDev, bool bDrawingR2LPortion ) { sal_uLong nLayoutMode = pOutDev->GetLayoutMode(); @@ -3113,7 +3113,7 @@ long TextEngine::ImpGetOutputOffset( sal_uLong nPara, TextLine* pLine, sal_uInt1 TEParaPortion* pPortion = mpTEParaPortions->GetObject( nPara ); sal_uInt16 nPortionStart; - sal_uInt16 nPortion = pPortion->GetTextPortions().FindPortion( nIndex, nPortionStart, sal_True ); + sal_uInt16 nPortion = pPortion->GetTextPortions().FindPortion( nIndex, nPortionStart, true ); TETextPortion* pTextPortion = pPortion->GetTextPortions()[ nPortion ]; @@ -3134,7 +3134,7 @@ long TextEngine::ImpGetOutputOffset( sal_uLong nPara, TextLine* pLine, sal_uInt1 nX = ImpGetXPos( nPara, pLine, nIndex, nIndex == nPortionStart ); if ( nIndex2 != nIndex ) { - long nX2 = ImpGetXPos( nPara, pLine, nIndex2, sal_False ); + long nX2 = ImpGetXPos( nPara, pLine, nIndex2, false ); if ( ( !IsRightToLeft() && ( nX2 < nX ) ) || ( IsRightToLeft() && ( nX2 > nX ) ) ) { diff --git a/vcl/source/edit/textundo.cxx b/vcl/source/edit/textundo.cxx index 709b61b040db..6cd4f339d642 100644 --- a/vcl/source/edit/textundo.cxx +++ b/vcl/source/edit/textundo.cxx @@ -82,9 +82,9 @@ bool TextUndoManager::Undo() UndoRedoStart(); - mpTextEngine->SetIsInUndo( sal_True ); + mpTextEngine->SetIsInUndo( true ); bool bDone = SfxUndoManager::Undo(); - mpTextEngine->SetIsInUndo( sal_False ); + mpTextEngine->SetIsInUndo( false ); UndoRedoEnd(); @@ -99,9 +99,9 @@ bool TextUndoManager::Redo() UndoRedoStart(); - mpTextEngine->SetIsInUndo( sal_True ); + mpTextEngine->SetIsInUndo( true ); bool bDone = SfxUndoManager::Redo(); - mpTextEngine->SetIsInUndo( sal_False ); + mpTextEngine->SetIsInUndo( false ); UndoRedoEnd(); diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index 1f43143bba78..969e5898d29a 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -166,36 +166,36 @@ struct ImpTextView sal_uInt16 mnTravelXPos; - sal_Bool mbAutoScroll : 1; - sal_Bool mbInsertMode : 1; - sal_Bool mbReadOnly : 1; - sal_Bool mbPaintSelection : 1; - sal_Bool mbAutoIndent : 1; - sal_Bool mbHighlightSelection : 1; - sal_Bool mbCursorEnabled : 1; - sal_Bool mbClickedInSelection : 1; - sal_Bool mbSupportProtectAttribute : 1; + bool mbAutoScroll : 1; + bool mbInsertMode : 1; + bool mbReadOnly : 1; + bool mbPaintSelection : 1; + bool mbAutoIndent : 1; + bool mbHighlightSelection : 1; + bool mbCursorEnabled : 1; + bool mbClickedInSelection : 1; + bool mbSupportProtectAttribute : 1; bool mbCursorAtEndOfLine; }; TextView::TextView( TextEngine* pEng, Window* pWindow ) : mpImpl(new ImpTextView) { - pWindow->EnableRTL( sal_False ); + pWindow->EnableRTL( false ); mpImpl->mpWindow = pWindow; mpImpl->mpTextEngine = pEng; mpImpl->mpVirtDev = NULL; - mpImpl->mbPaintSelection = sal_True; - mpImpl->mbAutoScroll = sal_True; - mpImpl->mbInsertMode = sal_True; - mpImpl->mbReadOnly = sal_False; - mpImpl->mbHighlightSelection = sal_False; - mpImpl->mbAutoIndent = sal_False; - mpImpl->mbCursorEnabled = sal_True; - mpImpl->mbClickedInSelection = sal_False; - mpImpl->mbSupportProtectAttribute = sal_False; + mpImpl->mbPaintSelection = true; + mpImpl->mbAutoScroll = true; + mpImpl->mbInsertMode = true; + mpImpl->mbReadOnly = false; + mpImpl->mbHighlightSelection = false; + mpImpl->mbAutoIndent = false; + mpImpl->mbCursorEnabled = true; + mpImpl->mbClickedInSelection = false; + mpImpl->mbSupportProtectAttribute = false; mpImpl->mbCursorAtEndOfLine = false; // mbInSelection = sal_False; @@ -204,7 +204,7 @@ TextView::TextView( TextEngine* pEng, Window* pWindow ) : mpImpl->mpSelFuncSet = new TextSelFunctionSet( this ); mpImpl->mpSelEngine = new SelectionEngine( mpImpl->mpWindow, mpImpl->mpSelFuncSet ); mpImpl->mpSelEngine->SetSelectionMode( RANGE_SELECTION ); - mpImpl->mpSelEngine->EnableDrag( sal_True ); + mpImpl->mpSelEngine->EnableDrag( true ); mpImpl->mpCursor = new Cursor; mpImpl->mpCursor->Show(); @@ -212,7 +212,7 @@ TextView::TextView( TextEngine* pEng, Window* pWindow ) : pWindow->SetInputContext( InputContext( pEng->GetFont(), INPUTCONTEXT_TEXT|INPUTCONTEXT_EXTTEXTINPUT ) ); if ( pWindow->GetSettings().GetStyleSettings().GetSelectionOptions() & SELECTION_OPTION_INVERT ) - mpImpl->mbHighlightSelection = sal_True; + mpImpl->mbHighlightSelection = true; pWindow->SetLineColor(); @@ -250,7 +250,7 @@ void TextView::Invalidate() mpImpl->mpWindow->Invalidate(); } -void TextView::SetSelection( const TextSelection& rTextSel, sal_Bool bGotoCursor ) +void TextView::SetSelection( const TextSelection& rTextSel, bool bGotoCursor ) { // if someone left an empty attribute and then the Outliner manipulated the selection if ( !mpImpl->maSelection.HasRange() ) @@ -319,10 +319,10 @@ void TextView::ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle c void TextView::Paint( const Rectangle& rRect ) { - ImpPaint( rRect, sal_False ); + ImpPaint( rRect, false ); } -void TextView::ImpPaint( const Rectangle& rRect, sal_Bool bUseVirtDev ) +void TextView::ImpPaint( const Rectangle& rRect, bool bUseVirtDev ) { if ( !mpImpl->mpTextEngine->GetUpdateMode() || mpImpl->mpTextEngine->IsInUndo() ) return; @@ -341,7 +341,7 @@ void TextView::ImpPaint( const Rectangle& rRect, sal_Bool bUseVirtDev ) if ( pVDev->GetBackground().GetColor() != rBackgroundColor ) pVDev->SetBackground( rBackgroundColor ); - sal_Bool bVDevValid = sal_True; + bool bVDevValid = true; Size aOutSz( pVDev->GetOutputSizePixel() ); if ( ( aOutSz.Width() < rRect.GetWidth() ) || ( aOutSz.Height() < rRect.GetHeight() ) ) @@ -364,7 +364,7 @@ void TextView::ImpPaint( const Rectangle& rRect, sal_Bool bUseVirtDev ) } if ( !bVDevValid ) { - ImpPaint( rRect, sal_False /* without VDev */ ); + ImpPaint( rRect, false /* without VDev */ ); return; } @@ -413,9 +413,9 @@ void TextView::ImpHighlight( const TextSelection& rSel ) sal_uInt16 nStartLine = 0; sal_uInt16 nEndLine = pTEParaPortion->GetLines().size() -1; if ( nPara == nStartPara ) - nStartLine = pTEParaPortion->GetLineNumber( aSel.GetStart().GetIndex(), sal_False ); + nStartLine = pTEParaPortion->GetLineNumber( aSel.GetStart().GetIndex(), false ); if ( nPara == nEndPara ) - nEndLine = pTEParaPortion->GetLineNumber( aSel.GetEnd().GetIndex(), sal_True ); + nEndLine = pTEParaPortion->GetLineNumber( aSel.GetEnd().GetIndex(), true ); // iterate over all lines for ( sal_uInt16 nLine = nStartLine; nLine <= nEndLine; nLine++ ) @@ -432,12 +432,12 @@ void TextView::ImpHighlight( const TextSelection& rSel ) if ( nEndIndex < nStartIndex ) nEndIndex = nStartIndex; - Rectangle aTmpRect( mpImpl->mpTextEngine->GetEditCursor( TextPaM( nPara, nStartIndex ), sal_False ) ); + Rectangle aTmpRect( mpImpl->mpTextEngine->GetEditCursor( TextPaM( nPara, nStartIndex ), false ) ); aTmpRect.Top() += nY; aTmpRect.Bottom() += nY; Point aTopLeft( aTmpRect.TopLeft() ); - aTmpRect = mpImpl->mpTextEngine->GetEditCursor( TextPaM( nPara, nEndIndex ), sal_True ); + aTmpRect = mpImpl->mpTextEngine->GetEditCursor( TextPaM( nPara, nEndIndex ), true ); aTmpRect.Top() += nY; aTmpRect.Bottom() += nY; Point aBottomRight( aTmpRect.BottomRight() ); @@ -487,20 +487,20 @@ void TextView::ImpSetSelection( const TextSelection& rSelection ) void TextView::ShowSelection() { - ImpShowHideSelection( sal_True ); + ImpShowHideSelection( true ); } void TextView::HideSelection() { - ImpShowHideSelection( sal_False ); + ImpShowHideSelection( false ); } void TextView::ShowSelection( const TextSelection& rRange ) { - ImpShowHideSelection( sal_True, &rRange ); + ImpShowHideSelection( true, &rRange ); } -void TextView::ImpShowHideSelection( sal_Bool bShow, const TextSelection* pRange ) +void TextView::ImpShowHideSelection( bool bShow, const TextSelection* pRange ) { const TextSelection* pRangeOrSelection = pRange ? pRange : &mpImpl->maSelection; @@ -520,7 +520,7 @@ void TextView::ImpShowHideSelection( sal_Bool bShow, const TextSelection* pRange Point aStartPos( ImpGetOutputStartPos( mpImpl->maStartDocPos ) ); TextSelection aRange( *pRangeOrSelection ); aRange.Justify(); - sal_Bool bVisCursor = mpImpl->mpCursor->IsVisible(); + bool bVisCursor = mpImpl->mpCursor->IsVisible(); mpImpl->mpCursor->Hide(); ImpPaint( mpImpl->mpWindow, aStartPos, &aOutArea, &aRange, bShow ? &mpImpl->maSelection : NULL ); if ( bVisCursor ) @@ -546,19 +546,19 @@ void TextView::EraseVirtualDevice() mpImpl->mpVirtDev = 0; } -sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) +bool TextView::KeyInput( const KeyEvent& rKeyEvent ) { - sal_Bool bDone = sal_True; + bool bDone = true; bool bModified = false; bool bMoved = false; - sal_Bool bEndKey = sal_False; // special CursorPosition + bool bEndKey = false; // special CursorPosition bool bAllowIdle = true; // check mModified; // the local bModified is not set e.g. by Cut/Paste, as here // the update happens somewhere else - sal_Bool bWasModified = mpImpl->mpTextEngine->IsModified(); - mpImpl->mpTextEngine->SetModified( sal_False ); + bool bWasModified = mpImpl->mpTextEngine->IsModified(); + mpImpl->mpTextEngine->SetModified( false ); TextSelection aCurSel( mpImpl->maSelection ); TextSelection aOldSel( aCurSel ); @@ -642,10 +642,10 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) } bMoved = true; if ( nCode == KEY_END ) - bEndKey = sal_True; + bEndKey = true; } else - bDone = sal_False; + bDone = false; } break; case KEY_BACKSPACE: @@ -710,7 +710,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) bAllowIdle = false; } else - bDone = sal_False; + bDone = false; } break; case KEY_TAB: @@ -723,7 +723,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) bModified = true; } else - bDone = sal_False; + bDone = false; } break; case KEY_RETURN: @@ -752,7 +752,7 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) bModified = true; } else - bDone = sal_False; + bDone = false; } break; case KEY_INSERT: @@ -768,12 +768,12 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) sal_Unicode nCharCode = rKeyEvent.GetCharCode(); if ( !mpImpl->mbReadOnly && ImplCheckTextLen( OUString(nCharCode) ) ) // otherwise swallow the character anyway { - aCurSel = mpImpl->mpTextEngine->ImpInsertText( nCharCode, aCurSel, !IsInsertMode(), sal_True ); + aCurSel = mpImpl->mpTextEngine->ImpInsertText( nCharCode, aCurSel, !IsInsertMode(), true ); bModified = true; } } else - bDone = sal_False; + bDone = false; } } } @@ -797,20 +797,20 @@ sal_Bool TextView::KeyInput( const KeyEvent& rKeyEvent ) else if ( bMoved ) { // selection is painted now in ImpMoveCursor - ImpShowCursor( mpImpl->mbAutoScroll, sal_True, bEndKey ); + ImpShowCursor( mpImpl->mbAutoScroll, true, bEndKey ); } if ( mpImpl->mpTextEngine->IsModified() ) mpImpl->mpTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) ); else if ( bWasModified ) - mpImpl->mpTextEngine->SetModified( sal_True ); + mpImpl->mpTextEngine->SetModified( true ); return bDone; } void TextView::MouseButtonUp( const MouseEvent& rMouseEvent ) { - mpImpl->mbClickedInSelection = sal_False; + mpImpl->mbClickedInSelection = false; mpImpl->mnTravelXPos = TRAVEL_X_DONTKNOW; mpImpl->mpSelEngine->SelMouseButtonUp( rMouseEvent ); if ( rMouseEvent.IsMiddle() && !IsReadOnly() && @@ -888,7 +888,7 @@ void TextView::MouseButtonDown( const MouseEvent& rMouseEvent ) } ImpSetSelection( aNewSel ); ShowSelection(); - ShowCursor( sal_True, sal_True ); + ShowCursor( true, true ); } } else if ( rMouseEvent.GetClicks() == 3 ) @@ -902,7 +902,7 @@ void TextView::MouseButtonDown( const MouseEvent& rMouseEvent ) aNewSel.GetEnd().GetIndex() = mpImpl->mpTextEngine->mpDoc->GetNodes().GetObject( mpImpl->maSelection.GetEnd().GetPara() )->GetText().getLength(); ImpSetSelection( aNewSel ); ShowSelection(); - ShowCursor( sal_True, sal_True ); + ShowCursor( true, true ); } } } @@ -936,7 +936,7 @@ void TextView::Command( const CommandEvent& rCEvt ) TEParaPortion* pPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( mpImpl->mpTextEngine->mpIMEInfos->aPos.GetPara() ); pPortion->MarkSelectionInvalid( mpImpl->mpTextEngine->mpIMEInfos->aPos.GetIndex(), 0 ); - sal_Bool bInsertMode = !mpImpl->mpTextEngine->mpIMEInfos->bWasCursorOverwrite; + bool bInsertMode = !mpImpl->mpTextEngine->mpIMEInfos->bWasCursorOverwrite; delete mpImpl->mpTextEngine->mpIMEInfos; mpImpl->mpTextEngine->mpIMEInfos = NULL; @@ -1032,7 +1032,7 @@ void TextView::Command( const CommandEvent& rCEvt ) mpImpl->mpTextEngine->FormatDoc(); TEParaPortion* pParaPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( aPaM.GetPara() ); - sal_uInt16 nLine = pParaPortion->GetLineNumber( aPaM.GetIndex(), sal_True ); + sal_uInt16 nLine = pParaPortion->GetLineNumber( aPaM.GetIndex(), true ); TextLine* pLine = pParaPortion->GetLines()[ nLine ]; if ( pLine && ( nInputEnd > pLine->GetEnd() ) ) nInputEnd = pLine->GetEnd(); @@ -1053,12 +1053,12 @@ void TextView::Command( const CommandEvent& rCEvt ) } } -void TextView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor ) +void TextView::ShowCursor( bool bGotoCursor, bool bForceVisCursor ) { // this setting has more weight if ( !mpImpl->mbAutoScroll ) - bGotoCursor = sal_False; - ImpShowCursor( bGotoCursor, bForceVisCursor, sal_False ); + bGotoCursor = false; + ImpShowCursor( bGotoCursor, bForceVisCursor, false ); } void TextView::HideCursor() @@ -1090,7 +1090,7 @@ void TextView::Scroll( long ndX, long ndY ) if ( nDiffX || nDiffY ) { - sal_Bool bVisCursor = mpImpl->mpCursor->IsVisible(); + bool bVisCursor = mpImpl->mpCursor->IsVisible(); mpImpl->mpCursor->Hide(); mpImpl->mpWindow->Update(); mpImpl->maStartDocPos = aNewStartPos; @@ -1134,7 +1134,7 @@ void TextView::Copy( uno::Reference< datatransfer::clipboard::XClipboard >& rxCl TETextDataObject* pDataObj = new TETextDataObject( GetSelected() ); if ( mpImpl->mpTextEngine->HasAttrib( TEXTATTR_HYPERLINK ) ) // then also as HTML - mpImpl->mpTextEngine->Write( pDataObj->GetHTMLStream(), &mpImpl->maSelection, sal_True ); + mpImpl->mpTextEngine->Write( pDataObj->GetHTMLStream(), &mpImpl->maSelection, true ); const sal_uInt32 nRef = Application::ReleaseSolarMutex(); @@ -1192,7 +1192,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC bool bWasTruncated = false; if( mpImpl->mpTextEngine->GetMaxTextLen() != 0 ) bWasTruncated = ImplTruncateNewText( aText ); - InsertText( aText, sal_False ); + InsertText( aText, false ); mpImpl->mpTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) ); if( bWasTruncated ) @@ -1222,22 +1222,22 @@ OUString TextView::GetSelected( LineEnd aSeparator ) return mpImpl->mpTextEngine->GetText( mpImpl->maSelection, aSeparator ); } -void TextView::SetInsertMode( sal_Bool bInsert ) +void TextView::SetInsertMode( bool bInsert ) { if ( mpImpl->mbInsertMode != bInsert ) { mpImpl->mbInsertMode = bInsert; - ShowCursor( mpImpl->mbAutoScroll, sal_False ); + ShowCursor( mpImpl->mbAutoScroll, false ); } } -void TextView::SetReadOnly( sal_Bool bReadOnly ) +void TextView::SetReadOnly( bool bReadOnly ) { if ( mpImpl->mbReadOnly != bReadOnly ) { mpImpl->mbReadOnly = bReadOnly; if ( !mpImpl->mbReadOnly ) - ShowCursor( mpImpl->mbAutoScroll, sal_False ); + ShowCursor( mpImpl->mbAutoScroll, false ); else HideCursor(); @@ -1348,7 +1348,7 @@ TextSelection TextView::ImpMoveCursor( const KeyEvent& rKeyEvent ) return mpImpl->maSelection; } -void TextView::InsertText( const OUString& rStr, sal_Bool bSelect ) +void TextView::InsertText( const OUString& rStr, bool bSelect ) { mpImpl->mpTextEngine->UndoActionStart(); @@ -1531,14 +1531,14 @@ TextPaM TextView::CursorUp( const TextPaM& rPaM ) long nX; if ( mpImpl->mnTravelXPos == TRAVEL_X_DONTKNOW ) { - nX = mpImpl->mpTextEngine->GetEditCursor( rPaM, sal_False ).Left(); + nX = mpImpl->mpTextEngine->GetEditCursor( rPaM, false ).Left(); mpImpl->mnTravelXPos = (sal_uInt16)nX+1; } else nX = mpImpl->mnTravelXPos; TEParaPortion* pPPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( rPaM.GetPara() ); - sal_uInt16 nLine = pPPortion->GetLineNumber( rPaM.GetIndex(), sal_False ); + sal_uInt16 nLine = pPPortion->GetLineNumber( rPaM.GetIndex(), false ); if ( nLine ) // same paragraph { sal_uInt16 nCharPos = mpImpl->mpTextEngine->GetCharPos( rPaM.GetPara(), nLine-1, nX ); @@ -1569,14 +1569,14 @@ TextPaM TextView::CursorDown( const TextPaM& rPaM ) long nX; if ( mpImpl->mnTravelXPos == TRAVEL_X_DONTKNOW ) { - nX = mpImpl->mpTextEngine->GetEditCursor( rPaM, sal_False ).Left(); + nX = mpImpl->mpTextEngine->GetEditCursor( rPaM, false ).Left(); mpImpl->mnTravelXPos = (sal_uInt16)nX+1; } else nX = mpImpl->mnTravelXPos; TEParaPortion* pPPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( rPaM.GetPara() ); - sal_uInt16 nLine = pPPortion->GetLineNumber( rPaM.GetIndex(), sal_False ); + sal_uInt16 nLine = pPPortion->GetLineNumber( rPaM.GetIndex(), false ); if ( nLine < ( pPPortion->GetLines().size() - 1 ) ) { sal_uInt16 nCharPos = mpImpl->mpTextEngine->GetCharPos( rPaM.GetPara(), nLine+1, nX ); @@ -1606,7 +1606,7 @@ TextPaM TextView::CursorStartOfLine( const TextPaM& rPaM ) TextPaM aPaM( rPaM ); TEParaPortion* pPPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( rPaM.GetPara() ); - sal_uInt16 nLine = pPPortion->GetLineNumber( aPaM.GetIndex(), sal_False ); + sal_uInt16 nLine = pPPortion->GetLineNumber( aPaM.GetIndex(), false ); TextLine* pLine = pPPortion->GetLines()[ nLine ]; aPaM.GetIndex() = pLine->GetStart(); @@ -1618,7 +1618,7 @@ TextPaM TextView::CursorEndOfLine( const TextPaM& rPaM ) TextPaM aPaM( rPaM ); TEParaPortion* pPPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( rPaM.GetPara() ); - sal_uInt16 nLine = pPPortion->GetLineNumber( aPaM.GetIndex(), sal_False ); + sal_uInt16 nLine = pPPortion->GetLineNumber( aPaM.GetIndex(), false ); TextLine* pLine = pPPortion->GetLines()[ nLine ]; aPaM.GetIndex() = pLine->GetEnd(); @@ -1692,11 +1692,11 @@ TextPaM TextView::PageDown( const TextPaM& rPaM ) return aPaM; } -void TextView::ImpShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sal_Bool bSpecial ) +void TextView::ImpShowCursor( bool bGotoCursor, bool bForceVisCursor, bool bSpecial ) { if ( mpImpl->mpTextEngine->IsFormatting() ) return; - if ( mpImpl->mpTextEngine->GetUpdateMode() == sal_False ) + if ( !mpImpl->mpTextEngine->GetUpdateMode() ) return; if ( mpImpl->mpTextEngine->IsInUndo() ) return; @@ -1715,7 +1715,7 @@ void TextView::ImpShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sa { TEParaPortion* pParaPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( aPaM.GetPara() ); mpImpl->mbCursorAtEndOfLine = - pParaPortion->GetLineNumber( aPaM.GetIndex(), sal_True ) != pParaPortion->GetLineNumber( aPaM.GetIndex(), sal_False ); + pParaPortion->GetLineNumber( aPaM.GetIndex(), true ) != pParaPortion->GetLineNumber( aPaM.GetIndex(), false ); } if ( !IsInsertMode() && !mpImpl->maSelection.HasRange() ) @@ -1724,12 +1724,12 @@ void TextView::ImpShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sa if ( !pNode->GetText().isEmpty() && ( aPaM.GetIndex() < pNode->GetText().getLength() ) ) { // If we are behind a portion, and the next portion has other direction, we must change position... - aEditCursor.Left() = aEditCursor.Right() = mpImpl->mpTextEngine->GetEditCursor( aPaM, sal_False, sal_True ).Left(); + aEditCursor.Left() = aEditCursor.Right() = mpImpl->mpTextEngine->GetEditCursor( aPaM, false, true ).Left(); TEParaPortion* pParaPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( aPaM.GetPara() ); sal_uInt16 nTextPortionStart = 0; - sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTextPortionStart, sal_True ); + sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTextPortionStart, true ); TETextPortion* pTextPortion = pParaPortion->GetTextPortions()[ nTextPortion ]; if ( pTextPortion->GetKind() == PORTIONKIND_TAB ) { @@ -1742,7 +1742,7 @@ void TextView::ImpShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sa else { TextPaM aNext = CursorRight( TextPaM( aPaM.GetPara(), aPaM.GetIndex() ), (sal_uInt16)i18n::CharacterIteratorMode::SKIPCELL ); - aEditCursor.Right() = mpImpl->mpTextEngine->GetEditCursor( aNext, sal_True ).Left(); + aEditCursor.Right() = mpImpl->mpTextEngine->GetEditCursor( aNext, true ).Left(); } } } @@ -1829,7 +1829,7 @@ void TextView::ImpShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sa mpImpl->mpCursor->Show(); } -sal_Bool TextView::SetCursorAtPoint( const Point& rPosPixel ) +bool TextView::SetCursorAtPoint( const Point& rPosPixel ) { mpImpl->mpTextEngine->CheckIdleFormatter(); @@ -1855,18 +1855,18 @@ sal_Bool TextView::SetCursorAtPoint( const Point& rPosPixel ) ShowSelection( aTmpNewSel ); } - sal_Bool bForceCursor = mpImpl->mpDDInfo ? sal_False : sal_True; // && !mbInSelection - ImpShowCursor( mpImpl->mbAutoScroll, bForceCursor, sal_False ); - return sal_True; + bool bForceCursor = mpImpl->mpDDInfo ? sal_False : sal_True; // && !mbInSelection + ImpShowCursor( mpImpl->mbAutoScroll, bForceCursor, false ); + return true; } -sal_Bool TextView::IsSelectionAtPoint( const Point& rPosPixel ) +bool TextView::IsSelectionAtPoint( const Point& rPosPixel ) { // if ( !Rectangle( Point(), mpImpl->mpWindow->GetOutputSizePixel() ).IsInside( rPosPixel ) && !mbInSelection ) // return sal_False; Point aDocPos = GetDocPos( rPosPixel ); - TextPaM aPaM = mpImpl->mpTextEngine->GetPaM( aDocPos, sal_False ); + TextPaM aPaM = mpImpl->mpTextEngine->GetPaM( aDocPos, false ); // For Hyperlinks D&D also start w/o a selection. // BeginDrag is only called, however, if IsSelectionAtPoint() // Problem: IsSelectionAtPoint is not called by Command() @@ -1875,7 +1875,7 @@ sal_Bool TextView::IsSelectionAtPoint( const Point& rPosPixel ) ( /* mpImpl->mpSelEngine->IsInCommand() && */ mpImpl->mpTextEngine->FindAttrib( aPaM, TEXTATTR_HYPERLINK ) ) ); } -sal_Bool TextView::IsInSelection( const TextPaM& rPaM ) +bool TextView::IsInSelection( const TextPaM& rPaM ) { TextSelection aSel = mpImpl->maSelection; aSel.Justify(); @@ -1885,20 +1885,20 @@ sal_Bool TextView::IsInSelection( const TextPaM& rPaM ) sal_uLong nCurNode = rPaM.GetPara(); if ( ( nCurNode > nStartNode ) && ( nCurNode < nEndNode ) ) - return sal_True; + return true; if ( nStartNode == nEndNode ) { if ( nCurNode == nStartNode ) if ( ( rPaM.GetIndex() >= aSel.GetStart().GetIndex() ) && ( rPaM.GetIndex() < aSel.GetEnd().GetIndex() ) ) - return sal_True; + return true; } else if ( ( nCurNode == nStartNode ) && ( rPaM.GetIndex() >= aSel.GetStart().GetIndex() ) ) - return sal_True; + return true; else if ( ( nCurNode == nEndNode ) && ( rPaM.GetIndex() < aSel.GetEnd().GetIndex() ) ) - return sal_True; + return true; - return sal_False; + return false; } void TextView::ImpHideDDCursor() @@ -1906,7 +1906,7 @@ void TextView::ImpHideDDCursor() if ( mpImpl->mpDDInfo && mpImpl->mpDDInfo->mbVisCursor ) { mpImpl->mpDDInfo->maCursor.Hide(); - mpImpl->mpDDInfo->mbVisCursor = sal_False; + mpImpl->mpDDInfo->mbVisCursor = false; } } @@ -1914,7 +1914,7 @@ void TextView::ImpShowDDCursor() { if ( !mpImpl->mpDDInfo->mbVisCursor ) { - Rectangle aCursor = mpImpl->mpTextEngine->PaMtoEditCursor( mpImpl->mpDDInfo->maDropPos, sal_True ); + Rectangle aCursor = mpImpl->mpTextEngine->PaMtoEditCursor( mpImpl->mpDDInfo->maDropPos, true ); aCursor.Right()++; aCursor.SetPos( GetWindowPos( aCursor.TopLeft() ) ); @@ -1922,11 +1922,11 @@ void TextView::ImpShowDDCursor() mpImpl->mpDDInfo->maCursor.SetPos( aCursor.TopLeft() ); mpImpl->mpDDInfo->maCursor.SetSize( aCursor.GetSize() ); mpImpl->mpDDInfo->maCursor.Show(); - mpImpl->mpDDInfo->mbVisCursor = sal_True; + mpImpl->mpDDInfo->mbVisCursor = true; } } -void TextView::SetPaintSelection( sal_Bool bPaint ) +void TextView::SetPaintSelection( bool bPaint ) { if ( bPaint != mpImpl->mbPaintSelection ) { @@ -1935,9 +1935,9 @@ void TextView::SetPaintSelection( sal_Bool bPaint ) } } -sal_Bool TextView::Read( SvStream& rInput ) +bool TextView::Read( SvStream& rInput ) { - sal_Bool bDone = mpImpl->mpTextEngine->Read( rInput, &mpImpl->maSelection ); + bool bDone = mpImpl->mpTextEngine->Read( rInput, &mpImpl->maSelection ); ShowCursor(); return bDone; } @@ -1968,9 +1968,9 @@ bool TextView::ImplTruncateNewText( OUString& rNewText ) const return bTruncated; } -sal_Bool TextView::ImplCheckTextLen( const OUString& rNewText ) +bool TextView::ImplCheckTextLen( const OUString& rNewText ) { - sal_Bool bOK = sal_True; + bool bOK = true; if ( mpImpl->mpTextEngine->GetMaxTextLen() ) { sal_uLong n = mpImpl->mpTextEngine->GetTextLen(); @@ -1980,7 +1980,7 @@ sal_Bool TextView::ImplCheckTextLen( const OUString& rNewText ) // calculate how much text is being deleted n -= mpImpl->mpTextEngine->GetTextLen( mpImpl->maSelection ); if ( n > mpImpl->mpTextEngine->GetMaxTextLen() ) - bOK = sal_False; + bOK = false; } } return bOK; @@ -1996,12 +1996,12 @@ void TextView::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd: delete mpImpl->mpDDInfo; mpImpl->mpDDInfo = new TextDDInfo; - mpImpl->mpDDInfo->mbStarterOfDD = sal_True; + mpImpl->mpDDInfo->mbStarterOfDD = true; TETextDataObject* pDataObj = new TETextDataObject( GetSelected() ); if ( mpImpl->mpTextEngine->HasAttrib( TEXTATTR_HYPERLINK ) ) // then also as HTML - mpImpl->mpTextEngine->Write( pDataObj->GetHTMLStream(), &mpImpl->maSelection, sal_True ); + mpImpl->mpTextEngine->Write( pDataObj->GetHTMLStream(), &mpImpl->maSelection, true ); /* @@ -2045,7 +2045,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv { SolarMutexGuard aVclGuard; - sal_Bool bChanges = sal_False; + bool bChanges = false; if ( !mpImpl->mbReadOnly && mpImpl->mpDDInfo ) { ImpHideDDCursor(); @@ -2056,7 +2056,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv sal_uLong nPrevParaCount = mpImpl->mpTextEngine->GetParagraphCount(); sal_uInt16 nPrevStartParaLen = mpImpl->mpTextEngine->GetTextLen( aPrevSel.GetStart().GetPara() ); - sal_Bool bStarterOfDD = sal_False; + bool bStarterOfDD = false; for ( sal_uInt16 nView = mpImpl->mpTextEngine->GetViewCount(); nView && !bStarterOfDD; ) bStarterOfDD = mpImpl->mpTextEngine->GetView( --nView )->mpImpl->mpDDInfo ? mpImpl->mpTextEngine->GetView( nView )->mpImpl->mpDDInfo->mbStarterOfDD : sal_False; @@ -2091,7 +2091,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv mpImpl->mpTextEngine->SetAttrib( TextAttribProtect(), aTempStart.GetPara(), aTempStart.GetIndex(), - mpImpl->maSelection.GetEnd().GetIndex(), sal_False ); + mpImpl->maSelection.GetEnd().GetIndex(), false ); } if ( aPrevSel.HasRange() && @@ -2263,7 +2263,7 @@ sal_Int32 TextView::GetLineNumberOfCursorInSelection() const { TextPaM aPaM = GetSelection().GetEnd(); TEParaPortion* pPPortion = mpImpl->mpTextEngine->mpTEParaPortions->GetObject( aPaM.GetPara() ); - nLineNo = pPPortion->GetLineNumber( aPaM.GetIndex(), sal_False ); + nLineNo = pPPortion->GetLineNumber( aPaM.GetIndex(), false ); if( mpImpl->mbCursorAtEndOfLine ) --nLineNo; } @@ -2294,12 +2294,12 @@ void TextSelFunctionSet::CreateAnchor() mpView->ImpSetSelection( mpView->mpImpl->maSelection.GetEnd() ); } -sal_Bool TextSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool ) +bool TextSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool ) { return mpView->SetCursorAtPoint( rPointPixel ); } -sal_Bool TextSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) +bool TextSelFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) { return mpView->IsSelectionAtPoint( rPointPixel ); } @@ -2322,27 +2322,27 @@ TextEngine* TextView::GetTextEngine() const { return mpImpl->mpTextEngine; } Window* TextView::GetWindow() const { return mpImpl->mpWindow; } -void TextView::EnableCursor( sal_Bool bEnable ) +void TextView::EnableCursor( bool bEnable ) { mpImpl->mbCursorEnabled = bEnable; } -sal_Bool TextView::IsCursorEnabled() const +bool TextView::IsCursorEnabled() const { return mpImpl->mbCursorEnabled; } void TextView::SetStartDocPos( const Point& rPos ) { mpImpl->maStartDocPos = rPos; } const Point& TextView::GetStartDocPos() const { return mpImpl->maStartDocPos; } -void TextView::SetAutoIndentMode( sal_Bool bAutoIndent ) +void TextView::SetAutoIndentMode( bool bAutoIndent ) { mpImpl->mbAutoIndent = bAutoIndent; } -sal_Bool TextView::IsReadOnly() const +bool TextView::IsReadOnly() const { return mpImpl->mbReadOnly; } -void TextView::SetAutoScroll( sal_Bool bAutoScroll ) +void TextView::SetAutoScroll( bool bAutoScroll ) { mpImpl->mbAutoScroll = bAutoScroll; } -sal_Bool TextView::IsAutoScroll() const +bool TextView::IsAutoScroll() const { return mpImpl->mbAutoScroll; } -sal_Bool TextView::HasSelection() const +bool TextView::HasSelection() const { return mpImpl->maSelection.HasRange(); } -sal_Bool TextView::IsInsertMode() const +bool TextView::IsInsertMode() const { return mpImpl->mbInsertMode; } -void TextView::SupportProtectAttribute(sal_Bool bSupport) +void TextView::SupportProtectAttribute(bool bSupport) { mpImpl->mbSupportProtectAttribute = bSupport;} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 2c616175a0d0..ea5237903c38 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -107,18 +107,18 @@ public: ImpVclMEdit( VclMultiLineEdit* pVclMultiLineEdit, WinBits nWinStyle ); ~ImpVclMEdit(); - void SetModified( sal_Bool bMod ); - sal_Bool IsModified() const; + void SetModified( bool bMod ); + bool IsModified() const; - void SetReadOnly( sal_Bool bRdOnly ); - sal_Bool IsReadOnly() const; + void SetReadOnly( bool bRdOnly ); + bool IsReadOnly() const; void SetMaxTextLen(sal_Int32 nLen); sal_Int32 GetMaxTextLen() const; void SetMaxTextWidth( sal_uLong nMaxWidth ); - sal_Bool IsInsertMode() const; + bool IsInsertMode() const; void InsertText( const OUString& rStr ); OUString GetSelected() const; @@ -139,9 +139,9 @@ public: void Resize(); void GetFocus(); - sal_Bool HandleCommand( const CommandEvent& rCEvt ); + bool HandleCommand( const CommandEvent& rCEvt ); - void Enable( sal_Bool bEnable ); + void Enable( bool bEnable ); Size CalcMinimumSize() const; Size CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; @@ -247,9 +247,9 @@ void ImpVclMEdit::InitFromStyle( WinBits nWinStyle ) mpTextWindow->SetAutoFocusHide( true ); if ( nWinStyle & WB_READONLY ) - mpTextWindow->GetTextView()->SetReadOnly( sal_True ); + mpTextWindow->GetTextView()->SetReadOnly( true ); else - mpTextWindow->GetTextView()->SetReadOnly( sal_False ); + mpTextWindow->GetTextView()->SetReadOnly( false ); if ( nWinStyle & WB_IGNORETAB ) { @@ -345,7 +345,7 @@ IMPL_LINK( ImpVclMEdit, ScrollHdl, ScrollBar*, pCurScrollBar ) void ImpVclMEdit::SetAlign( WinBits nWinStyle ) { - sal_Bool bRTL = Application::GetSettings().GetLayoutRTL(); + bool bRTL = Application::GetSettings().GetLayoutRTL(); mpTextWindow->GetTextEngine()->SetRightToLeft( bRTL ); if ( nWinStyle & WB_CENTER ) @@ -356,23 +356,23 @@ void ImpVclMEdit::SetAlign( WinBits nWinStyle ) mpTextWindow->GetTextEngine()->SetTextAlign( !bRTL ? TXTALIGN_LEFT : TXTALIGN_RIGHT ); } -void ImpVclMEdit::SetModified( sal_Bool bMod ) +void ImpVclMEdit::SetModified( bool bMod ) { mpTextWindow->GetTextEngine()->SetModified( bMod ); } -sal_Bool ImpVclMEdit::IsModified() const +bool ImpVclMEdit::IsModified() const { return mpTextWindow->GetTextEngine()->IsModified(); } -void ImpVclMEdit::SetReadOnly( sal_Bool bRdOnly ) +void ImpVclMEdit::SetReadOnly( bool bRdOnly ) { mpTextWindow->GetTextView()->SetReadOnly( bRdOnly ); // TODO: Adjust color? } -sal_Bool ImpVclMEdit::IsReadOnly() const +bool ImpVclMEdit::IsReadOnly() const { return mpTextWindow->GetTextView()->IsReadOnly(); } @@ -493,10 +493,10 @@ void ImpVclMEdit::Paste() void ImpVclMEdit::SetText( const OUString& rStr ) { - sal_Bool bWasModified = mpTextWindow->GetTextEngine()->IsModified(); + bool bWasModified = mpTextWindow->GetTextEngine()->IsModified(); mpTextWindow->GetTextEngine()->SetText( rStr ); if ( !bWasModified ) - mpTextWindow->GetTextEngine()->SetModified( sal_False ); + mpTextWindow->GetTextEngine()->SetModified( false ); mpTextWindow->GetTextView()->SetSelection( TextSelection() ); @@ -691,7 +691,7 @@ void ImpVclMEdit::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLi rnLines = (sal_uInt16) (aOutSz.Height()/aCharSz.Height()); } -void ImpVclMEdit::Enable( sal_Bool bEnable ) +void ImpVclMEdit::Enable( bool bEnable ) { mpTextWindow->Enable( bEnable ); if ( mpHScrollBar ) @@ -700,15 +700,15 @@ void ImpVclMEdit::Enable( sal_Bool bEnable ) mpVScrollBar->Enable( bEnable ); } -sal_Bool ImpVclMEdit::HandleCommand( const CommandEvent& rCEvt ) +bool ImpVclMEdit::HandleCommand( const CommandEvent& rCEvt ) { - sal_Bool bDone = sal_False; + bool bDone = false; if ( ( rCEvt.GetCommand() == COMMAND_WHEEL ) || ( rCEvt.GetCommand() == COMMAND_STARTAUTOSCROLL ) || ( rCEvt.GetCommand() == COMMAND_AUTOSCROLL ) ) { mpTextWindow->HandleScrollCommand( rCEvt, mpHScrollBar, mpVScrollBar ); - bDone = sal_True; + bDone = true; } return bDone; } @@ -732,7 +732,7 @@ TextWindow::TextWindow( Window* pParent ) : Window( pParent ) mpExtTextEngine->SetLocale( GetSettings().GetLanguageTag().getLocale() ); mpExtTextView = new ExtTextView( mpExtTextEngine, this ); mpExtTextEngine->InsertView( mpExtTextView ); - mpExtTextEngine->EnableUndo( sal_True ); + mpExtTextEngine->EnableUndo( true ); mpExtTextView->ShowCursor(); Color aBackgroundColor = GetSettings().GetStyleSettings().GetWorkspaceColor(); @@ -772,14 +772,14 @@ void TextWindow::MouseButtonUp( const MouseEvent& rMEvt ) void TextWindow::KeyInput( const KeyEvent& rKEvent ) { - sal_Bool bDone = sal_False; + bool bDone = false; sal_uInt16 nCode = rKEvent.GetKeyCode().GetCode(); if ( nCode == com::sun::star::awt::Key::SELECT_ALL || ( (nCode == KEY_A) && rKEvent.GetKeyCode().IsMod1() && !rKEvent.GetKeyCode().IsMod2() ) ) { mpExtTextView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFF, 0xFFFF ) ) ); - bDone = sal_True; + bDone = true; } else if ( (nCode == KEY_S) && rKEvent.GetKeyCode().IsShift() && rKEvent.GetKeyCode().IsMod1() ) { @@ -791,10 +791,10 @@ void TextWindow::KeyInput( const KeyEvent& rKEvent ) if (!aChars.isEmpty()) { mpExtTextView->InsertText( aChars ); - mpExtTextView->GetTextEngine()->SetModified( sal_True ); + mpExtTextView->GetTextEngine()->SetModified( true ); } mbActivePopup = false; - bDone = sal_True; + bDone = true; } } else if ( nCode == KEY_TAB ) @@ -827,20 +827,20 @@ void TextWindow::Command( const CommandEvent& rCEvt ) PopupMenu* pPopup = Edit::CreatePopupMenu(); if ( !mpExtTextView->HasSelection() ) { - pPopup->EnableItem( SV_MENU_EDIT_CUT, sal_False ); - pPopup->EnableItem( SV_MENU_EDIT_COPY, sal_False ); - pPopup->EnableItem( SV_MENU_EDIT_DELETE, sal_False ); + pPopup->EnableItem( SV_MENU_EDIT_CUT, false ); + pPopup->EnableItem( SV_MENU_EDIT_COPY, false ); + pPopup->EnableItem( SV_MENU_EDIT_DELETE, false ); } if ( mpExtTextView->IsReadOnly() ) { - pPopup->EnableItem( SV_MENU_EDIT_CUT, sal_False ); - pPopup->EnableItem( SV_MENU_EDIT_PASTE, sal_False ); - pPopup->EnableItem( SV_MENU_EDIT_DELETE, sal_False ); - pPopup->EnableItem( SV_MENU_EDIT_INSERTSYMBOL, sal_False ); + pPopup->EnableItem( SV_MENU_EDIT_CUT, false ); + pPopup->EnableItem( SV_MENU_EDIT_PASTE, false ); + pPopup->EnableItem( SV_MENU_EDIT_DELETE, false ); + pPopup->EnableItem( SV_MENU_EDIT_INSERTSYMBOL, false ); } if ( !mpExtTextView->GetTextEngine()->HasUndoManager() || !mpExtTextView->GetTextEngine()->GetUndoManager().GetUndoActionCount() ) { - pPopup->EnableItem( SV_MENU_EDIT_UNDO, sal_False ); + pPopup->EnableItem( SV_MENU_EDIT_UNDO, false ); } // if ( ( maSelection.Min() == 0 ) && ( maSelection.Max() == maText.Len() ) ) // { @@ -867,21 +867,21 @@ void TextWindow::Command( const CommandEvent& rCEvt ) switch ( n ) { case SV_MENU_EDIT_UNDO: mpExtTextView->Undo(); - mpExtTextEngine->SetModified( sal_True ); + mpExtTextEngine->SetModified( true ); mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) ); break; case SV_MENU_EDIT_CUT: mpExtTextView->Cut(); - mpExtTextEngine->SetModified( sal_True ); + mpExtTextEngine->SetModified( true ); mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) ); break; case SV_MENU_EDIT_COPY: mpExtTextView->Copy(); break; case SV_MENU_EDIT_PASTE: mpExtTextView->Paste(); - mpExtTextEngine->SetModified( sal_True ); + mpExtTextEngine->SetModified( true ); mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) ); break; case SV_MENU_EDIT_DELETE: mpExtTextView->DeleteSelected(); - mpExtTextEngine->SetModified( sal_True ); + mpExtTextEngine->SetModified( true ); mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) ); break; case SV_MENU_EDIT_SELECTALL: mpExtTextView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFFFFFF, 0xFFFF ) ) ); @@ -892,7 +892,7 @@ void TextWindow::Command( const CommandEvent& rCEvt ) if (!aChars.isEmpty()) { mpExtTextView->InsertText( aChars ); - mpExtTextEngine->SetModified( sal_True ); + mpExtTextEngine->SetModified( true ); mpExtTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) ); } } @@ -911,19 +911,19 @@ void TextWindow::GetFocus() { if ( !mbActivePopup ) { - sal_Bool bGotoCursor = !mpExtTextView->IsReadOnly(); + bool bGotoCursor = !mpExtTextView->IsReadOnly(); if ( mbFocusSelectionHide && IsReallyVisible() && !mpExtTextView->IsReadOnly() && ( mbSelectOnTab && (!mbInMBDown || ( GetSettings().GetStyleSettings().GetSelectionOptions() & SELECTION_OPTION_FOCUS ) )) ) { // select everything, but do not scroll - sal_Bool bAutoScroll = mpExtTextView->IsAutoScroll(); - mpExtTextView->SetAutoScroll( sal_False ); + bool bAutoScroll = mpExtTextView->IsAutoScroll(); + mpExtTextView->SetAutoScroll( false ); mpExtTextView->SetSelection( TextSelection( TextPaM( 0, 0 ), TextPaM( 0xFFFF, 0xFFFF ) ) ); mpExtTextView->SetAutoScroll( bAutoScroll ); - bGotoCursor = sal_False; + bGotoCursor = false; } - mpExtTextView->SetPaintSelection( sal_True ); + mpExtTextView->SetPaintSelection( true ); mpExtTextView->ShowCursor( bGotoCursor ); } } @@ -933,7 +933,7 @@ void TextWindow::LoseFocus() Window::LoseFocus(); if ( mbFocusSelectionHide && !mbActivePopup ) - mpExtTextView->SetPaintSelection( sal_False ); + mpExtTextView->SetPaintSelection( false ); } VclMultiLineEdit::VclMultiLineEdit( Window* pParent, WinBits nWinStyle ) @@ -941,10 +941,10 @@ VclMultiLineEdit::VclMultiLineEdit( Window* pParent, WinBits nWinStyle ) { SetType( WINDOW_MULTILINEEDIT ); pImpVclMEdit = new ImpVclMEdit( this, nWinStyle ); - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); pUpdateDataTimer = 0; - SetCompoundControl( sal_True ); + SetCompoundControl( true ); SetStyle( ImplInitStyle( nWinStyle ) ); } @@ -954,7 +954,7 @@ VclMultiLineEdit::VclMultiLineEdit( Window* pParent, const ResId& rResId ) SetType( WINDOW_MULTILINEEDIT ); WinBits nWinStyle = rResId.GetWinBits(); pImpVclMEdit = new ImpVclMEdit( this, nWinStyle ); - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); pUpdateDataTimer = 0; sal_Int32 nMaxLen = Edit::GetMaxTextLen(); @@ -966,7 +966,7 @@ VclMultiLineEdit::VclMultiLineEdit( Window* pParent, const ResId& rResId ) if ( IsVisible() ) pImpVclMEdit->Resize(); - SetCompoundControl( sal_True ); + SetCompoundControl( true ); SetStyle( ImplInitStyle( nWinStyle ) ); // Base Edit ctor could call Show already, but that would cause problems @@ -1002,7 +1002,7 @@ WinBits VclMultiLineEdit::ImplInitStyle( WinBits nStyle ) } -void VclMultiLineEdit::ImplInitSettings( sal_Bool /*bFont*/, sal_Bool /*bForeground*/, sal_Bool bBackground ) +void VclMultiLineEdit::ImplInitSettings( bool /*bFont*/, bool /*bForeground*/, bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -1034,7 +1034,7 @@ void VclMultiLineEdit::ImplInitSettings( sal_Bool /*bFont*/, sal_Bool /*bForegro { if( IsPaintTransparent() ) { - pImpVclMEdit->GetTextWindow()->SetPaintTransparent( sal_True ); + pImpVclMEdit->GetTextWindow()->SetPaintTransparent( true ); pImpVclMEdit->GetTextWindow()->SetBackground(); pImpVclMEdit->GetTextWindow()->SetControlBackground(); SetBackground(); @@ -1085,12 +1085,12 @@ void VclMultiLineEdit::UpdateData() void VclMultiLineEdit::SetModifyFlag() { - pImpVclMEdit->SetModified( sal_True ); + pImpVclMEdit->SetModified( true ); } void VclMultiLineEdit::ClearModifyFlag() { - pImpVclMEdit->SetModified( sal_False ); + pImpVclMEdit->SetModified( false ); } bool VclMultiLineEdit::IsModified() const @@ -1127,7 +1127,7 @@ void VclMultiLineEdit::SetReadOnly( sal_Bool bReadOnly ) SetStyle( nStyle ); } -sal_Bool VclMultiLineEdit::IsReadOnly() const +bool VclMultiLineEdit::IsReadOnly() const { return pImpVclMEdit->IsReadOnly(); } @@ -1278,7 +1278,7 @@ void VclMultiLineEdit::StateChanged( StateChangedType nType ) if( nType == STATE_CHANGE_ENABLE ) { pImpVclMEdit->Enable( IsEnabled() ); - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); } else if( nType == STATE_CHANGE_READONLY ) { @@ -1287,23 +1287,23 @@ void VclMultiLineEdit::StateChanged( StateChangedType nType ) else if ( nType == STATE_CHANGE_ZOOM ) { pImpVclMEdit->GetTextWindow()->SetZoom( GetZoom() ); - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); Resize(); } else if ( nType == STATE_CHANGE_CONTROLFONT ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); Resize(); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); Invalidate(); } else if ( nType == STATE_CHANGE_STYLE ) @@ -1315,7 +1315,7 @@ void VclMultiLineEdit::StateChanged( StateChangedType nType ) { if( IsPaintTransparent() ) { - pImpVclMEdit->GetTextWindow()->SetPaintTransparent( sal_True ); + pImpVclMEdit->GetTextWindow()->SetPaintTransparent( true ); pImpVclMEdit->GetTextWindow()->SetBackground(); pImpVclMEdit->GetTextWindow()->SetControlBackground(); SetBackground(); @@ -1331,7 +1331,7 @@ void VclMultiLineEdit::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); Resize(); Invalidate(); } @@ -1341,12 +1341,12 @@ void VclMultiLineEdit::DataChanged( const DataChangedEvent& rDCEvt ) void VclMultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); Font aFont = pImpVclMEdit->GetTextWindow()->GetDrawPixelFont( pDev ); - aFont.SetTransparent( sal_True ); + aFont.SetTransparent( true ); OutDevType eOutDevType = pDev->GetOutDevType(); pDev->Push(); @@ -1540,7 +1540,7 @@ ScrollBar* VclMultiLineEdit::GetVScrollBar() const return pImpVclMEdit->GetVScrollBar(); } -void VclMultiLineEdit::EnableFocusSelectionHide( sal_Bool bHide ) +void VclMultiLineEdit::EnableFocusSelectionHide( bool bHide ) { pImpVclMEdit->GetTextWindow()->SetAutoFocusHide( bHide ); } @@ -1551,7 +1551,7 @@ void VclMultiLineEdit::SetLeftMargin( sal_uInt16 n ) GetTextEngine()->SetLeftMargin( n ); } -void VclMultiLineEdit::SetRightToLeft( sal_Bool bRightToLeft ) +void VclMultiLineEdit::SetRightToLeft( bool bRightToLeft ) { if ( GetTextEngine() ) { @@ -1560,9 +1560,9 @@ void VclMultiLineEdit::SetRightToLeft( sal_Bool bRightToLeft ) } } -sal_Bool VclMultiLineEdit::IsRightToLeft() const +bool VclMultiLineEdit::IsRightToLeft() const { - sal_Bool bRightToLeft = sal_False; + bool bRightToLeft = false; if ( GetTextEngine() ) bRightToLeft = GetTextEngine()->IsRightToLeft(); @@ -1580,7 +1580,7 @@ void VclMultiLineEdit::SetTextSelectable( bool bTextSelectable ) pImpVclMEdit->GetTextWindow()->SetTextSelectable( bTextSelectable ); } -void VclMultiLineEdit::EnableCursor( sal_Bool bEnable ) +void VclMultiLineEdit::EnableCursor( bool bEnable ) { GetTextView()->EnableCursor( bEnable ); } diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx index 4bdc040b24fa..c543c563d4e1 100644 --- a/vcl/source/edit/xtextedt.cxx +++ b/vcl/source/edit/xtextedt.cxx @@ -135,7 +135,7 @@ TextSelection ExtTextEngine::MatchGroup( const TextPaM& rCursor ) const return aSel; } -sal_Bool ExtTextEngine::Search( TextSelection& rSel, const util::SearchOptions& rSearchOptions, sal_Bool bForward ) +bool ExtTextEngine::Search( TextSelection& rSel, const util::SearchOptions& rSearchOptions, bool bForward ) { TextSelection aSel( rSel ); aSel.Justify(); @@ -235,14 +235,14 @@ ExtTextView::~ExtTextView() { } -sal_Bool ExtTextView::MatchGroup() +bool ExtTextView::MatchGroup() { TextSelection aTmpSel( GetSelection() ); aTmpSel.Justify(); if ( ( aTmpSel.GetStart().GetPara() != aTmpSel.GetEnd().GetPara() ) || ( ( aTmpSel.GetEnd().GetIndex() - aTmpSel.GetStart().GetIndex() ) > 1 ) ) { - return sal_False; + return false; } TextSelection aMatchSel = ((ExtTextEngine*)GetTextEngine())->MatchGroup( aTmpSel.GetStart() ); @@ -252,17 +252,17 @@ sal_Bool ExtTextView::MatchGroup() return aMatchSel.HasRange() ? sal_True : sal_False; } -sal_Bool ExtTextView::Search( const util::SearchOptions& rSearchOptions, sal_Bool bForward ) +bool ExtTextView::Search( const util::SearchOptions& rSearchOptions, bool bForward ) { - sal_Bool bFound = sal_False; + bool bFound = false; TextSelection aSel( GetSelection() ); if ( ((ExtTextEngine*)GetTextEngine())->Search( aSel, rSearchOptions, bForward ) ) { - bFound = sal_True; + bFound = true; // First add the beginning of the word to the selection, // so that the whole word is in the visible region. SetSelection( aSel.GetStart() ); - ShowCursor( sal_True, sal_False ); + ShowCursor( true, false ); } else { @@ -275,7 +275,7 @@ sal_Bool ExtTextView::Search( const util::SearchOptions& rSearchOptions, sal_Boo return bFound; } -sal_uInt16 ExtTextView::Replace( const util::SearchOptions& rSearchOptions, sal_Bool bAll, sal_Bool bForward ) +sal_uInt16 ExtTextView::Replace( const util::SearchOptions& rSearchOptions, bool bAll, bool bForward ) { sal_uInt16 nFound = 0; @@ -311,7 +311,7 @@ sal_uInt16 ExtTextView::Replace( const util::SearchOptions& rSearchOptions, sal_ TextSelection aSearchSel( aSel ); - sal_Bool bFound = pTextEngine->Search( aSel, rSearchOptions, sal_True ); + bool bFound = pTextEngine->Search( aSel, rSearchOptions, true ); if ( bFound ) pTextEngine->UndoActionStart(); while ( bFound ) @@ -321,7 +321,7 @@ sal_uInt16 ExtTextView::Replace( const util::SearchOptions& rSearchOptions, sal_ TextPaM aNewStart = pTextEngine->ImpInsertText( aSel, rSearchOptions.replaceString ); aSel = aSearchSel; aSel.GetStart() = aNewStart; - bFound = pTextEngine->Search( aSel, rSearchOptions, sal_True ); + bFound = pTextEngine->Search( aSel, rSearchOptions, true ); } if ( nFound ) { @@ -333,9 +333,9 @@ sal_uInt16 ExtTextView::Replace( const util::SearchOptions& rSearchOptions, sal_ return nFound; } -sal_Bool ExtTextView::ImpIndentBlock( sal_Bool bRight ) +bool ExtTextView::ImpIndentBlock( bool bRight ) { - sal_Bool bDone = sal_False; + bool bDone = false; TextSelection aSel = GetSelection(); aSel.Justify(); @@ -356,7 +356,7 @@ sal_Bool ExtTextView::ImpIndentBlock( sal_Bool bRight ) { // add tabs GetTextEngine()->ImpInsertText( TextPaM( nPara, 0 ), '\t' ); - bDone = sal_True; + bDone = true; } else { @@ -367,14 +367,14 @@ sal_Bool ExtTextView::ImpIndentBlock( sal_Bool bRight ) ( aText[ 0 ] == ' ' ) ) ) { GetTextEngine()->ImpDeleteText( TextSelection( TextPaM( nPara, 0 ), TextPaM( nPara, 1 ) ) ); - bDone = sal_True; + bDone = true; } } } GetTextEngine()->UndoActionEnd(); - sal_Bool bRange = aSel.HasRange(); + bool bRange = aSel.HasRange(); if ( bRight ) { aSel.GetStart().GetIndex()++; @@ -395,14 +395,14 @@ sal_Bool ExtTextView::ImpIndentBlock( sal_Bool bRight ) return bDone; } -sal_Bool ExtTextView::IndentBlock() +bool ExtTextView::IndentBlock() { - return ImpIndentBlock( sal_True ); + return ImpIndentBlock( true ); } -sal_Bool ExtTextView::UnindentBlock() +bool ExtTextView::UnindentBlock() { - return ImpIndentBlock( sal_False ); + return ImpIndentBlock( false ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index 71334c96653a..cbb35a2ccd61 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -52,7 +52,7 @@ const char* FilterConfigCache::FilterConfigCacheEntry::ExternalPixelFilterNameLi "epp", "ira", "era", "itg", "iti", "eti", "exp", NULL }; -sal_Bool FilterConfigCache::bInitialized = sal_False; +bool FilterConfigCache::bInitialized = false; sal_Int32 FilterConfigCache::nIndType = -1; sal_Int32 FilterConfigCache::nIndUIName = -1; sal_Int32 FilterConfigCache::nIndDocumentService = -1; @@ -62,30 +62,30 @@ sal_Int32 FilterConfigCache::nIndUserData = -1; sal_Int32 FilterConfigCache::nIndFileFormatVersion = -1; sal_Int32 FilterConfigCache::nIndTemplateName = -1; -sal_Bool FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUString& rUserDataEntry ) +bool FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUString& rUserDataEntry ) { - bIsPixelFormat = bIsInternalFilter = sal_False; + bIsPixelFormat = bIsInternalFilter = false; sFilterName = rUserDataEntry; const char** pPtr; - for ( pPtr = InternalPixelFilterNameList; *pPtr && ( bIsInternalFilter == sal_False ); pPtr++ ) + for ( pPtr = InternalPixelFilterNameList; *pPtr && !bIsInternalFilter; pPtr++ ) { if ( sFilterName.equalsIgnoreAsciiCase( OUString(*pPtr, strlen(*pPtr), RTL_TEXTENCODING_ASCII_US) ) ) { - bIsInternalFilter = sal_True; - bIsPixelFormat = sal_True; + bIsInternalFilter = true; + bIsPixelFormat = true; } } - for ( pPtr = InternalVectorFilterNameList; *pPtr && ( bIsInternalFilter == sal_False ); pPtr++ ) + for ( pPtr = InternalVectorFilterNameList; *pPtr && !bIsInternalFilter; pPtr++ ) { if ( sFilterName.equalsIgnoreAsciiCase( OUString(*pPtr, strlen(*pPtr), RTL_TEXTENCODING_ASCII_US) ) ) - bIsInternalFilter = sal_True; + bIsInternalFilter = true; } if ( !bIsInternalFilter ) { - for ( pPtr = ExternalPixelFilterNameList; *pPtr && ( bIsPixelFormat == sal_False ); pPtr++ ) + for ( pPtr = ExternalPixelFilterNameList; *pPtr && !bIsPixelFormat; pPtr++ ) { if ( sFilterName.equalsIgnoreAsciiCase( OUString(*pPtr, strlen(*pPtr), RTL_TEXTENCODING_ASCII_US) ) ) - bIsPixelFormat = sal_True; + bIsPixelFormat = true; } OUString sTemp(SVLIBRARY("?")); sFilterName = sTemp.replaceFirst("?", sFilterName); @@ -302,7 +302,7 @@ void FilterConfigCache::ImplInitSmart() // ------------------------------------------------------------------------ -FilterConfigCache::FilterConfigCache( sal_Bool bConfig ) : +FilterConfigCache::FilterConfigCache( bool bConfig ) : bUseConfig ( bConfig ) { if ( bUseConfig ) @@ -432,12 +432,12 @@ OUString FilterConfigCache::GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEn return aWildcard; } -sal_Bool FilterConfigCache::IsImportInternalFilter( sal_uInt16 nFormat ) +bool FilterConfigCache::IsImportInternalFilter( sal_uInt16 nFormat ) { return (nFormat < aImport.size()) && aImport[ nFormat ].bIsInternalFilter; } -sal_Bool FilterConfigCache::IsImportPixelFormat( sal_uInt16 nFormat ) +bool FilterConfigCache::IsImportPixelFormat( sal_uInt16 nFormat ) { return (nFormat < aImport.size()) && aImport[ nFormat ].bIsPixelFormat; } @@ -546,12 +546,12 @@ OUString FilterConfigCache::GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEn return aWildcard; } -sal_Bool FilterConfigCache::IsExportInternalFilter( sal_uInt16 nFormat ) +bool FilterConfigCache::IsExportInternalFilter( sal_uInt16 nFormat ) { return (nFormat < aExport.size()) && aExport[ nFormat ].bIsInternalFilter; } -sal_Bool FilterConfigCache::IsExportPixelFormat( sal_uInt16 nFormat ) +bool FilterConfigCache::IsExportPixelFormat( sal_uInt16 nFormat ) { return (nFormat < aExport.size()) && aExport[ nFormat ].bIsPixelFormat; } diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx index a9b693e73c00..ee83a39db2fb 100644 --- a/vcl/source/filter/FilterConfigCache.hxx +++ b/vcl/source/filter/FilterConfigCache.hxx @@ -48,10 +48,10 @@ class FilterConfigCache // user data OUString sFilterName; - sal_Bool bIsInternalFilter : 1; - sal_Bool bIsPixelFormat : 1; + bool bIsInternalFilter : 1; + bool bIsPixelFormat : 1; - sal_Bool CreateFilterName( const OUString& rUserDataEntry ); + bool CreateFilterName( const OUString& rUserDataEntry ); OUString GetShortName( ); static const char* InternalPixelFilterNameList[]; @@ -63,9 +63,9 @@ class FilterConfigCache CacheVector aImport; CacheVector aExport; - sal_Bool bUseConfig; + bool bUseConfig; - static sal_Bool bInitialized; + static bool bInitialized; static sal_Int32 nIndType; static sal_Int32 nIndUIName; static sal_Int32 nIndDocumentService; @@ -98,8 +98,8 @@ public: OUString GetImportFilterType( sal_uInt16 nFormat ); OUString GetImportFilterTypeName( sal_uInt16 nFormat ); - sal_Bool IsImportInternalFilter( sal_uInt16 nFormat ); - sal_Bool IsImportPixelFormat( sal_uInt16 nFormat ); + bool IsImportInternalFilter( sal_uInt16 nFormat ); + bool IsImportPixelFormat( sal_uInt16 nFormat ); sal_uInt16 GetExportFormatCount() const { return sal::static_int_cast< sal_uInt16 >(aExport.size()); }; @@ -116,10 +116,10 @@ public: OUString GetExportFilterTypeName( sal_uInt16 nFormat ); OUString GetExportInternalFilterName( sal_uInt16 nFormat ); - sal_Bool IsExportInternalFilter( sal_uInt16 nFormat ); - sal_Bool IsExportPixelFormat( sal_uInt16 nFormat ); + bool IsExportInternalFilter( sal_uInt16 nFormat ); + bool IsExportPixelFormat( sal_uInt16 nFormat ); - FilterConfigCache( sal_Bool bUseConfig ); + FilterConfigCache( bool bUseConfig ); ~FilterConfigCache(); }; diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index e486af6372bf..db9af7ad21ed 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -104,7 +104,7 @@ static bool ImpIsTreeAvailable( Reference< XMultiServiceFactory >& rXCfgProv, co void FilterConfigItem::ImpInitTree( const OUString& rSubTree ) { - bModified = sal_False; + bModified = false; Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); @@ -122,7 +122,7 @@ void FilterConfigItem::ImpInitTree( const OUString& rSubTree ) // creation arguments: commit mode PropertyValue aModeArgument; - sal_Bool bAsyncron = sal_True; + bool bAsyncron = true; aAny <<= bAsyncron; aModeArgument.Name = "lazywrite"; aModeArgument.Value = aAny; @@ -189,15 +189,15 @@ FilterConfigItem::~FilterConfigItem() } } -sal_Bool FilterConfigItem::ImplGetPropertyValue( Any& rAny, const Reference< XPropertySet >& rXPropSet, const OUString& rString, sal_Bool bTestPropertyAvailability ) +bool FilterConfigItem::ImplGetPropertyValue( Any& rAny, const Reference< XPropertySet >& rXPropSet, const OUString& rString, bool bTestPropertyAvailability ) { - sal_Bool bRetValue = sal_True; + bool bRetValue = true; if ( rXPropSet.is() ) { if ( bTestPropertyAvailability ) { - bRetValue = sal_False; + bRetValue = false; try { Reference< XPropertySetInfo > @@ -216,16 +216,16 @@ sal_Bool FilterConfigItem::ImplGetPropertyValue( Any& rAny, const Reference< XPr { rAny = rXPropSet->getPropertyValue( rString ); if ( !rAny.hasValue() ) - bRetValue = sal_False; + bRetValue = false; } catch( ::com::sun::star::uno::Exception& ) { - bRetValue = sal_False; + bRetValue = false; } } } else - bRetValue = sal_False; + bRetValue = false; return bRetValue; } @@ -252,9 +252,9 @@ PropertyValue* FilterConfigItem::GetPropertyValue( Sequence< PropertyValue >& rP corresponding PropertyValue is replaced, otherwise the given PropertyValue will be appended */ -sal_Bool FilterConfigItem::WritePropertyValue( Sequence< PropertyValue >& rPropSeq, const PropertyValue& rPropValue ) +bool FilterConfigItem::WritePropertyValue( Sequence< PropertyValue >& rPropSeq, const PropertyValue& rPropValue ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( !rPropValue.Name.isEmpty() ) { sal_Int32 i, nCount; @@ -268,21 +268,21 @@ sal_Bool FilterConfigItem::WritePropertyValue( Sequence< PropertyValue >& rPropS rPropSeq[ i ] = rPropValue; - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool FilterConfigItem::ReadBool( const OUString& rKey, sal_Bool bDefault ) +bool FilterConfigItem::ReadBool( const OUString& rKey, bool bDefault ) { Any aAny; - sal_Bool bRetValue = bDefault; + bool bRetValue = bDefault; PropertyValue* pPropVal = GetPropertyValue( aFilterData, rKey ); if ( pPropVal ) { pPropVal->Value >>= bRetValue; } - else if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) ) + else if ( ImplGetPropertyValue( aAny, xPropSet, rKey, true ) ) { aAny >>= bRetValue; } @@ -302,7 +302,7 @@ sal_Int32 FilterConfigItem::ReadInt32( const OUString& rKey, sal_Int32 nDefault { pPropVal->Value >>= nRetValue; } - else if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) ) + else if ( ImplGetPropertyValue( aAny, xPropSet, rKey, true ) ) { aAny >>= nRetValue; } @@ -322,7 +322,7 @@ OUString FilterConfigItem::ReadString( const OUString& rKey, const OUString& rDe { pPropVal->Value >>= aRetValue; } - else if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) ) + else if ( ImplGetPropertyValue( aAny, xPropSet, rKey, true ) ) { aAny >>= aRetValue; } @@ -333,7 +333,7 @@ OUString FilterConfigItem::ReadString( const OUString& rKey, const OUString& rDe return aRetValue; } -void FilterConfigItem::WriteBool( const OUString& rKey, sal_Bool bNewValue ) +void FilterConfigItem::WriteBool( const OUString& rKey, bool bNewValue ) { PropertyValue aBool; aBool.Name = rKey; @@ -343,9 +343,9 @@ void FilterConfigItem::WriteBool( const OUString& rKey, sal_Bool bNewValue ) if ( xPropSet.is() ) { Any aAny; - if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) ) + if ( ImplGetPropertyValue( aAny, xPropSet, rKey, true ) ) { - sal_Bool bOldValue(sal_True); + bool bOldValue(true); if ( aAny >>= bOldValue ) { if ( bOldValue != bNewValue ) @@ -354,7 +354,7 @@ void FilterConfigItem::WriteBool( const OUString& rKey, sal_Bool bNewValue ) try { xPropSet->setPropertyValue( rKey, aAny ); - bModified = sal_True; + bModified = true; } catch ( ::com::sun::star::uno::Exception& ) { @@ -377,7 +377,7 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue ) { Any aAny; - if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) ) + if ( ImplGetPropertyValue( aAny, xPropSet, rKey, true ) ) { sal_Int32 nOldValue = 0; if ( aAny >>= nOldValue ) @@ -388,7 +388,7 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue ) try { xPropSet->setPropertyValue( rKey, aAny ); - bModified = sal_True; + bModified = true; } catch ( ::com::sun::star::uno::Exception& ) { diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 8e7e1ae69a91..abdcbea87bdb 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -145,7 +145,7 @@ static void KillDirEntry( const OUString& rMainUrl ) comphelper::getProcessComponentContext() ); aCnt.executeCommand( "delete", - css::uno::makeAny( sal_Bool( sal_True ) ) ); + css::uno::makeAny( true ) ); } catch(const css::ucb::CommandAbortedException&) { @@ -1097,7 +1097,7 @@ ImpFilterLibCacheEntry* ImpFilterLibCache::GetFilter( const OUString& rFilterPat namespace { struct Cache : public rtl::Static<ImpFilterLibCache, Cache> {}; } -GraphicFilter::GraphicFilter( sal_Bool bConfig ) : +GraphicFilter::GraphicFilter( bool bConfig ) : bUseConfig ( bConfig ), nExpGraphHint ( 0 ) { @@ -1153,7 +1153,7 @@ void GraphicFilter::ImplInit() } pErrorEx = new FilterErrorEx; - bAbort = sal_False; + bAbort = false; } sal_uLong GraphicFilter::ImplSetError( sal_uLong nError, const SvStream* pStm ) @@ -1219,7 +1219,7 @@ OUString GraphicFilter::GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry return pConfig->GetImportWildcard( nFormat, nEntry ); } -sal_Bool GraphicFilter::IsImportPixelFormat( sal_uInt16 nFormat ) +bool GraphicFilter::IsImportPixelFormat( sal_uInt16 nFormat ) { return pConfig->IsImportPixelFormat( nFormat ); } @@ -1285,7 +1285,7 @@ OUString GraphicFilter::GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry return pConfig->GetExportWildcard( nFormat, nEntry ); } -sal_Bool GraphicFilter::IsExportPixelFormat( sal_uInt16 nFormat ) +bool GraphicFilter::IsExportPixelFormat( sal_uInt16 nFormat ) { return pConfig->IsExportPixelFormat( nFormat ); } @@ -1356,12 +1356,12 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat GraphicReader* pContext = rGraphic.GetContext(); GfxLinkType eLinkType = GFX_LINK_TYPE_NONE; bool bDummyContext = ( pContext == (GraphicReader*) 1 ); - const sal_Bool bLinkSet = rGraphic.IsLink(); + const bool bLinkSet = rGraphic.IsLink(); FilterConfigItem* pFilterConfigItem = NULL; Size aPreviewSizeHint( 0, 0 ); - sal_Bool bAllowPartialStreamRead = sal_False; - sal_Bool bCreateNativeLink = sal_True; + bool bAllowPartialStreamRead = false; + bool bCreateNativeLink = true; ResetLastError(); @@ -1407,7 +1407,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat else nStmBegin = rIStream.Tell(); - bAbort = sal_False; + bAbort = false; nStatus = ImpTestOrFindFormat( rPath, rIStream, nFormat ); // if pending, return GRFILTER_OK in order to request more bytes if( rIStream.GetError() == ERRCODE_IO_PENDING ) @@ -1736,7 +1736,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat { rIStream.Seek( nStmBegin ); rIStream.Read( pBuf, nBufSize ); - rGraphic.SetLink( GfxLink( pBuf, nBufSize, eLinkType, sal_True ) ); + rGraphic.SetLink( GfxLink( pBuf, nBufSize, eLinkType, true ) ); } } } @@ -1844,7 +1844,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString FilterConfigItem aConfigItem( (uno::Sequence< beans::PropertyValue >*)pFilterData ); OUString aFilterName( pConfig->GetExportFilterName( nFormat ) ); - bAbort = sal_False; + bAbort = false; sal_uInt16 nStatus = GRFILTER_OK; GraphicType eType; Graphic aGraphic( rGraphic ); @@ -1907,7 +1907,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString if( !aBmp.Convert( (BmpConversion) nColorRes ) ) aBmp = aGraphic.GetBitmap(); } - sal_Bool bRleCoding = aConfigItem.ReadBool( "RLE_Coding", sal_True ); + bool bRleCoding = aConfigItem.ReadBool( "RLE_Coding", true ); // save RLE encoded? WriteDIB(aBmp, rOStm, bRleCoding, true); diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index 9e3fd4c96624..b0495dc174fa 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -32,14 +32,14 @@ sal_uInt8* ImplSearchEntry( sal_uInt8* , sal_uInt8* , sal_uLong , sal_uLong ); GraphicDescriptor::GraphicDescriptor( const INetURLObject& rPath ) : pFileStm( ::utl::UcbStreamHelper::CreateStream( rPath.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ) ), aPathExt( rPath.GetFileExtension().toAsciiLowerCase() ), - bOwnStream( sal_True ) + bOwnStream( true ) { ImpConstruct(); } GraphicDescriptor::GraphicDescriptor( SvStream& rInStream, const OUString* pPath) : pFileStm ( &rInStream ), - bOwnStream ( sal_False ) + bOwnStream ( false ) { ImpConstruct(); @@ -56,39 +56,39 @@ GraphicDescriptor::~GraphicDescriptor() delete pFileStm; } -sal_Bool GraphicDescriptor::Detect( sal_Bool bExtendedInfo ) +bool GraphicDescriptor::Detect( sal_Bool bExtendedInfo ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( pFileStm && !pFileStm->GetError() ) { SvStream& rStm = *pFileStm; sal_uInt16 nOldFormat = rStm.GetNumberFormatInt(); - if ( ImpDetectGIF( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectJPG( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectBMP( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectPNG( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectTIF( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectPCX( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectDXF( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectMET( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectSGF( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectSGV( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectSVM( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectWMF( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectEMF( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectSVG( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectPCT( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectXBM( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectXPM( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectPBM( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectPGM( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectPPM( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectRAS( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectTGA( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectPSD( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectEPS( rStm, bExtendedInfo ) ) bRet = sal_True; - else if ( ImpDetectPCD( rStm, bExtendedInfo ) ) bRet = sal_True; + if ( ImpDetectGIF( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectJPG( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectBMP( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectPNG( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectTIF( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectPCX( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectDXF( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectMET( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectSGF( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectSGV( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectSVM( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectWMF( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectEMF( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectSVG( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectPCT( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectXBM( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectXPM( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectPBM( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectPGM( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectPPM( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectRAS( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectTGA( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectPSD( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectEPS( rStm, bExtendedInfo ) ) bRet = true; + else if ( ImpDetectPCD( rStm, bExtendedInfo ) ) bRet = true; rStm.SetNumberFormatInt( nOldFormat ); } @@ -100,13 +100,13 @@ void GraphicDescriptor::ImpConstruct() nFormat = GFF_NOT; nBitsPerPixel = 0; nPlanes = 0; - bCompressed = sal_False; + bCompressed = false; } -sal_Bool GraphicDescriptor::ImpDetectBMP( SvStream& rStm, sal_Bool bExtendedInfo ) +bool GraphicDescriptor::ImpDetectBMP( SvStream& rStm, bool bExtendedInfo ) { sal_uInt16 nTemp16 = 0; - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nStmPos = rStm.Tell(); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); @@ -123,7 +123,7 @@ sal_Bool GraphicDescriptor::ImpDetectBMP( SvStream& rStm, sal_Bool bExtendedInfo if ( nTemp16 == 0x4d42 ) { nFormat = GFF_BMP; - bRet = sal_True; + bRet = true; if ( bExtendedInfo ) { @@ -168,7 +168,7 @@ sal_Bool GraphicDescriptor::ImpDetectBMP( SvStream& rStm, sal_Bool bExtendedInfo if ( ( nBitsPerPixel > 24 ) || ( nCompression > 3 ) ) { nFormat = GFF_NOT; - bRet = sal_False; + bRet = false; } } } @@ -176,11 +176,11 @@ sal_Bool GraphicDescriptor::ImpDetectBMP( SvStream& rStm, sal_Bool bExtendedInfo return bRet; } -sal_Bool GraphicDescriptor::ImpDetectGIF( SvStream& rStm, sal_Bool bExtendedInfo ) +bool GraphicDescriptor::ImpDetectGIF( SvStream& rStm, bool bExtendedInfo ) { sal_uInt32 n32 = 0; sal_uInt16 n16 = 0; - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt8 cByte = 0; sal_Int32 nStmPos = rStm.Tell(); @@ -193,7 +193,7 @@ sal_Bool GraphicDescriptor::ImpDetectGIF( SvStream& rStm, sal_Bool bExtendedInfo if ( ( n16 == 0x6137 ) || ( n16 == 0x6139 ) ) { nFormat = GFF_GIF; - bRet = sal_True; + bRet = true; if ( bExtendedInfo ) { @@ -243,10 +243,10 @@ sal_uInt8 ImpDetectJPG_GetNextMarker( SvStream& rStm ) return nByte; } -sal_Bool GraphicDescriptor::ImpDetectJPG( SvStream& rStm, sal_Bool bExtendedInfo ) +bool GraphicDescriptor::ImpDetectJPG( SvStream& rStm, bool bExtendedInfo ) { sal_uInt32 nTemp32 = 0; - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nStmPos = rStm.Tell(); @@ -257,7 +257,7 @@ sal_Bool GraphicDescriptor::ImpDetectJPG( SvStream& rStm, sal_Bool bExtendedInf if( 0xffd8ff00 == ( nTemp32 & 0xffffff00 ) ) { nFormat = GFF_JPG; - bRet = sal_True; + bRet = true; if ( bExtendedInfo ) { @@ -400,9 +400,9 @@ sal_Bool GraphicDescriptor::ImpDetectJPG( SvStream& rStm, sal_Bool bExtendedInf return bRet; } -sal_Bool GraphicDescriptor::ImpDetectPCD( SvStream& rStm, sal_Bool ) +bool GraphicDescriptor::ImpDetectPCD( SvStream& rStm, bool ) { - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nStmPos = rStm.Tell(); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); @@ -421,21 +421,21 @@ sal_Bool GraphicDescriptor::ImpDetectPCD( SvStream& rStm, sal_Bool ) ( cByte == 0x49 ) ) { nFormat = GFF_PCD; - bRet = sal_True; + bRet = true; } rStm.Seek( nStmPos ); return bRet; } -sal_Bool GraphicDescriptor::ImpDetectPCX( SvStream& rStm, sal_Bool bExtendedInfo ) +bool GraphicDescriptor::ImpDetectPCX( SvStream& rStm, bool bExtendedInfo ) { // ! Because 0x0a can be interpreted as LF too ... // we cant be sure that this special sign represent a PCX file only. // Every Ascii file is possible here :-( // We must detect the whole header. - bExtendedInfo = sal_True; + bExtendedInfo = true; - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt8 cByte = 0; sal_Int32 nStmPos = rStm.Tell(); @@ -445,7 +445,7 @@ sal_Bool GraphicDescriptor::ImpDetectPCX( SvStream& rStm, sal_Bool bExtendedInfo if ( cByte == 0x0a ) { nFormat = GFF_PCX; - bRet = sal_True; + bRet = true; if ( bExtendedInfo ) { @@ -511,10 +511,10 @@ sal_Bool GraphicDescriptor::ImpDetectPCX( SvStream& rStm, sal_Bool bExtendedInfo return bRet; } -sal_Bool GraphicDescriptor::ImpDetectPNG( SvStream& rStm, sal_Bool bExtendedInfo ) +bool GraphicDescriptor::ImpDetectPNG( SvStream& rStm, bool bExtendedInfo ) { sal_uInt32 nTemp32 = 0; - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nStmPos = rStm.Tell(); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); @@ -526,7 +526,7 @@ sal_Bool GraphicDescriptor::ImpDetectPNG( SvStream& rStm, sal_Bool bExtendedInfo if ( nTemp32 == 0x0d0a1a0a ) { nFormat = GFF_PNG; - bRet = sal_True; + bRet = true; if ( bExtendedInfo ) { @@ -550,7 +550,7 @@ sal_Bool GraphicDescriptor::ImpDetectPNG( SvStream& rStm, sal_Bool bExtendedInfo // Planes always 1; // compression always nPlanes = 1; - bCompressed = sal_True; + bCompressed = true; sal_uInt32 nLen32 = 0; nTemp32 = 0; @@ -606,10 +606,10 @@ sal_Bool GraphicDescriptor::ImpDetectPNG( SvStream& rStm, sal_Bool bExtendedInfo return bRet; } -sal_Bool GraphicDescriptor::ImpDetectTIF( SvStream& rStm, sal_Bool bExtendedInfo ) +bool GraphicDescriptor::ImpDetectTIF( SvStream& rStm, bool bExtendedInfo ) { bool bDetectOk = false; - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt8 cByte1 = 0; sal_uInt8 cByte2 = 1; @@ -637,7 +637,7 @@ sal_Bool GraphicDescriptor::ImpDetectTIF( SvStream& rStm, sal_Bool bExtendedInfo if ( nTemp16 == 0x2a ) { nFormat = GFF_TIF; - bRet = sal_True; + bRet = true; if ( bExtendedInfo ) { @@ -737,38 +737,38 @@ sal_Bool GraphicDescriptor::ImpDetectTIF( SvStream& rStm, sal_Bool bExtendedInfo return bRet; } -sal_Bool GraphicDescriptor::ImpDetectXBM( SvStream&, sal_Bool ) +bool GraphicDescriptor::ImpDetectXBM( SvStream&, bool ) { - sal_Bool bRet = aPathExt.startsWith( "xbm" ); + bool bRet = aPathExt.startsWith( "xbm" ); if (bRet) nFormat = GFF_XBM; return bRet; } -sal_Bool GraphicDescriptor::ImpDetectXPM( SvStream&, sal_Bool ) +bool GraphicDescriptor::ImpDetectXPM( SvStream&, bool ) { - sal_Bool bRet = aPathExt.startsWith( "xpm" ); + bool bRet = aPathExt.startsWith( "xpm" ); if (bRet) nFormat = GFF_XPM; return bRet; } -sal_Bool GraphicDescriptor::ImpDetectPBM( SvStream& rStm, sal_Bool ) +bool GraphicDescriptor::ImpDetectPBM( SvStream& rStm, bool ) { - sal_Bool bRet = sal_False; + bool bRet = false; // check file extension first, as this trumps the 2 ID bytes if ( aPathExt.startsWith( "pbm" ) ) - bRet = sal_True; + bRet = true; else { sal_Int32 nStmPos = rStm.Tell(); sal_uInt8 nFirst = 0, nSecond = 0; rStm.ReadUChar( nFirst ).ReadUChar( nSecond ); if ( nFirst == 'P' && ( ( nSecond == '1' ) || ( nSecond == '4' ) ) ) - bRet = sal_True; + bRet = true; rStm.Seek( nStmPos ); } @@ -778,19 +778,19 @@ sal_Bool GraphicDescriptor::ImpDetectPBM( SvStream& rStm, sal_Bool ) return bRet; } -sal_Bool GraphicDescriptor::ImpDetectPGM( SvStream& rStm, sal_Bool ) +bool GraphicDescriptor::ImpDetectPGM( SvStream& rStm, bool ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( aPathExt.startsWith( "pgm" ) ) - bRet = sal_True; + bRet = true; else { sal_uInt8 nFirst = 0, nSecond = 0; sal_Int32 nStmPos = rStm.Tell(); rStm.ReadUChar( nFirst ).ReadUChar( nSecond ); if ( nFirst == 'P' && ( ( nSecond == '2' ) || ( nSecond == '5' ) ) ) - bRet = sal_True; + bRet = true; rStm.Seek( nStmPos ); } @@ -800,19 +800,19 @@ sal_Bool GraphicDescriptor::ImpDetectPGM( SvStream& rStm, sal_Bool ) return bRet; } -sal_Bool GraphicDescriptor::ImpDetectPPM( SvStream& rStm, sal_Bool ) +bool GraphicDescriptor::ImpDetectPPM( SvStream& rStm, bool ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( aPathExt.startsWith( "ppm" ) ) - bRet = sal_True; + bRet = true; else { sal_uInt8 nFirst = 0, nSecond = 0; sal_Int32 nStmPos = rStm.Tell(); rStm.ReadUChar( nFirst ).ReadUChar( nSecond ); if ( nFirst == 'P' && ( ( nSecond == '3' ) || ( nSecond == '6' ) ) ) - bRet = sal_True; + bRet = true; rStm.Seek( nStmPos ); } @@ -822,34 +822,34 @@ sal_Bool GraphicDescriptor::ImpDetectPPM( SvStream& rStm, sal_Bool ) return bRet; } -sal_Bool GraphicDescriptor::ImpDetectRAS( SvStream& rStm, sal_Bool ) +bool GraphicDescriptor::ImpDetectRAS( SvStream& rStm, bool ) { sal_uInt32 nMagicNumber = 0; - sal_Bool bRet = sal_False; + bool bRet = false; sal_Int32 nStmPos = rStm.Tell(); rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); rStm.ReadUInt32( nMagicNumber ); if ( nMagicNumber == 0x59a66a95 ) { nFormat = GFF_RAS; - bRet = sal_True; + bRet = true; } rStm.Seek( nStmPos ); return bRet; } -sal_Bool GraphicDescriptor::ImpDetectTGA( SvStream&, sal_Bool ) +bool GraphicDescriptor::ImpDetectTGA( SvStream&, bool ) { - sal_Bool bRet = aPathExt.startsWith( "tga" ); + bool bRet = aPathExt.startsWith( "tga" ); if (bRet) nFormat = GFF_TGA; return bRet; } -sal_Bool GraphicDescriptor::ImpDetectPSD( SvStream& rStm, sal_Bool bExtendedInfo ) +bool GraphicDescriptor::ImpDetectPSD( SvStream& rStm, bool bExtendedInfo ) { - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt32 nMagicNumber = 0; sal_Int32 nStmPos = rStm.Tell(); @@ -861,7 +861,7 @@ sal_Bool GraphicDescriptor::ImpDetectPSD( SvStream& rStm, sal_Bool bExtendedInfo rStm.ReadUInt16( nVersion ); if ( nVersion == 1 ) { - bRet = sal_True; + bRet = true; if ( bExtendedInfo ) { sal_uInt16 nChannels = 0; @@ -885,11 +885,11 @@ sal_Bool GraphicDescriptor::ImpDetectPSD( SvStream& rStm, sal_Bool bExtendedInfo aPixSize.Height() = nRows; break; default: - bRet = sal_False; + bRet = false; } } else - bRet = sal_False; + bRet = false; } } } @@ -900,12 +900,12 @@ sal_Bool GraphicDescriptor::ImpDetectPSD( SvStream& rStm, sal_Bool bExtendedInfo return bRet; } -sal_Bool GraphicDescriptor::ImpDetectEPS( SvStream& rStm, sal_Bool ) +bool GraphicDescriptor::ImpDetectEPS( SvStream& rStm, bool ) { // check the EPS preview and the file extension sal_uInt32 nFirstLong = 0; sal_uInt8 nFirstBytes[20]; - sal_Bool bRet = sal_False; + bool bRet = false; memset(nFirstBytes, 0, sizeof (nFirstBytes)); sal_Int32 nStmPos = rStm.Tell(); @@ -919,24 +919,24 @@ sal_Bool GraphicDescriptor::ImpDetectEPS( SvStream& rStm, sal_Bool ) && ImplSearchEntry( &nFirstBytes[15], (sal_uInt8*)"EPS", 3, 3 ) ) ) { nFormat = GFF_EPS; - bRet = sal_True; + bRet = true; } rStm.Seek( nStmPos ); return bRet; } -sal_Bool GraphicDescriptor::ImpDetectDXF( SvStream&, sal_Bool ) +bool GraphicDescriptor::ImpDetectDXF( SvStream&, bool ) { - sal_Bool bRet = aPathExt.startsWith( "dxf" ); + bool bRet = aPathExt.startsWith( "dxf" ); if (bRet) nFormat = GFF_DXF; return bRet; } -sal_Bool GraphicDescriptor::ImpDetectMET( SvStream&, sal_Bool ) +bool GraphicDescriptor::ImpDetectMET( SvStream&, bool ) { - sal_Bool bRet = aPathExt.startsWith( "met" ); + bool bRet = aPathExt.startsWith( "met" ); if (bRet) nFormat = GFF_MET; @@ -945,9 +945,9 @@ sal_Bool GraphicDescriptor::ImpDetectMET( SvStream&, sal_Bool ) extern bool isPCT(SvStream& rStream, sal_uLong nStreamPos, sal_uLong nStreamLen); -sal_Bool GraphicDescriptor::ImpDetectPCT( SvStream& rStm, sal_Bool ) +bool GraphicDescriptor::ImpDetectPCT( SvStream& rStm, bool ) { - sal_Bool bRet = aPathExt.startsWith( "pct" ); + bool bRet = aPathExt.startsWith( "pct" ); if (bRet) nFormat = GFF_PCT; else @@ -956,7 +956,7 @@ sal_Bool GraphicDescriptor::ImpDetectPCT( SvStream& rStm, sal_Bool ) sal_Size nStreamLen = rStm.remainingSize(); if (isPCT(rStm, nStreamPos, nStreamLen)) { - bRet = sal_True; + bRet = true; nFormat = GFF_PCT; } rStm.Seek(nStreamPos); @@ -965,11 +965,11 @@ sal_Bool GraphicDescriptor::ImpDetectPCT( SvStream& rStm, sal_Bool ) return bRet; } -sal_Bool GraphicDescriptor::ImpDetectSGF( SvStream& rStm, sal_Bool ) +bool GraphicDescriptor::ImpDetectSGF( SvStream& rStm, bool ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( aPathExt.startsWith( "sgf" ) ) - bRet = sal_True; + bRet = true; else { sal_Int32 nStmPos = rStm.Tell(); @@ -979,7 +979,7 @@ sal_Bool GraphicDescriptor::ImpDetectSGF( SvStream& rStm, sal_Bool ) rStm.ReadUChar( nFirst ).ReadUChar( nSecond ); if( nFirst == 'J' && nSecond == 'J' ) - bRet = sal_True; + bRet = true; rStm.Seek( nStmPos ); } @@ -990,19 +990,19 @@ sal_Bool GraphicDescriptor::ImpDetectSGF( SvStream& rStm, sal_Bool ) return bRet; } -sal_Bool GraphicDescriptor::ImpDetectSGV( SvStream&, sal_Bool ) +bool GraphicDescriptor::ImpDetectSGV( SvStream&, bool ) { - sal_Bool bRet = aPathExt.startsWith( "sgv" ); + bool bRet = aPathExt.startsWith( "sgv" ); if (bRet) nFormat = GFF_SGV; return bRet; } -sal_Bool GraphicDescriptor::ImpDetectSVM( SvStream& rStm, sal_Bool bExtendedInfo ) +bool GraphicDescriptor::ImpDetectSVM( SvStream& rStm, bool bExtendedInfo ) { sal_uInt32 n32 = 0; - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt8 cByte = 0; sal_Int32 nStmPos = rStm.Tell(); @@ -1015,7 +1015,7 @@ sal_Bool GraphicDescriptor::ImpDetectSVM( SvStream& rStm, sal_Bool bExtendedInfo if ( cByte == 0x49 ) { nFormat = GFF_SVM; - bRet = sal_True; + bRet = true; if ( bExtendedInfo ) { @@ -1058,7 +1058,7 @@ sal_Bool GraphicDescriptor::ImpDetectSVM( SvStream& rStm, sal_Bool bExtendedInfo if( nTmp16 == 0x4654 ) { nFormat = GFF_SVM; - bRet = sal_True; + bRet = true; if( bExtendedInfo ) { @@ -1076,27 +1076,27 @@ sal_Bool GraphicDescriptor::ImpDetectSVM( SvStream& rStm, sal_Bool bExtendedInfo return bRet; } -sal_Bool GraphicDescriptor::ImpDetectWMF( SvStream&, sal_Bool ) +bool GraphicDescriptor::ImpDetectWMF( SvStream&, bool ) { - sal_Bool bRet = aPathExt.startsWith( "wmf" ); + bool bRet = aPathExt.startsWith( "wmf" ); if (bRet) nFormat = GFF_WMF; return bRet; } -sal_Bool GraphicDescriptor::ImpDetectEMF( SvStream&, sal_Bool ) +bool GraphicDescriptor::ImpDetectEMF( SvStream&, bool ) { - sal_Bool bRet = aPathExt.startsWith( "emf" ); + bool bRet = aPathExt.startsWith( "emf" ); if (bRet) nFormat = GFF_EMF; return bRet; } -sal_Bool GraphicDescriptor::ImpDetectSVG( SvStream& /*rStm*/, sal_Bool /*bExtendedInfo*/ ) +bool GraphicDescriptor::ImpDetectSVG( SvStream& /*rStm*/, bool /*bExtendedInfo*/ ) { - sal_Bool bRet = aPathExt.startsWith( "svg" ); + bool bRet = aPathExt.startsWith( "svg" ); if (bRet) nFormat = GFF_SVG; diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx index 79d58ce0641e..26ceb86b9e12 100644 --- a/vcl/source/filter/igif/gifread.cxx +++ b/vcl/source/filter/igif/gifread.cxx @@ -543,7 +543,7 @@ void GIFReader::CreateNewBitmaps() aAnimBmp.aPosPix = Point( nImagePosX, nImagePosY ); aAnimBmp.aSizePix = Size( nImageWidth, nImageHeight ); aAnimBmp.nWait = ( nTimer != 65535 ) ? nTimer : ANIMATION_TIMEOUT_ON_CLICK; - aAnimBmp.bUserInput = sal_False; + aAnimBmp.bUserInput = false; if( nGCDisposalMethod == 2 ) aAnimBmp.eDisposal = DISPOSE_BACK; diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx index 5e5c6ac9e9c9..e473df1e7a7d 100644 --- a/vcl/source/filter/jpeg/JpegReader.cxx +++ b/vcl/source/filter/jpeg/JpegReader.cxx @@ -285,7 +285,7 @@ unsigned char * JPEGReader::CreateBitmap( JPEGCreateBitmapParam * pParam ) else { pParam->nAlignedWidth = AlignedWidth4Bytes( aSize.Width() * ( bGray ? 8 : 24 ) ); - pParam->bTopDown = sal_True; + pParam->bTopDown = true; pBmpBuf = mpBuffer = new unsigned char[pParam->nAlignedWidth * aSize.Height()]; } } diff --git a/vcl/source/filter/jpeg/JpegReader.hxx b/vcl/source/filter/jpeg/JpegReader.hxx index 442c52d78ef2..978317a59c9d 100644 --- a/vcl/source/filter/jpeg/JpegReader.hxx +++ b/vcl/source/filter/jpeg/JpegReader.hxx @@ -43,7 +43,7 @@ struct JPEGCreateBitmapParam long bGray; long nAlignedWidth; // these members will be filled by the - long bTopDown; // CreateBitmap method in svtools + bool bTopDown; // CreateBitmap method in svtools }; class JPEGReader : public GraphicReader diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx index e763314138e9..78a96d43eeeb 100644 --- a/vcl/source/filter/jpeg/JpegWriter.cxx +++ b/vcl/source/filter/jpeg/JpegWriter.cxx @@ -186,9 +186,9 @@ void* JPEGWriter::GetScanline( long nY ) return pScanline; } -sal_Bool JPEGWriter::Write( const Graphic& rGraphic ) +bool JPEGWriter::Write( const Graphic& rGraphic ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( mxStatusIndicator.is() ) { @@ -223,7 +223,7 @@ sal_Bool JPEGWriter::Write( const Graphic& rGraphic ) } } if ( bIsGrey ) - mbGreys = sal_True; + mbGreys = true; } if( mpExpWasGrey ) @@ -236,7 +236,7 @@ sal_Bool JPEGWriter::Write( const Graphic& rGraphic ) if( !mbNative ) mpBuffer = new sal_uInt8[ AlignedWidth4Bytes( mbGreys ? mpReadAccess->Width() * 8L : mpReadAccess->Width() * 24L ) ]; - bRet = (sal_Bool) WriteJPEG( this, &mrStream, mpReadAccess->Width(), mpReadAccess->Height(), mbGreys, mnQuality, maChromaSubsampling, mxStatusIndicator ); + bRet = WriteJPEG( this, &mrStream, mpReadAccess->Width(), mpReadAccess->Height(), mbGreys, mnQuality, maChromaSubsampling, mxStatusIndicator ); delete[] mpBuffer; mpBuffer = NULL; diff --git a/vcl/source/filter/jpeg/JpegWriter.hxx b/vcl/source/filter/jpeg/JpegWriter.hxx index 88b6352f0c1b..8c4b13bbf197 100644 --- a/vcl/source/filter/jpeg/JpegWriter.hxx +++ b/vcl/source/filter/jpeg/JpegWriter.hxx @@ -33,7 +33,7 @@ class JPEGWriter BitmapReadAccess* mpReadAccess; sal_uInt8* mpBuffer; bool mbNative; - sal_Bool mbGreys; + bool mbGreys; sal_Int32 mnQuality; sal_Int32 maChromaSubsampling; @@ -49,7 +49,7 @@ public: virtual ~JPEGWriter() {}; void* GetScanline( long nY ); - sal_Bool Write( const Graphic& rGraphic ); + bool Write( const Graphic& rGraphic ); }; diff --git a/vcl/source/filter/jpeg/jpeg.h b/vcl/source/filter/jpeg/jpeg.h index 01209ba56509..1f8c21f62aac 100644 --- a/vcl/source/filter/jpeg/jpeg.h +++ b/vcl/source/filter/jpeg/jpeg.h @@ -38,7 +38,7 @@ void jpeg_svstream_src (j_decompress_ptr cinfo, void* infile); void jpeg_svstream_dest (j_compress_ptr cinfo, void* outfile); -long WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream, long nWidth, long nHeight, long bGreyScale, +bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream, long nWidth, long nHeight, bool bGreyScale, long nQualityPercent, long aChromaSubsampling, css::uno::Reference<css::task::XStatusIndicator> const & status); diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx index 3f52a2f024b9..6cbb5899d855 100644 --- a/vcl/source/filter/jpeg/jpegc.cxx +++ b/vcl/source/filter/jpeg/jpegc.cxx @@ -217,8 +217,8 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines, jpeg_destroy_decompress( &cinfo ); } -long WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream, - long nWidth, long nHeight, long bGreys, +bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream, + long nWidth, long nHeight, bool bGreys, long nQualityPercent, long aChromaSubsampling, css::uno::Reference<css::task::XStatusIndicator> const & status ) { @@ -230,7 +230,7 @@ long WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream, if ( setjmp( jerr.setjmp_buffer ) ) { jpeg_destroy_compress( &cinfo ); - return 0; + return false; } cinfo.err = jpeg_std_error( &jerr.pub ); @@ -295,7 +295,7 @@ long WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream, jpeg_finish_compress(&cinfo); jpeg_destroy_compress( &cinfo ); - return 1; + return true; } long Transform(void* pInputStream, void* pOutputStream, long nAngle) diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index e9272b3b5260..93ba2a47bd75 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -58,7 +58,7 @@ public: sal_uInt32 nList; // objectdata, first record sal_uInt32 ListEnd; // objectdata, last record Seitenformat Paper; // data of paper - sal_Bool BorderClip; // clip objects at border (cheat due to alignment in NT) + bool BorderClip; // clip objects at border (cheat due to alignment in NT) sal_uInt8 StdPg; // insert which standardpage ? PointType U; // origin sal_Int16 HlpLnH[20]; // guides @@ -115,8 +115,8 @@ public: ObjLineType ShdL; // shadow outline (new 2.0) ObjAreaType ShdF; // shadow inside (new 2.0) PointType ShdVers; // shadow offset max. 300.00% - sal_Bool ShdAbs; // True-> shadow offset is absolute instead of relative to font size - sal_Bool NoSpc; // True-> no space (for background area) + bool ShdAbs; // True-> shadow offset is absolute instead of relative to font size + bool NoSpc; // True-> no space (for background area) ObjAreaType BackF; // background area sal_uInt32 GetFont(); void SetFont(sal_uInt32 FontID); @@ -139,7 +139,7 @@ public: sal_uInt8 Art; sal_uInt8 Layer; friend SvStream& ReadObjkType(SvStream& rIStream, ObjkType& rObjk); - friend sal_Bool ObjOverSeek(SvStream& rInp, ObjkType& rObjk); + friend bool ObjOverSeek(SvStream& rInp, ObjkType& rObjk); virtual void Draw(OutputDevice& rOut); }; @@ -265,9 +265,9 @@ public: PointType PixSize; // size in Pixel (0 for vector) GrafStat Format; // see: GpmDef.Pas sal_uInt8 nPlanes; // number of bitplanes (0 for vector) - sal_Bool RawOut; // output as raw ? - sal_Bool InvOut; // output inverted ? - sal_Bool LightOut; // brighten? (SD20) + bool RawOut; // output as raw ? + bool InvOut; // output inverted ? + bool LightOut; // brighten? (SD20) sal_uInt8 GrfFlg; // (SD20) 0=nSGF 1=Pcx 2=HPGL 4=Raw $FF=Undef (to fix DrawBmp) INetURLObject aFltPath; // for GraphicFilter friend SvStream& ReadBmapType(SvStream& rIStream, BmapType& rBmap); @@ -300,11 +300,11 @@ class SgfFontOne { public: SgfFontOne* Next; // pointer to list sal_uInt32 IFID; - sal_Bool Bold; - sal_Bool Ital; - sal_Bool Sans; - sal_Bool Serf; - sal_Bool Fixd; + bool Bold; + bool Ital; + bool Sans; + bool Serf; + bool Fixd; FontFamily SVFamil; rtl_TextEncoding SVChSet; OUString SVFName; // e.g. "Times New Roman" = 15 chars diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index b5355cafcb81..39b581f373a4 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -589,7 +589,7 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u aColor=Sgv2SvFarbe(Atr.L.LFarbe,Atr.L.LBFarbe,Atr.L.LIntens); aFont.SetColor(aColor); aColor=Sgv2SvFarbe(Atr.F.FFarbe,Atr.F.FBFarbe,Atr.F.FIntens); aFont.SetFillColor(aColor); - aFont.SetTransparent(sal_True); + aFont.SetTransparent(true); aFont.SetAlign(ALIGN_BASELINE); Dreh/=10; Dreh=3600-Dreh; if (Dreh==3600) Dreh=0; @@ -601,11 +601,11 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, bool Kapt, sal_u if ((Atr.Schnitt & TextDbUnBit) !=0) aFont.SetUnderline(UNDERLINE_DOUBLE); if ((Atr.Schnitt & TextStrkBit) !=0) aFont.SetStrikeout(STRIKEOUT_SINGLE); if ((Atr.Schnitt & TextDbStBit) !=0) aFont.SetStrikeout(STRIKEOUT_DOUBLE); - if ((Atr.Schnitt & TextSh2DBit) !=0) aFont.SetShadow(sal_True); - if ((Atr.Schnitt & TextSh3DBit) !=0) aFont.SetShadow(sal_True); - if ((Atr.Schnitt & TextSh4DBit) !=0) aFont.SetShadow(sal_True); - if ((Atr.Schnitt & TextShEbBit) !=0) aFont.SetShadow(sal_True); - if (CheckTextOutl(Atr.F,Atr.L)) aFont.SetOutline(sal_True); + if ((Atr.Schnitt & TextSh2DBit) !=0) aFont.SetShadow(true); + if ((Atr.Schnitt & TextSh3DBit) !=0) aFont.SetShadow(true); + if ((Atr.Schnitt & TextSh4DBit) !=0) aFont.SetShadow(true); + if ((Atr.Schnitt & TextShEbBit) !=0) aFont.SetShadow(true); + if (CheckTextOutl(Atr.F,Atr.L)) aFont.SetOutline(true); if (aFont!=rOut.GetFont()) rOut.SetFont(aFont); @@ -1095,11 +1095,11 @@ SgfFontOne::SgfFontOne() { Next=NULL; IFID=0; - Bold=sal_False; - Ital=sal_False; - Sans=sal_False; - Serf=sal_False; - Fixd=sal_False; + Bold=false; + Ital=false; + Sans=false; + Serf=false; + Fixd=false; SVFamil=FAMILY_DONTKNOW; SVChSet=RTL_TEXTENCODING_DONTKNOW; SVWidth=40; @@ -1134,11 +1134,11 @@ void SgfFontOne::ReadOne( const OString& rID, OString& Dsc ) if (!s.isEmpty()) { s = s.toAsciiUpperCase(); - if (s.match("BOLD")) Bold=sal_True; - else if (s.match("ITAL")) Ital=sal_True; - else if (s.match("SERF")) Serf=sal_True; - else if (s.match("SANS")) Sans=sal_True; - else if (s.match("FIXD")) Fixd=sal_True; + if (s.match("BOLD")) Bold=true; + else if (s.match("ITAL")) Ital=true; + else if (s.match("SERF")) Serf=true; + else if (s.match("SANS")) Sans=true; + else if (s.match("FIXD")) Fixd=true; else if (s.match("ROMAN")) SVFamil=FAMILY_ROMAN; else if (s.match("SWISS")) SVFamil=FAMILY_SWISS; else if (s.match("MODERN")) SVFamil=FAMILY_MODERN; diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index 9a6909f2c418..79497fb344e1 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -178,7 +178,7 @@ void EMFWriter::ImplBeginPlusRecord( sal_uInt16 nType, sal_uInt16 nFlags ) if( !mbRecordPlusOpen ) { - mbRecordPlusOpen = sal_True; + mbRecordPlusOpen = true; mnRecordPlusPos = m_rStm.Tell(); m_rStm.WriteUInt16( (sal_uInt16) nType ).WriteUInt16( (sal_uInt16) nFlags ); @@ -198,7 +198,7 @@ void EMFWriter::ImplEndPlusRecord() m_rStm.WriteUInt32( (sal_uInt32)( nSize ) ) // Size .WriteUInt32( (sal_uInt32) ( nSize - 0xc ) ); // Data Size m_rStm.Seek( nActPos ); - mbRecordPlusOpen = sal_False; + mbRecordPlusOpen = false; } } @@ -283,11 +283,11 @@ void EMFWriter::ImplWritePlusFillPolygonRecord( const Polygon& rPoly, const sal_ ImplEndCommentRecord(); } -sal_Bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pFilterConfigItem ) +bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pFilterConfigItem ) { const sal_uLong nHeaderPos = m_rStm.Tell(); - maVDev.EnableOutput( sal_False ); + maVDev.EnableOutput( false ); maVDev.SetMapMode( rMtf.GetPrefMapMode() ); // don't work with pixel as destination map mode -> higher resolution preferrable maDestMapMode.SetMapUnit( MAP_100TH_MM ); @@ -401,7 +401,7 @@ void EMFWriter::ImplBeginRecord( sal_uInt32 nType ) if( !mbRecordOpen ) { - mbRecordOpen = sal_True; + mbRecordOpen = true; mnRecordPos = m_rStm.Tell(); m_rStm.WriteUInt32( nType ); @@ -426,11 +426,11 @@ void EMFWriter::ImplEndRecord() while( nFillBytes-- ) m_rStm.WriteUChar( (sal_uInt8)0 ); mnRecordCount++; - mbRecordOpen = sal_False; + mbRecordOpen = false; } } -sal_Bool EMFWriter::ImplPrepareHandleSelect( sal_uInt32& rHandle, sal_uLong nSelectType ) +bool EMFWriter::ImplPrepareHandleSelect( sal_uInt32& rHandle, sal_uLong nSelectType ) { if( rHandle != HANDLE_INVALID ) { @@ -664,7 +664,7 @@ void EMFWriter::ImplWriteRect( const Rectangle& rRect ) .WriteInt32( static_cast<sal_Int32>(aRect.Bottom()) ); } -void EMFWriter::ImplWritePolygonRecord( const Polygon& rPoly, sal_Bool bClose ) +void EMFWriter::ImplWritePolygonRecord( const Polygon& rPoly, bool bClose ) { if( rPoly.GetSize() ) { @@ -696,7 +696,7 @@ void EMFWriter::ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ) if( nPolyCount ) { if( 1 == nPolyCount ) - ImplWritePolygonRecord( rPolyPoly[ 0 ], sal_True ); + ImplWritePolygonRecord( rPolyPoly[ 0 ], true ); else { bool bHasFlags = false; @@ -711,7 +711,7 @@ void EMFWriter::ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ) if( nTotalPoints ) { if ( bHasFlags ) - ImplWritePath( rPolyPoly, sal_True ); + ImplWritePath( rPolyPoly, true ); else { ImplCheckFillAttr(); @@ -738,7 +738,7 @@ void EMFWriter::ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ) } } -void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed ) +void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, bool bClosed ) { if ( bClosed ) ImplCheckFillAttr(); @@ -957,7 +957,7 @@ void EMFWriter::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const bas for(sal_uInt32 a(0); a < aLinePolyPolygon.count(); a++) { const basegfx::B2DPolygon aCandidate(aLinePolyPolygon.getB2DPolygon(a)); - ImplWritePolygonRecord( Polygon(aCandidate), sal_False ); + ImplWritePolygonRecord( Polygon(aCandidate), false ); } } @@ -1154,7 +1154,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) { if(pA->GetLineInfo().IsDefault()) { - ImplWritePolygonRecord( rPoly, sal_False ); + ImplWritePolygonRecord( rPoly, false ); } else { @@ -1394,14 +1394,14 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case( META_LINECOLOR_ACTION ): { ( (MetaAction*) pAction )->Execute( &maVDev ); - mbLineChanged = sal_True; + mbLineChanged = true; } break; case( META_FILLCOLOR_ACTION ): { ( (MetaAction*) pAction )->Execute( &maVDev ); - mbFillChanged = sal_True; + mbFillChanged = true; } break; @@ -1412,7 +1412,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) case( META_FONT_ACTION ): { ( (MetaAction*) pAction )->Execute( &maVDev ); - mbTextChanged = sal_True; + mbTextChanged = true; } break; @@ -1457,7 +1457,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) ImplEndRecord(); ImplWriteRasterOp( maVDev.GetRasterOp() ); - mbLineChanged = mbFillChanged = mbTextChanged = sal_True; + mbLineChanged = mbFillChanged = mbTextChanged = true; } break; diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx index 54228e6cd8c6..1eddc51e2029 100644 --- a/vcl/source/filter/wmf/emfwr.hxx +++ b/vcl/source/filter/wmf/emfwr.hxx @@ -47,13 +47,13 @@ private: sal_uLong mnRecordCount; sal_uLong mnRecordPos; sal_uLong mnRecordPlusPos; - sal_Bool mbRecordOpen; - sal_Bool mbRecordPlusOpen; - sal_Bool mbLineChanged; + bool mbRecordOpen; + bool mbRecordPlusOpen; + bool mbLineChanged; sal_uInt32 mnLineHandle; - sal_Bool mbFillChanged; + bool mbFillChanged; sal_uInt32 mnFillHandle; - sal_Bool mbTextChanged; + bool mbTextChanged; sal_uInt32 mnTextHandle; sal_uInt32 mnHorTextAlign; @@ -68,7 +68,7 @@ private: sal_uLong ImplAcquireHandle(); void ImplReleaseHandle( sal_uLong nHandle ); - sal_Bool ImplPrepareHandleSelect( sal_uInt32& rHandle, sal_uLong nSelectType ); + bool ImplPrepareHandleSelect( sal_uInt32& rHandle, sal_uLong nSelectType ); void ImplCheckLineAttr(); void ImplCheckFillAttr(); void ImplCheckTextAttr(); @@ -79,8 +79,8 @@ private: void ImplWritePoint( const Point& rPoint ); void ImplWriteSize( const Size& rSize); void ImplWriteRect( const Rectangle& rRect ); - void ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClose ); - void ImplWritePolygonRecord( const Polygon& rPoly, sal_Bool bClose ); + void ImplWritePath( const PolyPolygon& rPolyPoly, bool bClose ); + void ImplWritePolygonRecord( const Polygon& rPoly, bool bClose ); void ImplWritePolyPolygonRecord( const PolyPolygon& rPolyPoly ); void ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, const Size& rSz, sal_uInt32 nROP ); void ImplWriteTextRecord( const Point& rPos, const OUString rText, const sal_Int32* pDXArray, sal_uInt32 nWidth ); @@ -97,7 +97,7 @@ public: EMFWriter(SvStream &rStream) : m_rStm(rStream) {} - sal_Bool WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pConfigItem = NULL ); + bool WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pConfigItem = NULL ); }; #endif // INCLUDED_VCL_SOURCE_FILTER_WMF_EMFWR_HXX diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index e2292a0b8f5f..9023c50ad3ed 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -236,7 +236,7 @@ static bool ImplReadRegion( PolyPolygon& rPolyPoly, SvStream& rSt, sal_uInt32 nL return bOk; } -void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC) +void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, bool& bHaveDC) { if (!bEMFPlus) { pOut->PassEMFPlusHeaderInfo(); @@ -306,7 +306,7 @@ void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC) * skipFirst: if the first point read is the 0th point or the 1st point in the array. * */ template <class T, class Drawer> -void EnhWMFReader::ReadAndDrawPolygon(Drawer drawer, const sal_Bool skipFirst) +void EnhWMFReader::ReadAndDrawPolygon(Drawer drawer, const bool skipFirst) { sal_uInt32 nPoints(0), nStartIndex(0); pWMF->SeekRel( 16 ); @@ -379,7 +379,7 @@ void EnhWMFReader::ReadAndDrawPolyLine() for ( i = 0; ( i < nPoly ) && pWMF->good(); i++ ) { Polygon aPolygon = ReadPolygon<T>(0, pnPoints[i]); - pOut->DrawPolyLine( aPolygon, sal_False, bRecordPath ); + pOut->DrawPolyLine( aPolygon, false, bRecordPath ); } delete[] pnPoints; } @@ -450,7 +450,7 @@ void EnhWMFReader::ReadAndDrawPolyPolygon() } } -sal_Bool EnhWMFReader::ReadEnhWMF() +bool EnhWMFReader::ReadEnhWMF() { sal_uInt32 nStretchBltMode = 0; sal_uInt32 nRecType(0), nRecSize(0), nNextPos(0), @@ -458,8 +458,8 @@ sal_Bool EnhWMFReader::ReadEnhWMF() nDat32(0), nNom1(0), nDen1(0), nNom2(0), nDen2(0); sal_Int32 nX32(0), nY32(0), nx32(0), ny32(0); - sal_Bool bFlag(sal_False), bStatus = ReadHeader(); - sal_Bool bHaveDC = false; + bool bFlag(false), bStatus = ReadHeader(); + bool bHaveDC = false; static bool bEnableEMFPlus = ( getenv( "EMF_PLUS_DISABLE" ) == NULL ); @@ -469,7 +469,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() if ( !pWMF->good() || ( nRecSize < 8 ) || ( nRecSize & 3 ) ) // Parameters are always divisible by 4 { - bStatus = sal_False; + bStatus = false; break; } @@ -477,7 +477,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() if ( !pWMF->good() || nNextPos > nEndPos ) { - bStatus = sal_False; + bStatus = false; break; } @@ -488,7 +488,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() pOut->ResolveBitmapActions( aBmpSaveList ); } - bFlag = sal_False; + bFlag = false; SAL_INFO ("vcl.emf", "0x" << std::hex << (nNextPos - nRecSize) << "-0x" << nNextPos << " record type: " << std::dec << nRecType << " size: " << nRecSize << std::dec); @@ -522,21 +522,21 @@ sal_Bool EnhWMFReader::ReadEnhWMF() switch( nRecType ) { case EMR_POLYBEZIERTO : - ReadAndDrawPolygon<sal_Int32>(boost::bind(&WinMtfOutput::DrawPolyBezier, _1, _2, _3, _4), sal_True); + ReadAndDrawPolygon<sal_Int32>(boost::bind(&WinMtfOutput::DrawPolyBezier, _1, _2, _3, _4), true); break; case EMR_POLYBEZIER : - ReadAndDrawPolygon<sal_Int32>(boost::bind(&WinMtfOutput::DrawPolyBezier, _1, _2, _3, _4), sal_False); + ReadAndDrawPolygon<sal_Int32>(boost::bind(&WinMtfOutput::DrawPolyBezier, _1, _2, _3, _4), false); break; case EMR_POLYGON : - ReadAndDrawPolygon<sal_Int32>(boost::bind(&WinMtfOutput::DrawPolygon, _1, _2, _3, _4), sal_False); + ReadAndDrawPolygon<sal_Int32>(boost::bind(&WinMtfOutput::DrawPolygon, _1, _2, _3, _4), false); break; case EMR_POLYLINETO : - ReadAndDrawPolygon<sal_Int32>(boost::bind(&WinMtfOutput::DrawPolyLine, _1, _2, _3, _4), sal_True); + ReadAndDrawPolygon<sal_Int32>(boost::bind(&WinMtfOutput::DrawPolyLine, _1, _2, _3, _4), true); break; case EMR_POLYLINE : - ReadAndDrawPolygon<sal_Int32>(boost::bind(&WinMtfOutput::DrawPolyLine, _1, _2, _3, _4), sal_False); + ReadAndDrawPolygon<sal_Int32>(boost::bind(&WinMtfOutput::DrawPolyLine, _1, _2, _3, _4), false); break; case EMR_POLYPOLYLINE : @@ -727,7 +727,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() if ( aSize.Width() ) aLineInfo.SetWidth( aSize.Width() ); - sal_Bool bTransparent = sal_False; + bool bTransparent = false; switch( nStyle & 0xFF ) { case PS_DASHDOTDOT : @@ -761,7 +761,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() aLineInfo.SetDistance( 100 ); break; case PS_NULL : - bTransparent = sal_True; + bTransparent = true; aLineInfo.SetStyle( LINE_NONE ); break; case PS_INSIDEFRAME : @@ -817,7 +817,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() if ( nWidth ) aLineInfo.SetWidth( nWidth ); - sal_Bool bTransparent = sal_False; + bool bTransparent = false; sal_uInt16 nDashCount = 0; sal_uInt16 nDotCount = 0; @@ -834,7 +834,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() nDashCount++; break; case PS_NULL : - bTransparent = sal_True; + bTransparent = true; aLineInfo.SetStyle( LINE_NONE ); break; @@ -938,21 +938,21 @@ sal_Bool EnhWMFReader::ReadEnhWMF() { sal_uInt32 nStartX, nStartY, nEndX, nEndY; pWMF->ReadInt32( nX32 ).ReadInt32( nY32 ).ReadInt32( nx32 ).ReadInt32( ny32 ).ReadUInt32( nStartX ).ReadUInt32( nStartY ).ReadUInt32( nEndX ).ReadUInt32( nEndY ); - pOut->DrawArc( ReadRectangle( nX32, nY32, nx32, ny32 ), Point( nStartX, nStartY ), Point( nEndX, nEndY ), sal_True ); + pOut->DrawArc( ReadRectangle( nX32, nY32, nx32, ny32 ), Point( nStartX, nStartY ), Point( nEndX, nEndY ), true ); } break; case EMR_BEGINPATH : { pOut->ClearPath(); - bRecordPath = sal_True; + bRecordPath = true; } break; case EMR_ABORTPATH : pOut->ClearPath(); case EMR_ENDPATH : - bRecordPath = sal_False; + bRecordPath = false; break; case EMR_CLOSEFIGURE : @@ -960,22 +960,22 @@ sal_Bool EnhWMFReader::ReadEnhWMF() break; case EMR_FILLPATH : - pOut->StrokeAndFillPath( sal_False, sal_True ); + pOut->StrokeAndFillPath( false, true ); break; case EMR_STROKEANDFILLPATH : - pOut->StrokeAndFillPath( sal_True, sal_True ); + pOut->StrokeAndFillPath( true, true ); break; case EMR_STROKEPATH : - pOut->StrokeAndFillPath( sal_True, sal_False ); + pOut->StrokeAndFillPath( true, false ); break; case EMR_SELECTCLIPPATH : { sal_Int32 nClippingMode; pWMF->ReadInt32( nClippingMode ); - pOut->SetClipPath( pOut->GetPathObj(), nClippingMode, sal_True ); + pOut->SetClipPath( pOut->GetPathObj(), nClippingMode, true ); } break; @@ -988,7 +988,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() PolyPolygon aPolyPoly; if ( cbRgnData ) ImplReadRegion( aPolyPoly, *pWMF, nRecSize ); - pOut->SetClipPath( aPolyPoly, iMode, sal_True ); + pOut->SetClipPath( aPolyPoly, iMode, true ); } break; @@ -1018,7 +1018,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() Rectangle aRect( Point( xDest, yDest ), Size( cxDest+1, cyDest+1 ) ); if ( (cbBitsSrc > (SAL_MAX_UINT32 - 14)) || ((SAL_MAX_UINT32 - 14) - cbBitsSrc < cbBmiSrc) ) - bStatus = sal_False; + bStatus = false; else { sal_uInt32 nSize = cbBmiSrc + cbBitsSrc + 14; @@ -1082,7 +1082,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() cyDest = abs( (int)cyDest ); // and also 122889 if ( (cbBitsSrc > (SAL_MAX_UINT32 - 14)) || ((SAL_MAX_UINT32 - 14) - cbBitsSrc < cbBmiSrc) ) - bStatus = sal_False; + bStatus = false; else { sal_uInt32 nSize = cbBmiSrc + cbBitsSrc + 14; @@ -1151,7 +1151,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() || ((SAL_MAX_UINT32 - 14) - cbBitsSrc < cbBmiSrc ) ) { - bStatus = sal_False; + bStatus = false; } else { @@ -1238,7 +1238,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() break; case EMR_EXTTEXTOUTA : - bFlag = sal_True; + bFlag = true; case EMR_EXTTEXTOUTW : { sal_Int32 nLeft, nTop, nRight, nBottom, ptlReferenceX, ptlReferenceY, nGfxMode, nXScale, nYScale; @@ -1328,21 +1328,21 @@ sal_Bool EnhWMFReader::ReadEnhWMF() break; case EMR_POLYBEZIERTO16 : - ReadAndDrawPolygon<sal_Int16>(boost::bind(&WinMtfOutput::DrawPolyBezier, _1, _2, _3, _4), sal_True); + ReadAndDrawPolygon<sal_Int16>(boost::bind(&WinMtfOutput::DrawPolyBezier, _1, _2, _3, _4), true); break; case EMR_POLYBEZIER16 : - ReadAndDrawPolygon<sal_Int16>(boost::bind(&WinMtfOutput::DrawPolyBezier, _1, _2, _3, _4), sal_False); + ReadAndDrawPolygon<sal_Int16>(boost::bind(&WinMtfOutput::DrawPolyBezier, _1, _2, _3, _4), false); break; case EMR_POLYGON16 : - ReadAndDrawPolygon<sal_Int16>(boost::bind(&WinMtfOutput::DrawPolygon, _1, _2, _3, _4), sal_False); + ReadAndDrawPolygon<sal_Int16>(boost::bind(&WinMtfOutput::DrawPolygon, _1, _2, _3, _4), false); break; case EMR_POLYLINETO16 : - ReadAndDrawPolygon<sal_Int16>(boost::bind(&WinMtfOutput::DrawPolyLine, _1, _2, _3, _4), sal_True); + ReadAndDrawPolygon<sal_Int16>(boost::bind(&WinMtfOutput::DrawPolyLine, _1, _2, _3, _4), true); break; case EMR_POLYLINE16 : - ReadAndDrawPolygon<sal_Int16>(boost::bind(&WinMtfOutput::DrawPolyLine, _1, _2, _3, _4), sal_False); + ReadAndDrawPolygon<sal_Int16>(boost::bind(&WinMtfOutput::DrawPolyLine, _1, _2, _3, _4), false); break; case EMR_POLYPOLYLINE16 : @@ -1364,7 +1364,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() { pOut->Push(); pOut->SelectObject( nIndex ); - pOut->DrawPolyPolygon( aPolyPoly, sal_False ); + pOut->DrawPolyPolygon( aPolyPoly, false ); pOut->Pop(); } } @@ -1388,7 +1388,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() pWMF->ReadUInt32( cbBits ); if ( (cbBits > (SAL_MAX_UINT32 - 14)) || ((SAL_MAX_UINT32 - 14) - cbBits < cbBmi) ) - bStatus = sal_False; + bStatus = false; else if ( offBmi ) { sal_uInt32 nSize = cbBmi + cbBits + 14; @@ -1488,7 +1488,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() }; -sal_Bool EnhWMFReader::ReadHeader() +bool EnhWMFReader::ReadHeader() { sal_uInt32 nType, nSignature, nVersion; sal_uInt32 nHeaderSize, nPalEntries; @@ -1499,7 +1499,7 @@ sal_Bool EnhWMFReader::ReadHeader() pWMF->ReadUInt32( nType ).ReadUInt32( nHeaderSize ); if ( nType != 1 ) { // per [MS-EMF] 2.3.4.2 EMF Header Record Types, type MUST be 0x00000001 SAL_WARN("vcl.emf", "EMF header type is not set to 0x00000001 - possibly corrupted file?"); - return sal_False; + return false; } // Start reading the EMR_HEADER Header object @@ -1526,7 +1526,7 @@ sal_Bool EnhWMFReader::ReadHeader() // and 2.1.14 FormatSignature Enumeration if ( nSignature != 0x464d4520 ) { SAL_WARN("vcl.emf", "EMF\t\tSignature is not 0x464d4520 (\"FME\") - possibly corrupted file?"); - return sal_False; + return false; } pWMF->ReadUInt32( nVersion ); // according to [WS-EMF] 2.2.9, this SHOULD be 0x0001000, however @@ -1555,7 +1555,7 @@ sal_Bool EnhWMFReader::ReadHeader() if ( !nRecordCount ) { SAL_WARN("vcl.emf", "EMF\t\tEMF Header object shows record counter as 0! This shouldn't " "be possible... indicator of possible file corruption?"); - return sal_False; + return false; } // the number of "handles", or graphics objects used in the metafile @@ -1591,7 +1591,7 @@ sal_Bool EnhWMFReader::ReadHeader() pOut->SetRefMill( Size( nMillX, nMillY ) ); pWMF->Seek( nStartPos + nHeaderSize ); - return sal_True; + return true; } diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index 7d0d479832b9..eca0d4f76798 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -95,7 +95,7 @@ void WinMtfPathObj::AddPoint( const Point& rPoint ) Insert( Polygon(), POLYPOLY_APPEND ); Polygon& rPoly = ((PolyPolygon&)*this)[ Count() - 1 ]; rPoly.Insert( rPoly.GetSize(), rPoint, POLY_NORMAL ); - bClosed = sal_False; + bClosed = false; } void WinMtfPathObj::AddPolyLine( const Polygon& rPolyLine ) @@ -104,13 +104,13 @@ void WinMtfPathObj::AddPolyLine( const Polygon& rPolyLine ) Insert( Polygon(), POLYPOLY_APPEND ); Polygon& rPoly = ((PolyPolygon&)*this)[ Count() - 1 ]; rPoly.Insert( rPoly.GetSize(), rPolyLine ); - bClosed = sal_False; + bClosed = false; } void WinMtfPathObj::AddPolygon( const Polygon& rPoly ) { Insert( rPoly, POLYPOLY_APPEND ); - bClosed = sal_True; + bClosed = true; } void WinMtfPathObj::AddPolyPolygon( const PolyPolygon& rPolyPoly ) @@ -118,7 +118,7 @@ void WinMtfPathObj::AddPolyPolygon( const PolyPolygon& rPolyPoly ) sal_uInt16 i, nCount = rPolyPoly.Count(); for ( i = 0; i < nCount; i++ ) Insert( rPolyPoly[ i ], POLYPOLY_APPEND ); - bClosed = sal_True; + bClosed = true; } void WinMtfPathObj::ClosePath() @@ -133,7 +133,7 @@ void WinMtfPathObj::ClosePath() rPoly.Insert( rPoly.GetSize(), aFirst, POLY_NORMAL ); } } - bClosed = sal_True; + bClosed = true; } @@ -594,7 +594,7 @@ void WinMtfOutput::SelectObject( sal_Int32 nIndex ) break; case NULL_PEN : { - pGDIObj->Set( GDI_PEN, new WinMtfLineStyle( Color( COL_TRANSPARENT ), sal_True ) ); + pGDIObj->Set( GDI_PEN, new WinMtfLineStyle( Color( COL_TRANSPARENT ), true ) ); } break; default: @@ -611,7 +611,7 @@ void WinMtfOutput::SelectObject( sal_Int32 nIndex ) case GDI_BRUSH : { maFillStyle = (WinMtfFillStyle*)pGDIObj->pStyle; - mbFillStyleSelected = sal_True; + mbFillStyleSelected = true; } break; case GDI_FONT : @@ -813,7 +813,7 @@ void WinMtfOutput::MoveClipRegion( const Size& rSize ) aClipPath.moveClipRegion( ImplMap( rSize ) ); } -void WinMtfOutput::SetClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode, sal_Bool bIsMapped ) +void WinMtfOutput::SetClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode, bool bIsMapped ) { mbClipNeedsUpdate=true; if ( bIsMapped ) @@ -841,8 +841,8 @@ WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) : meLatestRasterOp ( ROP_INVERT ), meRasterOp ( ROP_OVERPAINT ), maActPos ( Point() ), - mbNopMode ( sal_False ), - mbFillStyleSelected ( sal_False ), + mbNopMode ( false ), + mbFillStyleSelected ( false ), mbClipNeedsUpdate ( true ), mbComplexClip ( false ), mnGfxMode ( GM_COMPATIBLE ), @@ -861,8 +861,8 @@ WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) : mnMillY ( 1 ), mpGDIMetaFile ( &rGDIMetaFile ) { - mbIsMapWinSet = sal_False; - mbIsMapDevSet = sal_False; + mbIsMapWinSet = false; + mbIsMapDevSet = false; mpGDIMetaFile->AddAction( new MetaPushAction( PUSH_CLIPREGION ) ); // The original clipregion has to be on top // of the stack so it can always be restored // this is necessary to be able to support @@ -923,7 +923,7 @@ void WinMtfOutput::UpdateClipRegion() void WinMtfOutput::ImplSetNonPersistentLineColorTransparenz() { Color aColor( COL_TRANSPARENT); - WinMtfLineStyle aTransparentLine( aColor, sal_True ); + WinMtfLineStyle aTransparentLine( aColor, true ); if ( ! ( maLatestLineStyle == aTransparentLine ) ) { maLatestLineStyle = aTransparentLine; @@ -968,7 +968,7 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp ) { // changing modes from R2_NOP so set pen and brush maFillStyle = aNopFillStyle; maLineStyle = aNopLineStyle; - mbNopMode = sal_False; + mbNopMode = false; } switch( nRasterOp ) { @@ -983,13 +983,13 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp ) case R2_NOP: { meRasterOp = ROP_OVERPAINT; - if( mbNopMode == sal_False ) + if( !mbNopMode ) { aNopFillStyle = maFillStyle; aNopLineStyle = maLineStyle; maFillStyle = WinMtfFillStyle( Color( COL_TRANSPARENT ), true ); - maLineStyle = WinMtfLineStyle( Color( COL_TRANSPARENT ), sal_True ); - mbNopMode = sal_True; + maLineStyle = WinMtfLineStyle( Color( COL_TRANSPARENT ), true ); + mbNopMode = true; } } break; @@ -1005,7 +1005,7 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp ) }; -void WinMtfOutput::StrokeAndFillPath( sal_Bool bStroke, sal_Bool bFill ) +void WinMtfOutput::StrokeAndFillPath( bool bStroke, bool bFill ) { if ( aPathObj.Count() ) { @@ -1017,7 +1017,7 @@ void WinMtfOutput::StrokeAndFillPath( sal_Bool bStroke, sal_Bool bFill ) if ( !bStroke ) { mpGDIMetaFile->AddAction( new MetaPushAction( PUSH_LINECOLOR ) ); - mpGDIMetaFile->AddAction( new MetaLineColorAction( Color(), sal_False ) ); + mpGDIMetaFile->AddAction( new MetaLineColorAction( Color(), false ) ); } if ( aPathObj.Count() == 1 ) mpGDIMetaFile->AddAction( new MetaPolygonAction( aPathObj.GetObject( 0 ) ) ); @@ -1044,7 +1044,7 @@ void WinMtfOutput::DrawPixel( const Point& rSource, const Color& rColor ) } -void WinMtfOutput::MoveTo( const Point& rPoint, sal_Bool bRecordPath ) +void WinMtfOutput::MoveTo( const Point& rPoint, bool bRecordPath ) { Point aDest( ImplMap( rPoint ) ); if ( bRecordPath ) @@ -1059,7 +1059,7 @@ void WinMtfOutput::MoveTo( const Point& rPoint, sal_Bool bRecordPath ) } -void WinMtfOutput::LineTo( const Point& rPoint, sal_Bool bRecordPath ) +void WinMtfOutput::LineTo( const Point& rPoint, bool bRecordPath ) { UpdateClipRegion(); Point aDest( ImplMap( rPoint ) ); @@ -1074,7 +1074,7 @@ void WinMtfOutput::LineTo( const Point& rPoint, sal_Bool bRecordPath ) } -void WinMtfOutput::DrawRect( const Rectangle& rRect, sal_Bool bEdge ) +void WinMtfOutput::DrawRect( const Rectangle& rRect, bool bEdge ) { UpdateClipRegion(); UpdateFillStyle(); @@ -1145,7 +1145,7 @@ void WinMtfOutput::DrawEllipse( const Rectangle& rRect ) } -void WinMtfOutput::DrawArc( const Rectangle& rRect, const Point& rStart, const Point& rEnd, sal_Bool bTo ) +void WinMtfOutput::DrawArc( const Rectangle& rRect, const Point& rStart, const Point& rEnd, bool bTo ) { UpdateClipRegion(); UpdateLineStyle(); @@ -1223,7 +1223,7 @@ void WinMtfOutput::DrawChord( const Rectangle& rRect, const Point& rStart, const } -void WinMtfOutput::DrawPolygon( Polygon& rPolygon, sal_Bool bRecordPath ) +void WinMtfOutput::DrawPolygon( Polygon& rPolygon, bool bRecordPath ) { UpdateClipRegion(); ImplMap( rPolygon ); @@ -1296,7 +1296,7 @@ void WinMtfOutput::DrawPolygon( Polygon& rPolygon, sal_Bool bRecordPath ) } -void WinMtfOutput::DrawPolyPolygon( PolyPolygon& rPolyPolygon, sal_Bool bRecordPath ) +void WinMtfOutput::DrawPolyPolygon( PolyPolygon& rPolyPolygon, bool bRecordPath ) { UpdateClipRegion(); @@ -1323,7 +1323,7 @@ void WinMtfOutput::DrawPolyPolygon( PolyPolygon& rPolyPolygon, sal_Bool bRecordP } -void WinMtfOutput::DrawPolyLine( Polygon& rPolygon, sal_Bool bTo, sal_Bool bRecordPath ) +void WinMtfOutput::DrawPolyLine( Polygon& rPolygon, bool bTo, bool bRecordPath ) { UpdateClipRegion(); @@ -1343,7 +1343,7 @@ void WinMtfOutput::DrawPolyLine( Polygon& rPolygon, sal_Bool bTo, sal_Bool bReco } -void WinMtfOutput::DrawPolyBezier( Polygon& rPolygon, sal_Bool bTo, sal_Bool bRecordPath ) +void WinMtfOutput::DrawPolyBezier( Polygon& rPolygon, bool bTo, bool bRecordPath ) { UpdateClipRegion(); @@ -1374,7 +1374,7 @@ void WinMtfOutput::DrawPolyBezier( Polygon& rPolygon, sal_Bool bTo, sal_Bool bRe } -void WinMtfOutput::DrawText( Point& rPosition, OUString& rText, sal_Int32* pDXArry, sal_Bool bRecordPath, sal_Int32 nGfxMode ) +void WinMtfOutput::DrawText( Point& rPosition, OUString& rText, sal_Int32* pDXArry, bool bRecordPath, sal_Int32 nGfxMode ) { UpdateClipRegion(); rPosition = ImplMap( rPosition ); @@ -1443,9 +1443,9 @@ void WinMtfOutput::DrawText( Point& rPosition, OUString& rText, sal_Int32* pDXAr aTmp.SetFillColor( maBkColor ); if( mnBkMode == TRANSPARENT ) - aTmp.SetTransparent( sal_True ); + aTmp.SetTransparent( true ); else - aTmp.SetTransparent( sal_False ); + aTmp.SetTransparent( false ); if ( ( mnTextAlign & TA_BASELINE) == TA_BASELINE ) aTmp.SetAlign( ALIGN_BASELINE ); @@ -1566,7 +1566,7 @@ void WinMtfOutput::ImplDrawBitmap( const Point& rPos, const Size& rSize, const B const Point aEmptyPoint; // #i50672# Extract whole VDev content (to match size of rBitmap) - aVDev.EnableMapMode( sal_False ); + aVDev.EnableMapMode( false ); Bitmap aMask( aVDev.GetBitmap( aEmptyPoint, aSizePixel ).CreateMask( Color( COL_WHITE ) ) ); if ( aBmpEx.IsTransparent() ) @@ -1636,7 +1636,7 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList ) { // patterns aren't well supported yet sal_uInt32 nOldRop = SetRasterOp( ROP_OVERPAINT ); // in this case nRasterOperation is either 0 or 0xff UpdateFillStyle(); - DrawRect( aRect, sal_False ); + DrawRect( aRect, false ); SetRasterOp( nOldRop ); } else @@ -1701,7 +1701,7 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList ) if ( nOperation == 0x1 ) { SetRasterOp( R2_NOT ); - DrawRect( aRect, sal_False ); + DrawRect( aRect, false ); } } break; @@ -1719,7 +1719,7 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList ) if ( nOperation == 0x7 ) { SetRasterOp( R2_NOT ); - DrawRect( aRect, sal_False ); + DrawRect( aRect, false ); } } break; @@ -1728,7 +1728,7 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList ) case 0xb : { SetRasterOp( R2_NOT ); - DrawRect( aRect, sal_False ); + DrawRect( aRect, false ); SetRasterOp( R2_COPYPEN ); Bitmap aMask( aBitmap ); aBitmap.Invert(); @@ -1739,7 +1739,7 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList ) if ( nOperation == 0xb ) { SetRasterOp( R2_NOT ); - DrawRect( aRect, sal_False ); + DrawRect( aRect, false ); } } break; @@ -1756,7 +1756,7 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList ) if ( nOperation == 0xd ) { SetRasterOp( R2_NOT ); - DrawRect( aRect, sal_False ); + DrawRect( aRect, false ); } } break; @@ -1768,7 +1768,7 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList ) if ( nOperation == 0x9 ) { SetRasterOp( R2_NOT ); - DrawRect( aRect, sal_False ); + DrawRect( aRect, false ); } } break; @@ -1778,7 +1778,7 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList ) { // in this case nRasterOperation is either 0 or 0xff maFillStyle = WinMtfFillStyle( Color( nRasterOperation, nRasterOperation, nRasterOperation ) ); UpdateFillStyle(); - DrawRect( aRect, sal_False ); + DrawRect( aRect, false ); } break; @@ -1794,7 +1794,7 @@ void WinMtfOutput::ResolveBitmapActions( BSaveStructList_impl& rSaveList ) case 0x5 : // only destination is used { SetRasterOp( R2_NOT ); - DrawRect( aRect, sal_False ); + DrawRect( aRect, false ); } case 0xa : // no operation break; @@ -1830,7 +1830,7 @@ void WinMtfOutput::SetDevOrgOffset( sal_Int32 nXAdd, sal_Int32 nYAdd ) -void WinMtfOutput::SetDevExt( const Size& rSize ,sal_Bool regular) +void WinMtfOutput::SetDevExt( const Size& rSize ,bool regular) { if ( rSize.Width() && rSize.Height() ) { @@ -1845,7 +1845,7 @@ void WinMtfOutput::SetDevExt( const Size& rSize ,sal_Bool regular) } if (regular) { - mbIsMapDevSet=sal_True; + mbIsMapDevSet=true; } } } @@ -1860,7 +1860,7 @@ void WinMtfOutput::ScaleDevExt( double fX, double fY ) -void WinMtfOutput::SetWinOrg( const Point& rPoint , sal_Bool bIsEMF) +void WinMtfOutput::SetWinOrg( const Point& rPoint , bool bIsEMF) { mnWinOrgX = rPoint.X(); mnWinOrgY = rPoint.Y(); @@ -1868,7 +1868,7 @@ void WinMtfOutput::SetWinOrg( const Point& rPoint , sal_Bool bIsEMF) { SetDevByWin(); } - mbIsMapWinSet=sal_True; + mbIsMapWinSet=true; } @@ -1887,14 +1887,14 @@ void WinMtfOutput::SetDevByWin() //mnWinExt...-stuff has to be assigned before. { if ( mnMapMode == MM_ISOTROPIC ) //TODO: WHAT ABOUT ANISOTROPIC??? { - SetDevExt(Size((mnWinExtX+mnWinOrgX)>>MS_FIXPOINT_BITCOUNT_28_4,-((mnWinExtY-mnWinOrgY)>>MS_FIXPOINT_BITCOUNT_28_4)),sal_False); + SetDevExt(Size((mnWinExtX+mnWinOrgX)>>MS_FIXPOINT_BITCOUNT_28_4,-((mnWinExtY-mnWinOrgY)>>MS_FIXPOINT_BITCOUNT_28_4)),false); } } } -void WinMtfOutput::SetWinExt( const Size& rSize, sal_Bool bIsEMF ) +void WinMtfOutput::SetWinExt( const Size& rSize, bool bIsEMF ) { if( rSize.Width() && rSize.Height() ) { @@ -1909,7 +1909,7 @@ void WinMtfOutput::SetWinExt( const Size& rSize, sal_Bool bIsEMF ) { SetDevByWin(); } - mbIsMapWinSet=sal_True; + mbIsMapWinSet=true; } } } @@ -2184,7 +2184,7 @@ void WinMtfOutput::PassEMFPlusHeaderInfo() mem.Flush(); mpGDIMetaFile->AddAction( new MetaCommentAction( "EMF_PLUS_HEADER_INFO", 0, (const sal_uInt8*) mem.GetData(), mem.GetEndOfData() ) ); - mpGDIMetaFile->UseCanvas( sal_True ); + mpGDIMetaFile->UseCanvas( true ); } void WinMtfOutput::PassEMFPlus( void* pBuffer, sal_uInt32 nLength ) diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index c20090725f6b..ab7291986de3 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -307,12 +307,12 @@ public : class WinMtfPathObj : public PolyPolygon { - sal_Bool bClosed; + bool bClosed; public : - WinMtfPathObj() { bClosed = sal_True; } - void Init() { Clear(); bClosed = sal_True; }; + WinMtfPathObj() { bClosed = true; } + void Init() { Clear(); bClosed = true; }; void ClosePath(); void AddPoint( const Point& rPoint ); void AddPolygon( const Polygon& rPoly ); @@ -400,29 +400,29 @@ struct WinMtfLineStyle { Color aLineColor; LineInfo aLineInfo; - sal_Bool bTransparent; + bool bTransparent; WinMtfLineStyle() : aLineColor ( COL_BLACK ), - bTransparent( sal_False ) {} + bTransparent( false ) {} - WinMtfLineStyle( const Color& rColor, sal_Bool bTrans = sal_False ) : + WinMtfLineStyle( const Color& rColor, bool bTrans = false ) : aLineColor ( rColor ), bTransparent( bTrans ) {} - WinMtfLineStyle( const Color& rColor, const LineInfo& rStyle, sal_Bool bTrans = sal_False ) : + WinMtfLineStyle( const Color& rColor, const LineInfo& rStyle, bool bTrans = false ) : aLineColor ( rColor ), aLineInfo ( rStyle ), bTransparent( bTrans ) {} - sal_Bool operator==( const WinMtfLineStyle& rStyle ) + bool operator==( const WinMtfLineStyle& rStyle ) { return ( ( aLineColor == rStyle.aLineColor ) && ( bTransparent == rStyle.bTransparent ) && ( aLineInfo == rStyle.aLineInfo ) ); } - sal_Bool operator==( WinMtfLineStyle* pStyle ) + bool operator==( WinMtfLineStyle* pStyle ) { return ( ( aLineColor == pStyle->aLineColor ) && ( bTransparent == pStyle->bTransparent ) @@ -485,8 +485,8 @@ struct SaveStruct WinMtfClipPath aClipPath; XForm aXForm; - sal_Bool bRecordPath; - sal_Bool bFillStyleSelected; + bool bRecordPath; + bool bFillStyleSelected; }; typedef ::boost::shared_ptr< SaveStruct > SaveStructPtr; @@ -601,10 +601,10 @@ class WinMtfOutput Point maActPos; sal_uInt32 mnRop; - sal_Bool mbNopMode; - sal_Bool mbFillStyleSelected; - sal_Bool mbClipNeedsUpdate; - sal_Bool mbComplexClip; + bool mbNopMode; + bool mbFillStyleSelected; + bool mbClipNeedsUpdate; + bool mbComplexClip; std::vector< SaveStructPtr > vSaveStack; @@ -616,8 +616,8 @@ class WinMtfOutput sal_Int32 mnDevWidth, mnDevHeight; sal_Int32 mnWinOrgX, mnWinOrgY; // aktuel window origin sal_Int32 mnWinExtX, mnWinExtY; // aktuel window extend - sal_Bool mbIsMapWinSet; - sal_Bool mbIsMapDevSet; + bool mbIsMapWinSet; + bool mbIsMapDevSet; sal_Int32 mnPixX, mnPixY; // Reference Device in pixel sal_Int32 mnMillX, mnMillY; // Reference Device in Mill @@ -648,12 +648,12 @@ public: void SetDevByWin(); //Hack to set varying defaults for incompletely defined files. void SetDevOrg( const Point& rPoint ); void SetDevOrgOffset( sal_Int32 nXAdd, sal_Int32 nYAdd ); - void SetDevExt( const Size& rSize ,sal_Bool regular = true); + void SetDevExt( const Size& rSize ,bool regular = true); void ScaleDevExt( double fX, double fY ); - void SetWinOrg( const Point& rPoint , sal_Bool bIsEMF = false); + void SetWinOrg( const Point& rPoint , bool bIsEMF = false); void SetWinOrgOffset( sal_Int32 nX, sal_Int32 nY ); - void SetWinExt( const Size& rSize , sal_Bool bIsEMF = false); + void SetWinExt( const Size& rSize , bool bIsEMF = false); void ScaleWinExt( double fX, double fY ); void SetrclBounds( const Rectangle& rRect ); @@ -671,7 +671,7 @@ public: void Pop(); sal_uInt32 SetRasterOp( sal_uInt32 nRasterOp ); - void StrokeAndFillPath( sal_Bool bStroke, sal_Bool bFill ); + void StrokeAndFillPath( bool bStroke, bool bFill ); void SetGfxMode( sal_Int32 nGfxMode ){ mnGfxMode = nGfxMode; }; sal_Int32 GetGfxMode() const { return mnGfxMode; }; @@ -692,17 +692,17 @@ public: void ClosePath(){ aPathObj.ClosePath(); }; const PolyPolygon& GetPathObj(){ return aPathObj; }; - void MoveTo( const Point& rPoint, sal_Bool bRecordPath = sal_False ); - void LineTo( const Point& rPoint, sal_Bool bRecordPath = sal_False ); + void MoveTo( const Point& rPoint, bool bRecordPath = false ); + void LineTo( const Point& rPoint, bool bRecordPath = false ); void DrawPixel( const Point& rSource, const Color& rColor ); - void DrawRect( const Rectangle& rRect, sal_Bool bEdge = sal_True ); + void DrawRect( const Rectangle& rRect, bool bEdge = true ); void DrawRoundRect( const Rectangle& rRect, const Size& rSize ); void DrawEllipse( const Rectangle& rRect ); void DrawArc( const Rectangle& rRect, const Point& rStartAngle, const Point& rEndAngle, - sal_Bool bDrawTo = sal_False + bool bDrawTo = false ); void DrawPie( const Rectangle& rRect, @@ -714,28 +714,28 @@ public: const Point& rStartAngle, const Point& rEndAngle ); - void DrawPolygon( Polygon& rPolygon, sal_Bool bRecordPath = sal_False ); - void DrawPolygon( Polygon& rPolygon, sal_Bool /*bDrawTo*/, sal_Bool bRecordPath) + void DrawPolygon( Polygon& rPolygon, bool bRecordPath = false ); + void DrawPolygon( Polygon& rPolygon, bool /*bDrawTo*/, bool bRecordPath) { //For ReadAndDrawPolygon template compatibility DrawPolygon(rPolygon, bRecordPath); } - void DrawPolyPolygon( PolyPolygon& rPolyPolygon, sal_Bool bRecordPath = sal_False ); + void DrawPolyPolygon( PolyPolygon& rPolyPolygon, bool bRecordPath = false ); void DrawPolyLine( Polygon& rPolygon, - sal_Bool bDrawTo = sal_False, - sal_Bool bRecordPath = sal_False + bool bDrawTo = false, + bool bRecordPath = false ); void DrawPolyBezier( Polygon& rPolygin, - sal_Bool bDrawTo = sal_False, - sal_Bool bRecordPath = sal_False + bool bDrawTo = false, + bool bRecordPath = false ); void DrawText( Point& rPosition, OUString& rString, sal_Int32* pDXArry = NULL, - sal_Bool bRecordPath = sal_False, + bool bRecordPath = false, sal_Int32 nGraphicsMode = GM_COMPATIBLE ); void ResolveBitmapActions( BSaveStructList_impl& rSaveList ); @@ -746,7 +746,7 @@ public: void SetClipPath( const PolyPolygon& rPolyPoly, sal_Int32 nClippingMode, - sal_Bool bIsMapped + bool bIsMapped ); void UpdateClipRegion(); void AddFromGDIMetaFile( GDIMetaFile& rGDIMetaFile ); @@ -791,12 +791,12 @@ protected: class EnhWMFReader : public WinMtf { - sal_Bool bRecordPath; + bool bRecordPath; sal_Int32 nRecordCount; - sal_Bool bEMFPlus; + bool bEMFPlus; - sal_Bool ReadHeader(); + bool ReadHeader(); // reads and converts the rectangle Rectangle ReadRectangle( sal_Int32, sal_Int32, sal_Int32, sal_Int32 ); @@ -809,18 +809,18 @@ public: : WinMtf( new WinMtfOutput( rGDIMetaFile ) , rStreamWMF , pConfigItem ) - , bRecordPath( sal_False ) - , bEMFPlus( sal_False ) + , bRecordPath( false ) + , bEMFPlus( false ) {}; ~EnhWMFReader(); - sal_Bool ReadEnhWMF(); - void ReadEMFPlusComment(sal_uInt32 length, sal_Bool& bHaveDC); + bool ReadEnhWMF(); + void ReadEMFPlusComment(sal_uInt32 length, bool& bHaveDC); private: template <class T> void ReadAndDrawPolyPolygon(); template <class T> void ReadAndDrawPolyLine(); template <class T> Polygon ReadPolygon(sal_uInt32 nStartIndex, sal_uInt32 nPoints); - template <class T, class Drawer> void ReadAndDrawPolygon(Drawer drawer, const sal_Bool skipFirst); + template <class T, class Drawer> void ReadAndDrawPolygon(Drawer drawer, const bool skipFirst); }; //============================ WMFReader ================================== @@ -851,7 +851,7 @@ private: WMF_EXTERNALHEADER* pExternalHeader; // reads header of the WMF-Datei - sal_Bool ReadHeader(); + bool ReadHeader(); // reads parameters of the record with the functionnumber nFunction. void ReadRecordParams( sal_uInt16 nFunction ); @@ -860,7 +860,7 @@ private: Point ReadYX(); // reads and converts a point (first Y then X) Rectangle ReadRectangle(); // reads and converts a rectangle Size ReadYXExt(); - sal_Bool GetPlaceableBound( Rectangle& rSize, SvStream* pStrm ); + bool GetPlaceableBound( Rectangle& rSize, SvStream* pStrm ); public: diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index f53e396bc3ce..8d6fd89787aa 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -748,7 +748,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) if ( nWidth ) aLineInfo.SetWidth( nWidth ); - sal_Bool bTransparent = sal_False; + bool bTransparent = false; switch( nStyle & 0xFF ) { case PS_DASHDOTDOT : @@ -782,7 +782,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) aLineInfo.SetDistance( 100 ); break; case PS_NULL : - bTransparent = sal_True; + bTransparent = true; aLineInfo.SetStyle( LINE_NONE ); break; default : @@ -891,7 +891,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) pWMF->ReadUInt32( nROP ); Size aSize = ReadYXExt(); nOldROP = pOut->SetRasterOp( nROP ); - pOut->DrawRect( Rectangle( ReadYX(), aSize ), sal_False ); + pOut->DrawRect( Rectangle( ReadYX(), aSize ), false ); pOut->SetRasterOp( nOldROP ); } break; @@ -903,7 +903,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) if ( !nObjIndex ) { PolyPolygon aEmptyPolyPoly; - pOut->SetClipPath( aEmptyPolyPoly, RGN_COPY, sal_True ); + pOut->SetClipPath( aEmptyPolyPoly, RGN_COPY, true ); } } break; @@ -1091,7 +1091,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) // ------------------------------------------------------------------------ -sal_Bool WMFReader::ReadHeader() +bool WMFReader::ReadHeader() { sal_Size nStrmPos = pWMF->Tell(); @@ -1200,7 +1200,7 @@ void WMFReader::ReadWMF() nEMFRec = 0; nEMFSize = 0; - sal_Bool bEMFAvailable = sal_False; + bool bEMFAvailable = false; pOut->SetMapMode( MM_ANISOTROPIC ); pOut->SetWinOrg( Point() ); @@ -1306,9 +1306,9 @@ void WMFReader::ReadWMF() // ------------------------------------------------------------------------ -sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm ) +bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm ) { - sal_Bool bRet = sal_True; + bool bRet = true; rPlaceableBound.Left() = (sal_Int32)0x7fffffff; rPlaceableBound.Top() = (sal_Int32)0x7fffffff; @@ -1335,7 +1335,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt if( pStm->IsEof() ) { pStm->SetError( SVSTREAM_FILEFORMAT_ERROR ); - bRet = sal_False; + bRet = false; } break; } @@ -1419,7 +1419,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt if (!bRecordOk) { pStm->SetError( SVSTREAM_FILEFORMAT_ERROR ); - bRet = sal_False; + bRet = false; break; } @@ -1431,7 +1431,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt if (!bRecordOk) { pStm->SetError( SVSTREAM_FILEFORMAT_ERROR ); - bRet = sal_False; + bRet = false; break; } } @@ -1531,7 +1531,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt else { pStm->SetError( SVSTREAM_FILEFORMAT_ERROR ); - bRet = sal_False; + bRet = false; } } @@ -1539,7 +1539,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt else { pStm->SetError( SVSTREAM_GENERALERROR ); - bRet = sal_False; + bRet = false; } return bRet; } diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx index 002756aaaeed..f9e51a2a8724 100644 --- a/vcl/source/filter/wmf/wmf.cxx +++ b/vcl/source/filter/wmf/wmf.cxx @@ -27,7 +27,7 @@ // ----------------------------------------------------------------------------- -sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem, WMF_EXTERNALHEADER *pExtHeader ) +bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem, WMF_EXTERNALHEADER *pExtHeader ) { sal_uInt32 nMetaType; sal_uInt32 nOrgPos = rStreamWMF.Tell(); @@ -38,7 +38,7 @@ sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaF rStreamWMF.Seek( nOrgPos ); if ( nMetaType == 0x464d4520 ) { - if ( EnhWMFReader( rStreamWMF, rGDIMetaFile, pConfigItem ).ReadEnhWMF() == sal_False ) + if ( !EnhWMFReader( rStreamWMF, rGDIMetaFile, pConfigItem ).ReadEnhWMF() ) rStreamWMF.SetError( SVSTREAM_FILEFORMAT_ERROR ); } else @@ -58,7 +58,7 @@ sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaF // ----------------------------------------------------------------------------- -sal_Bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pFilterConfigItem ) +bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pFilterConfigItem ) { sal_uInt32 nMetaType(0); sal_uInt32 nOrgPos = rStream.Tell(); @@ -79,7 +79,7 @@ sal_Bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigI if ( nMetaType == 0x464d4520 ) { - if ( EnhWMFReader( rStream, rMTF, NULL ).ReadEnhWMF() == sal_False ) + if ( !EnhWMFReader( rStream, rMTF, NULL ).ReadEnhWMF() ) rStream.SetError( SVSTREAM_FILEFORMAT_ERROR ); } else @@ -111,7 +111,7 @@ bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream // ----------------------------------------------------------------------------- -sal_Bool ConvertGDIMetaFileToEMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, +bool ConvertGDIMetaFileToEMF( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pConfigItem ) { EMFWriter aEMFWriter(rTargetStream); diff --git a/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx index e51fb2ee34f3..68ba4014714d 100644 --- a/vcl/source/fontsubset/gsub.cxx +++ b/vcl/source/fontsubset/gsub.cxx @@ -325,7 +325,7 @@ void ReleaseGSUB(struct _TrueTypeFont* pTTFile) delete pGlyphSubstitution; } -int UseGSUB( struct _TrueTypeFont* pTTFile, int nGlyph, int /*wmode*/ ) +int UseGSUB( struct _TrueTypeFont* pTTFile, int nGlyph, bool /*wmode*/ ) { GlyphSubstitution* pGlyphSubstitution = (GlyphSubstitution*)pTTFile->pGSubstitution; if( pGlyphSubstitution != 0 ) diff --git a/vcl/source/fontsubset/gsub.h b/vcl/source/fontsubset/gsub.h index b4111e48fa88..ece5aae1195e 100644 --- a/vcl/source/fontsubset/gsub.h +++ b/vcl/source/fontsubset/gsub.h @@ -25,7 +25,7 @@ namespace vcl int HasVerticalGSUB( struct vcl::_TrueTypeFont* pTTFile ); -int UseGSUB( struct vcl::_TrueTypeFont* pTTFile, int nGlyph, int wmode ); +int UseGSUB( struct vcl::_TrueTypeFont* pTTFile, int nGlyph, bool wmode ); bool ReadGSUB( struct vcl::_TrueTypeFont* pTTFile, int nRequestedScript, int nRequestedLangsys ); diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index caf84587cb65..93257adc2ef3 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -2237,7 +2237,7 @@ int CreateT42FromTTGlyphs(TrueTypeFont *ttf, #ifndef NO_MAPPERS -int MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, int bvertical) +int MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, bool bvertical) { int i; sal_uInt16 *cp; @@ -2281,7 +2281,7 @@ int MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphA for (i = 0; i < nchars; i++) { cp[i] = (sal_uInt16)ttf->mapper(ttf->cmap, cp[i]); - if (cp[i]!=0 && bvertical!=0) + if (cp[i]!=0 && bvertical) cp[i] = (sal_uInt16)UseGSUB(ttf,cp[i],bvertical); } return nchars; diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx index 8a58bb1a8e65..7e1721e3dd55 100644 --- a/vcl/source/gdi/alpha.cxx +++ b/vcl/source/gdi/alpha.cxx @@ -75,14 +75,14 @@ Bitmap AlphaMask::GetBitmap() const return ImplGetBitmap(); } -sal_Bool AlphaMask::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, +bool AlphaMask::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const AlphaMask* pAlphaSrc ) { // Note: this code is copied from Bitmap::CopyPixel but avoids any palette lookups // This optimization is possible because the palettes of AlphaMasks are always identical (8bit GreyPalette, see ctor) const Size aSizePix( GetSizePixel() ); Rectangle aRectDst( rRectDst ); - sal_Bool bRet = sal_False; + bool bRet = false; aRectDst.Intersection( Rectangle( Point(), aSizePix ) ); @@ -173,7 +173,7 @@ sal_Bool AlphaMask::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRect } ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } } } @@ -183,16 +183,16 @@ sal_Bool AlphaMask::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRect } -sal_Bool AlphaMask::Erase( sal_uInt8 cTransparency ) +bool AlphaMask::Erase( sal_uInt8 cTransparency ) { return Bitmap::Erase( Color( cTransparency, cTransparency, cTransparency ) ); } -sal_Bool AlphaMask::Replace( const Bitmap& rMask, sal_uInt8 cReplaceTransparency ) +bool AlphaMask::Replace( const Bitmap& rMask, sal_uInt8 cReplaceTransparency ) { BitmapReadAccess* pMaskAcc = ( (Bitmap&) rMask ).AcquireReadAccess(); BitmapWriteAccess* pAcc = AcquireWriteAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pMaskAcc && pAcc ) { @@ -213,14 +213,14 @@ sal_Bool AlphaMask::Replace( const Bitmap& rMask, sal_uInt8 cReplaceTransparency return bRet; } -sal_Bool AlphaMask::Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, sal_uLong +bool AlphaMask::Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, sal_uLong #ifdef DBG_UTIL nTol #endif ) { BitmapWriteAccess* pAcc = AcquireWriteAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; DBG_ASSERT( !nTol, "AlphaMask::Replace: nTol not used yet" ); @@ -255,7 +255,7 @@ nTol } } - bRet = sal_True; + bRet = true; } if( pAcc ) diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index b0e3a492ab83..abc068958353 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -67,9 +67,9 @@ Animation::Animation() : mnLoops ( 0 ), mnPos ( 0 ), meCycleMode ( CYCLE_NORMAL ), - mbIsInAnimation ( sal_False ), - mbLoopTerminated ( sal_False ), - mbIsWaiting ( sal_False ) + mbIsInAnimation ( false ), + mbLoopTerminated ( false ), + mbIsWaiting ( false ) { maTimer.SetTimeoutHdl( LINK( this, Animation, ImplTimeoutHdl ) ); } @@ -80,7 +80,7 @@ Animation::Animation( const Animation& rAnimation ) : mnLoopCount ( rAnimation.mnLoopCount ), mnPos ( rAnimation.mnPos ), meCycleMode ( rAnimation.meCycleMode ), - mbIsInAnimation ( sal_False ), + mbIsInAnimation ( false ), mbLoopTerminated ( rAnimation.mbLoopTerminated ), mbIsWaiting ( rAnimation.mbIsWaiting ) { @@ -153,7 +153,7 @@ bool Animation::operator==( const Animation& rAnimation ) const void Animation::Clear() { maTimer.Stop(); - mbIsInAnimation = sal_False; + mbIsInAnimation = false; maGlobalSize = Size(); maBitmapEx.SetEmpty(); @@ -166,11 +166,11 @@ void Animation::Clear() maViewList.clear(); } -sal_Bool Animation::IsTransparent() const +bool Animation::IsTransparent() const { Point aPoint; Rectangle aRect( aPoint, maGlobalSize ); - sal_Bool bRet = sal_False; + bool bRet = false; // If some small bitmap needs to be replaced by the background, // we need to be transparent, in order to be displayed correctly @@ -184,7 +184,7 @@ sal_Bool Animation::IsTransparent() const && Rectangle( pAnimBmp->aPosPix, pAnimBmp->aSizePix ) != aRect ) { - bRet = sal_True; + bRet = true; break; } } @@ -234,10 +234,10 @@ sal_uLong Animation::GetChecksum() const return nCrc; } -sal_Bool Animation::Start( OutputDevice* pOut, const Point& rDestPt, const Size& rDestSz, long nExtraData, +bool Animation::Start( OutputDevice* pOut, const Point& rDestPt, const Size& rDestSz, long nExtraData, OutputDevice* pFirstFrameOutDev ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( !maList.empty() ) { @@ -274,7 +274,7 @@ sal_Bool Animation::Start( OutputDevice* pOut, const Point& rDestPt, const Size& if( maViewList.empty() ) { maTimer.Stop(); - mbIsInAnimation = sal_False; + mbIsInAnimation = false; mnPos = 0UL; } @@ -284,13 +284,13 @@ sal_Bool Animation::Start( OutputDevice* pOut, const Point& rDestPt, const Size& if( !mbIsInAnimation ) { ImplRestartTimer( maList[ mnPos ]->nWait ); - mbIsInAnimation = sal_True; + mbIsInAnimation = true; } } else Draw( pOut, rDestPt, rDestSz ); - bRet = sal_True; + bRet = true; } return bRet; @@ -315,7 +315,7 @@ void Animation::Stop( OutputDevice* pOut, long nExtraData ) if( maViewList.empty() ) { maTimer.Stop(); - mbIsInAnimation = sal_False; + mbIsInAnimation = false; } } @@ -391,7 +391,7 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl) pView = (ImplAnimView*) pAInfo->pViewData; pView->ImplPause( pAInfo->bPause ); - pView->ImplSetMarked( sal_True ); + pView->ImplSetMarked( true ); } // delete AInfo structures @@ -413,7 +413,7 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl) if( !pView->ImplIsPause() ) bGlobalPause = false; - pView->ImplSetMarked( sal_False ); + pView->ImplSetMarked( false ); i++; } } @@ -434,7 +434,7 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl) if( mnLoops == 1 ) { Stop(); - mbLoopTerminated = sal_True; + mbLoopTerminated = true; mnPos = nAnimCount - 1UL; maBitmapEx = maList[ mnPos ]->aBmpEx; return 0L; @@ -480,9 +480,9 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl) return 0L; } -sal_Bool Animation::Insert( const AnimationBitmap& rStepBmp ) +bool Animation::Insert( const AnimationBitmap& rStepBmp ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( !IsInAnimation() ) { @@ -496,7 +496,7 @@ sal_Bool Animation::Insert( const AnimationBitmap& rStepBmp ) if( maList.size() == 1 ) maBitmapEx = rStepBmp.aBmpEx; - bRet = sal_True; + bRet = true; } return bRet; @@ -541,18 +541,18 @@ void Animation::SetLoopCount( const sal_uLong nLoopCount ) void Animation::ResetLoopCount() { mnLoops = mnLoopCount; - mbLoopTerminated = sal_False; + mbLoopTerminated = false; } -sal_Bool Animation::Convert( BmpConversion eConversion ) +bool Animation::Convert( BmpConversion eConversion ) { DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" ); - sal_Bool bRet; + bool bRet; if( !IsInAnimation() && !maList.empty() ) { - bRet = sal_True; + bRet = true; for( size_t i = 0, n = maList.size(); ( i < n ) && bRet; ++i ) bRet = maList[ i ]->aBmpEx.Convert( eConversion ); @@ -560,20 +560,20 @@ sal_Bool Animation::Convert( BmpConversion eConversion ) maBitmapEx.Convert( eConversion ); } else - bRet = sal_False; + bRet = false; return bRet; } -sal_Bool Animation::ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce ) +bool Animation::ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce ) { DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" ); - sal_Bool bRet; + bool bRet; if( !IsInAnimation() && !maList.empty() ) { - bRet = sal_True; + bRet = true; for( size_t i = 0, n = maList.size(); ( i < n ) && bRet; ++i ) bRet = maList[ i ]->aBmpEx.ReduceColors( nNewColorCount, eReduce ); @@ -581,20 +581,20 @@ sal_Bool Animation::ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce ) maBitmapEx.ReduceColors( nNewColorCount, eReduce ); } else - bRet = sal_False; + bRet = false; return bRet; } -sal_Bool Animation::Invert() +bool Animation::Invert() { DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" ); - sal_Bool bRet; + bool bRet; if( !IsInAnimation() && !maList.empty() ) { - bRet = sal_True; + bRet = true; for( size_t i = 0, n = maList.size(); ( i < n ) && bRet; ++i ) bRet = maList[ i ]->aBmpEx.Invert(); @@ -602,27 +602,27 @@ sal_Bool Animation::Invert() maBitmapEx.Invert(); } else - bRet = sal_False; + bRet = false; return bRet; } -sal_Bool Animation::Mirror( sal_uLong nMirrorFlags ) +bool Animation::Mirror( sal_uLong nMirrorFlags ) { DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" ); - sal_Bool bRet; + bool bRet; if( !IsInAnimation() && !maList.empty() ) { - bRet = sal_True; + bRet = true; if( nMirrorFlags ) { for( size_t i = 0, n = maList.size(); ( i < n ) && bRet; ++i ) { AnimationBitmap* pStepBmp = maList[ i ]; - if( ( bRet = pStepBmp->aBmpEx.Mirror( nMirrorFlags ) ) == sal_True ) + if( ( bRet = pStepBmp->aBmpEx.Mirror( nMirrorFlags ) ) ) { if( nMirrorFlags & BMP_MIRROR_HORZ ) pStepBmp->aPosPix.X() = maGlobalSize.Width() - pStepBmp->aPosPix.X() - pStepBmp->aSizePix.Width(); @@ -636,22 +636,22 @@ sal_Bool Animation::Mirror( sal_uLong nMirrorFlags ) } } else - bRet = sal_False; + bRet = false; return bRet; } -sal_Bool Animation::Adjust( short nLuminancePercent, short nContrastPercent, +bool Animation::Adjust( short nLuminancePercent, short nContrastPercent, short nChannelRPercent, short nChannelGPercent, short nChannelBPercent, - double fGamma, sal_Bool bInvert ) + double fGamma, bool bInvert ) { DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" ); - sal_Bool bRet; + bool bRet; if( !IsInAnimation() && !maList.empty() ) { - bRet = sal_True; + bRet = true; for( size_t i = 0, n = maList.size(); ( i < n ) && bRet; ++i ) { @@ -669,20 +669,20 @@ sal_Bool Animation::Adjust( short nLuminancePercent, short nContrastPercent, fGamma, bInvert ); } else - bRet = sal_False; + bRet = false; return bRet; } -sal_Bool Animation::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress ) +bool Animation::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress ) { DBG_ASSERT( !IsInAnimation(), "Animation modified while it is animated" ); - sal_Bool bRet; + bool bRet; if( !IsInAnimation() && !maList.empty() ) { - bRet = sal_True; + bRet = true; for( size_t i = 0, n = maList.size(); ( i < n ) && bRet; ++i ) bRet = maList[ i ]->aBmpEx.Filter( eFilter, pFilterParam, pProgress ); @@ -690,7 +690,7 @@ sal_Bool Animation::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterPara maBitmapEx.Filter( eFilter, pFilterParam, pProgress ); } else - bRet = sal_False; + bRet = false; return bRet; } @@ -777,7 +777,7 @@ SvStream& ReadAnimation( SvStream& rIStm, Animation& rAnimation ) BitmapEx aBmpEx; sal_uInt32 nTmp32; sal_uInt16 nTmp16; - sal_uInt8 cTmp; + bool cTmp; do { @@ -787,7 +787,7 @@ SvStream& ReadAnimation( SvStream& rIStm, Animation& rAnimation ) ReadPair( rIStm, rAnimation.maGlobalSize ); rIStm.ReadUInt16( nTmp16 ); aAnimBmp.nWait = ( ( 65535 == nTmp16 ) ? ANIMATION_TIMEOUT_ON_CLICK : nTmp16 ); rIStm.ReadUInt16( nTmp16 ); aAnimBmp.eDisposal = ( Disposal) nTmp16; - rIStm.ReadUChar( cTmp ); aAnimBmp.bUserInput = (sal_Bool) cTmp; + rIStm.ReadCharAsBool( cTmp ); aAnimBmp.bUserInput = cTmp; rIStm.ReadUInt32( nTmp32 ); rAnimation.mnLoopCount = (sal_uInt16) nTmp32; rIStm.ReadUInt32( nTmp32 ); // Unused rIStm.ReadUInt32( nTmp32 ); // Unused diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 41fff7466179..9ecb8fa74865 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -240,7 +240,7 @@ Bitmap& Bitmap::operator=( const Bitmap& rBitmap ) return *this; } -sal_Bool Bitmap::IsEqual( const Bitmap& rBmp ) const +bool Bitmap::IsEqual( const Bitmap& rBmp ) const { return( IsSameInstance( rBmp ) || ( rBmp.GetSizePixel() == GetSizePixel() && @@ -267,10 +267,10 @@ sal_uInt16 Bitmap::GetBitCount() const return( mpImpBmp ? mpImpBmp->ImplGetBitCount() : 0 ); } -sal_Bool Bitmap::HasGreyPalette() const +bool Bitmap::HasGreyPalette() const { const sal_uInt16 nBitCount = GetBitCount(); - sal_Bool bRet = nBitCount == 1 ? sal_True : sal_False; + bool bRet = nBitCount == 1 ? sal_True : sal_False; BitmapReadAccess* pRAcc = ( (Bitmap*) this )->AcquireReadAccess(); @@ -431,13 +431,13 @@ void Bitmap::ReleaseAccess( BitmapReadAccess* pBitmapAccess ) delete pBitmapAccess; } -sal_Bool Bitmap::Erase( const Color& rFillColor ) +bool Bitmap::Erase( const Color& rFillColor ) { if( !(*this) ) - return sal_True; + return true; BitmapWriteAccess* pWriteAcc = AcquireWriteAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pWriteAcc ) { @@ -505,16 +505,16 @@ sal_Bool Bitmap::Erase( const Color& rFillColor ) } ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool Bitmap::Invert() +bool Bitmap::Invert() { BitmapWriteAccess* pAcc = AcquireWriteAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pAcc ) { @@ -539,17 +539,17 @@ sal_Bool Bitmap::Invert() } ReleaseAccess( pAcc ); - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool Bitmap::Mirror( sal_uLong nMirrorFlags ) +bool Bitmap::Mirror( sal_uLong nMirrorFlags ) { bool bHorz = ( ( nMirrorFlags & BMP_MIRROR_HORZ ) == BMP_MIRROR_HORZ ); bool bVert = ( ( nMirrorFlags & BMP_MIRROR_VERT ) == BMP_MIRROR_VERT ); - sal_Bool bRet = sal_False; + bool bRet = false; if( bHorz && !bVert ) { @@ -574,7 +574,7 @@ sal_Bool Bitmap::Mirror( sal_uLong nMirrorFlags ) } ReleaseAccess( pAcc ); - bRet = sal_True; + bRet = true; } } else if( bVert && !bHorz ) @@ -598,7 +598,7 @@ sal_Bool Bitmap::Mirror( sal_uLong nMirrorFlags ) delete[] pBuffer; ReleaseAccess( pAcc ); - bRet = sal_True; + bRet = true; } } else if( bHorz && bVert ) @@ -635,24 +635,24 @@ sal_Bool Bitmap::Mirror( sal_uLong nMirrorFlags ) } ReleaseAccess( pAcc ); - bRet = sal_True; + bRet = true; } } else - bRet = sal_True; + bRet = true; return bRet; } -sal_Bool Bitmap::Rotate( long nAngle10, const Color& rFillColor ) +bool Bitmap::Rotate( long nAngle10, const Color& rFillColor ) { - sal_Bool bRet = sal_False; + bool bRet = false; nAngle10 %= 3600L; nAngle10 = ( nAngle10 < 0L ) ? ( 3599L + nAngle10 ) : nAngle10; if( !nAngle10 ) - bRet = sal_True; + bRet = true; else if( 1800L == nAngle10 ) bRet = Mirror( BMP_MIRROR_HORZ | BMP_MIRROR_VERT ); else @@ -778,18 +778,18 @@ sal_Bool Bitmap::Rotate( long nAngle10, const Color& rFillColor ) ReleaseAccess( pReadAcc ); } - if( ( bRet = !!aRotatedBmp ) == sal_True ) + if( ( bRet = !!aRotatedBmp ) ) ImplAssignWithSize( aRotatedBmp ); } return bRet; }; -sal_Bool Bitmap::Crop( const Rectangle& rRectPixel ) +bool Bitmap::Crop( const Rectangle& rRectPixel ) { const Size aSizePix( GetSizePixel() ); Rectangle aRect( rRectPixel ); - sal_Bool bRet = sal_False; + bool bRet = false; aRect.Intersection( Rectangle( Point(), aSizePix ) ); @@ -816,7 +816,7 @@ sal_Bool Bitmap::Crop( const Rectangle& rRectPixel ) pWriteAcc->SetPixel( nY, nX, pReadAcc->GetPixel( nY2, nX2 ) ); aNewBmp.ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -829,12 +829,12 @@ sal_Bool Bitmap::Crop( const Rectangle& rRectPixel ) return bRet; }; -sal_Bool Bitmap::CopyPixel( const Rectangle& rRectDst, +bool Bitmap::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const Bitmap* pBmpSrc ) { const Size aSizePix( GetSizePixel() ); Rectangle aRectDst( rRectDst ); - sal_Bool bRet = sal_False; + bool bRet = false; aRectDst.Intersection( Rectangle( Point(), aSizePix ) ); @@ -1006,7 +1006,7 @@ sal_Bool Bitmap::CopyPixel( const Rectangle& rRectDst, } ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } } } @@ -1015,9 +1015,9 @@ sal_Bool Bitmap::CopyPixel( const Rectangle& rRectDst, return bRet; } -sal_Bool Bitmap::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor ) +bool Bitmap::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( nDX || nDY ) { @@ -1061,7 +1061,7 @@ sal_Bool Bitmap::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor ) pWriteAcc->SetPixel( nY, nX, aColor ); aNewBmp.ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -1078,7 +1078,7 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const { Bitmap aNewBmp( GetSizePixel(), 1 ); BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pWriteAcc ) { @@ -1247,7 +1247,7 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const } ( (Bitmap*) this )->ReleaseAccess( pReadAcc ); - bRet = sal_True; + bRet = true; } aNewBmp.ReleaseAccess( pWriteAcc ); @@ -1369,11 +1369,11 @@ Region Bitmap::CreateRegion( const Color& rColor, const Rectangle& rRect ) const return aRegion; } -sal_Bool Bitmap::Replace( const Bitmap& rMask, const Color& rReplaceColor ) +bool Bitmap::Replace( const Bitmap& rMask, const Color& rReplaceColor ) { BitmapReadAccess* pMaskAcc = ( (Bitmap&) rMask ).AcquireReadAccess(); BitmapWriteAccess* pAcc = AcquireWriteAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pMaskAcc && pAcc ) { @@ -1434,7 +1434,7 @@ sal_Bool Bitmap::Replace( const Bitmap& rMask, const Color& rReplaceColor ) if( pMaskAcc->GetPixel( nY, nX ) == aMaskWhite ) pAcc->SetPixel( nY, nX, aReplace ); - bRet = sal_True; + bRet = true; } ( (Bitmap&) rMask ).ReleaseAccess( pMaskAcc ); @@ -1443,13 +1443,13 @@ sal_Bool Bitmap::Replace( const Bitmap& rMask, const Color& rReplaceColor ) return bRet; } -sal_Bool Bitmap::Replace( const AlphaMask& rAlpha, const Color& rMergeColor ) +bool Bitmap::Replace( const AlphaMask& rAlpha, const Color& rMergeColor ) { Bitmap aNewBmp( GetSizePixel(), 24 ); BitmapReadAccess* pAcc = AcquireReadAccess(); BitmapReadAccess* pAlphaAcc = ( (AlphaMask&) rAlpha ).AcquireReadAccess(); BitmapWriteAccess* pNewAcc = aNewBmp.AcquireWriteAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pAcc && pAlphaAcc && pNewAcc ) { @@ -1466,7 +1466,7 @@ sal_Bool Bitmap::Replace( const AlphaMask& rAlpha, const Color& rMergeColor ) } } - bRet = sal_True; + bRet = true; } ReleaseAccess( pAcc ); @@ -1487,7 +1487,7 @@ sal_Bool Bitmap::Replace( const AlphaMask& rAlpha, const Color& rMergeColor ) return bRet; } -sal_Bool Bitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) +bool Bitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) { // Bitmaps with 1 bit color depth can cause problems // if they have other entries than black/white in their palette @@ -1495,7 +1495,7 @@ sal_Bool Bitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, Convert( BMP_CONVERSION_4BIT_COLORS ); BitmapWriteAccess* pAcc = AcquireWriteAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pAcc ) { @@ -1542,13 +1542,13 @@ sal_Bool Bitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, } ReleaseAccess( pAcc ); - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColors, +bool Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColors, sal_uLong nColorCount, sal_uLong* _pTols ) { // Bitmaps with 1 bit color depth can cause problems @@ -1557,7 +1557,7 @@ sal_Bool Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColor Convert( BMP_CONVERSION_4BIT_COLORS ); BitmapWriteAccess* pAcc = AcquireWriteAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pAcc ) { @@ -1649,7 +1649,7 @@ sal_Bool Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColor delete[] pMinB; delete[] pMaxB; ReleaseAccess( pAcc ); - bRet = sal_True; + bRet = true; } return bRet; @@ -1672,11 +1672,11 @@ Bitmap Bitmap::CreateDisplayBitmap( OutputDevice* pDisplay ) return aDispBmp; } -sal_Bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine ) +bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine ) { BitmapReadAccess* pMaskAcc = ( (Bitmap&) rMask ).AcquireReadAccess(); BitmapWriteAccess* pAcc = AcquireWriteAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pMaskAcc && pAcc ) { @@ -1800,7 +1800,7 @@ sal_Bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine ) break; } - bRet = sal_True; + bRet = true; } ( (Bitmap&) rMask ).ReleaseAccess( pMaskAcc ); @@ -1811,7 +1811,7 @@ sal_Bool Bitmap::CombineSimple( const Bitmap& rMask, BmpCombine eCombine ) // TODO: Have a look at OutputDevice::ImplDrawAlpha() for some // optimizations. Might even consolidate the code here and there. -sal_Bool Bitmap::Blend( const AlphaMask& rAlpha, const Color& rBackgroundColor ) +bool Bitmap::Blend( const AlphaMask& rAlpha, const Color& rBackgroundColor ) { // Convert to a truecolor bitmap, if we're a paletted one. There's // room for tradeoff decision here, maybe later for an overload (or a flag) @@ -1820,7 +1820,7 @@ sal_Bool Bitmap::Blend( const AlphaMask& rAlpha, const Color& rBackgroundColor ) BitmapReadAccess* pAlphaAcc = const_cast<AlphaMask&>(rAlpha).AcquireReadAccess(); BitmapWriteAccess* pAcc = AcquireWriteAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pAlphaAcc && pAcc ) { @@ -1833,7 +1833,7 @@ sal_Bool Bitmap::Blend( const AlphaMask& rAlpha, const Color& rBackgroundColor ) pAcc->GetPixel( nY, nX ).Merge( rBackgroundColor, 255 - pAlphaAcc->GetPixelIndex( nY, nX ) ) ); - bRet = sal_True; + bRet = true; } const_cast<AlphaMask&>(rAlpha).ReleaseAccess( pAlphaAcc ); @@ -1842,7 +1842,7 @@ sal_Bool Bitmap::Blend( const AlphaMask& rAlpha, const Color& rBackgroundColor ) return bRet; } -sal_Bool Bitmap::MakeMono( sal_uInt8 cThreshold ) +bool Bitmap::MakeMono( sal_uInt8 cThreshold ) { return ImplMakeMono( cThreshold ); } diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 87333ee4f4a6..73029540a90b 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -236,10 +236,10 @@ void ImplCreateDitherMatrix( sal_uInt8 (*pDitherMatrix)[16][16] ) (*pDitherMatrix)[i][j] = (sal_uInt8) ( fVal * pMtx[i][j] ); } -sal_Bool Bitmap::Convert( BmpConversion eConversion ) +bool Bitmap::Convert( BmpConversion eConversion ) { const sal_uInt16 nBitCount = GetBitCount(); - sal_Bool bRet = sal_False; + bool bRet = false; switch( eConversion ) { @@ -262,7 +262,7 @@ sal_Bool Bitmap::Convert( BmpConversion eConversion ) else if( nBitCount > 4 ) bRet = ImplConvertDown( 4, NULL ); else - bRet = sal_True; + bRet = true; } break; @@ -288,7 +288,7 @@ sal_Bool Bitmap::Convert( BmpConversion eConversion ) else if( nBitCount > 8 ) bRet = ImplConvertDown( 8 ); else - bRet = sal_True; + bRet = true; } break; @@ -308,7 +308,7 @@ sal_Bool Bitmap::Convert( BmpConversion eConversion ) if( nBitCount < 24 ) bRet = ImplConvertUp( 24, NULL ); else - bRet = sal_True; + bRet = true; } break; @@ -324,10 +324,10 @@ sal_Bool Bitmap::Convert( BmpConversion eConversion ) return bRet; } -sal_Bool Bitmap::ImplMakeMono( sal_uInt8 cThreshold ) +bool Bitmap::ImplMakeMono( sal_uInt8 cThreshold ) { BitmapReadAccess* pReadAcc = AcquireReadAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pReadAcc ) { @@ -376,7 +376,7 @@ sal_Bool Bitmap::ImplMakeMono( sal_uInt8 cThreshold ) } aNewBmp.ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -396,10 +396,10 @@ sal_Bool Bitmap::ImplMakeMono( sal_uInt8 cThreshold ) return bRet; } -sal_Bool Bitmap::ImplMakeMonoDither() +bool Bitmap::ImplMakeMonoDither() { BitmapReadAccess* pReadAcc = AcquireReadAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pReadAcc ) { @@ -451,7 +451,7 @@ sal_Bool Bitmap::ImplMakeMonoDither() } aNewBmp.ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -471,12 +471,12 @@ sal_Bool Bitmap::ImplMakeMonoDither() return bRet; } -sal_Bool Bitmap::ImplMakeGreyscales( sal_uInt16 nGreys ) +bool Bitmap::ImplMakeGreyscales( sal_uInt16 nGreys ) { DBG_ASSERT( nGreys == 16 || nGreys == 256, "Only 16 or 256 greyscales are supported!" ); BitmapReadAccess* pReadAcc = AcquireReadAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pReadAcc ) { @@ -557,7 +557,7 @@ sal_Bool Bitmap::ImplMakeGreyscales( sal_uInt16 nGreys ) } aNewBmp.ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -576,19 +576,19 @@ sal_Bool Bitmap::ImplMakeGreyscales( sal_uInt16 nGreys ) else { ReleaseAccess( pReadAcc ); - bRet = sal_True; + bRet = true; } } return bRet; } -sal_Bool Bitmap::ImplConvertUp( sal_uInt16 nBitCount, Color* pExtColor ) +bool Bitmap::ImplConvertUp( sal_uInt16 nBitCount, Color* pExtColor ) { DBG_ASSERT( nBitCount > GetBitCount(), "New BitCount must be greater!" ); BitmapReadAccess* pReadAcc = AcquireReadAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pReadAcc ) { @@ -637,7 +637,7 @@ sal_Bool Bitmap::ImplConvertUp( sal_uInt16 nBitCount, Color* pExtColor ) } aNewBmp.ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -657,12 +657,12 @@ sal_Bool Bitmap::ImplConvertUp( sal_uInt16 nBitCount, Color* pExtColor ) return bRet; } -sal_Bool Bitmap::ImplConvertDown( sal_uInt16 nBitCount, Color* pExtColor ) +bool Bitmap::ImplConvertDown( sal_uInt16 nBitCount, Color* pExtColor ) { DBG_ASSERT( nBitCount <= GetBitCount(), "New BitCount must be lower ( or equal when pExtColor is set )!" ); BitmapReadAccess* pReadAcc = AcquireReadAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pReadAcc ) { @@ -761,7 +761,7 @@ sal_Bool Bitmap::ImplConvertDown( sal_uInt16 nBitCount, Color* pExtColor ) delete[] pErrQuad2; aNewBmp.ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -781,11 +781,11 @@ sal_Bool Bitmap::ImplConvertDown( sal_uInt16 nBitCount, Color* pExtColor ) return bRet; } -sal_Bool Bitmap::ImplConvertGhosted() +bool Bitmap::ImplConvertGhosted() { Bitmap aNewBmp; BitmapReadAccess* pR = AcquireReadAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pR ) { @@ -808,7 +808,7 @@ sal_Bool Bitmap::ImplConvertGhosted() { pW->CopyBuffer( *pR ); aNewBmp.ReleaseAccess( pW ); - bRet = sal_True; + bRet = true; } } else @@ -834,7 +834,7 @@ sal_Bool Bitmap::ImplConvertGhosted() } aNewBmp.ReleaseAccess( pW ); - bRet = sal_True; + bRet = true; } } @@ -855,7 +855,7 @@ sal_Bool Bitmap::ImplConvertGhosted() return bRet; } -sal_Bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) +bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) { bool bRetval(false); @@ -948,7 +948,7 @@ sal_Bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 // ------------------------------------------------------------------------ -sal_Bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) +bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) { const Size aSize( GetSizePixel() ); bool bRet; @@ -1024,12 +1024,12 @@ void Bitmap::ImplAdaptBitCount(Bitmap& rNew) const } } -sal_Bool Bitmap::ImplScaleFast( const double& rScaleX, const double& rScaleY ) +bool Bitmap::ImplScaleFast( const double& rScaleX, const double& rScaleY ) { const Size aSizePix( GetSizePixel() ); const long nNewWidth = FRound( aSizePix.Width() * rScaleX ); const long nNewHeight = FRound( aSizePix.Height() * rScaleY ); - sal_Bool bRet = sal_False; + bool bRet = false; if( nNewWidth && nNewHeight ) { @@ -1076,7 +1076,7 @@ sal_Bool Bitmap::ImplScaleFast( const double& rScaleX, const double& rScaleY ) nActY++; } - bRet = sal_True; + bRet = true; aNewBmp.ReleaseAccess( pWriteAcc ); } @@ -1093,12 +1093,12 @@ sal_Bool Bitmap::ImplScaleFast( const double& rScaleX, const double& rScaleY ) return bRet; } -sal_Bool Bitmap::ImplScaleInterpolate( const double& rScaleX, const double& rScaleY ) +bool Bitmap::ImplScaleInterpolate( const double& rScaleX, const double& rScaleY ) { const Size aSizePix( GetSizePixel() ); const long nNewWidth = FRound( aSizePix.Width() * rScaleX ); const long nNewHeight = FRound( aSizePix.Height() * rScaleY ); - sal_Bool bRet = sal_False; + bool bRet = false; if( ( nNewWidth > 1L ) && ( nNewHeight > 1L ) ) { @@ -1185,7 +1185,7 @@ sal_Bool Bitmap::ImplScaleInterpolate( const double& rScaleX, const double& rSca delete[] pLutInt; delete[] pLutFrac; - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -1193,7 +1193,7 @@ sal_Bool Bitmap::ImplScaleInterpolate( const double& rScaleX, const double& rSca if( bRet ) { - bRet = sal_False; + bRet = false; const Bitmap aOriginal(*this); *this = aNewBmp; aNewBmp = Bitmap( Size( nNewWidth, nNewHeight ), 24 ); @@ -1257,7 +1257,7 @@ sal_Bool Bitmap::ImplScaleInterpolate( const double& rScaleX, const double& rSca delete[] pLutInt; delete[] pLutFrac; - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -1281,7 +1281,7 @@ sal_Bool Bitmap::ImplScaleInterpolate( const double& rScaleX, const double& rSca // #i121233# Added BMP_SCALE_SUPER from symphony code -sal_Bool Bitmap::ImplScaleSuper( +bool Bitmap::ImplScaleSuper( const double& rScaleX, const double& rScaleY ) { @@ -2140,7 +2140,7 @@ namespace } } - sal_Bool ImplScaleConvolutionHor( + bool ImplScaleConvolutionHor( Bitmap& rSource, Bitmap& rTarget, const double& rScaleX, @@ -2333,7 +2333,7 @@ namespace // #i121233# Added BMP_SCALE_LANCZOS, BMP_SCALE_BICUBIC, BMP_SCALE_BILINEAR and // BMP_SCALE_BOX derived from the original commit from Tomas Vajngerl (see // bugzilla task for deitails) Thanks! -sal_Bool Bitmap::ImplScaleConvolution( +bool Bitmap::ImplScaleConvolution( const double& rScaleX, const double& rScaleY, const Kernel& aKernel) @@ -2444,14 +2444,14 @@ sal_Bool Bitmap::ImplScaleConvolution( // ------------------------------------------------------------------------ -sal_Bool Bitmap::Dither( sal_uLong nDitherFlags ) +bool Bitmap::Dither( sal_uLong nDitherFlags ) { - sal_Bool bRet = sal_False; + bool bRet = false; const Size aSizePix( GetSizePixel() ); if( aSizePix.Width() == 1 || aSizePix.Height() == 1 ) - bRet = sal_True; + bRet = true; else if( nDitherFlags & BMP_DITHER_MATRIX ) bRet = ImplDitherMatrix(); else if( nDitherFlags & BMP_DITHER_FLOYD ) @@ -2462,12 +2462,12 @@ sal_Bool Bitmap::Dither( sal_uLong nDitherFlags ) return bRet; } -sal_Bool Bitmap::ImplDitherMatrix() +bool Bitmap::ImplDitherMatrix() { BitmapReadAccess* pReadAcc = AcquireReadAccess(); Bitmap aNewBmp( GetSizePixel(), 8 ); BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pReadAcc && pWriteAcc ) { @@ -2510,7 +2510,7 @@ sal_Bool Bitmap::ImplDitherMatrix() } } - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -2530,10 +2530,10 @@ sal_Bool Bitmap::ImplDitherMatrix() return bRet; } -sal_Bool Bitmap::ImplDitherFloyd() +bool Bitmap::ImplDitherFloyd() { const Size aSize( GetSizePixel() ); - sal_Bool bRet = sal_False; + bool bRet = false; if( ( aSize.Width() > 3 ) && ( aSize.Height() > 2 ) ) { @@ -2559,7 +2559,7 @@ sal_Bool Bitmap::ImplDitherFloyd() long* p1T = p1; long* p2T = p2; long* pTmp; - sal_Bool bPal = pReadAcc->HasPalette(); + bool bPal = pReadAcc->HasPalette(); pTmp = p2T; @@ -2648,7 +2648,7 @@ sal_Bool Bitmap::ImplDitherFloyd() delete[] p1; delete[] p2; - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -2669,12 +2669,12 @@ sal_Bool Bitmap::ImplDitherFloyd() return bRet; } -sal_Bool Bitmap::ImplDitherFloyd16() +bool Bitmap::ImplDitherFloyd16() { BitmapReadAccess* pReadAcc = AcquireReadAccess(); Bitmap aNewBmp( GetSizePixel(), 24 ); BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pReadAcc && pWriteAcc ) { @@ -2738,7 +2738,7 @@ sal_Bool Bitmap::ImplDitherFloyd16() // Destroy row buffer delete[] pErrQuad1; delete[] pErrQuad2; - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -2758,12 +2758,12 @@ sal_Bool Bitmap::ImplDitherFloyd16() return bRet; } -sal_Bool Bitmap::ReduceColors( sal_uInt16 nColorCount, BmpReduce eReduce ) +bool Bitmap::ReduceColors( sal_uInt16 nColorCount, BmpReduce eReduce ) { - sal_Bool bRet; + bool bRet; if( GetColorCount() <= (sal_uLong) nColorCount ) - bRet = sal_True; + bRet = true; else if( nColorCount ) { if( BMP_REDUCE_SIMPLE == eReduce ) @@ -2774,18 +2774,18 @@ sal_Bool Bitmap::ReduceColors( sal_uInt16 nColorCount, BmpReduce eReduce ) bRet = ImplReduceMedian( nColorCount ); } else - bRet = sal_False; + bRet = false; return bRet; } -sal_Bool Bitmap::ImplReduceSimple( sal_uInt16 nColorCount ) +bool Bitmap::ImplReduceSimple( sal_uInt16 nColorCount ) { Bitmap aNewBmp; BitmapReadAccess* pRAcc = AcquireReadAccess(); const sal_uInt16 nColCount = std::min( nColorCount, (sal_uInt16) 256 ); sal_uInt16 nBitCount; - sal_Bool bRet = sal_False; + bool bRet = false; if( nColCount <= 2 ) nBitCount = 1; @@ -2822,7 +2822,7 @@ sal_Bool Bitmap::ImplReduceSimple( sal_uInt16 nColorCount ) } aNewBmp.ReleaseAccess( pWAcc ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pRAcc ); @@ -2861,11 +2861,11 @@ extern "C" int SAL_CALL ImplPopularCmpFnc( const void* p1, const void* p2 ) return nRet; } -sal_Bool Bitmap::ImplReducePopular( sal_uInt16 nColCount ) +bool Bitmap::ImplReducePopular( sal_uInt16 nColCount ) { BitmapReadAccess* pRAcc = AcquireReadAccess(); sal_uInt16 nBitCount; - sal_Bool bRet = sal_False; + bool bRet = false; if( nColCount > 256 ) nColCount = 256; @@ -2986,7 +2986,7 @@ sal_Bool Bitmap::ImplReducePopular( sal_uInt16 nColCount ) delete[] pIndexMap; aNewBmp.ReleaseAccess( pWAcc ); - bRet = sal_True; + bRet = true; } delete[] pCountTable; @@ -3006,11 +3006,11 @@ sal_Bool Bitmap::ImplReducePopular( sal_uInt16 nColCount ) return bRet; } -sal_Bool Bitmap::ImplReduceMedian( sal_uInt16 nColCount ) +bool Bitmap::ImplReduceMedian( sal_uInt16 nColCount ) { BitmapReadAccess* pRAcc = AcquireReadAccess(); sal_uInt16 nBitCount; - sal_Bool bRet = sal_False; + bool bRet = false; if( nColCount < 17 ) nBitCount = 4; @@ -3076,7 +3076,7 @@ sal_Bool Bitmap::ImplReduceMedian( sal_uInt16 nColCount ) rtl_freeMemory( pColBuf ); aNewBmp.ReleaseAccess( pWAcc ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pRAcc ); @@ -3226,28 +3226,28 @@ void Bitmap::ImplMedianCut( sal_uLong* pColBuf, BitmapPalette& rPal, } } -sal_Bool Bitmap::Vectorize( PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress ) +bool Bitmap::Vectorize( PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress ) { return ImplVectorizer().ImplVectorize( *this, rPolyPoly, nFlags, pProgress ); } -sal_Bool Bitmap::Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress ) +bool Bitmap::Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress ) { return ImplVectorizer().ImplVectorize( *this, rMtf, cReduce, nFlags, pProgress ); } -sal_Bool Bitmap::Adjust( short nLuminancePercent, short nContrastPercent, +bool Bitmap::Adjust( short nLuminancePercent, short nContrastPercent, short nChannelRPercent, short nChannelGPercent, short nChannelBPercent, - double fGamma, sal_Bool bInvert ) + double fGamma, bool bInvert ) { - sal_Bool bRet = sal_False; + bool bRet = false; // nothing to do => return quickly if( !nLuminancePercent && !nContrastPercent && !nChannelRPercent && !nChannelGPercent && !nChannelBPercent && ( fGamma == 1.0 ) && !bInvert ) { - bRet = sal_True; + bRet = true; } else { @@ -3365,7 +3365,7 @@ sal_Bool Bitmap::Adjust( short nLuminancePercent, short nContrastPercent, delete[] cMapG; delete[] cMapB; ReleaseAccess( pAcc ); - bRet = sal_True; + bRet = true; } } diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index dbda9e68d4e8..509f7ead46ef 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -38,9 +38,9 @@ static inline sal_uInt8 lcl_getDuotoneColorComponent( sal_uInt8 base, sal_uInt16 return (sal_uInt8) (color1+color2); } -sal_Bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress ) +bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress ) { - sal_Bool bRet = sal_False; + bool bRet = false; switch( eFilter ) { @@ -58,7 +58,7 @@ sal_Bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, } else { - bRet = sal_False; + bRet = false; } } break; @@ -110,11 +110,11 @@ sal_Bool Bitmap::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, return bRet; } -sal_Bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor, +bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor, const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ ) { BitmapReadAccess* pReadAcc = AcquireReadAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pReadAcc ) { @@ -236,7 +236,7 @@ sal_Bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor, aNewBmp.ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -256,10 +256,10 @@ sal_Bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor, return bRet; } -sal_Bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ ) +bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ ) { BitmapReadAccess* pReadAcc = AcquireReadAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pReadAcc ) { @@ -365,7 +365,7 @@ sal_Bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const aNewBmp.ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -385,13 +385,13 @@ sal_Bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const return bRet; } -sal_Bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ ) +bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ ) { - sal_Bool bRet = ImplMakeGreyscales( 256 ); + bool bRet = ImplMakeGreyscales( 256 ); if( bRet ) { - bRet = sal_False; + bRet = false; BitmapReadAccess* pReadAcc = AcquireReadAccess(); @@ -490,7 +490,7 @@ sal_Bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Li delete[] pHMap; delete[] pVMap; aNewBmp.ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -511,13 +511,13 @@ sal_Bool Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Li return bRet; } -sal_Bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ ) +bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ ) { - sal_Bool bRet = ImplMakeGreyscales( 256 ); + bool bRet = ImplMakeGreyscales( 256 ); if( bRet ) { - bRet = sal_False; + bRet = false; BitmapReadAccess* pReadAcc = AcquireReadAccess(); @@ -602,7 +602,7 @@ sal_Bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* delete[] pHMap; delete[] pVMap; aNewBmp.ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -623,9 +623,9 @@ sal_Bool Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* return bRet; } -sal_Bool Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ ) +bool Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ ) { - sal_Bool bRet = sal_False; + bool bRet = false; BitmapWriteAccess* pWriteAcc = AcquireWriteAccess(); if( pWriteAcc ) @@ -665,16 +665,16 @@ sal_Bool Bitmap::ImplSolarize( const BmpFilterParam* pFilterParam, const Link* / } ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } return bRet; } -sal_Bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ ) +bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ ) { BitmapReadAccess* pReadAcc = AcquireReadAccess(); - sal_Bool bRet = sal_False; + bool bRet = false; if( pReadAcc ) { @@ -736,7 +736,7 @@ sal_Bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pP } aNewBmp.ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -756,13 +756,13 @@ sal_Bool Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pP return bRet; } -sal_Bool Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ ) +bool Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*pProgress*/ ) { sal_uLong nTileWidth = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ? pFilterParam->maMosaicTileSize.mnTileWidth : 4; sal_uLong nTileHeight = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_MOSAIC ) ? pFilterParam->maMosaicTileSize.mnTileHeight : 4; - sal_Bool bRet = sal_False; + bool bRet = false; if( !nTileWidth ) nTileWidth = 1; @@ -884,7 +884,7 @@ sal_Bool Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*p } while( nY1 < nHeight ); - bRet = sal_True; + bRet = true; } ReleaseAccess( pReadAcc ); @@ -908,7 +908,7 @@ sal_Bool Bitmap::ImplMosaic( const BmpFilterParam* pFilterParam, const Link* /*p } } else - bRet = sal_True; + bRet = true; return bRet; } @@ -933,13 +933,13 @@ extern "C" int SAL_CALL ImplPopArtCmpFnc( const void* p1, const void* p2 ) return nRet; } -sal_Bool Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ ) +bool Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ ) { - sal_Bool bRet = ( GetBitCount() > 8 ) ? Convert( BMP_CONVERSION_8BIT_COLORS ) : sal_True; + bool bRet = ( GetBitCount() > 8 ) ? Convert( BMP_CONVERSION_8BIT_COLORS ) : sal_True; if( bRet ) { - bRet = sal_False; + bRet = false; BitmapWriteAccess* pWriteAcc = AcquireWriteAccess(); @@ -986,7 +986,7 @@ sal_Bool Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link* // cleanup delete[] pPopArtTable; ReleaseAccess( pWriteAcc ); - bRet = sal_True; + bRet = true; } } diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 7a3320c767c8..a8b287724478 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star; BitmapEx::BitmapEx() : eTransparent( TRANSPARENT_NONE ), - bAlpha ( sal_False ) + bAlpha ( false ) { } @@ -64,7 +64,7 @@ BitmapEx::BitmapEx( const BitmapEx& rBitmapEx ) : BitmapEx::BitmapEx( const BitmapEx& rBitmapEx, Point aSrc, Size aSize ) : eTransparent( TRANSPARENT_NONE ), - bAlpha ( sal_False ) + bAlpha ( false ) { if( rBitmapEx.IsEmpty() ) return; @@ -73,7 +73,7 @@ BitmapEx::BitmapEx( const BitmapEx& rBitmapEx, Point aSrc, Size aSize ) : aBitmapSize = aSize; if( rBitmapEx.IsAlpha() ) { - bAlpha = sal_True; + bAlpha = true; aMask = AlphaMask( aSize ).ImplGetBitmap(); } else if( rBitmapEx.IsTransparent() ) @@ -86,7 +86,7 @@ BitmapEx::BitmapEx( const BitmapEx& rBitmapEx, Point aSrc, Size aSize ) : BitmapEx::BitmapEx( const ResId& rResId ) : eTransparent( TRANSPARENT_NONE ), - bAlpha ( sal_False ) + bAlpha ( false ) { static ImplImageTreeSingletonRef aImageTree; ResMgr* pResMgr = NULL; @@ -113,7 +113,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp ) : aBitmap ( rBmp ), aBitmapSize ( aBitmap.GetSizePixel() ), eTransparent( TRANSPARENT_NONE ), - bAlpha ( sal_False ) + bAlpha ( false ) { } @@ -122,7 +122,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Bitmap& rMask ) : aMask ( rMask ), aBitmapSize ( aBitmap.GetSizePixel() ), eTransparent ( !rMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP ), - bAlpha ( sal_False ) + bAlpha ( false ) { if(!!aBitmap && !!aMask && aBitmap.GetSizePixel() != aMask.GetSizePixel()) { @@ -163,7 +163,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const Color& rTransparentColor ) : aBitmapSize ( aBitmap.GetSizePixel() ), aTransparentColor ( rTransparentColor ), eTransparent ( TRANSPARENT_BITMAP ), - bAlpha ( sal_False ) + bAlpha ( false ) { aMask = aBitmap.CreateMask( aTransparentColor ); @@ -190,19 +190,19 @@ BitmapEx& BitmapEx::operator=( const BitmapEx& rBitmapEx ) return *this; } -sal_Bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const +bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const { if( eTransparent != rBitmapEx.eTransparent ) - return sal_False; + return false; if( aBitmap != rBitmapEx.aBitmap ) - return sal_False; + return false; if( aBitmapSize != rBitmapEx.aBitmapSize ) - return sal_False; + return false; if( eTransparent == TRANSPARENT_NONE ) - return sal_True; + return true; if( eTransparent == TRANSPARENT_COLOR ) return aTransparentColor == rBitmapEx.aTransparentColor; @@ -210,7 +210,7 @@ sal_Bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const return( ( aMask == rBitmapEx.aMask ) && ( bAlpha == rBitmapEx.bAlpha ) ); } -sal_Bool BitmapEx::IsEqual( const BitmapEx& rBmpEx ) const +bool BitmapEx::IsEqual( const BitmapEx& rBmpEx ) const { return( rBmpEx.eTransparent == eTransparent && rBmpEx.bAlpha == bAlpha && @@ -218,7 +218,7 @@ sal_Bool BitmapEx::IsEqual( const BitmapEx& rBmpEx ) const rBmpEx.aMask.IsEqual( aMask ) ); } -sal_Bool BitmapEx::IsEmpty() const +bool BitmapEx::IsEmpty() const { return( aBitmap.IsEmpty() && aMask.IsEmpty() ); } @@ -228,7 +228,7 @@ void BitmapEx::SetEmpty() aBitmap.SetEmpty(); aMask.SetEmpty(); eTransparent = TRANSPARENT_NONE; - bAlpha = sal_False; + bAlpha = false; } void BitmapEx::Clear() @@ -236,12 +236,12 @@ void BitmapEx::Clear() SetEmpty(); } -sal_Bool BitmapEx::IsTransparent() const +bool BitmapEx::IsTransparent() const { return( eTransparent != TRANSPARENT_NONE ); } -sal_Bool BitmapEx::IsAlpha() const +bool BitmapEx::IsAlpha() const { return( IsTransparent() && bAlpha ); } @@ -332,9 +332,9 @@ void BitmapEx::SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag ) } } -sal_Bool BitmapEx::Invert() +bool BitmapEx::Invert() { - sal_Bool bRet = sal_False; + bool bRet = false; if( !!aBitmap ) { @@ -347,9 +347,9 @@ sal_Bool BitmapEx::Invert() return bRet; } -sal_Bool BitmapEx::Mirror( sal_uLong nMirrorFlags ) +bool BitmapEx::Mirror( sal_uLong nMirrorFlags ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( !!aBitmap ) { @@ -364,9 +364,9 @@ sal_Bool BitmapEx::Mirror( sal_uLong nMirrorFlags ) // ------------------------------------------------------------------ -sal_Bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) +bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( !!aBitmap ) { @@ -388,9 +388,9 @@ sal_Bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt // ------------------------------------------------------------------------ -sal_Bool BitmapEx::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) +bool BitmapEx::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) { - sal_Bool bRet; + bool bRet; if( aBitmapSize.Width() && aBitmapSize.Height() && ( rNewSize.Width() != aBitmapSize.Width() || @@ -401,14 +401,14 @@ sal_Bool BitmapEx::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag ) nScaleFlag ); } else - bRet = sal_True; + bRet = true; return bRet; } -sal_Bool BitmapEx::Rotate( long nAngle10, const Color& rFillColor ) +bool BitmapEx::Rotate( long nAngle10, const Color& rFillColor ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( !!aBitmap ) { @@ -450,9 +450,9 @@ sal_Bool BitmapEx::Rotate( long nAngle10, const Color& rFillColor ) return bRet; } -sal_Bool BitmapEx::Crop( const Rectangle& rRectPixel ) +bool BitmapEx::Crop( const Rectangle& rRectPixel ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( !!aBitmap ) { @@ -470,19 +470,19 @@ sal_Bool BitmapEx::Crop( const Rectangle& rRectPixel ) return bRet; } -sal_Bool BitmapEx::Convert( BmpConversion eConversion ) +bool BitmapEx::Convert( BmpConversion eConversion ) { return( !!aBitmap ? aBitmap.Convert( eConversion ) : sal_False ); } -sal_Bool BitmapEx::ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce ) +bool BitmapEx::ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce ) { return( !!aBitmap ? aBitmap.ReduceColors( nNewColorCount, eReduce ) : sal_False ); } -sal_Bool BitmapEx::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor, sal_Bool bExpandTransparent ) +bool BitmapEx::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor, bool bExpandTransparent ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( !!aBitmap ) { @@ -503,10 +503,10 @@ sal_Bool BitmapEx::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor return bRet; } -sal_Bool BitmapEx::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, +bool BitmapEx::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const BitmapEx* pBmpExSrc ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( !pBmpExSrc || pBmpExSrc->IsEmpty() ) { @@ -537,7 +537,7 @@ sal_Bool BitmapEx::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectS aMask = pAlpha->ImplGetBitmap(); delete pAlpha; - bAlpha = sal_True; + bAlpha = true; aMask.CopyPixel( rRectDst, rRectSrc, &pBmpExSrc->aMask ); } else @@ -548,7 +548,7 @@ sal_Bool BitmapEx::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectS aMask = pAlpha->ImplGetBitmap(); delete pAlpha; eTransparent = TRANSPARENT_BITMAP; - bAlpha = sal_True; + bAlpha = true; aMask.CopyPixel( rRectDst, rRectSrc, &pBmpExSrc->aMask ); } } @@ -590,9 +590,9 @@ sal_Bool BitmapEx::CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectS return bRet; } -sal_Bool BitmapEx::Erase( const Color& rFillColor ) +bool BitmapEx::Erase( const Color& rFillColor ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( !!aBitmap ) { @@ -617,31 +617,31 @@ sal_Bool BitmapEx::Erase( const Color& rFillColor ) return bRet; } -sal_Bool BitmapEx::Dither( sal_uLong nDitherFlags ) +bool BitmapEx::Dither( sal_uLong nDitherFlags ) { return( !!aBitmap ? aBitmap.Dither( nDitherFlags ) : sal_False ); } -sal_Bool BitmapEx::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) +bool BitmapEx::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) { return( !!aBitmap ? aBitmap.Replace( rSearchColor, rReplaceColor, nTol ) : sal_False ); } -sal_Bool BitmapEx::Replace( const Color* pSearchColors, const Color* pReplaceColors, sal_uLong nColorCount, const sal_uLong* pTols ) +bool BitmapEx::Replace( const Color* pSearchColors, const Color* pReplaceColors, sal_uLong nColorCount, const sal_uLong* pTols ) { return( !!aBitmap ? aBitmap.Replace( pSearchColors, pReplaceColors, nColorCount, (sal_uLong*) pTols ) : sal_False ); } -sal_Bool BitmapEx::Adjust( short nLuminancePercent, short nContrastPercent, +bool BitmapEx::Adjust( short nLuminancePercent, short nContrastPercent, short nChannelRPercent, short nChannelGPercent, short nChannelBPercent, - double fGamma, sal_Bool bInvert ) + double fGamma, bool bInvert ) { return( !!aBitmap ? aBitmap.Adjust( nLuminancePercent, nContrastPercent, nChannelRPercent, nChannelGPercent, nChannelBPercent, fGamma, bInvert ) : sal_False ); } -sal_Bool BitmapEx::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress ) +bool BitmapEx::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress ) { return( !!aBitmap ? aBitmap.Filter( eFilter, pFilterParam, pProgress ) : sal_False ); } diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 8e3836596e32..92160da2b990 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -26,7 +26,7 @@ #include <string.h> -BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap, sal_Bool bModify ) : +BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap, bool bModify ) : mpBuffer ( NULL ), mpScanBuf ( NULL ), mFncGetPixel ( NULL ), @@ -41,7 +41,7 @@ BitmapReadAccess::BitmapReadAccess( Bitmap& rBitmap ) : mpScanBuf ( NULL ), mFncGetPixel ( NULL ), mFncSetPixel ( NULL ), - mbModify ( sal_False ) + mbModify ( false ) { ImplCreate( rBitmap ); } @@ -133,9 +133,9 @@ void BitmapReadAccess::ImplDestroy() } } -sal_Bool BitmapReadAccess::ImplSetAccessPointers( sal_uLong nFormat ) +bool BitmapReadAccess::ImplSetAccessPointers( sal_uLong nFormat ) { - sal_Bool bRet = sal_True; + bool bRet = true; switch( nFormat ) { @@ -157,7 +157,7 @@ sal_Bool BitmapReadAccess::ImplSetAccessPointers( sal_uLong nFormat ) CASE_FORMAT( _32BIT_TC_MASK ) default: - bRet = sal_False; + bRet = false; break; } @@ -385,7 +385,7 @@ BitmapColor BitmapReadAccess::GetColorWithFallback( double fY, double fX, const } BitmapWriteAccess::BitmapWriteAccess( Bitmap& rBitmap ) : - BitmapReadAccess( rBitmap, sal_True ), + BitmapReadAccess( rBitmap, true ), mpLineColor ( NULL ), mpFillColor ( NULL ) { diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 3df540f95d67..d547cc19eaaa 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -249,7 +249,7 @@ void ImplWriteFont( SvStream& rOStm, const Font& rFont, rOStm.WriteInt16( (sal_Int16) nWeight ); rOStm.WriteInt16( (sal_Int16) rFont.GetUnderline() ); rOStm.WriteInt16( (sal_Int16) rFont.GetStrikeout() ); - rOStm.WriteUChar( (sal_Bool) ( rFont.GetItalic() != ITALIC_NONE ) ); + rOStm.WriteUChar( rFont.GetItalic() != ITALIC_NONE ); rOStm.WriteUChar( rFont.IsOutline() ); rOStm.WriteUChar( rFont.IsShadow() ); rOStm.WriteUChar( rFont.IsTransparent() ); @@ -262,7 +262,7 @@ void ImplWriteRasterOpAction( SvStream& rOStm, sal_Int16 nRasterOp ) rOStm.WriteInt16( (sal_Int16) GDI_RASTEROP_ACTION ).WriteInt32( (sal_Int32) 6 ).WriteInt16( nRasterOp ); } -sal_Bool ImplWriteUnicodeComment( SvStream& rOStm, const OUString& rString ) +bool ImplWriteUnicodeComment( SvStream& rOStm, const OUString& rString ) { sal_Int32 nStringLen = rString.getLength(); if ( nStringLen ) @@ -662,7 +662,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) const Polygon aPoly( aRect.Center(), aRect.GetWidth() >> 1, aRect.GetHeight() >> 1 ); rMtf.AddAction( new MetaPushAction( PUSH_LINECOLOR ) ); - rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, sal_False ) ); + rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, false ) ); rMtf.AddAction( new MetaPolygonAction( aPoly ) ); rMtf.AddAction( new MetaPopAction() ); rMtf.AddAction( new MetaPolyLineAction( aPoly, aLineInfo ) ); @@ -683,7 +683,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) const Polygon aPoly( aRect, aPt, aPt1, POLY_ARC ); rMtf.AddAction( new MetaPushAction( PUSH_LINECOLOR ) ); - rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, sal_False ) ); + rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, false ) ); rMtf.AddAction( new MetaPolygonAction( aPoly ) ); rMtf.AddAction( new MetaPopAction() ); rMtf.AddAction( new MetaPolyLineAction( aPoly, aLineInfo ) ); @@ -704,7 +704,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) const Polygon aPoly( aRect, aPt, aPt1, POLY_PIE ); rMtf.AddAction( new MetaPushAction( PUSH_LINECOLOR ) ); - rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, sal_False ) ); + rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, false ) ); rMtf.AddAction( new MetaPolygonAction( aPoly ) ); rMtf.AddAction( new MetaPopAction() ); rMtf.AddAction( new MetaPolyLineAction( aPoly, aLineInfo ) ); @@ -744,7 +744,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) if( bFatLine ) { rMtf.AddAction( new MetaPushAction( PUSH_LINECOLOR ) ); - rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, sal_False ) ); + rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, false ) ); rMtf.AddAction( new MetaPolygonAction( aActionPoly ) ); rMtf.AddAction( new MetaPopAction() ); rMtf.AddAction( new MetaPolyLineAction( aActionPoly, aLineInfo ) ); @@ -766,7 +766,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) if( bFatLine ) { rMtf.AddAction( new MetaPushAction( PUSH_LINECOLOR ) ); - rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, sal_False ) ); + rMtf.AddAction( new MetaLineColorAction( COL_TRANSPARENT, false ) ); rMtf.AddAction( new MetaPolyPolygonAction( aPolyPoly ) ); rMtf.AddAction( new MetaPopAction() ); @@ -788,7 +788,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) sal_Int32 nWidth, nHeight; sal_Int16 nCharSet, nFamily, nPitch, nAlign, nWeight, nUnderline, nStrikeout; sal_Int16 nCharOrient, nLineOrient; - sal_Bool bItalic, bOutline, bShadow, bTransparent; + bool bItalic, bOutline, bShadow, bTransparent; ImplReadColor( rIStm, aActionColor ); aFont.SetColor( aActionColor ); ImplReadColor( rIStm, aActionColor ); aFont.SetFillColor( aActionColor ); @@ -797,7 +797,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) rIStm.ReadInt32( nWidth ).ReadInt32( nHeight ); rIStm.ReadInt16( nCharOrient ).ReadInt16( nLineOrient ); rIStm.ReadInt16( nCharSet ).ReadInt16( nFamily ).ReadInt16( nPitch ).ReadInt16( nAlign ).ReadInt16( nWeight ).ReadInt16( nUnderline ).ReadInt16( nStrikeout ); - rIStm.ReadUChar( bItalic ).ReadUChar( bOutline ).ReadUChar( bShadow ).ReadUChar( bTransparent ); + rIStm.ReadCharAsBool( bItalic ).ReadCharAsBool( bOutline ).ReadCharAsBool( bShadow ).ReadCharAsBool( bTransparent ); aFont.SetSize( Size( nWidth, nHeight ) ); aFont.SetCharSet( (rtl_TextEncoding) nCharSet ); @@ -1011,7 +1011,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) Region aRegion; sal_Int16 nRegType; sal_Int16 bIntersect; - sal_Bool bClip = sal_False; + bool bClip = false; rIStm.ReadInt16( nRegType ).ReadInt16( bIntersect ); ImplReadRect( rIStm, aRect ); @@ -1027,7 +1027,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) ImplReadRect( rIStm, aRegRect ); aRegion = Region( aRegRect ); - bClip = sal_True; + bClip = true; } break; @@ -1035,7 +1035,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) { ImplReadPoly( rIStm, aActionPoly ); aRegion = Region( aActionPoly ); - bClip = sal_True; + bClip = true; } break; @@ -1053,7 +1053,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) } aRegion = Region( aPolyPoly ); - bClip = sal_True; + bClip = true; } break; } @@ -1227,11 +1227,11 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_REFPOINT_COMMENT ): { Point aRefPoint; - sal_Bool bSet; + bool bSet; sal_Int32 nFollowingActionCount; ReadPair( rIStm, aRefPoint ); - rIStm.ReadUChar( bSet ).ReadInt32( nFollowingActionCount ); + rIStm.ReadCharAsBool( bSet ).ReadInt32( nFollowingActionCount ); ImplSkipActions( rIStm, nFollowingActionCount ); rMtf.AddAction( new MetaRefPointAction( aRefPoint, bSet ) ); @@ -1248,11 +1248,11 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_TEXTLINECOLOR_COMMENT ): { Color aColor; - sal_Bool bSet; + bool bSet; sal_Int32 nFollowingActionCount; ReadColor( rIStm, aColor ); - rIStm.ReadUChar( bSet ).ReadInt32( nFollowingActionCount ); + rIStm.ReadCharAsBool( bSet ).ReadInt32( nFollowingActionCount ); ImplSkipActions( rIStm, nFollowingActionCount ); rMtf.AddAction( new MetaTextLineColorAction( aColor, bSet ) ); @@ -1354,7 +1354,7 @@ void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ) const sal_uInt16 nOldFormat = rOStm.GetNumberFormatInt(); rtl_TextEncoding eActualCharSet = osl_getThreadTextEncoding(); const Size aPrefSize( rMtf.GetPrefSize() ); - sal_Bool bRop_0_1 = sal_False; + bool bRop_0_1 = false; VirtualDevice aSaveVDev; Color aLineCol( COL_BLACK ); ::std::stack< Color* > aLineColStack; @@ -1390,7 +1390,7 @@ void SVMConverter::ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ) } sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, - VirtualDevice& rSaveVDev, sal_Bool& rRop_0_1, + VirtualDevice& rSaveVDev, bool& rRop_0_1, Color& rLineCol, ::std::stack< Color* >& rLineColStack, rtl_TextEncoding& rActualCharSet ) { @@ -2108,7 +2108,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { ImplWritePopAction( rOStm ); rSaveVDev.Pop(); - rRop_0_1 = sal_False; + rRop_0_1 = false; nCount++; } @@ -2140,7 +2140,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, } ImplWriteRasterOpAction( rOStm, 0 ); - rRop_0_1 = sal_True; + rRop_0_1 = true; nCount += 4; } } @@ -2314,7 +2314,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { const MetaRefPointAction* pA = (MetaRefPointAction*) pAction; const Point& rRefPoint = pA->GetRefPoint(); - const sal_Bool bSet = pA->IsSetting(); + const bool bSet = pA->IsSetting(); sal_uLong nOldPos, nNewPos; // write RefPoint comment @@ -2343,7 +2343,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, { const MetaTextLineColorAction* pA = (MetaTextLineColorAction*) pAction; const Color& rColor = pA->GetColor(); - const sal_Bool bSet = pA->IsSetting(); + const bool bSet = pA->IsSetting(); sal_uLong nOldPos, nNewPos; // write RefPoint comment diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx index 738e463c43ef..b20286959b9c 100644 --- a/vcl/source/gdi/font.cxx +++ b/vcl/source/gdi/font.cxx @@ -303,7 +303,7 @@ void Font::SetFillColor( const Color& rColor ) mpImplFont->mbTransparent = true; } -void Font::SetTransparent( sal_Bool bTransparent ) +void Font::SetTransparent( bool bTransparent ) { if( mpImplFont->mbTransparent != bTransparent ) @@ -427,7 +427,7 @@ void Font::SetOrientation( short nOrientation ) } } -void Font::SetVertical( sal_Bool bVertical ) +void Font::SetVertical( bool bVertical ) { if( mpImplFont->mbVertical != bVertical ) @@ -447,7 +447,7 @@ void Font::SetKerning( FontKerning nKerning ) } } -sal_Bool Font::IsKerning() const +bool Font::IsKerning() const { return (mpImplFont->mnKerning & KERNING_FONTSPECIFIC) != 0; } @@ -482,7 +482,7 @@ void Font::SetItalic( FontItalic eItalic ) } } -void Font::SetOutline( sal_Bool bOutline ) +void Font::SetOutline( bool bOutline ) { if( mpImplFont->mbOutline != bOutline ) @@ -492,7 +492,7 @@ void Font::SetOutline( sal_Bool bOutline ) } } -void Font::SetShadow( sal_Bool bShadow ) +void Font::SetShadow( bool bShadow ) { if( mpImplFont->mbShadow != bShadow ) @@ -552,7 +552,7 @@ void Font::SetEmphasisMark( FontEmphasisMark eEmphasisMark ) } } -void Font::SetWordLineMode( sal_Bool bWordLine ) +void Font::SetWordLineMode( bool bWordLine ) { if( mpImplFont->mbWordLine != bWordLine ) @@ -659,7 +659,7 @@ SvStream& ReadImpl_Font( SvStream& rIStm, Impl_Font& rImpl_Font ) { VersionCompat aCompat( rIStm, STREAM_READ ); sal_uInt16 nTmp16; - sal_Bool bTmp; + bool bTmp; sal_uInt8 nTmp8; rImpl_Font.maFamilyName = rIStm.ReadUniOrByteString(rIStm.GetStreamCharSet()); @@ -678,16 +678,16 @@ SvStream& ReadImpl_Font( SvStream& rIStm, Impl_Font& rImpl_Font ) rIStm.ReadInt16( rImpl_Font.mnOrientation ); - rIStm.ReadUChar( bTmp ); rImpl_Font.mbWordLine = bTmp; - rIStm.ReadUChar( bTmp ); rImpl_Font.mbOutline = bTmp; - rIStm.ReadUChar( bTmp ); rImpl_Font.mbShadow = bTmp; + rIStm.ReadCharAsBool( bTmp ); rImpl_Font.mbWordLine = bTmp; + rIStm.ReadCharAsBool( bTmp ); rImpl_Font.mbOutline = bTmp; + rIStm.ReadCharAsBool( bTmp ); rImpl_Font.mbShadow = bTmp; rIStm.ReadUChar( nTmp8 ); rImpl_Font.mnKerning = nTmp8; if( aCompat.GetVersion() >= 2 ) { rIStm.ReadUChar( nTmp8 ); rImpl_Font.meRelief = (FontRelief)nTmp8; rIStm.ReadUInt16( nTmp16 ); rImpl_Font.maCJKLanguageTag.reset( (LanguageType)nTmp16); - rIStm.ReadUChar( bTmp ); rImpl_Font.mbVertical = bTmp; + rIStm.ReadCharAsBool( bTmp ); rImpl_Font.mbVertical = bTmp; rIStm.ReadUInt16( nTmp16 ); rImpl_Font.meEmphasisMark = (FontEmphasisMark)nTmp16; } if( aCompat.GetVersion() >= 3 ) @@ -719,15 +719,15 @@ SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& rImpl_Font ) rOStm.WriteInt16( rImpl_Font.mnOrientation ); - rOStm.WriteUChar( (sal_Bool) rImpl_Font.mbWordLine ); - rOStm.WriteUChar( (sal_Bool) rImpl_Font.mbOutline ); - rOStm.WriteUChar( (sal_Bool) rImpl_Font.mbShadow ); + rOStm.WriteUChar( rImpl_Font.mbWordLine ); + rOStm.WriteUChar( rImpl_Font.mbOutline ); + rOStm.WriteUChar( rImpl_Font.mbShadow ); rOStm.WriteUChar( (sal_uInt8) rImpl_Font.mnKerning ); // new in version 2 rOStm.WriteUChar( (sal_uInt8) rImpl_Font.meRelief ); rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.maCJKLanguageTag.getLanguageType( false) ); - rOStm.WriteUChar( (sal_Bool) rImpl_Font.mbVertical ); + rOStm.WriteUChar( rImpl_Font.mbVertical ); rOStm.WriteUInt16( (sal_uInt16) rImpl_Font.meEmphasisMark ); // new in version 3 @@ -960,7 +960,7 @@ const Color& Font::GetColor() const { return mpImplFont->maColor; } const Color& Font::GetFillColor() const { return mpImplFont->maFillColor; } -sal_Bool Font::IsTransparent() const { return mpImplFont->mbTransparent; } +bool Font::IsTransparent() const { return mpImplFont->mbTransparent; } FontAlign Font::GetAlign() const { return mpImplFont->meAlign; } @@ -1004,9 +1004,9 @@ FontItalic Font::GetItalic() const { return mpImplFont->GetItalic(); } FontFamily Font::GetFamily() const { return mpImplFont->GetFamily(); } -sal_Bool Font::IsOutline() const { return mpImplFont->mbOutline; } +bool Font::IsOutline() const { return mpImplFont->mbOutline; } -sal_Bool Font::IsShadow() const { return mpImplFont->mbShadow; } +bool Font::IsShadow() const { return mpImplFont->mbShadow; } FontRelief Font::GetRelief() const { return mpImplFont->meRelief; } @@ -1018,8 +1018,8 @@ FontStrikeout Font::GetStrikeout() const { return mpImplFont->meStrikeout; } FontEmphasisMark Font::GetEmphasisMark() const { return mpImplFont->meEmphasisMark; } -sal_Bool Font::IsWordLineMode() const { return mpImplFont->mbWordLine; } +bool Font::IsWordLineMode() const { return mpImplFont->mbWordLine; } -sal_Bool Font::IsSameInstance( const Font& rFont ) const { return (mpImplFont == rFont.mpImplFont); } +bool Font::IsSameInstance( const Font& rFont ) const { return (mpImplFont == rFont.mpImplFont); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index a8768bff42f3..8e952cea47c0 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -66,7 +66,7 @@ struct ImplBmpAdjustParam short nChannelGPercent; short nChannelBPercent; double fGamma; - sal_Bool bInvert; + bool bInvert; }; struct ImplColConvertParam @@ -115,9 +115,9 @@ GDIMetaFile::GDIMetaFile() : pPrev ( NULL ), pNext ( NULL ), pOutDev ( NULL ), - bPause ( sal_False ), - bRecord ( sal_False ), - bUseCanvas ( sal_False ) + bPause ( false ), + bRecord ( false ), + bUseCanvas ( false ) { } @@ -129,8 +129,8 @@ GDIMetaFile::GDIMetaFile( const GDIMetaFile& rMtf ) : pPrev ( rMtf.pPrev ), pNext ( rMtf.pNext ), pOutDev ( NULL ), - bPause ( sal_False ), - bRecord ( sal_False ), + bPause ( false ), + bRecord ( false ), bUseCanvas ( rMtf.bUseCanvas ) { // Increment RefCount of MetaActions @@ -145,7 +145,7 @@ GDIMetaFile::GDIMetaFile( const GDIMetaFile& rMtf ) : Record( rMtf.pOutDev ); if ( rMtf.bPause ) - Pause( sal_True ); + Pause( true ); } } @@ -209,8 +209,8 @@ GDIMetaFile& GDIMetaFile::operator=( const GDIMetaFile& rMtf ) pPrev = rMtf.pPrev; pNext = rMtf.pNext; pOutDev = NULL; - bPause = sal_False; - bRecord = sal_False; + bPause = false; + bRecord = false; bUseCanvas = rMtf.bUseCanvas; if( rMtf.bRecord ) @@ -218,31 +218,31 @@ GDIMetaFile& GDIMetaFile::operator=( const GDIMetaFile& rMtf ) Record( rMtf.pOutDev ); if( rMtf.bPause ) - Pause( sal_True ); + Pause( true ); } } return *this; } -sal_Bool GDIMetaFile::operator==( const GDIMetaFile& rMtf ) const +bool GDIMetaFile::operator==( const GDIMetaFile& rMtf ) const { const size_t nObjCount = aList.size(); - sal_Bool bRet = sal_False; + bool bRet = false; if( this == &rMtf ) - bRet = sal_True; + bRet = true; else if( rMtf.GetActionSize() == nObjCount && rMtf.GetPrefSize() == aPrefSize && rMtf.GetPrefMapMode() == aPrefMapMode ) { - bRet = sal_True; + bRet = true; for( size_t n = 0; n < nObjCount; n++ ) { if( aList[ n ] != rMtf.GetAction( n ) ) { - bRet = sal_False; + bRet = false; break; } } @@ -306,7 +306,7 @@ void GDIMetaFile::Record( OutputDevice* pOut ) nCurrentActionElement = aList.empty() ? 0 : (aList.size() - 1); pOutDev = pOut; - bRecord = sal_True; + bRecord = true; Linker( pOut, sal_True ); } @@ -590,7 +590,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, const Point& rPos, } } -void GDIMetaFile::Pause( sal_Bool _bPause ) +void GDIMetaFile::Pause( bool _bPause ) { if( bRecord ) { @@ -613,12 +613,12 @@ void GDIMetaFile::Stop() { if( bRecord ) { - bRecord = sal_False; + bRecord = false; if( !bPause ) Linker( pOutDev, sal_False ); else - bPause = sal_False; + bPause = false; } } @@ -686,12 +686,12 @@ void GDIMetaFile::RemoveAction( size_t nPos ) pPrev->RemoveAction( nPos ); } -sal_Bool GDIMetaFile::Mirror( sal_uLong nMirrorFlags ) +bool GDIMetaFile::Mirror( sal_uLong nMirrorFlags ) { const Size aOldPrefSize( GetPrefSize() ); long nMoveX, nMoveY; double fScaleX, fScaleY; - sal_Bool bRet; + bool bRet; if( nMirrorFlags & MTF_MIRROR_HORZ ) nMoveX = SAL_ABS( aOldPrefSize.Width() ) - 1, fScaleX = -1.0; @@ -708,10 +708,10 @@ sal_Bool GDIMetaFile::Mirror( sal_uLong nMirrorFlags ) Scale( fScaleX, fScaleY ); Move( nMoveX, nMoveY ); SetPrefSize( aOldPrefSize ); - bRet = sal_True; + bRet = true; } else - bRet = sal_False; + bRet = false; return bRet; } @@ -722,7 +722,7 @@ void GDIMetaFile::Move( long nX, long nY ) Size aOffset( aBaseOffset ); VirtualDevice aMapVDev; - aMapVDev.EnableOutput( sal_False ); + aMapVDev.EnableOutput( false ); aMapVDev.SetMapMode( GetPrefMapMode() ); for( MetaAction* pAct = FirstAction(); pAct; pAct = NextAction() ) @@ -756,7 +756,7 @@ void GDIMetaFile::Move( long nX, long nY, long nDPIX, long nDPIY ) Size aOffset( aBaseOffset ); VirtualDevice aMapVDev; - aMapVDev.EnableOutput( sal_False ); + aMapVDev.EnableOutput( false ); aMapVDev.SetReferenceDevice( nDPIX, nDPIY ); aMapVDev.SetMapMode( GetPrefMapMode() ); @@ -824,7 +824,7 @@ void GDIMetaFile::Clip( const Rectangle& i_rClipRect ) Rectangle aCurRect( i_rClipRect ); VirtualDevice aMapVDev; - aMapVDev.EnableOutput( sal_False ); + aMapVDev.EnableOutput( false ); aMapVDev.SetMapMode( GetPrefMapMode() ); for( MetaAction* pAct = FirstAction(); pAct; pAct = NextAction() ) @@ -844,7 +844,7 @@ void GDIMetaFile::Clip( const Rectangle& i_rClipRect ) Region aNewReg( aCurRect ); if( pOldAct->IsClipping() ) aNewReg.Intersect( pOldAct->GetRegion() ); - MetaClipRegionAction* pNewAct = new MetaClipRegionAction( aNewReg, sal_True ); + MetaClipRegionAction* pNewAct = new MetaClipRegionAction( aNewReg, true ); aList[ nCurrentActionElement ] = pNewAct; pOldAct->Delete(); } @@ -890,7 +890,7 @@ void GDIMetaFile::ImplAddGradientEx( GDIMetaFile& rMtf, { // Generate comment, GradientEx and Gradient actions (within DrawGradient) VirtualDevice aVDev( rMapDev, 0 ); - aVDev.EnableOutput( sal_False ); + aVDev.EnableOutput( false ); GDIMetaFile aGradMtf; aGradMtf.Record( &aVDev ); @@ -923,7 +923,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) aPoly.Rotate( Point(), fSin, fCos ); - aMapVDev.EnableOutput( sal_False ); + aMapVDev.EnableOutput( false ); aMapVDev.SetMapMode( GetPrefMapMode() ); const Rectangle aNewBound( aPoly.GetBoundRect() ); @@ -1280,7 +1280,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) MetaClipRegionAction* pAct = (MetaClipRegionAction*) pAction; if( pAct->IsClipping() && pAct->GetRegion().HasPolyPolygonOrB2DPolyPolygon() ) - aMtf.AddAction( new MetaClipRegionAction( Region( ImplGetRotatedPolyPolygon( pAct->GetRegion().GetAsPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ) ), sal_True ) ); + aMtf.AddAction( new MetaClipRegionAction( Region( ImplGetRotatedPolyPolygon( pAct->GetRegion().GetAsPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ) ), true ) ); else { pAction->Duplicate(); @@ -1399,7 +1399,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai GDIMetaFile aMtf; VirtualDevice aMapVDev( i_rReference ); - aMapVDev.EnableOutput( sal_False ); + aMapVDev.EnableOutput( false ); aMapVDev.SetMapMode( GetPrefMapMode() ); std::vector<Rectangle> aClipStack( 1, Rectangle() ); @@ -1939,7 +1939,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol if( !pAct->IsSetting() ) pAct->Duplicate(); else - pAct = new MetaLineColorAction( pFncCol( pAct->GetColor(), pColParam ), sal_True ); + pAct = new MetaLineColorAction( pFncCol( pAct->GetColor(), pColParam ), true ); aMtf.push_back( pAct ); } @@ -1952,7 +1952,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol if( !pAct->IsSetting() ) pAct->Duplicate(); else - pAct = new MetaFillColorAction( pFncCol( pAct->GetColor(), pColParam ), sal_True ); + pAct = new MetaFillColorAction( pFncCol( pAct->GetColor(), pColParam ), true ); aMtf.push_back( pAct ); } @@ -1972,7 +1972,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol if( !pAct->IsSetting() ) pAct->Duplicate(); else - pAct = new MetaTextFillColorAction( pFncCol( pAct->GetColor(), pColParam ), sal_True ); + pAct = new MetaTextFillColorAction( pFncCol( pAct->GetColor(), pColParam ), true ); aMtf.push_back( pAct ); } @@ -1985,7 +1985,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol if( !pAct->IsSetting() ) pAct->Duplicate(); else - pAct = new MetaTextLineColorAction( pFncCol( pAct->GetColor(), pColParam ), sal_True ); + pAct = new MetaTextLineColorAction( pFncCol( pAct->GetColor(), pColParam ), true ); aMtf.push_back( pAct ); } @@ -1998,7 +1998,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol if( !pAct->IsSetting() ) pAct->Duplicate(); else - pAct = new MetaOverlineColorAction( pFncCol( pAct->GetColor(), pColParam ), sal_True ); + pAct = new MetaOverlineColorAction( pFncCol( pAct->GetColor(), pColParam ), true ); aMtf.push_back( pAct ); } @@ -2176,7 +2176,7 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol void GDIMetaFile::Adjust( short nLuminancePercent, short nContrastPercent, short nChannelRPercent, short nChannelGPercent, - short nChannelBPercent, double fGamma, sal_Bool bInvert ) + short nChannelBPercent, double fGamma, bool bInvert ) { // nothing to do? => return quickly if( nLuminancePercent || nContrastPercent || @@ -2772,7 +2772,7 @@ SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ) { MetaCommentAction* pCommentAct = static_cast<MetaCommentAction*>(pAction); if ( pCommentAct->GetComment() == "EMF_PLUS" ) - rGDIMetaFile.UseCanvas( sal_True ); + rGDIMetaFile.UseCanvas( true ); } rGDIMetaFile.AddAction( pAction ); } @@ -2870,7 +2870,7 @@ SvStream& GDIMetaFile::Write( SvStream& rOStm ) return rOStm; } -sal_Bool GDIMetaFile::CreateThumbnail(BitmapEx& rBmpEx, sal_uInt32 nMaximumExtent) const +bool GDIMetaFile::CreateThumbnail(BitmapEx& rBmpEx, sal_uInt32 nMaximumExtent) const { // initialization seems to be complicated but is used to avoid rounding errors VirtualDevice aVDev; @@ -2938,7 +2938,7 @@ sal_Bool GDIMetaFile::CreateThumbnail(BitmapEx& rBmpEx, sal_uInt32 nMaximumExten return !rBmpEx.IsEmpty(); } -void GDIMetaFile::UseCanvas( sal_Bool _bUseCanvas ) +void GDIMetaFile::UseCanvas( bool _bUseCanvas ) { bUseCanvas = _bUseCanvas; } diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 94f1b0022ca8..742b5537e109 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -45,7 +45,7 @@ GfxLink::GfxLink( const GfxLink& rGfxLink ) : ImplCopy( rGfxLink ); } -GfxLink::GfxLink( sal_uInt8* pBuf, sal_uInt32 nSize, GfxLinkType nType, sal_Bool bOwns ) : +GfxLink::GfxLink( sal_uInt8* pBuf, sal_uInt32 nSize, GfxLinkType nType, bool bOwns ) : mpImpData( new ImpGfxLink ) { DBG_ASSERT( (pBuf != NULL && nSize) || (!bOwns && nSize == 0), @@ -94,9 +94,9 @@ GfxLink& GfxLink::operator=( const GfxLink& rGfxLink ) return *this; } -sal_Bool GfxLink::IsEqual( const GfxLink& rGfxLink ) const +bool GfxLink::IsEqual( const GfxLink& rGfxLink ) const { - sal_Bool bIsEqual = sal_False; + bool bIsEqual = false; if ( ( mnBufSize == rGfxLink.mnBufSize ) && ( meType == rGfxLink.meType ) ) { @@ -109,7 +109,7 @@ sal_Bool GfxLink::IsEqual( const GfxLink& rGfxLink ) const bIsEqual = memcmp( pSource, pDest, nSourceSize ) == 0; } else if ( ( pSource == 0 ) && ( pDest == 0 ) ) - bIsEqual = sal_True; + bIsEqual = true; } return bIsEqual; } @@ -135,7 +135,7 @@ GfxLinkType GfxLink::GetType() const return meType; } -sal_Bool GfxLink::IsNative() const +bool GfxLink::IsNative() const { return( meType >= GFX_LINK_FIRST_NATIVE_ID && meType <= GFX_LINK_LAST_NATIVE_ID ); } @@ -185,9 +185,9 @@ bool GfxLink::IsPrefMapModeValid() return mpImpData->mbPrefMapModeValid; } -sal_Bool GfxLink::LoadNative( Graphic& rGraphic ) +bool GfxLink::LoadNative( Graphic& rGraphic ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( IsNative() && mnBufSize ) { @@ -215,7 +215,7 @@ sal_Bool GfxLink::LoadNative( Graphic& rGraphic ) } if( nCvtType && ( GraphicConverter::Import( aMemStm, rGraphic, nCvtType ) == ERRCODE_NONE ) ) - bRet = sal_True; + bRet = true; } } @@ -256,7 +256,7 @@ void GfxLink::SwapIn() } } -sal_Bool GfxLink::ExportNative( SvStream& rOStream ) const +bool GfxLink::ExportNative( SvStream& rOStream ) const { if( GetDataSize() ) { @@ -319,7 +319,7 @@ SvStream& ReadGfxLink( SvStream& rIStream, GfxLink& rGfxLink) pBuf = new sal_uInt8[ nSize ]; rIStream.Read( pBuf, nSize ); - rGfxLink = GfxLink( pBuf, nSize, (GfxLinkType) nType, sal_True ); + rGfxLink = GfxLink( pBuf, nSize, (GfxLinkType) nType, true ); rGfxLink.SetUserId( nUserId ); if( bMapAndSizeValid ) diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx index da4185ebef2d..d8eed8320a27 100644 --- a/vcl/source/gdi/gradient.cxx +++ b/vcl/source/gdi/gradient.cxx @@ -265,11 +265,11 @@ Gradient& Gradient::operator=( const Gradient& rGradient ) return *this; } -sal_Bool Gradient::operator==( const Gradient& rGradient ) const +bool Gradient::operator==( const Gradient& rGradient ) const { if ( mpImplGradient == rGradient.mpImplGradient ) - return sal_True; + return true; if ( (mpImplGradient->meStyle == rGradient.mpImplGradient->meStyle) && (mpImplGradient->mnAngle == rGradient.mpImplGradient->mnAngle) && @@ -281,9 +281,9 @@ sal_Bool Gradient::operator==( const Gradient& rGradient ) const (mpImplGradient->mnIntensityEnd == rGradient.mpImplGradient->mnIntensityEnd) && (mpImplGradient->maStartColor == rGradient.mpImplGradient->maStartColor) && (mpImplGradient->maEndColor == rGradient.mpImplGradient->maEndColor) ) - return sal_True; + return true; else - return sal_False; + return false; } SvStream& ReadImpl_Gradient( SvStream& rIStm, Impl_Gradient& rImpl_Gradient ) diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx index 20b1b090464c..be6af1734f8f 100644 --- a/vcl/source/gdi/graph.cxx +++ b/vcl/source/gdi/graph.cxx @@ -289,17 +289,17 @@ Graphic& Graphic::operator=( const Graphic& rGraphic ) return *this; } -sal_Bool Graphic::operator==( const Graphic& rGraphic ) const +bool Graphic::operator==( const Graphic& rGraphic ) const { return( *mpImpGraphic == *rGraphic.mpImpGraphic ); } -sal_Bool Graphic::operator!=( const Graphic& rGraphic ) const +bool Graphic::operator!=( const Graphic& rGraphic ) const { return( *mpImpGraphic != *rGraphic.mpImpGraphic ); } -sal_Bool Graphic::operator!() const +bool Graphic::operator!() const { return( GRAPHIC_NONE == mpImpGraphic->ImplGetType() ); } @@ -336,27 +336,27 @@ void Graphic::SetDefaultType() mpImpGraphic->ImplSetDefaultType(); } -sal_Bool Graphic::IsSupportedGraphic() const +bool Graphic::IsSupportedGraphic() const { return mpImpGraphic->ImplIsSupportedGraphic(); } -sal_Bool Graphic::IsTransparent() const +bool Graphic::IsTransparent() const { return mpImpGraphic->ImplIsTransparent(); } -sal_Bool Graphic::IsAlpha() const +bool Graphic::IsAlpha() const { return mpImpGraphic->ImplIsAlpha(); } -sal_Bool Graphic::IsAnimated() const +bool Graphic::IsAnimated() const { return mpImpGraphic->ImplIsAnimated(); } -sal_Bool Graphic::IsEPS() const +bool Graphic::IsEPS() const { return mpImpGraphic->ImplIsEPS(); } @@ -516,31 +516,31 @@ sal_uLong Graphic::GetDocFilePos() const return mpImpGraphic->ImplGetDocFilePos(); } -sal_Bool Graphic::SwapOut() +bool Graphic::SwapOut() { ImplTestRefCount(); return mpImpGraphic->ImplSwapOut(); } -sal_Bool Graphic::SwapOut( SvStream* pOStream ) +bool Graphic::SwapOut( SvStream* pOStream ) { ImplTestRefCount(); return mpImpGraphic->ImplSwapOut( pOStream ); } -sal_Bool Graphic::SwapIn() +bool Graphic::SwapIn() { ImplTestRefCount(); return mpImpGraphic->ImplSwapIn(); } -sal_Bool Graphic::SwapIn( SvStream* pStrm ) +bool Graphic::SwapIn( SvStream* pStrm ) { ImplTestRefCount(); return mpImpGraphic->ImplSwapIn( pStrm ); } -sal_Bool Graphic::IsSwapOut() const +bool Graphic::IsSwapOut() const { return mpImpGraphic->ImplIsSwapOut(); } @@ -556,7 +556,7 @@ GfxLink Graphic::GetLink() const return mpImpGraphic->ImplGetLink(); } -sal_Bool Graphic::IsLink() const +bool Graphic::IsLink() const { return mpImpGraphic->ImplIsLink(); } @@ -566,7 +566,7 @@ sal_uLong Graphic::GetChecksum() const return mpImpGraphic->ImplGetChecksum(); } -sal_Bool Graphic::ExportNative( SvStream& rOStream ) const +bool Graphic::ExportNative( SvStream& rOStream ) const { return mpImpGraphic->ImplExportNative( rOStream ); } diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx index b4f2439ef93a..e4d08e08a7f3 100644 --- a/vcl/source/gdi/hatch.cxx +++ b/vcl/source/gdi/hatch.cxx @@ -80,7 +80,7 @@ Hatch& Hatch::operator=( const Hatch& rHatch ) return *this; } -sal_Bool Hatch::operator==( const Hatch& rHatch ) const +bool Hatch::operator==( const Hatch& rHatch ) const { return( mpImplHatch == rHatch.mpImplHatch || diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index 2a17f5140771..8400942651a5 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -247,7 +247,7 @@ Image& Image::operator=( const Image& rImage ) return *this; } -sal_Bool Image::operator==( const Image& rImage ) const +bool Image::operator==( const Image& rImage ) const { bool bRet = false; @@ -690,7 +690,7 @@ ImageList& ImageList::operator=( const ImageList& rImageList ) return *this; } -sal_Bool ImageList::operator==( const ImageList& rImageList ) const +bool ImageList::operator==( const ImageList& rImageList ) const { bool bRet = false; diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx index 40b86b4fb91f..5a5453045dc7 100644 --- a/vcl/source/gdi/impanmvw.cxx +++ b/vcl/source/gdi/impanmvw.cxx @@ -37,8 +37,8 @@ ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice* pOut, mpBackground ( new VirtualDevice ), mpRestore ( new VirtualDevice ), meLastDisposal ( DISPOSE_BACK ), - mbPause ( sal_False ), - mbMarked ( sal_False ), + mbPause ( false ), + mbMarked ( false ), mbHMirr ( maSz.Width() < 0L ), mbVMirr ( maSz.Height() < 0L ) { @@ -100,17 +100,17 @@ ImplAnimView::~ImplAnimView() mpParent->ImplDecAnimCount(); } -sal_Bool ImplAnimView::ImplMatches( OutputDevice* pOut, long nExtraData ) const +bool ImplAnimView::ImplMatches( OutputDevice* pOut, long nExtraData ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( nExtraData ) { if( ( mnExtraData == nExtraData ) && ( !pOut || ( pOut == mpOut ) ) ) - bRet = sal_True; + bRet = true; } else if( !pOut || ( pOut == mpOut ) ) - bRet = sal_True; + bRet = true; return bRet; } @@ -157,7 +157,7 @@ void ImplAnimView::ImplDrawToPos( sal_uLong nPos ) VirtualDevice aVDev; Region* pOldClip = !maClip.IsNull() ? new Region( mpOut->GetClipRegion() ) : NULL; - aVDev.SetOutputSizePixel( maSzPix, sal_False ); + aVDev.SetOutputSizePixel( maSzPix, false ); nPos = std::min( nPos, (sal_uLong) mpParent->Count() - 1UL ); for( sal_uLong i = 0UL; i <= nPos; i++ ) @@ -186,7 +186,7 @@ void ImplAnimView::ImplDraw( sal_uLong nPos, VirtualDevice* pVDev ) // check, if output lies out of display if( aOutRect.Intersection( Rectangle( maDispPt, maDispSz ) ).IsEmpty() ) - ImplSetMarked( sal_True ); + ImplSetMarked( true ); else if( !mbPause ) { VirtualDevice* pDev; @@ -227,7 +227,7 @@ void ImplAnimView::ImplDraw( sal_uLong nPos, VirtualDevice* pVDev ) if( !pVDev ) { pDev = new VirtualDevice; - pDev->SetOutputSizePixel( maSzPix, sal_False ); + pDev->SetOutputSizePixel( maSzPix, false ); pDev->DrawOutDev( Point(), maSzPix, maDispPt, maDispSz, *mpOut ); } else @@ -258,10 +258,10 @@ void ImplAnimView::ImplDraw( sal_uLong nPos, VirtualDevice* pVDev ) // Put it into a bitmap if needed, else delete // SaveBitmap to conserve memory if( ( meLastDisposal == DISPOSE_BACK ) || ( meLastDisposal == DISPOSE_NOT ) ) - mpRestore->SetOutputSizePixel( Size( 1, 1 ), sal_False ); + mpRestore->SetOutputSizePixel( Size( 1, 1 ), false ); else { - mpRestore->SetOutputSizePixel( maRestSz, sal_False ); + mpRestore->SetOutputSizePixel( maRestSz, false ); mpRestore->DrawOutDev( Point(), maRestSz, aPosPix, aSizePix, *pDev ); } @@ -292,7 +292,7 @@ void ImplAnimView::ImplDraw( sal_uLong nPos, VirtualDevice* pVDev ) void ImplAnimView::ImplRepaint() { - const sal_Bool bOldPause = mbPause; + const bool bOldPause = mbPause; if( mpOut->GetOutDevType() == OUTDEV_WINDOW ) { @@ -305,7 +305,7 @@ void ImplAnimView::ImplRepaint() else mpBackground->DrawOutDev( Point(), maSzPix, maDispPt, maDispSz, *mpOut ); - mbPause = sal_False; + mbPause = false; ImplDrawToPos( mnActPos ); mbPause = bOldPause; } diff --git a/vcl/source/gdi/impanmvw.hxx b/vcl/source/gdi/impanmvw.hxx index 8fb0df5207be..2cb0aecf264a 100644 --- a/vcl/source/gdi/impanmvw.hxx +++ b/vcl/source/gdi/impanmvw.hxx @@ -47,10 +47,10 @@ private: VirtualDevice* mpRestore; sal_uLong mnActPos; Disposal meLastDisposal; - sal_Bool mbPause; - sal_Bool mbMarked; - sal_Bool mbHMirr; - sal_Bool mbVMirr; + bool mbPause; + bool mbMarked; + bool mbHMirr; + bool mbVMirr; void ImplGetPosSize( const AnimationBitmap& rAnm, Point& rPosPix, Size& rSizePix ); void ImplDraw( sal_uLong nPos, VirtualDevice* pVDev ); @@ -62,7 +62,7 @@ public: OutputDevice* pFirstFrameOutDev = NULL ); ~ImplAnimView(); - sal_Bool ImplMatches( OutputDevice* pOut, long nExtraData ) const; + bool ImplMatches( OutputDevice* pOut, long nExtraData ) const; void ImplDrawToPos( sal_uLong nPos ); void ImplDraw( sal_uLong nPos ); void ImplRepaint(); @@ -73,11 +73,11 @@ public: const Size& ImplGetOutSize() const { return maSz; } const Size& ImplGetOutSizePix() const { return maSzPix; } - void ImplPause( sal_Bool bPause ) { mbPause = bPause; } - sal_Bool ImplIsPause() const { return mbPause; } + void ImplPause( bool bPause ) { mbPause = bPause; } + bool ImplIsPause() const { return mbPause; } - void ImplSetMarked( sal_Bool bMarked ) { mbMarked = bMarked; } - sal_Bool ImplIsMarked() const { return mbMarked; } + void ImplSetMarked( bool bMarked ) { mbMarked = bMarked; } + bool ImplIsMarked() const { return mbMarked; } }; #endif diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx index 852f21110998..08ecc18b7a91 100644 --- a/vcl/source/gdi/impbmp.cxx +++ b/vcl/source/gdi/impbmp.cxx @@ -42,23 +42,23 @@ void ImpBitmap::ImplSetSalBitmap( SalBitmap* pBitmap ) delete mpSalBitmap, mpSalBitmap = pBitmap; } -sal_Bool ImpBitmap::ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) +bool ImpBitmap::ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ) { return mpSalBitmap->Create( rSize, nBitCount, rPal ); } -sal_Bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap ) +bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap ) { mnChecksum = rImpBitmap.mnChecksum; return mpSalBitmap->Create( *rImpBitmap.mpSalBitmap ); } -sal_Bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics ) +bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics ) { return mpSalBitmap->Create( *rImpBitmap.mpSalBitmap, pGraphics ); } -sal_Bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount ) +bool ImpBitmap::ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount ) { return mpSalBitmap->Create( *rImpBitmap.mpSalBitmap, nNewBitCount ); } @@ -74,12 +74,12 @@ sal_uInt16 ImpBitmap::ImplGetBitCount() const return( ( nBitCount <= 1 ) ? 1 : ( nBitCount <= 4 ) ? 4 : ( nBitCount <= 8 ) ? 8 : 24 ); } -BitmapBuffer* ImpBitmap::ImplAcquireBuffer( sal_Bool bReadOnly ) +BitmapBuffer* ImpBitmap::ImplAcquireBuffer( bool bReadOnly ) { return mpSalBitmap->AcquireBuffer( bReadOnly ); } -void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, sal_Bool bReadOnly ) +void ImpBitmap::ImplReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) { mpSalBitmap->ReleaseBuffer( pBuffer, bReadOnly ); diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index f8c6065c3f1c..643b28311e4a 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -97,8 +97,8 @@ ImpGraphic::ImpGraphic() : mnDocFilePos ( 0UL ), mnSizeBytes ( 0UL ), mnRefCount ( 1UL ), - mbSwapOut ( sal_False ), - mbSwapUnderway ( sal_False ) + mbSwapOut ( false ), + mbSwapUnderway ( false ) { } @@ -113,7 +113,7 @@ ImpGraphic::ImpGraphic( const ImpGraphic& rImpGraphic ) : mnSizeBytes ( rImpGraphic.mnSizeBytes ), mnRefCount ( 1UL ), mbSwapOut ( rImpGraphic.mbSwapOut ), - mbSwapUnderway ( sal_False ) + mbSwapUnderway ( false ) { if( mpSwapFile ) mpSwapFile->nRefCount++; @@ -144,8 +144,8 @@ ImpGraphic::ImpGraphic( const Bitmap& rBitmap ) : mnDocFilePos ( 0UL ), mnSizeBytes ( 0UL ), mnRefCount ( 1UL ), - mbSwapOut ( sal_False ), - mbSwapUnderway ( sal_False ) + mbSwapOut ( false ), + mbSwapUnderway ( false ) { } @@ -159,8 +159,8 @@ ImpGraphic::ImpGraphic( const BitmapEx& rBitmapEx ) : mnDocFilePos ( 0UL ), mnSizeBytes ( 0UL ), mnRefCount ( 1UL ), - mbSwapOut ( sal_False ), - mbSwapUnderway ( sal_False ) + mbSwapOut ( false ), + mbSwapUnderway ( false ) { } @@ -173,8 +173,8 @@ ImpGraphic::ImpGraphic(const SvgDataPtr& rSvgDataPtr) mnDocFilePos( 0UL ), mnSizeBytes( 0UL ), mnRefCount( 1UL ), - mbSwapOut( sal_False ), - mbSwapUnderway( sal_False ), + mbSwapOut( false ), + mbSwapUnderway( false ), maSvgData(rSvgDataPtr) { } @@ -189,8 +189,8 @@ ImpGraphic::ImpGraphic( const Animation& rAnimation ) : mnDocFilePos ( 0UL ), mnSizeBytes ( 0UL ), mnRefCount ( 1UL ), - mbSwapOut ( sal_False ), - mbSwapUnderway ( sal_False ) + mbSwapOut ( false ), + mbSwapUnderway ( false ) { } @@ -204,8 +204,8 @@ ImpGraphic::ImpGraphic( const GDIMetaFile& rMtf ) : mnDocFilePos ( 0UL ), mnSizeBytes ( 0UL ), mnRefCount ( 1UL ), - mbSwapOut ( sal_False ), - mbSwapUnderway ( sal_False ) + mbSwapOut ( false ), + mbSwapUnderway ( false ) { } @@ -265,24 +265,24 @@ ImpGraphic& ImpGraphic::operator=( const ImpGraphic& rImpGraphic ) return *this; } -sal_Bool ImpGraphic::operator==( const ImpGraphic& rImpGraphic ) const +bool ImpGraphic::operator==( const ImpGraphic& rImpGraphic ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( this == &rImpGraphic ) - bRet = sal_True; + bRet = true; else if( !ImplIsSwapOut() && ( rImpGraphic.meType == meType ) ) { switch( meType ) { case( GRAPHIC_NONE ): - bRet = sal_True; + bRet = true; break; case( GRAPHIC_GDIMETAFILE ): { if( rImpGraphic.maMetaFile == maMetaFile ) - bRet = sal_True; + bRet = true; } break; @@ -292,7 +292,7 @@ sal_Bool ImpGraphic::operator==( const ImpGraphic& rImpGraphic ) const { if(maSvgData == rImpGraphic.maSvgData) { - bRet = sal_True; + bRet = true; } else if(rImpGraphic.maSvgData) { @@ -303,7 +303,7 @@ sal_Bool ImpGraphic::operator==( const ImpGraphic& rImpGraphic ) const rImpGraphic.maSvgData->getSvgDataArray().get(), maSvgData->getSvgDataArrayLength())) { - bRet = sal_True; + bRet = true; } } } @@ -311,11 +311,11 @@ sal_Bool ImpGraphic::operator==( const ImpGraphic& rImpGraphic ) const else if( mpAnimation ) { if( rImpGraphic.mpAnimation && ( *rImpGraphic.mpAnimation == *mpAnimation ) ) - bRet = sal_True; + bRet = true; } else if( !rImpGraphic.mpAnimation && ( rImpGraphic.maEx == maEx ) ) { - bRet = sal_True; + bRet = true; } } break; @@ -328,7 +328,7 @@ sal_Bool ImpGraphic::operator==( const ImpGraphic& rImpGraphic ) const return bRet; } -void ImpGraphic::ImplClearGraphics( sal_Bool bCreateSwapInfo ) +void ImpGraphic::ImplClearGraphics( bool bCreateSwapInfo ) { if( bCreateSwapInfo && !ImplIsSwapOut() ) { @@ -370,7 +370,7 @@ void ImpGraphic::ImplClear() comphelper::getProcessComponentContext() ); aCnt.executeCommand( OUString("delete"), - ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); + ::com::sun::star::uno::makeAny( true ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) { @@ -391,12 +391,12 @@ void ImpGraphic::ImplClear() mpSwapFile = NULL; } - mbSwapOut = sal_False; + mbSwapOut = false; mnDocFilePos = 0UL; maDocFileURLStr = OUString(); // cleanup - ImplClearGraphics( sal_False ); + ImplClearGraphics( false ); meType = GRAPHIC_NONE; mnSizeBytes = 0; } @@ -412,14 +412,14 @@ void ImpGraphic::ImplSetDefaultType() meType = GRAPHIC_DEFAULT; } -sal_Bool ImpGraphic::ImplIsSupportedGraphic() const +bool ImpGraphic::ImplIsSupportedGraphic() const { return( meType != GRAPHIC_NONE ); } -sal_Bool ImpGraphic::ImplIsTransparent() const +bool ImpGraphic::ImplIsTransparent() const { - sal_Bool bRet(sal_True); + bool bRet(true); if( meType == GRAPHIC_BITMAP && !maSvgData.get()) { @@ -429,13 +429,13 @@ sal_Bool ImpGraphic::ImplIsTransparent() const return bRet; } -sal_Bool ImpGraphic::ImplIsAlpha() const +bool ImpGraphic::ImplIsAlpha() const { - sal_Bool bRet(sal_False); + bool bRet(false); if(maSvgData.get()) { - bRet = sal_True; + bRet = true; } else if( meType == GRAPHIC_BITMAP ) { @@ -445,12 +445,12 @@ sal_Bool ImpGraphic::ImplIsAlpha() const return bRet; } -sal_Bool ImpGraphic::ImplIsAnimated() const +bool ImpGraphic::ImplIsAnimated() const { return( mpAnimation != NULL ); } -sal_Bool ImpGraphic::ImplIsEPS() const +bool ImpGraphic::ImplIsEPS() const { return( ( meType == GRAPHIC_GDIMETAFILE ) && ( maMetaFile.GetActionSize() > 0 ) && @@ -980,7 +980,7 @@ sal_uLong ImpGraphic::ImplGetDocFilePos() const return mnDocFilePos; } -sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) +bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, bool bSwap ) { MapMode aMapMode; Size aSize; @@ -991,7 +991,7 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) sal_Int32 nType; sal_Int32 nLen; const sal_uInt16 nOldFormat = rIStm.GetNumberFormatInt(); - sal_Bool bRet = sal_False; + bool bRet = false; if( !mbSwapUnderway ) { @@ -1088,7 +1088,7 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) if (!maDocFileURLStr.isEmpty()) { rIStm.Seek( nStartPos + nHeaderLen + nLen ); - bRet = mbSwapOut = sal_True; + bRet = mbSwapOut = true; } else { @@ -1135,7 +1135,7 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) if( !nReadErr && !nWriteErr ) { - bRet = mbSwapOut = sal_True; + bRet = mbSwapOut = true; mpSwapFile = new ImpSwapFile; mpSwapFile->nRefCount = 1; mpSwapFile->aSwapURL = aTmpURL; @@ -1149,7 +1149,7 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) comphelper::getProcessComponentContext() ); aCnt.executeCommand( OUString("delete"), - ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); + ::com::sun::star::uno::makeAny( true ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) { @@ -1210,16 +1210,16 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) } } else - bRet = sal_True; + bRet = true; rIStm.SetNumberFormatInt( nOldFormat ); return bRet; } -sal_Bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm ) +bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( ( meType != GRAPHIC_NONE ) && ( meType != GRAPHIC_DEFAULT ) && !ImplIsSwapOut() ) { @@ -1286,7 +1286,7 @@ sal_Bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm ) //fdo39428 SvStream no longer supports operator<<(long) rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(nStmPos2 - nDataStart) ); rOStm.Seek( nStmPos2 ); - bRet = sal_True; + bRet = true; } } @@ -1296,9 +1296,9 @@ sal_Bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm ) return bRet; } -sal_Bool ImpGraphic::ImplSwapOut() +bool ImpGraphic::ImplSwapOut() { - sal_Bool bRet = sal_False; + bool bRet = false; if( !ImplIsSwapOut() ) { @@ -1322,7 +1322,7 @@ sal_Bool ImpGraphic::ImplSwapOut() pOStm->SetVersion( SOFFICE_FILEFORMAT_50 ); pOStm->SetCompressMode( COMPRESSMODE_NATIVE ); - if( ( bRet = ImplSwapOut( pOStm ) ) == sal_True ) + if( ( bRet = ImplSwapOut( pOStm ) ) ) { mpSwapFile = new ImpSwapFile; mpSwapFile->nRefCount = 1; @@ -1339,7 +1339,7 @@ sal_Bool ImpGraphic::ImplSwapOut() comphelper::getProcessComponentContext() ); aCnt.executeCommand( OUString("delete"), - ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); + ::com::sun::star::uno::makeAny( true ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) { @@ -1361,17 +1361,17 @@ sal_Bool ImpGraphic::ImplSwapOut() } else { - ImplClearGraphics( sal_True ); - bRet = mbSwapOut = sal_True; + ImplClearGraphics( true ); + bRet = mbSwapOut = true; } } return bRet; } -sal_Bool ImpGraphic::ImplSwapOut( SvStream* pOStm ) +bool ImpGraphic::ImplSwapOut( SvStream* pOStm ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( pOStm ) { @@ -1383,23 +1383,23 @@ sal_Bool ImpGraphic::ImplSwapOut( SvStream* pOStm ) if( !pOStm->GetError() ) { - ImplClearGraphics( sal_True ); - bRet = mbSwapOut = sal_True; + ImplClearGraphics( true ); + bRet = mbSwapOut = true; } } } else { - ImplClearGraphics( sal_True ); - bRet = mbSwapOut = sal_True; + ImplClearGraphics( true ); + bRet = mbSwapOut = true; } return bRet; } -sal_Bool ImpGraphic::ImplSwapIn() +bool ImpGraphic::ImplSwapIn() { - sal_Bool bRet = sal_False; + bool bRet = false; if( ImplIsSwapOut() ) { @@ -1445,7 +1445,7 @@ sal_Bool ImpGraphic::ImplSwapIn() comphelper::getProcessComponentContext() ); aCnt.executeCommand( OUString("delete"), - ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); + ::com::sun::star::uno::makeAny( true ) ); } catch( const ::com::sun::star::ucb::ContentCreationException& ) { @@ -1472,9 +1472,9 @@ sal_Bool ImpGraphic::ImplSwapIn() return bRet; } -sal_Bool ImpGraphic::ImplSwapIn( SvStream* pIStm ) +bool ImpGraphic::ImplSwapIn( SvStream* pIStm ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( pIStm ) { @@ -1482,21 +1482,21 @@ sal_Bool ImpGraphic::ImplSwapIn( SvStream* pIStm ) if( !pIStm->GetError() ) { - mbSwapUnderway = sal_True; + mbSwapUnderway = true; bRet = ImplReadEmbedded( *pIStm ); - mbSwapUnderway = sal_False; + mbSwapUnderway = false; if( !bRet ) ImplClear(); else - mbSwapOut = sal_False; + mbSwapOut = false; } } return bRet; } -sal_Bool ImpGraphic::ImplIsSwapOut() const +bool ImpGraphic::ImplIsSwapOut() const { return mbSwapOut; } @@ -1515,7 +1515,7 @@ GfxLink ImpGraphic::ImplGetLink() return( mpGfxLink ? *mpGfxLink : GfxLink() ); } -sal_Bool ImpGraphic::ImplIsLink() const +bool ImpGraphic::ImplIsLink() const { return ( mpGfxLink != NULL ) ? sal_True : sal_False; } @@ -1559,9 +1559,9 @@ sal_uLong ImpGraphic::ImplGetChecksum() const return nRet; } -sal_Bool ImpGraphic::ImplExportNative( SvStream& rOStm ) const +bool ImpGraphic::ImplExportNative( SvStream& rOStm ) const { - sal_Bool bResult = sal_False; + bool bResult = false; if( !rOStm.GetError() ) { @@ -1625,7 +1625,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic ) if( !rIStm.GetError() && aLink.LoadNative( aGraphic ) ) { // set link only, if no other link was set - const sal_Bool bSetLink = ( rImpGraphic.mpGfxLink == NULL ); + const bool bSetLink = ( rImpGraphic.mpGfxLink == NULL ); // assign graphic rImpGraphic = *aGraphic.ImplGetImpGraphic(); diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index fafd07c90007..5215ed0d969d 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -112,7 +112,7 @@ ImplImageData::~ImplImageData() delete mpImageBitmap; } -sal_Bool ImplImageData::IsEqual( const ImplImageData& rData ) +bool ImplImageData::IsEqual( const ImplImageData& rData ) { return( maBmpEx == rData.maBmpEx ); } diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index 7c5ed11e82a0..aa2c022c84c1 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -639,10 +639,10 @@ ImplVectorizer::~ImplVectorizer() { } -sal_Bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, +bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress ) { - sal_Bool bRet = sal_False; + bool bRet = false; VECT_PROGRESS( pProgress, 0 ); @@ -709,8 +709,8 @@ sal_Bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rM if( aPolyPoly.Count() ) { - rMtf.AddAction( new MetaLineColorAction( aFindColor, sal_True ) ); - rMtf.AddAction( new MetaFillColorAction( aFindColor, sal_True ) ); + rMtf.AddAction( new MetaLineColorAction( aFindColor, true ) ); + rMtf.AddAction( new MetaFillColorAction( aFindColor, true ) ); rMtf.AddAction( new MetaPolyPolygonAction( aPolyPoly ) ); } } @@ -731,7 +731,7 @@ sal_Bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rM rMtf.SetPrefSize( Size( nWidth + 2, nHeight + 2 ) ); rMtf.Move( 1, 1 ); rMtf.Scale( aLogSize1.Width(), aLogSize1.Height() ); - bRet = sal_True; + bRet = true; } } @@ -742,14 +742,14 @@ sal_Bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rM return bRet; } -sal_Bool ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp, +bool ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp, PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress ) { Bitmap* pBmp = new Bitmap( rMonoBmp ); BitmapReadAccess* pRAcc; ImplVectMap* pMap; - sal_Bool bRet = sal_False; + bool bRet = false; VECT_PROGRESS( pProgress, 10 ); @@ -829,7 +829,7 @@ sal_Bool ImplVectorizer::ImplVectorize( const Bitmap& rMonoBmp, rPolyPoly.Insert( aFirst, 0 ); } - bRet = sal_True; + bRet = true; } VECT_PROGRESS( pProgress, 100 ); @@ -1027,7 +1027,7 @@ void ImplVectorizer::ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, s } } -sal_Bool ImplVectorizer::ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain ) +bool ImplVectorizer::ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain ) { long nActX = rStartPt.X(); long nActY = rStartPt.Y(); @@ -1076,19 +1076,19 @@ sal_Bool ImplVectorizer::ImplGetChain( ImplVectMap* pMap, const Point& rStartPt } while( nFound ); - return sal_True; + return true; } -sal_Bool ImplVectorizer::ImplIsUp( ImplVectMap* pMap, long nY, long nX ) const +bool ImplVectorizer::ImplIsUp( ImplVectMap* pMap, long nY, long nX ) const { if( pMap->IsDone( nY - 1L, nX ) ) - return sal_True; + return true; else if( pMap->IsDone( nY + 1L, nX ) ) - return sal_False; + return false; else if( pMap->IsDone( nY - 1L, nX - 1L ) || pMap->IsDone( nY - 1L, nX + 1L ) ) - return sal_True; + return true; else - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx index 5543c13a7458..38becc56ddd7 100644 --- a/vcl/source/gdi/impvect.hxx +++ b/vcl/source/gdi/impvect.hxx @@ -37,8 +37,8 @@ private: ImplVectMap* ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor ); void ImplCalculate( ImplVectMap* pMap, PolyPolygon& rPolyPoly, sal_uInt8 cReduce, sal_uLong nFlags ); - sal_Bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain ); - sal_Bool ImplIsUp( ImplVectMap* pMap, long nY, long nX ) const; + bool ImplGetChain( ImplVectMap* pMap, const Point& rStartPt, ImplChain& rChain ); + bool ImplIsUp( ImplVectMap* pMap, long nY, long nX ) const; void ImplLimitPolyPoly( PolyPolygon& rPolyPoly ); public: @@ -46,9 +46,9 @@ public: ImplVectorizer(); ~ImplVectorizer(); - sal_Bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, + bool ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf, sal_uInt8 cReduce, sal_uLong nFlags, const Link* pProgress ); - sal_Bool ImplVectorize( const Bitmap& rMonoBmp, PolyPolygon& rPolyPoly, + bool ImplVectorize( const Bitmap& rMonoBmp, PolyPolygon& rPolyPoly, sal_uLong nFlags, const Link* pProgress ); }; diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index 044cde6977e2..ecc81753f365 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -192,14 +192,14 @@ JobSetup& JobSetup::operator=( const JobSetup& rJobSetup ) return *this; } -sal_Bool JobSetup::operator==( const JobSetup& rJobSetup ) const +bool JobSetup::operator==( const JobSetup& rJobSetup ) const { if ( mpData == rJobSetup.mpData ) - return sal_True; + return true; if ( !mpData || !rJobSetup.mpData ) - return sal_False; + return false; ImplJobSetup* pData1 = mpData; ImplJobSetup* pData2 = rJobSetup.mpData; @@ -216,9 +216,9 @@ sal_Bool JobSetup::operator==( const JobSetup& rJobSetup ) const (memcmp( pData1->mpDriverData, pData2->mpDriverData, pData1->mnDriverDataLen ) == 0) && (pData1->maValueMap == pData2->maValueMap) ) - return sal_True; + return true; - return sal_False; + return false; } SvStream& ReadJobSetup( SvStream& rIStream, JobSetup& rJobSetup ) diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index bc6f7390b68d..a6fb09f1ad05 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -119,7 +119,7 @@ LineInfo& LineInfo::operator=( const LineInfo& rLineInfo ) // ----------------------------------------------------------------------- -sal_Bool LineInfo::operator==( const LineInfo& rLineInfo ) const +bool LineInfo::operator==( const LineInfo& rLineInfo ) const { return( mpImplLineInfo == rLineInfo.mpImplLineInfo || @@ -220,7 +220,7 @@ void LineInfo::SetLineCap(com::sun::star::drawing::LineCap eLineCap) // ----------------------------------------------------------------------- -sal_Bool LineInfo::IsDefault() const +bool LineInfo::IsDefault() const { return( !mpImplLineInfo->mnWidth && ( LINE_SOLID == mpImplLineInfo->meStyle ) diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx index d17e73e8cd38..2a723a987e70 100644 --- a/vcl/source/gdi/mapmod.cxx +++ b/vcl/source/gdi/mapmod.cxx @@ -30,7 +30,7 @@ ImplMapMode::ImplMapMode() : { mnRefCount = 1; meUnit = MAP_PIXEL; - mbSimple = sal_False; + mbSimple = false; } ImplMapMode::ImplMapMode( const ImplMapMode& rImplMapMode ) : @@ -40,7 +40,7 @@ ImplMapMode::ImplMapMode( const ImplMapMode& rImplMapMode ) : { mnRefCount = 1; meUnit = rImplMapMode.meUnit; - mbSimple = sal_False; + mbSimple = false; } SvStream& ReadImplMapMode( SvStream& rIStm, ImplMapMode& rImplMapMode ) @@ -52,7 +52,7 @@ SvStream& ReadImplMapMode( SvStream& rIStm, ImplMapMode& rImplMapMode ) ReadPair( rIStm, rImplMapMode.maOrigin ); ReadFraction( rIStm, rImplMapMode.maScaleX ); ReadFraction( rIStm, rImplMapMode.maScaleY ); - rIStm.ReadUChar( rImplMapMode.mbSimple ); + rIStm.ReadCharAsBool( rImplMapMode.mbSimple ); return rIStm; } @@ -85,7 +85,7 @@ ImplMapMode* ImplMapMode::ImplGetStaticMapMode( MapUnit eUnit ) pImplMapMode->maScaleX = aDefFraction; pImplMapMode->maScaleY = aDefFraction; pImplMapMode->meUnit = eUnit; - pImplMapMode->mbSimple = sal_True; + pImplMapMode->mbSimple = true; } return pImplMapMode; @@ -202,35 +202,35 @@ MapMode& MapMode::operator=( const MapMode& rMapMode ) return *this; } -sal_Bool MapMode::operator==( const MapMode& rMapMode ) const +bool MapMode::operator==( const MapMode& rMapMode ) const { if ( mpImplMapMode == rMapMode.mpImplMapMode ) - return sal_True; + return true; if ( (mpImplMapMode->meUnit == rMapMode.mpImplMapMode->meUnit) && (mpImplMapMode->maOrigin == rMapMode.mpImplMapMode->maOrigin) && (mpImplMapMode->maScaleX == rMapMode.mpImplMapMode->maScaleX) && (mpImplMapMode->maScaleY == rMapMode.mpImplMapMode->maScaleY) ) - return sal_True; + return true; else - return sal_False; + return false; } -sal_Bool MapMode::IsDefault() const +bool MapMode::IsDefault() const { ImplMapMode* pDefMapMode = ImplMapMode::ImplGetStaticMapMode( MAP_PIXEL ); if ( mpImplMapMode == pDefMapMode ) - return sal_True; + return true; if ( (mpImplMapMode->meUnit == pDefMapMode->meUnit) && (mpImplMapMode->maOrigin == pDefMapMode->maOrigin) && (mpImplMapMode->maScaleX == pDefMapMode->maScaleX) && (mpImplMapMode->maScaleY == pDefMapMode->maScaleY) ) - return sal_True; + return true; else - return sal_False; + return false; } SvStream& ReadMapMode( SvStream& rIStm, MapMode& rMapMode ) diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 3c8b494ff542..16ecaa20ac57 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -131,9 +131,9 @@ void MetaAction::Scale( double, double ) // ------------------------------------------------------------------------ -sal_Bool MetaAction::Compare( const MetaAction& ) const +bool MetaAction::Compare( const MetaAction& ) const { - return sal_True; + return true; } // ------------------------------------------------------------------------ @@ -278,7 +278,7 @@ void MetaPixelAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaPixelAction::Compare( const MetaAction& rMetaAction ) const +bool MetaPixelAction::Compare( const MetaAction& rMetaAction ) const { return ( maPt == ((MetaPixelAction&)rMetaAction).maPt ) && ( maColor == ((MetaPixelAction&)rMetaAction).maColor ); @@ -346,7 +346,7 @@ void MetaPointAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaPointAction::Compare( const MetaAction& rMetaAction ) const +bool MetaPointAction::Compare( const MetaAction& rMetaAction ) const { return maPt == ((MetaPointAction&)rMetaAction).maPt; } @@ -429,7 +429,7 @@ void MetaLineAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaLineAction::Compare( const MetaAction& rMetaAction ) const +bool MetaLineAction::Compare( const MetaAction& rMetaAction ) const { return ( maLineInfo == ((MetaLineAction&)rMetaAction).maLineInfo ) && ( maStartPt == ((MetaLineAction&)rMetaAction).maStartPt ) && @@ -508,7 +508,7 @@ void MetaRectAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaRectAction::Compare( const MetaAction& rMetaAction ) const +bool MetaRectAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaRectAction&)rMetaAction).maRect; } @@ -578,7 +578,7 @@ void MetaRoundRectAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const +bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaRoundRectAction&)rMetaAction).maRect ) && ( mnHorzRound == ((MetaRoundRectAction&)rMetaAction).mnHorzRound ) && @@ -646,7 +646,7 @@ void MetaEllipseAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaEllipseAction::Compare( const MetaAction& rMetaAction ) const +bool MetaEllipseAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaEllipseAction&)rMetaAction).maRect; } @@ -718,7 +718,7 @@ void MetaArcAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const +bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaArcAction&)rMetaAction).maRect ) && ( maStartPt == ((MetaArcAction&)rMetaAction).maStartPt ) && @@ -796,7 +796,7 @@ void MetaPieAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const +bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaPieAction&)rMetaAction).maRect ) && ( maStartPt == ((MetaPieAction&)rMetaAction).maStartPt ) && @@ -874,7 +874,7 @@ void MetaChordAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const +bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaChordAction&)rMetaAction).maRect ) && ( maStartPt == ((MetaChordAction&)rMetaAction).maStartPt ) && @@ -958,11 +958,11 @@ void MetaPolyLineAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const +bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const { - sal_Bool bIsEqual = sal_True; + bool bIsEqual = true; if ( maLineInfo != ((MetaPolyLineAction&)rMetaAction).maLineInfo ) - bIsEqual = sal_False; + bIsEqual = false; else bIsEqual = maPoly.IsEqual(((MetaPolyLineAction&)rMetaAction).maPoly ); return bIsEqual; @@ -1052,7 +1052,7 @@ void MetaPolygonAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaPolygonAction::Compare( const MetaAction& rMetaAction ) const +bool MetaPolygonAction::Compare( const MetaAction& rMetaAction ) const { return maPoly.IsEqual(((MetaPolygonAction&)rMetaAction).maPoly ); } @@ -1135,7 +1135,7 @@ void MetaPolyPolygonAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaPolyPolygonAction::Compare( const MetaAction& rMetaAction ) const +bool MetaPolyPolygonAction::Compare( const MetaAction& rMetaAction ) const { return maPolyPoly.IsEqual(((MetaPolyPolygonAction&)rMetaAction).maPolyPoly ); } @@ -1243,7 +1243,7 @@ void MetaTextAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const +bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const { return ( maPt == ((MetaTextAction&)rMetaAction).maPt ) && ( maStr == ((MetaTextAction&)rMetaAction).maStr ) && @@ -1377,7 +1377,7 @@ void MetaTextArrayAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaTextArrayAction::Compare( const MetaAction& rMetaAction ) const +bool MetaTextArrayAction::Compare( const MetaAction& rMetaAction ) const { return ( maStartPt == ((MetaTextArrayAction&)rMetaAction).maStartPt ) && ( maStr == ((MetaTextArrayAction&)rMetaAction).maStr ) && @@ -1516,7 +1516,7 @@ void MetaStretchTextAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const +bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const { return ( maPt == ((MetaStretchTextAction&)rMetaAction).maPt ) && ( maStr == ((MetaStretchTextAction&)rMetaAction).maStr ) && @@ -1601,7 +1601,7 @@ void MetaTextRectAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const +bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaTextRectAction&)rMetaAction).maRect ) && ( maStr == ((MetaTextRectAction&)rMetaAction).maStr ) && @@ -1685,7 +1685,7 @@ void MetaTextLineAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaTextLineAction::Compare( const MetaAction& rMetaAction ) const +bool MetaTextLineAction::Compare( const MetaAction& rMetaAction ) const { return ( maPos == ((MetaTextLineAction&)rMetaAction).maPos ) && ( mnWidth == ((MetaTextLineAction&)rMetaAction).mnWidth ) && @@ -1776,7 +1776,7 @@ void MetaBmpAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaBmpAction::Compare( const MetaAction& rMetaAction ) const +bool MetaBmpAction::Compare( const MetaAction& rMetaAction ) const { return maBmp.IsEqual(((MetaBmpAction&)rMetaAction).maBmp ) && ( maPt == ((MetaBmpAction&)rMetaAction).maPt ); @@ -1853,7 +1853,7 @@ void MetaBmpScaleAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaBmpScaleAction::Compare( const MetaAction& rMetaAction ) const +bool MetaBmpScaleAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaBmpScaleAction&)rMetaAction).maBmp )) && ( maPt == ((MetaBmpScaleAction&)rMetaAction).maPt ) && @@ -1936,7 +1936,7 @@ void MetaBmpScalePartAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaBmpScalePartAction::Compare( const MetaAction& rMetaAction ) const +bool MetaBmpScalePartAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaBmpScalePartAction&)rMetaAction).maBmp )) && ( maDstPt == ((MetaBmpScalePartAction&)rMetaAction).maDstPt ) && @@ -2017,7 +2017,7 @@ void MetaBmpExAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaBmpExAction::Compare( const MetaAction& rMetaAction ) const +bool MetaBmpExAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmpEx.IsEqual(((MetaBmpExAction&)rMetaAction).maBmpEx )) && ( maPt == ((MetaBmpExAction&)rMetaAction).maPt ); @@ -2094,7 +2094,7 @@ void MetaBmpExScaleAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaBmpExScaleAction::Compare( const MetaAction& rMetaAction ) const +bool MetaBmpExScaleAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmpEx.IsEqual(((MetaBmpExScaleAction&)rMetaAction).maBmpEx )) && ( maPt == ((MetaBmpExScaleAction&)rMetaAction).maPt ) && @@ -2177,7 +2177,7 @@ void MetaBmpExScalePartAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaBmpExScalePartAction::Compare( const MetaAction& rMetaAction ) const +bool MetaBmpExScalePartAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmpEx.IsEqual(((MetaBmpExScalePartAction&)rMetaAction).maBmpEx )) && ( maDstPt == ((MetaBmpExScalePartAction&)rMetaAction).maDstPt ) && @@ -2261,7 +2261,7 @@ void MetaMaskAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaMaskAction::Compare( const MetaAction& rMetaAction ) const +bool MetaMaskAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaMaskAction&)rMetaAction).maBmp )) && ( maColor == ((MetaMaskAction&)rMetaAction).maColor ) && @@ -2341,7 +2341,7 @@ void MetaMaskScaleAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaMaskScaleAction::Compare( const MetaAction& rMetaAction ) const +bool MetaMaskScaleAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaMaskScaleAction&)rMetaAction).maBmp )) && ( maColor == ((MetaMaskScaleAction&)rMetaAction).maColor ) && @@ -2427,7 +2427,7 @@ void MetaMaskScalePartAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaMaskScalePartAction::Compare( const MetaAction& rMetaAction ) const +bool MetaMaskScalePartAction::Compare( const MetaAction& rMetaAction ) const { return ( maBmp.IsEqual(((MetaMaskScalePartAction&)rMetaAction).maBmp )) && ( maColor == ((MetaMaskScalePartAction&)rMetaAction).maColor ) && @@ -2511,7 +2511,7 @@ void MetaGradientAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaGradientAction::Compare( const MetaAction& rMetaAction ) const +bool MetaGradientAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaGradientAction&)rMetaAction).maRect ) && ( maGradient == ((MetaGradientAction&)rMetaAction).maGradient ); @@ -2594,7 +2594,7 @@ void MetaGradientExAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaGradientExAction::Compare( const MetaAction& rMetaAction ) const +bool MetaGradientExAction::Compare( const MetaAction& rMetaAction ) const { return ( maPolyPoly == ((MetaGradientExAction&)rMetaAction).maPolyPoly ) && ( maGradient == ((MetaGradientExAction&)rMetaAction).maGradient ); @@ -2669,7 +2669,7 @@ void MetaHatchAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaHatchAction::Compare( const MetaAction& rMetaAction ) const +bool MetaHatchAction::Compare( const MetaAction& rMetaAction ) const { return ( maPolyPoly == ((MetaHatchAction&)rMetaAction).maPolyPoly ) && ( maHatch == ((MetaHatchAction&)rMetaAction).maHatch ); @@ -2744,7 +2744,7 @@ void MetaWallpaperAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaWallpaperAction::Compare( const MetaAction& rMetaAction ) const +bool MetaWallpaperAction::Compare( const MetaAction& rMetaAction ) const { return ( maRect == ((MetaWallpaperAction&)rMetaAction).maRect ) && ( maWallpaper == ((MetaWallpaperAction&)rMetaAction).maWallpaper ); @@ -2772,7 +2772,7 @@ IMPL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION ) // ------------------------------------------------------------------------ -MetaClipRegionAction::MetaClipRegionAction( const Region& rRegion, sal_Bool bClip ) : +MetaClipRegionAction::MetaClipRegionAction( const Region& rRegion, bool bClip ) : MetaAction ( META_CLIPREGION_ACTION ), maRegion ( rRegion ), mbClip ( bClip ) @@ -2814,7 +2814,7 @@ void MetaClipRegionAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaClipRegionAction::Compare( const MetaAction& rMetaAction ) const +bool MetaClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return ( maRegion == ((MetaClipRegionAction&)rMetaAction).maRegion ) && ( mbClip == ((MetaClipRegionAction&)rMetaAction).mbClip ); @@ -2835,7 +2835,7 @@ void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); ReadRegion( rIStm, maRegion ); - rIStm.ReadUChar( mbClip ); + rIStm.ReadCharAsBool( mbClip ); } // ======================================================================== @@ -2882,7 +2882,7 @@ void MetaISectRectClipRegionAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaISectRectClipRegionAction::Compare( const MetaAction& rMetaAction ) const +bool MetaISectRectClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return maRect == ((MetaISectRectClipRegionAction&)rMetaAction).maRect; } @@ -2947,7 +2947,7 @@ void MetaISectRegionClipRegionAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaISectRegionClipRegionAction::Compare( const MetaAction& rMetaAction ) const +bool MetaISectRegionClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return maRegion == ((MetaISectRegionClipRegionAction&)rMetaAction).maRegion; } @@ -3007,7 +3007,7 @@ void MetaMoveClipRegionAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaMoveClipRegionAction::Compare( const MetaAction& rMetaAction ) const +bool MetaMoveClipRegionAction::Compare( const MetaAction& rMetaAction ) const { return ( mnHorzMove == ((MetaMoveClipRegionAction&)rMetaAction).mnHorzMove ) && ( mnVertMove == ((MetaMoveClipRegionAction&)rMetaAction).mnVertMove ); @@ -3040,7 +3040,7 @@ IMPL_META_ACTION( LineColor, META_LINECOLOR_ACTION ) // ------------------------------------------------------------------------ -MetaLineColorAction::MetaLineColorAction( const Color& rColor, sal_Bool bSet ) : +MetaLineColorAction::MetaLineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_LINECOLOR_ACTION ), maColor ( rColor ), mbSet ( bSet ) @@ -3068,7 +3068,7 @@ MetaAction* MetaLineColorAction::Clone() // ------------------------------------------------------------------------ -sal_Bool MetaLineColorAction::Compare( const MetaAction& rMetaAction ) const +bool MetaLineColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaLineColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaLineColorAction&)rMetaAction).mbSet ); @@ -3089,7 +3089,7 @@ void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); maColor.Read( rIStm, true ); - rIStm.ReadUChar( mbSet ); + rIStm.ReadCharAsBool( mbSet ); } // ======================================================================== @@ -3098,7 +3098,7 @@ IMPL_META_ACTION( FillColor, META_FILLCOLOR_ACTION ) // ------------------------------------------------------------------------ -MetaFillColorAction::MetaFillColorAction( const Color& rColor, sal_Bool bSet ) : +MetaFillColorAction::MetaFillColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_FILLCOLOR_ACTION ), maColor ( rColor ), mbSet ( bSet ) @@ -3126,7 +3126,7 @@ MetaAction* MetaFillColorAction::Clone() // ------------------------------------------------------------------------ -sal_Bool MetaFillColorAction::Compare( const MetaAction& rMetaAction ) const +bool MetaFillColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaFillColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaFillColorAction&)rMetaAction).mbSet ); @@ -3147,7 +3147,7 @@ void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); maColor.Read( rIStm, true ); - rIStm.ReadUChar( mbSet ); + rIStm.ReadCharAsBool( mbSet ); } // ======================================================================== @@ -3180,7 +3180,7 @@ MetaAction* MetaTextColorAction::Clone() // ------------------------------------------------------------------------ -sal_Bool MetaTextColorAction::Compare( const MetaAction& rMetaAction ) const +bool MetaTextColorAction::Compare( const MetaAction& rMetaAction ) const { return maColor == ((MetaTextColorAction&)rMetaAction).maColor; } @@ -3207,7 +3207,7 @@ IMPL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION ) // ------------------------------------------------------------------------ -MetaTextFillColorAction::MetaTextFillColorAction( const Color& rColor, sal_Bool bSet ) : +MetaTextFillColorAction::MetaTextFillColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_TEXTFILLCOLOR_ACTION ), maColor ( rColor ), mbSet ( bSet ) @@ -3235,7 +3235,7 @@ MetaAction* MetaTextFillColorAction::Clone() // ------------------------------------------------------------------------ -sal_Bool MetaTextFillColorAction::Compare( const MetaAction& rMetaAction ) const +bool MetaTextFillColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaTextFillColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaTextFillColorAction&)rMetaAction).mbSet ); @@ -3256,7 +3256,7 @@ void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); maColor.Read( rIStm, true ); - rIStm.ReadUChar( mbSet ); + rIStm.ReadCharAsBool( mbSet ); } // ======================================================================== @@ -3265,7 +3265,7 @@ IMPL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION ) // ------------------------------------------------------------------------ -MetaTextLineColorAction::MetaTextLineColorAction( const Color& rColor, sal_Bool bSet ) : +MetaTextLineColorAction::MetaTextLineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_TEXTLINECOLOR_ACTION ), maColor ( rColor ), mbSet ( bSet ) @@ -3293,7 +3293,7 @@ MetaAction* MetaTextLineColorAction::Clone() // ------------------------------------------------------------------------ -sal_Bool MetaTextLineColorAction::Compare( const MetaAction& rMetaAction ) const +bool MetaTextLineColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaTextLineColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaTextLineColorAction&)rMetaAction).mbSet ); @@ -3314,7 +3314,7 @@ void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); maColor.Read( rIStm, true ); - rIStm.ReadUChar( mbSet ); + rIStm.ReadCharAsBool( mbSet ); } // ======================================================================== @@ -3323,7 +3323,7 @@ IMPL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION ) // ------------------------------------------------------------------------ -MetaOverlineColorAction::MetaOverlineColorAction( const Color& rColor, sal_Bool bSet ) : +MetaOverlineColorAction::MetaOverlineColorAction( const Color& rColor, bool bSet ) : MetaAction ( META_OVERLINECOLOR_ACTION ), maColor ( rColor ), mbSet ( bSet ) @@ -3351,7 +3351,7 @@ MetaAction* MetaOverlineColorAction::Clone() // ------------------------------------------------------------------------ -sal_Bool MetaOverlineColorAction::Compare( const MetaAction& rMetaAction ) const +bool MetaOverlineColorAction::Compare( const MetaAction& rMetaAction ) const { return ( maColor == ((MetaOverlineColorAction&)rMetaAction).maColor ) && ( mbSet == ((MetaOverlineColorAction&)rMetaAction).mbSet ); @@ -3372,7 +3372,7 @@ void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); maColor.Read( rIStm, true ); - rIStm.ReadUChar( mbSet ); + rIStm.ReadCharAsBool( mbSet ); } // ======================================================================== @@ -3405,7 +3405,7 @@ MetaAction* MetaTextAlignAction::Clone() // ------------------------------------------------------------------------ -sal_Bool MetaTextAlignAction::Compare( const MetaAction& rMetaAction ) const +bool MetaTextAlignAction::Compare( const MetaAction& rMetaAction ) const { return maAlign == ((MetaTextAlignAction&)rMetaAction).maAlign; } @@ -3468,7 +3468,7 @@ void MetaMapModeAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaMapModeAction::Compare( const MetaAction& rMetaAction ) const +bool MetaMapModeAction::Compare( const MetaAction& rMetaAction ) const { return maMapMode == ((MetaMapModeAction&)rMetaAction).maMapMode; } @@ -3538,7 +3538,7 @@ void MetaFontAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaFontAction::Compare( const MetaAction& rMetaAction ) const +bool MetaFontAction::Compare( const MetaAction& rMetaAction ) const { return maFont == ((MetaFontAction&)rMetaAction).maFont; } @@ -3595,7 +3595,7 @@ MetaAction* MetaPushAction::Clone() // ------------------------------------------------------------------------ -sal_Bool MetaPushAction::Compare( const MetaAction& rMetaAction ) const +bool MetaPushAction::Compare( const MetaAction& rMetaAction ) const { return mnFlags == ((MetaPushAction&)rMetaAction).mnFlags; } @@ -3680,7 +3680,7 @@ MetaAction* MetaRasterOpAction::Clone() // ------------------------------------------------------------------------ -sal_Bool MetaRasterOpAction::Compare( const MetaAction& rMetaAction ) const +bool MetaRasterOpAction::Compare( const MetaAction& rMetaAction ) const { return meRasterOp == ((MetaRasterOpAction&)rMetaAction).meRasterOp; } @@ -3749,7 +3749,7 @@ void MetaTransparentAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaTransparentAction::Compare( const MetaAction& rMetaAction ) const +bool MetaTransparentAction::Compare( const MetaAction& rMetaAction ) const { return ( maPolyPoly == ((MetaTransparentAction&)rMetaAction).maPolyPoly ) && ( mnTransPercent == ((MetaTransparentAction&)rMetaAction).mnTransPercent ); @@ -3837,7 +3837,7 @@ void MetaFloatTransparentAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) const +bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) const { return ( maMtf == ((MetaFloatTransparentAction&)rMetaAction).maMtf ) && ( maPoint == ((MetaFloatTransparentAction&)rMetaAction).maPoint ) && @@ -3919,7 +3919,7 @@ void MetaEPSAction::Scale( double fScaleX, double fScaleY ) // ------------------------------------------------------------------------ -sal_Bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const +bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const { return ( maGfxLink.IsEqual(((MetaEPSAction&)rMetaAction).maGfxLink )) && ( maSubst == ((MetaEPSAction&)rMetaAction).maSubst ) && @@ -3955,7 +3955,7 @@ IMPL_META_ACTION( RefPoint, META_REFPOINT_ACTION ) // ------------------------------------------------------------------------ -MetaRefPointAction::MetaRefPointAction( const Point& rRefPoint, sal_Bool bSet ) : +MetaRefPointAction::MetaRefPointAction( const Point& rRefPoint, bool bSet ) : MetaAction ( META_REFPOINT_ACTION ), maRefPoint ( rRefPoint ), mbSet ( bSet ) @@ -3983,7 +3983,7 @@ MetaAction* MetaRefPointAction::Clone() // ------------------------------------------------------------------------ -sal_Bool MetaRefPointAction::Compare( const MetaAction& rMetaAction ) const +bool MetaRefPointAction::Compare( const MetaAction& rMetaAction ) const { return ( maRefPoint == ((MetaRefPointAction&)rMetaAction).maRefPoint ) && ( mbSet == ((MetaRefPointAction&)rMetaAction).mbSet ); @@ -4003,7 +4003,7 @@ void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData ) void MetaRefPointAction::Read( SvStream& rIStm, ImplMetaReadData* ) { COMPAT( rIStm ); - ReadPair( rIStm, maRefPoint ).ReadUChar( mbSet ); + ReadPair( rIStm, maRefPoint ).ReadCharAsBool( mbSet ); } // ======================================================================== @@ -4199,7 +4199,7 @@ void MetaCommentAction::Scale( double fXScale, double fYScale ) // ------------------------------------------------------------------------ -sal_Bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const +bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const { return ( maComment == ((MetaCommentAction&)rMetaAction).maComment ) && ( mnValue == ((MetaCommentAction&)rMetaAction).mnValue ) && @@ -4270,7 +4270,7 @@ MetaAction* MetaLayoutModeAction::Clone() // ------------------------------------------------------------------------ -sal_Bool MetaLayoutModeAction::Compare( const MetaAction& rMetaAction ) const +bool MetaLayoutModeAction::Compare( const MetaAction& rMetaAction ) const { return mnLayoutMode == ((MetaLayoutModeAction&)rMetaAction).mnLayoutMode; } @@ -4321,7 +4321,7 @@ MetaAction* MetaTextLanguageAction::Clone() // ------------------------------------------------------------------------ -sal_Bool MetaTextLanguageAction::Compare( const MetaAction& rMetaAction ) const +bool MetaTextLanguageAction::Compare( const MetaAction& rMetaAction ) const { return meTextLanguage == ((MetaTextLanguageAction&)rMetaAction).meTextLanguage; } diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx index ff17f9d5bd9a..0ddf5ec69e1c 100644 --- a/vcl/source/gdi/metric.cxx +++ b/vcl/source/gdi/metric.cxx @@ -116,15 +116,15 @@ FontInfo& FontInfo::operator=( const FontInfo& rInfo ) // ----------------------------------------------------------------------- -sal_Bool FontInfo::operator==( const FontInfo& rInfo ) const +bool FontInfo::operator==( const FontInfo& rInfo ) const { if( !Font::operator==( rInfo ) ) - return sal_False; + return false; if( mpImplMetric == rInfo.mpImplMetric ) - return sal_True; + return true; if( *mpImplMetric == *rInfo.mpImplMetric ) - return sal_True; - return sal_False; + return true; + return false; } // ----------------------------------------------------------------------- @@ -190,7 +190,7 @@ FontMetric& FontMetric::operator =( const FontMetric& rMetric ) // ----------------------------------------------------------------------- -sal_Bool FontMetric::operator==( const FontMetric& rMetric ) const +bool FontMetric::operator==( const FontMetric& rMetric ) const { return FontInfo::operator==( rMetric ); } diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx index 165ab33708cf..0a6a8c1ddc13 100644 --- a/vcl/source/gdi/octree.cxx +++ b/vcl/source/gdi/octree.cxx @@ -217,7 +217,7 @@ void Octree::ImplReduce() } } - pNode->bLeaf = sal_True; + pNode->bLeaf = true; pNode->nRed = nRedSum; pNode->nGreen = nGreenSum; pNode->nBlue = nBlueSum; diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx index b372c9d8c585..439e385f5b94 100644 --- a/vcl/source/gdi/outdev.cxx +++ b/vcl/source/gdi/outdev.cxx @@ -392,7 +392,7 @@ OutputDevice::~OutputDevice() if ( GetUnoGraphicsList() ) { - UnoWrapperBase* pWrapper = Application::GetUnoWrapper( sal_False ); + UnoWrapperBase* pWrapper = Application::GetUnoWrapper( false ); if ( pWrapper ) pWrapper->ReleaseAllGraphics( this ); delete mpUnoGraphicsList; @@ -457,9 +457,9 @@ bool OutputDevice::supportsOperation( OutDevSupportType eType ) const return bHasSupport; } -void OutputDevice::EnableRTL( sal_Bool bEnable ) +void OutputDevice::EnableRTL( bool bEnable ) { - mbEnableRTL = (bEnable != 0); + mbEnableRTL = bEnable; if( meOutDevType == OUTDEV_VIRDEV ) { // virdevs default to not mirroring, they will only be set to mirroring @@ -555,7 +555,7 @@ SalGraphics* OutputDevice::ImplGetGraphics() const { // steal the wingraphics from the other outdev mpGraphics = pReleaseOutDev->mpGraphics; - pReleaseOutDev->ImplReleaseGraphics( sal_False ); + pReleaseOutDev->ImplReleaseGraphics( false ); } else { @@ -670,7 +670,7 @@ SalGraphics* OutputDevice::ImplGetGraphics() const return mpGraphics; } -void OutputDevice::ImplReleaseGraphics( sal_Bool bRelease ) +void OutputDevice::ImplReleaseGraphics( bool bRelease ) { DBG_TESTSOLARMUTEX(); @@ -820,7 +820,7 @@ void OutputDevice::ImplInvalidateViewTransform() } } -sal_Bool OutputDevice::ImplIsRecordLayout() const +bool OutputDevice::ImplIsRecordLayout() const { return mpOutDevData && mpOutDevData->mpRecordLayout; } @@ -994,7 +994,7 @@ void OutputDevice::SetClipRegion() { if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaClipRegionAction( Region(), sal_False ) ); + mpMetaFile->AddAction( new MetaClipRegionAction( Region(), false ) ); ImplSetClipRegion( NULL ); @@ -1006,7 +1006,7 @@ void OutputDevice::SetClipRegion( const Region& rRegion ) { if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaClipRegionAction( rRegion, sal_True ) ); + mpMetaFile->AddAction( new MetaClipRegionAction( rRegion, true ) ); if ( rRegion.IsNull() ) { @@ -1130,7 +1130,7 @@ void OutputDevice::SetLineColor() { if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaLineColorAction( Color(), sal_False ) ); + mpMetaFile->AddAction( new MetaLineColorAction( Color(), false ) ); if ( mbLineColor ) { @@ -1190,7 +1190,7 @@ void OutputDevice::SetLineColor( const Color& rColor ) Color aColor = ImplDrawModeToColor( rColor ); if( mpMetaFile ) - mpMetaFile->AddAction( new MetaLineColorAction( aColor, sal_True ) ); + mpMetaFile->AddAction( new MetaLineColorAction( aColor, true ) ); if( ImplIsColorTransparent( aColor ) ) { @@ -1219,7 +1219,7 @@ void OutputDevice::SetFillColor() { if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaFillColorAction( Color(), sal_False ) ); + mpMetaFile->AddAction( new MetaFillColorAction( Color(), false ) ); if ( mbFillColor ) { @@ -1275,7 +1275,7 @@ void OutputDevice::SetFillColor( const Color& rColor ) } if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaFillColorAction( aColor, sal_True ) ); + mpMetaFile->AddAction( new MetaFillColorAction( aColor, true ) ); if ( ImplIsColorTransparent( aColor ) ) { @@ -1328,7 +1328,7 @@ void OutputDevice::SetRefPoint() { if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaRefPointAction( Point(), sal_False ) ); + mpMetaFile->AddAction( new MetaRefPointAction( Point(), false ) ); mbRefPoint = false; maRefPoint.X() = maRefPoint.Y() = 0L; @@ -1341,7 +1341,7 @@ void OutputDevice::SetRefPoint( const Point& rRefPoint ) { if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaRefPointAction( rRefPoint, sal_True ) ); + mpMetaFile->AddAction( new MetaRefPointAction( rRefPoint, true ) ); mbRefPoint = true; maRefPoint = rRefPoint; @@ -2459,9 +2459,9 @@ void OutputDevice::SetConnectMetaFile( GDIMetaFile* pMtf ) mpMetaFile = pMtf; } -void OutputDevice::EnableOutput( sal_Bool bEnable ) +void OutputDevice::EnableOutput( bool bEnable ) { - mbOutput = (bEnable != 0); + mbOutput = bEnable; if( mpAlphaVDev ) mpAlphaVDev->EnableOutput( bEnable ); @@ -2510,7 +2510,7 @@ sal_uLong OutputDevice::GetColorCount() const return( ( nBitCount > 31 ) ? ULONG_MAX : ( ( (sal_uLong) 1 ) << nBitCount) ); } -sal_Bool OutputDevice::HasAlpha() +bool OutputDevice::HasAlpha() { return mpAlphaVDev != NULL; } diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx index 501d42b236c4..111fdf652a8a 100644 --- a/vcl/source/gdi/outdev2.cxx +++ b/vcl/source/gdi/outdev2.cxx @@ -1747,7 +1747,7 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap aBmp, "ImplBlendWithAlpha(): call me only with valid alpha VDev!" ); bool bOldMapMode( mpAlphaVDev->IsMapModeEnabled() ); - mpAlphaVDev->EnableMapMode(sal_False); + mpAlphaVDev->EnableMapMode(false); Bitmap aAlphaBitmap( mpAlphaVDev->GetBitmap( aDstRect.TopLeft(), aDstRect.GetSize() ) ); BitmapWriteAccess* pAlphaW = aAlphaBitmap.AcquireWriteAccess(); diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index fb3c099a158a..833caaa1bb00 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -334,7 +334,7 @@ void OutputDevice::ImplUpdateFontDataForAllFrames( const FontUpdateHandler_t pHd void OutputDevice::BeginFontSubstitution() { ImplSVData* pSVData = ImplGetSVData(); - pSVData->maGDIData.mbFontSubChanged = sal_False; + pSVData->maGDIData.mbFontSubChanged = false; } void OutputDevice::EndFontSubstitution() @@ -348,7 +348,7 @@ void OutputDevice::EndFontSubstitution() DataChangedEvent aDCEvt( DATACHANGED_FONTSUBSTITUTION ); pApp->DataChanged( aDCEvt ); pApp->NotifyAllWindows( aDCEvt ); - pSVData->maGDIData.mbFontSubChanged = sal_False; + pSVData->maGDIData.mbFontSubChanged = false; } } @@ -360,7 +360,7 @@ void OutputDevice::AddFontSubstitute( const OUString& rFontName, if( !rpSubst ) rpSubst = new ImplDirectFontSubstitution(); rpSubst->AddFontSubstitute( rFontName, rReplaceFontName, nFlags ); - ImplGetSVData()->maGDIData.mbFontSubChanged = sal_True; + ImplGetSVData()->maGDIData.mbFontSubChanged = true; } void ImplDirectFontSubstitution::AddFontSubstitute( const OUString& rFontName, @@ -2837,17 +2837,17 @@ FontEmphasisMark OutputDevice::ImplGetEmphasisMarkStyle( const Font& rFont ) return nEmphasisMark; } -sal_Bool OutputDevice::ImplIsUnderlineAbove( const Font& rFont ) +bool OutputDevice::ImplIsUnderlineAbove( const Font& rFont ) { if ( !rFont.IsVertical() ) - return sal_False; + return false; if( (LANGUAGE_JAPANESE == rFont.GetLanguage()) || (LANGUAGE_JAPANESE == rFont.GetCJKContextLanguage()) ) // the underline is right for Japanese only - return sal_True; + return true; - return sal_False; + return false; } void OutputDevice::ImplInitFontList() const @@ -3563,7 +3563,7 @@ void OutputDevice::ImplDrawWaveTextLine( long nBaseX, long nBaseY, long nDistX, long nDistY, long nWidth, FontUnderline eTextLine, Color aColor, - sal_Bool bIsAbove ) + bool bIsAbove ) { ImplFontEntry* pFontEntry = mpFontEntry; long nLineHeight; @@ -3625,7 +3625,7 @@ void OutputDevice::ImplDrawStraightTextLine( long nBaseX, long nBaseY, long nDistX, long nDistY, long nWidth, FontUnderline eTextLine, Color aColor, - sal_Bool bIsAbove ) + bool bIsAbove ) { ImplFontEntry* pFontEntry = mpFontEntry; long nLineHeight = 0; @@ -4006,7 +4006,7 @@ void OutputDevice::ImplDrawTextLine( long nX, long nY, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, - sal_Bool bUnderlineAbove ) + bool bUnderlineAbove ) { if ( !nWidth ) return; @@ -4046,7 +4046,7 @@ void OutputDevice::ImplDrawTextLine( long nX, long nY, (eOverline == UNDERLINE_DOUBLEWAVE) || (eOverline == UNDERLINE_BOLDWAVE) ) { - ImplDrawWaveTextLine( nX, nY, nDistX, 0, nWidth, eOverline, aOverlineColor, sal_True ); + ImplDrawWaveTextLine( nX, nY, nDistX, 0, nWidth, eOverline, aOverlineColor, true ); bOverlineDone = true; } @@ -4061,14 +4061,14 @@ void OutputDevice::ImplDrawTextLine( long nX, long nY, ImplDrawStraightTextLine( nX, nY, nDistX, 0, nWidth, eUnderline, aUnderlineColor, bUnderlineAbove ); if ( !bOverlineDone ) - ImplDrawStraightTextLine( nX, nY, nDistX, 0, nWidth, eOverline, aOverlineColor, sal_True ); + ImplDrawStraightTextLine( nX, nY, nDistX, 0, nWidth, eOverline, aOverlineColor, true ); if ( !bStrikeoutDone ) ImplDrawStrikeoutLine( nX, nY, nDistX, 0, nWidth, eStrikeout, aStrikeoutColor ); } void OutputDevice::ImplDrawTextLines( SalLayout& rSalLayout, - FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, sal_Bool bWordLine, sal_Bool bUnderlineAbove ) + FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, bool bWordLine, bool bUnderlineAbove ) { if( bWordLine ) { @@ -4140,10 +4140,10 @@ void OutputDevice::ImplDrawMnemonicLine( long nX, long nY, long nWidth ) nX = nBaseX - nWidth - (nX - nBaseX - 1); } - ImplDrawTextLine( nX, nY, 0, nWidth, STRIKEOUT_NONE, UNDERLINE_SINGLE, UNDERLINE_NONE, sal_False ); + ImplDrawTextLine( nX, nY, 0, nWidth, STRIKEOUT_NONE, UNDERLINE_SINGLE, UNDERLINE_NONE, false ); } -void OutputDevice::ImplGetEmphasisMark( PolyPolygon& rPolyPoly, sal_Bool& rPolyLine, +void OutputDevice::ImplGetEmphasisMark( PolyPolygon& rPolyPoly, bool& rPolyLine, Rectangle& rRect1, Rectangle& rRect2, long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, @@ -4184,7 +4184,7 @@ void OutputDevice::ImplGetEmphasisMark( PolyPolygon& rPolyPoly, sal_Bool& rPolyL rWidth = 0; rYOff = 0; - rPolyLine = sal_False; + rPolyLine = false; if ( !nHeight ) return; @@ -4225,7 +4225,7 @@ void OutputDevice::ImplGetEmphasisMark( PolyPolygon& rPolyPoly, sal_Bool& rPolyL // BorderWidth is 15% long nBorder = (nDotSize*150)/1000; if ( nBorder <= 1 ) - rPolyLine = sal_True; + rPolyLine = true; else { Polygon aPoly2( Point( nRad, nRad ), @@ -4297,7 +4297,7 @@ void OutputDevice::ImplGetEmphasisMark( PolyPolygon& rPolyPoly, sal_Bool& rPolyL } void OutputDevice::ImplDrawEmphasisMark( long nBaseX, long nX, long nY, - const PolyPolygon& rPolyPoly, sal_Bool bPolyLine, + const PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ) { if( IsRTLEnabled() ) @@ -4343,10 +4343,10 @@ void OutputDevice::ImplDrawEmphasisMarks( SalLayout& rSalLayout ) { Color aOldLineColor = GetLineColor(); Color aOldFillColor = GetFillColor(); - sal_Bool bOldMap = mbMap; + bool bOldMap = mbMap; GDIMetaFile* pOldMetaFile = mpMetaFile; mpMetaFile = NULL; - EnableMapMode( sal_False ); + EnableMapMode( false ); FontEmphasisMark nEmphasisMark = ImplGetEmphasisMarkStyle( maFont ); PolyPolygon aPolyPoly; @@ -4355,7 +4355,7 @@ void OutputDevice::ImplDrawEmphasisMarks( SalLayout& rSalLayout ) long nEmphasisYOff; long nEmphasisWidth; long nEmphasisHeight; - sal_Bool bPolyLine; + bool bPolyLine; if ( nEmphasisMark & EMPHASISMARK_POS_BELOW ) nEmphasisHeight = mnEmphasisDescent; @@ -4477,12 +4477,12 @@ bool OutputDevice::ImplDrawRotateText( SalLayout& rSalLayout ) GDIMetaFile* pOldMetaFile = mpMetaFile; long nOldOffX = mnOutOffX; long nOldOffY = mnOutOffY; - sal_Bool bOldMap = mbMap; + bool bOldMap = mbMap; mnOutOffX = 0L; mnOutOffY = 0L; mpMetaFile = NULL; - EnableMapMode( sal_False ); + EnableMapMode( false ); DrawMask( aPoint, aBmp, GetTextColor() ); @@ -4494,7 +4494,7 @@ bool OutputDevice::ImplDrawRotateText( SalLayout& rSalLayout ) return true; } -void OutputDevice::ImplDrawTextDirect( SalLayout& rSalLayout, sal_Bool bTextLines ) +void OutputDevice::ImplDrawTextDirect( SalLayout& rSalLayout, bool bTextLines ) { if( mpFontEntry->mnOwnOrientation ) if( ImplDrawRotateText( rSalLayout ) ) @@ -4758,7 +4758,7 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, xHyphWord = xHyph->hyphenate( aWord, rDefLocale, aWord.getLength() - nMinTrail, uno::Sequence< beans::PropertyValue >() ); if (xHyphWord.is()) { - sal_Bool bAlternate = xHyphWord->isAlternativeSpelling(); + bool bAlternate = xHyphWord->isAlternativeSpelling(); sal_Int32 _nWordLen = 1 + xHyphWord->getHyphenPos(); if ( ( _nWordLen >= 2 ) && ( (nWordStart+_nWordLen) >= ( 2 ) ) ) @@ -4930,7 +4930,7 @@ void OutputDevice::SetFont( const Font& rNewFont ) aFont.SetColor( aTextColor ); - sal_Bool bTransFill = aFont.IsTransparent(); + bool bTransFill = aFont.IsTransparent(); if ( !bTransFill ) { Color aTextFillColor( aFont.GetFillColor() ); @@ -4949,7 +4949,7 @@ void OutputDevice::SetFont( const Font& rNewFont ) else if ( mnDrawMode & DRAWMODE_NOFILL ) { aTextFillColor = Color( COL_TRANSPARENT ); - bTransFill = sal_True; + bTransFill = true; } if ( !bTransFill && (mnDrawMode & DRAWMODE_GHOSTEDFILL) ) @@ -5073,12 +5073,12 @@ void OutputDevice::SetTextFillColor() { if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaTextFillColorAction( Color(), sal_False ) ); + mpMetaFile->AddAction( new MetaTextFillColorAction( Color(), false ) ); if ( maFont.GetColor() != Color( COL_TRANSPARENT ) ) maFont.SetFillColor( Color( COL_TRANSPARENT ) ); if ( !maFont.IsTransparent() ) - maFont.SetTransparent( sal_True ); + maFont.SetTransparent( true ); if( mpAlphaVDev ) mpAlphaVDev->SetTextFillColor(); @@ -5088,7 +5088,7 @@ void OutputDevice::SetTextFillColor( const Color& rColor ) { Color aColor( rColor ); - sal_Bool bTransFill = ImplIsColorTransparent( aColor ) ? sal_True : sal_False; + bool bTransFill = ImplIsColorTransparent( aColor ) ? sal_True : sal_False; if ( !bTransFill ) { @@ -5110,7 +5110,7 @@ void OutputDevice::SetTextFillColor( const Color& rColor ) else if ( mnDrawMode & DRAWMODE_NOFILL ) { aColor = Color( COL_TRANSPARENT ); - bTransFill = sal_True; + bTransFill = true; } if ( !bTransFill && (mnDrawMode & DRAWMODE_GHOSTEDFILL) ) @@ -5123,7 +5123,7 @@ void OutputDevice::SetTextFillColor( const Color& rColor ) } if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaTextFillColorAction( aColor, sal_True ) ); + mpMetaFile->AddAction( new MetaTextFillColorAction( aColor, true ) ); if ( maFont.GetFillColor() != aColor ) maFont.SetFillColor( aColor ); @@ -5146,7 +5146,7 @@ void OutputDevice::SetTextLineColor() { if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaTextLineColorAction( Color(), sal_False ) ); + mpMetaFile->AddAction( new MetaTextLineColorAction( Color(), false ) ); maTextLineColor = Color( COL_TRANSPARENT ); @@ -5185,7 +5185,7 @@ void OutputDevice::SetTextLineColor( const Color& rColor ) } if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaTextLineColorAction( aColor, sal_True ) ); + mpMetaFile->AddAction( new MetaTextLineColorAction( aColor, true ) ); maTextLineColor = aColor; @@ -5197,7 +5197,7 @@ void OutputDevice::SetOverlineColor() { if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaOverlineColorAction( Color(), sal_False ) ); + mpMetaFile->AddAction( new MetaOverlineColorAction( Color(), false ) ); maOverlineColor = Color( COL_TRANSPARENT ); @@ -5236,7 +5236,7 @@ void OutputDevice::SetOverlineColor( const Color& rColor ) } if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaOverlineColorAction( aColor, sal_True ) ); + mpMetaFile->AddAction( new MetaOverlineColorAction( aColor, true ) ); maOverlineColor = aColor; @@ -5264,7 +5264,7 @@ void OutputDevice::DrawTextLine( const Point& rPos, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, - sal_Bool bUnderlineAbove ) + bool bUnderlineAbove ) { if ( mpMetaFile ) @@ -5594,7 +5594,7 @@ long OutputDevice::GetTextArray( const OUString& rStr, sal_Int32* pDXAry, bool OutputDevice::GetCaretPositions( const OUString& rStr, sal_Int32* pCaretXArray, sal_Int32 nIndex, sal_Int32 nLen, sal_Int32* pDXAry, long nLayoutWidth, - sal_Bool bCellBreaking ) const + bool bCellBreaking ) const { if( nIndex >= rStr.getLength() ) @@ -6013,7 +6013,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay return pSalLayout; } -sal_Bool OutputDevice::GetTextIsRTL( const OUString& rString, sal_Int32 nIndex, sal_Int32 nLen ) const +bool OutputDevice::GetTextIsRTL( const OUString& rString, sal_Int32 nIndex, sal_Int32 nLen ) const { OUString aStr( rString ); ImplLayoutArgs aArgs = ImplPrepareLayoutArgs( aStr, nIndex, nLen, 0, NULL ); @@ -6120,8 +6120,8 @@ void OutputDevice::ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& r bool bRestoreFillColor = false; if ( (nStyle & TEXT_DRAW_DISABLE) && ! pVector ) { - sal_Bool bHighContrastBlack = sal_False; - sal_Bool bHighContrastWhite = sal_False; + bool bHighContrastBlack = false; + bool bHighContrastWhite = false; const StyleSettings& rStyleSettings( rTargetDevice.GetSettings().GetStyleSettings() ); if( rStyleSettings.GetHighContrastMode() ) { @@ -6392,11 +6392,11 @@ void OutputDevice::AddTextRectActions( const Rectangle& rRect, // temporarily swap in passed mtf for action generation, and // disable output generation. - const sal_Bool bOutputEnabled( IsOutputEnabled() ); + const bool bOutputEnabled( IsOutputEnabled() ); GDIMetaFile* pMtf = mpMetaFile; mpMetaFile = &rMtf; - EnableOutput( sal_False ); + EnableOutput( false ); // #i47157# Factored out to ImplDrawTextRect(), to be shared // between us and DrawText() @@ -6495,7 +6495,7 @@ Rectangle OutputDevice::GetTextRect( const Rectangle& rRect, else { if ( pInfo ) - pInfo->mbEllipsis = sal_True; + pInfo->mbEllipsis = true; nMaxWidth = nWidth; } } @@ -6536,7 +6536,7 @@ Rectangle OutputDevice::GetTextRect( const Rectangle& rRect, if ( (nMaxWidth > nWidth) && (nStyle & TEXT_DRAW_ELLIPSIS) ) { if ( pInfo ) - pInfo->mbEllipsis = sal_True; + pInfo->mbEllipsis = true; nMaxWidth = nWidth; } } @@ -6803,8 +6803,8 @@ void OutputDevice::DrawCtrlText( const Point& rPos, const OUString& rStr, Color aOldTextColor; Color aOldTextFillColor; bool bRestoreFillColor; - sal_Bool bHighContrastBlack = sal_False; - sal_Bool bHighContrastWhite = sal_False; + bool bHighContrastBlack = false; + bool bHighContrastWhite = false; const StyleSettings& rStyleSettings( GetSettings().GetStyleSettings() ); if( rStyleSettings.GetHighContrastMode() ) { @@ -6960,23 +6960,23 @@ FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const return aFontInfo; } -sal_Bool OutputDevice::AddTempDevFont( const OUString& rFileURL, const OUString& rFontName ) +bool OutputDevice::AddTempDevFont( const OUString& rFileURL, const OUString& rFontName ) { ImplInitFontList(); if( !mpGraphics && !ImplGetGraphics() ) - return sal_False; + return false; bool bRC = mpGraphics->AddTempDevFont( mpFontList, rFileURL, rFontName ); if( !bRC ) - return sal_False; + return false; if( mpAlphaVDev ) mpAlphaVDev->AddTempDevFont( rFileURL, rFontName ); mpFontCache->Invalidate(); - return sal_True; + return true; } int OutputDevice::GetDevFontSizeCount( const Font& rFont ) const @@ -7020,7 +7020,7 @@ Size OutputDevice::GetDevFontSize( const Font& rFont, int nSizeIndex ) const return aSize; } -sal_Bool OutputDevice::IsFontAvailable( const OUString& rFontName ) const +bool OutputDevice::IsFontAvailable( const OUString& rFontName ) const { ImplDevFontListData* pFound = mpFontList->FindFontFamily( rFontName ); @@ -7215,7 +7215,7 @@ sal_Int32 OutputDevice::ValidateKashidas ( const OUString& rTxt, return nDropped; } -sal_Bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, +bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) { @@ -7247,7 +7247,7 @@ sal_Bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const OUString& return (nLen == (int)rVector.size()); } -sal_Bool OutputDevice::GetTextBoundRect( Rectangle& rRect, +bool OutputDevice::GetTextBoundRect( Rectangle& rRect, const OUString& rStr, sal_Int32 nBase, sal_Int32 nIndex, sal_Int32 nLen, sal_uLong nLayoutWidth, const sal_Int32* pDXAry ) const @@ -7258,7 +7258,7 @@ sal_Bool OutputDevice::GetTextBoundRect( Rectangle& rRect, "GetTextBoundRect Suspicious arguments nLen:" << nLen); } - sal_Bool bRet = sal_False; + bool bRet = false; rRect.SetEmpty(); SalLayout* pSalLayout = NULL; @@ -7322,8 +7322,8 @@ sal_Bool OutputDevice::GetTextBoundRect( Rectangle& rRect, // so we need a monochrome virtual device with matching font VirtualDevice aVDev( 1 ); Font aFont( GetFont() ); - aFont.SetShadow( sal_False ); - aFont.SetOutline( sal_False ); + aFont.SetShadow( false ); + aFont.SetOutline( false ); aFont.SetRelief( RELIEF_NONE ); aFont.SetOrientation( 0 ); aFont.SetSize( Size( mpFontEntry->maFontSelData.mnWidth, mpFontEntry->maFontSelData.mnHeight ) ); @@ -7356,7 +7356,7 @@ sal_Bool OutputDevice::GetTextBoundRect( Rectangle& rRect, Bitmap aBmp = aVDev.GetBitmap( Point(), aOutSize ); BitmapReadAccess* pAcc = aBmp.AcquireReadAccess(); if( !pAcc ) - return sal_False; + return false; const BitmapColor aBlack( pAcc->GetBestMatchingColor( Color( COL_BLACK ) ) ); const long nW = pAcc->Width(); const long nH = pAcc->Height(); @@ -7421,16 +7421,16 @@ sal_Bool OutputDevice::GetTextBoundRect( Rectangle& rRect, aTopLeft.X() = ImplDevicePixelToLogicWidth( aTopLeft.X() ); aTopLeft.Y() = ImplDevicePixelToLogicHeight( aTopLeft.Y() ); rRect = Rectangle( aTopLeft, aSize ); - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector, +bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector, const OUString& rStr, sal_Int32 nBase, sal_Int32 nIndex, sal_Int32 nLen, - sal_Bool bOptimize, sal_uLong nLayoutWidth, const sal_Int32* pDXArray ) const + bool bOptimize, sal_uLong nLayoutWidth, const sal_Int32* pDXArray ) const { if(nLen == 0x0FFFF) { @@ -7443,9 +7443,9 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector if( mbInitFont ) ImplInitFont(); if( !mpFontEntry ) - return sal_False; + return false; - sal_Bool bRet = sal_False; + bool bRet = false; rVector.clear(); if( nLen < 0 ) { @@ -7455,7 +7455,7 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector // we want to get the Rectangle in logical units, so to // avoid rounding errors we just size the font in logical units - sal_Bool bOldMap = mbMap; + bool bOldMap = mbMap; if( bOldMap ) { const_cast<OutputDevice&>(*this).mbMap = false; @@ -7564,7 +7564,7 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector pSalLayout->Release(); if( !nWidth || !nHeight ) - return sal_True; + return true; double fScaleX = static_cast< double >(nOrgWidth) / nWidth; double fScaleY = static_cast< double >(nOrgHeight) / nHeight; @@ -7662,9 +7662,9 @@ sal_Bool OutputDevice::GetTextOutlines( ::basegfx::B2DPolyPolygonVector& rVector return bRet; } -sal_Bool OutputDevice::GetTextOutlines( PolyPolyVector& rResultVector, +bool OutputDevice::GetTextOutlines( PolyPolyVector& rResultVector, const OUString& rStr, sal_Int32 nBase, - sal_Int32 nIndex, sal_Int32 nLen, sal_Bool bOptimize, + sal_Int32 nIndex, sal_Int32 nLen, bool bOptimize, sal_uLong nTWidth, const sal_Int32* pDXArray ) const { if(nLen == 0x0FFFF) @@ -7679,7 +7679,7 @@ sal_Bool OutputDevice::GetTextOutlines( PolyPolyVector& rResultVector, ::basegfx::B2DPolyPolygonVector aB2DPolyPolyVector; if( !GetTextOutlines( aB2DPolyPolyVector, rStr, nBase, nIndex, nLen, bOptimize, nTWidth, pDXArray ) ) - return sal_False; + return false; // convert to a tool polypolygon vector rResultVector.reserve( aB2DPolyPolyVector.size() ); @@ -7687,12 +7687,12 @@ sal_Bool OutputDevice::GetTextOutlines( PolyPolyVector& rResultVector, for(; aIt != aB2DPolyPolyVector.end(); ++aIt ) rResultVector.push_back(PolyPolygon(*aIt)); // #i76339# - return sal_True; + return true; } -sal_Bool OutputDevice::GetTextOutline( PolyPolygon& rPolyPoly, const OUString& rStr, +bool OutputDevice::GetTextOutline( PolyPolygon& rPolyPoly, const OUString& rStr, sal_Int32 nBase, sal_Int32 nIndex, sal_Int32 nLen, - sal_Bool bOptimize, sal_uLong nTWidth, const sal_Int32* pDXArray ) const + bool bOptimize, sal_uLong nTWidth, const sal_Int32* pDXArray ) const { if(nLen == 0x0FFFF) { @@ -7705,7 +7705,7 @@ sal_Bool OutputDevice::GetTextOutline( PolyPolygon& rPolyPoly, const OUString& r ::basegfx::B2DPolyPolygonVector aB2DPolyPolyVector; if( !GetTextOutlines( aB2DPolyPolyVector, rStr, nBase, nIndex, nLen, bOptimize, nTWidth, pDXArray ) ) - return sal_False; + return false; // convert and merge into a tool polypolygon ::basegfx::B2DPolyPolygonVector::const_iterator aIt = aB2DPolyPolyVector.begin(); @@ -7713,7 +7713,7 @@ sal_Bool OutputDevice::GetTextOutline( PolyPolygon& rPolyPoly, const OUString& r for( unsigned int i = 0; i < aIt->count(); ++i ) rPolyPoly.Insert(Polygon((*aIt).getB2DPolygon( i ))); // #i76339# - return sal_True; + return true; } bool OutputDevice::GetFontCapabilities( FontCapabilities& rFontCapabilities ) const @@ -7732,20 +7732,20 @@ bool OutputDevice::GetFontCapabilities( FontCapabilities& rFontCapabilities ) co return mpGraphics->GetImplFontCapabilities(rFontCapabilities); } -sal_Bool OutputDevice::GetFontCharMap( FontCharMap& rFontCharMap ) const +bool OutputDevice::GetFontCharMap( FontCharMap& rFontCharMap ) const { rFontCharMap.Reset(); // we need a graphics if( !mpGraphics && !ImplGetGraphics() ) - return sal_False; + return false; if( mbNewFont ) ImplNewFont(); if( mbInitFont ) ImplInitFont(); if( !mpFontEntry ) - return sal_False; + return false; #ifdef ENABLE_IFC_CACHE // a little font charmap cache helps considerably static const int NMAXITEMS = 16; @@ -7785,8 +7785,8 @@ sal_Bool OutputDevice::GetFontCharMap( FontCharMap& rFontCharMap ) const } if( rFontCharMap.IsDefaultMap() ) - return sal_False; - return sal_True; + return false; + return true; } sal_Int32 OutputDevice::HasGlyphs( const Font& rTempFont, const OUString& rStr, @@ -7807,11 +7807,11 @@ sal_Int32 OutputDevice::HasGlyphs( const Font& rTempFont, const OUString& rStr, const Font aOrigFont = GetFont(); const_cast<OutputDevice&>(*this).SetFont( rTempFont ); FontCharMap aFontCharMap; - sal_Bool bRet = GetFontCharMap( aFontCharMap ); + bool bRet = GetFontCharMap( aFontCharMap ); const_cast<OutputDevice&>(*this).SetFont( aOrigFont ); // if fontmap is unknown assume it doesn't have the glyphs - if( bRet == sal_False ) + if( !bRet ) return nIndex; for( sal_Int32 i = nIndex; nIndex < nEnd; ++i, ++nIndex ) diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx index 55f28e479693..c9a3e6369dda 100644 --- a/vcl/source/gdi/outdev4.cxx +++ b/vcl/source/gdi/outdev4.cxx @@ -143,7 +143,7 @@ inline sal_uInt8 ImplGetGradientColorValue( long nValue ) void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, - sal_Bool bMtf, const PolyPolygon* pClipPolyPoly ) + bool bMtf, const PolyPolygon* pClipPolyPoly ) { // get BoundRect of rotated rectangle Rectangle aRect; @@ -211,7 +211,7 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect, nGreen = (sal_uInt8)nStartGreen; nBlue = (sal_uInt8)nStartBlue; if ( bMtf ) - mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), sal_True ) ); + mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), true ) ); else mpGraphics->SetFillColor( MAKE_SALCOLOR( nRed, nGreen, nBlue ) ); @@ -296,7 +296,7 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect, fTempColor = ((double)nStartBlue) * (1.0-fAlpha) + ((double)nEndBlue) * fAlpha; nBlue = ImplGetGradientColorValue((long)fTempColor); if ( bMtf ) - mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), sal_True ) ); + mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), true ) ); else mpGraphics->SetFillColor( MAKE_SALCOLOR( nRed, nGreen, nBlue ) ); @@ -334,7 +334,7 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect, nGreen = ImplGetGradientColorValue(nEndGreen); nBlue = ImplGetGradientColorValue(nEndBlue); if ( bMtf ) - mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), sal_True ) ); + mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), true ) ); else mpGraphics->SetFillColor( MAKE_SALCOLOR( nRed, nGreen, nBlue ) ); @@ -354,7 +354,7 @@ void OutputDevice::ImplDrawLinearGradient( const Rectangle& rRect, void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, - sal_Bool bMtf, const PolyPolygon* pClipPolyPoly ) + bool bMtf, const PolyPolygon* pClipPolyPoly ) { // Determine if we output via Polygon or PolyPolygon // For all rasteroperations other then Overpaint always use PolyPolygon, @@ -442,7 +442,7 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect, bool bPaintLastPolygon( false ); // #107349# Paint last polygon only if loop has generated any output if( bMtf ) - mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), sal_True ) ); + mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), true ) ); else mpGraphics->SetFillColor( MAKE_SALCOLOR( nRed, nGreen, nBlue ) ); @@ -510,7 +510,7 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect, // the one painted in the window outdev path below. To get // matching colors, have to delay color setting here. if( bMtf ) - mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), sal_True ) ); + mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), true ) ); else mpGraphics->SetFillColor( MAKE_SALCOLOR( nRed, nGreen, nBlue ) ); } @@ -518,7 +518,7 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect, { // #107349# Set fill color _before_ geometry painting if( bMtf ) - mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), sal_True ) ); + mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), true ) ); else mpGraphics->SetFillColor( MAKE_SALCOLOR( nRed, nGreen, nBlue ) ); @@ -545,7 +545,7 @@ void OutputDevice::ImplDrawComplexGradient( const Rectangle& rRect, if( bMtf ) { - mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), sal_True ) ); + mpMetaFile->AddAction( new MetaFillColorAction( Color( nRed, nGreen, nBlue ), true ) ); mpMetaFile->AddAction( new MetaPolygonAction( rPoly ) ); } else @@ -670,9 +670,9 @@ void OutputDevice::DrawGradient( const Rectangle& rRect, aGradient.SetSteps( GRADIENT_DEFAULT_STEPCOUNT ); if( aGradient.GetStyle() == GradientStyle_LINEAR || aGradient.GetStyle() == GradientStyle_AXIAL ) - ImplDrawLinearGradient( aRect, aGradient, sal_False, NULL ); + ImplDrawLinearGradient( aRect, aGradient, false, NULL ); else - ImplDrawComplexGradient( aRect, aGradient, sal_False, NULL ); + ImplDrawComplexGradient( aRect, aGradient, false, NULL ); } Pop(); @@ -743,9 +743,9 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly, } else { - const sal_Bool bOldOutput = IsOutputEnabled(); + const bool bOldOutput = IsOutputEnabled(); - EnableOutput( sal_False ); + EnableOutput( false ); Push( PUSH_RASTEROP ); SetRasterOp( ROP_XOR ); DrawGradient( aRect, rGradient ); @@ -830,9 +830,9 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly, aGradient.SetSteps( GRADIENT_DEFAULT_STEPCOUNT ); if( aGradient.GetStyle() == GradientStyle_LINEAR || aGradient.GetStyle() == GradientStyle_AXIAL ) - ImplDrawLinearGradient( aRect, aGradient, sal_False, &aClipPolyPoly ); + ImplDrawLinearGradient( aRect, aGradient, false, &aClipPolyPoly ); else - ImplDrawComplexGradient( aRect, aGradient, sal_False, &aClipPolyPoly ); + ImplDrawComplexGradient( aRect, aGradient, false, &aClipPolyPoly ); } } } @@ -874,9 +874,9 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly, if( pVDev->SetOutputSizePixel( aDstSize) ) { MapMode aVDevMap; - const sal_Bool bOldMap = mbMap; + const bool bOldMap = mbMap; - EnableMapMode( sal_False ); + EnableMapMode( false ); pVDev->DrawOutDev( Point(), aDstSize, aDstRect.TopLeft(), aDstSize, *this ); pVDev->SetRasterOp( ROP_XOR ); @@ -921,7 +921,7 @@ void OutputDevice::AddGradientActions( const Rectangle& rRect, const Gradient& r mpMetaFile = &rMtf; mpMetaFile->AddAction( new MetaPushAction( PUSH_ALL ) ); mpMetaFile->AddAction( new MetaISectRectClipRegionAction( aRect ) ); - mpMetaFile->AddAction( new MetaLineColorAction( Color(), sal_False ) ); + mpMetaFile->AddAction( new MetaLineColorAction( Color(), false ) ); // because we draw with no border line, we have to expand gradient // rect to avoid missing lines on the right and bottom edge @@ -935,9 +935,9 @@ void OutputDevice::AddGradientActions( const Rectangle& rRect, const Gradient& r aGradient.SetSteps( GRADIENT_DEFAULT_STEPCOUNT ); if( aGradient.GetStyle() == GradientStyle_LINEAR || aGradient.GetStyle() == GradientStyle_AXIAL ) - ImplDrawLinearGradient( aRect, aGradient, sal_True, NULL ); + ImplDrawLinearGradient( aRect, aGradient, true, NULL ); else - ImplDrawComplexGradient( aRect, aGradient, sal_True, NULL ); + ImplDrawComplexGradient( aRect, aGradient, true, NULL ); mpMetaFile->AddAction( new MetaPopAction() ); mpMetaFile = pOldMtf; @@ -998,17 +998,17 @@ void OutputDevice::DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch { PolyPolygon aPolyPoly( LogicToPixel( rPolyPoly ) ); GDIMetaFile* pOldMetaFile = mpMetaFile; - sal_Bool bOldMap = mbMap; + bool bOldMap = mbMap; aPolyPoly.Optimize( POLY_OPTIMIZE_NO_SAME ); aHatch.SetDistance( ImplLogicWidthToDevicePixel( aHatch.GetDistance() ) ); mpMetaFile = NULL; - EnableMapMode( sal_False ); + EnableMapMode( false ); Push( PUSH_LINECOLOR ); SetLineColor( aHatch.GetColor() ); ImplInitLineColor(); - ImplDrawHatch( aPolyPoly, aHatch, sal_False ); + ImplDrawHatch( aPolyPoly, aHatch, false ); Pop(); EnableMapMode( bOldMap ); mpMetaFile = pOldMetaFile; @@ -1031,14 +1031,14 @@ void OutputDevice::AddHatchActions( const PolyPolygon& rPolyPoly, const Hatch& r mpMetaFile = &rMtf; mpMetaFile->AddAction( new MetaPushAction( PUSH_ALL ) ); - mpMetaFile->AddAction( new MetaLineColorAction( rHatch.GetColor(), sal_True ) ); - ImplDrawHatch( aPolyPoly, rHatch, sal_True ); + mpMetaFile->AddAction( new MetaLineColorAction( rHatch.GetColor(), true ) ); + ImplDrawHatch( aPolyPoly, rHatch, true ); mpMetaFile->AddAction( new MetaPopAction() ); mpMetaFile = pOldMtf; } } -void OutputDevice::ImplDrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, sal_Bool bMtf ) +void OutputDevice::ImplDrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, bool bMtf ) { if(rPolyPoly.Count()) { @@ -1221,7 +1221,7 @@ void OutputDevice::ImplCalcHatchValues( const Rectangle& rRect, long nDist, sal_ } void OutputDevice::ImplDrawHatchLine( const Line& rLine, const PolyPolygon& rPolyPoly, - Point* pPtBuffer, sal_Bool bMtf ) + Point* pPtBuffer, bool bMtf ) { double fX, fY; long nAdd, nPCounter = 0; diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx index 3f06b4e9c4ff..9d785e2610f9 100644 --- a/vcl/source/gdi/outdev6.cxx +++ b/vcl/source/gdi/outdev6.cxx @@ -139,8 +139,8 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon if( mbInitFillColor ) ImplInitFillColor(); - const sal_Bool bOldMap = mbMap; - EnableMapMode( sal_False ); + const bool bOldMap = mbMap; + EnableMapMode( false ); if( nFlags & GRID_DOTS ) { @@ -384,8 +384,8 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, Push( PUSH_CLIPREGION | PUSH_LINECOLOR ); IntersectClipRegion(Region(rPolyPoly)); SetLineColor( GetFillColor() ); - const sal_Bool bOldMap = mbMap; - EnableMapMode( sal_False ); + const bool bOldMap = mbMap; + EnableMapMode( false ); if(nMove) { @@ -480,9 +480,9 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly, if( aVDev.SetOutputSizePixel( aDstSz ) ) { - const sal_Bool bOldMap = mbMap; + const bool bOldMap = mbMap; - EnableMapMode( sal_False ); + EnableMapMode( false ); aVDev.SetLineColor( COL_BLACK ); aVDev.SetFillColor( COL_BLACK ); @@ -745,17 +745,17 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, AlphaMask aAlpha; MapMode aMap( GetMapMode() ); Point aOutPos( PixelToLogic( aDstRect.TopLeft() ) ); - const sal_Bool bOldMap = mbMap; + const bool bOldMap = mbMap; aMap.SetOrigin( Point( -aOutPos.X(), -aOutPos.Y() ) ); pVDev->SetMapMode( aMap ); - const sal_Bool bVDevOldMap = pVDev->IsMapModeEnabled(); + const bool bVDevOldMap = pVDev->IsMapModeEnabled(); // create paint bitmap ( (GDIMetaFile&) rMtf ).WindStart(); ( (GDIMetaFile&) rMtf ).Play( pVDev, rPos, rSize ); ( (GDIMetaFile&) rMtf ).WindStart(); - pVDev->EnableMapMode( sal_False ); + pVDev->EnableMapMode( false ); aPaint = pVDev->GetBitmap( Point(), pVDev->GetOutputSizePixel() ); pVDev->EnableMapMode( bVDevOldMap ); // #i35331#: MUST NOT use EnableMapMode( sal_True ) here! @@ -768,7 +768,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, ( (GDIMetaFile&) rMtf ).WindStart(); ( (GDIMetaFile&) rMtf ).Play( pVDev, rPos, rSize ); ( (GDIMetaFile&) rMtf ).WindStart(); - pVDev->EnableMapMode( sal_False ); + pVDev->EnableMapMode( false ); aMask = pVDev->GetBitmap( Point(), pVDev->GetOutputSizePixel() ); pVDev->EnableMapMode( bVDevOldMap ); // #i35331#: MUST NOT use EnableMapMode( sal_True ) here! @@ -776,14 +776,14 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, pVDev->SetDrawMode( DRAWMODE_GRAYGRADIENT ); pVDev->DrawGradient( Rectangle( rPos, rSize ), rTransparenceGradient ); pVDev->SetDrawMode( DRAWMODE_DEFAULT ); - pVDev->EnableMapMode( sal_False ); + pVDev->EnableMapMode( false ); pVDev->DrawMask( Point(), pVDev->GetOutputSizePixel(), aMask, Color( COL_WHITE ) ); aAlpha = pVDev->GetBitmap( Point(), pVDev->GetOutputSizePixel() ); delete pVDev; - EnableMapMode( sal_False ); + EnableMapMode( false ); DrawBitmapEx( aDstRect.TopLeft(), BitmapEx( aPaint, aAlpha ) ); EnableMapMode( bOldMap ); } @@ -807,8 +807,8 @@ void OutputDevice::ImplDrawColorWallpaper( long nX, long nY, Color aOldFillColor = GetFillColor(); SetLineColor(); SetFillColor( rWallpaper.GetColor() ); - sal_Bool bMap = mbMap; - EnableMapMode( sal_False ); + bool bMap = mbMap; + EnableMapMode( false ); DrawRect( Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ) ); SetLineColor( aOldLineColor ); SetFillColor( aOldFillColor ); @@ -827,7 +827,7 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY, Size aSize; GDIMetaFile* pOldMetaFile = mpMetaFile; const WallpaperStyle eStyle = rWallpaper.GetStyle(); - const sal_Bool bOldMap = mbMap; + const bool bOldMap = mbMap; bool bDrawn = false; bool bDrawGradientBackground = false; bool bDrawColorBackground = false; @@ -839,7 +839,7 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY, const long nBmpWidth = aBmpEx.GetSizePixel().Width(); const long nBmpHeight = aBmpEx.GetSizePixel().Height(); - const sal_Bool bTransparent = aBmpEx.IsTransparent(); + const bool bTransparent = aBmpEx.IsTransparent(); // draw background if( bTransparent ) @@ -891,7 +891,7 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY, } mpMetaFile = NULL; - EnableMapMode( sal_False ); + EnableMapMode( false ); Push( PUSH_CLIPREGION ); IntersectClipRegion( Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ) ); @@ -1066,13 +1066,13 @@ void OutputDevice::ImplDrawGradientWallpaper( long nX, long nY, { Rectangle aBound; GDIMetaFile* pOldMetaFile = mpMetaFile; - const sal_Bool bOldMap = mbMap; + const bool bOldMap = mbMap; bool bNeedGradient = true; aBound = Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ); mpMetaFile = NULL; - EnableMapMode( sal_False ); + EnableMapMode( false ); Push( PUSH_CLIPREGION ); IntersectClipRegion( Rectangle( Point( nX, nY ), Size( nWidth, nHeight ) ) ); @@ -1151,7 +1151,7 @@ void OutputDevice::Erase() if ( !IsDeviceOutputNecessary() || ImplIsRecordLayout() ) return; - sal_Bool bNativeOK = sal_False; + bool bNativeOK = false; if( meOutDevType == OUTDEV_WINDOW ) { diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx index d04477930c6d..9e310c7ab9ac 100644 --- a/vcl/source/gdi/outdevnative.cxx +++ b/vcl/source/gdi/outdevnative.cxx @@ -147,14 +147,14 @@ PushButtonValue* PushButtonValue::clone() const // ----------------------------------------------------------------------- -sal_Bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPart ) const +bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPart ) const { if( !lcl_enableNativeWidget( *this ) ) - return sal_False; + return false; if ( !mpGraphics ) if ( !ImplGetGraphics() ) - return sal_False; + return false; return( mpGraphics->IsNativeControlSupported(nType, nPart) ); } @@ -162,18 +162,18 @@ sal_Bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart // ----------------------------------------------------------------------- -sal_Bool OutputDevice::HitTestNativeControl( ControlType nType, +bool OutputDevice::HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, bool& rIsInside ) const { if( !lcl_enableNativeWidget( *this ) ) - return sal_False; + return false; if ( !mpGraphics ) if ( !ImplGetGraphics() ) - return sal_False; + return false; Point aWinOffs( mnOutOffX, mnOutOffY ); Rectangle screenRegion( rControlRegion ); @@ -263,7 +263,7 @@ static boost::shared_ptr< ImplControlValue > lcl_transformControlValue( const Im } return aResult; } -sal_Bool OutputDevice::DrawNativeControl( ControlType nType, +bool OutputDevice::DrawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -271,17 +271,17 @@ sal_Bool OutputDevice::DrawNativeControl( ControlType nType, OUString aCaption ) { if( !lcl_enableNativeWidget( *this ) ) - return sal_False; + return false; // make sure the current clip region is initialized correctly if ( !mpGraphics ) if ( !ImplGetGraphics() ) - return sal_False; + return false; if ( mbInitClipRegion ) ImplInitClipRegion(); if ( mbOutputClipped ) - return sal_True; + return true; if ( mbInitLineColor ) ImplInitLineColor(); @@ -298,14 +298,14 @@ sal_Bool OutputDevice::DrawNativeControl( ControlType nType, if (aTestRegion == Region(rControlRegion)) nState |= CTRL_CACHING_ALLOWED; // control is not clipped, caching allowed - sal_Bool bRet = mpGraphics->DrawNativeControl(nType, nPart, screenRegion, nState, *aScreenCtrlValue, aCaption, this ); + bool bRet = mpGraphics->DrawNativeControl(nType, nPart, screenRegion, nState, *aScreenCtrlValue, aCaption, this ); return bRet; } // ----------------------------------------------------------------------- -sal_Bool OutputDevice::GetNativeControlRegion( ControlType nType, +bool OutputDevice::GetNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -315,18 +315,18 @@ sal_Bool OutputDevice::GetNativeControlRegion( ControlType nType, Rectangle &rNativeContentRegion ) const { if( !lcl_enableNativeWidget( *this ) ) - return sal_False; + return false; if ( !mpGraphics ) if ( !ImplGetGraphics() ) - return sal_False; + return false; // Convert the coordinates from relative to Window-absolute, so we draw // in the correct place in platform code boost::shared_ptr< ImplControlValue > aScreenCtrlValue( lcl_transformControlValue( aValue, *this ) ); Rectangle screenRegion( ImplLogicToDevicePixel( rControlRegion ) ); - sal_Bool bRet = mpGraphics->GetNativeControlRegion(nType, nPart, screenRegion, nState, *aScreenCtrlValue, + bool bRet = mpGraphics->GetNativeControlRegion(nType, nPart, screenRegion, nState, *aScreenCtrlValue, aCaption, rNativeBoundingRegion, rNativeContentRegion, this ); if( bRet ) diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index e68140ba1191..ba9fd16d9c06 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -684,9 +684,9 @@ Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const // ----------------------------------------------------------------------- -void OutputDevice::EnableMapMode( sal_Bool bEnable ) +void OutputDevice::EnableMapMode( bool bEnable ) { - mbMap = (bEnable != 0); + mbMap = bEnable; if( mpAlphaVDev ) mpAlphaVDev->EnableMapMode( bEnable ); diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index 30f118652b03..327c46bc6ba6 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -304,7 +304,7 @@ struct PageSyncData PageSyncData( GlobalSyncData* pGlobal ) : mbGroupIgnoreGDIMtfActions ( false ) { mpGlobalData = pGlobal; } void PushAction( const OutputDevice& rOutDev, const PDFExtOutDevDataSync::Action eAct ); - sal_Bool PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction, const PDFExtOutDevData& rOutDevData ); + bool PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction, const PDFExtOutDevData& rOutDevData ); }; void PageSyncData::PushAction( const OutputDevice& rOutDev, const PDFExtOutDevDataSync::Action eAct ) { @@ -319,12 +319,12 @@ void PageSyncData::PushAction( const OutputDevice& rOutDev, const PDFExtOutDevDa aSync.nIdx = 0x7fffffff; // sync not possible mActions.push_back( aSync ); } -sal_Bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction, const PDFExtOutDevData& rOutDevData ) +bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction, const PDFExtOutDevData& rOutDevData ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( mActions.size() && ( mActions.front().nIdx == rCurGDIMtfAction ) ) { - bRet = sal_True; + bRet = true; PDFExtOutDevDataSync aDataSync = mActions.front(); mActions.pop_front(); switch( aDataSync.eAct ) @@ -486,7 +486,7 @@ sal_Bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIM else if ( mbGroupIgnoreGDIMtfActions ) { rCurGDIMtfAction++; - bRet = sal_True; + bRet = true; } return bRet; } @@ -494,14 +494,14 @@ sal_Bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIM TYPEINIT1(PDFExtOutDevData,ExtOutDevData); PDFExtOutDevData::PDFExtOutDevData( const OutputDevice& rOutDev ) : mrOutDev ( rOutDev ), - mbTaggedPDF ( sal_False ), - mbExportNotes ( sal_True ), - mbExportNotesPages ( sal_False ), - mbTransitionEffects ( sal_True ), - mbUseLosslessCompression( sal_True ), - mbReduceImageResolution ( sal_False ), - mbExportHiddenSlides ( sal_False ), - mbExportNDests ( sal_False ), + mbTaggedPDF ( false ), + mbExportNotes ( true ), + mbExportNotesPages ( false ), + mbTransitionEffects ( true ), + mbUseLosslessCompression( true ), + mbReduceImageResolution ( false ), + mbExportHiddenSlides ( false ), + mbExportNDests ( false ), mnFormsFormat ( 0 ), mnPage ( -1 ), mpPageSyncData ( NULL ), @@ -532,59 +532,59 @@ void PDFExtOutDevData::SetCurrentPageNumber( const sal_Int32 nPage ) { mnPage = nPage; } -sal_Bool PDFExtOutDevData::GetIsLosslessCompression() const +bool PDFExtOutDevData::GetIsLosslessCompression() const { return mbUseLosslessCompression; } -void PDFExtOutDevData::SetIsLosslessCompression( const sal_Bool bUseLosslessCompression ) +void PDFExtOutDevData::SetIsLosslessCompression( const bool bUseLosslessCompression ) { mbUseLosslessCompression = bUseLosslessCompression; } -sal_Bool PDFExtOutDevData::GetIsReduceImageResolution() const +bool PDFExtOutDevData::GetIsReduceImageResolution() const { return mbReduceImageResolution; } -void PDFExtOutDevData::SetIsReduceImageResolution( const sal_Bool bReduceImageResolution ) +void PDFExtOutDevData::SetIsReduceImageResolution( const bool bReduceImageResolution ) { mbReduceImageResolution = bReduceImageResolution; } -sal_Bool PDFExtOutDevData::GetIsExportNotes() const +bool PDFExtOutDevData::GetIsExportNotes() const { return mbExportNotes; } -void PDFExtOutDevData::SetIsExportNotes( const sal_Bool bExportNotes ) +void PDFExtOutDevData::SetIsExportNotes( const bool bExportNotes ) { mbExportNotes = bExportNotes; } -sal_Bool PDFExtOutDevData::GetIsExportNotesPages() const +bool PDFExtOutDevData::GetIsExportNotesPages() const { return mbExportNotesPages; } -void PDFExtOutDevData::SetIsExportNotesPages( const sal_Bool bExportNotesPages ) +void PDFExtOutDevData::SetIsExportNotesPages( const bool bExportNotesPages ) { mbExportNotesPages = bExportNotesPages; } -sal_Bool PDFExtOutDevData::GetIsExportTaggedPDF() const +bool PDFExtOutDevData::GetIsExportTaggedPDF() const { return mbTaggedPDF; } -void PDFExtOutDevData::SetIsExportTaggedPDF( const sal_Bool bTaggedPDF ) +void PDFExtOutDevData::SetIsExportTaggedPDF( const bool bTaggedPDF ) { mbTaggedPDF = bTaggedPDF; } -sal_Bool PDFExtOutDevData::GetIsExportTransitionEffects() const +bool PDFExtOutDevData::GetIsExportTransitionEffects() const { return mbTransitionEffects; } -void PDFExtOutDevData::SetIsExportTransitionEffects( const sal_Bool bTransitionEffects ) +void PDFExtOutDevData::SetIsExportTransitionEffects( const bool bTransitionEffects ) { mbTransitionEffects = bTransitionEffects; } -sal_Bool PDFExtOutDevData::GetIsExportFormFields() const +bool PDFExtOutDevData::GetIsExportFormFields() const { return mbExportFormFields; } -void PDFExtOutDevData::SetIsExportFormFields( const sal_Bool bExportFomtFields ) +void PDFExtOutDevData::SetIsExportFormFields( const bool bExportFomtFields ) { mbExportFormFields = bExportFomtFields; } @@ -592,19 +592,19 @@ void PDFExtOutDevData::SetFormsFormat( const sal_Int32 nFormsFormat ) { mnFormsFormat = nFormsFormat; } -sal_Bool PDFExtOutDevData::GetIsExportBookmarks() const +bool PDFExtOutDevData::GetIsExportBookmarks() const { return mbExportBookmarks; } -void PDFExtOutDevData::SetIsExportBookmarks( const sal_Bool bExportBookmarks ) +void PDFExtOutDevData::SetIsExportBookmarks( const bool bExportBookmarks ) { mbExportBookmarks = bExportBookmarks; } -sal_Bool PDFExtOutDevData::GetIsExportHiddenSlides() const +bool PDFExtOutDevData::GetIsExportHiddenSlides() const { return mbExportHiddenSlides; } -void PDFExtOutDevData::SetIsExportHiddenSlides( const sal_Bool bExportHiddenSlides ) +void PDFExtOutDevData::SetIsExportHiddenSlides( const bool bExportHiddenSlides ) { mbExportHiddenSlides = bExportHiddenSlides; } @@ -612,11 +612,11 @@ std::vector< PDFExtOutDevBookmarkEntry >& PDFExtOutDevData::GetBookmarks() { return maBookmarks; } -sal_Bool PDFExtOutDevData::GetIsExportNamedDestinations() const +bool PDFExtOutDevData::GetIsExportNamedDestinations() const { return mbExportNDests; } -void PDFExtOutDevData::SetIsExportNamedDestinations( const sal_Bool bExportNDests ) +void PDFExtOutDevData::SetIsExportNamedDestinations( const bool bExportNDests ) { mbExportNDests = bExportNDests; } @@ -624,7 +624,7 @@ void PDFExtOutDevData::ResetSyncData() { *mpPageSyncData = PageSyncData( mpGlobalSyncData ); } -sal_Bool PDFExtOutDevData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rIdx ) +bool PDFExtOutDevData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rIdx ) { return mpPageSyncData->PlaySyncPageAct( rWriter, rIdx, *this ); } diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index 610bfd5db6fa..de00ac33c87a 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -74,7 +74,7 @@ void PDFWriter::DrawTextLine( FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, - sal_Bool bUnderlineAbove ) + bool bUnderlineAbove ) { pImplementation->drawTextLine( rPos, nWidth, eStrikeout, eUnderline, eOverline, bUnderlineAbove ); } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index d24ba589dad1..ccf7771b99ee 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -4409,7 +4409,7 @@ we check in the following sequence: INetURLObject aDocumentURL( m_aContext.BaseURL ); INetURLObject aTargetURL( rLink.m_aURL ); sal_Int32 nSetGoToRMode = 0; - sal_Bool bTargetHasPDFExtension = sal_False; + bool bTargetHasPDFExtension = false; INetProtocol eTargetProtocol = aTargetURL.GetProtocol(); bool bIsUNCPath = false; @@ -7165,7 +7165,7 @@ void PDFWriterImpl::drawRelief( SalLayout& rLayout, const OUString& rText, bool Font aSetFont = m_aCurrentPDFState.m_aFont; aSetFont.SetRelief( RELIEF_NONE ); - aSetFont.SetShadow( sal_False ); + aSetFont.SetShadow( false ); aSetFont.SetColor( aReliefColor ); setTextLineColor( aReliefColor ); @@ -7202,8 +7202,8 @@ void PDFWriterImpl::drawShadow( SalLayout& rLayout, const OUString& rText, bool rFont.SetColor( Color( COL_LIGHTGRAY ) ); else rFont.SetColor( Color( COL_BLACK ) ); - rFont.SetShadow( sal_False ); - rFont.SetOutline( sal_False ); + rFont.SetShadow( false ); + rFont.SetOutline( false ); setFont( rFont ); setTextLineColor( rFont.GetColor() ); setOverlineColor( rFont.GetColor() ); @@ -7661,7 +7661,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool ) ) { - sal_Bool bUnderlineAbove = OutputDevice::ImplIsUnderlineAbove( m_aCurrentPDFState.m_aFont ); + bool bUnderlineAbove = OutputDevice::ImplIsUnderlineAbove( m_aCurrentPDFState.m_aFont ); if( m_aCurrentPDFState.m_aFont.IsWordLineMode() ) { Point aPos, aStartPt; @@ -7714,7 +7714,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool long nEmphYOff; long nEmphWidth; long nEmphHeight; - sal_Bool bEmphPolyLine; + bool bEmphPolyLine; FontEmphasisMark nEmphMark; push( PUSH_ALL ); @@ -7795,7 +7795,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool } void PDFWriterImpl::drawEmphasisMark( long nX, long nY, - const PolyPolygon& rPolyPoly, sal_Bool bPolyLine, + const PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ) { // TODO: pass nWidth as width of this mark @@ -8387,11 +8387,11 @@ void PDFWriterImpl::drawStrikeoutChar( const Point& rPos, long nWidth, FontStrik while( m_pReferenceDevice->GetTextWidth( aStrikeout ) >= nWidth ) aStrikeout = aStrikeout.replaceAt( 0, 1, "" ); aStrikeout += aStrikeoutChar; - sal_Bool bShadow = m_aCurrentPDFState.m_aFont.IsShadow(); + bool bShadow = m_aCurrentPDFState.m_aFont.IsShadow(); if ( bShadow ) { Font aFont = m_aCurrentPDFState.m_aFont; - aFont.SetShadow( sal_False ); + aFont.SetShadow( false ); setFont( aFont ); updateGraphicsState(); } @@ -8425,7 +8425,7 @@ void PDFWriterImpl::drawStrikeoutChar( const Point& rPos, long nWidth, FontStrik if ( bShadow ) { Font aFont = m_aCurrentPDFState.m_aFont; - aFont.SetShadow( sal_True ); + aFont.SetShadow( true ); setFont( aFont ); updateGraphicsState(); } @@ -10326,7 +10326,7 @@ void PDFWriterImpl::drawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch aPolyPoly.Optimize( POLY_OPTIMIZE_NO_SAME ); push( PUSH_LINECOLOR ); setLineColor( rHatch.GetColor() ); - getReferenceDevice()->ImplDrawHatch( aPolyPoly, rHatch, sal_False ); + getReferenceDevice()->ImplDrawHatch( aPolyPoly, rHatch, false ); pop(); } } diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 4bcebbddc11e..b2fa560e56ed 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -1010,7 +1010,7 @@ i12626 bool checkEmitStructure(); /* draws an emphasis mark */ - void drawEmphasisMark( long nX, long nY, const PolyPolygon& rPolyPoly, sal_Bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); + void drawEmphasisMark( long nX, long nY, const PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); /* true if PDF/A-1a or PDF/A-1b is output */ bool m_bIsPDF_A1; @@ -1153,7 +1153,7 @@ public: void setTextFillColor() { m_aGraphicsStack.front().m_aFont.SetFillColor( Color( COL_TRANSPARENT ) ); - m_aGraphicsStack.front().m_aFont.SetTransparent( sal_True ); + m_aGraphicsStack.front().m_aFont.SetTransparent( true ); m_aGraphicsStack.front().m_nUpdateFlags |= GraphicsState::updateFont; } void setTextColor( const Color& rColor ) diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index bea5e7dc2c2c..2a805f6d5a67 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -253,7 +253,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa if( ! pDummyVDev ) { pPrivateDevice = pDummyVDev = new VirtualDevice(); - pDummyVDev->EnableOutput( sal_False ); + pDummyVDev->EnableOutput( false ); pDummyVDev->SetMapMode( i_rMtf.GetPrefMapMode() ); } GDIMetaFile aMtf( i_rMtf ); @@ -461,9 +461,9 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa aTmpMtf.Play( pVDev, aPoint, aDstSize ); aTmpMtf.WindStart(); - pVDev->EnableMapMode( sal_False ); + pVDev->EnableMapMode( false ); aPaint = pVDev->GetBitmap( aPoint, aDstSizePixel ); - pVDev->EnableMapMode( sal_True ); + pVDev->EnableMapMode( true ); // create mask bitmap pVDev->SetLineColor( COL_BLACK ); @@ -474,15 +474,15 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa aTmpMtf.WindStart(); aTmpMtf.Play( pVDev, aPoint, aDstSize ); aTmpMtf.WindStart(); - pVDev->EnableMapMode( sal_False ); + pVDev->EnableMapMode( false ); aMask = pVDev->GetBitmap( aPoint, aDstSizePixel ); - pVDev->EnableMapMode( sal_True ); + pVDev->EnableMapMode( true ); // create alpha mask from gradient pVDev->SetDrawMode( DRAWMODE_GRAYGRADIENT ); pVDev->DrawGradient( Rectangle( aPoint, aDstSize ), rTransparenceGradient ); pVDev->SetDrawMode( DRAWMODE_DEFAULT ); - pVDev->EnableMapMode( sal_False ); + pVDev->EnableMapMode( false ); pVDev->DrawMask( aPoint, aDstSizePixel, aMask, Color( COL_WHITE ) ); aAlpha = pVDev->GetBitmap( aPoint, aDstSizePixel ); implWriteBitmapEx( rPos, rSize, BitmapEx( aPaint, aAlpha ), pDummyVDev, i_rContext ); diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 0e8160e02d91..79f36d49f38a 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -51,7 +51,7 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData = NULL ); ~PNGWriterImpl(); - sal_Bool Write( SvStream& rOStm ); + bool Write( SvStream& rOStm ); std::vector< vcl::PNGWriter::ChunkData >& GetChunks(); @@ -62,7 +62,7 @@ private: sal_Int32 mnCompLevel; sal_Int32 mnInterlaced; sal_uInt32 mnMaxChunkSize; - sal_Bool mbStatus; + bool mbStatus; BitmapReadAccess* mpAccess; BitmapReadAccess* mpMaskAccess; @@ -77,7 +77,7 @@ private: sal_uInt8 mnBitsPerPixel; sal_uInt8 mnFilterType; // 0 oder 4; sal_uLong mnBBP; // bytes per pixel ( needed for filtering ) - sal_Bool mbTrueAlpha; + bool mbTrueAlpha; sal_uLong mnCRC; void ImplWritepHYs( const BitmapEx& rBitmapEx ); @@ -85,7 +85,7 @@ private: sal_uLong ImplGetFilter( sal_uLong nY, sal_uLong nXStart=0, sal_uLong nXAdd=1 ); void ImplClearFirstScanline(); void ImplWriteTransparent(); - sal_Bool ImplWriteHeader(); + bool ImplWriteHeader(); void ImplWritePalette(); void ImplOpenChunk( sal_uLong nChunkType ); void ImplWriteChunk( sal_uInt8 nNumb ); @@ -97,7 +97,7 @@ private: PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ) : mnCompLevel ( PNG_DEF_COMPRESSION ), - mbStatus ( sal_True ), + mbStatus ( true ), mpAccess ( NULL ), mpMaskAccess ( NULL ), mpZCodec ( new ZCodec( DEFAULT_IN_BUFSIZE, DEFAULT_OUT_BUFSIZE, MAX_MEM_USAGE ) ), @@ -157,14 +157,14 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx, aBmp.ReleaseAccess( mpAccess ), mpAccess = 0; } else - mbStatus = sal_False; + mbStatus = false; } else { mpAccess = aBmp.AcquireReadAccess(); // sal_True RGB with alphachannel if( mpAccess ) { - if ( ( mbTrueAlpha = rBmpEx.IsAlpha() ) != sal_False ) + if ( ( mbTrueAlpha = rBmpEx.IsAlpha() ) ) { AlphaMask aMask( rBmpEx.GetAlpha() ); mpMaskAccess = aMask.AcquireReadAccess(); @@ -178,7 +178,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx, aMask.ReleaseAccess( mpMaskAccess ), mpMaskAccess = 0; } else - mbStatus = sal_False; + mbStatus = false; } else { @@ -194,12 +194,12 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx, aMask.ReleaseAccess( mpMaskAccess ), mpMaskAccess = 0; } else - mbStatus = sal_False; + mbStatus = false; } aBmp.ReleaseAccess( mpAccess ), mpAccess = 0; } else - mbStatus = sal_False; + mbStatus = false; } } else @@ -218,7 +218,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx, aBmp.ReleaseAccess( mpAccess ), mpAccess = 0; } else - mbStatus = sal_False; + mbStatus = false; } if ( mbStatus ) { @@ -233,7 +233,7 @@ PNGWriterImpl::~PNGWriterImpl() delete mpZCodec; } -sal_Bool PNGWriterImpl::Write( SvStream& rOStm ) +bool PNGWriterImpl::Write( SvStream& rOStm ) { /* png signature is always an array of 8 bytes */ sal_uInt16 nOldMode = rOStm.GetNumberFormatInt(); @@ -269,7 +269,7 @@ std::vector< vcl::PNGWriter::ChunkData >& PNGWriterImpl::GetChunks() return maChunkSeq; } -sal_Bool PNGWriterImpl::ImplWriteHeader() +bool PNGWriterImpl::ImplWriteHeader() { ImplOpenChunk(PNGCHUNK_IHDR); ImplWriteChunk( sal_uInt32( mnWidth = mpAccess->Width() ) ); @@ -301,7 +301,7 @@ sal_Bool PNGWriterImpl::ImplWriteHeader() ImplCloseChunk(); } else - mbStatus = sal_False; + mbStatus = false; return mbStatus; } @@ -505,7 +505,7 @@ sal_uLong PNGWriterImpl::ImplGetFilter ( sal_uLong nY, sal_uLong nXStart, sal_uL break; default : - mbStatus = sal_False; + mbStatus = false; break; } } @@ -658,7 +658,7 @@ PNGWriter::~PNGWriter() delete mpImpl; } -sal_Bool PNGWriter::Write( SvStream& rIStm ) +bool PNGWriter::Write( SvStream& rIStm ) { return mpImpl->Write( rIStm ); } diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 4137c23ef85a..ea6780da3df0 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -100,17 +100,17 @@ void ImplUpdateJobSetupPaper( JobSetup& rJobSetup ) // PrinterOptions PrinterOptions::PrinterOptions() : - mbReduceTransparency( sal_False ), + mbReduceTransparency( false ), meReducedTransparencyMode( PRINTER_TRANSPARENCY_AUTO ), - mbReduceGradients( sal_False ), + mbReduceGradients( false ), meReducedGradientsMode( PRINTER_GRADIENT_STRIPES ), mnReducedGradientStepCount( 64 ), - mbReduceBitmaps( sal_False ), + mbReduceBitmaps( false ), meReducedBitmapMode( PRINTER_BITMAP_NORMAL ), mnReducedBitmapResolution( 200 ), - mbReducedBitmapsIncludeTransparency( sal_True ), - mbConvertToGreyscales( sal_False ), - mbPDFAsStandardPrintJobFormat( sal_False ) + mbReducedBitmapsIncludeTransparency( true ), + mbConvertToGreyscales( false ), + mbPDFAsStandardPrintJobFormat( false ) { } @@ -167,7 +167,7 @@ bool PrinterOptions::ReadFromConfig( bool i_bFile ) if( xSet.is() ) { sal_Int32 nValue = 0; - sal_Bool bValue = 0; + bool bValue = false; if( xSet->getPropertyValue(PROPERTYNAME_REDUCETRANSPARENCY) >>= bValue ) SetReduceTransparency( bValue ); if( xSet->getPropertyValue(PROPERTYNAME_REDUCEDTRANSPARENCYMODE) >>= nValue ) @@ -421,22 +421,22 @@ void Printer::ImplInitData() { mbDevOutput = false; meOutDevType = OUTDEV_PRINTER; - mbDefPrinter = sal_False; + mbDefPrinter = false; mnError = 0; mnCurPage = 0; mnCurPrintPage = 0; mnPageQueueSize = 0; mnCopyCount = 1; - mbCollateCopy = sal_False; - mbPrinting = sal_False; - mbJobActive = sal_False; - mbPrintFile = sal_False; - mbInPrintPage = sal_False; - mbNewJobSetup = sal_False; + mbCollateCopy = false; + mbPrinting = false; + mbJobActive = false; + mbPrintFile = false; + mbInPrintPage = false; + mbNewJobSetup = false; mpInfoPrinter = NULL; mpPrinter = NULL; mpDisplayDev = NULL; - mbIsQueuePrinter = sal_False; + mbIsQueuePrinter = false; mpPrinterOptions = new PrinterOptions; // Add printer to the list @@ -597,7 +597,7 @@ Printer::Printer() { ImplInit( pInfo ); if ( !IsDisplayPrinter() ) - mbDefPrinter = sal_True; + mbDefPrinter = true; } else ImplInitDisplay( NULL ); @@ -707,38 +707,38 @@ sal_uLong Printer::GetCapabilities( sal_uInt16 nType ) const } -sal_Bool Printer::HasSupport( PrinterSupport eFeature ) const +bool Printer::HasSupport( PrinterSupport eFeature ) const { switch ( eFeature ) { case SUPPORT_SET_ORIENTATION: - return (sal_Bool)GetCapabilities( PRINTER_CAPABILITIES_SETORIENTATION ); + return GetCapabilities( PRINTER_CAPABILITIES_SETORIENTATION ) != 0; case SUPPORT_SET_PAPERBIN: - return (sal_Bool)GetCapabilities( PRINTER_CAPABILITIES_SETPAPERBIN ); + return GetCapabilities( PRINTER_CAPABILITIES_SETPAPERBIN ) != 0; case SUPPORT_SET_PAPERSIZE: - return (sal_Bool)GetCapabilities( PRINTER_CAPABILITIES_SETPAPERSIZE ); + return GetCapabilities( PRINTER_CAPABILITIES_SETPAPERSIZE ) != 0; case SUPPORT_SET_PAPER: - return (sal_Bool)GetCapabilities( PRINTER_CAPABILITIES_SETPAPER ); + return GetCapabilities( PRINTER_CAPABILITIES_SETPAPER ) != 0; case SUPPORT_COPY: return (GetCapabilities( PRINTER_CAPABILITIES_COPIES ) != 0); case SUPPORT_COLLATECOPY: return (GetCapabilities( PRINTER_CAPABILITIES_COLLATECOPIES ) != 0); case SUPPORT_SETUPDIALOG: - return (sal_Bool)GetCapabilities( PRINTER_CAPABILITIES_SUPPORTDIALOG ); + return GetCapabilities( PRINTER_CAPABILITIES_SUPPORTDIALOG ) != 0; case SUPPORT_FAX: - return (sal_Bool) GetCapabilities( PRINTER_CAPABILITIES_FAX ); + return GetCapabilities( PRINTER_CAPABILITIES_FAX ) != 0; case SUPPORT_PDF: - return (sal_Bool) GetCapabilities( PRINTER_CAPABILITIES_PDF ); + return GetCapabilities( PRINTER_CAPABILITIES_PDF ) != 0; } - return sal_True; + return true; } -sal_Bool Printer::SetJobSetup( const JobSetup& rSetup ) +bool Printer::SetJobSetup( const JobSetup& rSetup ) { if ( IsDisplayPrinter() || mbInPrintPage ) - return sal_False; + return false; JobSetup aJobSetup = rSetup; @@ -746,58 +746,58 @@ sal_Bool Printer::SetJobSetup( const JobSetup& rSetup ) if ( mpInfoPrinter->SetPrinterData( aJobSetup.ImplGetData() ) ) { ImplUpdateJobSetupPaper( aJobSetup ); - mbNewJobSetup = sal_True; + mbNewJobSetup = true; maJobSetup = aJobSetup; ImplUpdatePageData(); ImplUpdateFontList(); - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool Printer::Setup( Window* pWindow ) +bool Printer::Setup( Window* pWindow ) { if ( IsDisplayPrinter() ) - return sal_False; + return false; if ( IsJobActive() || IsPrinting() ) - return sal_False; + return false; JobSetup aJobSetup = maJobSetup; SalFrame* pFrame; if ( !pWindow ) pWindow = ImplGetDefaultWindow(); if( !pWindow ) - return sal_False; + return false; pFrame = pWindow->ImplGetFrame(); ImplReleaseGraphics(); ImplSVData* pSVData = ImplGetSVData(); pSVData->maAppData.mnModalMode++; nImplSysDialog++; - sal_Bool bSetup = mpInfoPrinter->Setup( pFrame, aJobSetup.ImplGetData() ); + bool bSetup = mpInfoPrinter->Setup( pFrame, aJobSetup.ImplGetData() ); pSVData->maAppData.mnModalMode--; nImplSysDialog--; if ( bSetup ) { ImplUpdateJobSetupPaper( aJobSetup ); - mbNewJobSetup = sal_True; + mbNewJobSetup = true; maJobSetup = aJobSetup; ImplUpdatePageData(); ImplUpdateFontList(); - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool Printer::SetPrinterProps( const Printer* pPrinter ) +bool Printer::SetPrinterProps( const Printer* pPrinter ) { if ( IsJobActive() || IsPrinting() ) - return sal_False; + return false; ImplSVData* pSVData = ImplGetSVData(); @@ -844,7 +844,7 @@ sal_Bool Printer::SetPrinterProps( const Printer* pPrinter ) // Construct new printer ImplInitDisplay( NULL ); - return sal_True; + return true; } // Destroy old printer? @@ -898,14 +898,14 @@ sal_Bool Printer::SetPrinterProps( const Printer* pPrinter ) else SetJobSetup( pPrinter->GetJobSetup() ); - return sal_False; + return false; } -sal_Bool Printer::SetOrientation( Orientation eOrientation ) +bool Printer::SetOrientation( Orientation eOrientation ) { if ( mbInPrintPage ) - return sal_False; + return false; if ( maJobSetup.ImplGetConstData()->meOrientation != eOrientation ) { @@ -915,26 +915,26 @@ sal_Bool Printer::SetOrientation( Orientation eOrientation ) if ( IsDisplayPrinter() ) { - mbNewJobSetup = sal_True; + mbNewJobSetup = true; maJobSetup = aJobSetup; - return sal_True; + return true; } ImplReleaseGraphics(); if ( mpInfoPrinter->SetData( SAL_JOBSET_ORIENTATION, pSetupData ) ) { ImplUpdateJobSetupPaper( aJobSetup ); - mbNewJobSetup = sal_True; + mbNewJobSetup = true; maJobSetup = aJobSetup; ImplUpdatePageData(); ImplUpdateFontList(); - return sal_True; + return true; } else - return sal_False; + return false; } - return sal_True; + return true; } @@ -944,10 +944,10 @@ Orientation Printer::GetOrientation() const } -sal_Bool Printer::SetPaperBin( sal_uInt16 nPaperBin ) +bool Printer::SetPaperBin( sal_uInt16 nPaperBin ) { if ( mbInPrintPage ) - return sal_False; + return false; if ( (maJobSetup.ImplGetConstData()->mnPaperBin != nPaperBin) && (nPaperBin < GetPaperBinCount()) ) @@ -958,26 +958,26 @@ sal_Bool Printer::SetPaperBin( sal_uInt16 nPaperBin ) if ( IsDisplayPrinter() ) { - mbNewJobSetup = sal_True; + mbNewJobSetup = true; maJobSetup = aJobSetup; - return sal_True; + return true; } ImplReleaseGraphics(); if ( mpInfoPrinter->SetData( SAL_JOBSET_PAPERBIN, pSetupData ) ) { ImplUpdateJobSetupPaper( aJobSetup ); - mbNewJobSetup = sal_True; + mbNewJobSetup = true; maJobSetup = aJobSetup; ImplUpdatePageData(); ImplUpdateFontList(); - return sal_True; + return true; } else - return sal_False; + return false; } - return sal_True; + return true; } @@ -1077,10 +1077,10 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNe } -sal_Bool Printer::SetPaper( Paper ePaper ) +bool Printer::SetPaper( Paper ePaper ) { if ( mbInPrintPage ) - return sal_False; + return false; if ( maJobSetup.ImplGetConstData()->mePaperFormat != ePaper ) { @@ -1096,9 +1096,9 @@ sal_Bool Printer::SetPaper( Paper ePaper ) if ( IsDisplayPrinter() ) { - mbNewJobSetup = sal_True; + mbNewJobSetup = true; maJobSetup = aJobSetup; - return sal_True; + return true; } ImplReleaseGraphics(); @@ -1107,29 +1107,29 @@ sal_Bool Printer::SetPaper( Paper ePaper ) if ( mpInfoPrinter->SetData( SAL_JOBSET_PAPERSIZE|SAL_JOBSET_ORIENTATION, pSetupData ) ) { ImplUpdateJobSetupPaper( aJobSetup ); - mbNewJobSetup = sal_True; + mbNewJobSetup = true; maJobSetup = aJobSetup; ImplUpdatePageData(); ImplUpdateFontList(); - return sal_True; + return true; } else - return sal_False; + return false; } - return sal_True; + return true; } -sal_Bool Printer::SetPaperSizeUser( const Size& rSize ) +bool Printer::SetPaperSizeUser( const Size& rSize ) { return SetPaperSizeUser( rSize, false ); } -sal_Bool Printer::SetPaperSizeUser( const Size& rSize, bool bMatchNearest ) +bool Printer::SetPaperSizeUser( const Size& rSize, bool bMatchNearest ) { if ( mbInPrintPage ) - return sal_False; + return false; Size aPixSize = LogicToPixel( rSize ); Size aPageSize = PixelToLogic( aPixSize, MAP_100TH_MM ); @@ -1145,9 +1145,9 @@ sal_Bool Printer::SetPaperSizeUser( const Size& rSize, bool bMatchNearest ) if ( IsDisplayPrinter() ) { - mbNewJobSetup = sal_True; + mbNewJobSetup = true; maJobSetup = aJobSetup; - return sal_True; + return true; } ImplReleaseGraphics(); @@ -1157,17 +1157,17 @@ sal_Bool Printer::SetPaperSizeUser( const Size& rSize, bool bMatchNearest ) if ( mpInfoPrinter->SetData( SAL_JOBSET_PAPERSIZE|SAL_JOBSET_ORIENTATION, pSetupData ) ) { ImplUpdateJobSetupPaper( aJobSetup ); - mbNewJobSetup = sal_True; + mbNewJobSetup = true; maJobSetup = aJobSetup; ImplUpdatePageData(); ImplUpdateFontList(); - return sal_True; + return true; } else - return sal_False; + return false; } - return sal_True; + return true; } @@ -1234,10 +1234,10 @@ const PaperInfo& Printer::GetPaperInfo( int nPaper ) const } -sal_Bool Printer::SetDuplexMode( DuplexMode eDuplex ) +bool Printer::SetDuplexMode( DuplexMode eDuplex ) { if ( mbInPrintPage ) - return sal_False; + return false; if ( maJobSetup.ImplGetConstData()->meDuplexMode != eDuplex ) { @@ -1247,26 +1247,26 @@ sal_Bool Printer::SetDuplexMode( DuplexMode eDuplex ) if ( IsDisplayPrinter() ) { - mbNewJobSetup = sal_True; + mbNewJobSetup = true; maJobSetup = aJobSetup; - return sal_True; + return true; } ImplReleaseGraphics(); if ( mpInfoPrinter->SetData( SAL_JOBSET_DUPLEXMODE, pSetupData ) ) { ImplUpdateJobSetupPaper( aJobSetup ); - mbNewJobSetup = sal_True; + mbNewJobSetup = true; maJobSetup = aJobSetup; ImplUpdatePageData(); ImplUpdateFontList(); - return sal_True; + return true; } else - return sal_False; + return false; } - return sal_True; + return true; } @@ -1303,11 +1303,11 @@ OUString Printer::GetPaperBinName( sal_uInt16 nPaperBin ) const } -sal_Bool Printer::SetCopyCount( sal_uInt16 nCopy, sal_Bool bCollate ) +bool Printer::SetCopyCount( sal_uInt16 nCopy, bool bCollate ) { mnCopyCount = nCopy; mbCollateCopy = bCollate; - return sal_True; + return true; } @@ -1338,15 +1338,15 @@ sal_uLong Printer::ImplSalPrinterErrorCodeToVCL( sal_uLong nError ) } -sal_Bool Printer::EndJob() +bool Printer::EndJob() { - sal_Bool bRet = sal_False; + bool bRet = false; if ( !IsJobActive() ) return bRet; DBG_ASSERT( !mbInPrintPage, "Printer::EndJob() - StartPage() without EndPage() called" ); - mbJobActive = sal_False; + mbJobActive = false; if ( mpPrinter ) { @@ -1354,7 +1354,7 @@ sal_Bool Printer::EndJob() mnCurPage = 0; - mbPrinting = sal_False; + mbPrinting = false; mnCurPrintPage = 0; maJobName = OUString(); @@ -1389,7 +1389,7 @@ void Printer::ImplStartPage() // PrintJob not aborted ??? if ( IsJobActive() ) { - mbInPrintPage = sal_True; + mbInPrintPage = true; mnCurPage++; mnCurPrintPage++; } @@ -1402,7 +1402,7 @@ void Printer::ImplEndPage() if ( !IsJobActive() ) return; - mbInPrintPage = sal_False; + mbInPrintPage = false; if ( mpPrinter ) { @@ -1411,7 +1411,7 @@ void Printer::ImplEndPage() mbDevOutput = false; mpJobGraphics = NULL; - mbNewJobSetup = sal_False; + mbNewJobSetup = false; } } diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index 5f30b43d9ac9..b6b8f23de2b8 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -144,13 +144,13 @@ static void ImplConvertTransparentAction( GDIMetaFile& o_rMtf, aLineColor.SetRed( static_cast<sal_uInt8>( (255L*nTransparency + (100L - nTransparency)*aLineColor.GetRed()) / 100L ) ); aLineColor.SetGreen( static_cast<sal_uInt8>( (255L*nTransparency + (100L - nTransparency)*aLineColor.GetGreen()) / 100L ) ); aLineColor.SetBlue( static_cast<sal_uInt8>( (255L*nTransparency + (100L - nTransparency)*aLineColor.GetBlue()) / 100L ) ); - o_rMtf.AddAction( new MetaLineColorAction(aLineColor, sal_True) ); + o_rMtf.AddAction( new MetaLineColorAction(aLineColor, true) ); Color aFillColor( rStateOutDev.GetFillColor() ); aFillColor.SetRed( static_cast<sal_uInt8>( (255L*nTransparency + (100L - nTransparency)*aFillColor.GetRed()) / 100L ) ); aFillColor.SetGreen( static_cast<sal_uInt8>( (255L*nTransparency + (100L - nTransparency)*aFillColor.GetGreen()) / 100L ) ); aFillColor.SetBlue( static_cast<sal_uInt8>( (255L*nTransparency + (100L - nTransparency)*aFillColor.GetBlue()) / 100L ) ); - o_rMtf.AddAction( new MetaFillColorAction(aFillColor, sal_True) ); + o_rMtf.AddAction( new MetaFillColorAction(aFillColor, true) ); } o_rMtf.AddAction( new MetaPolyPolygonAction(pTransAct->GetPolyPolygon()) ); @@ -727,7 +727,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, VirtualDevice aMapModeVDev; aMapModeVDev.mnDPIX = mnDPIX; aMapModeVDev.mnDPIY = mnDPIY; - aMapModeVDev.EnableOutput(sal_False); + aMapModeVDev.EnableOutput(false); int nLastBgAction, nActionNum; @@ -1172,7 +1172,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, Size aDstSzPix; VirtualDevice aMapVDev; // here, we record only mapmode information - aMapVDev.EnableOutput(sal_False); + aMapVDev.EnableOutput(false); VirtualDevice aPaintVDev; // into this one, we render. aPaintVDev.SetBackground( aBackgroundComponent.aBgColor ); @@ -1204,7 +1204,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, aMapVDev.mnDPIX = aPaintVDev.mnDPIX = mnDPIX; aMapVDev.mnDPIY = aPaintVDev.mnDPIY = mnDPIY; - aPaintVDev.EnableOutput(sal_False); + aPaintVDev.EnableOutput(false); // iterate over all actions for( pCurrAct=const_cast<GDIMetaFile&>(rInMtf).FirstAction(), nActionNum=0; @@ -1216,7 +1216,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, // the current aCCList element // (aCurr) if( aCCList_MemberMap[nActionNum] == &(*aCurr) ) - aPaintVDev.EnableOutput(sal_True); + aPaintVDev.EnableOutput(true); // but process every action const sal_uInt16 nType( pCurrAct->GetType() ); @@ -1254,7 +1254,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, Application::Reschedule(); } - const sal_Bool bOldMap = mbMap; + const bool bOldMap = mbMap; mbMap = aPaintVDev.mbMap = false; Bitmap aBandBmp( aPaintVDev.GetBitmap( Point(), aDstSzPix ) ); diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index db7b14e14ec0..a64e6fc3ddff 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -148,10 +148,10 @@ public: Link maOptionChangeHdl; ControlDependencyMap maControlDependencies; ChoiceDisableMap maChoiceDisableMap; - sal_Bool mbFirstPage; - sal_Bool mbLastPage; - sal_Bool mbReversePageOrder; - sal_Bool mbPapersizeFromSetup; + bool mbFirstPage; + bool mbLastPage; + bool mbReversePageOrder; + bool mbPapersizeFromSetup; view::PrintableState meJobState; vcl::PrinterController::MultiPageSetup maMultiPage; @@ -182,10 +182,10 @@ public: // history suggests this is intentional... ImplPrinterControllerData() : - mbFirstPage( sal_True ), - mbLastPage( sal_False ), - mbReversePageOrder( sal_False ), - mbPapersizeFromSetup( sal_False ), + mbFirstPage( true ), + mbLastPage( false ), + mbReversePageOrder( false ), + mbPapersizeFromSetup( false ), meJobState( view::PrintableState_JOB_STARTED ), mpProgress( NULL ), mnDefaultPaperBin( -1 ), @@ -285,7 +285,7 @@ void Printer::PrintJob( const boost::shared_ptr<PrinterController>& i_pControlle const JobSetup& i_rInitSetup ) { - sal_Bool bSynchronous = sal_False; + bool bSynchronous = false; PropertyValue* pVal = i_pController->getValue( OUString( "Wait" ) ); if( pVal ) pVal->Value >>= bSynchronous; @@ -333,7 +333,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr } // reset last page property - i_pController->setLastPage( sal_False ); + i_pController->setLastPage( false ); // update "PageRange" property inferring from other properties: // case 1: "Pages" set from UNO API -> @@ -402,7 +402,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr PropertyValue* pReverseVal = i_pController->getValue( OUString( "PrintReverse" ) ); if( pReverseVal ) { - sal_Bool bReverse = sal_False; + bool bReverse = false; pReverseVal->Value >>= bReverse; pController->setReversePrint( bReverse ); } @@ -410,7 +410,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr PropertyValue* pPapersizeFromSetupVal = i_pController->getValue( OUString( "PapersizeFromSetup" ) ); if( pPapersizeFromSetupVal ) { - sal_Bool bPapersizeFromSetup = sal_False; + bool bPapersizeFromSetup = false; pPapersizeFromSetupVal->Value >>= bPapersizeFromSetup; pController->setPapersizeFromSetup( bPapersizeFromSetup ); } @@ -560,7 +560,7 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print if ( !mpPrinter ) return false; - sal_Bool bSinglePrintJobs = sal_False; + bool bSinglePrintJobs = false; PropertyValue* pSingleValue = i_pController->getValue( OUString( "PrintCollateAsSingleJobs" ) ); if( pSingleValue ) { @@ -574,9 +574,9 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print pFileValue->Value >>= aFile; if( !aFile.isEmpty() ) { - mbPrintFile = sal_True; + mbPrintFile = true; maPrintFile = aFile; - bSinglePrintJobs = sal_False; + bSinglePrintJobs = false; } } @@ -588,10 +588,10 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print maJobName = i_rJobName; mnCurPage = 1; mnCurPrintPage = 1; - mbPrinting = sal_True; + mbPrinting = true; if( GetCapabilities( PRINTER_CAPABILITIES_USEPULLMODEL ) ) { - mbJobActive = sal_True; + mbJobActive = true; // sallayer does all necessary page printing // and also handles showing a dialog // that also means it must call jobStarted when the dialog is finished @@ -612,12 +612,12 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print pSVData->mpDefInst->DestroyPrinter( mpPrinter ); mnCurPage = 0; mnCurPrintPage = 0; - mbPrinting = sal_False; + mbPrinting = false; mpPrinter = NULL; - mbJobActive = sal_False; + mbJobActive = false; GDIMetaFile aDummyFile; - i_pController->setLastPage(sal_True); + i_pController->setLastPage(true); i_pController->getFilteredPageFile(0, aDummyFile); return false; @@ -658,7 +658,7 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print i_pController->isDirectPrint(), maJobSetup.ImplGetConstData() ) ) { - mbJobActive = sal_True; + mbJobActive = true; i_pController->createProgressDialog(); const int nPages = i_pController->getFilteredPageCount(); // abort job, if no pages will be printed. @@ -678,7 +678,7 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print nInnerIteration == nInnerRepeatCount-1 && nJobIteration == nJobs-1 ) { - i_pController->setLastPage( sal_True ); + i_pController->setLastPage( true ); } i_pController->printFilteredPage( nPage ); if( i_pController->isProgressCanceled() ) @@ -705,7 +705,7 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print maJobName = i_rJobName; mnCurPage = 1; mnCurPrintPage = 1; - mbPrinting = sal_True; + mbPrinting = true; } else bError = true; @@ -726,7 +726,7 @@ bool Printer::StartJob( const OUString& i_rJobName, boost::shared_ptr<vcl::Print pSVData->mpDefInst->DestroyPrinter( mpPrinter ); mnCurPage = 0; mnCurPrintPage = 0; - mbPrinting = sal_False; + mbPrinting = false; mpPrinter = NULL; return false; @@ -863,7 +863,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons } else if ( i_rProps[ nProperty ].Name == "PageIncludesNonprintableArea" ) { - sal_Bool bVal = sal_False; + bool bVal = false; i_rProps[ nProperty ].Value >>= bVal; aPageSize.bFullPaper = static_cast<bool>(bVal); } @@ -985,7 +985,7 @@ PrinterController::PageSize PrinterController::getPageFile( int i_nUnfilteredPag o_rMtf.SetPrefSize( aPageSize.aSize ); o_rMtf.SetPrefMapMode( aMapMode ); - mpImplData->mpPrinter->EnableOutput( sal_False ); + mpImplData->mpPrinter->EnableOutput( false ); o_rMtf.Record( mpImplData->mpPrinter.get() ); @@ -999,7 +999,7 @@ PrinterController::PageSize PrinterController::getPageFile( int i_nUnfilteredPag mpImplData->maPageCache.insert( i_nUnfilteredPage, o_rMtf, aPageSize ); // reset "FirstPage" property to false now we've gotten at least our first one - mpImplData->mbFirstPage = sal_False; + mpImplData->mbFirstPage = false; return aPageSize; } @@ -1014,7 +1014,7 @@ static void appendSubPage( GDIMetaFile& o_rMtf, const Rectangle& i_rClipRect, GD o_rMtf.AddAction( new MetaPushAction( PUSH_ALL ) ); // clip to page rect - o_rMtf.AddAction( new MetaClipRegionAction( Region( i_rClipRect ), sal_True ) ); + o_rMtf.AddAction( new MetaClipRegionAction( Region( i_rClipRect ), true ) ); // append the subpage io_rSubPage.WindStart(); @@ -1031,8 +1031,8 @@ static void appendSubPage( GDIMetaFile& o_rMtf, const Rectangle& i_rClipRect, GD o_rMtf.AddAction( new MetaMapModeAction( MapMode( MAP_100TH_MM ) ) ); Rectangle aBorderRect( i_rClipRect ); - o_rMtf.AddAction( new MetaLineColorAction( Color( COL_BLACK ), sal_True ) ); - o_rMtf.AddAction( new MetaFillColorAction( Color( COL_TRANSPARENT ), sal_False ) ); + o_rMtf.AddAction( new MetaLineColorAction( Color( COL_BLACK ), true ) ); + o_rMtf.AddAction( new MetaFillColorAction( Color( COL_TRANSPARENT ), false ) ); o_rMtf.AddAction( new MetaRectAction( aBorderRect ) ); // restore gstate @@ -1085,8 +1085,8 @@ PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilte // set last page property really only on the very last page to be rendered // that is on the last subpage of a NUp run - sal_Bool bIsLastPage = mpImplData->mbLastPage; - mpImplData->mbLastPage = sal_False; + bool bIsLastPage = mpImplData->mbLastPage; + mpImplData->mbLastPage = false; Size aPaperSize( mpImplData->getRealPaperSize( mpImplData->maMultiPage.aPaperSize, false ) ); @@ -1298,7 +1298,7 @@ void PrinterController::printFilteredPage( int i_nPage ) GDIMetaFile aCleanedFile; sal_uLong nRestoreDrawMode = removeTransparencies( aPageFile, aCleanedFile ); - mpImplData->mpPrinter->EnableOutput( sal_True ); + mpImplData->mpPrinter->EnableOutput( true ); // actually print the page mpImplData->mpPrinter->ImplStartPage(); @@ -1326,19 +1326,19 @@ void PrinterController::abortJob() setJobState( view::PrintableState_JOB_ABORTED ); // applications (well, sw) depend on a page request with "IsLastPage" = true // to free resources, else they (well, sw) will crash eventually - setLastPage( sal_True ); + setLastPage( true ); delete mpImplData->mpProgress; mpImplData->mpProgress = NULL; GDIMetaFile aMtf; getPageFile( 0, aMtf, false ); } -void PrinterController::setLastPage( sal_Bool i_bLastPage ) +void PrinterController::setLastPage( bool i_bLastPage ) { mpImplData->mbLastPage = i_bLastPage; } -void PrinterController::setReversePrint( sal_Bool i_bReverse ) +void PrinterController::setReversePrint( bool i_bReverse ) { mpImplData->mbReversePageOrder = i_bReverse; } @@ -1348,7 +1348,7 @@ bool PrinterController::getReversePrint() const return mpImplData->mbReversePageOrder; } -void PrinterController::setPapersizeFromSetup( sal_Bool i_bPapersizeFromSetup ) +void PrinterController::setPapersizeFromSetup( bool i_bPapersizeFromSetup ) { mpImplData->mbPapersizeFromSetup = i_bPapersizeFromSetup; } @@ -1475,7 +1475,7 @@ void PrinterController::setUIOptions( const Sequence< PropertyValue >& i_rOption } else if ( rEntry.Name == "Enabled" ) { - sal_Bool bValue = sal_True; + bool bValue = true; rEntry.Value >>= bValue; bIsEnabled = bValue; } @@ -1537,7 +1537,7 @@ bool PrinterController::isUIOptionEnabled( const OUString& i_rProperty ) const if( pVal ) { sal_Int32 nDepVal = 0; - sal_Bool bDepVal = sal_False; + bool bDepVal = false; if( pVal->Value >>= nDepVal ) { bEnabled = (nDepVal == it->second.mnDependsOnEntry) || (it->second.mnDependsOnEntry == -1); @@ -1605,7 +1605,7 @@ OUString PrinterController::makeEnabled( const OUString& i_rProperty ) if( pVal ) { sal_Int32 nDepVal = 0; - sal_Bool bDepVal = sal_False; + bool bDepVal = false; if( pVal->Value >>= nDepVal ) { if( it->second.mnDependsOnEntry != -1 ) @@ -1615,7 +1615,7 @@ OUString PrinterController::makeEnabled( const OUString& i_rProperty ) } else if( pVal->Value >>= bDepVal ) { - setValue( aDependency, makeAny( sal_Bool( it->second.mnDependsOnEntry != 0 ) ) ); + setValue( aDependency, makeAny( it->second.mnDependsOnEntry != 0 ) ); } else { @@ -1638,7 +1638,7 @@ void PrinterController::createProgressDialog() { if( ! mpImplData->mpProgress ) { - sal_Bool bShow = sal_True; + bool bShow = true; PropertyValue* pMonitor = getValue( OUString( "MonitorVisible" ) ); if( pMonitor ) pMonitor->Value >>= bShow; @@ -1647,7 +1647,7 @@ void PrinterController::createProgressDialog() const css::beans::PropertyValue* pVal = getValue( OUString( "IsApi" ) ); if( pVal ) { - sal_Bool bApi = sal_False; + bool bApi = false; pVal->Value >>= bApi; bShow = ! bApi; } @@ -1690,7 +1690,7 @@ void PrinterController::pushPropertiesToPrinter() const css::beans::PropertyValue* pVal = getValue( OUString( "CopyCount" ) ); if( pVal ) pVal->Value >>= nCopyCount; - sal_Bool bCollate = sal_False; + bool bCollate = false; pVal = getValue( OUString( "Collate" ) ); if( pVal ) pVal->Value >>= bCollate; @@ -1713,19 +1713,19 @@ void PrinterController::pushPropertiesToPrinter() bool PrinterController::isShowDialogs() const { - sal_Bool bApi = getBoolProperty( OUString( "IsApi" ), sal_False ); + bool bApi = getBoolProperty( OUString( "IsApi" ), false ); return ! bApi && ! Application::IsHeadlessModeEnabled(); } bool PrinterController::isDirectPrint() const { - sal_Bool bDirect = getBoolProperty( OUString( "IsDirect" ), sal_False ); - return bDirect == sal_True; + bool bDirect = getBoolProperty( OUString( "IsDirect" ), false ); + return bDirect; } -sal_Bool PrinterController::getBoolProperty( const OUString& i_rProperty, sal_Bool i_bFallback ) const +bool PrinterController::getBoolProperty( const OUString& i_rProperty, bool i_bFallback ) const { - sal_Bool bRet = i_bFallback; + bool bRet = i_bFallback; const css::beans::PropertyValue* pVal = getValue( i_rProperty ); if( pVal ) pVal->Value >>= bRet; @@ -1754,9 +1754,9 @@ Any PrinterOptionsHelper::getValue( const OUString& i_rPropertyName ) const return aRet; } -sal_Bool PrinterOptionsHelper::getBoolValue( const OUString& i_rPropertyName, sal_Bool i_bDefault ) const +bool PrinterOptionsHelper::getBoolValue( const OUString& i_rPropertyName, bool i_bDefault ) const { - sal_Bool bRet = sal_False; + bool bRet = false; Any aVal( getValue( i_rPropertyName ) ); return (aVal >>= bRet) ? bRet : i_bDefault; } @@ -1945,7 +1945,7 @@ Any PrinterOptionsHelper::setBoolControlOpt(const OUString& i_rID, const OUString& i_rTitle, const OUString& i_rHelpId, const OUString& i_rProperty, - sal_Bool i_bValue, + bool i_bValue, const PrinterOptionsHelper::UIControlOptions& i_rControlOptions) { Sequence< OUString > aHelpId; diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index e35f0b424ceb..6e3f7fe06d3d 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -1598,9 +1598,9 @@ SvStream& ReadRegion(SvStream& rIStrm, Region& rRegion) if(aCompat.GetVersion() >= 2) { - sal_Bool bHasPolyPolygon(sal_False); + bool bHasPolyPolygon(false); - rIStrm.ReadUChar( bHasPolyPolygon ); + rIStrm.ReadCharAsBool( bHasPolyPolygon ); if(bHasPolyPolygon) { @@ -1674,7 +1674,7 @@ SvStream& WriteRegion( SvStream& rOStrm, const Region& rRegion ) } // write polypolygon if available - const sal_Bool bHasPolyPolygon(rRegion.HasPolyPolygonOrB2DPolyPolygon()); + const bool bHasPolyPolygon(rRegion.HasPolyPolygonOrB2DPolyPolygon()); rOStrm.WriteUChar( bHasPolyPolygon ); if(bHasPolyPolygon) diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index ab522688e0f5..35f66b58924a 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -167,7 +167,7 @@ void SalGraphics::mirror( long& x, long& nWidth, const OutputDevice *pOutDev, bo } } -sal_Bool SalGraphics::mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack ) const +bool SalGraphics::mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack ) const { long w; if( pOutDev && pOutDev->GetOutDevType() == OUTDEV_VIRDEV ) @@ -240,10 +240,10 @@ sal_Bool SalGraphics::mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoi pPtAry2[j].mnY = pPtAry[i].mnY; } } - return sal_True; + return true; } else - return sal_False; + return false; } void SalGraphics::mirror( Region& rRgn, const OutputDevice *pOutDev, bool bBack ) const @@ -422,7 +422,7 @@ void SalGraphics::DrawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry, cons if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) { SalPoint* pPtAry2 = new SalPoint[nPoints]; - sal_Bool bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); + bool bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); drawPolyLine( nPoints, bCopied ? pPtAry2 : pPtAry ); delete [] pPtAry2; } @@ -435,7 +435,7 @@ void SalGraphics::DrawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry, const if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) { SalPoint* pPtAry2 = new SalPoint[nPoints]; - sal_Bool bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); + bool bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); drawPolygon( nPoints, bCopied ? pPtAry2 : pPtAry ); delete [] pPtAry2; } @@ -480,13 +480,13 @@ bool SalGraphics::DrawPolyPolygon( const basegfx::B2DPolyPolygon& i_rPolyPolygon return bRet; } -sal_Bool SalGraphics::DrawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev ) +bool SalGraphics::DrawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev ) { - sal_Bool bResult = sal_False; + bool bResult = false; if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) { SalPoint* pPtAry2 = new SalPoint[nPoints]; - sal_Bool bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); + bool bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); bResult = drawPolyLineBezier( nPoints, bCopied ? pPtAry2 : pPtAry, pFlgAry ); delete [] pPtAry2; } @@ -495,13 +495,13 @@ sal_Bool SalGraphics::DrawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pP return bResult; } -sal_Bool SalGraphics::DrawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev ) +bool SalGraphics::DrawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry, const OutputDevice* pOutDev ) { - sal_Bool bResult = sal_False; + bool bResult = false; if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) { SalPoint* pPtAry2 = new SalPoint[nPoints]; - sal_Bool bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); + bool bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); bResult = drawPolygonBezier( nPoints, bCopied ? pPtAry2 : pPtAry, pFlgAry ); delete [] pPtAry2; } @@ -510,10 +510,10 @@ sal_Bool SalGraphics::DrawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPt return bResult; } -sal_Bool SalGraphics::DrawPolyPolygonBezier( sal_uInt32 i_nPoly, const sal_uInt32* i_pPoints, +bool SalGraphics::DrawPolyPolygonBezier( sal_uInt32 i_nPoly, const sal_uInt32* i_pPoints, const SalPoint* const* i_pPtAry, const sal_uInt8* const* i_pFlgAry, const OutputDevice* i_pOutDev ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (i_pOutDev && i_pOutDev->IsRTLEnabled()) ) { // TODO: optimize, reduce new/delete calls @@ -645,7 +645,7 @@ void SalGraphics::Invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInve if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) { SalPoint* pPtAry2 = new SalPoint[nPoints]; - sal_Bool bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); + bool bCopied = mirror( nPoints, pPtAry, pPtAry2, pOutDev ); invert( nPoints, bCopied ? pPtAry2 : pPtAry, nFlags ); delete [] pPtAry2; } @@ -653,14 +653,14 @@ void SalGraphics::Invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInve invert( nPoints, pPtAry, nFlags ); } -sal_Bool SalGraphics::DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize, const OutputDevice *pOutDev ) +bool SalGraphics::DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize, const OutputDevice *pOutDev ) { if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) mirror( nX, nWidth, pOutDev ); return drawEPS( nX, nY, nWidth, nHeight, pPtr, nSize ); } -sal_Bool SalGraphics::HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, +bool SalGraphics::HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, bool& rIsInside, const OutputDevice *pOutDev ) { if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) @@ -710,7 +710,7 @@ void SalGraphics::mirror( ImplControlValue& rVal, const OutputDevice* pOutDev, b } } -sal_Bool SalGraphics::DrawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, +bool SalGraphics::DrawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption, const OutputDevice *pOutDev ) { @@ -720,14 +720,14 @@ sal_Bool SalGraphics::DrawNativeControl( ControlType nType, ControlPart nPart, c mirror( rgn, pOutDev ); boost::scoped_ptr< ImplControlValue > mirrorValue( aValue.clone()); mirror( *mirrorValue, pOutDev ); - sal_Bool bRet = drawNativeControl( nType, nPart, rgn, nState, *mirrorValue, aCaption ); + bool bRet = drawNativeControl( nType, nPart, rgn, nState, *mirrorValue, aCaption ); return bRet; } else return drawNativeControl( nType, nPart, rControlRegion, nState, aValue, aCaption ); } -sal_Bool SalGraphics::GetNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, +bool SalGraphics::GetNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion, const OutputDevice *pOutDev ) { @@ -742,9 +742,9 @@ sal_Bool SalGraphics::GetNativeControlRegion( ControlType nType, ControlPart nPa { mirror( rNativeBoundingRegion, pOutDev, true ); mirror( rNativeContentRegion, pOutDev, true ); - return sal_True; + return true; } - return sal_False; + return false; } else return getNativeControlRegion( nType, nPart, rControlRegion, nState, aValue, aCaption, diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx index bd97f0d67b7b..8e8ee1240caf 100644 --- a/vcl/source/gdi/salnativewidgets-none.cxx +++ b/vcl/source/gdi/salnativewidgets-none.cxx @@ -32,9 +32,9 @@ * Returns sal_True if the platform supports native * drawing of the control defined by nPart */ -sal_Bool SalGraphics::IsNativeControlSupported( ControlType, ControlPart ) +bool SalGraphics::IsNativeControlSupported( ControlType, ControlPart ) { - return( sal_False ); + return false; } @@ -45,13 +45,13 @@ sal_Bool SalGraphics::IsNativeControlSupported( ControlType, ControlPart ) * aPos was or was not inside the native widget specified by the * nType/nPart combination. */ -sal_Bool SalGraphics::hitTestNativeControl( ControlType, +bool SalGraphics::hitTestNativeControl( ControlType, ControlPart, const Rectangle&, const Point&, bool& ) { - return( sal_False ); + return false; } @@ -64,14 +64,14 @@ sal_Bool SalGraphics::hitTestNativeControl( ControlType, * aValue: An optional value (tristate/numerical/string) * aCaption: A caption or title string (like button text etc) */ -sal_Bool SalGraphics::drawNativeControl( ControlType, +bool SalGraphics::drawNativeControl( ControlType, ControlPart, const Rectangle&, ControlState, const ImplControlValue&, const OUString& ) { - return( sal_False ); + return false; } /* @@ -87,7 +87,7 @@ sal_Bool SalGraphics::drawNativeControl( ControlType, * aValue: An optional value (tristate/numerical/string) * aCaption: A caption or title string (like button text etc) */ -sal_Bool SalGraphics::getNativeControlRegion( ControlType, +bool SalGraphics::getNativeControlRegion( ControlType, ControlPart, const Rectangle&, ControlState, @@ -96,7 +96,7 @@ sal_Bool SalGraphics::getNativeControlRegion( ControlType, Rectangle &, Rectangle & ) { - return( sal_False ); + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index a7b3633ddf2d..2602dbc3d7f8 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -73,7 +73,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev, mnBitCount = ( nBitCount ? nBitCount : pOutDev->GetBitCount() ); mnOutWidth = nDX; mnOutHeight = nDY; - mbScreenComp = sal_True; + mbScreenComp = true; mnAlphaDepth = -1; // #i59315# init vdev size from system object, when passed a @@ -86,7 +86,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev, SetAntialiasing( ANTIALIASING_DISABLE_TEXT ); if ( pOutDev->GetOutDevType() == OUTDEV_PRINTER ) - mbScreenComp = sal_False; + mbScreenComp = false; else if ( pOutDev->GetOutDevType() == OUTDEV_VIRDEV ) mbScreenComp = ((VirtualDevice*)pOutDev)->mbScreenComp; @@ -203,24 +203,24 @@ VirtualDevice::~VirtualDevice() // ----------------------------------------------------------------------- -sal_Bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, sal_Bool bErase, const basebmp::RawMemorySharedArray &pBuffer ) +bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bErase, const basebmp::RawMemorySharedArray &pBuffer ) { SAL_INFO( "vcl.gdi", "VirtualDevice::InnerImplSetOutputSizePixel( " << rNewSize.Width() << ", " << rNewSize.Height() << ", " << int(bErase) << " )" ); if ( !mpVirDev ) - return sal_False; + return false; else if ( rNewSize == GetOutputSizePixel() ) { if ( bErase ) Erase(); // Yeah, so trying to re-use a VirtualDevice but this time using a // pre-allocated buffer won't work. Big deal. - return sal_True; + return true; } - sal_Bool bRet; + bool bRet; long nNewWidth = rNewSize.Width(), nNewHeight = rNewSize.Height(); if ( nNewWidth < 1 ) @@ -252,7 +252,7 @@ sal_Bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, sal_B if ( !mpGraphics ) { if ( !ImplGetGraphics() ) - return sal_False; + return false; } pNewVirDev = pSVData->mpDefInst->CreateVirtualDevice( mpGraphics, nNewWidth, nNewHeight, mnBitCount ); @@ -288,16 +288,16 @@ sal_Bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, sal_B mpVirDev = pNewVirDev; mnOutWidth = rNewSize.Width(); mnOutHeight = rNewSize.Height(); - bRet = sal_True; + bRet = true; } else { - bRet = sal_False; + bRet = false; pSVData->mpDefInst->DestroyVirtualDevice( pNewVirDev ); } } else - bRet = sal_False; + bRet = false; } return bRet; @@ -321,7 +321,7 @@ void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect ) // ----------------------------------------------------------------------- -sal_Bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, sal_Bool bErase, const basebmp::RawMemorySharedArray &pBuffer ) +bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase, const basebmp::RawMemorySharedArray &pBuffer ) { if( InnerImplSetOutputSizePixel(rNewSize, bErase, pBuffer) ) { @@ -350,18 +350,18 @@ sal_Bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, sal_Bool b mpAlphaVDev->SetMapMode( GetMapMode() ); } - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool VirtualDevice::SetOutputSizePixel( const Size& rNewSize, sal_Bool bErase ) +bool VirtualDevice::SetOutputSizePixel( const Size& rNewSize, bool bErase ) { return ImplSetOutputSizePixel( rNewSize, bErase, basebmp::RawMemorySharedArray() ); } -sal_Bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize, const Fraction& rScale, const Point& rNewOffset, const basebmp::RawMemorySharedArray &pBuffer ) +bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize, const Fraction& rScale, const Point& rNewOffset, const basebmp::RawMemorySharedArray &pBuffer ) { if (pBuffer) { MapMode mm = GetMapMode(); @@ -370,7 +370,7 @@ sal_Bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNew mm.SetScaleY( rScale ); SetMapMode( mm ); } - return ImplSetOutputSizePixel( rNewSize, sal_True, pBuffer); + return ImplSetOutputSizePixel( rNewSize, true, pBuffer); } // ----------------------------------------------------------------------- @@ -408,8 +408,8 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32 mnDPIY = i_nDPIY; mnDPIScaleFactor = 1; - EnableOutput( sal_False ); // prevent output on reference device - mbScreenComp = sal_False; + EnableOutput( false ); // prevent output on reference device + mbScreenComp = false; // invalidate currently selected fonts mbInitFont = true; diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx index f6d7d59b34af..7c08e016b5cb 100644 --- a/vcl/source/gdi/wall.cxx +++ b/vcl/source/gdi/wall.cxx @@ -118,9 +118,9 @@ SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) // version 2 if( aCompat.GetVersion() >= 2 ) { - sal_Bool bRect, bGrad, bBmp, bDummy; + bool bRect, bGrad, bBmp, bDummy; - rIStm.ReadUChar( bRect ).ReadUChar( bGrad ).ReadUChar( bBmp ).ReadUChar( bDummy ).ReadUChar( bDummy ).ReadUChar( bDummy ); + rIStm.ReadCharAsBool( bRect ).ReadCharAsBool( bGrad ).ReadCharAsBool( bBmp ).ReadCharAsBool( bDummy ).ReadCharAsBool( bDummy ).ReadCharAsBool( bDummy ); if( bRect ) { @@ -155,10 +155,10 @@ SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper ) SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpaper ) { VersionCompat aCompat( rOStm, STREAM_WRITE, 3 ); - sal_Bool bRect = ( rImplWallpaper.mpRect != NULL ); - sal_Bool bGrad = ( rImplWallpaper.mpGradient != NULL ); - sal_Bool bBmp = ( rImplWallpaper.mpBitmap != NULL ); - sal_Bool bDummy = sal_False; + bool bRect = ( rImplWallpaper.mpRect != NULL ); + bool bGrad = ( rImplWallpaper.mpGradient != NULL ); + bool bBmp = ( rImplWallpaper.mpBitmap != NULL ); + bool bDummy = false; // version 1 WriteColor( rOStm, rImplWallpaper.maColor ); @@ -184,7 +184,7 @@ SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpap // ----------------------------------------------------------------------- -inline void Wallpaper::ImplMakeUnique( sal_Bool bReleaseCache ) +inline void Wallpaper::ImplMakeUnique( bool bReleaseCache ) { // copy them if other references exist if ( mpImplWallpaper->mnRefCount != 1 ) @@ -292,7 +292,7 @@ const Color& Wallpaper::GetColor() const void Wallpaper::SetStyle( WallpaperStyle eStyle ) { - ImplMakeUnique( sal_False ); + ImplMakeUnique( false ); if( eStyle == WALLPAPER_APPLICATIONGRADIENT ) // set a dummy gradient, the correct gradient @@ -353,7 +353,7 @@ BitmapEx Wallpaper::GetBitmap() const // ----------------------------------------------------------------------- -sal_Bool Wallpaper::IsBitmap() const +bool Wallpaper::IsBitmap() const { return (mpImplWallpaper->mpBitmap != 0); @@ -394,7 +394,7 @@ Gradient Wallpaper::GetGradient() const // ----------------------------------------------------------------------- -sal_Bool Wallpaper::IsGradient() const +bool Wallpaper::IsGradient() const { return (mpImplWallpaper->mpGradient != 0); @@ -422,7 +422,7 @@ Gradient Wallpaper::ImplGetApplicationGradient() const void Wallpaper::SetRect( const Rectangle& rRect ) { - ImplMakeUnique( sal_False ); + ImplMakeUnique( false ); if ( rRect.IsEmpty() ) { @@ -457,7 +457,7 @@ Rectangle Wallpaper::GetRect() const // ----------------------------------------------------------------------- -sal_Bool Wallpaper::IsRect() const +bool Wallpaper::IsRect() const { return (mpImplWallpaper->mpRect != 0); @@ -466,26 +466,26 @@ sal_Bool Wallpaper::IsRect() const // ----------------------------------------------------------------------- -sal_Bool Wallpaper::IsFixed() const +bool Wallpaper::IsFixed() const { if ( mpImplWallpaper->meStyle == WALLPAPER_NULL ) - return sal_False; + return false; else return (!mpImplWallpaper->mpBitmap && !mpImplWallpaper->mpGradient); } // ----------------------------------------------------------------------- -sal_Bool Wallpaper::IsScrollable() const +bool Wallpaper::IsScrollable() const { if ( mpImplWallpaper->meStyle == WALLPAPER_NULL ) - return sal_False; + return false; else if ( !mpImplWallpaper->mpBitmap && !mpImplWallpaper->mpGradient ) - return sal_True; + return true; else if ( mpImplWallpaper->mpBitmap ) return (mpImplWallpaper->meStyle == WALLPAPER_TILE); else - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -515,35 +515,35 @@ Wallpaper& Wallpaper::operator=( const Wallpaper& rWallpaper ) // ----------------------------------------------------------------------- -sal_Bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const +bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const { if ( mpImplWallpaper == rWallpaper.mpImplWallpaper ) - return sal_True; + return true; if ( ( mpImplWallpaper->meStyle != rWallpaper.mpImplWallpaper->meStyle ) || ( mpImplWallpaper->maColor != rWallpaper.mpImplWallpaper->maColor ) ) - return sal_False; + return false; if ( mpImplWallpaper->mpRect != rWallpaper.mpImplWallpaper->mpRect && ( !mpImplWallpaper->mpRect || !rWallpaper.mpImplWallpaper->mpRect || *(mpImplWallpaper->mpRect) != *(rWallpaper.mpImplWallpaper->mpRect) ) ) - return sal_False; + return false; if ( mpImplWallpaper->mpBitmap != rWallpaper.mpImplWallpaper->mpBitmap && ( !mpImplWallpaper->mpBitmap || !rWallpaper.mpImplWallpaper->mpBitmap || *(mpImplWallpaper->mpBitmap) != *(rWallpaper.mpImplWallpaper->mpBitmap) ) ) - return sal_False; + return false; if ( mpImplWallpaper->mpGradient != rWallpaper.mpImplWallpaper->mpGradient && ( !mpImplWallpaper->mpGradient || !rWallpaper.mpImplWallpaper->mpGradient || *(mpImplWallpaper->mpGradient) != *(rWallpaper.mpImplWallpaper->mpGradient) ) ) - return sal_False; + return false; - return sal_True; + return true; } // ----------------------------------------------------------------------- diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx index e3676dcb3ccd..996463b84eb7 100644 --- a/vcl/source/helper/lazydelete.cxx +++ b/vcl/source/helper/lazydelete.cxx @@ -57,7 +57,7 @@ void LazyDelete::flush() // specialized is_less function for Window template<> bool LazyDeletor<Window>::is_less( Window* left, Window* right ) { - return (left != right && right->IsChild( left, sal_True )) ? true : false; + return (left != right && right->IsChild( left, true )) ? true : false; } #ifndef LINUX diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index 345b0aba8fe9..4ded993eb491 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -161,7 +161,7 @@ void Accelerator::ImplInit() { mnCurId = 0; mnCurRepeat = 0; - mbIsCancel = sal_False; + mbIsCancel = false; mpDel = NULL; } @@ -217,7 +217,7 @@ void Accelerator::ImplDeleteData() // ----------------------------------------------------------------------- void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, - sal_Bool bEnable, Accelerator* pAutoAccel ) + bool bEnable, Accelerator* pAutoAccel ) { DBG_ASSERT( nItemId, "Accelerator::InsertItem(): ItemId == 0" ); @@ -356,7 +356,7 @@ void Accelerator::Select() void Accelerator::InsertItem( sal_uInt16 nItemId, const KeyCode& rKeyCode ) { - ImplInsertAccel( nItemId, rKeyCode, sal_True, NULL ); + ImplInsertAccel( nItemId, rKeyCode, true, NULL ); } // ----------------------------------------------------------------------- @@ -447,7 +447,7 @@ Accelerator& Accelerator::operator=( const Accelerator& rAccel ) maCurKeyCode = KeyCode(); mnCurId = 0; mnCurRepeat = 0; - mbIsCancel = sal_False; + mbIsCancel = false; // delete and copy tables ImplDeleteData(); diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx index 8c0cb32888a0..5fe29c0e3341 100644 --- a/vcl/source/window/accmgr.cxx +++ b/vcl/source/window/accmgr.cxx @@ -37,20 +37,20 @@ ImplAccelManager::~ImplAccelManager() // ----------------------------------------------------------------------- -sal_Bool ImplAccelManager::InsertAccel( Accelerator* pAccel ) +bool ImplAccelManager::InsertAccel( Accelerator* pAccel ) { if ( !mpAccelList ) { mpAccelList = new ImplAccelList; } else { for ( size_t i = 0, n = mpAccelList->size(); i < n; ++i ) { if ( (*mpAccelList)[ i ] == pAccel ) { - return sal_False; + return false; } } } mpAccelList->insert( mpAccelList->begin(), pAccel ); - return sal_True; + return true; } // ----------------------------------------------------------------------- @@ -92,7 +92,7 @@ void ImplAccelManager::RemoveAccel( Accelerator* pAccel ) // ----------------------------------------------------------------------- -void ImplAccelManager::EndSequence( sal_Bool bCancel ) +void ImplAccelManager::EndSequence( bool bCancel ) { // are we in a list ? if ( !mpSequenceList ) @@ -108,7 +108,7 @@ void ImplAccelManager::EndSequence( sal_Bool bCancel ) pTempAccel->Deactivate(); if ( !bDel ) { - pTempAccel->mbIsCancel = sal_False; + pTempAccel->mbIsCancel = false; pTempAccel->mpDel = NULL; } } @@ -120,15 +120,15 @@ void ImplAccelManager::EndSequence( sal_Bool bCancel ) // ----------------------------------------------------------------------- -sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ) +bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ) { Accelerator* pAccel; // do we have accelerators ?? if ( !mpAccelList ) - return sal_False; + return false; if ( mpAccelList->empty() ) - return sal_False; + return false; // are we in a sequence ? if ( mpSequenceList ) @@ -140,7 +140,7 @@ sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepe { // abort sequence FlushAccel(); - return sal_False; + return false; } // can the entry be found ? @@ -157,7 +157,7 @@ sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepe // call Activate-Handler of the new one pNextAccel->Activate(); - return sal_True; + return true; } else { @@ -185,14 +185,14 @@ sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepe pAccel->mpDel = NULL; } - return sal_True; + return true; } else { // stop sequence as the accelerator was disbled // transfer the key (to the system) FlushAccel(); - return sal_False; + return false; } } } @@ -200,7 +200,7 @@ sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepe { // wrong key => stop sequence FlushAccel(); - return sal_False; + return false; } } @@ -227,7 +227,7 @@ sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepe // call activate-Handler of the new one pNextAccel->Activate(); - return sal_True; + return true; } else { @@ -256,15 +256,15 @@ sal_Bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepe pAccel->mpDel = NULL; } - return sal_True; + return true; } else - return sal_False; + return false; } } } - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index c9ead5972c9b..b68b4ab9ae51 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star::uno; // ======================================================================= -static void ImplGetPinImage( sal_uInt16 nStyle, sal_Bool bPinIn, Image& rImage ) +static void ImplGetPinImage( sal_uInt16 nStyle, bool bPinIn, Image& rImage ) { // load ImageList if not available yet ImplSVData* pSVData = ImplGetSVData(); @@ -132,7 +132,7 @@ static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev, pWin->SetLineColor(); pWin->DrawRect( rRect ); pWin->DrawSelectionBackground( rRect, 2, (nState & BUTTON_DRAW_PRESSED) ? sal_True : sal_False, - sal_True, sal_False ); + true, false ); } aTempRect = rRect; aTempRect.Left()+=3; @@ -161,23 +161,23 @@ ImplBorderWindowView::~ImplBorderWindowView() // ----------------------------------------------------------------------- -sal_Bool ImplBorderWindowView::MouseMove( const MouseEvent& ) +bool ImplBorderWindowView::MouseMove( const MouseEvent& ) { - return sal_False; + return false; } // ----------------------------------------------------------------------- -sal_Bool ImplBorderWindowView::MouseButtonDown( const MouseEvent& ) +bool ImplBorderWindowView::MouseButtonDown( const MouseEvent& ) { - return sal_False; + return false; } // ----------------------------------------------------------------------- -sal_Bool ImplBorderWindowView::Tracking( const TrackingEvent& ) +bool ImplBorderWindowView::Tracking( const TrackingEvent& ) { - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -311,7 +311,7 @@ sal_uInt16 ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const // ----------------------------------------------------------------------- -sal_Bool ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt ) +bool ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt ) { sal_uInt16 oldCloseState = pData->mnCloseState; sal_uInt16 oldMenuState = pData->mnMenuState; @@ -348,12 +348,12 @@ sal_Bool ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const if( pData->mnMenuState != oldMenuState ) pData->mpBorderWindow->Invalidate( pData->maMenuRect ); - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt ) +bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt ) { ImplBorderWindow* pBorderWindow = pData->mpBorderWindow; @@ -458,9 +458,9 @@ sal_Bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, if ( bTracking ) { - pData->mbDragFull = sal_False; + pData->mbDragFull = false; if ( nDragFullTest ) - pData->mbDragFull = sal_True; // always fulldrag for proper docking, ignore system settings + pData->mbDragFull = true; // always fulldrag for proper docking, ignore system settings pBorderWindow->StartTracking(); } else if ( bHitTest ) @@ -468,12 +468,12 @@ sal_Bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, } } - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt ) +bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt ) { ImplBorderWindow* pBorderWindow = pData->mpBorderWindow; @@ -921,7 +921,7 @@ sal_Bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const T } } - return sal_True; + return true; } // ----------------------------------------------------------------------- @@ -1167,16 +1167,16 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei if( mnWidth && mnHeight ) { - mpBorderWindow->SetPaintTransparent( sal_True ); + mpBorderWindow->SetPaintTransparent( true ); mpBorderWindow->SetBackground(); - pCtrl->SetPaintTransparent( sal_True ); + pCtrl->SetPaintTransparent( true ); Window* pCompoundParent = NULL; if( pWin->GetParent() && pWin->GetParent()->IsCompoundControl() ) pCompoundParent = pWin->GetParent(); if( pCompoundParent ) - pCompoundParent->SetPaintTransparent( sal_True ); + pCompoundParent->SetPaintTransparent( true ); if( mnWidth < aBounds.GetWidth() || mnHeight < aBounds.GetHeight() ) { @@ -1260,7 +1260,7 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* if ( nBorderStyle & WINDOW_BORDER_NOBORDER ) return; - sal_Bool bNativeOK = sal_False; + bool bNativeOK = false; // for native widget drawing we must find out what // control this border belongs to Window *pWin = NULL, *pCtrl = NULL; @@ -1352,9 +1352,9 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* nState |= CTRL_STATE_FOCUSED; } - sal_Bool bMouseOver = sal_False; + bool bMouseOver = false; Window *pCtrlChild = pCtrl->GetWindow( WINDOW_FIRSTCHILD ); - while( pCtrlChild && (bMouseOver = pCtrlChild->IsMouseOver()) == sal_False ) + while( pCtrlChild && !(bMouseOver = pCtrlChild->IsMouseOver()) ) pCtrlChild = pCtrlChild->GetWindow( WINDOW_NEXT ); if( bMouseOver ) @@ -1423,7 +1423,7 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow ) { maFrameData.mpBorderWindow = pBorderWindow; - maFrameData.mbDragFull = sal_False; + maFrameData.mbDragFull = false; maFrameData.mnHitTest = 0; maFrameData.mnPinState = 0; maFrameData.mnCloseState = 0; @@ -1432,7 +1432,7 @@ ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindo maFrameData.mnMenuState = 0; maFrameData.mnHideState = 0; maFrameData.mnHelpState = 0; - maFrameData.mbTitleClipped = 0; + maFrameData.mbTitleClipped = false; mpATitleVirDev = NULL; mpDTitleVirDev = NULL; @@ -1448,21 +1448,21 @@ ImplStdBorderWindowView::~ImplStdBorderWindowView() // ----------------------------------------------------------------------- -sal_Bool ImplStdBorderWindowView::MouseMove( const MouseEvent& rMEvt ) +bool ImplStdBorderWindowView::MouseMove( const MouseEvent& rMEvt ) { return ImplMouseMove( &maFrameData, rMEvt ); } // ----------------------------------------------------------------------- -sal_Bool ImplStdBorderWindowView::MouseButtonDown( const MouseEvent& rMEvt ) +bool ImplStdBorderWindowView::MouseButtonDown( const MouseEvent& rMEvt ) { return ImplMouseButtonDown( &maFrameData, rMEvt ); } // ----------------------------------------------------------------------- -sal_Bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) +bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) { return ImplTracking( &maFrameData, rTEvt ); } @@ -1545,7 +1545,7 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh if ( pBorderWindow->GetStyle() & WB_PINABLE ) { Image aImage; - ImplGetPinImage( 0, 0, aImage ); + ImplGetPinImage( 0, false, aImage ); pData->maPinRect.Top() = nItemTop; pData->maPinRect.Bottom() = nItemBottom; pData->maPinRect.Left() = nLeft; @@ -1868,14 +1868,14 @@ void ImplBorderWindow::ImplInit( Window* pParent, nStyle &= nTestStyle; mpWindowImpl->mbBorderWin = true; - mbSmallOutBorder = sal_False; + mbSmallOutBorder = false; if ( nTypeStyle & BORDERWINDOW_STYLE_FRAME ) { if( (nStyle & WB_SYSTEMCHILDWINDOW) ) { mpWindowImpl->mbOverlapWin = true; mpWindowImpl->mbFrame = true; - mbFrameBorder = sal_False; + mbFrameBorder = false; } else if( (nStyle & (WB_OWNERDRAWDECORATION | WB_POPUP)) ) { @@ -1887,24 +1887,24 @@ void ImplBorderWindow::ImplInit( Window* pParent, { mpWindowImpl->mbOverlapWin = true; mpWindowImpl->mbFrame = true; - mbFrameBorder = sal_False; + mbFrameBorder = false; // closeable windows may have a border as well, eg. system floating windows without caption if ( (nOrgStyle & (WB_BORDER | WB_NOBORDER | WB_MOVEABLE | WB_SIZEABLE/* | WB_CLOSEABLE*/)) == WB_BORDER ) - mbSmallOutBorder = sal_True; + mbSmallOutBorder = true; } } else if ( nTypeStyle & BORDERWINDOW_STYLE_OVERLAP ) { mpWindowImpl->mbOverlapWin = true; - mbFrameBorder = sal_True; + mbFrameBorder = true; } else - mbFrameBorder = sal_False; + mbFrameBorder = false; if ( nTypeStyle & BORDERWINDOW_STYLE_FLOAT ) - mbFloatWindow = sal_True; + mbFloatWindow = true; else - mbFloatWindow = sal_False; + mbFloatWindow = false; Window::ImplInit( pParent, nStyle, pSystemParentData ); SetBackground(); @@ -1917,12 +1917,12 @@ void ImplBorderWindow::ImplInit( Window* pParent, mnMaxHeight = SHRT_MAX; mnRollHeight = 0; mnOrgMenuHeight = 0; - mbPined = sal_False; - mbRollUp = sal_False; - mbMenuHide = sal_False; - mbDockBtn = sal_False; - mbMenuBtn = sal_False; - mbHideBtn = sal_False; + mbPined = false; + mbRollUp = false; + mbMenuHide = false; + mbDockBtn = false; + mbMenuBtn = false; + mbHideBtn = false; mbDisplayActive = IsActive(); if ( nTypeStyle & BORDERWINDOW_STYLE_FLOAT ) @@ -1996,7 +1996,7 @@ void ImplBorderWindow::Draw( const Rectangle&, OutputDevice* pOutDev, const Poin void ImplBorderWindow::Activate() { - SetDisplayActive( sal_True ); + SetDisplayActive( true ); Window::Activate(); } @@ -2007,7 +2007,7 @@ void ImplBorderWindow::Deactivate() // remove active windows from the ruler, also ignore the Deactivate // if a menu becomes active if ( GetActivateMode() && !ImplGetSVData()->maWinData.mbNoDeactivate ) - SetDisplayActive( sal_False ); + SetDisplayActive( false ); Window::Deactivate(); } @@ -2121,7 +2121,7 @@ void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt ) (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) { if ( !mpWindowImpl->mbFrame || (GetStyle() & (WB_OWNERDRAWDECORATION | WB_POPUP)) ) - UpdateView( sal_True, ImplGetWindow()->GetOutputSizePixel() ); + UpdateView( true, ImplGetWindow()->GetOutputSizePixel() ); } Window::DataChanged( rDCEvt ); @@ -2150,7 +2150,7 @@ void ImplBorderWindow::InitView() // ----------------------------------------------------------------------- -void ImplBorderWindow::UpdateView( sal_Bool bNewView, const Size& rNewOutSize ) +void ImplBorderWindow::UpdateView( bool bNewView, const Size& rNewOutSize ) { sal_Int32 nLeftBorder; sal_Int32 nTopBorder; @@ -2226,7 +2226,7 @@ void ImplBorderWindow::InvalidateBorder() // ----------------------------------------------------------------------- -void ImplBorderWindow::SetDisplayActive( sal_Bool bActive ) +void ImplBorderWindow::SetDisplayActive( bool bActive ) { if ( mbDisplayActive != bActive ) { @@ -2241,7 +2241,7 @@ void ImplBorderWindow::SetDisplayActive( sal_Bool bActive ) void ImplBorderWindow::SetTitleType( sal_uInt16 nTitleType, const Size& rSize ) { mnTitleType = nTitleType; - UpdateView( sal_False, rSize ); + UpdateView( false, rSize ); } // ----------------------------------------------------------------------- @@ -2251,13 +2251,13 @@ void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle ) if ( !mbFrameBorder && (mnBorderStyle != nStyle) ) { mnBorderStyle = nStyle; - UpdateView( sal_False, ImplGetWindow()->GetOutputSizePixel() ); + UpdateView( false, ImplGetWindow()->GetOutputSizePixel() ); } } // ----------------------------------------------------------------------- -void ImplBorderWindow::SetPin( sal_Bool bPin ) +void ImplBorderWindow::SetPin( bool bPin ) { mbPined = bPin; InvalidateBorder(); @@ -2265,11 +2265,11 @@ void ImplBorderWindow::SetPin( sal_Bool bPin ) // ----------------------------------------------------------------------- -void ImplBorderWindow::SetRollUp( sal_Bool bRollUp, const Size& rSize ) +void ImplBorderWindow::SetRollUp( bool bRollUp, const Size& rSize ) { mbRollUp = bRollUp; mnRollHeight = rSize.Height(); - UpdateView( sal_False, rSize ); + UpdateView( false, rSize ); } // ----------------------------------------------------------------------- @@ -2284,7 +2284,7 @@ void ImplBorderWindow::SetCloser() // ----------------------------------------------------------------------- -void ImplBorderWindow::SetDockButton( sal_Bool bDockButton ) +void ImplBorderWindow::SetDockButton( bool bDockButton ) { mbDockBtn = bDockButton; Size aSize = GetOutputSizePixel(); @@ -2294,7 +2294,7 @@ void ImplBorderWindow::SetDockButton( sal_Bool bDockButton ) // ----------------------------------------------------------------------- -void ImplBorderWindow::SetHideButton( sal_Bool bHideButton ) +void ImplBorderWindow::SetHideButton( bool bHideButton ) { mbHideBtn = bHideButton; Size aSize = GetOutputSizePixel(); @@ -2304,7 +2304,7 @@ void ImplBorderWindow::SetHideButton( sal_Bool bHideButton ) // ----------------------------------------------------------------------- -void ImplBorderWindow::SetMenuButton( sal_Bool bMenuButton ) +void ImplBorderWindow::SetMenuButton( bool bMenuButton ) { mbMenuBtn = bMenuButton; Size aSize = GetOutputSizePixel(); @@ -2331,7 +2331,7 @@ void ImplBorderWindow::SetMenuBarWindow( Window* pWindow ) // ----------------------------------------------------------------------- -void ImplBorderWindow::SetMenuBarMode( sal_Bool bHide ) +void ImplBorderWindow::SetMenuBarMode( bool bHide ) { mbMenuHide = bHide; UpdateMenuHeight(); diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index af5bead656c2..9bc6a3eedccf 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -42,7 +42,7 @@ void ButtonDialog::ImplInitButtonDialogData() mnButtonSize = 0; mnCurButtonId = 0; mnFocusButtonId = BUTTONDIALOG_BUTTON_NOTFOUND; - mbFormat = sal_True; + mbFormat = true; } ButtonDialog::ButtonDialog( WindowType nType ) : @@ -204,7 +204,7 @@ void ButtonDialog::ImplPosControls() SetOutputSizePixel( aDlgSize ); - mbFormat = sal_False; + mbFormat = false; } IMPL_LINK( ButtonDialog, ImplClickHdl, PushButton*, pBtn ) @@ -285,7 +285,7 @@ void ButtonDialog::AddButton( const OUString& rText, sal_uInt16 nId, if ( nBtnFlags & BUTTONDIALOG_FOCUSBUTTON ) mnFocusButtonId = nId; - mbFormat = sal_True; + mbFormat = true; } void ButtonDialog::AddButton( StandardButtonType eType, sal_uInt16 nId, @@ -318,7 +318,7 @@ void ButtonDialog::AddButton( StandardButtonType eType, sal_uInt16 nId, maItemList.push_back(pItem); - mbFormat = sal_True; + mbFormat = true; } void ButtonDialog::RemoveButton( sal_uInt16 nId ) @@ -353,7 +353,7 @@ void ButtonDialog::Clear() } maItemList.clear(); - mbFormat = sal_True; + mbFormat = true; } sal_uInt16 ButtonDialog::GetButtonId( sal_uInt16 nButton ) const @@ -381,7 +381,7 @@ void ButtonDialog::SetButtonText( sal_uInt16 nId, const OUString& rText ) if ( pItem ) { pItem->mpPushButton->SetText( rText ); - mbFormat = sal_True; + mbFormat = true; } } diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index 37c6b8c4b5da..169aeb2dea96 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -841,7 +841,7 @@ void DecorationView::DrawSymbol( const Rectangle& rRect, SymbolType eType, const Color aOldFillColor = mpOutDev->GetFillColor(); const bool bOldMapMode = mpOutDev->IsMapModeEnabled(); Color nColor(rColor); - mpOutDev->EnableMapMode( sal_False ); + mpOutDev->EnableMapMode( false ); if ( (rStyleSettings.GetOptions() & STYLE_OPTION_MONO) || (mpOutDev->GetOutDevType() == OUTDEV_PRINTER) ) @@ -945,11 +945,11 @@ void DecorationView::DrawHighlightFrame( const Rectangle& rRect, Rectangle DecorationView::DrawFrame( const Rectangle& rRect, sal_uInt16 nStyle ) { Rectangle aRect = rRect; - sal_Bool bOldMap = mpOutDev->IsMapModeEnabled(); + bool bOldMap = mpOutDev->IsMapModeEnabled(); if ( bOldMap ) { aRect = mpOutDev->LogicToPixel( aRect ); - mpOutDev->EnableMapMode( sal_False ); + mpOutDev->EnableMapMode( false ); } if ( !rRect.IsEmpty() ) diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index d9b66f3053c3..e2a18ba7f977 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -356,10 +356,10 @@ void Dialog::ImplInitDialogData() mpWindowImpl->mbDialog = true; mpDialogParent = NULL; mpPrevExecuteDlg = NULL; - mbInExecute = sal_False; - mbOldSaveBack = sal_False; - mbInClose = sal_False; - mbModalMode = sal_False; + mbInExecute = false; + mbOldSaveBack = false; + mbInClose = false; + mbModalMode = false; mpContentArea = NULL; mpActionArea = NULL; mbIsCalculatingInitialLayoutSize = false; @@ -401,7 +401,7 @@ void Dialog::ImplInit( Window* pParent, WinBits nStyle ) while ( pExeDlg ) { // only if visible and enabled - if ( pParent->ImplGetFirstOverlapWindow()->IsWindowOrChild( pExeDlg, sal_True ) && + if ( pParent->ImplGetFirstOverlapWindow()->IsWindowOrChild( pExeDlg, true ) && pExeDlg->IsReallyVisible() && pExeDlg->IsEnabled() && pExeDlg->IsInputEnabled() && !pExeDlg->IsInModalMode() ) { @@ -467,7 +467,7 @@ void Dialog::ImplInitSettings() else if( IsNativeControlSupported( CTRL_WINDOW_BACKGROUND, PART_BACKGROUND_DIALOG ) ) { mpWindowImpl->mnNativeBackground = PART_BACKGROUND_DIALOG; - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); } // fallback to settings color else @@ -627,8 +627,8 @@ bool Dialog::Notify( NotifyEvent& rNEvt ) if( mbInExecute && mbModalMode ) { // do not change modal counter (pSVData->maAppData.mnModalDialog) - SetModalInputMode( sal_False ); - SetModalInputMode( sal_True ); + SetModalInputMode( false ); + SetModalInputMode( true ); // #93022# def-button might have changed after show if( !mnMousePositioned ) @@ -753,23 +753,23 @@ void Dialog::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -sal_Bool Dialog::Close() +bool Dialog::Close() { ImplDelData aDelData; ImplAddDel( &aDelData ); ImplCallEventListeners( VCLEVENT_WINDOW_CLOSE ); if ( aDelData.IsDead() ) - return sal_False; + return false; ImplRemoveDel( &aDelData ); if ( mpWindowImpl->mxWindowPeer.is() && IsCreatedWithToolkit() && !IsInExecute() ) - return sal_False; + return false; - mbInClose = sal_True; + mbInClose = true; if ( !(GetStyle() & WB_CLOSEABLE) ) { - sal_Bool bRet = sal_True; + bool bRet = true; ImplAddDel( &aDelData ); PushButton* pButton = ImplGetCancelButton( this ); if ( pButton ) @@ -780,10 +780,10 @@ sal_Bool Dialog::Close() if ( pButton ) pButton->Click(); else - bRet = sal_False; + bRet = false; } if ( aDelData.IsDead() ) - return sal_True; + return true; ImplRemoveDel( &aDelData ); return bRet; } @@ -791,19 +791,19 @@ sal_Bool Dialog::Close() if ( IsInExecute() ) { EndDialog( sal_False ); - mbInClose = sal_False; - return sal_True; + mbInClose = false; + return true; } else { - mbInClose = sal_False; + mbInClose = false; return SystemWindow::Close(); } } // ----------------------------------------------------------------------- -sal_Bool Dialog::ImplStartExecuteModal() +bool Dialog::ImplStartExecuteModal() { if ( mbInExecute ) { @@ -813,7 +813,7 @@ sal_Bool Dialog::ImplStartExecuteModal() aErrorStr.append(ImplGetDialogText(this)); OSL_FAIL(aErrorStr.getStr()); #endif - return sal_False; + return false; } switch ( Application::GetDialogCancelMode() ) @@ -825,7 +825,7 @@ sal_Bool Dialog::ImplStartExecuteModal() "vcl", "Dialog \"" << ImplGetDialogText(this).getStr() << "\"cancelled in silent mode"); - return sal_False; + return false; default: assert(false); // this cannot happen // fall through @@ -859,15 +859,15 @@ sal_Bool Dialog::ImplStartExecuteModal() pSVData->maWinData.mpTrackWin->EndTracking( ENDTRACK_CANCEL ); if ( pSVData->maWinData.mpCaptureWin ) pSVData->maWinData.mpCaptureWin->ReleaseMouse(); - EnableInput( true, sal_True ); + EnableInput( true, true ); if ( GetParent() ) { NotifyEvent aNEvt( EVENT_EXECUTEDIALOG, this ); GetParent()->Notify( aNEvt ); } - mbInExecute = sal_True; - SetModalInputMode( sal_True ); + mbInExecute = true; + SetModalInputMode( true ); mbOldSaveBack = IsSaveBackgroundEnabled(); EnableSaveBackground(); @@ -877,7 +877,7 @@ sal_Bool Dialog::ImplStartExecuteModal() Show(); pSVData->maAppData.mnModalMode++; - return sal_True; + return true; } // ----------------------------------------------------------------------- @@ -1007,7 +1007,7 @@ void Dialog::EndDialog( long nResult ) { if ( mbInExecute ) { - SetModalInputMode( sal_False ); + SetModalInputMode( false ); // remove dialog from the list of dialogs which are being executed ImplSVData* pSVData = ImplGetSVData(); @@ -1055,7 +1055,7 @@ void Dialog::EndDialog( long nResult ) mpDialogImpl->mbStartedModal = false; mpDialogImpl->mnResult = -1; } - mbInExecute = sal_False; + mbInExecute = false; } } @@ -1076,7 +1076,7 @@ void Dialog::EndAllDialogs( Window* pParent ) while ( pModDialog ) { pTempModDialog = pModDialog->mpPrevExecuteDlg; - if( !pParent || ( pParent && pParent->IsWindowOrChild( pModDialog, sal_True ) ) ) + if( !pParent || ( pParent && pParent->IsWindowOrChild( pModDialog, true ) ) ) { pModDialog->EndDialog( sal_False ); pModDialog->PostUserEvent( Link() ); @@ -1087,7 +1087,7 @@ void Dialog::EndAllDialogs( Window* pParent ) // ----------------------------------------------------------------------- -void Dialog::SetModalInputMode( sal_Bool bModal ) +void Dialog::SetModalInputMode( bool bModal ) { if ( bModal == mbModalMode ) return; @@ -1101,8 +1101,8 @@ void Dialog::SetModalInputMode( sal_Bool bModal ) // Diable the prev Modal Dialog, because our dialog must close at first, // before the other dialog can be closed (because the other dialog // is on stack since our dialog returns) - if ( mpPrevExecuteDlg && !mpPrevExecuteDlg->IsWindowOrChild( this, sal_True ) ) - mpPrevExecuteDlg->EnableInput( false, sal_True, sal_True, this ); + if ( mpPrevExecuteDlg && !mpPrevExecuteDlg->IsWindowOrChild( this, true ) ) + mpPrevExecuteDlg->EnableInput( false, true, true, this ); // determine next overlap dialog parent Window* pParent = GetParent(); @@ -1129,9 +1129,9 @@ void Dialog::SetModalInputMode( sal_Bool bModal ) } // Enable the prev Modal Dialog - if ( mpPrevExecuteDlg && !mpPrevExecuteDlg->IsWindowOrChild( this, sal_True ) ) + if ( mpPrevExecuteDlg && !mpPrevExecuteDlg->IsWindowOrChild( this, true ) ) { - mpPrevExecuteDlg->EnableInput( true, sal_True, sal_True, this ); + mpPrevExecuteDlg->EnableInput( true, true, true, this ); // ensure continued modality of prev dialog // do not change modality counter @@ -1144,10 +1144,10 @@ void Dialog::SetModalInputMode( sal_Bool bModal ) if( pPrevModalDlg && ( pPrevModalDlg == mpPrevExecuteDlg - || !pPrevModalDlg->IsWindowOrChild( this, sal_True ) ) ) + || !pPrevModalDlg->IsWindowOrChild( this, true ) ) ) { - mpPrevExecuteDlg->SetModalInputMode( sal_False ); - mpPrevExecuteDlg->SetModalInputMode( sal_True ); + mpPrevExecuteDlg->SetModalInputMode( false ); + mpPrevExecuteDlg->SetModalInputMode( true ); } } } @@ -1155,7 +1155,7 @@ void Dialog::SetModalInputMode( sal_Bool bModal ) // ----------------------------------------------------------------------- -void Dialog::SetModalInputMode( sal_Bool bModal, sal_Bool bSubModalDialogs ) +void Dialog::SetModalInputMode( bool bModal, bool bSubModalDialogs ) { if ( bSubModalDialogs ) { @@ -1164,7 +1164,7 @@ void Dialog::SetModalInputMode( sal_Bool bModal, sal_Bool bSubModalDialogs ) while ( pOverlap ) { if ( pOverlap->IsDialog() ) - ((Dialog*)pOverlap)->SetModalInputMode( bModal, sal_True ); + ((Dialog*)pOverlap)->SetModalInputMode( bModal, true ); pOverlap = pOverlap->mpWindowImpl->mpNext; } } @@ -1237,7 +1237,7 @@ void Dialog::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal ImplBorderWindow aImplWin( this, WB_BORDER|WB_STDWORK, BORDERWINDOW_STYLE_OVERLAP ); aImplWin.SetText( GetText() ); aImplWin.setPosSizePixel( aPos.X(), aPos.Y(), aSize.Width(), aSize.Height() ); - aImplWin.SetDisplayActive( sal_True ); + aImplWin.SetDisplayActive( true ); aImplWin.InitView(); aImplWin.Draw( Rectangle( aPos, aSize ), pDev, aPos ); diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index b4ac50f920e4..0fc9c9617f89 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -151,7 +151,7 @@ static Window* ImplGetSubChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& // ----------------------------------------------------------------------- -static Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, sal_Bool bTestEnable ) +static Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ) { pParent = ImplGetTopParentOfTabHierarchy( pParent ); @@ -185,7 +185,7 @@ static Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nI // ----------------------------------------------------------------------- -static Window* ImplGetNextWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, sal_Bool bTestEnable ) +static Window* ImplGetNextWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ) { Window* pWindow = ImplGetChildWindow( pParent, n+1, nIndex, bTestEnable ); if ( n == nIndex ) @@ -219,7 +219,7 @@ Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType, i--; else i = nFormEnd; - pWindow = ImplGetChildWindow( this, i, nTemp, sal_True ); + pWindow = ImplGetChildWindow( this, i, nTemp, true ); if ( !pWindow ) break; if ( (i == nTemp) && (pWindow->GetStyle() & WB_TABSTOP) ) @@ -239,12 +239,12 @@ Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType, { if ( i < nFormEnd ) { - pWindow = ImplGetNextWindow( this, i, i, sal_True ); + pWindow = ImplGetNextWindow( this, i, i, true ); if ( (i > nFormEnd) || (i < nFormStart) ) - pWindow = ImplGetChildWindow( this, nFormStart, i, sal_True ); + pWindow = ImplGetChildWindow( this, nFormStart, i, true ); } else - pWindow = ImplGetChildWindow( this, nFormStart, i, sal_True ); + pWindow = ImplGetChildWindow( this, nFormStart, i, true ); } if ( i <= nFormEnd ) @@ -264,9 +264,9 @@ Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType, } nOldIndex = i; if ( (i > nFormEnd) || (i < nFormStart) ) - pWindow = ImplGetChildWindow( this, nFormStart, i, sal_True ); + pWindow = ImplGetChildWindow( this, nFormStart, i, true ); else - pWindow = ImplGetNextWindow( this, i, i, sal_True ); + pWindow = ImplGetNextWindow( this, i, i, true ); } while ( (i != nStartIndex) && (i != nStartIndex2) ); @@ -317,7 +317,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt sal_uInt16 nFormEnd; // Focus-Fenster in der Child-Liste suchen - Window* pFirstChildWindow = pSWindow = ImplGetChildWindow( pParent, 0, i, sal_False ); + Window* pFirstChildWindow = pSWindow = ImplGetChildWindow( pParent, 0, i, false ); if( pWindow == NULL ) pWindow = pSWindow; @@ -340,7 +340,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt break; } - pSWindow = ImplGetNextWindow( pParent, i, i, sal_False ); + pSWindow = ImplGetNextWindow( pParent, i, i, false ); if ( !i ) pSWindow = NULL; } @@ -370,7 +370,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt do { nFormEnd = i; - pTempWindow = ImplGetNextWindow( pParent, i, i, sal_False ); + pTempWindow = ImplGetNextWindow( pParent, i, i, false ); // the DialogControlStart mark is only accepted for the direct children if ( !i @@ -403,7 +403,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt // ----------------------------------------------------------------------- static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode, - sal_uInt16 nFormStart, sal_uInt16 nFormEnd, sal_Bool bCheckEnable = sal_True ) + sal_uInt16 nFormStart, sal_uInt16 nFormEnd, bool bCheckEnable = true ) { DBG_ASSERT( (rIndex >= nFormStart) && (rIndex <= nFormEnd), "Window::ImplFindAccelWindow() - rIndex not in Form" ); @@ -422,9 +422,9 @@ static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Uni cCharCode = xCharClass->toUpper( OUString(cCharCode), 0, 1, rLocale )[0]; if ( i < nFormEnd ) - pWindow = ImplGetNextWindow( pParent, i, i, sal_True ); + pWindow = ImplGetNextWindow( pParent, i, i, true ); else - pWindow = ImplGetChildWindow( pParent, nFormStart, i, sal_True ); + pWindow = ImplGetChildWindow( pParent, nFormStart, i, true ); while( pWindow ) { const OUString aStr = pWindow->GetText(); @@ -501,7 +501,7 @@ void Window::ImplControlFocus( sal_uInt16 nFlags ) if ( GetType() == WINDOW_RADIOBUTTON ) { if ( !((RadioButton*)this)->IsChecked() ) - ((RadioButton*)this)->ImplCallClick( sal_True, nFlags ); + ((RadioButton*)this)->ImplCallClick( true, nFlags ); else ImplGrabFocus( nFlags ); } @@ -514,8 +514,8 @@ void Window::ImplControlFocus( sal_uInt16 nFlags ) ((CheckBox*)this)->ImplCheck(); else if ( mpWindowImpl->mbPushButton ) { - ((PushButton*)this)->SetPressed( sal_True ); - ((PushButton*)this)->SetPressed( sal_False ); + ((PushButton*)this)->SetPressed( true ); + ((PushButton*)this)->SetPressed( false ); ((PushButton*)this)->Click(); } } @@ -526,7 +526,7 @@ void Window::ImplControlFocus( sal_uInt16 nFlags ) if ( GetType() == WINDOW_RADIOBUTTON ) { if ( !((RadioButton*)this)->IsChecked() ) - ((RadioButton*)this)->ImplCallClick( sal_True, nFlags ); + ((RadioButton*)this)->ImplCallClick( true, nFlags ); else ImplGrabFocus( nFlags ); } @@ -600,7 +600,7 @@ namespace } } -sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) +bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) { KeyCode aKeyCode = rKEvt.GetKeyCode(); sal_uInt16 nKeyCode = aKeyCode.GetCode(); @@ -619,13 +619,13 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) // Ohne Focus-Window koennen wir auch keine Steuerung uebernehmen Window* pFocusWindow = Application::GetFocusWindow(); if ( !pFocusWindow || !ImplIsWindowOrChild( pFocusWindow ) ) - return sal_False; + return false; // Focus-Fenster in der Child-Liste suchen pSWindow = ::ImplFindDlgCtrlWindow( this, pFocusWindow, nIndex, nFormStart, nFormEnd ); if ( !pSWindow ) - return sal_False; + return false; i = nIndex; nDlgCtrlFlags = 0; @@ -644,7 +644,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) if ( nKeyCode == KEY_RETURN ) { // Wir suchen zuerst nach einem DefPushButton/CancelButton - pButtonWindow = ImplGetChildWindow( this, nFormStart, iButton, sal_True ); + pButtonWindow = ImplGetChildWindow( this, nFormStart, iButton, true ); iButtonStart = iButton; while ( pButtonWindow ) { @@ -652,7 +652,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) pButtonWindow->mpWindowImpl->mbPushButton ) break; - pButtonWindow = ImplGetNextWindow( this, iButton, iButton, sal_True ); + pButtonWindow = ImplGetNextWindow( this, iButton, iButton, true ); if ( (iButton <= iButtonStart) || (iButton > nFormEnd) ) pButtonWindow = NULL; } @@ -691,7 +691,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) nGetFocusFlags |= GETFOCUS_AROUND; } pTempWindow->ImplControlFocus( nGetFocusFlags ); - return sal_True; + return true; } else { @@ -713,21 +713,21 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) if ( !ImplCallPreNotify( aNEvt2 ) ) pSWindow->GetFocus(); pSWindow->mpWindowImpl->mnGetFocusFlags = 0; - return sal_True; + return true; } } } else if ( nKeyCode == KEY_ESCAPE ) { // Wir suchen zuerst nach einem DefPushButton/CancelButton - pButtonWindow = ImplGetChildWindow( this, nFormStart, iButton, sal_True ); + pButtonWindow = ImplGetChildWindow( this, nFormStart, iButton, true ); iButtonStart = iButton; while ( pButtonWindow ) { if ( pButtonWindow->GetType() == WINDOW_CANCELBUTTON ) break; - pButtonWindow = ImplGetNextWindow( this, iButton, iButton, sal_True ); + pButtonWindow = ImplGetNextWindow( this, iButton, iButton, true ); if ( (iButton <= iButtonStart) || (iButton > nFormEnd) ) pButtonWindow = NULL; } @@ -736,9 +736,9 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) { if ( mpWindowImpl->mpDlgCtrlDownWindow != pButtonWindow ) { - ((PushButton*)mpWindowImpl->mpDlgCtrlDownWindow)->SetPressed( sal_False ); + ((PushButton*)mpWindowImpl->mpDlgCtrlDownWindow)->SetPressed( false ); mpWindowImpl->mpDlgCtrlDownWindow = NULL; - return sal_True; + return true; } } } @@ -761,7 +761,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) // Gruppe suchen Window* pFormularFirstWindow = NULL; Window* pLastFormularFirstWindow = NULL; - pTempWindow = ImplGetChildWindow( this, 0, iTemp, sal_False ); + pTempWindow = ImplGetChildWindow( this, 0, iTemp, false ); Window* pPrevFirstFormularFirstWindow = NULL; Window* pFirstFormularFirstWindow = pTempWindow; while ( pTempWindow ) @@ -784,7 +784,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) pLastFormularFirstWindow = pTempWindow; } - pTempWindow = ImplGetNextWindow( this, iTemp, iTemp, sal_False ); + pTempWindow = ImplGetNextWindow( this, iTemp, iTemp, false ); if ( !iTemp ) pTempWindow = NULL; } @@ -810,7 +810,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) if ( pFormularFirstWindow ) { pFormularFirstWindow->ImplControlFocus(); - return sal_True; + return true; } } } @@ -846,7 +846,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) if ( !ImplCallPreNotify( aNEvt2 ) ) pSWindow->GetFocus(); pSWindow->mpWindowImpl->mnGetFocusFlags = 0; - return sal_True; + return true; } else if ( pWindow ) { @@ -862,7 +862,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) nGetFocusFlags |= GETFOCUS_AROUND; } pWindow->ImplControlFocus( nGetFocusFlags ); - return sal_True; + return true; } } } @@ -888,7 +888,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) { if ( pWindow != pSWindow ) pWindow->ImplControlFocus( GETFOCUS_CURSOR | GETFOCUS_BACKWARD ); - return sal_True; + return true; } if ( nStyle & WB_GROUP ) @@ -918,7 +918,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) if (isSuitableDestination(pWindow)) { pWindow->ImplControlFocus( GETFOCUS_CURSOR | GETFOCUS_BACKWARD ); - return sal_True; + return true; } pWindow = nextLogicalChildOfParent(this, pWindow); @@ -937,7 +937,7 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) if ( pSWindow == ::ImplFindAccelWindow( this, i, c, nFormStart, nFormEnd ) ) nGetFocusFlags |= GETFOCUS_UNIQUEMNEMONIC; pSWindow->ImplControlFocus( nGetFocusFlags ); - return sal_True; + return true; } } } @@ -949,30 +949,30 @@ sal_Bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ) { if ( mpWindowImpl->mpDlgCtrlDownWindow && (mpWindowImpl->mpDlgCtrlDownWindow != pButtonWindow) ) { - ((PushButton*)mpWindowImpl->mpDlgCtrlDownWindow)->SetPressed( sal_False ); + ((PushButton*)mpWindowImpl->mpDlgCtrlDownWindow)->SetPressed( false ); mpWindowImpl->mpDlgCtrlDownWindow = NULL; } - ((PushButton*)pButtonWindow)->SetPressed( sal_True ); + ((PushButton*)pButtonWindow)->SetPressed( true ); mpWindowImpl->mpDlgCtrlDownWindow = pButtonWindow; } else if ( mpWindowImpl->mpDlgCtrlDownWindow == pButtonWindow ) { mpWindowImpl->mpDlgCtrlDownWindow = NULL; - ((PushButton*)pButtonWindow)->SetPressed( sal_False ); + ((PushButton*)pButtonWindow)->SetPressed( false ); ((PushButton*)pButtonWindow)->Click(); } - return sal_True; + return true; } - return sal_False; + return false; } // ----------------------------------------------------------------------- // checks if this window has dialog control -sal_Bool Window::ImplHasDlgCtrl() +bool Window::ImplHasDlgCtrl() { Window* pDlgCtrlParent; @@ -984,9 +984,9 @@ sal_Bool Window::ImplHasDlgCtrl() pDlgCtrlParent = pDlgCtrlParent->ImplGetParent(); if ( !pDlgCtrlParent || ((pDlgCtrlParent->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) ) - return sal_False; + return false; else - return sal_True; + return true; } void Window::ImplDlgCtrlNextWindow() @@ -1023,7 +1023,7 @@ if ( !pDlgCtrlParent || (GetStyle() & WB_NODIALOGCONTROL) || ((pDlgCtrlParent->G // ----------------------------------------------------------------------- static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow, - sal_Bool bGetFocus ) + bool bGetFocus ) { PushButton* pOldDefButton = NULL; PushButton* pNewDefButton = NULL; @@ -1040,7 +1040,7 @@ static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow, nFormEnd = 0xFFFF; } - pSWindow = ImplGetChildWindow( pParent, nFormStart, i, sal_False ); + pSWindow = ImplGetChildWindow( pParent, nFormStart, i, false ); while ( pSWindow ) { if ( pSWindow->ImplIsPushButton() ) @@ -1054,7 +1054,7 @@ static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow, pNewDefButton = pPushButton; } - pSWindow = ImplGetNextWindow( pParent, i, i, sal_False ); + pSWindow = ImplGetNextWindow( pParent, i, i, false ); if ( !i || (i > nFormEnd) ) pSWindow = NULL; } @@ -1073,19 +1073,19 @@ static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow, if ( pOldDefButton != pNewDefButton ) { if ( pOldDefButton ) - pOldDefButton->ImplSetDefButton( sal_False ); + pOldDefButton->ImplSetDefButton( false ); if ( pNewDefButton ) - pNewDefButton->ImplSetDefButton( sal_True ); + pNewDefButton->ImplSetDefButton( true ); } } // ----------------------------------------------------------------------- -void Window::ImplDlgCtrlFocusChanged( Window* pWindow, sal_Bool bGetFocus ) +void Window::ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus ) { if ( mpWindowImpl->mpDlgCtrlDownWindow && !bGetFocus ) { - ((PushButton*)mpWindowImpl->mpDlgCtrlDownWindow)->SetPressed( sal_False ); + ((PushButton*)mpWindowImpl->mpDlgCtrlDownWindow)->SetPressed( false ); mpWindowImpl->mpDlgCtrlDownWindow = NULL; } @@ -1162,7 +1162,7 @@ static Window* ImplGetLabelFor( Window* pFrameWindow, WindowType nMyType, Window nAccel, nFormStart, nFormEnd, - sal_False ); + false ); } else { @@ -1174,7 +1174,7 @@ static Window* ImplGetLabelFor( Window* pFrameWindow, WindowType nMyType, Window pSWindow = ::ImplGetChildWindow( pFrameWindow, nIndex, nIndex, - sal_False ); + false ); if( pSWindow && isVisibleInLayout(pSWindow) && ! (pSWindow->GetStyle() & WB_NOLABEL) ) { WindowType nType = pSWindow->GetType(); @@ -1257,7 +1257,7 @@ static Window* ImplGetLabeledBy( Window* pFrameWindow, WindowType nMyType, Windo pSWindow = ::ImplGetChildWindow( pFrameWindow, nSearchIndex, nFoundIndex, - sal_False ); + false ); if( pSWindow && isVisibleInLayout(pSWindow) && !(pSWindow->GetStyle() & WB_NOLABEL) ) { WindowType nType = pSWindow->GetType(); @@ -1348,7 +1348,7 @@ Window* Window::getLegacyNonLayoutAccessibleRelationMemberOf() const pSWindow = ::ImplGetChildWindow( pFrameWindow, nSearchIndex, nFoundIndex, - sal_False ); + false ); if( pSWindow && pSWindow->IsVisible() && ( pSWindow->GetType() == WINDOW_FIXEDLINE || pSWindow->GetType() == WINDOW_GROUPBOX ) ) @@ -1390,7 +1390,7 @@ KeyEvent Window::GetActivationKey() const nCode = KEY_POINT; else if( nAccel == '-' ) nCode = KEY_SUBTRACT; - KeyCode aKeyCode( nCode, sal_False, sal_False, sal_True, sal_False ); + KeyCode aKeyCode( nCode, false, false, true, false ); aKeyEvent = KeyEvent( nAccel, aKeyCode ); } return aKeyEvent; diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx index cb79e140e7b4..130ee3d774b9 100644 --- a/vcl/source/window/dndlcon.cxx +++ b/vcl/source/window/dndlcon.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star::datatransfer::dnd; DNDListenerContainer::DNDListenerContainer( sal_Int8 nDefaultActions ) : WeakComponentImplHelper4< XDragGestureRecognizer, XDropTargetDragContext, XDropTargetDropContext, XDropTarget >(GetMutex()) { - m_bActive = sal_True; + m_bActive = true; m_nDefaultActions = nDefaultActions; } diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index a1a18dbd8254..13bca4abecd9 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -140,7 +140,7 @@ void DockingAreaWindow::StateChanged( StateChangedType nType ) // ----------------------------------------------------------------------- -sal_Bool DockingAreaWindow::IsHorizontal() const +bool DockingAreaWindow::IsHorizontal() const { return ( mpImplData->meAlign == WINDOWALIGN_TOP || mpImplData->meAlign == WINDOWALIGN_BOTTOM ); } @@ -164,7 +164,7 @@ WindowAlign DockingAreaWindow::GetAlign() const void DockingAreaWindow::Paint( const Rectangle& ) { - EnableNativeWidget( sal_True ); // only required because the toolkit curently switches this flag off + EnableNativeWidget( true ); // only required because the toolkit curently switches this flag off if( IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) ) { ToolbarValue aControlValue; @@ -173,7 +173,7 @@ void DockingAreaWindow::Paint( const Rectangle& ) { // give NWF a hint that this dockingarea is adjacent to the menubar // useful for special gradient effects that should cover both windows - aControlValue.mbIsTopDockingArea = sal_True; + aControlValue.mbIsTopDockingArea = true; } ControlState nState = CTRL_STATE_ENABLED; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 6fd6295a2c7b..cb5fd3334170 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -73,7 +73,7 @@ public: virtual void Roll(); virtual void PopupModeEnd(); virtual void Resizing( Size& rSize ); - virtual sal_Bool Close(); + virtual bool Close(); virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); @@ -96,8 +96,8 @@ ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent, WinBits nWinBits, { SetSettings( pDockingWin->GetWindow()->GetSettings() ); Enable( pDockingWin->GetWindow()->IsEnabled(), false ); - EnableInput( pDockingWin->GetWindow()->IsInputEnabled(), sal_False ); - AlwaysEnableInput( pDockingWin->GetWindow()->IsAlwaysEnableInput(), sal_False ); + EnableInput( pDockingWin->GetWindow()->IsInputEnabled(), false ); + AlwaysEnableInput( pDockingWin->GetWindow()->IsAlwaysEnableInput(), false ); EnableAlwaysOnTop( pDockingWin->GetWindow()->IsAlwaysOnTopEnabled() ); SetActivateMode( pDockingWin->GetWindow()->GetActivateMode() ); } @@ -137,7 +137,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl) else if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) ) { mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->HideTracking(); - mpDockWin->EndDocking( maDockRect, sal_False ); + mpDockWin->EndDocking( maDockRect, false ); } else { @@ -157,7 +157,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl) if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) ) { mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->HideTracking(); - mpDockWin->EndDocking( maDockRect, sal_True ); + mpDockWin->EndDocking( maDockRect, true ); } else { @@ -219,7 +219,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) if( ! mpDockWin->IsDocking() ) mpDockWin->StartDocking( aMousePos, maDockRect ); - sal_Bool bFloatMode = mpDockWin->Docking( aMousePos, maDockRect ); + bool bFloatMode = mpDockWin->Docking( aMousePos, maDockRect ); if( ! bFloatMode ) { @@ -327,7 +327,7 @@ void ImplDockFloatWin2::Resizing( Size& rSize ) // ----------------------------------------------------------------------- -sal_Bool ImplDockFloatWin2::Close() +bool ImplDockFloatWin2::Close() { return mpDockWin->Close(); } @@ -363,7 +363,7 @@ ImplDockingWindowWrapper* DockingManager::GetDockingWindowWrapper( const Window return NULL; } -sal_Bool DockingManager::IsDockable( const Window *pWindow ) +bool DockingManager::IsDockable( const Window *pWindow ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); @@ -374,22 +374,22 @@ sal_Bool DockingManager::IsDockable( const Window *pWindow ) return (pWrapper != NULL); } -sal_Bool DockingManager::IsFloating( const Window *pWindow ) +bool DockingManager::IsFloating( const Window *pWindow ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); if( pWrapper ) return pWrapper->IsFloatingMode(); else - return sal_False; + return false; } -sal_Bool DockingManager::IsLocked( const Window *pWindow ) +bool DockingManager::IsLocked( const Window *pWindow ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); if( pWrapper && pWrapper->IsLocked() ) - return sal_True; + return true; else - return sal_False; + return false; } void DockingManager::Lock( const Window *pWindow ) @@ -406,7 +406,7 @@ void DockingManager::Unlock( const Window *pWindow ) pWrapper->Unlock(); } -void DockingManager::SetFloatingMode( const Window *pWindow, sal_Bool bFloating ) +void DockingManager::SetFloatingMode( const Window *pWindow, bool bFloating ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); if( pWrapper ) @@ -428,13 +428,13 @@ void DockingManager::StartPopupMode( ToolBox *pParentToolBox, const Window *pWin FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE ); } -sal_Bool DockingManager::IsInPopupMode( const Window *pWindow ) +bool DockingManager::IsInPopupMode( const Window *pWindow ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); if( pWrapper && pWrapper->IsInPopupMode() ) - return sal_True; + return true; else - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -669,9 +669,9 @@ void ImplPopupFloatWin::DrawBorder() void ImplPopupFloatWin::DrawGrip() { - sal_Bool bLinecolor = IsLineColor(); + bool bLinecolor = IsLineColor(); Color aLinecolor = GetLineColor(); - sal_Bool bFillcolor = IsFillColor(); + bool bFillcolor = IsFillColor(); Color aFillcolor = GetFillColor(); // draw background @@ -684,7 +684,7 @@ void ImplPopupFloatWin::DrawGrip() if( mbHighlight ) { Erase( aRect ); - DrawSelectionBackground( aRect, 2, sal_False, sal_True, sal_False ); + DrawSelectionBackground( aRect, 2, false, true, false ); } else { @@ -846,15 +846,15 @@ ImplDockingWindowWrapper::ImplDockingWindowWrapper( const Window *pWindow ) mpDockingWindow = (Window*) pWindow; mpParent = pWindow->GetParent(); - mbDockable = sal_True; - mbLocked = sal_False; + mbDockable = true; + mbLocked = false; mnFloatBits = WB_BORDER | WB_CLOSEABLE | WB_SIZEABLE | (pWindow->GetStyle() & DOCKWIN_FLOATSTYLES); DockingWindow *pDockWin = dynamic_cast< DockingWindow* > ( mpDockingWindow ); if( pDockWin ) mnFloatBits = pDockWin->GetFloatStyle(); // must be enabled in Window::Notify to prevent permanent docking during mouse move - mbStartDockingEnabled = sal_False; + mbStartDockingEnabled = false; } ImplDockingWindowWrapper::~ImplDockingWindowWrapper() @@ -862,23 +862,23 @@ ImplDockingWindowWrapper::~ImplDockingWindowWrapper() if ( IsFloatingMode() ) { GetWindow()->Show( false, SHOW_NOFOCUSCHANGE ); - SetFloatingMode( sal_False ); + SetFloatingMode( false ); } } // ----------------------------------------------------------------------- -sal_Bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos ) +bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos ) { if ( !mbDockable ) - return sal_False; + return false; if( !mbStartDockingEnabled ) - return sal_False; + return false; maMouseOff = rPos; maMouseStart = maMouseOff; - mbDocking = sal_True; + mbDocking = true; mbLastFloatMode = IsFloatingMode(); mbStartFloat = mbLastFloatMode; @@ -922,7 +922,7 @@ sal_Bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos ) GetWindow()->ImplGetFrameWindow()->ImplUpdateAll(); GetWindow()->StartTracking( STARTTRACK_KEYMOD ); - return sal_True; + return true; } // ======================================================================= @@ -933,13 +933,13 @@ void ImplDockingWindowWrapper::ImplInitData() //GetWindow()->mpWindowImpl->mbDockWin = sal_True; // TODO: must be eliminated mpFloatWin = NULL; - mbDockCanceled = sal_False; - mbFloatPrevented = sal_False; - mbDocking = sal_False; - mbPined = sal_False; - mbRollUp = sal_False; - mbDockBtn = sal_False; - mbHideBtn = sal_False; + mbDockCanceled = false; + mbFloatPrevented = false; + mbDocking = false; + mbPined = false; + mbRollUp = false; + mbDockBtn = false; + mbHideBtn = false; maMaxOutSize = Size( SHRT_MAX, SHRT_MAX ); } @@ -952,13 +952,13 @@ void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt ) { if ( rTEvt.IsTrackingEnded() ) { - mbDocking = sal_False; + mbDocking = false; GetWindow()->HideTracking(); if ( rTEvt.IsTrackingCanceled() ) { - mbDockCanceled = sal_True; + mbDockCanceled = true; EndDocking( Rectangle( Point( mnTrackX, mnTrackY ), Size( mnTrackWidth, mnTrackHeight ) ), mbLastFloatMode ); - mbDockCanceled = sal_False; + mbDockCanceled = false; } else EndDocking( Rectangle( Point( mnTrackX, mnTrackY ), Size( mnTrackWidth, mnTrackHeight ) ), mbLastFloatMode ); @@ -986,9 +986,9 @@ void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt ) aPos.X() += maMouseOff.X(); aPos.Y() += maMouseOff.Y(); - sal_Bool bFloatMode = Docking( aPos, aTrackRect ); + bool bFloatMode = Docking( aPos, aTrackRect ); - mbFloatPrevented = sal_False; + mbFloatPrevented = false; if ( mbLastFloatMode != bFloatMode ) { if ( bFloatMode ) @@ -1042,12 +1042,12 @@ void ImplDockingWindowWrapper::StartDocking( const Point& rPoint, Rectangle& rRe DockingData data( rPoint, rRect, IsFloatingMode() ); GetWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_STARTDOCKING, &data ); - mbDocking = sal_True; + mbDocking = true; } // ----------------------------------------------------------------------- -sal_Bool ImplDockingWindowWrapper::Docking( const Point& rPoint, Rectangle& rRect ) +bool ImplDockingWindowWrapper::Docking( const Point& rPoint, Rectangle& rRect ) { DockingData data( rPoint, rRect, IsFloatingMode() ); @@ -1058,7 +1058,7 @@ sal_Bool ImplDockingWindowWrapper::Docking( const Point& rPoint, Rectangle& rRec // ----------------------------------------------------------------------- -void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) +void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMode ) { Rectangle aRect( rRect ); @@ -1091,15 +1091,15 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, sal_Bool bFlo EndDockingData data( aRect, IsFloatingMode(), IsDockingCanceled() ); GetWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_ENDDOCKING, &data ); - mbDocking = sal_False; + mbDocking = false; // must be enabled in Window::Notify to prevent permanent docking during mouse move - mbStartDockingEnabled = sal_False; + mbStartDockingEnabled = false; } // ----------------------------------------------------------------------- -sal_Bool ImplDockingWindowWrapper::PrepareToggleFloatingMode() +bool ImplDockingWindowWrapper::PrepareToggleFloatingMode() { sal_Bool bFloating = sal_True; GetWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_PREPARETOGGLEFLOATING, &bFloating ); @@ -1108,10 +1108,10 @@ sal_Bool ImplDockingWindowWrapper::PrepareToggleFloatingMode() // ----------------------------------------------------------------------- -sal_Bool ImplDockingWindowWrapper::Close() +bool ImplDockingWindowWrapper::Close() { // TODO: send event - return sal_True; + return true; } // ----------------------------------------------------------------------- @@ -1128,7 +1128,7 @@ void ImplDockingWindowWrapper::ToggleFloatingMode() GetWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_TOGGLEFLOATING ); // must be enabled in Window::Notify to prevent permanent docking during mouse move - mbStartDockingEnabled = sal_False; + mbStartDockingEnabled = false; } // ----------------------------------------------------------------------- @@ -1182,7 +1182,7 @@ void ImplDockingWindowWrapper::Resizing( Size& rSize ) // ----------------------------------------------------------------------- -void ImplDockingWindowWrapper::ShowTitleButton( sal_uInt16 nButton, sal_Bool bVisible ) +void ImplDockingWindowWrapper::ShowTitleButton( sal_uInt16 nButton, bool bVisible ) { if ( mpFloatWin ) mpFloatWin->ShowTitleButton( nButton, bVisible ); @@ -1291,17 +1291,17 @@ IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd) } -sal_Bool ImplDockingWindowWrapper::IsInPopupMode() const +bool ImplDockingWindowWrapper::IsInPopupMode() const { if( GetFloatingWindow() ) return GetFloatingWindow()->IsInPopupMode(); else - return sal_False; + return false; } // ----------------------------------------------------------------------- -void ImplDockingWindowWrapper::SetFloatingMode( sal_Bool bFloatMode ) +void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode ) { // do nothing if window is docked and locked if( !IsFloatingMode() && IsLocked() ) @@ -1311,7 +1311,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( sal_Bool bFloatMode ) { if ( PrepareToggleFloatingMode() ) { - sal_Bool bVisible = GetWindow()->IsVisible(); + bool bVisible = GetWindow()->IsVisible(); if ( bFloatMode ) { @@ -1478,7 +1478,7 @@ void ImplDockingWindowWrapper::SetMaxOutputSizePixel( const Size& rSize ) maMaxOutSize = rSize; } -sal_Bool ImplDockingWindowWrapper::IsFloatingMode() const +bool ImplDockingWindowWrapper::IsFloatingMode() const { return (mpFloatWin != NULL); } @@ -1496,7 +1496,7 @@ Rectangle ImplDockingWindowWrapper::GetDragArea() const void ImplDockingWindowWrapper::Lock() { - mbLocked = sal_True; + mbLocked = true; // only toolbars support locking ToolBox *pToolBox = dynamic_cast< ToolBox * >( GetWindow() ); if( pToolBox ) @@ -1505,14 +1505,14 @@ void ImplDockingWindowWrapper::Lock() void ImplDockingWindowWrapper::Unlock() { - mbLocked = sal_False; + mbLocked = false; // only toolbars support locking ToolBox *pToolBox = dynamic_cast< ToolBox * >( GetWindow() ); if( pToolBox ) pToolBox->Lock( mbLocked ); } -sal_Bool ImplDockingWindowWrapper::IsLocked() const +bool ImplDockingWindowWrapper::IsLocked() const { return mbLocked; } diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 4d852f7c86c4..3346751b751c 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -90,7 +90,7 @@ public: virtual void Roll(); virtual void PopupModeEnd(); virtual void Resizing( Size& rSize ); - virtual sal_Bool Close(); + virtual bool Close(); sal_uLong GetLastTicks() const { return mnLastTicks; } }; @@ -109,8 +109,8 @@ ImplDockFloatWin::ImplDockFloatWin( Window* pParent, WinBits nWinBits, { SetSettings( pDockingWin->GetSettings() ); Enable( pDockingWin->IsEnabled(), false ); - EnableInput( pDockingWin->IsInputEnabled(), sal_False ); - AlwaysEnableInput( pDockingWin->IsAlwaysEnableInput(), sal_False ); + EnableInput( pDockingWin->IsInputEnabled(), false ); + AlwaysEnableInput( pDockingWin->IsAlwaysEnableInput(), false ); EnableAlwaysOnTop( pDockingWin->IsAlwaysOnTopEnabled() ); SetActivateMode( pDockingWin->GetActivateMode() ); } @@ -180,7 +180,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl) // mouse pos also in screen pixels Point aMousePos = mpDockWin->GetParent()->OutputToScreenPixel( aState.maPos ); - sal_Bool bFloatMode = mpDockWin->Docking( aMousePos, maDockRect ); + bool bFloatMode = mpDockWin->Docking( aMousePos, maDockRect ); if( ! bFloatMode ) { mpDockWin->GetParent()->ImplGetFrameWindow()->ShowTracking( maDockRect, SHOWTRACK_OBJECT | SHOWTRACK_WINDOW ); @@ -271,21 +271,21 @@ void ImplDockFloatWin::Resizing( Size& rSize ) // ----------------------------------------------------------------------- -sal_Bool ImplDockFloatWin::Close() +bool ImplDockFloatWin::Close() { return mpDockWin->Close(); } // ======================================================================= -sal_Bool DockingWindow::ImplStartDocking( const Point& rPos ) +bool DockingWindow::ImplStartDocking( const Point& rPos ) { if ( !mbDockable ) - return sal_False; + return false; maMouseOff = rPos; maMouseStart = maMouseOff; - mbDocking = sal_True; + mbDocking = true; mbLastFloatMode = IsFloatingMode(); mbStartFloat = mbLastFloatMode; @@ -318,17 +318,17 @@ sal_Bool DockingWindow::ImplStartDocking( const Point& rPos ) if ( GetSettings().GetStyleSettings().GetDragFullOptions() & DRAGFULL_OPTION_DOCKING && !( mnFloatBits & ( WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE ) ) ) // no full drag when migrating to system window - mbDragFull = sal_True; + mbDragFull = true; else { StartDocking(); - mbDragFull = sal_False; + mbDragFull = false; ImplUpdateAll(); ImplGetFrameWindow()->ImplUpdateAll(); } StartTracking( STARTTRACK_KEYMOD ); - return sal_True; + return true; } // ======================================================================= @@ -339,14 +339,14 @@ void DockingWindow::ImplInitDockingWindowData() mpWindowImpl->mbDockWin = true; mpFloatWin = NULL; - mbDockCanceled = sal_False; - mbDockPrevented = sal_False; - mbFloatPrevented = sal_False; - mbDocking = sal_False; - mbPined = sal_False; - mbRollUp = sal_False; - mbDockBtn = sal_False; - mbHideBtn = sal_False; + mbDockCanceled = false; + mbDockPrevented = false; + mbFloatPrevented = false; + mbDocking = false; + mbPined = false; + mbRollUp = false; + mbDockBtn = false; + mbHideBtn = false; } // ----------------------------------------------------------------------- @@ -424,8 +424,8 @@ void DockingWindow::ImplLoadRes( const ResId& rResId ) if ( nMask & RSC_DOCKINGWINDOW_FLOATING ) { - if ( (sal_Bool)ReadShortRes() ) - SetFloatingMode( sal_True ); + if ( ReadShortRes() != 0 ) + SetFloatingMode( true ); } } @@ -468,7 +468,7 @@ DockingWindow::~DockingWindow() if ( IsFloatingMode() ) { Show( false, SHOW_NOFOCUSCHANGE ); - SetFloatingMode( sal_False ); + SetFloatingMode( false ); } delete mpImplData; } @@ -484,7 +484,7 @@ void DockingWindow::Tracking( const TrackingEvent& rTEvt ) { if ( rTEvt.IsTrackingEnded() ) { - mbDocking = sal_False; + mbDocking = false; if ( mbDragFull ) { // Bei Abbruch alten Zustand wieder herstellen @@ -500,9 +500,9 @@ void DockingWindow::Tracking( const TrackingEvent& rTEvt ) HideTracking(); if ( rTEvt.IsTrackingCanceled() ) { - mbDockCanceled = sal_True; + mbDockCanceled = true; EndDocking( Rectangle( Point( mnTrackX, mnTrackY ), Size( mnTrackWidth, mnTrackHeight ) ), mbLastFloatMode ); - mbDockCanceled = sal_False; + mbDockCanceled = false; } else EndDocking( Rectangle( Point( mnTrackX, mnTrackY ), Size( mnTrackWidth, mnTrackHeight ) ), mbLastFloatMode ); @@ -532,9 +532,9 @@ void DockingWindow::Tracking( const TrackingEvent& rTEvt ) aFramePos.Y() += maMouseOff.Y(); if ( mbDragFull ) StartDocking(); - sal_Bool bFloatMode = Docking( aFramePos, aTrackRect ); - mbDockPrevented = sal_False; - mbFloatPrevented = sal_False; + bool bFloatMode = Docking( aFramePos, aTrackRect ); + mbDockPrevented = false; + mbFloatPrevented = false; if ( mbLastFloatMode != bFloatMode ) { if ( bFloatMode ) @@ -653,12 +653,12 @@ bool DockingWindow::Notify( NotifyEvent& rNEvt ) void DockingWindow::StartDocking() { - mbDocking = sal_True; + mbDocking = true; } // ----------------------------------------------------------------------- -sal_Bool DockingWindow::Docking( const Point&, Rectangle& ) +bool DockingWindow::Docking( const Point&, Rectangle& ) { return IsFloatingMode(); } @@ -670,7 +670,7 @@ void DockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) if ( !IsDockingCanceled() ) { bool bShow = false; - if ( bFloatMode != IsFloatingMode() ) + if ( bool(bFloatMode) != IsFloatingMode() ) { Show( false, SHOW_NOFOCUSCHANGE ); SetFloatingMode( bFloatMode ); @@ -688,32 +688,32 @@ void DockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) if ( bShow ) Show(); } - mbDocking = sal_False; + mbDocking = false; } // ----------------------------------------------------------------------- -sal_Bool DockingWindow::PrepareToggleFloatingMode() +bool DockingWindow::PrepareToggleFloatingMode() { - return sal_True; + return true; } // ----------------------------------------------------------------------- -sal_Bool DockingWindow::Close() +bool DockingWindow::Close() { ImplDelData aDelData; ImplAddDel( &aDelData ); ImplCallEventListeners( VCLEVENT_WINDOW_CLOSE ); if ( aDelData.IsDead() ) - return sal_False; + return false; ImplRemoveDel( &aDelData ); if ( mpWindowImpl->mxWindowPeer.is() && IsCreatedWithToolkit() ) - return sal_False; + return false; Show( false, SHOW_NOFOCUSCHANGE ); - return sal_True; + return true; } // ----------------------------------------------------------------------- @@ -790,7 +790,7 @@ void DockingWindow::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -void DockingWindow::SetFloatingMode( sal_Bool bFloatMode ) +void DockingWindow::SetFloatingMode( bool bFloatMode ) { ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this ); if( pWrapper ) @@ -802,7 +802,7 @@ void DockingWindow::SetFloatingMode( sal_Bool bFloatMode ) { if ( PrepareToggleFloatingMode() ) // changes to floating mode can be vetoed { - sal_Bool bVisible = IsVisible(); + bool bVisible = IsVisible(); if ( bFloatMode ) { @@ -1053,7 +1053,7 @@ Point DockingWindow::GetFloatingPos() const return maFloatPos; } -sal_Bool DockingWindow::IsFloatingMode() const +bool DockingWindow::IsFloatingMode() const { ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this ); if( pWrapper ) diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index c91cfea9a3a4..8aa30f8bf7fc 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -67,8 +67,8 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle ) mpImplData = new ImplData; mpWindowImpl->mbFloatWin = true; - mbInCleanUp = sal_False; - mbGrabFocus = sal_False; + mbInCleanUp = false; + mbGrabFocus = false; DBG_ASSERT( pParent, "FloatWindow::FloatingWindow(): - pParent == NULL!" ); @@ -116,7 +116,7 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle ) SystemWindow::ImplInit( pBorderWin, nStyle & ~WB_BORDER, NULL ); pBorderWin->mpWindowImpl->mpClientWindow = this; pBorderWin->GetBorder( mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder, mpWindowImpl->mnRightBorder, mpWindowImpl->mnBottomBorder ); - pBorderWin->SetDisplayActive( sal_True ); + pBorderWin->SetDisplayActive( true ); mpWindowImpl->mpBorderWindow = pBorderWin; mpWindowImpl->mpRealParent = pParent; } @@ -129,11 +129,11 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle ) mnTitle = (nStyle & (WB_MOVEABLE | WB_POPUP)) ? FLOATWIN_TITLE_NORMAL : FLOATWIN_TITLE_NONE; mnOldTitle = mnTitle; mnPopupModeFlags = 0; - mbInPopupMode = sal_False; - mbPopupMode = sal_False; - mbPopupModeCanceled = sal_False; - mbPopupModeTearOff = sal_False; - mbMouseDown = sal_False; + mbInPopupMode = false; + mbPopupMode = false; + mbPopupModeCanceled = false; + mbPopupModeTearOff = false; + mbMouseDown = false; ImplInitSettings(); } @@ -253,7 +253,7 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow, Rectangle normRect( rRect ); // rRect is already relative to top-level window normRect.SetPos( pW->ScreenToOutputPixel( normRect.TopLeft() ) ); - sal_Bool bRTL = Application::GetSettings().GetLayoutRTL(); + bool bRTL = Application::GetSettings().GetLayoutRTL(); Rectangle devRect( pW->OutputToAbsoluteScreenPixel( normRect.TopLeft() ), pW->OutputToAbsoluteScreenPixel( normRect.BottomRight() ) ); @@ -526,20 +526,20 @@ FloatingWindow* FloatingWindow::ImplFindLastLevelFloat() // ----------------------------------------------------------------------- -sal_Bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow ) +bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow ) { FloatingWindow* pWin = this; do { if ( pWin->mpFirstPopupModeWin == pWindow ) - return sal_True; + return true; pWin = pWin->mpNextFloat; } while ( pWin ); - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -548,7 +548,7 @@ IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl) { mnPostId = 0; mnPopupModeFlags = 0; - mbPopupMode = sal_False; + mbPopupMode = false; PopupModeEnd(); return 0; } @@ -610,7 +610,7 @@ void FloatingWindow::DataChanged( const DataChangedEvent& rDCEvt ) void FloatingWindow::ImplCallPopupModeEnd() { // PopupMode wurde beendet - mbInPopupMode = sal_False; + mbInPopupMode = false; // Handler asyncron rufen if ( !mnPostId ) @@ -708,11 +708,11 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags ) maFloatRect.Right() += 2; maFloatRect.Bottom() += 2; mnPopupModeFlags = nFlags; - mbInPopupMode = sal_True; - mbPopupMode = sal_True; - mbPopupModeCanceled = sal_False; - mbPopupModeTearOff = sal_False; - mbMouseDown = sal_False; + mbInPopupMode = true; + mbPopupMode = true; + mbPopupModeCanceled = false; + mbPopupModeTearOff = false; + mbMouseDown = false; mbOldSaveBackMode = IsSaveBackgroundEnabled(); EnableSaveBackground(); @@ -724,7 +724,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags ) if( nFlags & FLOATWIN_POPUPMODE_GRABFOCUS ) { // force key input even without focus (useful for menus) - mbGrabFocus = sal_True; + mbGrabFocus = true; } Show( true, SHOW_NOACTIVATE ); } @@ -739,7 +739,7 @@ void FloatingWindow::StartPopupMode( ToolBox* pBox, sal_uLong nFlags ) return; mpImplData->mpBox = pBox; - pBox->ImplFloatControl( sal_True, this ); + pBox->ImplFloatControl( true, this ); // retrieve some data from the ToolBox Rectangle aRect = pBox->GetItemRect( nItemId ); @@ -785,7 +785,7 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId ) ImplSVData* pSVData = ImplGetSVData(); - mbInCleanUp = sal_True; // prevent killing this window due to focus change while working with it + mbInCleanUp = true; // prevent killing this window due to focus change while working with it // Bei allen nachfolgenden PopupMode-Fenster den Modus auch beenden while ( pSVData->maWinData.mpFirstFloat && pSVData->maWinData.mpFirstFloat != this ) @@ -810,13 +810,13 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId ) else if ( pSVData->maWinData.mpFocusWin && pSVData->maWinData.mpFirstFloat && ImplIsWindowOrChild( pSVData->maWinData.mpFocusWin ) ) pSVData->maWinData.mpFirstFloat->GrabFocus(); - mbPopupModeTearOff = sal_False; + mbPopupModeTearOff = false; } else { - mbPopupModeTearOff = sal_True; + mbPopupModeTearOff = true; if ( nFocusId ) - Window::EndSaveFocus( nFocusId, sal_False ); + Window::EndSaveFocus( nFocusId, false ); } EnableSaveBackground( mbOldSaveBackMode ); @@ -828,7 +828,7 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId ) // ToolBox wieder auf normal schalten if ( mpImplData->mpBox ) { - mpImplData->mpBox->ImplFloatControl( sal_False, this ); + mpImplData->mpBox->ImplFloatControl( false, this ); mpImplData->mpBox = NULL; } @@ -849,7 +849,7 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId ) } } - mbInCleanUp = sal_False; + mbInCleanUp = false; } // ----------------------------------------------------------------------- diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index bf0f1911be44..e4b1998d445f 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -123,11 +123,11 @@ struct MenuItemData sal_uLong nUserValue; // User value Image aImage; // Image KeyCode aAccelKey; // Accelerator-Key - sal_Bool bChecked; // Checked - sal_Bool bEnabled; // Enabled - sal_Bool bVisible; // Visible (note: this flag will not override MENU_FLAG_HIDEDISABLEDENTRIES when true) + bool bChecked; // Checked + bool bEnabled; // Enabled + bool bVisible; // Visible (note: this flag will not override MENU_FLAG_HIDEDISABLEDENTRIES when true) bool bIsTemporary; // Temporary inserted ('No selection possible') - sal_Bool bMirrorMode; + bool bMirrorMode; long nItemImageAngle; Size aSz; // only temporarily valid OUString aAccessibleName; // accessible name @@ -267,11 +267,11 @@ MenuItemData* MenuItemList::Insert( pData->pSubMenu = NULL; pData->pAutoSubMenu = NULL; pData->nUserValue = 0; - pData->bChecked = sal_False; - pData->bEnabled = sal_True; - pData->bVisible = sal_True; + pData->bChecked = false; + pData->bEnabled = true; + pData->bVisible = true; pData->bIsTemporary = false; - pData->bMirrorMode = sal_False; + pData->bMirrorMode = false; pData->nItemImageAngle = 0; SalItemParams aSalMIData; @@ -303,11 +303,11 @@ void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos) pData->pSubMenu = NULL; pData->pAutoSubMenu = NULL; pData->nUserValue = 0; - pData->bChecked = sal_False; - pData->bEnabled = sal_True; - pData->bVisible = sal_True; + pData->bChecked = false; + pData->bEnabled = true; + pData->bVisible = true; pData->bIsTemporary = false; - pData->bMirrorMode = sal_False; + pData->bMirrorMode = false; pData->nItemImageAngle = 0; SalItemParams aSalMIData; @@ -502,9 +502,9 @@ private: sal_uInt16 nPosInParent; bool bInExecute; - sal_Bool bScrollMenu; - sal_Bool bScrollUp; - sal_Bool bScrollDown; + bool bScrollMenu; + bool bScrollUp; + bool bScrollDown; bool bIgnoreFirstMove; bool bKeyInput; @@ -517,14 +517,14 @@ private: void StateChanged( StateChangedType nType ); void DataChanged( const DataChangedEvent& rDCEvt ); protected: - Region ImplCalcClipRegion( sal_Bool bIncludeLogo = sal_True ) const; + Region ImplCalcClipRegion( bool bIncludeLogo = true ) const; void ImplInitClipRegion(); - void ImplDrawScroller( sal_Bool bUp ); + void ImplDrawScroller( bool bUp ); using Window::ImplScroll; void ImplScroll( const Point& rMousePos ); - void ImplScroll( sal_Bool bUp ); - void ImplCursorUpDown( sal_Bool bUp, sal_Bool bHomeEnd = sal_False ); - void ImplHighlightItem( const MouseEvent& rMEvt, sal_Bool bMBDown ); + void ImplScroll( bool bUp ); + void ImplCursorUpDown( bool bUp, bool bHomeEnd = false ); + void ImplHighlightItem( const MouseEvent& rMEvt, bool bMBDown ); long ImplGetStartY() const; Rectangle ImplGetItemRect( sal_uInt16 nPos ); @@ -546,8 +546,8 @@ public: void SetFocusId( sal_uLong nId ) { nSaveFocusId = nId; } sal_uLong GetFocusId() const { return nSaveFocusId; } - void EnableScrollMenu( sal_Bool b ); - sal_Bool IsScrollMenu() const { return bScrollMenu; } + void EnableScrollMenu( bool b ); + bool IsScrollMenu() const { return bScrollMenu; } sal_uInt16 GetScrollerHeight() const { return nScrollerHeight; } void Execute(); @@ -558,8 +558,8 @@ public: PopupMenu* GetActivePopup() const { return pActivePopup; } void KillActivePopup( PopupMenu* pThisOnly = NULL ); - void HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight ); - void ChangeHighlightItem( sal_uInt16 n, sal_Bool bStartPopupTimer ); + void HighlightItem( sal_uInt16 nPos, bool bHighlight ); + void ChangeHighlightItem( sal_uInt16 n, bool bStartPopupTimer ); sal_uInt16 GetHighlightedItem() const { return nHighlightedItem; } void SetPosInParent( sal_uInt16 nPos ) { nPosInParent = nPos; } @@ -704,7 +704,7 @@ private: sal_uInt16 nHighlightedItem; sal_uInt16 nRolloveredItem; sal_uLong nSaveFocusId; - sal_Bool mbAutoPopup; + bool mbAutoPopup; bool bIgnoreFirstMove; bool bStayActive; @@ -714,12 +714,12 @@ private: std::map< sal_uInt16, AddButtonEntry > m_aAddButtons; - void HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight ); - void ChangeHighlightItem( sal_uInt16 n, sal_Bool bSelectPopupEntry, sal_Bool bAllowRestoreFocus = sal_True, sal_Bool bDefaultToDocument = sal_True ); + void HighlightItem( sal_uInt16 nPos, bool bHighlight ); + void ChangeHighlightItem( sal_uInt16 n, bool bSelectPopupEntry, bool bAllowRestoreFocus = true, bool bDefaultToDocument = true ); sal_uInt16 ImplFindEntry( const Point& rMousePos ) const; - void ImplCreatePopup( sal_Bool bPreSelectFirst ); - sal_Bool ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bFromMenu = sal_True ); + void ImplCreatePopup( bool bPreSelectFirst ); + bool ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu = true ); Rectangle ImplGetItemRect( sal_uInt16 nPos ); void ImplInitStyleSettings(); @@ -739,7 +739,7 @@ public: MenuBarWindow( Window* pParent ); ~MenuBarWindow(); - void ShowButtons( sal_Bool bClose, sal_Bool bFloat, sal_Bool bHide ); + void ShowButtons( bool bClose, bool bFloat, bool bHide ); virtual void MouseMove( const MouseEvent& rMEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); @@ -759,7 +759,7 @@ public: sal_uInt16 GetHighlightedItem() const { return nHighlightedItem; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - void SetAutoPopup( sal_Bool bAuto ) { mbAutoPopup = bAuto; } + void SetAutoPopup( bool bAuto ) { mbAutoPopup = bAuto; } void ImplLayoutChanged(); Size MinCloseButtonSize(); @@ -916,13 +916,13 @@ static int ImplGetTopDockingAreaHeight( Window *pWindow ) Menu::Menu() { - bIsMenuBar = sal_False; + bIsMenuBar = false; ImplInit(); } // this constructor makes sure we're creating the native menu // with the correct type (ie, MenuBar vs. PopupMenu) -Menu::Menu( sal_Bool bMenubar ) +Menu::Menu( bool bMenubar ) { bIsMenuBar = bMenubar; ImplInit(); @@ -964,7 +964,7 @@ Menu::~Menu() pDelData = pDelData->mpNext; } - bKilled = sal_True; + bKilled = true; delete pItemList; delete pLogo; @@ -987,9 +987,9 @@ void Menu::ImplInit() pStartedFrom = NULL; pWindow = NULL; nEventId = 0; - bCanceled = sal_False; - bInCallback = sal_False; - bKilled = sal_False; + bCanceled = false; + bInCallback = false; + bKilled = false; mpLayoutData = NULL; mpFirstDel = NULL; // Dtor notification list // Native-support: returns NULL if not supported @@ -1049,7 +1049,7 @@ void Menu::CreateAutoMnemonics() void Menu::Activate() { - bInCallback = sal_True; + bInCallback = true; ImplMenuDelData aDelData( this ); @@ -1064,14 +1064,14 @@ void Menu::Activate() Menu* pStartMenu = ImplGetStartMenu(); if ( pStartMenu && ( pStartMenu != this ) ) { - pStartMenu->bInCallback = sal_True; + pStartMenu->bInCallback = true; // MT 11/01: Call EventListener here? I don't know... pStartMenu->aActivateHdl.Call( this ); - pStartMenu->bInCallback = sal_False; + pStartMenu->bInCallback = false; } } } - bInCallback = sal_False; + bInCallback = false; } } @@ -1084,7 +1084,7 @@ void Menu::Deactivate() pItemList->Remove( n ); } - bInCallback = sal_True; + bInCallback = true; ImplMenuDelData aDelData( this ); @@ -1099,9 +1099,9 @@ void Menu::Deactivate() { if ( pStartMenu && ( pStartMenu != this ) ) { - pStartMenu->bInCallback = sal_True; + pStartMenu->bInCallback = true; pStartMenu->aDeactivateHdl.Call( this ); - pStartMenu->bInCallback = sal_False; + pStartMenu->bInCallback = false; } } } @@ -1109,7 +1109,7 @@ void Menu::Deactivate() if( !aDelData.isDeleted() ) { - bInCallback = sal_False; + bInCallback = false; } } @@ -1130,11 +1130,11 @@ void Menu::ImplSelect() MenuItemData* pData = GetItemList()->GetData( nSelectedId ); if ( pData && (pData->nBits & MIB_AUTOCHECK) ) { - sal_Bool bChecked = IsItemChecked( nSelectedId ); + bool bChecked = IsItemChecked( nSelectedId ); if ( pData->nBits & MIB_RADIOCHECK ) { if ( !bChecked ) - CheckItem( nSelectedId, sal_True ); + CheckItem( nSelectedId, true ); } else CheckItem( nSelectedId, !bChecked ); @@ -1278,9 +1278,9 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos ) GetRes( rResId.SetRT( RSC_MENUITEM ) ); nObjMask = ReadLongRes(); - sal_Bool bSep = sal_False; + bool bSep = false; if ( nObjMask & RSC_MENUITEM_SEPARATOR ) - bSep = (sal_Bool)ReadShortRes(); + bSep = ReadShortRes() != 0; sal_uInt16 nItemId = 1; if ( nObjMask & RSC_MENUITEM_ID ) @@ -1340,12 +1340,12 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos ) if( nObjMask & RSC_MENUITEM_CHECKED ) { if ( !bSep ) - CheckItem( nItemId, (sal_Bool)ReadShortRes() ); + CheckItem( nItemId, ReadShortRes() != 0 ); } if ( nObjMask & RSC_MENUITEM_DISABLE ) { if ( !bSep ) - EnableItem( nItemId, !(sal_Bool)ReadShortRes() ); + EnableItem( nItemId, ReadShortRes() == 0 ); } if ( nObjMask & RSC_MENUITEM_COMMAND ) { @@ -1450,9 +1450,9 @@ void ImplCopyItem( Menu* pThis, const Menu& rMenu, sal_uInt16 nPos, sal_uInt16 n pThis->InsertItem( nId, pData->aImage, pData->nBits, pData->sIdent, nNewPos ); if ( rMenu.IsItemChecked( nId ) ) - pThis->CheckItem( nId, sal_True ); + pThis->CheckItem( nId, true ); if ( !rMenu.IsItemEnabled( nId ) ) - pThis->EnableItem( nId, sal_False ); + pThis->EnableItem( nId, false ); pThis->SetHelpId( nId, pData->aHelpId ); pThis->SetHelpText( nId, pData->aHelpText ); pThis->SetAccelKey( nId, pData->aAccelKey ); @@ -1594,14 +1594,14 @@ OUString Menu::GetItemAccKeyStrFromPos(sal_uInt16 nPos) const return OUString(); } -sal_Bool Menu::IsTemporaryItemFromPos(sal_uInt16 nPos ) const +bool Menu::IsTemporaryItemFromPos(sal_uInt16 nPos ) const { MenuItemData* pData = pItemList->GetDataFromPos( nPos ); if (pData) { return pData->bIsTemporary; } - return sal_False; + return false; } sal_uInt16 Menu::GetCurItemId() const @@ -1745,7 +1745,7 @@ KeyEvent Menu::GetActivationKey( sal_uInt16 nItemId ) const return aRet; } -void Menu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ) +void Menu::CheckItem( sal_uInt16 nItemId, bool bCheck ) { size_t nPos; MenuItemData* pData = pItemList->GetData( nItemId, nPos ); @@ -1760,7 +1760,7 @@ void Menu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ) MenuItemData* pGroupData; sal_uInt16 nGroupPos; sal_uInt16 nItemCount = GetItemCount(); - sal_Bool bFound = sal_False; + bool bFound = false; nGroupPos = nPos; while ( nGroupPos ) @@ -1770,8 +1770,8 @@ void Menu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ) { if ( IsItemChecked( pGroupData->nId ) ) { - CheckItem( pGroupData->nId, sal_False ); - bFound = sal_True; + CheckItem( pGroupData->nId, false ); + bFound = true; break; } } @@ -1790,7 +1790,7 @@ void Menu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ) { if ( IsItemChecked( pGroupData->nId ) ) { - CheckItem( pGroupData->nId, sal_False ); + CheckItem( pGroupData->nId, false ); break; } } @@ -1810,18 +1810,18 @@ void Menu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ) ImplCallEventListeners( bCheck ? VCLEVENT_MENU_ITEMCHECKED : VCLEVENT_MENU_ITEMUNCHECKED, nPos ); } -sal_Bool Menu::IsItemChecked( sal_uInt16 nItemId ) const +bool Menu::IsItemChecked( sal_uInt16 nItemId ) const { size_t nPos; MenuItemData* pData = pItemList->GetData( nItemId, nPos ); if ( !pData ) - return sal_False; + return false; return pData->bChecked; } -void Menu::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable ) +void Menu::EnableItem( sal_uInt16 nItemId, bool bEnable ) { size_t nPos; MenuItemData* pItemData = pItemList->GetData( nItemId, nPos ); @@ -1855,18 +1855,18 @@ void Menu::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable ) } } -sal_Bool Menu::IsItemEnabled( sal_uInt16 nItemId ) const +bool Menu::IsItemEnabled( sal_uInt16 nItemId ) const { size_t nPos; MenuItemData* pData = pItemList->GetData( nItemId, nPos ); if ( !pData ) - return sal_False; + return false; return pData->bEnabled; } -void Menu::ShowItem( sal_uInt16 nItemId, sal_Bool bVisible ) +void Menu::ShowItem( sal_uInt16 nItemId, bool bVisible ) { size_t nPos; MenuItemData* pData = pItemList->GetData( nItemId, nPos ); @@ -1981,7 +1981,7 @@ static inline Image ImplMirrorImage( const Image& rImage ) return Image( aBmpEx ); } -void Menu::SetItemImageMirrorMode( sal_uInt16 nItemId, sal_Bool bMirror ) +void Menu::SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror ) { size_t nPos; MenuItemData* pData = pItemList->GetData( nItemId, nPos ); @@ -2143,19 +2143,19 @@ Menu& Menu::operator=( const Menu& rMenu ) return *this; } -sal_Bool Menu::ImplIsVisible( sal_uInt16 nPos ) const +bool Menu::ImplIsVisible( sal_uInt16 nPos ) const { - sal_Bool bVisible = sal_True; + bool bVisible = true; MenuItemData* pData = pItemList->GetDataFromPos( nPos ); // check general visibility first if( pData && !pData->bVisible ) - bVisible = sal_False; + bVisible = false; if ( bVisible && pData && pData->eType == MENUITEM_SEPARATOR ) { if( nPos == 0 ) // no separator should be shown at the very beginning - bVisible = sal_False; + bVisible = false; else { // always avoid adjacent separators @@ -2173,10 +2173,10 @@ sal_Bool Menu::ImplIsVisible( sal_uInt16 nPos ) const } } if( n == nCount ) // no next visible item - bVisible = sal_False; + bVisible = false; // check for separator if( pNextData && pNextData->bVisible && pNextData->eType == MENUITEM_SEPARATOR ) - bVisible = sal_False; + bVisible = false; if( bVisible ) { @@ -2190,7 +2190,7 @@ sal_Bool Menu::ImplIsVisible( sal_uInt16 nPos ) const } } if( n == 0 ) // no previous visible item - bVisible = sal_False; + bVisible = false; } } } @@ -2201,7 +2201,7 @@ sal_Bool Menu::ImplIsVisible( sal_uInt16 nPos ) const !( nMenuFlags & MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES ) ) { if( !pData ) // e.g. nPos == ITEMPOS_INVALID - bVisible = sal_False; + bVisible = false; else if ( pData->eType != MENUITEM_SEPARATOR ) // separators handled above { // bVisible = pData->bEnabled && ( !pData->pSubMenu || pData->pSubMenu->HasValidEntries( sal_True ) ); @@ -2212,24 +2212,24 @@ sal_Bool Menu::ImplIsVisible( sal_uInt16 nPos ) const return bVisible; } -sal_Bool Menu::IsItemPosVisible( sal_uInt16 nItemPos ) const +bool Menu::IsItemPosVisible( sal_uInt16 nItemPos ) const { return IsMenuVisible() && ImplIsVisible( nItemPos ); } -sal_Bool Menu::IsMenuVisible() const +bool Menu::IsMenuVisible() const { return pWindow && pWindow->IsReallyVisible(); } -sal_Bool Menu::ImplIsSelectable( sal_uInt16 nPos ) const +bool Menu::ImplIsSelectable( sal_uInt16 nPos ) const { - sal_Bool bSelectable = sal_True; + bool bSelectable = true; MenuItemData* pData = pItemList->GetDataFromPos( nPos ); // check general visibility first if ( pData && ( pData->nBits & MIB_NOSELECT ) ) - bSelectable = sal_False; + bSelectable = false; return bSelectable; } @@ -2327,7 +2327,7 @@ Size Menu::ImplGetNativeCheckAndRadioSize( const Window* pWin, long& rCheckHeigh return Size(std::max(nCheckWidth, nRadioWidth), std::max(rCheckHeight, rRadioHeight)); } -sal_Bool Menu::ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, long& rArrowSpacing ) const +bool Menu::ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, long& rArrowSpacing ) const { ImplControlValue aVal; Rectangle aNativeBounds; @@ -2352,10 +2352,10 @@ sal_Bool Menu::ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, lo rArrowSize = aSize; rArrowSpacing = aNativeBounds.GetWidth() - aNativeContent.GetWidth(); - return sal_True; + return true; } } - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -2601,7 +2601,7 @@ Size Menu::ImplCalcSize( const Window* pWin ) static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRect, bool i_bHighlight ) { - sal_Bool bNativeOk = sal_False; + bool bNativeOk = false; if( i_pWindow->IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) ) { ImplControlValue aControlValue; @@ -2619,7 +2619,7 @@ static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRec { const StyleSettings& rSettings = i_pWindow->GetSettings().GetStyleSettings(); Color aColor( i_bHighlight ? rSettings.GetMenuHighlightTextColor() : rSettings.GetHighlightColor() ); - i_pWindow->DrawSelectionBackground( i_rRect, 0, i_bHighlight, sal_True, sal_False, 2, NULL, &aColor ); + i_pWindow->DrawSelectionBackground( i_rRect, 0, i_bHighlight, true, false, 2, NULL, &aColor ); } } @@ -2643,7 +2643,7 @@ static OUString getShortenedString( const OUString& i_rLong, Window* i_pWin, lon return aNonMnem; } -void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder, long nStartY, MenuItemData* pThisItemOnly, sal_Bool bHighlighted, bool bLayout, bool bRollover ) const +void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder, long nStartY, MenuItemData* pThisItemOnly, bool bHighlighted, bool bLayout, bool bRollover ) const { // for symbols: nFontHeight x nFontHeight long nFontHeight = pWin->GetTextHeight(); @@ -3065,7 +3065,7 @@ Menu* Menu::ImplFindMenu( sal_uInt16 nItemId ) return pSelMenu; } -void Menu::RemoveDisabledEntries( sal_Bool bCheckPopups, sal_Bool bRemoveEmptyPopups ) +void Menu::RemoveDisabledEntries( bool bCheckPopups, bool bRemoveEmptyPopups ) { for ( sal_uInt16 n = 0; n < GetItemCount(); n++ ) { @@ -3081,7 +3081,7 @@ void Menu::RemoveDisabledEntries( sal_Bool bCheckPopups, sal_Bool bRemoveEmptyPo if ( bCheckPopups && pItem->pSubMenu ) { - pItem->pSubMenu->RemoveDisabledEntries( sal_True ); + pItem->pSubMenu->RemoveDisabledEntries( true ); if ( bRemoveEmptyPopups && !pItem->pSubMenu->GetItemCount() ) bRemove = true; } @@ -3100,9 +3100,9 @@ void Menu::RemoveDisabledEntries( sal_Bool bCheckPopups, sal_Bool bRemoveEmptyPo delete mpLayoutData, mpLayoutData = NULL; } -sal_Bool Menu::HasValidEntries( sal_Bool bCheckPopups ) +bool Menu::HasValidEntries( bool bCheckPopups ) { - sal_Bool bValidEntries = sal_False; + bool bValidEntries = false; sal_uInt16 nCount = GetItemCount(); for ( sal_uInt16 n = 0; !bValidEntries && ( n < nCount ); n++ ) { @@ -3110,9 +3110,9 @@ sal_Bool Menu::HasValidEntries( sal_Bool bCheckPopups ) if ( pItem->bEnabled && ( pItem->eType != MENUITEM_SEPARATOR ) ) { if ( bCheckPopups && pItem->pSubMenu ) - bValidEntries = pItem->pSubMenu->HasValidEntries( sal_True ); + bValidEntries = pItem->pSubMenu->HasValidEntries( true ); else - bValidEntries = sal_True; + bValidEntries = true; } } return bValidEntries; @@ -3130,12 +3130,12 @@ void Menu::ImplFillLayoutData() const mpLayoutData = new MenuLayoutData(); if( bIsMenuBar ) { - ImplPaint( pWindow, 0, 0, 0, sal_False, true ); + ImplPaint( pWindow, 0, 0, 0, false, true ); } else { MenuFloatingWindow* pFloat = (MenuFloatingWindow*)pWindow; - ImplPaint( pWindow, pFloat->nScrollerHeight, pFloat->ImplGetStartY(), 0, sal_False, true ); + ImplPaint( pWindow, pFloat->nScrollerHeight, pFloat->ImplGetStartY(), 0, false, true ); } } } @@ -3228,16 +3228,16 @@ void Menu::ImplSetSalMenu( SalMenu *pSalMenu ) mpSalMenu = pSalMenu; } -sal_Bool Menu::GetSystemMenuData( SystemMenuData* pData ) const +bool Menu::GetSystemMenuData( SystemMenuData* pData ) const { Menu* pMenu = (Menu*)this; if( pData && pMenu->ImplGetSalMenu() ) { pMenu->ImplGetSalMenu()->GetSystemMenuData( pData ); - return sal_True; + return true; } else - return sal_False; + return false; } bool Menu::IsHighlighted( sal_uInt16 nItemPos ) const @@ -3262,12 +3262,12 @@ void Menu::HighlightItem( sal_uInt16 nItemPos ) if ( bIsMenuBar ) { MenuBarWindow* pMenuWin = static_cast< MenuBarWindow* >( pWindow ); - pMenuWin->SetAutoPopup( sal_False ); - pMenuWin->ChangeHighlightItem( nItemPos, sal_False ); + pMenuWin->SetAutoPopup( false ); + pMenuWin->ChangeHighlightItem( nItemPos, false ); } else { - static_cast< MenuFloatingWindow* >( pWindow )->ChangeHighlightItem( nItemPos, sal_False ); + static_cast< MenuFloatingWindow* >( pWindow )->ChangeHighlightItem( nItemPos, false ); } } } @@ -3277,35 +3277,35 @@ void Menu::HighlightItem( sal_uInt16 nItemPos ) // - MenuBar - // ----------- -MenuBar::MenuBar() : Menu( sal_True ) +MenuBar::MenuBar() : Menu( true ) { - mbDisplayable = sal_True; - mbCloserVisible = sal_False; - mbFloatBtnVisible = sal_False; - mbHideBtnVisible = sal_False; + mbDisplayable = true; + mbCloserVisible = false; + mbFloatBtnVisible = false; + mbHideBtnVisible = false; } -MenuBar::MenuBar( const MenuBar& rMenu ) : Menu( sal_True ) +MenuBar::MenuBar( const MenuBar& rMenu ) : Menu( true ) { - mbDisplayable = sal_True; - mbCloserVisible = sal_False; - mbFloatBtnVisible = sal_False; - mbHideBtnVisible = sal_False; + mbDisplayable = true; + mbCloserVisible = false; + mbFloatBtnVisible = false; + mbHideBtnVisible = false; *this = rMenu; - bIsMenuBar = sal_True; + bIsMenuBar = true; } MenuBar::~MenuBar() { - ImplDestroy( this, sal_True ); + ImplDestroy( this, true ); } -void MenuBar::ShowCloser( sal_Bool bShow ) +void MenuBar::ShowCloser( bool bShow ) { ShowButtons( bShow, mbFloatBtnVisible, mbHideBtnVisible ); } -void MenuBar::ShowButtons( sal_Bool bClose, sal_Bool bFloat, sal_Bool bHide ) +void MenuBar::ShowButtons( bool bClose, bool bFloat, bool bHide ) { if ( (bClose != mbCloserVisible) || (bFloat != mbFloatBtnVisible) || @@ -3319,7 +3319,7 @@ void MenuBar::ShowButtons( sal_Bool bClose, sal_Bool bFloat, sal_Bool bHide ) } } -void MenuBar::SetDisplayable( sal_Bool bDisplayable ) +void MenuBar::SetDisplayable( bool bDisplayable ) { if( bDisplayable != mbDisplayable ) { @@ -3350,7 +3350,7 @@ Window* MenuBar::ImplCreate( Window* pParent, Window* pWindow, MenuBar* pMenu ) return pWindow; } -void MenuBar::ImplDestroy( MenuBar* pMenu, sal_Bool bDelete ) +void MenuBar::ImplDestroy( MenuBar* pMenu, bool bDelete ) { MenuBarWindow* pWindow = (MenuBarWindow*) pMenu->ImplGetWindow(); if ( pWindow && bDelete ) @@ -3361,9 +3361,9 @@ void MenuBar::ImplDestroy( MenuBar* pMenu, sal_Bool bDelete ) pMenu->pWindow = NULL; } -sal_Bool MenuBar::ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bFromMenu ) +bool MenuBar::ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu ) { - sal_Bool bDone = sal_False; + bool bDone = false; // No keyboard processing when system handles the menu or our menubar is invisible if( !IsDisplayable() || @@ -3389,14 +3389,14 @@ void MenuBar::SelectEntry( sal_uInt16 nId ) nId = GetItemPos( nId ); // #99705# popup the selected menu - pMenuWin->SetAutoPopup( sal_True ); + pMenuWin->SetAutoPopup( true ); if( ITEMPOS_INVALID != pMenuWin->nHighlightedItem ) { pMenuWin->KillActivePopup(); - pMenuWin->ChangeHighlightItem( ITEMPOS_INVALID, sal_False ); + pMenuWin->ChangeHighlightItem( ITEMPOS_INVALID, false ); } if( nId != ITEMPOS_INVALID ) - pMenuWin->ChangeHighlightItem( nId, sal_False ); + pMenuWin->ChangeHighlightItem( nId, false ); } } @@ -3404,38 +3404,38 @@ void MenuBar::SelectEntry( sal_uInt16 nId ) // handler for native menu selection and command events -sal_Bool MenuBar::HandleMenuActivateEvent( Menu *pMenu ) const +bool MenuBar::HandleMenuActivateEvent( Menu *pMenu ) const { if( pMenu ) { ImplMenuDelData aDelData( this ); pMenu->pStartedFrom = (Menu*)this; - pMenu->bInCallback = sal_True; + pMenu->bInCallback = true; pMenu->Activate(); if( !aDelData.isDeleted() ) - pMenu->bInCallback = sal_False; + pMenu->bInCallback = false; } - return sal_True; + return true; } -sal_Bool MenuBar::HandleMenuDeActivateEvent( Menu *pMenu ) const +bool MenuBar::HandleMenuDeActivateEvent( Menu *pMenu ) const { if( pMenu ) { ImplMenuDelData aDelData( this ); pMenu->pStartedFrom = (Menu*)this; - pMenu->bInCallback = sal_True; + pMenu->bInCallback = true; pMenu->Deactivate(); if( !aDelData.isDeleted() ) - pMenu->bInCallback = sal_False; + pMenu->bInCallback = false; } - return sal_True; + return true; } -sal_Bool MenuBar::HandleMenuHighlightEvent( Menu *pMenu, sal_uInt16 nHighlightEventId ) const +bool MenuBar::HandleMenuHighlightEvent( Menu *pMenu, sal_uInt16 nHighlightEventId ) const { if( !pMenu ) pMenu = ((Menu*) this)->ImplFindMenu( nHighlightEventId ); @@ -3453,13 +3453,13 @@ sal_Bool MenuBar::HandleMenuHighlightEvent( Menu *pMenu, sal_uInt16 nHighlightEv pMenu->pStartedFrom = (Menu*)this; pMenu->ImplCallHighlight( pMenu->mnHighlightedItemPos ); } - return sal_True; + return true; } else - return sal_False; + return false; } -sal_Bool MenuBar::HandleMenuCommandEvent( Menu *pMenu, sal_uInt16 nCommandEventId ) const +bool MenuBar::HandleMenuCommandEvent( Menu *pMenu, sal_uInt16 nCommandEventId ) const { if( !pMenu ) pMenu = ((Menu*) this)->ImplFindMenu( nCommandEventId ); @@ -3468,10 +3468,10 @@ sal_Bool MenuBar::HandleMenuCommandEvent( Menu *pMenu, sal_uInt16 nCommandEventI pMenu->nSelectedId = nCommandEventId; pMenu->pStartedFrom = (Menu*)this; pMenu->ImplSelect(); - return sal_True; + return true; } else - return sal_False; + return false; } sal_uInt16 MenuBar::AddMenuBarButton( const Image& i_rImage, const Link& i_rLink, const OUString& i_rToolTip, sal_uInt16 i_nPos ) @@ -3496,7 +3496,7 @@ void MenuBar::RemoveMenuBarButton( sal_uInt16 nId ) static_cast<MenuBarWindow*>(pWindow)->RemoveMenuBarButton( nId ); } -sal_Bool MenuBar::HandleMenuButtonEvent( Menu *, sal_uInt16 i_nButtonId ) const +bool MenuBar::HandleMenuButtonEvent( Menu *, sal_uInt16 i_nButtonId ) const { return static_cast<MenuBarWindow*>(pWindow)->HandleMenuButtonEvent( i_nButtonId ); } @@ -3528,7 +3528,7 @@ PopupMenu::~PopupMenu() *pRefAutoSubMenu = NULL; // #111060# avoid second delete in ~MenuItemData } -sal_Bool PopupMenu::IsInExecute() +bool PopupMenu::IsInExecute() { return GetActivePopupMenu() ? sal_True : sal_False; } @@ -3554,7 +3554,7 @@ void PopupMenu::SelectEntry( sal_uInt16 nId ) size_t nPos = 0; MenuItemData* pData = GetItemList()->GetData( nId, nPos ); if ( pData->pSubMenu ) - ImplGetFloatingWindow()->ChangeHighlightItem( nPos, sal_True ); + ImplGetFloatingWindow()->ChangeHighlightItem( nPos, true ); else ImplGetFloatingWindow()->EndExecute( nId ); } @@ -3571,7 +3571,7 @@ void PopupMenu::SelectEntry( sal_uInt16 nId ) pFloat->KillActivePopup(); } } - pFloat->ChangeHighlightItem( ITEMPOS_INVALID, sal_False ); + pFloat->ChangeHighlightItem( ITEMPOS_INVALID, false ); } } } @@ -3608,10 +3608,10 @@ sal_uInt16 PopupMenu::Execute( Window* pExecWindow, const Rectangle& rRect, sal_ if (nFlags & POPUPMENU_NOHORZ_PLACEMENT) nPopupModeFlags |= FLOATWIN_POPUPMODE_NOHORZPLACEMENT; - return ImplExecute( pExecWindow, rRect, nPopupModeFlags, 0, sal_False ); + return ImplExecute( pExecWindow, rRect, nPopupModeFlags, 0, false ); } -sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong nPopupModeFlags, Menu* pSFrom, sal_Bool bPreSelectFirst ) +sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong nPopupModeFlags, Menu* pSFrom, bool bPreSelectFirst ) { if ( !pSFrom && ( PopupMenu::IsInExecute() || !GetItemCount() ) ) return 0; @@ -3622,13 +3622,13 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong pStartedFrom = pSFrom; nSelectedId = 0; - bCanceled = sal_False; + bCanceled = false; sal_uLong nFocusId = 0; bool bRealExecute = false; if ( !pStartedFrom ) { - pSVData->maWinData.mbNoDeactivate = sal_True; + pSVData->maWinData.mbNoDeactivate = true; nFocusId = Window::SaveFocus(); bRealExecute = true; } @@ -3657,9 +3657,9 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong ImplDelData aDelData; pW->ImplAddDel( &aDelData ); - bInCallback = sal_True; // set it here, if Activate overloaded + bInCallback = true; // set it here, if Activate overloaded Activate(); - bInCallback = sal_False; + bInCallback = false; if ( aDelData.IsDead() ) return 0; // Error @@ -3753,7 +3753,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong nMaxHeight -= nTop+nBottom; if ( aSz.Height() > nMaxHeight ) { - pWin->EnableScrollMenu( sal_True ); + pWin->EnableScrollMenu( true ); sal_uInt16 nStart = ImplGetFirstVisible(); sal_uInt16 nEntries = ImplCalcVisEntries( nMaxHeight, nStart ); aSz.Height() = ImplCalcHeight( nEntries ); @@ -3808,7 +3808,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong && ImplIsSelectable( n ) ) { - pWin->ChangeHighlightItem( n, sal_False ); + pWin->ChangeHighlightItem( n, false ); break; } } @@ -3838,7 +3838,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong if ( nFocusId ) { pWin->SetFocusId( 0 ); - pSVData->maWinData.mbNoDeactivate = sal_False; + pSVData->maWinData.mbNoDeactivate = false; } pWin->ImplEndPopupMode( 0, nFocusId ); @@ -3934,7 +3934,7 @@ static void ImplInitMenuWindow( Window* pWin, bool bFont, bool bMenuBar ) aWallpaper.SetColor( Application::GetSettings().GetStyleSettings().GetWorkspaceColor() ); pWin->SetBackground( aWallpaper ); - pWin->SetPaintTransparent( sal_False ); + pWin->SetPaintTransparent( false ); pWin->SetParentClipMode( 0 ); } else if ( pWin->IsNativeControlSupported( CTRL_MENUBAR, PART_ENTIRE_CONTROL ) ) @@ -3946,7 +3946,7 @@ static void ImplInitMenuWindow( Window* pWin, bool bFont, bool bMenuBar ) Wallpaper aWallpaper; aWallpaper.SetStyle( WALLPAPER_APPLICATIONGRADIENT ); pWin->SetBackground( aWallpaper ); - pWin->SetPaintTransparent( sal_False ); + pWin->SetPaintTransparent( false ); pWin->SetParentClipMode( 0 ); } } @@ -3976,15 +3976,15 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, Window* pParent, WinBits nSt pActivePopup = 0; nSaveFocusId = 0; bInExecute = false; - bScrollMenu = sal_False; + bScrollMenu = false; nHighlightedItem = ITEMPOS_INVALID; nMBDownPos = ITEMPOS_INVALID; nPosInParent = ITEMPOS_INVALID; nScrollerHeight = 0; nBorder = EXTRASPACEY; nFirstEntry = 0; - bScrollUp = sal_False; - bScrollDown = sal_False; + bScrollUp = false; + bScrollDown = false; bIgnoreFirstMove = true; bKeyInput = false; @@ -4026,7 +4026,7 @@ void MenuFloatingWindow::doShutdown() { MenuFloatingWindow* pPWin = (MenuFloatingWindow*)pMenu->pStartedFrom->ImplGetWindow(); if( pPWin ) - pPWin->HighlightItem( i, sal_False ); + pPWin->HighlightItem( i, false ); } } @@ -4068,7 +4068,7 @@ long MenuFloatingWindow::ImplGetStartY() const return -nY; } -Region MenuFloatingWindow::ImplCalcClipRegion( sal_Bool bIncludeLogo ) const +Region MenuFloatingWindow::ImplCalcClipRegion( bool bIncludeLogo ) const { Size aOutSz = GetOutputSizePixel(); Point aPos; @@ -4098,7 +4098,7 @@ void MenuFloatingWindow::ImplInitClipRegion() } } -void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, sal_Bool bMBDown ) +void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, bool bMBDown ) { if( ! pMenu ) return; @@ -4120,7 +4120,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, sal_Bool bM nY += pItemData->aSz.Height(); if ( ( nOldY <= nMouseY ) && ( nY > nMouseY ) && pMenu->ImplIsSelectable( n ) ) { - sal_Bool bPopupArea = sal_True; + bool bPopupArea = true; if ( pItemData->nBits & MIB_POPUPSELECT ) { // only when clicked over the arrow... @@ -4133,10 +4133,10 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, sal_Bool bM { if ( n != nHighlightedItem ) { - ChangeHighlightItem( (sal_uInt16)n, sal_False ); + ChangeHighlightItem( (sal_uInt16)n, false ); } - sal_Bool bAllowNewPopup = sal_True; + bool bAllowNewPopup = true; if ( pActivePopup ) { MenuItemData* pData = pMenu->pItemList->GetDataFromPos( n ); @@ -4154,7 +4154,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, sal_Bool bM { if ( n != nHighlightedItem ) { - ChangeHighlightItem( (sal_uInt16)n, sal_True ); + ChangeHighlightItem( (sal_uInt16)n, true ); } else if ( pItemData->nBits & MIB_POPUPSELECT ) { @@ -4167,12 +4167,12 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, sal_Bool bM } } if ( !bHighlighted ) - ChangeHighlightItem( ITEMPOS_INVALID, sal_True ); + ChangeHighlightItem( ITEMPOS_INVALID, true ); } else { ImplScroll( rMEvt.GetPosPixel() ); - ChangeHighlightItem( ITEMPOS_INVALID, sal_True ); + ChangeHighlightItem( ITEMPOS_INVALID, true ); } } @@ -4189,9 +4189,9 @@ IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd) //pActivePopup->bCanceled = sal_True; } bInExecute = false; - pMenu->bInCallback = sal_True; + pMenu->bInCallback = true; pMenu->Deactivate(); - pMenu->bInCallback = sal_False; + pMenu->bInCallback = false; } else { @@ -4317,11 +4317,11 @@ IMPL_LINK( MenuFloatingWindow, ShowHideListener, VclWindowEvent*, pEvent ) return 0; } -void MenuFloatingWindow::EnableScrollMenu( sal_Bool b ) +void MenuFloatingWindow::EnableScrollMenu( bool b ) { bScrollMenu = b; nScrollerHeight = b ? (sal_uInt16) GetSettings().GetStyleSettings().GetScrollBarSize() /2 : 0; - bScrollDown = sal_True; + bScrollDown = true; ImplInitClipRegion(); } @@ -4346,12 +4346,12 @@ void MenuFloatingWindow::StopExecute( sal_uLong nFocusId ) // (could have been restored in Select) if ( nSaveFocusId ) { - Window::EndSaveFocus( nFocusId, sal_False ); + Window::EndSaveFocus( nFocusId, false ); nFocusId = nSaveFocusId; if ( nFocusId ) { nSaveFocusId = 0; - ImplGetSVData()->maWinData.mbNoDeactivate = sal_False; + ImplGetSVData()->maWinData.mbNoDeactivate = false; } } ImplEndPopupMode( 0, nFocusId ); @@ -4375,15 +4375,15 @@ void MenuFloatingWindow::KillActivePopup( PopupMenu* pThisOnly ) if( ((FloatingWindow *) pActivePopup->pWindow)->IsInCleanUp() ) return; // kill it later if ( pActivePopup->bInCallback ) - pActivePopup->bCanceled = sal_True; + pActivePopup->bCanceled = true; // For all actions pActivePopup = 0, if e.g. // PopupModeEndHdl the popups to destroy were called synchronous PopupMenu* pPopup = pActivePopup; pActivePopup = NULL; - pPopup->bInCallback = sal_True; + pPopup->bInCallback = true; pPopup->Deactivate(); - pPopup->bInCallback = sal_False; + pPopup->bInCallback = false; if ( pPopup->ImplGetWindow() ) { pPopup->ImplGetFloatingWindow()->StopExecute(); @@ -4406,7 +4406,7 @@ void MenuFloatingWindow::EndExecute() if ( nFocusId ) { ((MenuBarWindow*)((MenuBar*)pStart)->ImplGetWindow())->SetFocusId( 0 ); - ImplGetSVData()->maWinData.mbNoDeactivate = sal_False; + ImplGetSVData()->maWinData.mbNoDeactivate = false; } } @@ -4460,7 +4460,7 @@ void MenuFloatingWindow::MouseButtonDown( const MouseEvent& rMEvt ) //if ( pActivePopup && pActivePopup->ImplGetWindow() && !pActivePopup->ImplGetFloatingWindow()->pActivePopup ) // pActivePopup->ImplGetFloatingWindow()->ToTop( TOTOP_NOGRABFOCUS ); - ImplHighlightItem( rMEvt, sal_True ); + ImplHighlightItem( rMEvt, true ); nMBDownPos = nHighlightedItem; } @@ -4504,7 +4504,7 @@ void MenuFloatingWindow::MouseMove( const MouseEvent& rMEvt ) pActivePopup->ImplGetFloatingWindow()->aSubmenuCloseTimer.Start(); if( !pActivePopup || (pData && pData->pSubMenu != pActivePopup ) ) - ChangeHighlightItem( ITEMPOS_INVALID, sal_False ); + ChangeHighlightItem( ITEMPOS_INVALID, false ); if ( IsScrollMenu() ) ImplScroll( rMEvt.GetPosPixel() ); @@ -4515,11 +4515,11 @@ void MenuFloatingWindow::MouseMove( const MouseEvent& rMEvt ) if( bIgnoreFirstMove ) bIgnoreFirstMove = false; else - ImplHighlightItem( rMEvt, sal_False ); + ImplHighlightItem( rMEvt, false ); } } -void MenuFloatingWindow::ImplScroll( sal_Bool bUp ) +void MenuFloatingWindow::ImplScroll( bool bUp ) { KillActivePopup(); Update(); @@ -4527,7 +4527,7 @@ void MenuFloatingWindow::ImplScroll( sal_Bool bUp ) if( ! pMenu ) return; - HighlightItem( nHighlightedItem, sal_False ); + HighlightItem( nHighlightedItem, false ); pMenu->ImplKillLayoutData(); @@ -4540,17 +4540,17 @@ void MenuFloatingWindow::ImplScroll( sal_Bool bUp ) if ( !bScrollDown ) { - bScrollDown = sal_True; - ImplDrawScroller( sal_False ); + bScrollDown = true; + ImplDrawScroller( false ); } if ( pMenu->ImplGetPrevVisible( nFirstEntry ) == ITEMPOS_INVALID ) { - bScrollUp = sal_False; - ImplDrawScroller( sal_True ); + bScrollUp = false; + ImplDrawScroller( true ); } - Scroll( 0, nScrollEntryHeight, ImplCalcClipRegion( sal_False ).GetBoundRect(), SCROLL_CLIP ); + Scroll( 0, nScrollEntryHeight, ImplCalcClipRegion( false ).GetBoundRect(), SCROLL_CLIP ); } else if ( bScrollDown && !bUp ) { @@ -4562,8 +4562,8 @@ void MenuFloatingWindow::ImplScroll( sal_Bool bUp ) if ( !bScrollUp ) { - bScrollUp = sal_True; - ImplDrawScroller( sal_True ); + bScrollUp = true; + ImplDrawScroller( true ); } long nHeight = GetOutputSizePixel().Height(); @@ -4571,14 +4571,14 @@ void MenuFloatingWindow::ImplScroll( sal_Bool bUp ) ((PopupMenu*)pMenu)->ImplCalcVisEntries( nHeight, nFirstEntry, &nLastVisible ); if ( pMenu->ImplGetNextVisible( nLastVisible ) == ITEMPOS_INVALID ) { - bScrollDown = sal_False; - ImplDrawScroller( sal_False ); + bScrollDown = false; + ImplDrawScroller( false ); } - Scroll( 0, -nScrollEntryHeight, ImplCalcClipRegion( sal_False ).GetBoundRect(), SCROLL_CLIP ); + Scroll( 0, -nScrollEntryHeight, ImplCalcClipRegion( false ).GetBoundRect(), SCROLL_CLIP ); } - HighlightItem( nHighlightedItem, sal_True ); + HighlightItem( nHighlightedItem, true ); } void MenuFloatingWindow::ImplScroll( const Point& rMousePos ) @@ -4591,12 +4591,12 @@ void MenuFloatingWindow::ImplScroll( const Point& rMousePos ) if ( bScrollUp && ( nMouseY < nY ) ) { - ImplScroll( sal_True ); + ImplScroll( true ); nDelta = nY - nMouseY; } else if ( bScrollDown && ( nMouseY > ( aOutSz.Height() - nY ) ) ) { - ImplScroll( sal_False ); + ImplScroll( false ); nDelta = nMouseY - ( aOutSz.Height() - nY ); } @@ -4618,7 +4618,7 @@ void MenuFloatingWindow::ImplScroll( const Point& rMousePos ) aScrollTimer.Start(); } } -void MenuFloatingWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bStartPopupTimer ) +void MenuFloatingWindow::ChangeHighlightItem( sal_uInt16 n, bool bStartPopupTimer ) { // #57934# ggf. immediately close the active, as TH's backgroundstorage works. // #65750# we prefer to refrain from the background storage of small lines. @@ -4633,7 +4633,7 @@ void MenuFloatingWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bStartPopup if ( nHighlightedItem != ITEMPOS_INVALID ) { - HighlightItem( nHighlightedItem, sal_False ); + HighlightItem( nHighlightedItem, false ); pMenu->ImplCallEventListeners( VCLEVENT_MENU_DEHIGHLIGHT, nHighlightedItem ); } @@ -4657,12 +4657,12 @@ void MenuFloatingWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bStartPopup MenuFloatingWindow* pPWin = (MenuFloatingWindow*)pMenu->pStartedFrom->ImplGetWindow(); if( pPWin && pPWin->nHighlightedItem != i ) { - pPWin->HighlightItem( i, sal_True ); + pPWin->HighlightItem( i, true ); pPWin->nHighlightedItem = i; } } } - HighlightItem( nHighlightedItem, sal_True ); + HighlightItem( nHighlightedItem, true ); pMenu->SetHightlightItem(nHighlightedItem); pMenu->ImplCallHighlight( nHighlightedItem ); } @@ -4682,7 +4682,7 @@ void MenuFloatingWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bStartPopup } } -void MenuFloatingWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight ) +void MenuFloatingWindow::HighlightItem( sal_uInt16 nPos, bool bHighlight ) { if( ! pMenu ) return; @@ -4733,7 +4733,7 @@ void MenuFloatingWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight ) IsNativeControlSupported( CTRL_MENU_POPUP, PART_MENU_ITEM ) ) { bDrawItemRect = false; - if( sal_False == DrawNativeControl( CTRL_MENU_POPUP, PART_MENU_ITEM, + if( !DrawNativeControl( CTRL_MENU_POPUP, PART_MENU_ITEM, aItemRect, CTRL_STATE_SELECTED | ( pData->bEnabled? CTRL_STATE_ENABLED: 0 ), aVal, @@ -4814,7 +4814,7 @@ Rectangle MenuFloatingWindow::ImplGetItemRect( sal_uInt16 nPos ) } -void MenuFloatingWindow::ImplCursorUpDown( sal_Bool bUp, sal_Bool bHomeEnd ) +void MenuFloatingWindow::ImplCursorUpDown( bool bUp, bool bHomeEnd ) { if( ! pMenu ) return; @@ -4878,21 +4878,21 @@ void MenuFloatingWindow::ImplCursorUpDown( sal_Bool bUp, sal_Bool bHomeEnd ) // Is selection in visible area? if ( IsScrollMenu() ) { - ChangeHighlightItem( ITEMPOS_INVALID, sal_False ); + ChangeHighlightItem( ITEMPOS_INVALID, false ); while ( n < nFirstEntry ) - ImplScroll( sal_True ); + ImplScroll( true ); Size aOutSz = GetOutputSizePixel(); sal_uInt16 nLastVisible; ((PopupMenu*)pMenu)->ImplCalcVisEntries( aOutSz.Height(), nFirstEntry, &nLastVisible ); while ( n > nLastVisible ) { - ImplScroll( sal_False ); + ImplScroll( false ); ((PopupMenu*)pMenu)->ImplCalcVisEntries( aOutSz.Height(), nFirstEntry, &nLastVisible ); } } - ChangeHighlightItem( n, sal_False ); + ChangeHighlightItem( n, false ); break; } } while ( n != nLoop ); @@ -4916,7 +4916,7 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent ) case KEY_END: case KEY_HOME: { - ImplCursorUpDown( nCode == KEY_END, sal_True ); + ImplCursorUpDown( nCode == KEY_END, true ); } break; case KEY_F6: @@ -4965,7 +4965,7 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent ) pFloat->GrabFocus(); pFloat->KillActivePopup(); sal_uInt16 highlightItem = pFloat->GetHighlightedItem(); - pFloat->ChangeHighlightItem(highlightItem, sal_False); + pFloat->ChangeHighlightItem(highlightItem, false); } } } @@ -5036,7 +5036,7 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent ) { if ( pData->pSubMenu || nDuplicates > 1 ) { - ChangeHighlightItem( nPos, sal_False ); + ChangeHighlightItem( nPos, false ); HighlightChanged( 0 ); } else @@ -5078,16 +5078,16 @@ void MenuFloatingWindow::Paint( const Rectangle& ) } if ( IsScrollMenu() ) { - ImplDrawScroller( sal_True ); - ImplDrawScroller( sal_False ); + ImplDrawScroller( true ); + ImplDrawScroller( false ); } SetFillColor( GetSettings().GetStyleSettings().GetMenuColor() ); pMenu->ImplPaint( this, nScrollerHeight, ImplGetStartY() ); if ( nHighlightedItem != ITEMPOS_INVALID ) - HighlightItem( nHighlightedItem, sal_True ); + HighlightItem( nHighlightedItem, true ); } -void MenuFloatingWindow::ImplDrawScroller( sal_Bool bUp ) +void MenuFloatingWindow::ImplDrawScroller( bool bUp ) { if( ! pMenu ) return; @@ -5192,7 +5192,7 @@ MenuBarWindow::MenuBarWindow( Window* pParent ) : nSaveFocusId = 0; nHighlightedItem = ITEMPOS_INVALID; nRolloveredItem = ITEMPOS_INVALID; - mbAutoPopup = sal_True; + mbAutoPopup = true; nSaveFocusId = 0; bIgnoreFirstMove = true; bStayActive = false; @@ -5206,7 +5206,7 @@ MenuBarWindow::MenuBarWindow( Window* pParent ) : aCloser.SetOutStyle( TOOLBOX_STYLE_FLAT ); aCloser.SetBackground(); - aCloser.SetPaintTransparent( sal_True ); + aCloser.SetPaintTransparent( true ); aCloser.SetParentClipMode( PARENTCLIPMODE_NOCLIP ); aCloser.InsertItem( IID_DOCUMENTCLOSE, aCloser.maImage, 0 ); @@ -5259,7 +5259,7 @@ void MenuBarWindow::SetMenu( MenuBar* pMen ) } } -void MenuBarWindow::ShowButtons( sal_Bool bClose, sal_Bool bFloat, sal_Bool bHide ) +void MenuBarWindow::ShowButtons( bool bClose, bool bFloat, bool bHide ) { aCloser.ShowItem( IID_DOCUMENTCLOSE, bClose ); aCloser.Show( bClose || ! m_aAddButtons.empty() ); @@ -5346,7 +5346,7 @@ IMPL_LINK_NOARG(MenuBarWindow, HideHdl) return pMenu ? ((MenuBar*)pMenu)->GetHideButtonClickHdl().Call( pMenu ) : 0; } -void MenuBarWindow::ImplCreatePopup( sal_Bool bPreSelectFirst ) +void MenuBarWindow::ImplCreatePopup( bool bPreSelectFirst ) { MenuItemData* pItemData = pMenu ? pMenu->GetItemList()->GetDataFromPos( nHighlightedItem ) : NULL; if ( pItemData ) @@ -5406,11 +5406,11 @@ void MenuBarWindow::KillActivePopup() return; // kill it later if ( pActivePopup->bInCallback ) - pActivePopup->bCanceled = sal_True; + pActivePopup->bCanceled = true; - pActivePopup->bInCallback = sal_True; + pActivePopup->bInCallback = true; pActivePopup->Deactivate(); - pActivePopup->bInCallback = sal_False; + pActivePopup->bInCallback = false; // check for pActivePopup, if stopped by deactivate... if ( pActivePopup->ImplGetWindow() ) { @@ -5428,22 +5428,22 @@ void MenuBarWindow::PopupClosed( Menu* pPopup ) if ( pPopup == pActivePopup ) { KillActivePopup(); - ChangeHighlightItem( ITEMPOS_INVALID, sal_False, ImplGetFrameWindow()->ImplGetFrameData()->mbHasFocus, sal_False ); + ChangeHighlightItem( ITEMPOS_INVALID, false, ImplGetFrameWindow()->ImplGetFrameData()->mbHasFocus, false ); } } void MenuBarWindow::MouseButtonDown( const MouseEvent& rMEvt ) { - mbAutoPopup = sal_True; + mbAutoPopup = true; sal_uInt16 nEntry = ImplFindEntry( rMEvt.GetPosPixel() ); if ( ( nEntry != ITEMPOS_INVALID ) && !pActivePopup ) { - ChangeHighlightItem( nEntry, sal_False ); + ChangeHighlightItem( nEntry, false ); } else { KillActivePopup(); - ChangeHighlightItem( ITEMPOS_INVALID, sal_False ); + ChangeHighlightItem( ITEMPOS_INVALID, false ); } } @@ -5459,7 +5459,7 @@ void MenuBarWindow::MouseMove( const MouseEvent& rMEvt ) if ( rMEvt.IsLeaveWindow() ) { if ( nRolloveredItem != ITEMPOS_INVALID && nRolloveredItem != nHighlightedItem ) - HighlightItem( nRolloveredItem, sal_False ); + HighlightItem( nRolloveredItem, false ); nRolloveredItem = ITEMPOS_INVALID; return; @@ -5471,10 +5471,10 @@ void MenuBarWindow::MouseMove( const MouseEvent& rMEvt ) if ( nRolloveredItem != nEntry ) { if ( nRolloveredItem != ITEMPOS_INVALID ) - HighlightItem( nRolloveredItem, sal_False ); + HighlightItem( nRolloveredItem, false ); nRolloveredItem = nEntry; - HighlightItem( nRolloveredItem, sal_True ); + HighlightItem( nRolloveredItem, true ); } return; } @@ -5488,10 +5488,10 @@ void MenuBarWindow::MouseMove( const MouseEvent& rMEvt ) if ( ( nEntry != ITEMPOS_INVALID ) && ( nEntry != nHighlightedItem ) ) - ChangeHighlightItem( nEntry, sal_False ); + ChangeHighlightItem( nEntry, false ); } -void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bSelectEntry, sal_Bool bAllowRestoreFocus, sal_Bool bDefaultToDocument) +void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, bool bSelectEntry, bool bAllowRestoreFocus, bool bDefaultToDocument) { if( ! pMenu ) return; @@ -5505,7 +5505,7 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bSelectEntry, sa bool bJustActivated = false; if ( ( nHighlightedItem == ITEMPOS_INVALID ) && ( n != ITEMPOS_INVALID ) ) { - ImplGetSVData()->maWinData.mbNoDeactivate = sal_True; + ImplGetSVData()->maWinData.mbNoDeactivate = true; if( !bStayActive ) { // #105406# avoid saving the focus when we already have the focus @@ -5516,7 +5516,7 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bSelectEntry, sa if( !ImplGetSVData()->maWinData.mbNoSaveFocus ) { // we didn't clean up last time - Window::EndSaveFocus( nSaveFocusId, sal_False ); // clean up + Window::EndSaveFocus( nSaveFocusId, false ); // clean up nSaveFocusId = 0; if( !bNoSaveFocus ) nSaveFocusId = Window::SaveFocus(); // only save focus when initially activated @@ -5533,17 +5533,17 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bSelectEntry, sa } else bStayActive = false; - pMenu->bInCallback = sal_True; // set here if Activate overloaded + pMenu->bInCallback = true; // set here if Activate overloaded pMenu->Activate(); - pMenu->bInCallback = sal_False; + pMenu->bInCallback = false; bJustActivated = true; } else if ( ( nHighlightedItem != ITEMPOS_INVALID ) && ( n == ITEMPOS_INVALID ) ) { - pMenu->bInCallback = sal_True; + pMenu->bInCallback = true; pMenu->Deactivate(); - pMenu->bInCallback = sal_False; - ImplGetSVData()->maWinData.mbNoDeactivate = sal_False; + pMenu->bInCallback = false; + ImplGetSVData()->maWinData.mbNoDeactivate = false; if( !ImplGetSVData()->maWinData.mbNoSaveFocus ) { sal_uLong nTempFocusId = nSaveFocusId; @@ -5558,7 +5558,7 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bSelectEntry, sa if ( nHighlightedItem != ITEMPOS_INVALID ) { if ( nHighlightedItem != nRolloveredItem ) - HighlightItem( nHighlightedItem, sal_False ); + HighlightItem( nHighlightedItem, false ); pMenu->ImplCallEventListeners( VCLEVENT_MENU_DEHIGHLIGHT, nHighlightedItem ); } @@ -5566,9 +5566,9 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bSelectEntry, sa nHighlightedItem = (sal_uInt16)n; DBG_ASSERT( ( nHighlightedItem == ITEMPOS_INVALID ) || pMenu->ImplIsVisible( nHighlightedItem ), "ChangeHighlightItem: Not visible!" ); if ( nHighlightedItem != ITEMPOS_INVALID ) - HighlightItem( nHighlightedItem, sal_True ); + HighlightItem( nHighlightedItem, true ); else if ( nRolloveredItem != ITEMPOS_INVALID ) - HighlightItem( nRolloveredItem, sal_True ); + HighlightItem( nRolloveredItem, true ); pMenu->SetHightlightItem(nHighlightedItem); pMenu->ImplCallHighlight(nHighlightedItem); @@ -5580,7 +5580,7 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bSelectEntry, sa GrabFocus(); } -void MenuBarWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight ) +void MenuBarWindow::HighlightItem( sal_uInt16 nPos, bool bHighlight ) { if( ! pMenu ) return; @@ -5709,15 +5709,15 @@ void MenuBarWindow::KeyInput( const KeyEvent& rKEvent ) Window::KeyInput( rKEvent ); } -sal_Bool MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bFromMenu ) +bool MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu ) { if( ! pMenu ) - return sal_False; + return false; if ( pMenu->bInCallback ) - return sal_True; // swallow + return true; // swallow - sal_Bool bDone = sal_False; + bool bDone = false; sal_uInt16 nCode = rKEvent.GetKeyCode().GetCode(); if( GetParent() ) @@ -5727,7 +5727,7 @@ sal_Bool MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bF SystemWindow *pSysWin = (SystemWindow*)GetParent()->GetWindow( WINDOW_CLIENT ); if( pSysWin->GetTaskPaneList() ) if( pSysWin->GetTaskPaneList()->HandleKeyEvent( rKEvent ) ) - return sal_True; + return true; } } @@ -5736,15 +5736,15 @@ sal_Bool MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bF mbAutoPopup = ImplGetSVData()->maNWFData.mbOpenMenuOnF10; if ( nHighlightedItem == ITEMPOS_INVALID ) { - ChangeHighlightItem( 0, sal_False ); + ChangeHighlightItem( 0, false ); GrabFocus(); } else { - ChangeHighlightItem( ITEMPOS_INVALID, sal_False ); + ChangeHighlightItem( ITEMPOS_INVALID, false ); nSaveFocusId = 0; } - bDone = sal_True; + bDone = true; } else if ( bFromMenu ) { @@ -5797,14 +5797,14 @@ sal_Bool MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bF MenuItemData* pData = (MenuItemData*)pMenu->GetItemList()->GetDataFromPos( n ); if ( ( pData->eType != MENUITEM_SEPARATOR ) && pMenu->ImplIsVisible( n ) ) { - sal_Bool bDoSelect = sal_True; + bool bDoSelect = true; if( ImplGetSVData()->maNWFData.mbOpenMenuOnF10 ) bDoSelect = bWasHighlight; ChangeHighlightItem( n, bDoSelect ); break; } } while ( n != nLoop ); - bDone = sal_True; + bDone = true; } else if ( nCode == KEY_RETURN ) { @@ -5812,36 +5812,36 @@ sal_Bool MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bF else if ( !mbAutoPopup ) { - ImplCreatePopup( sal_True ); - mbAutoPopup = sal_True; + ImplCreatePopup( true ); + mbAutoPopup = true; } - bDone = sal_True; + bDone = true; } else if ( ( nCode == KEY_UP ) || ( nCode == KEY_DOWN ) ) { if ( !mbAutoPopup ) { - ImplCreatePopup( sal_True ); - mbAutoPopup = sal_True; + ImplCreatePopup( true ); + mbAutoPopup = true; } - bDone = sal_True; + bDone = true; } else if ( nCode == KEY_ESCAPE || ( nCode == KEY_F6 && rKEvent.GetKeyCode().IsMod1() ) ) { if( pActivePopup ) { // bring focus to menu bar without any open popup - mbAutoPopup = sal_False; + mbAutoPopup = false; sal_uInt16 n = nHighlightedItem; nHighlightedItem = ITEMPOS_INVALID; bStayActive = true; - ChangeHighlightItem( n, sal_False ); + ChangeHighlightItem( n, false ); bStayActive = false; KillActivePopup(); GrabFocus(); } else - ChangeHighlightItem( ITEMPOS_INVALID, sal_False ); + ChangeHighlightItem( ITEMPOS_INVALID, false ); if( nCode == KEY_F6 && rKEvent.GetKeyCode().IsMod1() ) { @@ -5849,7 +5849,7 @@ sal_Bool MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bF GrabFocusToDocument(); } - bDone = sal_True; + bDone = true; } } @@ -5862,9 +5862,9 @@ sal_Bool MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bF MenuItemData* pData = pMenu->GetItemList()->SearchItem( nCharCode, rKEvent.GetKeyCode(), nEntry, nDuplicates, nHighlightedItem ); if ( pData && (nEntry != ITEMPOS_INVALID) ) { - mbAutoPopup = sal_True; - ChangeHighlightItem( nEntry, sal_True ); - bDone = sal_True; + mbAutoPopup = true; + ChangeHighlightItem( nEntry, true ); + bDone = true; } } } @@ -5903,7 +5903,7 @@ void MenuBarWindow::Paint( const Rectangle& ) SetFillColor( GetSettings().GetStyleSettings().GetMenuColor() ); pMenu->ImplPaint( this, 0 ); if ( nHighlightedItem != ITEMPOS_INVALID ) - HighlightItem( nHighlightedItem, sal_True ); + HighlightItem( nHighlightedItem, true ); // in high contrast mode draw a separating line on the lower edge if( ! IsNativeControlSupported( CTRL_MENUBAR, PART_ENTIRE_CONTROL) && @@ -5979,7 +5979,7 @@ void MenuBarWindow::RequestHelp( const HelpEvent& rHEvt ) { sal_uInt16 nId = nHighlightedItem; if ( rHEvt.GetMode() & (HELPMODE_CONTEXT | HELPMODE_EXTENDED) ) - ChangeHighlightItem( ITEMPOS_INVALID, sal_True ); + ChangeHighlightItem( ITEMPOS_INVALID, true ); Rectangle aHighlightRect( ImplGetItemRect( nHighlightedItem ) ); if( !ImplHandleHelpEvent( this, pMenu, nId, rHEvt, aHighlightRect ) ) @@ -6057,16 +6057,16 @@ void MenuBarWindow::DataChanged( const DataChangedEvent& rDCEvt ) void MenuBarWindow::LoseFocus() { - if ( !HasChildPathFocus( sal_True ) ) - ChangeHighlightItem( ITEMPOS_INVALID, sal_False, sal_False ); + if ( !HasChildPathFocus( true ) ) + ChangeHighlightItem( ITEMPOS_INVALID, false, false ); } void MenuBarWindow::GetFocus() { if ( nHighlightedItem == ITEMPOS_INVALID ) { - mbAutoPopup = sal_False; // do not open menu when activated by focus handling like taskpane cycling - ChangeHighlightItem( 0, sal_False ); + mbAutoPopup = false; // do not open menu when activated by focus handling like taskpane cycling + ChangeHighlightItem( 0, false ); } } diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index fe45ae8928cd..2fe22fbee90c 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -137,7 +137,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) OUString aKey = xCharClass->toUpper( _rKey, 0, _rKey.getLength(), rLocale ); - sal_Bool bChanged = sal_False; + bool bChanged = false; sal_Int32 nLen = aKey.getLength(); bool bCJK = MsLangId::isCJK(Application::GetSettings().GetUILanguageTag().getLanguageType()); @@ -202,7 +202,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) { maMnemonics[nMnemonicIndex] = 0; rKey = rKey.replaceAt( nIndex, 0, OUString(MNEMONIC_CHAR) ); - bChanged = sal_True; + bChanged = true; break; } } @@ -254,7 +254,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) { maMnemonics[nBestMnemonicIndex] = 0; rKey = rKey.replaceAt( nBestIndex, 0, OUString(MNEMONIC_CHAR) ); - bChanged = sal_True; + bChanged = true; } } } @@ -299,7 +299,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) nIndex--; } rKey = rKey.replaceAt( nIndex, 0, aStr ); - bChanged = sal_True; + bChanged = true; break; } } diff --git a/vcl/source/window/mnemonicengine.cxx b/vcl/source/window/mnemonicengine.cxx index b903c31837d8..3fbf5923c4d1 100644 --- a/vcl/source/window/mnemonicengine.cxx +++ b/vcl/source/window/mnemonicengine.cxx @@ -81,7 +81,7 @@ namespace vcl bool MnemonicEngine::HandleKeyEvent( const KeyEvent& _rKEvt ) { - sal_Bool bAccelKey = _rKEvt.GetKeyCode().IsMod2(); + bool bAccelKey = _rKEvt.GetKeyCode().IsMod2(); if ( !bAccelKey ) return false; diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 1f3019a09fc5..3a700f10e711 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -60,9 +60,9 @@ void MessBox::ImplInitMessBoxData() { mpVCLMultiLineEdit = NULL; mpFixedImage = NULL; - mbHelpBtn = sal_False; + mbHelpBtn = false; mpCheckBox = NULL; - mbCheck = sal_False; + mbCheck = false; } // ----------------------------------------------------------------------- @@ -209,7 +209,7 @@ void MessBox::ImplPosControls() if ( !mbHelpBtn ) { AddButton( BUTTON_HELP, RET_HELP, BUTTONDIALOG_HELPBUTTON, 3 ); - mbHelpBtn = sal_True; + mbHelpBtn = true; } } else @@ -217,7 +217,7 @@ void MessBox::ImplPosControls() if ( mbHelpBtn ) { RemoveButton( RET_HELP ); - mbHelpBtn = sal_False; + mbHelpBtn = false; } } @@ -393,8 +393,8 @@ void MessBox::ImplPosControls() mpVCLMultiLineEdit->SetText( aMessText ); mpVCLMultiLineEdit->SetPosSizePixel( aTextPos, aMEditSize ); mpVCLMultiLineEdit->Show(); - mpVCLMultiLineEdit->SetPaintTransparent(sal_True); - mpVCLMultiLineEdit->EnableCursor(sal_False); + mpVCLMultiLineEdit->SetPaintTransparent(true); + mpVCLMultiLineEdit->EnableCursor(false); SetPageSizePixel( aPageSize ); } @@ -411,14 +411,14 @@ void MessBox::StateChanged( StateChangedType nType ) // ----------------------------------------------------------------------- -sal_Bool MessBox::GetCheckBoxState() const +bool MessBox::GetCheckBoxState() const { return mpCheckBox ? mpCheckBox->IsChecked() : mbCheck; } // ----------------------------------------------------------------------- -void MessBox::SetCheckBoxState( sal_Bool bCheck ) +void MessBox::SetCheckBoxState( bool bCheck ) { if( mpCheckBox ) mpCheckBox->Check( bCheck ); mbCheck = bCheck; diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index ff5121212b39..371fceab8a6d 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -70,7 +70,7 @@ PrintDialog::PrintPreviewWindow::PrintPreviewWindow( Window* i_pParent ) , maHorzDim( this, WB_HORZ | WB_CENTER ) , maVertDim( this, WB_VERT | WB_VCENTER ) { - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); SetBackground(); maPageVDev.SetBackground( Color( COL_WHITE ) ); maHorzDim.Show(); @@ -140,7 +140,7 @@ void PrintDialog::PrintPreviewWindow::Resize() aScaledSize.Width() = PREVIEW_BITMAP_WIDTH; aScaledSize.Height() = PREVIEW_BITMAP_WIDTH * aAspectRatio; - maPageVDev.SetOutputSizePixel( aScaledSize, sal_False ); + maPageVDev.SetOutputSizePixel( aScaledSize, false ); // position dimension lines Point aRef( nTextHeight + (aNewSize.Width() - maPreviewSize.Width())/2, @@ -219,7 +219,7 @@ void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPrevi maReplacementString = i_rReplacement; mbGreyscale = i_bGreyscale; maPageVDev.SetReferenceDevice( i_nDPIX, i_nDPIY ); - maPageVDev.EnableOutput( sal_True ); + maPageVDev.EnableOutput( true ); // use correct measurements const LocaleDataWrapper& rLocWrap( GetSettings().GetLocaleDataWrapper() ); @@ -436,7 +436,7 @@ void PrintDialog::NUpTabPage::showAdvancedControls( bool i_bShow ) void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterController::MultiPageSetup& i_rMPS ) { mpNupOrderWin->Show(); - mpPagesBtn->Check( sal_True ); + mpPagesBtn->Check( true ); mpBrochureBtn->Show( false ); // setup field units for metric fields @@ -509,7 +509,7 @@ void PrintDialog::JobTabPage::readFromSettings() if( aValue.equalsIgnoreAsciiCase("alwaysoff") ) { mnCollateUIMode = 1; - mpCollateBox->Check( sal_False ); + mpCollateBox->Check( false ); mpCollateBox->Enable( false ); } else @@ -548,11 +548,11 @@ void PrintDialog::OutputOptPage::readFromSettings() OUString( "CollateSingleJobs" ) ); if ( aValue.equalsIgnoreAsciiCase("true") ) { - mpCollateSingleJobsBox->Check( sal_True ); + mpCollateSingleJobsBox->Check( true ); } else { - mpCollateSingleJobsBox->Check( sal_False ); + mpCollateSingleJobsBox->Check( false ); } } @@ -581,7 +581,7 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont , mnCachedPages( 0 ) , maPrintToFileText( VclResId( SV_PRINT_TOFILE_TXT ).toString() ) , maDefPrtText( VclResId( SV_PRINT_DEFPRT_TXT ).toString() ) - , mbShowLayoutPage( sal_True ) + , mbShowLayoutPage( true ) { get(mpOKButton, "ok"); get(mpCancelButton, "cancel"); @@ -710,7 +710,7 @@ PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterCont // setup dependencies checkControlDependencies(); - if ( maPController->getBoolProperty( OUString( "HideHelpButton" ), sal_False ) ) + if ( maPController->getBoolProperty( OUString( "HideHelpButton" ), false ) ) mpHelpButton->Hide(); // set initial focus to "Number of copies" maJobPage.mpCopyCountField->GrabFocus(); @@ -846,7 +846,7 @@ void PrintDialog::setupOptionalUI() OUString aGroupingHint; OUString aDependsOnName; sal_Int32 nDependsOnValue = 0; - sal_Bool bUseDependencyRow = sal_False; + bool bUseDependencyRow = false; for( int n = 0; n < aOptProp.getLength(); n++ ) { @@ -880,7 +880,7 @@ void PrintDialog::setupOptionalUI() } else if ( rEntry.Name == "Enabled" ) { - sal_Bool bValue = sal_True; + bool bValue = true; rEntry.Value >>= bValue; } else if ( rEntry.Name == "GroupingHint" ) @@ -933,7 +933,7 @@ void PrintDialog::setupOptionalUI() } else if ( rEntry.Name == "HintNoLayoutPage" ) { - sal_Bool bNoLayoutPage = sal_False; + bool bNoLayoutPage = false; rEntry.Value >>= bNoLayoutPage; mbShowLayoutPage = ! bNoLayoutPage; } @@ -979,7 +979,7 @@ void PrintDialog::setupOptionalUI() maNUpPage.mpBrochureBtn->SetText( aText ); maNUpPage.mpBrochureBtn->Show(); - sal_Bool bVal = sal_False; + bool bVal = false; PropertyValue* pVal = maPController->getValue( aPropertyName ); if( pVal ) pVal->Value >>= bVal; @@ -1005,7 +1005,7 @@ void PrintDialog::setupOptionalUI() pNewBox->SetText( aText ); pNewBox->Show(); - sal_Bool bVal = sal_False; + bool bVal = false; PropertyValue* pVal = maPController->getValue( aPropertyName ); if( pVal ) pVal->Value >>= bVal; @@ -1543,7 +1543,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) } else if( pButton == maOptionsPage.mpPapersizeFromSetup ) { - sal_Bool bChecked = maOptionsPage.mpPapersizeFromSetup->IsChecked(); + bool bChecked = maOptionsPage.mpPapersizeFromSetup->IsChecked(); maPController->setPapersizeFromSetup( bChecked ); maPController->setValue( OUString( "PapersizeFromSetup" ), makeAny( bChecked ) ); @@ -1554,7 +1554,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) PropertyValue* pVal = getValueForWindow( pButton ); if( pVal ) { - sal_Bool bVal = maNUpPage.mpBrochureBtn->IsChecked(); + bool bVal = maNUpPage.mpBrochureBtn->IsChecked(); pVal->Value <<= bVal; checkOptionalControlDependencies(); @@ -1578,12 +1578,12 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) else if( pButton == maJobPage.mpCollateBox ) { maPController->setValue( OUString( "Collate" ), - makeAny( sal_Bool(isCollate()) ) ); + makeAny( isCollate() ) ); checkControlDependencies(); } else if( pButton == maJobPage.mpReverseOrderBox ) { - sal_Bool bChecked = maJobPage.mpReverseOrderBox->IsChecked(); + bool bChecked = maJobPage.mpReverseOrderBox->IsChecked(); maPController->setReversePrint( bChecked ); maPController->setValue( OUString( "PrintReverse" ), makeAny( bChecked ) ); @@ -1624,7 +1624,7 @@ IMPL_LINK( PrintDialog, ModifyHdl, Edit*, pEdit ) maPController->setValue( OUString( "CopyCount" ), makeAny( sal_Int32(maJobPage.mpCopyCountField->GetValue()) ) ); maPController->setValue( OUString( "Collate" ), - makeAny( sal_Bool(isCollate()) ) ); + makeAny( isCollate() ) ); } return 0; } @@ -1660,7 +1660,7 @@ void PrintDialog::updateWindowFromProperty( const OUString& i_rProperty ) const std::vector< Window* >& rWindows( it->second ); if( ! rWindows.empty() ) { - sal_Bool bVal = sal_False; + bool bVal = false; sal_Int32 nVal = -1; if( pValue->Value >>= bVal ) { @@ -1721,7 +1721,7 @@ IMPL_LINK( PrintDialog, UIOption_CheckHdl, CheckBox*, i_pBox ) { makeEnabled( i_pBox ); - sal_Bool bVal = i_pBox->IsChecked(); + bool bVal = i_pBox->IsChecked(); pVal->Value <<= bVal; checkOptionalControlDependencies(); diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index f07ccaa203d6..77448d15f921 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -27,7 +27,7 @@ FunctionSet::~FunctionSet() } -inline sal_Bool SelectionEngine::ShouldDeselect( sal_Bool bModifierKey1 ) const +inline bool SelectionEngine::ShouldDeselect( bool bModifierKey1 ) const { // return !( eSelMode == MULTIPLE_SELECTION && bModifierKey1 ); return eSelMode != MULTIPLE_SELECTION || !bModifierKey1; @@ -97,7 +97,7 @@ void SelectionEngine::SetSelectionMode( SelectionMode eMode ) |* *************************************************************************/ -void SelectionEngine::CursorPosChanging( sal_Bool bShift, sal_Bool bMod1 ) +void SelectionEngine::CursorPosChanging( bool bShift, bool bMod1 ) { if ( !pFunctionSet ) return; @@ -151,15 +151,15 @@ void SelectionEngine::CursorPosChanging( sal_Bool bShift, sal_Bool bMod1 ) |* *************************************************************************/ -sal_Bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) +bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) { nFlags &= (~SELENG_CMDEVT); if ( !pFunctionSet || !pWin || rMEvt.GetClicks() > 1 || rMEvt.IsRight() ) - return sal_False; + return false; sal_uInt16 nModifier = rMEvt.GetModifier() | nLockedMods; if ( nModifier & KEY_MOD2 ) - return sal_False; + return false; // in SingleSelection: Control-Taste filtern (damit auch // mit Ctrl-Click ein D&D gestartet werden kann) if ( nModifier == KEY_MOD1 && eSelMode == SINGLE_SELECTION ) @@ -182,14 +182,14 @@ sal_Bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) { case 0: // KEY_NO_KEY { - sal_Bool bSelAtPoint = pFunctionSet->IsSelectionAtPoint( aPos ); + bool bSelAtPoint = pFunctionSet->IsSelectionAtPoint( aPos ); nFlags &= (~SELENG_IN_ADD); if ( (nFlags & SELENG_DRG_ENAB) && bSelAtPoint ) { nFlags |= SELENG_WAIT_UPEVT; nFlags &= ~(SELENG_IN_SEL); pWin->ReleaseMouse(); - return sal_True; //auf STARTDRAG-Command-Event warten + return true; //auf STARTDRAG-Command-Event warten } if ( eSelMode != SINGLE_SELECTION ) { @@ -204,7 +204,7 @@ sal_Bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) // in einem Zug moeglich ist if (eSelMode == SINGLE_SELECTION && (nFlags & SELENG_DRG_ENAB)) nFlags |= SELENG_WAIT_UPEVT; - return sal_True; + return true; } case KEY_SHIFT: @@ -212,7 +212,7 @@ sal_Bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) { pWin->ReleaseMouse(); nFlags &= (~SELENG_IN_SEL); - return sal_False; + return false; } if ( nFlags & SELENG_ADD_ALW ) nFlags |= SELENG_IN_ADD; @@ -227,7 +227,7 @@ sal_Bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) nFlags |= SELENG_HAS_ANCH; } pFunctionSet->SetCursorAtPoint( aPos ); - return sal_True; + return true; case KEY_MOD1: // Control nur bei Mehrfachselektion erlaubt @@ -235,7 +235,7 @@ sal_Bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) { nFlags &= (~SELENG_IN_SEL); pWin->ReleaseMouse(); - return sal_True; // Mausclick verschlucken + return true; // Mausclick verschlucken } if ( nFlags & SELENG_HAS_ANCH ) { @@ -252,14 +252,14 @@ sal_Bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) { pFunctionSet->SetCursorAtPoint( aPos ); } - return sal_True; + return true; case KEY_SHIFT + KEY_MOD1: if ( eSelMode != MULTIPLE_SELECTION ) { pWin->ReleaseMouse(); nFlags &= (~SELENG_IN_SEL); - return sal_False; + return false; } nFlags |= SELENG_IN_ADD; //bIsInAddMode = sal_True; if ( !(nFlags & SELENG_HAS_ANCH) ) @@ -268,10 +268,10 @@ sal_Bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) nFlags |= SELENG_HAS_ANCH; } pFunctionSet->SetCursorAtPoint( aPos ); - return sal_True; + return true; } - return sal_False; + return false; } /************************************************************************* @@ -280,14 +280,14 @@ sal_Bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) |* *************************************************************************/ -sal_Bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt ) +bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt ) { aWTimer.Stop(); //DbgOut("Up"); if( !pFunctionSet || !pWin ) { nFlags &= ~(SELENG_CMDEVT | SELENG_WAIT_UPEVT | SELENG_IN_SEL); - return sal_False; + return false; } if( !rMEvt.IsRight() ) @@ -321,7 +321,7 @@ sal_Bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt ) } nFlags &= ~(SELENG_CMDEVT | SELENG_WAIT_UPEVT | SELENG_IN_SEL); - return sal_True; + return true; } /************************************************************************* @@ -330,21 +330,21 @@ sal_Bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt ) |* *************************************************************************/ -sal_Bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt ) +bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt ) { if ( !pFunctionSet || !(nFlags & SELENG_IN_SEL) || (nFlags & (SELENG_CMDEVT | SELENG_WAIT_UPEVT)) ) - return sal_False; + return false; if( !(nFlags & SELENG_EXPANDONMOVE) ) - return sal_False; // auf DragEvent warten! + return false; // auf DragEvent warten! aLastMove = rMEvt; // wenn die Maus ausserhalb der Area steht, dann wird die // Frequenz des SetCursorAtPoint() nur durch den Timer bestimmt if( aWTimer.IsActive() && !aArea.IsInside( rMEvt.GetPosPixel() )) - return sal_True; + return true; aWTimer.SetTimeout( nUpdateInterval ); aWTimer.Start(); @@ -361,7 +361,7 @@ sal_Bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt ) //DbgOut("Move:SetCursor"); pFunctionSet->SetCursorAtPoint( rMEvt.GetPosPixel() ); - return sal_True; + return true; } /************************************************************************* diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 4cb24ee0e702..5b2480e50747 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -58,8 +58,8 @@ void Splitter::ImplInitSplitterData() mnSplitPos = 0; mnLastSplitPos = 0; mnStartSplitPos = 0; - mbDragFull = sal_False; - mbKbdSplitting = sal_False; + mbDragFull = false; + mbKbdSplitting = false; mbInKeyEvent = 0; mnKeyboardStepSize = SPLITTER_DEFAULTSTEPSIZE; } @@ -226,11 +226,11 @@ Splitter* Splitter::ImplFindSibling() // ----------------------------------------------------------------------- -sal_Bool Splitter::ImplSplitterActive() +bool Splitter::ImplSplitterActive() { // is splitter in document or at scrollbar handle ? - sal_Bool bActive = sal_True; + bool bActive = true; const StyleSettings& rSettings = GetSettings().GetStyleSettings(); long nA = rSettings.GetScrollBarSize(); long nB = rSettings.GetSplitSize(); @@ -239,12 +239,12 @@ sal_Bool Splitter::ImplSplitterActive() if ( mbHorzSplit ) { if( aSize.Width() == nB && aSize.Height() == nA ) - bActive = sal_False; + bActive = false; } else { if( aSize.Width() == nA && aSize.Height() == nB ) - bActive = sal_False; + bActive = false; } return bActive; } @@ -366,7 +366,7 @@ void Splitter::ImplKbdTracking( KeyCode aKeyCode ) if( !mbKbdSplitting ) return; else - mbKbdSplitting = sal_False; + mbKbdSplitting = false; if ( nCode != KEY_ESCAPE ) { @@ -554,7 +554,7 @@ void Splitter::ImplStartKbdSplitting() if( mbKbdSplitting ) return; - mbKbdSplitting = sal_True; + mbKbdSplitting = true; StartSplit(); @@ -626,7 +626,7 @@ void Splitter::LoseFocus() { KeyCode aReturnKey( KEY_RETURN ); ImplKbdTracking( aReturnKey ); - mbKbdSplitting = sal_False; + mbKbdSplitting = false; } Invalidate(); } diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 55b934382fc4..d5fc03b5d16a 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -108,7 +108,7 @@ namespace { #define SPLIT_WINDOW ((sal_uInt16)0x0004) #define SPLIT_NOSPLIT ((sal_uInt16)0x8000) -static void ImplCalcBorder( WindowAlign eAlign, sal_Bool bNoAlign, +static void ImplCalcBorder( WindowAlign eAlign, bool bNoAlign, long& rLeft, long& rTop, long& rRight, long& rBottom ) { @@ -310,7 +310,7 @@ static sal_uInt16 ImplFindItem( ImplSplitSet* pSet, Window* pWindow ) } static sal_uInt16 ImplFindItem( ImplSplitSet* pSet, const Point& rPos, - sal_Bool bRows, sal_Bool bDown = sal_True ) + bool bRows, bool bDown = true ) { sal_uInt16 i; sal_uInt16 nItems = pSet->mnItems; @@ -379,7 +379,7 @@ static void ImplDeleteSet( ImplSplitSet* pSet ) static void ImplCalcSet( ImplSplitSet* pSet, long nSetLeft, long nSetTop, long nSetWidth, long nSetHeight, - sal_Bool bRows, sal_Bool bDown = sal_True ) + bool bRows, bool bDown = true ) { if ( !pSet->mpItems ) return; @@ -753,8 +753,8 @@ static void ImplCalcSet( ImplSplitSet* pSet, } } -void SplitWindow::ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, sal_Bool bHide, - sal_Bool bRows, sal_Bool /*bDown*/ ) +void SplitWindow::ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, bool bHide, + bool bRows, bool /*bDown*/ ) { sal_uInt16 i; sal_uInt16 nItems = pSet->mnItems; @@ -827,9 +827,9 @@ void SplitWindow::ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, sal_Bo { if ( pItems[i].mpSet ) { - sal_Bool bTempHide = bHide; + bool bTempHide = bHide; if ( !pItems[i].mnWidth || !pItems[i].mnHeight ) - bTempHide = sal_True; + bTempHide = true; ImplCalcSet2( pWindow, pItems[i].mpSet, bTempHide, ((pItems[i].mnBits & SWIB_COLSET) == 0) ); } @@ -958,7 +958,7 @@ void SplitWindow::ImplDrawBack( SplitWindow* pWindow, ImplSplitSet* pSet ) } static void ImplDrawSplit( SplitWindow* pWindow, ImplSplitSet* pSet, - sal_Bool bRows, sal_Bool bDown = sal_True ) + bool bRows, bool bDown = true ) { if ( !pSet->mpItems ) return; @@ -1052,7 +1052,7 @@ static void ImplDrawSplit( SplitWindow* pWindow, ImplSplitSet* pSet, sal_uInt16 SplitWindow::ImplTestSplit( ImplSplitSet* pSet, const Point& rPos, long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos, - sal_Bool bRows, sal_Bool /*bDown*/ ) + bool bRows, bool /*bDown*/ ) { if ( !pSet->mpItems ) return 0; @@ -1258,29 +1258,29 @@ void SplitWindow::ImplInit( Window* pParent, WinBits nStyle ) mnMouseModifier = 0; mnMStartPos = 0; mnMSplitPos = 0; - mbDragFull = sal_False; - mbHorz = sal_True; - mbBottomRight = sal_False; - mbCalc = sal_False; - mbRecalc = sal_True; - mbInvalidate = sal_True; - mbAutoHide = sal_False; - mbFadeIn = sal_False; - mbFadeOut = sal_False; - mbAutoHideIn = sal_False; - mbAutoHideDown = sal_False; - mbFadeInDown = sal_False; - mbFadeOutDown = sal_False; - mbAutoHidePressed = sal_False; - mbFadeInPressed = sal_False; - mbFadeOutPressed = sal_False; - mbFadeNoButtonMode = sal_False; - mbNoAlign = sal_False; + mbDragFull = false; + mbHorz = true; + mbBottomRight = false; + mbCalc = false; + mbRecalc = true; + mbInvalidate = true; + mbAutoHide = false; + mbFadeIn = false; + mbFadeOut = false; + mbAutoHideIn = false; + mbAutoHideDown = false; + mbFadeInDown = false; + mbFadeOutDown = false; + mbAutoHidePressed = false; + mbFadeInPressed = false; + mbFadeOutPressed = false; + mbFadeNoButtonMode = false; + mbNoAlign = false; if ( nStyle & WB_NOSPLITDRAW ) { pNewSet->mnSplitSize -= 2; - mbInvalidate = sal_False; + mbInvalidate = false; } if ( nStyle & WB_BORDER ) @@ -1479,9 +1479,9 @@ void SplitWindow::ImplCalcLayout() nCurSize -= nSplitSize; nCurSize -= (mpMainSet->mnItems-1)*mpMainSet->mnSplitSize; - mbRecalc = sal_False; + mbRecalc = false; ImplSetWindowSize( nCalcSize-nCurSize ); - mbRecalc = sal_True; + mbRecalc = true; } } @@ -1522,13 +1522,13 @@ void SplitWindow::ImplCalcLayout() // Sets rekursiv berechnen ImplCalcSet( mpMainSet, nL, nT, nW, nH, mbHorz, !mbBottomRight ); - ImplCalcSet2( this, mpMainSet, sal_False, mbHorz, !mbBottomRight ); - mbCalc = sal_False; + ImplCalcSet2( this, mpMainSet, false, mbHorz, !mbBottomRight ); + mbCalc = false; } void SplitWindow::ImplUpdate() { - mbCalc = sal_True; + mbCalc = true; if ( IsReallyShown() && IsUpdateMode() && mbRecalc ) { @@ -1562,7 +1562,7 @@ void SplitWindow::ImplSplitMousePos( Point& rMousePos ) } } -void SplitWindow::ImplGetButtonRect( Rectangle& rRect, long nEx, sal_Bool bTest ) const +void SplitWindow::ImplGetButtonRect( Rectangle& rRect, long nEx, bool bTest ) const { long nSplitSize = mpMainSet->mnSplitSize-1; if ( mbAutoHide || mbFadeOut || mbFadeIn ) @@ -1632,7 +1632,7 @@ void SplitWindow::ImplGetButtonRect( Rectangle& rRect, long nEx, sal_Bool bTest } } -void SplitWindow::ImplGetAutoHideRect( Rectangle& rRect, sal_Bool bTest ) const +void SplitWindow::ImplGetAutoHideRect( Rectangle& rRect, bool bTest ) const { Rectangle aRect; @@ -1647,7 +1647,7 @@ void SplitWindow::ImplGetAutoHideRect( Rectangle& rRect, sal_Bool bTest ) const rRect = aRect; } -void SplitWindow::ImplGetFadeInRect( Rectangle& rRect, sal_Bool bTest ) const +void SplitWindow::ImplGetFadeInRect( Rectangle& rRect, bool bTest ) const { Rectangle aRect; @@ -1657,12 +1657,12 @@ void SplitWindow::ImplGetFadeInRect( Rectangle& rRect, sal_Bool bTest ) const rRect = aRect; } -void SplitWindow::ImplGetFadeOutRect( Rectangle& rRect, sal_Bool ) const +void SplitWindow::ImplGetFadeOutRect( Rectangle& rRect, bool ) const { Rectangle aRect; if ( mbFadeOut ) - ImplGetButtonRect( aRect, 0, sal_False ); + ImplGetButtonRect( aRect, 0, false ); rRect = aRect; } @@ -1733,7 +1733,7 @@ void SplitWindow::ImplDrawButtonRect( const Rectangle& rRect, long nSize ) } } -void SplitWindow::ImplDrawAutoHide( sal_Bool bInPaint ) +void SplitWindow::ImplDrawAutoHide( bool bInPaint ) { if ( mbAutoHide ) { @@ -1808,7 +1808,7 @@ void SplitWindow::ImplDrawAutoHide( sal_Bool bInPaint ) } } -void SplitWindow::ImplDrawFadeArrow( const Point& rPt, sal_Bool bHorz, sal_Bool bLeft ) +void SplitWindow::ImplDrawFadeArrow( const Point& rPt, bool bHorz, bool bLeft ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -1864,14 +1864,14 @@ void SplitWindow::ImplDrawFadeArrow( const Point& rPt, sal_Bool bHorz, sal_Bool } } -void SplitWindow::ImplDrawGrip( const Rectangle& rRect, sal_Bool bHorz, sal_Bool bLeft ) +void SplitWindow::ImplDrawGrip( const Rectangle& rRect, bool bHorz, bool bLeft ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); if( rRect.IsInside( GetPointerPosPixel() ) ) { DrawWallpaper( rRect, Wallpaper( Color( COL_WHITE ) ) ); - DrawSelectionBackground( rRect, 2, sal_False, sal_False, sal_False ); + DrawSelectionBackground( rRect, 2, false, false, false ); } if( bHorz ) @@ -1922,24 +1922,24 @@ void SplitWindow::ImplDrawGrip( const Rectangle& rRect, sal_Bool bHorz, sal_Bool } } -void SplitWindow::ImplDrawFadeIn( sal_Bool bInPaint ) +void SplitWindow::ImplDrawFadeIn( bool bInPaint ) { if ( mbFadeIn ) { Rectangle aTempRect; ImplGetFadeInRect( aTempRect ); - sal_Bool bLeft = sal_True; + bool bLeft = true; switch ( meAlign ) { case WINDOWALIGN_TOP: case WINDOWALIGN_LEFT: - bLeft = sal_False; + bLeft = false; break; case WINDOWALIGN_BOTTOM: case WINDOWALIGN_RIGHT: default: - bLeft = sal_True; + bLeft = true; break; } @@ -1950,24 +1950,24 @@ void SplitWindow::ImplDrawFadeIn( sal_Bool bInPaint ) } } -void SplitWindow::ImplDrawFadeOut( sal_Bool bInPaint ) +void SplitWindow::ImplDrawFadeOut( bool bInPaint ) { if ( mbFadeOut ) { Rectangle aTempRect; ImplGetFadeOutRect( aTempRect ); - sal_Bool bLeft = sal_True; + bool bLeft = true; switch ( meAlign ) { case WINDOWALIGN_BOTTOM: case WINDOWALIGN_RIGHT: - bLeft = sal_False; + bLeft = false; break; case WINDOWALIGN_TOP: case WINDOWALIGN_LEFT: default: - bLeft = sal_True; + bLeft = true; break; } @@ -2208,35 +2208,35 @@ void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt ) Point aMousePosPixel = rMEvt.GetPosPixel(); Rectangle aTestRect; - mbFadeNoButtonMode = sal_False; - ImplGetAutoHideRect( aTestRect, sal_True ); + mbFadeNoButtonMode = false; + ImplGetAutoHideRect( aTestRect, true ); if ( aTestRect.IsInside( aMousePosPixel ) ) { - mbAutoHideDown = sal_True; - mbAutoHidePressed = sal_True; - ImplDrawAutoHide( sal_False ); + mbAutoHideDown = true; + mbAutoHidePressed = true; + ImplDrawAutoHide( false ); } else { - ImplGetFadeOutRect( aTestRect, sal_True ); + ImplGetFadeOutRect( aTestRect, true ); if ( aTestRect.IsInside( aMousePosPixel ) ) { - mbFadeOutDown = sal_True; - mbFadeOutPressed = sal_True; - ImplDrawFadeOut( sal_False ); + mbFadeOutDown = true; + mbFadeOutPressed = true; + ImplDrawFadeOut( false ); } else { - ImplGetFadeInRect( aTestRect, sal_True ); + ImplGetFadeInRect( aTestRect, true ); if ( aTestRect.IsInside( aMousePosPixel ) ) { - mbFadeInDown = sal_True; - mbFadeInPressed = sal_True; - ImplDrawFadeIn( sal_False ); + mbFadeInDown = true; + mbFadeInPressed = true; + ImplDrawFadeIn( false ); } else if ( !aTestRect.IsEmpty() && !(mnWinStyle & WB_SIZEABLE) ) { - mbFadeNoButtonMode = sal_True; + mbFadeNoButtonMode = true; FadeIn(); return; } @@ -2292,30 +2292,30 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) { if ( rTEvt.IsTrackingEnded() ) { - mbAutoHideDown = sal_False; + mbAutoHideDown = false; if ( mbAutoHidePressed ) { - mbAutoHidePressed = sal_False; + mbAutoHidePressed = false; if ( !rTEvt.IsTrackingCanceled() ) { mbAutoHideIn = !mbAutoHideIn; - ImplDrawAutoHide( sal_False ); + ImplDrawAutoHide( false ); AutoHide(); } else - ImplDrawAutoHide( sal_False ); + ImplDrawAutoHide( false ); } } else { Rectangle aTestRect; - ImplGetAutoHideRect( aTestRect, sal_True ); - sal_Bool bNewPressed = aTestRect.IsInside( aMousePosPixel ); + ImplGetAutoHideRect( aTestRect, true ); + bool bNewPressed = aTestRect.IsInside( aMousePosPixel ); if ( bNewPressed != mbAutoHidePressed ) { mbAutoHidePressed = bNewPressed; - ImplDrawAutoHide( sal_False ); + ImplDrawAutoHide( false ); } } } @@ -2323,11 +2323,11 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) { if ( rTEvt.IsTrackingEnded() ) { - mbFadeInDown = sal_False; + mbFadeInDown = false; if ( mbFadeInPressed ) { - mbFadeInPressed = sal_False; - ImplDrawFadeIn( sal_False ); + mbFadeInPressed = false; + ImplDrawFadeIn( false ); if ( !rTEvt.IsTrackingCanceled() ) FadeIn(); @@ -2336,12 +2336,12 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) else { Rectangle aTestRect; - ImplGetFadeInRect( aTestRect, sal_True ); - sal_Bool bNewPressed = aTestRect.IsInside( aMousePosPixel ); + ImplGetFadeInRect( aTestRect, true ); + bool bNewPressed = aTestRect.IsInside( aMousePosPixel ); if ( bNewPressed != mbFadeInPressed ) { mbFadeInPressed = bNewPressed; - ImplDrawFadeIn( sal_False ); + ImplDrawFadeIn( false ); } } } @@ -2349,11 +2349,11 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) { if ( rTEvt.IsTrackingEnded() ) { - mbFadeOutDown = sal_False; + mbFadeOutDown = false; if ( mbFadeOutPressed ) { - mbFadeOutPressed = sal_False; - ImplDrawFadeOut( sal_False ); + mbFadeOutPressed = false; + ImplDrawFadeOut( false ); if ( !rTEvt.IsTrackingCanceled() ) FadeOut(); @@ -2362,12 +2362,12 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) else { Rectangle aTestRect; - ImplGetFadeOutRect( aTestRect, sal_True ); - sal_Bool bNewPressed = aTestRect.IsInside( aMousePosPixel ); - if ( bNewPressed == sal_False ) + ImplGetFadeOutRect( aTestRect, true ); + bool bNewPressed = aTestRect.IsInside( aMousePosPixel ); + if ( !bNewPressed ) { mbFadeOutPressed = bNewPressed; - ImplDrawFadeOut( sal_False ); + ImplDrawFadeOut( false ); // We need a mouseevent with a position inside the button for the // ImplStartSplit function! @@ -2377,7 +2377,7 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) aOrgMEvt.GetModifier() ); ImplStartSplit( aNewMEvt ); - mbFadeOutDown = sal_False; + mbFadeOutDown = false; } } } @@ -2420,8 +2420,8 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) if ( bSplit ) { - sal_Bool bPropSmaller = (mnMouseModifier & KEY_SHIFT) ? sal_True : sal_False; - sal_Bool bPropGreater = (mnMouseModifier & KEY_MOD1) ? sal_True : sal_False; + bool bPropSmaller = (mnMouseModifier & KEY_SHIFT) ? sal_True : sal_False; + bool bPropGreater = (mnMouseModifier & KEY_MOD1) ? sal_True : sal_False; long nDelta = mnMSplitPos-mnMStartPos; if ( (mnSplitTest & SPLIT_WINDOW) && !mpMainSet->mpItems ) @@ -2500,9 +2500,9 @@ void SplitWindow::Paint( const Rectangle& ) ImplDrawBorder( this ); ImplDrawBorderLine( this ); - ImplDrawFadeOut( sal_True ); - ImplDrawFadeIn( sal_True ); - ImplDrawAutoHide( sal_True ); + ImplDrawFadeOut( true ); + ImplDrawFadeIn( true ); + ImplDrawAutoHide( true ); // FrameSet-Hintergruende zeichnen ImplDrawBack( this, mpMainSet ); @@ -2536,7 +2536,7 @@ void SplitWindow::RequestHelp( const HelpEvent& rHEvt ) Rectangle aHelpRect; sal_uInt16 nHelpResId = 0; - ImplGetAutoHideRect( aHelpRect, sal_True ); + ImplGetAutoHideRect( aHelpRect, true ); if ( aHelpRect.IsInside( aMousePosPixel ) ) { if ( mbAutoHideIn ) @@ -2546,12 +2546,12 @@ void SplitWindow::RequestHelp( const HelpEvent& rHEvt ) } else { - ImplGetFadeInRect( aHelpRect, sal_True ); + ImplGetFadeInRect( aHelpRect, true ); if ( aHelpRect.IsInside( aMousePosPixel ) ) nHelpResId = SV_HELPTEXT_FADEIN; else { - ImplGetFadeOutRect( aHelpRect, sal_True ); + ImplGetFadeOutRect( aHelpRect, true ); if ( aHelpRect.IsInside( aMousePosPixel ) ) nHelpResId = SV_HELPTEXT_FADEOUT; } @@ -2690,7 +2690,7 @@ void SplitWindow::InsertItem( sal_uInt16 nId, long nSize, InsertItem( nId, NULL, nSize, nPos, nSetId, nBits ); } -void SplitWindow::RemoveItem( sal_uInt16 nId, sal_Bool bHide ) +void SplitWindow::RemoveItem( sal_uInt16 nId, bool bHide ) { #ifdef DBG_UTIL sal_uInt16 nDbgDummy; @@ -2760,7 +2760,7 @@ void SplitWindow::Clear() } void SplitWindow::SplitItem( sal_uInt16 nId, long nNewSize, - sal_Bool bPropSmall, sal_Bool bPropGreat ) + bool bPropSmall, bool bPropGreat ) { sal_uInt16 nItems; sal_uInt16 nPos; @@ -2841,7 +2841,7 @@ void SplitWindow::SplitItem( sal_uInt16 nId, long nNewSize, { nPos--; nDelta *= -1; - sal_Bool bTemp = bPropSmall; + bool bTemp = bPropSmall; bPropSmall = bPropGreat; bPropGreat = bTemp; } @@ -3101,15 +3101,15 @@ sal_uInt16 SplitWindow::GetSet( sal_uInt16 nId ) const return 0; } -sal_Bool SplitWindow::IsItemValid( sal_uInt16 nId ) const +bool SplitWindow::IsItemValid( sal_uInt16 nId ) const { sal_uInt16 nPos; ImplSplitSet* pSet = mpBaseSet ? ImplFindItem(mpBaseSet, nId, nPos) : NULL; if ( pSet ) - return sal_True; + return true; else - return sal_False; + return false; } sal_uInt16 SplitWindow::GetItemId( Window* pWindow ) const @@ -3164,28 +3164,28 @@ void SplitWindow::ImplNewAlign() { if ( mbNoAlign ) { - mbHorz = sal_False; - mbBottomRight = sal_False; + mbHorz = false; + mbBottomRight = false; } else { switch ( meAlign ) { case WINDOWALIGN_TOP: - mbHorz = sal_True; - mbBottomRight = sal_False; + mbHorz = true; + mbBottomRight = false; break; case WINDOWALIGN_BOTTOM: - mbHorz = sal_True; - mbBottomRight = sal_True; + mbHorz = true; + mbBottomRight = true; break; case WINDOWALIGN_LEFT: - mbHorz = sal_False; - mbBottomRight = sal_False; + mbHorz = false; + mbBottomRight = false; break; case WINDOWALIGN_RIGHT: - mbHorz = sal_False; - mbBottomRight = sal_True; + mbHorz = false; + mbBottomRight = true; break; } } @@ -3210,25 +3210,25 @@ void SplitWindow::SetAlign( WindowAlign eNewAlign ) } } -void SplitWindow::ShowAutoHideButton( sal_Bool bShow ) +void SplitWindow::ShowAutoHideButton( bool bShow ) { mbAutoHide = bShow; ImplUpdate(); } -void SplitWindow::ShowFadeInHideButton( sal_Bool bShow ) +void SplitWindow::ShowFadeInHideButton( bool bShow ) { mbFadeIn = bShow; ImplUpdate(); } -void SplitWindow::ShowFadeOutButton( sal_Bool bShow ) +void SplitWindow::ShowFadeOutButton( bool bShow ) { mbFadeOut = bShow; ImplUpdate(); } -void SplitWindow::SetAutoHideState( sal_Bool bAutoHide ) +void SplitWindow::SetAutoHideState( bool bAutoHide ) { mbAutoHideIn = bAutoHide; if ( IsReallyVisible() ) diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 81ee2495d9e6..5cac8f0da7ff 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -79,7 +79,7 @@ struct ImplStatusItem OUString maQuickHelpText; OString maHelpId; void* mpUserData; - sal_Bool mbVisible; + bool mbVisible; OUString maAccessibleName; OUString maCommand; }; @@ -114,12 +114,12 @@ static Point ImplGetItemTextPos( const Size& rRectSize, const Size& rTextSize, // ----------------------------------------------------------------------- -sal_Bool StatusBar::ImplIsItemUpdate() +bool StatusBar::ImplIsItemUpdate() { if ( !mbProgressMode && mbVisibleItems && IsReallyVisible() && IsUpdateMode() ) - return sal_True; + return true; else - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -138,10 +138,10 @@ void StatusBar::ImplInit( Window* pParent, WinBits nStyle ) mpItemList = new ImplStatusItemList; mpImplData->mpVirDev = new VirtualDevice( *this ); mnCurItemId = 0; - mbFormat = sal_True; - mbVisibleItems = sal_True; - mbProgressMode = sal_False; - mbInUserDraw = sal_False; + mbFormat = true; + mbVisibleItems = true; + mbProgressMode = false; + mbInUserDraw = false; mnItemsWidth = STATUSBAR_OFFSET_X; mnDX = 0; mnDY = 0; @@ -149,7 +149,7 @@ void StatusBar::ImplInit( Window* pParent, WinBits nStyle ) mnItemY = STATUSBAR_OFFSET_Y; mnTextY = STATUSBAR_OFFSET_TEXTY; - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); SetLineColor(); SetOutputSizePixel( CalcWindowSizePixel() ); @@ -180,8 +180,8 @@ StatusBar::~StatusBar() // ----------------------------------------------------------------------- -void StatusBar::ImplInitSettings( sal_Bool bFont, - sal_Bool bForeground, sal_Bool bBackground ) +void StatusBar::ImplInitSettings( bool bFont, + bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -228,7 +228,7 @@ void StatusBar::ImplInitSettings( sal_Bool bFont, IsNativeControlSupported( CTRL_WINDOW_BACKGROUND, PART_BACKGROUND_WINDOW ) ) { ImplGetWindowImpl()->mnNativeBackground = PART_BACKGROUND_WINDOW; - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); } } } @@ -306,7 +306,7 @@ void StatusBar::ImplFormat() } } - mbFormat = sal_False; + mbFormat = false; } // ----------------------------------------------------------------------- @@ -351,7 +351,7 @@ sal_uInt16 StatusBar::ImplGetFirstVisiblePos() const // ----------------------------------------------------------------------- -void StatusBar::ImplDrawText( sal_Bool bOffScreen, long nOldTextWidth ) +void StatusBar::ImplDrawText( bool bOffScreen, long nOldTextWidth ) { // prevent item box from being overwritten Rectangle aTextRect; @@ -388,7 +388,7 @@ void StatusBar::ImplDrawText( sal_Bool bOffScreen, long nOldTextWidth ) // ----------------------------------------------------------------------- -void StatusBar::ImplDrawItem( sal_Bool bOffScreen, sal_uInt16 nPos, sal_Bool bDrawText, sal_Bool bDrawFrame ) +void StatusBar::ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText, bool bDrawFrame ) { Rectangle aRect = ImplGetItemRectPos( nPos ); @@ -430,12 +430,12 @@ void StatusBar::ImplDrawItem( sal_Bool bOffScreen, sal_uInt16 nPos, sal_Bool bDr { if ( bOffScreen ) { - mbInUserDraw = sal_True; + mbInUserDraw = true; mpImplData->mpVirDev->EnableRTL( IsRTLEnabled() ); UserDrawEvent aODEvt( mpImplData->mpVirDev, Rectangle( Point(), aTextRectSize ), pItem->mnId ); UserDraw( aODEvt ); - mpImplData->mpVirDev->EnableRTL( sal_False ); - mbInUserDraw = sal_False; + mpImplData->mpVirDev->EnableRTL( false ); + mbInUserDraw = false; } else { @@ -529,7 +529,7 @@ void DrawProgress( Window* pWindow, const Point& rPos, pWindow->Push( PUSH_CLIPREGION ); pWindow->IntersectClipRegion( rFramePosSize ); } - sal_Bool bNativeOK = pWindow->DrawNativeControl( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, + bool bNativeOK = pWindow->DrawNativeControl( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, CTRL_STATE_ENABLED, aValue, OUString() ); if( bNeedErase ) pWindow->Pop(); @@ -607,7 +607,7 @@ void DrawProgress( Window* pWindow, const Point& rPos, // ----------------------------------------------------------------------- -void StatusBar::ImplDrawProgress( sal_Bool bPaint, +void StatusBar::ImplDrawProgress( bool bPaint, sal_uInt16 nPercent1, sal_uInt16 nPercent2 ) { bool bNative = IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ); @@ -664,7 +664,7 @@ void StatusBar::ImplCalcProgressRect() // save the divisor for later mnPercentCount = 10000 / nMaxPercent; - sal_Bool bNativeOK = sal_False; + bool bNativeOK = false; if( IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ) ) { ImplControlValue aValue; @@ -672,7 +672,7 @@ void StatusBar::ImplCalcProgressRect() Rectangle aNativeControlRegion, aNativeContentRegion; if( (bNativeOK = GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, CTRL_STATE_ENABLED, aValue, OUString(), - aNativeControlRegion, aNativeContentRegion ) ) != sal_False ) + aNativeControlRegion, aNativeContentRegion ) ) ) { long nProgressHeight = aNativeControlRegion.GetHeight(); if( nProgressHeight > maPrgsFrameRect.GetHeight() ) @@ -737,18 +737,18 @@ void StatusBar::Paint( const Rectangle& ) sal_uInt16 nItemCount = sal_uInt16( mpItemList->size() ); if ( mbProgressMode ) - ImplDrawProgress( sal_True, 0, mnPercent ); + ImplDrawProgress( true, 0, mnPercent ); else { // draw text if ( !mbVisibleItems || (GetStyle() & WB_RIGHT) ) - ImplDrawText( sal_False, 0 ); + ImplDrawText( false, 0 ); // draw items if ( mbVisibleItems ) { for ( sal_uInt16 i = 0; i < nItemCount; i++ ) - ImplDrawItem( sal_False, i, sal_True, sal_True ); + ImplDrawItem( false, i, true, true ); } } @@ -780,7 +780,7 @@ void StatusBar::Resize() mnTextY = (mnCalcHeight-GetTextHeight())/2; // provoke re-formatting - mbFormat = sal_True; + mbFormat = true; if ( mbProgressMode ) ImplCalcProgressRect(); @@ -868,18 +868,18 @@ void StatusBar::StateChanged( StateChangedType nType ) else if ( (nType == STATE_CHANGE_ZOOM) || (nType == STATE_CHANGE_CONTROLFONT) ) { - mbFormat = sal_True; - ImplInitSettings( sal_True, sal_False, sal_False ); + mbFormat = true; + ImplInitSettings( true, false, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); Invalidate(); } } @@ -898,8 +898,8 @@ void StatusBar::DataChanged( const DataChangedEvent& rDCEvt ) ) ) { - mbFormat = sal_True; - ImplInitSettings( sal_True, sal_True, sal_True ); + mbFormat = true; + ImplInitSettings( true, true, true ); long nFudge = GetTextHeight() / 4; for ( size_t i = 0, n = mpItemList->size(); i < n; ++i ) { @@ -963,7 +963,7 @@ void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, pItem->mnWidth = (long)nWidth+nFudge+STATUSBAR_OFFSET; pItem->mnOffset = nOffset; pItem->mpUserData = 0; - pItem->mbVisible = sal_True; + pItem->mbVisible = true; // add item to list if ( nPos < mpItemList->size() ) { @@ -972,7 +972,7 @@ void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, mpItemList->push_back( pItem ); } - mbFormat = sal_True; + mbFormat = true; if ( ImplIsItemUpdate() ) Invalidate(); @@ -989,7 +989,7 @@ void StatusBar::RemoveItem( sal_uInt16 nItemId ) delete (*mpItemList)[ nPos ]; mpItemList->erase( mpItemList->begin() + nPos ); - mbFormat = sal_True; + mbFormat = true; if ( ImplIsItemUpdate() ) Invalidate(); @@ -1008,9 +1008,9 @@ void StatusBar::ShowItem( sal_uInt16 nItemId ) ImplStatusItem* pItem = (*mpItemList)[ nPos ]; if ( !pItem->mbVisible ) { - pItem->mbVisible = sal_True; + pItem->mbVisible = true; - mbFormat = sal_True; + mbFormat = true; if ( ImplIsItemUpdate() ) Invalidate(); @@ -1030,9 +1030,9 @@ void StatusBar::HideItem( sal_uInt16 nItemId ) ImplStatusItem* pItem = (*mpItemList)[ nPos ]; if ( pItem->mbVisible ) { - pItem->mbVisible = sal_False; + pItem->mbVisible = false; - mbFormat = sal_True; + mbFormat = true; if ( ImplIsItemUpdate() ) Invalidate(); @@ -1043,14 +1043,14 @@ void StatusBar::HideItem( sal_uInt16 nItemId ) // ----------------------------------------------------------------------- -sal_Bool StatusBar::IsItemVisible( sal_uInt16 nItemId ) const +bool StatusBar::IsItemVisible( sal_uInt16 nItemId ) const { sal_uInt16 nPos = GetItemPos( nItemId ); if ( nPos != STATUSBAR_ITEM_NOTFOUND ) return (*mpItemList)[ nPos ]->mbVisible; else - return sal_False; + return false; } void StatusBar::Clear() @@ -1061,7 +1061,7 @@ void StatusBar::Clear() } mpItemList->clear(); - mbFormat = sal_True; + mbFormat = true; if ( ImplIsItemUpdate() ) Invalidate(); @@ -1237,7 +1237,7 @@ void StatusBar::SetItemText( sal_uInt16 nItemId, const OUString& rText ) if ( pItem->mbVisible && !mbFormat && ImplIsItemUpdate() ) { Update(); - ImplDrawItem( sal_True, nPos, sal_True, sal_False ); + ImplDrawItem( true, nPos, true, false ); Flush(); } } @@ -1298,7 +1298,7 @@ void StatusBar::SetItemData( sal_uInt16 nItemId, void* pNewData ) !mbFormat && ImplIsItemUpdate() ) { Update(); - ImplDrawItem( sal_True, nPos, sal_False, sal_False ); + ImplDrawItem( true, nPos, false, false ); Flush(); } } @@ -1328,7 +1328,7 @@ void StatusBar::RedrawItem( sal_uInt16 nItemId ) pItem->mbVisible && ImplIsItemUpdate() ) { Update(); - ImplDrawItem( sal_True, nPos, sal_False, sal_False ); + ImplDrawItem( true, nPos, false, false ); Flush(); } } @@ -1422,7 +1422,7 @@ void StatusBar::StartProgressMode( const OUString& rText ) { DBG_ASSERT( !mbProgressMode, "StatusBar::StartProgressMode(): progress mode is active" ); - mbProgressMode = sal_True; + mbProgressMode = true; mnPercent = 0; maPrgsTxt = rText; @@ -1457,7 +1457,7 @@ void StatusBar::SetProgressValue( sal_uInt16 nNewPercent ) { Update(); SetLineColor(); - ImplDrawProgress( sal_False, mnPercent, nNewPercent ); + ImplDrawProgress( false, mnPercent, nNewPercent ); Flush(); } mnPercent = nNewPercent; @@ -1469,7 +1469,7 @@ void StatusBar::EndProgressMode() { DBG_ASSERT( mbProgressMode, "StatusBar::EndProgressMode(): no progress mode" ); - mbProgressMode = sal_False; + mbProgressMode = false; maPrgsTxt = ""; // re-trigger Paint to recreate StatusBar @@ -1499,7 +1499,7 @@ void StatusBar::SetText( const OUString& rText ) Update(); long nOldTextWidth = GetTextWidth( GetText() ); Window::SetText( rText ); - ImplDrawText( sal_True, nOldTextWidth ); + ImplDrawText( true, nOldTextWidth ); Flush(); } } diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 0b7aa9f7dfa2..203ccc5e70c7 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -67,33 +67,33 @@ long ImplSysChildProc( void* pInst, SalObject* /* pObject */, // Focus holen und zwar so, das alle Handler gerufen // werden, als ob dieses Fenster den Focus bekommt, // ohne das der Frame den Focus wieder klaut - pWindow->ImplGetFrameData()->mbSysObjFocus = sal_True; - pWindow->ImplGetFrameData()->mbInSysObjToTopHdl = sal_True; + pWindow->ImplGetFrameData()->mbSysObjFocus = true; + pWindow->ImplGetFrameData()->mbInSysObjToTopHdl = true; pWindow->ToTop( TOTOP_NOGRABFOCUS ); if( aDogTag.IsDead() ) break; - pWindow->ImplGetFrameData()->mbInSysObjToTopHdl = sal_False; - pWindow->ImplGetFrameData()->mbInSysObjFocusHdl = sal_True; + pWindow->ImplGetFrameData()->mbInSysObjToTopHdl = false; + pWindow->ImplGetFrameData()->mbInSysObjFocusHdl = true; pWindow->GrabFocus(); if( aDogTag.IsDead() ) break; - pWindow->ImplGetFrameData()->mbInSysObjFocusHdl = sal_False; + pWindow->ImplGetFrameData()->mbInSysObjFocusHdl = false; break; case SALOBJ_EVENT_LOSEFOCUS: // Hintenrum einen LoseFocus ausloesen, das der Status // der Fenster dem entsprechenden Activate-Status // entspricht - pWindow->ImplGetFrameData()->mbSysObjFocus = sal_False; + pWindow->ImplGetFrameData()->mbSysObjFocus = false; if ( !pWindow->ImplGetFrameData()->mnFocusId ) { - pWindow->ImplGetFrameData()->mbStartFocusState = sal_True; + pWindow->ImplGetFrameData()->mbStartFocusState = true; Application::PostUserEvent( pWindow->ImplGetFrameData()->mnFocusId, LINK( pWindow->ImplGetFrameWindow(), Window, ImplAsyncFocusHdl ) ); } break; case SALOBJ_EVENT_TOTOP: - pWindow->ImplGetFrameData()->mbInSysObjToTopHdl = sal_True; + pWindow->ImplGetFrameData()->mbInSysObjToTopHdl = true; if ( !Application::GetFocusWindow() || pWindow->HasChildPathFocus() ) pWindow->ToTop( TOTOP_NOGRABFOCUS ); else @@ -103,7 +103,7 @@ long ImplSysChildProc( void* pInst, SalObject* /* pObject */, pWindow->GrabFocus(); if( aDogTag.IsDead() ) break; - pWindow->ImplGetFrameData()->mbInSysObjToTopHdl = sal_False; + pWindow->ImplGetFrameData()->mbInSysObjToTopHdl = false; break; } @@ -112,7 +112,7 @@ long ImplSysChildProc( void* pInst, SalObject* /* pObject */, // ======================================================================= -void SystemChildWindow::ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, sal_Bool bShow ) +void SystemChildWindow::ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) { mpWindowImpl->mpSysObj = ImplGetSVData()->mpDefInst->CreateObject( pParent->ImplGetFrame(), pData, bShow ); @@ -137,7 +137,7 @@ SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle ) : // ----------------------------------------------------------------------- -SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, sal_Bool bShow ) : +SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) : Window( WINDOW_SYSTEMCHILDWINDOW ) { ImplInitSysChild( pParent, nStyle, pData, bShow ); @@ -167,7 +167,7 @@ const SystemEnvData* SystemChildWindow::GetSystemData() const // ----------------------------------------------------------------------- -void SystemChildWindow::EnableEraseBackground( sal_Bool bEnable ) +void SystemChildWindow::EnableEraseBackground( bool bEnable ) { if ( mpWindowImpl->mpSysObj ) mpWindowImpl->mpSysObj->EnableEraseBackground( bEnable ); @@ -207,7 +207,7 @@ void SystemChildWindow::ImplTestJavaException( void* pEnv ) #endif // HAVE_FEATURE_JAVA } -void SystemChildWindow::SetForwardKey( sal_Bool bEnable ) +void SystemChildWindow::SetForwardKey( bool bEnable ) { if ( mpWindowImpl->mpSysObj ) mpWindowImpl->mpSysObj->SetForwardKey( bEnable ); @@ -215,7 +215,7 @@ void SystemChildWindow::SetForwardKey( sal_Bool bEnable ) // ----------------------------------------------------------------------- -sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava ) +sal_IntPtr SystemChildWindow::GetParentWindowHandle( bool bUseJava ) { sal_IntPtr nRet = 0; diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 6b03cf7115a8..94ae46949227 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -71,12 +71,12 @@ SystemWindow::SystemWindow( WindowType nType ) : mpWindowImpl->mnActivateMode = ACTIVATE_MODE_GRABFOCUS; mpMenuBar = NULL; - mbPined = sal_False; - mbRollUp = sal_False; - mbRollFunc = sal_False; - mbDockBtn = sal_False; - mbHideBtn = sal_False; - mbSysChild = sal_False; + mbPined = false; + mbRollUp = false; + mbRollFunc = false; + mbDockBtn = false; + mbHideBtn = false; + mbSysChild = false; mnMenuBarMode = MENUBAR_MODE_NORMAL; mnIcon = 0; } @@ -101,7 +101,7 @@ bool SystemWindow::Notify( NotifyEvent& rNEvt ) if( pWin && pWin->IsSystemWindow() ) pMBar = ((SystemWindow*)pWin)->GetMenuBar(); } - if ( pMBar && pMBar->ImplHandleKeyEvent( *rNEvt.GetKeyEvent(), sal_False ) ) + if ( pMBar && pMBar->ImplHandleKeyEvent( *rNEvt.GetKeyEvent(), false ) ) return true; } @@ -176,17 +176,17 @@ TaskPaneList* SystemWindow::GetTaskPaneList() // ----------------------------------------------------------------------- -sal_Bool SystemWindow::Close() +bool SystemWindow::Close() { ImplDelData aDelData; ImplAddDel( &aDelData ); ImplCallEventListeners( VCLEVENT_WINDOW_CLOSE ); if ( aDelData.IsDead() ) - return sal_False; + return false; ImplRemoveDel( &aDelData ); if ( mpWindowImpl->mxWindowPeer.is() && IsCreatedWithToolkit() ) - return sal_False; + return false; // Is Window not closeable, ignore close Window* pBorderWin = ImplGetBorderWindow(); @@ -196,11 +196,11 @@ sal_Bool SystemWindow::Close() else nStyle = GetStyle(); if ( !(nStyle & WB_CLOSEABLE) ) - return sal_False; + return false; Hide(); - return sal_True; + return true; } // ----------------------------------------------------------------------- @@ -266,7 +266,7 @@ void SystemWindow::SetIcon( sal_uInt16 nIcon ) // ----------------------------------------------------------------------- -void SystemWindow::EnableSaveBackground( sal_Bool bSave ) +void SystemWindow::EnableSaveBackground( bool bSave ) { if( ImplGetSVData()->maWinData.mbNoSaveBackground ) bSave = false; @@ -284,7 +284,7 @@ void SystemWindow::EnableSaveBackground( sal_Bool bSave ) // ----------------------------------------------------------------------- -sal_Bool SystemWindow::IsSaveBackgroundEnabled() const +bool SystemWindow::IsSaveBackgroundEnabled() const { const Window* pWindow = this; while ( pWindow->mpWindowImpl->mpBorderWindow ) @@ -292,12 +292,12 @@ sal_Bool SystemWindow::IsSaveBackgroundEnabled() const if ( pWindow->mpWindowImpl->mpOverlapData ) return pWindow->mpWindowImpl->mpOverlapData->mbSaveBack; else - return sal_False; + return false; } // ----------------------------------------------------------------------- -void SystemWindow::ShowTitleButton( sal_uInt16 nButton, sal_Bool bVisible ) +void SystemWindow::ShowTitleButton( sal_uInt16 nButton, bool bVisible ) { if ( nButton == TITLE_BUTTON_DOCKING ) { @@ -328,7 +328,7 @@ void SystemWindow::ShowTitleButton( sal_uInt16 nButton, sal_Bool bVisible ) // ----------------------------------------------------------------------- -sal_Bool SystemWindow::IsTitleButtonVisible( sal_uInt16 nButton ) const +bool SystemWindow::IsTitleButtonVisible( sal_uInt16 nButton ) const { if ( nButton == TITLE_BUTTON_DOCKING ) return mbDockBtn; @@ -338,7 +338,7 @@ sal_Bool SystemWindow::IsTitleButtonVisible( sal_uInt16 nButton ) const // ----------------------------------------------------------------------- -void SystemWindow::SetPin( sal_Bool bPin ) +void SystemWindow::SetPin( bool bPin ) { if ( bPin != mbPined ) { @@ -355,16 +355,16 @@ void SystemWindow::RollUp() if ( !mbRollUp ) { maOrgSize = GetOutputSizePixel(); - mbRollFunc = sal_True; + mbRollFunc = true; Size aSize = maRollUpOutSize; if ( !aSize.Width() ) aSize.Width() = GetOutputSizePixel().Width(); - mbRollUp = sal_True; + mbRollUp = true; if ( mpWindowImpl->mpBorderWindow ) - ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->SetRollUp( sal_True, aSize ); + ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->SetRollUp( true, aSize ); else SetOutputSizePixel( aSize ); - mbRollFunc = sal_False; + mbRollFunc = false; } } @@ -374,9 +374,9 @@ void SystemWindow::RollDown() { if ( mbRollUp ) { - mbRollUp = sal_False; + mbRollUp = false; if ( mpWindowImpl->mpBorderWindow ) - ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->SetRollUp( sal_False, maOrgSize ); + ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->SetRollUp( false, maOrgSize ); else SetOutputSizePixel( maOrgSize ); } @@ -707,7 +707,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData ) Rectangle aDesktop = GetDesktopRectPixel(); ImplSVData *pSVData = ImplGetSVData(); Window *pWin = pSVData->maWinData.mpFirstFrame; - sal_Bool bWrapped = sal_False; + bool bWrapped = false; while( pWin ) { if( !pWin->ImplIsRealParentPath( this ) && ( pWin != this ) && @@ -728,7 +728,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData ) (unsigned long) (aState.mnY + displacement + aState.mnHeight + g.nBottomDecoration) > (unsigned long) aDesktop.Bottom() ) break; // further displacement not possible -> break // avoid endless testing - bWrapped = sal_True; + bWrapped = true; } else { @@ -949,7 +949,7 @@ void SystemWindow::SetMenuBar( MenuBar* pMenuBar ) ImplToBottomChild(); if ( pOldMenuBar ) { - sal_Bool bDelete = (pMenuBar == 0) ? sal_True : sal_False; + bool bDelete = (pMenuBar == 0) ? sal_True : sal_False; if( bDelete && pOldWindow ) { if( mpImplData->mpTaskPaneList ) @@ -990,20 +990,20 @@ void SystemWindow::SetMenuBarMode( sal_uInt16 nMode ) if ( mpWindowImpl->mpBorderWindow && (mpWindowImpl->mpBorderWindow->GetType() == WINDOW_BORDERWINDOW) ) { if ( nMode == MENUBAR_MODE_HIDE ) - ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->SetMenuBarMode( sal_True ); + ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->SetMenuBarMode( true ); else - ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->SetMenuBarMode( sal_False ); + ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->SetMenuBarMode( false ); } } } // ----------------------------------------------------------------------- -sal_Bool SystemWindow::ImplIsInTaskPaneList( Window* pWin ) +bool SystemWindow::ImplIsInTaskPaneList( Window* pWin ) { if( mpImplData && mpImplData->mpTaskPaneList ) return mpImplData->mpTaskPaneList->IsInList( pWin ); - return sal_False; + return false; } unsigned int SystemWindow::GetScreenNumber() const diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx index c0b4d9ead371..9bb2f242abc8 100644 --- a/vcl/source/window/tabdlg.cxx +++ b/vcl/source/window/tabdlg.cxx @@ -32,7 +32,7 @@ void TabDialog::ImplInitTabDialogData() mpFixedLine = NULL; mpViewWindow = NULL; meViewAlign = WINDOWALIGN_LEFT; - mbPosControls = sal_True; + mbPosControls = true; } // ----------------------------------------------------------------------- @@ -149,7 +149,7 @@ void TabDialog::ImplPosControls() pTabControl->SetPosPixel( aTabOffset ); // Alle anderen Children positionieren - sal_Bool bTabCtrl = sal_False; + bool bTabCtrl = false; int nLines = 0; long nX; long nY = aDlgSize.Height(); @@ -167,7 +167,7 @@ void TabDialog::ImplPosControls() if ( pChild2->IsVisible() && (pChild2 != mpViewWindow) ) { if ( pChild2 == pTabControl ) - bTabCtrl = sal_True; + bTabCtrl = true; else if ( bTabCtrl ) { if ( !nLines ) @@ -209,7 +209,7 @@ void TabDialog::ImplPosControls() mpFixedLine->Show(); } - mbPosControls = sal_False; + mbPosControls = false; } // ----------------------------------------------------------------------- diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 5a59ac6506b5..8c64ba7e20e2 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -46,7 +46,7 @@ void TabPage::ImplInit( Window* pParent, WinBits nStyle ) // if the tabpage is drawn (ie filled) by a native widget, make sure all contols will have transparent background // otherwise they will paint with a wrong background if( IsNativeControlSupported(CTRL_TAB_BODY, PART_ENTIRE_CONTROL) && GetParent() && (GetParent()->GetType() == WINDOW_TABCONTROL) ) - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); } // ----------------------------------------------------------------------- @@ -56,16 +56,16 @@ void TabPage::ImplInitSettings() Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { - EnableChildTransparentMode( sal_True ); + EnableChildTransparentMode( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); SetBackground(); } else { - EnableChildTransparentMode( sal_False ); + EnableChildTransparentMode( false ); SetParentClipMode( 0 ); - SetPaintTransparent( sal_False ); + SetPaintTransparent( false ); if ( IsControlBackground() ) SetBackground( GetControlBackground() ); diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index 459f557272d0..b111106dac21 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -132,7 +132,7 @@ void TaskPaneList::AddWindow( Window *pWindow ) } mTaskPanes.insert( insertionPos, pWindow ); - pWindow->ImplIsInTaskPaneList( sal_True ); + pWindow->ImplIsInTaskPaneList( true ); } } @@ -145,25 +145,25 @@ void TaskPaneList::RemoveWindow( Window *pWindow ) if( p != mTaskPanes.end() ) { mTaskPanes.erase( p ); - pWindow->ImplIsInTaskPaneList( sal_False ); + pWindow->ImplIsInTaskPaneList( false ); } } // -------------------------------------------------- -sal_Bool TaskPaneList::IsInList( Window *pWindow ) +bool TaskPaneList::IsInList( Window *pWindow ) { ::std::vector< Window* >::iterator p; p = ::std::find( mTaskPanes.begin(), mTaskPanes.end(), pWindow ); if( p != mTaskPanes.end() ) - return sal_True; + return true; else - return sal_False; + return false; } // -------------------------------------------------- -sal_Bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) +bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) { // F6 cycles through everything and works always @@ -175,10 +175,10 @@ sal_Bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) // // Since the design of Ctrl-Tab looks to be inconsistent ( non-modal dialogs are not reachable // and the shortcut conflicts with tab-control shortcut ), it is no more supported - sal_Bool bSplitterOnly = sal_False; - sal_Bool bFocusInList = sal_False; + bool bSplitterOnly = false; + bool bFocusInList = false; KeyCode aKeyCode = aKeyEvent.GetKeyCode(); - sal_Bool bForward = !aKeyCode.IsShift(); + bool bForward = !aKeyCode.IsShift(); if( aKeyCode.GetCode() == KEY_F6 && ! aKeyCode.IsMod2() ) // F6 { bSplitterOnly = aKeyCode.IsMod1() && aKeyCode.IsShift(); @@ -188,43 +188,43 @@ sal_Bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) while( p != mTaskPanes.end() ) { Window *pWin = *p; - if( pWin->HasChildPathFocus( sal_True ) ) + if( pWin->HasChildPathFocus( true ) ) { - bFocusInList = sal_True; + bFocusInList = true; // Ctrl-F6 goes directly to the document if( !pWin->IsDialog() && aKeyCode.IsMod1() && !aKeyCode.IsShift() ) { pWin->ImplGrabFocusToDocument( GETFOCUS_F6 ); - return sal_True; + return true; } // activate next task pane Window *pNextWin = NULL; if( bSplitterOnly ) - pNextWin = FindNextSplitter( *p, sal_True ); + pNextWin = FindNextSplitter( *p, true ); else pNextWin = FindNextFloat( *p, bForward ); if( pNextWin != pWin ) { - ImplGetSVData()->maWinData.mbNoSaveFocus = sal_True; + ImplGetSVData()->maWinData.mbNoSaveFocus = true; ImplTaskPaneListGrabFocus( pNextWin, bForward ); - ImplGetSVData()->maWinData.mbNoSaveFocus = sal_False; + ImplGetSVData()->maWinData.mbNoSaveFocus = false; } else { // forward key if no splitter found if( bSplitterOnly ) - return sal_False; + return false; // we did not find another taskpane, so // put focus back into document pWin->ImplGrabFocusToDocument( GETFOCUS_F6 | (bForward ? GETFOCUS_FORWARD : GETFOCUS_BACKWARD)); } - return sal_True; + return true; } else ++p; @@ -235,24 +235,24 @@ sal_Bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) { Window *pWin; if( bSplitterOnly ) - pWin = FindNextSplitter( NULL, sal_True ); + pWin = FindNextSplitter( NULL, true ); else pWin = FindNextFloat( NULL, bForward ); if( pWin ) { ImplTaskPaneListGrabFocus( pWin, bForward ); - return sal_True; + return true; } } } - return sal_False; + return false; } // -------------------------------------------------- // returns next splitter -Window* TaskPaneList::FindNextSplitter( Window *pWindow, sal_Bool bForward ) +Window* TaskPaneList::FindNextSplitter( Window *pWindow, bool bForward ) { if( bForward ) ::std::stable_sort( mTaskPanes.begin(), mTaskPanes.end(), LTRSort() ); @@ -291,7 +291,7 @@ Window* TaskPaneList::FindNextSplitter( Window *pWindow, sal_Bool bForward ) // -------------------------------------------------- // returns first valid item (regardless of type) if pWindow==0, otherwise returns next valid float -Window* TaskPaneList::FindNextFloat( Window *pWindow, sal_Bool bForward ) +Window* TaskPaneList::FindNextFloat( Window *pWindow, bool bForward ) { if( bForward ) ::std::stable_sort( mTaskPanes.begin(), mTaskPanes.end(), LTRSort() ); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 509de9750fa2..c89bb59c9298 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -92,7 +92,7 @@ // ----------------------------------------------------------------------- -static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, sal_Bool bChecked, sal_Bool bEnabled, sal_Bool bIsWindow ); +static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow ); // ----------------------------------------------------------------------- typedef ::std::vector< ToolBox* > ImplTBList; @@ -111,9 +111,9 @@ private: sal_uInt16 mnLineMode; sal_uInt16 mnStartLines; void* mpCustomizeData; - sal_Bool mbCustomizeMode; - sal_Bool mbResizeMode; - sal_Bool mbShowDragRect; + bool mbCustomizeMode; + bool mbResizeMode; + bool mbShowDragRect; public: ImplTBDragMgr(); @@ -137,16 +137,16 @@ public: void StartDragging( ToolBox* pDragBox, const Point& rPos, const Rectangle& rRect, - sal_uInt16 nLineMode, sal_Bool bResizeItem, + sal_uInt16 nLineMode, bool bResizeItem, void* pData = NULL ); void Dragging( const Point& rPos ); - void EndDragging( sal_Bool bOK = sal_True ); + void EndDragging( bool bOK = true ); void HideDragRect() { if ( mbShowDragRect ) mpDragBox->HideTracking(); } void UpdateDragRect(); DECL_LINK( SelectHdl, Accelerator* ); - sal_Bool IsCustomizeMode() { return mbCustomizeMode; } - sal_Bool IsResizeMode() { return mbResizeMode; } + bool IsCustomizeMode() { return mbCustomizeMode; } + bool IsResizeMode() { return mbResizeMode; } }; // ----------------------------------------------------------------------- @@ -291,7 +291,7 @@ void ToolBox::ImplDrawGrip( ToolBox* pThis ) // execute pending paint requests ImplCheckUpdate( pThis ); - sal_Bool bNativeOk = sal_False; + bool bNativeOk = false; if( pThis->IsNativeControlSupported( CTRL_TOOLBAR, pThis->mbHorz ? PART_THUMB_HORZ : PART_THUMB_VERT ) ) { ToolbarValue aToolbarValue; @@ -375,7 +375,7 @@ void ToolBox::ImplDrawGradientBackground( ToolBox* pThis, ImplDockingWindowWrapp g.SetStartColor( startCol ); g.SetEndColor( endCol ); - sal_Bool bLineColor = pThis->IsLineColor(); + bool bLineColor = pThis->IsLineColor(); Color aOldCol = pThis->GetLineColor(); pThis->SetLineColor( pThis->GetSettings().GetStyleSettings().GetShadowColor() ); @@ -480,7 +480,7 @@ void ToolBox::ImplDrawGradientBackground( ToolBox* pThis, ImplDockingWindowWrapp } -sal_Bool ToolBox::ImplDrawNativeBackground( ToolBox* pThis, const Region & ) +bool ToolBox::ImplDrawNativeBackground( ToolBox* pThis, const Region & ) { // use NWF Point aPt; @@ -504,7 +504,7 @@ void ToolBox::ImplDrawTransparentBackground( ToolBox* pThis, const Region &rRegi pThis->mpData->mbIsPaintLocked = bOldPaintLock; } -void ToolBox::ImplDrawConstantBackground( ToolBox* pThis, const Region &rRegion, sal_Bool bIsInPopupMode ) +void ToolBox::ImplDrawConstantBackground( ToolBox* pThis, const Region &rRegion, bool bIsInPopupMode ) { // draw a constant color if( !bIsInPopupMode ) @@ -525,7 +525,7 @@ void ToolBox::ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect ) ImplCheckUpdate( pThis ); ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( pThis ); - sal_Bool bIsInPopupMode = pThis->ImplIsInPopupMode(); + bool bIsInPopupMode = pThis->ImplIsInPopupMode(); Region aPaintRegion( rRect ); @@ -550,7 +550,7 @@ void ToolBox::ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect ) // toolbars known to the dockingmanager will be drawn using NWF or a gradient // docked toolbars are transparent and NWF is already used in the docking area which is their common background // so NWF is used here for floating toolbars only - sal_Bool bNativeOk = sal_False; + bool bNativeOk = false; if( pThis->ImplIsFloatingMode() && pThis->IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL) ) bNativeOk = ImplDrawNativeBackground( pThis, aPaintRegion ); @@ -571,7 +571,7 @@ void ToolBox::ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect ) pThis->Pop(); } -void ToolBox::ImplErase( ToolBox* pThis, const Rectangle &rRect, sal_Bool bHighlight, sal_Bool bHasOpenPopup ) +void ToolBox::ImplErase( ToolBox* pThis, const Rectangle &rRect, bool bHighlight, bool bHasOpenPopup ) { // the background of non NWF buttons is painted in a constant color // to have the same highlight color (transparency in DrawSelectionBackground()) @@ -700,19 +700,19 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uIn Size aSize; WindowAlign eOldAlign = pThis->meAlign; bool bOldHorz = pThis->mbHorz; - sal_Bool bOldAssumeDocked = pThis->mpData->mbAssumeDocked; - sal_Bool bOldAssumeFloating = pThis->mpData->mbAssumeFloating; + bool bOldAssumeDocked = pThis->mpData->mbAssumeDocked; + bool bOldAssumeFloating = pThis->mpData->mbAssumeFloating; if ( nCalcMode ) { - sal_Bool bOldFloatingMode = pThis->ImplIsFloatingMode(); + bool bOldFloatingMode = pThis->ImplIsFloatingMode(); - pThis->mpData->mbAssumeDocked = sal_False; - pThis->mpData->mbAssumeFloating = sal_False; + pThis->mpData->mbAssumeDocked = false; + pThis->mpData->mbAssumeFloating = false; if ( nCalcMode == TB_CALCMODE_HORZ ) { - pThis->mpData->mbAssumeDocked = sal_True; // force non-floating mode during calculation + pThis->mpData->mbAssumeDocked = true; // force non-floating mode during calculation ImplCalcBorder( WINDOWALIGN_TOP, nLeft, nTop, nRight, nBottom, pThis ); ((ToolBox*)pThis)->mbHorz = true; if ( pThis->mbHorz != bOldHorz ) @@ -720,7 +720,7 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uIn } else if ( nCalcMode == TB_CALCMODE_VERT ) { - pThis->mpData->mbAssumeDocked = sal_True; // force non-floating mode during calculation + pThis->mpData->mbAssumeDocked = true; // force non-floating mode during calculation ImplCalcBorder( WINDOWALIGN_LEFT, nLeft, nTop, nRight, nBottom, pThis ); ((ToolBox*)pThis)->mbHorz = false; if ( pThis->mbHorz != bOldHorz ) @@ -728,7 +728,7 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uIn } else if ( nCalcMode == TB_CALCMODE_FLOAT ) { - pThis->mpData->mbAssumeFloating = sal_True; // force non-floating mode during calculation + pThis->mpData->mbAssumeFloating = true; // force non-floating mode during calculation nLeft = nTop = nRight = nBottom = 0; ((ToolBox*)pThis)->mbHorz = true; if ( pThis->mbHorz != bOldHorz ) @@ -844,7 +844,7 @@ void ToolBox::ImplCalcFloatSizes( ToolBox* pThis ) sal_uInt16 nCalcLines; sal_uInt16 nTempLines; long nMaxLineWidth; - nCalcLines = pThis->ImplCalcBreaks( nCalcSize, &nMaxLineWidth, sal_True ); + nCalcLines = pThis->ImplCalcBreaks( nCalcSize, &nMaxLineWidth, true ); pThis->maFloatSizes.reserve( nCalcLines ); @@ -864,7 +864,7 @@ void ToolBox::ImplCalcFloatSizes( ToolBox* pThis ) do { nCalcSize += pThis->mnMaxItemWidth; - nTempLines = pThis->ImplCalcBreaks( nCalcSize, &nMaxLineWidth, sal_True ); + nTempLines = pThis->ImplCalcBreaks( nCalcSize, &nMaxLineWidth, true ); } while ( (nCalcSize < upperBoundWidth) && (nLines < nTempLines) && (nTempLines != 1) ); if ( nTempLines < nLines ) @@ -1015,7 +1015,7 @@ sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos ) void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, sal_uInt16 nLineMode ) { - sal_Bool mbHorz; + bool mbHorz; long nOneLineSize; long nCurSize; long nMaxSize; @@ -1025,27 +1025,27 @@ void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRec if ( nLineMode & DOCK_LINERIGHT ) { nCurSize = rPos.X() - rRect.Left(); - mbHorz = sal_False; + mbHorz = false; } else if ( nLineMode & DOCK_LINEBOTTOM ) { nCurSize = rPos.Y() - rRect.Top(); - mbHorz = sal_True; + mbHorz = true; } else if ( nLineMode & DOCK_LINELEFT ) { nCurSize = rRect.Right() - rPos.X(); - mbHorz = sal_False; + mbHorz = false; } else if ( nLineMode & DOCK_LINETOP ) { nCurSize = rRect.Bottom() - rPos.Y(); - mbHorz = sal_True; + mbHorz = true; } else { OSL_FAIL( "ImplLineSizing: Trailing else" ); nCurSize = 0; - mbHorz = sal_False; + mbHorz = false; } Size aWinSize = pThis->GetSizePixel(); @@ -1177,9 +1177,9 @@ ImplTBDragMgr::ImplTBDragMgr() mpBoxList = new ImplTBList(); mnLineMode = 0; mnStartLines = 0; - mbCustomizeMode = sal_False; - mbResizeMode = sal_False; - mbShowDragRect = sal_False; + mbCustomizeMode = false; + mbResizeMode = false; + mbShowDragRect = false; mpDragBox = NULL; maAccel.InsertItem( KEY_RETURN, KeyCode( KEY_RETURN ) ); @@ -1229,7 +1229,7 @@ ToolBox* ImplTBDragMgr::FindToolBox( const Rectangle& rRect ) void ImplTBDragMgr::StartDragging( ToolBox* pToolBox, const Point& rPos, const Rectangle& rRect, - sal_uInt16 nDragLineMode, sal_Bool bResizeItem, + sal_uInt16 nDragLineMode, bool bResizeItem, void* pData ) { mpDragBox = pToolBox; @@ -1266,7 +1266,7 @@ void ImplTBDragMgr::StartDragging( ToolBox* pToolBox, maMouseOff.Y() = rRect.Top() - rPos.Y(); maRect = rRect; maStartRect = rRect; - mbShowDragRect = sal_True; + mbShowDragRect = true; pToolBox->ShowTracking( maRect ); } @@ -1306,12 +1306,12 @@ void ImplTBDragMgr::Dragging( const Point& rPos ) // ----------------------------------------------------------------------- -void ImplTBDragMgr::EndDragging( sal_Bool bOK ) +void ImplTBDragMgr::EndDragging( bool bOK ) { mpDragBox->HideTracking(); mpDragBox->ReleaseMouse(); mpDragBox->mbDragging = false; - mbShowDragRect = sal_False; + mbShowDragRect = false; Application::RemoveAccel( &maAccel ); if ( mnLineMode ) @@ -1346,7 +1346,7 @@ void ImplTBDragMgr::EndDragging( sal_Bool bOK ) pItem->mpWindow->SetSizePixel( aSize ); // re-calculate and show ToolBox - mpDragBox->ImplInvalidate( sal_True ); + mpDragBox->ImplInvalidate( true ); mpDragBox->Customize( ToolBoxCustomizeEvent( mpDragBox, nTempItem, TOOLBOX_CUSTOMIZE_RESIZE, mpCustomizeData ) ); @@ -1385,7 +1385,7 @@ void ImplTBDragMgr::EndDragging( sal_Bool bOK ) } } mpCustomizeData = NULL; - mbResizeMode = sal_False; + mbResizeMode = false; mpDragBox->Deactivate(); } @@ -1408,9 +1408,9 @@ void ImplTBDragMgr::UpdateDragRect() IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel ) { if ( pAccel->GetCurItemId() == KEY_ESCAPE ) - EndDragging( sal_False ); + EndDragging( false ); else - EndDragging( sal_True ); + EndDragging( true ); return sal_True; } @@ -1493,13 +1493,13 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle ) ImplGetWindowImpl()->mnStyle &= ~WB_DIALOGCONTROL; } - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); } // ----------------------------------------------------------------------- -void ToolBox::ImplInitSettings( sal_Bool bFont, - sal_Bool bForeground, sal_Bool bBackground ) +void ToolBox::ImplInitSettings( bool bFont, + bool bForeground, bool bBackground ) { mpData->mbNativeButtons = IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ); @@ -1533,7 +1533,7 @@ void ToolBox::ImplInitSettings( sal_Bool bFont, { aColor = GetControlBackground(); SetBackground( aColor ); - SetPaintTransparent( sal_False ); + SetPaintTransparent( false ); SetParentClipMode( 0 ); } else @@ -1542,7 +1542,7 @@ void ToolBox::ImplInitSettings( sal_Bool bFont, ( GetAlign() == WINDOWALIGN_TOP && !Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() ) ) { SetBackground(); - SetPaintTransparent( sal_True ); + SetPaintTransparent( true ); SetParentClipMode( PARENTCLIPMODE_NOCLIP ); mpData->maDisplayBackground = Wallpaper( rStyleSettings.GetFaceColor() ); } @@ -1554,7 +1554,7 @@ void ToolBox::ImplInitSettings( sal_Bool bFont, aColor = rStyleSettings.GetWindowColor(); SetBackground( aColor ); - SetPaintTransparent( sal_False ); + SetPaintTransparent( false ); SetParentClipMode( 0 ); ImplUpdateImageList(); @@ -1704,7 +1704,7 @@ ImplToolItem* ToolBox::ImplGetItem( sal_uInt16 nItemId ) const } // ----------------------------------------------------------------------- -static void ImplAddButtonBorder( long &rWidth, long& rHeight, sal_Bool bNativeButtons ) +static void ImplAddButtonBorder( long &rWidth, long& rHeight, bool bNativeButtons ) { rWidth += SMALLBUTTON_HSIZE; rHeight += SMALLBUTTON_VSIZE; @@ -1719,12 +1719,12 @@ static void ImplAddButtonBorder( long &rWidth, long& rHeight, sal_Bool bNativeBu // ----------------------------------------------------------------------- -sal_Bool ToolBox::ImplCalcItem() +bool ToolBox::ImplCalcItem() { // recalc required ? if ( !mbCalc ) - return sal_False; + return false; ImplDisableFlatButtons(); @@ -1815,8 +1815,8 @@ sal_Bool ToolBox::ImplCalcItem() std::vector< ImplToolItem >::iterator it = mpData->m_aItems.begin(); while ( it != mpData->m_aItems.end() ) { - sal_Bool bImage; - sal_Bool bText; + bool bImage; + bool bText; it->mbVisibleText = false; // indicates if text will definitely be drawn, influences dropdown pos @@ -1824,13 +1824,13 @@ sal_Bool ToolBox::ImplCalcItem() { // check if image and/or text exists if ( !(it->maImage) ) - bImage = sal_False; + bImage = false; else - bImage = sal_True; + bImage = true; if ( it->maText.isEmpty() ) - bText = sal_False; + bText = false; else - bText = sal_True; + bText = true; ButtonType tmpButtonType = determineButtonType( &(*it), meButtonType ); // default to toolbox setting if ( bImage || bText ) { @@ -1999,15 +1999,15 @@ sal_Bool ToolBox::ImplCalcItem() mnMaxItemWidth = nMaxWidth; mnMaxItemHeight = nMaxHeight; - return sal_True; + return true; } else - return sal_False; + return false; } // ----------------------------------------------------------------------- -sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, sal_Bool bCalcHorz ) +sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz ) { sal_uLong nLineStart = 0; sal_uLong nGroupStart = 0; @@ -2016,8 +2016,8 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, sal_Bool b long nLastGroupLineWidth = 0; long nMaxLineWidth = 0; sal_uInt16 nLines = 1; - sal_Bool bWindow; - sal_Bool bBreak = sal_False; + bool bWindow; + bool bBreak = false; long nWidthTotal = nWidth; long nMenuWidth = 0; @@ -2038,12 +2038,12 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, sal_Bool b while ( it != mpData->m_aItems.end() ) { it->mbBreak = bBreak; - bBreak = sal_False; + bBreak = false; if ( it->mbVisible ) { - bWindow = sal_False; - bBreak = sal_False; + bWindow = false; + bBreak = false; nCurWidth = 0; if ( it->meType == TOOLBOXITEM_BUTTON || it->meType == TOOLBOXITEM_SPACE ) @@ -2059,7 +2059,7 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, sal_Bool b if ( !mbScroll || (nWinItemWidth <= nWidthTotal) ) { nCurWidth = nWinItemWidth; - bWindow = sal_True; + bWindow = true; } else { @@ -2074,17 +2074,17 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, sal_Bool b // to show the toolbar's menu; otherwise yes if ( ( ( it == lastVisible ) && (nLineWidth+nCurWidth > nWidthTotal) && mbScroll ) || ( ( it != lastVisible ) && (nLineWidth+nCurWidth+nMenuWidth > nWidthTotal) && mbScroll ) ) - bBreak = sal_True; + bBreak = true; } else if ( it->meType == TOOLBOXITEM_SEPARATOR ) { nCurWidth = it->mnSepSize; if ( !ImplIsFloatingMode() && ( it != lastVisible ) && (nLineWidth+nCurWidth+nMenuWidth > nWidthTotal) ) - bBreak = sal_True; + bBreak = true; } // treat breaks as separators, except when using old style toolbars (ie. no menu button) else if ( (it->meType == TOOLBOXITEM_BREAK) && !IsMenuEnabled() ) - bBreak = sal_True; + bBreak = true; if ( bBreak ) { @@ -2101,7 +2101,7 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, sal_Bool b nLineStart = it - mpData->m_aItems.begin(); nGroupStart = nLineStart; it->mbBreak = true; - bBreak = sal_False; + bBreak = false; } else { @@ -2253,7 +2253,7 @@ static void lcl_hideDoubleSeparators( std::vector< ImplToolItem >& rItems ) } } -void ToolBox::ImplFormat( sal_Bool bResize ) +void ToolBox::ImplFormat( bool bResize ) { // Has to re-formatted if ( !mbFormat ) @@ -2268,12 +2268,12 @@ void ToolBox::ImplFormat( sal_Bool bResize ) long nTop; long nMax; // width of layoutarea in pixels sal_uInt16 nFormatLine; - sal_Bool bMustFullPaint; + bool bMustFullPaint; std::vector< ImplToolItem >::iterator it; ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this ); - sal_Bool bIsInPopupMode = ImplIsInPopupMode(); + bool bIsInPopupMode = ImplIsInPopupMode(); maFloatSizes.clear(); @@ -2287,9 +2287,9 @@ void ToolBox::ImplFormat( sal_Bool bResize ) ImplUpdateDragArea( this ); if ( ImplCalcItem() ) - bMustFullPaint = sal_True; + bMustFullPaint = true; else - bMustFullPaint = sal_False; + bMustFullPaint = false; // calculate new size during interactive resize or @@ -2716,7 +2716,7 @@ IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl) (mpData->m_aItems[ mnCurPos ].mnBits & TIB_DROPDOWN) ) { - mpData->mbDropDownByKeyboard = sal_False; + mpData->mbDropDownByKeyboard = false; GetDropdownClickHdl().Call( this ); // do not reset data if the dropdown handler opened a floating window @@ -2751,7 +2751,7 @@ IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl) } // ----------------------------------------------------------------------- -static void ImplDrawMoreIndicator( ToolBox *pBox, const Rectangle& rRect, sal_Bool bSetColor, sal_Bool bRotate ) +static void ImplDrawMoreIndicator( ToolBox *pBox, const Rectangle& rRect, bool bSetColor, bool bRotate ) { Color aOldFillColor = pBox->GetFillColor(); Color aOldLineColor = pBox->GetLineColor(); @@ -2823,10 +2823,10 @@ static void ImplDrawMoreIndicator( ToolBox *pBox, const Rectangle& rRect, sal_Bo pBox->SetLineColor( aOldLineColor ); } -static void ImplDrawDropdownArrow( ToolBox *pBox, const Rectangle& rDropDownRect, sal_Bool bSetColor, sal_Bool bRotate ) +static void ImplDrawDropdownArrow( ToolBox *pBox, const Rectangle& rDropDownRect, bool bSetColor, bool bRotate ) { - sal_Bool bLineColor = pBox->IsLineColor(); - sal_Bool bFillColor = pBox->IsFillColor(); + bool bLineColor = pBox->IsLineColor(); + bool bFillColor = pBox->IsFillColor(); Color aOldFillColor = pBox->GetFillColor(); Color aOldLineColor = pBox->GetLineColor(); pBox->SetLineColor(); @@ -2880,7 +2880,7 @@ static void ImplDrawDropdownArrow( ToolBox *pBox, const Rectangle& rDropDownRect // ----------------------------------------------------------------------- -void ToolBox::ImplDrawMenubutton( ToolBox *pThis, sal_Bool bHighlight ) +void ToolBox::ImplDrawMenubutton( ToolBox *pThis, bool bHighlight ) { if( !pThis->mpData->maMenubuttonItem.maRect.IsEmpty() ) { @@ -2891,8 +2891,8 @@ void ToolBox::ImplDrawMenubutton( ToolBox *pThis, sal_Bool bHighlight ) // execute pending paint requests ImplCheckUpdate( pThis ); - sal_Bool bFillColor = pThis->IsFillColor(); - sal_Bool bLineColor = pThis->IsLineColor(); + bool bFillColor = pThis->IsFillColor(); + bool bLineColor = pThis->IsLineColor(); Color aOldFillCol = pThis->GetFillColor(); Color aOldLineCol = pThis->GetLineColor(); @@ -2900,10 +2900,10 @@ void ToolBox::ImplDrawMenubutton( ToolBox *pThis, sal_Bool bHighlight ) ImplErase( pThis, pThis->mpData->maMenubuttonItem.maRect, bHighlight ); if( bHighlight ) - ImplDrawButton( pThis, pThis->mpData->maMenubuttonItem.maRect, 2, sal_False, sal_True, sal_False ); + ImplDrawButton( pThis, pThis->mpData->maMenubuttonItem.maRect, 2, false, true, false ); if( pThis->ImplHasClippedItems() ) - ImplDrawMoreIndicator( pThis, pThis->mpData->maMenubuttonItem.maRect, sal_True, !pThis->mbHorz ); + ImplDrawMoreIndicator( pThis, pThis->mpData->maMenubuttonItem.maRect, true, !pThis->mbHorz ); // store highlight state pThis->mpData->mbMenubuttonSelected = bHighlight; @@ -2922,29 +2922,29 @@ void ToolBox::ImplDrawMenubutton( ToolBox *pThis, sal_Bool bHighlight ) // ----------------------------------------------------------------------- -void ToolBox::ImplDrawSpin( sal_Bool bUpperIn, sal_Bool bLowerIn ) +void ToolBox::ImplDrawSpin( bool bUpperIn, bool bLowerIn ) { - sal_Bool bTmpUpper; - sal_Bool bTmpLower; + bool bTmpUpper; + bool bTmpLower; if ( maUpperRect.IsEmpty() || maLowerRect.IsEmpty() ) return; if ( mnCurLine > 1 ) - bTmpUpper = sal_True; + bTmpUpper = true; else - bTmpUpper = sal_False; + bTmpUpper = false; if ( mnCurLine+mnVisLines-1 < mnCurLines ) - bTmpLower = sal_True; + bTmpLower = true; else - bTmpLower = sal_False; + bTmpLower = false; if ( !IsEnabled() ) { - bTmpUpper = sal_False; - bTmpLower = sal_False; + bTmpUpper = false; + bTmpLower = false; } ImplDrawSpinButton( this, maUpperRect, maLowerRect, @@ -3002,12 +3002,12 @@ void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect ) // ----------------------------------------------------------------------- -static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, sal_Bool bChecked, sal_Bool bEnabled, sal_Bool bIsWindow ) +static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow ) { // draws toolbar button background either native or using a coloured selection // if bIsWindow is sal_True, the corresponding item is a control and only a selection border will be drawn - sal_Bool bNativeOk = sal_False; + bool bNativeOk = false; if( !bIsWindow && pThis->IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) ) { ImplControlValue aControlValue; @@ -3025,10 +3025,10 @@ static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 h } if( !bNativeOk ) - pThis->DrawSelectionBackground( rRect, bIsWindow ? 3 : highlight, bChecked, sal_True, bIsWindow, 2, NULL, NULL ); + pThis->DrawSelectionBackground( rRect, bIsWindow ? 3 : highlight, bChecked, true, bIsWindow, 2, NULL, NULL ); } -void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, sal_Bool bPaint, sal_Bool bLayout ) +void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint, bool bLayout ) { if( nPos >= mpData->m_aItems.size() ) @@ -3055,13 +3055,13 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, sal_Bool bPa const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); // no gradient background for items that have a popup open - sal_Bool bHasOpenPopup = (mpFloatWin != NULL) && (mnDownItemId==pItem->mnId); + bool bHasOpenPopup = (mpFloatWin != NULL) && (mnDownItemId==pItem->mnId); - sal_Bool bHighContrastWhite = sal_False; + bool bHighContrastWhite = false; // check the face color as highcontrast indicator // because the toolbox itself might have a gradient if( rStyleSettings.GetFaceColor() == Color( COL_WHITE ) ) - bHighContrastWhite = sal_True; + bHighContrastWhite = true; // Compute buttons area. Size aBtnSize = pItem->maRect.GetSize(); @@ -3129,18 +3129,18 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, sal_Bool bPa Size aSize( GetCtrlTextWidth( pItem->maText ), GetTextHeight() ); Point aPos( pItem->maRect.Left()+2, pItem->maRect.Top() ); aPos.Y() += (pItem->maRect.GetHeight()-aSize.Height())/2; - sal_Bool bClip; + bool bClip; if ( (aSize.Width() > pItem->maRect.GetWidth()-2) || (aSize.Height() > pItem->maRect.GetHeight()-2) ) { - bClip = sal_True; + bClip = true; Rectangle aTempRect( pItem->maRect.Left()+1, pItem->maRect.Top()+1, pItem->maRect.Right()-1, pItem->maRect.Bottom()-1 ); Region aTempRegion( aTempRect ); SetClipRegion( aTempRegion ); } else - bClip = sal_False; + bClip = false; if( bLayout ) { mpData->m_pLayoutData->m_aLineIndices.push_back( mpData->m_pLayoutData->m_aDisplayText.getLength() ); @@ -3192,8 +3192,8 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, sal_Bool bPa nOffY += pItem->maRect.Top(); // determine what has to be drawn on the button: image, text or both - sal_Bool bImage; - sal_Bool bText; + bool bImage; + bool bText; ButtonType tmpButtonType = determineButtonType( pItem, meButtonType ); // default to toolbox setting pItem->DetermineButtonDrawStyle( tmpButtonType, bImage, bText ); @@ -3212,7 +3212,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, sal_Bool bPa if ( bImage && ! bLayout ) { const Image* pImage; - if ( (nHighlight != 0) && (!(pItem->maHighImage)) == sal_False ) + if ( (nHighlight != 0) && !!(pItem->maHighImage) ) pImage = &(pItem->maHighImage); else pImage = &(pItem->maImage); @@ -3261,7 +3261,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, sal_Bool bPa } // draw the text - sal_Bool bRotate = sal_False; + bool bRotate = false; if ( bText ) { long nTextOffX = nOffX; @@ -3272,7 +3272,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, sal_Bool bPa if( pItem->mbVisibleText && !ImplIsFloatingMode() && ((meAlign == WINDOWALIGN_LEFT) || (meAlign == WINDOWALIGN_RIGHT)) ) { - bRotate = sal_True; + bRotate = true; Font aRotateFont = aOldFont; aRotateFont.SetOrientation( 2700 ); @@ -3328,10 +3328,10 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, sal_Bool bPa if ( pItem->mnBits & TIB_DROPDOWN ) { Rectangle aDropDownRect( pItem->GetDropDownRect( mbHorz ) ); - sal_Bool bSetColor = sal_True; + bool bSetColor = true; if ( !pItem->mbEnabled || !IsEnabled() ) { - bSetColor = sal_False; + bSetColor = false; SetFillColor( rStyleSettings.GetShadowColor() ); } @@ -3345,7 +3345,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, sal_Bool bPa if( bHasOpenPopup ) ImplDrawFloatwinBorder( pItem ); else - ImplDrawButton( this, aDropDownRect, nHighlight, pItem->meState == STATE_CHECK, pItem->mbEnabled && IsEnabled(), sal_False ); + ImplDrawButton( this, aDropDownRect, nHighlight, pItem->meState == STATE_CHECK, pItem->mbEnabled && IsEnabled(), false ); } } ImplDrawDropdownArrow( this, aDropDownRect, bSetColor, bRotate ); @@ -3393,7 +3393,7 @@ void ToolBox::ImplDrawFloatwinBorder( ImplToolItem* pItem ) } } -void ToolBox::ImplFloatControl( sal_Bool bStart, FloatingWindow* pFloatWindow ) +void ToolBox::ImplFloatControl( bool bStart, FloatingWindow* pFloatWindow ) { if ( bStart ) @@ -3413,7 +3413,7 @@ void ToolBox::ImplFloatControl( sal_Bool bStart, FloatingWindow* pFloatWindow ) // if focus is still in this toolbox, then the floater was opened by keyboard // draw current item with highlight and keep old state - sal_Bool bWasKeyboardActivate = mpData->mbDropDownByKeyboard; + bool bWasKeyboardActivate = mpData->mbDropDownByKeyboard; if ( mnCurPos != TOOLBOX_ITEM_NOTFOUND ) @@ -3433,7 +3433,7 @@ void ToolBox::ImplFloatControl( sal_Bool bStart, FloatingWindow* pFloatWindow ) // ----------------------------------------------------------------------- -void ToolBox::ShowLine( sal_Bool bNext ) +void ToolBox::ShowLine( bool bNext ) { mbFormat = true; @@ -3468,7 +3468,7 @@ void ToolBox::ShowLine( sal_Bool bNext ) // ----------------------------------------------------------------------- -sal_Bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat ) +bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) { Point aMousePos = rMEvt.GetPosPixel(); @@ -3500,7 +3500,7 @@ sal_Bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat } } - return sal_True; + return true; } if ( mbUpper ) @@ -3509,9 +3509,9 @@ sal_Bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat if ( bNewIn != mbIn ) { mbIn = bNewIn; - ImplDrawSpin( mbIn, sal_False ); + ImplDrawSpin( mbIn, false ); } - return sal_True; + return true; } if ( mbLower ) @@ -3520,17 +3520,17 @@ sal_Bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat if ( bNewIn != mbIn ) { mbIn = bNewIn; - ImplDrawSpin( sal_False, mbIn ); + ImplDrawSpin( false, mbIn ); } - return sal_True; + return true; } - return sal_False; + return false; } // ----------------------------------------------------------------------- -sal_Bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCancel ) +bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel ) { ImplDisableFlatButtons(); @@ -3559,7 +3559,7 @@ sal_Bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCa { mbSelection = false; if ( mnCurPos == TOOLBOX_ITEM_NOTFOUND ) - return sal_True; + return true; } // has mouse been released on top of item? @@ -3597,7 +3597,7 @@ sal_Bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCa ImplAddDel( &aDelData ); Select(); if ( aDelData.IsDead() ) - return sal_True; + return true; ImplRemoveDel( &aDelData ); } } @@ -3630,7 +3630,7 @@ sal_Bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCa mnDownItemId = 0; mnMouseClicks = 0; mnMouseModifier = 0; - return sal_True; + return true; } else if ( mbUpper || mbLower ) { @@ -3639,11 +3639,11 @@ sal_Bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCa mbUpper = false; mbLower = false; mbIn = false; - ImplDrawSpin( sal_False, sal_False ); - return sal_True; + ImplDrawSpin( false, false ); + return true; } - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -3665,10 +3665,10 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) // only highlight when the focus is not inside a child window of a toolbox // eg, in a edit control // and do not hilight when focus is in a different toolbox - sal_Bool bDrawHotSpot = sal_True; + bool bDrawHotSpot = true; Window *pWin = Application::GetFocusWindow(); if( pWin && pWin->ImplGetWindowImpl()->mbToolBox && pWin != this ) - bDrawHotSpot = sal_False; + bDrawHotSpot = false; if ( mbSelection && bDrawHotSpot ) { @@ -3785,7 +3785,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) if ( bDrawHotSpot && ( (mnOutStyle & TOOLBOX_STYLE_FLAT) || !mnOutStyle ) ) { - sal_Bool bClearHigh = sal_True; + bool bClearHigh = true; if ( !rMEvt.IsLeaveWindow() && (mnCurPos == TOOLBOX_ITEM_NOTFOUND) ) { std::vector< ImplToolItem >::const_iterator it = mpData->m_aItems.begin(); @@ -3797,7 +3797,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) { if ( !mnOutStyle || (mnOutStyle & TOOLBOX_STYLE_FLAT) ) { - bClearHigh = sal_False; + bClearHigh = false; if ( mnHighItemId != it->mnId ) { sal_uInt16 nTempPos = sal::static_int_cast<sal_uInt16>(it - mpData->m_aItems.begin()); @@ -3811,7 +3811,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) if ( mpData->mbMenubuttonSelected ) { // remove highlight from menubutton - ImplDrawMenubutton( this, sal_False ); + ImplDrawMenubutton( this, false ); } mnHighItemId = it->mnId; ImplDrawItem( nTempPos, 2 ); @@ -3828,13 +3828,13 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) } // only clear highlight when focus is not in toolbar - sal_Bool bMenuButtonHit = mpData->maMenubuttonItem.maRect.IsInside( aMousePos ) && ImplHasClippedItems(); + bool bMenuButtonHit = mpData->maMenubuttonItem.maRect.IsInside( aMousePos ) && ImplHasClippedItems(); if ( bClearHigh || bMenuButtonHit ) { if ( !bMenuButtonHit && mpData->mbMenubuttonSelected ) { // remove highlight from menubutton - ImplDrawMenubutton( this, sal_False ); + ImplDrawMenubutton( this, false ); } if( mnHighItemId ) @@ -3852,7 +3852,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) if( bMenuButtonHit ) { - ImplDrawMenubutton( this, sal_True ); + ImplDrawMenubutton( this, true ); } } } @@ -3923,12 +3923,12 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) Rectangle aItemRect = GetItemRect( it->mnId ); mnConfigItem = it->mnId; - sal_Bool bResizeItem; + bool bResizeItem; if ( mbCustomizeMode && it->mbShowWindow && (it->maRect.Right()-TB_RESIZE_OFFSET <= aMousePos.X()) ) - bResizeItem = sal_True; + bResizeItem = true; else - bResizeItem = sal_False; + bResizeItem = false; pMgr->StartDragging( this, aMousePos, aItemRect, 0, bResizeItem ); return; } @@ -3983,7 +3983,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) // dropdownonly always triggers the dropdown handler, over the whole button area // the drop down arrow should not trigger the item action - mpData->mbDropDownByKeyboard = sal_False; + mpData->mbDropDownByKeyboard = false; GetDropdownClickHdl().Call( this ); // do not reset data if the dropdown handler opened a floating window @@ -4043,7 +4043,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) StartTracking(); mbUpper = true; mbIn = true; - ImplDrawSpin( sal_True, sal_False ); + ImplDrawSpin( true, false ); } return; } @@ -4054,7 +4054,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) StartTracking(); mbLower = true; mbIn = true; - ImplDrawSpin( sal_False, sal_True ); + ImplDrawSpin( false, true ); } return; } @@ -4077,7 +4077,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt ) // start dragging pMgr->StartDragging( this, aMousePos, Rectangle( aPos, aSize ), - nLineMode, sal_False ); + nLineMode, false ); return; } } @@ -4156,7 +4156,7 @@ void ToolBox::Paint( const Rectangle& rPaintRect ) if ( mnWinStyle & WB_SCROLL ) { if ( mnCurLines > mnLines ) - ImplDrawSpin( sal_False, sal_False ); + ImplDrawSpin( false, false ); } // draw buttons @@ -4446,9 +4446,9 @@ bool ToolBox::Notify( NotifyEvent& rNEvt ) } else if( (GetGetFocusFlags() & (GETFOCUS_BACKWARD|GETFOCUS_TAB) ) == (GETFOCUS_BACKWARD|GETFOCUS_TAB)) // Shift-TAB was pressed in the parent - ImplChangeHighlightUpDn( sal_False ); + ImplChangeHighlightUpDn( false ); else - ImplChangeHighlightUpDn( sal_True ); + ImplChangeHighlightUpDn( true ); mnLastFocusItemId = 0; @@ -4540,10 +4540,10 @@ void ToolBox::Command( const CommandEvent& rCEvt ) if ( pData->GetMode() == COMMAND_WHEEL_SCROLL ) { if ( (mnCurLine > 1) && (pData->GetDelta() > 0) ) - ShowLine( sal_False ); + ShowLine( false ); else if ( (mnCurLine+mnVisLines-1 < mnCurLines) && (pData->GetDelta() < 0) ) - ShowLine( sal_True ); - ImplDrawSpin( sal_False, sal_False ); + ShowLine( true ); + ImplDrawSpin( false, false ); return; } } @@ -4572,17 +4572,17 @@ void ToolBox::StateChanged( StateChangedType nType ) { mbCalc = true; mbFormat = true; - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { - ImplInitSettings( sal_False, sal_False, sal_True ); // font, foreground, background + ImplInitSettings( false, false, true ); // font, foreground, background Invalidate(); } @@ -4604,7 +4604,7 @@ void ToolBox::DataChanged( const DataChangedEvent& rDCEvt ) { mbCalc = true; mbFormat = true; - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); Invalidate(); } @@ -4614,7 +4614,7 @@ void ToolBox::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -sal_Bool ToolBox::PrepareToggleFloatingMode() +bool ToolBox::PrepareToggleFloatingMode() { return DockingWindow::PrepareToggleFloatingMode(); } @@ -4656,7 +4656,7 @@ void ToolBox::ToggleFloatingMode() // if orientation changes, the toolbox has to be initialized again // to update the direction of the gradient mbCalc = true; - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); } mbFormat = true; @@ -4675,13 +4675,13 @@ void ToolBox::StartDocking() // ----------------------------------------------------------------------- -sal_Bool ToolBox::Docking( const Point& rPos, Rectangle& rRect ) +bool ToolBox::Docking( const Point& rPos, Rectangle& rRect ) { // do nothing during dragging, it was calculated before if ( mbDragging ) - return sal_False; + return false; - sal_Bool bFloatMode = sal_False; + bool bFloatMode = false; DockingWindow::Docking( rPos, rRect ); @@ -4728,7 +4728,7 @@ sal_Bool ToolBox::Docking( const Point& rPos, Rectangle& rRect ) // become a floating window Rectangle aIntersect = aInRect.GetIntersection( aDockingRect ); if ( aIntersect == aDockingRect ) - bFloatMode = sal_True; + bFloatMode = true; else { // docking rectangle is in the "sensible area" @@ -4781,7 +4781,7 @@ sal_Bool ToolBox::Docking( const Point& rPos, Rectangle& rRect ) } } else - bFloatMode = sal_True; + bFloatMode = true; if ( bFloatMode ) { @@ -4810,7 +4810,7 @@ void ToolBox::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) if ( meAlign != meDockAlign ) SetAlign( meDockAlign ); } - if ( bFloatMode || (bFloatMode != ImplIsFloatingMode()) ) + if ( bFloatMode || (bool(bFloatMode) != ImplIsFloatingMode()) ) DockingWindow::EndDocking( rRect, bFloatMode ); } @@ -4924,9 +4924,9 @@ Size ToolBox::CalcPopupWindowSizePixel() const nLines = (sal_uInt16) ceil( sqrt( (double) GetItemCount() ) ); } - sal_Bool bPopup = mpData->mbAssumePopupMode; + bool bPopup = mpData->mbAssumePopupMode; ToolBox *pThis = (ToolBox*) this; - pThis->mpData->mbAssumePopupMode = sal_True; + pThis->mpData->mbAssumePopupMode = true; Size aSize = CalcFloatingWindowSizePixel( nLines ); @@ -4943,13 +4943,13 @@ Size ToolBox::CalcFloatingWindowSizePixel() const Size ToolBox::CalcFloatingWindowSizePixel( sal_uInt16 nCalcLines ) const { - sal_Bool bFloat = mpData->mbAssumeFloating; - sal_Bool bDocking = mpData->mbAssumeDocked; + bool bFloat = mpData->mbAssumeFloating; + bool bDocking = mpData->mbAssumeDocked; // simulate floating mode and force reformat before calculating ToolBox *pThis = (ToolBox*) this; - pThis->mpData->mbAssumeFloating = sal_True; - pThis->mpData->mbAssumeDocked = sal_False; + pThis->mpData->mbAssumeFloating = true; + pThis->mpData->mbAssumeDocked = false; Size aSize = ImplCalcFloatSize( (ToolBox*) this, nCalcLines ); @@ -5030,7 +5030,7 @@ void ToolBox::GetFocus() void ToolBox::LoseFocus() { - ImplChangeHighlight( NULL, sal_True ); + ImplChangeHighlight( NULL, true ); DockingWindow::LoseFocus(); } @@ -5038,7 +5038,7 @@ void ToolBox::LoseFocus() // ----------------------------------------------------------------------- // performs the action associated with an item, ie simulates clicking the item -void ToolBox::TriggerItem( sal_uInt16 nItemId, sal_Bool bShift, sal_Bool bCtrl ) +void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl ) { mnHighItemId = nItemId; sal_uInt16 nModifier = 0; @@ -5054,16 +5054,16 @@ void ToolBox::TriggerItem( sal_uInt16 nItemId, sal_Bool bShift, sal_Bool bCtrl ) // calls the button's action handler // returns sal_True if action was called -sal_Bool ToolBox::ImplActivateItem( KeyCode aKeyCode ) +bool ToolBox::ImplActivateItem( KeyCode aKeyCode ) { - sal_Bool bRet = sal_True; + bool bRet = true; if( mnHighItemId ) { ImplToolItem *pToolItem = ImplGetItem( mnHighItemId ); // #107712#, activate can also be called for disabled entries if( pToolItem && !pToolItem->mbEnabled ) - return sal_True; + return true; if( pToolItem && pToolItem->mpWindow && HasFocus() ) { @@ -5110,13 +5110,13 @@ sal_Bool ToolBox::ImplActivateItem( KeyCode aKeyCode ) } } else - bRet = sal_False; + bRet = false; return bRet; } // ----------------------------------------------------------------------- -sal_Bool ImplCloseLastPopup( Window *pParent ) +bool ImplCloseLastPopup( Window *pParent ) { // close last popup toolbox (see also: // ImplHandleMouseFloatMode(...) in winproc.cxx ) @@ -5128,23 +5128,23 @@ sal_Bool ImplCloseLastPopup( Window *pParent ) if( pLastLevelFloat && pLastLevelFloat != pParent ) { pLastLevelFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL ); - return sal_True; + return true; } } - return sal_False; + return false; } // opens a drop down toolbox item // returns sal_True if item was opened -sal_Bool ToolBox::ImplOpenItem( KeyCode aKeyCode ) +bool ToolBox::ImplOpenItem( KeyCode aKeyCode ) { sal_uInt16 nCode = aKeyCode.GetCode(); - sal_Bool bRet = sal_True; + bool bRet = true; // arrow keys should work only in the opposite direction of alignment (to not break cursor travelling) if ( ((nCode == KEY_LEFT || nCode == KEY_RIGHT) && IsHorizontal()) || ((nCode == KEY_UP || nCode == KEY_DOWN) && !IsHorizontal()) ) - return sal_False; + return false; if( IsMenuEnabled() && mpData->mbMenubuttonSelected ) { @@ -5168,7 +5168,7 @@ sal_Bool ToolBox::ImplOpenItem( KeyCode aKeyCode ) mbIsKeyEvent = true; Activate(); - mpData->mbDropDownByKeyboard = sal_True; + mpData->mbDropDownByKeyboard = true; GetDropdownClickHdl().Call( this ); mbIsKeyEvent = false; @@ -5176,7 +5176,7 @@ sal_Bool ToolBox::ImplOpenItem( KeyCode aKeyCode ) mnMouseModifier = 0; } else - bRet = sal_False; + bRet = false; return bRet; } @@ -5193,8 +5193,8 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) bool bOldSchoolContainer = ((pParent->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) == WB_DIALOGCONTROL); bool bParentIsContainer = bOldSchoolContainer || isContainerWindow(pParent); - sal_Bool bForwardKey = sal_False; - sal_Bool bGrabFocusToDocument = sal_False; + bool bForwardKey = false; + bool bGrabFocusToDocument = false; // #107776# we might be destroyed in the keyhandler ImplDelData aDelData; @@ -5208,7 +5208,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) if( aKeyCode.GetModifier() ) // allow only pure cursor keys break; if( !IsHorizontal() ) - ImplChangeHighlightUpDn( sal_True ); + ImplChangeHighlightUpDn( true ); else ImplOpenItem( aKeyCode ); } @@ -5218,7 +5218,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) if( aKeyCode.GetModifier() ) // allow only pure cursor keys break; if( IsHorizontal() ) - ImplChangeHighlightUpDn( sal_True ); + ImplChangeHighlightUpDn( true ); else ImplOpenItem( aKeyCode ); } @@ -5228,7 +5228,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) if( aKeyCode.GetModifier() ) // allow only pure cursor keys break; if( !IsHorizontal() ) - ImplChangeHighlightUpDn( sal_False ); + ImplChangeHighlightUpDn( false ); else ImplOpenItem( aKeyCode ); } @@ -5238,7 +5238,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) if( aKeyCode.GetModifier() ) // allow only pure cursor keys break; if( IsHorizontal() ) - ImplChangeHighlightUpDn( sal_False ); + ImplChangeHighlightUpDn( false ); else ImplOpenItem( aKeyCode ); } @@ -5252,7 +5252,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) mnCurLine = 1; mbFormat = true; ImplFormat(); - ImplDrawSpin( sal_False, sal_False ); + ImplDrawSpin( false, false ); ImplChangeHighlight( ImplGetFirstValidItem( mnCurLine ) ); } break; @@ -5265,20 +5265,20 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) mnCurLine = mnCurLines; mbFormat = true; ImplFormat(); - ImplDrawSpin( sal_False, sal_False ); + ImplDrawSpin( false, false ); ImplChangeHighlight( ImplGetFirstValidItem( mnCurLine ) ); } break; case KEY_END: { ImplChangeHighlight( NULL ); - ImplChangeHighlightUpDn( sal_False ); + ImplChangeHighlightUpDn( false ); } break; case KEY_HOME: { ImplChangeHighlight( NULL ); - ImplChangeHighlightUpDn( sal_True ); + ImplChangeHighlightUpDn( true ); } break; case KEY_ESCAPE: @@ -5310,7 +5310,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) ImplToolItem *pItem = ImplGetItem( mnHighItemId ); if( !pItem->mbEnabled ) { - bGrabFocusToDocument = sal_True; + bGrabFocusToDocument = true; } } if( !bGrabFocusToDocument ) @@ -5340,7 +5340,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) // while the toolbox has the focus // just forward function and special keys and combinations with Alt-key if( aKeyGroup == KEYGROUP_FKEYS || aKeyGroup == KEYGROUP_MISC || aKeyCode.IsMod2() ) - bForwardKey = sal_True; + bForwardKey = true; } } } @@ -5439,11 +5439,11 @@ void ToolBox::ChangeHighlight( sal_uInt16 nPos ) { if ( nPos < GetItemCount() ) { ImplGrabFocus( 0 ); - ImplChangeHighlight ( ImplGetItem ( GetItemId ( (sal_uInt16) nPos ) ), sal_False ); + ImplChangeHighlight ( ImplGetItem ( GetItemId ( (sal_uInt16) nPos ) ), false ); } } -void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, sal_Bool bNoGrabFocus ) +void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus ) { // avoid recursion due to focus change if( mbChangingHighlight ) @@ -5522,17 +5522,17 @@ void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, sal_Bool bNoGrabFocus ) // ----------------------------------------------------------------------- // check for keyboard accessible items -static sal_Bool ImplIsValidItem( const ImplToolItem* pItem, sal_Bool bNotClipped ) +static bool ImplIsValidItem( const ImplToolItem* pItem, bool bNotClipped ) { - sal_Bool bValid = (pItem && pItem->meType == TOOLBOXITEM_BUTTON && pItem->mbVisible && !ImplIsFixedControl( pItem )); + bool bValid = (pItem && pItem->meType == TOOLBOXITEM_BUTTON && pItem->mbVisible && !ImplIsFixedControl( pItem )); if( bValid && bNotClipped && pItem->IsClipped() ) - bValid = sal_False; + bValid = false; return bValid; } // ----------------------------------------------------------------------- -sal_Bool ToolBox::ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle ) +bool ToolBox::ImplChangeHighlightUpDn( bool bUp, bool bNoCycle ) { ImplToolItem* pToolItem = ImplGetItem( mnHighItemId ); @@ -5549,13 +5549,13 @@ sal_Bool ToolBox::ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle ) while( it != mpData->m_aItems.begin() ) { --it; - if ( ImplIsValidItem( &(*it), sal_True ) ) + if ( ImplIsValidItem( &(*it), true ) ) { pItem = &(*it); break; } } - ImplDrawMenubutton( this, sal_False ); + ImplDrawMenubutton( this, false ); ImplChangeHighlight( pItem ); } else @@ -5564,17 +5564,17 @@ sal_Bool ToolBox::ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle ) std::vector< ImplToolItem >::iterator it = mpData->m_aItems.begin(); while( it != mpData->m_aItems.end() ) { - if ( ImplIsValidItem( &(*it), sal_True ) ) + if ( ImplIsValidItem( &(*it), true ) ) break; ++it; } if( it != mpData->m_aItems.end() ) { - ImplDrawMenubutton( this, sal_False ); + ImplDrawMenubutton( this, false ); ImplChangeHighlight( &(*it) ); } } - return sal_True; + return true; } if( bUp ) @@ -5583,7 +5583,7 @@ sal_Bool ToolBox::ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle ) std::vector< ImplToolItem >::iterator it = mpData->m_aItems.begin(); while( it != mpData->m_aItems.end() ) { - if ( ImplIsValidItem( &(*it), sal_False ) ) + if ( ImplIsValidItem( &(*it), false ) ) break; ++it; } @@ -5592,11 +5592,11 @@ sal_Bool ToolBox::ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle ) if( (it != mpData->m_aItems.end() && &(*it) == ImplGetFirstClippedItem( this )) && IsMenuEnabled() ) { ImplChangeHighlight( NULL ); - ImplDrawMenubutton( this, sal_True ); + ImplDrawMenubutton( this, true ); } else ImplChangeHighlight( (it != mpData->m_aItems.end()) ? &(*it) : NULL ); - return sal_True; + return true; } else { @@ -5606,7 +5606,7 @@ sal_Bool ToolBox::ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle ) if( IsMenuEnabled() && !ImplIsFloatingMode() ) { ImplChangeHighlight( NULL ); - ImplDrawMenubutton( this, sal_True ); + ImplDrawMenubutton( this, true ); } else { @@ -5615,7 +5615,7 @@ sal_Bool ToolBox::ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle ) while( it != mpData->m_aItems.begin() ) { --it; - if ( ImplIsValidItem( &(*it), sal_False ) ) + if ( ImplIsValidItem( &(*it), false ) ) { pItem = &(*it); break; @@ -5623,7 +5623,7 @@ sal_Bool ToolBox::ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle ) } ImplChangeHighlight( pItem ); } - return sal_True; + return true; } } @@ -5640,14 +5640,14 @@ sal_Bool ToolBox::ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle ) if( !pos-- ) { if( bNoCycle ) - return sal_False; + return false; // highlight the menu button if it is the last item if( IsMenuEnabled() && !ImplIsFloatingMode() ) { ImplChangeHighlight( NULL ); - ImplDrawMenubutton( this, sal_True ); - return sal_True; + ImplDrawMenubutton( this, true ); + return true; } else pos = nCount-1; @@ -5658,14 +5658,14 @@ sal_Bool ToolBox::ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle ) if( ++pos >= nCount ) { if( bNoCycle ) - return sal_False; + return false; // highlight the menu button if it is the last item if( IsMenuEnabled() && !ImplIsFloatingMode() ) { ImplChangeHighlight( NULL ); - ImplDrawMenubutton( this, sal_True ); - return sal_True; + ImplDrawMenubutton( this, true ); + return true; } else pos = 0; @@ -5674,7 +5674,7 @@ sal_Bool ToolBox::ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle ) pToolItem = &mpData->m_aItems[pos]; - if ( ImplIsValidItem( pToolItem, sal_False ) ) + if ( ImplIsValidItem( pToolItem, false ) ) break; } while( ++i < nCount); @@ -5683,14 +5683,14 @@ sal_Bool ToolBox::ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle ) { // select the menu button if a clipped item would be selected ImplChangeHighlight( NULL ); - ImplDrawMenubutton( this, sal_True ); + ImplDrawMenubutton( this, true ); } else if( i != nCount ) ImplChangeHighlight( pToolItem ); else - return sal_False; + return false; } - return sal_True; + return true; } // ----------------------------------------------------------------------- @@ -5727,7 +5727,7 @@ void ToolBox::ImplHideFocus() if ( mpData->mbMenubuttonSelected ) { // remove highlight from menubutton - ImplDrawMenubutton( this, sal_False ); + ImplDrawMenubutton( this, false ); } } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 277d5cf8c09f..9c5667a96209 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -76,17 +76,17 @@ ImplToolBoxPrivateData::ImplToolBoxPrivateData() : mnMenuButtonWidth = TB_MENUBUTTON_SIZE; - mbIsLocked = sal_False; - mbNativeButtons = sal_False; - mbIsPaintLocked = sal_False; - mbAssumeDocked = sal_False; - mbAssumePopupMode = sal_False; - mbAssumeFloating = sal_False; - mbKeyInputDisabled = sal_False; - mbMenubuttonSelected = sal_False; - mbPageScroll = sal_False; - mbWillUsePopupMode = sal_False; - mbDropDownByKeyboard = sal_False; + mbIsLocked = false; + mbNativeButtons = false; + mbIsPaintLocked = false; + mbAssumeDocked = false; + mbAssumePopupMode = false; + mbAssumeFloating = false; + mbKeyInputDisabled = false; + mbMenubuttonSelected = false; + mbPageScroll = false; + mbWillUsePopupMode = false; + mbDropDownByKeyboard = false; } ImplToolBoxPrivateData::~ImplToolBoxPrivateData() @@ -98,7 +98,7 @@ ImplToolBoxPrivateData::~ImplToolBoxPrivateData() // ----------------------------------------------------------------------- void ImplToolItem::init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits, - sal_Bool bEmptyBtn) + bool bEmptyBtn) { mnId = nItemId; mpWindow = NULL; @@ -121,7 +121,7 @@ void ImplToolItem::init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits, ImplToolItem::ImplToolItem() { - init(0, 0, sal_True); + init(0, 0, true); } // ----------------------------------------------------------------------- @@ -130,7 +130,7 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage, ToolBoxItemBits nItemBits ) : maImage( rImage ) { - init(nItemId, nItemBits, sal_False); + init(nItemId, nItemBits, false); } // ----------------------------------------------------------------------- @@ -139,7 +139,7 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const OUString& rText, ToolBoxItemBits nItemBits ) : maText( rText ) { - init(nItemId, nItemBits, sal_False); + init(nItemId, nItemBits, false); } // ----------------------------------------------------------------------- @@ -149,7 +149,7 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage, maImage( rImage ), maText( rText ) { - init(nItemId, nItemBits, sal_False); + init(nItemId, nItemBits, false); } // ----------------------------------------------------------------------- @@ -231,7 +231,7 @@ ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem ) // ----------------------------------------------------------------------- -Size ImplToolItem::GetSize( sal_Bool bHorz, sal_Bool bCheckMaxWidth, long maxWidth, const Size& rDefaultSize ) +Size ImplToolItem::GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth, const Size& rDefaultSize ) { Size aSize( rDefaultSize ); // the size of 'standard' toolbox items // non-standard items are eg windows or buttons with text @@ -285,27 +285,27 @@ Size ImplToolItem::GetSize( sal_Bool bHorz, sal_Bool bCheckMaxWidth, long maxWid // ----------------------------------------------------------------------- -void ImplToolItem::DetermineButtonDrawStyle( ButtonType eButtonType, sal_Bool& rbImage, sal_Bool& rbText ) const +void ImplToolItem::DetermineButtonDrawStyle( ButtonType eButtonType, bool& rbImage, bool& rbText ) const { if ( meType != TOOLBOXITEM_BUTTON ) { // no button -> draw nothing - rbImage = rbText = sal_False; + rbImage = rbText = false; return; } - sal_Bool bHasImage; - sal_Bool bHasText; + bool bHasImage; + bool bHasText; // check for image and/or text if ( !(maImage) ) - bHasImage = sal_False; + bHasImage = false; else - bHasImage = sal_True; + bHasImage = true; if ( maText.isEmpty() ) - bHasText = sal_False; + bHasText = false; else - bHasText = sal_True; + bHasText = true; // prefer images if symbolonly buttons are drawn // prefer texts if textonly buttons are dreawn @@ -314,38 +314,38 @@ void ImplToolItem::DetermineButtonDrawStyle( ButtonType eButtonType, sal_Bool& r { if( bHasImage || !bHasText ) { - rbImage = sal_True; - rbText = sal_False; + rbImage = true; + rbText = false; } else { - rbImage = sal_False; - rbText = sal_True; + rbImage = false; + rbText = true; } } else if ( eButtonType == BUTTON_TEXT ) // drawing text only { if( bHasText || !bHasImage ) { - rbImage = sal_False; - rbText = sal_True; + rbImage = false; + rbText = true; } else { - rbImage = sal_True; - rbText = sal_False; + rbImage = true; + rbText = false; } } else // drawing icons and text both { - rbImage = sal_True; - rbText = sal_True; + rbImage = true; + rbText = true; } } // ----------------------------------------------------------------------- -Rectangle ImplToolItem::GetDropDownRect( sal_Bool bHorz ) const +Rectangle ImplToolItem::GetDropDownRect( bool bHorz ) const { Rectangle aRect; if( (mnBits & TIB_DROPDOWN) && !maRect.IsEmpty() ) @@ -363,14 +363,14 @@ Rectangle ImplToolItem::GetDropDownRect( sal_Bool bHorz ) const // ----------------------------------------------------------------------- -sal_Bool ImplToolItem::IsClipped() const +bool ImplToolItem::IsClipped() const { return ( meType == TOOLBOXITEM_BUTTON && mbVisible && maRect.IsEmpty() ); } // ----------------------------------------------------------------------- -sal_Bool ImplToolItem::IsItemHidden() const +bool ImplToolItem::IsItemHidden() const { return ( meType == TOOLBOXITEM_BUTTON && !mbVisible ); } @@ -389,7 +389,7 @@ const OUString ToolBox::ImplConvertMenuString( const OUString& rStr ) // ----------------------------------------------------------------------- -void ToolBox::ImplInvalidate( sal_Bool bNewCalc, sal_Bool bFullPaint ) +void ToolBox::ImplInvalidate( bool bNewCalc, bool bFullPaint ) { ImplUpdateInputEnable(); @@ -529,7 +529,7 @@ void ToolBox::UserDraw( const UserDrawEvent& ) void ToolBox::InsertItem( const ResId& rResId, sal_uInt16 nPos ) { sal_uLong nObjMask; - sal_Bool bImage = sal_False; // Wurde Image gesetzt + bool bImage = false; // Wurde Image gesetzt // Item anlegen ImplToolItem aItem; @@ -564,22 +564,22 @@ void ToolBox::InsertItem( const ResId& rResId, sal_uInt16 nPos ) Bitmap aBmp = Bitmap( ResId( (RSHEADER_TYPE*)GetClassRes(), *rResId.GetResMgr() ) ); IncrementRes( GetObjSizeRes( (RSHEADER_TYPE*)GetClassRes() ) ); aItem.maImage = Image( aBmp, IMAGE_STDBTN_COLOR ); - bImage = sal_True; + bImage = true; } if ( nObjMask & RSC_TOOLBOXITEM_IMAGE ) { aItem.maImage = Image( ResId( (RSHEADER_TYPE*)GetClassRes(), *rResId.GetResMgr() ) ); IncrementRes( GetObjSizeRes( (RSHEADER_TYPE*)GetClassRes() ) ); - bImage = sal_True; + bImage = true; } if ( nObjMask & RSC_TOOLBOXITEM_DISABLE ) - aItem.mbEnabled = !(sal_Bool)ReadShortRes(); + aItem.mbEnabled = ReadShortRes() == 0; if ( nObjMask & RSC_TOOLBOXITEM_STATE ) aItem.meState = (TriState)ReadLongRes(); if ( nObjMask & RSC_TOOLBOXITEM_HIDE ) - aItem.mbVisible = !((sal_Bool)ReadShortRes()); + aItem.mbVisible = ReadShortRes() == 0; if ( nObjMask & RSC_TOOLBOXITEM_COMMAND ) aItem.maCommandStr = ReadStringRes(); @@ -590,15 +590,15 @@ void ToolBox::InsertItem( const ResId& rResId, sal_uInt16 nPos ) aItem.maImage = maImageList.GetImage( aItem.mnId ); // Wenn es sich um ein ButtonItem handelt, die ID ueberpruefen - sal_Bool bNewCalc; + bool bNewCalc; if ( aItem.meType != TOOLBOXITEM_BUTTON ) { - bNewCalc = sal_False; + bNewCalc = false; aItem.mnId = 0; } else { - bNewCalc = sal_True; + bNewCalc = true; DBG_ASSERT( aItem.mnId, "ToolBox::InsertItem(): ItemId == 0" ); DBG_ASSERT( GetItemPos( aItem.mnId ) == TOOLBOX_ITEM_NOTFOUND, @@ -631,7 +631,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage, SetItemImage(nItemId, rImage); mpData->ImplClearLayoutData(); - ImplInvalidate( sal_True ); + ImplInvalidate( true ); // Notify sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); @@ -653,7 +653,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage, SetItemImage(nItemId, rImage); mpData->ImplClearLayoutData(); - ImplInvalidate( sal_True ); + ImplInvalidate( true ); // Notify sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); @@ -673,7 +673,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const OUString& rText, mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), ImplToolItem( nItemId, ImplConvertMenuString( rText ), nBits ) ); mpData->ImplClearLayoutData(); - ImplInvalidate( sal_True ); + ImplInvalidate( true ); // Notify sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); @@ -818,7 +818,7 @@ void ToolBox::InsertWindow( sal_uInt16 nItemId, Window* pWindow, if ( pWindow ) pWindow->Hide(); - ImplInvalidate( sal_True ); + ImplInvalidate( true ); // Notify sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); @@ -836,7 +836,7 @@ void ToolBox::InsertSpace( sal_uInt16 nPos ) mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem ); mpData->ImplClearLayoutData(); - ImplInvalidate( sal_False ); + ImplInvalidate( false ); // Notify sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); @@ -856,7 +856,7 @@ void ToolBox::InsertSeparator( sal_uInt16 nPos, sal_uInt16 nPixSize ) mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem ); mpData->ImplClearLayoutData(); - ImplInvalidate( sal_False ); + ImplInvalidate( false ); // Notify sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); @@ -874,7 +874,7 @@ void ToolBox::InsertBreak( sal_uInt16 nPos ) mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem ); mpData->ImplClearLayoutData(); - ImplInvalidate( sal_False ); + ImplInvalidate( false ); // Notify sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); @@ -887,11 +887,11 @@ void ToolBox::RemoveItem( sal_uInt16 nPos ) { if( nPos < mpData->m_aItems.size() ) { - sal_Bool bMustCalc; + bool bMustCalc; if ( mpData->m_aItems[nPos].meType == TOOLBOXITEM_BUTTON ) - bMustCalc = sal_True; + bMustCalc = true; else - bMustCalc = sal_False; + bMustCalc = false; if ( mpData->m_aItems[nPos].mpWindow ) mpData->m_aItems[nPos].mpWindow->Hide(); @@ -937,7 +937,7 @@ void ToolBox::CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId, mpData->m_aItems.insert( (nNewPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nNewPos : mpData->m_aItems.end(), aNewItem ); mpData->ImplClearLayoutData(); // ToolBox neu ausgeben - ImplInvalidate( sal_False ); + ImplInvalidate( false ); // Notify sal_uInt16 nNewPos2 = sal::static_int_cast<sal_uInt16>(( nNewPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nNewPos); @@ -956,7 +956,7 @@ void ToolBox::Clear() mnCurItemId = 0; mnHighItemId = 0; - ImplInvalidate( sal_True, sal_True ); + ImplInvalidate( true, true ); // Notify ImplCallEventListeners( VCLEVENT_TOOLBOX_ALLITEMSCHANGED ); @@ -972,7 +972,7 @@ void ToolBox::SetButtonType( ButtonType eNewType ) // Hier besser alles neu ausgeben, da es ansonsten zu Problemen // mit den per CopyBits kopierten Bereichen geben kann - ImplInvalidate( sal_True ); + ImplInvalidate( true ); } } @@ -1052,7 +1052,7 @@ void ToolBox::SetAlign( WindowAlign eNewAlign ) mbHorz = true; // Update the background according to Persona if necessary - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); // Hier alles neu ausgeben, da sich Border auch aendert mbCalc = true; @@ -1076,13 +1076,13 @@ void ToolBox::SetLineCount( sal_uInt16 nNewLines ) // Hier besser alles neu ausgeben, da es ansonsten zu Problemen // mit den per CopyBits kopierten Bereichen geben kann - ImplInvalidate( sal_False ); + ImplInvalidate( false ); } } // ----------------------------------------------------------------------- -void ToolBox::SetPageScroll( sal_Bool b ) +void ToolBox::SetPageScroll( bool b ) { mpData->mbPageScroll = b; } @@ -1278,16 +1278,16 @@ Size ToolBox::GetItemContentSize( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -sal_Bool ToolBox::ImplHasExternalMenubutton() +bool ToolBox::ImplHasExternalMenubutton() { // check if the borderwindow (i.e. the decoration) provides the menu button - sal_Bool bRet = sal_False; + bool bRet = false; if( ImplIsFloatingMode() ) { // custom menu is placed in the decoration ImplBorderWindow *pBorderWin = dynamic_cast<ImplBorderWindow*>( GetWindow( WINDOW_BORDER ) ); if( pBorderWin && !pBorderWin->GetMenuRect().IsEmpty() ) - bRet = sal_True; + bRet = true; } return bRet; } @@ -1304,9 +1304,9 @@ void ToolBox::SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits ) nBits &= TIB_LEFT | TIB_AUTOSIZE | TIB_DROPDOWN; nOldBits &= TIB_LEFT | TIB_AUTOSIZE | TIB_DROPDOWN; // trigger reformat when the item width has changed (dropdown arrow) - sal_Bool bFormat = (nBits & TIB_DROPDOWN) != (nOldBits & TIB_DROPDOWN); + bool bFormat = (nBits & TIB_DROPDOWN) != (nOldBits & TIB_DROPDOWN); if ( nBits != nOldBits ) - ImplInvalidate( sal_True, bFormat ); + ImplInvalidate( true, bFormat ); } } @@ -1401,7 +1401,7 @@ void ToolBox::SetItemImage( sal_uInt16 nItemId, const Image& rImage ) Size aOldSize = pItem->maImage.GetSizePixel(); pItem->maImage = aImage; if ( aOldSize != pItem->maImage.GetSizePixel() ) - ImplInvalidate( sal_True ); + ImplInvalidate( true ); else ImplUpdateItem( nPos ); } @@ -1463,7 +1463,7 @@ void ToolBox::SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 ) if ( !mbCalc ) { if ( aOldSize != pItem->maImage.GetSizePixel() ) - ImplInvalidate( sal_True ); + ImplInvalidate( true ); else ImplUpdateItem( nPos ); } @@ -1482,7 +1482,7 @@ static Image ImplMirrorImage( const Image& rImage ) return Image( aMirrBitmapEx ); } -void ToolBox::SetItemImageMirrorMode( sal_uInt16 nItemId, sal_Bool bMirror ) +void ToolBox::SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1537,7 +1537,7 @@ void ToolBox::SetItemText( sal_uInt16 nItemId, const OUString& rText ) pItem->maText = ImplConvertMenuString( rText ); mpData->ImplClearLayoutData(); if ( nOldWidth != GetCtrlTextWidth( pItem->maText ) ) - ImplInvalidate( sal_True ); + ImplInvalidate( true ); else ImplUpdateItem( nPos ); } @@ -1576,7 +1576,7 @@ void ToolBox::SetItemWindow( sal_uInt16 nItemId, Window* pNewWindow ) pItem->mpWindow = pNewWindow; if ( pNewWindow ) pNewWindow->Hide(); - ImplInvalidate( sal_True ); + ImplInvalidate( true ); ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED, reinterpret_cast< void* >( nPos ) ); } } @@ -1636,7 +1636,7 @@ void ToolBox::EndSelection() // ----------------------------------------------------------------------- -void ToolBox::SetItemDown( sal_uInt16 nItemId, sal_Bool bDown, sal_Bool bRelease ) +void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1789,14 +1789,14 @@ void ToolBox::EnableItem( sal_uInt16 nItemId, bool bEnable ) // ----------------------------------------------------------------------- -sal_Bool ToolBox::IsItemEnabled( sal_uInt16 nItemId ) const +bool ToolBox::IsItemEnabled( sal_uInt16 nItemId ) const { ImplToolItem* pItem = ImplGetItem( nItemId ); if ( pItem ) return pItem->mbEnabled; else - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -1812,36 +1812,36 @@ void ToolBox::ShowItem( sal_uInt16 nItemId, bool bVisible ) if ( pItem->mbVisible != bVisible ) { pItem->mbVisible = bVisible; - ImplInvalidate( sal_False ); + ImplInvalidate( false ); } } } // ----------------------------------------------------------------------- -sal_Bool ToolBox::IsItemVisible( sal_uInt16 nItemId ) const +bool ToolBox::IsItemVisible( sal_uInt16 nItemId ) const { ImplToolItem* pItem = ImplGetItem( nItemId ); if ( pItem ) return pItem->mbVisible; else - return sal_False; + return false; } // ----------------------------------------------------------------------- -sal_Bool ToolBox::IsItemReallyVisible( sal_uInt16 nItemId ) const +bool ToolBox::IsItemReallyVisible( sal_uInt16 nItemId ) const { // is the item on the visible area of the toolbox? - sal_Bool bRet = sal_False; + bool bRet = false; Rectangle aRect( mnLeftBorder, mnTopBorder, mnDX-mnRightBorder, mnDY-mnBottomBorder ); ImplToolItem* pItem = ImplGetItem( nItemId ); if ( pItem && pItem->mbVisible && !pItem->maRect.IsEmpty() && aRect.IsOver( pItem->maRect ) ) { - bRet = sal_True; + bRet = true; } return bRet; @@ -1958,7 +1958,7 @@ void ToolBox::SetOutStyle( sal_uInt16 nNewStyle ) mnMaxItemHeight = 1; } - ImplInvalidate( sal_True, sal_True ); + ImplInvalidate( true, true ); } } @@ -1974,11 +1974,11 @@ void ToolBox::ImplUpdateInputEnable() if( it->mbEnabled ) { // at least one useful entry - mpData->mbKeyInputDisabled = sal_False; + mpData->mbKeyInputDisabled = false; return; } } - mpData->mbKeyInputDisabled = sal_True; + mpData->mbKeyInputDisabled = true; } // ----------------------------------------------------------------------- @@ -1994,7 +1994,7 @@ void ToolBox::ImplFillLayoutData() const // Nur malen, wenn Rechteck im PaintRectangle liegt if ( !pItem->maRect.IsEmpty() ) - const_cast<ToolBox*>(this)->ImplDrawItem( i, sal_False, sal_False, sal_True ); + const_cast<ToolBox*>(this)->ImplDrawItem( i, sal_False, false, true ); } } @@ -2096,7 +2096,7 @@ sal_uInt16 ToolBox::GetMenuType() const return mpData->maMenuType; } -sal_Bool ToolBox::IsMenuEnabled() const +bool ToolBox::IsMenuEnabled() const { return mpData->maMenuType != TOOLBOX_MENUTYPE_NONE; } @@ -2113,7 +2113,7 @@ void ToolBox::SetMenuButtonHdl( const Link& rLink ) // ----------------------------------------------------------------------- -sal_Bool ToolBox::ImplHasClippedItems() +bool ToolBox::ImplHasClippedItems() { // are any items currently clipped ? ImplFormat(); @@ -2121,10 +2121,10 @@ sal_Bool ToolBox::ImplHasClippedItems() while ( it != mpData->m_aItems.end() ) { if( it->IsClipped() ) - return sal_True; + return true; ++it; } - return sal_False; + return false; } void ToolBox::UpdateCustomMenu() @@ -2190,7 +2190,7 @@ IMPL_LINK( ToolBox, ImplCustomMenuListener, VclMenuEvent*, pEvent ) { sal_uInt16 id = GetMenu()->GetItemId( pEvent->GetItemPos() ); if( id >= TOOLBOX_MENUITEM_START ) - TriggerItem( id - TOOLBOX_MENUITEM_START, sal_False, sal_False ); + TriggerItem( id - TOOLBOX_MENUITEM_START, false, false ); } return 0; } @@ -2275,24 +2275,24 @@ void ToolBox::ExecuteCustomMenu() // ----------------------------------------------------------------------- // checks override first, useful during calculation of sizes -sal_Bool ToolBox::ImplIsFloatingMode() const +bool ToolBox::ImplIsFloatingMode() const { DBG_ASSERT( !(mpData->mbAssumeDocked && mpData->mbAssumeFloating), "ToolBox::ImplIsFloatingMode(): cannot assume docked and floating" ); if( mpData->mbAssumeDocked ) - return sal_False; + return false; else if( mpData->mbAssumeFloating ) - return sal_True; + return true; else return IsFloatingMode(); } // checks override first, useful during calculation of sizes -sal_Bool ToolBox::ImplIsInPopupMode() const +bool ToolBox::ImplIsInPopupMode() const { if( mpData->mbAssumePopupMode ) - return sal_True; + return true; else { ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this ); @@ -2302,7 +2302,7 @@ sal_Bool ToolBox::ImplIsInPopupMode() const // ----------------------------------------------------------------------- -void ToolBox::Lock( sal_Bool bLock ) +void ToolBox::Lock( bool bLock ) { ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this ); if( !pWrapper ) @@ -2322,7 +2322,7 @@ void ToolBox::Lock( sal_Bool bLock ) // ----------------------------------------------------------------------- -sal_Bool ToolBox::AlwaysLocked() +bool ToolBox::AlwaysLocked() { // read config item to determine toolbox behaviour, used for subtoolbars @@ -2338,21 +2338,21 @@ sal_Bool ToolBox::AlwaysLocked() if ( aNode.isValid() ) { // feature enabled ? - sal_Bool bStatesEnabled = sal_Bool(); + bool bStatesEnabled = bool(); ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString("StatesEnabled") ); if( aValue >>= bStatesEnabled ) { - if( bStatesEnabled == sal_True ) + if( bStatesEnabled ) { // now read the locking state utl::OConfigurationNode aNode2 = utl::OConfigurationTreeRoot::tryCreateWithComponentContext( comphelper::getProcessComponentContext(), OUString("/org.openoffice.Office.UI.GlobalSettings/Toolbars/States") ); // note: case sensitive ! - sal_Bool bLocked = sal_Bool(); + bool bLocked = bool(); ::com::sun::star::uno::Any aValue2 = aNode2.getNodeValue( OUString("Locked") ); if( aValue2 >>= bLocked ) - nAlwaysLocked = (bLocked == sal_True) ? 1 : 0; + nAlwaysLocked = bLocked ? 1 : 0; } } } @@ -2361,12 +2361,12 @@ sal_Bool ToolBox::AlwaysLocked() return nAlwaysLocked == 1 ? sal_True : sal_False; } -sal_Bool ToolBox::WillUsePopupMode() const +bool ToolBox::WillUsePopupMode() const { return mpData->mbWillUsePopupMode; } -void ToolBox::WillUsePopupMode( sal_Bool b ) +void ToolBox::WillUsePopupMode( bool b ) { mpData->mbWillUsePopupMode = b; } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 1d93c80dd9cd..ed057f78fcd5 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -450,10 +450,10 @@ bool Window::ImplCheckUIFont( const Font& rFont ) // ----------------------------------------------------------------------- -void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl ) +void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl ) { StyleSettings aTmpSt( rSettings.GetStyleSettings() ); - aTmpSt.SetHighContrastMode( sal_False ); + aTmpSt.SetHighContrastMode( false ); rSettings.SetStyleSettings( aTmpSt ); ImplGetFrame()->UpdateSettings( rSettings ); // reset default border width for layouters @@ -635,7 +635,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl // (see above) then accept that if( !rSettings.GetStyleSettings().GetHighContrastMode() ) { - sal_Bool bTmp = sal_False, bAutoHCMode = sal_True; + bool bTmp = false, bAutoHCMode = true; utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithComponentContext( comphelper::getProcessComponentContext(), OUString("org.openoffice.Office.Common/Accessibility") ); // note: case sensitive ! @@ -660,7 +660,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl if( bForceHCMode ) { aStyleSettings = rSettings.GetStyleSettings(); - aStyleSettings.SetHighContrastMode( sal_True ); + aStyleSettings.SetHighContrastMode( true ); aStyleSettings.SetSymbolsStyle( STYLE_SYMBOLS_HICONTRAST ); rSettings.SetStyleSettings( aStyleSettings ); } @@ -790,7 +790,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste mpWindowImpl->mpOverlapData->mpSaveBackRgn = NULL; mpWindowImpl->mpOverlapData->mpNextBackWin = NULL; mpWindowImpl->mpOverlapData->mnSaveBackSize = 0; - mpWindowImpl->mpOverlapData->mbSaveBack = sal_False; + mpWindowImpl->mpOverlapData->mbSaveBack = false; mpWindowImpl->mpOverlapData->mnTopLevel = 1; } @@ -906,21 +906,21 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste mpWindowImpl->mpFrameData->mnMouseCode = 0; mpWindowImpl->mpFrameData->mnMouseMode = 0; mpWindowImpl->mpFrameData->meMapUnit = MAP_PIXEL; - mpWindowImpl->mpFrameData->mbHasFocus = sal_False; - mpWindowImpl->mpFrameData->mbInMouseMove = sal_False; - mpWindowImpl->mpFrameData->mbMouseIn = sal_False; - mpWindowImpl->mpFrameData->mbStartDragCalled = sal_False; - mpWindowImpl->mpFrameData->mbNeedSysWindow = sal_False; - mpWindowImpl->mpFrameData->mbMinimized = sal_False; - mpWindowImpl->mpFrameData->mbStartFocusState = sal_False; - mpWindowImpl->mpFrameData->mbInSysObjFocusHdl = sal_False; - mpWindowImpl->mpFrameData->mbInSysObjToTopHdl = sal_False; - mpWindowImpl->mpFrameData->mbSysObjFocus = sal_False; + mpWindowImpl->mpFrameData->mbHasFocus = false; + mpWindowImpl->mpFrameData->mbInMouseMove = false; + mpWindowImpl->mpFrameData->mbMouseIn = false; + mpWindowImpl->mpFrameData->mbStartDragCalled = false; + mpWindowImpl->mpFrameData->mbNeedSysWindow = false; + mpWindowImpl->mpFrameData->mbMinimized = false; + mpWindowImpl->mpFrameData->mbStartFocusState = false; + mpWindowImpl->mpFrameData->mbInSysObjFocusHdl = false; + mpWindowImpl->mpFrameData->mbInSysObjToTopHdl = false; + mpWindowImpl->mpFrameData->mbSysObjFocus = false; mpWindowImpl->mpFrameData->maPaintTimer.SetTimeout( 30 ); mpWindowImpl->mpFrameData->maPaintTimer.SetTimeoutHdl( LINK( this, Window, ImplHandlePaintHdl ) ); mpWindowImpl->mpFrameData->maResizeTimer.SetTimeout( 50 ); mpWindowImpl->mpFrameData->maResizeTimer.SetTimeoutHdl( LINK( this, Window, ImplHandleResizeTimerHdl ) ); - mpWindowImpl->mpFrameData->mbInternalDragGestureRecognizer = sal_False; + mpWindowImpl->mpFrameData->mbInternalDragGestureRecognizer = false; if ( pRealParent && IsTopWindow() ) { @@ -966,7 +966,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste // side effect: ImplUpdateGlobalSettings does an ImplGetFrame()->UpdateSettings ImplUpdateGlobalSettings( *pSVData->maAppData.mpSettings ); OutputDevice::SetSettings( *pSVData->maAppData.mpSettings ); - pSVData->maAppData.mbSettingsInit = sal_True; + pSVData->maAppData.mbSettingsInit = true; } // If we create a Window with default size, query this @@ -1095,7 +1095,7 @@ void Window::ImplInsertWindow( Window* pParent ) // ----------------------------------------------------------------------- -void Window::ImplRemoveWindow( sal_Bool bRemoveFrameData ) +void Window::ImplRemoveWindow( bool bRemoveFrameData ) { // remove window from the lists if ( !mpWindowImpl->mbFrame ) @@ -1295,8 +1295,8 @@ void Window::ImplLoadRes( const ResId& rResId ) sal_uLong nObjMask = aHeader.nObjMask; - sal_Bool bPos = sal_False; - sal_Bool bSize = sal_False; + bool bPos = false; + bool bSize = false; Point aPos; Size aSize; @@ -1305,7 +1305,7 @@ void Window::ImplLoadRes( const ResId& rResId ) // use size as per resource MapUnit ePosMap = MAP_PIXEL; - bPos = sal_True; + bPos = true; if ( nObjMask & WINDOW_XYMAPMODE ) ePosMap = (MapUnit)ReadLongRes(); @@ -1320,7 +1320,7 @@ void Window::ImplLoadRes( const ResId& rResId ) // use size as per resource MapUnit eSizeMap = MAP_PIXEL; - bSize = sal_True; + bSize = true; if ( nObjMask & WINDOW_WHMAPMODE ) eSizeMap = (MapUnit)ReadLongRes(); @@ -1393,7 +1393,7 @@ ImplWinData* Window::ImplGetWinData() const mpWindowImpl->mpWinData->mpTrackRect = NULL; mpWindowImpl->mpWinData->mnTrackFlags = 0; mpWindowImpl->mpWinData->mnIsTopWindow = (sal_uInt16) ~0; // not initialized yet, 0/1 will indicate TopWindow (see IsTopWindow()) - mpWindowImpl->mpWinData->mbMouseOver = sal_False; + mpWindowImpl->mpWinData->mbMouseOver = false; mpWindowImpl->mpWinData->mbEnableNativeWidget = (pNoNWF && *pNoNWF) ? sal_False : sal_True; // sal_True: try to draw this control with native theme API } @@ -1491,22 +1491,22 @@ sal_uInt16 Window::ImplHitTest( const Point& rFramePos ) // ----------------------------------------------------------------------- -sal_Bool Window::ImplIsRealParentPath( const Window* pWindow ) const +bool Window::ImplIsRealParentPath( const Window* pWindow ) const { pWindow = pWindow->GetParent(); while ( pWindow ) { if ( pWindow == this ) - return sal_True; + return true; pWindow = pWindow->GetParent(); } - return sal_False; + return false; } // ----------------------------------------------------------------------- -sal_Bool Window::ImplIsChild( const Window* pWindow, sal_Bool bSystemWindow ) const +bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const { do { @@ -1516,19 +1516,19 @@ sal_Bool Window::ImplIsChild( const Window* pWindow, sal_Bool bSystemWindow ) co pWindow = pWindow->ImplGetParent(); if ( pWindow == this ) - return sal_True; + return true; } while ( pWindow ); - return sal_False; + return false; } // ----------------------------------------------------------------------- -sal_Bool Window::ImplIsWindowOrChild( const Window* pWindow, sal_Bool bSystemWindow ) const +bool Window::ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const { if ( this == pWindow ) - return sal_True; + return true; return ImplIsChild( pWindow, bSystemWindow ); } @@ -1553,7 +1553,7 @@ int Window::ImplTestMousePointerSet() PointerStyle Window::ImplGetMousePointer() const { PointerStyle ePointerStyle; - sal_Bool bWait = sal_False; + bool bWait = false; if ( IsEnabled() && IsInputEnabled() && ! IsInModalMode() ) ePointerStyle = GetPointer().GetStyle(); @@ -1573,7 +1573,7 @@ PointerStyle Window::ImplGetMousePointer() const if ( pWindow->mpWindowImpl->mnWaitCount ) { ePointerStyle = POINTER_WAIT; - bWait = sal_True; + bWait = true; } else { @@ -1596,7 +1596,7 @@ PointerStyle Window::ImplGetMousePointer() const void Window::ImplResetReallyVisible() { - sal_Bool bBecameReallyInvisible = mpWindowImpl->mbReallyVisible; + bool bBecameReallyInvisible = mpWindowImpl->mbReallyVisible; mbDevOutput = false; mpWindowImpl->mbReallyVisible = false; @@ -1637,7 +1637,7 @@ void Window::ImplSetReallyVisible() if( !mpWindowImpl->mbReallyShown ) ImplCallInitShow(); - sal_Bool bBecameReallyVisible = !mpWindowImpl->mbReallyVisible; + bool bBecameReallyVisible = !mpWindowImpl->mbReallyVisible; mbDevOutput = true; mpWindowImpl->mbReallyVisible = true; @@ -1814,9 +1814,9 @@ void Window::ImplLogicToPoint( Font& rFont ) const // ----------------------------------------------------------------------- -sal_Bool Window::ImplSysObjClip( const Region* pOldRegion ) +bool Window::ImplSysObjClip( const Region* pOldRegion ) { - sal_Bool bUpdate = sal_True; + bool bUpdate = true; if ( mpWindowImpl->mpSysObj ) { @@ -1955,9 +1955,9 @@ void Window::ImplUpdateSysObjClip() // ----------------------------------------------------------------------- -sal_Bool Window::ImplSetClipFlagChildren( sal_Bool bSysObjOnlySmaller ) +bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller ) { - sal_Bool bUpdate = sal_True; + bool bUpdate = true; if ( mpWindowImpl->mpSysObj ) { Region* pOldRegion = NULL; @@ -1971,7 +1971,7 @@ sal_Bool Window::ImplSetClipFlagChildren( sal_Bool bSysObjOnlySmaller ) while ( pWindow ) { if ( !pWindow->ImplSetClipFlagChildren( bSysObjOnlySmaller ) ) - bUpdate = sal_False; + bUpdate = false; pWindow = pWindow->mpWindowImpl->mpNext; } @@ -1979,7 +1979,7 @@ sal_Bool Window::ImplSetClipFlagChildren( sal_Bool bSysObjOnlySmaller ) { mbInitClipRegion = true; mpWindowImpl->mbInitWinClipRegion = true; - bUpdate = sal_False; + bUpdate = false; } delete pOldRegion; @@ -1993,7 +1993,7 @@ sal_Bool Window::ImplSetClipFlagChildren( sal_Bool bSysObjOnlySmaller ) while ( pWindow ) { if ( !pWindow->ImplSetClipFlagChildren( bSysObjOnlySmaller ) ) - bUpdate = sal_False; + bUpdate = false; pWindow = pWindow->mpWindowImpl->mpNext; } } @@ -2002,15 +2002,15 @@ sal_Bool Window::ImplSetClipFlagChildren( sal_Bool bSysObjOnlySmaller ) // ----------------------------------------------------------------------- -sal_Bool Window::ImplSetClipFlagOverlapWindows( sal_Bool bSysObjOnlySmaller ) +bool Window::ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller ) { - sal_Bool bUpdate = ImplSetClipFlagChildren( bSysObjOnlySmaller ); + bool bUpdate = ImplSetClipFlagChildren( bSysObjOnlySmaller ); Window* pWindow = mpWindowImpl->mpFirstOverlap; while ( pWindow ) { if ( !pWindow->ImplSetClipFlagOverlapWindows( bSysObjOnlySmaller ) ) - bUpdate = sal_False; + bUpdate = false; pWindow = pWindow->mpWindowImpl->mpNext; } @@ -2019,11 +2019,11 @@ sal_Bool Window::ImplSetClipFlagOverlapWindows( sal_Bool bSysObjOnlySmaller ) // ----------------------------------------------------------------------- -sal_Bool Window::ImplSetClipFlag( sal_Bool bSysObjOnlySmaller ) +bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller ) { if ( !ImplIsOverlapWindow() ) { - sal_Bool bUpdate = ImplSetClipFlagChildren( bSysObjOnlySmaller ); + bool bUpdate = ImplSetClipFlagChildren( bSysObjOnlySmaller ); Window* pParent = ImplGetParent(); if ( pParent && @@ -2040,7 +2040,7 @@ sal_Bool Window::ImplSetClipFlag( sal_Bool bSysObjOnlySmaller ) while ( pWindow ) { if ( !pWindow->ImplSetClipFlagChildren( bSysObjOnlySmaller ) ) - bUpdate = sal_False; + bUpdate = false; pWindow = pWindow->mpWindowImpl->mpNext; } } @@ -2120,7 +2120,7 @@ void Window::ImplExcludeOverlapWindows2( Region& rRegion ) // ----------------------------------------------------------------------- -void Window::ImplClipBoundaries( Region& rRegion, sal_Bool bThis, sal_Bool bOverlaps ) +void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps ) { if ( bThis ) ImplIntersectWindowClipRegion( rRegion ); @@ -2155,9 +2155,9 @@ void Window::ImplClipBoundaries( Region& rRegion, sal_Bool bThis, sal_Bool bOver // ----------------------------------------------------------------------- -sal_Bool Window::ImplClipChildren( Region& rRegion ) +bool Window::ImplClipChildren( Region& rRegion ) { - sal_Bool bOtherClip = sal_False; + bool bOtherClip = false; Window* pWindow = mpWindowImpl->mpFirstChild; while ( pWindow ) { @@ -2169,7 +2169,7 @@ sal_Bool Window::ImplClipChildren( Region& rRegion ) ((nClipMode & PARENTCLIPMODE_CLIP) || (GetStyle() & WB_CLIPCHILDREN)) ) pWindow->ImplExcludeWindowRegion( rRegion ); else - bOtherClip = sal_True; + bOtherClip = true; } pWindow = pWindow->mpWindowImpl->mpNext; @@ -2223,7 +2223,7 @@ void Window::ImplInitWinClipRegion() ImplClipSiblings( mpWindowImpl->maWinClipRegion ); // Clip Parent Boundaries - ImplClipBoundaries( mpWindowImpl->maWinClipRegion, sal_False, sal_True ); + ImplClipBoundaries( mpWindowImpl->maWinClipRegion, false, true ); // Clip Children if ( (GetStyle() & WB_CLIPCHILDREN) || mpWindowImpl->mbClipChildren ) @@ -2335,7 +2335,7 @@ void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& // ----------------------------------------------------------------------- void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegion, - sal_Bool bChildren, sal_Bool bParent, sal_Bool bSiblings ) + bool bChildren, bool bParent, bool bSiblings ) { Region aRegion( rSourceRect ); if ( mpWindowImpl->mbWinRegion ) @@ -2554,7 +2554,7 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ) // #98943# draw toolbox selection if( !aSelectionRect.IsEmpty() ) - DrawSelectionBackground( aSelectionRect, 3, sal_False, sal_True, sal_False ); + DrawSelectionBackground( aSelectionRect, 3, false, true, false ); delete pChildRegion; @@ -2695,7 +2695,7 @@ void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion ) { Region aRegion = rRegion; - ImplClipBoundaries( aRegion, sal_True, sal_True ); + ImplClipBoundaries( aRegion, true, true ); if ( !aRegion.IsEmpty() ) ImplInvalidateFrameRegion( &aRegion, INVALIDATE_CHILDREN ); @@ -2733,7 +2733,7 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) ImplInvalidateAllOverlapBackgrounds(); // check what has to be redrawn - sal_Bool bInvalidateAll = !pRegion; + bool bInvalidateAll = !pRegion; // take Transparent-Invalidate into account Window* pOpaqueWindow = this; @@ -2746,7 +2746,7 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) { pOpaqueWindow = pTempWindow; nFlags |= INVALIDATE_CHILDREN; - bInvalidateAll = sal_False; + bInvalidateAll = false; break; } @@ -2767,7 +2767,7 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) nFlags |= INVALIDATE_CHILDREN; } if ( (nFlags & INVALIDATE_NOCHILDREN) && mpWindowImpl->mpFirstChild ) - bInvalidateAll = sal_False; + bInvalidateAll = false; if ( bInvalidateAll ) ImplInvalidateFrameRegion( NULL, nFlags ); else @@ -2788,7 +2788,7 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) else aRegion.Intersect( *pRegion ); } - ImplClipBoundaries( aRegion, sal_True, sal_True ); + ImplClipBoundaries( aRegion, true, true ); if ( nFlags & INVALIDATE_NOCHILDREN ) { nFlags &= ~INVALIDATE_CHILDREN; @@ -2815,7 +2815,7 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) void Window::ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, - sal_Bool bChildren ) + bool bChildren ) { if ( (mpWindowImpl->mnPaintFlags & (IMPL_PAINT_PAINT | IMPL_PAINT_PAINTALL)) == IMPL_PAINT_PAINT ) { @@ -2830,7 +2830,7 @@ void Window::ImplMoveInvalidateRegion( const Rectangle& rRect, Window* pWindow = mpWindowImpl->mpFirstChild; while ( pWindow ) { - pWindow->ImplMoveInvalidateRegion( rRect, nHorzScroll, nVertScroll, sal_True ); + pWindow->ImplMoveInvalidateRegion( rRect, nHorzScroll, nVertScroll, true ); pWindow = pWindow->mpWindowImpl->mpNext; } } @@ -2840,7 +2840,7 @@ void Window::ImplMoveInvalidateRegion( const Rectangle& rRect, void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, - sal_Bool bChildren ) + bool bChildren ) { // also shift Paint-Region when paints need processing ImplMoveInvalidateRegion( rRect, nHorzScroll, nVertScroll, bChildren ); @@ -2924,7 +2924,7 @@ void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags ) { // assemble region - sal_Bool bValidateAll = !pRegion; + bool bValidateAll = !pRegion; sal_uInt16 nOrgFlags = nFlags; if ( !(nFlags & (VALIDATE_CHILDREN | VALIDATE_NOCHILDREN)) ) { @@ -2934,7 +2934,7 @@ void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags ) nFlags |= VALIDATE_CHILDREN; } if ( (nFlags & VALIDATE_NOCHILDREN) && mpWindowImpl->mpFirstChild ) - bValidateAll = sal_False; + bValidateAll = false; if ( bValidateAll ) ImplValidateFrameRegion( NULL, nFlags ); else @@ -2943,7 +2943,7 @@ void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags ) Region aRegion( aRect ); if ( pRegion ) aRegion.Intersect( *pRegion ); - ImplClipBoundaries( aRegion, sal_True, sal_True ); + ImplClipBoundaries( aRegion, true, true ); if ( nFlags & VALIDATE_NOCHILDREN ) { nFlags &= ~VALIDATE_CHILDREN; @@ -2991,16 +2991,16 @@ void Window::ImplScroll( const Rectangle& rRect, } Region aInvalidateRegion; - sal_Bool bScrollChildren = (nFlags & SCROLL_CHILDREN) != 0; - sal_Bool bErase = (nFlags & SCROLL_NOERASE) == 0; + bool bScrollChildren = (nFlags & SCROLL_CHILDREN) != 0; + bool bErase = (nFlags & SCROLL_NOERASE) == 0; if ( !mpWindowImpl->mpFirstChild ) - bScrollChildren = sal_False; + bScrollChildren = false; OutputDevice *pOutDev = GetOutDev(); // --- RTL --- check if this window requires special action - sal_Bool bReMirror = ( ImplIsAntiparallel() ); + bool bReMirror = ( ImplIsAntiparallel() ); Rectangle aRectMirror( rRect ); if( bReMirror ) @@ -3015,7 +3015,7 @@ void Window::ImplScroll( const Rectangle& rRect, if ( !(nFlags & SCROLL_NOINVALIDATE) ) { - ImplCalcOverlapRegion( aRectMirror, aInvalidateRegion, !bScrollChildren, sal_True, sal_False ); + ImplCalcOverlapRegion( aRectMirror, aInvalidateRegion, !bScrollChildren, true, false ); // --- RTL --- // if the scrolling on the device is performed in the opposite direction @@ -3025,7 +3025,7 @@ void Window::ImplScroll( const Rectangle& rRect, if ( !aInvalidateRegion.IsEmpty() ) { aInvalidateRegion.Move( bReMirror ? -nHorzScroll : nHorzScroll, nVertScroll ); - bErase = sal_True; + bErase = true; } if ( !(nFlags & SCROLL_NOWINDOWINVALIDATE) ) { @@ -3047,7 +3047,7 @@ void Window::ImplScroll( const Rectangle& rRect, aRegion.Exclude( aInvalidateRegion ); - ImplClipBoundaries( aRegion, sal_False, sal_True ); + ImplClipBoundaries( aRegion, false, true ); if ( !bScrollChildren ) { if ( nOrgFlags & SCROLL_NOCHILDREN ) @@ -3133,19 +3133,19 @@ void Window::ImplScroll( const Rectangle& rRect, // ----------------------------------------------------------------------- -void Window::ImplUpdateAll( sal_Bool bOverlapWindows ) +void Window::ImplUpdateAll( bool bOverlapWindows ) { if ( !mpWindowImpl->mbReallyVisible ) return; - sal_Bool bFlush = sal_False; + bool bFlush = false; if ( mpWindowImpl->mpFrameWindow->mpWindowImpl->mbPaintFrame ) { Point aPoint( 0, 0 ); Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); ImplInvalidateOverlapFrameRegion( aRegion ); if ( mpWindowImpl->mbFrame || (mpWindowImpl->mpBorderWindow && mpWindowImpl->mpBorderWindow->mpWindowImpl->mbFrame) ) - bFlush = sal_True; + bFlush = true; } // an update changes the OverlapWindow, such that for later paints @@ -3204,9 +3204,9 @@ void Window::ImplUpdateWindowPtr() // ----------------------------------------------------------------------- -void Window::ImplUpdateOverlapWindowPtr( sal_Bool bNewFrame ) +void Window::ImplUpdateOverlapWindowPtr( bool bNewFrame ) { - sal_Bool bVisible = IsVisible(); + bool bVisible = IsVisible(); Show( false ); ImplRemoveWindow( bNewFrame ); Window* pRealParent = mpWindowImpl->mpRealParent; @@ -3233,9 +3233,9 @@ void Window::ImplUpdateOverlapWindowPtr( sal_Bool bNewFrame ) // ----------------------------------------------------------------------- -sal_Bool Window::ImplUpdatePos() +bool Window::ImplUpdatePos() { - sal_Bool bSysChild = sal_False; + bool bSysChild = false; if ( ImplIsOverlapWindow() ) { @@ -3254,12 +3254,12 @@ sal_Bool Window::ImplUpdatePos() while ( pChild ) { if ( pChild->ImplUpdatePos() ) - bSysChild = sal_True; + bSysChild = true; pChild = pChild->mpWindowImpl->mpNext; } if ( mpWindowImpl->mpSysObj ) - bSysChild = sal_True; + bSysChild = true; return bSysChild; } @@ -3283,9 +3283,9 @@ void Window::ImplUpdateSysObjPos() void Window::ImplPosSizeWindow( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) { - sal_Bool bNewPos = sal_False; - sal_Bool bNewSize = sal_False; - sal_Bool bCopyBits = sal_False; + bool bNewPos = false; + bool bNewSize = false; + bool bCopyBits = false; long nOldOutOffX = mnOutOffX; long nOldOutOffY = mnOutOffY; long nOldOutWidth = mnOutWidth; @@ -3307,17 +3307,17 @@ void Window::ImplPosSizeWindow( long nX, long nY, if ( mnOutWidth && mnOutHeight && !mpWindowImpl->mbPaintTransparent && !mpWindowImpl->mbInitWinClipRegion && !mpWindowImpl->maWinClipRegion.IsEmpty() && !HasPaintEvent() ) - bCopyBits = sal_True; + bCopyBits = true; } - sal_Bool bnXRecycled = sal_False; // avoid duplicate mirroring in RTL case + bool bnXRecycled = false; // avoid duplicate mirroring in RTL case if ( nFlags & WINDOW_POSSIZE_WIDTH ) { if(!( nFlags & WINDOW_POSSIZE_X )) { nX = mpWindowImpl->mnX; nFlags |= WINDOW_POSSIZE_X; - bnXRecycled = sal_True; // we're using a mnX which was already mirrored in RTL case + bnXRecycled = true; // we're using a mnX which was already mirrored in RTL case } if ( nWidth < 0 ) @@ -3325,8 +3325,8 @@ void Window::ImplPosSizeWindow( long nX, long nY, if ( nWidth != mnOutWidth ) { mnOutWidth = nWidth; - bNewSize = sal_True; - bCopyBits = sal_False; + bNewSize = true; + bCopyBits = false; } } if ( nFlags & WINDOW_POSSIZE_HEIGHT ) @@ -3336,8 +3336,8 @@ void Window::ImplPosSizeWindow( long nX, long nY, if ( nHeight != mnOutHeight ) { mnOutHeight = nHeight; - bNewSize = sal_True; - bCopyBits = sal_False; + bNewSize = true; + bCopyBits = false; } } @@ -3388,12 +3388,12 @@ void Window::ImplPosSizeWindow( long nX, long nY, pOverlapRegion = new Region(); ImplCalcOverlapRegion( Rectangle( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ), - *pOverlapRegion, sal_False, sal_True, sal_True ); + *pOverlapRegion, false, true, true ); } mpWindowImpl->mnX = nX; mpWindowImpl->maPos.X() = nOrgX; mpWindowImpl->mnAbsScreenX = aPtDev.X(); // --- RTL --- (store real screen pos) - bNewPos = sal_True; + bNewPos = true; } } if ( nFlags & WINDOW_POSSIZE_Y ) @@ -3406,17 +3406,17 @@ void Window::ImplPosSizeWindow( long nX, long nY, pOverlapRegion = new Region(); ImplCalcOverlapRegion( Rectangle( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ), - *pOverlapRegion, sal_False, sal_True, sal_True ); + *pOverlapRegion, false, true, true ); } mpWindowImpl->mnY = nY; mpWindowImpl->maPos.Y() = nY; - bNewPos = sal_True; + bNewPos = true; } } if ( bNewPos || bNewSize ) { - sal_Bool bUpdateSysObjPos = sal_False; + bool bUpdateSysObjPos = false; if ( bNewPos ) bUpdateSysObjPos = ImplUpdatePos(); @@ -3469,7 +3469,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, mpWindowImpl->mbCallResize = true; } - sal_Bool bUpdateSysObjClip = sal_False; + bool bUpdateSysObjClip = false; if ( IsReallyVisible() ) { if ( bNewPos || bNewSize ) @@ -3480,7 +3480,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) ImplInvalidateAllOverlapBackgrounds(); // set Clip-Flag - bUpdateSysObjClip = !ImplSetClipFlag( sal_True ); + bUpdateSysObjClip = !ImplSetClipFlag( true ); } // invalidate window content ? @@ -3488,8 +3488,8 @@ void Window::ImplPosSizeWindow( long nX, long nY, { if ( bNewPos ) { - sal_Bool bInvalidate = sal_False; - sal_Bool bParentPaint = sal_True; + bool bInvalidate = false; + bool bParentPaint = true; if ( !ImplIsOverlapWindow() ) bParentPaint = mpWindowImpl->mpParent->IsPaintEnabled(); if ( bCopyBits && bParentPaint && !HasPaintEvent() ) @@ -3499,7 +3499,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, Size( mnOutWidth, mnOutHeight ) ) ); if ( mpWindowImpl->mbWinRegion ) aRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) ); - ImplClipBoundaries( aRegion, sal_False, sal_True ); + ImplClipBoundaries( aRegion, false, true ); if ( !pOverlapRegion->IsEmpty() ) { pOverlapRegion->Move( mnOutOffX-nOldOutOffX, mnOutOffY-nOldOutOffY ); @@ -3511,7 +3511,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, ImplMoveAllInvalidateRegions( Rectangle( Point( nOldOutOffX, nOldOutOffY ), Size( nOldOutWidth, nOldOutHeight ) ), mnOutOffX-nOldOutOffX, mnOutOffY-nOldOutOffY, - sal_True ); + true ); SalGraphics* pGraphics = ImplGetFrameGraphics(); if ( pGraphics ) { @@ -3526,10 +3526,10 @@ void Window::ImplPosSizeWindow( long nX, long nY, SAL_COPYAREA_WINDOWINVALIDATE, this ); } else - bInvalidate = sal_True; + bInvalidate = true; } else - bInvalidate = sal_True; + bInvalidate = true; if ( !bInvalidate ) { if ( !pOverlapRegion->IsEmpty() ) @@ -3537,10 +3537,10 @@ void Window::ImplPosSizeWindow( long nX, long nY, } } else - bInvalidate = sal_True; + bInvalidate = true; } else - bInvalidate = sal_True; + bInvalidate = true; if ( bInvalidate ) ImplInvalidateFrameRegion( NULL, INVALIDATE_CHILDREN ); } @@ -3552,7 +3552,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, aRegion.Exclude( *pOldRegion ); if ( mpWindowImpl->mbWinRegion ) aRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) ); - ImplClipBoundaries( aRegion, sal_False, sal_True ); + ImplClipBoundaries( aRegion, false, true ); if ( !aRegion.IsEmpty() ) ImplInvalidateFrameRegion( &aRegion, INVALIDATE_CHILDREN ); } @@ -3565,7 +3565,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, Region aRegion( *pOldRegion ); if ( !mpWindowImpl->mbPaintTransparent ) ImplExcludeWindowRegion( aRegion ); - ImplClipBoundaries( aRegion, sal_False, sal_True ); + ImplClipBoundaries( aRegion, false, true ); if ( !aRegion.IsEmpty() && !mpWindowImpl->mpBorderWindow ) ImplInvalidateParentFrameRegion( aRegion ); } @@ -3673,7 +3673,7 @@ void Window::ImplToTop( sal_uInt16 nFlags ) mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpLastOverlap = mpWindowImpl->mpPrev; // take AlwaysOnTop into account - sal_Bool bOnTop = IsAlwaysOnTopEnabled(); + bool bOnTop = IsAlwaysOnTopEnabled(); Window* pNextWin = mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpFirstOverlap; if ( !bOnTop ) { @@ -3781,7 +3781,7 @@ void Window::ImplStartToTop( sal_uInt16 nFlags ) // ----------------------------------------------------------------------- -void Window::ImplFocusToTop( sal_uInt16 nFlags, sal_Bool bReallyVisible ) +void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible ) { // do we need to fetch the focus? if ( !(nFlags & TOTOP_NOGRABFOCUS) ) @@ -3800,7 +3800,7 @@ void Window::ImplFocusToTop( sal_uInt16 nFlags, sal_Bool bReallyVisible ) pFocusWindow = pFocusWindow->ImplGetParent(); } if ( (pFocusWindow->mpWindowImpl->mnActivateMode & ACTIVATE_MODE_GRABFOCUS) && - !pFocusWindow->HasChildPathFocus( sal_True ) ) + !pFocusWindow->HasChildPathFocus( true ) ) pFocusWindow->GrabFocus(); } @@ -3844,7 +3844,7 @@ void Window::ImplHideAllOverlaps() // ----------------------------------------------------------------------- -void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, sal_Bool bModChanged ) +void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged ) { if ( mpWindowImpl->mpFrameData->mbMouseIn && mpWindowImpl->mpFrameWindow->mpWindowImpl->mbReallyVisible ) { @@ -3853,15 +3853,15 @@ void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, sal_Bool bModChanged ) long nY = mpWindowImpl->mpFrameData->mnLastMouseY; sal_uInt16 nCode = nMouseCode; sal_uInt16 nMode = mpWindowImpl->mpFrameData->mnMouseMode; - sal_Bool bLeave; + bool bLeave; // check for MouseLeave if ( ((nX < 0) || (nY < 0) || (nX >= mpWindowImpl->mpFrameWindow->mnOutWidth) || (nY >= mpWindowImpl->mpFrameWindow->mnOutHeight)) && !ImplGetSVData()->maWinData.mpCaptureWin ) - bLeave = sal_True; + bLeave = true; else - bLeave = sal_False; + bLeave = false; nMode |= MOUSE_SYNTHETIC; if ( bModChanged ) nMode |= MOUSE_MODIFIERCHANGED; @@ -4051,13 +4051,13 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) // which is done using ToTop ImplSVData* pSVData = ImplGetSVData(); - sal_Bool bAsyncFocusWaiting = sal_False; + bool bAsyncFocusWaiting = false; Window *pFrame = pSVData->maWinData.mpFirstFrame; while( pFrame ) { if( pFrame != mpWindowImpl->mpFrameWindow && pFrame->mpWindowImpl->mpFrameData->mnFocusId ) { - bAsyncFocusWaiting = sal_True; + bAsyncFocusWaiting = true; break; } pFrame = pFrame->mpWindowImpl->mpFrameData->mpNextFrame; @@ -4065,7 +4065,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) bool bHasFocus = IsWindowFocused(*mpWindowImpl); - sal_Bool bMustNotGrabFocus = sal_False; + bool bMustNotGrabFocus = false; // #100242#, check parent hierarchy if some floater prohibits grab focus Window *pParent = this; @@ -4075,7 +4075,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) // otherwise we cannot set the focus in a floating toolbox if( ( (pParent->mpWindowImpl->mbFloatWin && ((FloatingWindow*)pParent)->GrabsFocus()) || ( pParent->GetStyle() & WB_SYSTEMFLOATWIN ) ) && !( pParent->GetStyle() & WB_MOVEABLE ) ) { - bMustNotGrabFocus = sal_True; + bMustNotGrabFocus = true; break; } pParent = pParent->mpWindowImpl->mpParent; @@ -4397,7 +4397,7 @@ Window::~Window() } } - UnoWrapperBase* pWrapper = Application::GetUnoWrapper( sal_False ); + UnoWrapperBase* pWrapper = Application::GetUnoWrapper( false ); if ( pWrapper ) pWrapper->WindowDestroyed( this ); @@ -4436,7 +4436,7 @@ Window::~Window() if ( true ) // always perform these tests in non-pro versions { OStringBuffer aErrorStr; - sal_Bool bError = sal_False; + bool bError = false; Window* pTempWin; if (mpWindowImpl->mpFrameData != 0) { @@ -4445,7 +4445,7 @@ Window::~Window() { if ( ImplIsRealParentPath( pTempWin ) ) { - bError = sal_True; + bError = true; aErrorStr.append(lcl_createWindowInfo(*pTempWin)); } pTempWin = pTempWin->mpWindowImpl->mpNextOverlap; @@ -4465,13 +4465,13 @@ Window::~Window() } } - bError = sal_False; + bError = false; pTempWin = pSVData->maWinData.mpFirstFrame; while ( pTempWin ) { if ( ImplIsRealParentPath( pTempWin ) ) { - bError = sal_True; + bError = true; aErrorStr.append(lcl_createWindowInfo(*pTempWin)); } pTempWin = pTempWin->mpWindowImpl->mpFrameData->mpNextFrame; @@ -4589,11 +4589,11 @@ Window::~Window() } // check if the focus window is our child - sal_Bool bHasFocussedChild = sal_False; + bool bHasFocussedChild = false; if( pSVData->maWinData.mpFocusWin && ImplIsRealParentPath( pSVData->maWinData.mpFocusWin ) ) { // #122232#, this must not happen and is an application bug ! but we try some cleanup to hopefully avoid crashes, see below - bHasFocussedChild = sal_True; + bHasFocussedChild = true; #if OSL_DEBUG_LEVEL > 0 OStringBuffer aTempStr("Window ("); aTempStr.append(OUStringToOString(GetText(), @@ -4684,18 +4684,18 @@ Window::~Window() ImplDelData* pDelData = mpWindowImpl->mpFirstDel; while ( pDelData ) { - pDelData->mbDel = sal_True; + pDelData->mbDel = true; pDelData->mpWindow = NULL; // #112873# pDel is not associated with a Window anymore pDelData = pDelData->mpNext; } // remove window from the lists - ImplRemoveWindow( sal_True ); + ImplRemoveWindow( true ); // de-register as "top window child" at our parent, if necessary if ( mpWindowImpl->mbFrame ) { - sal_Bool bIsTopWindow = mpWindowImpl->mpWinData && ( mpWindowImpl->mpWinData->mnIsTopWindow == 1 ); + bool bIsTopWindow = mpWindowImpl->mpWinData && ( mpWindowImpl->mpWinData->mnIsTopWindow == 1 ); if ( mpWindowImpl->mpRealParent && bIsTopWindow ) { ImplWinData* pParentWinData = mpWindowImpl->mpRealParent->ImplGetWinData(); @@ -5100,11 +5100,11 @@ bool Window::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_GETFOCUS ) { - sal_Bool bCompoundFocusChanged = sal_False; + bool bCompoundFocusChanged = false; if ( mpWindowImpl->mbCompoundControl && !mpWindowImpl->mbCompoundControlHasFocus && HasChildPathFocus() ) { mpWindowImpl->mbCompoundControlHasFocus = true; - bCompoundFocusChanged = sal_True; + bCompoundFocusChanged = true; } if ( bCompoundFocusChanged || ( rNEvt.GetWindow() == this ) ) @@ -5112,11 +5112,11 @@ bool Window::PreNotify( NotifyEvent& rNEvt ) } else if( rNEvt.GetType() == EVENT_LOSEFOCUS ) { - sal_Bool bCompoundFocusChanged = sal_False; + bool bCompoundFocusChanged = false; if ( mpWindowImpl->mbCompoundControl && mpWindowImpl->mbCompoundControlHasFocus && !HasChildPathFocus() ) { mpWindowImpl->mbCompoundControlHasFocus = false ; - bCompoundFocusChanged = sal_True; + bCompoundFocusChanged = true; } if ( bCompoundFocusChanged || ( rNEvt.GetWindow() == this ) ) @@ -5145,7 +5145,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) { const MouseEvent* pMEvt = rNEvt.GetMouseEvent(); - sal_Bool bHit = pWrapper->GetDragArea().IsInside( pMEvt->GetPosPixel() ); + bool bHit = pWrapper->GetDragArea().IsInside( pMEvt->GetPosPixel() ); if ( pMEvt->IsLeft() ) { if ( pMEvt->IsMod1() && (pMEvt->GetClicks() == 2) ) @@ -5165,7 +5165,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) else if ( rNEvt.GetType() == EVENT_MOUSEMOVE ) { const MouseEvent* pMEvt = rNEvt.GetMouseEvent(); - sal_Bool bHit = pWrapper->GetDragArea().IsInside( pMEvt->GetPosPixel() ); + bool bHit = pWrapper->GetDragArea().IsInside( pMEvt->GetPosPixel() ); if ( pMEvt->IsLeft() ) { // check if a single click initiated this sequence ( ImplStartDockingEnabled() ) @@ -5336,7 +5336,7 @@ sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller ) // ----------------------------------------------------------------------- -sal_Bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller ) +bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller ) { ImplSVEvent* pSVEvent = new ImplSVEvent; @@ -5344,17 +5344,17 @@ sal_Bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pC pSVEvent->mpData = pCaller; pSVEvent->mpLink = new Link( rLink ); pSVEvent->mpWindow = this; - pSVEvent->mbCall = sal_True; + pSVEvent->mbCall = true; ImplAddDel( &(pSVEvent->maDelData) ); rEventId = (sal_uLong)pSVEvent; if ( mpWindowImpl->mpFrame->PostEvent( pSVEvent ) ) - return sal_True; + return true; else { rEventId = 0; ImplRemoveDel( &(pSVEvent->maDelData) ); delete pSVEvent; - return sal_False; + return false; } } @@ -5376,28 +5376,28 @@ void Window::RemoveUserEvent( sal_uLong nUserEvent ) pSVEvent->mpWindow = NULL; } - pSVEvent->mbCall = sal_False; + pSVEvent->mbCall = false; } // ----------------------------------------------------------------------- -sal_Bool Window::IsLocked( sal_Bool bChildren ) const +bool Window::IsLocked( bool bChildren ) const { if ( mpWindowImpl->mnLockCount != 0 ) - return sal_True; + return true; if ( bChildren || mpWindowImpl->mbChildNotify ) { Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { - if ( pChild->IsLocked( sal_True ) ) - return sal_True; + if ( pChild->IsLocked( true ) ) + return true; pChild = pChild->mpWindowImpl->mpNext; } } - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -5540,7 +5540,7 @@ long Window::CalcTitleWidth() const // ----------------------------------------------------------------------- -void Window::EnableClipSiblings( sal_Bool bClipSiblings ) +void Window::EnableClipSiblings( bool bClipSiblings ) { if ( mpWindowImpl->mpBorderWindow ) @@ -5551,7 +5551,7 @@ void Window::EnableClipSiblings( sal_Bool bClipSiblings ) // ----------------------------------------------------------------------- -void Window::SetMouseTransparent( sal_Bool bTransparent ) +void Window::SetMouseTransparent( bool bTransparent ) { if ( mpWindowImpl->mpBorderWindow ) @@ -5565,7 +5565,7 @@ void Window::SetMouseTransparent( sal_Bool bTransparent ) // ----------------------------------------------------------------------- -void Window::SetPaintTransparent( sal_Bool bTransparent ) +void Window::SetPaintTransparent( bool bTransparent ) { // transparency is not useful for frames as the background would have to be provided by a different frame @@ -5643,7 +5643,7 @@ long Window::GetCursorExtTextInputWidth() const // ----------------------------------------------------------------------- -void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, sal_Bool bVertical ) { +void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, bool bVertical ) { ImplWinData* pWinData = ImplGetWinData(); delete[] pWinData->mpCompositionCharRects; @@ -5701,15 +5701,15 @@ void Window::SetSettings( const AllSettings& rSettings, sal_Bool bChild ) // ----------------------------------------------------------------------- -void Window::UpdateSettings( const AllSettings& rSettings, sal_Bool bChild ) +void Window::UpdateSettings( const AllSettings& rSettings, bool bChild ) { if ( mpWindowImpl->mpBorderWindow ) { - mpWindowImpl->mpBorderWindow->UpdateSettings( rSettings, sal_False ); + mpWindowImpl->mpBorderWindow->UpdateSettings( rSettings, false ); if ( (mpWindowImpl->mpBorderWindow->GetType() == WINDOW_BORDERWINDOW) && ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow ) - ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow->UpdateSettings( rSettings, sal_True ); + ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow->UpdateSettings( rSettings, true ); } AllSettings aOldSettings(*mxSettings); @@ -5970,7 +5970,7 @@ const Region& Window::GetWindowRegionPixel() const // ----------------------------------------------------------------------- -sal_Bool Window::IsWindowRegionPixel() const +bool Window::IsWindowRegionPixel() const { if ( mpWindowImpl->mpBorderWindow ) @@ -6091,13 +6091,13 @@ void Window::SetParent( Window* pNewParent ) // check if the taskpanelist would change and move the window pointer accordingly SystemWindow *pSysWin = ImplGetLastSystemWindow(this); SystemWindow *pNewSysWin = NULL; - sal_Bool bChangeTaskPaneList = sal_False; + bool bChangeTaskPaneList = false; if( pSysWin && pSysWin->ImplIsInTaskPaneList( this ) ) { pNewSysWin = ImplGetLastSystemWindow( pNewParent ); if( pNewSysWin && pNewSysWin != pSysWin ) { - bChangeTaskPaneList = sal_True; + bChangeTaskPaneList = true; pSysWin->GetTaskPaneList()->RemoveWindow( this ); } } @@ -6126,7 +6126,7 @@ void Window::SetParent( Window* pNewParent ) if ( mpWindowImpl->mbFrame ) mpWindowImpl->mpFrame->SetParent( pNewParent->mpWindowImpl->mpFrame ); - sal_Bool bVisible = IsVisible(); + bool bVisible = IsVisible(); Show( false, SHOW_NOFOCUSCHANGE ); // check if the overlap window changes @@ -6144,9 +6144,9 @@ void Window::SetParent( Window* pNewParent ) } // convert windows in the hierarchy - sal_Bool bFocusOverlapWin = HasChildPathFocus( sal_True ); - sal_Bool bFocusWin = HasChildPathFocus(); - sal_Bool bNewFrame = pNewParent->mpWindowImpl->mpFrameWindow != mpWindowImpl->mpFrameWindow; + bool bFocusOverlapWin = HasChildPathFocus( true ); + bool bFocusWin = HasChildPathFocus(); + bool bNewFrame = pNewParent->mpWindowImpl->mpFrameWindow != mpWindowImpl->mpFrameWindow; if ( bNewFrame ) { if ( mpWindowImpl->mpFrameData->mpFocusWin ) @@ -6207,7 +6207,7 @@ void Window::SetParent( Window* pNewParent ) } // update activate-status at next overlap window - if ( HasChildPathFocus( sal_True ) ) + if ( HasChildPathFocus( true ) ) ImplCallFocusChangeActivate( pNewOverlapWindow, pOldOverlapWindow ); } @@ -6256,7 +6256,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) ImplDelData aDogTag( this ); - sal_Bool bRealVisibilityChanged = sal_False; + bool bRealVisibilityChanged = false; mpWindowImpl->mbVisible = bVisible; if ( !bVisible ) @@ -6284,12 +6284,12 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) if ( mpWindowImpl->mbReallyVisible ) { Region aInvRegion; - sal_Bool bSaveBack = sal_False; + bool bSaveBack = false; if ( ImplIsOverlapWindow() && !mpWindowImpl->mbFrame ) { if ( ImplRestoreOverlapBackground( aInvRegion ) ) - bSaveBack = sal_True; + bSaveBack = true; } if ( !bSaveBack ) @@ -6383,7 +6383,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) if ( ImplIsOverlapWindow() && !(nFlags & SHOW_NOACTIVATE) ) { ImplStartToTop(( nFlags & SHOW_FOREGROUNDTASK ) ? TOTOP_FOREGROUNDTASK : 0 ); - ImplFocusToTop( 0, sal_False ); + ImplFocusToTop( 0, false ); } // save background @@ -6428,7 +6428,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) mpWindowImpl->mbSuppressAccessibilityEvents = false; mpWindowImpl->mbPaintFrame = true; - sal_Bool bNoActivate = (nFlags & (SHOW_NOACTIVATE|SHOW_NOFOCUSCHANGE)) ? sal_True : sal_False; + bool bNoActivate = (nFlags & (SHOW_NOACTIVATE|SHOW_NOFOCUSCHANGE)) ? sal_True : sal_False; mpWindowImpl->mpFrame->Show( sal_True, bNoActivate ); if( aDogTag.IsDead() ) return; @@ -6617,16 +6617,16 @@ bool Window::IsCallHandlersOnInputDisabled() const // ----------------------------------------------------------------------- -void Window::EnableInput( bool bEnable, sal_Bool bChild ) +void Window::EnableInput( bool bEnable, bool bChild ) { - sal_Bool bNotify = (bEnable != mpWindowImpl->mbInputDisabled); + bool bNotify = (bEnable != mpWindowImpl->mbInputDisabled); if ( mpWindowImpl->mpBorderWindow ) { - mpWindowImpl->mpBorderWindow->EnableInput( bEnable, sal_False ); + mpWindowImpl->mpBorderWindow->EnableInput( bEnable, false ); if ( (mpWindowImpl->mpBorderWindow->GetType() == WINDOW_BORDERWINDOW) && ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow ) - ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow->EnableInput( bEnable, sal_True ); + ((ImplBorderWindow*)mpWindowImpl->mpBorderWindow)->mpMenuBarWindow->EnableInput( bEnable, true ); } if ( (! bEnable && mpWindowImpl->meAlwaysInputMode != AlwaysInputEnabled) || @@ -6682,7 +6682,7 @@ void Window::EnableInput( bool bEnable, sal_Bool bChild ) // ----------------------------------------------------------------------- -void Window::EnableInput( bool bEnable, sal_Bool bChild, sal_Bool bSysWin, +void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin, const Window* pExcludeWindow ) { @@ -6697,11 +6697,11 @@ void Window::EnableInput( bool bEnable, sal_Bool bChild, sal_Bool bSysWin, while ( pSysWin ) { // Is Window in the path from this window - if ( ImplGetFirstOverlapWindow()->ImplIsWindowOrChild( pSysWin, sal_True ) ) + if ( ImplGetFirstOverlapWindow()->ImplIsWindowOrChild( pSysWin, true ) ) { // Is Window not in the exclude window path or not the // exclude window, than change the status - if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( pSysWin, sal_True ) ) + if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( pSysWin, true ) ) pSysWin->EnableInput( bEnable, bChild ); } pSysWin = pSysWin->mpWindowImpl->mpNextOverlap; @@ -6714,11 +6714,11 @@ void Window::EnableInput( bool bEnable, sal_Bool bChild, sal_Bool bSysWin, if( pFrameWin->ImplIsFloatingWindow() ) { // Is Window in the path from this window - if ( ImplGetFirstOverlapWindow()->ImplIsWindowOrChild( pFrameWin, sal_True ) ) + if ( ImplGetFirstOverlapWindow()->ImplIsWindowOrChild( pFrameWin, true ) ) { // Is Window not in the exclude window path or not the // exclude window, than change the status - if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( pFrameWin, sal_True ) ) + if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( pFrameWin, true ) ) pFrameWin->EnableInput( bEnable, bChild ); } } @@ -6733,11 +6733,11 @@ void Window::EnableInput( bool bEnable, sal_Bool bChild, sal_Bool bSysWin, while( p != rList.end() ) { // Is Window in the path from this window - if ( ImplGetFirstOverlapWindow()->ImplIsWindowOrChild( (*p), sal_True ) ) + if ( ImplGetFirstOverlapWindow()->ImplIsWindowOrChild( (*p), true ) ) { // Is Window not in the exclude window path or not the // exclude window, than change the status - if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( (*p), sal_True ) ) + if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( (*p), true ) ) (*p)->EnableInput( bEnable, bChild ); } ++p; @@ -6748,18 +6748,18 @@ void Window::EnableInput( bool bEnable, sal_Bool bChild, sal_Bool bSysWin, // ----------------------------------------------------------------------- -void Window::AlwaysEnableInput( sal_Bool bAlways, sal_Bool bChild ) +void Window::AlwaysEnableInput( bool bAlways, bool bChild ) { if ( mpWindowImpl->mpBorderWindow ) - mpWindowImpl->mpBorderWindow->AlwaysEnableInput( bAlways, sal_False ); + mpWindowImpl->mpBorderWindow->AlwaysEnableInput( bAlways, false ); if( bAlways && mpWindowImpl->meAlwaysInputMode != AlwaysInputEnabled ) { mpWindowImpl->meAlwaysInputMode = AlwaysInputEnabled; if ( bAlways ) - EnableInput( true, sal_False ); + EnableInput( true, false ); } else if( ! bAlways && mpWindowImpl->meAlwaysInputMode == AlwaysInputEnabled ) { @@ -6779,18 +6779,18 @@ void Window::AlwaysEnableInput( sal_Bool bAlways, sal_Bool bChild ) // ----------------------------------------------------------------------- -void Window::AlwaysDisableInput( sal_Bool bAlways, sal_Bool bChild ) +void Window::AlwaysDisableInput( bool bAlways, bool bChild ) { if ( mpWindowImpl->mpBorderWindow ) - mpWindowImpl->mpBorderWindow->AlwaysDisableInput( bAlways, sal_False ); + mpWindowImpl->mpBorderWindow->AlwaysDisableInput( bAlways, false ); if( bAlways && mpWindowImpl->meAlwaysInputMode != AlwaysInputDisabled ) { mpWindowImpl->meAlwaysInputMode = AlwaysInputDisabled; if ( bAlways ) - EnableInput( false, sal_False ); + EnableInput( false, false ); } else if( ! bAlways && mpWindowImpl->meAlwaysInputMode == AlwaysInputDisabled ) { @@ -6824,7 +6824,7 @@ void Window::SetActivateMode( sal_uInt16 nMode ) if ( mpWindowImpl->mnActivateMode ) { if ( (mpWindowImpl->mbActive || (GetType() == WINDOW_BORDERWINDOW)) && - !HasChildPathFocus( sal_True ) ) + !HasChildPathFocus( true ) ) { mpWindowImpl->mbActive = false; Deactivate(); @@ -6969,7 +6969,7 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) if ( mpWindowImpl->mbInitWinClipRegion || !mpWindowImpl->maWinClipRegion.IsEmpty() ) { - sal_Bool bInitWinClipRegion = mpWindowImpl->mbInitWinClipRegion; + bool bInitWinClipRegion = mpWindowImpl->mbInitWinClipRegion; ImplSetClipFlag(); // When ClipRegion was not initialised, assume @@ -7027,7 +7027,7 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) // ----------------------------------------------------------------------- -void Window::EnableAlwaysOnTop( sal_Bool bEnable ) +void Window::EnableAlwaysOnTop( bool bEnable ) { mpWindowImpl->mbAlwaysOnTop = bEnable; @@ -7292,18 +7292,18 @@ Rectangle Window::ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle &rR Rectangle Window::GetWindowExtentsRelative( Window *pRelativeWindow ) const { // with decoration - return ImplGetWindowExtentsRelative( pRelativeWindow, sal_False ); + return ImplGetWindowExtentsRelative( pRelativeWindow, false ); } Rectangle Window::GetClientWindowExtentsRelative( Window *pRelativeWindow ) const { // without decoration - return ImplGetWindowExtentsRelative( pRelativeWindow, sal_True ); + return ImplGetWindowExtentsRelative( pRelativeWindow, true ); } // ----------------------------------------------------------------------- -Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, sal_Bool bClientOnly ) const +Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bClientOnly ) const { SalFrameGeometry g = mpWindowImpl->mpFrame->GetGeometry(); // make sure we use the extent of our border window, @@ -7414,17 +7414,17 @@ void Window::Validate( sal_uInt16 nFlags ) // ----------------------------------------------------------------------- -sal_Bool Window::HasPaintEvent() const +bool Window::HasPaintEvent() const { if ( !mpWindowImpl->mbReallyVisible ) - return sal_False; + return false; if ( mpWindowImpl->mpFrameWindow->mpWindowImpl->mbPaintFrame ) - return sal_True; + return true; if ( mpWindowImpl->mnPaintFlags & IMPL_PAINT_PAINT ) - return sal_True; + return true; if ( !ImplIsOverlapWindow() ) { @@ -7433,12 +7433,12 @@ sal_Bool Window::HasPaintEvent() const { pTempWindow = pTempWindow->ImplGetParent(); if ( pTempWindow->mpWindowImpl->mnPaintFlags & (IMPL_PAINT_PAINTCHILDREN | IMPL_PAINT_PAINTALLCHILDREN) ) - return sal_True; + return true; } while ( !pTempWindow->ImplIsOverlapWindow() ); } - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -7455,14 +7455,14 @@ void Window::Update() if ( !mpWindowImpl->mbReallyVisible ) return; - sal_Bool bFlush = sal_False; + bool bFlush = false; if ( mpWindowImpl->mpFrameWindow->mpWindowImpl->mbPaintFrame ) { Point aPoint( 0, 0 ); Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); ImplInvalidateOverlapFrameRegion( aRegion ); if ( mpWindowImpl->mbFrame || (mpWindowImpl->mpBorderWindow && mpWindowImpl->mpBorderWindow->mpWindowImpl->mbFrame) ) - bFlush = sal_True; + bFlush = true; } // First we should skip all windows which are Paint-Transparent @@ -7503,7 +7503,7 @@ void Window::Update() } pUpdateWindow->ImplCallPaint( NULL, pUpdateWindow->mpWindowImpl->mnPaintFlags ); - bFlush = sal_True; + bFlush = true; } if ( bFlush ) @@ -7529,7 +7529,7 @@ void Window::Sync() // ----------------------------------------------------------------------- -void Window::SetUpdateMode( sal_Bool bUpdate ) +void Window::SetUpdateMode( bool bUpdate ) { mpWindowImpl->mbNoUpdate = !bUpdate; @@ -7546,7 +7546,7 @@ void Window::GrabFocus() // ----------------------------------------------------------------------- -sal_Bool Window::HasFocus() const +bool Window::HasFocus() const { // #107575# the first floating window always has the keyboard focus, see also winproc.cxx: ImplGetKeyInputWindow() @@ -7578,7 +7578,7 @@ void Window::SetFakeFocus( bool bFocus ) // ----------------------------------------------------------------------- -sal_Bool Window::HasChildPathFocus( sal_Bool bSystemWindow ) const +bool Window::HasChildPathFocus( bool bSystemWindow ) const { // #107575#, the first floating window always has the keyboard focus, see also winproc.cxx: ImplGetKeyInputWindow() @@ -7593,7 +7593,7 @@ sal_Bool Window::HasChildPathFocus( sal_Bool bSystemWindow ) const Window* pFocusWin = ImplGetSVData()->maWinData.mpFocusWin; if ( pFocusWin ) return ImplIsWindowOrChild( pFocusWin, bSystemWindow ); - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -7637,7 +7637,7 @@ void Window::ReleaseMouse() // ----------------------------------------------------------------------- -sal_Bool Window::IsMouseCaptured() const +bool Window::IsMouseCaptured() const { return (this == ImplGetSVData()->maWinData.mpCaptureWin); @@ -7728,7 +7728,7 @@ Point Window::GetLastPointerPosPixel() // ----------------------------------------------------------------------- -void Window::ShowPointer( sal_Bool bVisible ) +void Window::ShowPointer( bool bVisible ) { if ( mpWindowImpl->mbNoPtrVisible != !bVisible ) @@ -7767,7 +7767,7 @@ Window::PointerState Window::GetPointerState() // ----------------------------------------------------------------------- -sal_Bool Window::IsMouseOver() +bool Window::IsMouseOver() { return ImplGetWinData()->mbMouseOver; } @@ -8069,7 +8069,7 @@ Window* Window::GetWindow( sal_uInt16 nType ) const // ----------------------------------------------------------------------- -sal_Bool Window::IsChild( const Window* pWindow, sal_Bool bSystemWindow ) const +bool Window::IsChild( const Window* pWindow, bool bSystemWindow ) const { do @@ -8080,20 +8080,20 @@ sal_Bool Window::IsChild( const Window* pWindow, sal_Bool bSystemWindow ) const pWindow = pWindow->ImplGetParent(); if ( pWindow == this ) - return sal_True; + return true; } while ( pWindow ); - return sal_False; + return false; } // ----------------------------------------------------------------------- -sal_Bool Window::IsWindowOrChild( const Window* pWindow, sal_Bool bSystemWindow ) const +bool Window::IsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const { if ( this == pWindow ) - return sal_True; + return true; return ImplIsChild( pWindow, bSystemWindow ); } @@ -8265,7 +8265,7 @@ uno::Reference< XDropTarget > Window::GetDropTarget() uno::Reference< XDragGestureListener > (mpWindowImpl->mpFrameData->mxDropTargetListener, UNO_QUERY)); } else - mpWindowImpl->mpFrameData->mbInternalDragGestureRecognizer = sal_True; + mpWindowImpl->mpFrameData->mbInternalDragGestureRecognizer = true; } catch (const RuntimeException&) @@ -8438,7 +8438,7 @@ uno::Reference< XClipboard > Window::GetPrimarySelection() // Accessibility // ----------------------------------------------------------------------- -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::GetAccessible( sal_Bool bCreate ) +::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::GetAccessible( bool bCreate ) { // do not optimize hierarchy for the top level border win (ie, when there is no parent) /* // do not optimize accessible hierarchy at all to better reflect real VCL hierarchy @@ -8468,28 +8468,28 @@ void Window::SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star:: } // skip all border windows that are no top level frames -sal_Bool Window::ImplIsAccessibleCandidate() const +bool Window::ImplIsAccessibleCandidate() const { if( !mpWindowImpl->mbBorderWin ) - return sal_True; + return true; else // #101741 do not check for WB_CLOSEABLE because undecorated floaters (like menus!) are closeable if( mpWindowImpl->mbFrame && mpWindowImpl->mnStyle & (WB_MOVEABLE | WB_SIZEABLE) ) - return sal_True; + return true; else - return sal_False; + return false; } -sal_Bool Window::ImplIsAccessibleNativeFrame() const +bool Window::ImplIsAccessibleNativeFrame() const { if( mpWindowImpl->mbFrame ) // #101741 do not check for WB_CLOSEABLE because undecorated floaters (like menus!) are closeable if( (mpWindowImpl->mnStyle & (WB_MOVEABLE | WB_SIZEABLE)) ) - return sal_True; + return true; else - return sal_False; + return false; else - return sal_False; + return false; } sal_uInt16 Window::ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirstWindowType ) const @@ -8507,7 +8507,7 @@ sal_uInt16 Window::ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirst return nChildren; } -Window* Window::ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, sal_Bool bTopLevel ) const +Window* Window::ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, bool bTopLevel ) const { if( bTopLevel ) @@ -8519,7 +8519,7 @@ Window* Window::ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& Window *pTmpChild = pChild; if( !pChild->ImplIsAccessibleCandidate() ) - pTmpChild = pChild->ImplGetAccessibleCandidateChild( nChild, rChildCount, WINDOW_FIRSTCHILD, sal_False ); + pTmpChild = pChild->ImplGetAccessibleCandidateChild( nChild, rChildCount, WINDOW_FIRSTCHILD, false ); if ( nChild == rChildCount ) return pTmpChild; @@ -9018,7 +9018,7 @@ Window* Window::GetAccessibleRelationLabeledBy() const return NULL; } -sal_Bool Window::IsAccessibilityEventsSuppressed( sal_Bool bTraverseParentPath ) +bool Window::IsAccessibilityEventsSuppressed( bool bTraverseParentPath ) { if( !bTraverseParentPath ) return mpWindowImpl->mbSuppressAccessibilityEvents; @@ -9028,15 +9028,15 @@ sal_Bool Window::IsAccessibilityEventsSuppressed( sal_Bool bTraverseParentPath ) while ( pParent && pParent->mpWindowImpl) { if( pParent->mpWindowImpl->mbSuppressAccessibilityEvents ) - return sal_True; + return true; else pParent = pParent->mpWindowImpl->mpParent; // do not use GetParent() to find borderwindows that are frames } - return sal_False; + return false; } } -void Window::SetAccessibilityEventsSuppressed(sal_Bool bSuppressed) +void Window::SetAccessibilityEventsSuppressed(bool bSuppressed) { mpWindowImpl->mbSuppressAccessibilityEvents = bSuppressed; } @@ -9057,21 +9057,21 @@ void Window::RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle& // ----------------------------------------------------------------------- -void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, sal_Bool bChecked, sal_Bool bDrawBorder, sal_Bool bDrawExtBorderOnly ) +void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly ) { DrawSelectionBackground( rRect, highlight, bChecked, bDrawBorder, bDrawExtBorderOnly, 0, NULL, NULL ); } -void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, sal_Bool bChecked, sal_Bool bDrawBorder, sal_Bool bDrawExtBorderOnly, Color* pSelectionTextColor ) +void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly, Color* pSelectionTextColor ) { DrawSelectionBackground( rRect, highlight, bChecked, bDrawBorder, bDrawExtBorderOnly, 0, pSelectionTextColor, NULL ); } void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, - sal_Bool bChecked, - sal_Bool bDrawBorder, - sal_Bool bDrawExtBorderOnly, + bool bChecked, + bool bDrawBorder, + bool bDrawExtBorderOnly, long nCornerRadius, Color* pSelectionTextColor, Color* pPaintColor @@ -9089,8 +9089,8 @@ void Window::DrawSelectionBackground( const Rectangle& rRect, Color aSelectionBorderCol( pPaintColor ? *pPaintColor : rStyles.GetHighlightColor() ); Color aSelectionFillCol( aSelectionBorderCol ); - sal_Bool bDark = rStyles.GetFaceColor().IsDark(); - sal_Bool bBright = ( rStyles.GetFaceColor() == Color( COL_WHITE ) ); + bool bDark = rStyles.GetFaceColor().IsDark(); + bool bBright = ( rStyles.GetFaceColor() == Color( COL_WHITE ) ); int c1 = aSelectionBorderCol.GetLuminance(); int c2 = GetDisplayBackground().GetColor().GetLuminance(); @@ -9236,7 +9236,7 @@ Window* Window::GetPreferredKeyInputWindow() } -sal_Bool Window::IsScrollable() const +bool Window::IsScrollable() const { // check for scrollbars Window *pChild = mpWindowImpl->mpFirstChild; @@ -9250,14 +9250,14 @@ sal_Bool Window::IsScrollable() const return false; } -sal_Bool Window::IsTopWindow() const +bool Window::IsTopWindow() const { if ( mpWindowImpl->mbInDtor ) - return sal_False; + return false; // topwindows must be frames or they must have a borderwindow which is a frame if( !mpWindowImpl->mbFrame && (!mpWindowImpl->mpBorderWindow || (mpWindowImpl->mpBorderWindow && !mpWindowImpl->mpBorderWindow->mpWindowImpl->mbFrame) ) ) - return sal_False; + return false; ImplGetWinData(); if( mpWindowImpl->mpWinData->mnIsTopWindow == (sal_uInt16)~0) // still uninitialized @@ -9276,7 +9276,7 @@ void Window::ImplMirrorFramePos( Point &pt ) const } // frame based modal counter (dialogs are not modal to the whole application anymore) -sal_Bool Window::IsInModalMode() const +bool Window::IsInModalMode() const { return (mpWindowImpl->mpFrameWindow->mpWindowImpl->mpFrameData->mnModalMode != 0); } @@ -9318,12 +9318,12 @@ void Window::ImplDecModalCount() } } -void Window::ImplIsInTaskPaneList( sal_Bool mbIsInTaskList ) +void Window::ImplIsInTaskPaneList( bool mbIsInTaskList ) { mpWindowImpl->mbIsInTaskPaneList = mbIsInTaskList; } -void Window::ImplNotifyIconifiedState( sal_Bool bIconified ) +void Window::ImplNotifyIconifiedState( bool bIconified ) { mpWindowImpl->mpFrameWindow->ImplCallEventListeners( bIconified ? VCLEVENT_WINDOW_MINIMIZE : VCLEVENT_WINDOW_NORMALIZE ); // #109206# notify client window as well to have toolkit topwindow listeners notified @@ -9331,15 +9331,15 @@ void Window::ImplNotifyIconifiedState( sal_Bool bIconified ) mpWindowImpl->mpFrameWindow->mpWindowImpl->mpClientWindow->ImplCallEventListeners( bIconified ? VCLEVENT_WINDOW_MINIMIZE : VCLEVENT_WINDOW_NORMALIZE ); } -sal_Bool Window::HasActiveChildFrame() +bool Window::HasActiveChildFrame() { - sal_Bool bRet = sal_False; + bool bRet = false; Window *pFrameWin = ImplGetSVData()->maWinData.mpFirstFrame; while( pFrameWin ) { if( pFrameWin != mpWindowImpl->mpFrameWindow ) { - sal_Bool bDecorated = sal_False; + bool bDecorated = false; Window *pChildFrame = pFrameWin->ImplGetWindow(); // #i15285# unfortunately WB_MOVEABLE is the same as WB_TABSTOP which can // be removed for ToolBoxes to influence the keyboard accessibility @@ -9351,9 +9351,9 @@ sal_Bool Window::HasActiveChildFrame() if( bDecorated || (pFrameWin->mpWindowImpl->mnStyle & (WB_MOVEABLE | WB_SIZEABLE) ) ) if( pChildFrame && pChildFrame->IsVisible() && pChildFrame->IsActive() ) { - if( ImplIsChild( pChildFrame, sal_True ) ) + if( ImplIsChild( pChildFrame, true ) ) { - bRet = sal_True; + bRet = true; break; } } @@ -9368,11 +9368,11 @@ LanguageType Window::GetInputLanguage() const return mpWindowImpl->mpFrame->GetInputLanguage(); } -void Window::EnableNativeWidget( sal_Bool bEnable ) +void Window::EnableNativeWidget( bool bEnable ) { static const char* pNoNWF = getenv( "SAL_NO_NWF" ); if( pNoNWF && *pNoNWF ) - bEnable = sal_False; + bEnable = false; if( bEnable != ImplGetWinData()->mbEnableNativeWidget ) { @@ -9397,7 +9397,7 @@ void Window::EnableNativeWidget( sal_Bool bEnable ) } } -sal_Bool Window::IsNativeWidgetEnabled() const +bool Window::IsNativeWidgetEnabled() const { return ImplGetWinData()->mbEnableNativeWidget; } @@ -9517,9 +9517,9 @@ uno::Reference< rendering::XSpriteCanvas > Window::GetSpriteCanvas() const void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rPos ) { - sal_Bool bRVisible = mpWindowImpl->mbReallyVisible; + bool bRVisible = mpWindowImpl->mbReallyVisible; mpWindowImpl->mbReallyVisible = mpWindowImpl->mbVisible; - sal_Bool bDevOutput = mbDevOutput; + bool bDevOutput = mbDevOutput; mbDevOutput = true; const OutputDevice *pOutDev = GetOutDev(); @@ -9527,7 +9527,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP long nOldDPIY = pOutDev->ImplGetDPIY(); mnDPIX = i_pTargetOutDev->ImplGetDPIX(); mnDPIY = i_pTargetOutDev->ImplGetDPIY(); - sal_Bool bOutput = IsOutputEnabled(); + bool bOutput = IsOutputEnabled(); EnableOutput(); DBG_ASSERT( GetMapMode().GetMapUnit() == MAP_PIXEL, "MapMode must be PIXEL based" ); @@ -9658,7 +9658,7 @@ void Window::PaintToDevice( OutputDevice* pDev, const Point& rPos, const Size& / Hide(); } - sal_Bool bVisible = mpWindowImpl->mbVisible; + bool bVisible = mpWindowImpl->mbVisible; mpWindowImpl->mbVisible = true; if( mpWindowImpl->mpBorderWindow ) diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 2c2a8f05f61b..05c237571eea 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -62,18 +62,18 @@ struct ImplFocusDelData : public ImplDelData // ======================================================================= -sal_Bool Window::ImplIsWindowInFront( const Window* pTestWindow ) const +bool Window::ImplIsWindowInFront( const Window* pTestWindow ) const { // check for overlapping window pTestWindow = pTestWindow->ImplGetFirstOverlapWindow(); const Window* pTempWindow = pTestWindow; const Window* pThisWindow = ImplGetFirstOverlapWindow(); if ( pTempWindow == pThisWindow ) - return sal_False; + return false; do { if ( pTempWindow == pThisWindow ) - return sal_True; + return true; if ( pTempWindow->mpWindowImpl->mbFrame ) break; pTempWindow = pTempWindow->mpWindowImpl->mpOverlapWindow; @@ -83,7 +83,7 @@ sal_Bool Window::ImplIsWindowInFront( const Window* pTestWindow ) const do { if ( pTempWindow == pTestWindow ) - return sal_False; + return false; if ( pTempWindow->mpWindowImpl->mbFrame ) break; pTempWindow = pTempWindow->mpWindowImpl->mpOverlapWindow; @@ -141,12 +141,12 @@ sal_Bool Window::ImplIsWindowInFront( const Window* pTestWindow ) const do { if ( pTempWindow == pThisWindow ) - return sal_True; + return true; pTempWindow = pTempWindow->mpWindowImpl->mpNext; } while ( pTempWindow ); - return sal_False; + return false; } // ======================================================================= @@ -194,7 +194,7 @@ void Window::ImplSaveOverlapBackground() // ----------------------------------------------------------------------- -sal_Bool Window::ImplRestoreOverlapBackground( Region& rInvRegion ) +bool Window::ImplRestoreOverlapBackground( Region& rInvRegion ) { if ( mpWindowImpl->mpOverlapData->mpSaveBackDev ) { @@ -227,10 +227,10 @@ sal_Bool Window::ImplRestoreOverlapBackground( Region& rInvRegion ) ImplDeleteOverlapBackground(); } - return sal_True; + return true; } - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -532,7 +532,7 @@ void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags ) Point aPoint( mnOutOffX, mnOutOffY ); Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); - ImplClipBoundaries( aRegion, sal_False, sal_False ); + ImplClipBoundaries( aRegion, false, false ); pOutDev->ImplSelectClipRegion( aRegion, pGraphics ); } } @@ -598,7 +598,7 @@ void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags ) Point aPoint( mnOutOffX, mnOutOffY ); Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); - ImplClipBoundaries( aRegion, sal_False, sal_False ); + ImplClipBoundaries( aRegion, false, false ); pOutDev->ImplSelectClipRegion( aRegion, pGraphics ); } } @@ -708,7 +708,7 @@ void Window::EndTracking( sal_uInt16 nFlags ) // ----------------------------------------------------------------------- -sal_Bool Window::IsTracking() const +bool Window::IsTracking() const { return (ImplGetSVData()->maWinData.mpTrackWin == this); } @@ -763,13 +763,13 @@ void Window::SaveBackground( const Point& rPos, const Size& rSize, { const Region aOldClip( rSaveDevice.GetClipRegion() ); const Point aPixOffset( rSaveDevice.LogicToPixel( rDestOff ) ); - const sal_Bool bMap = rSaveDevice.IsMapModeEnabled(); + const bool bMap = rSaveDevice.IsMapModeEnabled(); // move clip region to have the same distance to DestOffset aClip.Move( aPixOffset.X() - aPixPos.X(), aPixOffset.Y() - aPixPos.Y() ); // set pixel clip region - rSaveDevice.EnableMapMode( sal_False ); + rSaveDevice.EnableMapMode( false ); rSaveDevice.SetClipRegion( aClip ); rSaveDevice.EnableMapMode( bMap ); rSaveDevice.DrawOutDev( rDestOff, rSize, rPos, rSize, *this ); @@ -798,13 +798,13 @@ sal_uIntPtr Window::SaveFocus() // ----------------------------------------------------------------------- -sal_Bool Window::EndSaveFocus( sal_uIntPtr nSaveId, sal_Bool bRestore ) +bool Window::EndSaveFocus( sal_uIntPtr nSaveId, bool bRestore ) { if ( !nSaveId ) - return sal_False; + return false; else { - sal_Bool bOK = sal_True; + bool bOK = true; ImplFocusDelData* pDelData = (ImplFocusDelData*)(void*)nSaveId; if ( !pDelData->IsDead() ) { @@ -1094,10 +1094,10 @@ static void lcl_HandleScrollHelper( ScrollBar* pScrl, long nN, bool isMultiplyBy } -sal_Bool Window::HandleScrollCommand( const CommandEvent& rCmd, +bool Window::HandleScrollCommand( const CommandEvent& rCmd, ScrollBar* pHScrl, ScrollBar* pVScrl ) { - sal_Bool bRet = sal_False; + bool bRet = false; if ( pHScrl || pVScrl ) { @@ -1122,7 +1122,7 @@ sal_Bool Window::HandleScrollCommand( const CommandEvent& rCmd, if ( nFlags ) { StartAutoScroll( nFlags ); - bRet = sal_True; + bRet = true; } } break; @@ -1152,7 +1152,7 @@ sal_Bool Window::HandleScrollCommand( const CommandEvent& rCmd, 0L, pData->IsHorz() ? pHScrl : pVScrl, nLines ); - bRet = sal_True; + bRet = true; } } else @@ -1192,7 +1192,7 @@ sal_Bool Window::HandleScrollCommand( const CommandEvent& rCmd, bool isMultiplyByLineSize = false; #endif lcl_HandleScrollHelper( pHScrl, deltaXInLogic, isMultiplyByLineSize ); - bRet = sal_True; + bRet = true; } } if(pVScrl) @@ -1224,7 +1224,7 @@ sal_Bool Window::HandleScrollCommand( const CommandEvent& rCmd, #endif lcl_HandleScrollHelper( pVScrl, deltaYInLogic, isMultiplyByLineSize ); - bRet = sal_True; + bRet = true; } } } @@ -1239,7 +1239,7 @@ sal_Bool Window::HandleScrollCommand( const CommandEvent& rCmd, { ImplHandleScroll( pHScrl, pData->GetDeltaX(), pVScrl, pData->GetDeltaY() ); - bRet = sal_True; + bRet = true; } } break; @@ -1274,7 +1274,7 @@ DockingManager* Window::GetDockingManager() return ImplGetDockingManager(); } -void Window::EnableDocking( sal_Bool bEnable ) +void Window::EnableDocking( bool bEnable ) { // update list of dockable windows if( bEnable ) @@ -1374,32 +1374,32 @@ Window* Window::ImplGetFrameWindow() const return mpWindowImpl->mpFrameWindow; } -sal_Bool Window::ImplIsDockingWindow() const +bool Window::ImplIsDockingWindow() const { return mpWindowImpl->mbDockWin; } -sal_Bool Window::ImplIsFloatingWindow() const +bool Window::ImplIsFloatingWindow() const { return mpWindowImpl->mbFloatWin; } -sal_Bool Window::ImplIsSplitter() const +bool Window::ImplIsSplitter() const { return mpWindowImpl->mbSplitter; } -sal_Bool Window::ImplIsPushButton() const +bool Window::ImplIsPushButton() const { return mpWindowImpl->mbPushButton; } -sal_Bool Window::ImplIsOverlapWindow() const +bool Window::ImplIsOverlapWindow() const { return mpWindowImpl->mbOverlapWin; } -void Window::ImplSetMouseTransparent( sal_Bool bTransparent ) +void Window::ImplSetMouseTransparent( bool bTransparent ) { mpWindowImpl->mbMouseTransparent = bTransparent; } @@ -1414,7 +1414,7 @@ Point Window::ImplFrameToOutput( const Point& rPos ) return Point( rPos.X()-mnOutOffX, rPos.Y()-mnOutOffY ); } -void Window::SetCompoundControl( sal_Bool bCompound ) +void Window::SetCompoundControl( bool bCompound ) { mpWindowImpl->mbCompoundControl = bCompound; } @@ -1469,57 +1469,57 @@ Dialog* Window::GetParentDialog() const return const_cast<Dialog *>(dynamic_cast<const Dialog*>(pWindow)); } -sal_Bool Window::IsSystemWindow() const +bool Window::IsSystemWindow() const { return mpWindowImpl->mbSysWin; } -sal_Bool Window::IsDialog() const +bool Window::IsDialog() const { return mpWindowImpl->mbDialog; } -sal_Bool Window::IsMenuFloatingWindow() const +bool Window::IsMenuFloatingWindow() const { return mpWindowImpl->mbMenuFloatingWindow; } -sal_Bool Window::IsToolbarFloatingWindow() const +bool Window::IsToolbarFloatingWindow() const { return mpWindowImpl->mbToolbarFloatingWindow; } -void Window::EnableAllResize( sal_Bool bEnable ) +void Window::EnableAllResize( bool bEnable ) { mpWindowImpl->mbAllResize = bEnable; } -void Window::EnableChildTransparentMode( sal_Bool bEnable ) +void Window::EnableChildTransparentMode( bool bEnable ) { mpWindowImpl->mbChildTransparent = bEnable; } -sal_Bool Window::IsChildTransparentModeEnabled() const +bool Window::IsChildTransparentModeEnabled() const { return mpWindowImpl->mbChildTransparent; } -sal_Bool Window::IsMouseTransparent() const +bool Window::IsMouseTransparent() const { return mpWindowImpl->mbMouseTransparent; } -sal_Bool Window::IsPaintTransparent() const +bool Window::IsPaintTransparent() const { return mpWindowImpl->mbPaintTransparent; } -void Window::SetDialogControlStart( sal_Bool bStart ) +void Window::SetDialogControlStart( bool bStart ) { mpWindowImpl->mbDlgCtrlStart = bStart; } -sal_Bool Window::IsDialogControlStart() const +bool Window::IsDialogControlStart() const { return mpWindowImpl->mbDlgCtrlStart; } @@ -1539,7 +1539,7 @@ const InputContext& Window::GetInputContext() const return mpWindowImpl->maInputContext; } -sal_Bool Window::IsControlFont() const +bool Window::IsControlFont() const { return (mpWindowImpl->mpControlFont != 0); } @@ -1549,7 +1549,7 @@ Color Window::GetControlForeground() const return mpWindowImpl->maControlForeground; } -sal_Bool Window::IsControlForeground() const +bool Window::IsControlForeground() const { return mpWindowImpl->mbControlForeground; } @@ -1559,12 +1559,12 @@ Color Window::GetControlBackground() const return mpWindowImpl->maControlBackground; } -sal_Bool Window::IsControlBackground() const +bool Window::IsControlBackground() const { return mpWindowImpl->mbControlBackground; } -sal_Bool Window::IsInPaint() const +bool Window::IsInPaint() const { return mpWindowImpl->mbInPaint; } @@ -1574,37 +1574,37 @@ Window* Window::GetParent() const return mpWindowImpl->mpRealParent; } -sal_Bool Window::IsVisible() const +bool Window::IsVisible() const { return mpWindowImpl->mbVisible; } -sal_Bool Window::IsReallyVisible() const +bool Window::IsReallyVisible() const { return mpWindowImpl->mbReallyVisible; } -sal_Bool Window::IsReallyShown() const +bool Window::IsReallyShown() const { return mpWindowImpl->mbReallyShown; } -sal_Bool Window::IsInInitShow() const +bool Window::IsInInitShow() const { return mpWindowImpl->mbInInitShow; } -sal_Bool Window::IsEnabled() const +bool Window::IsEnabled() const { return !mpWindowImpl->mbDisabled; } -sal_Bool Window::IsInputEnabled() const +bool Window::IsInputEnabled() const { return !mpWindowImpl->mbInputDisabled; } -sal_Bool Window::IsAlwaysEnableInput() const +bool Window::IsAlwaysEnableInput() const { return mpWindowImpl->meAlwaysInputMode == AlwaysInputEnabled; } @@ -1615,42 +1615,42 @@ sal_uInt16 Window::GetActivateMode() const } -sal_Bool Window::IsAlwaysOnTopEnabled() const +bool Window::IsAlwaysOnTopEnabled() const { return mpWindowImpl->mbAlwaysOnTop; } -sal_Bool Window::IsDefaultPos() const +bool Window::IsDefaultPos() const { return mpWindowImpl->mbDefPos; } -sal_Bool Window::IsDefaultSize() const +bool Window::IsDefaultSize() const { return mpWindowImpl->mbDefSize; } -void Window::EnablePaint( sal_Bool bEnable ) +void Window::EnablePaint( bool bEnable ) { mpWindowImpl->mbPaintDisabled = !bEnable; } -sal_Bool Window::IsPaintEnabled() const +bool Window::IsPaintEnabled() const { return !mpWindowImpl->mbPaintDisabled; } -sal_Bool Window::IsUpdateMode() const +bool Window::IsUpdateMode() const { return !mpWindowImpl->mbNoUpdate; } -void Window::SetParentUpdateMode( sal_Bool bUpdate ) +void Window::SetParentUpdateMode( bool bUpdate ) { mpWindowImpl->mbNoParentUpdate = !bUpdate; } -sal_Bool Window::IsActive() const +bool Window::IsActive() const { return mpWindowImpl->mbActive; } @@ -1660,12 +1660,12 @@ sal_uInt16 Window::GetGetFocusFlags() const return mpWindowImpl->mnGetFocusFlags; } -sal_Bool Window::IsCompoundControl() const +bool Window::IsCompoundControl() const { return mpWindowImpl->mbCompoundControl; } -sal_Bool Window::IsWait() const +bool Window::IsWait() const { return (mpWindowImpl->mnWaitCount != 0); } @@ -1680,7 +1680,7 @@ const Fraction& Window::GetZoom() const return mpWindowImpl->maZoom; } -sal_Bool Window::IsZoom() const +bool Window::IsZoom() const { return mpWindowImpl->maZoom.GetNumerator() != mpWindowImpl->maZoom.GetDenominator(); } @@ -1711,12 +1711,12 @@ void* Window::GetData() const return mpWindowImpl->mpUserData; } -sal_Bool Window::IsCreatedWithToolkit() const +bool Window::IsCreatedWithToolkit() const { return mpWindowImpl->mbCreatedWithToolkit; } -void Window::SetCreatedWithToolkit( sal_Bool b ) +void Window::SetCreatedWithToolkit( bool b ) { mpWindowImpl->mbCreatedWithToolkit = b; diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 2d299cd3faa1..33d764d1bc5e 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -64,9 +64,9 @@ bool ImplCallPreNotify( NotifyEvent& rEvt ) || rEvt.GetWindow()->PreNotify( rEvt ); } -static sal_Bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, +static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, sal_uInt16 nCode, sal_uInt16 nSVEvent, - sal_Bool bMouseLeave ) + bool bMouseLeave ) { ImplSVData* pSVData = ImplGetSVData(); @@ -84,14 +84,14 @@ static sal_Bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos if ( nSVEvent == EVENT_MOUSEMOVE ) { if ( bMouseLeave ) - return sal_True; + return true; if ( !pFloat || (nHitTest & IMPL_FLOATWIN_HITTEST_RECT) ) { if ( pSVData->maHelpData.mpHelpWin && !pSVData->maHelpData.mbKeyboardHelp ) ImplDestroyHelpWindow( true ); pChild->ImplGetFrame()->SetPointer( POINTER_ARROW ); - return sal_True; + return true; } } else @@ -109,13 +109,13 @@ static sal_Bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos // if ( nPopupFlags & FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK ) // return sal_False; // else - return sal_True; + return true; } else if ( nHitTest & IMPL_FLOATWIN_HITTEST_RECT ) { if ( !(pFloat->GetPopupModeFlags() & FLOATWIN_POPUPMODE_NOMOUSERECTCLOSE) ) pFloat->ImplSetMouseDown(); - return sal_True; + return true; } } else @@ -126,7 +126,7 @@ static sal_Bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos { if ( pFloat->ImplIsMouseDown() ) pFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL ); - return sal_True; + return true; } } else @@ -136,7 +136,7 @@ static sal_Bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos if ( !(nPopupFlags & FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE) ) { pLastLevelFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL ); - return sal_True; + return true; } } } @@ -151,21 +151,21 @@ static sal_Bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos { if ( (nPopupFlags & FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE) && (nSVEvent == EVENT_MOUSEBUTTONUP) ) - return sal_True; + return true; pLastLevelFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL ); if ( nPopupFlags & FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK ) - return sal_False; + return false; else - return sal_True; + return true; } else - return sal_True; + return true; } } } } - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -187,9 +187,9 @@ static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos ) if ( pChild->IsInputEnabled() && !pChild->IsInModalNonRefMode() ) { HelpEvent aHelpEvent( rMousePos, nHelpMode ); - pSVData->maHelpData.mbRequestingHelp = sal_True; + pSVData->maHelpData.mbRequestingHelp = true; pChild->RequestHelp( aHelpEvent ); - pSVData->maHelpData.mbRequestingHelp = sal_False; + pSVData->maHelpData.mbRequestingHelp = false; } // #104172# do not kill keyboard activated tooltips else if ( pSVData->maHelpData.mpHelpWin && !pSVData->maHelpData.mbKeyboardHelp) @@ -213,8 +213,8 @@ static void ImplSetMousePointer( Window* pChild ) // ----------------------------------------------------------------------- -static sal_Bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL, - sal_Bool bMouse = sal_False, Point* pPos = NULL ) +static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL, + bool bMouse = false, Point* pPos = NULL ) { Point aPos; if ( pPos ) @@ -236,22 +236,22 @@ static sal_Bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = ImplDelData aDelData( pChild ); bool bPreNotify = ImplCallPreNotify( aNCmdEvt ); if ( aDelData.IsDead() ) - return sal_False; + return false; if ( !bPreNotify ) { pChild->ImplGetWindowImpl()->mbCommand = false; pChild->Command( aCEvt ); if( aDelData.IsDead() ) - return sal_False; + return false; pChild->ImplNotifyKeyMouseCommandEventListeners( aNCmdEvt ); if ( aDelData.IsDead() ) - return sal_False; + return false; if ( pChild->ImplGetWindowImpl()->mbCommand ) - return sal_True; + return true; } - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -274,14 +274,14 @@ static long ContextMenuEventLink( void* pCEvent, void* ) if( ! pEv->aDelData.IsDead() ) { pEv->pWindow->ImplRemoveDel( &pEv->aDelData ); - ImplCallCommand( pEv->pWindow, COMMAND_CONTEXTMENU, NULL, sal_True, &pEv->aChildPos ); + ImplCallCommand( pEv->pWindow, COMMAND_CONTEXTMENU, NULL, true, &pEv->aChildPos ); } delete pEv; return 0; } -bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouseLeave, +bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeave, long nX, long nY, sal_uLong nMsgTime, sal_uInt16 nCode, sal_uInt16 nMode ) { @@ -314,7 +314,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse if ( (pWinFrameData->mnLastMouseX != nX) || (pWinFrameData->mnLastMouseY != nY) ) { - ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, sal_False, nX, nY, nMsgTime, nCode, nMode ); + ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, false, nX, nY, nMsgTime, nCode, nMode ); } } @@ -327,7 +327,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse pWinFrameData->mnMouseMode = nMode & ~(MOUSE_SYNTHETIC | MOUSE_MODIFIERCHANGED); if ( bMouseLeave ) { - pWinFrameData->mbMouseIn = sal_False; + pWinFrameData->mbMouseIn = false; if ( pSVData->maHelpData.mpHelpWin && !pSVData->maHelpData.mbKeyboardHelp ) { ImplDelData aDelData( pWindow ); @@ -339,7 +339,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse } } else - pWinFrameData->mbMouseIn = sal_True; + pWinFrameData->mbMouseIn = true; DBG_ASSERT( !pSVData->maWinData.mpTrackWin || (pSVData->maWinData.mpTrackWin == pSVData->maWinData.mpCaptureWin), @@ -490,7 +490,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse !(((nMouseY-nDragH) <= pMouseDownWin->ImplGetFrameData()->mnFirstMouseY) && ((nMouseY+nDragH) >= pMouseDownWin->ImplGetFrameData()->mnFirstMouseY)) ) { - pMouseDownWin->ImplGetFrameData()->mbStartDragCalled = sal_True; + pMouseDownWin->ImplGetFrameData()->mbStartDragCalled = true; // Check if drag source provides it's own recognizer if( pMouseDownWin->ImplGetFrameData()->mbInternalDragGestureRecognizer ) @@ -539,7 +539,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse } } else - pMouseDownWin->ImplGetFrameData()->mbStartDragCalled = sal_True; + pMouseDownWin->ImplGetFrameData()->mbStartDragCalled = true; } // test for mouseleave and mouseenter @@ -553,8 +553,8 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse NotifyEvent aNLeaveEvt( EVENT_MOUSEMOVE, pMouseMoveWin, &aMLeaveEvt ); ImplDelData aDelData; ImplDelData aDelData2; - pWinFrameData->mbInMouseMove = sal_True; - pMouseMoveWin->ImplGetWinData()->mbMouseOver = sal_False; + pWinFrameData->mbInMouseMove = true; + pMouseMoveWin->ImplGetWinData()->mbMouseOver = false; pMouseMoveWin->ImplAddDel( &aDelData ); // A MouseLeave can destroy this window @@ -569,7 +569,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse } pWinFrameData->mpMouseMoveWin = NULL; - pWinFrameData->mbInMouseMove = sal_False; + pWinFrameData->mbInMouseMove = false; if ( pChild ) { @@ -587,7 +587,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse } pWinFrameData->mpMouseMoveWin = pChild; if( pChild ) - pChild->ImplGetWinData()->mbMouseOver = sal_True; + pChild->ImplGetWinData()->mbMouseOver = true; // MouseLeave if ( !pChild ) @@ -616,7 +616,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse ((nMouseY+nDblClkH) >= pChild->ImplGetFrameData()->mnFirstMouseY) ) { pChild->ImplGetFrameData()->mnClickCount++; - pChild->ImplGetFrameData()->mbStartDragCalled = sal_True; + pChild->ImplGetFrameData()->mbStartDragCalled = true; } else { @@ -655,7 +655,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse if ( !aDelData.IsDead() ) { pChild->ImplRemoveDel( &aDelData ); - pChild->ImplGetFrameData()->mbStartDragCalled = sal_True; + pChild->ImplGetFrameData()->mbStartDragCalled = true; } return true; } @@ -664,15 +664,15 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse } // call handler - sal_Bool bDrag = sal_False; - sal_Bool bCallHelpRequest = sal_True; + bool bDrag = false; + bool bCallHelpRequest = true; DBG_ASSERT( pChild, "ImplHandleMouseEvent: pChild is NULL" ); ImplDelData aDelData; NotifyEvent aNEvt( nSVEvent, pChild, &aMEvt ); pChild->ImplAddDel( &aDelData ); if ( nSVEvent == EVENT_MOUSEMOVE ) - pChild->ImplGetFrameData()->mbInMouseMove = sal_True; + pChild->ImplGetFrameData()->mbInMouseMove = true; // bring window into foreground on mouseclick if ( nSVEvent == EVENT_MOUSEBUTTONDOWN ) @@ -702,7 +702,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse (pSVData->maWinData.mnTrackFlags & STARTTRACK_SCROLLREPEAT) ) pSVData->maWinData.mpTrackTimer->Start(); } - bCallHelpRequest = sal_False; + bCallHelpRequest = false; nRet = true; } else @@ -713,7 +713,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse pChild->ToTop( TOTOP_NOGRABFOCUS ); if( aDelData.IsDead() ) - bCallHelpRequest = sal_False; + bCallHelpRequest = false; else { // if the MouseMove handler changes the help window's visibility @@ -722,7 +722,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse pChild->ImplGetWindowImpl()->mbMouseMove = false; pChild->MouseMove( aMEvt ); if ( pOldHelpTextWin != pSVData->maHelpData.mpHelpWin ) - bCallHelpRequest = sal_False; + bCallHelpRequest = false; } } } @@ -761,7 +761,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse if ( nSVEvent == EVENT_MOUSEMOVE ) - pChild->ImplGetWindowImpl()->mpFrameData->mbInMouseMove = sal_False; + pChild->ImplGetWindowImpl()->mpFrameData->mbInMouseMove = false; if ( nSVEvent == EVENT_MOUSEMOVE ) { @@ -801,9 +801,9 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse { sal_uInt16 nMiddleAction = pChild->GetSettings().GetMouseSettings().GetMiddleButtonAction(); if ( nMiddleAction == MOUSE_MIDDLE_AUTOSCROLL ) - nRet = !ImplCallCommand( pChild, COMMAND_STARTAUTOSCROLL, NULL, sal_True, &aChildPos ); + nRet = !ImplCallCommand( pChild, COMMAND_STARTAUTOSCROLL, NULL, true, &aChildPos ); else if ( nMiddleAction == MOUSE_MIDDLE_PASTESELECTION ) - nRet = !ImplCallCommand( pChild, COMMAND_PASTESELECTION, NULL, sal_True, &aChildPos ); + nRet = !ImplCallCommand( pChild, COMMAND_PASTESELECTION, NULL, true, &aChildPos ); } else { @@ -812,7 +812,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse if ( (nCode == rMSettings.GetContextMenuCode()) && (nClicks == rMSettings.GetContextMenuClicks()) ) { - sal_Bool bContextMenu; + bool bContextMenu; if ( rMSettings.GetContextMenuDown() ) bContextMenu = (nSVEvent == EVENT_MOUSEBUTTONDOWN); else @@ -836,7 +836,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse Application::PostUserEvent( Link( pEv, ContextMenuEventLink ) ); } else - nRet = ! ImplCallCommand( pChild, COMMAND_CONTEXTMENU, NULL, sal_True, &aChildPos ); + nRet = ! ImplCallCommand( pChild, COMMAND_CONTEXTMENU, NULL, true, &aChildPos ); } } } @@ -892,7 +892,7 @@ static Window* ImplGetKeyInputWindow( Window* pWindow ) // ----------------------------------------------------------------------- static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, - sal_uInt16 nKeyCode, sal_uInt16 nCharCode, sal_uInt16 nRepeat, sal_Bool bForward ) + sal_uInt16 nKeyCode, sal_uInt16 nCharCode, sal_uInt16 nRepeat, bool bForward ) { ImplSVData* pSVData = ImplGetSVData(); KeyCode aKeyCode( nKeyCode, nKeyCode ); @@ -931,7 +931,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, } } - sal_Bool bCtrlF6 = (aKeyCode.GetCode() == KEY_F6) && aKeyCode.IsMod1(); + bool bCtrlF6 = (aKeyCode.GetCode() == KEY_F6) && aKeyCode.IsMod1(); // determine last input time pSVData->maAppData.mnLastInputTime = Time::GetSystemTicks(); @@ -1068,7 +1068,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, sal_uInt16 nCode = aKeyCode.GetCode(); // #101999# is focus in or below toolbox - sal_Bool bToolboxFocus=sal_False; + bool bToolboxFocus=false; if( (nCode == KEY_F1) && aKeyCode.IsShift() ) { Window *pWin = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin; @@ -1076,7 +1076,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, { if( pWin->ImplGetWindowImpl()->mbToolBox ) { - bToolboxFocus = sal_True; + bToolboxFocus = true; break; } else @@ -1086,7 +1086,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, // ContextMenu if ( (nCode == KEY_CONTEXTMENU) || ((nCode == KEY_F10) && aKeyCode.IsShift() && !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) ) - nRet = !ImplCallCommand( pChild, COMMAND_CONTEXTMENU, NULL, sal_False ); + nRet = !ImplCallCommand( pChild, COMMAND_CONTEXTMENU, NULL, false ); else if ( ( (nCode == KEY_F2) && aKeyCode.IsShift() ) || ( (nCode == KEY_F1) && aKeyCode.IsMod1() ) || // #101999# no active help when focus in toolbox, simulate BallonHelp instead ( (nCode == KEY_F1) && aKeyCode.IsShift() && bToolboxFocus ) ) @@ -1099,10 +1099,10 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, aPos = pChild->OutputToScreenPixel( aPos ); HelpEvent aHelpEvent( aPos, HELPMODE_BALLOON ); - aHelpEvent.SetKeyboardActivated( sal_True ); - pSVData->maHelpData.mbSetKeyboardHelp = sal_True; + aHelpEvent.SetKeyboardActivated( true ); + pSVData->maHelpData.mbSetKeyboardHelp = true; pChild->RequestHelp( aHelpEvent ); - pSVData->maHelpData.mbSetKeyboardHelp = sal_False; + pSVData->maHelpData.mbSetKeyboardHelp = false; } else if ( (nCode == KEY_F1) || (nCode == KEY_HELP) ) { @@ -1362,7 +1362,7 @@ static bool ImplHandleInputContextChange( Window* pWindow, LanguageType eNewLang // ----------------------------------------------------------------------- -static sal_Bool ImplCallWheelCommand( Window* pWindow, const Point& rPos, +static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos, const CommandWheelData* pWheelData ) { Point aCmdMousePos = pWindow->ImplFrameToOutput( rPos ); @@ -1371,17 +1371,17 @@ static sal_Bool ImplCallWheelCommand( Window* pWindow, const Point& rPos, ImplDelData aDelData( pWindow ); bool bPreNotify = ImplCallPreNotify( aNCmdEvt ); if ( aDelData.IsDead() ) - return sal_False; + return false; if ( !bPreNotify ) { pWindow->ImplGetWindowImpl()->mbCommand = false; pWindow->Command( aCEvt ); if ( aDelData.IsDead() ) - return sal_False; + return false; if ( pWindow->ImplGetWindowImpl()->mbCommand ) - return sal_True; + return true; } - return sal_False; + return false; } // ----------------------------------------------------------------------- @@ -1418,7 +1418,7 @@ static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv CommandWheelData aWheelData( rEvt.mnDelta, rEvt.mnNotchDelta, rEvt.mnScrollLines, nMode, nCode, bHorz, bPixel ); Point aMousePos( rEvt.mnX, rEvt.mnY ); - sal_Bool bRet = sal_True; + bool bRet = true; // first check any floating window ( eg. drop down listboxes) bool bIsFloat = false; @@ -1531,7 +1531,7 @@ static void KillOwnPopups( Window* pWindow ) ImplSVData* pSVData = ImplGetSVData(); Window *pParent = pWindow->ImplGetWindowImpl()->mpFrameWindow; Window *pChild = pSVData->maWinData.mpFirstFloat; - if ( pChild && pParent->ImplIsWindowOrChild( pChild, sal_True ) ) + if ( pChild && pParent->ImplIsWindowOrChild( pChild, true ) ) { if ( !(pSVData->maWinData.mpFirstFloat->GetPopupModeFlags() & FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE) ) pSVData->maWinData.mpFirstFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL ); @@ -1601,7 +1601,7 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ) pWindow->ImplGetWindowImpl()->mpFrameData->mbNeedSysWindow = (nNewWidth < IMPL_MIN_NEEDSYSWIN) || (nNewHeight < IMPL_MIN_NEEDSYSWIN); - sal_Bool bMinimized = (nNewWidth <= 0) || (nNewHeight <= 0); + bool bMinimized = (nNewWidth <= 0) || (nNewHeight <= 0); if( bMinimized != pWindow->ImplGetWindowImpl()->mpFrameData->mbMinimized ) pWindow->ImplGetWindowImpl()->mpFrameWindow->ImplNotifyIconifiedState( bMinimized ); pWindow->ImplGetWindowImpl()->mpFrameData->mbMinimized = bMinimized; @@ -1644,7 +1644,7 @@ static void ImplHandleMoveResize( Window* pWindow, long nNewWidth, long nNewHeig // ----------------------------------------------------------------------- -static void ImplActivateFloatingWindows( Window* pWindow, sal_Bool bActive ) +static void ImplActivateFloatingWindows( Window* pWindow, bool bActive ) { // First check all overlapping windows Window* pTempWindow = pWindow->ImplGetWindowImpl()->mpFirstOverlap; @@ -1671,7 +1671,7 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) // If the status has been preserved, because we got back the focus // in the meantime, we do nothing - sal_Bool bHasFocus = ImplGetWindowImpl()->mpFrameData->mbHasFocus || ImplGetWindowImpl()->mpFrameData->mbSysObjFocus; + bool bHasFocus = ImplGetWindowImpl()->mpFrameData->mbHasFocus || ImplGetWindowImpl()->mpFrameData->mbSysObjFocus; // next execute the delayed functions if ( bHasFocus ) @@ -1682,21 +1682,21 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) if ( ImplGetWindowImpl()->mpFrameData->mpFocusWin ) { - sal_Bool bHandled = sal_False; + bool bHandled = false; if ( ImplGetWindowImpl()->mpFrameData->mpFocusWin->IsInputEnabled() && ! ImplGetWindowImpl()->mpFrameData->mpFocusWin->IsInModalMode() ) { if ( ImplGetWindowImpl()->mpFrameData->mpFocusWin->IsEnabled() ) { ImplGetWindowImpl()->mpFrameData->mpFocusWin->GrabFocus(); - bHandled = sal_True; + bHandled = true; } else if( ImplGetWindowImpl()->mpFrameData->mpFocusWin->ImplHasDlgCtrl() ) { // #109094# if the focus is restored to a disabled dialog control (was disabled meanwhile) // try to move it to the next control ImplGetWindowImpl()->mpFrameData->mpFocusWin->ImplDlgCtrlNextWindow(); - bHandled = sal_True; + bHandled = true; } } if ( !bHandled ) @@ -1777,7 +1777,7 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) static void ImplHandleGetFocus( Window* pWindow ) { - pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus = sal_True; + pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus = true; // execute Focus-Events after a delay, such that SystemChildWindows @@ -1817,7 +1817,7 @@ static void ImplHandleLoseFocus( Window* pWindow ) pSVData->maWinData.mpFirstFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL ); } - pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus = sal_False; + pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus = false; // execute Focus-Events after a delay, such that SystemChildWindows // do not flicker when they receive focus @@ -1978,7 +1978,7 @@ static sal_uInt16 ImplGetMouseButtonMode( SalMouseEvent* pEvent ) inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent ) { - return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, sal_True, + return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, true, pEvent->mnX, pEvent->mnY, pEvent->mnTime, pEvent->mnCode, ImplGetMouseMoveMode( pEvent ) ); @@ -1988,7 +1988,7 @@ inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent ) inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent ) { - return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, sal_False, + return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, false, pEvent->mnX, pEvent->mnY, pEvent->mnTime, pEvent->mnCode, ImplGetMouseMoveMode( pEvent ) ); @@ -1998,7 +1998,7 @@ inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent ) inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent ) { - return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONDOWN, sal_False, + return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONDOWN, false, pEvent->mnX, pEvent->mnY, pEvent->mnTime, #ifdef MACOSX @@ -2013,7 +2013,7 @@ inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent ) { - return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONUP, sal_False, + return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONUP, false, pEvent->mnX, pEvent->mnY, pEvent->mnTime, #ifdef MACOSX @@ -2095,7 +2095,7 @@ static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent ) #else nNewCode |= pWindow->ImplGetWindowImpl()->mpFrameData->mnMouseCode & ~(KEY_SHIFT | KEY_MOD1 | KEY_MOD2); #endif - pWindow->ImplGetWindowImpl()->mpFrameWindow->ImplCallMouseMove( nNewCode, sal_True ); + pWindow->ImplGetWindowImpl()->mpFrameWindow->ImplCallMouseMove( nNewCode, true ); } // #105224# send commandevent to allow special treatment of Ctrl-LeftShift/Ctrl-RightShift etc. @@ -2328,7 +2328,7 @@ static void ImplHandleSalQueryCharPosition( Window *pWindow, pEvt->mnCursorBoundY = aAbsScreenPos.Y(); pEvt->mnCursorBoundWidth = aDeviceRect.GetWidth(); pEvt->mnCursorBoundHeight = aDeviceRect.GetHeight(); - pEvt->mbVertical = (pWinData->mbVertical != sal_False); + pEvt->mbVertical = pWinData->mbVertical; pEvt->mbValid = true; } } @@ -2412,28 +2412,28 @@ bool ImplWindowFrameProc( Window* pWindow, SalFrame* /*pFrame*/, { SalKeyEvent* pKeyEvt = (SalKeyEvent*)pEvent; nRet = ImplHandleKey( pWindow, EVENT_KEYINPUT, - pKeyEvt->mnCode, pKeyEvt->mnCharCode, pKeyEvt->mnRepeat, sal_True ); + pKeyEvt->mnCode, pKeyEvt->mnCharCode, pKeyEvt->mnRepeat, true ); } break; case SALEVENT_EXTERNALKEYINPUT: { KeyEvent* pKeyEvt = (KeyEvent*) pEvent; nRet = ImplHandleKey( pWindow, EVENT_KEYINPUT, - pKeyEvt->GetKeyCode().GetFullCode(), pKeyEvt->GetCharCode(), pKeyEvt->GetRepeat(), sal_False ); + pKeyEvt->GetKeyCode().GetFullCode(), pKeyEvt->GetCharCode(), pKeyEvt->GetRepeat(), false ); } break; case SALEVENT_KEYUP: { SalKeyEvent* pKeyEvt = (SalKeyEvent*)pEvent; nRet = ImplHandleKey( pWindow, EVENT_KEYUP, - pKeyEvt->mnCode, pKeyEvt->mnCharCode, pKeyEvt->mnRepeat, sal_True ); + pKeyEvt->mnCode, pKeyEvt->mnCharCode, pKeyEvt->mnRepeat, true ); } break; case SALEVENT_EXTERNALKEYUP: { KeyEvent* pKeyEvt = (KeyEvent*) pEvent; nRet = ImplHandleKey( pWindow, EVENT_KEYUP, - pKeyEvt->GetKeyCode().GetFullCode(), pKeyEvt->GetCharCode(), pKeyEvt->GetRepeat(), sal_False ); + pKeyEvt->GetKeyCode().GetFullCode(), pKeyEvt->GetCharCode(), pKeyEvt->GetRepeat(), false ); } break; case SALEVENT_KEYMODCHANGE: @@ -2604,7 +2604,7 @@ bool ImplWindowFrameProc( Window* pWindow, SalFrame* /*pFrame*/, ScrollEvent* pScrollEvent = (ScrollEvent*) pEvent; SalWheelMouseEvent aSalWheelMouseEvent; aSalWheelMouseEvent.mnTime = Time::GetSystemTicks(); - aSalWheelMouseEvent.mbDeltaIsPixel = sal_True; + aSalWheelMouseEvent.mbDeltaIsPixel = true; // event location holds delta values instead aSalWheelMouseEvent.mnX = long(pScrollEvent->GetXOffset()); aSalWheelMouseEvent.mnY = long(pScrollEvent->GetYOffset()); diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 8d27cd69b749..4f6eee505780 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -41,10 +41,10 @@ void WorkWindow::ImplInitWorkWindowData() mnIcon = 0; // Should be removed in the next top level update - now in SystemWindow mnPresentationFlags = 0; - mbPresentationMode = sal_False; - mbPresentationVisible = sal_False; - mbPresentationFull = sal_False; - mbFullScreenMode = sal_False; + mbPresentationMode = false; + mbPresentationVisible = false; + mbPresentationFull = false; + mbFullScreenMode = false; } // ----------------------------------------------------------------------- @@ -113,7 +113,7 @@ WorkWindow::WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSyst SystemWindow( WINDOW_WORKWINDOW ) { ImplInitWorkWindowData(); - mbSysChild = sal_True; + mbSysChild = true; ImplInit( pParent, nStyle, aSystemWorkWindowToken ); } @@ -123,7 +123,7 @@ WorkWindow::WorkWindow( SystemParentData* pParent ) : SystemWindow( WINDOW_WORKWINDOW ) { ImplInitWorkWindowData(); - mbSysChild = sal_True; + mbSysChild = true; ImplInit( NULL, 0, pParent ); } @@ -141,17 +141,17 @@ WorkWindow::~WorkWindow() // ----------------------------------------------------------------------- -void WorkWindow::ShowFullScreenMode( sal_Bool bFullScreenMode ) +void WorkWindow::ShowFullScreenMode( bool bFullScreenMode ) { return ShowFullScreenMode( bFullScreenMode, GetScreenNumber()); } -void WorkWindow::ShowFullScreenMode( sal_Bool bFullScreenMode, sal_Int32 nDisplayScreen ) +void WorkWindow::ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScreen ) { if ( !mbFullScreenMode == !bFullScreenMode ) return; - mbFullScreenMode = bFullScreenMode != 0; + mbFullScreenMode = bFullScreenMode; if ( !mbSysChild ) { // Dispose of the canvas implementation, which might rely on @@ -173,25 +173,25 @@ void WorkWindow::ShowFullScreenMode( sal_Bool bFullScreenMode, sal_Int32 nDispla // ----------------------------------------------------------------------- -void WorkWindow::StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlags ) +void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags ) { return StartPresentationMode( bPresentation, nFlags, GetScreenNumber()); } -void WorkWindow::StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlags, sal_Int32 nDisplayScreen ) +void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, sal_Int32 nDisplayScreen ) { if ( !bPresentation == !mbPresentationMode ) return; if ( bPresentation ) { - mbPresentationMode = sal_True; + mbPresentationMode = true; mbPresentationVisible = IsVisible(); mbPresentationFull = mbFullScreenMode; mnPresentationFlags = nFlags; if ( !(mnPresentationFlags & PRESENTATION_NOFULLSCREEN) ) - ShowFullScreenMode( sal_True, nDisplayScreen ); + ShowFullScreenMode( true, nDisplayScreen ); if ( !mbSysChild ) { if ( mnPresentationFlags & PRESENTATION_HIDEALLAPPS ) @@ -215,16 +215,16 @@ void WorkWindow::StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlag } ShowFullScreenMode( mbPresentationFull, nDisplayScreen ); - mbPresentationMode = sal_False; - mbPresentationVisible = sal_False; - mbPresentationFull = sal_False; + mbPresentationMode = false; + mbPresentationVisible = false; + mbPresentationFull = false; mnPresentationFlags = 0; } } // ----------------------------------------------------------------------- -sal_Bool WorkWindow::IsMinimized() const +bool WorkWindow::IsMinimized() const { //return mpWindowImpl->mpFrameData->mbMinimized; SalFrameState aState; @@ -234,15 +234,15 @@ sal_Bool WorkWindow::IsMinimized() const // ----------------------------------------------------------------------- -sal_Bool WorkWindow::SetPluginParent( SystemParentData* pParent ) +bool WorkWindow::SetPluginParent( SystemParentData* pParent ) { DBG_ASSERT( ! mbPresentationMode && ! mbFullScreenMode, "SetPluginParent in fullscreen or presentation mode !" ); bool bWasDnd = Window::ImplStopDnd(); - sal_Bool bShown = IsVisible(); + bool bShown = IsVisible(); Show( false ); - sal_Bool bRet = mpWindowImpl->mpFrame->SetPluginParent( pParent ); + bool bRet = mpWindowImpl->mpFrame->SetPluginParent( pParent ); Show( bShown ); if( bWasDnd ) @@ -270,9 +270,9 @@ void WorkWindow::Restore() ImplSetFrameState( WINDOWSTATE_STATE_NORMAL ); } -sal_Bool WorkWindow::Close() +bool WorkWindow::Close() { - sal_Bool bCanClose = SystemWindow::Close(); + bool bCanClose = SystemWindow::Close(); // Ist es das Applikationsfenster, dann beende die Applikation if ( bCanClose && ( ImplGetSVData()->maWinData.mpAppWin == this ) ) @@ -281,14 +281,14 @@ sal_Bool WorkWindow::Close() return bCanClose; } -void WorkWindow::Maximize( sal_Bool bMaximize ) +void WorkWindow::Maximize( bool bMaximize ) { ImplSetFrameState( bMaximize ? WINDOWSTATE_STATE_MAXIMIZED : WINDOWSTATE_STATE_NORMAL ); } -sal_Bool WorkWindow::IsMaximized() const +bool WorkWindow::IsMaximized() const { - sal_Bool bRet = sal_False; + bool bRet = false; SalFrameState aState; if( mpWindowImpl->mpFrame->GetWindowState( &aState ) ) @@ -296,7 +296,7 @@ sal_Bool WorkWindow::IsMaximized() const if( aState.mnState & (WINDOWSTATE_STATE_MAXIMIZED | WINDOWSTATE_STATE_MAXIMIZED_HORZ | WINDOWSTATE_STATE_MAXIMIZED_VERT ) ) - bRet = sal_True; + bRet = true; } return bRet; } diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 85bbdeef7771..3446d18472dc 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -373,7 +373,7 @@ IIIMPStatusWindow::IIIMPStatusWindow( SalFrame* pParent, bool bOn ) : else fprintf( stderr, "Warning: could not reposition status window since no frame\n" ); #endif - EnableAlwaysOnTop( sal_True ); + EnableAlwaysOnTop( true ); } IIIMPStatusWindow::~IIIMPStatusWindow() diff --git a/vcl/unx/generic/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx index 6886c793a7cb..9a12c97c2d3a 100644 --- a/vcl/unx/generic/app/i18n_xkb.cxx +++ b/vcl/unx/generic/app/i18n_xkb.cxx @@ -24,7 +24,7 @@ #include "unx/i18n_xkb.hxx" SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay ) - : mbUseExtension( sal_True ), + : mbUseExtension( true ), mnDefaultGroup( 0 ) { mpDisplay = pDisplay; @@ -53,9 +53,9 @@ SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay ) int nExtMajorVersion = XkbMajorVersion; int nExtMinorVersion = XkbMinorVersion; - mbUseExtension = (sal_Bool)XkbQueryExtension( mpDisplay, + mbUseExtension = XkbQueryExtension( mpDisplay, &nMajorExtOpcode, (int*)&mnEventBase, (int*)&mnErrorBase, - &nExtMajorVersion, &nExtMinorVersion ); + &nExtMajorVersion, &nExtMinorVersion ) != 0; } // query notification for changes of the keyboard group diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 607f413acfc5..2ea2c4c61141 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -126,7 +126,7 @@ static int sal_significantBits( Pixel nMask ) return nBits; } -static sal_Bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI ) +static bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI ) { int nInfos; XVisualInfo aTemplate; @@ -136,14 +136,14 @@ static sal_Bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI pInfos = XGetVisualInfo( pDisplay, VisualIDMask, &aTemplate, &nInfos ); if( !pInfos ) - return sal_False; + return false; rVI = *pInfos; XFree( pInfos ); DBG_ASSERT( rVI.visualid == nVID, "sal_GetVisualInfo: could not get correct visual by visualId" ); - return sal_True; + return true; } // --------------------------------------------------------------------------- @@ -175,7 +175,7 @@ sal_GetServerVendor( Display *p_display ) return vendor_unknown; } -sal_Bool SalDisplay::BestVisual( Display *pDisplay, +bool SalDisplay::BestVisual( Display *pDisplay, int nScreen, XVisualInfo &rVI ) { @@ -200,22 +200,22 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay, int i; for( i = 0; i < nVisuals; i++ ) { - sal_Bool bUsable = sal_False; + bool bUsable = false; int nTrueColor = 1; if ( pVInfos[i].screen != nScreen ) { - bUsable = sal_False; + bUsable = false; } else if( pVInfos[i].c_class == TrueColor ) { nTrueColor = 2048; if( pVInfos[i].depth == 24 ) - bUsable = sal_True; + bUsable = true; } else if( pVInfos[i].c_class == PseudoColor ) { - bUsable = sal_True; + bUsable = true; } pWeight[ i ] = bUsable ? nTrueColor*pVInfos[i].depth : -1024; pWeight[ i ] -= pVInfos[ i ].visualid; @@ -332,12 +332,12 @@ static int DisplayHasEvent( int fd, SalX11Display *pDisplay ) if( ! pDisplay->IsDisplay() ) return 0; - int result; + bool result; GetSalData()->m_pInstance->GetYieldMutex()->acquire(); result = pDisplay->IsEvent(); GetSalData()->m_pInstance->GetYieldMutex()->release(); - return result; + return int(result); } static int DisplayQueue( int fd, SalX11Display *pDisplay ) { @@ -1833,13 +1833,13 @@ int SalDisplay::CaptureMouse( SalFrame *pCapture ) // Events -sal_Bool SalX11Display::IsEvent() +bool SalX11Display::IsEvent() { if( HasUserEvents() || XEventsQueued( pDisp_, QueuedAlready ) ) - return sal_True; + return true; XFlush( pDisp_ ); - return sal_False; + return false; } void SalX11Display::Yield() @@ -2752,7 +2752,7 @@ SalColor SalColormap::GetColor( Pixel nPixel ) const return MAKE_SALCOLOR( aColor.red>>8, aColor.green>>8, aColor.blue>>8 ); } -inline sal_Bool SalColormap::GetXPixel( XColor &rColor, +inline bool SalColormap::GetXPixel( XColor &rColor, int r, int g, int b ) const @@ -2763,15 +2763,15 @@ inline sal_Bool SalColormap::GetXPixel( XColor &rColor, return XAllocColor( GetXDisplay(), m_hColormap, &rColor ); } -sal_Bool SalColormap::GetXPixels( XColor &rColor, +bool SalColormap::GetXPixels( XColor &rColor, int r, int g, int b ) const { if( !GetXPixel( rColor, r, g, b ) ) - return sal_False; + return false; if( rColor.pixel & 1 ) - return sal_True; + return true; return GetXPixel( rColor, r^0xFF, g^0xFF, b^0xFF ); } diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 9966c08e7128..487cd637f45d 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -84,7 +84,7 @@ X11SalInstance::~X11SalInstance() struct PredicateReturn { sal_uInt16 nType; - sal_Bool bRet; + bool bRet; }; extern "C" { @@ -121,7 +121,7 @@ Bool ImplPredicateEvent( Display *, XEvent *pEvent, char *pData ) } if ( (nType & pPre->nType) || ( ! nType && (pPre->nType & VCL_INPUT_OTHER) ) ) - pPre->bRet = sal_True; + pPre->bRet = true; return False; } @@ -131,16 +131,16 @@ bool X11SalInstance::AnyInput(sal_uInt16 nType) { SalGenericData *pData = GetGenericData(); Display *pDisplay = pData->GetSalDisplay()->GetDisplay(); - sal_Bool bRet = sal_False; + bool bRet = false; if( (nType & VCL_INPUT_TIMER) && (mpXLib && mpXLib->CheckTimeout(false)) ) - bRet = sal_True; + bRet = true; else if (XPending(pDisplay) ) { PredicateReturn aInput; XEvent aEvent; - aInput.bRet = sal_False; + aInput.bRet = false; aInput.nType = nType; XCheckIfEvent(pDisplay, &aEvent, ImplPredicateEvent, diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index ead695ce4d97..9ae8e0ebbd4e 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -2162,7 +2162,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) // some listener forgot to call dropComplete in the last operation // let us end it now and accept the new enter event aGuard.clear(); - dropComplete( sal_False, m_aCurrentDropWindow, m_nDropTime ); + dropComplete( false, m_aCurrentDropWindow, m_nDropTime ); aGuard.reset(); } @@ -2294,7 +2294,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) aGuard.clear(); it->second->dragExit( aEvent ); // reset the drop status, notify source - dropComplete( sal_False, m_aCurrentDropWindow, m_nDropTime ); + dropComplete( false, m_aCurrentDropWindow, m_nDropTime ); } } } @@ -2305,7 +2305,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) * methods for XDropTargetDropContext */ -void SelectionManager::dropComplete( sal_Bool bSuccess, XLIB_Window aDropWindow, XLIB_Time ) +void SelectionManager::dropComplete( bool bSuccess, XLIB_Window aDropWindow, XLIB_Time ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -3880,7 +3880,7 @@ sal_Bool SelectionManager::handleEvent( const Any& event ) throw() m_nSelectionTimestamp = nTimestamp; } - return sal_Bool( handleXEvent( *pEvent ) ); + return handleXEvent( *pEvent ); } else { diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 5b5ad959b842..cb968f24f147 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -465,7 +465,7 @@ namespace x11 { // for XDropTarget{Drag|Drop}Context void accept( sal_Int8 dragOperation, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); void reject( XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); - void dropComplete( sal_Bool success, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); + void dropComplete( bool success, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); // for XDragSourceContext sal_Int32 getCurrentCursor(); diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 29b5b47a8c1b..2bc1c65a16a0 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -130,20 +130,20 @@ X11SalGraphics::X11SalGraphics() pStippleGC_ = NULL; pTrackingGC_ = NULL; - bWindow_ = sal_False; - bPrinter_ = sal_False; - bVirDev_ = sal_False; - bPenGC_ = sal_False; - bFontGC_ = sal_False; - bBrushGC_ = sal_False; - bMonoGC_ = sal_False; - bCopyGC_ = sal_False; - bInvertGC_ = sal_False; - bInvert50GC_ = sal_False; - bStippleGC_ = sal_False; - bTrackingGC_ = sal_False; + bWindow_ = false; + bPrinter_ = false; + bVirDev_ = false; + bPenGC_ = false; + bFontGC_ = false; + bBrushGC_ = false; + bMonoGC_ = false; + bCopyGC_ = false; + bInvertGC_ = false; + bInvert50GC_ = false; + bStippleGC_ = false; + bTrackingGC_ = false; bXORMode_ = false; - bDitherBrush_ = sal_False; + bDitherBrush_ = false; } X11SalGraphics::~X11SalGraphics() @@ -216,7 +216,7 @@ void X11SalGraphics::Init( SalFrame *pFrame, Drawable aTarget, m_nXScreen = nXScreen; SetDrawable( aTarget, nXScreen ); - bWindow_ = sal_True; + bWindow_ = true; m_pFrame = pFrame; m_pVDev = NULL; } @@ -275,7 +275,7 @@ GC X11SalGraphics::SelectPen() XSetForeground( pDisplay, pPenGC_, nPenPixel_ ); XSetFunction ( pDisplay, pPenGC_, bXORMode_ ? GXxor : GXcopy ); SetClipRegion( pPenGC_ ); - bPenGC_ = sal_True; + bPenGC_ = true; } return pPenGC_; @@ -321,7 +321,7 @@ GC X11SalGraphics::SelectBrush() XSetFunction ( pDisplay, pBrushGC_, bXORMode_ ? GXxor : GXcopy ); SetClipRegion( pBrushGC_ ); - bBrushGC_ = sal_True; + bBrushGC_ = true; } return pBrushGC_; @@ -352,7 +352,7 @@ GC X11SalGraphics::GetTrackingGC() if( !bTrackingGC_ ) { SetClipRegion( pTrackingGC_ ); - bTrackingGC_ = sal_True; + bTrackingGC_ = true; } return pTrackingGC_; @@ -397,7 +397,7 @@ void X11SalGraphics::DrawLines( sal_uLong nPoints, #define P_DELTA 51 #define DMAP( v, m ) ((v % P_DELTA) > m ? (v / P_DELTA) + 1 : (v / P_DELTA)) -BOOL X11SalGraphics::GetDitherPixmap( SalColor nSalColor ) +bool X11SalGraphics::GetDitherPixmap( SalColor nSalColor ) { static const short nOrdDither8Bit[ 8 ][ 8 ] = { @@ -413,7 +413,7 @@ BOOL X11SalGraphics::GetDitherPixmap( SalColor nSalColor ) // test for correct depth (8bit) if( GetColormap().GetVisual().GetDepth() != 8 ) - return sal_False; + return false; char pBits[64]; char *pBitsPtr = pBits; @@ -469,7 +469,7 @@ BOOL X11SalGraphics::GetDitherPixmap( SalColor nSalColor ) pImage->data = NULL; XDestroyImage( pImage ); - return sal_True; + return true; } void X11SalGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY ) // const @@ -537,15 +537,15 @@ void X11SalGraphics::ResetClipRegion() { if( mpClipRegion ) { - bPenGC_ = sal_False; - bFontGC_ = sal_False; - bBrushGC_ = sal_False; - bMonoGC_ = sal_False; - bCopyGC_ = sal_False; - bInvertGC_ = sal_False; - bInvert50GC_ = sal_False; - bStippleGC_ = sal_False; - bTrackingGC_ = sal_False; + bPenGC_ = false; + bFontGC_ = false; + bBrushGC_ = false; + bMonoGC_ = false; + bCopyGC_ = false; + bInvertGC_ = false; + bInvert50GC_ = false; + bStippleGC_ = false; + bTrackingGC_ = false; XDestroyRegion( mpClipRegion ); mpClipRegion = NULL; @@ -601,15 +601,15 @@ bool X11SalGraphics::setClipRegion( const Region& i_rClip ) //} // done, invalidate GCs - bPenGC_ = sal_False; - bFontGC_ = sal_False; - bBrushGC_ = sal_False; - bMonoGC_ = sal_False; - bCopyGC_ = sal_False; - bInvertGC_ = sal_False; - bInvert50GC_ = sal_False; - bStippleGC_ = sal_False; - bTrackingGC_ = sal_False; + bPenGC_ = false; + bFontGC_ = false; + bBrushGC_ = false; + bMonoGC_ = false; + bCopyGC_ = false; + bInvertGC_ = false; + bInvert50GC_ = false; + bStippleGC_ = false; + bTrackingGC_ = false; if( XEmptyRegion( mpClipRegion ) ) { @@ -624,7 +624,7 @@ void X11SalGraphics::SetLineColor() if( nPenColor_ != SALCOLOR_NONE ) { nPenColor_ = SALCOLOR_NONE; - bPenGC_ = sal_False; + bPenGC_ = false; } } @@ -634,7 +634,7 @@ void X11SalGraphics::SetLineColor( SalColor nSalColor ) { nPenColor_ = nSalColor; nPenPixel_ = GetPixel( nSalColor ); - bPenGC_ = sal_False; + bPenGC_ = false; } } @@ -642,9 +642,9 @@ void X11SalGraphics::SetFillColor() { if( nBrushColor_ != SALCOLOR_NONE ) { - bDitherBrush_ = sal_False; + bDitherBrush_ = false; nBrushColor_ = SALCOLOR_NONE; - bBrushGC_ = sal_False; + bBrushGC_ = false; } } @@ -652,7 +652,7 @@ void X11SalGraphics::SetFillColor( SalColor nSalColor ) { if( nBrushColor_ != nSalColor ) { - bDitherBrush_ = sal_False; + bDitherBrush_ = false; nBrushColor_ = nSalColor; nBrushPixel_ = GetPixel( nSalColor ); if( TrueColor != GetColormap().GetVisual().GetClass() @@ -674,7 +674,7 @@ void X11SalGraphics::SetFillColor( SalColor nSalColor ) && nSalColor != MAKE_SALCOLOR( 0xFF, 0xFF, 0x00 ) // light brown && nSalColor != MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF ) ) bDitherBrush_ = GetDitherPixmap(nSalColor); - bBrushGC_ = sal_False; + bBrushGC_ = false; } } @@ -693,7 +693,7 @@ void X11SalGraphics::SetROPLineColor( SalROPColor nROPColor ) break; } nPenColor_ = GetColormap().GetColor( nPenPixel_ ); - bPenGC_ = sal_False; + bPenGC_ = false; } void X11SalGraphics::SetROPFillColor( SalROPColor nROPColor ) @@ -710,9 +710,9 @@ void X11SalGraphics::SetROPFillColor( SalROPColor nROPColor ) nBrushPixel_ = (Pixel)(1 << GetVisual().GetDepth()) - 1; break; } - bDitherBrush_ = sal_False; + bDitherBrush_ = false; nBrushColor_ = GetColormap().GetColor( nBrushPixel_ ); - bBrushGC_ = sal_False; + bBrushGC_ = false; } void X11SalGraphics::SetXORMode( bool bSet, bool ) @@ -720,15 +720,15 @@ void X11SalGraphics::SetXORMode( bool bSet, bool ) if( !bXORMode_ == bSet ) { bXORMode_ = bSet; - bPenGC_ = sal_False; - bFontGC_ = sal_False; - bBrushGC_ = sal_False; - bMonoGC_ = sal_False; - bCopyGC_ = sal_False; - bInvertGC_ = sal_False; - bInvert50GC_ = sal_False; - bStippleGC_ = sal_False; - bTrackingGC_ = sal_False; + bPenGC_ = false; + bFontGC_ = false; + bBrushGC_ = false; + bMonoGC_ = false; + bCopyGC_ = false; + bInvertGC_ = false; + bInvert50GC_ = false; + bStippleGC_ = false; + bTrackingGC_ = false; } } @@ -914,7 +914,7 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly, GC pGC = SelectBrush(); SetClipRegion( pGC, pXRegA ); // ??? twice XDestroyRegion( pXRegA ); - bBrushGC_ = sal_False; + bBrushGC_ = false; XFillRectangle( GetXDisplay(), GetDrawable(), @@ -928,20 +928,20 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly, drawPolyLine( pPoints[i], pPtAry[i], true ); } -sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const sal_uInt8* ) +bool X11SalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const sal_uInt8* ) { - return sal_False; + return false; } -sal_Bool X11SalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const sal_uInt8* ) +bool X11SalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const sal_uInt8* ) { - return sal_False; + return false; } -sal_Bool X11SalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*, +bool X11SalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*, const SalPoint* const*, const sal_uInt8* const* ) { - return sal_False; + return false; } void X11SalGraphics::invert( sal_uInt32 nPoints, @@ -969,9 +969,9 @@ void X11SalGraphics::invert( sal_uInt32 nPoints, Complex, CoordModeOrigin ); } -BOOL X11SalGraphics::drawEPS( long,long,long,long,void*,sal_uLong ) +bool X11SalGraphics::drawEPS( long,long,long,long,void*,sal_uLong ) { - return sal_False; + return false; } XID X11SalGraphics::GetXRenderPicture() diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index 6b1aabe93a91..3daf71bbae57 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -118,7 +118,7 @@ inline GC X11SalGraphics::GetMonoGC( Pixmap hPixmap ) if( !bMonoGC_ ) { SetClipRegion( pMonoGC_ ); - bMonoGC_ = sal_True; + bMonoGC_ = true; } return pMonoGC_; @@ -134,7 +134,7 @@ inline GC X11SalGraphics::GetCopyGC() if( !bCopyGC_ ) { SetClipRegion( pCopyGC_ ); - bCopyGC_ = sal_True; + bCopyGC_ = true; } return pCopyGC_; } @@ -151,7 +151,7 @@ GC X11SalGraphics::GetInvertGC() if( !bInvertGC_ ) { SetClipRegion( pInvertGC_ ); - bInvertGC_ = sal_True; + bInvertGC_ = true; } return pInvertGC_; } @@ -198,7 +198,7 @@ GC X11SalGraphics::GetInvert50GC() if( !bInvert50GC_ ) { SetClipRegion( pInvert50GC_ ); - bInvert50GC_ = sal_True; + bInvert50GC_ = true; } return pInvert50GC_; } @@ -215,7 +215,7 @@ inline GC X11SalGraphics::GetStippleGC() { XSetFunction( GetXDisplay(), pStippleGC_, bXORMode_ ? GXxor : GXcopy ); SetClipRegion( pStippleGC_ ); - bStippleGC_ = sal_True; + bStippleGC_ = true; } return pStippleGC_; @@ -577,7 +577,7 @@ void X11SalGraphics::drawMaskedBitmap( const SalTwoRect& rPosAry, DBG_TESTTRANS( aBG ); // #105055# Disable XOR temporarily - sal_Bool bOldXORMode( bXORMode_ ); + bool bOldXORMode( bXORMode_ ); bXORMode_ = false; // copy pixmap #2 (result) to background diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 84ec4f657873..e0e1ff4bcc2a 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -118,7 +118,7 @@ X11SalGraphics::GetFontGC() { XSetForeground( pDisplay, pFontGC_, nTextPixel_ ); SetClipRegion( pFontGC_ ); - bFontGC_ = sal_True; + bFontGC_ = true; } return pFontGC_; @@ -492,7 +492,7 @@ X11SalGraphics::SetTextColor( SalColor nSalColor ) { nTextColor_ = nSalColor; nTextPixel_ = GetPixel( nSalColor ); - bFontGC_ = sal_False; + bFontGC_ = false; } } @@ -718,7 +718,7 @@ SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const //-------------------------------------------------------------------------- -sal_Bool X11SalGraphics::CreateFontSubset( +bool X11SalGraphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, sal_GlyphId* pGlyphIds, diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index 96d8ed6db943..fde56609167d 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -115,10 +115,10 @@ void X11SalGraphics::Init( X11SalVirtualDevice *pDevice, SalColormap* pColormap, m_pFrame = NULL; bWindow_ = pDisplay->IsDisplay(); - bVirDev_ = sal_True; + bVirDev_ = true; } -sal_Bool X11SalVirtualDevice::Init( SalDisplay *pDisplay, +bool X11SalVirtualDevice::Init( SalDisplay *pDisplay, long nDX, long nDY, sal_uInt16 nBitCount, SalX11Screen nXScreen, @@ -157,7 +157,7 @@ sal_Bool X11SalVirtualDevice::Init( SalDisplay *pDisplay, else { hDrawable_ = hDrawable; - bExternPixmap_ = sal_True; + bExternPixmap_ = true; } pGraphics_->Init( this, pColormap, bDeleteColormap ); @@ -174,8 +174,8 @@ X11SalVirtualDevice::X11SalVirtualDevice() : nDX_ = 0; nDY_ = 0; nDepth_ = 0; - bGraphics_ = sal_False; - bExternPixmap_ = sal_False; + bGraphics_ = false; + bExternPixmap_ = false; } X11SalVirtualDevice::~X11SalVirtualDevice() @@ -194,18 +194,18 @@ SalGraphics* X11SalVirtualDevice::GetGraphics() return NULL; if( pGraphics_ ) - bGraphics_ = sal_True; + bGraphics_ = true; return pGraphics_; } void X11SalVirtualDevice::ReleaseGraphics( SalGraphics* ) -{ bGraphics_ = sal_False; } +{ bGraphics_ = false; } -sal_Bool X11SalVirtualDevice::SetSize( long nDX, long nDY ) +bool X11SalVirtualDevice::SetSize( long nDX, long nDY ) { if( bExternPixmap_ ) - return sal_False; + return false; if( !nDX ) nDX = 1; if( !nDY ) nDY = 1; @@ -224,7 +224,7 @@ sal_Bool X11SalVirtualDevice::SetSize( long nDX, long nDY ) nDX_ = 1; nDY_ = 1; } - return sal_False; + return false; } if( GetDrawable() ) @@ -237,7 +237,7 @@ sal_Bool X11SalVirtualDevice::SetSize( long nDX, long nDY ) if( pGraphics_ ) InitGraphics( this ); - return sal_True; + return true; } void X11SalVirtualDevice::GetSize( long& rWidth, long& rHeight ) diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index e06003daf599..481f44f7c612 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -193,12 +193,12 @@ void X11SalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode ) GetGenericData()->ErrorTrapPop(); } -static sal_Bool lcl_SelectAppIconPixmap( SalDisplay *pDisplay, SalX11Screen nXScreen, +static bool lcl_SelectAppIconPixmap( SalDisplay *pDisplay, SalX11Screen nXScreen, sal_uInt16 nIcon, sal_uInt16 iconSize, Pixmap& icon_pixmap, Pixmap& icon_mask) { if( ! ImplGetResMgr() ) - return sal_False; + return false; sal_uInt16 nIconSizeOffset; @@ -209,11 +209,11 @@ static sal_Bool lcl_SelectAppIconPixmap( SalDisplay *pDisplay, SalX11Screen nXSc else if( iconSize >= 16 ) nIconSizeOffset = SV_ICON_SIZE16_START; else - return sal_False; + return false; BitmapEx aIcon( ResId(nIconSizeOffset + nIcon, *ImplGetResMgr())); - if( sal_True == aIcon.IsEmpty() ) - return sal_False; + if( aIcon.IsEmpty() ) + return false; SalTwoRect aRect; aRect.mnSrcX = 0; aRect.mnSrcY = 0; @@ -264,7 +264,7 @@ static sal_Bool lcl_SelectAppIconPixmap( SalDisplay *pDisplay, SalX11Screen nXSc XFreeGC( pDisplay->GetDisplay(), aMonoGC ); } - return sal_True; + return true; } void X11SalFrame::Init( sal_uLong nSalFrameStyle, SalX11Screen nXScreen, SystemParentData* pParentData, bool bUseGeometry ) @@ -531,8 +531,8 @@ void X11SalFrame::Init( sal_uLong nSalFrameStyle, SalX11Screen nXScreen, SystemP } nShowState_ = SHOWSTATE_UNKNOWN; - bViewable_ = sal_True; - bMapped_ = sal_False; + bViewable_ = true; + bMapped_ = false; nVisibility_ = VisibilityFullyObscured; mhWindow = XCreateWindow( GetXDisplay(), aFrameParent, @@ -729,16 +729,16 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uLong nSalFrameStyle, nHeight_ = 0; nStyle_ = 0; mnExtStyle = 0; - bAlwaysOnTop_ = sal_False; + bAlwaysOnTop_ = false; // set bViewable_ to sal_True: hack GetClientSize to report something // different to 0/0 before first map - bViewable_ = sal_True; - bMapped_ = sal_False; - bDefaultPosition_ = sal_True; + bViewable_ = true; + bMapped_ = false; + bDefaultPosition_ = true; nVisibility_ = VisibilityFullyObscured; m_nWorkArea = 0; - mbInShow = sal_False; + mbInShow = false; m_bXEmbed = false; nScreenSaversTimeout_ = 0; @@ -1009,7 +1009,7 @@ void X11SalFrame::SetIcon( sal_uInt16 nIcon ) } pHints = &Hints; - sal_Bool bOk = lcl_SelectAppIconPixmap( GetDisplay(), m_nXScreen, + bool bOk = lcl_SelectAppIconPixmap( GetDisplay(), m_nXScreen, nIcon, iconSize, pHints->icon_pixmap, pHints->icon_mask ); if ( !bOk ) @@ -1098,7 +1098,7 @@ void X11SalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) setXEmbedInfo(); if( bVisible ) { - mbInShow = sal_True; + mbInShow = true; if( ! (nStyle_ & SAL_FRAME_STYLE_INTRO) ) { // hide all INTRO frames @@ -1712,7 +1712,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState ) } } -sal_Bool X11SalFrame::GetWindowState( SalFrameState* pState ) +bool X11SalFrame::GetWindowState( SalFrameState* pState ) { if( SHOWSTATE_MINIMIZED == nShowState_ ) pState->mnState = WINDOWSTATE_STATE_MINIMIZED; @@ -1751,7 +1751,7 @@ sal_Bool X11SalFrame::GetWindowState( SalFrameState* pState ) pState->mnMask |= _FRAMESTATE_MASK_MAXIMIZED_GEOMETRY; } - return sal_True; + return true; } // native menu implementation - currently empty @@ -2375,10 +2375,10 @@ X11SalFrame::HandleExtTextEvent (XClientMessageEvent *pEvent) // PostEvent -sal_Bool X11SalFrame::PostEvent( void *pData ) +bool X11SalFrame::PostEvent( void *pData ) { GetDisplay()->SendInternalEvent( this, pData ); - return sal_True; + return true; } // Title @@ -2460,10 +2460,10 @@ OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode ) return GetDisplay()->GetKeyName( nKeyCode ); } -sal_Bool X11SalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) +bool X11SalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) { // not supported yet - return sal_False; + return false; } LanguageType X11SalFrame::GetInputLanguage() @@ -3628,9 +3628,9 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) XLIB_Window hWM_Parent; XLIB_Window hRoot, *Children, hDummy; unsigned int nChildren; - sal_Bool bNone = pDisplay_->GetProperties() + bool bNone = pDisplay_->GetProperties() & PROPERTY_SUPPORT_WM_Parent_Pixmap_None; - sal_Bool bAccessParentWindow = ! (pDisplay_->GetProperties() + bool bAccessParentWindow = ! (pDisplay_->GetProperties() & PROPERTY_FEATURE_TrustedSolaris); static const char* pDisableStackingCheck = getenv( "SAL_DISABLE_STACKING_CHECK" ); @@ -4013,8 +4013,8 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) XUnmapWindow( GetXDisplay(), GetShellWindow() ); break; } - bMapped_ = sal_True; - bViewable_ = sal_True; + bMapped_ = true; + bViewable_ = true; nRet = sal_True; if ( mpInputContext != NULL ) mpInputContext->Map( this ); @@ -4065,7 +4065,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) RestackChildren(); - mbInShow = sal_False; + mbInShow = false; m_bSetFocusOnMap = false; } break; @@ -4073,8 +4073,8 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) case UnmapNotify: if( pEvent->xunmap.window == GetShellWindow() ) { - bMapped_ = sal_False; - bViewable_ = sal_False; + bMapped_ = false; + bViewable_ = false; nRet = sal_True; if ( mpInputContext != NULL ) mpInputContext->Unmap( this ); diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index 6f61ced8c416..a694b91bd91b 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -47,7 +47,7 @@ SalObject* X11SalInstance::CreateObject( SalFrame* pParent, SystemWindowData* pW return X11SalObject::CreateObject( pParent, pWindowData, bShow ); } -X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow ) +X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow ) { int error_base, event_base; X11SalObject* pObject = new X11SalObject(); @@ -500,10 +500,10 @@ bool X11SalObject::Dispatch( XEvent* pEvent ) switch( pEvent->type ) { case UnmapNotify: - pObject->mbVisible = sal_False; + pObject->mbVisible = false; return true; case MapNotify: - pObject->mbVisible = sal_True; + pObject->mbVisible = true; return true; case ButtonPress: pObject->CallCallback( SALOBJ_EVENT_TOTOP, NULL ); diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 365f1c9cdd2e..502d30ef125c 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -600,12 +600,12 @@ Bool2String( const uno::Any& rAny ) static bool String2Bool( uno::Any& rAny, const gchar * value ) { - sal_Bool bValue; + bool bValue; if( strncmp( value, STRNCMP_PARAM( "true" ) ) ) - bValue = sal_True; + bValue = true; else if( strncmp( value, STRNCMP_PARAM( "false" ) ) ) - bValue = sal_False; + bValue = false; else return false; diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index bdd24551b768..9df91e511925 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -99,7 +99,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext mnHID_FolderChange( 0 ), mnHID_SelectionChange( 0 ), bVersionWidthUnset( false ), - mbPreviewState( sal_False ), + mbPreviewState( false ), mHID_Preview( 0 ), m_pPreview( NULL ), m_pPseudoFilter( NULL ), @@ -393,7 +393,7 @@ public: OUString getFilter() const { return m_sFilter; } /// determines if the filter has sub filter (i.e., the filter is a filter group in real) - sal_Bool hasSubFilters( ) const; + bool hasSubFilters( ) const; /** retrieves the filters belonging to the entry @return @@ -416,7 +416,7 @@ FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFil } //--------------------------------------------------------------------- -sal_Bool FilterEntry::hasSubFilters() const +bool FilterEntry::hasSubFilters() const { return( 0 < m_aSubFilters.getLength() ); } @@ -518,7 +518,7 @@ namespace { //............................................................................ bool operator () ( const FilterEntry& _rEntry ) { - sal_Bool bMatch; + bool bMatch; if( !_rEntry.hasSubFilters() ) // a real filter bMatch = (_rEntry.getTitle() == rTitle) @@ -544,9 +544,9 @@ namespace { //------------------------------------------------------------------------------------ -sal_Bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) +bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( m_pFilterList ) bRet = @@ -560,9 +560,9 @@ sal_Bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) } //------------------------------------------------------------------------------------ -sal_Bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters ) +bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( m_pFilterList ) { @@ -867,7 +867,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno OUString aNewFilter; OUString aOldFilter = getCurrentFilter(); - sal_Bool bChangeFilter = sal_True; + bool bChangeFilter = true; for ( FilterList::iterator aListIter = m_pFilterList->begin(); aListIter != m_pFilterList->end(); ++aListIter @@ -879,7 +879,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno aNewFilter = aListIter->getTitle(); if( aOldFilter == aListIter->getTitle() ) - bChangeFilter = sal_False; + bChangeFilter = false; bExtensionTypedIn = true; } @@ -1345,7 +1345,7 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr OSL_TRACE("enable unknown control %d", nControlId); else if( tType == GTK_TYPE_TOGGLE_BUTTON ) { - sal_Bool bChecked = false; + bool bChecked = false; rValue >>= bChecked; gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( pWidget ), bChecked ); } @@ -1373,7 +1373,7 @@ uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nC if( !( pWidget = getWidget( nControlId, &tType ) ) ) OSL_TRACE("enable unknown control %d", nControlId); else if( tType == GTK_TYPE_TOGGLE_BUTTON ) - aRetval <<= (sal_Bool) gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( pWidget ) ); + aRetval <<= bool( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( pWidget ) ) ); else if( tType == GTK_TYPE_COMBO_BOX ) aRetval = HandleGetListValue(GTK_COMBO_BOX(pWidget), nControlAction); else @@ -1619,7 +1619,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) throw( u OSL_ASSERT( m_pDialog != NULL ); // TODO return m_pImpl->setShowState( bShowState ); - if( bShowState != mbPreviewState ) + if( bool(bShowState) != mbPreviewState ) { if( bShowState ) { diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index 60e886fed937..4e25b0e14df8 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -206,8 +206,8 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base SalGtkFilePicker( const SalGtkFilePicker& ); SalGtkFilePicker& operator=( const SalGtkFilePicker& ); - sal_Bool FilterNameExists( const OUString& rTitle ); - sal_Bool FilterNameExists( const UnoFilterList& _rGroupedFilters ); + bool FilterNameExists( const OUString& rTitle ); + bool FilterNameExists( const UnoFilterList& _rGroupedFilters ); void ensureFilterList( const OUString& _rInitialCurrentFilter ); @@ -271,7 +271,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base OUString m_aInitialFilter; bool bVersionWidthUnset; - sal_Bool mbPreviewState; + bool mbPreviewState; gulong mHID_Preview; GtkWidget* m_pPreview; GtkFileFilter* m_pPseudoFilter; diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 01915a7c5576..6056a84e0f7a 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -44,8 +44,8 @@ typedef struct _cairo_font_options cairo_font_options_t; const char* const tabPrelitDataName="libreoffice-tab-is-prelit"; // initialize statics -sal_Bool GtkSalGraphics::bThemeChanged = sal_True; -sal_Bool GtkSalGraphics::bNeedPixmapPaint = sal_False; +bool GtkSalGraphics::bThemeChanged = true; +bool GtkSalGraphics::bNeedPixmapPaint = false; GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow ) : X11SalGraphics(), @@ -288,7 +288,7 @@ public: { delete [] pData; m_idx = 0; m_size = n; pData = new NWPixmapCacheData[m_size]; } int GetSize() const { return m_size; } - sal_Bool Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap ); + bool Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap ); void Fill( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap* pPixmap ); void ThemeChanged(); @@ -341,7 +341,7 @@ void NWPixmapCache::ThemeChanged() pData[i].SetPixmap( NULL ); } -sal_Bool NWPixmapCache::Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap ) +bool NWPixmapCache::Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap ) { aState &= ~CTRL_CACHING_ALLOWED; // mask clipping flag int i; @@ -354,10 +354,10 @@ sal_Bool NWPixmapCache::Find( ControlType aType, ControlState aState, const Rec pData[i].m_pixmap != NULL ) { *pPixmap = pData[i].m_pixmap; - return sal_True; + return true; } } - return sal_False; + return false; } void NWPixmapCache::Fill( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap* pPixmap ) @@ -552,7 +552,7 @@ void GtkSalGraphics::copyBits( const SalTwoRect& rPosAry, * Returns sal_True if the platform supports native * drawing of the control defined by nPart */ -sal_Bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) +bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) { switch(nType) { @@ -664,7 +664,7 @@ sal_Bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPar * * returns whether bIsInside was really set. */ -sal_Bool GtkSalGraphics::hitTestNativeControl( ControlType nType, +bool GtkSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, @@ -752,17 +752,17 @@ sal_Bool GtkSalGraphics::hitTestNativeControl( ControlType nType, if ( has_forward2 ) rIsInside |= aForward.IsInside( aPos ); } - return ( sal_True ); + return true; } if( IsNativeControlSupported(nType, nPart) ) { rIsInside = rControlRegion.IsInside( aPos ); - return( sal_True ); + return true; } else { - return( sal_False ); + return false; } } @@ -776,7 +776,7 @@ sal_Bool GtkSalGraphics::hitTestNativeControl( ControlType nType, * aValue: An optional value (tristate/numerical/string) * rCaption: A caption or title string (like button text etc) */ -sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, +bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -793,7 +793,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, for( unsigned int i = 0; i < gWidgetData.size(); i++ ) if( gWidgetData[i].gNWPixmapCacheList ) gWidgetData[i].gNWPixmapCacheList->ThemeChanged(); - GtkSalGraphics::bThemeChanged = sal_False; + GtkSalGraphics::bThemeChanged = false; } Rectangle aCtrlRect( rControlRegion ); @@ -820,7 +820,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, Size( aCtrlRect.GetWidth()+2, aCtrlRect.GetHeight()+2) ); pixmap = NWGetPixmapFromScreen( aPixmapRect ); if( ! pixmap ) - return sal_False; + return false; gdkDrawable = GDK_DRAWABLE( pixmap ); aCtrlRect = Rectangle( Point(1,1), aCtrlRect.GetSize() ); aClip.push_back( aCtrlRect ); @@ -843,7 +843,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, if (gdkDrawable == 0) return false; - sal_Bool returnVal = sal_False; + bool returnVal = false; if ( (nType==CTRL_PUSHBUTTON) && (nPart==PART_ENTIRE_CONTROL) ) { returnVal = NWPaintGTKButton( gdkDrawable, nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption ); @@ -886,7 +886,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, else if ( (nType==CTRL_TAB_ITEM) || (nType==CTRL_TAB_PANE) || (nType==CTRL_TAB_BODY) ) { if ( nType == CTRL_TAB_BODY ) - returnVal = sal_True; + returnVal = true; else returnVal = NWPaintGTKTabItem( nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption); } @@ -977,7 +977,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, * aValue: An optional value (tristate/numerical/string) * rCaption: A caption or title string (like button text etc) */ -sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, +bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -986,7 +986,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { - sal_Bool returnVal = sal_False; + bool returnVal = false; if ( (nType==CTRL_PUSHBUTTON) && (nPart==PART_ENTIRE_CONTROL) && (rControlRegion.GetWidth() > 16) @@ -996,13 +996,13 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, nState, aValue, rCaption ); rNativeContentRegion = rControlRegion; - returnVal = sal_True; + returnVal = true; } if (nType == CTRL_TAB_ITEM && nPart == PART_ENTIRE_CONTROL) { rNativeBoundingRegion = NWGetTabItemRect(m_nXScreen, rControlRegion); rNativeContentRegion = rNativeBoundingRegion; - returnVal = sal_True; + returnVal = true; } if ( (nType==CTRL_COMBOBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) ) { @@ -1010,7 +1010,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, aValue, rCaption ); rNativeContentRegion = rNativeBoundingRegion; - returnVal = sal_True; + returnVal = true; } if ( (nType==CTRL_SPINBOX) && ((nPart==PART_BUTTON_UP) || (nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) ) { @@ -1019,7 +1019,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, aValue, rCaption ); rNativeContentRegion = rNativeBoundingRegion; - returnVal = sal_True; + returnVal = true; } if ( (nType==CTRL_LISTBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) ) { @@ -1027,7 +1027,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, aValue, rCaption ); rNativeContentRegion = rNativeBoundingRegion; - returnVal = sal_True; + returnVal = true; } if ( (nType==CTRL_TOOLBAR) && ((nPart==PART_DRAW_BACKGROUND_HORZ) || @@ -1039,7 +1039,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, { rNativeBoundingRegion = NWGetToolbarRect( m_nXScreen, nType, nPart, rControlRegion, nState, aValue, rCaption ); rNativeContentRegion = rNativeBoundingRegion; - returnVal = sal_True; + returnVal = true; } if ( (nType==CTRL_SCROLLBAR) && ((nPart==PART_BUTTON_LEFT) || (nPart==PART_BUTTON_RIGHT) || (nPart==PART_BUTTON_UP) || (nPart==PART_BUTTON_DOWN) ) ) @@ -1052,7 +1052,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1; if (!rNativeContentRegion.GetHeight()) rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1; - returnVal = sal_True; + returnVal = true; } if( (nType == CTRL_MENUBAR) && (nPart == PART_ENTIRE_CONTROL) ) { @@ -1064,7 +1064,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, Size( aMenuBarRect.GetWidth(), aReq.height+1 ) ); rNativeBoundingRegion = aMenuBarRect; rNativeContentRegion = rNativeBoundingRegion; - returnVal = sal_True; + returnVal = true; } if( nType == CTRL_MENU_POPUP ) { @@ -1084,7 +1084,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, (rControlRegion.GetHeight()-indicator_size)/2), Size( indicator_size, indicator_size ) ); rNativeContentRegion = aIndicatorRect; - returnVal = sal_True; + returnVal = true; } else if( nPart == PART_MENU_SUBMENU_ARROW ) { @@ -1128,7 +1128,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, Size( arrow_extent, arrow_extent )); rNativeBoundingRegion = Rectangle( Point( 0, 0 ), Size( arrow_extent + horizontal_padding, arrow_extent )); - returnVal = sal_True; + returnVal = true; } } if( (nType == CTRL_RADIOBUTTON || nType == CTRL_CHECKBOX) ) @@ -1149,7 +1149,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, (rControlRegion.GetHeight()-indicator_size)/2), Size( indicator_size, indicator_size ) ); rNativeContentRegion = aIndicatorRect; - returnVal = sal_True; + returnVal = true; } if( (nType == CTRL_EDITBOX || nType == CTRL_SPINBOX || nType == CTRL_COMBOBOX) && nPart == PART_ENTIRE_CONTROL ) { @@ -1163,7 +1163,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, Size( aEditRect.GetWidth(), nHeight ) ); rNativeBoundingRegion = aEditRect; rNativeContentRegion = rNativeBoundingRegion; - returnVal = sal_True; + returnVal = true; } if( (nType == CTRL_SLIDER) && (nPart == PART_THUMB_HORZ || nPart == PART_THUMB_VERT) ) { @@ -1187,7 +1187,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, aRect.Right() = aRect.Left() + slider_width - 1; } rNativeBoundingRegion = rNativeContentRegion = aRect; - returnVal = sal_True; + returnVal = true; } if( nType == CTRL_FRAME && nPart == PART_BORDER ) { @@ -1217,7 +1217,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, /************************************************************************ * Individual control drawing functions ************************************************************************/ -sal_Bool GtkSalGraphics::NWPaintGTKArrow( +bool GtkSalGraphics::NWPaintGTKArrow( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -1246,7 +1246,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKArrow( return true; } -sal_Bool GtkSalGraphics::NWPaintGTKListHeader( +bool GtkSalGraphics::NWPaintGTKListHeader( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -1287,7 +1287,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKListHeader( return true; } -sal_Bool GtkSalGraphics::NWPaintGTKFixedLine( +bool GtkSalGraphics::NWPaintGTKFixedLine( GdkDrawable* gdkDrawable, ControlType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -1303,7 +1303,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKFixedLine( return true; } -sal_Bool GtkSalGraphics::NWPaintGTKFrame( +bool GtkSalGraphics::NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -1367,10 +1367,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKFrame( rControlRectangle.GetHeight()); } - return sal_True; + return true; } -sal_Bool GtkSalGraphics::NWPaintGTKWindowBackground( +bool GtkSalGraphics::NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& /* rControlRectangle */, @@ -1391,10 +1391,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKWindowBackground( gtk_paint_flat_box(m_pWindow->style,gdkDrawable,GTK_STATE_NORMAL,GTK_SHADOW_NONE,&clipRect,m_pWindow,"base",0,0,w,h); } - return sal_True; + return true; } -sal_Bool GtkSalGraphics::NWPaintGTKButtonReal( +bool GtkSalGraphics::NWPaintGTKButtonReal( GtkWidget* button, GdkDrawable* gdkDrawable, ControlType, ControlPart, @@ -1408,7 +1408,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKButtonReal( gboolean interiorFocus; gint focusWidth; gint focusPad; - sal_Bool bDrawFocus = sal_True; + bool bDrawFocus = true; gint x, y, w, h; GtkBorder aDefBorder; GtkBorder* pBorder; @@ -1477,7 +1477,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKButtonReal( // If the button is too small, don't ever draw focus or grab more space if ( (w < 16) || (h < 16) ) - bDrawFocus = sal_False; + bDrawFocus = false; gint xi = x, yi = y, wi = w, hi = h; if ( (nState & CTRL_STATE_DEFAULT) && bDrawFocus ) @@ -1528,10 +1528,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKButtonReal( } } - return( sal_True ); + return true; } -sal_Bool GtkSalGraphics::NWPaintGTKButton( +bool GtkSalGraphics::NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType type, ControlPart part, const Rectangle& rControlRectangle, @@ -1558,7 +1558,7 @@ static Rectangle NWGetButtonArea( SalX11Screen nScreen, gint focusPad; GtkBorder aDefBorder; GtkBorder * pBorder; - sal_Bool bDrawFocus = sal_True; + bool bDrawFocus = true; Rectangle aRect; gint x, y, w, h; @@ -1585,7 +1585,7 @@ static Rectangle NWGetButtonArea( SalX11Screen nScreen, // If the button is too small, don't ever draw focus or grab more space if ( (w < 16) || (h < 16) ) - bDrawFocus = sal_False; + bDrawFocus = false; if ( (nState & CTRL_STATE_DEFAULT) && bDrawFocus ) { @@ -1624,7 +1624,7 @@ static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect ) //------------------------------------- -sal_Bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, +bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, const clipList& rClipList, @@ -1634,7 +1634,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, { GtkStateType stateType; GtkShadowType shadowType; - sal_Bool isChecked = (aValue.getTristateVal()==BUTTONVALUE_ON); + bool isChecked = (aValue.getTristateVal()==BUTTONVALUE_ON); gint x, y; GdkRectangle clipRect; @@ -1677,12 +1677,12 @@ sal_Bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, x, y, indicator_size, indicator_size ); } - return( sal_True ); + return true; } //------------------------------------- -sal_Bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable, +bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, const clipList& rClipList, @@ -1724,7 +1724,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable, x, y, indicator_size, indicator_size ); } - return( sal_True ); + return true; } //------------------------------------- @@ -1740,7 +1740,7 @@ static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow ) ) ); } -sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, +bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList&, ControlState nState, @@ -1793,7 +1793,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, scrollbarRect = pixmapRect; if ( (scrollbarRect.GetWidth() <= 1) || (scrollbarRect.GetHeight() <= 1) ) - return( sal_True ); + return true; // Grab some button style attributes gtk_widget_style_get( gWidgetData[m_nXScreen].gScrollHorizWidget, @@ -1906,7 +1906,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, thumbRect.Move( (scrollbarRect.GetWidth() - slider_width) / 2, 0 ); } - sal_Bool has_slider = ( thumbRect.GetWidth() > 0 && thumbRect.GetHeight() > 0 ); + bool has_slider = ( thumbRect.GetWidth() > 0 && thumbRect.GetHeight() > 0 ); scrollbarValues = gtk_range_get_adjustment( GTK_RANGE(scrollbarWidget) ); if ( scrollbarValues == NULL ) @@ -1931,7 +1931,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, // painting them directly to the window flickers pixmap = NWGetPixmapFromScreen( pixmapRect ); if( ! pixmap ) - return sal_False; + return false; x = y = 0; w = pixmapRect.GetWidth(); @@ -2061,11 +2061,11 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, if( !NWRenderPixmapToScreen(pixmap, pixmapRect) ) { g_object_unref( pixmap ); - return( sal_False ); + return false; } g_object_unref( pixmap ); - return( sal_True ); + return true; } //--- @@ -2153,7 +2153,7 @@ static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPa //------------------------------------- -sal_Bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable, +bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, @@ -2178,7 +2178,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable, NWPaintOneEditBox( m_nXScreen, gdkDrawable, &clipRect, nType, nPart, pixmapRect, nState, aValue, rCaption ); } - return( sal_True ); + return true; } @@ -2292,7 +2292,7 @@ static void NWPaintOneEditBox( SalX11Screen nScreen, //------------------------------------- -sal_Bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, +bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList&, ControlState nState, @@ -2343,7 +2343,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart pixmap = NWGetPixmapFromScreen( pixmapRect ); if ( !pixmap ) - return( sal_False ); + return false; // First render background gtk_paint_flat_box(m_pWindow->style,pixmap,GTK_STATE_NORMAL,GTK_SHADOW_NONE,NULL,m_pWindow,"base", @@ -2389,11 +2389,11 @@ sal_Bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart if( !NWRenderPixmapToScreen(pixmap, pixmapRect) ) { g_object_unref( pixmap ); - return( sal_False ); + return false; } g_object_unref( pixmap ); - return( sal_True ); + return true; } //--- @@ -2490,7 +2490,7 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen, //------------------------------------- -sal_Bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable, +bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, @@ -2565,7 +2565,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable, arrowRect.GetWidth(), arrowRect.GetHeight() ); } - return( sal_True ); + return true; } //---- @@ -2630,7 +2630,7 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, -sal_Bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, +bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, const Rectangle& rControlRectangle, const clipList&, ControlState nState, @@ -2776,14 +2776,14 @@ sal_Bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, else aCachePage.Fill( nType, nState, pixmapRect, pixmap ); - sal_Bool bSuccess = NWRenderPixmapToScreen(pixmap, pixmapRect); + bool bSuccess = NWRenderPixmapToScreen(pixmap, pixmapRect); g_object_unref( pixmap ); return bSuccess; } //------------------------------------- -sal_Bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable, +bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, @@ -2856,10 +2856,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable, } } - return( sal_True ); + return true; } -sal_Bool GtkSalGraphics::NWPaintGTKToolbar( +bool GtkSalGraphics::NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -3029,12 +3029,12 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar( } } - return( sal_True ); + return true; } //---- -sal_Bool GtkSalGraphics::NWPaintGTKMenubar( +bool GtkSalGraphics::NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -3117,10 +3117,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKMenubar( } } - return( sal_True ); + return true; } -sal_Bool GtkSalGraphics::NWPaintGTKPopupMenu( +bool GtkSalGraphics::NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -3132,7 +3132,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKPopupMenu( // even crashes) in very old (Fedora Core 4 vintage) gtk's if (gtk_major_version <= 2 && gtk_minor_version <= 8 && nPart == PART_MENU_ITEM && ! (nState & CTRL_STATE_ENABLED) ) - return sal_True; + return true; GtkStateType stateType; GtkShadowType shadowType; @@ -3282,10 +3282,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKPopupMenu( } } - return( sal_True ); + return true; } -sal_Bool GtkSalGraphics::NWPaintGTKTooltip( +bool GtkSalGraphics::NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -3320,10 +3320,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKTooltip( x, y, w, h ); } - return( sal_True ); + return true; } -sal_Bool GtkSalGraphics::NWPaintGTKListNode( +bool GtkSalGraphics::NWPaintGTKListNode( GdkDrawable*, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -3359,7 +3359,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKListNode( GdkPixmap* pixmap = NWGetPixmapFromScreen( aRect ); if( ! pixmap ) - return sal_False; + return false; GdkDrawable* const &pixDrawable = GDK_DRAWABLE( pixmap ); gtk_paint_expander( gWidgetData[m_nXScreen].gTreeView->style, @@ -3371,13 +3371,13 @@ sal_Bool GtkSalGraphics::NWPaintGTKListNode( w/2, h/2, eStyle ); - sal_Bool bRet = NWRenderPixmapToScreen( pixmap, aRect ); + bool bRet = NWRenderPixmapToScreen( pixmap, aRect ); g_object_unref( pixmap ); return bRet; } -sal_Bool GtkSalGraphics::NWPaintGTKProgress( +bool GtkSalGraphics::NWPaintGTKProgress( GdkDrawable*, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -3395,7 +3395,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKProgress( GdkPixmap* pixmap = NWGetPixmapFromScreen( Rectangle( Point( 0, 0 ), Size( w, h ) ) ); if( ! pixmap ) - return sal_False; + return false; GdkDrawable* const &pixDrawable = GDK_DRAWABLE( pixmap ); @@ -3440,13 +3440,13 @@ sal_Bool GtkSalGraphics::NWPaintGTKProgress( } } - sal_Bool bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle ); + bool bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle ); g_object_unref( pixmap ); return bRet; } -sal_Bool GtkSalGraphics::NWPaintGTKSlider( +bool GtkSalGraphics::NWPaintGTKSlider( GdkDrawable*, ControlType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -3465,7 +3465,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKSlider( GdkPixmap* pixmap = NWGetPixmapFromScreen( rControlRectangle ); if( ! pixmap ) - return sal_False; + return false; GdkDrawable* const &pixDrawable = GDK_DRAWABLE( pixmap ); GtkWidget* pWidget = (nPart == PART_TRACK_HORZ_AREA) @@ -3529,7 +3529,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKSlider( } - sal_Bool bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle ); + bool bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle ); g_object_unref( pixmap ); return bRet; @@ -3872,8 +3872,8 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) aStyleSet.SetInactiveTabColor( aSelectedBackColor ); // menu disabled entries handling - aStyleSet.SetSkipDisabledInMenus( sal_True ); - aStyleSet.SetAcceleratorsInContextMenus( sal_False ); + aStyleSet.SetSkipDisabledInMenus( true ); + aStyleSet.SetAcceleratorsInContextMenus( false ); // menu colors GtkStyle* pMenuStyle = gtk_widget_get_style( gWidgetData[m_nXScreen].gMenuWidget ); GtkStyle* pMenuItemStyle = gtk_rc_get_style( gWidgetData[m_nXScreen].gMenuItemMenuWidget ); @@ -4145,18 +4145,18 @@ GdkPixmap* GtkSalGraphics::NWGetPixmapFromScreen( Rectangle srcRect ) * Copy an alpha pixmap to screen using a gc with clipping ************************************************************************/ -sal_Bool GtkSalGraphics::NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect ) +bool GtkSalGraphics::NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect ) { // The GC can't be null, otherwise we'd have no clip region GC aFontGC = GetFontGC(); if( aFontGC == NULL ) { std::fprintf(stderr, "salnativewidgets.cxx: no valid GC\n" ); - return( sal_False ); + return false; } if ( !pPixmap ) - return( sal_False ); + return false; // Copy the background of the screen into a composite pixmap CopyScreenArea( GetXDisplay(), @@ -4167,7 +4167,7 @@ sal_Bool GtkSalGraphics::NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle d aFontGC, 0, 0, dstRect.GetWidth(), dstRect.GetHeight(), dstRect.Left(), dstRect.Top() ); - return( sal_True ); + return true; } diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index b0a6a9f5cf99..eb6609098960 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -198,7 +198,7 @@ GtkSalPrinter::impl_doJob( for (int nPage(0); nPage != nPages; ++nPage) { if (nPage == nPages - 1) - io_rController.setLastPage(sal_True); + io_rController.setLastPage(true); io_rController.printFilteredPage(nPage); } io_rController.setJobState(view::PrintableState_JOB_COMPLETED); @@ -208,7 +208,7 @@ GtkSalPrinter::impl_doJob( } -sal_Bool +bool GtkSalPrinter::StartJob( const OUString* const i_pFileName, const OUString& i_rJobName, @@ -232,7 +232,7 @@ GtkSalPrinter::StartJob( if (!aDialog.run()) { io_rController.abortJob(); - return sal_False; + return false; } aDialog.updateControllerPrintRange(); m_pImpl->m_pPrinter = aDialog.getPrinter(); @@ -267,10 +267,10 @@ GtkSalPrinter::StartJob( } -sal_Bool +bool GtkSalPrinter::EndJob() { - sal_Bool bRet = PspSalPrinter::EndJob(); + bool bRet = PspSalPrinter::EndJob(); if (!lcl_useSystemPrintDialog()) return bRet; @@ -478,8 +478,8 @@ GtkPrintDialog::impl_initCustomTab() sal_Int32 nCurHelpText = 0; OUString aDependsOnName; sal_Int32 nDependsOnValue = 0; - sal_Bool bUseDependencyRow = sal_False; - sal_Bool bIgnore = sal_False; + bool bUseDependencyRow = false; + bool bIgnore = false; GtkWidget* pGroup = NULL; bool bGtkInternal = false; @@ -607,7 +607,7 @@ GtkPrintDialog::impl_initCustomTab() lcl_setHelpText(pWidget, aHelpTexts, 0); m_aControlToPropertyMap[pWidget] = aPropertyName; - sal_Bool bVal = sal_False; + bool bVal = false; pVal = m_rController.getValue(aPropertyName); if (pVal) pVal->Value >>= bVal; diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index 3ba5b0631a87..c89848b69ebd 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -30,7 +30,7 @@ #include <unx/gtk/gtkinst.hxx> #include <unx/gtk/gtkgdi.hxx> -GtkSalObject::GtkSalObject( GtkSalFrame* pParent, sal_Bool bShow ) +GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow ) : m_pSocket( NULL ), m_pRegion( NULL ) { diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 37d1bfad73da..324a06635f84 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -786,7 +786,7 @@ void on_registrar_available( GDBusConnection * /*connection*/, if ( pSalMenu != NULL ) { GtkSalMenu* pGtkSalMenu = static_cast<GtkSalMenu*>(pSalMenu); - pGtkSalMenu->Display( sal_True ); + pGtkSalMenu->Display( true ); pGtkSalMenu->UpdateFull(); } } @@ -807,7 +807,7 @@ void on_registrar_unavailable( GDBusConnection * /*connection*/, if ( pSalMenu ) { GtkSalMenu* pGtkSalMenu = static_cast< GtkSalMenu* >( pSalMenu ); - pGtkSalMenu->Display( sal_False ); + pGtkSalMenu->Display( false ); } } #endif @@ -1534,10 +1534,10 @@ void GtkSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) } } -sal_Bool GtkSalFrame::PostEvent( void* pData ) +bool GtkSalFrame::PostEvent( void* pData ) { getDisplay()->SendInternalEvent( this, pData ); - return sal_True; + return true; } void GtkSalFrame::SetTitle( const OUString& rTitle ) @@ -1806,7 +1806,7 @@ void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) * showing the float (cannot grab it to the float * before show). */ - m_pParent->grabPointer( sal_True, sal_True ); + m_pParent->grabPointer( true, true ); } guint32 nUserTime = 0; @@ -1853,7 +1853,7 @@ void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) { m_nFloats++; if( ! getDisplay()->GetCaptureFrame() && m_nFloats == 1 ) - grabPointer( sal_True, sal_True ); + grabPointer( true, true ); // #i44068# reset parent's IM context if( m_pParent ) m_pParent->EndExtTextInput(0); @@ -1867,7 +1867,7 @@ void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) { m_nFloats--; if( ! getDisplay()->GetCaptureFrame() && m_nFloats == 0) - grabPointer( sal_False ); + grabPointer( false ); } gtk_widget_hide( m_pWindow ); if( m_pIMHandler ) @@ -2191,7 +2191,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState ) } } -sal_Bool GtkSalFrame::GetWindowState( SalFrameState* pState ) +bool GtkSalFrame::GetWindowState( SalFrameState* pState ) { pState->mnState = WINDOWSTATE_STATE_NORMAL; pState->mnMask = WINDOWSTATE_MASK_STATE; @@ -2226,7 +2226,7 @@ sal_Bool GtkSalFrame::GetWindowState( SalFrameState* pState ) WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT; - return sal_True; + return true; } typedef enum { @@ -2681,13 +2681,13 @@ void GtkSalFrame::SetPointer( PointerStyle ePointerStyle ) // #i80791# use grabPointer the same way as CaptureMouse, respective float grab if( getDisplay()->MouseCaptured( this ) ) - grabPointer( sal_True, sal_False ); + grabPointer( true, false ); else if( m_nFloats > 0 ) - grabPointer( sal_True, sal_True ); + grabPointer( true, true ); } } -void GtkSalFrame::grabPointer( sal_Bool bGrab, sal_Bool bOwnerEvents ) +void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents ) { #if !GTK_CHECK_VERSION(3,0,0) static const char* pEnv = getenv( "SAL_NO_MOUSEGRABS" ); @@ -2869,10 +2869,10 @@ void GtkSalFrame::EndExtTextInput( sal_uInt16 nFlags ) m_pIMHandler->endExtTextInput( nFlags ); } -sal_Bool GtkSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) +bool GtkSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) { // not supported yet - return sal_False; + return false; } LanguageType GtkSalFrame::GetInputLanguage() @@ -3898,7 +3898,7 @@ void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer fram { // signalize theme changed for NWF caches // FIXME: should be called only once for a style change - GtkSalGraphics::bThemeChanged = sal_True; + GtkSalGraphics::bThemeChanged = true; } #endif } diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index 976465e74f91..258e1d97cfac 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -28,7 +28,7 @@ const sal_uInt16 START_ITEMID_WINDOWLIST = 4600; const sal_uInt16 END_ITEMID_WINDOWLIST = 4699; -static sal_Bool bMenuVisibility = sal_False; +static bool bMenuVisibility = false; /* * This function generates the proper command name for all actions, including @@ -271,7 +271,7 @@ void GtkSalMenu::ImplUpdate( gboolean bRecurse ) sal_Int32 nItem; for ( nItem = 0; nItem < ( sal_Int32 ) GetItemCount(); nItem++ ) { - if ( IsItemVisible( nItem ) == sal_False ) + if ( !IsItemVisible( nItem ) ) continue; GtkSalMenuItem *pSalMenuItem = GetItemAtPos( nItem ); @@ -384,7 +384,7 @@ void GtkSalMenu::UpdateFull() * GtkSalMenu */ -GtkSalMenu::GtkSalMenu( sal_Bool bMenuBar ) : +GtkSalMenu::GtkSalMenu( bool bMenuBar ) : mbMenuBar( bMenuBar ), mpVCLMenu( NULL ), mpOldSalMenu( NULL ), @@ -399,7 +399,7 @@ GtkSalMenu::~GtkSalMenu() { SolarMutexGuard aGuard; - if ( mbMenuBar == sal_True ) + if ( mbMenuBar ) { if ( mpMenuModel ) { @@ -411,7 +411,7 @@ GtkSalMenu::~GtkSalMenu() maItems.clear(); } -sal_Bool GtkSalMenu::VisibleMenuBar() +bool GtkSalMenu::VisibleMenuBar() { return bMenuVisibility; } @@ -713,7 +713,7 @@ void GtkSalMenu::Activate() void GtkSalMenu::Deactivate( const gchar* aMenuCommand ) { - if ( mbMenuBar == sal_False ) + if ( !mbMenuBar ) return; GtkSalMenu* pSalSubMenu = GetMenuForItemCommand( (gchar*) aMenuCommand, TRUE ); @@ -724,23 +724,23 @@ void GtkSalMenu::Deactivate( const gchar* aMenuCommand ) } } -void GtkSalMenu::Display( sal_Bool bVisible ) +void GtkSalMenu::Display( bool bVisible ) { - if ( mbMenuBar == sal_False || mpVCLMenu == NULL ) + if ( !mbMenuBar || mpVCLMenu == NULL ) return; bMenuVisibility = bVisible; - sal_Bool bVCLMenuVisible = ( bVisible == sal_True ) ? sal_False : sal_True; + bool bVCLMenuVisible = ( bVisible ) ? sal_False : sal_True; MenuBar* pMenuBar = static_cast< MenuBar* >( mpVCLMenu ); pMenuBar->SetDisplayable( bVCLMenuVisible ); } -sal_Bool GtkSalMenu::IsItemVisible( unsigned nPos ) +bool GtkSalMenu::IsItemVisible( unsigned nPos ) { SolarMutexGuard aGuard; - sal_Bool bVisible = sal_False; + bool bVisible = false; if ( nPos < maItems.size() ) bVisible = ( ( GtkSalMenuItem* ) maItems[ nPos ])->mbVisible; @@ -789,7 +789,7 @@ void GtkSalMenu::GetSystemMenuData( SystemMenuData* ) GtkSalMenuItem::GtkSalMenuItem( const SalItemParams* pItemData ) : mnId( pItemData->nId ), mnType( pItemData->eType ), - mbVisible( sal_True ), + mbVisible( true ), mpVCLMenu( pItemData->pMenu ), mpParentMenu( NULL ), mpSubMenu( NULL ) diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index e91c748196cd..6ba0ec33145b 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -396,7 +396,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context, thumbRect.Move( (scrollbarRect.GetWidth() - slider_width) / 2, 0 ); } - sal_Bool has_slider = ( thumbRect.GetWidth() > 0 && thumbRect.GetHeight() > 0 ); + bool has_slider = ( thumbRect.GetWidth() > 0 && thumbRect.GetHeight() > 0 ); // ----------------- TROUGH gtk_style_context_save(context); @@ -785,7 +785,7 @@ void GtkSalGraphics::PaintCheckOrRadio(GtkStyleContext *context, gtk_render_option(context, cr, x, y, indicator_size, indicator_size); } -sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, +bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& ) { @@ -823,7 +823,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart renderType = RENDER_COMBOBOX; break; default: - return sal_False; + return false; } break; case CTRL_MENU_POPUP: @@ -864,7 +864,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart context = mpToolButtonStyle; break; default: - return sal_False; + return false; } break; case CTRL_CHECKBOX: @@ -898,7 +898,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart } break; default: - return sal_False; + return false; } cairo_rectangle_int_t translatedRegion = { (int) rControlRegion.Left() - 1, (int) rControlRegion.Top() - 1, @@ -959,7 +959,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart renderAreaToPix(cr, &translatedRegion); cairo_destroy(cr); // unref - return sal_True; + return true; } // FIXME: This is incredibly lame ... but so is cairo's insistance on -exactly- @@ -1007,7 +1007,7 @@ void GtkSalGraphics::renderAreaToPix( cairo_t *cr, gtk_widget_queue_draw_area( mpFrame->getWindow(), ax, ay, awidth, aheight ); } -sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState, +bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState, const ImplControlValue&, const OUString&, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { @@ -1099,13 +1099,13 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart } else { - return sal_False; + return false; } rNativeBoundingRegion = aEditRect; rNativeContentRegion = rNativeBoundingRegion; - return sal_True; + return true; } /************************************************************************ * helper for GtkSalFrame @@ -1197,8 +1197,8 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) } // menu disabled entries handling - aStyleSet.SetSkipDisabledInMenus( sal_True ); - aStyleSet.SetAcceleratorsInContextMenus( sal_False ); + aStyleSet.SetSkipDisabledInMenus( true ); + aStyleSet.SetAcceleratorsInContextMenus( false ); // menu colors gtk_style_context_get_background_color( mpMenuStyle, GTK_STATE_FLAG_NORMAL, &background_color ); @@ -1439,7 +1439,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) } -sal_Bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) +bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) { if( (nType == CTRL_EDITBOX) || @@ -1463,12 +1463,12 @@ sal_Bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPar (nType == CTRL_MENU_POPUP && ((nPart == PART_MENU_ITEM_CHECK_MARK) || (nPart == PART_MENU_ITEM_RADIO_MARK) || (nPart == PART_MENU_SEPARATOR) || (nPart == PART_MENU_SUBMENU_ARROW)))) - return sal_True; + return true; printf( "Unhandled is native supported for Type: %d, Part %d\n", (int)nType, (int)nPart ); - return sal_False; + return false; } void GtkData::initNWF() {} diff --git a/vcl/unx/kde/UnxCommandThread.cxx b/vcl/unx/kde/UnxCommandThread.cxx index d281949f6e37..4d63289e908d 100644 --- a/vcl/unx/kde/UnxCommandThread.cxx +++ b/vcl/unx/kde/UnxCommandThread.cxx @@ -43,7 +43,7 @@ UnxFilePickerCommandThread::~UnxFilePickerCommandThread() { } -sal_Bool SAL_CALL UnxFilePickerCommandThread::result() +bool SAL_CALL UnxFilePickerCommandThread::result() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -115,10 +115,10 @@ void SAL_CALL UnxFilePickerCommandThread::run() sal_Char *pWhereToRead = pBuffer; sal_Char *pEntryBegin = pBuffer; sal_Int32 nBytesRead = 0; - sal_Bool bShouldExit = sal_False; + bool bShouldExit = false; while ( !bShouldExit && ( nBytesRead = read( m_nReadFD, pWhereToRead, pBufferEnd - pWhereToRead ) ) > 0 ) { - sal_Bool bFoundNL = sal_False; + bool bFoundNL = false; sal_Char *pWhereToReadEnd = pWhereToRead + nBytesRead; sal_Char *pEntryEnd = pWhereToRead; do { @@ -127,11 +127,11 @@ void SAL_CALL UnxFilePickerCommandThread::run() if ( pEntryEnd < pWhereToReadEnd ) { - bFoundNL = sal_True; + bFoundNL = true; *pEntryEnd = 0; if ( strcmp( pEntryBegin, "exited" ) == 0 ) - bShouldExit = sal_True; + bShouldExit = true; else handleCommand( OUString( pEntryBegin, pEntryEnd - pEntryBegin, RTL_TEXTENCODING_UTF8 )/*, bQuit*/ ); @@ -181,12 +181,12 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const OUString &rComman if ( aCommandName == "accept" ) { - m_aResult = sal_True; + m_aResult = true; m_aExecCondition.set(); } else if ( aCommandName == "reject" ) { - m_aResult = sal_False; + m_aResult = false; m_aExecCondition.set(); } else if ( aCommandName == "fileSelectionChanged" ) @@ -210,7 +210,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const OUString &rComman if ( aType == "bool" ) { - sal_Bool bValue = !aList.empty() && aList.front().equalsIgnoreAsciiCase("true"); + bool bValue = !aList.empty() && aList.front().equalsIgnoreAsciiCase("true"); m_aGetValue <<= bValue; m_aGetValueCondition.set(); @@ -275,7 +275,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const OUString &rComman const sal_Unicode *pUnicode = rCommand.getStr(); const sal_Unicode *pEnd = pUnicode + rCommand.getLength(); - sal_Bool bQuoted = sal_False; + bool bQuoted = false; for ( ; pUnicode != pEnd; ++pUnicode ) { diff --git a/vcl/unx/kde/UnxCommandThread.hxx b/vcl/unx/kde/UnxCommandThread.hxx index b893eb3559d7..5a3670564abf 100644 --- a/vcl/unx/kde/UnxCommandThread.hxx +++ b/vcl/unx/kde/UnxCommandThread.hxx @@ -81,7 +81,7 @@ protected: ::osl::Mutex m_aMutex; YieldingCondition m_aExecCondition; - sal_Bool m_aResult; + bool m_aResult; ::osl::Condition m_aGetCurrentFilterCondition; OUString m_aGetCurrentFilter; @@ -100,7 +100,7 @@ public: ~UnxFilePickerCommandThread(); YieldingCondition& SAL_CALL execCondition() { return m_aExecCondition; } - sal_Bool SAL_CALL result(); + bool SAL_CALL result(); ::osl::Condition& SAL_CALL getCurrentFilterCondition() { return m_aGetCurrentFilterCondition; } OUString SAL_CALL getCurrentFilter(); diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index dbf371d673a3..cfd5e3783b8f 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> +#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ControlActions.hpp> @@ -171,7 +172,9 @@ sal_Int16 SAL_CALL UnxFilePicker::execute() m_pCommandThread->execCondition().wait(); - return m_pCommandThread->result(); + return m_pCommandThread->result() + ? css::ui::dialogs::ExecutableDialogResults::OK + : css::ui::dialogs::ExecutableDialogResults::CANCEL; } void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode ) @@ -326,7 +329,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA if ( aType == "checkbox" ) { - sal_Bool bControlValue; + bool bControlValue; if ( ( rValue >>= bControlValue ) && bControlValue ) aBuffer.appendAscii( " true" ); else @@ -808,7 +811,7 @@ void UnxFilePicker::appendEscaped( OUStringBuffer &rBuffer, const OUString &rStr rBuffer.appendAscii( "\"", 1 ); } -sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, OUString &rType, sal_Int32 &rTitleId ) +bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, OUString &rType, sal_Int32 &rTitleId ) { typedef struct { sal_Int16 nId; @@ -856,13 +859,13 @@ sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, OUString &rType, sa rType = *(pPtr->pType); rTitleId = pPtr->nTitle; - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, OUString &rType ) +bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, OUString &rType ) { typedef struct { sal_Int16 nId; @@ -890,7 +893,7 @@ sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, OUString &r rType = pPtr->pType; - return sal_True; + return true; } void UnxFilePicker::sendAppendControlCommand( sal_Int16 nControlId ) diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx index 3459e64a7476..58aec56647e4 100644 --- a/vcl/unx/kde/UnxFilePicker.hxx +++ b/vcl/unx/kde/UnxFilePicker.hxx @@ -162,8 +162,8 @@ protected: void appendEscaped( OUStringBuffer &rBuffer, const OUString &rString ); private: - sal_Bool controlIdInfo( sal_Int16 nControlId, OUString &rType, sal_Int32 &rTitleId ); - sal_Bool controlActionInfo( sal_Int16 nControlId, OUString &rType ); + bool controlIdInfo( sal_Int16 nControlId, OUString &rType, sal_Int32 &rTitleId ); + bool controlActionInfo( sal_Int16 nControlId, OUString &rType ); void sendAppendControlCommand( sal_Int16 nControlId ); }; diff --git a/vcl/unx/kde/UnxNotifyThread.cxx b/vcl/unx/kde/UnxNotifyThread.cxx index ad838405639b..60eb14933082 100644 --- a/vcl/unx/kde/UnxNotifyThread.cxx +++ b/vcl/unx/kde/UnxNotifyThread.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; UnxFilePickerNotifyThread::UnxFilePickerNotifyThread( UnxFilePicker *pUnxFilePicker ) : m_pUnxFilePicker( pUnxFilePicker ), - m_bExit( sal_False ), + m_bExit( false ), m_eNotifyType( Nothing ), m_nControlId( 0 ) { @@ -54,7 +54,7 @@ void SAL_CALL UnxFilePickerNotifyThread::exit() { ::osl::MutexGuard aGuard( m_aMutex ); - m_bExit = sal_True; + m_bExit = true; m_aExitCondition.reset(); m_aNotifyCondition.set(); diff --git a/vcl/unx/kde/UnxNotifyThread.hxx b/vcl/unx/kde/UnxNotifyThread.hxx index a4529453f94e..993bcd61c6c6 100644 --- a/vcl/unx/kde/UnxNotifyThread.hxx +++ b/vcl/unx/kde/UnxNotifyThread.hxx @@ -45,7 +45,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener; - sal_Bool m_bExit; + bool m_bExit; ::osl::Condition m_aExitCondition; NotifyType m_eNotifyType; diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 8d458e56c055..86096366d563 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -270,7 +270,7 @@ class WidgetPainter @param gc The graphics context. */ - sal_Bool drawStyledWidget( QWidget *pWidget, + bool drawStyledWidget( QWidget *pWidget, ControlState nState, const ImplControlValue& aValue, Display *dpy, XLIB_Window drawable, SalX11Screen nXScreen, int nDepth, GC gc, @@ -284,7 +284,7 @@ class WidgetPainter @return valid push button. */ - QPushButton *pushButton( const Rectangle& rControlRegion, sal_Bool bDefault ); + QPushButton *pushButton( const Rectangle& rControlRegion, bool bDefault ); /** 'Get' method for radio button. @@ -305,7 +305,7 @@ class WidgetPainter @see pushButton(), m_pEditableComboBox */ - QComboBox *comboBox( const Rectangle& rControlRegion, sal_Bool bEditable ); + QComboBox *comboBox( const Rectangle& rControlRegion, bool bEditable ); /** 'Get' method for line edit box. @@ -342,13 +342,13 @@ class WidgetPainter @see pushButton() */ QScrollBar *scrollBar( const Rectangle& rControlRegion, - sal_Bool bHorizontal, const ImplControlValue& aValue ); + bool bHorizontal, const ImplControlValue& aValue ); /** 'Get' method for tool bar. @see pushButton() */ - QToolBar *toolBar( const Rectangle& rControlRegion, sal_Bool bHorizontal ); + QToolBar *toolBar( const Rectangle& rControlRegion, bool bHorizontal ); /** 'Get' method for tool button. @@ -463,13 +463,13 @@ WidgetPainter::~WidgetPainter( void ) delete m_pProgressBar, m_pProgressBar = NULL; } -sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget, +bool WidgetPainter::drawStyledWidget( QWidget *pWidget, ControlState nState, const ImplControlValue& aValue, Display *dpy, XLIB_Window drawable, SalX11Screen nXScreen, int nDepth, GC gc, ControlPart nPart ) { if ( !pWidget ) - return sal_False; + return false; // Normalize the widget QPoint qWidgetPos( pWidget->pos() ); @@ -625,7 +625,7 @@ sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget, pTab = m_pTabMiddle; } if ( !pTab ) - return sal_False; + return false; pTab->setRect( qRect ); @@ -817,7 +817,7 @@ sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget, pWidget->colorGroup(), nStyle ); } else - return sal_False; + return false; // Bitblt it to the screen X11SalGraphics::CopyScreenArea( @@ -830,11 +830,11 @@ sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget, // Restore widget's position pWidget->move( qWidgetPos ); - return sal_True; + return true; } QPushButton *WidgetPainter::pushButton( const Rectangle& rControlRegion, - sal_Bool bDefault ) + bool bDefault ) { if ( !m_pPushButton ) m_pPushButton = new QPushButton( NULL, "push_button" ); @@ -929,7 +929,7 @@ QCheckBox *WidgetPainter::checkBox( const Rectangle& rControlRegion ) } QComboBox *WidgetPainter::comboBox( const Rectangle& rControlRegion, - sal_Bool bEditable ) + bool bEditable ) { QComboBox *pComboBox = NULL; if ( bEditable ) @@ -1041,7 +1041,7 @@ QListView *WidgetPainter::listView( const Rectangle& rControlRegion ) } QScrollBar *WidgetPainter::scrollBar( const Rectangle& rControlRegion, - sal_Bool bHorizontal, const ImplControlValue& aValue ) + bool bHorizontal, const ImplControlValue& aValue ) { if ( !m_pScrollBar ) { @@ -1068,7 +1068,7 @@ QScrollBar *WidgetPainter::scrollBar( const Rectangle& rControlRegion, return m_pScrollBar; } -QToolBar *WidgetPainter::toolBar( const Rectangle& rControlRegion, sal_Bool bHorizontal ) +QToolBar *WidgetPainter::toolBar( const Rectangle& rControlRegion, bool bHorizontal ) { if ( !m_pMainWindow ) m_pMainWindow = new QMainWindow( NULL, "main_window" ); @@ -1209,15 +1209,15 @@ class KDESalGraphics : public X11SalGraphics public: KDESalGraphics() {} virtual ~KDESalGraphics() {} - virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); - virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, + virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, bool& rIsInside ) SAL_OVERRIDE; - virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, + virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption ); - virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, + virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption, @@ -1235,7 +1235,7 @@ class KDESalGraphics : public X11SalGraphics @return sal_True if the platform supports native drawing of the widget nType defined by nPart. */ -sal_Bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) +bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) { return ( (nType == CTRL_PUSHBUTTON) && (nPart == PART_ENTIRE_CONTROL) ) || @@ -1270,7 +1270,7 @@ sal_Bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPar aPos was or was not inside the native widget specified by the nType/nPart combination. */ -sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, +bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& rPos, bool& rIsInside ) { @@ -1280,7 +1280,7 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP Point aPos = rPos - rControlRegion.TopLeft(); rIsInside = false; - sal_Bool bHorizontal = ( nPart == PART_BUTTON_LEFT || nPart == PART_BUTTON_RIGHT ); + bool bHorizontal = ( nPart == PART_BUTTON_LEFT || nPart == PART_BUTTON_RIGHT ); QScrollBar *pScrollBar = pWidgetPainter->scrollBar( rControlRegion, bHorizontal, ImplControlValue() ); @@ -1290,10 +1290,10 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarAddLine ); // There are 2 buttons on the right/bottom side of the scrollbar - sal_Bool bTwoSubButtons = sal_False; + bool bTwoSubButtons = false; // It is a Platinum style scroll bar - sal_Bool bPlatinumStyle = sal_False; + bool bPlatinumStyle = false; // Workaround for Platinum and 3 button style scroll bars. // It makes the right/down button bigger. @@ -1303,9 +1303,9 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarAddPage ).right() + 1 ); if ( qRectAddLine.width() > qRectSubLine.width() ) - bTwoSubButtons = sal_True; + bTwoSubButtons = true; if ( qRectSubLine.left() > kapp->style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubPage ).left() ) - bPlatinumStyle = sal_True; + bPlatinumStyle = true; } else { @@ -1313,9 +1313,9 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarAddPage ).bottom() + 1 ); if ( qRectAddLine.height() > qRectSubLine.height() ) - bTwoSubButtons = sal_True; + bTwoSubButtons = true; if ( qRectSubLine.top() > kapp->style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubPage ).top() ) - bPlatinumStyle = sal_True; + bPlatinumStyle = true; } switch ( nPart ) @@ -1356,13 +1356,13 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP // cases PART_TRACK_HORZ_AREA and PART_TRACK_VERT_AREA default: - return sal_False; + return false; } - return sal_True; + return true; } - return sal_False; + return false; } @@ -1377,12 +1377,12 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP @param aCaption A caption or title string (like button text etc.) */ -sal_Bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, +bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& ) { - sal_Bool bReturn = sal_False; + bool bReturn = false; Display *dpy = GetXDisplay(); XLIB_Window drawable = GetDrawable(); @@ -1412,7 +1412,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart else if ( (nType == CTRL_COMBOBOX) && (nPart == PART_ENTIRE_CONTROL) ) { bReturn = pWidgetPainter->drawStyledWidget( - pWidgetPainter->comboBox( rControlRegion, sal_True ), + pWidgetPainter->comboBox( rControlRegion, true ), nState, aValue, dpy, drawable, GetScreenNumber(), GetVisual().GetDepth(), gc ); } @@ -1426,7 +1426,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart else if ( (nType == CTRL_LISTBOX) && (nPart == PART_ENTIRE_CONTROL) ) { bReturn = pWidgetPainter->drawStyledWidget( - pWidgetPainter->comboBox( rControlRegion, sal_False ), + pWidgetPainter->comboBox( rControlRegion, false ), nState, aValue, dpy, drawable, GetScreenNumber(), GetVisual().GetDepth(), gc ); } @@ -1521,13 +1521,13 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart @param aCaption A caption or title string (like button text etc.) */ -sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, +bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue&, const OUString&, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { - sal_Bool bReturn = sal_False; + bool bReturn = false; QRect qBoundingRect = WidgetPainter::region2QRect( rControlRegion ); QRect qRect; @@ -1549,7 +1549,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart QStyle::PM_ButtonDefaultIndicator, pWidget ); qBoundingRect.addCoords( -nIndicatorSize, -nIndicatorSize, nIndicatorSize, nIndicatorSize ); - bReturn = sal_True; + bReturn = true; } break; } @@ -1564,7 +1564,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart qRect.setWidth( kapp->style().pixelMetric( QStyle::PM_ExclusiveIndicatorWidth, pWidget ) ); qRect.setHeight( kapp->style().pixelMetric( QStyle::PM_ExclusiveIndicatorHeight, pWidget ) ); - bReturn = sal_True; + bReturn = true; } break; @@ -1577,7 +1577,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart qRect.setWidth( kapp->style().pixelMetric( QStyle::PM_IndicatorWidth, pWidget ) ); qRect.setHeight( kapp->style().pixelMetric( QStyle::PM_IndicatorHeight, pWidget ) ); - bReturn = sal_True; + bReturn = true; } break; @@ -1594,14 +1594,14 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart QStyle::CC_ComboBox, pWidget, QStyle::SC_ComboBoxEditField ).right() + 1 ); qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); - bReturn = sal_True; + bReturn = true; break; case PART_SUB_EDIT: qRect = kapp->style().querySubControlMetrics( QStyle::CC_ComboBox, pWidget, QStyle::SC_ComboBoxEditField ); qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); - bReturn = sal_True; + bReturn = true; break; } break; @@ -1614,14 +1614,14 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart case PART_BUTTON_UP: qRect = kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetUp ); - bReturn = sal_True; + bReturn = true; qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); break; case PART_BUTTON_DOWN: qRect = kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetDown ); - bReturn = sal_True; + bReturn = true; qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); break; @@ -1629,7 +1629,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart qRect = kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetEditField ); qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); - bReturn = sal_True; + bReturn = true; break; } break; @@ -1671,7 +1671,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); - bReturn = sal_True; + bReturn = true; break; case PART_BUTTON_RIGHT: @@ -1692,7 +1692,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); - bReturn = sal_True; + bReturn = true; break; } break; @@ -1962,7 +1962,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) qMainWindow.createGUI( "/dev/null" ); // hack // Menu - aStyleSettings.SetSkipDisabledInMenus( sal_True ); + aStyleSettings.SetSkipDisabledInMenus( true ); KMenuBar *pMenuBar = qMainWindow.menuBar(); if ( pMenuBar ) { diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx index 6dc97df86cc2..7c29af7a1fee 100644 --- a/vcl/unx/kde4/KDE4FilePicker.hxx +++ b/vcl/unx/kde4/KDE4FilePicker.hxx @@ -152,7 +152,7 @@ private Q_SLOTS: sal_Int16 executeSlot() throw( ::com::sun::star::uno::RuntimeException ) { return execute(); } // XFilePicker functions - void setMultiSelectionModeSlot( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ) { return setMultiSelectionMode( bMode ); } + void setMultiSelectionModeSlot( bool bMode ) throw( ::com::sun::star::uno::RuntimeException ) { return setMultiSelectionMode( bMode ); } void setDefaultNameSlot( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException ) { return setDefaultName( rName ); } void setDisplayDirectorySlot( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException ) { return setDisplayDirectory( rDirectory ); } OUString getDisplayDirectorySlot() throw( ::com::sun::star::uno::RuntimeException ) { return getDisplayDirectory(); } @@ -169,7 +169,7 @@ private Q_SLOTS: // XFilePickerControlAccess functions void setValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException) { return setValue( nControlId, nControlAction, rValue ); } ::com::sun::star::uno::Any getValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException) { return getValue( nControlId, nControlAction ); } - void enableControlSlot( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ) { return enableControl( nControlId, bEnable ); } + void enableControlSlot( sal_Int16 nControlId, bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ) { return enableControl( nControlId, bEnable ); } void setLabelSlot( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException) { return setLabel( nControlId, rLabel ); } OUString getLabelSlot( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException) { return getLabel( nControlId ); } @@ -185,7 +185,7 @@ Q_SIGNALS: sal_Int16 executeSignal(); // XFilePicker functions - void setMultiSelectionModeSignal( sal_Bool bMode ); + void setMultiSelectionModeSignal( bool bMode ); void setDefaultNameSignal( const OUString &rName ); void setDisplayDirectorySignal( const OUString &rDirectory ); OUString getDisplayDirectorySignal(); @@ -202,7 +202,7 @@ Q_SIGNALS: // XFilePickerControlAccess functions void setValueSignal( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ); ::com::sun::star::uno::Any getValueSignal( sal_Int16 nControlId, sal_Int16 nControlAction ); - void enableControlSignal( sal_Int16 nControlId, sal_Bool bEnable ); + void enableControlSignal( sal_Int16 nControlId, bool bEnable ); void setLabelSignal( sal_Int16 nControlId, const OUString &rLabel ); OUString getLabelSignal( sal_Int16 nControlId ); diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index abee781cab1b..a1fa6fd280fc 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -88,7 +88,7 @@ KDESalGraphics::~KDESalGraphics() delete m_image; } -sal_Bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart part ) +bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart part ) { if (type == CTRL_PUSHBUTTON) return true; @@ -242,7 +242,7 @@ static QRegion XRegionToQRegion( XLIB_Region xr ) } #endif -sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, +bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, const Rectangle& rControlRegion, ControlState nControlState, const ImplControlValue& value, const OUString& ) @@ -256,7 +256,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, return false; } - sal_Bool returnVal = true; + bool returnVal = true; QRect widgetRect = region2QRect(rControlRegion); if( type == CTRL_SPINBOX && part == PART_ALL_BUTTONS ) @@ -672,13 +672,13 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, return returnVal; } -sal_Bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, +bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, const Rectangle& controlRegion, ControlState controlState, const ImplControlValue& val, const OUString&, Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion ) { - sal_Bool retVal = false; + bool retVal = false; QRect boundingRect = region2QRect( controlRegion ); QRect contentRect = boundingRect; @@ -950,7 +950,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart p aPos was or was not inside the native widget specified by the nType/nPart combination. */ -sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, +bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& rPos, bool& rIsInside ) { diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx index 0fce28980a74..d865d43204e7 100644 --- a/vcl/unx/kde4/KDESalGraphics.hxx +++ b/vcl/unx/kde4/KDESalGraphics.hxx @@ -43,14 +43,14 @@ class KDESalGraphics : public X11SalGraphics @param part Specification of the widget's part if it consists of more than one. @return true if the platform supports native drawing of the widget type defined by part. */ - virtual sal_Bool IsNativeControlSupported( ControlType type, ControlPart part ); + virtual bool IsNativeControlSupported( ControlType type, ControlPart part ); /** Test whether the position is in the native widget. If the return value is TRUE, bIsInside contains information whether aPos was or was not inside the native widget specified by the type/part combination. */ - virtual sal_Bool hitTestNativeControl( ControlType type, ControlPart part, + virtual bool hitTestNativeControl( ControlType type, ControlPart part, const Rectangle& rControlRegion, const Point& aPos, bool& rIsInside ) SAL_OVERRIDE; /** Draw the requested control described by part/nControlState. @@ -64,7 +64,7 @@ class KDESalGraphics : public X11SalGraphics @param aCaption A caption or title string (like button text etc.) */ - virtual sal_Bool drawNativeControl( ControlType type, ControlPart part, + virtual bool drawNativeControl( ControlType type, ControlPart part, const Rectangle& rControlRegion, ControlState nControlState, const ImplControlValue& aValue, const OUString& aCaption ); @@ -86,7 +86,7 @@ class KDESalGraphics : public X11SalGraphics @param aCaption A caption or title string (like button text etc.) */ - virtual sal_Bool getNativeControlRegion( ControlType type, ControlPart part, + virtual bool getNativeControlRegion( ControlType type, ControlPart part, const Rectangle& rControlRegion, ControlState nControlState, const ImplControlValue& aValue, const OUString& aCaption, |