diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-02-24 01:53:13 +1100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-28 03:19:47 -0600 |
| commit | 381f8a5673b70e31fda2739da25f3863895ae665 (patch) | |
| tree | d9366671e0e2794164ef6cbffbf3e53242139efb /vcl | |
| parent | cd56e54df1df9c9e1a455f81bd86457f1d832604 (diff) | |
sal_Bool -> bool in mostly vcl module
Conflicts:
include/vcl/settings.hxx
svtools/source/table/tablecontrol_impl.cxx
sw/source/core/frmedt/fecopy.cxx
vcl/inc/canvasbitmap.hxx
vcl/inc/headless/svpframe.hxx
vcl/inc/unx/salframe.h
vcl/inc/win/salframe.h
vcl/inc/win/salprn.h
vcl/inc/win/salvd.h
vcl/osx/DragSource.cxx
vcl/osx/DragSource.hxx
vcl/osx/DropTarget.cxx
vcl/osx/DropTarget.hxx
vcl/osx/OSXTransferable.cxx
vcl/osx/OSXTransferable.hxx
vcl/osx/clipboard.cxx
vcl/osx/clipboard.hxx
vcl/osx/salprn.cxx
vcl/qa/cppunit/canvasbitmaptest.cxx
vcl/source/components/fontident.cxx
vcl/source/control/edit.cxx
vcl/source/control/spinfld.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/gdi/virdev.cxx
vcl/source/helper/canvasbitmap.cxx
vcl/source/window/dockwin.cxx
vcl/unx/generic/dtrans/X11_selection.hxx
vcl/unx/kde/UnxFilePicker.cxx
vcl/unx/kde/UnxFilePicker.hxx
vcl/unx/kde4/KDE4FilePicker.cxx
vcl/unx/kde4/KDE4FilePicker.hxx
vcl/unx/kde4/KDESalFrame.hxx
Change-Id: I9866d985da86dea2a56feff23f91c1467a1636b0
Reviewed-on: https://gerrit.libreoffice.org/8219
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
148 files changed, 646 insertions, 656 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 4c2443b51e54..93cb40ec8ac8 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -1138,7 +1138,7 @@ bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) ((FT_OutlineGlyphRec*)pGlyphFT)->outline.flags |= FT_OUTLINE_HIGH_PRECISION; FT_Render_Mode nRenderMode = FT_RENDER_MODE_MONO; - rc = FT_Glyph_To_Bitmap( &pGlyphFT, nRenderMode, NULL, sal_True ); + rc = FT_Glyph_To_Bitmap( &pGlyphFT, nRenderMode, NULL, true ); if( rc != FT_Err_Ok ) { FT_Done_Glyph( pGlyphFT ); @@ -1261,7 +1261,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) bool bEmbedded = (pGlyphFT->format == FT_GLYPH_FORMAT_BITMAP); if( !bEmbedded ) { - rc = FT_Glyph_To_Bitmap( &pGlyphFT, FT_RENDER_MODE_NORMAL, NULL, sal_True ); + rc = FT_Glyph_To_Bitmap( &pGlyphFT, FT_RENDER_MODE_NORMAL, NULL, true ); if( rc != FT_Err_Ok ) { FT_Done_Glyph( pGlyphFT ); diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx index ae8943cbd937..e7bb64467c10 100644 --- a/vcl/generic/print/common_gfx.cxx +++ b/vcl/generic/print/common_gfx.cxx @@ -60,7 +60,7 @@ PrinterGfx::Init (PrinterJob &rPrinterJob) mnDpi = rPrinterJob.GetResolution(); rPrinterJob.GetScale (mfScaleX, mfScaleY); const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rPrinterJob.GetPrinterName() ) ); - mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False; + mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? true : false ) : false; return true; } @@ -72,13 +72,13 @@ PrinterGfx::Init (const JobData& rData) mpPageBody = NULL; mnDepth = rData.m_nColorDepth; mnPSLevel = rData.m_nPSLevel ? rData.m_nPSLevel : (rData.m_pParser ? rData.m_pParser->getLanguageLevel() : 2 ); - mbColor = rData.m_nColorDevice ? ( rData.m_nColorDevice == -1 ? sal_False : sal_True ) : (( rData.m_pParser ? (rData.m_pParser->isColorDevice() ? sal_True : sal_False ) : sal_True ) ); + mbColor = rData.m_nColorDevice ? ( rData.m_nColorDevice == -1 ? false : true ) : (( rData.m_pParser ? (rData.m_pParser->isColorDevice() ? true : false ) : true ) ); int nRes = rData.m_aContext.getRenderResolution(); mnDpi = nRes; mfScaleX = (double)72.0 / (double)mnDpi; mfScaleY = (double)72.0 / (double)mnDpi; const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo( rData.m_aPrinterName ) ); - mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? sal_True : sal_False ) : sal_False; + mbUploadPS42Fonts = rInfo.m_pParser ? ( rInfo.m_pParser->isType42Capable() ? true : false ) : false; return true; } diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 3fb28d2f17e2..f49af9aa7ce7 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -951,7 +951,7 @@ bool PspSalPrinter::StartJob( #endif m_aPrinterGfx.Init( m_aJobData ); - return m_aPrintJob.StartJob( ! m_aTmpFile.isEmpty() ? m_aTmpFile : m_aFileName, nMode, rJobName, rAppName, m_aJobData, &m_aPrinterGfx, bDirect ) ? sal_True : sal_False; + return m_aPrintJob.StartJob( ! m_aTmpFile.isEmpty() ? m_aTmpFile : m_aFileName, nMode, rJobName, rAppName, m_aJobData, &m_aPrinterGfx, bDirect ) ? true : false; } bool PspSalPrinter::EndJob() @@ -986,12 +986,12 @@ bool PspSalPrinter::EndJob() bool PspSalPrinter::AbortJob() { - bool bAbort = m_aPrintJob.AbortJob() ? sal_True : sal_False; + bool bAbort = m_aPrintJob.AbortJob() ? true : false; GetSalData()->m_pInstance->jobEndedPrinterUpdate(); return bAbort; } -SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, sal_Bool ) +SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, bool ) { OSL_TRACE("PspSalPrinter::StartPage"); @@ -1018,7 +1018,7 @@ bool PspSalPrinter::EndPage() bool bResult = m_aPrintJob.EndPage(); m_aPrinterGfx.Clear(); OSL_TRACE("PspSalPrinter::EndPage"); - return bResult ? sal_True : sal_False; + return bResult ? true : false; } sal_uLong PspSalPrinter::GetErrorCode() diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx index abb4b9d835a5..adf08a3cd34f 100644 --- a/vcl/generic/print/glyphset.cxx +++ b/vcl/generic/print/glyphset.cxx @@ -855,7 +855,7 @@ GlyphSet::PSUploadFont (osl::File& rOutFile, PrinterGfx &rGfx, bool bAllowType42 #else (void)rOutFile; (void)rGfx; (void)bAllowType42; (void)rSuppliedFonts; # warning FIXME: Missing OpenTTFontFile outside of Unix ... - return sal_False; + return false; #endif } diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx index 6e15280f830f..b6ef32f69d2a 100644 --- a/vcl/generic/print/printerjob.cxx +++ b/vcl/generic/print/printerjob.cxx @@ -157,9 +157,9 @@ PrinterJob::IsColorPrinter () const bool bColor = false; if( m_aLastJobData.m_nColorDevice ) - bColor = m_aLastJobData.m_nColorDevice == -1 ? sal_False : sal_True; + bColor = m_aLastJobData.m_nColorDevice == -1 ? false : true; else if( m_aLastJobData.m_pParser ) - bColor = m_aLastJobData.m_pParser->isColorDevice() ? sal_True : sal_False; + bColor = m_aLastJobData.m_pParser->isColorDevice() ? true : false; return bColor; } diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx index c45076bb4923..b5e033a127ea 100644 --- a/vcl/headless/svpdummies.cxx +++ b/vcl/headless/svpdummies.cxx @@ -40,7 +40,7 @@ void SvpSalObject::BeginSetClipRegion( sal_uLong ) {} void SvpSalObject::UnionClipRegion( long, long, long, long ) {} void SvpSalObject::EndSetClipRegion() {} void SvpSalObject::SetPosSize( long, long, long, long ) {} -void SvpSalObject::Show( sal_Bool ) {} +void SvpSalObject::Show( bool ) {} const SystemEnvData* SvpSalObject::GetSystemData() const { return &m_aSystemChildData; } // SalI18NImeStatus diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index 98f0a44b343b..e4ab5a1f19c0 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -218,7 +218,7 @@ void SvpSalFrame::SetExtendedFrameStyle( SalExtStyle ) { } -void SvpSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) +void SvpSalFrame::Show( bool bVisible, bool bNoActivate ) { if( bVisible && ! m_bVisible ) { @@ -241,7 +241,7 @@ void SvpSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) } } -void SvpSalFrame::Enable( sal_Bool ) +void SvpSalFrame::Enable( bool ) { } @@ -372,11 +372,11 @@ void SvpSalFrame::ShowFullScreen( bool, sal_Int32 ) SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT ); } -void SvpSalFrame::StartPresentation( sal_Bool ) +void SvpSalFrame::StartPresentation( bool ) { } -void SvpSalFrame::SetAlwaysOnTop( sal_Bool ) +void SvpSalFrame::SetAlwaysOnTop( bool ) { } @@ -389,7 +389,7 @@ void SvpSalFrame::SetPointer( PointerStyle ) { } -void SvpSalFrame::CaptureMouse( sal_Bool ) +void SvpSalFrame::CaptureMouse( bool ) { } diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 9aa08e91ab46..a9953a94478f 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -207,7 +207,7 @@ void SvpSalInstance::DestroyFrame( SalFrame* pFrame ) delete pFrame; } -SalObject* SvpSalInstance::CreateObject( SalFrame*, SystemWindowData*, sal_Bool ) +SalObject* SvpSalInstance::CreateObject( SalFrame*, SystemWindowData*, bool ) { return new SvpSalObject(); } diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h index 539c2b4fadd0..a14a46a501cd 100644 --- a/vcl/inc/generic/genprn.h +++ b/vcl/inc/generic/genprn.h @@ -90,7 +90,7 @@ public: vcl::PrinterController& i_rController ); virtual bool EndJob(); virtual bool AbortJob(); - virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ); + virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ); virtual bool EndPage(); virtual sal_uIntPtr GetErrorCode(); }; diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index 49c2f99dd037..2f1ea8a4c4a2 100644 --- a/vcl/inc/headless/svpdummies.hxx +++ b/vcl/inc/headless/svpdummies.hxx @@ -44,7 +44,7 @@ public: virtual void EndSetClipRegion(); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); - virtual void Show( sal_Bool bVisible ); + virtual void Show( bool bVisible ); virtual const SystemEnvData* GetSystemData() const; }; diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 6068ba54cc0f..63986cf7b22d 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 bool PostEvent( void* pData ); + virtual bool PostEvent( void* pData ); virtual void SetTitle( const OUString& rTitle ); virtual void SetIcon( sal_uInt16 nIcon ); @@ -87,8 +87,8 @@ public: virtual void DrawMenuBar(); virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); - virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False ); - virtual void Enable( sal_Bool bEnable ); + virtual void Show( bool bVisible, bool bNoActivate = sal_False ); + virtual void Enable( bool bEnable ); virtual void SetMinClientSize( long nWidth, long nHeight ); virtual void SetMaxClientSize( long nWidth, long nHeight ); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); @@ -96,21 +96,21 @@ public: virtual void GetWorkArea( Rectangle& rRect ); virtual SalFrame* GetParent() const; virtual void SetWindowState( const SalFrameState* pState ); - virtual bool GetWindowState( SalFrameState* pState ); + virtual bool GetWindowState( SalFrameState* pState ); virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ); - virtual void StartPresentation( sal_Bool bStart ); - virtual void SetAlwaysOnTop( sal_Bool bOnTop ); + virtual void StartPresentation( bool bStart ); + virtual void SetAlwaysOnTop( bool bOnTop ); virtual void ToTop( sal_uInt16 nFlags ); virtual void SetPointer( PointerStyle ePointerStyle ); - virtual void CaptureMouse( sal_Bool bMouse ); + virtual void CaptureMouse( bool bMouse ); virtual void SetPointerPos( long nX, long nY ); using SalFrame::Flush; virtual void Flush(); virtual void Sync(); virtual void SetInputContext( SalInputContext* pContext ); virtual void EndExtTextInput( sal_uInt16 nFlags ); - virtual OUString GetKeyName( sal_uInt16 nKeyCode ); - virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); + virtual OUString GetKeyName( sal_uInt16 nKeyCode ); + 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/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index 79e5e1fe394e..50b0c8b5b5c3 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -114,7 +114,7 @@ public: virtual void DestroyFrame( SalFrame* pFrame ); // Object (System Child Window) - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); + virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ); virtual void DestroyObject( SalObject* pObject ); // VirtualDevice diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index cb90e5de30df..294f7c9a7c9e 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -127,7 +127,7 @@ public: long GetEntryHeight( sal_uInt16 nPos ) const; sal_uInt16 GetEntryCount() const { return (sal_uInt16)maEntries.size(); } - bool HasImages() const { return mnImages ? sal_True : sal_False; } + bool HasImages() const { return mnImages ? true : false; } OUString GetEntryText( sal_uInt16 nPos ) const; diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index 6cc843b68dbc..bbd638ba81f6 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -120,8 +120,8 @@ public: virtual void SetRepresentedURL( const OUString& ); virtual void SetMenu( SalMenu* pSalMenu ); virtual void DrawMenuBar(); - virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False ); - virtual void Enable( sal_Bool bEnable ); + virtual void Show( bool bVisible, bool bNoActivate = false ); + virtual void Enable( bool bEnable ); virtual void SetMinClientSize( long nWidth, long nHeight ); virtual void SetMaxClientSize( long nWidth, long nHeight ); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); @@ -131,11 +131,11 @@ public: virtual void SetWindowState( const SalFrameState* pState ); virtual bool GetWindowState( SalFrameState* pState ); virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ); - virtual void StartPresentation( sal_Bool bStart ); - virtual void SetAlwaysOnTop( sal_Bool bOnTop ); + virtual void StartPresentation( bool bStart ); + virtual void SetAlwaysOnTop( bool bOnTop ); virtual void ToTop( sal_uInt16 nFlags ); virtual void SetPointer( PointerStyle ePointerStyle ); - virtual void CaptureMouse( sal_Bool bMouse ); + virtual void CaptureMouse( bool bMouse ); virtual void SetPointerPos( long nX, long nY ); virtual void Flush( void ); virtual void Flush( const Rectangle& ); diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h index d6d282451bb8..c0b41c214fda 100644 --- a/vcl/inc/osx/salinst.h +++ b/vcl/inc/osx/salinst.h @@ -88,7 +88,7 @@ public: virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ); virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ); virtual void DestroyFrame( SalFrame* pFrame ); - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); + virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ); virtual void DestroyObject( SalObject* pObject ); virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, long nDX, long nDY, @@ -114,7 +114,7 @@ public: virtual bool CheckYieldMutex(); virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ); virtual bool AnyInput( sal_uInt16 nType ); - virtual SalMenu* CreateMenu( sal_Bool bMenuBar, Menu* pVCLMenu ); + virtual SalMenu* CreateMenu( bool bMenuBar, Menu* pVCLMenu ); virtual void DestroyMenu( SalMenu* ); virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ); virtual void DestroyMenuItem( SalMenuItem* ); diff --git a/vcl/inc/osx/salmenu.h b/vcl/inc/osx/salmenu.h index 6bd9b7270073..66ec2f0d6f68 100644 --- a/vcl/inc/osx/salmenu.h +++ b/vcl/inc/osx/salmenu.h @@ -63,8 +63,8 @@ public: virtual void RemoveItem( unsigned nPos ); virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ); virtual void SetFrame( const SalFrame* pFrame ); - virtual void CheckItem( unsigned nPos, sal_Bool bCheck ); - virtual void EnableItem( unsigned nPos, sal_Bool bEnable ); + virtual void CheckItem( unsigned nPos, bool bCheck ); + virtual void EnableItem( unsigned nPos, bool bEnable ); virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage); virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ); diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h index 5994144237c5..f289b721e09c 100644 --- a/vcl/inc/osx/salobj.h +++ b/vcl/inc/osx/salobj.h @@ -66,7 +66,7 @@ public: virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual void EndSetClipRegion(); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); - virtual void Show( sal_Bool bVisible ); + virtual void Show( bool bVisible ); virtual const SystemEnvData* GetSystemData() const; }; diff --git a/vcl/inc/osx/salprn.h b/vcl/inc/osx/salprn.h index 3fb3dc92aa2c..1906cda332a4 100644 --- a/vcl/inc/osx/salprn.h +++ b/vcl/inc/osx/salprn.h @@ -143,7 +143,7 @@ class AquaSalPrinter : public SalPrinter virtual bool EndJob(); virtual bool AbortJob(); - virtual SalGraphics* StartPage( ImplJobSetup* i_pSetupData, sal_Bool i_bNewJobData ); + virtual SalGraphics* StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ); virtual bool EndPage(); virtual sal_uLong GetErrorCode(); diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index 8f8621a6d6a8..9142e7aee7f3 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -127,8 +127,8 @@ public: // Before the window is visible, a resize event // must be sent with the correct size - virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False ) = 0; - virtual void Enable( sal_Bool bEnable ) = 0; + virtual void Show( bool bVisible, bool bNoActivate = false ) = 0; + virtual void Enable( bool bEnable ) = 0; // Set ClientSize and Center the Window to the desktop // and send/post a resize message virtual void SetMinClientSize( long nWidth, long nHeight ) = 0; @@ -146,9 +146,9 @@ public: virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) = 0; // Enable/Disable ScreenSaver, SystemAgents, ... - virtual void StartPresentation( sal_Bool bStart ) = 0; + virtual void StartPresentation( bool bStart ) = 0; // Show Window over all other Windows - virtual void SetAlwaysOnTop( sal_Bool bOnTop ) = 0; + virtual void SetAlwaysOnTop( bool bOnTop ) = 0; // Window to top and grab focus virtual void ToTop( sal_uInt16 nFlags ) = 0; @@ -156,7 +156,7 @@ public: // this function can call with the same // pointer style virtual void SetPointer( PointerStyle ePointerStyle ) = 0; - virtual void CaptureMouse( sal_Bool bMouse ) = 0; + virtual void CaptureMouse( bool bMouse ) = 0; virtual void SetPointerPos( long nX, long nY ) = 0; // flush output buffer @@ -171,7 +171,7 @@ public: virtual OUString GetKeyName( sal_uInt16 nKeyCode ) = 0; // 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 + // returns false if no mapping exists or function not supported // this is required for advanced menu support virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) = 0; diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index bfed8fcd6966..add454786a4d 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -250,7 +250,7 @@ public: // CreateFontSubset: a method to get a subset of glyhps of a font // inside a new valid font file - // returns sal_True if creation of subset was successful + // returns true if creation of subset was successful // parameters: rToFile: contains a osl file URL to write the subset to // pFont: describes from which font to create a subset // pGlyphIDs: the glyph ids to be extracted diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index bcf754873aa2..75b390a0897f 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -75,7 +75,7 @@ public: virtual void DestroyFrame( SalFrame* pFrame ) = 0; // Object (System Child Window) - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ) = 0; + virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) = 0; virtual void DestroyObject( SalObject* pObject ) = 0; // VirtualDevice @@ -128,7 +128,7 @@ public: virtual bool AnyInput( sal_uInt16 nType ) = 0; // menus - virtual SalMenu* CreateMenu( sal_Bool bMenuBar, Menu* pMenu ); + virtual SalMenu* CreateMenu( bool bMenuBar, Menu* pMenu ); virtual void DestroyMenu( SalMenu* pMenu); virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ); virtual void DestroyMenuItem( SalMenuItem* pItem ); diff --git a/vcl/inc/salmenu.hxx b/vcl/inc/salmenu.hxx index 6515fc2fab0f..f0cafe3ea4de 100644 --- a/vcl/inc/salmenu.hxx +++ b/vcl/inc/salmenu.hxx @@ -65,15 +65,15 @@ public: SalMenu() {} virtual ~SalMenu(); - virtual bool VisibleMenuBar() = 0; // must return sal_True to actually DISPLAY native menu bars + virtual bool VisibleMenuBar() = 0; // 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 ) = 0; virtual void RemoveItem( unsigned nPos ) = 0; virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) = 0; virtual void SetFrame( const SalFrame* pFrame ) = 0; - virtual void CheckItem( unsigned nPos, sal_Bool bCheck ) = 0; - virtual void EnableItem( unsigned nPos, sal_Bool bEnable ) = 0; + virtual void CheckItem( unsigned nPos, bool bCheck ) = 0; + virtual void EnableItem( unsigned nPos, bool bEnable ) = 0; virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText )= 0; virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ) = 0; virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ) = 0; @@ -83,7 +83,7 @@ public: virtual void RemoveMenuBarButton( sal_uInt16 nId ); // TODO: implement show/hide for the Win/Mac VCL native backends - virtual void ShowItem( unsigned nPos, sal_Bool bShow ) { EnableItem( nPos, bShow ); } + virtual void ShowItem( unsigned nPos, bool bShow ) { EnableItem( nPos, bShow ); } // return an empty rectangle if not implemented // return Rectangle( Point( -1, -1 ), Size( 1, 1 ) ) if menu bar buttons implemented diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index a9d224f25966..065eb0de7ffc 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -52,14 +52,14 @@ public: virtual void EndSetClipRegion() = 0; virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) = 0; - virtual void Show( sal_Bool bVisible ) = 0; - virtual void Enable( sal_Bool /* nEnable */ ) {} + virtual void Show( bool bVisible ) = 0; + virtual void Enable( bool /* nEnable */ ) {} virtual void GrabFocus() {} virtual void SetBackground() {} virtual void SetBackground( SalColor /* nSalColor */ ) {} - virtual void SetForwardKey( sal_Bool /* bEnable */ ) {} + virtual void SetForwardKey( bool /* bEnable */ ) {} virtual const SystemEnvData* GetSystemData() const = 0; diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx index ce003ff17354..368ec3d0c71e 100644 --- a/vcl/inc/salprn.hxx +++ b/vcl/inc/salprn.hxx @@ -99,7 +99,7 @@ public: ImplJobSetup* pSetupData ) = 0; // implement for pull model print systems only, - // default implementations (see salvtables.cxx) just returns sal_False + // default implementations (see salvtables.cxx) just returns false virtual bool StartJob( const OUString* pFileName, const OUString& rJobName, const OUString& rAppName, @@ -108,7 +108,7 @@ public: virtual bool EndJob() = 0; virtual bool AbortJob() = 0; - virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ) = 0; + virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) = 0; virtual bool EndPage() = 0; virtual sal_uLong GetErrorCode() = 0; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index f46bf003f9cc..7a40ba610fc9 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -137,10 +137,10 @@ struct ImplSVAppData 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 mbSettingsInit; // 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 + Application::DialogCancelMode meDialogCancel; // true: All Dialog::Execute() calls will be terminated immediately with return false long mnDefaultLayoutBorder; // default value in pixel for layout distances used // in window arrangers @@ -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 - bool mbFontSubChanged; // sal_True: FontSubstitution was changed between Begin/End + bool mbFontSubChanged; // 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 - 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 + bool mbNoDeactivate; // true: do not execute Deactivate + bool mbNoSaveFocus; // true: menus must not save/restore focus + bool mbNoSaveBackground; // true: save background is unnecessary or even less performant }; @@ -318,8 +318,8 @@ struct ImplSVData ResMgr* mpResMgr; // SV-Resource-Manager sal_uLong mnTimerPeriod; // current timer period sal_uLong mnTimerUpdate; // TimerCallbackProcs on stack - bool mbNotAllTimerCalled;// sal_True: Es muessen noch Timer abgearbeitet werden - bool mbNoCallTimer; // sal_True: No Timeout calls + bool mbNotAllTimerCalled;// true: Es muessen noch Timer abgearbeitet werden + bool mbNoCallTimer; // 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 diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index bfa420e6d44f..82cee5d47804 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -368,8 +368,8 @@ public: virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); // Before the window is visible, a resize event // must be sent with the correct size - virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False ); - virtual void Enable( sal_Bool bEnable ); + virtual void Show( bool bVisible, bool bNoActivate = false ); + virtual void Enable( bool bEnable ); // Set ClientSize and Center the Window to the desktop // and send/post a resize message virtual void SetMinClientSize( long nWidth, long nHeight ); @@ -382,9 +382,9 @@ public: virtual bool GetWindowState( SalFrameState* pState ); virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ); // Enable/Disable ScreenSaver, SystemAgents, ... - virtual void StartPresentation( sal_Bool bStart ); + virtual void StartPresentation( bool bStart ); // Show Window over all other Windows - virtual void SetAlwaysOnTop( sal_Bool bOnTop ); + virtual void SetAlwaysOnTop( bool bOnTop ); // Window to top and grab focus virtual void ToTop( sal_uInt16 nFlags ); @@ -392,7 +392,7 @@ public: // this function can call with the same // pointer style virtual void SetPointer( PointerStyle ePointerStyle ); - virtual void CaptureMouse( sal_Bool bMouse ); + virtual void CaptureMouse( bool bMouse ); virtual void SetPointerPos( long nX, long nY ); // flush output buffer diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 9ec7c1e6d11d..bb997a6147bc 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -71,11 +71,11 @@ public: virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ); virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ); - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); + virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ); virtual SalSystem* CreateSalSystem(); virtual SalInfoPrinter* CreateInfoPrinter(SalPrinterQueueInfo* pPrinterQueueInfo, ImplJobSetup* pJobSetup); virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ); - virtual SalMenu* CreateMenu( sal_Bool, Menu* ); + virtual SalMenu* CreateMenu( bool, Menu* ); virtual void DestroyMenu( SalMenu* pMenu ); virtual SalMenuItem* CreateMenuItem( const SalItemParams* ); virtual void DestroyMenuItem( SalMenuItem* pItem ); diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx index 39ef5b80222a..34710ff87f64 100644 --- a/vcl/inc/unx/gtk/gtkobject.hxx +++ b/vcl/inc/unx/gtk/gtkobject.hxx @@ -51,9 +51,9 @@ public: virtual void EndSetClipRegion(); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); - virtual void Show( sal_Bool bVisible ); + virtual void Show( bool bVisible ); - virtual void SetForwardKey( sal_Bool bEnable ); + virtual void SetForwardKey( bool bEnable ); virtual const SystemEnvData* GetSystemData() const; }; diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index aa99268f82f8..a2e59e77fb4f 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -66,9 +66,9 @@ public: virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ); virtual void SetFrame( const SalFrame* pFrame ); virtual const GtkSalFrame* GetFrame() const; - virtual void CheckItem( unsigned nPos, sal_Bool bCheck ); - virtual void EnableItem( unsigned nPos, sal_Bool bEnable ); - virtual void ShowItem( unsigned nPos, sal_Bool bShow ); + virtual void CheckItem( unsigned nPos, bool bCheck ); + virtual void EnableItem( unsigned nPos, bool bEnable ); + virtual void ShowItem( unsigned nPos, bool bShow ); virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage); virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ); diff --git a/vcl/inc/unx/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx index 249dde6359c5..0b8afea6d926 100644 --- a/vcl/inc/unx/kde/kdedata.hxx +++ b/vcl/inc/unx/kde/kdedata.hxx @@ -66,7 +66,7 @@ public: virtual void ReleaseGraphics( SalGraphics *pGraphics ); virtual void updateGraphics( bool bClear ); virtual void UpdateSettings( AllSettings& rSettings ); - virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate ); + virtual void Show( bool bVisible, bool bNoActivate ); }; class KDESalInstance : public X11SalInstance diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index a41fac4160c0..e5f41264158d 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -225,10 +225,10 @@ public: virtual void DrawMenuBar(); virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); - virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False ); - virtual void Enable( sal_Bool bEnable ); - virtual void SetMinClientSize( long nWidth, long nHeight ); - virtual void SetMaxClientSize( long nWidth, long nHeight ); + virtual void Show( bool bVisible, bool bNoActivate = false ); + virtual void Enable( bool bEnable ); + virtual void SetMinClientSize( long nWidth, long nHeight ); + virtual void SetMaxClientSize( long nWidth, long nHeight ); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); virtual void GetClientSize( long& rWidth, long& rHeight ); virtual void GetWorkArea( Rectangle& rRect ); @@ -236,11 +236,11 @@ public: virtual void SetWindowState( const SalFrameState* pState ); virtual bool GetWindowState( SalFrameState* pState ); virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nMonitor ); - virtual void StartPresentation( sal_Bool bStart ); - virtual void SetAlwaysOnTop( sal_Bool bOnTop ); + virtual void StartPresentation( bool bStart ); + virtual void SetAlwaysOnTop( bool bOnTop ); virtual void ToTop( sal_uInt16 nFlags ); virtual void SetPointer( PointerStyle ePointerStyle ); - virtual void CaptureMouse( sal_Bool bMouse ); + virtual void CaptureMouse( bool bMouse ); virtual void SetPointerPos( long nX, long nY ); using SalFrame::Flush; virtual void Flush(); diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h index 9c4fd3f7abe7..215b3ff3b451 100644 --- a/vcl/inc/unx/salinst.h +++ b/vcl/inc/unx/salinst.h @@ -50,7 +50,7 @@ public: virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); virtual void DestroyFrame( SalFrame* pFrame ); - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); + virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ); virtual void DestroyObject( SalObject* pObject ); virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h index 5b398ae984c4..93dc2f0bd9de 100644 --- a/vcl/inc/unx/salmenu.h +++ b/vcl/inc/unx/salmenu.h @@ -36,8 +36,8 @@ public: virtual void RemoveItem( unsigned nPos ); virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ); virtual void SetFrame( const SalFrame* pFrame ); - virtual void CheckItem( unsigned nPos, sal_Bool bCheck ); - virtual void EnableItem( unsigned nPos, sal_Bool bEnable ); + virtual void CheckItem( unsigned nPos, bool bCheck ); + virtual void EnableItem( unsigned nPos, bool bEnable ); virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage); virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ); diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h index e8b71eefaa93..5bb5990d0d30 100644 --- a/vcl/inc/unx/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -67,7 +67,7 @@ public: bool mbVisible; static VCL_DLLPUBLIC bool Dispatch( XEvent* pEvent ); - static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = sal_True ); + static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ); X11SalObject(); virtual ~X11SalObject(); @@ -80,7 +80,7 @@ public: virtual void EndSetClipRegion(); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); - virtual void Show( sal_Bool bVisible ); + virtual void Show( bool bVisible ); virtual void GrabFocus(); virtual const SystemEnvData* GetSystemData() const; diff --git a/vcl/inc/unx/tde/tdedata.hxx b/vcl/inc/unx/tde/tdedata.hxx index c6b8dac18d4e..940947b40c90 100644 --- a/vcl/inc/unx/tde/tdedata.hxx +++ b/vcl/inc/unx/tde/tdedata.hxx @@ -76,7 +76,7 @@ public: virtual void ReleaseGraphics( SalGraphics *pGraphics ); virtual void updateGraphics( bool bClear ); virtual void UpdateSettings( AllSettings& rSettings ); - virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate ); + virtual void Show( bool bVisible, bool bNoActivate ); }; class TDESalInstance : public X11SalInstance diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index ecaeca5aee83..8d297cd1b98a 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -68,7 +68,7 @@ public: void initKeyCodeMap(); // checks if the menuhandle was created by VCL - sal_Bool IsKnownMenuHandle( HMENU hMenu ); + bool IsKnownMenuHandle( HMENU hMenu ); public: HINSTANCE mhInst; // default instance handle @@ -86,7 +86,7 @@ public: DWORD mnNextTimerTime; DWORD mnLastEventTime; UINT mnTimerId; // windows timer id - sal_Bool mbInTimerProc; // timer event is currently being dispatched + bool mbInTimerProc; // timer event is currently being dispatched HHOOK mhSalObjMsgHook; // hook to get interesting msg for SalObject HWND mhWantLeaveMsg; // window handle, that want a MOUSELEAVE message AutoTimer* mpMouseLeaveTimer; // Timer for MouseLeave Test @@ -106,16 +106,16 @@ public: sal_uInt16 mnStockBrushCount; // count of static brushes WPARAM mnSalObjWantKeyEvt; // KeyEvent that should be processed by SalObj-Hook BYTE mnCacheDCInUse; // count of CacheDC in use - sal_Bool mbObjClassInit; // is SALOBJECTCLASS initialised - sal_Bool mbInPalChange; // is in WM_QUERYNEWPALETTE + bool mbObjClassInit; // is SALOBJECTCLASS initialised + bool mbInPalChange; // is in WM_QUERYNEWPALETTE DWORD mnAppThreadId; // Id from Applikation-Thread BOOL mbScrSvrEnabled; // ScreenSaver enabled int mnSageStatus; // status of Sage-DLL (DISABLE_AGENT == does not exist) SysAgt_Enable_PROC mpSageEnableProc; // funktion to deactivate the system agent SalIcon* mpFirstIcon; // icon cache, points to first icon, NULL if none TempFontItem* mpTempFontItem; - sal_Bool mbThemeChanged; // true if visual theme was changed: throw away theme handles - sal_Bool mbThemeMenuSupport; + bool mbThemeChanged; // true if visual theme was changed: throw away theme handles + bool mbThemeMenuSupport; // for GdiPlus GdiplusStartup/GdiplusShutdown ULONG_PTR gdiplusToken; @@ -166,13 +166,13 @@ void ImplReleaseTempFonts( SalData& ); HCURSOR ImplLoadSalCursor( int nId ); HBITMAP ImplLoadSalBitmap( int nId ); -sal_Bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon ); +bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon ); void ImplInitSalGDI(); void ImplFreeSalGDI(); void ImplSalYieldMutexAcquireWithWait(); -sal_Bool ImplSalYieldMutexTryToAcquire(); +bool ImplSalYieldMutexTryToAcquire(); void ImplSalYieldMutexAcquire(); void ImplSalYieldMutexRelease(); sal_uLong ImplSalReleaseYieldMutex(); @@ -184,14 +184,14 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l void CALLBACK SalTimerProc( HWND hWnd, UINT nMsg, UINT_PTR nId, DWORD nTime ); void SalTestMouseLeave(); -sal_Bool ImplWriteLastError( DWORD lastError, const char *szApiCall ); +bool ImplWriteLastError( DWORD lastError, const char *szApiCall ); long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ); long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ); -sal_Bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rlResult ); +bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rlResult ); WinSalObject* ImplFindSalObject( HWND hWndChild ); -sal_Bool ImplSalPreDispatchMsg( MSG* pMsg ); +bool ImplSalPreDispatchMsg( MSG* pMsg ); void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT nDispatchResult ); void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont ); diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h index cc8fd16d5126..990d5bf290c0 100644 --- a/vcl/inc/win/salframe.h +++ b/vcl/inc/win/salframe.h @@ -53,35 +53,35 @@ public: int mnFullScreenShowState; // fullscreen restore show state UINT mnInputLang; // current Input Language UINT mnInputCodePage; // current Input CodePage - sal_uIntPtr mnStyle; // style - sal_Bool mbGraphics; // is Graphics used - sal_Bool mbCaption; // has window a caption - sal_Bool mbBorder; // has window a border - sal_Bool mbFixBorder; // has window a fixed border - sal_Bool mbSizeBorder; // has window a sizeable border - sal_Bool mbNoIcon; // is an window without an icon - sal_Bool mbFloatWin; // is a FloatingWindow + sal_uIntPtr mnStyle; // style + bool mbGraphics; // is Graphics used + bool mbCaption; // has window a caption + bool mbBorder; // has window a border + bool mbFixBorder; // has window a fixed border + bool mbSizeBorder; // has window a sizeable border + bool mbNoIcon; // is an window without an icon + bool mbFloatWin; // is a FloatingWindow bool mbFullScreen; // TRUE: in full screen mode - sal_Bool mbPresentation; // TRUE: Presentation Mode running - sal_Bool mbInShow; // innerhalb eines Show-Aufrufs - sal_Bool mbRestoreMaximize; // Restore-Maximize - sal_Bool mbInMoveMsg; // Move-Message wird verarbeitet - sal_Bool mbInSizeMsg; // Size-Message wird verarbeitet - sal_Bool mbFullScreenToolWin; // WS_EX_TOOLWINDOW reset in FullScreenMode - sal_Bool mbDefPos; // default-position - sal_Bool mbOverwriteState; // TRUE: WindowState darf umgesetzt werden - sal_Bool mbIME; // TRUE: We are in IME Mode - sal_Bool mbHandleIME; // TRUE: Wir handeln die IME-Messages - sal_Bool mbSpezIME; // TRUE: Spez IME - sal_Bool mbAtCursorIME; // TRUE: Wir behandeln nur einige IME-Messages - sal_Bool mbCandidateMode; // TRUE: Wir befinden uns im Candidate-Modus - static sal_Bool mbInReparent; // TRUE: ignore focus lost and gain due to reparenting + bool mbPresentation; // TRUE: Presentation Mode running + bool mbInShow; // innerhalb eines Show-Aufrufs + bool mbRestoreMaximize; // Restore-Maximize + bool mbInMoveMsg; // Move-Message wird verarbeitet + bool mbInSizeMsg; // Size-Message wird verarbeitet + bool mbFullScreenToolWin; // WS_EX_TOOLWINDOW reset in FullScreenMode + bool mbDefPos; // default-position + bool mbOverwriteState; // TRUE: WindowState darf umgesetzt werden + bool mbIME; // TRUE: We are in IME Mode + bool mbHandleIME; // TRUE: Wir handeln die IME-Messages + bool mbSpezIME; // TRUE: Spez IME + bool mbAtCursorIME; // TRUE: Wir behandeln nur einige IME-Messages + bool mbCandidateMode; // TRUE: Wir befinden uns im Candidate-Modus + static bool mbInReparent; // TRUE: ignore focus lost and gain due to reparenting - RGNDATA* mpClipRgnData; - RECT* mpNextClipRect; - sal_Bool mbFirstClipRect; - sal_Int32 mnDisplay; // Display used for Fullscreen, 0 is primary monitor - sal_Bool mbPropertiesStored; // has values stored in the window property store + RGNDATA* mpClipRgnData; + RECT* mpNextClipRect; + bool mbFirstClipRect; + sal_Int32 mnDisplay; // Display used for Fullscreen, 0 is primary monitor + bool mbPropertiesStored; // has values stored in the window property store void updateScreenNumber(); public: @@ -96,8 +96,8 @@ public: virtual void SetMenu( SalMenu* pSalMenu ); virtual void DrawMenuBar(); virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ); - virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = FALSE ); - virtual void Enable( sal_Bool bEnable ); + virtual void Show( bool bVisible, bool bNoActivate = FALSE ); + virtual void Enable( bool bEnable ); virtual void SetMinClientSize( long nWidth, long nHeight ); virtual void SetMaxClientSize( long nWidth, long nHeight ); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); @@ -107,11 +107,11 @@ public: virtual void SetWindowState( const SalFrameState* pState ); virtual bool GetWindowState( SalFrameState* pState ); virtual void ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ); - virtual void StartPresentation( sal_Bool bStart ); - virtual void SetAlwaysOnTop( sal_Bool bOnTop ); + virtual void StartPresentation( bool bStart ); + virtual void SetAlwaysOnTop( bool bOnTop ); virtual void ToTop( sal_uInt16 nFlags ); virtual void SetPointer( PointerStyle ePointerStyle ); - virtual void CaptureMouse( sal_Bool bMouse ); + virtual void CaptureMouse( bool bMouse ); virtual void SetPointerPos( long nX, long nY ); using SalFrame::Flush; virtual void Flush(); diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index d41783320bc0..5505130f3b4f 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -171,7 +171,7 @@ public: ImplFontAttrCache* mpFontAttrCache; // Cache font attributes from files in so/share/fonts BYTE* mpFontCharSets; // All Charsets for the current font BYTE mnFontCharSetCount; // Number of Charsets of the current font; 0 - if not queried - sal_Bool mbFontKernInit; // FALSE: FontKerns must be queried + bool mbFontKernInit; // FALSE: FontKerns must be queried KERNINGPAIR* mpFontKernPairs; // Kerning Pairs of the current Font sal_uIntPtr mnFontKernPairCount;// Number of Kerning Pairs of the current Font int mnPenWidth; // Linienbreite diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h index f9f5e0af20cd..083920335cce 100644 --- a/vcl/inc/win/salinst.h +++ b/vcl/inc/win/salinst.h @@ -39,7 +39,7 @@ public: virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ); virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); virtual void DestroyFrame( SalFrame* pFrame ); - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); + virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ); virtual void DestroyObject( SalObject* pObject ); virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, long nDX, long nDY, @@ -66,7 +66,7 @@ public: virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ); virtual bool AnyInput( sal_uInt16 nType ); - virtual SalMenu* CreateMenu( sal_Bool bMenuBar, Menu* ); + virtual SalMenu* CreateMenu( bool bMenuBar, Menu* ); virtual void DestroyMenu( SalMenu* ); virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ); virtual void DestroyMenuItem( SalMenuItem* ); @@ -79,8 +79,8 @@ public: SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, HWND hWndParent, sal_uIntPtr nSalFrameStyle ); SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent ); -HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, sal_Bool bAsChild ); -void ImplSalStartTimer( sal_uIntPtr nMS, sal_Bool bMutex = sal_False ); +HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, bool bAsChild ); +void ImplSalStartTimer( sal_uIntPtr nMS, bool bMutex = false ); void ImplSalPrinterAbortJobAsync( HDC hPrnDC ); #endif // INCLUDED_VCL_INC_WIN_SALINST_H diff --git a/vcl/inc/win/salmenu.h b/vcl/inc/win/salmenu.h index 4fa0d038802d..119bf1dbfc60 100644 --- a/vcl/inc/win/salmenu.h +++ b/vcl/inc/win/salmenu.h @@ -35,15 +35,15 @@ public: virtual void RemoveItem( unsigned nPos ); virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ); virtual void SetFrame( const SalFrame* pFrame ); - virtual void CheckItem( unsigned nPos, sal_Bool bCheck ); - virtual void EnableItem( unsigned nPos, sal_Bool bEnable ); + virtual void CheckItem( unsigned nPos, bool bCheck ); + virtual void EnableItem( unsigned nPos, bool bEnable ); virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const OUString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ); virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& rKeyName ); virtual void GetSystemMenuData( SystemMenuData* pData ); HMENU mhMenu; // the menu handle - sal_Bool mbMenuBar; // true for menu bars + bool mbMenuBar; // true for menu bars HWND mhWnd; // the window handle where the menubar is attached, may be NULL WinSalMenu *mpParentMenu; // the parent menu }; diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h index 5face14e3f16..bbb59ff35868 100644 --- a/vcl/inc/win/salobj.h +++ b/vcl/inc/win/salobj.h @@ -36,7 +36,7 @@ public: RGNDATA* mpClipRgnData; // ClipRegion-Data RGNDATA* mpStdClipRgnData; // Cache Standard-ClipRegion-Data RECT* mpNextClipRect; // Naechstes ClipRegion-Rect - sal_Bool mbFirstClipRect; // Flag for first cliprect to insert + bool mbFirstClipRect; // Flag for first cliprect to insert WinSalObject* mpNextObject; // pointer to next object @@ -49,8 +49,8 @@ public: virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual void EndSetClipRegion(); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); - virtual void Show( sal_Bool bVisible ); - virtual void Enable( sal_Bool nEnable ); + virtual void Show( bool bVisible ); + virtual void Enable( bool nEnable ); virtual void GrabFocus(); virtual const SystemEnvData* GetSystemData() const; }; diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h index c65f7f5c84a3..2c71f7a28484 100644 --- a/vcl/inc/win/salprn.h +++ b/vcl/inc/win/salprn.h @@ -49,12 +49,12 @@ class WinSalGraphics; class WinSalInfoPrinter : public SalInfoPrinter { public: - WinSalGraphics* mpGraphics; // current Printer graphics + WinSalGraphics* mpGraphics; // current Printer graphics OUString maDriverName; // printer driver name OUString maDeviceName; // printer device name OUString maPortName; // printer port name - HDC mhDC; // printer hdc - sal_Bool mbGraphics; // is Graphics used + HDC mhDC; // printer hdc + bool mbGraphics; // is Graphics used public: WinSalInfoPrinter(); virtual ~WinSalInfoPrinter(); @@ -88,8 +88,8 @@ public: HDC mhDC; // printer hdc sal_uIntPtr mnError; // Error Code sal_uIntPtr mnCopies; // Kopien - sal_Bool mbCollate; // Sortierte Kopien - sal_Bool mbAbort; // Job Aborted + bool mbCollate; // Sortierte Kopien + bool mbAbort; // Job Aborted bool mbValid; @@ -107,7 +107,7 @@ public: ImplJobSetup* pSetupData ); virtual bool EndJob(); virtual bool AbortJob(); - virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ); + virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, bool bNewJobData ); virtual bool EndPage(); virtual sal_uIntPtr GetErrorCode(); diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h index 19a0144c04b9..deda8c8aefe2 100644 --- a/vcl/inc/win/salsys.h +++ b/vcl/inc/win/salsys.h @@ -70,7 +70,7 @@ public: const std::vector<DisplayMonitor>& getMonitors() { initMonitors(); return m_aMonitors;} - sal_Bool handleMonitorCallback( sal_IntPtr /*HMONITOR*/, + bool handleMonitorCallback( sal_IntPtr /*HMONITOR*/, sal_IntPtr /*HDC*/, sal_IntPtr /*LPRECT*/ ); }; diff --git a/vcl/inc/win/salvd.h b/vcl/inc/win/salvd.h index b9d3f68d7cc5..b8c6f555fc29 100644 --- a/vcl/inc/win/salvd.h +++ b/vcl/inc/win/salvd.h @@ -42,9 +42,9 @@ public: HBITMAP mhDefBmp; // Default Bitmap WinSalGraphics* mpGraphics; // current VirDev graphics WinSalVirtualDevice* mpNext; // next VirDev - sal_uInt16 mnBitCount; // BitCount (0 or 1) - sal_Bool mbGraphics; // is Graphics used - sal_Bool mbForeignDC; // uses a foreign DC instead of a bitmap + sal_uInt16 mnBitCount; // BitCount (0 or 1) + bool mbGraphics; // is Graphics used + bool mbForeignDC; // uses a foreign DC instead of a bitmap WinSalVirtualDevice(); virtual ~WinSalVirtualDevice(); diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index 4ffc6893cfab..5c243dcf1e61 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -302,10 +302,10 @@ IMPL_LINK( IosSalInstance, DisplayConfigurationChanged, void*, ) for( std::list< SalFrame* >::const_iterator it = getFrames().begin(); it != getFrames().end(); it++ ) { - (*it)->Show( sal_False, sal_False ); + (*it)->Show( false, false ); (*it)->CallCallback( SALEVENT_SETTINGSCHANGED, 0 ); (*it)->SetPosSize(0, 0, viewWidth, viewHeight, SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT); - (*it)->Show( sal_True, sal_False ); + (*it)->Show( true, false ); } touch_ui_damaged( 0, 0, viewWidth, viewHeight ); diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx index 0857116eb58b..d01b4aaf470c 100644 --- a/vcl/osx/OSXTransferable.cxx +++ b/vcl/osx/OSXTransferable.cxx @@ -119,9 +119,9 @@ sal_Bool SAL_CALL OSXTransferable::isDataFlavorSupported(const DataFlavor& aFlav { for (sal_Int32 i = 0; i < mFlavorList.getLength(); i++) if (compareDataFlavors(aFlavor, mFlavorList[i])) - return sal_True; + return true; - return sal_False; + return false; } diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx index 2ccbfdf167fa..7177bef30b1d 100644 --- a/vcl/osx/OSXTransferable.hxx +++ b/vcl/osx/OSXTransferable.hxx @@ -62,10 +62,8 @@ public: virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - // Helper functions not part of the XTransferable interface - void initClipboardItemList(); //com::sun::star::uno::Any getClipboardItemData(ClipboardItemPtr_t clipboardItem); diff --git a/vcl/osx/clipboard.cxx b/vcl/osx/clipboard.cxx index 6932faec07b4..f27f0d37d7a9 100644 --- a/vcl/osx/clipboard.cxx +++ b/vcl/osx/clipboard.cxx @@ -344,4 +344,4 @@ Sequence< OUString > SAL_CALL AquaClipboard::getSupportedServiceNames() throw( R return clipboard_getSupportedServiceNames(); } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index cf46277d9806..30b9a37b5edc 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -205,7 +205,7 @@ static void initAppMenu() -SalMenu* AquaSalInstance::CreateMenu( sal_Bool bMenuBar, Menu* pVCLMenu ) +SalMenu* AquaSalInstance::CreateMenu( bool bMenuBar, Menu* pVCLMenu ) { initAppMenu(); @@ -343,7 +343,7 @@ sal_Int32 removeUnusedItemsRunner(NSMenu * pMenu) bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags) { - // do not use native popup menu when AQUA_NATIVE_MENUS is set to sal_False + // do not use native popup menu when AQUA_NATIVE_MENUS is set to false if( ! VisibleMenuBar() ) { return false; } @@ -633,7 +633,7 @@ void AquaSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsi } } -void AquaSalMenu::CheckItem( unsigned nPos, sal_Bool bCheck ) +void AquaSalMenu::CheckItem( unsigned nPos, bool bCheck ) { if( nPos < maItems.size() ) { @@ -642,7 +642,7 @@ void AquaSalMenu::CheckItem( unsigned nPos, sal_Bool bCheck ) } } -void AquaSalMenu::EnableItem( unsigned nPos, sal_Bool bEnable ) +void AquaSalMenu::EnableItem( unsigned nPos, bool bEnable ) { if( nPos < maItems.size() ) { diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx index 2ed64b1d18e8..574010a98511 100644 --- a/vcl/osx/salnativewidgets.cxx +++ b/vcl/osx/salnativewidgets.cxx @@ -264,7 +264,7 @@ static bool AquaGetScrollRect( /* TODO: int nScreen, */ ControlPart nPart, /* * IsNativeControlSupported() * -------------------------- - * Returns sal_True if the platform supports native + * Returns true if the platform supports native * drawing of the control defined by nPart. * */ @@ -398,7 +398,7 @@ bool AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart n /* * HitTestNativeControl() * - * If the return value is sal_True, bIsInside contains information whether + * If the return value is true, bIsInside contains information whether * aPos was or was not inside the native widget specified by the * nType/nPart combination. */ @@ -409,7 +409,7 @@ bool AquaSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart { Rectangle aRect; bool bValid = AquaGetScrollRect( /* TODO: m_nScreen */ nPart, rControlRegion, aRect ); - rIsInside = bValid ? aRect.IsInside( rPos ) : sal_False; + rIsInside = bValid ? aRect.IsInside( rPos ) : false; if( NSAppKitVersionNumber < NSAppKitVersionNumber10_7 && GetSalData()->mbIsScrollbarDoubleMax ) { @@ -1200,7 +1200,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType, /* * GetNativeControlRegion() * - * If the return value is sal_True, rNativeBoundingRegion + * If the return value is true, rNativeBoundingRegion * contains the true bounding region covered by the control * including any adornment, while rNativeContentRegion contains the area * within the control that can be safely drawn into without drawing over diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx index c4b032647b51..3171b00e3831 100644 --- a/vcl/osx/salprn.cxx +++ b/vcl/osx/salprn.cxx @@ -544,7 +544,7 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName, // inform application that it can release its data // this is awkward, but the XRenderable interface has no method for this, - // so we need to call XRenderadble::render one last time with IsLastPage = sal_True + // so we need to call XRenderadble::render one last time with IsLastPage = true i_rController.setLastPage( true ); GDIMetaFile aPageFile; if( mrContext ) @@ -560,8 +560,6 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName, return bSuccess; } - - bool AquaSalInfoPrinter::EndJob() { mnStartPageOffsetX = mnStartPageOffsetY = 0; @@ -569,8 +567,6 @@ bool AquaSalInfoPrinter::EndJob() return true; } - - bool AquaSalInfoPrinter::AbortJob() { mbJob = false; @@ -579,8 +575,6 @@ bool AquaSalInfoPrinter::AbortJob() return false; } - - SalGraphics* AquaSalInfoPrinter::StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ) { if( i_bNewJobData && i_pSetupData ) @@ -593,8 +587,6 @@ SalGraphics* AquaSalInfoPrinter::StartPage( ImplJobSetup* i_pSetupData, bool i_b return mpGraphics; } - - bool AquaSalInfoPrinter::EndPage() { mpGraphics->InvalidateContext(); @@ -662,7 +654,7 @@ bool AquaSalPrinter::AbortJob() -SalGraphics* AquaSalPrinter::StartPage( ImplJobSetup* i_pSetupData, sal_Bool i_bNewJobData ) +SalGraphics* AquaSalPrinter::StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ) { return mpInfoPrinter->StartPage( i_pSetupData, i_bNewJobData ); } diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index a20a8951507c..f7da2df6b3f8 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -110,7 +110,7 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp, bool(xBmp->hasAlpha()) == aContainedBmpEx.IsTransparent()); CPPUNIT_ASSERT_MESSAGE( "getScaledBitmap() failed", - xBmp->getScaledBitmap( geometry::RealSize2D(500,500), sal_False ).is()); + xBmp->getScaledBitmap( geometry::RealSize2D(500,500), false ).is()); rendering::IntegerBitmapLayout aLayout; uno::Sequence<sal_Int8> aPixelData = xBmp->getData(aLayout, geometry::IntegerRectangle2D(0,0,1,1)); @@ -196,7 +196,7 @@ void checkCanvasBitmap( const rtl::Reference<VclCanvasBitmap>& xBmp, xPal->getNumberOfEntries() == 1L << nOriginalDepth); uno::Sequence<double> aIndex; CPPUNIT_ASSERT_MESSAGE( "Palette is not read-only", - xPal->setIndex(aIndex,sal_True,0) == sal_False); + xPal->setIndex(aIndex,true,0) == false); CPPUNIT_ASSERT_MESSAGE( "Palette entry 0 is not opaque", xPal->getIndex(aIndex,0)); CPPUNIT_ASSERT_MESSAGE( "Palette has no valid color space", @@ -348,7 +348,7 @@ private: return 255; } - virtual ::sal_Bool SAL_CALL getIndex( uno::Sequence< double >& entry, + virtual sal_Bool SAL_CALL getIndex( uno::Sequence< double >& entry, ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, @@ -363,11 +363,11 @@ private: sal_uInt8(nIndex), sal_uInt8(nIndex)) ); - return sal_True; // no palette transparency here. + return true; // no palette transparency here. } - virtual ::sal_Bool SAL_CALL setIndex( const uno::Sequence< double >&, - ::sal_Bool, + virtual sal_Bool SAL_CALL setIndex( const uno::Sequence< double >&, + sal_Bool, ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException, @@ -377,7 +377,7 @@ private: getPalette().is()); CPPUNIT_ASSERT_MESSAGE( "setIndex: index out of range", nIndex >= 0 && nIndex < 256); - return sal_False; + return false; } struct PaletteColorSpaceHolder: public rtl::StaticWithInit<uno::Reference<rendering::XColorSpace>, @@ -679,7 +679,7 @@ public: maLayout.PlaneStride = 0; maLayout.ColorSpace.clear(); maLayout.Palette.clear(); - maLayout.IsMsbFirst = sal_False; + maLayout.IsMsbFirst = false; } }; diff --git a/vcl/qa/cppunit/dndtest.cxx b/vcl/qa/cppunit/dndtest.cxx index 604d8702e4d6..e0f9d92cfa3f 100644 --- a/vcl/qa/cppunit/dndtest.cxx +++ b/vcl/qa/cppunit/dndtest.cxx @@ -126,7 +126,7 @@ public: virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException); virtual Sequence< DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(RuntimeException); - virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException); + virtual bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException); }; @@ -178,7 +178,7 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : if( xDropTarget.is() ) { xDropTarget->addDropTargetListener( xListener ); - xDropTarget->setActive( sal_True ); + xDropTarget->setActive( true ); } Reference< XDragGestureRecognizer > xRecognizer = GetDragGestureRecognizer(); @@ -247,7 +247,7 @@ void SAL_CALL MyDragAndDropListener::dragGestureRecognized( const DragGestureEve void SAL_CALL MyDragAndDropListener::drop( const DropTargetDropEvent& dtde ) throw(RuntimeException) { - dtde.Context->dropComplete( sal_True ); + dtde.Context->dropComplete( true ); } @@ -324,7 +324,7 @@ MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent, if( xDropTarget.is() ) { xDropTarget->addDropTargetListener( xListener ); - xDropTarget->setActive( sal_True ); + xDropTarget->setActive( true ); } Reference< XDragGestureRecognizer > xRecognizer = GetDragGestureRecognizer(); @@ -342,7 +342,7 @@ MyListBox::MyListBox( Window* pParent ) : ListBox( pParent ) if( xDropTarget.is() ) { xDropTarget->addDropTargetListener( xListener ); - xDropTarget->setActive( sal_True ); + xDropTarget->setActive( true ); } Reference< XDragGestureRecognizer > xRecognizer = GetDragGestureRecognizer(); @@ -368,10 +368,10 @@ Sequence< DataFlavor > SAL_CALL StringTransferable::getTransferDataFlavors( ) -sal_Bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& ) +bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& ) throw(RuntimeException) { - return sal_True; + return true; } CPPUNIT_TEST_SUITE_REGISTRATION(VclDnDTest); diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 379bc32a7062..1eab532d4d1a 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -905,8 +905,8 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton ) aData.aInclFilter[sizeof( aData.aInclFilter )-1] = '\0'; aData.aExclFilter[sizeof( aData.aExclFilter )-1] = '\0'; - aData.bOverwrite = maOverwrite.IsChecked() ? sal_True : sal_False; - aData.bHookOSLAssert = maHookOSLBox.IsChecked() ? sal_True : sal_False; + aData.bOverwrite = maOverwrite.IsChecked() ? true : false; + aData.bHookOSLAssert = maHookOSLBox.IsChecked() ? true : false; if ( maXtorThis.IsChecked() ) aData.nTestFlags |= DBG_TEST_XTOR_THIS; @@ -973,7 +973,7 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton ) ) ); aBox.Execute(); } - EndDialog( sal_True ); + EndDialog( true ); } else if ( pButton == &maInfoButton ) { @@ -1491,8 +1491,8 @@ long SolarMessageBoxExecutor::doIt() #if ! defined USE_VCL_MSGBOX #ifdef WNT - sal_Bool bOldCallTimer = pSVData->mbNoCallTimer; - pSVData->mbNoCallTimer = sal_True; + bool bOldCallTimer = pSVData->mbNoCallTimer; + pSVData->mbNoCallTimer = true; nResult = MessageBoxW( 0, (LPWSTR)m_sDebugMessage.getStr(), L"Debug Output", MB_TASKMODAL | MB_YESNOCANCEL | MB_DEFBUTTON2 | MB_ICONSTOP ); pSVData->mbNoCallTimer = bOldCallTimer; diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index d3f377535091..3c0a0f526eb3 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -63,7 +63,7 @@ void SalInstance::FillFontPathList( std::list< OString >& ) // do nothing } -SalMenu* SalInstance::CreateMenu( sal_Bool, Menu* ) +SalMenu* SalInstance::CreateMenu( bool, Menu* ) { // default: no native menus return NULL; diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 123a0f505db3..6d449df9a398 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1636,7 +1636,7 @@ bool InitAccessBridge() // disable accessibility if the user chooses to continue AllSettings aSettings = Application::GetSettings(); MiscSettings aMisc = aSettings.GetMiscSettings(); - aMisc.SetEnableATToolSupport( sal_False ); + aMisc.SetEnableATToolSupport( false ); aSettings.SetMiscSettings( aMisc ); Application::SetSettings( aSettings ); } diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index c25668126900..a4d615424827 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -321,7 +321,7 @@ GenericDragSource::~GenericDragSource() sal_Bool GenericDragSource::isDragImageSupported() throw(std::exception) { - return sal_False; + return false; } sal_Int32 GenericDragSource::getDefaultCursor( sal_Int8 ) throw(std::exception) @@ -337,7 +337,7 @@ void GenericDragSource::startDrag( const datatransfer::dnd::DragGestureEvent&, { datatransfer::dnd::DragSourceDropEvent aEv; aEv.DropAction = datatransfer::dnd::DNDConstants::ACTION_COPY; - aEv.DropSuccess = sal_False; + aEv.DropSuccess = false; listener->dragDropEnd( aEv ); } @@ -444,7 +444,7 @@ void GenericDropTarget::removeDropTargetListener( const Reference< ::com::sun::s sal_Bool GenericDropTarget::isActive() throw(std::exception) { - return sal_False; + return false; } void GenericDropTarget::setActive( sal_Bool ) throw(std::exception) diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx index 82254081e9e0..d6133ea65d57 100644 --- a/vcl/source/components/fontident.cxx +++ b/vcl/source/components/fontident.cxx @@ -106,8 +106,8 @@ Any SAL_CALL FontIdentificator::getMaterial() throw(RuntimeException, std::excep aFD.Underline = 0; aFD.Strikeout = 0; aFD.Orientation = 0; - aFD.Kerning = sal_False; - aFD.WordLineMode = sal_False; + aFD.Kerning = false; + aFD.WordLineMode = false; aFD.Type = 0; switch( m_aFont.GetFamily() ) { diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 94fc477055c3..5c8859a24357 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1682,7 +1682,7 @@ void OKButton::Click() if ( pParent->IsDialog() ) { if ( ((Dialog*)pParent)->IsInExecute() ) - ((Dialog*)pParent)->EndDialog( sal_True ); + ((Dialog*)pParent)->EndDialog( true ); // prevent recursive calls else if ( !((Dialog*)pParent)->IsInClose() ) { @@ -1739,7 +1739,7 @@ void CancelButton::Click() if ( pParent->IsDialog() ) { if ( ((Dialog*)pParent)->IsInExecute() ) - ((Dialog*)pParent)->EndDialog( sal_False ); + ((Dialog*)pParent)->EndDialog( false ); // prevent recursive calls else if ( !((Dialog*)pParent)->IsInClose() ) { diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 64a8e5f56dbc..6b806031d2b6 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -652,7 +652,7 @@ void ComboBox::StateChanged( StateChangedType nType ) else if ( nType == STATE_CHANGE_STYLE ) { SetStyle( ImplInitStyle( GetStyle() ) ); - mpImplLB->GetMainWindow()->EnableSort( ( GetStyle() & WB_SORT ) ? sal_True : sal_False ); + mpImplLB->GetMainWindow()->EnableSort( ( GetStyle() & WB_SORT ) ? true : false ); } else if( nType == STATE_CHANGE_MIRRORING ) { diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 0e89eca8e9bb..0a2170e2040a 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -353,7 +353,7 @@ void Edit::ImplInit( Window* pParent, WinBits nStyle ) xDGR->addDragGestureListener( xDGL ); uno::Reference< datatransfer::dnd::XDropTargetListener> xDTL( mxDnDListener, uno::UNO_QUERY ); GetDropTarget()->addDropTargetListener( xDTL ); - GetDropTarget()->setActive( sal_True ); + GetDropTarget()->setActive( true ); GetDropTarget()->setDefaultActions( datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE ); } } @@ -720,7 +720,7 @@ void Edit::ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uI if ( nMode == EDIT_DELMODE_RESTOFWORD ) { i18n::Boundary aBoundary = xBI->getWordBoundary( maText.toString(), aSelection.Min(), - GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True ); + GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, true ); if ( aBoundary.startPos == aSelection.Min() ) aBoundary = xBI->previousWord( maText.toString(), aSelection.Min(), GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES ); @@ -1356,7 +1356,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt ) { uno::Reference < i18n::XBreakIterator > xBI = ImplGetBreakIterator(); i18n::Boundary aBoundary = xBI->getWordBoundary( maText.toString(), aSelection.Max(), - GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True ); + GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, true ); ImplSetSelection( Selection( aBoundary.startPos, aBoundary.endPos ) ); ImplCopyToSelectionClipboard(); } @@ -1584,7 +1584,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) if ( bWord ) { i18n::Boundary aBoundary = xBI->getWordBoundary( maText.toString(), aSel.Max(), - GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True ); + GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, true ); if ( aBoundary.startPos == aSel.Max() ) aBoundary = xBI->previousWord( maText.toString(), aSel.Max(), GetSettings().GetLanguageTag().getLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES ); @@ -1716,7 +1716,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt ) // Wurde nichts veraendert, dann TAB fuer DialogControl if ( GetSelection().Len() ) - bDone = sal_True; + bDone = true; } } break; @@ -2412,7 +2412,7 @@ void Edit::SetEchoChar( sal_Unicode c ) mpSubEdit->SetEchoChar( c ); } -void Edit::SetReadOnly( sal_Bool bReadOnly ) +void Edit::SetReadOnly( bool bReadOnly ) { if ( mbReadOnly != bool(bReadOnly) ) { diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 0568ad4c9d1b..af2845cefc5e 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -158,38 +158,38 @@ static int ImplIsPatternChar( sal_Unicode cChar, sal_Char cEditMask ) { SAL_WARN( "vcl.control", "ImplIsPatternChar: Exception caught!" ); DBG_UNHANDLED_EXCEPTION(); - return sal_False; + return false; } if ( (cEditMask == EDITMASK_ALPHA) || (cEditMask == EDITMASK_UPPERALPHA) ) { if( !CharClass::isLetterType( nType ) ) - return sal_False; + return false; } else if ( cEditMask == EDITMASK_NUM ) { if( !CharClass::isNumericType( nType ) ) - return sal_False; + return false; } else if ( (cEditMask == EDITMASK_ALPHANUM) || (cEditMask == EDITMASK_UPPERALPHANUM) ) { if( !CharClass::isLetterNumericType( nType ) ) - return sal_False; + return false; } else if ( (cEditMask == EDITMASK_ALLCHAR) || (cEditMask == EDITMASK_UPPERALLCHAR) ) { if ( cChar < 32 ) - return sal_False; + return false; } else if ( cEditMask == EDITMASK_NUMSPACE ) { if ( !CharClass::isNumericType( nType ) && ( cChar != ' ' ) ) - return sal_False; + return false; } else - return sal_False; + return false; - return sal_True; + return true; } static sal_Unicode ImplPatternChar( sal_Unicode cChar, sal_Char cEditMask ) @@ -212,12 +212,12 @@ static sal_Unicode ImplPatternChar( sal_Unicode cChar, sal_Char cEditMask ) static int ImplCommaPointCharEqual( sal_Unicode c1, sal_Unicode c2 ) { if ( c1 == c2 ) - return sal_True; + return true; else if ( ((c1 == '.') || (c1 == ',')) && ((c2 == '.') || (c2 == ',')) ) - return sal_True; + return true; else - return sal_False; + return false; } static OUString ImplPatternReformat( const OUString& rStr, diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 6ece054b39df..ae3a58f514a6 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -443,7 +443,7 @@ sal_uInt16 ImplEntryList::GetSelectEntryPos( sal_uInt16 nIndex ) const bool ImplEntryList::IsEntryPosSelected( sal_uInt16 nIndex ) const { ImplEntryType* pImplEntry = GetEntry( nIndex ); - return pImplEntry ? pImplEntry->mbIsSelected : sal_False; + return pImplEntry ? pImplEntry->mbIsSelected : false; } bool ImplEntryList::IsEntrySelectable( sal_uInt16 nPos ) const @@ -969,7 +969,7 @@ void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, bool bSelect ) sal_uInt16 nDeselect = GetEntryList()->GetSelectEntryPos( 0 ); if( nDeselect != LISTBOX_ENTRY_NOTFOUND ) { - //SelectEntryPos( nDeselect, sal_False ); + //SelectEntryPos( nDeselect, false ); GetEntryList()->SelectEntry( nDeselect, false ); if ( IsUpdateMode() && IsReallyVisible() ) ImplPaint( nDeselect, true ); @@ -1047,7 +1047,7 @@ bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, b // Space for selection change if( !bShift && ( ( eLET == LET_KEYSPACE ) || ( eLET == LET_MBDOWN ) ) ) { - bool bSelect = ( mbStackMode && IsMouseMoveSelect() ) ? sal_True : !mpEntryList->IsEntryPosSelected( nSelect ); + bool bSelect = ( mbStackMode && IsMouseMoveSelect() ) ? true : !mpEntryList->IsEntryPosSelected( nSelect ); if ( mbStackMode ) { sal_uInt16 n; diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index f77ffe074f2d..6d6474cfb400 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -863,8 +863,8 @@ void ListBox::StateChanged( StateChangedType nType ) else if ( nType == STATE_CHANGE_STYLE ) { SetStyle( ImplInitStyle( GetStyle() ) ); - mpImplLB->GetMainWindow()->EnableSort( ( GetStyle() & WB_SORT ) ? sal_True : sal_False ); - bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) ? sal_True : sal_False; + mpImplLB->GetMainWindow()->EnableSort( ( GetStyle() & WB_SORT ) ? true : false ); + bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) ? true : false; mpImplLB->SetMultiSelectionSimpleMode( bSimpleMode ); } else if( nType == STATE_CHANGE_MIRRORING ) @@ -1185,7 +1185,7 @@ void ListBox::EnableMultiSelection( bool bMulti, bool bStackSelection ) // WB_SIMPLEMODE: // The MultiListBox behaves just like a normal ListBox // MultiSelection is possible via corresponding additional keys - bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) ? sal_True : sal_False; + bool bSimpleMode = ( GetStyle() & WB_SIMPLEMODE ) ? true : false; mpImplLB->SetMultiSelectionSimpleMode( bSimpleMode ); // In a MultiSelection, we can't see us travelling without focus diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index 2940d28a2518..c14df7b195df 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -196,7 +196,7 @@ void ProgressBar::StateChanged( StateChangedType nType ) if ( (nType == STATE_CHANGE_ZOOM) || (nType == STATE_CHANGE_CONTROLFONT) ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); Invalidate(); } else diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index d270b241178c..fcd035cb27f8 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -991,7 +991,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) } else if(bPage && (HitTestNativeControl( CTRL_SCROLLBAR, bHorizontal? PART_TRACK_HORZ_AREA : PART_TRACK_VERT_AREA, aControlRegion, rMousePos, bIsInside ) ? - bIsInside : sal_True) ) + bIsInside : true) ) { nTrackFlags = STARTTRACK_BUTTONREPEAT; diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 5c6c2028ff43..9091c1d93aa8 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -411,7 +411,7 @@ void SpinField::MouseButtonDown( const MouseEvent& rMEvt ) else if ( maDropDownRect.IsInside( rMEvt.GetPosPixel() ) ) { // put DropDownButton to the right - mbInDropDown = ShowDropDown( mbInDropDown ? sal_False : sal_True ); + mbInDropDown = ShowDropDown( mbInDropDown ? false : true ); Paint( Rectangle( Point(), GetOutputSizePixel() ) ); } @@ -527,7 +527,7 @@ bool SpinField::Notify( NotifyEvent& rNEvt ) } else if ( ( nMod == KEY_MOD2 ) && !mbInDropDown && ( GetStyle() & WB_DROPDOWN ) ) { - mbInDropDown = ShowDropDown( sal_True ); + mbInDropDown = ShowDropDown( true ); Paint( Rectangle( Point(), GetOutputSizePixel() ) ); nDone = true; } @@ -911,7 +911,7 @@ void SpinField::EndDropDown() Paint( Rectangle( Point(), GetOutputSizePixel() ) ); } -bool SpinField::ShowDropDown( sal_Bool ) +bool SpinField::ShowDropDown( bool ) { return false; } diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index 30c8dc49db7e..9308728bb6f6 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -255,7 +255,7 @@ public: virtual void CreateAnchor(); - virtual bool SetCursorAtPoint( const Point& rPointPixel, sal_Bool bDontSelectAtCursor = sal_False ); + virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ); virtual bool IsSelectionAtPoint( const Point& rPointPixel ); virtual void DeselectAll(); diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 46d0ad7ccd27..b6edd64a78ac 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -751,7 +751,7 @@ TextPaM TextEngine::ImpInsertText( sal_Unicode c, const TextSelection& rCurSel, if ( IsUndoEnabled() && !IsInUndo() ) { TextUndoInsertChars* pNewUndo = new TextUndoInsertChars( this, aPaM, OUString(c) ); - bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False; + bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? true : false; InsertUndo( pNewUndo, bTryMerge ); } @@ -1694,9 +1694,9 @@ void TextEngine::ImpBreakLine( sal_uLong nPara, TextLine* pLine, TETextPortion*, i18n::LineBreakUserOptions aUserOptions; aUserOptions.forbiddenBeginCharacters = ImpGetLocaleDataWrapper()->getForbiddenCharacters().beginLine; aUserOptions.forbiddenEndCharacters = ImpGetLocaleDataWrapper()->getForbiddenCharacters().endLine; - aUserOptions.applyForbiddenRules = sal_True; - aUserOptions.allowPunctuationOutsideMargin = sal_False; - aUserOptions.allowHyphenateEnglish = sal_False; + aUserOptions.applyForbiddenRules = true; + aUserOptions.allowPunctuationOutsideMargin = false; + aUserOptions.allowHyphenateEnglish = false; static const com::sun::star::lang::Locale aDefLocale; i18n::LineBreakResults aLBR = xBI->getLineBreak( pNode->GetText(), nMaxBreakPos, aDefLocale, pLine->GetStart(), aHyphOptions, aUserOptions ); @@ -2152,7 +2152,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan bool TextEngine::CreateLines( sal_uLong nPara ) { - // sal_Bool: changing Height of Paragraph Yes/No - sal_True/sal_False + // bool: changing Height of Paragraph Yes/No - true/false TextNode* pNode = mpDoc->GetNodes().GetObject( nPara ); TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPara ); @@ -2491,7 +2491,7 @@ OUString TextEngine::GetWord( const TextPaM& rCursorPos, TextPaM* pStartOfWord ) TextSelection aSel( rCursorPos ); TextNode* pNode = mpDoc->GetNodes().GetObject( rCursorPos.GetPara() ); uno::Reference < i18n::XBreakIterator > xBI = GetBreakIterator(); - i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), rCursorPos.GetIndex(), GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True ); + i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), rCursorPos.GetIndex(), GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, true ); aSel.GetStart().GetIndex() = (sal_uInt16)aBoundary.startPos; aSel.GetEnd().GetIndex() = (sal_uInt16)aBoundary.endPos; aWord = pNode->GetText().copy( aSel.GetStart().GetIndex(), aSel.GetEnd().GetIndex() - aSel.GetStart().GetIndex() ); @@ -2543,7 +2543,7 @@ bool TextEngine::Read( SvStream& rInput, const TextSelection* pSel ) SetUpdateMode( bUpdate ); FormatAndUpdate( GetActiveView() ); - return rInput.GetError() ? sal_False : sal_True; + return rInput.GetError() ? false : true; } bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, bool bHTML ) @@ -2631,7 +2631,7 @@ bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, bool bHTML rOutput.WriteLine( "</HTML>" ); } - return rOutput.GetError() ? sal_False : sal_True; + return rOutput.GetError() ? false : true; } void TextEngine::RemoveAttribs( sal_uLong nPara, bool bIdleFormatAndUpdate ) diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index d8b26df1a8e7..9caeba98aa5a 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -197,7 +197,7 @@ TextView::TextView( TextEngine* pEng, Window* pWindow ) : mpImpl->mbClickedInSelection = false; mpImpl->mbSupportProtectAttribute = false; mpImpl->mbCursorAtEndOfLine = false; -// mbInSelection = sal_False; +// mbInSelection = false; mpImpl->mnTravelXPos = TRAVEL_X_DONTKNOW; @@ -227,7 +227,7 @@ TextView::TextView( TextEngine* pEng, Window* pWindow ) : pWindow->GetDragGestureRecognizer()->addDragGestureListener( xDGL ); uno::Reference< datatransfer::dnd::XDropTargetListener> xDTL( xDGL, uno::UNO_QUERY ); pWindow->GetDropTarget()->addDropTargetListener( xDTL ); - pWindow->GetDropTarget()->setActive( sal_True ); + pWindow->GetDropTarget()->setActive( true ); pWindow->GetDropTarget()->setDefaultActions( datatransfer::dnd::DNDConstants::ACTION_COPY_OR_MOVE ); } } @@ -862,7 +862,7 @@ void TextView::MouseButtonDown( const MouseEvent& rMouseEvent ) HideSelection(); TextNode* pNode = mpImpl->mpTextEngine->mpDoc->GetNodes().GetObject( mpImpl->maSelection.GetEnd().GetPara() ); uno::Reference < i18n::XBreakIterator > xBI = mpImpl->mpTextEngine->GetBreakIterator(); - i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), mpImpl->maSelection.GetEnd().GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True ); + i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), mpImpl->maSelection.GetEnd().GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, true ); TextSelection aNewSel( mpImpl->maSelection ); aNewSel.GetStart().GetIndex() = (sal_uInt16)aBoundary.startPos; aNewSel.GetEnd().GetIndex() = (sal_uInt16)aBoundary.endPos; @@ -1421,7 +1421,7 @@ TextPaM TextView::CursorWordLeft( const TextPaM& rPaM ) { TextNode* pNode = mpImpl->mpTextEngine->mpDoc->GetNodes().GetObject( aPaM.GetPara() ); uno::Reference < i18n::XBreakIterator > xBI = mpImpl->mpTextEngine->GetBreakIterator(); - i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), rPaM.GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True ); + i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), rPaM.GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, true ); if ( aBoundary.startPos >= rPaM.GetIndex() ) aBoundary = xBI->previousWord( pNode->GetText(), rPaM.GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES ); aPaM.GetIndex() = ( aBoundary.startPos != -1 ) ? (sal_uInt16)aBoundary.startPos : 0; @@ -1473,7 +1473,7 @@ TextPaM TextView::ImpDelete( sal_uInt8 nMode, sal_uInt8 nDelMode ) { TextNode* pNode = mpImpl->mpTextEngine->mpDoc->GetNodes().GetObject( aEndPaM.GetPara() ); uno::Reference < i18n::XBreakIterator > xBI = mpImpl->mpTextEngine->GetBreakIterator(); - i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), mpImpl->maSelection.GetEnd().GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, sal_True ); + i18n::Boundary aBoundary = xBI->getWordBoundary( pNode->GetText(), mpImpl->maSelection.GetEnd().GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES, true ); if ( aBoundary.startPos == mpImpl->maSelection.GetEnd().GetIndex() ) aBoundary = xBI->previousWord( pNode->GetText(), mpImpl->maSelection.GetEnd().GetIndex(), mpImpl->mpTextEngine->GetLocale(), i18n::WordType::ANYWORD_IGNOREWHITESPACES ); // #i63506# startPos is -1 when the paragraph starts with a tab @@ -1855,7 +1855,7 @@ bool TextView::SetCursorAtPoint( const Point& rPosPixel ) ShowSelection( aTmpNewSel ); } - bool bForceCursor = mpImpl->mpDDInfo ? sal_False : sal_True; // && !mbInSelection + bool bForceCursor = mpImpl->mpDDInfo ? false : true; // && !mbInSelection ImpShowCursor( mpImpl->mbAutoScroll, bForceCursor, false ); return true; } @@ -1863,14 +1863,14 @@ bool TextView::SetCursorAtPoint( const Point& rPosPixel ) bool TextView::IsSelectionAtPoint( const Point& rPosPixel ) { // if ( !Rectangle( Point(), mpImpl->mpWindow->GetOutputSizePixel() ).IsInside( rPosPixel ) && !mbInSelection ) -// return sal_False; +// return false; Point aDocPos = GetDocPos( rPosPixel ); 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() - // if before MBDown returned sal_False. + // if before MBDown returned false. return ( IsInSelection( aPaM ) || ( /* mpImpl->mpSelEngine->IsInCommand() && */ mpImpl->mpTextEngine->FindAttrib( aPaM, TEXTATTR_HYPERLINK ) ) ); } @@ -2058,7 +2058,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv 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; + bStarterOfDD = mpImpl->mpTextEngine->GetView( --nView )->mpImpl->mpDDInfo ? mpImpl->mpTextEngine->GetView( nView )->mpImpl->mpDDInfo->mbStarterOfDD : false; HideSelection(); ImpSetSelection( mpImpl->mpDDInfo->maDropPos ); @@ -2294,7 +2294,7 @@ void TextSelFunctionSet::CreateAnchor() mpView->ImpSetSelection( mpView->mpImpl->maSelection.GetEnd() ); } -bool TextSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool ) +bool TextSelFunctionSet::SetCursorAtPoint( const Point& rPointPixel, bool ) { return mpView->SetCursorAtPoint( rPointPixel ); } diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 97e6d99a4d5f..5300e9151956 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -337,7 +337,7 @@ IMPL_LINK( ImpVclMEdit, ScrollHdl, ScrollBar*, pCurScrollBar ) nDiffX = mpTextWindow->GetTextView()->GetStartDocPos().X() - pCurScrollBar->GetThumbPos(); mpTextWindow->GetTextView()->Scroll( nDiffX, nDiffY ); - // mpTextWindow->GetTextView()->ShowCursor( sal_False, sal_True ); + // mpTextWindow->GetTextView()->ShowCursor( false, true ); return 0; } @@ -843,7 +843,7 @@ void TextWindow::Command( const CommandEvent& rCEvt ) } // if ( ( maSelection.Min() == 0 ) && ( maSelection.Max() == maText.Len() ) ) // { -// pPopup->EnableItem( SV_MENU_EDIT_SELECTALL, sal_False ); +// pPopup->EnableItem( SV_MENU_EDIT_SELECTALL, false ); // } if ( !Edit::GetGetSpecialCharsFunction() ) { @@ -1112,7 +1112,7 @@ void VclMultiLineEdit::EnableUpdateData( sal_uLong nTimeout ) } } -void VclMultiLineEdit::SetReadOnly( sal_Bool bReadOnly ) +void VclMultiLineEdit::SetReadOnly( bool bReadOnly ) { pImpVclMEdit->SetReadOnly( bReadOnly ); Edit::SetReadOnly( bReadOnly ); diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx index 0f8f1342e277..04555e68acf5 100644 --- a/vcl/source/edit/xtextedt.cxx +++ b/vcl/source/edit/xtextedt.cxx @@ -249,7 +249,7 @@ bool ExtTextView::MatchGroup() if ( aMatchSel.HasRange() ) SetSelection( aMatchSel ); - return aMatchSel.HasRange() ? sal_True : sal_False; + return aMatchSel.HasRange() ? true : false; } bool ExtTextView::Search( const util::SearchOptions& rSearchOptions, bool bForward ) diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index f950b6597d1c..978d927594e8 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -300,7 +300,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, nSecondLong=(nSecondLong<<8)|(sal_uLong)sFirstBytes[i+4]; } - // The following variable is used when bTest == true. It remains sal_False + // The following variable is used when bTest == true. It remains false // if the format (rFormatExtension) has not yet been set. bool bSomethingTested = false; @@ -2119,7 +2119,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString #endif if( pFunc ) { - if ( !(*pFunc)( rOStm, aGraphic, &aConfigItem, sal_False ) ) + if ( !(*pFunc)( rOStm, aGraphic, &aConfigItem, false ) ) nStatus = GRFILTER_FORMATERROR; break; } diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index b0495dc174fa..812c2430fdf7 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -56,7 +56,7 @@ GraphicDescriptor::~GraphicDescriptor() delete pFileStm; } -bool GraphicDescriptor::Detect( sal_Bool bExtendedInfo ) +bool GraphicDescriptor::Detect( bool bExtendedInfo ) { bool bRet = false; if ( pFileStm && !pFileStm->GetError() ) diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx index e473df1e7a7d..10697737d71b 100644 --- a/vcl/source/filter/jpeg/JpegReader.cxx +++ b/vcl/source/filter/jpeg/JpegReader.cxx @@ -60,7 +60,7 @@ extern "C" void init_source (j_decompress_ptr cinfo) * but we don't clear the input buffer. * This is correct behavior for reading a series of images from one source. */ - source->start_of_file = sal_True; + source->start_of_file = true; } long StreamRead( SvStream* pStream, void* pBuffer, long nBufferSize ) @@ -108,9 +108,9 @@ extern "C" boolean fill_input_buffer (j_decompress_ptr cinfo) source->pub.next_input_byte = source->buffer; source->pub.bytes_in_buffer = nbytes; - source->start_of_file = sal_False; + source->start_of_file = false; - return sal_True; + return true; } extern "C" void skip_input_data (j_decompress_ptr cinfo, long numberOfBytes) @@ -128,7 +128,7 @@ extern "C" void skip_input_data (j_decompress_ptr cinfo, long numberOfBytes) numberOfBytes -= (long) source->pub.bytes_in_buffer; (void) fill_input_buffer(cinfo); - /* note we assume that fill_input_buffer will never return sal_False, + /* note we assume that fill_input_buffer will never return false, * so suspension need not be handled. */ } diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx index c7e28ab8bad1..0f7f52940034 100644 --- a/vcl/source/filter/jpeg/JpegWriter.cxx +++ b/vcl/source/filter/jpeg/JpegWriter.cxx @@ -67,7 +67,7 @@ extern "C" boolean empty_output_buffer (j_compress_ptr cinfo) destination->pub.next_output_byte = destination->buffer; destination->pub.free_in_buffer = BUFFER_SIZE; - return sal_True; + return true; } extern "C" void term_destination (j_compress_ptr cinfo) diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index 79497fb344e1..6d557e77a92b 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -292,8 +292,8 @@ bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, FilterConfigItem* pFilterConf // don't work with pixel as destination map mode -> higher resolution preferrable maDestMapMode.SetMapUnit( MAP_100TH_MM ); mpFilterConfigItem = pFilterConfigItem; - mpHandlesUsed = new sal_Bool[ MAXHANDLES ]; - memset( mpHandlesUsed, 0, MAXHANDLES * sizeof( sal_Bool ) ); + mpHandlesUsed = new bool[ MAXHANDLES ]; + memset( mpHandlesUsed, 0, MAXHANDLES * sizeof( bool ) ); mnHandleCount = mnLastPercent = mnRecordCount = mnRecordPos = mnRecordPlusPos = 0; mbRecordOpen = mbRecordPlusOpen = false; mbLineChanged = mbFillChanged = mbTextChanged = false; @@ -378,7 +378,7 @@ sal_uLong EMFWriter::ImplAcquireHandle() { if( !mpHandlesUsed[ i ] ) { - mpHandlesUsed[ i ] = sal_True; + mpHandlesUsed[ i ] = true; if( ( nHandle = i ) == mnHandleCount ) mnHandleCount++; @@ -392,7 +392,7 @@ sal_uLong EMFWriter::ImplAcquireHandle() void EMFWriter::ImplReleaseHandle( sal_uLong nHandle ) { DBG_ASSERT( nHandle && ( nHandle < MAXHANDLES ), "Handle out of range" ); - mpHandlesUsed[ nHandle - 1 ] = sal_False; + mpHandlesUsed[ nHandle - 1 ] = false; } void EMFWriter::ImplBeginRecord( sal_uInt32 nType ) diff --git a/vcl/source/filter/wmf/emfwr.hxx b/vcl/source/filter/wmf/emfwr.hxx index 2bf365843de5..03b5225c5dcb 100644 --- a/vcl/source/filter/wmf/emfwr.hxx +++ b/vcl/source/filter/wmf/emfwr.hxx @@ -37,7 +37,7 @@ private: MapMode maDestMapMode; FilterConfigItem* mpFilterConfigItem; SvStream& m_rStm; - sal_Bool* mpHandlesUsed; + bool* mpHandlesUsed; sal_uLong mnHandleCount; sal_uLong mnLastPercent; sal_uLong mnRecordCount; diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index 09788f0430a1..c4e57194662c 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -865,7 +865,7 @@ bool EnhWMFReader::ReadEnhWMF() if ( ( nIndex & ENHMETA_STOCK_OBJECT ) == 0 ) { pWMF->ReadUInt32( nStyle ); - pOut->CreateObject( nIndex, GDI_BRUSH, new WinMtfFillStyle( ReadColor(), ( nStyle == BS_HOLLOW ) ? sal_True : sal_False ) ); + pOut->CreateObject( nIndex, GDI_BRUSH, new WinMtfFillStyle( ReadColor(), ( nStyle == BS_HOLLOW ) ? true : false ) ); } } break; diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 644cb4ee7372..52c34a4770e4 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -645,7 +645,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) { if ( nWinROP == PATCOPY ) pWMF->ReadUInt16( nUsage ); // i don't know anything of this parameter, so its called nUsage - // pOut->DrawRect( Rectangle( ReadYX(), aDestSize ), sal_False ); + // pOut->DrawRect( Rectangle( ReadYX(), aDestSize ), false ); Size aDestSize( ReadYXExt() ); if ( aDestSize.Width() && aDestSize.Height() ) // #92623# do not try to read buggy bitmaps @@ -814,7 +814,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) { sal_uInt16 nStyle = 0; pWMF->ReadUInt16( nStyle ); - pOut->CreateObject( GDI_BRUSH, new WinMtfFillStyle( ReadColor(), ( nStyle == BS_HOLLOW ) ? sal_True : sal_False ) ); + pOut->CreateObject( GDI_BRUSH, new WinMtfFillStyle( ReadColor(), ( nStyle == BS_HOLLOW ) ? true : false ) ); } break; @@ -1490,7 +1490,7 @@ bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm ) { if ( nWinROP == PATCOPY ) pStm->ReadUInt16( nUsage ); // i don't know anything of this parameter, so its called nUsage - // pOut->DrawRect( Rectangle( ReadYX(), aDestSize ), sal_False ); + // pOut->DrawRect( Rectangle( ReadYX(), aDestSize ), false ); Size aDestSize( ReadYXExt() ); if ( aDestSize.Width() && aDestSize.Height() ) // #92623# do not try to read buggy bitmaps diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 9ecb8fa74865..af11af295b15 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -270,7 +270,7 @@ sal_uInt16 Bitmap::GetBitCount() const bool Bitmap::HasGreyPalette() const { const sal_uInt16 nBitCount = GetBitCount(); - bool bRet = nBitCount == 1 ? sal_True : sal_False; + bool bRet = nBitCount == 1 ? true : false; BitmapReadAccess* pRAcc = ( (Bitmap*) this )->AcquireReadAccess(); diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index 1237c5338cd5..642d2010342e 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -935,7 +935,7 @@ extern "C" int SAL_CALL ImplPopArtCmpFnc( const void* p1, const void* p2 ) bool Bitmap::ImplPopArt( const BmpFilterParam* /*pFilterParam*/, const Link* /*pProgress*/ ) { - bool bRet = ( GetBitCount() > 8 ) ? Convert( BMP_CONVERSION_8BIT_COLORS ) : sal_True; + bool bRet = ( GetBitCount() > 8 ) ? Convert( BMP_CONVERSION_8BIT_COLORS ) : true; if( bRet ) { diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 840282eeee29..b9a6311e8945 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -143,7 +143,7 @@ BitmapEx::BitmapEx( const Bitmap& rBmp, const AlphaMask& rAlphaMask ) : aMask ( rAlphaMask.ImplGetBitmap() ), aBitmapSize ( aBitmap.GetSizePixel() ), eTransparent ( !rAlphaMask ? TRANSPARENT_NONE : TRANSPARENT_BITMAP ), - bAlpha ( !rAlphaMask ? sal_False : sal_True ) + bAlpha ( !rAlphaMask ? false : true ) { if(!!aBitmap && !!aMask && aBitmap.GetSizePixel() != aMask.GetSizePixel()) { @@ -472,12 +472,12 @@ bool BitmapEx::Crop( const Rectangle& rRectPixel ) bool BitmapEx::Convert( BmpConversion eConversion ) { - return( !!aBitmap ? aBitmap.Convert( eConversion ) : sal_False ); + return( !!aBitmap ? aBitmap.Convert( eConversion ) : false ); } bool BitmapEx::ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce ) { - return( !!aBitmap ? aBitmap.ReduceColors( nNewColorCount, eReduce ) : sal_False ); + return( !!aBitmap ? aBitmap.ReduceColors( nNewColorCount, eReduce ) : false ); } bool BitmapEx::Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor, bool bExpandTransparent ) @@ -619,17 +619,17 @@ bool BitmapEx::Erase( const Color& rFillColor ) bool BitmapEx::Dither( sal_uLong nDitherFlags ) { - return( !!aBitmap ? aBitmap.Dither( nDitherFlags ) : sal_False ); + return( !!aBitmap ? aBitmap.Dither( nDitherFlags ) : false ); } bool BitmapEx::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol ) { - return( !!aBitmap ? aBitmap.Replace( rSearchColor, rReplaceColor, nTol ) : sal_False ); + return( !!aBitmap ? aBitmap.Replace( rSearchColor, rReplaceColor, nTol ) : false ); } 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 ); + return( !!aBitmap ? aBitmap.Replace( pSearchColors, pReplaceColors, nColorCount, (sal_uLong*) pTols ) : false ); } bool BitmapEx::Adjust( short nLuminancePercent, short nContrastPercent, @@ -638,12 +638,12 @@ bool BitmapEx::Adjust( short nLuminancePercent, short nContrastPercent, { return( !!aBitmap ? aBitmap.Adjust( nLuminancePercent, nContrastPercent, nChannelRPercent, nChannelGPercent, nChannelBPercent, - fGamma, bInvert ) : sal_False ); + fGamma, bInvert ) : false ); } bool BitmapEx::Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam, const Link* pProgress ) { - return( !!aBitmap ? aBitmap.Filter( eFilter, pFilterParam, pProgress ) : sal_False ); + return( !!aBitmap ? aBitmap.Filter( eFilter, pFilterParam, pProgress ) : false ); } void BitmapEx::Draw( OutputDevice* pOutDev, const Point& rDestPt ) const diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx index 75ea7eb39034..796036224427 100644 --- a/vcl/source/gdi/configsettings.cxx +++ b/vcl/source/gdi/configsettings.cxx @@ -66,7 +66,7 @@ void SettingsConfigItem::Commit() for( group = m_aSettings.begin(); group != m_aSettings.end(); ++group ) { OUString aKeyName( group->first ); - /*sal_Bool bAdded =*/ AddNode( OUString(), aKeyName ); + /*bool bAdded =*/ AddNode( OUString(), aKeyName ); Sequence< PropertyValue > aValues( group->second.size() ); PropertyValue* pValues = aValues.getArray(); int nIndex = 0; diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 8e952cea47c0..5698066e8ce2 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -307,7 +307,7 @@ void GDIMetaFile::Record( OutputDevice* pOut ) nCurrentActionElement = aList.empty() ? 0 : (aList.size() - 1); pOutDev = pOut; bRecord = true; - Linker( pOut, sal_True ); + Linker( pOut, true ); } void GDIMetaFile::Play( GDIMetaFile& rMtf, size_t nPos ) @@ -597,12 +597,12 @@ void GDIMetaFile::Pause( bool _bPause ) if( _bPause ) { if( !bPause ) - Linker( pOutDev, sal_False ); + Linker( pOutDev, false ); } else { if( bPause ) - Linker( pOutDev, sal_True ); + Linker( pOutDev, true ); } bPause = _bPause; @@ -616,7 +616,7 @@ void GDIMetaFile::Stop() bRecord = false; if( !bPause ) - Linker( pOutDev, sal_False ); + Linker( pOutDev, false ); else bPause = false; } diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 643b28311e4a..a118405827f2 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -1517,7 +1517,7 @@ GfxLink ImpGraphic::ImplGetLink() bool ImpGraphic::ImplIsLink() const { - return ( mpGfxLink != NULL ) ? sal_True : sal_False; + return ( mpGfxLink != NULL ) ? true : false; } sal_uLong ImpGraphic::ImplGetChecksum() const diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index b2fa560e56ed..c4ae22e05467 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -1147,7 +1147,7 @@ public: void setTextFillColor( const Color& rColor ) { m_aGraphicsStack.front().m_aFont.SetFillColor( rColor ); - m_aGraphicsStack.front().m_aFont.SetTransparent( ImplIsColorTransparent( rColor ) ? sal_True : sal_False ); + m_aGraphicsStack.front().m_aFont.SetTransparent( ImplIsColorTransparent( rColor ) ? true : false ); m_aGraphicsStack.front().m_nUpdateFlags |= GraphicsState::updateFont; } void setTextFillColor() diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 79f36d49f38a..f8a712809701 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -161,7 +161,7 @@ PNGWriterImpl::PNGWriterImpl( const BitmapEx& rBmpEx, } else { - mpAccess = aBmp.AcquireReadAccess(); // sal_True RGB with alphachannel + mpAccess = aBmp.AcquireReadAccess(); // true RGB with alphachannel if( mpAccess ) { if ( ( mbTrueAlpha = rBmpEx.IsAlpha() ) ) diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index ea6780da3df0..968ebab50920 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -698,12 +698,12 @@ Printer::~Printer() sal_uLong Printer::GetCapabilities( sal_uInt16 nType ) const { if ( IsDisplayPrinter() ) - return sal_False; + return false; if( mpInfoPrinter ) return mpInfoPrinter->GetCapabilities( maJobSetup.ImplGetConstData(), nType ); else - return sal_False; + return false; } diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index 7ce25b7ccbda..350bfdc178a6 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -317,7 +317,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr aBox.Execute(); } pController->setValue( OUString( "IsDirect" ), - makeAny( sal_False ) ); + makeAny( false ) ); } // setup printer @@ -497,7 +497,7 @@ void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pContr else if( aDlg.isSingleJobs() ) { pController->setValue( OUString( "PrintCollateAsSingleJobs" ), - makeAny( sal_True ) ); + makeAny( true ) ); } } catch (const std::bad_alloc&) @@ -865,7 +865,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons { bool bVal = false; i_rProps[ nProperty ].Value >>= bVal; - aPageSize.bFullPaper = static_cast<bool>(bVal); + aPageSize.bFullPaper = bVal; } else if ( i_rProps[ nProperty ].Name == "PrinterPaperTray" ) { diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx index 8e8ee1240caf..bdb9fb3ea09a 100644 --- a/vcl/source/gdi/salnativewidgets-none.cxx +++ b/vcl/source/gdi/salnativewidgets-none.cxx @@ -29,7 +29,7 @@ /* * IsNativeControlSupported() * - * Returns sal_True if the platform supports native + * Returns true if the platform supports native * drawing of the control defined by nPart */ bool SalGraphics::IsNativeControlSupported( ControlType, ControlPart ) @@ -41,7 +41,7 @@ bool SalGraphics::IsNativeControlSupported( ControlType, ControlPart ) /* * HitTestNativeControl() * - * If the return value is sal_True, bIsInside contains information whether + * If the return value is true, bIsInside contains information whether * aPos was or was not inside the native widget specified by the * nType/nPart combination. */ @@ -77,8 +77,8 @@ bool SalGraphics::drawNativeControl( ControlType, /* * GetNativeControlRegion() * - * If the return value is sal_True, rNativeBoundingRegion - * contains the sal_True bounding region covered by the control + * If the return value is true, rNativeBoundingRegion + * contains the true bounding region covered by the control * including any adornment, while rNativeContentRegion contains the area * within the control that can be safely drawn into without drawing over * the borders of the control. diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index ee9d63ce1071..82af07a555f3 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -127,7 +127,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) : m_aLayout.PlaneStride = 0; m_aLayout.ColorSpace.clear(); m_aLayout.Palette.clear(); - m_aLayout.IsMsbFirst = sal_False; + m_aLayout.IsMsbFirst = false; if( m_pBmpAcc ) { @@ -142,42 +142,42 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) : m_bPalette = true; m_nBitsPerInputPixel = 1; m_nEndianness = util::Endianness::LITTLE; // doesn't matter - m_aLayout.IsMsbFirst = sal_True; + m_aLayout.IsMsbFirst = true; break; case BMP_FORMAT_1BIT_LSB_PAL: m_bPalette = true; m_nBitsPerInputPixel = 1; m_nEndianness = util::Endianness::LITTLE; // doesn't matter - m_aLayout.IsMsbFirst = sal_False; + m_aLayout.IsMsbFirst = false; break; case BMP_FORMAT_4BIT_MSN_PAL: m_bPalette = true; m_nBitsPerInputPixel = 4; m_nEndianness = util::Endianness::LITTLE; // doesn't matter - m_aLayout.IsMsbFirst = sal_True; + m_aLayout.IsMsbFirst = true; break; case BMP_FORMAT_4BIT_LSN_PAL: m_bPalette = true; m_nBitsPerInputPixel = 4; m_nEndianness = util::Endianness::LITTLE; // doesn't matter - m_aLayout.IsMsbFirst = sal_False; + m_aLayout.IsMsbFirst = false; break; case BMP_FORMAT_8BIT_PAL: m_bPalette = true; m_nBitsPerInputPixel = 8; m_nEndianness = util::Endianness::LITTLE; // doesn't matter - m_aLayout.IsMsbFirst = sal_False; // doesn't matter + m_aLayout.IsMsbFirst = false; // doesn't matter break; case BMP_FORMAT_8BIT_TC_MASK: m_bPalette = false; m_nBitsPerInputPixel = 8; m_nEndianness = util::Endianness::LITTLE; // doesn't matter - m_aLayout.IsMsbFirst = sal_False; // doesn't matter + m_aLayout.IsMsbFirst = false; // doesn't matter setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(), m_pBmpAcc->GetColorMask().GetGreenMask(), m_pBmpAcc->GetColorMask().GetBlueMask() ); @@ -187,7 +187,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) : m_bPalette = false; m_nBitsPerInputPixel = 16; m_nEndianness = util::Endianness::BIG; - m_aLayout.IsMsbFirst = sal_False; // doesn't matter + m_aLayout.IsMsbFirst = false; // doesn't matter setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(), m_pBmpAcc->GetColorMask().GetGreenMask(), m_pBmpAcc->GetColorMask().GetBlueMask() ); @@ -197,7 +197,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) : m_bPalette = false; m_nBitsPerInputPixel = 16; m_nEndianness = util::Endianness::LITTLE; - m_aLayout.IsMsbFirst = sal_False; // doesn't matter + m_aLayout.IsMsbFirst = false; // doesn't matter setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(), m_pBmpAcc->GetColorMask().GetGreenMask(), m_pBmpAcc->GetColorMask().GetBlueMask() ); @@ -207,7 +207,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) : m_bPalette = false; m_nBitsPerInputPixel = 24; m_nEndianness = util::Endianness::LITTLE; - m_aLayout.IsMsbFirst = sal_False; // doesn't matter + m_aLayout.IsMsbFirst = false; // doesn't matter setComponentInfo( 0xff0000LL, 0x00ff00LL, 0x0000ffLL ); @@ -217,7 +217,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) : m_bPalette = false; m_nBitsPerInputPixel = 24; m_nEndianness = util::Endianness::LITTLE; - m_aLayout.IsMsbFirst = sal_False; // doesn't matter + m_aLayout.IsMsbFirst = false; // doesn't matter setComponentInfo( 0x0000ffLL, 0x00ff00LL, 0xff0000LL ); @@ -227,7 +227,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) : m_bPalette = false; m_nBitsPerInputPixel = 24; m_nEndianness = util::Endianness::LITTLE; - m_aLayout.IsMsbFirst = sal_False; // doesn't matter + m_aLayout.IsMsbFirst = false; // doesn't matter setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(), m_pBmpAcc->GetColorMask().GetGreenMask(), m_pBmpAcc->GetColorMask().GetBlueMask() ); @@ -238,7 +238,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) : m_bPalette = false; m_nBitsPerInputPixel = 32; m_nEndianness = util::Endianness::LITTLE; - m_aLayout.IsMsbFirst = sal_False; // doesn't matter + m_aLayout.IsMsbFirst = false; // doesn't matter m_aComponentTags.realloc(4); sal_Int8* pTags = m_aComponentTags.getArray(); @@ -266,7 +266,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) : m_bPalette = false; m_nBitsPerInputPixel = 32; m_nEndianness = util::Endianness::LITTLE; - m_aLayout.IsMsbFirst = sal_False; // doesn't matter + m_aLayout.IsMsbFirst = false; // doesn't matter m_aComponentTags.realloc(4); sal_Int8* pTags = m_aComponentTags.getArray(); @@ -294,7 +294,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) : m_bPalette = false; m_nBitsPerInputPixel = 32; m_nEndianness = util::Endianness::LITTLE; - m_aLayout.IsMsbFirst = sal_False; // doesn't matter + m_aLayout.IsMsbFirst = false; // doesn't matter m_aComponentTags.realloc(4); sal_Int8* pTags = m_aComponentTags.getArray(); @@ -322,7 +322,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) : m_bPalette = false; m_nBitsPerInputPixel = 32; m_nEndianness = util::Endianness::LITTLE; - m_aLayout.IsMsbFirst = sal_False; // doesn't matter + m_aLayout.IsMsbFirst = false; // doesn't matter m_aComponentTags.realloc(4); sal_Int8* pTags = m_aComponentTags.getArray(); @@ -349,7 +349,7 @@ VclCanvasBitmap::VclCanvasBitmap( const BitmapEx& rBitmap ) : m_bPalette = false; m_nBitsPerInputPixel = 32; m_nEndianness = util::Endianness::LITTLE; - m_aLayout.IsMsbFirst = sal_False; // doesn't matter + m_aLayout.IsMsbFirst = false; // doesn't matter setComponentInfo( m_pBmpAcc->GetColorMask().GetRedMask(), m_pBmpAcc->GetColorMask().GetGreenMask(), m_pBmpAcc->GetColorMask().GetBlueMask() ); @@ -438,7 +438,7 @@ geometry::IntegerSize2D SAL_CALL VclCanvasBitmap::getSize() throw (uno::RuntimeE return integerSize2DFromSize( m_aBitmap.GetSizePixel() ); } -::sal_Bool SAL_CALL VclCanvasBitmap::hasAlpha() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL VclCanvasBitmap::hasAlpha() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return m_aBmpEx.IsTransparent(); diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx index b5a35266415c..4376ab185fbf 100644 --- a/vcl/source/helper/strhelper.cxx +++ b/vcl/source/helper/strhelper.cxx @@ -293,11 +293,11 @@ OUString WhitespaceToSpace( const OUString& rLine, bool bProtect ) pRun++; } else if( bProtect && *pRun == '`' ) - CopyUntil( pLeap, pRun, '`', sal_True ); + CopyUntil( pLeap, pRun, '`', true ); else if( bProtect && *pRun == '\'' ) - CopyUntil( pLeap, pRun, '\'', sal_True ); + CopyUntil( pLeap, pRun, '\'', true ); else if( bProtect && *pRun == '"' ) - CopyUntil( pLeap, pRun, '"', sal_True ); + CopyUntil( pLeap, pRun, '"', true ); else { *pLeap = *pRun; @@ -349,11 +349,11 @@ OString WhitespaceToSpace(const OString& rLine, bool bProtect) pRun++; } else if( bProtect && *pRun == '`' ) - CopyUntil( pLeap, pRun, '`', sal_True ); + CopyUntil( pLeap, pRun, '`', true ); else if( bProtect && *pRun == '\'' ) - CopyUntil( pLeap, pRun, '\'', sal_True ); + CopyUntil( pLeap, pRun, '\'', true ); else if( bProtect && *pRun == '"' ) - CopyUntil( pLeap, pRun, '"', sal_True ); + CopyUntil( pLeap, pRun, '"', true ); else { *pLeap = *pRun; diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index c4aad9c36148..8c70510b111e 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -325,7 +325,7 @@ Accelerator::~Accelerator() // inform AccelManager about deleting the Accelerator if ( mpDel ) - *mpDel = sal_True; + *mpDel = true; ImplDeleteData(); delete mpData; diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx index 617fbf3c0caa..e3bccd74ca41 100644 --- a/vcl/source/window/accmgr.cxx +++ b/vcl/source/window/accmgr.cxx @@ -102,7 +102,7 @@ void ImplAccelManager::EndSequence( bool bCancel ) for ( size_t i = 0, n = mpSequenceList->size(); i < n; ++i ) { Accelerator* pTempAccel = (*mpSequenceList)[ i ]; - sal_Bool bDel = sal_False; + bool bDel = false; pTempAccel->mbIsCancel = bCancel; pTempAccel->mpDel = &bDel; pTempAccel->Deactivate(); @@ -169,7 +169,7 @@ bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ) // set accelerator of the actuel item // and call the handler - sal_Bool bDel = sal_False; + bool bDel = false; pAccel->maCurKeyCode = rKeyCode; pAccel->mnCurId = pEntry->mnId; pAccel->mnCurRepeat = nRepeat; @@ -240,7 +240,7 @@ bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ) // define accelerator of the actual item // and call the handler - sal_Bool bDel = sal_False; + bool bDel = false; pAccel->maCurKeyCode = rKeyCode; pAccel->mnCurId = pEntry->mnId; pAccel->mnCurRepeat = nRepeat; diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 9f7e85bef537..c88719ed2fe8 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -131,7 +131,7 @@ static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev, pWin->SetFillColor( pDev->GetSettings().GetStyleSettings().GetWindowColor() ); pWin->SetLineColor(); pWin->DrawRect( rRect ); - pWin->DrawSelectionBackground( rRect, 2, (nState & BUTTON_DRAW_PRESSED) ? sal_True : sal_False, + pWin->DrawSelectionBackground( rRect, 2, (nState & BUTTON_DRAW_PRESSED) ? true : false, true, false ); } aTempRect = rRect; @@ -1881,7 +1881,7 @@ void ImplBorderWindow::ImplInit( Window* pParent, { mpWindowImpl->mbOverlapWin = true; mpWindowImpl->mbFrame = true; - mbFrameBorder = (nOrgStyle & WB_NOBORDER) ? sal_False : sal_True; + mbFrameBorder = (nOrgStyle & WB_NOBORDER) ? false : true; } else { diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index a531bbde66ac..0d648a6a15d3 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -790,7 +790,7 @@ bool Dialog::Close() if ( IsInExecute() ) { - EndDialog( sal_False ); + EndDialog( false ); mbInClose = false; return true; } @@ -1078,7 +1078,7 @@ void Dialog::EndAllDialogs( Window* pParent ) pTempModDialog = pModDialog->mpPrevExecuteDlg; if( !pParent || ( pParent && pParent->IsWindowOrChild( pModDialog, true ) ) ) { - pModDialog->EndDialog( sal_False ); + pModDialog->EndDialog( false ); pModDialog->PostUserEvent( Link() ); } pModDialog = pTempModDialog; diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 2ff6f0c79a6b..102547f8d0fa 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -339,7 +339,7 @@ bool DockingManager::IsDockable( const Window *pWindow ) /* if( pWindow->HasDockingHandler() ) - return sal_True; + return true; */ return (pWrapper != NULL); } @@ -891,7 +891,7 @@ void ImplDockingWindowWrapper::ImplInitData() { mpDockingWindow = NULL; - //GetWindow()->mpWindowImpl->mbDockWin = sal_True; // TODO: must be eliminated + //GetWindow()->mpWindowImpl->mbDockWin = true; // TODO: must be eliminated mpFloatWin = NULL; mbDockCanceled = false; mbFloatPrevented = false; @@ -1049,7 +1049,7 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMo bool ImplDockingWindowWrapper::PrepareToggleFloatingMode() { - sal_Bool bFloating = sal_True; + bool bFloating = true; GetWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_PREPARETOGGLEFLOATING, &bFloating ); return bFloating; } diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 9f029f62b6f1..4d0893509ac0 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -129,14 +129,14 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl) { // i43499 CTRL disables docking now mpDockWin->GetParent()->ImplGetFrameWindow()->HideTracking(); - mpDockWin->EndDocking( maDockRect, sal_True ); + mpDockWin->EndDocking( maDockRect, true ); if( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) maDockTimer.Start(); } else if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) ) { mpDockWin->GetParent()->ImplGetFrameWindow()->HideTracking(); - mpDockWin->EndDocking( maDockRect, sal_False ); + mpDockWin->EndDocking( maDockRect, false ); } else { @@ -177,7 +177,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl) { mpDockWin->GetParent()->ImplGetFrameWindow()->HideTracking(); maDockTimer.Stop(); - mpDockWin->EndDocking( maDockRect, sal_True ); + mpDockWin->EndDocking( maDockRect, true ); } } mbInMove = false; @@ -608,7 +608,7 @@ bool DockingWindow::Docking( const Point&, Rectangle& ) return IsFloatingMode(); } -void DockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) +void DockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode ) { if ( !IsDockingCanceled() ) { diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index e2f71b627387..65193d1d8584 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -980,7 +980,7 @@ void Menu::ImplInit() mpSalMenu = NULL; nMenuFlags = 0; nDefaultItem = 0; - //bIsMenuBar = sal_False; // this is now set in the ctor, must not be changed here!!! + //bIsMenuBar = false; // this is now set in the ctor, must not be changed here!!! nSelectedId = 0; pItemList = new MenuItemList; pLogo = NULL; @@ -2179,7 +2179,7 @@ bool Menu::ImplIsVisible( sal_uInt16 nPos ) const bVisible = false; else if ( pData->eType != MENUITEM_SEPARATOR ) // separators handled above { - // bVisible = pData->bEnabled && ( !pData->pSubMenu || pData->pSubMenu->HasValidEntries( sal_True ) ); + // bVisible = pData->bEnabled && ( !pData->pSubMenu || pData->pSubMenu->HasValidEntries( true ) ); bVisible = pData->bEnabled; // do not check submenus as they might be filled at Activate(). } } @@ -3478,7 +3478,7 @@ bool MenuBar::HandleMenuButtonEvent( Menu *, sal_uInt16 i_nButtonId ) const -// sal_Bool PopupMenu::bAnyPopupInExecute = sal_False; +// bool PopupMenu::bAnyPopupInExecute = false; PopupMenu::PopupMenu() { @@ -3505,7 +3505,7 @@ PopupMenu::~PopupMenu() bool PopupMenu::IsInExecute() { - return GetActivePopupMenu() ? sal_True : sal_False; + return GetActivePopupMenu() ? true : false; } PopupMenu* PopupMenu::GetActivePopupMenu() @@ -4161,7 +4161,7 @@ IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd) { //DBG_ASSERT( !pActivePopup->ImplGetWindow(), "PopupEnd, obwohl pActivePopup MIT Window!" ); KillActivePopup(); // should be ok to just remove it - //pActivePopup->bCanceled = sal_True; + //pActivePopup->bCanceled = true; } bInExecute = false; pMenu->bInCallback = true; @@ -4257,7 +4257,7 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer ) Menu* pTest = pActivePopup; sal_uLong nOldFlags = GetPopupModeFlags(); SetPopupModeFlags( GetPopupModeFlags() | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE ); - sal_uInt16 nRet = pActivePopup->ImplExecute( this, Rectangle( aItemTopLeft, aItemBottomRight ), FLOATWIN_POPUPMODE_RIGHT, pMenu, pTimer ? sal_False : sal_True ); + sal_uInt16 nRet = pActivePopup->ImplExecute( this, Rectangle( aItemTopLeft, aItemBottomRight ), FLOATWIN_POPUPMODE_RIGHT, pMenu, pTimer ? false : true ); SetPopupModeFlags( nOldFlags ); // nRet != 0, wenn es waerend Activate() abgeschossen wurde... @@ -4307,7 +4307,7 @@ void MenuFloatingWindow::Execute() pSVData->maAppData.mpActivePopupMenu = (PopupMenu*)pMenu; bInExecute = true; -// bCallingSelect = sal_False; +// bCallingSelect = false; while ( bInExecute ) Application::Yield(); diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index e30a4699fd24..e42cadaac73b 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -324,7 +324,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) // { // maMnemonics[nMnemonicIndex] = 0; // rKey.Insert( MNEMONIC_CHAR, nIndex ); -// bChanged = sal_True; +// bChanged = true; // break; // } diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 8abf77fddbbf..7c1c5a2e22d4 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -788,7 +788,7 @@ bool PrintDialog::isPrintToFile() bool PrintDialog::isCollate() { - return maJobPage.mpCopyCountField->GetValue() > 1 ? maJobPage.mpCollateBox->IsChecked() : sal_False; + return maJobPage.mpCopyCountField->GetValue() > 1 ? maJobPage.mpCollateBox->IsChecked() : false; } bool PrintDialog::isSingleJobs() @@ -1052,7 +1052,7 @@ void PrintDialog::setupOptionalUI() pBtn->SetText( aChoices[m] ); pBtn->Check( m == nSelectVal ); pBtn->SetToggleHdl( LINK( this, PrintDialog, UIOption_RadioHdl ) ); - if( aChoicesDisabled.getLength() > m && aChoicesDisabled[m] == sal_True ) + if( aChoicesDisabled.getLength() > m && aChoicesDisabled[m] == true ) pBtn->Enable( false ); pBtn->Show(); maPropertyToWindowMap[ aPropertyName ].push_back( pBtn ); diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index 77448d15f921..5e215d7aa082 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -197,7 +197,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) pFunctionSet->DeselectAll(); else pFunctionSet->DestroyAnchor(); - nFlags &= (~SELENG_HAS_ANCH); // bHasAnchor = sal_False; + nFlags &= (~SELENG_HAS_ANCH); // bHasAnchor = false; } pFunctionSet->SetCursorAtPoint( aPos ); // Sonderbehandlung Single-Selection, damit Select+Drag @@ -246,7 +246,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) if ( pFunctionSet->IsSelectionAtPoint( aPos ) ) { pFunctionSet->DeselectAtPoint( aPos ); - pFunctionSet->SetCursorAtPoint( aPos, sal_True ); + pFunctionSet->SetCursorAtPoint( aPos, true ); } else { @@ -261,7 +261,7 @@ bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt ) nFlags &= (~SELENG_IN_SEL); return false; } - nFlags |= SELENG_IN_ADD; //bIsInAddMode = sal_True; + nFlags |= SELENG_IN_ADD; //bIsInAddMode = true; if ( !(nFlags & SELENG_HAS_ANCH) ) { pFunctionSet->CreateAnchor(); @@ -310,7 +310,7 @@ bool SelectionEngine::SelMouseButtonUp( const MouseEvent& rMEvt ) } pFunctionSet->DeselectAtPoint( aLastMove.GetPosPixel() ); nFlags &= (~SELENG_HAS_ANCH); // nix Anker - pFunctionSet->SetCursorAtPoint( aLastMove.GetPosPixel(), sal_True ); + pFunctionSet->SetCursorAtPoint( aLastMove.GetPosPixel(), true ); } else { diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 16e06ab25ffa..0601c8b75dda 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -2423,8 +2423,8 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) if ( bSplit ) { - bool bPropSmaller = (mnMouseModifier & KEY_SHIFT) ? sal_True : sal_False; - bool bPropGreater = (mnMouseModifier & KEY_MOD1) ? sal_True : sal_False; + bool bPropSmaller = (mnMouseModifier & KEY_SHIFT) ? true : false; + bool bPropGreater = (mnMouseModifier & KEY_MOD1) ? true : false; long nDelta = mnMSplitPos-mnMStartPos; if ( (mnSplitTest & SPLIT_WINDOW) && !mpMainSet->mpItems ) diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 3281e8a564da..6274cfc8883e 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -949,7 +949,7 @@ void SystemWindow::SetMenuBar( MenuBar* pMenuBar ) ImplToBottomChild(); if ( pOldMenuBar ) { - bool bDelete = (pMenuBar == 0) ? sal_True : sal_False; + bool bDelete = (pMenuBar == 0) ? true : false; if( bDelete && pOldWindow ) { if( mpImplData->mpTaskPaneList ) diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index aa3910d8a86f..b43dd8453e75 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -932,7 +932,7 @@ void ToolBox::ImplSetMinMaxFloatSize( ToolBox *pThis ) { pWrapper->SetMinOutputSizePixel( aMinSize ); pWrapper->SetMaxOutputSizePixel( aMaxSize ); - pWrapper->ShowTitleButton( TITLE_BUTTON_MENU, ( pThis->GetMenuType() & TOOLBOX_MENUTYPE_CUSTOMIZE) ? sal_True : sal_False ); + pWrapper->ShowTitleButton( TITLE_BUTTON_MENU, ( pThis->GetMenuType() & TOOLBOX_MENUTYPE_CUSTOMIZE) ? true : false ); } else { @@ -1319,10 +1319,10 @@ void ImplTBDragMgr::EndDragging( bool bOK ) if ( !bOK ) { mpDragBox->mnDockLines = mnStartLines; - mpDragBox->EndDocking( maStartRect, sal_False ); + mpDragBox->EndDocking( maStartRect, false ); } else - mpDragBox->EndDocking( maRect, sal_False ); + mpDragBox->EndDocking( maRect, false ); mnLineMode = 0; mnStartLines = 0; } @@ -1412,7 +1412,7 @@ IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel ) else EndDragging( true ); - return sal_True; + return true; } @@ -3003,7 +3003,7 @@ void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect ) 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 + // if bIsWindow is true, the corresponding item is a control and only a selection border will be drawn bool bNativeOk = false; if( !bIsWindow && pThis->IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) ) @@ -3247,7 +3247,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint, if( bHasOpenPopup ) ImplDrawFloatwinBorder( pItem ); else - ImplDrawButton( this, aButtonRect, nHighlight, pItem->meState == TRISTATE_TRUE, pItem->mbEnabled && IsEnabled(), pItem->mbShowWindow ? sal_True : sal_False ); + ImplDrawButton( this, aButtonRect, nHighlight, pItem->meState == TRISTATE_TRUE, pItem->mbEnabled && IsEnabled(), pItem->mbShowWindow ? true : false ); if( nHighlight != 0 ) { @@ -3301,7 +3301,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint, if( bHasOpenPopup ) ImplDrawFloatwinBorder( pItem ); else - ImplDrawButton( this, pItem->maRect, nHighlight, pItem->meState == TRISTATE_TRUE, pItem->mbEnabled && IsEnabled(), pItem->mbShowWindow ? sal_True : sal_False ); + ImplDrawButton( this, pItem->maRect, nHighlight, pItem->meState == TRISTATE_TRUE, pItem->mbEnabled && IsEnabled(), pItem->mbShowWindow ? true : false ); } sal_uInt16 nTextStyle = 0; @@ -4422,7 +4422,7 @@ bool ToolBox::Notify( NotifyEvent& rNEvt ) if( bNoTabCycling && ! (GetStyle() & WB_FORCETABCYCLE) ) return DockingWindow::Notify( rNEvt ); - else if( ImplChangeHighlightUpDn( aKeyCode.IsShift() ? sal_True : sal_False , bNoTabCycling ) ) + else if( ImplChangeHighlightUpDn( aKeyCode.IsShift() ? true : false , bNoTabCycling ) ) return false; else return DockingWindow::Notify( rNEvt ); @@ -4639,7 +4639,7 @@ void ToolBox::ToggleFloatingMode() } else { - mbScroll = (mnWinStyle & WB_SCROLL) ? sal_True : sal_False; + mbScroll = (mnWinStyle & WB_SCROLL) ? true : false; if ( (meAlign == WINDOWALIGN_TOP) || (meAlign == WINDOWALIGN_BOTTOM) ) mbHorz = true; else @@ -4799,7 +4799,7 @@ bool ToolBox::Docking( const Point& rPos, Rectangle& rRect ) -void ToolBox::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ) +void ToolBox::EndDocking( const Rectangle& rRect, bool bFloatMode ) { if ( !IsDockingCanceled() ) { @@ -5051,7 +5051,7 @@ void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl ) // calls the button's action handler -// returns sal_True if action was called +// returns true if action was called bool ToolBox::ImplActivateItem( KeyCode aKeyCode ) { bool bRet = true; @@ -5133,7 +5133,7 @@ bool ImplCloseLastPopup( Window *pParent ) } // opens a drop down toolbox item -// returns sal_True if item was opened +// returns true if item was opened bool ToolBox::ImplOpenItem( KeyCode aKeyCode ) { sal_uInt16 nCode = aKeyCode.GetCode(); diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index be9926ca86d9..b8db7789a1a1 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -226,7 +226,7 @@ Size ImplToolItem::GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth, cons if ( mpWindow && bHorz ) { // get size of item window and check if it fits - // no windows in vertical toolbars (the default is mbShowWindow=sal_False) + // no windows in vertical toolbars (the default is mbShowWindow=false) Size aWinSize = mpWindow->GetSizePixel(); if ( !bCheckMaxWidth || (aWinSize.Width() <= maxWidth) ) { @@ -1489,7 +1489,7 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease ) if ( nPos != mnCurPos ) { mnCurPos = nPos; - ImplDrawItem( mnCurPos, sal_True ); + ImplDrawItem( mnCurPos, true ); Flush(); } } @@ -1497,7 +1497,7 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease ) { if ( nPos == mnCurPos ) { - ImplDrawItem( mnCurPos, sal_False ); + ImplDrawItem( mnCurPos, false ); Flush(); mnCurPos = TOOLBOX_ITEM_NOTFOUND; } @@ -1799,7 +1799,7 @@ void ToolBox::ImplFillLayoutData() const // only draw, if the rectangle is within PaintRectangle if ( !pItem->maRect.IsEmpty() ) - const_cast<ToolBox*>(this)->ImplDrawItem( i, sal_False, false, true ); + const_cast<ToolBox*>(this)->ImplDrawItem( i, false, false, true ); } } @@ -1871,7 +1871,7 @@ void ToolBox::SetMenuType( sal_uInt16 aType ) // the menu button may have to be moved into the decoration which changes the layout ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this ); if( pWrapper ) - pWrapper->ShowTitleButton( TITLE_BUTTON_MENU, ( aType & TOOLBOX_MENUTYPE_CUSTOMIZE) ? sal_True : sal_False ); + pWrapper->ShowTitleButton( TITLE_BUTTON_MENU, ( aType & TOOLBOX_MENUTYPE_CUSTOMIZE) ? true : false ); mbFormat = true; ImplFormat(); @@ -2145,7 +2145,7 @@ bool ToolBox::AlwaysLocked() } } - return nAlwaysLocked == 1 ? sal_True : sal_False; + return nAlwaysLocked == 1 ? true : false; } bool ToolBox::WillUsePopupMode() const diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 5eb217c7737e..0c517104baa7 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -8127,7 +8127,7 @@ void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star:: { UnoWrapperBase* pWrapper = Application::GetUnoWrapper(); if ( pWrapper ) - mpWindowImpl->mxWindowPeer = pWrapper->GetWindowInterface( this, sal_True ); + mpWindowImpl->mxWindowPeer = pWrapper->GetWindowInterface( this, true ); } return mpWindowImpl->mxWindowPeer; } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 003795a7da3e..17f745d291c0 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -107,7 +107,7 @@ static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, pLastLevelFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL ); // Erstmal ausgebaut als Hack fuer Bug 53378 // if ( nPopupFlags & FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK ) -// return sal_False; +// return false; // else return true; } @@ -518,7 +518,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav nMouseX, nMouseY, nClicks, - sal_False ); + false ); sal_uLong nCount = Application::ReleaseSolarMutex(); @@ -903,7 +903,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, sal_uInt16 nEvCode = aKeyCode.GetCode(); // allow application key listeners to remove the key event - // but make sure we're not forwarding external KeyEvents, (ie where bForward is sal_False) + // but make sure we're not forwarding external KeyEvents, (ie where bForward is false) // because those are coming back from the listener itself and MUST be processed KeyEvent aKeyEvent( (sal_Unicode)nCharCode, aKeyCode, nRepeat ); if( bForward ) diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index ba18b541f0ac..9c2060c77a50 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -195,10 +195,10 @@ void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, s if ( !mbSysChild ) { if ( mnPresentationFlags & PRESENTATION_HIDEALLAPPS ) - mpWindowImpl->mpFrame->SetAlwaysOnTop( sal_True ); + mpWindowImpl->mpFrame->SetAlwaysOnTop( true ); if ( !(mnPresentationFlags & PRESENTATION_NOAUTOSHOW) ) ToTop(); - mpWindowImpl->mpFrame->StartPresentation( sal_True ); + mpWindowImpl->mpFrame->StartPresentation( true ); } if ( !(mnPresentationFlags & PRESENTATION_NOAUTOSHOW) ) @@ -209,9 +209,9 @@ void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, s Show( mbPresentationVisible ); if ( !mbSysChild ) { - mpWindowImpl->mpFrame->StartPresentation( sal_False ); + mpWindowImpl->mpFrame->StartPresentation( false ); if ( mnPresentationFlags & PRESENTATION_HIDEALLAPPS ) - mpWindowImpl->mpFrame->SetAlwaysOnTop( sal_False ); + mpWindowImpl->mpFrame->SetAlwaysOnTop( false ); } ShowFullScreenMode( mbPresentationFull, nDisplayScreen ); diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index fda0b3d9517a..ea6f9b873fee 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -362,7 +362,7 @@ static int DisplayYield( int fd, SalX11Display *pDisplay ) GetSalData()->m_pInstance->GetYieldMutex()->acquire(); pDisplay->Yield(); GetSalData()->m_pInstance->GetYieldMutex()->release(); - return sal_True; + return true; } SalX11Display::SalX11Display( Display *display ) diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 0ac8dd748297..4072e835cad6 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -1791,12 +1791,12 @@ bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest if( aNotify.xselection.property != None ) { dsde.DropAction = DNDConstants::ACTION_COPY; - dsde.DropSuccess = sal_True; + dsde.DropSuccess = true; } else { dsde.DropAction = DNDConstants::ACTION_NONE; - dsde.DropSuccess = sal_False; + dsde.DropSuccess = false; } css::uno::Reference< XDragSourceListener > xListener( m_xDragSourceListener ); m_xDragSourceListener.clear(); @@ -2729,7 +2729,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) dsde.DragSourceContext = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this ); dsde.DragSource = static_cast< XDragSource* >(this); dsde.DropAction = DNDConstants::ACTION_NONE; - dsde.DropSuccess = sal_False; + dsde.DropSuccess = false; css::uno::Reference< XDragSourceListener > xListener( m_xDragSourceListener ); m_xDragSourceListener.clear(); aGuard.clear(); @@ -2870,7 +2870,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) dsde.DragSourceContext = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this ); dsde.DragSource = static_cast< XDragSource* >(this); dsde.DropAction = DNDConstants::ACTION_NONE; - dsde.DropSuccess = sal_False; + dsde.DropSuccess = false; css::uno::Reference< XDragSourceListener > xListener( m_xDragSourceListener ); m_xDragSourceListener.clear(); aGuard.clear(); @@ -2921,7 +2921,7 @@ void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time ) dsde.DragSourceContext = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this ); dsde.DragSource = static_cast< XDragSource* >(this); dsde.DropAction = DNDConstants::ACTION_NONE; - dsde.DropSuccess = sal_False; + dsde.DropSuccess = false; m_xDragSourceListener->dragDropEnd( dsde ); m_xDragSourceListener.clear(); } @@ -2934,7 +2934,7 @@ void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time ) sal_Bool SelectionManager::isDragImageSupported() throw(std::exception) { - return sal_False; + return false; } @@ -3201,7 +3201,7 @@ void SelectionManager::startDrag( aDragFailedEvent.DragSource = static_cast< XDragSource* >(this); aDragFailedEvent.DragSourceContext = new DragSourceContext( None, CurrentTime, *this ); aDragFailedEvent.DropAction = DNDConstants::ACTION_NONE; - aDragFailedEvent.DropSuccess = sal_False; + aDragFailedEvent.DropSuccess = false; if( m_aDragRunning.check() ) { @@ -3483,7 +3483,7 @@ void SelectionManager::dragDoDispatch() dsde.DragSourceContext = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this ); dsde.DragSource = static_cast< XDragSource* >(this); dsde.DropAction = DNDConstants::ACTION_NONE; - dsde.DropSuccess = sal_False; + dsde.DropSuccess = false; // cleanup after drag if( m_bWaitingForPrimaryConversion ) @@ -3889,7 +3889,7 @@ sal_Bool SelectionManager::handleEvent( const Any& event ) throw(std::exception) #endif shutdown(); } - return sal_True; + return true; } void SAL_CALL SelectionManager::disposing( const ::com::sun::star::lang::EventObject& rEvt ) @@ -4038,7 +4038,7 @@ void SelectionManager::deregisterDropTarget( XLIB_Window aWindow ) dsde.DragSourceContext = new DragSourceContext( m_aDropWindow, m_nDragTimestamp, *this ); dsde.DragSource = static_cast< XDragSource* >(this); dsde.DropAction = DNDConstants::ACTION_NONE; - dsde.DropSuccess = sal_False; + dsde.DropSuccess = false; css::uno::Reference< XDragSourceListener > xListener( m_xDragSourceListener ); m_xDragSourceListener.clear(); aGuard.clear(); @@ -4123,7 +4123,7 @@ void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) thro sal_Bool SelectionManagerHolder::isDragImageSupported() throw(std::exception) { - return m_xRealDragSource.is() ? m_xRealDragSource->isDragImageSupported() : sal_False; + return m_xRealDragSource.is() ? m_xRealDragSource->isDragImageSupported() : false; } diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx index 5321f084ae13..e913e8d83821 100644 --- a/vcl/unx/generic/dtrans/X11_transferable.cxx +++ b/vcl/unx/generic/dtrans/X11_transferable.cxx @@ -114,9 +114,9 @@ sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFla for( int i = 0; i < aFlavors.getLength(); i++ ) if( aFlavor.MimeType.equalsIgnoreAsciiCase( aFlavors.getConstArray()[i].MimeType ) && aFlavor.DataType == aFlavors.getConstArray()[i].DataType ) - return sal_True; + return true; - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index a8da77564967..018f83328c48 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -114,7 +114,7 @@ X11SalGraphics::X11SalGraphics() #if ENABLE_GRAPHITE // check if graphite fonts have been disabled static const char* pDisableGraphiteStr = getenv( "SAL_DISABLE_GRAPHITE" ); - bDisableGraphite_ = pDisableGraphiteStr ? (pDisableGraphiteStr[0]!='0') : sal_False; + bDisableGraphite_ = pDisableGraphiteStr ? (pDisableGraphiteStr[0]!='0') : false; #endif pBrushGC_ = NULL; diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index fde56609167d..250ad488ba8c 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -162,7 +162,7 @@ bool X11SalVirtualDevice::Init( SalDisplay *pDisplay, pGraphics_->Init( this, pColormap, bDeleteColormap ); - return hDrawable_ != None ? sal_True : sal_False; + return hDrawable_ != None ? true : false; } X11SalVirtualDevice::X11SalVirtualDevice() : diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 4bfd29a169d5..0d8ad3368739 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -731,7 +731,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uLong nSalFrameStyle, mnExtStyle = 0; bAlwaysOnTop_ = false; - // set bViewable_ to sal_True: hack GetClientSize to report something + // set bViewable_ to true: hack GetClientSize to report something // different to 0/0 before first map bViewable_ = true; bMapped_ = false; @@ -803,7 +803,7 @@ X11SalFrame::~X11SalFrame() ShowFullScreen( false, 0 ); if( bMapped_ ) - Show( sal_False ); + Show( false ); if( mpInputContext ) { @@ -914,7 +914,7 @@ void X11SalFrame::updateGraphics( bool bClear ) pFreeGraphics_->SetDrawable( aDrawable, m_nXScreen ); } -void X11SalFrame::Enable( sal_Bool /*bEnable*/ ) +void X11SalFrame::Enable( bool /*bEnable*/ ) { // NYI: enable/disable frame } @@ -1080,7 +1080,7 @@ void X11SalFrame::SetMinClientSize( long nWidth, long nHeight ) // Show + Pos (x,y,z) + Size (width,height) -void X11SalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) +void X11SalFrame::Show( bool bVisible, bool bNoActivate ) { if( ( bVisible && bMapped_ ) || ( !bVisible && !bMapped_ ) ) @@ -1110,12 +1110,12 @@ void X11SalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) if( pFrame->nStyle_ & SAL_FRAME_STYLE_INTRO ) { if( pFrame->bMapped_ ) - const_cast<X11SalFrame*>(pFrame)->Show( sal_False ); + const_cast<X11SalFrame*>(pFrame)->Show( false ); } } } - // update NET_WM_STATE which may have been deleted due to earlier Show(sal_False) + // update NET_WM_STATE which may have been deleted due to earlier Show(false) if( nShowState_ == SHOWSTATE_HIDDEN ) GetDisplay()->getWMAdaptor()->frameIsMapping( this ); @@ -1124,7 +1124,7 @@ void X11SalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) * with the basic dialogue editor, * which shows a frame and instantly hides it again. After that the * editor window is shown and the WM takes this as an opportunity - * to show our hidden transient frame also. So Show( sal_False ) must + * to show our hidden transient frame also. So Show( false ) must * withdraw the frame AND delete the WM_TRANSIENT_FOR property. * In case the frame is shown again, the transient hint must be restored here. */ @@ -1257,7 +1257,7 @@ void X11SalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) * plugged windows don't necessarily get the * focus on show because the parent may already be mapped * and have the focus. So try to set the focus - * to the child on Show(sal_True) + * to the child on Show(true) */ if( (nStyle_ & SAL_FRAME_STYLE_PLUG) && ! m_bXEmbed ) XSetInputFocus( GetXDisplay(), @@ -1545,7 +1545,7 @@ void X11SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_u bDefaultPosition_ = False; } -void X11SalFrame::SetAlwaysOnTop( sal_Bool bOnTop ) +void X11SalFrame::SetAlwaysOnTop( bool bOnTop ) { if( ! IsOverrideRedirect() ) { @@ -2009,22 +2009,22 @@ void X11SalFrame::SetScreenNumber( unsigned int nNewScreen ) Rectangle aNewScreenRect( GetDisplay()->GetXineramaScreens()[nNewScreen] ); bool bVisible = bMapped_; if( bVisible ) - Show( sal_False ); + Show( false ); maGeometry.nX = aNewScreenRect.Left() + (maGeometry.nX - aOldScreenRect.Left()); maGeometry.nY = aNewScreenRect.Top() + (maGeometry.nY - aOldScreenRect.Top()); createNewWindow( None, m_nXScreen ); if( bVisible ) - Show( sal_True ); + Show( true ); maGeometry.nDisplayScreenNumber = nNewScreen; } else if( nNewScreen < GetDisplay()->GetXScreenCount() ) { bool bVisible = bMapped_; if( bVisible ) - Show( sal_False ); + Show( false ); createNewWindow( None, SalX11Screen( nNewScreen ) ); if( bVisible ) - Show( sal_True ); + Show( true ); maGeometry.nDisplayScreenNumber = nNewScreen; } } @@ -2074,7 +2074,7 @@ void X11SalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nScreen ) nStyle_ |= SAL_FRAME_STYLE_PARTIAL_FULLSCREEN; bool bVisible = bMapped_; if( bVisible ) - Show( sal_False ); + Show( false ); maGeometry.nX = aRect.Left(); maGeometry.nY = aRect.Top(); maGeometry.nWidth = aRect.GetWidth(); @@ -2087,7 +2087,7 @@ void X11SalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nScreen ) else GetDisplay()->getWMAdaptor()->showFullScreen( this, true ); if( bVisible ) - Show(sal_True); + Show(true); } else @@ -2098,14 +2098,14 @@ void X11SalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nScreen ) Rectangle aRect = maRestorePosSize; maRestorePosSize = Rectangle(); if( bVisible ) - Show( sal_False ); + Show( false ); createNewWindow( None, m_nXScreen ); if( !aRect.IsEmpty() ) SetPosSize( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y | SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT ); if( bVisible ) - Show( sal_True ); + Show( true ); } } else @@ -2118,12 +2118,12 @@ void X11SalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nScreen ) if( mbFullScreen ) pDisplay_->getWMAdaptor()->showFullScreen( this, false ); if( bVisible ) - Show( sal_False ); + Show( false ); createNewWindow( None, SalX11Screen( nScreen ) ); if( mbFullScreen ) pDisplay_->getWMAdaptor()->showFullScreen( this, true ); if( bVisible ) - Show( sal_True ); + Show( true ); } if( mbFullScreen == (bool)bFullScreen ) return; @@ -2207,7 +2207,7 @@ MessageToXAutoLock( Display *p_display, int n_message ) return True; } -void X11SalFrame::StartPresentation( sal_Bool bStart ) +void X11SalFrame::StartPresentation( bool bStart ) { I18NStatus::get().show( !bStart, I18NStatus::presentation ); if ( bStart ) @@ -2486,7 +2486,7 @@ void X11SalFrame::UpdateSettings( AllSettings& rSettings ) rSettings.SetStyleSettings( aStyleSettings ); } -void X11SalFrame::CaptureMouse( sal_Bool bCapture ) +void X11SalFrame::CaptureMouse( bool bCapture ) { nCaptured_ = pDisplay_->CaptureMouse( bCapture ? this : NULL ); } @@ -2515,7 +2515,7 @@ void X11SalFrame::createNewWindow( XLIB_Window aNewParent, SalX11Screen nXScreen { bool bWasVisible = bMapped_; if( bWasVisible ) - Show( sal_False ); + Show( false ); if( nXScreen.getXScreen() >= GetDisplay()->GetXScreenCount() ) nXScreen = m_nXScreen; @@ -2582,7 +2582,7 @@ void X11SalFrame::createNewWindow( XLIB_Window aNewParent, SalX11Screen nXScreen } if( bWasVisible ) - Show( sal_True ); + Show( true ); std::list< X11SalFrame* > aChildren = maChildren; for( std::list< X11SalFrame* >::iterator it = aChildren.begin(); it != aChildren.end(); ++it ) @@ -2792,7 +2792,7 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent ) } if( ! bInside ) { - // need not take care of the XUngrabPointer in Show( sal_False ) + // need not take care of the XUngrabPointer in Show( false ) // because XUngrabPointer does not produce errors if pointer // is not grabbed XUngrabPointer( GetXDisplay(), CurrentTime ); @@ -3663,8 +3663,8 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) hWM_Parent = GetShellWindow(); break; } - /* this sometimes happens if a Show(sal_True) is - * immediately followed by Show(sal_False) (which is braindead anyway) + /* this sometimes happens if a Show(true) is + * immediately followed by Show(false) (which is braindead anyway) */ if( hDummy == hWM_Parent ) hDummy = hRoot; @@ -3942,7 +3942,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) if( -1 == nCaptured_ ) { - CaptureMouse( sal_True ); + CaptureMouse( true ); #ifdef DBG_UTIL if( -1 != nCaptured_ ) pDisplay_->DbgPrintDisplayEvent("Captured", pEvent); @@ -4015,7 +4015,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) } bMapped_ = true; bViewable_ = true; - nRet = sal_True; + nRet = true; if ( mpInputContext != NULL ) mpInputContext->Map( this ); CallCallback( SALEVENT_RESIZE, NULL ); @@ -4075,7 +4075,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) { bMapped_ = false; bViewable_ = false; - nRet = sal_True; + nRet = true; if ( mpInputContext != NULL ) mpInputContext->Unmap( this ); CallCallback( SALEVENT_RESIZE, NULL ); @@ -4090,7 +4090,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) case VisibilityNotify: nVisibility_ = pEvent->xvisibility.state; - nRet = sal_True; + nRet = true; if( bAlwaysOnTop_ && bMapped_ && ! GetDisplay()->getWMAdaptor()->isAlwaysOnTopOK() diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index a06a7df96a40..af85a8c5f685 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -42,7 +42,7 @@ // SalInstance member to create and destroy a SalObject -SalObject* X11SalInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow ) +SalObject* X11SalInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow ) { return X11SalObject::CreateObject( pParent, pWindowData, bShow ); } @@ -382,7 +382,7 @@ X11SalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) void -X11SalObject::Show( sal_Bool bVisible ) +X11SalObject::Show( bool bVisible ) { if ( ! maSystemChildData.aWindow ) return; diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 502d30ef125c..243ea1870bb1 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -591,7 +591,7 @@ Bool2String( const uno::Any& rAny ) { int n = 1; - if( rAny.get<sal_Bool>() ) + if( rAny.get<bool>() ) n = 0; return g_strdup( bool_values[n] ); @@ -755,7 +755,7 @@ get_font_effect(const uno::Sequence< beans::PropertyValue >& rAttributeList, { if( nContourIndex != -1 ) { - if( rAttributeList[nContourIndex].Value.get<sal_Bool>() ) + if( rAttributeList[nContourIndex].Value.get<bool>() ) return g_strdup(outline); } @@ -799,7 +799,7 @@ get_text_decoration(const uno::Sequence< beans::PropertyValue >& rAttributeList, if( nBlinkIndex != -1 ) { - if( rAttributeList[nBlinkIndex].Value.get<sal_Bool>() ) + if( rAttributeList[nBlinkIndex].Value.get<bool>() ) value_list[count++] = const_cast <gchar *> (decorations[DECORATION_BLINK]); } if( nUnderlineIndex != -1 ) @@ -833,7 +833,7 @@ Bool2Shadow( const uno::Any& rAny ) { int n = 0; - if( rAny.get<sal_Bool>() ) + if( rAny.get<bool>() ) n = 1; return g_strdup( shadow_values[n] ); diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 1f140f3141a3..24ff3c836c86 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -208,7 +208,7 @@ SalFrame* GtkInstance::CreateChildFrame( SystemParentData* pParentData, sal_uLon return new GtkSalFrame( pParentData ); } -SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow ) +SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow ) { EnsureInit(); #if !GTK_CHECK_VERSION(3,0,0) @@ -368,7 +368,7 @@ SalBitmap* GtkInstance::CreateSalBitmap() #ifdef ENABLE_GMENU_INTEGRATION -SalMenu* GtkInstance::CreateMenu( sal_Bool bMenuBar, Menu* pVCLMenu ) +SalMenu* GtkInstance::CreateMenu( bool bMenuBar, Menu* pVCLMenu ) { EnsureInit(); GtkSalMenu* pSalMenu = new GtkSalMenu( bMenuBar ); @@ -396,7 +396,7 @@ void GtkInstance::DestroyMenuItem( SalMenuItem* pItem ) #else // not ENABLE_GMENU_INTEGRATION -SalMenu* GtkInstance::CreateMenu( sal_Bool, Menu* ) { return NULL; } +SalMenu* GtkInstance::CreateMenu( bool, Menu* ) { return NULL; } void GtkInstance::DestroyMenu( SalMenu* ) {} SalMenuItem* GtkInstance::CreateMenuItem( const SalItemParams* ) { return NULL; } void GtkInstance::DestroyMenuItem( SalMenuItem* ) {} diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index ce7d1ed42cc9..2365565ce614 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -71,7 +71,7 @@ static void expandexpanders(GtkContainer *pWidget) if (GTK_IS_CONTAINER(GTK_WIDGET(p->data))) expandexpanders(GTK_CONTAINER(GTK_WIDGET(p->data))); if (GTK_IS_EXPANDER(GTK_WIDGET(p->data))) - gtk_expander_set_expanded(GTK_EXPANDER(GTK_WIDGET(p->data)), sal_True); + gtk_expander_set_expanded(GTK_EXPANDER(GTK_WIDGET(p->data)), true); } g_list_free(pChildren); } @@ -142,18 +142,18 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT ); #if ENABLE_GNOME_VFS || ENABLE_GIO - gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False ); + gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), false ); #endif - gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), sal_False ); + gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), false ); - m_pVBox = gtk_vbox_new( sal_False, 0 ); + m_pVBox = gtk_vbox_new( false, 0 ); // We don't want clickable items to have a huge hit-area - GtkWidget *pHBox = gtk_hbox_new( sal_False, 0 ); - GtkWidget *pThinVBox = gtk_vbox_new( sal_False, 0 ); + GtkWidget *pHBox = gtk_hbox_new( false, 0 ); + GtkWidget *pThinVBox = gtk_vbox_new( false, 0 ); - gtk_box_pack_end (GTK_BOX( m_pVBox ), pHBox, sal_False, sal_False, 0); - gtk_box_pack_start (GTK_BOX( pHBox ), pThinVBox, sal_False, sal_False, 0); + gtk_box_pack_end (GTK_BOX( m_pVBox ), pHBox, false, false, 0); + gtk_box_pack_start (GTK_BOX( pHBox ), pThinVBox, false, false, 0); gtk_widget_show( pHBox ); gtk_widget_show( pThinVBox ); @@ -183,12 +183,12 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext break; } - gtk_box_pack_end( GTK_BOX( pThinVBox ), m_pToggles[i], sal_False, sal_False, 0 ); + gtk_box_pack_end( GTK_BOX( pThinVBox ), m_pToggles[i], false, false, 0 ); } for( i = 0; i < LIST_LAST; i++ ) { - m_pHBoxs[i] = gtk_hbox_new( sal_False, 0 ); + m_pHBoxs[i] = gtk_hbox_new( false, 0 ); m_pAligns[i] = gtk_alignment_new(0, 0, 0, 1); @@ -220,18 +220,18 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext } gtk_container_add( GTK_CONTAINER( m_pAligns[i]), m_pLists[i] ); - gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pAligns[i], sal_False, sal_False, 0 ); + gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pAligns[i], false, false, 0 ); - gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pListLabels[i], sal_False, sal_False, 0 ); + gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pListLabels[i], false, false, 0 ); - gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pHBoxs[i], sal_False, sal_False, 0 ); + gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pHBoxs[i], false, false, 0 ); } aLabel = getResString( FILE_PICKER_FILE_TYPE ); m_pFilterExpander = gtk_expander_new_with_mnemonic( OUStringToOString( aLabel, RTL_TEXTENCODING_UTF8 ).getStr()); - gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pFilterExpander, sal_False, sal_True, 0 ); + gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pFilterExpander, false, true, 0 ); GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), @@ -249,11 +249,11 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext case 0: break; case 1: - gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), sal_True); + gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), true); break; case 2: expandexpanders(GTK_CONTAINER(m_pDialog)); - gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), sal_True); + gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), true); break; } @@ -270,8 +270,8 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext { column = gtk_tree_view_column_new (); cell = gtk_cell_renderer_text_new (); - gtk_tree_view_column_set_expand (column, sal_True); - gtk_tree_view_column_pack_start (column, cell, sal_False); + gtk_tree_view_column_set_expand (column, true); + gtk_tree_view_column_pack_start (column, cell, false); gtk_tree_view_column_set_attributes (column, cell, "text", i, (char *)NULL); gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column); } @@ -1399,12 +1399,12 @@ throw( uno::RuntimeException, std::exception ) if( bEnable ) { OSL_TRACE( "enable" ); - gtk_widget_set_sensitive( pWidget, sal_True ); + gtk_widget_set_sensitive( pWidget, true ); } else { OSL_TRACE( "disable" ); - gtk_widget_set_sensitive( pWidget, sal_False ); + gtk_widget_set_sensitive( pWidget, false ); } } else @@ -1443,7 +1443,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& } else if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL ) g_object_set( pWidget, "label", aTxt.getStr(), - "use_underline", sal_True, (char *)NULL ); + "use_underline", true, (char *)NULL ); else OSL_TRACE("Can't set label on list"); } @@ -1586,7 +1586,7 @@ void SalGtkFilePicker::update_preview_cb( GtkFileChooser *file_chooser, SalGtkFi GtkWidget *preview; char *filename; GdkPixbuf *pixbuf; - gboolean have_preview = sal_False; + gboolean have_preview = false; preview = pobjFP->m_pPreview; filename = gtk_file_chooser_get_preview_filename( file_chooser ); @@ -1865,22 +1865,22 @@ extern "C" static gboolean case_insensitive_filter (const GtkFileFilterInfo *filter_info, gpointer data) { - gboolean bRetval = sal_False; + gboolean bRetval = false; const char *pFilter = (const char *) data; - g_return_val_if_fail( data != NULL, sal_False ); - g_return_val_if_fail( filter_info != NULL, sal_False ); + g_return_val_if_fail( data != NULL, false ); + g_return_val_if_fail( filter_info != NULL, false ); if( !filter_info->uri ) - return sal_False; + return false; const char *pExtn = strrchr( filter_info->uri, '.' ); if( !pExtn ) - return sal_False; + return false; pExtn++; if( !g_ascii_strcasecmp( pFilter, pExtn ) ) - bRetval = sal_True; + bRetval = true; SAL_INFO( "vcl.gtk", "'" << filter_info->uri << "' match extn '" << pExtn << "' vs '" << pFilter << "' yeilds " << bRetval ); diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index 46fdcdbe4475..b30334408c5c 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -60,9 +60,9 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT ); #if ENABLE_GNOME_VFS || ENABLE_GIO - gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False ); + gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), false ); #endif - gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), sal_False ); + gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), false ); } diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 22b8794cba2e..76e5d44b5359 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -549,7 +549,7 @@ void GtkSalGraphics::copyBits( const SalTwoRect& rPosAry, /* * IsNativeControlSupported() * - * Returns sal_True if the platform supports native + * Returns true if the platform supports native * drawing of the control defined by nPart */ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) @@ -658,7 +658,7 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP /* * HitTestNativeControl() * - * bIsInside is set to sal_True if aPos is contained within the + * bIsInside is set to true if aPos is contained within the * given part of the control, whose bounding region is * given by rControlRegion (in VCL frame coordinates). * @@ -967,7 +967,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, /* * GetNativeControlRegion() * - * If the return value is sal_True, rNativeBoundingRegion + * If the return value is true, rNativeBoundingRegion * contains the true bounding region covered by the control * including any adornment, while rNativeContentRegion contains the area * within the control that can be safely drawn into without drawing over @@ -1662,7 +1662,7 @@ bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, // intermediate states between active/inactive. Let's hope that // GtkToggleButtone stays binary compatible. if (!isChecked) - GTK_TOGGLE_BUTTON(gWidgetData[m_nXScreen].gRadioWidgetSibling)->active = sal_True; + GTK_TOGGLE_BUTTON(gWidgetData[m_nXScreen].gRadioWidgetSibling)->active = true; GTK_TOGGLE_BUTTON(gWidgetData[m_nXScreen].gRadioWidget)->active = isChecked; for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it ) @@ -2004,7 +2004,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, // ----------------- ARROW 1 NWCalcArrowRect( button11BoundRect, arrowRect ); gtk_paint_arrow( style, gdkDrawable, stateType, shadowType, - gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, sal_True, + gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, true, x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(), arrowRect.GetWidth(), arrowRect.GetHeight() ); } @@ -2020,7 +2020,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, // ----------------- ARROW 1 NWCalcArrowRect( button12BoundRect, arrowRect ); gtk_paint_arrow( style, gdkDrawable, stateType, shadowType, - gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, sal_True, + gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, true, x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(), arrowRect.GetWidth(), arrowRect.GetHeight() ); } @@ -2037,7 +2037,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, // ----------------- ARROW 2 NWCalcArrowRect( button21BoundRect, arrowRect ); gtk_paint_arrow( style, gdkDrawable, stateType, shadowType, - gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, sal_True, + gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button1Type, true, x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(), arrowRect.GetWidth(), arrowRect.GetHeight() ); } @@ -2053,7 +2053,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, // ----------------- ARROW 2 NWCalcArrowRect( button22BoundRect, arrowRect ); gtk_paint_arrow( style, gdkDrawable, stateType, shadowType, - gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, sal_True, + gdkRect, GTK_WIDGET(scrollbarWidget), scrollbarTag, button2Type, true, x+hShim+arrowRect.Left(), y+vShim+arrowRect.Top(), arrowRect.GetWidth(), arrowRect.GetHeight() ); } @@ -2482,7 +2482,7 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen, arrowRect.setY( buttonRect.Top() + (buttonRect.GetHeight() - arrowRect.GetHeight()) / 2 - 1); gtk_paint_arrow( gWidgetData[nScreen].gSpinButtonWidget->style, pixmap, stateType, GTK_SHADOW_OUT, NULL, gWidgetData[nScreen].gSpinButtonWidget, - "spinbutton", (nPart == PART_BUTTON_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN, sal_True, + "spinbutton", (nPart == PART_BUTTON_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN, true, (arrowRect.Left() - aAreaRect.Left()), (arrowRect.Top() - aAreaRect.Top()), arrowRect.GetWidth(), arrowRect.GetHeight() ); } @@ -2560,7 +2560,7 @@ bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable, buttonRect.GetWidth(), buttonRect.GetHeight() ); gtk_paint_arrow( gWidgetData[m_nXScreen].gArrowWidget->style, gdkDrawable, stateType, shadowType, - &clipRect, gWidgetData[m_nXScreen].gArrowWidget, "arrow", GTK_ARROW_DOWN, sal_True, + &clipRect, gWidgetData[m_nXScreen].gArrowWidget, "arrow", GTK_ARROW_DOWN, true, x+(arrowRect.Left() - pixmapRect.Left()), y+(arrowRect.Top() - pixmapRect.Top()), arrowRect.GetWidth(), arrowRect.GetHeight() ); } diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index c89848b69ebd..f585c73c904d 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -156,7 +156,7 @@ void GtkSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) } } -void GtkSalObject::Show( sal_Bool bVisible ) +void GtkSalObject::Show( bool bVisible ) { if( m_pSocket ) { @@ -202,7 +202,7 @@ void GtkSalObject::signalDestroy( GtkWidget* pObj, gpointer object ) } } -void GtkSalObject::SetForwardKey( sal_Bool bEnable ) +void GtkSalObject::SetForwardKey( bool bEnable ) { if( bEnable ) gtk_widget_add_events( GTK_WIDGET( m_pSocket ), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE ); diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 285809042ab7..547f543eeb46 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1314,7 +1314,7 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle ) else if( (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) { eType = GDK_WINDOW_TYPE_HINT_TOOLBAR; - lcl_set_accept_focus( GTK_WINDOW(m_pWindow), sal_False, true ); + lcl_set_accept_focus( GTK_WINDOW(m_pWindow), false, true ); } else if( (nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE) ) { @@ -1362,9 +1362,9 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle ) if( bDecoHandling ) { - gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? sal_True : FALSE ); + gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle & SAL_FRAME_STYLE_SIZEABLE) ? true : FALSE ); if( ( (nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ) ) - lcl_set_accept_focus( GTK_WINDOW(m_pWindow), sal_False, false ); + lcl_set_accept_focus( GTK_WINDOW(m_pWindow), false, false ); } } @@ -1605,7 +1605,7 @@ bitmapToPixbuf( SalBitmap *pSalBitmap, SalBitmap *pSalAlpha ) pSalAlpha->ReleaseBuffer( pAlpha, true ); return gdk_pixbuf_new_from_data( pPixbufData, - GDK_COLORSPACE_RGB, sal_True, 8, + GDK_COLORSPACE_RGB, true, 8, aSize.Width(), aSize.Height(), aSize.Width() * 4, (GdkPixbufDestroyNotify) g_free, @@ -1768,7 +1768,7 @@ static void initClientId() #endif } -void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) +void GtkSalFrame::Show( bool bVisible, bool bNoActivate ) { if( m_pWindow ) { @@ -1880,7 +1880,7 @@ void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) } } -void GtkSalFrame::Enable( sal_Bool /*bEnable*/ ) +void GtkSalFrame::Enable( bool /*bEnable*/ ) { // Not implemented by X11SalFrame either } @@ -2303,7 +2303,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSiz bool bResize = false; bool bVisible = IS_WIDGET_MAPPED( m_pWindow ); if( bVisible ) - Show( sal_False ); + Show( false ); if( eType == SET_FULLSCREEN ) { @@ -2371,7 +2371,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSiz CallCallback( SALEVENT_MOVERESIZE, NULL ); if( bVisible ) - Show( sal_True ); + Show( true ); } void GtkSalFrame::SetScreenNumber( unsigned int nNewScreen ) @@ -2577,7 +2577,7 @@ dbus_uninhibit_gsm (guint cookie) } #endif -void GtkSalFrame::StartPresentation( sal_Bool bStart ) +void GtkSalFrame::StartPresentation( bool bStart ) { setAutoLock( !bStart ); @@ -2622,7 +2622,7 @@ void GtkSalFrame::StartPresentation( sal_Bool bStart ) } } -void GtkSalFrame::SetAlwaysOnTop( sal_Bool bOnTop ) +void GtkSalFrame::SetAlwaysOnTop( bool bOnTop ) { if( m_pWindow ) gtk_window_set_keep_above( GTK_WINDOW( m_pWindow ), bOnTop ); @@ -2751,7 +2751,7 @@ void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents ) #endif } -void GtkSalFrame::CaptureMouse( sal_Bool bCapture ) +void GtkSalFrame::CaptureMouse( bool bCapture ) { getDisplay()->CaptureMouse( bCapture ? this : NULL ); } @@ -2933,7 +2933,7 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, SalX11S { bool bWasVisible = m_pWindow ? IS_WIDGET_MAPPED(m_pWindow) : false; if( bWasVisible ) - Show( sal_False ); + Show( false ); if( (int)nXScreen.getXScreen() >= getDisplay()->GetXScreenCount() ) nXScreen = m_nXScreen; @@ -3019,7 +3019,7 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, SalX11S SetTitle( m_aTitle ); if( bWasVisible ) - Show( sal_True ); + Show( true ); std::list< GtkSalFrame* > aChildren = m_aChildren; m_aChildren.clear(); @@ -3154,7 +3154,7 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent ) GdkEventFocus aEvent; aEvent.type = GDK_FOCUS_CHANGE; aEvent.window = widget_get_window( m_pWindow ); - aEvent.send_event = sal_True; + aEvent.send_event = true; aEvent.in = gint16(pEvent->xclient.data.l[1] == 1); signalFocus( m_pWindow, &aEvent, this ); } @@ -3178,14 +3178,14 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer nEventType = SALEVENT_MOUSEBUTTONUP; break; default: - return sal_False; + return false; } switch( pEvent->button ) { case 1: aEvent.mnButton = MOUSE_LEFT; break; case 2: aEvent.mnButton = MOUSE_MIDDLE; break; case 3: aEvent.mnButton = MOUSE_RIGHT; break; - default: return sal_False; + default: return false; } aEvent.mnTime = pEvent->time; aEvent.mnX = (long)pEvent->x_root - pThis->maGeometry.nX; @@ -3251,7 +3251,7 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer } } - return sal_False; + return false; } gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame ) @@ -3285,7 +3285,7 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame pThis->CallCallback( SALEVENT_WHEELMOUSE, &aEvent ); - return sal_False; + return false; } gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer frame ) @@ -3327,7 +3327,7 @@ gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer } } - return sal_True; + return true; } gboolean GtkSalFrame::signalCrossing( GtkWidget*, GdkEventCrossing* pEvent, gpointer frame ) @@ -3342,7 +3342,7 @@ gboolean GtkSalFrame::signalCrossing( GtkWidget*, GdkEventCrossing* pEvent, gpoi pThis->CallCallback( (pEvent->type == GDK_ENTER_NOTIFY) ? SALEVENT_MOUSEMOVE : SALEVENT_MOUSELEAVE, &aEvent ); - return sal_True; + return true; } #if GTK_CHECK_VERSION(3,0,0) @@ -3534,7 +3534,7 @@ gboolean GtkSalFrame::signalExpose( GtkWidget*, GdkEventExpose* pEvent, gpointer pThis->CallCallback( SALEVENT_PAINT, &aEvent ); - return sal_False; + return false; } gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer frame ) @@ -3569,7 +3569,7 @@ gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer f if( m_nFloats == 0 ) pThis->CallCallback( pEvent->in ? SALEVENT_GETFOCUS : SALEVENT_LOSEFOCUS, NULL ); - return sal_False; + return false; } #if !GTK_CHECK_VERSION(3,8,0) @@ -3641,7 +3641,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame ) pThis->CallCallback( SALEVENT_RESIZE, NULL ); - return sal_False; + return false; } gboolean GtkSalFrame::signalUnmap( GtkWidget*, GdkEvent*, gpointer frame ) @@ -3650,7 +3650,7 @@ gboolean GtkSalFrame::signalUnmap( GtkWidget*, GdkEvent*, gpointer frame ) pThis->CallCallback( SALEVENT_RESIZE, NULL ); - return sal_False; + return false; } gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gpointer frame ) @@ -3668,7 +3668,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp */ if( (pThis->m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) && pThis->getDisplay()->GetCaptureFrame() == pThis ) - return sal_False; + return false; /* #i31785# claims we cannot trust the x,y members of the event; * they are e.g. not set correctly on maximize/demaximize; @@ -3734,7 +3734,7 @@ gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gp else if( bSized ) pThis->CallCallback( SALEVENT_RESIZE, NULL ); - return sal_False; + return false; } gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame ) @@ -3746,7 +3746,7 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame if( pThis->m_pIMHandler ) { if( pThis->m_pIMHandler->handleKeyEvent( pEvent ) ) - return sal_True; + return true; } // handle modifiers @@ -3850,7 +3850,7 @@ gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame if( !aDel.isDeleted() && pThis->m_pIMHandler ) pThis->m_pIMHandler->updateIMSpotLocation(); - return sal_True; + return true; } gboolean GtkSalFrame::signalDelete( GtkWidget*, GdkEvent*, gpointer frame ) @@ -3859,7 +3859,7 @@ gboolean GtkSalFrame::signalDelete( GtkWidget*, GdkEvent*, gpointer frame ) pThis->CallCallback( SALEVENT_CLOSE, NULL ); - return sal_True; + return true; } void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer frame ) @@ -3927,7 +3927,7 @@ gboolean GtkSalFrame::signalState( GtkWidget*, GdkEvent* pEvent, gpointer frame } #endif - return sal_False; + return false; } gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* pEvent, gpointer frame ) @@ -3935,7 +3935,7 @@ gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* pEvent, GtkSalFrame* pThis = (GtkSalFrame*)frame; pThis->m_nVisibility = pEvent->state; - return sal_False; + return false; } void GtkSalFrame::signalDestroy( GtkWidget* pObj, gpointer frame ) diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index ae83e26a2879..48dd2255f58a 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -731,7 +731,7 @@ void GtkSalMenu::Display( bool bVisible ) bMenuVisibility = bVisible; - bool bVCLMenuVisible = ( bVisible ) ? sal_False : sal_True; + bool bVCLMenuVisible = ( bVisible ) ? false : true; MenuBar* pMenuBar = static_cast< MenuBar* >( mpVCLMenu ); pMenuBar->SetDisplayable( bVCLMenuVisible ); @@ -748,15 +748,15 @@ bool GtkSalMenu::IsItemVisible( unsigned nPos ) return bVisible; } -void GtkSalMenu::CheckItem( unsigned, sal_Bool ) +void GtkSalMenu::CheckItem( unsigned, bool ) { } -void GtkSalMenu::EnableItem( unsigned, sal_Bool ) +void GtkSalMenu::EnableItem( unsigned, bool ) { } -void GtkSalMenu::ShowItem( unsigned nPos, sal_Bool bShow ) +void GtkSalMenu::ShowItem( unsigned nPos, bool bShow ) { SolarMutexGuard aGuard; if ( nPos < maItems.size() ) diff --git a/vcl/unx/kde/UnxCommandThread.hxx b/vcl/unx/kde/UnxCommandThread.hxx index 5a3670564abf..c70959a78a96 100644 --- a/vcl/unx/kde/UnxCommandThread.hxx +++ b/vcl/unx/kde/UnxCommandThread.hxx @@ -117,7 +117,7 @@ public: protected: virtual void SAL_CALL run(); - virtual void SAL_CALL handleCommand( const OUString &rCommand/*, sal_Bool &rQuit*/ ); + virtual void SAL_CALL handleCommand( const OUString &rCommand/*, bool &rQuit*/ ); ::std::list< OUString > SAL_CALL tokenize( const OUString &rCommand ); }; diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 8472838fc429..7f11b2ef0c2d 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -1232,7 +1232,7 @@ class KDESalGraphics : public X11SalGraphics @param nPart Specification of the widget's part if it consists of more than one. - @return sal_True if the platform supports native drawing of the widget nType + @return true if the platform supports native drawing of the widget nType defined by nPart. */ bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) @@ -1266,7 +1266,7 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP /** Test whether the position is in the native widget. - If the return value is sal_True, bIsInside contains information whether + If the return value is true, bIsInside contains information whether aPos was or was not inside the native widget specified by the nType/nPart combination. */ @@ -1506,7 +1506,7 @@ bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, /** Check if the bounding regions match. - If the return value is sal_True, rNativeBoundingRegion + If the return value is true, rNativeBoundingRegion contains the true bounding region covered by the control including any adornment, while rNativeContentRegion contains the area within the control that can be safely drawn into without drawing over @@ -1724,7 +1724,7 @@ KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uLong nStyle ) : { } -void KDESalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) +void KDESalFrame::Show( bool bVisible, bool bNoActivate ) { if ( !GetParent() && ! (GetStyle() & SAL_FRAME_STYLE_INTRO) ) { diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index a66420191b2d..467e8d871093 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -144,8 +144,8 @@ KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& ) this, SLOT( executeSlot() ), Qt::BlockingQueuedConnection ); // XFilePicker functions - connect( this, SIGNAL( setMultiSelectionModeSignal( sal_Bool ) ), - this, SLOT( setMultiSelectionModeSlot( sal_Bool ) ), Qt::BlockingQueuedConnection ); + connect( this, SIGNAL( setMultiSelectionModeSignal( bool ) ), + this, SLOT( setMultiSelectionModeSlot( bool ) ), Qt::BlockingQueuedConnection ); connect( this, SIGNAL( setDefaultNameSignal( const OUString & ) ), this, SLOT( setDefaultNameSlot( const OUString & ) ), Qt::BlockingQueuedConnection ); connect( this, SIGNAL( setDisplayDirectorySignal( const OUString & ) ), @@ -172,8 +172,8 @@ KDE4FilePicker::KDE4FilePicker( const uno::Reference<uno::XComponentContext>& ) this, SLOT( setValueSlot( sal_Int16, sal_Int16, const ::com::sun::star::uno::Any & ) ), Qt::BlockingQueuedConnection ); connect( this, SIGNAL( getValueSignal( sal_Int16, sal_Int16 ) ), this, SLOT( getValueSlot( sal_Int16, sal_Int16 ) ), Qt::BlockingQueuedConnection ); - connect( this, SIGNAL( enableControlSignal( sal_Int16, sal_Bool ) ), - this, SLOT( enableControlSlot( sal_Int16, sal_Bool ) ), Qt::BlockingQueuedConnection ); + connect( this, SIGNAL( enableControlSignal( sal_Int16, bool ) ), + this, SLOT( enableControlSlot( sal_Int16, bool ) ), Qt::BlockingQueuedConnection ); connect( this, SIGNAL( setLabelSignal( sal_Int16, const OUString & ) ), this, SLOT( setLabelSlot( sal_Int16, const OUString & ) ), Qt::BlockingQueuedConnection ); connect( this, SIGNAL( getLabelSignal( sal_Int16 ) ), diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index 52a031523b4f..a27fbb0989ea 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -56,7 +56,7 @@ KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uLong nState ) : { } -void KDESalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) +void KDESalFrame::Show( bool bVisible, bool bNoActivate ) { if ( !GetParent() && ! (GetStyle() & SAL_FRAME_STYLE_INTRO) ) { diff --git a/vcl/unx/kde4/KDESalFrame.hxx b/vcl/unx/kde4/KDESalFrame.hxx index 739aacd2084d..1748415af9c3 100644 --- a/vcl/unx/kde4/KDESalFrame.hxx +++ b/vcl/unx/kde4/KDESalFrame.hxx @@ -46,7 +46,7 @@ class KDESalFrame : public X11SalFrame virtual void ReleaseGraphics( SalGraphics *pGraphics ); virtual void updateGraphics( bool bClear ); virtual void UpdateSettings( AllSettings& rSettings ); - virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate ); + virtual void Show( bool bVisible, bool bNoActivate ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index 178693f15615..19234fdf387e 100644 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -56,7 +56,7 @@ static BOOL CALLBACK ImplEnumMonitorProc( HMONITOR hMonitor, reinterpret_cast<sal_IntPtr>(lpRect) ); } -sal_Bool WinSalSystem::handleMonitorCallback( sal_IntPtr hMonitor, sal_IntPtr, sal_IntPtr ) +bool WinSalSystem::handleMonitorCallback( sal_IntPtr hMonitor, sal_IntPtr, sal_IntPtr ) { MONITORINFOEXW aInfo; aInfo.cbSize = sizeof( aInfo ); @@ -77,7 +77,7 @@ sal_Bool WinSalSystem::handleMonitorCallback( sal_IntPtr hMonitor, sal_IntPtr, s m_nPrimary = it->second; } } - return sal_True; + return true; } void WinSalSystem::clearMonitors() diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index d639d894c752..602ee8a9bc69 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -228,7 +228,7 @@ void ImplSalYieldMutexAcquireWithWait() if ( pSalData->mnAppThreadId == nThreadId ) { // wait till we get the Mutex - sal_Bool bAcquire = FALSE; + bool bAcquire = FALSE; do { if ( pInst->mpSalYieldMutex->tryToAcquire() ) @@ -261,7 +261,7 @@ void ImplSalYieldMutexAcquireWithWait() -sal_Bool ImplSalYieldMutexTryToAcquire() +bool ImplSalYieldMutexTryToAcquire() { WinSalInstance* pInst = GetSalData()->mpFirstInstance; if ( pInst ) @@ -647,7 +647,7 @@ static void ImplSalDispatchMessage( MSG* pMsg ) -void ImplSalYield( sal_Bool bWait, sal_Bool bHandleAllCurrentEvents ) +void ImplSalYield( bool bWait, bool bHandleAllCurrentEvents ) { MSG aMsg; bool bWasMsg = false, bOneEvent = false; @@ -741,7 +741,7 @@ LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar rDef = FALSE; break; case SAL_MSG_THREADYIELD: - ImplSalYield( (sal_Bool)wParam, (sal_Bool)lParam ); + ImplSalYield( (bool)wParam, (bool)lParam ); rDef = FALSE; break; // If we get this message, because another GetMessage() call @@ -1004,7 +1004,7 @@ void WinSalInstance::DestroyFrame( SalFrame* pFrame ) SalObject* WinSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* /*pWindowData*/, // SystemWindowData meaningless on Windows - sal_Bool /*bShow*/ ) + bool /*bShow*/ ) { // to switch to Main-Thread return (SalObject*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEOBJECT, 0, (LPARAM)static_cast<WinSalFrame*>(pParent) ); diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx index 8d72b021fae0..cddc07f16d9a 100644 --- a/vcl/win/source/app/salshl.cxx +++ b/vcl/win/source/app/salshl.cxx @@ -32,7 +32,7 @@ extern "C" { #ifdef __MINGW32__ -sal_Bool WINAPI DllMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) +bool WINAPI DllMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) #else BOOL WINAPI _CRT_INIT( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ); @@ -82,7 +82,7 @@ HBITMAP ImplLoadSalBitmap( int nId ) -sal_Bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon ) +bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon ) { DBG_ASSERT( aSalShlData.mhInst, "no DLL instance handle" ); diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx index ef99cd86db8e..c3d2e4e8ed8f 100644 --- a/vcl/win/source/app/saltimer.cxx +++ b/vcl/win/source/app/saltimer.cxx @@ -34,7 +34,7 @@ -void ImplSalStartTimer( sal_uLong nMS, sal_Bool bMutex ) +void ImplSalStartTimer( sal_uLong nMS, bool bMutex ) { SalData* pSalData = GetSalData(); diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 04faaa67151d..464583d4f5b4 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -179,7 +179,7 @@ void ImplInitSalGDI() HBITMAP hBmpOld = (HBITMAP) ::SelectObject( hMemDC, hMemBmp ); HBRUSH hMemBrush = ::CreateSolidBrush( PALETTERGB( 175, 171, 169 ) ); HBRUSH hBrushOld = (HBRUSH) ::SelectObject( hMemDC, hMemBrush ); - sal_Bool bDither16 = TRUE; + bool bDither16 = TRUE; ::PatBlt( hMemDC, 0, 0, 8, 8, PATCOPY ); const COLORREF aCol( ::GetPixel( hMemDC, 0, 0 ) ); @@ -1097,7 +1097,7 @@ void WinSalGraphics::SetLineColor( SalColor nSalColor ) SALCOLOR_GREEN( nSalColor ), SALCOLOR_BLUE( nSalColor ) ); HPEN hNewPen = 0; - sal_Bool bStockPen = FALSE; + bool bStockPen = FALSE; // search for stock pen (only screen, because printer have problems, // when we use stock objects) @@ -1181,7 +1181,7 @@ void WinSalGraphics::SetFillColor( SalColor nSalColor ) BYTE nBlue = SALCOLOR_BLUE( nSalColor ); COLORREF nBrushColor = PALETTERGB( nRed, nGreen, nBlue ); HBRUSH hNewBrush = 0; - sal_Bool bStockBrush = FALSE; + bool bStockBrush = FALSE; // search for stock brush (only screen, because printer have problems, // when we use stock objects) @@ -1552,9 +1552,9 @@ bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPt ImplRenderPath( getHDC(), nPoints, pPtAry, pFlgAry ); - return sal_True; + return true; #else - return sal_False; + return false; #endif } @@ -1585,7 +1585,7 @@ bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtA sal_uInt32 nPoints_i32(nPoints); ImplPreparePolyDraw(true, 1, &nPoints_i32, &pPtAry, &pFlgAry, pWinPointAry, pWinFlagAry); - sal_Bool bRet( sal_False ); + bool bRet( false ); if( BeginPath( getHDC() ) ) { @@ -1594,7 +1594,7 @@ bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtA if( EndPath( getHDC() ) ) { if( StrokeAndFillPath( getHDC() ) ) - bRet = sal_True; + bRet = true; } } @@ -1606,7 +1606,7 @@ bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtA return bRet; #else - return sal_False; + return false; #endif } @@ -1642,7 +1642,7 @@ bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* ImplPreparePolyDraw(true, nPoly, pPoints, pPtAry, pFlgAry, pWinPointAry, pWinFlagAry); - sal_Bool bRet( sal_False ); + bool bRet( false ); if( BeginPath( getHDC() ) ) { @@ -1651,7 +1651,7 @@ bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* if( EndPath( getHDC() ) ) { if( StrokeAndFillPath( getHDC() ) ) - bRet = sal_True; + bRet = true; } } @@ -1663,7 +1663,7 @@ bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* return bRet; #else - return sal_False; + return false; #endif } @@ -1688,9 +1688,9 @@ static BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, sal_uLong nComp, sal_u return NULL; } -static sal_Bool ImplGetBoundingBox( double* nNumb, BYTE* pSource, sal_uLong nSize ) +static bool ImplGetBoundingBox( double* nNumb, BYTE* pSource, sal_uLong nSize ) { - sal_Bool bRetValue = FALSE; + bool bRetValue = FALSE; BYTE* pDest = ImplSearchEntry( pSource, (BYTE*)"%%BoundingBox:", nSize, 14 ); if ( pDest ) { @@ -1705,9 +1705,9 @@ static sal_Bool ImplGetBoundingBox( double* nNumb, BYTE* pSource, sal_uLong nSiz for ( i = 0; ( i < 4 ) && nSizeLeft; i++ ) { int nDivision = 1; - sal_Bool bDivision = FALSE; - sal_Bool bNegative = FALSE; - sal_Bool bValid = TRUE; + bool bDivision = FALSE; + bool bNegative = FALSE; + bool bValid = TRUE; while ( ( --nSizeLeft ) && ( ( *pDest == ' ' ) || ( *pDest == 0x9 ) ) ) pDest++; BYTE nByte = *pDest; @@ -1752,7 +1752,7 @@ static sal_Bool ImplGetBoundingBox( double* nNumb, BYTE* pSource, sal_uLong nSiz bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) { - sal_Bool bRetValue = FALSE; + bool bRetValue = FALSE; if ( mbPrinter ) { diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index a39bf3c3c518..dc7f4c5d749e 100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -339,14 +339,14 @@ void WinSalGraphics::copyArea( long nDestX, long nDestY, void ImplDrawBitmap( HDC hDC, const SalTwoRect& rPosAry, const WinSalBitmap& rSalBitmap, - sal_Bool bPrinter, int nDrawMode ) + bool bPrinter, int nDrawMode ) { if( hDC ) { HGLOBAL hDrawDIB; HBITMAP hDrawDDB = rSalBitmap.ImplGethDDB(); WinSalBitmap* pTmpSalBmp = NULL; - sal_Bool bPrintDDB = ( bPrinter && hDrawDDB ); + bool bPrintDDB = ( bPrinter && hDrawDDB ); if( bPrintDDB ) { @@ -380,7 +380,7 @@ void ImplDrawBitmap( HDC hDC, HDC hBmpDC = ImplGetCachedDC( CACHED_HDC_DRAW, hDrawDDB ); COLORREF nOldBkColor = RGB(0xFF,0xFF,0xFF); COLORREF nOldTextColor = RGB(0,0,0); - sal_Bool bMono = ( rSalBitmap.GetBitCount() == 1 ); + bool bMono = ( rSalBitmap.GetBitCount() == 1 ); if( bMono ) { @@ -700,7 +700,7 @@ SalBitmap* WinSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY ) HDC hDC = getHDC(); HBITMAP hBmpBitmap = CreateCompatibleBitmap( hDC, nDX, nDY ); HDC hBmpDC = ImplGetCachedDC( CACHED_HDC_1, hBmpBitmap ); - sal_Bool bRet; + bool bRet; bRet = BitBlt( hBmpDC, 0, 0, (int) nDX, (int) nDY, hDC, (int) nX, (int) nY, SRCCOPY ) ? TRUE : FALSE; ImplReleaseCachedDC( CACHED_HDC_1 ); diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 29448a48d47a..9f184797cf85 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -97,7 +97,7 @@ private: FontAttrMap aFontAttributes; OUString aCacheFileName; OUString aBaseURL; - sal_Bool bModified; + bool bModified; protected: OUString OptimizeURL( const OUString& rURL ) const; diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index cfba8a449b1e..67326b05afeb 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -84,7 +84,7 @@ private: public: VisualStylesAPI(); ~VisualStylesAPI(); - sal_Bool IsAvailable() { return (mhModule != NULL); } + bool IsAvailable() { return (mhModule != NULL); } HTHEME OpenThemeData( HWND hwnd, LPCWSTR pszClassList ); HRESULT CloseThemeData( HTHEME hTheme ); @@ -360,7 +360,7 @@ bool WinSalGraphics::hitTestNativeControl( ControlType, return FALSE; } -sal_Bool ImplDrawTheme( HTHEME hTheme, HDC hDC, int iPart, int iState, RECT rc, const OUString& aStr) +bool ImplDrawTheme( HTHEME hTheme, HDC hDC, int iPart, int iState, RECT rc, const OUString& aStr) { HRESULT hr = vsAPI.DrawThemeBackground( hTheme, hDC, iPart, iState, &rc, 0); @@ -515,7 +515,7 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool bHorizontal ) } } -sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, +bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, ControlType nType, ControlPart nPart, ControlState nState, @@ -655,7 +655,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, RECT rect; ImplConvertSpinbuttonValues( pValue->mnUpperPart, pValue->mnUpperState, pValue->maUpperRect, &iPart, &iState, &rect ); - sal_Bool bOk = ImplDrawTheme( hTheme, hDC, iPart, iState, rect, aCaption); + bool bOk = ImplDrawTheme( hTheme, hDC, iPart, iState, rect, aCaption); if( bOk ) { @@ -679,7 +679,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, RECT rect; ImplConvertSpinbuttonValues( pValue->mnUpperPart, pValue->mnUpperState, pValue->maUpperRect, &iPart, &iState, &rect ); - sal_Bool bOk = ImplDrawTheme( hTheme, hDC, iPart, iState, rect, aCaption); + bool bOk = ImplDrawTheme( hTheme, hDC, iPart, iState, rect, aCaption); if( bOk ) { @@ -780,7 +780,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, if( nType == CTRL_RADIOBUTTON ) { iPart = BP_RADIOBUTTON; - sal_Bool bChecked = ( aValue.getTristateVal() == BUTTONVALUE_ON ); + bool bChecked = ( aValue.getTristateVal() == BUTTONVALUE_ON ); if( nState & CTRL_STATE_PRESSED ) iState = bChecked ? RBS_CHECKEDPRESSED : RBS_UNCHECKEDPRESSED; @@ -911,7 +911,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, if( nPart == PART_BUTTON ) { iPart = TP_BUTTON; - sal_Bool bChecked = ( aValue.getTristateVal() == BUTTONVALUE_ON ); + bool bChecked = ( aValue.getTristateVal() == BUTTONVALUE_ON ); if( !(nState & CTRL_STATE_ENABLED) ) //iState = TS_DISABLED; // disabled buttons are typically not painted at all but we need visual @@ -945,7 +945,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, if( ImplGetSVData()->maNWFData.mbDockingAreaAvoidTBFrames ) { impl_drawAeroToolbar( hDC, rc, nPart == PART_DRAW_BACKGROUND_HORZ ); - return sal_True; + return true; } return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption); @@ -965,7 +965,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, if( ImplGetSVData()->maNWFData.mbDockingAreaAvoidTBFrames ) { impl_drawAeroToolbar( hDC, rc, true ); - return sal_True; + return true; } } return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption); @@ -1170,7 +1170,7 @@ bool WinSalGraphics::drawNativeControl( ControlType nType, const ImplControlValue& aValue, const OUString& aCaption ) { - sal_Bool bOk = false; + bool bOk = false; HTHEME hTheme = NULL; switch( nType ) @@ -1305,7 +1305,7 @@ bool WinSalGraphics::getNativeControlRegion( ControlType nType, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { - sal_Bool bRet = FALSE; + bool bRet = FALSE; HDC hDC = GetDC( mhWnd ); if( nType == CTRL_TOOLBAR ) diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index b1dbab938ee9..7c36d1b6f259 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -273,8 +273,8 @@ static DWORD ImplDeviceCaps( WinSalInfoPrinter* pPrinter, WORD nCaps, nCaps, (LPWSTR)pOutput, pDevMode ); } -static sal_Bool ImplTestSalJobSetup( WinSalInfoPrinter* pPrinter, - ImplJobSetup* pSetupData, sal_Bool bDelete ) +static bool ImplTestSalJobSetup( WinSalInfoPrinter* pPrinter, + ImplJobSetup* pSetupData, bool bDelete ) { if ( pSetupData && pSetupData->mpDriverData ) { @@ -356,8 +356,8 @@ static sal_Bool ImplTestSalJobSetup( WinSalInfoPrinter* pPrinter, return FALSE; } -static sal_Bool ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData, - sal_Bool bIn, WinSalFrame* pVisibleDlgParent ) +static bool ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData, + bool bIn, WinSalFrame* pVisibleDlgParent ) { HANDLE hPrn; LPWSTR pPrinterNameW = reinterpret_cast<LPWSTR>(const_cast<sal_Unicode*>(pPrinter->maDeviceName.getStr())); @@ -1057,7 +1057,7 @@ static WinSalGraphics* ImplCreateSalPrnGraphics( HDC hDC ) return pGraphics; } -static sal_Bool ImplUpdateSalPrnIC( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData ) +static bool ImplUpdateSalPrnIC( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData ) { HDC hNewDC = ImplCreateSalPrnIC( pPrinter, pSetupData ); if ( !hNewDC ) @@ -1324,7 +1324,7 @@ BOOL CALLBACK SalPrintAbortProc( HDC hPrnDC, int /* nError */ ) { SalData* pSalData = GetSalData(); WinSalPrinter* pPrinter; - sal_Bool bWhile = TRUE; + bool bWhile = TRUE; int i = 0; do @@ -1360,7 +1360,7 @@ BOOL CALLBACK SalPrintAbortProc( HDC hPrnDC, int /* nError */ ) return TRUE; } -static LPDEVMODEW ImplSalSetCopies( LPDEVMODEW pDevMode, sal_uLong nCopies, sal_Bool bCollate ) +static LPDEVMODEW ImplSalSetCopies( LPDEVMODEW pDevMode, sal_uLong nCopies, bool bCollate ) { LPDEVMODEW pNewDevMode = pDevMode; if ( pDevMode && (nCopies > 1) ) @@ -1505,7 +1505,7 @@ bool WinSalPrinter::StartJob( const OUString* pFileName, // As the Telocom Balloon Fax driver tends to send messages repeatedly // we try to process first all, and then insert a dummy message - sal_Bool bWhile = TRUE; + bool bWhile = TRUE; int i = 0; do { @@ -1665,7 +1665,7 @@ void ImplSalPrinterAbortJobAsync( HDC hPrnDC ) } } -SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ) +SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) { if( ! isValid() || mhDC == 0 ) return NULL; diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx index 89eaba889d26..30a733665c49 100644 --- a/vcl/win/source/gdi/salvd.cxx +++ b/vcl/win/source/gdi/salvd.cxx @@ -78,7 +78,7 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics, HDC hDC = NULL; HBITMAP hBmp = NULL; - sal_Bool bOk = FALSE; + bool bOk = FALSE; if( pData ) { diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 850faf7f94e5..9154fa05a27d 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -117,7 +117,7 @@ using namespace ::com::sun::star::beans; const unsigned int WM_USER_SYSTEM_WINDOW_ACTIVATED = RegisterWindowMessageA("SYSTEM_WINDOW_ACTIVATED"); -sal_Bool WinSalFrame::mbInReparent = FALSE; +bool WinSalFrame::mbInReparent = FALSE; @@ -136,7 +136,7 @@ static void ImplSaveFrameState( WinSalFrame* pFrame ) // save position, size and state for GetWindowState() if ( !pFrame->mbFullScreen ) { - sal_Bool bVisible = (GetWindowStyle( pFrame->mhWnd ) & WS_VISIBLE) != 0; + bool bVisible = (GetWindowStyle( pFrame->mhWnd ) & WS_VISIBLE) != 0; if ( IsIconic( pFrame->mhWnd ) ) { pFrame->maState.mnState |= WINDOWSTATE_STATE_MINIMIZED; @@ -291,7 +291,7 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, HWND hWnd; DWORD nSysStyle = 0; DWORD nExSysStyle = 0; - sal_Bool bSubFrame = FALSE; + bool bSubFrame = FALSE; static const char* pEnvSynchronize = getenv("SAL_SYNCHRONIZE"); if ( pEnvSynchronize ) // no buffering of drawing commands @@ -507,7 +507,7 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, // helper that only creates the HWND // to allow for easy reparenting of system windows, (i.e. destroy and create new) -HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, sal_Bool bAsChild ) +HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, bool bAsChild ) { HINSTANCE hInstance = GetSalData()->mhInst; sal_uLong nSysStyle = GetWindowLong( oldhWnd, GWL_STYLE ); @@ -826,7 +826,7 @@ static void ImplSalCalcFullScreenSize( const WinSalFrame* pFrame, -static void ImplSalFrameFullScreenPos( WinSalFrame* pFrame, sal_Bool bAlways = FALSE ) +static void ImplSalFrameFullScreenPos( WinSalFrame* pFrame, bool bAlways = FALSE ) { if ( bAlways || !IsIconic( pFrame->mhWnd ) ) { @@ -1099,7 +1099,7 @@ void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) bool WinSalFrame::PostEvent( void* pData ) { - return (sal_Bool)ImplPostMessage( mhWnd, SAL_MSG_USEREVENT, 0, (LPARAM)pData ); + return (bool)ImplPostMessage( mhWnd, SAL_MSG_USEREVENT, 0, (LPARAM)pData ); } @@ -1170,7 +1170,7 @@ SalFrame* WinSalFrame::GetParent() const -static void ImplSalShow( HWND hWnd, sal_Bool bVisible, sal_Bool bNoActivate ) +static void ImplSalShow( HWND hWnd, bool bVisible, bool bNoActivate ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); if ( !pFrame ) @@ -1255,7 +1255,7 @@ void WinSalFrame::SetExtendedFrameStyle( SalExtStyle ) -void WinSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) +void WinSalFrame::Show( bool bVisible, bool bNoActivate ) { // Post this Message to the window, because this only works // in the thread of the window, which has create this window. @@ -1268,7 +1268,7 @@ void WinSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) -void WinSalFrame::Enable( sal_Bool bEnable ) +void WinSalFrame::Enable( bool bEnable ) { EnableWindow( mhWnd, bEnable ); } @@ -1292,7 +1292,7 @@ void WinSalFrame::SetMaxClientSize( long nWidth, long nHeight ) void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) { - sal_Bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; + bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; if ( !bVisible ) { Window *pClientWin = GetWindow()->ImplGetClientWindow(); @@ -1459,7 +1459,7 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, // Adjust Window in the screen - sal_Bool bCheckOffScreen = TRUE; + bool bCheckOffScreen = TRUE; // but don't do this for floaters or ownerdraw windows that are currently moved interactively if( (mnStyle & SAL_FRAME_STYLE_FLOAT) && !(mnStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) @@ -1502,7 +1502,7 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, -static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, sal_Bool bAsChild ) +static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, bool bAsChild ) { // save hwnd, will be overwritten in WM_CREATE during createwindow HWND hWndOld = pThis->mhWnd; @@ -1535,8 +1535,8 @@ static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, sal_Bool pObject = pObject->mpNextObject; } - sal_Bool bNeedGraphics = pThis->mbGraphics; - sal_Bool bNeedCacheDC = FALSE; + bool bNeedGraphics = pThis->mbGraphics; + bool bNeedCacheDC = FALSE; HFONT hFont = NULL; HPEN hPen = NULL; @@ -1775,8 +1775,8 @@ void WinSalFrame::SetWindowState( const SalFrameState* pState ) GetWindowPlacement( mhWnd, &aPlacement ); // set State - sal_Bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; - sal_Bool bUpdateHiddenFramePos = FALSE; + bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; + bool bUpdateHiddenFramePos = FALSE; if ( !bVisible ) { aPlacement.showCmd = SW_HIDE; @@ -1979,7 +1979,7 @@ void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) { // when the ShowState has to be reset, hide the window first to // reduce flicker - sal_Bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; + bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; if ( bVisible && (mnShowState != mnFullScreenShowState) ) ShowWindow( mhWnd, SW_HIDE ); @@ -2011,7 +2011,7 @@ void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) -void WinSalFrame::StartPresentation( sal_Bool bStart ) +void WinSalFrame::StartPresentation( bool bStart ) { if ( mbPresentation == bStart ) return; @@ -2066,7 +2066,7 @@ void WinSalFrame::StartPresentation( sal_Bool bStart ) -void WinSalFrame::SetAlwaysOnTop( sal_Bool bOnTop ) +void WinSalFrame::SetAlwaysOnTop( bool bOnTop ) { HWND hWnd; if ( bOnTop ) @@ -2282,7 +2282,7 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) -void WinSalFrame::CaptureMouse( sal_Bool bCapture ) +void WinSalFrame::CaptureMouse( bool bCapture ) { // Send this Message to the window, because CaptureMouse() only work // in the thread of the window, which has create this window @@ -2324,7 +2324,7 @@ void WinSalFrame::Sync() static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pContext ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); - sal_Bool bIME = (pContext->mnOptions & SAL_INPUTCONTEXT_TEXT) != 0; + bool bIME = (pContext->mnOptions & SAL_INPUTCONTEXT_TEXT) != 0; if ( bIME ) { if ( !pFrame->mbIME ) @@ -3179,7 +3179,7 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg, SalMouseEvent aMouseEvt; long nRet; sal_uInt16 nEvent = 0; - sal_Bool bCall = TRUE; + bool bCall = TRUE; aMouseEvt.mnX = (short)LOWORD( lParam ); aMouseEvt.mnY = (short)HIWORD( lParam ); @@ -3480,7 +3480,7 @@ LanguageType WinSalFrame::GetInputLanguage() bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) { - sal_Bool bRet = FALSE; + bool bRet = FALSE; sal_IntPtr nLangType = aLangType; // just use the passed language identifier, do not try to load additional keyboard support HKL hkl = (HKL) nLangType; @@ -3519,7 +3519,7 @@ bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangT static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rResult ) { - static sal_Bool bIgnoreCharMsg = FALSE; + static bool bIgnoreCharMsg = FALSE; static WPARAM nDeadChar = 0; static WPARAM nLastVKChar = 0; static sal_uInt16 nLastChar = 0; @@ -3695,7 +3695,7 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg, MSG aCharMsg; BOOL bCharPeek = FALSE; UINT nCharMsg = WM_CHAR; - sal_Bool bKeyUp = (nMsg == WM_KEYUP) || (nMsg == WM_SYSKEYUP); + bool bKeyUp = (nMsg == WM_KEYUP) || (nMsg == WM_SYSKEYUP); nLastModKeyCode = 0; // make sure no modkey messages are sent if they belong to a hotkey (see above) aKeyEvt.mnCharCode = 0; @@ -3824,7 +3824,7 @@ long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg, { SalKeyEvent aKeyEvt; sal_uInt16 nEvent; - sal_Bool bKeyUp = (nMsg == WM_KEYUP) || (nMsg == WM_SYSKEYUP); + bool bKeyUp = (nMsg == WM_KEYUP) || (nMsg == WM_SYSKEYUP); // convert KeyCode aKeyEvt.mnCode = ImplSalGetKeyCode( wParam ); @@ -3893,7 +3893,7 @@ long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ) static bool ImplHandlePaintMsg( HWND hWnd ) { - sal_Bool bMutex = FALSE; + bool bMutex = FALSE; if ( ImplSalYieldMutexTryToAcquire() ) bMutex = TRUE; @@ -4344,7 +4344,7 @@ static void ImplHandleForcePalette( HWND hWnd ) -static LRESULT ImplHandlePalette( sal_Bool bFrame, HWND hWnd, UINT nMsg, +static LRESULT ImplHandlePalette( bool bFrame, HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { SalData* pSalData = GetSalData(); @@ -4362,7 +4362,7 @@ static LRESULT ImplHandlePalette( sal_Bool bFrame, HWND hWnd, UINT nMsg, return 0; } - sal_Bool bReleaseMutex = FALSE; + bool bReleaseMutex = FALSE; if ( (nMsg == WM_QUERYNEWPALETTE) || (nMsg == WM_PALETTECHANGED) ) { // as Windows can send these messages also, we have to use @@ -4381,8 +4381,8 @@ static LRESULT ImplHandlePalette( sal_Bool bFrame, HWND hWnd, UINT nMsg, HDC hDC; HPALETTE hOldPal; UINT nCols; - sal_Bool bStdDC; - sal_Bool bUpdate; + bool bStdDC; + bool bUpdate; pSalData->mbInPalChange = TRUE; @@ -4575,7 +4575,7 @@ static int ImplHandleMinMax( HWND hWnd, LPARAM lParam ) // the pointer is stored in every item, so if no position // is specified we just use the first item (ie, pos=0) // if bByPosition is FALSE then nPos denotes a menu id instead of a position -static WinSalMenuItem* ImplGetSalMenuItem( HMENU hMenu, UINT nPos, sal_Bool bByPosition=TRUE ) +static WinSalMenuItem* ImplGetSalMenuItem( HMENU hMenu, UINT nPos, bool bByPosition=TRUE ) { MENUITEMINFOW mi; memset(&mi, 0, sizeof(mi)); @@ -4723,9 +4723,9 @@ static int ImplDrawItem(HWND, WPARAM wParam, LPARAM lParam ) COLORREF clrPrevText, clrPrevBkgnd; HFONT hfntOld; HBRUSH hbrOld; - sal_Bool fChecked = (pDI->itemState & ODS_CHECKED) ? TRUE : FALSE; - sal_Bool fSelected = (pDI->itemState & ODS_SELECTED) ? TRUE : FALSE; - sal_Bool fDisabled = (pDI->itemState & (ODS_DISABLED | ODS_GRAYED)) ? TRUE : FALSE; + bool fChecked = (pDI->itemState & ODS_CHECKED) ? TRUE : FALSE; + bool fSelected = (pDI->itemState & ODS_SELECTED) ? TRUE : FALSE; + bool fDisabled = (pDI->itemState & (ODS_DISABLED | ODS_GRAYED)) ? TRUE : FALSE; // Set the appropriate foreground and background colors. RECT aRect = pDI->rcItem; @@ -4866,7 +4866,7 @@ static int ImplHandleMenuActivate( HWND hWnd, WPARAM wParam, LPARAM ) HMENU hMenu = (HMENU) wParam; // WORD nPos = LOWORD (lParam); - // sal_Bool bWindowMenu = (sal_Bool) HIWORD(lParam); + // bool bWindowMenu = (bool) HIWORD(lParam); // Send activate and deactivate together, so we have not keep track of opened menus // this will be enough to have the menus updated correctly @@ -4901,7 +4901,7 @@ static int ImplHandleMenuSelect( HWND hWnd, WPARAM wParam, LPARAM lParam ) if( !GetSalData()->IsKnownMenuHandle( hMenu ) ) return 0; - sal_Bool bByPosition = FALSE; + bool bByPosition = FALSE; if( nFlags & MF_POPUP ) bByPosition = TRUE; @@ -5156,9 +5156,9 @@ static void ImplUpdateIMECursorPos( WinSalFrame* pFrame, HIMC hIMC ) -static sal_Bool ImplHandleIMEStartComposition( HWND hWnd ) +static bool ImplHandleIMEStartComposition( HWND hWnd ) { - sal_Bool bDef = TRUE; + bool bDef = TRUE; ImplSalYieldMutexAcquireWithWait(); @@ -5186,10 +5186,10 @@ static sal_Bool ImplHandleIMEStartComposition( HWND hWnd ) -static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, +static bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, HIMC hIMC, LPARAM lParam ) { - sal_Bool bDef = TRUE; + bool bDef = TRUE; // Init Event SalExtTextInputEvent aEvt; @@ -5317,9 +5317,9 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, -static sal_Bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam ) +static bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam ) { - sal_Bool bDef = TRUE; + bool bDef = TRUE; ImplSalYieldMutexAcquireWithWait(); WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -5364,9 +5364,9 @@ static sal_Bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam ) -static sal_Bool ImplHandleIMEEndComposition( HWND hWnd ) +static bool ImplHandleIMEEndComposition( HWND hWnd ) { - sal_Bool bDef = TRUE; + bool bDef = TRUE; ImplSalYieldMutexAcquireWithWait(); @@ -5491,7 +5491,7 @@ ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet) // IA2 should be enabled automatically AllSettings aSettings = Application::GetSettings(); MiscSettings aMisc = aSettings.GetMiscSettings(); - aMisc.SetEnableATToolSupport( sal_True ); + aMisc.SetEnableATToolSupport( true ); aSettings.SetMiscSettings( aMisc ); Application::SetSettings( aSettings ); @@ -6012,7 +6012,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP rDef = FALSE; break; case SAL_MSG_SHOW: - ImplSalShow( hWnd, (sal_Bool)wParam, (sal_Bool)lParam ); + ImplSalShow( hWnd, (bool)wParam, (bool)lParam ); rDef = FALSE; break; case SAL_MSG_SETINPUTCONTEXT: @@ -6171,11 +6171,11 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l -sal_Bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rlResult ) +bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rlResult ) { // handle all messages concerning all frames so they get processed only once // Must work for Unicode and none Unicode - sal_Bool bResult = FALSE; + bool bResult = FALSE; if ( (nMsg == WM_PALETTECHANGED) || (nMsg == SAL_MSG_POSTPALCHANGED) ) { int bDef = TRUE; @@ -6194,7 +6194,7 @@ sal_Bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam -sal_Bool ImplWriteLastError( DWORD lastError, const char *szApiCall ) +bool ImplWriteLastError( DWORD lastError, const char *szApiCall ) { static int first=1; // if VCL_LOGFILE_ENABLED is set, Win32 API error messages can be written @@ -6202,7 +6202,7 @@ sal_Bool ImplWriteLastError( DWORD lastError, const char *szApiCall ) static char *logEnabled = getenv("VCL_LOGFILE_ENABLED"); if( logEnabled ) { - sal_Bool bSuccess = FALSE; + bool bSuccess = FALSE; static char *szTmp = getenv("TMP"); if( !szTmp || !*szTmp ) szTmp = getenv("TEMP"); diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index 7bbfd39fc475..522bf2134827 100644 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -41,7 +41,7 @@ static DWORD myerr=0; -sal_Bool SalData::IsKnownMenuHandle( HMENU hMenu ) +bool SalData::IsKnownMenuHandle( HMENU hMenu ) { if( mhMenuSet.find( hMenu ) == mhMenuSet.end() ) return FALSE; @@ -53,7 +53,7 @@ sal_Bool SalData::IsKnownMenuHandle( HMENU hMenu ) // WinSalInst factory methods -SalMenu* WinSalInstance::CreateMenu( sal_Bool bMenuBar, Menu* ) +SalMenu* WinSalInstance::CreateMenu( bool bMenuBar, Menu* ) { WinSalMenu *pSalMenu = new WinSalMenu(); @@ -288,13 +288,13 @@ void WinSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsig } } -void WinSalMenu::CheckItem( unsigned nPos, sal_Bool bCheck ) +void WinSalMenu::CheckItem( unsigned nPos, bool bCheck ) { if( static_cast<unsigned>( -1 ) != ::CheckMenuItem( mhMenu, nPos, MF_BYPOSITION|(bCheck ? MF_CHECKED : MF_UNCHECKED) ) ) ImplDrawMenuBar( this ); } -void WinSalMenu::EnableItem( unsigned nPos, sal_Bool bEnable ) +void WinSalMenu::EnableItem( unsigned nPos, bool bEnable ) { if( -1 != ::EnableMenuItem( mhMenu, nPos, MF_BYPOSITION|(bEnable ? MF_ENABLED : (MF_DISABLED|MF_GRAYED) ) ) ) ImplDrawMenuBar( this ); diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index d4ac6f002ec2..981937638e25 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -33,7 +33,7 @@ -static sal_Bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild ) +static bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild ) { if ( hWndParent == hWndChild ) return TRUE; @@ -151,7 +151,7 @@ LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam ) -sal_Bool ImplSalPreDispatchMsg( MSG* pMsg ) +bool ImplSalPreDispatchMsg( MSG* pMsg ) { // Used for Unicode and none Unicode SalData* pSalData = GetSalData(); @@ -174,7 +174,7 @@ sal_Bool ImplSalPreDispatchMsg( MSG* pMsg ) // process KeyEvents even if the control does not process them itself // SysKeys are processed as WM_SYSCOMMAND // Char-Events are not processed, as they are not accelerator-relevant - sal_Bool bWantedKeyCode = FALSE; + bool bWantedKeyCode = FALSE; // A-Z, 0-9 nur in Verbindung mit Control-Taste if ( ((pMsg->wParam >= 65) && (pMsg->wParam <= 90)) || ((pMsg->wParam >= 48) && (pMsg->wParam <= 57)) ) @@ -208,7 +208,7 @@ sal_Bool ImplSalPreDispatchMsg( MSG* pMsg ) ((nKeyCode >= 65) && (nKeyCode <= 90)) || ((nKeyCode >= 97) && (nKeyCode <= 122)) ) { - sal_Bool bRet = FALSE; + bool bRet = FALSE; ImplSalYieldMutexAcquireWithWait(); pObject = ImplFindSalObject( pMsg->hwnd ); if ( pObject ) @@ -731,7 +731,7 @@ void WinSalObject::EndSetClipRegion() void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) { sal_uLong nStyle = 0; - sal_Bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; + bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; if ( bVisible ) { ShowWindow( mhWnd, SW_HIDE ); @@ -744,7 +744,7 @@ void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) -void WinSalObject::Show( sal_Bool bVisible ) +void WinSalObject::Show( bool bVisible ) { if ( bVisible ) ShowWindow( mhWnd, SW_SHOWNORMAL ); @@ -754,7 +754,7 @@ void WinSalObject::Show( sal_Bool bVisible ) -void WinSalObject::Enable( sal_Bool bEnable ) +void WinSalObject::Enable( bool bEnable ) { EnableWindow( mhWnd, bEnable ); } diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index 52e48a8c910d..715b7cedebdf 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -136,7 +136,7 @@ void setupMethodStubs( functor_vector_type& res ) const Wallpaper aWallpaper( aWhiteColor ); GDIMetaFile aMtf; - aMtf.AddAction( new MetaFillColorAction(Color(COL_RED),sal_True) ); + aMtf.AddAction( new MetaFillColorAction(Color(COL_RED),true) ); aMtf.AddAction( new MetaRectAction(aRect) ); /* void DrawTextArray( const Point& rStartPt, const OUString& rStr, diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx index b085d9824634..33cd1346773b 100644 --- a/vcl/workben/svdem.cxx +++ b/vcl/workben/svdem.cxx @@ -43,7 +43,7 @@ SAL_IMPLEMENT_MAIN() tools::extendApplicationEnvironment(); Reference< XMultiServiceFactory > xMS; - xMS = cppu::createRegistryServiceFactory( "types.rdb", "applicat.rdb", sal_True ); + xMS = cppu::createRegistryServiceFactory( "types.rdb", "applicat.rdb", true ); comphelper::setProcessServiceFactory( xMS ); diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 9125cb1120ca..61fe3e056349 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -104,7 +104,7 @@ public: void Paint( const Rectangle& rRect ); void Resize(); - sal_Bool Close(); + bool Close(); void parseList( const OString& rList ); OString processCommand( const OString& rCommand ); @@ -149,9 +149,9 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : m_aQuitButton.Show(); } -sal_Bool MyWin::Close() +bool MyWin::Close() { - sal_Bool bRet = WorkWindow::Close(); + bool bRet = WorkWindow::Close(); if( bRet ) Application::Quit(); return bRet; diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index 52b13a0ccc17..e5c677375c93 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -51,7 +51,7 @@ SAL_IMPLEMENT_MAIN() tools::extendApplicationEnvironment(); Reference< XMultiServiceFactory > xMS; - xMS = cppu::createRegistryServiceFactory( OUString( "types.rdb" ), OUString( "applicat.rdb" ), sal_True ); + xMS = cppu::createRegistryServiceFactory( OUString( "types.rdb" ), OUString( "applicat.rdb" ), true ); comphelper::setProcessServiceFactory( xMS ); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 841305e854ca..c8cd734e7732 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -46,7 +46,7 @@ SAL_IMPLEMENT_MAIN() tools::extendApplicationEnvironment(); Reference< XMultiServiceFactory > xMS; - xMS = cppu::createRegistryServiceFactory( OUString( "types.rdb" ), OUString( "applicat.rdb" ), sal_True ); + xMS = cppu::createRegistryServiceFactory( OUString( "types.rdb" ), OUString( "applicat.rdb" ), true ); comphelper::setProcessServiceFactory( xMS ); |