diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 11:55:42 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-29 11:55:42 +0000 |
| commit | 7d696629991e7caefb873a6279e99037306a668e (patch) | |
| tree | 40c7249304473d28ed017d362b2d9f4290fcf6b7 /sc/source/ui/view/dbfunc3.cxx | |
| parent | 9722be9ebe493d6f8a67162b0b489b2a12942673 (diff) | |
INTEGRATION: CWS groupingapi (1.8.6); FILE MERGED
2005/03/11 18:47:23 sab 1.8.6.1: #i33817#; add Groupingapi
Diffstat (limited to 'sc/source/ui/view/dbfunc3.cxx')
| -rw-r--r-- | sc/source/ui/view/dbfunc3.cxx | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 894639218132..0785fc4d00a8 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbfunc3.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2004-08-03 12:46:58 $ + * last change: $Author: rt $ $Date: 2005-03-29 12:55:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,9 @@ #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp> #include <com/sun/star/sheet/MemberResultFlags.hpp> +#ifndef _COM_SUN_STAR_SHEET_DATAPILOTFIELDGROUPBY_HPP_ +#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp> +#endif #include "dbfunc.hxx" #include "global.hxx" @@ -827,7 +830,7 @@ BOOL ScDBFunc::HasSelectionForDateGroup( ScDPNumGroupInfo& rOldInfo, sal_Int32& // of days with a "Number of days" value. rOldInfo = pNumGroupDim->GetInfo(); - rParts = SC_DP_DATE_DAYS; // not found in CollectDateParts + rParts = com::sun::star::sheet::DataPilotFieldGroupBy::DAYS; // not found in CollectDateParts bFoundParts = TRUE; bFound = TRUE; } @@ -961,13 +964,13 @@ String lcl_GetDatePartName( sal_Int32 nPart ) switch (nPart) { //! use translated strings from globstr.src - case SC_DP_DATE_SECONDS: aRet = String::CreateFromAscii("Seconds"); break; - case SC_DP_DATE_MINUTES: aRet = String::CreateFromAscii("Minutes"); break; - case SC_DP_DATE_HOURS: aRet = String::CreateFromAscii("Hours"); break; - case SC_DP_DATE_DAYS: aRet = String::CreateFromAscii("Days"); break; - case SC_DP_DATE_MONTHS: aRet = String::CreateFromAscii("Months"); break; - case SC_DP_DATE_QUARTERS: aRet = String::CreateFromAscii("Quarters"); break; - case SC_DP_DATE_YEARS: aRet = String::CreateFromAscii("Years"); break; + case com::sun::star::sheet::DataPilotFieldGroupBy::SECONDS: aRet = String::CreateFromAscii("Seconds"); break; + case com::sun::star::sheet::DataPilotFieldGroupBy::MINUTES: aRet = String::CreateFromAscii("Minutes"); break; + case com::sun::star::sheet::DataPilotFieldGroupBy::HOURS: aRet = String::CreateFromAscii("Hours"); break; + case com::sun::star::sheet::DataPilotFieldGroupBy::DAYS: aRet = String::CreateFromAscii("Days"); break; + case com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS: aRet = String::CreateFromAscii("Months"); break; + case com::sun::star::sheet::DataPilotFieldGroupBy::QUARTERS: aRet = String::CreateFromAscii("Quarters"); break; + case com::sun::star::sheet::DataPilotFieldGroupBy::YEARS: aRet = String::CreateFromAscii("Years"); break; default: DBG_ERROR("invalid date part"); } @@ -1052,7 +1055,7 @@ void ScDBFunc::DateGroupDataPilot( const ScDPNumGroupInfo& rInfo, sal_Int32 nPar // innermost part: create NumGroupDimension (replacing original values) // Dimension name is left unchanged - if ( nParts == SC_DP_DATE_DAYS && rInfo.Step != 0.0 ) + if ( nParts == com::sun::star::sheet::DataPilotFieldGroupBy::DAYS && rInfo.Step != 0.0 ) { // only days, and a step value specified: use numerical grouping // with DateValues flag, not date grouping |