Consolidate all these duplicated defined uno prop names for pivot table.

They will be later merged into unonames.hxx.

3 files changed, 1 insertions, 44 deletions

diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx
index 3619f03dfcb3..5d3b5d6d345a 100644
--- a/sc/inc/dpglobal.hxx
+++ b/sc/inc/dpglobal.hxx
@@ -91,6 +91,7 @@
 #define DP_PROP_USEDHIERARCHY       "UsedHierarchy"
 #define DP_PROP_FILTER              "Filter"
 #define DP_PROP_POSITION            "Position"
+#define DP_PROP_ORIGINAL            "Original"
 
 class ScTypedStrData;
 class ScDPObject;
@@ -177,7 +178,6 @@ protected:
 namespace ScDPGlobal
 {
 // common operation
-    String operator + ( const String & rL, const String &rR );
     Rectangle operator *( const Rectangle &rLeft, const std::pair<double,double> & rRight );
 }
 #endif
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 234a2af515b2..1dec7be77db2 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -109,35 +109,6 @@ using ::rtl::OUString;
 
 #define SCDPSOURCE_SERVICE  "com.sun.star.sheet.DataPilotSource"
 
-// -----------------------------------------------------------------------
-
-// incompatible versions of data pilot files
-#define SC_DP_VERSION_CURRENT   6
-
-// type of source data
-#define SC_DP_SOURCE_SHEET      0
-#define SC_DP_SOURCE_DATABASE   1
-#define SC_DP_SOURCE_SERVICE    2
-
-// -----------------------------------------------------------------------
-
-//! move to a header file
-#define DP_PROP_COLUMNGRAND         "ColumnGrand"
-#define DP_PROP_FUNCTION            "Function"
-#define DP_PROP_IGNOREEMPTY         "IgnoreEmptyRows"
-#define DP_PROP_ISDATALAYOUT        "IsDataLayoutDimension"
-#define DP_PROP_ORIENTATION         "Orientation"
-#define DP_PROP_ORIGINAL            "Original"
-#define DP_PROP_POSITION            "Position"
-#define DP_PROP_REPEATIFEMPTY       "RepeatIfEmpty"
-#define DP_PROP_ROWGRAND            "RowGrand"
-#define DP_PROP_SHOWDETAILS         "ShowDetails"
-#define DP_PROP_SHOWEMPTY           "ShowEmpty"
-#define DP_PROP_SUBTOTALS           "SubTotals"
-#define DP_PROP_USEDHIERARCHY       "UsedHierarchy"
-
-// -----------------------------------------------------------------------
-
 sal_uInt16 lcl_GetDataGetOrientation( const uno::Reference<sheet::XDimensionsSupplier>& xSource )
 {
     long nRet = sheet::DataPilotFieldOrientation_HIDDEN;
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index e43d70632ad0..3264b28ce0db 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -72,20 +72,6 @@ using ::com::sun::star::uno::makeAny;
 using ::com::sun::star::uno::Any;
 using ::rtl::OUString;
 
-// -----------------------------------------------------------------------
-
-//! move to a header file
-//! use names from unonames.hxx?
-#define DP_PROP_FUNCTION            "Function"
-#define DP_PROP_ORIENTATION         "Orientation"
-#define DP_PROP_POSITION            "Position"
-#define DP_PROP_USEDHIERARCHY       "UsedHierarchy"
-#define DP_PROP_ISDATALAYOUT        "IsDataLayoutDimension"
-#define DP_PROP_FILTER              "Filter"
-#define DP_PROP_COLUMNGRAND         "ColumnGrand"
-#define DP_PROP_ROWGRAND            "RowGrand"
-#define DP_PROP_SUBTOTALS           "SubTotals"
-
 #define SC_DP_FRAME_INNER_BOLD      20
 #define SC_DP_FRAME_OUTER_BOLD      40