[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Kohei Yoshida]

 sc/source/ui/dbgui/pvfundlg.cxx |    5 +++--
 sc/source/ui/dbgui/pvfundlg.src |    5 +++--
 sc/source/ui/inc/pvfundlg.hxx   |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 053832f8dc453b408d33028e58b7357b29041ae3
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Mon Jul 2 16:42:29 2012 -0400

    fdo#51222: Use multi-list box for subtotal dialog.
    
    Change-Id: I22cb3b66d0c4a93cbcba05bb5990080e5ee57a2e

diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 51b8c8b..6d23793 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -166,7 +166,7 @@ static const ScDPListBoxWrapper::MapEntryType spShowFromMap[] =
 // ============================================================================
 
 ScDPFunctionListBox::ScDPFunctionListBox( Window* pParent, const ResId& rResId ) :
-    ListBox( pParent, rResId )
+    MultiListBox( pParent, rResId )
 {
     FillFunctionNames();
 }
@@ -190,7 +190,7 @@ sal_uInt16 ScDPFunctionListBox::GetSelection() const
 
 void ScDPFunctionListBox::FillFunctionNames()
 {
-    OSL_ENSURE( !GetEntryCount(), "ScDPFunctionListBox::FillFunctionNames - do not add texts to resource" );
+    OSL_ENSURE( !GetEntryCount(), "ScDPMultiFuncListBox::FillFunctionNames - do not add texts to resource" );
     Clear();
     ResStringArray aArr( ScResId( SCSTR_DPFUNCLISTBOX ) );
     for( sal_uInt16 nIndex = 0, nCount = sal::static_int_cast<sal_uInt16>(aArr.Count()); nIndex < nCount; ++nIndex )
@@ -224,6 +224,7 @@ ScDPFunctionDlg::ScDPFunctionDlg(
 {
     FreeResource();
     Init( rLabelData, rFuncData );
+    maLbFunc.EnableMultiSelection(false);
 }
 
 sal_uInt16 ScDPFunctionDlg::GetFuncMask() const
diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src
index a5982ae..d5203f2 100644
--- a/sc/source/ui/dbgui/pvfundlg.src
+++ b/sc/source/ui/dbgui/pvfundlg.src
@@ -62,14 +62,15 @@ ModalDialog RID_SCDLG_DPDATAFIELD
         Size = MAP_APPFONT ( 152 , 8 ) ;
         Text [ en-US ] = "~Function" ;
     };
-    ListBox LB_FUNC
+    MultiListBox LB_FUNC
     {
-        HelpID = "sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_FUNC";
+        HelpID = "sc:MultiListBox:RID_SCDLG_DPDATAFIELD:LB_FUNC";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 140 , 65 ) ;
         TabStop = TRUE ;
         AutoHScroll = TRUE ;
+        SimpleMode = TRUE ;
     };
     FixedText FT_NAMELABEL
     {
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index 76c6049..00189ab 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -53,7 +53,7 @@ class ScDPObject;
 
 // ============================================================================
 
-class ScDPFunctionListBox : public ListBox
+class ScDPFunctionListBox : public MultiListBox
 {
 public:
     explicit            ScDPFunctionListBox( Window* pParent, const ResId& rResId );