summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-28 20:02:24 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-28 20:26:28 +0100
commita29cdd540c6b6b583b56f0e1a6e0c4f8714b351e (patch)
tree04e1b7df604b0b361772640b689218ec6646d95c /extensions
parent6d993bc5b448241c2cb35eff92e126058ccf1ce1 (diff)
bool improvements
Change-Id: If3402725c9cbff5df45043bd2ecd22dd6241c052
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/abpilot/admininvokationimpl.cxx2
-rw-r--r--extensions/source/abpilot/datasourcehandling.cxx2
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx2
-rw-r--r--extensions/source/dbpilots/controlwizard.cxx2
-rw-r--r--extensions/source/nsplugin/source/so_main.cxx2
-rw-r--r--extensions/source/propctrlr/browserlistbox.cxx2
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx4
-rw-r--r--extensions/source/propctrlr/propertyeditor.cxx4
-rw-r--r--extensions/source/propctrlr/selectlabeldialog.cxx4
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx4
-rw-r--r--extensions/source/scanner/sanedlg.cxx56
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx2
12 files changed, 43 insertions, 43 deletions
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 66ec18151dcf..fb39a208b184 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -110,7 +110,7 @@ namespace abp
return sal_True;
}
else
- ShowServiceNotAvailableError(m_pMessageParent, s_sAdministrationServiceName, sal_True);
+ ShowServiceNotAvailableError(m_pMessageParent, s_sAdministrationServiceName, true);
}
catch(const Exception&)
{
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 65d97ffc2240..fde1b3ace120 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -531,7 +531,7 @@ namespace abp
{
OUString s_sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler");
if ( _pMessageParent )
- ShowServiceNotAvailableError( _pMessageParent, s_sInteractionHandlerServiceName, sal_True );
+ ShowServiceNotAvailableError( _pMessageParent, s_sInteractionHandlerServiceName, true );
return sal_False;
}
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index dd476337e57f..4f22bb08a27f 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -99,7 +99,7 @@ namespace dbp
if (0 == m_aTable.GetSelectEntryCount())
return false;
- return sal_True;
+ return true;
}
//---------------------------------------------------------------------
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index f1e4aef9ea60..1b7b1d6c0248 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -513,7 +513,7 @@ namespace dbp
if (!xHandler.is())
{
const OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler");
- ShowServiceNotAvailableError(_pWindow, sInteractionHandlerServiceName, sal_True);
+ ShowServiceNotAvailableError(_pWindow, sInteractionHandlerServiceName, true);
}
return xHandler;
}
diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx
index ba617ed2853b..b90405b8c6b7 100644
--- a/extensions/source/nsplugin/source/so_main.cxx
+++ b/extensions/source/nsplugin/source/so_main.cxx
@@ -471,7 +471,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
PLUGIN_MSG nMsg;
int len;
- while(1)
+ while(true)
{
memset(&nMsg, 0, sizeof(PLUGIN_MSG));
len = NSP_ReadFromPipe(la_read_fd, (char*)&nMsg, sizeof(PLUGIN_MSG));
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index ac52c6aee332..79d35a90d022 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -1200,7 +1200,7 @@ namespace pcr
if ( pControlWindowAsEdit )
pControlWindowAsEdit->SetReadOnly( sal_True );
else
- pControlWindowAsEdit->Enable( sal_False );
+ pControlWindowAsEdit->Enable( false );
}
}
}
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 6e8423291258..9d6d93b7859f 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -132,7 +132,7 @@ namespace pcr
if (xContainerWindow.is())
{
xContainerWindow->addFocusListener(this);
- m_bContainerFocusListening = sal_True;
+ m_bContainerFocusListening = true;
}
}
@@ -151,7 +151,7 @@ namespace pcr
if (xContainerWindow.is())
{
xContainerWindow->removeFocusListener(this);
- m_bContainerFocusListening = sal_False;
+ m_bContainerFocusListening = false;
}
}
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index a35fbc0fdba2..8f9e792c1609 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -78,7 +78,7 @@ namespace pcr
OBrowserPage* pPage = static_cast<OBrowserPage*>(m_aTabControl.GetTabPage(nID));
if (pPage)
{
- pPage->EnableInput(sal_False);
+ pPage->EnableInput(false);
m_aTabControl.RemovePage(nID);
delete pPage;
}
@@ -244,7 +244,7 @@ namespace pcr
OBrowserPage* pPage = static_cast<OBrowserPage*>(m_aTabControl.GetTabPage(nID));
if (pPage)
- pPage->EnableInput(sal_False);
+ pPage->EnableInput(false);
m_aTabControl.RemovePage(nID);
if (pPage)
delete pPage;
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 36dae6ea1fd0..1fc2b9ffe3ec 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -67,7 +67,7 @@ namespace pcr
// initialize the TreeListBox
m_aControlTree.SetSelectionMode( SINGLE_SELECTION );
m_aControlTree.SetDragDropMode( 0 );
- m_aControlTree.EnableInplaceEditing( sal_False );
+ m_aControlTree.EnableInplaceEditing( false );
m_aControlTree.SetStyle(m_aControlTree.GetStyle() | WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL);
m_aControlTree.SetNodeBitmaps( m_aModelImages.GetImage( RID_SVXIMG_COLLAPSEDNODE ), m_aModelImages.GetImage( RID_SVXIMG_EXPANDEDNODE ) );
@@ -141,7 +141,7 @@ namespace pcr
if (!m_bHaveAssignableControl)
{ // no controls which can be assigned
m_aNoAssignment.Check(sal_True);
- m_aNoAssignment.Enable(sal_False);
+ m_aNoAssignment.Enable(false);
}
m_aNoAssignment.SetClickHdl(LINK(this, OSelectLabelDialog, OnNoAssignmentClicked));
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index fe471ac93573..14475a06e356 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -696,7 +696,7 @@ namespace pcr
if ( ( nWinStyle & WB_READONLY ) != 0 )
{
getTypedControlWindow()->SetReadOnly( sal_True );
- getTypedControlWindow()->Enable( sal_True );
+ getTypedControlWindow()->Enable( true );
}
}
@@ -805,7 +805,7 @@ namespace pcr
if ( ( nWinStyle & WB_READONLY ) != 0 )
{
getTypedControlWindow()->SetReadOnly( sal_True );
- getTypedControlWindow()->Enable( sal_True );
+ getTypedControlWindow()->Enable( true );
}
}
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 57fa03e9e624..79efa8a9dd22 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -194,7 +194,7 @@ void SaneDlg::InitFields()
bSuccess = mrSane.GetOptionValue( nOption, fRes );
if( bSuccess )
{
- maReslBox.Enable( sal_True );
+ maReslBox.Enable( true );
maReslBox.SetValue( (long)fRes );
double *pDouble = NULL;
@@ -233,12 +233,12 @@ void SaneDlg::InitFields()
}
}
else
- maReslBox.Enable( sal_False );
+ maReslBox.Enable( false );
delete [] pDouble;
}
}
else
- maReslBox.Enable( sal_False );
+ maReslBox.Enable( false );
// set scan area
for( i = 0; i < 4; i++ )
@@ -316,7 +316,7 @@ void SaneDlg::InitFields()
case 3: maMaxBottomRight.Y() = (int)fValue;break;
}
}
- pField->Enable( sal_True );
+ pField->Enable( true );
}
else
{
@@ -348,7 +348,7 @@ void SaneDlg::InitFields()
pField->SetValue( PREVIEW_HEIGHT );
break;
}
- pField->Enable( sal_False );
+ pField->Enable( false );
}
}
maTopLeft = GetPixelPos( maTopLeft );
@@ -560,8 +560,8 @@ IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox )
maVectorBox.SetMin( 1 );
maVectorBox.SetMax(
mrSane.GetOptionElements( mnCurrentOption ) );
- maVectorBox.Show( sal_True );
- maVectorTxt.Show( sal_True );
+ maVectorBox.Show( true );
+ maVectorTxt.Show( true );
}
else
{
@@ -786,15 +786,15 @@ void SaneDlg::Paint( const Rectangle& rRect )
void SaneDlg::DisableOption()
{
- maBoolCheckBox.Show( sal_False );
- maStringEdit.Show( sal_False );
- maNumericEdit.Show( sal_False );
- maQuantumRangeBox.Show( sal_False );
- maStringRangeBox.Show( sal_False );
- maButtonOption.Show( sal_False );
- maVectorBox.Show( sal_False );
- maVectorTxt.Show( sal_False );
- maOptionDescTxt.Show( sal_False );
+ maBoolCheckBox.Show( false );
+ maStringEdit.Show( false );
+ maNumericEdit.Show( false );
+ maQuantumRangeBox.Show( false );
+ maStringRangeBox.Show( false );
+ maButtonOption.Show( false );
+ maVectorBox.Show( false );
+ maVectorTxt.Show( false );
+ maOptionDescTxt.Show( false );
}
void SaneDlg::EstablishBoolOption()
@@ -805,9 +805,9 @@ void SaneDlg::EstablishBoolOption()
if( bSuccess )
{
maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
- maOptionDescTxt.Show( sal_True );
+ maOptionDescTxt.Show( true );
maBoolCheckBox.Check( bValue );
- maBoolCheckBox.Show( sal_True );
+ maBoolCheckBox.Show( true );
}
}
@@ -820,9 +820,9 @@ void SaneDlg::EstablishStringOption()
if( bSuccess )
{
maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
- maOptionDescTxt.Show( sal_True );
+ maOptionDescTxt.Show( true );
maStringEdit.SetText(OStringToOUString(aValue, osl_getThreadTextEncoding()));
- maStringEdit.Show( sal_True );
+ maStringEdit.Show( true );
}
}
@@ -835,9 +835,9 @@ void SaneDlg::EstablishStringRange()
OString aValue;
mrSane.GetOptionValue( mnCurrentOption, aValue );
maStringRangeBox.SelectEntry(OStringToOUString(aValue, osl_getThreadTextEncoding()));
- maStringRangeBox.Show( sal_True );
+ maStringRangeBox.Show( true );
maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
- maOptionDescTxt.Show( sal_True );
+ maOptionDescTxt.Show( true );
}
void SaneDlg::EstablishQuantumRange()
@@ -873,12 +873,12 @@ void SaneDlg::EstablishQuantumRange()
sprintf( pBuf, "%g", fValue );
maQuantumRangeBox.SelectEntry( OUString( pBuf, strlen(pBuf), osl_getThreadTextEncoding() ) );
}
- maQuantumRangeBox.Show( sal_True );
+ maQuantumRangeBox.Show( true );
OUString aText( mrSane.GetOptionName( mnCurrentOption ) );
aText += " ";
aText += mrSane.GetOptionUnitName( mnCurrentOption );
maOptionDescTxt.SetText( aText );
- maOptionDescTxt.Show( sal_True );
+ maOptionDescTxt.Show( true );
}
}
@@ -901,17 +901,17 @@ void SaneDlg::EstablishNumericOption()
aText += OUString( pBuf, strlen(pBuf), osl_getThreadTextEncoding() );
}
maOptionDescTxt.SetText( aText );
- maOptionDescTxt.Show( sal_True );
+ maOptionDescTxt.Show( true );
sprintf( pBuf, "%g", fValue );
maNumericEdit.SetText( OUString( pBuf, strlen(pBuf), osl_getThreadTextEncoding() ) );
- maNumericEdit.Show( sal_True );
+ maNumericEdit.Show( true );
}
void SaneDlg::EstablishButtonOption()
{
maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
- maOptionDescTxt.Show( sal_True );
- maButtonOption.Show( sal_True );
+ maOptionDescTxt.Show( true );
+ maButtonOption.Show( true );
}
#define RECT_SIZE_PIX 7
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index f52f5c53929a..1361ebaee414 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -437,7 +437,7 @@ void UpdateCheckUI::setPropertyValue(const OUString& rPropertyName,
throw lang::IllegalArgumentException();
}
else if (rPropertyName == PROPERTY_SHOW_MENUICON ) {
- bool bShowMenuIcon = sal_False;
+ bool bShowMenuIcon = false;
rValue >>= bShowMenuIcon;
if ( bShowMenuIcon != mbShowMenuIcon )
{