INTEGRATION: CWS sb59 (1.7.62); FILE MERGED

2006/08/03 13:51:27 cl 1.7.62.1: removed compiler warnings

svx/source/dialog/checklbx.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: checklbx.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 04:11:54 $
+ *  last change: $Author: obo $ $Date: 2006-10-12 12:07:24 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -257,3 +257,16 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt )
         SvTreeListBox::KeyInput( rKEvt );
 }
 
+// -----------------------------------------------------------------------
+
+SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, BOOL bChildsOnDemand, ULONG nPos, void* pUserData )
+{
+    return SvTreeListBox::InsertEntry( rText, pParent, bChildsOnDemand, nPos, pUserData );
+}
+
+// -----------------------------------------------------------------------
+
+SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent, BOOL bChildsOnDemand, ULONG nPos, void* pUserData )
+{
+    return SvTreeListBox::InsertEntry( rText, rExpandedEntryBmp, rCollapsedEntryBmp, pParent, bChildsOnDemand, nPos, pUserData );
+}

svx/source/dialog/connpooloptions.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: connpooloptions.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 04:13:00 $
+ *  last change: $Author: obo $ $Date: 2006-10-12 12:07:50 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -72,6 +72,7 @@ namespace offapp
     typedef ::svt::EditBrowseBox DriverListControl_Base;
     class DriverListControl : public DriverListControl_Base
     {
+        using Window::Update;
     protected:
         DriverPoolingSettings                   m_aSavedSettings;
         DriverPoolingSettings                   m_aSettings;