[Libreoffice-commits] core.git: 17 commits - avmedia/source canvas/source chart2/source cui/source desktop/source editeng/source include/svx include/vbahelper package/source reportdesign/source scripting/source sc/source sd/source sfx2/source svx/source uui/source vbahelper/source xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Tue Jan 21 23:23:14 PST 2014
avmedia/source/framework/soundhandler.cxx | 4 +--
canvas/source/vcl/canvashelper_texturefill.cxx | 4 +--
chart2/source/model/template/ChartTypeTemplate.cxx | 2 -
chart2/source/tools/DataSeriesHelper.cxx | 2 -
chart2/source/tools/DiagramHelper.cxx | 4 +--
cui/source/customize/cfg.cxx | 18 ++++++++--------
cui/source/customize/cfgutil.cxx | 2 -
cui/source/customize/macropg.cxx | 2 -
cui/source/customize/selector.cxx | 2 -
cui/source/dialogs/cuigaldlg.cxx | 2 -
cui/source/dialogs/cuihyperdlg.cxx | 2 -
cui/source/options/optgdlg.cxx | 2 -
cui/source/options/optjava.cxx | 2 -
cui/source/options/optpath.cxx | 2 -
desktop/source/app/dispatchwatcher.cxx | 8 +++----
desktop/source/deployment/misc/dp_misc.cxx | 2 -
desktop/source/migration/services/jvmfwk.cxx | 4 +--
editeng/source/editeng/impedit.cxx | 4 +--
editeng/source/editeng/impedit3.cxx | 2 -
editeng/source/uno/unofored.cxx | 4 +--
include/svx/fmshell.hxx | 4 +--
include/svx/svdglue.hxx | 22 ++++++++++----------
include/vbahelper/vbacollectionimpl.hxx | 2 -
package/source/xstor/ocompinstream.cxx | 4 +--
package/source/xstor/oseekinstream.cxx | 2 -
package/source/xstor/owriteablestream.cxx | 6 ++---
package/source/xstor/xstorage.cxx | 6 ++---
reportdesign/source/core/api/Group.cxx | 4 +--
reportdesign/source/core/api/ReportDefinition.cxx | 8 +++----
sc/source/core/data/validat.cxx | 2 -
sc/source/core/tool/rangeutl.cxx | 2 -
sc/source/filter/excel/xecontent.cxx | 4 +--
sc/source/ui/cctrl/checklistmenu.cxx | 2 -
sc/source/ui/docshell/dbdocimp.cxx | 2 -
sc/source/ui/formdlg/dwfunctr.cxx | 4 +--
sc/source/ui/miscdlgs/crnrdlg.cxx | 2 -
sc/source/ui/pagedlg/areasdlg.cxx | 2 -
sc/source/ui/unoobj/chartuno.cxx | 4 +--
sc/source/ui/vba/vbaapplication.cxx | 2 -
sc/source/ui/view/selectionstate.cxx | 4 +--
sc/source/ui/view/tabvwsh3.cxx | 4 +--
sc/source/ui/view/viewfun2.cxx | 4 +--
scripting/source/protocolhandler/scripthandler.cxx | 3 --
scripting/source/provider/MasterScriptProvider.cxx | 2 -
scripting/source/provider/URIHelper.cxx | 3 --
sd/source/ui/framework/module/SlideSorterModule.cxx | 12 +++++-----
sd/source/ui/framework/module/ToolPanelModule.cxx | 10 ++++-----
sd/source/ui/func/fusel.cxx | 2 -
sd/source/ui/func/futext.cxx | 2 -
sd/source/ui/inc/SdUnoDrawView.hxx | 2 -
sd/source/ui/unoidl/SdUnoDrawView.cxx | 2 -
sd/source/ui/view/outlnvsh.cxx | 2 -
sfx2/source/appl/appcfg.cxx | 2 -
sfx2/source/appl/appinit.cxx | 2 -
sfx2/source/appl/appserv.cxx | 2 -
sfx2/source/bastyp/fltfnc.cxx | 11 +++-------
sfx2/source/dialog/dinfdlg.cxx | 2 -
sfx2/source/dialog/dockwin.cxx | 2 -
sfx2/source/doc/objstor.cxx | 4 +--
sfx2/source/doc/printhelper.cxx | 14 ++++++------
svx/source/dialog/checklbx.cxx | 4 +--
svx/source/form/fmshell.cxx | 4 +--
svx/source/form/fmundo.cxx | 2 -
svx/source/inc/fmundo.hxx | 2 -
svx/source/svdraw/svdmodel.cxx | 2 -
svx/source/svdraw/svdoashp.cxx | 4 +--
uui/source/fltdlg.cxx | 2 -
vbahelper/source/vbahelper/vbahelper.cxx | 3 --
xmlsecurity/source/helper/xsecctl.cxx | 6 ++---
69 files changed, 136 insertions(+), 142 deletions(-)
New commits:
commit 53984191169232c3ff097a4661e19532faa6bf67
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 22 01:05:52 2014 +0100
bool improvements
Change-Id: I21f806d7a9ebe5b4de4cbedfc9879019cdbba22b
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index b5d3ba7..ee640a0 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -134,7 +134,7 @@ void SAL_CALL OGroup::setSortAscending( ::sal_Bool _sortascending ) throw (uno::
// -----------------------------------------------------------------------------
void SAL_CALL OGroup::setHeaderOn( ::sal_Bool _headeron ) throw (uno::RuntimeException)
{
- if ( _headeron != m_xHeader.is() )
+ if ( bool(_headeron) != m_xHeader.is() )
{
OUString sName(RPT_RESSTRING(RID_STR_GROUP_HEADER,m_xContext->getServiceManager()));
setSection(PROPERTY_HEADERON,_headeron,sName,m_xHeader);
@@ -149,7 +149,7 @@ void SAL_CALL OGroup::setHeaderOn( ::sal_Bool _headeron ) throw (uno::RuntimeExc
// -----------------------------------------------------------------------------
void SAL_CALL OGroup::setFooterOn( ::sal_Bool _footeron ) throw (uno::RuntimeException)
{
- if ( _footeron != m_xFooter.is() )
+ if ( bool(_footeron) != m_xFooter.is() )
{
OUString sName(RPT_RESSTRING(RID_STR_GROUP_FOOTER,m_xContext->getServiceManager()));
setSection(PROPERTY_FOOTERON,_footeron,sName,m_xFooter);
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 9dd7ca6..eee33f6 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1007,7 +1007,7 @@ void SAL_CALL OReportDefinition::setEscapeProcessing( ::sal_Bool _escapeprocessi
// -----------------------------------------------------------------------------
void SAL_CALL OReportDefinition::setReportHeaderOn( ::sal_Bool _reportheaderon ) throw (uno::RuntimeException)
{
- if ( _reportheaderon != m_pImpl->m_xReportHeader.is() )
+ if ( bool(_reportheaderon) != m_pImpl->m_xReportHeader.is() )
{
setSection(PROPERTY_REPORTHEADERON,_reportheaderon,RPT_RESSTRING(RID_STR_REPORT_HEADER,m_aProps->m_xContext->getServiceManager()),m_pImpl->m_xReportHeader);
}
@@ -1021,7 +1021,7 @@ void SAL_CALL OReportDefinition::setReportHeaderOn( ::sal_Bool _reportheaderon )
// -----------------------------------------------------------------------------
void SAL_CALL OReportDefinition::setReportFooterOn( ::sal_Bool _reportfooteron ) throw (uno::RuntimeException)
{
- if ( _reportfooteron != m_pImpl->m_xReportFooter.is() )
+ if ( bool(_reportfooteron) != m_pImpl->m_xReportFooter.is() )
{
setSection(PROPERTY_REPORTFOOTERON,_reportfooteron,RPT_RESSTRING(RID_STR_REPORT_FOOTER,m_aProps->m_xContext->getServiceManager()),m_pImpl->m_xReportFooter);
}
@@ -1035,7 +1035,7 @@ void SAL_CALL OReportDefinition::setReportFooterOn( ::sal_Bool _reportfooteron )
// -----------------------------------------------------------------------------
void SAL_CALL OReportDefinition::setPageHeaderOn( ::sal_Bool _pageheaderon ) throw (uno::RuntimeException)
{
- if ( _pageheaderon != m_pImpl->m_xPageHeader.is() )
+ if ( bool(_pageheaderon) != m_pImpl->m_xPageHeader.is() )
{
setSection(PROPERTY_PAGEHEADERON,_pageheaderon,RPT_RESSTRING(RID_STR_PAGE_HEADER,m_aProps->m_xContext->getServiceManager()),m_pImpl->m_xPageHeader);
}
@@ -1049,7 +1049,7 @@ void SAL_CALL OReportDefinition::setPageHeaderOn( ::sal_Bool _pageheaderon ) thr
// -----------------------------------------------------------------------------
void SAL_CALL OReportDefinition::setPageFooterOn( ::sal_Bool _pagefooteron ) throw (uno::RuntimeException)
{
- if ( _pagefooteron != m_pImpl->m_xPageFooter.is() )
+ if ( bool(_pagefooteron) != m_pImpl->m_xPageFooter.is() )
{
setSection(PROPERTY_PAGEFOOTERON,_pagefooteron,RPT_RESSTRING(RID_STR_PAGE_FOOTER,m_aProps->m_xContext->getServiceManager()),m_pImpl->m_xPageFooter);
}
commit 078199a243a17cf5bd02aff7042d07d6ec03f06b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 22 00:57:35 2014 +0100
bool improvements
Change-Id: I943e54afaf6ce58aaccbf588ffd9b9e235ef3b39
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx
index bbd6c8d..89e038b 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -54,17 +54,17 @@ SlideSorterModule::SlideSorterModule (
{
UpdateViewTabBar(NULL);
- if (SvtSlideSorterBarOptions().GetVisibleImpressView()==sal_True)
+ if (SvtSlideSorterBarOptions().GetVisibleImpressView())
AddActiveMainView(FrameworkHelper::msImpressViewURL);
- if (SvtSlideSorterBarOptions().GetVisibleOutlineView()==sal_True)
+ if (SvtSlideSorterBarOptions().GetVisibleOutlineView())
AddActiveMainView(FrameworkHelper::msOutlineViewURL);
- if (SvtSlideSorterBarOptions().GetVisibleNotesView()==sal_True)
+ if (SvtSlideSorterBarOptions().GetVisibleNotesView())
AddActiveMainView(FrameworkHelper::msNotesViewURL);
- if (SvtSlideSorterBarOptions().GetVisibleHandoutView()==sal_True)
+ if (SvtSlideSorterBarOptions().GetVisibleHandoutView())
AddActiveMainView(FrameworkHelper::msHandoutViewURL);
- if (SvtSlideSorterBarOptions().GetVisibleSlideSorterView()==sal_True)
+ if (SvtSlideSorterBarOptions().GetVisibleSlideSorterView())
AddActiveMainView(FrameworkHelper::msSlideSorterURL);
- if (SvtSlideSorterBarOptions().GetVisibleDrawView()==sal_True)
+ if (SvtSlideSorterBarOptions().GetVisibleDrawView())
AddActiveMainView(FrameworkHelper::msDrawViewURL);
mxConfigurationController->addConfigurationChangeListener(
diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx
index c607fbd..08b3452 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.cxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.cxx
@@ -49,15 +49,15 @@ ToolPanelModule::ToolPanelModule (
{
if (mxConfigurationController.is())
{
- if (SvtToolPanelOptions().GetVisibleImpressView()==sal_True)
+ if (SvtToolPanelOptions().GetVisibleImpressView())
AddActiveMainView(FrameworkHelper::msImpressViewURL);
- if (SvtToolPanelOptions().GetVisibleOutlineView()==sal_True)
+ if (SvtToolPanelOptions().GetVisibleOutlineView())
AddActiveMainView(FrameworkHelper::msOutlineViewURL);
- if (SvtToolPanelOptions().GetVisibleNotesView()==sal_True)
+ if (SvtToolPanelOptions().GetVisibleNotesView())
AddActiveMainView(FrameworkHelper::msNotesViewURL);
- if (SvtToolPanelOptions().GetVisibleHandoutView()==sal_True)
+ if (SvtToolPanelOptions().GetVisibleHandoutView())
AddActiveMainView(FrameworkHelper::msHandoutViewURL);
- if (SvtToolPanelOptions().GetVisibleSlideSorterView()==sal_True)
+ if (SvtToolPanelOptions().GetVisibleSlideSorterView())
AddActiveMainView(FrameworkHelper::msSlideSorterURL);
mxConfigurationController->addConfigurationChangeListener(
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index b1cfce3..0a75b11 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1406,7 +1406,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
sal_Bool bTmp = sal_False;
if ( eErr == ERRCODE_NONE &&
aRet.getValueType() == getCppuBooleanType() &&
- sal_True == ( aRet >>= bTmp ) &&
+ ( aRet >>= bTmp ) &&
bTmp == sal_True )
{
bAnimated = sal_True;
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 5ec1ccc..c965073 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -820,7 +820,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
pPara = GetTextObj()->GetOutlinerParaObject();
}
- if(pPara && sal_True != pPara->IsVertical())
+ if(pPara && !pPara->IsVertical())
{
// set ParaObject orientation accordingly
pPara->SetVertical(sal_True);
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index 71a018a..74d668d 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -99,7 +99,7 @@ public:
protected:
sal_Bool getMasterPageMode(void) const throw();
- void setMasterPageMode(sal_Bool MasterPageMode_) throw();
+ void setMasterPageMode(bool MasterPageMode_) throw();
sal_Bool getLayerMode(void) const throw();
void setLayerMode(sal_Bool LayerMode_) throw();
public:
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index cafb61c..69d8b61 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -80,7 +80,7 @@ sal_Bool SdUnoDrawView::getMasterPageMode(void) const throw()
-void SdUnoDrawView::setMasterPageMode (sal_Bool bMasterPageMode) throw()
+void SdUnoDrawView::setMasterPageMode (bool bMasterPageMode) throw()
{
if ((mrDrawViewShell.GetEditMode() == EM_MASTERPAGE) != bMasterPageMode)
{
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 9475f40..f7842d5 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1147,7 +1147,7 @@ long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll)
*/
bool OutlineViewShell::PrepareClose( sal_Bool bUI )
{
- if( ViewShell::PrepareClose(bUI) != sal_True )
+ if( !ViewShell::PrepareClose(bUI) )
return false;
return pOlView == NULL || pOlView->PrepareClose(bUI);
commit 3d21cb27ac16cafc97fa230f2e1b575e970cfb7e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Jan 22 00:39:26 2014 +0100
bool improvements
Change-Id: I63078dd1ac7119d2886d4183e7267eeff3365b87
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index b8e58b1..58f7b32 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -600,7 +600,7 @@ ConvertSvxConfigEntry(
// as an empty string.
// It will be initialised again later using the command to label map.
aPropSeq[2].Name = aDescriptorLabel;
- if ( pEntry->HasChangedName() == sal_False && !pEntry->GetCommand().isEmpty() )
+ if ( !pEntry->HasChangedName() && !pEntry->GetCommand().isEmpty() )
{
sal_Bool isDefaultName = sal_False;
try
@@ -678,7 +678,7 @@ ConvertToolbarEntry(
// as an empty string.
// It will be initialised again later using the command to label map.
aPropSeq[2].Name = aDescriptorLabel;
- if ( pEntry->HasChangedName() == sal_False && !pEntry->GetCommand().isEmpty() )
+ if ( !pEntry->HasChangedName() && !pEntry->GetCommand().isEmpty() )
{
sal_Bool isDefaultName = sal_False;
try
@@ -1455,7 +1455,7 @@ sal_Bool SvxMenuEntriesListBox::NotifyMoving(
// only try to do a move if we are dragging within the list box
if ( m_bIsInternalDrag )
{
- if ( pPage->MoveEntryData( pSource, pTarget ) == sal_True )
+ if ( pPage->MoveEntryData( pSource, pTarget ) )
{
SvTreeListBox::NotifyMoving(
pTarget, pSource, rpNewParent, rNewChildPos );
@@ -1719,7 +1719,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
}
}
- if ( bURLToSelectFound == sal_False )
+ if ( !bURLToSelectFound )
{
// if the document has menu configuration settings select it
// it the SaveIn listbox, otherwise select the module data
@@ -3546,7 +3546,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
}
}
- if ( bNeedsApply == sal_True )
+ if ( bNeedsApply )
{
(( ToolbarSaveInData* ) GetSaveInData())->ApplyToolbar( pToolbar );
UpdateButtonStates();
@@ -4818,7 +4818,7 @@ sal_Bool SvxToolbarEntriesListBox::NotifyMoving(
bool result = SvxMenuEntriesListBox::NotifyMoving(
pTarget, pSource, rpNewParent, rNewChildPos );
- if ( result == sal_True )
+ if ( result )
{
// Instant Apply changes to UI
SvxConfigEntry* pToolbar = pPage->GetTopLevelSelection();
@@ -5313,7 +5313,7 @@ void SvxIconSelectorDialog::ImportGraphics(
}
else
{
- if ( ImportGraphic( rPaths[0] ) == sal_False )
+ if ( !ImportGraphic( rPaths[0] ) )
{
rejected[0] = rPaths[0];
rejectedCount = 1;
@@ -5348,7 +5348,7 @@ void SvxIconSelectorDialog::ImportGraphics(
if ( !bHasReplaced )
{
bool result = ImportGraphic( aPath );
- if ( result == sal_False )
+ if ( !result )
{
rejected[ rejectedCount ] = rPaths[i];
++rejectedCount;
@@ -5361,7 +5361,7 @@ void SvxIconSelectorDialog::ImportGraphics(
else
{
bool result = ImportGraphic( aSourcePath + rPaths[i] );
- if ( result == sal_False )
+ if ( !result )
{
rejected[ rejectedCount ] = rPaths[i];
++rejectedCount;
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index a234185..3739737 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -736,7 +736,7 @@ Image SfxConfigGroupListBox_Impl::GetImage(
xDocumentModel ) );
Sequence<beans::PropertyValue> moduleDescr;
Any aAny = xModuleManager->getByName(appModule);
- if( sal_True != ( aAny >>= moduleDescr ) )
+ if( !( aAny >>= moduleDescr ) )
{
throw RuntimeException("SFTreeListBox::Init: failed to get PropertyValue", Reference< XInterface >());
}
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 511e941..578cd5c 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -801,7 +801,7 @@ Any _SvxMacroTabPage::GetPropsByName( const OUString& eventName, EventsHash& eve
{
Sequence< beans::PropertyValue > props;
OUString type, url;
- if( sal_True == ( aAny >>= props ) )
+ if( aAny >>= props )
{
::comphelper::NamedValueCollection aProps( props );
type = aProps.getOrDefault( "EventType", type );
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index bb37627..87bed53 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -554,7 +554,7 @@ Image SvxConfigGroupListBox::GetImage(
xDocumentModel ) );
Sequence<beans::PropertyValue> moduleDescr;
Any aAny = xModuleManager->getByName(appModule);
- if( sal_True != ( aAny >>= moduleDescr ) )
+ if( !( aAny >>= moduleDescr ) )
{
throw RuntimeException("SFTreeListBox::Init: failed to get PropertyValue", Reference< XInterface >());
}
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index c3fba41..ef4a9a4 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -1236,7 +1236,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl)
IMPL_LINK( TPGalleryThemeProperties, DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent*, pEvt )
{
- DBG_ASSERT( xFolderPicker.is() == sal_True, "TPGalleryThemeProperties::DialogClosedHdl(): no folder picker" );
+ DBG_ASSERT( xFolderPicker.is(), "TPGalleryThemeProperties::DialogClosedHdl(): no folder picker" );
OUString sURL = xFolderPicker->getDirectory();
StartSearchFiles( sURL, pEvt->DialogResult );
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index d82418a..1421e14 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -57,7 +57,7 @@ void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
break;
case SID_READONLY_MODE :
{
- pParent->SetReadOnlyMode( ( (SfxBoolItem*)pState)->GetValue() == sal_True );
+ pParent->SetReadOnlyMode( ( (SfxBoolItem*)pState)->GetValue() );
}
break;
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 6b3a1a1..4862ef0 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1576,7 +1576,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
// check the box "For the current document only"
// set the focus to the Western Language box
const SfxPoolItem* pLang = 0;
- if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, sal_False, &pLang ) &&( (const SfxBoolItem*)pLang)->GetValue() == sal_True )
+ if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, sal_False, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() )
{
m_pWesternLanguageLB->GrabFocus();
m_pCurrentDocCB->Enable(sal_True);
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index ce5c162..5e28451 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -409,7 +409,7 @@ IMPL_LINK( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt )
{
if ( RET_OK == pEvt->DialogResult )
{
- DBG_ASSERT( xFolderPicker.is() == sal_True, "SvxJavaOptionsPage::DialogClosedHdl(): no folder picker" );
+ DBG_ASSERT( xFolderPicker.is(), "SvxJavaOptionsPage::DialogClosedHdl(): no folder picker" );
AddFolder( xFolderPicker->getDirectory() );
}
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 15ec74e..af138e3 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -700,7 +700,7 @@ IMPL_LINK( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt )
{
if ( RET_OK == pEvt->DialogResult )
{
- DBG_ASSERT( xFolderPicker.is() == sal_True, "SvxPathTabPage::DialogClosedHdl(): no folder picker" );
+ DBG_ASSERT( xFolderPicker.is(), "SvxPathTabPage::DialogClosedHdl(): no folder picker" );
OUString sURL = xFolderPicker->getDirectory();
ChangeCurrentEntry( sURL );
commit b168814577b388de63972d68e298ae96f9eee8a3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 21 23:42:48 2014 +0100
bool improvements
Change-Id: I7f814f53f67e2d6dd44013e7f9055ee256ec4811
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index b7e51ba..878dc0a 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -346,7 +346,7 @@ bool ScValidationData::DoMacro( const ScAddress& rPos, const OUString& rInput,
pDocument->SetInLinkUpdate( false );
// Eingabe abbrechen, wenn Basic-Makro sal_False zurueckgibt
- if ( eRet == ERRCODE_NONE && refRes->GetType() == SbxBOOL && refRes->GetBool() == false )
+ if ( eRet == ERRCODE_NONE && refRes->GetType() == SbxBOOL && !refRes->GetBool() )
bRet = true;
bDone = true;
}
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 10fdf13..85c5abb 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -356,7 +356,7 @@ sal_Int32 ScRangeStringConverter::IndexOf(
{
sal_Int32 nLength = rString.getLength();
sal_Int32 nIndex = nOffset;
- sal_Bool bQuoted = false;
+ bool bQuoted = false;
sal_Bool bExitLoop = false;
while( !bExitLoop && (nIndex >= 0 && nIndex < nLength) )
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 2c92bfe..21394c5 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1483,7 +1483,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
{
// prompt box - empty string represented by single NUL character
OUString aTitle, aText;
- bool bShowPrompt = (pValData->GetInput( aTitle, aText ) == sal_True);
+ bool bShowPrompt = pValData->GetInput( aTitle, aText );
if( !aTitle.isEmpty() )
maPromptTitle.Assign( aTitle );
else
@@ -1495,7 +1495,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
// error box - empty string represented by single NUL character
ScValidErrorStyle eScErrorStyle;
- bool bShowError = (pValData->GetErrMsg( aTitle, aText, eScErrorStyle ) == sal_True);
+ bool bShowError = pValData->GetErrMsg( aTitle, aText, eScErrorStyle );
if( !aTitle.isEmpty() )
maErrorTitle.Assign( aTitle );
else
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 39d2173..2ebf0cb 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1474,7 +1474,7 @@ void ScCheckListBox::KeyInput( const KeyEvent& rKEvt )
if ( pEntry )
{
- sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
+ bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
CheckEntry( pEntry, !bCheck );
if ( bCheck != ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) )
CheckButtonHdl();
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 033ab00..27ebd6f 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -316,7 +316,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
// skip rows that are not selected
if ( !bDoSelection )
{
- if ( (bEnd = !xRowSet->next()) == false )
+ if ( !(bEnd = !xRowSet->next()) )
++nRowsRead;
}
else
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 1d9fc51..bc72d0d 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -319,7 +319,7 @@ void ScFunctionDockWin::SetSize()
void ScFunctionDockWin::SetLeftRightSize()
{
- if(bSizeFlag==false)
+ if(!bSizeFlag)
{
bSizeFlag=sal_True;
@@ -366,7 +366,7 @@ void ScFunctionDockWin::SetLeftRightSize()
void ScFunctionDockWin::SetTopBottonSize()
{
- if(bSizeFlag==false)
+ if(!bSizeFlag)
{
bSizeFlag=sal_True;
Size aDiffSize=GetSizePixel();
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index adce6ab..93f3676 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -752,7 +752,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl)
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
ScRange aRange1, aRange2;
sal_Bool bOk1;
- if ( (bOk1 = ((aRange1.ParseAny( aNewArea, pDoc, eConv ) & SCA_VALID) == SCA_VALID)) != false
+ if ( (bOk1 = ((aRange1.ParseAny( aNewArea, pDoc, eConv ) & SCA_VALID) == SCA_VALID))
&& ((aRange2.ParseAny( aNewData, pDoc, eConv ) & SCA_VALID) == SCA_VALID) )
{
theCurArea = aRange1;
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 0e28c5c..3085f8d 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -699,7 +699,7 @@ static bool lcl_CheckOne_OOO( const OUString& rStr, bool bIsRow, SCCOLROW& rVal
{
sal_Int32 n = aStr.toInt32();
- if ( ( bStrOk = (n > 0) && ( n <= MAXROWCOUNT ) ) != false )
+ if ( ( bStrOk = (n > 0) && ( n <= MAXROWCOUNT ) ) )
nNum = static_cast<SCCOLROW>(n - 1);
}
}
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index 31ef9da..53b8255 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -674,7 +674,7 @@ void SAL_CALL ScChartObj::setHasColumnHeaders( sal_Bool bHasColumnHeaders )
ScRangeListRef xRanges = new ScRangeList;
bool bOldColHeaders, bOldRowHeaders;
GetData_Impl( xRanges, bOldColHeaders, bOldRowHeaders );
- if ( bOldColHeaders != (bHasColumnHeaders != false) )
+ if ( bOldColHeaders != bool(bHasColumnHeaders) )
Update_Impl( xRanges, bHasColumnHeaders, bOldRowHeaders );
}
@@ -694,7 +694,7 @@ void SAL_CALL ScChartObj::setHasRowHeaders( sal_Bool bHasRowHeaders )
ScRangeListRef xRanges = new ScRangeList;
bool bOldColHeaders, bOldRowHeaders;
GetData_Impl( xRanges, bOldColHeaders, bOldRowHeaders );
- if ( bOldRowHeaders != (bHasRowHeaders != false) )
+ if ( bOldRowHeaders != bool(bHasRowHeaders) )
Update_Impl( xRanges, bOldColHeaders, bHasRowHeaders );
}
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 9abea92..aa4fe74 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -423,7 +423,7 @@ ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::Runtime
}
else if( _statusbar >>= bDefault )
{
- if( bDefault == false )
+ if( !bDefault )
{
xStatusIndicator->end();
setDisplayStatusBar( sal_True );
diff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxx
index f4ff50c5..bbbe313 100644
--- a/sc/source/ui/view/selectionstate.cxx
+++ b/sc/source/ui/view/selectionstate.cxx
@@ -60,10 +60,10 @@ bool operator==( const ScSelectionState& rL, const ScSelectionState& rR )
if( bEqual ) switch( rL.GetSelectionType() )
{
case SC_SELECTTYPE_EDITCELL:
- bEqual &= ( rL.GetEditSelection().IsEqual( rR.GetEditSelection() ) != false );
+ bEqual &= rL.GetEditSelection().IsEqual( rR.GetEditSelection() );
// run through!
case SC_SELECTTYPE_SHEET:
- bEqual &= (rL.GetSheetSelection() == rR.GetSheetSelection()) == sal_True;
+ bEqual &= rL.GetSheetSelection() == rR.GetSheetSelection();
// run through!
case SC_SELECTTYPE_NONE:
bEqual &= rL.GetCellCursor() == rR.GetCellCursor();
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index de20ea1..c1f5339 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -525,7 +525,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
const SfxPoolItem* pItem;
if ( pReqArgs && pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET )
{
- sal_Bool bItemValue = ((const SfxBoolItem*)pItem)->GetValue();
+ bool bItemValue = ((const SfxBoolItem*)pItem)->GetValue();
bWantPageBreak = (nSlot == FID_PAGEBREAKMODE) == bItemValue;
}
@@ -977,7 +977,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
{
const SfxPoolItem* pItem;
if( pReqArgs->HasItem( FID_PROTECT_DOC, &pItem ) &&
- ((const SfxBoolItem*)pItem)->GetValue() == static_cast<sal_Bool>(pDoc->IsDocProtected()) )
+ ((const SfxBoolItem*)pItem)->GetValue() == pDoc->IsDocProtected() )
{
rReq.Ignore();
break;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index fb07797..408b029 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -481,7 +481,7 @@ sal_Bool ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
if ( bRow )
{
nEndRow = static_cast< SCROW >( nExtend );
- if ( ( bContinue = lcl_FindNextSumEntryInColumn( pDoc, nCol, nEndRow /*inout*/, nTab, nExtend /*out*/, 0 ) ) == true )
+ if ( ( bContinue = lcl_FindNextSumEntryInColumn( pDoc, nCol, nEndRow /*inout*/, nTab, nExtend /*out*/, 0 ) ) )
{
nStartRow = nEndRow;
}
@@ -489,7 +489,7 @@ sal_Bool ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
else
{
nEndCol = static_cast< SCCOL >( nExtend );
- if ( ( bContinue = lcl_FindNextSumEntryInRow( pDoc, nEndCol /*inout*/, nRow, nTab, nExtend /*out*/, 0 ) ) == true )
+ if ( ( bContinue = lcl_FindNextSumEntryInRow( pDoc, nEndCol /*inout*/, nRow, nTab, nExtend /*out*/, 0 ) ) )
{
nStartCol = nEndCol;
}
commit 7f0fe5444f80472ec454efbccc2a38bebab62625
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 21 23:39:19 2014 +0100
bool improvements
Change-Id: I8e83eb52a8873e6c7372091c697158053da82488
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index b1ac7d22..b06e2ef 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -661,7 +661,7 @@ void ChartTypeTemplate::adaptScales(
Reference< chart2::XAxis > xAxis( xCooSys->getAxisByDimension( 1,nI ));
if( xAxis.is())
{
- sal_Bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT);
+ bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT);
chart2::ScaleData aScaleData = xAxis->getScaleData();
if( bPercent != (aScaleData.AxisType==AxisType::PERCENT) )
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 8b6b4a7..16d3696 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -429,7 +429,7 @@ void setStackModeAtSeries(
xCorrespondingCoordinateSystem->getAxisByDimension( 1, nAxisIndex ));
if( xAxis.is())
{
- sal_Bool bPercent = (eStackMode == StackMode_Y_STACKED_PERCENT);
+ bool bPercent = (eStackMode == StackMode_Y_STACKED_PERCENT);
chart2::ScaleData aScaleData = xAxis->getScaleData();
if( bPercent != (aScaleData.AxisType==chart2::AxisType::PERCENT) )
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index e434ad8..3a63b84 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -268,9 +268,9 @@ void DiagramHelper::setStackMode(
uno::Any aNewDirection( uno::makeAny(eNewDirection) );
- sal_Bool bPercent = sal_False;
+ bool bPercent = false;
if( eStackMode == StackMode_Y_STACKED_PERCENT )
- bPercent = sal_True;
+ bPercent = true;
//iterate through all coordinate systems
uno::Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY );
commit 7f84ebe93bcdc8c57f944c57616ecfc1c8366124
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 21 23:26:39 2014 +0100
bool improvements
Change-Id: I74db1d1b8250a6832fc68a6856912713b1d8944b
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index 1134c86..15f0f96f 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -147,7 +147,7 @@ void XSecController::createXSecComponent( )
xMCF->createInstanceWithContext( sXMLSignature, mxCtx ),
cssu::UNO_QUERY );
- bool bSuccess = (0!=m_xXMLSignature.is());
+ bool bSuccess = m_xXMLSignature.is();
if ( bSuccess )
/*
* XMLSignature created successfully.
@@ -158,7 +158,7 @@ void XSecController::createXSecComponent( )
cssu::UNO_QUERY );
}
- bSuccess &= (0!=m_xXMLDocumentWrapper.is());
+ bSuccess &= m_xXMLDocumentWrapper.is();
if ( bSuccess )
/*
* XMLDocumentWrapper created successfully.
@@ -169,7 +169,7 @@ void XSecController::createXSecComponent( )
cssu::UNO_QUERY );
}
- bSuccess &= (0!=m_xSAXEventKeeper.is());
+ bSuccess &= m_xSAXEventKeeper.is();
if (bSuccess)
/*
commit d5b01ac24918c99eb859bf1b9e56879000ccf4a1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 21 23:24:45 2014 +0100
bool improvements
Change-Id: I6df7ec9669452a025fbac55199927347ef84c6b9
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index f6dc852..1ed9039 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -216,7 +216,7 @@ OUString FilterDialog::impl_buildUIFileName( const OUString& sName )
{
// otherwise its really a url ... build short name by using INetURLObject
::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > xStringCalculator( new StringCalculator(&m_ftURL) );
- if( xStringCalculator.is() == sal_True )
+ if( xStringCalculator.is() )
{
INetURLObject aBuilder ( sName );
Size aSize = m_ftURL.GetOutputSize();
commit 3ca9c83610a3b3bf646d7ccb84234dbcf8df1f1d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 21 23:17:22 2014 +0100
bool improvements
Change-Id: I1a88cdb87767d029868b855eac09c016e1bca82e
diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx
index 9217913..cb214c5 100644
--- a/include/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
@@ -292,7 +292,7 @@ public:
{
sal_Int32 nIndex = 0;
- if ( ( Index1 >>= nIndex ) != sal_True )
+ if ( !( Index1 >>= nIndex ) )
{
OUString message;
message = OUString( "Couldn't convert index to Int32");
commit a586ee94bbcc5f68d510f609000c8e741532cc7b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 21 22:14:59 2014 +0100
bool improvements
Change-Id: Ic02ccfcadc1a82f489280304ce1180c86aaa3a63
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index 2da3dc6..455a474 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -91,10 +91,10 @@ namespace vclcanvas
{
// update return value. This method should return true, if
// at least one of the looped Draws succeeded.
- bRet |= ( sal_True == rGraphic.Draw( &rOutDev,
+ bRet |= rGraphic.Draw( &rOutDev,
aCurrPos,
rTileSize,
- &rAttr ) );
+ &rAttr );
aCurrPos.X() += rNextTileX.Width();
aCurrPos.Y() += rNextTileX.Height();
commit 0e5c7d0b5bdf0f20e67b3ed65a4199107e58bffa
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 21 21:55:11 2014 +0100
bool improvements
Change-Id: Iddc92e42a100a0fb36c77c21d4c176dded8f3391
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index c33332c..1c9240a 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -277,12 +277,12 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
Reference < XDispatch > xDispatcher ;
Reference < XURLTransformer > xParser ( URLTransformer::create(::comphelper::getProcessComponentContext()) );
- if( xParser.is() == sal_True )
+ if( xParser.is() )
xParser->parseStrict( aURL );
xDispatcher = xDesktop->queryDispatch( aURL, OUString(), 0 );
- if( xDispatcher.is() == sal_True )
+ if( xDispatcher.is() )
{
{
::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -305,12 +305,12 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
Reference < XDispatch > xDispatcher ;
Reference < XURLTransformer > xParser ( URLTransformer::create(::comphelper::getProcessComponentContext()) );
- if( xParser.is() == sal_True )
+ if( xParser.is() )
xParser->parseStrict( aURL );
xDispatcher = xDesktop->queryDispatch( aURL, OUString(), 0 );
- if( xDispatcher.is() == sal_True )
+ if( xDispatcher.is() )
{
try
{
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 8496d31..49ba7f5 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -563,7 +563,7 @@ void syncRepositories(
if (restarter.is())
{
OSL_TRACE( "Request restart for modified extensions manager" );
- restarter->requestRestart(xCmdEnv.is() == sal_True ? xCmdEnv->getInteractionHandler() :
+ restarter->requestRestart(xCmdEnv.is() ? xCmdEnv->getInteractionHandler() :
Reference<task::XInteractionHandler>());
}
}
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index d45012a..da5fff4 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -418,7 +418,7 @@ void SAL_CALL JavaMigration::setPropertyValue(
case ENABLE_JAVA:
{
sal_Bool val = sal_Bool();
- if ((aValue >>= val) == sal_False)
+ if (!(aValue >>= val))
throw MalformedDataException(
OUString("[Service implementation ") + IMPL_NAME +
"] XLayerHandler::setPropertyValue received wrong type for Enable property", 0, Any());
@@ -432,7 +432,7 @@ void SAL_CALL JavaMigration::setPropertyValue(
case USER_CLASS_PATH:
{
OUString cp;
- if ((aValue >>= cp) == sal_False)
+ if (!(aValue >>= cp))
throw MalformedDataException(
OUString("[Service implementation ") + IMPL_NAME +
"] XLayerHandler::setPropertyValue received wrong type for UserClassPath property", 0, Any());
commit 9e1ec4df0bb2f894333ef63f596b08e9ff79bdba
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 21 21:53:19 2014 +0100
bool improvements
Change-Id: I75c137c1ed0c6089c5dfa8131ffde76cadda0134
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx
index 1f86d7b..4aa7e20 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -79,8 +79,7 @@ void SAL_CALL ScriptProtocolHandler::initialize(
// first argument contains a reference to the frame (may be empty or the desktop,
// but usually it's a "real" frame)
- if ( aArguments.getLength() &&
- sal_False == ( aArguments[ 0 ] >>= m_xFrame ) )
+ if ( aArguments.getLength() && !( aArguments[ 0 ] >>= m_xFrame ) )
{
OUString temp = "ScriptProtocolHandler::initialize: could not extract reference to the frame";
throw RuntimeException( temp, Reference< XInterface >() );
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index e5c540b..5a227c4 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -203,7 +203,7 @@ throw ( Exception, RuntimeException )
}
m_sAargs = invokeArgs;
// don't create pkg mgr MSP for documents, not supported
- if ( m_bIsPkgMSP == sal_False && !m_xModel.is() )
+ if ( !m_bIsPkgMSP && !m_xModel.is() )
{
createPkgProvider();
}
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index 6b49525..c429312 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -93,8 +93,7 @@ throw ( uno::Exception, uno::RuntimeException )
uno::Reference< uno::XInterface >() );
}
- if ( (args[0] >>= m_sLanguage) == sal_False ||
- (args[1] >>= m_sLocation) == sal_False )
+ if ( !(args[0] >>= m_sLanguage) || !(args[1] >>= m_sLocation) )
{
throw uno::RuntimeException( OUString(
"ScriptingFrameworkURIHelper error parsing args" ),
commit d980ba7a9da88f88da96bd83c79b833d4b8b0033
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 21 21:52:17 2014 +0100
bool improvements
Change-Id: I9eebb02ff295bf5713ce39fabd38a7a0d10b89f4
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index a3bcc51..bddda57 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -216,8 +216,7 @@ getCurrentDoc( const OUString& sKey ) throw (uno::RuntimeException)
if ( pCompVar )
{
aModel = sbxToUnoValue( pCompVar );
- if ( sal_False == ( aModel >>= xModel ) ||
- !xModel.is() )
+ if ( !( aModel >>= xModel ) || !xModel.is() )
{
throw uno::RuntimeException(
"Can't extract model from basic ( it's obviously not set yet therefore don't know the current document context)" , uno::Reference< uno::XInterface >() );
commit f649cef13c172a211a10ba0d9e69711fbcba509c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 21 21:43:02 2014 +0100
bool improvements
Change-Id: I142196c59ff0dc5c26e0cc9a79293ddfb0ee94cf
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index f0e7eb5..7ec0027 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -79,8 +79,8 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell
SfxViewShell* m_pParentShell;
sal_uInt16 m_nLastSlot;
- sal_Bool m_bDesignMode : 1;
- sal_Bool m_bHasForms : 1; // flag storing if the forms on a page exist,
+ bool m_bDesignMode : 1;
+ bool m_bHasForms : 1; // flag storing if the forms on a page exist,
// only for the DesignMode, see UIFeatureChanged!
// the marks of a FormView have changed...
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index ffe5ec4..386d84c 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -55,18 +55,18 @@ class SdrObject;
class SVX_DLLPUBLIC SdrGluePoint {
// Bezugspunkt ist SdrObject::GetSnapRect().Center()
- // bNoPercent=FALSE: Position ist -5000..5000 (1/100)% bzw. 0..10000 (je nach Align)
- // bNoPercent=sal_True : Position ist in log Einh, rel zum Bezugspunkt
+ // bNoPercent=false: Position ist -5000..5000 (1/100)% bzw. 0..10000 (je nach Align)
+ // bNoPercent=true : Position ist in log Einh, rel zum Bezugspunkt
Point aPos;
sal_uInt16 nEscDir;
sal_uInt16 nId;
sal_uInt16 nAlign;
- sal_uInt8 bNoPercent:1;
- sal_uInt8 bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt
- sal_uInt8 bUserDefined:1; // #i38892#
+ bool bNoPercent:1;
+ bool bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt
+ bool bUserDefined:1; // #i38892#
public:
- SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=sal_False; bReallyAbsolute=sal_False; bUserDefined=sal_True; }
- SdrGluePoint(const Point& rNewPos, bool bNewPercent= sal_True, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute = sal_False; bUserDefined = sal_True; }
+ SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0),bNoPercent(false),bReallyAbsolute(false),bUserDefined(true) {}
+ SdrGluePoint(const Point& rNewPos, bool bNewPercent=true, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign),bNoPercent(!bNewPercent),bReallyAbsolute(false),bUserDefined(true) {}
bool operator==(const SdrGluePoint& rCmpGP) const { return aPos==rCmpGP.aPos && nEscDir==rCmpGP.nEscDir && nId==rCmpGP.nId && nAlign==rCmpGP.nAlign && bNoPercent==rCmpGP.bNoPercent && bReallyAbsolute==rCmpGP.bReallyAbsolute && bUserDefined==rCmpGP.bUserDefined; }
bool operator!=(const SdrGluePoint& rCmpGP) const { return !operator==(rCmpGP); }
const Point& GetPos() const { return aPos; }
@@ -75,15 +75,15 @@ public:
void SetEscDir(sal_uInt16 nNewEsc) { nEscDir=nNewEsc; }
sal_uInt16 GetId() const { return nId; }
void SetId(sal_uInt16 nNewId) { nId=nNewId; }
- bool IsPercent() const { return bNoPercent ? false : true; }
+ bool IsPercent() const { return !bNoPercent; }
void SetPercent(bool bOn) { bNoPercent = !bOn; }
// Temporaer zu setzen fuer Transformationen am Bezugsobjekt
- bool IsReallyAbsolute() const { return bReallyAbsolute ? true : false; }
+ bool IsReallyAbsolute() const { return bReallyAbsolute; }
void SetReallyAbsolute(bool bOn, const SdrObject& rObj);
// #i38892#
- bool IsUserDefined() const { return bUserDefined ? true : false; }
- void SetUserDefined(bool bNew) { bUserDefined = bNew ? true : false; }
+ bool IsUserDefined() const { return bUserDefined; }
+ void SetUserDefined(bool bNew) { bUserDefined = bNew; }
sal_uInt16 GetAlign() const { return nAlign; }
void SetAlign(sal_uInt16 nAlg) { nAlign=nAlg; }
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 03869f7..b47b53c 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -214,7 +214,7 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt )
if ( pEntry )
{
- sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
+ bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
SvLBoxItem* pItem = GetItem( pEntry, aPnt.X() );
if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON)
@@ -255,7 +255,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt )
if ( pEntry )
{
- sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
+ bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
ToggleCheckButton( pEntry );
if ( bCheck != ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) )
CheckButtonHdl();
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index dcf8ce4..17ae864 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -672,7 +672,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
case SID_FM_DESIGN_MODE:
{
SFX_REQUEST_ARG(rReq, pDesignItem, SfxBoolItem, nSlot, sal_False);
- sal_Bool bDesignMode = pDesignItem ? pDesignItem->GetValue() : !m_bDesignMode;
+ bool bDesignMode = pDesignItem ? pDesignItem->GetValue() : !m_bDesignMode;
SetDesignMode( bDesignMode );
if ( m_bDesignMode == bDesignMode )
rReq.Done();
@@ -1229,7 +1229,7 @@ void FmFormShell::SetView( FmFormView* _pView )
void FmFormShell::DetermineForms(sal_Bool bInvalidate)
{
// Existieren Formulare auf der aktuellen Page
- sal_Bool bForms = GetImpl()->hasForms();
+ bool bForms = GetImpl()->hasForms();
if (bForms != m_bHasForms)
{
m_bHasForms = bForms;
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index e0cbe0a..0ef9fd2 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -179,7 +179,7 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
,m_pPropertySetCache( NULL )
,m_pScriptingEnv( ::svxform::createDefaultFormScriptingEnvironment( _rModel ) )
,m_Locks( 0 )
- ,bReadOnly( sal_False )
+ ,bReadOnly( false )
,m_bDisposed( false )
{
DBG_CTOR(FmXUndoEnvironment,NULL);
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index 3a3a369..e2f0fe1 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -143,7 +143,7 @@ class SVX_DLLPRIVATE FmXUndoEnvironment
::svxform::PFormScriptingEnvironment m_pScriptingEnv;
oslInterlockedCount m_Locks;
::osl::Mutex m_aMutex;
- sal_Bool bReadOnly;
+ bool bReadOnly;
bool m_bDisposed;
public:
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 8910ec8..e9add1a 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1820,7 +1820,7 @@ void SdrModel::setLock( bool bLock )
// #i120437# need to set first, else ImpReformatAllEdgeObjects will do nothing
mbModelLocked = bLock;
- if( sal_False == bLock )
+ if( !bLock )
{
ImpReformatAllEdgeObjects();
}
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 7e213b7..8d61587 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2234,7 +2234,7 @@ bool SdrObjCustomShape::IsAutoGrowHeight() const
const SfxItemSet& rSet = GetMergedItemSet();
bool bIsAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
if ( bIsAutoGrowHeight && IsVerticalWriting() )
- bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False;
+ bIsAutoGrowHeight = !((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue();
return bIsAutoGrowHeight;
}
bool SdrObjCustomShape::IsAutoGrowWidth() const
@@ -2242,7 +2242,7 @@ bool SdrObjCustomShape::IsAutoGrowWidth() const
const SfxItemSet& rSet = GetMergedItemSet();
bool bIsAutoGrowWidth = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
if ( bIsAutoGrowWidth && !IsVerticalWriting() )
- bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False;
+ bIsAutoGrowWidth = !((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue();
return bIsAutoGrowWidth;
}
commit 1b1031a8f6aa3ed7eeb1516aac6c327b1fddea4b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 21 21:32:17 2014 +0100
bool improvements
Change-Id: I5f90d0acff506955d1cc5a44944311012f3b04b9
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index acd9eeb..fbf0f5b 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -691,7 +691,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_QUICKLAUNCHER), sal_True, &pItem))
{
DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
- ShutdownIcon::SetAutostart( ( (const SfxBoolItem*)pItem )->GetValue() != sal_False );
+ ShutdownIcon::SetAutostart( ( (const SfxBoolItem*)pItem )->GetValue() );
}
// StarBasic Enable
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index a5f1fde..f59ebfe 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -100,7 +100,7 @@ void SAL_CALL SfxTerminateListener_Impl::queryTermination( const EventObject& )
void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& aEvent ) throw(RuntimeException )
{
Reference< XDesktop > xDesktop( aEvent.Source, UNO_QUERY );
- if( xDesktop.is() == sal_True )
+ if( xDesktop.is() )
xDesktop->removeTerminateListener( this );
SolarMutexGuard aGuard;
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 8c6d096..5717f7a 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -580,7 +580,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
TYPE(SfxBoolItem)));
bool bShow = pItem == 0
? !pAppData_Impl->m_xImeStatusWindow->isShowing()
- : ( pItem->GetValue() == sal_True );
+ : pItem->GetValue();
pAppData_Impl->m_xImeStatusWindow->show(bShow);
if (pItem == 0)
rReq.AppendItem(SfxBoolItem(SID_SHOW_IME_STATUS_WINDOW,
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 8f74c46..31ded84 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -622,7 +622,7 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno:
{
uno::Reference< lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
uno::Reference< container::XContainerQuery > xTypeCFG;
- if( xServiceManager.is() == sal_True )
+ if( xServiceManager.is() )
xTypeCFG = uno::Reference < com::sun::star::container::XContainerQuery >( xServiceManager->createInstance( "com.sun.star.document.TypeDetection" ), uno::UNO_QUERY );
if ( xTypeCFG.is() )
{
@@ -804,7 +804,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const OUString& rName,
uno::Reference< lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
uno::Reference< container::XNameAccess > xFilterCFG ;
uno::Reference< container::XNameAccess > xTypeCFG ;
- if( xServiceManager.is() == sal_True )
+ if( xServiceManager.is() )
{
xFilterCFG = uno::Reference< container::XNameAccess >( xServiceManager->createInstance( "com.sun.star.document.FilterFactory" ), uno::UNO_QUERY );
xTypeCFG = uno::Reference< container::XNameAccess >( xServiceManager->createInstance( "com.sun.star.document.TypeDetection" ), uno::UNO_QUERY );
@@ -1139,16 +1139,13 @@ void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate )
uno::Reference< lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory();
uno::Reference< container::XNameAccess > xFilterCFG ;
uno::Reference< container::XNameAccess > xTypeCFG ;
- if( xServiceManager.is() == sal_True )
+ if( xServiceManager.is() )
{
xFilterCFG = uno::Reference< container::XNameAccess >( xServiceManager->createInstance( "com.sun.star.document.FilterFactory" ), uno::UNO_QUERY );
xTypeCFG = uno::Reference< container::XNameAccess >( xServiceManager->createInstance( "com.sun.star.document.TypeDetection" ), uno::UNO_QUERY );
}
- if(
- ( xFilterCFG.is() == sal_True ) &&
- ( xTypeCFG.is() == sal_True )
- )
+ if( xFilterCFG.is() && xTypeCFG.is() )
{
// select right query to get right set of filters for search modul
uno::Sequence< OUString > lFilterNames = xFilterCFG->getElementNames();
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 0cb8977..978bde9 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1543,7 +1543,7 @@ bool CustomPropertiesWindow::IsLineValid( CustomPropertyLine* pLine ) const
sal_uInt32 nTemp = nIndex;
double fDummy = 0.0;
bIsValid = const_cast< SvNumberFormatter& >(
- m_aNumberFormatter ).IsNumberFormat( sValue, nIndex, fDummy ) != sal_False;
+ m_aNumberFormatter ).IsNumberFormat( sValue, nIndex, fDummy );
if ( bIsValid && nTemp != nIndex )
// sValue is a number but the format doesn't match the index
bIsValid = false;
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 72f95bc..823be0b 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1075,7 +1075,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
// detect floating mode
// toggeling mode will not execute code in handlers, because pImp->bConstructed is not set yet
- sal_Bool bFloatMode = IsFloatingMode();
+ bool bFloatMode = IsFloatingMode();
if ( bFloatMode != ((GetAlignment() == SFX_ALIGN_NOALIGNMENT)) )
{
bFloatMode = !bFloatMode;
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 311eedc..243f818 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -3235,7 +3235,7 @@ sal_Bool SfxObjectShell::SaveCompleted( const uno::Reference< embed::XStorage >&
#ifdef DBG_UTIL
// check for wrong creation of object container
- sal_Bool bHasContainer = ( pImp->mpObjectContainer != 0 );
+ bool bHasContainer = ( pImp->mpObjectContainer != 0 );
#endif
if ( !xStorage.is() || xStorage == GetStorage() )
@@ -3384,7 +3384,7 @@ sal_Bool SfxObjectShell::SwitchPersistance( const uno::Reference< embed::XStorag
sal_Bool bResult = sal_False;
#ifdef DBG_UTIL
// check for wrong creation of object container
- sal_Bool bHasContainer = ( pImp->mpObjectContainer != 0 );
+ bool bHasContainer = ( pImp->mpObjectContainer != 0 );
#endif
if ( xStorage.is() )
{
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index ed78d0f..4641bea 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -362,9 +362,9 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >
if ( rProp.Name.equalsAscii( "PaperOrientation" ) )
{
view::PaperOrientation eOrient;
- if ( ( rProp.Value >>= eOrient ) == sal_False )
+ if ( !( rProp.Value >>= eOrient ) )
{
- if ( ( rProp.Value >>= lDummy ) == sal_False )
+ if ( !( rProp.Value >>= lDummy ) )
throw ::com::sun::star::lang::IllegalArgumentException();
eOrient = ( view::PaperOrientation) lDummy;
}
@@ -379,9 +379,9 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >
// PaperFormat-Property?
else if ( rProp.Name.equalsAscii( "PaperFormat" ) )
{
- if ( ( rProp.Value >>= nPaperFormat ) == sal_False )
+ if ( !( rProp.Value >>= nPaperFormat ) )
{
- if ( ( rProp.Value >>= lDummy ) == sal_False )
+ if ( !( rProp.Value >>= lDummy ) )
throw ::com::sun::star::lang::IllegalArgumentException();
nPaperFormat = ( view::PaperFormat ) lDummy;
}
@@ -397,7 +397,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >
else if ( rProp.Name.equalsAscii( "PaperSize" ) )
{
awt::Size aTempSize ;
- if ( ( rProp.Value >>= aTempSize ) == sal_False )
+ if ( !( rProp.Value >>= aTempSize ) )
{
throw ::com::sun::star::lang::IllegalArgumentException();
}
@@ -411,7 +411,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >
else if ( rProp.Name.equalsAscii( "PrinterPaperTray" ) )
{
OUString aTmp;
- if ( ( rProp.Value >>= aTmp ) == sal_False )
+ if ( !( rProp.Value >>= aTmp ) )
throw ::com::sun::star::lang::IllegalArgumentException();
sal_uInt16 nCount = pPrinter->GetPaperBinCount();
for (sal_uInt16 nBin=0; nBin<nCount; nBin++)
@@ -695,7 +695,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >&
else if ( rProp.Name.equalsAscii( "CopyCount" ) )
{
sal_Int32 nCopies = 0;
- if ( ( rProp.Value >>= nCopies ) == sal_False )
+ if ( !( rProp.Value >>= nCopies ) )
throw ::com::sun::star::lang::IllegalArgumentException();
aCheckedArgs[nProps].Name = rProp.Name;
commit 3257e9a47a79678fc29d29166700e82d0ab7ab1c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 21 21:19:12 2014 +0100
bool improvements
Change-Id: Ia212b8f80da70de7796f0d8ba817c8d3da693080
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 556bf80..598ddd8 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -161,7 +161,7 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion, OutputD
if ( !pRegion )
{
- if ( pEditEngine->pImpEditEngine->GetUpdateMode() == sal_False )
+ if ( !pEditEngine->pImpEditEngine->GetUpdateMode() )
return;
if ( pEditEngine->pImpEditEngine->IsInUndo() )
return;
@@ -642,7 +642,7 @@ void ImpEditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sa
// is initialized in Paint, because no SetPool();
if ( pEditEngine->pImpEditEngine->IsFormatting() )
return;
- if ( pEditEngine->pImpEditEngine->GetUpdateMode() == sal_False )
+ if ( !pEditEngine->pImpEditEngine->GetUpdateMode() )
return;
if ( pEditEngine->pImpEditEngine->IsInUndo() )
return;
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 80a3380..a39a591 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3953,7 +3953,7 @@ EditSelection ImpEditEngine::MoveParagraphs( Range aOldPositions, sal_Int32 nNew
// Where the paragraph was inserted it has to be properly redrawn:
// Where the paragraph was removed it has to be properly redrawn:
// ( and correspondingly in between as well...)
- if ( pCurView && ( GetUpdateMode() == sal_True ) )
+ if ( pCurView && GetUpdateMode() )
{
// in this case one can redraw directly without invalidating the
// Portions
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index f073bee..6b5e09a 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -295,7 +295,7 @@ Rectangle SvxEditEngineForwarder::GetCharBounds( sal_Int32 nPara, sal_uInt16 nIn
// don't rotate for vertical text.
Size aSize( rEditEngine.CalcTextWidth(), rEditEngine.GetTextHeight() );
::std::swap( aSize.Width(), aSize.Height() );
- bool bIsVertical( rEditEngine.IsVertical() == sal_True );
+ bool bIsVertical( rEditEngine.IsVertical() );
// #108900# Handle virtual position one-past-the end of the string
if( nIndex >= rEditEngine.GetTextLen(nPara) )
@@ -380,7 +380,7 @@ sal_Bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32&
::std::swap( aSize.Width(), aSize.Height() );
Point aEEPos( SvxEditSourceHelper::UserSpaceToEE( rPos,
aSize,
- rEditEngine.IsVertical() == sal_True ));
+ rEditEngine.IsVertical() ));
EPosition aDocPos = rEditEngine.FindDocPosition( aEEPos );
commit 6122207e407d8774b3a445eaa94a27cb0801e86d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 21 21:14:32 2014 +0100
bool improvements
Change-Id: Ib5bff97e764cf36bedc39154cc8aca1f223b0f22
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index d6e2c92..f81df49 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -60,7 +60,7 @@ css::uno::Any SAL_CALL SoundHandler::queryInterface( const css::uno::Type& aType
static_cast< css::frame::XDispatch* >(this),
static_cast< css::document::XExtendedFilterDetection* >(this)));
/* If searched interface not supported by this class ... */
- if ( aReturn.hasValue() == sal_False )
+ if ( !aReturn.hasValue() )
{
/* ... ask baseclass for interfaces! */
aReturn = OWeakObject::queryInterface( aType );
@@ -431,7 +431,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmedia_component_getFactory(cons
if ( avmedia::SoundHandler::impl_getStaticImplementationName().equals( OUString::createFromAscii( pImplementationName ) ) )
xFactory = avmedia::SoundHandler::impl_createFactory( xServiceManager );
- if ( xFactory.is() == sal_True )
+ if ( xFactory.is() )
{
xFactory->acquire();
pReturn = xFactory.get();
commit 01fe7b72389bb2f8de45d8319728807d8048b1d3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Jan 21 20:34:12 2014 +0100
bool improvements
Change-Id: I80dfcb60878d9e280e8a03297ccc4833277c235d
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx
index 1b5bab7..f0cfc51 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -90,7 +90,7 @@ uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType )
, static_cast<beans::XPropertySet*> ( this )
, static_cast<embed::XExtendedStorageStream*> ( this ) );
- if ( aReturn.hasValue() == sal_True )
+ if ( aReturn.hasValue() )
return aReturn ;
if ( m_nStorageType == embed::StorageFormats::OFOPXML )
@@ -99,7 +99,7 @@ uno::Any SAL_CALL OInputCompStream::queryInterface( const uno::Type& rType )
( rType
, static_cast<embed::XRelationshipAccess*> ( this ) );
- if ( aReturn.hasValue() == sal_True )
+ if ( aReturn.hasValue() )
return aReturn ;
}
diff --git a/package/source/xstor/oseekinstream.cxx b/package/source/xstor/oseekinstream.cxx
index 15d06c6..6abdcf3 100644
--- a/package/source/xstor/oseekinstream.cxx
+++ b/package/source/xstor/oseekinstream.cxx
@@ -86,7 +86,7 @@ uno::Any SAL_CALL OInputSeekStream::queryInterface( const uno::Type& rType )
uno::Any aReturn( ::cppu::queryInterface( rType,
static_cast< io::XSeekable* >( this ) ) );
- if ( aReturn.hasValue() == sal_True )
+ if ( aReturn.hasValue() )
{
return aReturn ;
}
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 63e2b70..eb32aea 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -1890,7 +1890,7 @@ uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType )
, static_cast<lang::XComponent*> ( this )
, static_cast<beans::XPropertySet*> ( this ) );
- if ( aReturn.hasValue() == sal_True )
+ if ( aReturn.hasValue() )
return aReturn ;
if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE )
@@ -1907,7 +1907,7 @@ uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType )
, static_cast<embed::XRelationshipAccess*> ( this ) );
}
- if ( aReturn.hasValue() == sal_True )
+ if ( aReturn.hasValue() )
return aReturn ;
if ( m_bTransacted )
@@ -1917,7 +1917,7 @@ uno::Any SAL_CALL OWriteStream::queryInterface( const uno::Type& rType )
, static_cast<embed::XTransactedObject*> ( this )
, static_cast<embed::XTransactionBroadcaster*> ( this ) );
- if ( aReturn.hasValue() == sal_True )
+ if ( aReturn.hasValue() )
return aReturn ;
}
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 9e2ffb7..16483d6 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -2204,7 +2204,7 @@ uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType )
, static_cast<beans::XPropertySet*> ( this )
, static_cast<embed::XOptimizedStorage*> ( this ) );
- if ( aReturn.hasValue() == sal_True )
+ if ( aReturn.hasValue() )
return aReturn ;
aReturn <<= ::cppu::queryInterface
@@ -2212,7 +2212,7 @@ uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType )
, static_cast<embed::XHierarchicalStorageAccess*> ( this )
, static_cast<embed::XHierarchicalStorageAccess2*> ( this ) );
- if ( aReturn.hasValue() == sal_True )
+ if ( aReturn.hasValue() )
return aReturn ;
if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE )
@@ -2240,7 +2240,7 @@ uno::Any SAL_CALL OStorage::queryInterface( const uno::Type& rType )
, static_cast<embed::XRelationshipAccess*> ( this ) );
}
- if ( aReturn.hasValue() == sal_True )
+ if ( aReturn.hasValue() )
return aReturn ;
return OWeakObject::queryInterface( rType );
More information about the Libreoffice-commits
mailing list