[Libreoffice-commits] core.git: basctl/source cui/source include/svtools sfx2/source svtools/source

[Stephan Bergmann]

 basctl/source/basicide/bastype2.cxx   |    2 +-
 basctl/source/basicide/bastype2.hxx   |    2 +-
 cui/source/dialogs/scriptdlg.cxx      |    4 ++--
 cui/source/inc/scriptdlg.hxx          |    2 +-
 include/svtools/treelistbox.hxx       |    2 +-
 sfx2/source/dialog/templdlg.cxx       |    6 +++---
 svtools/source/contnr/treelistbox.cxx |    4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 01f3186c4b8357e7a3784e0249aaee1af381f609
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jan 13 18:07:49 2014 +0100

    SvTreeListBox::ExpandingHdl should return bool
    
    Change-Id: I39a854910299ab2e7c64beabda381bb9f0bd2891

diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index b353853..c899447 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -700,7 +700,7 @@ SvTreeListEntry* TreeListBox::FindEntry( SvTreeListEntry* pParent, const OUStrin
     return 0;
 }
 
-long TreeListBox::ExpandingHdl()
+bool TreeListBox::ExpandingHdl()
 {
     // expanding or collapsing?
     bool bOK = true;
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index 90cc273..bc7d669 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -185,7 +185,7 @@ protected:
     virtual void            RequestingChildren( SvTreeListEntry* pParent );
     virtual void            ExpandedHdl();
     virtual SvTreeListEntry*    CloneEntry( SvTreeListEntry* pSource );
-    virtual long            ExpandingHdl();
+    virtual bool            ExpandingHdl();
 
     void                    ImpCreateLibEntries( SvTreeListEntry* pShellRootEntry, const ScriptDocument& rDocument, LibraryLocation eLocation );
     void                    ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName );
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 6339593..b47fa2e 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -340,9 +340,9 @@ void SFTreeListBox:: RequestSubEntries( SvTreeListEntry* pRootEntry, Reference<
     }
 }
 
-long SFTreeListBox::ExpandingHdl()
+bool SFTreeListBox::ExpandingHdl()
 {
-    return sal_True;
+    return true;
 }
 
 void SFTreeListBox::ExpandAllTrees()
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index bbf35c0..394462f 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -73,7 +73,7 @@ protected:
     void                    ExpandTree( SvTreeListEntry* pRootEntry );
     virtual void            RequestingChildren( SvTreeListEntry* pParent );
     virtual void            ExpandedHdl();
-    virtual long            ExpandingHdl();
+    virtual bool            ExpandingHdl();
 public:
     void                    Init( const OUString& language );
     void  RequestSubEntries(  SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node,
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 0d9b768..6d1f2ca 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -442,7 +442,7 @@ public:
     const Link&     GetExpandingHdl() const { return aExpandingHdl; }
 
     virtual void    ExpandedHdl();
-    virtual long    ExpandingHdl();
+    virtual bool    ExpandingHdl();
     virtual void    SelectHdl();
     virtual void    DeselectHdl();
     virtual sal_Bool    DoubleClickHdl();
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index ecc4d41..067eae9 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -526,7 +526,7 @@ protected:
     virtual void    Command( const CommandEvent& rMEvt );
     virtual long    Notify( NotifyEvent& rNEvt );
     virtual sal_Bool    DoubleClickHdl();
-    virtual long    ExpandingHdl();
+    virtual bool    ExpandingHdl();
     virtual void    ExpandedHdl();
     virtual sal_Bool    NotifyMoving(SvTreeListEntry*  pTarget,
                                      SvTreeListEntry*  pEntry,
@@ -644,7 +644,7 @@ sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry*  pTarget,
 
 //-------------------------------------------------------------------------
 
-long  StyleTreeListBox_Impl::ExpandingHdl()
+bool  StyleTreeListBox_Impl::ExpandingHdl()
 
 /*  [Description]
 
@@ -656,7 +656,7 @@ long  StyleTreeListBox_Impl::ExpandingHdl()
 */
 {
     pCurEntry = GetCurEntry();
-    return sal_True;
+    return true;
 }
 
 //-------------------------------------------------------------------------
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 018fcbd..1399757 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -504,10 +504,10 @@ sal_uLong SvTreeListBox::Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos )
     return nInsPos;
 }
 
-long SvTreeListBox::ExpandingHdl()
+bool SvTreeListBox::ExpandingHdl()
 {
     DBG_CHKTHIS(SvTreeListBox,0);
-    return aExpandingHdl.IsSet() ? aExpandingHdl.Call( this ) : 1;
+    return !aExpandingHdl.IsSet() || aExpandingHdl.Call( this );
 }
 
 void SvTreeListBox::ExpandedHdl()