Pivot table related uno names to have SC_UNO_DP prefix.

1 files changed, 41 insertions, 42 deletions

diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index 58ed8548bdba..c6e7d78c6a91 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -562,52 +562,51 @@
 #define OLD_UNO_VERTSCROLL          "VerticalScrollBar"
 
 //  data pilot source
-#define SC_UNO_COLGRAND             "ColumnGrand"
-#define SC_UNO_ROWGRAND             "RowGrand"
-#define SC_UNO_ORIGINAL             "Original"
-#define SC_UNO_ISDATALA             "IsDataLayoutDimension"
-#define SC_UNO_ORIENTAT             "Orientation"
-#define SC_UNO_POSITION             "Position"
-#define SC_UNO_FUNCTION             "Function"
-#define SC_UNO_USEDHIER             "UsedHierarchy"
-#define SC_UNO_FILTER               "Filter"
-#define SC_UNO_SUBTOTAL             "SubTotals"
-#define SC_UNO_SHOWEMPT             "ShowEmpty"
-#define SC_UNO_ISVISIBL             "IsVisible"
-#define SC_UNO_SHOWDETA             "ShowDetails"
-#define SC_UNO_IGNOREEM             "IgnoreEmptyRows"
-#define SC_UNO_REPEATIF             "RepeatIfEmpty"
-#define SC_UNO_DATADESC             "DataDescription"
-#define SC_UNO_NUMBERFO             "NumberFormat"
-#define SC_UNO_ROWFIELDCOUNT        "RowFieldCount"
-#define SC_UNO_COLUMNFIELDCOUNT     "ColumnFieldCount"
-#define SC_UNO_DATAFIELDCOUNT       "DataFieldCount"
-#define SC_UNO_LAYOUTNAME           "LayoutName"
-#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"
-#define SC_UNO_SORTING              "Sorting"
-#define SC_UNO_AUTOSHOW             "AutoShow"
-#define SC_UNO_LAYOUT               "Layout"
+#define SC_UNO_DP_COLGRAND             "ColumnGrand"
+#define SC_UNO_DP_ROWGRAND             "RowGrand"
+#define SC_UNO_DP_ORIGINAL             "Original"
+#define SC_UNO_DP_ISDATALA             "IsDataLayoutDimension"
+#define SC_UNO_DP_ORIENTAT             "Orientation"
+#define SC_UNO_DP_POSITION             "Position"
+#define SC_UNO_DP_FUNCTION             "Function"
+#define SC_UNO_DP_USEDHIER             "UsedHierarchy"
+#define SC_UNO_DP_FILTER               "Filter"
+#define SC_UNO_DP_SUBTOTAL             "SubTotals"
+#define SC_UNO_DP_SHOWEMPT             "ShowEmpty"
+#define SC_UNO_DP_ISVISIBL             "IsVisible"
+#define SC_UNO_DP_SHOWDETA             "ShowDetails"
+#define SC_UNO_DP_IGNOREEM             "IgnoreEmptyRows"
+#define SC_UNO_DP_REPEATIF             "RepeatIfEmpty"
+#define SC_UNO_DP_DATADESC             "DataDescription"
+#define SC_UNO_DP_NUMBERFO             SC_UNONAME_NUMFMT
+#define SC_UNO_DP_ROWFIELDCOUNT        "RowFieldCount"
+#define SC_UNO_DP_COLUMNFIELDCOUNT     "ColumnFieldCount"
+#define SC_UNO_DP_DATAFIELDCOUNT       "DataFieldCount"
+#define SC_UNO_DP_LAYOUTNAME           "LayoutName"
+#define SC_UNO_DP_FIELD_SUBTOTALNAME   "FieldSubtotalName"
+#define SC_UNO_DP_GRANDTOTAL_NAME      "GrandTotalName"
+#define SC_UNO_DP_HAS_HIDDEN_MEMBER    "HasHiddenMember"
+#define SC_UNO_DP_FLAGS                "Flags"
+
+#define SC_UNO_DP_REFVALUE             "ReferenceValue"
+#define SC_UNO_DP_SORTING              "Sorting"
+#define SC_UNO_DP_AUTOSHOW             "AutoShow"
+#define SC_UNO_DP_LAYOUT               "Layout"
 
 // data pilot descriptor
-#define SC_UNO_IGNEMPROWS           "IgnoreEmptyRows"
-#define SC_UNO_RPTEMPTY             "RepeatIfEmpty"
-#define SC_UNO_DRILLDOWN            "DrillDownOnDoubleClick"
-#define SC_UNO_SHOWFILT             "ShowFilterButton"
-#define SC_UNO_IMPORTDESC           "ImportDescriptor"
-#define SC_UNO_SOURCESERV           "SourceServiceName"
-#define SC_UNO_SERVICEARG           "ServiceArguments"
+#define SC_UNO_DP_IGNEMPROWS           "IgnoreEmptyRows"
+#define SC_UNO_DP_RPTEMPTY             "RepeatIfEmpty"
+#define SC_UNO_DP_DRILLDOWN            "DrillDownOnDoubleClick"
+#define SC_UNO_DP_SHOWFILT             "ShowFilterButton"
+#define SC_UNO_DP_IMPORTDESC           "ImportDescriptor"
+#define SC_UNO_DP_SOURCESERV           "SourceServiceName"
+#define SC_UNO_DP_SERVICEARG           "ServiceArguments"
 
 // properties in data pilot descriptor ServiceArguments
-#define SC_UNO_SOURCENAME           "SourceName"
-#define SC_UNO_OBJECTNAME           "ObjectName"
-#define SC_UNO_USERNAME             "UserName"
-#define SC_UNO_PASSWORD             "Password"
+#define SC_UNO_DP_SOURCENAME           "SourceName"
+#define SC_UNO_DP_OBJECTNAME           "ObjectName"
+#define SC_UNO_DP_USERNAME             "UserName"
+#define SC_UNO_DP_PASSWORD             "Password"
 
 //  range selection
 #define SC_UNONAME_INITVAL          "InitialValue"