summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-21 17:07:05 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-21 18:24:02 +0100
commitb184636e1ccbc6560430a6a3e44fe56d2014c8f7 (patch)
treef79664745b4945e2c19beac2772ee27c31f91914 /vcl
parentf44116909d356fdc9c9ec8658be6cc465cb46686 (diff)
bool improvements
Change-Id: I714caa8dc3d34fd56e6a11f57db6723dcb7e6705
Diffstat (limited to 'vcl')
-rw-r--r--vcl/generic/print/glyphset.cxx2
-rw-r--r--vcl/generic/print/glyphset.hxx2
-rw-r--r--vcl/inc/window.h2
-rw-r--r--vcl/source/control/button.cxx4
-rw-r--r--vcl/source/gdi/font.cxx2
-rw-r--r--vcl/source/window/window.cxx10
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx2
-rw-r--r--vcl/unx/gtk/a11y/atkwindow.cxx2
-rw-r--r--vcl/unx/gtk/gdi/salprn-gtk.cxx2
-rw-r--r--vcl/unx/gtk/window/gtksalmenu.cxx4
10 files changed, 16 insertions, 16 deletions
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index f5d8b03d5d86..96b965762f62 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -73,7 +73,7 @@ GlyphSet::GetFontType ()
return meBaseType;
}
-sal_Bool
+bool
GlyphSet::IsVertical ()
{
return mbVertical;
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/generic/print/glyphset.hxx
index 8ceb1213f95e..934ff31fe86c 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/generic/print/glyphset.hxx
@@ -102,7 +102,7 @@ public:
static OString
GetGlyphSetEncodingName (rtl_TextEncoding nEnc,
const OString &rFontName);
- sal_Bool IsVertical ();
+ bool IsVertical ();
void DrawText (PrinterGfx &rGfx, const Point& rPoint,
const sal_Unicode* pStr, sal_Int16 nLen,
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 00702c2aee5d..fddddb64c4a2 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -320,7 +320,7 @@ public:
sal_Int32 mnMarginRight;
sal_Int32 mnMarginTop;
sal_Int32 mnMarginBottom;
- sal_uInt8 mbFrame:1,
+ bool mbFrame:1,
mbBorderWin:1,
mbOverlapWin:1,
mbSysWin:1,
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 4c43db6baae8..8d443c961b71 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -3239,7 +3239,7 @@ void CheckBox::ImplDrawCheckBoxState()
{
bool bNativeOK = sal_True;
- if ( (bNativeOK=IsNativeControlSupported(CTRL_CHECKBOX, PART_ENTIRE_CONTROL)) == sal_True )
+ if ( (bNativeOK=IsNativeControlSupported(CTRL_CHECKBOX, PART_ENTIRE_CONTROL)) )
{
ImplControlValue aControlValue( meState == STATE_CHECK ? BUTTONVALUE_ON : BUTTONVALUE_OFF );
Rectangle aCtrlRegion( maStateRect );
@@ -3262,7 +3262,7 @@ void CheckBox::ImplDrawCheckBoxState()
aControlValue, OUString() );
}
- if ( bNativeOK == sal_False )
+ if ( !bNativeOK )
{
sal_uInt16 nStyle = ImplGetButtonState();
if ( !IsEnabled() )
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index e37d30961957..70febab64284 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -996,7 +996,7 @@ LanguageType Font::GetCJKContextLanguage() const { return mpImplFont->maCJKLangu
short Font::GetOrientation() const { return mpImplFont->mnOrientation; }
-sal_Bool Font::IsVertical() const { return mpImplFont->mbVertical; }
+bool Font::IsVertical() const { return mpImplFont->mbVertical; }
FontKerning Font::GetKerning() const { return mpImplFont->mnKerning; }
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a24819c4354d..d29df4e2a14c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -6192,7 +6192,7 @@ void Window::SetParent( Window* pNewParent )
// -----------------------------------------------------------------------
-void Window::Show( sal_Bool bVisible, sal_uInt16 nFlags )
+void Window::Show( bool bVisible, sal_uInt16 nFlags )
{
if ( mpWindowImpl->mbVisible == bVisible )
@@ -6201,7 +6201,7 @@ void Window::Show( sal_Bool bVisible, sal_uInt16 nFlags )
ImplDelData aDogTag( this );
sal_Bool bRealVisibilityChanged = sal_False;
- mpWindowImpl->mbVisible = (bVisible != 0);
+ mpWindowImpl->mbVisible = bVisible;
if ( !bVisible )
{
@@ -6561,7 +6561,7 @@ bool Window::IsCallHandlersOnInputDisabled() const
// -----------------------------------------------------------------------
-void Window::EnableInput( sal_Bool bEnable, sal_Bool bChild )
+void Window::EnableInput( bool bEnable, sal_Bool bChild )
{
sal_Bool bNotify = (bEnable != mpWindowImpl->mbInputDisabled);
@@ -6626,7 +6626,7 @@ void Window::EnableInput( sal_Bool bEnable, sal_Bool bChild )
// -----------------------------------------------------------------------
-void Window::EnableInput( sal_Bool bEnable, sal_Bool bChild, sal_Bool bSysWin,
+void Window::EnableInput( bool bEnable, sal_Bool bChild, sal_Bool bSysWin,
const Window* pExcludeWindow )
{
@@ -7604,7 +7604,7 @@ void Window::SetPointer( const Pointer& rPointer )
// -----------------------------------------------------------------------
-void Window::EnableChildPointerOverwrite( sal_Bool bOverwrite )
+void Window::EnableChildPointerOverwrite( bool bOverwrite )
{
if ( mpWindowImpl->mbChildPtrOverwrite == bOverwrite )
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index c09414c5043e..83e8d4c3aa07 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -1162,7 +1162,7 @@ void PPDParser::parse( ::std::list< OString >& rLines )
m_pTranslator->insertValue( aUniKey, aOption, aValue, aValueTranslation, aTransLocale );
// eventually update query and remove from option list
- if( bQuery && pKey->m_bQueryValue == sal_False )
+ if( bQuery && !pKey->m_bQueryValue )
{
pKey->m_aQueryValue = *pValue;
pKey->m_bQueryValue = true;
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index a9e8375df00a..e60ef0bbe491 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -75,7 +75,7 @@ init_from_window( AtkObject *accessible, Window *pWindow )
Window *pParent = pWindow->GetParent();
if( pParent ) {
type = pParent->GetType();
- parentIsMenuFloatingWindow = ( TRUE == pParent->IsMenuFloatingWindow() );
+ parentIsMenuFloatingWindow = pParent->IsMenuFloatingWindow();
}
if( (WINDOW_LISTBOX != type) && (WINDOW_COMBOBOX != type) &&
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 60ccdc3d2ff7..b0a6a9f5cf99 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -1133,7 +1133,7 @@ GtkPrintDialog::impl_readFromSettings()
m_pWrapper->print_settings_set_n_copies(pSettings, sal::static_int_cast<gint>(nCopyCount));
}
- const gboolean bOldCollate(m_pWrapper->print_settings_get_collate(pSettings));
+ const bool bOldCollate(m_pWrapper->print_settings_get_collate(pSettings));
const bool bCollate(aCollate.equalsIgnoreAsciiCase("true"));
if (bOldCollate != bCollate)
{
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index fe5d87a30edd..976465e74f91 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -679,7 +679,7 @@ void GtkSalMenu::DispatchCommand( gint itemId, const gchar *aCommand )
{
SolarMutexGuard aGuard;
// Only the menubar is allowed to dispatch commands.
- if ( mbMenuBar != TRUE )
+ if ( !mbMenuBar )
return;
GtkSalMenu* pSalSubMenu = GetMenuForItemCommand( (gchar*) aCommand, FALSE );
@@ -705,7 +705,7 @@ void GtkSalMenu::ActivateAllSubmenus(MenuBar* pMenuBar)
void GtkSalMenu::Activate()
{
- if ( mbMenuBar != TRUE )
+ if ( !mbMenuBar )
return;
ActivateAllSubmenus(static_cast<MenuBar*>(mpVCLMenu));
}