summaryrefslogtreecommitdiff
path: root/vcl/inc/unx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-21 12:53:51 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-21 12:53:51 +0100
commite8f8f24c8415898c787bbfb629247ed62e73a2b9 (patch)
treedae18a3acbf29c192118e7c003f80df8da8e21ae /vcl/inc/unx
parent1c8402465cfd4df862409dc310f5f099d044c4d8 (diff)
vcl: sal_Bool -> bool
Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e
Diffstat (limited to 'vcl/inc/unx')
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx8
-rw-r--r--vcl/inc/unx/gtk/gtkgdi.hxx64
-rw-r--r--vcl/inc/unx/gtk/gtkobject.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtkprn.hxx4
-rw-r--r--vcl/inc/unx/gtk/gtksalmenu.hxx12
-rw-r--r--vcl/inc/unx/i18n_xkb.hxx10
-rw-r--r--vcl/inc/unx/saldisp.hxx14
-rw-r--r--vcl/inc/unx/salframe.h18
-rw-r--r--vcl/inc/unx/salgdi.h42
-rw-r--r--vcl/inc/unx/salmenu.h2
-rw-r--r--vcl/inc/unx/salobj.h4
-rw-r--r--vcl/inc/unx/salvd.h10
12 files changed, 95 insertions, 95 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 0cf197a7d70d..bd2fd96dbbc8 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -323,7 +323,7 @@ public:
// and false else; if true was returned the event should
// be swallowed
bool Dispatch( const XEvent* pEvent );
- void grabPointer( sal_Bool bGrab, sal_Bool bOwnerEvents = sal_False );
+ void grabPointer( bool bGrab, bool bOwnerEvents = false );
GtkSalDisplay* getDisplay();
GdkDisplay* getGdkDisplay();
@@ -356,7 +356,7 @@ public:
// Event must be destroyed, when Frame is destroyed
// When Event is called, SalInstance::Yield() must be returned
- virtual sal_Bool PostEvent( void* pData );
+ virtual bool PostEvent( void* pData );
virtual void SetTitle( const OUString& rTitle );
virtual void SetIcon( sal_uInt16 nIcon );
@@ -379,7 +379,7 @@ public:
virtual void GetWorkArea( Rectangle& rRect );
virtual SalFrame* GetParent() const;
virtual void SetWindowState( const SalFrameState* pState );
- virtual sal_Bool GetWindowState( SalFrameState* pState );
+ virtual bool GetWindowState( SalFrameState* pState );
virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay );
// Enable/Disable ScreenSaver, SystemAgents, ...
virtual void StartPresentation( sal_Bool bStart );
@@ -405,7 +405,7 @@ public:
virtual void EndExtTextInput( sal_uInt16 nFlags );
virtual OUString GetKeyName( sal_uInt16 nKeyCode );
- virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
+ virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
// returns the input language used for the last key stroke
// may be LANGUAGE_DONTKNOW if not supported by the OS
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 628221bf1f94..d3c540b0307f 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -42,12 +42,12 @@ public:
long nSrcX, long nSrcY,
long nSrcWidth, long nSrcHeight,
sal_uInt16 /*nFlags*/ );
- virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart,
+ virtual bool drawNativeControl( ControlType nType, ControlPart nPart,
const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart );
- virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart,
+ virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart );
+ virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart,
const Rectangle& rControlRegion,
ControlState nState,
const ImplControlValue& aValue,
@@ -130,17 +130,17 @@ public:
// will be set when UI theme was changed
- static sal_Bool bThemeChanged;
- static sal_Bool bNeedPixmapPaint;
+ static bool bThemeChanged;
+ static bool bNeedPixmapPaint;
// native widget methods
- virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart );
- virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+ virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart );
+ virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
const Point& aPos, bool& rIsInside ) SAL_OVERRIDE;
- virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
+ virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
+ virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
const ImplControlValue& aValue, const OUString& rCaption,
Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
@@ -163,115 +163,115 @@ protected:
typedef std::list< Rectangle > clipList;
GdkPixmap* NWGetPixmapFromScreen( Rectangle srcRect );
- sal_Bool NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect );
+ bool NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect );
- sal_Bool NWPaintGTKArrow( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKArrow( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKListHeader( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKListHeader( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKFixedLine( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKFixedLine( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKButtonReal( GtkWidget* button, GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKButtonReal( GtkWidget* button, GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKScrollbar( ControlType nType, ControlPart nPart,
+ bool NWPaintGTKScrollbar( ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
+ bool NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKTabItem( ControlType nType, ControlPart nPart,
+ bool NWPaintGTKTabItem( ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKProgress( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKProgress( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKSlider( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
const OUString& rCaption );
- sal_Bool NWPaintGTKListNode( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
+ bool NWPaintGTKListNode( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart,
const Rectangle& rControlRectangle,
const clipList& rClipList,
ControlState nState, const ImplControlValue& aValue,
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index 99fd9cb3f8a0..39ef5b80222a 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -40,7 +40,7 @@ class GtkSalObject : public SalObject
static gboolean signalFocus( GtkWidget*, GdkEventFocus*, gpointer );
static void signalDestroy( GtkWidget*, gpointer );
public:
- GtkSalObject( GtkSalFrame* pParent, sal_Bool bShow = sal_True );
+ GtkSalObject( GtkSalFrame* pParent, bool bShow = true );
virtual ~GtkSalObject();
// overload all pure virtual methods
diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx
index 2550dd38052f..8e955a32d1d7 100644
--- a/vcl/inc/unx/gtk/gtkprn.hxx
+++ b/vcl/inc/unx/gtk/gtkprn.hxx
@@ -24,11 +24,11 @@ public:
GtkSalPrinter(SalInfoPrinter* i_pInfoPrinter);
using PspSalPrinter::StartJob;
- virtual sal_Bool StartJob(
+ virtual bool StartJob(
const OUString* i_pFileName, const OUString& i_rJobName,
const OUString& i_rAppName, ImplJobSetup* io_pSetupData,
vcl::PrinterController& io_rController);
- virtual sal_Bool EndJob();
+ virtual bool EndJob();
private:
bool impl_doJob(
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 4b2ac33dc26f..aa99268f82f8 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -40,7 +40,7 @@ class GtkSalMenu : public SalMenu
private:
std::vector< GtkSalMenuItem* > maItems;
- sal_Bool mbMenuBar;
+ bool mbMenuBar;
Menu* mpVCLMenu;
GtkSalMenu* mpOldSalMenu;
GtkSalMenu* mpParentSalMenu;
@@ -55,10 +55,10 @@ private:
void ActivateAllSubmenus(MenuBar* pMenuBar);
public:
- GtkSalMenu( sal_Bool bMenuBar );
+ GtkSalMenu( bool bMenuBar );
virtual ~GtkSalMenu();
- virtual sal_Bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars
+ virtual bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars
// otherwise only menu messages are processed (eg, OLE on Windows)
virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos );
@@ -83,7 +83,7 @@ public:
virtual GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; }
virtual void SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; }
virtual GActionGroup* GetActionGroup() { return mpActionGroup; }
- virtual sal_Bool IsItemVisible( unsigned nPos );
+ virtual bool IsItemVisible( unsigned nPos );
void NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText );
void NativeSetItemCommand( unsigned nSection,
@@ -100,7 +100,7 @@ public:
void DispatchCommand( gint itemId, const gchar* aCommand );
void Activate();
void Deactivate( const gchar* aMenuCommand );
- void Display( sal_Bool bVisible );
+ void Display( bool bVisible );
bool PrepUpdate();
void Update(); // Update this menu only.
void UpdateFull(); // Update full menu hierarchy from this menu.
@@ -114,7 +114,7 @@ public:
sal_uInt16 mnId; // Item ID
MenuItemType mnType; // Item type
- sal_Bool mbVisible; // Item visibility.
+ bool mbVisible; // Item visibility.
Menu* mpVCLMenu; // VCL Menu into which this menu item is inserted
GtkSalMenu* mpParentMenu; // The menu into which this menu item is inserted
GtkSalMenu* mpSubMenu; // Submenu of this item (if defined)
diff --git a/vcl/inc/unx/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index 2c5f13942ca9..76b21925383f 100644
--- a/vcl/inc/unx/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -27,7 +27,7 @@ class VCLPLUG_GEN_PUBLIC SalI18N_KeyboardExtension
{
private:
- sal_Bool mbUseExtension;
+ bool mbUseExtension;
sal_uInt32 mnDefaultGroup;
sal_uInt32 mnGroup;
int mnEventBase;
@@ -39,9 +39,9 @@ public:
SalI18N_KeyboardExtension( Display *pDisplay );
inline ~SalI18N_KeyboardExtension();
- inline sal_Bool UseExtension() const ; // server and client support the
+ inline bool UseExtension() const ; // server and client support the
// extension
- inline void UseExtension( sal_Bool bState );// used to disable the Extension
+ inline void UseExtension( bool bState );// used to disable the Extension
void Dispatch( XEvent *pEvent ); // keep track of group changes
@@ -59,14 +59,14 @@ SalI18N_KeyboardExtension::~SalI18N_KeyboardExtension()
{
}
-inline sal_Bool
+inline bool
SalI18N_KeyboardExtension::UseExtension() const
{
return mbUseExtension;
}
inline void
-SalI18N_KeyboardExtension::UseExtension( sal_Bool bState )
+SalI18N_KeyboardExtension::UseExtension( bool bState )
{
mbUseExtension = mbUseExtension && bState;
}
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 00fcd3ee6869..b9a38daa8f7f 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -139,11 +139,11 @@ public:
inline Pixel GetUsed() const { return m_nUsed; }
inline int GetClass() const { return m_aVisual.GetClass(); }
- sal_Bool GetXPixels( XColor &rColor,
+ bool GetXPixels( XColor &rColor,
int r,
int g,
int b ) const;
- inline sal_Bool GetXPixel( XColor &rColor,
+ inline bool GetXPixel( XColor &rColor,
int r,
int g,
int b ) const;
@@ -262,7 +262,7 @@ protected:
XLIB_Cursor aPointerCache_[POINTER_COUNT];
// Keyboard
- sal_Bool bNumLockFromXS_; // Num Lock handled by X Server
+ bool bNumLockFromXS_; // Num Lock handled by X Server
int nNumLockIndex_; // modifier index in modmap
int nNumLockMask_; // keyevent state mask for
KeySym nShiftKeySym_; // first shift modifier
@@ -290,7 +290,7 @@ protected:
void addXineramaScreenUnique( int i, long i_nX, long i_nY, long i_nWidth, long i_nHeight );
public:
static SalDisplay *GetSalDisplay( Display* display );
- static sal_Bool BestVisual( Display *pDisp,
+ static bool BestVisual( Display *pDisp,
int nScreen,
XVisualInfo &rVI );
@@ -340,7 +340,7 @@ public:
const Size& GetScreenSize( SalX11Screen nXScreen ) const { return getDataForScreen( nXScreen ).m_aSize; }
srv_vendor_t GetServerVendor() const { return meServerVendor; }
void SetServerVendor() { meServerVendor = sal_GetServerVendor(pDisp_); }
- sal_Bool IsDisplay() const { return !!pXLib_; }
+ bool IsDisplay() const { return !!pXLib_; }
GC GetMonoGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aMonoGC; }
GC GetCopyGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aCopyGC; }
GC GetAndInvertedGC( SalX11Screen nXScreen ) const { return getDataForScreen(nXScreen).m_aAndInvertedGC; }
@@ -376,7 +376,7 @@ public:
unsigned int GetXScreenCount() const { return m_aScreens.size(); }
const std::list< SalFrame* >& getFrames() const { return m_aFrames; }
- sal_Bool IsNumLockFromXS() const { return bNumLockFromXS_; }
+ bool IsNumLockFromXS() const { return bNumLockFromXS_; }
std::list< SalObject* >& getSalObjects() { return m_aSalObjects; }
@@ -403,7 +403,7 @@ public:
virtual void Yield();
virtual void PostUserEvent();
- sal_Bool IsEvent();
+ bool IsEvent();
void SetupInput( SalI18N_InputMethod *pInputMethod );
};
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index bb6253f3f34f..d76218b918dc 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -89,11 +89,11 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
Rectangle maRestorePosSize;
sal_uIntPtr nStyle_;
SalExtStyle mnExtStyle;
- sal_Bool bAlwaysOnTop_;
- sal_Bool bViewable_;
- sal_Bool bMapped_;
- sal_Bool mbInShow;
- sal_Bool bDefaultPosition_; // client is centered initially
+ bool bAlwaysOnTop_;
+ bool bViewable_;
+ bool bMapped_;
+ bool mbInShow;
+ bool bDefaultPosition_; // client is centered initially
bool m_bXEmbed;
int nVisibility_;
int m_nWorkArea;
@@ -192,7 +192,7 @@ public:
sal_uIntPtr GetStyle() const { return nStyle_; }
XLIB_Cursor GetCursor() const { return hCursor_; }
- sal_Bool IsCaptured() const { return nCaptured_ == 1; }
+ bool IsCaptured() const { return nCaptured_ == 1; }
#if !defined(__synchronous_extinput__)
void HandleExtTextEvent (XClientMessageEvent *pEvent);
#endif
@@ -217,7 +217,7 @@ public:
// call with false to setup graphics with window (GetWindow())
virtual void updateGraphics( bool bClear );
- virtual sal_Bool PostEvent( void* pData );
+ virtual bool PostEvent( void* pData );
virtual void SetTitle( const OUString& rTitle );
virtual void SetIcon( sal_uInt16 nIcon );
@@ -234,7 +234,7 @@ public:
virtual void GetWorkArea( Rectangle& rRect );
virtual SalFrame* GetParent() const;
virtual void SetWindowState( const SalFrameState* pState );
- virtual sal_Bool GetWindowState( SalFrameState* pState );
+ virtual bool GetWindowState( SalFrameState* pState );
virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nMonitor );
virtual void StartPresentation( sal_Bool bStart );
virtual void SetAlwaysOnTop( sal_Bool bOnTop );
@@ -248,7 +248,7 @@ public:
virtual void SetInputContext( SalInputContext* pContext );
virtual void EndExtTextInput( sal_uInt16 nFlags );
virtual OUString GetKeyName( sal_uInt16 nKeyCode );
- virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
+ virtual bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
virtual LanguageType GetInputLanguage();
virtual void UpdateSettings( AllSettings& rSettings );
virtual void Beep();
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 962c32e60e3f..e6426b226231 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -108,9 +108,9 @@ protected:
SalColor nTextColor_;
Pixel nTextPixel_;
- sal_Bool bFontVertical_;
+ bool bFontVertical_;
- sal_Bool bDisableGraphite_;
+ bool bDisableGraphite_;
GC pBrushGC_; // Brush attributes
SalColor nBrushColor_;
@@ -125,20 +125,20 @@ protected:
GC pStippleGC_;
GC pTrackingGC_;
- sal_Bool bWindow_ : 1; // is Window
- sal_Bool bPrinter_ : 1; // is Printer
- sal_Bool bVirDev_ : 1; // is VirDev
- sal_Bool bPenGC_ : 1; // is Pen GC valid
- sal_Bool bFontGC_ : 1; // is Font GC valid
- sal_Bool bBrushGC_ : 1; // is Brush GC valid
- sal_Bool bMonoGC_ : 1; // is Mono GC valid
- sal_Bool bCopyGC_ : 1; // is Copy GC valid
- sal_Bool bInvertGC_ : 1; // is Invert GC valid
- sal_Bool bInvert50GC_ : 1; // is Invert50 GC valid
- sal_Bool bStippleGC_ : 1; // is Stipple GC valid
- sal_Bool bTrackingGC_ : 1; // is Tracking GC valid
+ bool bWindow_ : 1; // is Window
+ bool bPrinter_ : 1; // is Printer
+ bool bVirDev_ : 1; // is VirDev
+ bool bPenGC_ : 1; // is Pen GC valid
+ bool bFontGC_ : 1; // is Font GC valid
+ bool bBrushGC_ : 1; // is Brush GC valid
+ bool bMonoGC_ : 1; // is Mono GC valid
+ bool bCopyGC_ : 1; // is Copy GC valid
+ bool bInvertGC_ : 1; // is Invert GC valid
+ bool bInvert50GC_ : 1; // is Invert50 GC valid
+ bool bStippleGC_ : 1; // is Stipple GC valid
+ bool bTrackingGC_ : 1; // is Tracking GC valid
bool bXORMode_ : 1; // is ROP XOR Mode set
- sal_Bool bDitherBrush_ : 1; // is solid or tile
+ bool bDitherBrush_ : 1; // is solid or tile
using SalGraphics::SetClipRegion;
void SetClipRegion( GC pGC,
@@ -156,7 +156,7 @@ protected:
GC pGC,
bool bClose
);
- sal_Bool GetDitherPixmap ( SalColor nSalColor );
+ bool GetDitherPixmap ( SalColor nSalColor );
inline GC GetMonoGC( Pixmap hPixmap );
inline GC GetCopyGC();
@@ -233,7 +233,7 @@ public:
virtual void GetDevFontList( ImplDevFontList* );
virtual void ClearDevFontCache();
virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
- virtual sal_Bool CreateFontSubset( const OUString& rToFile,
+ virtual bool CreateFontSubset( const OUString& rToFile,
const PhysicalFontFace*,
sal_GlyphId* pGlyphIDs,
sal_uInt8* pEncoding,
@@ -277,13 +277,13 @@ public:
virtual bool drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency );
#if 1 // TODO: remove these obselete methods
- virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints,
+ virtual bool drawPolyLineBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints,
+ virtual bool drawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
const sal_uInt8* pFlgAry );
- virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly,
+ virtual bool drawPolyPolygonBezier( sal_uInt32 nPoly,
const sal_uInt32* pPoints,
const SalPoint* const* pPtAry,
const sal_uInt8* const* pFlgAry );
@@ -314,7 +314,7 @@ public:
virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags );
virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags );
- virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize );
+ virtual bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize );
virtual bool drawAlphaBitmap( const SalTwoRect&,
const SalBitmap& rSourceBitmap,
diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h
index 3b545bff969f..5b398ae984c4 100644
--- a/vcl/inc/unx/salmenu.h
+++ b/vcl/inc/unx/salmenu.h
@@ -29,7 +29,7 @@ public:
X11SalMenu() {}
virtual ~X11SalMenu();
- virtual sal_Bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars
+ virtual bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars
// otherwise only menu messages are processed (eg, OLE on Windows)
virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos );
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index dc65ba5185d9..e8b71eefaa93 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -64,10 +64,10 @@ public:
XLIB_Window maSecondary;
Colormap maColormap;
SalClipRegion maClipRegion;
- sal_Bool mbVisible;
+ bool mbVisible;
static VCL_DLLPUBLIC bool Dispatch( XEvent* pEvent );
- static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True );
+ static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = sal_True );
X11SalObject();
virtual ~X11SalObject();
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index fe6afd432b32..b1210b3a5243 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -41,14 +41,14 @@ class X11SalVirtualDevice : public SalVirtualDevice
int nDX_;
int nDY_;
sal_uInt16 nDepth_;
- sal_Bool bGraphics_; // is Graphics used
- sal_Bool bExternPixmap_;
+ bool bGraphics_; // is Graphics used
+ bool bExternPixmap_;
public:
X11SalVirtualDevice();
virtual ~X11SalVirtualDevice();
- sal_Bool Init( SalDisplay *pDisplay,
+ bool Init( SalDisplay *pDisplay,
long nDX, long nDY,
sal_uInt16 nBitCount,
SalX11Screen nXScreen,
@@ -66,7 +66,7 @@ public:
{
return pDisplay_;
}
- sal_Bool IsDisplay() const
+ bool IsDisplay() const
{
return pDisplay_->IsDisplay();
}
@@ -80,7 +80,7 @@ public:
virtual void ReleaseGraphics( SalGraphics* pGraphics );
// Set new size, without saving the old contents
- virtual sal_Bool SetSize( long nNewDX, long nNewDY );
+ virtual bool SetSize( long nNewDX, long nNewDY );
virtual void GetSize( long& rWidth, long& rHeight );
};