[Libreoffice-commits] .: sc/inc sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Sep 18 14:01:07 PDT 2012


 sc/inc/dpcachetable.hxx              |    8 --------
 sc/source/core/data/dpcachetable.cxx |   11 -----------
 sc/source/core/data/dpitemdata.cxx   |    2 +-
 3 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit c72af8739d57035b9cd0771941939bd77813348e
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Tue Sep 18 15:53:21 2012 -0400

    Some cleanups.
    
    Change-Id: I8812c9928409bcdb78dac1479c5e2205f2616965

diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx
index c0d0625..c55ec26 100644
--- a/sc/inc/dpcachetable.hxx
+++ b/sc/inc/dpcachetable.hxx
@@ -55,15 +55,7 @@ struct ScQueryParam;
  */
 class SC_DLLPUBLIC ScDPCacheTable
 {
-    struct RowFlag
-    {
-        bool mbShowByFilter:1;
-        bool mbShowByPage:1;
-        bool isActive() const;
-        RowFlag();
-    };
 public:
-
     /** interface class used for filtering of rows. */
     class FilterBase
     {
diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxx
index 11ac85f..14f4e8e 100644
--- a/sc/source/core/data/dpcachetable.cxx
+++ b/sc/source/core/data/dpcachetable.cxx
@@ -64,17 +64,6 @@ using ::com::sun::star::uno::UNO_QUERY;
 using ::com::sun::star::uno::UNO_QUERY_THROW;
 using ::com::sun::star::sheet::DataPilotFieldFilter;
 
-bool ScDPCacheTable::RowFlag::isActive() const
-{
-    return mbShowByFilter && mbShowByPage;
-}
-
-ScDPCacheTable::RowFlag::RowFlag() :
-    mbShowByFilter(false),
-    mbShowByPage(true)
-{
-}
-
 ScDPCacheTable::SingleFilter::SingleFilter(const ScDPItemData& rItem) :
     maItem(rItem) {}
 
diff --git a/sc/source/core/data/dpitemdata.cxx b/sc/source/core/data/dpitemdata.cxx
index bb22894..c3a163c 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -210,7 +210,7 @@ bool ScDPItemData::IsCaseInsEqual(const ScDPItemData& r) const
             ;
     }
 
-    if (mbStringInterned && r.mbStringInterned && mpString == r.mpString)
+    if (mpString == r.mpString)
         // Fast equality check for interned strings.
         return true;
 


More information about the Libreoffice-commits mailing list