diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-10-06 13:31:28 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-10-06 13:31:28 +0200 |
| commit | 227b28d8f597a6a275b7497134b39430e387b621 (patch) | |
| tree | 51ea070da1462fc48e05bc512ef8de1fc1eac4bd /sc/inc | |
| parent | d804b40cdfaf0d5d705176bfbc92d96c85ad28e6 (diff) | |
| parent | c548b0b0b38ad2b1a7184a4ffc97ca26958b0389 (diff) | |
Merge commit 'ooo/OOO330_m9'
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/ViewSettingsSequenceDefines.hxx | 2 | ||||
| -rw-r--r-- | sc/inc/dpobject.hxx | 4 | ||||
| -rw-r--r-- | sc/inc/dpsave.hxx | 1 | ||||
| -rw-r--r-- | sc/inc/pivot.hxx | 1 | ||||
| -rw-r--r-- | sc/inc/unonames.hxx | 1 |
5 files changed, 7 insertions, 2 deletions
diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxx index a8086fbdbe40..7437ba698f8a 100644 --- a/sc/inc/ViewSettingsSequenceDefines.hxx +++ b/sc/inc/ViewSettingsSequenceDefines.hxx @@ -104,6 +104,6 @@ #define SC_PAGEVIEWZOOMVALUE "PageViewZoomValue" #define SC_SHOWPAGEBREAKPREVIEW "ShowPageBreakPreview" #define SC_VIEWID "ViewId" -#define SC_VIEW "View" +#define SC_VIEW "view" #endif diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 44aa1daa9a92..e1b88919dad6 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -186,7 +186,7 @@ public: bool IsDataDescriptionCell(const ScAddress& rPos); bool IsDimNameInUse(const ::rtl::OUString& rName) const; - String GetDimName( long nDim, BOOL& rIsDataLayout ); + String GetDimName( long nDim, BOOL& rIsDataLayout, sal_Int32* pFlags = NULL ); BOOL IsDuplicated( long nDim ); long GetDimCount(); void GetHeaderPositionData(const ScAddress& rPos, ::com::sun::star::sheet::DataPilotTableHeaderData& rData); @@ -259,6 +259,8 @@ public: PivotField* pRefColFields = NULL, SCSIZE nRefColCount = 0, PivotField* pRefRowFields = NULL, SCSIZE nRefRowCount = 0, PivotField* pRefPageFields = NULL, SCSIZE nRefPageCount = 0 ); + + static bool IsOrientationAllowed( USHORT nOrient, sal_Int32 nDimFlags ); }; diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index bfff0b97a168..8272b850b27e 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -140,6 +140,7 @@ public: void SetSubTotals(long nCount, const USHORT* pFuncs); long GetSubTotalsCount() const { return nSubTotalCount; } USHORT GetSubTotalFunc(long nIndex) const { return pSubTotalFuncs[nIndex]; } + bool HasShowEmpty() const; void SetShowEmpty(BOOL bSet); BOOL GetShowEmpty() const { return BOOL(nShowEmptyMode); } void SetFunction(USHORT nNew); // enum GeneralFunction diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index 23fc41311fd4..3a0a776205c8 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -150,6 +150,7 @@ struct ScDPLabelData SCsCOL mnCol; USHORT mnFuncMask; /// Page/Column/Row subtotal function. sal_Int32 mnUsedHier; /// Used hierarchy. + sal_Int32 mnFlags; /// Flags from the DataPilotSource dimension bool mbShowAll; /// true = Show all (also empty) results. bool mbIsValue; /// true = Sum or count in data field. diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx index f06662846158..f66f6c8cf6eb 100644 --- a/sc/inc/unonames.hxx +++ b/sc/inc/unonames.hxx @@ -568,6 +568,7 @@ #define SC_UNO_FIELD_SUBTOTALNAME "FieldSubtotalName" #define SC_UNO_GRANDTOTAL_NAME "GrandTotalName" #define SC_UNO_HAS_HIDDEN_MEMBER "HasHiddenMember" +#define SC_UNO_FLAGS "Flags" // (preliminary:) #define SC_UNO_REFVALUE "ReferenceValue" |