1 files changed, 6 insertions, 12 deletions
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index c6fafa1b0926..f45213a28b49 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -24,8 +24,10 @@
 #include <editeng/svxenum.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <connectivity/dbtools.hxx>
+#include <unotools/resmgr.hxx>
 
 #include <memory>
+#include <string_view>
 
 #define RET_ALL     100
 
@@ -42,11 +44,6 @@ namespace com::sun::star {
     {
         class XEventListener;
     }
-    namespace awt
-    {
-        struct FontDescriptor;
-        class XWindow;
-    }
     namespace sdbc
     {
         class XDatabaseMetaData;
@@ -54,7 +51,6 @@ namespace com::sun::star {
     }
     namespace util
     {
-        struct URL;
         class XNumberFormatter;
     }
     namespace ucb { class XContent; }
@@ -71,8 +67,6 @@ namespace weld {
     class Widget;
     class Window;
 }
-class ToolBox;
-namespace vcl { class Font; }
 class SvNumberFormatter;
 class SfxFilter;
 
@@ -113,7 +107,7 @@ namespace dbaui
         @param  _rTypeInfoIters the vector filled with map iterators
     */
     void fillTypeInfo(  const css::uno::Reference< css::sdbc::XConnection>& _rxConnection,
-                        const OUString& _rsTypeNames,
+                        std::u16string_view _rsTypeNames,
                         OTypeInfoMap& _rTypeInfoMap,
                         std::vector<OTypeInfoMap::iterator>& _rTypeInfoIters);
 
@@ -138,7 +132,7 @@ namespace dbaui
         @param SvxCellHorJustify& _eAlignment
         @return the corresponding css::awt::TextAlign
     */
-    sal_Int32 mapTextAllign(const SvxCellHorJustify& _eAlignment);
+    sal_Int32 mapTextAlign(const SvxCellHorJustify& _eAlignment);
 
     /** retrieves a data source given by name or URL, and displays an error if this fails
 
@@ -309,7 +303,7 @@ namespace dbaui
         @return
             RET_YES, RET_NO, RET_ALL
     */
-    sal_Int32 askForUserAction(weld::Window* pParent, const char* pTitle, const char* pText, bool bAll, const OUString& rName);
+    sal_Int32 askForUserAction(weld::Window* pParent, TranslateId pTitle, TranslateId pText, bool bAll, std::u16string_view rName);
 
     /** creates a new view from a query or table
         @param  _sName
@@ -370,7 +364,7 @@ namespace dbaui
         @return
             <TRUE/> if the insert operation was successful, otherwise <FALSE/>.
     */
-    bool insertHierachyElement(
+    bool insertHierarchyElement(
                 weld::Window* pParent,
                 const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
                 const css::uno::Reference< css::container::XHierarchicalNameContainer>& _xNames,