fdo#69984: Handle duplicate field names correctly.

Duplicate field names are represented in two ways: 1) 'Name' vs 'Name*' in
the UNO part of the pivot engine, and 2) Name,0 vs Name,1 which are a pair
of textural name and a numeric duplicate index in the non-UNO part of the
engine.  But some parts lost this duplicate index information and/or confused
the 2 ways of representation.  Hopefully this change will sort things out.

Change-Id: I03ae7b6c011c31ace454679837542d6d0909ecaa

1 files changed, 5 insertions, 2 deletions

diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 6c9b03e5742b..cd74a996e55f 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -51,12 +51,14 @@
 #include <com/sun/star/sheet/DataPilotFieldLayoutInfo.hpp>
 #include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp>
 
-struct ScDPName
+struct SC_DLLPUBLIC ScDPName
 {
     OUString     maName;         ///< Original name of the dimension.
     OUString     maLayoutName;   ///< Layout name (display name)
+    sal_uInt8 mnDupCount;
 
-    explicit ScDPName(const OUString& rName, const OUString& rLayoutName);
+    ScDPName();
+    explicit ScDPName(const OUString& rName, const OUString& rLayoutName, sal_uInt8 nDupCount);
 };
 
 struct ScDPLabelData
@@ -69,6 +71,7 @@ struct ScDPLabelData
     sal_uInt16          mnFuncMask;     ///< Page/Column/Row subtotal function.
     sal_Int32           mnUsedHier;     ///< Used hierarchy.
     sal_Int32           mnFlags;        ///< Flags from the DataPilotSource dimension
+    sal_uInt8           mnDupCount;
     bool                mbShowAll:1;    ///< true = Show all (also empty) results.
     bool                mbIsValue:1;    ///< true = Sum or count in data field.
     bool                mbDataLayout:1;