[Libreoffice-commits] .: Branch 'feature/calc-dp-unlimited-fields' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/sc.hrc                   |    1 +
 sc/source/ui/dbgui/fieldwnd.cxx |   15 +++++++++++++++
 sc/source/ui/inc/fieldwnd.hxx   |    3 +++
 sc/source/ui/src/scstring.src   |    5 +++++
 4 files changed, 24 insertions(+)

New commits:
commit d28be24997af545a56180d9a7d0ce3d57009a9ff
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Dec 15 22:26:33 2010 -0500

    Give each field control a proper description.
    
    Incidentally, the page field was missing a description.  Added one.

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 1d7d59d..d684d05 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1316,6 +1316,7 @@
 #define STR_ACC_DATAPILOT_COL_DESCR (STR_START + 179)
 #define STR_ACC_DATAPILOT_DATA_DESCR (STR_START + 180)
 #define STR_ACC_DATAPILOT_SEL_DESCR (STR_START + 181)
+#define STR_ACC_DATAPILOT_PAGE_DESCR (STR_START + 182)
 
 // --------------------------------------------------
 
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index c0a0998..26f6faf 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -977,6 +977,11 @@ ScDPFieldType ScDPPageFieldControl::GetFieldType() const
     return TYPE_PAGE;
 }
 
+String ScDPPageFieldControl::GetDescription() const
+{
+    return ScResId(STR_ACC_DATAPILOT_PAGE_DESCR);
+}
+
 //=============================================================================
 
 ScDPColFieldControl::ScDPColFieldControl(
@@ -994,6 +999,11 @@ ScDPFieldType ScDPColFieldControl::GetFieldType() const
     return TYPE_COL;
 }
 
+String ScDPColFieldControl::GetDescription() const
+{
+    return ScResId(STR_ACC_DATAPILOT_COL_DESCR);
+}
+
 //=============================================================================
 
 ScDPRowFieldControl::ScDPRowFieldControl(
@@ -1244,6 +1254,11 @@ ScDPFieldType ScDPSelectFieldControl::GetFieldType() const
     return TYPE_SELECT;
 }
 
+String ScDPSelectFieldControl::GetDescription() const
+{
+    return ScResId(STR_ACC_DATAPILOT_SEL_DESCR);
+}
+
 //=============================================================================
 
 ScDPDataFieldControl::ScDPDataFieldControl(
diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx
index bf707ad..7835855 100644
--- a/sc/source/ui/inc/fieldwnd.hxx
+++ b/sc/source/ui/inc/fieldwnd.hxx
@@ -302,6 +302,7 @@ public:
     virtual ~ScDPPageFieldControl();
 
     virtual ScDPFieldType GetFieldType() const;
+    virtual String GetDescription() const;
 };
 
 // ============================================================================
@@ -314,6 +315,7 @@ public:
     virtual ~ScDPColFieldControl();
 
     virtual ScDPFieldType GetFieldType() const;
+    virtual String GetDescription() const;
 };
 
 // ============================================================================
@@ -370,6 +372,7 @@ public:
     virtual ~ScDPSelectFieldControl();
 
     virtual ScDPFieldType GetFieldType() const;
+    virtual String GetDescription() const;
 };
 
 // ============================================================================
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index c39a183..92ced8a 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -796,6 +796,11 @@ String STR_ACC_DATAPILOT_SEL_DESCR
     Text [ en-US ] = "Lists the fields that you can drag to one of the other three areas.";
 };
 
+String STR_ACC_DATAPILOT_PAGE_DESCR
+{
+    Text [ en-US ] = "Fields that you drop here will be available as filter lists at the top of the final DataPilot table.";
+};
+
 String SCSTR_MEDIASHELL
 {
     Text [ en-US ] = "Media Playback";