Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hello all,
The attached patch is to remove warning about "inefficient checking
for emptiness" from cppcheck.
Please feel free to comment.

Best Regards,
--
Korrawit Pruegsanusak
From e9d8c0fee442f0f6e7cafe06618a340d423ba170 Mon Sep 17 00:00:00 2001
From: Korrawit Pruegsanusak <detective.conan.1412@gmail.com>
Date: Sun, 29 May 2011 11:39:15 +0700
Subject: [PATCH] cppcheck cleanliness
 Remove: (performance) Possible inefficient checking for * emptiness.
 Released under LGPLv3+/MPL

---
 sc/source/ui/vba/vbawindow.cxx     |    2 +-
 sc/source/ui/vba/vbawindows.cxx    |    2 +-
 sc/source/ui/vba/vbaworksheets.cxx |    2 +-
 sc/source/ui/view/gridwin.cxx      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 1e04b50..da051e9 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -166,7 +166,7 @@ public:
 
     virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) 
     { 
-        return (sheets.size() > 0);
+        return ( !sheets.empty() );
     }
 
     //XNameAccess
diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx
index 6ff7bb1..b135895 100644
--- a/sc/source/ui/vba/vbawindows.cxx
+++ b/sc/source/ui/vba/vbawindows.cxx
@@ -178,7 +178,7 @@ public:
 
     virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException)
     {
-        return (m_windows.size() > 0);
+        return ( !m_windows.empty() );
     }
 
     //XNameAccess
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index 2fabece..cf6ffcf 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -115,7 +115,7 @@ public:
     SheetCollectionHelper( const SheetMap& sMap ) : mSheetMap( sMap ), cachePos(mSheetMap.begin()) 
{}
     // XElementAccess
     virtual uno::Type SAL_CALL getElementType(  ) throw (uno::RuntimeException) { return  
sheet::XSpreadsheet::static_type(0); }
-    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) { return ( 
mSheetMap.size() > 0 ); }
+    virtual ::sal_Bool SAL_CALL hasElements(  ) throw (uno::RuntimeException) { return ( 
!mSheetMap.empty() ); }
     // XNameAcess 
     virtual uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw 
(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
     {
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 08ccbfc..fb2506d 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5277,7 +5277,7 @@ void ScGridWindow::UpdateCursorOverlay()
         }
     }
 
-    if ( aPixelRects.size() )
+    if ( !aPixelRects.empty() )
     {
         // #i70788# get the OverlayManager safely
         ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager();
-- 
1.7.0.4


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.