[Libreoffice-commits] core.git: 44 commits - accessibility/source basebmp/test basegfx/test canvas/source chart2/source compilerplugins/clang connectivity/source cui/source dbaccess/source desktop/source drawinglayer/source editeng/source extensions/source filter/source forms/source formula/source fpicker/source framework/inc framework/source hwpfilter/source i18nlangtag/qa idlc/source javaunohelper/source jvmfwk/plugins jvmfwk/source linguistic/source lotuswordpro/source mysqlc/source oox/source reportdesign/source sal/osl sal/qa sc/source sdext/source sd/source sfx2/source slideshow/source starmath/source svl/source svtools/source svx/source sw/source test/source testtools/source uui/source vcl/generic vcl/inc vcl/source vcl/unx writerfilter/source
Stephan Bergmann
sbergman at redhat.com
Mon Apr 27 06:31:45 PDT 2015
accessibility/source/standard/vclxaccessiblebox.cxx | 2
basebmp/test/basictest.cxx | 2
basegfx/test/basegfx2d.cxx | 8 -
canvas/source/cairo/cairo_canvas.cxx | 2
canvas/source/cairo/cairo_spritecanvas.cxx | 2
canvas/source/opengl/ogl_spritecanvas.cxx | 4
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx | 2
compilerplugins/clang/simplifybool.cxx | 4
connectivity/source/drivers/mork/MResultSet.cxx | 12 -
cui/source/customize/selector.cxx | 4
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/tabpages/tpbitmap.cxx | 2
cui/source/tabpages/tpcolor.cxx | 2
cui/source/tabpages/tpgradnt.cxx | 2
cui/source/tabpages/tphatch.cxx | 2
dbaccess/source/core/dataaccess/databasedocument.cxx | 2
dbaccess/source/ui/app/AppController.cxx | 2
dbaccess/source/ui/tabledesign/TEditControl.cxx | 2
dbaccess/source/ui/tabledesign/TableController.cxx | 6
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 2
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 2
desktop/source/deployment/manager/dp_commandenvironments.cxx | 2
desktop/source/deployment/misc/dp_update.cxx | 4
desktop/source/deployment/registry/package/dp_package.cxx | 2
drawinglayer/source/geometry/viewinformation2d.cxx | 2
editeng/source/editeng/editdoc.cxx | 4
extensions/source/plugin/unx/nppapi.cxx | 4
extensions/source/update/check/updatehdl.cxx | 2
filter/source/graphicfilter/eos2met/eos2met.cxx | 16 +-
filter/source/graphicfilter/epict/epict.cxx | 26 +--
filter/source/graphicfilter/icgm/actimpr.cxx | 2
filter/source/graphicfilter/icgm/bitmap.cxx | 2
filter/source/graphicfilter/icgm/cgm.cxx | 2
filter/source/graphicfilter/idxf/dxf2mtf.cxx | 4
filter/source/graphicfilter/idxf/dxfentrd.cxx | 2
filter/source/graphicfilter/idxf/idxf.cxx | 4
filter/source/graphicfilter/ipbm/ipbm.cxx | 10 -
filter/source/graphicfilter/ipcd/ipcd.cxx | 6
filter/source/graphicfilter/ipcx/ipcx.cxx | 2
filter/source/graphicfilter/ipict/ipict.cxx | 2
filter/source/graphicfilter/ipsd/ipsd.cxx | 2
filter/source/graphicfilter/iras/iras.cxx | 2
filter/source/graphicfilter/itiff/ccidecom.cxx | 10 -
filter/source/graphicfilter/itiff/itiff.cxx | 6
filter/source/msfilter/dffpropset.cxx | 2
filter/source/msfilter/svdfppt.cxx | 6
forms/source/xforms/binding.cxx | 5
forms/source/xforms/propertysetbase.cxx | 2
formula/source/ui/dlg/FormulaHelper.cxx | 4
fpicker/source/office/PlacesListBox.cxx | 2
framework/inc/classes/filtercachedata.hxx | 7
framework/source/dispatch/menudispatcher.cxx | 2
framework/source/dispatch/popupmenudispatcher.cxx | 2
framework/source/helper/oframes.cxx | 2
framework/source/loadenv/loadenv.cxx | 14 -
hwpfilter/source/hiodev.cxx | 2
hwpfilter/source/hwpfile.cxx | 2
hwpfilter/source/hwpreader.cxx | 8 -
i18nlangtag/qa/cppunit/test_languagetag.cxx | 78 +++++-----
idlc/source/options.cxx | 4
javaunohelper/source/javaunohelper.cxx | 2
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 8 -
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 2
jvmfwk/source/elements.cxx | 6
jvmfwk/source/framework.cxx | 9 -
jvmfwk/source/fwkbase.cxx | 4
linguistic/source/dicimp.cxx | 4
lotuswordpro/source/filter/lwpfribmark.cxx | 2
lotuswordpro/source/filter/lwptablelayout.cxx | 4
lotuswordpro/source/filter/xfilter/xfframe.cxx | 2
mysqlc/source/mysqlc_connection.cxx | 2
mysqlc/source/mysqlc_databasemetadata.cxx | 2
oox/source/drawingml/chart/titleconverter.cxx | 2
oox/source/vml/vmlinputstream.cxx | 10 -
reportdesign/source/ui/report/SectionView.cxx | 2
reportdesign/source/ui/report/ViewsWindow.cxx | 2
sal/osl/unx/profile.cxx | 14 -
sal/qa/rtl/alloc/rtl_alloc.cxx | 8 -
sal/qa/rtl/oustring/rtl_OUString2.cxx | 54 +++---
sal/qa/rtl/strings/test_ostring_stringliterals.cxx | 44 ++---
sal/qa/rtl/strings/test_oustring_stringliterals.cxx | 2
sc/source/core/data/docpool.cxx | 2
sc/source/core/data/dpoutput.cxx | 2
sc/source/core/opencl/formulagroupcl.cxx | 4
sc/source/filter/excel/xepivot.cxx | 8 -
sc/source/filter/excel/xeview.cxx | 2
sc/source/filter/excel/xistyle.cxx | 12 -
sc/source/ui/miscdlgs/warnbox.cxx | 2
sc/source/ui/namedlg/namemgrtable.cxx | 2
sc/source/ui/vba/vbaaxes.cxx | 2
sc/source/ui/vba/vbavalidation.cxx | 2
sc/source/ui/view/viewfun2.cxx | 4
sd/source/filter/eppt/eppt.cxx | 4
sd/source/filter/eppt/epptso.cxx | 6
sd/source/filter/eppt/pptx-epptbase.cxx | 4
sd/source/filter/ppt/pptin.cxx | 4
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/dlg/filedlg.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 2
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 2
sd/source/ui/unoidl/unopage.cxx | 4
sdext/source/minimizer/optimizerdialogcontrols.cxx | 8 -
sdext/source/pdfimport/wrapper/wrapper.cxx | 2
sfx2/source/appl/opengrf.cxx | 2
sfx2/source/dialog/mailmodel.cxx | 2
sfx2/source/doc/SfxDocumentMetaData.cxx | 2
slideshow/source/engine/slide/layermanager.cxx | 4
slideshow/source/engine/slideshowimpl.cxx | 4
starmath/source/document.cxx | 2
svl/source/numbers/zforfind.cxx | 2
svtools/source/contnr/svimpbox.cxx | 2
svtools/source/dialogs/ServerDetailsControls.cxx | 2
svtools/source/filter/exportdialog.cxx | 2
svtools/source/toolpanel/paneltabbar.cxx | 2
svx/source/form/datanavi.cxx | 2
svx/source/svdraw/svdoashp.cxx | 6
svx/source/svdraw/svdpoev.cxx | 2
svx/source/unodraw/unoshtxt.cxx | 2
sw/source/core/crsr/findattr.cxx | 2
sw/source/core/docnode/ndtbl1.cxx | 2
sw/source/core/docnode/nodes.cxx | 4
sw/source/core/edit/ednumber.cxx | 4
sw/source/core/layout/pagechg.cxx | 2
sw/source/core/view/viewsh.cxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 4
sw/source/filter/ww8/wrtw8nds.cxx | 2
sw/source/filter/ww8/ww8graf.cxx | 4
sw/source/filter/ww8/ww8par.cxx | 4
sw/source/filter/ww8/ww8par2.cxx | 6
sw/source/filter/ww8/ww8par6.cxx | 2
sw/source/uibase/misc/redlndlg.cxx | 2
sw/source/uibase/uiview/viewdraw.cxx | 2
sw/source/uibase/utlui/numfmtlb.cxx | 2
test/source/sheet/xdatabaserange.cxx | 4
test/source/sheet/xsheetannotation.cxx | 4
testtools/source/bridgetest/constructors.cxx | 2
uui/source/iahndl-authentication.cxx | 8 -
vcl/generic/print/common_gfx.cxx | 2
vcl/inc/svdata.hxx | 2
vcl/source/control/edit.cxx | 2
vcl/source/gdi/pdfwriter_impl2.cxx | 2
vcl/source/gdi/sallayout.cxx | 2
vcl/source/window/layout.cxx | 4
vcl/source/window/window2.cxx | 2
vcl/unx/generic/app/saldisp.cxx | 2
vcl/unx/kde4/VCLKDEApplication.cxx | 2
writerfilter/source/dmapper/GraphicImport.cxx | 2
writerfilter/source/dmapper/NumberingManager.cxx | 2
152 files changed, 361 insertions(+), 366 deletions(-)
New commits:
commit dbb75877c2efe075e85365dbbb315fcc25656292
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:30:34 2015 +0200
loplugin:simplifybool: Need to ignore imp. casts when determining literals
Change-Id: I6b25ef369a9d445322f7500630a6a4ed38ae7d8f
diff --git a/compilerplugins/clang/simplifybool.cxx b/compilerplugins/clang/simplifybool.cxx
index e30d408..9f82660 100644
--- a/compilerplugins/clang/simplifybool.cxx
+++ b/compilerplugins/clang/simplifybool.cxx
@@ -31,6 +31,7 @@ Expr const * getSubExprOfLogicalNegation(Expr const * expr) {
enum class Value { Unknown, False, True };
Value getValue(Expr const * expr) {
+ expr = ignoreParenImpCastAndComma(expr);
if (expr->getType()->isBooleanType()) {
// Instead going via Expr::isCXX11ConstantExpr would turn up excatly one
// additional place in svx/source/dialog/framelinkarray.cxx
@@ -41,8 +42,7 @@ Value getValue(Expr const * expr) {
//
// where it is unclear whether it is not actually better to consider
// DIAG_DBL_CLIP_DEFAULT a tunable parameter (and thus not to simplify):
- auto lit
- = dyn_cast<CXXBoolLiteralExpr>(ignoreParenImpCastAndComma(expr));
+ auto lit = dyn_cast<CXXBoolLiteralExpr>(expr);
if (lit != nullptr) {
return lit->getValue() ? Value::True : Value::False;
}
commit 6f287989fb26c0972bf3dde045acce70c349d90e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:29:45 2015 +0200
More loplugin:simplifybool
Change-Id: I577db0bcb4c9fd45530132409fabf1a422f3d2cb
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index f2099c9..56c3741 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -180,7 +180,7 @@ struct GraphicBorderLine
bool isEmpty()
{
- return nLineWidth == 0 && nLineColor == 0 && bHasShadow == false;
+ return nLineWidth == 0 && nLineColor == 0 && !bHasShadow;
}
};
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index e341ff9..3377c53 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -963,7 +963,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
if (m_pCurrentDefinition->GetCurrentLevel().get())
{
m_pCurrentDefinition->GetCurrentLevel( )->SetValue( nSprmId, nIntValue );
- if( false == bIsStartVisited )
+ if( !bIsStartVisited )
{
m_pCurrentDefinition->GetCurrentLevel( )->SetValue( NS_ooxml::LN_CT_Lvl_start, 0 );
bIsStartVisited = true;
commit 23b34e148b0b9bde6c21aff66dbb19eedcb6fc23
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:29:41 2015 +0200
More loplugin:simplifybool
Change-Id: I34cb4961f6db405cc3b72d488d163487489b0251
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index ffe1e25..b02c577 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/generic/print/common_gfx.cxx
@@ -1144,7 +1144,7 @@ PrinterGfx::DrawEPS( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize
bool bEndComments = false;
while( ! aStream.IsEof()
&& ( ( fLeft == 0 && fRight == 0 && fTop == 0 && fBottom == 0 ) ||
- ( aDocTitle.isEmpty() && bEndComments == false ) )
+ ( aDocTitle.isEmpty() && !bEndComments ) )
)
{
aStream.ReadLine( aLine );
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 4847e19..c4da2e8 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -385,7 +385,7 @@ struct ImplDelData
bool IsDead() const
{
- DBG_ASSERT( mbDel == false, "object deleted while in use !" );
+ DBG_ASSERT( !mbDel, "object deleted while in use !" );
return mbDel;
}
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index c9e19db..809e944 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2851,7 +2851,7 @@ void Edit::dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::Dra
SolarMutexGuard aVclGuard;
if ( !IsTracking() && maSelection.Len() &&
- !(GetStyle() & WB_PASSWORD) && (!mpDDInfo || mpDDInfo->bStarterOfDD == false) ) // Kein Mehrfach D&D
+ !(GetStyle() & WB_PASSWORD) && (!mpDDInfo || !mpDDInfo->bStarterOfDD) ) // Kein Mehrfach D&D
{
Selection aSel( maSelection );
aSel.Justify();
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 0c6714e..e6bd287 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1493,7 +1493,7 @@ bool PDFWriterImpl::computeUDictionaryValue( EncHashTransporter* i_pTransporter,
for( sal_Int32 i = i_nKeyLength, y = 0; y < 5 ; y++ )
io_rProperties.EncryptionKey[i++] = 0;
- if( io_rProperties.Security128bit == false )
+ if( !io_rProperties.Security128bit )
{
//3.4
//step 2 and 3
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index f3481cf..de37876 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -411,7 +411,7 @@ bool ImplLayoutRuns::PosIsInAnyRun( int nCharPos ) const
for (size_t i = 0; i < maRuns.size(); i+=2)
{
- if( (bRet = PosIsInRun( nCharPos )) == true )
+ if( (bRet = PosIsInRun( nCharPos )) )
break;
pThis->NextRun();
}
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 74a9593..2cc0a67 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -890,11 +890,11 @@ VclGrid::array_type VclGrid::assembleGrid() const
array_type B(boost::extents[nNonEmptyCols][nNonEmptyRows]);
for (sal_Int32 x = 0, x2 = 0; x < nMaxX; ++x)
{
- if (aNonEmptyCols[x] == false)
+ if (!aNonEmptyCols[x])
continue;
for (sal_Int32 y = 0, y2 = 0; y < nMaxY; ++y)
{
- if (aNonEmptyRows[y] == false)
+ if (!aNonEmptyRows[y])
continue;
GridEntry &rEntry = A[x][y];
B[x2][y2++] = rEntry;
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index e667287..68129c0 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1523,7 +1523,7 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
aFont.SetItalic(ITALIC_NORMAL);
SetControlFont(aFont);
}
- else if (rKey == "underline" && toBool(rValue) == true)
+ else if (rKey == "underline" && toBool(rValue))
{
vcl::Font aFont(GetControlFont());
aFont.SetUnderline(UNDERLINE_SINGLE);
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index e984b3e..eedbadb 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -582,7 +582,7 @@ void SalDisplay::Init()
bExactResolution = true;
}
}
- if( bExactResolution == false )
+ if( !bExactResolution )
{
/* if Xft.dpi is not set, try and find the DPI from the
* reported screen sizes and resolution. If there are multiple
diff --git a/vcl/unx/kde4/VCLKDEApplication.cxx b/vcl/unx/kde4/VCLKDEApplication.cxx
index 535977b..bb849be 100644
--- a/vcl/unx/kde4/VCLKDEApplication.cxx
+++ b/vcl/unx/kde4/VCLKDEApplication.cxx
@@ -55,7 +55,7 @@ void VCLKDEApplication::preDialogSetup()
// (see the KDE VCL plug), then this won't happen.
// We cannot simply release SolarMutex here, because the event loop started
// by the file dialog would also call back to LO code.
- assert( QApplication::clipboard()->property( "useEventLoopWhenWaiting" ).toBool() == true );
+ assert( QApplication::clipboard()->property( "useEventLoopWhenWaiting" ).toBool() );
}
// various hacks to be performed after a Qt dialog has been closed
commit a32f1d208eb232b9b0db6346d7b8a4140fa2d4e2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:29:37 2015 +0200
More loplugin:simplifybool
Change-Id: I0bb14b3470728b75d8af2ff0d351fa11ceef083a
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index fc5ea18..51bf286 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -684,7 +684,7 @@ UUIInteractionHelper::handlePasswordRequest(
{
nMode = aDocumentPasswordRequest2.Mode;
aDocumentName = aDocumentPasswordRequest2.Name;
- OSL_ENSURE( bMSCryptoMode == false, "bMSCryptoMode should be false" );
+ OSL_ENSURE( !bMSCryptoMode, "bMSCryptoMode should be false" );
bIsPasswordToModify = aDocumentPasswordRequest2.IsRequestPasswordToModify;
bDoHandleRequest = true;
@@ -695,8 +695,8 @@ UUIInteractionHelper::handlePasswordRequest(
{
nMode = aDocumentPasswordRequest.Mode;
aDocumentName = aDocumentPasswordRequest.Name;
- OSL_ENSURE( bMSCryptoMode == false, "bMSCryptoMode should be false" );
- OSL_ENSURE( bIsPasswordToModify == false, "bIsPasswordToModify should be false" );
+ OSL_ENSURE( !bMSCryptoMode, "bMSCryptoMode should be false" );
+ OSL_ENSURE( !bIsPasswordToModify, "bIsPasswordToModify should be false" );
bDoHandleRequest = true;
}
@@ -718,7 +718,7 @@ UUIInteractionHelper::handlePasswordRequest(
nMode = aDocumentMSPasswordRequest.Mode;
aDocumentName = aDocumentMSPasswordRequest.Name;
bMSCryptoMode = true;
- OSL_ENSURE( bIsPasswordToModify == false, "bIsPasswordToModify should be false" );
+ OSL_ENSURE( !bIsPasswordToModify, "bIsPasswordToModify should be false" );
bDoHandleRequest = true;
}
commit 17432a57a6aba6c43a227970c17779c100292e8e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:29:32 2015 +0200
More loplugin:simplifybool
Change-Id: I8d8d6220ff597ce416042fe03d86a7e7bb0a3518
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index 423306a..8553457 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -349,7 +349,7 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
&& (arguments[32] >>= arg32) && arg32.member.getLength() == 1
&& arg32.member[0].member1 == 'X'
&& arg32.member[0].member2.getLength() == 1
- && (arg32.member[0].member2[0] >>= arg32a) && arg32a == true
+ && (arg32.member[0].member2[0] >>= arg32a) && arg32a
&& (arguments[33] >>= arg33) && arg33.member.getLength() == 1
&& arg33.member[0].member1.member == 'X'
&& arg33.member[0].member2.getLength() == 1
commit c8509a027f2caea5e4aed16a7145d0b31bb93145
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:29:28 2015 +0200
More loplugin:simplifybool
Change-Id: I020627f1747bfa31e60d79954cdb9c8fe0a4e5f2
diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx
index 4bd0d27..8c30ed8 100644
--- a/test/source/sheet/xdatabaserange.cxx
+++ b/test/source/sheet/xdatabaserange.cxx
@@ -104,7 +104,7 @@ void XDatabaseRange::testGetSortDescriptor()
{
bool bCopyOutputData = true;
xProp.Value >>= bCopyOutputData;
- CPPUNIT_ASSERT(bCopyOutputData == false);
+ CPPUNIT_ASSERT(!bCopyOutputData);
}
else if (xProp.Name == "OutputPosition")
{
@@ -114,7 +114,7 @@ void XDatabaseRange::testGetSortDescriptor()
{
bool bIsUserListEnabled = true;
xProp.Value >>= bIsUserListEnabled;
- CPPUNIT_ASSERT(bIsUserListEnabled == false);
+ CPPUNIT_ASSERT(!bIsUserListEnabled);
}
else if (xProp.Name == "UserListIndex")
diff --git a/test/source/sheet/xsheetannotation.cxx b/test/source/sheet/xsheetannotation.cxx
index fd118ab..2755f56 100644
--- a/test/source/sheet/xsheetannotation.cxx
+++ b/test/source/sheet/xsheetannotation.cxx
@@ -54,7 +54,7 @@ void XSheetAnnotation::testGetIsVisible()
uno::Reference< sheet::XSheetAnnotation > aSheetAnnotation (init(), UNO_QUERY_THROW);
bool isVisible = aSheetAnnotation->getIsVisible();
- CPPUNIT_ASSERT_MESSAGE("Wrong visible state", isVisible == true);
+ CPPUNIT_ASSERT_MESSAGE("Wrong visible state", isVisible);
}
void XSheetAnnotation::testSetIsVisible()
{
@@ -62,7 +62,7 @@ void XSheetAnnotation::testSetIsVisible()
aSheetAnnotation->setIsVisible(false);
bool isVisible = aSheetAnnotation->getIsVisible();
- CPPUNIT_ASSERT_MESSAGE("Visible state not changed", isVisible == false);
+ CPPUNIT_ASSERT_MESSAGE("Visible state not changed", !isVisible);
}
}
commit a390d178b0440f5ecc151427c9d05f52c54e8c45
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:29:20 2015 +0200
More loplugin:simplifybool
Change-Id: I91848b0a5a5110ca557375d8c432832033237249
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index cf399d5..aa3b2ed 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -82,7 +82,7 @@ bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
bNumOffsetEqual = false;
}
- if (bNumOffsetEqual == false)
+ if (!bNumOffsetEqual)
return false;
return static_cast<const SwFmtPageDesc&>(rItem1).GetPageDesc() == static_cast<const SwFmtPageDesc&>(rItem2).GetPageDesc();
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 5bf4baa..25705e22 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -1212,7 +1212,7 @@ bool SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill ) const
}
}
- if ( false == bRet )
+ if ( !bRet )
break;
}
}
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 3ae5e3b..9a54ec9 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1286,7 +1286,7 @@ SwCntntNode* SwNodes::GoNext(SwNodeIndex *pIdx) const
SwNodeIndex aTmp(*pIdx, +1);
SwNode* pNd = 0;
- while( aTmp < Count()-1 && false == ( pNd = &aTmp.GetNode())->IsCntntNode() )
+ while( aTmp < Count()-1 && !( pNd = &aTmp.GetNode())->IsCntntNode() )
++aTmp;
if( aTmp == Count()-1 )
@@ -1303,7 +1303,7 @@ SwCntntNode* SwNodes::GoPrevious(SwNodeIndex *pIdx) const
SwNodeIndex aTmp( *pIdx, -1 );
SwNode* pNd = 0;
- while( aTmp.GetIndex() && false == ( pNd = &aTmp.GetNode())->IsCntntNode() )
+ while( aTmp.GetIndex() && !( pNd = &aTmp.GetNode())->IsCntntNode() )
--aTmp;
if( !aTmp.GetIndex() )
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index ee3b3c8..c4e1ab4 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -179,7 +179,7 @@ bool SwEditShell::SelectionHasNumber() const
{
bResult = false;
}
- if (bResult==false) {
+ if (!bResult) {
break;
}
}
@@ -218,7 +218,7 @@ bool SwEditShell::SelectionHasBullet() const
{
bResult = pTxtNd->HasBullet();
- if (bResult==false) {
+ if (!bResult) {
break;
}
}
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 2cfd85b..a816029 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -190,7 +190,7 @@ SwPageFrm::SwPageFrm( SwFrmFmt *pFmt, SwFrm* pSib, SwPageDesc *pPgDsc ) :
// create and insert body area if it is not a blank page
SwDoc *pDoc = pFmt->GetDoc();
- if ( false == (bEmptyPage = (pFmt == pDoc->GetEmptyPageFmt())) )
+ if ( !(bEmptyPage = (pFmt == pDoc->GetEmptyPageFmt())) )
{
bEmptyPage = false;
Calc(); // so that the PrtArea is correct
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 14dfb43..1ed7fa0 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1581,7 +1581,7 @@ bool SwViewShell::CheckInvalidForPaint( const SwRect &rRect )
for ( size_t i = 0; i < pRegion->size(); ++i )
{
const SwRect &rTmp = (*pRegion)[i];
- if ( false == (bStop = rTmp.IsOver( VisArea() )) )
+ if ( !(bStop = rTmp.IsOver( VisArea() )) )
break;
}
if ( bStop )
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index f45fc10..595cae2 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2691,7 +2691,7 @@ static void impl_borders( FSHelperPtr pSerializer, const SvxBoxItem& rBox, const
const SvxBoxItemLine* pBrd = aBorders;
bool bExportDistanceFromPageEdge = false;
- if ( rOptions.bCheckDistanceSize == true && boxHasLineLargerThan31(rBox) == true )
+ if ( rOptions.bCheckDistanceSize && boxHasLineLargerThan31(rBox) )
{
// The distance is larger than '31'. This cannot be exported as 'distance from text'.
// Instead - it should be exported as 'distance from page edge'.
@@ -5461,7 +5461,7 @@ void DocxAttributeOutput::SectionPageBorders( const SwFrmFmt* pFmt, const SwFrmF
if ( pBottom || pTop || pLeft || pRight )
{
bool bExportDistanceFromPageEdge = false;
- if ( boxHasLineLargerThan31(rBox) == true )
+ if ( boxHasLineLargerThan31(rBox) )
{
// The distance is larger than '31'. This cannot be exported as 'distance from text'.
// Instead - it should be exported as 'distance from page edge'.
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index d787258..1d5aacb 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2946,7 +2946,7 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point
A special case for converting some inline form controls to form fields
when in winword 8+ mode
*/
- if ((bUseEscher == true) && (eType == sw::Frame::eFormControl))
+ if (bUseEscher && (eType == sw::Frame::eFormControl))
{
if ( m_rWW8Export.MiserableFormFieldExportHack( rFrmFmt ) )
return ;
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 8249a06..7bf2a38 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -642,7 +642,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
if (bStartAttr)
{
ImportSprm(aRes.pMemPos, aRes.nSprmId);
- if (!bDoingSymbol && bSymbol == true)
+ if (!bDoingSymbol && bSymbol)
{
bDoingSymbol = true;
nStartReplace = nTxtStart;
@@ -652,7 +652,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
else
{
EndSprm( aRes.nSprmId );
- if (bSymbol == false && bDoingSymbol)
+ if (!bSymbol && bDoingSymbol)
{
bDoingSymbol = false;
OUStringBuffer sTemp;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 85922e7..14ef17bb 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2561,11 +2561,11 @@ void SwWW8ImplReader::EndSpecial()
StopTable();
maApos.pop_back();
--nInTable;
- if (maApos[nInTable] == true)
+ if (maApos[nInTable])
StopApo();
}
- if (maApos[0] == true)
+ if (maApos[0])
StopApo();
OSL_ENSURE(!nInTable, "unclosed table!");
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 97865c5..6c04df2 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2246,10 +2246,10 @@ void WW8TabDesc::CalcDefaults()
so the default mapping forward wont't work. So map it (and
contiguous invalid cells backwards to the last valid cell instead.
*/
- if (i && pR->bExist[i-1] == false)
+ if (i && !pR->bExist[i-1])
{
sal_uInt16 k=i-1;
- while (k && pR->bExist[k] == false)
+ while (k && !pR->bExist[k])
k--;
for (sal_uInt16 n=k+1;n<i;n++)
pR->nTransCell[n] = pR->nTransCell[k];
@@ -2338,7 +2338,7 @@ void WW8TabDesc::CreateSwTable(SvxULSpaceItem* pULSpaceItem)
}
}
- if (bSetMinHeight == true)
+ if (bSetMinHeight)
{
// minimize Fontsize to minimize height growth of the header/footer
// set font size to 1 point to minimize y-growth of Hd/Ft
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index f4781a7..9ac0f0e 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4677,7 +4677,7 @@ void SwWW8ImplReader::Read_ParaBackColor(sal_uInt16, const sal_uInt8* pData, sho
sal_uInt32 SwWW8ImplReader::ExtractColour(const sal_uInt8* &rpData, bool bVer67)
{
(void) bVer67; // unused in non-debug
- OSL_ENSURE(bVer67 == false, "Impossible");
+ OSL_ENSURE(!bVer67, "Impossible");
sal_uInt32 nFore = msfilter::util::BGRToRGB(SVBT32ToUInt32(rpData));
rpData+=4;
sal_uInt32 nBack = msfilter::util::BGRToRGB(SVBT32ToUInt32(rpData));
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 63847a4..1db1ec8 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -777,7 +777,7 @@ void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept )
ListBoxEntries_t aRedlines;
// don't activate
- OSL_ENSURE( bInhibitActivate == false,
+ OSL_ENSURE( !bInhibitActivate,
"recursive call of CallAcceptReject?");
bInhibitActivate = true;
diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index ccc39a4..8ed2185 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -709,7 +709,7 @@ bool SwView::HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const
const size_t nCnt = pList->GetObjCount();
for (size_t i = 0; i < nCnt; ++i)
- if ((bRet = HasOnlyObj(pList->GetObj(i), eObjInventor)) == false)
+ if (!(bRet = HasOnlyObj(pList->GetObj(i), eObjInventor)))
break;
}
else if (eObjInventor == pSdrObj->GetObjInventor())
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index 1b9aa58..c4ad0d1 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -96,7 +96,7 @@ void NumFormatListBox::Init(short nFormatType, bool bUsrFmts)
else
eCurLanguage = SvtSysLocale().GetLanguageTag().getLanguageType();
- if (bUsrFmts == false)
+ if (!bUsrFmts)
{
pOwnFormatter = new SvNumberFormatter(comphelper::getProcessComponentContext(), eCurLanguage);
}
commit 61e5ba62f5f4a275d26eb7e36fa9e885774ad0cb
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:29:17 2015 +0200
More loplugin:simplifybool
Change-Id: I8dce5186e3b95082fe5c282493424534d469cd51
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 381fc84..6c63be1 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1268,7 +1268,7 @@ namespace svxform
if ( pNode && ( pNode->m_xNode.is() || pNode->m_xPropSet.is() ) )
{
bEnableEdit = true;
- bEnableRemove = ( bSubmitChild != true );
+ bEnableRemove = !bSubmitChild;
if ( DGTInstance == m_eGroup && !m_pItemList->GetParent( pEntry ) )
bEnableRemove = false;
if ( pNode->m_xNode.is() )
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 9b06946..5080b71 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -492,7 +492,7 @@ bool SdrObjCustomShape::UseNoFillStyle() const
const Any* pAny = rGeometryItem.GetPropertyValueByName( sType );
if ( pAny )
*pAny >>= sShapeType;
- bRet = IsCustomShapeFilledByDefault( EnhancedCustomShapeTypeNames::Get( sType ) ) == false;
+ bRet = !IsCustomShapeFilledByDefault( EnhancedCustomShapeTypeNames::Get( sType ) );
return bRet;
}
@@ -1588,12 +1588,12 @@ void SdrObjCustomShape::NbcResize( const Point& rRef, const Fraction& rxFact, co
if ( ( ( xFact.GetNumerator() < 0 ) && ( xFact.GetDenominator() > 0 ) ) ||
( ( xFact.GetNumerator() > 0 ) && ( xFact.GetDenominator() < 0 ) ) )
{
- SetMirroredX( IsMirroredX() == false );
+ SetMirroredX( !IsMirroredX() );
}
if ( ( ( yFact.GetNumerator() < 0 ) && ( yFact.GetDenominator() > 0 ) ) ||
( ( yFact.GetNumerator() > 0 ) && ( yFact.GetDenominator() < 0 ) ) )
{
- SetMirroredY( IsMirroredY() == false );
+ SetMirroredY( !IsMirroredY() );
}
}
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index aa6aaf4..9d559ff 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -391,7 +391,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
if(nNewPt0Idx)
{
// correction necessary?
- DBG_ASSERT(bKorregFlag==false,"Multiple index corrections at SdrPolyEditView::RipUp().");
+ DBG_ASSERT(!bKorregFlag,"Multiple index corrections at SdrPolyEditView::RipUp().");
if(!bKorregFlag)
{
bKorregFlag = true;
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 1850e1d..c87bdc1 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -237,7 +237,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText
SvxTextEditSourceImpl::~SvxTextEditSourceImpl()
{
- DBG_ASSERT( mbIsLocked == false, "text edit source was not unlocked before dispose!" );
+ DBG_ASSERT( !mbIsLocked, "text edit source was not unlocked before dispose!" );
if( mpObject )
mpObject->RemoveObjectUser( *this );
commit 79faad753fab8db49582c55ef0082588ae2521a0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:29:14 2015 +0200
More loplugin:simplifybool
Change-Id: Ica40d21d8fd4cab37b6ba561be77d3db53d75e72
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index f1aa6fa..1b0f9e8 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2105,7 +2105,7 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
else
{
// CheckButton? (TreeListBox: Check + Info)
- if( ButtonDownCheckCtrl(rMEvt, pEntry, nY) == true)
+ if( ButtonDownCheckCtrl(rMEvt, pEntry, nY) )
return;
// Inplace-Editing?
}
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index f7aebdf..90e8df4 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -174,7 +174,7 @@ IMPL_LINK( DavDetailsContainer, ToggledDavsHdl, CheckBox*, pCheckBox )
bool bCheckedDavs = pCheckBox->IsChecked();
if ( m_pEDPort->GetValue() == 80 && bCheckedDavs )
m_pEDPort->SetValue( 443 );
- else if ( m_pEDPort->GetValue() == 443 && bCheckedDavs == false )
+ else if ( m_pEDPort->GetValue() == 443 && !bCheckedDavs )
m_pEDPort->SetValue( 80 );
OUString sScheme( "http" );
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 024d6b1..ce1f4ff 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -326,7 +326,7 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC
}
uno::Sequence< beans::PropertyValue > aRet( pFilterOptions->GetFilterData() );
- if ( bUpdateConfig == false )
+ if ( !bUpdateConfig )
delete pFilterOptions;
return aRet;
}
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index 91c1304..ef19414 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -813,7 +813,7 @@ namespace svt
void PanelTabBar_Impl::EnsureItemsCache()
{
- if ( m_bItemsDirty == false )
+ if ( !m_bItemsDirty )
{
DBG_CHECK( *this );
return;
commit 46fdbbfe4d6c3b95f27b2eacd03480ac43109d8f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:29:11 2015 +0200
More loplugin:simplifybool
Change-Id: Id80e640852c0fda7a4fe3fcec33ca1f95407235d
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 3e9a9ce..97948c5 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -3803,7 +3803,7 @@ bool ImpSvNumberInputScan::IsNumberFormat( const OUString& rString, // s
}
}
- if (res == false)
+ if (!res)
{
eScannedType = css::util::NumberFormat::TEXT;
fOutNumber = 0.0;
commit e15d89361e202136cb6bd096a5bad4883d457164
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:29:05 2015 +0200
More loplugin:simplifybool
Change-Id: Id4c8b4c2ac064838b968bac4f24e544162a55bdf
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index c1fdc10..73e4fa4 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -727,7 +727,7 @@ bool SmDocShell::ConvertFrom(SfxMedium &rMedium)
{
// is this a MathType Storage?
MathType aEquation( aText );
- if ( true == (bSuccess = (1 == aEquation.Parse( aStorage )) ))
+ if ( (bSuccess = (1 == aEquation.Parse( aStorage )) ))
Parse();
}
}
commit 9f366a65b8609919a2f834fc62f41839a416e657
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:28:59 2015 +0200
More loplugin:simplifybool
Change-Id: I5426400b0831a353336451409103ebeb01dcd946
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index 1f3cbd6..c46b902 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -811,8 +811,8 @@ namespace slideshow
const bool bThisIsBackgroundDetached(
pCurrShape->isBackgroundDetached() );
- if( bLastWasBackgroundDetached == true &&
- bThisIsBackgroundDetached == false )
+ if( bLastWasBackgroundDetached &&
+ !bThisIsBackgroundDetached )
{
// discontinuity found - current shape needs to
// get into a new layer
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index a101eb1..98d7414 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -1629,7 +1629,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
OSL_ENSURE( mbMouseVisible,
"setProperty(): User paint overrides invisible mouse" );
- if(nSwitchPenMode == true){
+ if(nSwitchPenMode){
// Switch to Pen Mode
maSwitchPenMode.reset( nSwitchPenMode );
maEventMultiplexer.notifySwitchPenMode();
@@ -1645,7 +1645,7 @@ sal_Bool SlideShowImpl::setProperty( beans::PropertyValue const& rProperty )
{
OSL_ENSURE( mbMouseVisible,
"setProperty(): User paint overrides invisible mouse" );
- if(nSwitchEraserMode == true){
+ if(nSwitchEraserMode){
// switch to Eraser mode
maSwitchEraserMode.reset( nSwitchEraserMode );
maEventMultiplexer.notifySwitchEraserMode();
commit 343397c37609347afb64b1367bcd557b53ffb4cc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:28:55 2015 +0200
More loplugin:simplifybool
Change-Id: Ifa8a855fc870a55fda8d801c22c15b0bc441fbe6
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 6ef54db..8c18f40 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -111,7 +111,7 @@ short SvxOpenGraphicDialog::Execute()
sal_uInt16 nImpRet;
bool bQuitLoop(false);
- while( bQuitLoop == false &&
+ while( !bQuitLoop &&
mpImpl->aFileDlg.Execute() == ERRCODE_NONE )
{
if( !GetPath().isEmpty() )
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index ff9e9e5..28233e4 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -851,7 +851,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css:
{
}
- if ( bSend == false )
+ if ( !bSend )
{
css::uno::Reference< css::awt::XWindow > xParentWindow = xFrame->getContainerWindow();
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index db6274f..d7118a7 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -2171,7 +2171,7 @@ sal_Bool SAL_CALL SfxDocumentMetaData::isModified( )
checkInit();
css::uno::Reference<css::util::XModifiable> xMB(m_xUserDefined,
css::uno::UNO_QUERY);
- return m_isModified || (xMB.is() ? xMB->isModified() : false);
+ return m_isModified || (xMB.is() && xMB->isModified());
}
void SAL_CALL SfxDocumentMetaData::setModified( sal_Bool bModified )
commit c82515eb6b073548543a9d0f3d0153d6cec889ad
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:28:52 2015 +0200
More loplugin:simplifybool
Change-Id: I4ea5c7e9f807dfd5242c8e87a87d9ad604ebd035
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index df12933..e8d3eb0 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -506,8 +506,8 @@ void OptimizerDialog::UpdateControlStatesPage2()
if ( aResolutionText.isEmpty() )
aResolutionText = OUString::number( nImageResolution );
- setControlProperty( "RadioButton0Pg1", "State", Any( (sal_Int16)( bJPEGCompression == false ) ) );
- setControlProperty( "RadioButton1Pg1", "State", Any( (sal_Int16)( bJPEGCompression == true ) ) );
+ setControlProperty( "RadioButton0Pg1", "State", Any( (sal_Int16)( !bJPEGCompression ) ) );
+ setControlProperty( "RadioButton1Pg1", "State", Any( (sal_Int16)( bJPEGCompression ) ) );
setControlProperty( "FixedText1Pg1", "Enabled", Any( bJPEGCompression ) );
setControlProperty( "FormattedField0Pg1", "Enabled", Any( bJPEGCompression ) );
setControlProperty( "FormattedField0Pg1", "EffectiveValue", Any( (double)nJPEGQuality ) );
@@ -610,8 +610,8 @@ void OptimizerDialog::UpdateControlStatesPage4()
}
else
{
- setControlProperty( "RadioButton0Pg4", "State", Any( (sal_Int16)( bSaveAs == false ) ) );
- setControlProperty( "RadioButton1Pg4", "State", Any( (sal_Int16)( bSaveAs == true ) ) );
+ setControlProperty( "RadioButton0Pg4", "State", Any( (sal_Int16)( !bSaveAs ) ) );
+ setControlProperty( "RadioButton1Pg4", "State", Any( (sal_Int16)( bSaveAs ) ) );
}
setControlProperty( "ComboBox0Pg4", "Enabled", Any( false ) );
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 480a901..aa0cf96 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -1029,7 +1029,7 @@ bool xpdf_ImportFromFile( const OUString& rURL,
// check for encryption, if necessary get password
OUString aPwd( rPwd );
bool bIsEncrypted = false;
- if( checkEncryption( aSysUPath, xIHdl, aPwd, bIsEncrypted, aDocName ) == false )
+ if( !checkEncryption( aSysUPath, xIHdl, aPwd, bIsEncrypted, aDocName ) )
{
SAL_INFO(
"sdext.pdfimport",
commit 44642cbc558ba869c91a629ffc34c6867319069a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:28:49 2015 +0200
More loplugin:simplifybool
Change-Id: I3bb156856ec6538168764c64dc768ba70c9bca88
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index d4f0640..b57b35e 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -227,7 +227,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "LoopSound" ) ) )
aAny >>= bLoopSound;
- bool bNeedsSSSlideInfoAtom = ( bVisible == false )
+ bool bNeedsSSSlideInfoAtom = !bVisible
|| ( mnDiaMode == 2 )
|| ( bIsSound )
|| ( bStopSound )
@@ -260,7 +260,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
nTransitionType = GetTransition( eFe, nDirection );
if ( mnDiaMode == 2 ) // automatic ?
nBuildFlags |= 0x400;
- if ( bVisible == false )
+ if ( !bVisible )
nBuildFlags |= 4;
if ( bIsSound )
nBuildFlags |= 16;
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 9885c0d..ed18ae0 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2583,7 +2583,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
{
sal_uInt16 nSpType, nSpFlags;
::com::sun::star::awt::Rectangle aNewRect;
- if ( aPropOpt.CreateConnectorProperties( mXShape, aSolverContainer, aNewRect, nSpType, nSpFlags ) == false )
+ if ( !aPropOpt.CreateConnectorProperties( mXShape, aSolverContainer, aNewRect, nSpType, nSpFlags ) )
continue;
maRect = MapRectangle( aNewRect );
@@ -3305,9 +3305,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
if ( !pClientTextBox )
pClientTextBox = new SvMemoryStream( 0x200, 0x200 );
- if ( mbEmptyPresObj == false )
+ if ( !mbEmptyPresObj )
{
- if ( ( ePageType == NORMAL ) && ( bMasterPage == false ) )
+ if ( ( ePageType == NORMAL ) && !bMasterPage )
{
sal_uInt32 nTextType = EPP_TEXTTYPE_Body;
if ( mnTextStyle == EPP_TEXTSTYLE_BODY )
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 2606fa3..7a2eb7f 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -714,7 +714,7 @@ bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, bool bGroup )
{
while(true)
{
- if ( ( bGroup == false ) || ( GetCurrentGroupLevel() == 0 ) )
+ if ( !bGroup || ( GetCurrentGroupLevel() == 0 ) )
{
Any aAny( mXShapes->getByIndex( nIndex ) );
aAny >>= mXShape;
@@ -972,7 +972,7 @@ bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( bool bForOOMLX )
bool bOtherThanPlaceHolders = false;
if ( nShapes )
- for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == false ); nIndex++ )
+ for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && !bOtherThanPlaceHolders; nIndex++ )
{
if ( GetShapeByIndex( nIndex ) && mType != "drawing.Page" )
{
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 4d8b2f6..4f40576 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -721,7 +721,7 @@ bool ImplSdPPTImport::Import()
static_cast<SdPage*>(pNotesClone)->SetLayoutName( aLayoutName );
}
}
- else if ( pPersist->bStarDrawFiller == false )
+ else if ( !pPersist->bStarDrawFiller )
{
PptSlidePersistEntry* pE = pPersist;
while( ( pE->aSlideAtom.nFlags & 4 ) && pE->aSlideAtom.nMasterId )
@@ -1761,7 +1761,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations
}
aHd.SeekToEndOfRecord( rStCtrl );
}
- if ( bTryTwice && ( bSSSlideInfoAtom == false ) )
+ if ( bTryTwice && !bSSSlideInfoAtom )
{
bTryTwice = false;
if ( HasMasterPage( nAktPageNum, eAktPageKind ) )
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 015c5a4..b856cb1 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -374,7 +374,7 @@ void AnnotationManagerImpl::InsertAnnotation()
}
}
- if( bFree == false)
+ if( !bFree )
{
x += width;
if( x > page_width )
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index a749a5b..ae7c5da 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -249,7 +249,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType,
#endif
}
}
- else if( mbUsableSelection != true )
+ else if( !mbUsableSelection )
{
try
{
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 1dccec0..596edba 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1054,7 +1054,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsSlideshowRespectZOrder() );
aProperties.push_back(
beans::PropertyValue( "DisableAnimationZOrder" ,
- -1, Any( bZOrderEnabled == false ),
+ -1, Any( !bZOrderEnabled ),
beans::PropertyState_DIRECT_VALUE ) );
aProperties.push_back(
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index 63f25e5..19fbc99 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -119,7 +119,7 @@ void RequestQueue::AddRequest (
Request aRequest (aKey, nPriority, eRequestClass);
std::pair<Container::iterator,bool> ret = mpRequestQueue->insert(aRequest);
- bool bInserted = ret.second == true;
+ bool bInserted = ret.second;
if (bInserted)
{
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index d3d8384..e43f4e9 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -732,7 +732,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName
bool bVisible = false;
if( ! ( aValue >>= bVisible ) )
throw lang::IllegalArgumentException();
- GetPage()->SetExcluded( bVisible == false );
+ GetPage()->SetExcluded( !bVisible );
break;
}
case WID_PAGE_SOUNDFILE :
@@ -1162,7 +1162,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName )
case WID_PAGE_VISIBLE :
{
- bool bVisible = GetPage()->IsExcluded() == false;
+ bool bVisible = !GetPage()->IsExcluded();
aAny <<= bVisible;
break;
}
commit 6c97d801203b277428e329d174c8650e5fae78ab
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:28:46 2015 +0200
More loplugin:simplifybool
Change-Id: I65ea51a6d34942acfe8c4fe0dee62781251fb1bf
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 2effa6d..7a9009b 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -703,7 +703,7 @@ static bool lcl_HFPresentation
if ( SfxItemState::SET == rSet.GetItemState(ATTR_PAGE_ON,false,&pItem) )
{
- if( false == static_cast<const SfxBoolItem*>(pItem)->GetValue() )
+ if( !static_cast<const SfxBoolItem*>(pItem)->GetValue() )
return false;
}
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index dee436a..450c5bb 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -1105,7 +1105,7 @@ void ScDPOutput::Output()
++nEnd;
SCROW nEndRowPos = nDataStartRow + (SCROW)nEnd; //TODO: check for overflow
outputimp.AddRow( nRowPos );
- if ( vbSetBorder[ nRow ] == false )
+ if ( !vbSetBorder[ nRow ] )
{
outputimp.OutputBlockFrame( nColPos, nRowPos, nTabEndCol, nEndRowPos );
vbSetBorder[ nRow ] = true;
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 1ad5120..368c525 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1693,7 +1693,7 @@ public:
if (NumericRange* NR =
dynamic_cast<NumericRange*>(vSubArguments[i].get()))
{
- bool needBody; NR->GenReductionLoopHeader(ss, needBody); if (needBody == false)
+ bool needBody; NR->GenReductionLoopHeader(ss, needBody); if (!needBody)
continue;
}
else if (ParallelNumericRange* PNR =
@@ -1711,7 +1711,7 @@ public:
//did not handle yet
bool needBody;
SR->GenReductionLoopHeader(ss, needBody);
- if (needBody == false)
+ if (!needBody)
continue;
}
else
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index d4039c5..035a186 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -462,7 +462,7 @@ void XclExpPCField::InsertOrigTextItem( const OUString& rText )
// #i76047# maximum item text length in pivot cache is 255
OUString aShortText = rText.copy( 0, ::std::min(rText.getLength(), EXC_PC_MAXSTRLEN ) );
for( size_t nSize = maOrigItemList.GetSize(); !bFound && (nPos < nSize); ++nPos )
- if( (bFound = maOrigItemList.GetRecord( nPos )->EqualsText( aShortText )) == true )
+ if( (bFound = maOrigItemList.GetRecord( nPos )->EqualsText( aShortText )) )
InsertItemArrayIndex( nPos );
if( !bFound )
InsertOrigItem( new XclExpPCItem( aShortText ) );
@@ -473,7 +473,7 @@ void XclExpPCField::InsertOrigDoubleItem( double fValue )
size_t nPos = 0;
bool bFound = false;
for( size_t nSize = maOrigItemList.GetSize(); !bFound && (nPos < nSize); ++nPos )
- if( (bFound = maOrigItemList.GetRecord( nPos )->EqualsDouble( fValue )) == true )
+ if( (bFound = maOrigItemList.GetRecord( nPos )->EqualsDouble( fValue )) )
InsertItemArrayIndex( nPos );
if( !bFound )
InsertOrigItem( new XclExpPCItem( fValue ) );
@@ -484,7 +484,7 @@ void XclExpPCField::InsertOrigDateTimeItem( const DateTime& rDateTime )
size_t nPos = 0;
bool bFound = false;
for( size_t nSize = maOrigItemList.GetSize(); !bFound && (nPos < nSize); ++nPos )
- if( (bFound = maOrigItemList.GetRecord( nPos )->EqualsDateTime( rDateTime )) == true )
+ if( (bFound = maOrigItemList.GetRecord( nPos )->EqualsDateTime( rDateTime )) )
InsertItemArrayIndex( nPos );
if( !bFound )
InsertOrigItem( new XclExpPCItem( rDateTime ) );
@@ -495,7 +495,7 @@ void XclExpPCField::InsertOrigBoolItem( bool bValue )
size_t nPos = 0;
bool bFound = false;
for( size_t nSize = maOrigItemList.GetSize(); !bFound && (nPos < nSize); ++nPos )
- if( (bFound = maOrigItemList.GetRecord( nPos )->EqualsBool( bValue )) == true )
+ if( (bFound = maOrigItemList.GetRecord( nPos )->EqualsBool( bValue )) )
InsertItemArrayIndex( nPos );
if( !bFound )
InsertOrigItem( new XclExpPCItem( bValue ) );
diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx
index e3104ff..09fbbc1 100644
--- a/sc/source/filter/excel/xeview.cxx
+++ b/sc/source/filter/excel/xeview.cxx
@@ -209,7 +209,7 @@ XclExpSelection::XclExpSelection( const XclTabViewData& rData, sal_uInt8 nPane )
XclRangeList& rXclSel = maSelData.maXclSelection;
bool bFound = false;
for( XclRangeVector::const_iterator aIt = rXclSel.begin(), aEnd = rXclSel.end(); !bFound && (aIt != aEnd); ++aIt )
- if( (bFound = aIt->Contains( maSelData.maXclCursor )) == true )
+ if( (bFound = aIt->Contains( maSelData.maXclCursor )) )
maSelData.mnCursorIdx = static_cast< sal_uInt16 >( aIt - rXclSel.begin() );
/* Cursor cell not found in list? (e.g. inactive pane, or removed in
ConvertRangeList(), because Calc cursor on invalid pos)
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 3934935..47251d5 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -281,17 +281,17 @@ void XclImpFont::ReadCFFontBlock( XclImpStream& rStrm )
sal_uInt32 nFontFlags3 = rStrm.ReaduInt32();
rStrm.Ignore( 18 );
- if( (mbHeightUsed = (nHeight <= 0x7FFF)) == true )
+ if( (mbHeightUsed = (nHeight <= 0x7FFF)) )
maData.mnHeight = static_cast< sal_uInt16 >( nHeight );
- if( (mbWeightUsed = !::get_flag( nFontFlags1, EXC_CF_FONT_STYLE ) && (nWeight < 0x7FFF)) == true )
+ if( (mbWeightUsed = !::get_flag( nFontFlags1, EXC_CF_FONT_STYLE ) && (nWeight < 0x7FFF)) )
maData.mnWeight = static_cast< sal_uInt16 >( nWeight );
- if( (mbItalicUsed = !::get_flag( nFontFlags1, EXC_CF_FONT_STYLE )) == true )
+ if( (mbItalicUsed = !::get_flag( nFontFlags1, EXC_CF_FONT_STYLE )) )
maData.mbItalic = ::get_flag( nStyle, EXC_CF_FONT_STYLE );
- if( (mbUnderlUsed = !::get_flag( nFontFlags3, EXC_CF_FONT_UNDERL ) && (nUnderl <= 0x7F)) == true )
+ if( (mbUnderlUsed = !::get_flag( nFontFlags3, EXC_CF_FONT_UNDERL ) && (nUnderl <= 0x7F)) )
maData.mnUnderline = nUnderl;
- if( (mbColorUsed = (nColor <= 0x7FFF)) == true )
+ if( (mbColorUsed = (nColor <= 0x7FFF)) )
maData.maColor = GetPalette().GetColor( static_cast< sal_uInt16 >( nColor ) );
- if( (mbStrikeUsed = !::get_flag( nFontFlags1, EXC_CF_FONT_STRIKEOUT )) == true )
+ if( (mbStrikeUsed = !::get_flag( nFontFlags1, EXC_CF_FONT_STRIKEOUT )) )
maData.mbStrikeout = ::get_flag( nStyle, EXC_CF_FONT_STRIKEOUT );
}
diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx
index de69700..75c7b60 100644
--- a/sc/source/ui/miscdlgs/warnbox.cxx
+++ b/sc/source/ui/miscdlgs/warnbox.cxx
@@ -62,7 +62,7 @@ ScReplaceWarnBox::ScReplaceWarnBox( vcl::Window* pParent ) :
bool ScReplaceWarnBox::IsDialogEnabled()
{
- return ((bool) SC_MOD()->GetInputOptions().GetReplaceCellsWarn()) == true;
+ return (bool) SC_MOD()->GetInputOptions().GetReplaceCellsWarn();
}
void ScReplaceWarnBox::DisableDialog()
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index fbe6cba6..f534320 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -175,7 +175,7 @@ void ScRangeManagerTable::CheckForFormulaString()
for (SvTreeListEntry* pEntry = GetFirstEntryInView(); pEntry ; pEntry = GetNextEntryInView(pEntry))
{
std::map<SvTreeListEntry*, bool>::const_iterator itr = maCalculatedFormulaEntries.find(pEntry);
- if (itr == maCalculatedFormulaEntries.end() || itr->second == false)
+ if (itr == maCalculatedFormulaEntries.end() || !itr->second)
{
ScRangeNameLine aLine;
GetLine( aLine, pEntry);
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index 1cd8851..c2b0f7d 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -176,7 +176,7 @@ ScVbaAxes::Item( const css::uno::Any& _nType, const css::uno::Any& _oAxisGroup)
// bodgy helperapi port bits
sal_Int32 nAxisGroup = xlPrimary;
sal_Int32 nType = -1;
- if ( !_nType.hasValue() || ( ( _nType >>= nType ) == false ) )
+ if ( !_nType.hasValue() || !( _nType >>= nType ) )
throw uno::RuntimeException("Axes::Item Failed to extract type" );
if ( _oAxisGroup.hasValue() )
diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx
index 95585a0..541be9a 100644
--- a/sc/source/ui/vba/vbavalidation.cxx
+++ b/sc/source/ui/vba/vbavalidation.cxx
@@ -74,7 +74,7 @@ ScVbaValidation::getInCellDropdown() throw (uno::RuntimeException, std::exceptio
uno::Reference< beans::XPropertySet > xProps = lcl_getValidationProps( m_xRange );
sal_Int32 nShowList = 0;
xProps->getPropertyValue( SC_UNONAME_SHOWLIST ) >>= nShowList;
- return ( nShowList ? sal_True : false );
+ return nShowList != 0;
}
void SAL_CALL
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 1c647ab..7f303ea 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -314,7 +314,7 @@ static bool lcl_GetAutoSumForColumnRange( ScDocument* pDoc, ScRangeList& rRangeL
{
rRangeList.Append( ScRange( nCol, nStartRow, nTab, nCol, nEndRow, nTab ) );
nEndRow = static_cast< SCROW >( nExtend );
- if ( ( bContinue = lcl_FindNextSumEntryInColumn( pDoc, nCol, nEndRow /*inout*/, nTab, nExtend /*out*/, aStart.Row() ) ) == true )
+ if ( ( bContinue = lcl_FindNextSumEntryInColumn( pDoc, nCol, nEndRow /*inout*/, nTab, nExtend /*out*/, aStart.Row() ) ) )
{
nStartRow = nEndRow;
}
@@ -356,7 +356,7 @@ static bool lcl_GetAutoSumForRowRange( ScDocument* pDoc, ScRangeList& rRangeList
{
rRangeList.Append( ScRange( nStartCol, nRow, nTab, nEndCol, nRow, nTab ) );
nEndCol = static_cast< SCCOL >( nExtend );
- if ( ( bContinue = lcl_FindNextSumEntryInRow( pDoc, nEndCol /*inout*/, nRow, nTab, nExtend /*out*/, aStart.Col() ) ) == true )
+ if ( ( bContinue = lcl_FindNextSumEntryInRow( pDoc, nEndCol /*inout*/, nRow, nTab, nExtend /*out*/, aStart.Col() ) ) )
{
nStartCol = nEndCol;
}
commit 3591554df303958e519d8758acd595975809c827
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:28:41 2015 +0200
More loplugin:simplifybool
Change-Id: I9414d9167213c0156fb97559a8af5e55a4e1c1de
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index 4feb4eb..00d0b44 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -196,7 +196,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
pthread_mutex_lock(&(pProfile->m_AccessLock));
- if ( pProfile->m_bIsValid == false )
+ if ( !pProfile->m_bIsValid )
{
SAL_WARN("sal.osl", "!pProfile->m_bIsValid");
pthread_mutex_unlock(&(pProfile->m_AccessLock));
@@ -293,7 +293,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
pthread_mutex_lock(&(pProfile->m_AccessLock));
- if ( pProfile->m_bIsValid == false )
+ if ( !pProfile->m_bIsValid )
{
SAL_WARN_IF(!pProfile->m_bIsValid, "sal.osl", "!pProfile->m_bIsValid");
pthread_mutex_unlock(&(pProfile->m_AccessLock));
@@ -370,7 +370,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
pthread_mutex_lock(&(pTmpProfile->m_AccessLock));
- if ( pTmpProfile->m_bIsValid == false )
+ if ( !pTmpProfile->m_bIsValid )
{
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
@@ -504,7 +504,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
pthread_mutex_lock(&(pTmpProfile->m_AccessLock));
- if ( pTmpProfile->m_bIsValid == false )
+ if ( !pTmpProfile->m_bIsValid )
{
SAL_WARN_IF(!pTmpProfile->m_bIsValid, "sal.osl", "!pTmpProfile->m_bIsValid");
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
@@ -657,7 +657,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
pthread_mutex_lock(&(pTmpProfile->m_AccessLock));
- if ( pTmpProfile->m_bIsValid == false )
+ if ( !pTmpProfile->m_bIsValid )
{
SAL_WARN_IF(!pTmpProfile->m_bIsValid, "sal.osl", "!pTmpProfile->m_bIsValid");
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
@@ -727,7 +727,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile,
pthread_mutex_lock(&(pTmpProfile->m_AccessLock));
- if ( pTmpProfile->m_bIsValid == false )
+ if ( !pTmpProfile->m_bIsValid )
{
SAL_WARN_IF(!pTmpProfile->m_bIsValid, "sal.osl", "!pTmpProfile->m_bIsValid");
@@ -810,7 +810,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile,
pthread_mutex_lock(&(pTmpProfile->m_AccessLock));
- if ( pTmpProfile->m_bIsValid == false )
+ if ( !pTmpProfile->m_bIsValid )
{
SAL_WARN_IF(!pTmpProfile->m_bIsValid, "sal.osl", "!pTmpProfile->m_bIsValid");
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index 4aee1ca..9a5c488 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -73,7 +73,7 @@ public:
{
CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", m_pMemory != NULL);
memset(m_pMemory, 1, m_nSizeOfMemory);
- CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pMemory, m_nSizeOfMemory, 1) == true);
+ CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pMemory, m_nSizeOfMemory, 1));
}
void rtl_reallocateMemory_001()
@@ -83,7 +83,7 @@ public:
CPPUNIT_ASSERT_MESSAGE( "Can reallocate memory.", m_pMemory != NULL);
memset(m_pMemory, 2, nSize);
- CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pMemory, nSize, 2) == true);
+ CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pMemory, nSize, 2));
}
CPPUNIT_TEST_SUITE(Memory);
@@ -123,10 +123,10 @@ public:
void rtl_allocateZeroMemory_001()
{
CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", m_pZeroMemory != NULL);
- CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 0) == true);
+ CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 0));
memset(m_pZeroMemory, 3, m_nSizeOfZeroMemory);
- CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 3) == true);
+ CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 3));
}
CPPUNIT_TEST_SUITE(TestZeroMemory);
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 95940f7..eff33e9 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -62,7 +62,7 @@ class number : public CppUnit::TestFixture
double nValueATOF = doubleToFloat(atof( sValue.getStr() ));
bool bEqualResult = is_float_equal(_nValue, nValueATOF);
- CPPUNIT_ASSERT_MESSAGE("Values are not equal.", bEqualResult == true);
+ CPPUNIT_ASSERT_MESSAGE("Values are not equal.", bEqualResult);
}
void number_float_test(float _nValue)
@@ -133,7 +133,7 @@ private:
double nValueATOF = atof( sValue.getStr() );
bool bEqualResult = is_double_equal(_nValue, nValueATOF);
- CPPUNIT_ASSERT_MESSAGE("Values are not equal.", bEqualResult == true);
+ CPPUNIT_ASSERT_MESSAGE("Values are not equal.", bEqualResult);
}
void number_double_test(double _nValue)
@@ -256,7 +256,7 @@ public:
//printf("result data is %e\n", nValueToDouble);
bool bEqualResult = is_double_equal(nValueToDouble, nValueATOF);
- CPPUNIT_ASSERT_MESSAGE("Values are not equal.", bEqualResult == true);
+ CPPUNIT_ASSERT_MESSAGE("Values are not equal.", bEqualResult);
}
void toDouble_test(rtl::OString const& _sValue)
@@ -273,22 +273,22 @@ public:
void toDouble_selftest()
{
printf("Start selftest:\n");
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.01) == false);
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.001) == false);
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.0001) == false);
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.00001) == false);
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.000001) == false);
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.0000001) == false);
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.00000001) == false);
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.000000001) == false);
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.0000000001) == false);
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.00000000001) == false);
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.000000000001) == false);
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.0000000000001) == false);
+ CPPUNIT_ASSERT (!is_double_equal(1.0, 1.01));
+ CPPUNIT_ASSERT (!is_double_equal(1.0, 1.001));
+ CPPUNIT_ASSERT (!is_double_equal(1.0, 1.0001));
+ CPPUNIT_ASSERT (!is_double_equal(1.0, 1.00001));
+ CPPUNIT_ASSERT (!is_double_equal(1.0, 1.000001));
+ CPPUNIT_ASSERT (!is_double_equal(1.0, 1.0000001));
+ CPPUNIT_ASSERT (!is_double_equal(1.0, 1.00000001));
+ CPPUNIT_ASSERT (!is_double_equal(1.0, 1.000000001));
+ CPPUNIT_ASSERT (!is_double_equal(1.0, 1.0000000001));
+ CPPUNIT_ASSERT (!is_double_equal(1.0, 1.00000000001));
+ CPPUNIT_ASSERT (!is_double_equal(1.0, 1.000000000001));
+ CPPUNIT_ASSERT (!is_double_equal(1.0, 1.0000000000001));
// we check til 15 values after comma
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.00000000000001) == true);
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.000000000000001) == true);
- CPPUNIT_ASSERT (is_double_equal(1.0, 1.0000000000000001) == true);
+ CPPUNIT_ASSERT (is_double_equal(1.0, 1.00000000000001));
+ CPPUNIT_ASSERT (is_double_equal(1.0, 1.000000000000001));
+ CPPUNIT_ASSERT (is_double_equal(1.0, 1.0000000000000001));
printf("Selftest done.\n");
}
@@ -391,7 +391,7 @@ public:
//printf("the result str is %.10f\n", nValueToFloat);
bool bEqualResult = is_float_equal(nValueToFloat, nValueATOF);
- CPPUNIT_ASSERT_MESSAGE("Values are not equal.", bEqualResult == true);
+ CPPUNIT_ASSERT_MESSAGE("Values are not equal.", bEqualResult);
}
void toFloat_test(rtl::OString const& _sValue)
@@ -408,14 +408,14 @@ public:
void toFloat_selftest()
{
printf("Start selftest:\n");
- CPPUNIT_ASSERT (is_float_equal(1.0f, 1.01f) == false);
- CPPUNIT_ASSERT (is_float_equal(1.0f, 1.001f) == false);
- CPPUNIT_ASSERT (is_float_equal(1.0f, 1.0001f) == false);
- CPPUNIT_ASSERT (is_float_equal(1.0f, 1.00001f) == false);
- CPPUNIT_ASSERT (is_float_equal(1.0f, 1.000002f) == false);
- CPPUNIT_ASSERT (is_float_equal(1.0f, 1.0000001f) == true);
- CPPUNIT_ASSERT (is_float_equal(1.0f, 1.00000001f) == true);
- CPPUNIT_ASSERT (is_float_equal(1.0f, 1.000000001f) == true);
+ CPPUNIT_ASSERT (!is_float_equal(1.0f, 1.01f));
+ CPPUNIT_ASSERT (!is_float_equal(1.0f, 1.001f));
+ CPPUNIT_ASSERT (!is_float_equal(1.0f, 1.0001f));
+ CPPUNIT_ASSERT (!is_float_equal(1.0f, 1.00001f));
+ CPPUNIT_ASSERT (!is_float_equal(1.0f, 1.000002f));
+ CPPUNIT_ASSERT (is_float_equal(1.0f, 1.0000001f));
+ CPPUNIT_ASSERT (is_float_equal(1.0f, 1.00000001f));
+ CPPUNIT_ASSERT (is_float_equal(1.0f, 1.000000001f));
printf("Selftest done.\n");
}
diff --git a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
index 7e24e49..af547ed 100644
--- a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
@@ -126,53 +126,53 @@ void test::ostring::StringLiterals::checkUsage()
rtl_string_unittest_non_const_literal_function = false; // and check for non-const variants
rtl_string_unittest_const_literal_function = false;
CPPUNIT_ASSERT_EQUAL( foo, rtl::OString() = "foo" );
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
rtl_string_unittest_const_literal_function = false;
CPPUNIT_ASSERT( FoO.equalsIgnoreAsciiCase( "fOo" ));
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
rtl_string_unittest_const_literal_function = false;
CPPUNIT_ASSERT( foobarfoo.match( "bar", 3 ));
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
rtl_string_unittest_const_literal_function = false;
CPPUNIT_ASSERT( foobar.match( "foo" ));
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
rtl_string_unittest_const_literal_function = false;
CPPUNIT_ASSERT( FooBaRfoo.matchIgnoreAsciiCase( "bAr", 3 ));
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
rtl_string_unittest_const_literal_function = false;
CPPUNIT_ASSERT( FooBaR.matchIgnoreAsciiCase( "fOo" ));
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
rtl_string_unittest_const_literal_function = false;
CPPUNIT_ASSERT( foobar.startsWith( "foo" ));
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
rtl_string_unittest_const_literal_function = false;
CPPUNIT_ASSERT( foobar.endsWith( "bar" ));
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
// rtl_string_unittest_const_literal_function = false;
// CPPUNIT_ASSERT( FooBaR.endsWithIgnoreAsciiCase( "bar" ));
// CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
rtl_string_unittest_const_literal_function = false;
CPPUNIT_ASSERT( foo == "foo" );
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
rtl_string_unittest_const_literal_function = false;
CPPUNIT_ASSERT( "foo" == foo );
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
rtl_string_unittest_const_literal_function = false;
CPPUNIT_ASSERT( foo != "bar" );
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
rtl_string_unittest_const_literal_function = false;
CPPUNIT_ASSERT( "foo" != bar );
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
rtl_string_unittest_const_literal_function = false;
CPPUNIT_ASSERT( foobarfoo.indexOf( "foo", 1 ) == 6 );
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
// rtl_string_unittest_const_literal_function = false;
// CPPUNIT_ASSERT( foobarfoo.lastIndexOf( "foo" ) == 6 );
// CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
// if this is not true, some of the calls above converted to OString
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal == false );
+ CPPUNIT_ASSERT( !rtl_string_unittest_const_literal );
// if this is not true, some of the calls above used non-const variants
- CPPUNIT_ASSERT( rtl_string_unittest_non_const_literal_function == false );
+ CPPUNIT_ASSERT( !rtl_string_unittest_non_const_literal_function );
}
void test::ostring::StringLiterals::checkNonConstUsage()
@@ -223,8 +223,8 @@ void test::ostring::StringLiterals::checkNonConstUsage()
// CPPUNIT_ASSERT( foobarfoo.lastIndexOf( (const char*)foo_c ) == 6 );
// CPPUNIT_ASSERT( foobarfoo.lastIndexOf( foo_c ) == 6 );
// if this is not true, some of the calls above used const variants
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal == false );
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == false );
+ CPPUNIT_ASSERT( !rtl_string_unittest_const_literal );
+ CPPUNIT_ASSERT( !rtl_string_unittest_const_literal_function );
}
void test::ostring::StringLiterals::checkBuffer()
@@ -232,15 +232,15 @@ void test::ostring::StringLiterals::checkBuffer()
rtl::OStringBuffer buf;
rtl_string_unittest_const_literal_function = false;
buf.append( "foo" );
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
CPPUNIT_ASSERT_EQUAL( rtl::OString( "foo" ), buf.toString());
rtl_string_unittest_const_literal_function = false;
buf.append( "bar" );
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
CPPUNIT_ASSERT_EQUAL( rtl::OString( "foobar" ), buf.toString());
rtl_string_unittest_const_literal_function = false;
buf.insert( 3, "baz" );
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == true );
+ CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function );
CPPUNIT_ASSERT_EQUAL( rtl::OString( "foobazbar" ), buf.toString());
rtl::OString foobazbard( "foobazbard" );
@@ -250,8 +250,8 @@ void test::ostring::StringLiterals::checkBuffer()
char d[] = "d";
CPPUNIT_ASSERT_EQUAL( foobazbard, buf.append( d ).toString());
CPPUNIT_ASSERT_EQUAL( foodbazbard, buf.insert( 3, d ).toString() );
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal == false );
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal_function == false );
+ CPPUNIT_ASSERT( !rtl_string_unittest_const_literal );
+ CPPUNIT_ASSERT( !rtl_string_unittest_const_literal_function );
}
#undef CONST_CTOR_USED
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index c237b17..a126104 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -132,7 +132,7 @@ void test::oustring::StringLiterals::checkUsage()
CPPUNIT_ASSERT( foobarfoo.replaceAll( "foo", "test" ) == "testbartest" );
CPPUNIT_ASSERT( foo.reverseCompareTo( "foo" ) == 0 );
// if this is not true, some of the calls above converted to OUString
- CPPUNIT_ASSERT( rtl_string_unittest_const_literal == false );
+ CPPUNIT_ASSERT( !rtl_string_unittest_const_literal );
}
void test::oustring::StringLiterals::checkExtraIntArgument()
commit badc69d73ae2da5ddc68d93a3e327104253a0598
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:28:37 2015 +0200
More loplugin:simplifybool
Change-Id: I58a6d08f0a6583b5e50ffc5b003313857dfb97ff
diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx
index bbbbf20..423396e 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -223,7 +223,7 @@ bool OSectionView::IsDragResize() const
if (pDragMethod)
{
bool bMoveOnly = pDragMethod->getMoveOnly();
- if (bMoveOnly == false)
+ if (!bMoveOnly)
{
// current marked components will be resized
return true;
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 30d690c7..9a7afee 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -1239,7 +1239,7 @@ void OViewsWindow::EndDragObj(bool _bControlKeyPressed, const OSectionView* _pSe
Point aNewPos = _aPnt;
OSectionView* pInSection = getSectionRelativeToPosition(_pSection, aNewPos);
if (!_bControlKeyPressed &&
- (_pSection && ( _pSection->IsDragResize() == false ) ) && /* Not in resize mode */
+ _pSection && !_pSection->IsDragResize() && /* Not in resize mode */
_pSection != pInSection)
{
EndDragObj_removeInvisibleObjects();
commit 378dd762ee6e77fcc8aa27d9b24e35424f2dcf28
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:28:33 2015 +0200
More loplugin:simplifybool
Change-Id: Ibfa82d0d397b87b1ca46f1edf9ad7609f8fa4167
diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx
index 79863f5..6e6b440 100644
--- a/oox/source/drawingml/chart/titleconverter.cxx
+++ b/oox/source/drawingml/chart/titleconverter.cxx
@@ -245,7 +245,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram )
aPropSet.setProperty( PROP_AnchorPosition, eLegendPos );
aPropSet.setProperty( PROP_Expansion, eLegendExpand );
- if(eLegendPos == LegendPosition_CUSTOM && bTopRight && bManualLayout==false)
+ if(eLegendPos == LegendPosition_CUSTOM && bTopRight && !bManualLayout)
aPropSet.setProperty( PROP_RelativePosition , makeAny(eRelPos));
}
catch( Exception& )
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index 9fab155..91af9e1 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -93,19 +93,19 @@ void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal
{
// pcNameBeg points to begin of attribute name, find equality sign
const sal_Char* pcEqualSign = lclFindCharacter( pcNameBeg, pcEnd, '=' );
- if ((bOk = (pcEqualSign < pcEnd)) == true)
+ if ((bOk = (pcEqualSign < pcEnd)))
{
// find end of attribute name (ignore whitespace between name and equality sign)
const sal_Char* pcNameEnd = lclTrimWhiteSpaceFromEnd( pcNameBeg, pcEqualSign );
- if( (bOk = (pcNameBeg < pcNameEnd)) == true )
+ if( (bOk = (pcNameBeg < pcNameEnd)) )
{
// find begin of attribute value (must be single or double quote)
const sal_Char* pcValueBeg = lclFindNonWhiteSpace( pcEqualSign + 1, pcEnd );
- if( (bOk = (pcValueBeg < pcEnd) && ((*pcValueBeg == '\'') || (*pcValueBeg == '"'))) == true )
+ if( (bOk = (pcValueBeg < pcEnd) && ((*pcValueBeg == '\'') || (*pcValueBeg == '"'))) )
{
// find end of attribute value (matching quote character)
const sal_Char* pcValueEnd = lclFindCharacter( pcValueBeg + 1, pcEnd, *pcValueBeg );
- if( (bOk = (pcValueEnd < pcEnd)) == true )
+ if( (bOk = (pcValueEnd < pcEnd)) )
{
++pcValueEnd;
OString aAttribName( pcNameBeg, static_cast< sal_Int32 >( pcNameEnd - pcNameBeg ) );
@@ -120,7 +120,7 @@ void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal
aAttributes[ pcNameBeg ] = aAttribData;
// continue with next attribute (skip whitespace after this attribute)
pcNameBeg = pcValueEnd;
- if( (pcNameBeg < pcEnd) && ((bOk = lclIsWhiteSpace( *pcNameBeg )) == true) )
+ if( (pcNameBeg < pcEnd) && ((bOk = lclIsWhiteSpace( *pcNameBeg ))) )
pcNameBeg = lclFindNonWhiteSpace( pcNameBeg + 1, pcEnd );
}
}
commit 2339a5bd5088f20aad8746821ea2dcc656edb8ac
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:28:29 2015 +0200
More loplugin:simplifybool
Change-Id: Ic26c9e044b0e2225db8e218f39409338a69e7047
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index 6cd26b1..d26558b 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -324,7 +324,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit()
bool autoCommit = false;
try {
- autoCommit = m_settings.cppConnection->getAutoCommit() == true;
+ autoCommit = m_settings.cppConnection->getAutoCommit();
} catch (const sql::SQLException & e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
}
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx
index e975611..b35023e 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -373,7 +373,7 @@ rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm()
rtl::OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString()
throw(SQLException, RuntimeException, std::exception)
{
- if (identifier_quote_string_set == false) {
+ if (!identifier_quote_string_set) {
identifier_quote_string = impl_getStringMetaData("getIdentifierQuoteString", &sql::DatabaseMetaData::getIdentifierQuoteString);
identifier_quote_string_set = true;
}
commit de6d87c1ba18ecf20ec9ea5a405030e626ab544a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:28:23 2015 +0200
More loplugin:simplifybool
Change-Id: I1ed1841c7cfbf69abfc8ba19cca348077da7b6d1
diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx
index 430d7e5..143a00f 100644
--- a/lotuswordpro/source/filter/lwpfribmark.cxx
+++ b/lotuswordpro/source/filter/lwpfribmark.cxx
@@ -261,7 +261,7 @@ void LwpFribField::XFConvert(XFContentContainer* pXFPara)
//end marker
if (type == MARKER_END)
{
- if (pFieldMark->GetStart() == false)
+ if (!pFieldMark->GetStart())
return;
if (pFieldMark->IsFormulaInsert())
{
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index 99d8b18..e2edf49 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -1295,7 +1295,7 @@ void LwpTableLayout::SplitConflictCells()
continue;
}
pRowLayout= iter1->second;
- if (pRowLayout->GetMergeCellFlag() == false)
+ if (!pRowLayout->GetMergeCellFlag())
{
i++;
continue;
@@ -1310,7 +1310,7 @@ void LwpTableLayout::SplitConflictCells()
if (iter2 == m_RowsMap.end())
continue;
pEffectRow = iter2->second;
- if (pEffectRow->GetMergeCellFlag() == false)
+ if (!pEffectRow->GetMergeCellFlag())
continue;
else
pEffectRow->SetCellSplit(nEffectRows);
diff --git a/lotuswordpro/source/filter/xfilter/xfframe.cxx b/lotuswordpro/source/filter/xfilter/xfframe.cxx
index 3eee43d..cc50382 100644
--- a/lotuswordpro/source/filter/xfilter/xfframe.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfframe.cxx
@@ -141,7 +141,7 @@ void XFFrame::StartFrame(IXFStream *pStrm)
pAttrList->AddAttribute( "draw:style-name", GetStyleName() );
assert(!m_strName.isEmpty() && "name should not be null.");
- if( !m_strName.isEmpty() && m_isTextBox == false)
+ if( !m_strName.isEmpty() && !m_isTextBox)
pAttrList->AddAttribute( "draw:name", m_strName );
//anchor type:
switch( m_eAnchor )
commit 64fd710cd57986f319bbb1a379cd674b134b5708
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:28:18 2015 +0200
More loplugin:simplifybool
Change-Id: I68b98ad56d4487ff85b8e4555c94f6dd247c2012
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 07ce3eb..bdc7c30 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -335,7 +335,7 @@ sal_uLong DictionaryNeo::loadEntries(const OUString &rMainURL)
OString aLine;
// remaining lines - stock strings (a [==] b)
- while (true == (bSuccess = pStream->ReadLine(aLine)))
+ while ((bSuccess = pStream->ReadLine(aLine)))
{
if (aLine[0] == '#') // skip comments
continue;
@@ -775,7 +775,7 @@ void SAL_CALL DictionaryNeo::setActive( sal_Bool bActivate )
DictionaryEventFlags::ACTIVATE_DIC : DictionaryEventFlags::DEACTIVATE_DIC;
// remove entries from memory if dictionary is deactivated
- if (bIsActive == false)
+ if (!bIsActive)
{
bool bIsEmpty = nCount == 0;
commit 3daf0c7e77a6438d11d23a31b5f21577c19cdcd8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:28:09 2015 +0200
More loplugin:simplifybool
Change-Id: I51e7a11149676a8b5396d9eb993a509859cdf725
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 8b92e15..f179bde 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -76,7 +76,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
if (pInfo == NULL)
{
- if (false == findAndSelect(&pInfo))
+ if (!findAndSelect(&pInfo))
return -1;
}
else
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index 9fc69d6..07ec21e 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -281,7 +281,7 @@ bool GnuInfo::initialize(vector<pair<OUString, OUString> > props)
break;
}
}
- if (bLdPath == false)
+ if (!bLdPath)
return false;
return true;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 54ba4d0..667440c 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -94,7 +94,7 @@ bool SunVersion::init(const char *szVersion)
(nPart < 2 && *pCur == '.') )
&& (
//prevent 1.4.0. 1.4.0-
- pCur + 1 == pEnd ? isdigit(*(pCur)) : true) )
+ pCur + 1 != pEnd || isdigit(*(pCur))) )
{
int len = pCur - pLast;
if (len >= 127)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index eb43be0..c72668d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -976,11 +976,11 @@ rtl::Reference<VendorBase> getJREInfoByPath(
}
bool bProcessRun= false;
- if (getJavaProps(sFilePath,
+ if (!getJavaProps(sFilePath,
#ifdef JVM_ONE_PATH_CHECK
sResolvedDir,
#endif
- props, & bProcessRun) == false)
+ props, & bProcessRun))
{
//The java executable could not be run or the system properties
//could not be retrieved. We can assume that this java is corrupt.
@@ -991,7 +991,7 @@ rtl::Reference<VendorBase> getJREInfoByPath(
//in jdk/jre/bin. We do not search any further, because we assume that if one java
//does not work then the other does not work as well. This saves us to run java
//again which is quite costly.
- if (bProcessRun == true)
+ if (bProcessRun)
{
// 1.3.1 special treatment: jdk/bin/java and /jdk/jre/bin/java are links to
//a script, named .java_wrapper. The script starts jdk/bin/sparc/native_threads/java
@@ -1084,7 +1084,7 @@ Reference<VendorBase> createInstance(createInstance_func pFunc,
Reference<VendorBase> aBase = (*pFunc)();
if (aBase.is())
{
- if (aBase->initialize(properties) == false)
+ if (!aBase->initialize(properties))
aBase = 0;
}
return aBase;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index f91f75e..5ee17d7 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -173,7 +173,7 @@ bool VendorBase::initialize(vector<pair<OUString, OUString> > props)
break;
}
}
- if (bLdPath == false)
+ if (!bLdPath)
return false;
return true;
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 0326912..253ad0d 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -777,7 +777,7 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
bNil = false;
else
throw FrameworkException(JFW_E_ERROR, sExcMsg);
- if (bNil == true)
+ if (bNil)
return;
//Get javaInfo at manuallySelected attribute
@@ -890,7 +890,7 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
//javaInfo at autoSelect
xmlSetProp(pJavaInfoNode, reinterpret_cast<xmlChar const *>("autoSelect"),
- reinterpret_cast<xmlChar const *>(bAutoSelect == true ? "true" : "false"));
+ reinterpret_cast<xmlChar const *>(bAutoSelect ? "true" : "false"));
//Set xsi:nil in javaInfo element to false
//the xmlNs pointer must not be destroyed
@@ -977,7 +977,7 @@ void CNodeJavaInfo::writeToNode(xmlDoc* pDoc,
JavaInfo * CNodeJavaInfo::makeJavaInfo() const
{
- if (bNil == true || m_bEmptyNode == true)
+ if (bNil || m_bEmptyNode)
return NULL;
JavaInfo * pInfo = static_cast<JavaInfo*>(rtl_allocateMemory(sizeof(JavaInfo)));
if (pInfo == NULL)
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index e621e0e..ddfc4bf 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -276,8 +276,7 @@ javaFrameworkError SAL_CALL jfw_startVM(
//Check if the selected Java was set in this process. If so it
//must not have the requirments flag JFW_REQUIRE_NEEDRESTART
if ((aInfo->nRequirements & JFW_REQUIRE_NEEDRESTART)
- &&
- (jfw::wasJavaSelectedInSameProcess() == true))
+ && jfw::wasJavaSelectedInSameProcess())
return JFW_E_NEED_RESTART;
vmParams = settings.getVmParametersUtf8();
@@ -533,7 +532,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
jfw_freeJavaInfo(arInfos[j]);
rtl_freeMemory(arInfos);
- if (bInfoFound == true)
+ if (bInfoFound)
break;
//All Java installations found by the current plug-in lib
//do not provide the required features. Try the next plug-in
@@ -591,7 +590,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo)
}
}
}//end iterate over paths
- if (bInfoFound == true)
+ if (bInfoFound)
break;
}// end iterate plug-ins
}
@@ -837,7 +836,7 @@ javaFrameworkError SAL_CALL jfw_setEnabled(sal_Bool bEnabled)
if (jfw::getMode() == jfw::JFW_MODE_DIRECT)
return JFW_E_DIRECT_MODE;
- if (g_bEnabledSwitchedOn == false && bEnabled == sal_True)
+ if (!g_bEnabledSwitchedOn && bEnabled == sal_True)
{
//When the process started then Enabled was false.
//This is first time enabled is set to true.
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 871b96c..9c79344 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -418,7 +418,7 @@ JFW_MODE getMode()
static bool g_bMode = false;
static JFW_MODE g_mode = JFW_MODE_APPLICATION;
- if (g_bMode == false)
+ if (!g_bMode)
{
//check if either of the "direct mode" bootstrap variables is set
bool bDirectMode = true;
@@ -555,7 +555,7 @@ void setJavaSelected()
bool wasJavaSelectedInSameProcess()
{
//g_setJavaProcId not set means no Java selected
- if (g_bJavaSet == true)
+ if (g_bJavaSet)
return true;
return false;
}
commit d3273a06eb5aa7515e5e67ed399c3a699b555485
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:28:05 2015 +0200
More loplugin:simplifybool
Change-Id: I4749145f12a8f22bc8cd13722ad38096a2c4720e
diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx
index 52ec161..d91a081 100644
--- a/javaunohelper/source/javaunohelper.cxx
+++ b/javaunohelper/source/javaunohelper.cxx
@@ -128,7 +128,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
}
}
#endif
- return bRet == false? JNI_FALSE : JNI_TRUE;
+ return bRet ? JNI_TRUE : JNI_FALSE;
}
/*
commit b47ae9d0f65ff7c06cfa4366eb56ee12d1d6e82c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:28:01 2015 +0200
More loplugin:simplifybool
Change-Id: Iddfa035ac4b41d203ed6864f83dab69dcec33386
diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx
index 0db0e21..f4aad14 100644
--- a/idlc/source/options.cxx
+++ b/idlc/source/options.cxx
@@ -69,14 +69,14 @@ bool Options::checkArgument (std::vector< std::string > & rArgs, char const * ar
switch(arg[0])
{
case '@':
- if ((result = (len > 1)) == true)
+ if ((result = (len > 1)))
{
// "@<cmdfile>"
result = Options::checkCommandFile (rArgs, &(arg[1]));
}
break;
case '-':
- if ((result = (len > 1)) == true)
+ if ((result = (len > 1)))
{
// "-<option>"
switch (arg[1])
commit 70ae9dbda8117b6bcce4d7d0f8940f8b417cd403
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Apr 27 15:27:57 2015 +0200
More loplugin:simplifybool
Change-Id: I27dab9c717b0b4d38e1273006002ff595ddf4736
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index cc0afea..81ec2df 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -93,9 +93,9 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT( aLocale.Country.isEmpty() );
CPPUNIT_ASSERT( aLocale.Variant.isEmpty() );
CPPUNIT_ASSERT( LanguageTag::isOnTheFlyID( klingon.getLanguageType()) );
- CPPUNIT_ASSERT( klingon.isValidBcp47() == true );
- CPPUNIT_ASSERT( klingon.isIsoLocale() == true );
- CPPUNIT_ASSERT( klingon.isIsoODF() == true );
+ CPPUNIT_ASSERT( klingon.isValidBcp47() );
+ CPPUNIT_ASSERT( klingon.isIsoLocale() );
+ CPPUNIT_ASSERT( klingon.isIsoODF() );
LanguageType nLang = klingon.getLanguageType();
LanguageTag klingon_id( nLang);
CPPUNIT_ASSERT( klingon_id.getBcp47() == "tlh" );
@@ -123,9 +123,9 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT( aLocale.Country == "RS" );
CPPUNIT_ASSERT( aLocale.Variant.isEmpty() );
CPPUNIT_ASSERT( sr_RS.getLanguageType() == LANGUAGE_USER_SERBIAN_CYRILLIC_SERBIA );
- CPPUNIT_ASSERT( sr_RS.isValidBcp47() == true );
- CPPUNIT_ASSERT( sr_RS.isIsoLocale() == true );
- CPPUNIT_ASSERT( sr_RS.isIsoODF() == true );
+ CPPUNIT_ASSERT( sr_RS.isValidBcp47() );
+ CPPUNIT_ASSERT( sr_RS.isIsoLocale() );
+ CPPUNIT_ASSERT( sr_RS.isIsoODF() );
}
{
@@ -137,9 +137,9 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT( aLocale.Country == "RS" );
CPPUNIT_ASSERT( aLocale.Variant == s_sr_Latn_RS );
CPPUNIT_ASSERT( sr_RS.getLanguageType() == LANGUAGE_USER_SERBIAN_LATIN_SERBIA );
- CPPUNIT_ASSERT( sr_RS.isValidBcp47() == true );
- CPPUNIT_ASSERT( sr_RS.isIsoLocale() == false );
- CPPUNIT_ASSERT( sr_RS.isIsoODF() == true );
+ CPPUNIT_ASSERT( sr_RS.isValidBcp47() );
+ CPPUNIT_ASSERT( !sr_RS.isIsoLocale() );
+ CPPUNIT_ASSERT( sr_RS.isIsoODF() );
CPPUNIT_ASSERT( sr_RS.getLanguage() == "sr" );
CPPUNIT_ASSERT( sr_RS.getCountry() == "RS" );
CPPUNIT_ASSERT( sr_RS.getScript() == "Latn" );
@@ -155,9 +155,9 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT( aLocale.Country == "CS" );
CPPUNIT_ASSERT( aLocale.Variant == s_sr_Latn_CS );
CPPUNIT_ASSERT( sr_Latn_CS.getLanguageType() == LANGUAGE_SERBIAN_LATIN_SAM );
- CPPUNIT_ASSERT( sr_Latn_CS.isValidBcp47() == true );
- CPPUNIT_ASSERT( sr_Latn_CS.isIsoLocale() == false );
- CPPUNIT_ASSERT( sr_Latn_CS.isIsoODF() == true );
+ CPPUNIT_ASSERT( sr_Latn_CS.isValidBcp47() );
+ CPPUNIT_ASSERT( !sr_Latn_CS.isIsoLocale() );
+ CPPUNIT_ASSERT( sr_Latn_CS.isIsoODF() );
CPPUNIT_ASSERT( sr_Latn_CS.getLanguage() == "sr" );
CPPUNIT_ASSERT( sr_Latn_CS.getCountry() == "CS" );
CPPUNIT_ASSERT( sr_Latn_CS.getScript() == "Latn" );
@@ -186,9 +186,9 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT( aLocale.Country == "RS" );
CPPUNIT_ASSERT( aLocale.Variant == "sr-Latn-RS" );
CPPUNIT_ASSERT( sh_RS.getLanguageType() == LANGUAGE_USER_SERBIAN_LATIN_SERBIA );
- CPPUNIT_ASSERT( sh_RS.isValidBcp47() == true );
- CPPUNIT_ASSERT( sh_RS.isIsoLocale() == false );
- CPPUNIT_ASSERT( sh_RS.isIsoODF() == true );
+ CPPUNIT_ASSERT( sh_RS.isValidBcp47() );
+ CPPUNIT_ASSERT( !sh_RS.isIsoLocale() );
+ CPPUNIT_ASSERT( sh_RS.isIsoODF() );
CPPUNIT_ASSERT( sh_RS.getLanguage() == "sr" );
CPPUNIT_ASSERT( sh_RS.getCountry() == "RS" );
CPPUNIT_ASSERT( sh_RS.getScript() == "Latn" );
@@ -218,9 +218,9 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT( aLocale.Country == "BA" );
CPPUNIT_ASSERT( aLocale.Variant.isEmpty() );
CPPUNIT_ASSERT( bs_Latn_BA.getLanguageType() == LANGUAGE_BOSNIAN_LATIN_BOSNIA_HERZEGOVINA );
- CPPUNIT_ASSERT( bs_Latn_BA.isValidBcp47() == true );
- CPPUNIT_ASSERT( bs_Latn_BA.isIsoLocale() == true );
- CPPUNIT_ASSERT( bs_Latn_BA.isIsoODF() == true );
+ CPPUNIT_ASSERT( bs_Latn_BA.isValidBcp47() );
+ CPPUNIT_ASSERT( bs_Latn_BA.isIsoLocale() );
+ CPPUNIT_ASSERT( bs_Latn_BA.isIsoODF() );
CPPUNIT_ASSERT( bs_Latn_BA.getLanguage() == "bs" );
CPPUNIT_ASSERT( bs_Latn_BA.getCountry() == "BA" );
CPPUNIT_ASSERT( bs_Latn_BA.getScript().isEmpty() );
@@ -243,9 +243,9 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT( aLocale.Country == "ES" );
CPPUNIT_ASSERT( aLocale.Variant == s_ca_ES_valencia );
CPPUNIT_ASSERT( ca_ES_valencia.getLanguageType() == LANGUAGE_CATALAN_VALENCIAN );
- CPPUNIT_ASSERT( ca_ES_valencia.isValidBcp47() == true );
- CPPUNIT_ASSERT( ca_ES_valencia.isIsoLocale() == false );
- CPPUNIT_ASSERT( ca_ES_valencia.isIsoODF() == false );
+ CPPUNIT_ASSERT( ca_ES_valencia.isValidBcp47() );
+ CPPUNIT_ASSERT( !ca_ES_valencia.isIsoLocale() );
+ CPPUNIT_ASSERT( !ca_ES_valencia.isIsoODF() );
CPPUNIT_ASSERT( ca_ES_valencia.getLanguage() == "ca" );
CPPUNIT_ASSERT( ca_ES_valencia.getCountry() == "ES" );
CPPUNIT_ASSERT( ca_ES_valencia.getScript().isEmpty() );
@@ -269,9 +269,9 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT( aLocale.Country.isEmpty() );
CPPUNIT_ASSERT( aLocale.Variant == s_ca_valencia );
CPPUNIT_ASSERT( LanguageTag::isOnTheFlyID( ca_valencia.getLanguageType()) );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list