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

[Kohei Yoshida]

 sc/source/ui/dbgui/pivot.hrc    |    3 ---
 sc/source/ui/dbgui/pivot.src    |    9 +--------
 sc/source/ui/dbgui/pvlaydlg.cxx |    2 --
 sc/source/ui/inc/pvlaydlg.hxx   |    2 +-
 4 files changed, 2 insertions(+), 14 deletions(-)

New commits:
commit 4b5c4e2d3a926ea18b943199252d6d983c179361
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Dec 15 14:17:50 2010 -0500

    Clean up.

diff --git a/sc/source/ui/dbgui/pivot.hrc b/sc/source/ui/dbgui/pivot.hrc
index 9942cfa..e4207e8 100644
--- a/sc/source/ui/dbgui/pivot.hrc
+++ b/sc/source/ui/dbgui/pivot.hrc
@@ -38,9 +38,6 @@
 #define WND_ROW                 12
 #define WND_DATA                13
 #define WND_SELECT              14
-//#define WND_FIELD               15
-//#define WND_FIELD_SPACE         16
-#define WND_HSCROLL             17
 #define WND_PAGE                18
 #define FT_COL                  31
 #define FT_ROW                  32
diff --git a/sc/source/ui/dbgui/pivot.src b/sc/source/ui/dbgui/pivot.src
index 1aaf937..fc70df9 100644
--- a/sc/source/ui/dbgui/pivot.src
+++ b/sc/source/ui/dbgui/pivot.src
@@ -89,20 +89,13 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
     Control WND_SELECT
     {
         Pos = MAP_APPFONT ( 210 , 14 ) ;
-        Size = MAP_APPFONT ( 70 , 126 ) ;
+        Size = MAP_APPFONT ( 70 , 136 ) ;
         TabStop = TRUE ;
     };
     String STR_SELECT
     {
         Text [ en-US ] = "Selection area";
     };
-    ScrollBar WND_HSCROLL
-    {
-        Pos = MAP_APPFONT ( 208 , 144 ) ;
-        Size = MAP_APPFONT ( 70 , 8 ) ;
-        HScroll = TRUE ;
-        TabStop = FALSE ;
-    };
     FixedText FT_INFO
     {
         Pos = MAP_APPFONT ( 6 , 200 ) ;
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index b5db6a7..1b2d4e5 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -1460,8 +1460,6 @@ void ScDPLayoutDlg::UpdateSrcRange()
     aWndPage.ClearFields();
 
     aSelectArr.clear();
-    aSelectArr.resize(PAGE_SIZE);
-
     aRowArr.clear();
     aColArr.clear();
     aDataArr.clear();
diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx
index 01b4fe9..98c3ba1 100644
--- a/sc/source/ui/inc/pvlaydlg.hxx
+++ b/sc/source/ui/inc/pvlaydlg.hxx
@@ -166,7 +166,7 @@ private:
     ScDPFieldType           eLastActiveType;        /// Type of last active area.
     size_t                  nOffset;                /// Offset of first field in TYPE_SELECT area.
 
-    ScDPFuncDataVec         aSelectArr;  // holds instances for visible buttons only
+    ScDPFuncDataVec         aSelectArr;
     ScDPFuncDataVec         aPageArr;
     ScDPFuncDataVec         aColArr;
     ScDPFuncDataVec         aRowArr;