Date field is now determined outside of ScDPItemData.

sc/inc/dpitemdata.hxx

@@ -84,8 +84,6 @@ public:
     const rtl::OUString& GetString() const;
     double GetValue() const ;
     bool HasStringData() const ;
-    bool IsDate() const;
-    void SetDate( bool b ) ;
 
     sal_uInt8 GetType() const;
 };

sc/source/core/data/dpitemdata.cxx

@@ -94,9 +94,7 @@ bool ScDPItemData::operator==( const ScDPItemData& r ) const
 {
     if ( IsValue() )
     {
-        if ( IsDate() != r.IsDate() )
-            return false;
-        else if ( r.IsValue() )
+        if ( r.IsValue() )
             return rtl::math::approxEqual( mfValue, r.mfValue );
         else
             return false;
@@ -114,19 +112,7 @@ sal_Int32 ScDPItemData::Compare( const ScDPItemData& rA,
     if ( rA.IsValue() )
     {
         if ( rB.IsValue() )
-        {
-            if ( rtl::math::approxEqual( rA.mfValue, rB.mfValue ) )
-            {
-                if ( rA.IsDate() == rB.IsDate() )
-                    return 0;
-                else
-                    return rA.IsDate() ? 1: -1;
-            }
-            else if ( rA.mfValue < rB.mfValue )
-                return -1;
-            else
-                return 1;
-        }
+            return rA.mfValue < rB.mfValue ? -1 : 1;
         else
             return -1;           // values first
     }
@@ -178,17 +164,6 @@ bool ScDPItemData::HasStringData() const
     return IsHasData()&&!IsHasErr()&&!IsValue();
 }
 
-bool ScDPItemData::IsDate() const
-{
-    return !!(mbFlag&MK_DATE);
-}
-
-void ScDPItemData::SetDate( bool b )
-{
-    b ? ( mbFlag |= MK_DATE ) : ( mbFlag &= ~MK_DATE );
-}
-
-
 ScDPItemDataPool::ScDPItemDataPool()
 {
 }

sc/source/core/data/dptablecache.cxx

@@ -790,11 +790,16 @@ bool ScDPCache::IsDateDimension( long nDim ) const
     if (nDim >= mnColumnCount)
         return false;
 
-    const DataListType& rItems = maFields[nDim].maItems;
-    if (rItems.empty())
+    SvNumberFormatter* pFormatter = mpDoc->GetFormatTable();
+    if (!pFormatter)
+        return false;
+
+    const std::vector<sal_uLong>& rNumFormats = maFields[nDim].maNumFormats;
+    if (rNumFormats.empty())
         return false;
 
-    return rItems[0].IsDate();
+    short eType = pFormatter->GetType(rNumFormats[0]);
+    return (eType == NUMBERFORMAT_DATE) || (eType == NUMBERFORMAT_DATETIME);
 }
 
 SCROW ScDPCache::GetDimMemberCount( SCCOL nDim ) const