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

[Kohei Yoshida]

 sc/source/ui/dbgui/fieldwnd.cxx |    1 +
 sc/source/ui/dbgui/pvlaydlg.cxx |    6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit caab2dc5df4938d37a28be1aeffe194a5a595b9d
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Nov 19 00:01:58 2010 -0500

    Now the select field control shows two columns of field buttons.

diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index 04c25ce..4ebc44a 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -1686,4 +1686,5 @@ IMPL_LINK(ScDPDataFieldControl, EndScrollHdl, ScrollBar*, EMPTYARG)
     HandleScroll();
     return 0;
 }
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index a0f84ca..1873ef5 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -384,7 +384,6 @@ void ScDPLayoutDlg::StateChanged( StateChangedType nStateChange )
 
 void ScDPLayoutDlg::InitWndSelect( const vector<ScDPLabelDataRef>& rLabels )
 {
-    StackPrinter __stack_printer__("ScDPLayoutDlg::InitWndSelect");
     size_t nLabelCount = rLabels.size();
     if (nLabelCount > MAX_LABELS)
         nLabelCount = MAX_LABELS;
@@ -393,13 +392,12 @@ void ScDPLayoutDlg::InitWndSelect( const vector<ScDPLabelDataRef>& rLabels )
     aLabelDataArr.reserve( nLabelCount );
     for ( size_t i=0; i < nLabelCount; i++ )
     {
-        fprintf(stdout, "ScDPLayoutDlg::InitWndSelect:   label data = %s\n",
-                rtl::OUStringToOString(rLabels[i]->getDisplayName(), RTL_TEXTENCODING_UTF8).getStr());
         aLabelDataArr.push_back(*rLabels[i]);
         aWndSelect.AddField(aLabelDataArr[i].getDisplayName(), i);
         ScDPFuncDataRef p(new ScDPFuncData(aLabelDataArr[i].mnCol, aLabelDataArr[i].mnFuncMask));
         aSelectArr.push_back(p);
     }
+    aWndSelect.ResetScrollBar();
 }
 
 //----------------------------------------------------------------------------
@@ -1351,7 +1349,7 @@ void ScDPLayoutDlg::CalcWndSizes()
 
     // selection area
     aWndSelect.SetSizePixel(
-        Size(2 * nFldW + ROW_FIELD_BTN_GAP,
+        Size(2 * nFldW + ROW_FIELD_BTN_GAP + 10,
              LINE_SIZE * nFldH + (LINE_SIZE - 1) * ROW_FIELD_BTN_GAP));
 
     aRectPage   = Rectangle( aWndPage.GetPosPixel(),    aWndPage.GetSizePixel() );