INTEGRATION: CWS dba30d (1.35.30); FILE MERGED

2008/06/10 06:41:15 fs 1.35.30.2: RESYNC: (1.35-1.36); FILE MERGED
2008/06/01 20:53:07 fs 1.35.30.1: fillTreeListNames had one client only - moved to the respective class / +AppendConfigToken (was formerly declared as extern in the client file)

1 files changed, 6 insertions, 25 deletions

diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index a6bb7736618a..4e900ac49482 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: UITools.hxx,v $
- * $Revision: 1.36 $
+ * $Revision: 1.37 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -105,7 +105,6 @@ class SvLBoxEntry;
 namespace dbaui
 {
 // .........................................................................
-    class IContainerFoundListener;
     class ODsnTypeCollection;
     class DBTreeListBox;
 
@@ -446,29 +445,6 @@ namespace dbaui
     */
     const SfxFilter* getStandardDatabaseFilter();
 
-    /** fills the tree list box with the elements from the given container and sub elements.
-        @param  _xContainer
-            The container.
-        @param  _rList
-            The list to fill.
-        @param  _nImageId
-            For the leaf elements which do not support a XNameAccess, this denotes the resource id of the image to be used.
-        @param  _nHighContrastImageId
-            For the leaf elements which do not support a XNameAccess, this denotes the resource id of the high contrast image to be used.
-        @param  _pParent
-            The root entry.
-        @param  _pContainerFoundListener
-            Will be called if a sub container was found
-    */
-    void fillTreeListNames(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer,
-            DBTreeListBox& _rList,
-            USHORT _nImageId,
-            USHORT _nHighContrastImageId,
-            SvLBoxEntry* _pParent,
-            IContainerFoundListener* _pContainerFoundListener
-        );
-
     /** opens a save dialog to store a form or report folder in the current hierachy.
         @param  _pParent
             The parent of the dialog.
@@ -507,6 +483,11 @@ namespace dbaui
             The multi service factory
     */
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rMF );
+
+    // this completes a help url with the system parameters "Language" and "System"
+    // detect installed locale
+    void AppendConfigToken( ::rtl::OUString& _rURL, sal_Bool _bQuestionMark );
+
 // .........................................................................
 }
 // .........................................................................