loplugin:ostr in dbaccess

Change-Id: I6d720ef94d9f29c120f292b844721621e6630856
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167259
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

16 files changed, 139 insertions, 139 deletions

diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index 1fa17c06207c..2815c4696115 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -45,7 +45,7 @@ namespace dbaui
     }
     OUString SAL_CALL OConnectionLineAccess::getImplementationName()
     {
-        return "org.openoffice.comp.dbu.ConnectionLineAccessibility";
+        return u"org.openoffice.comp.dbu.ConnectionLineAccessibility"_ustr;
     }
     // XAccessibleContext
     sal_Int64 SAL_CALL OConnectionLineAccess::getAccessibleChildCount(  )
@@ -86,7 +86,7 @@ namespace dbaui
     }
     OUString SAL_CALL OConnectionLineAccess::getAccessibleDescription(  )
     {
-        return "Relation";
+        return u"Relation"_ustr;
     }
     Reference< XAccessibleRelationSet > SAL_CALL OConnectionLineAccess::getAccessibleRelationSet(  )
     {
diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx
index 13a18b918db7..7c6844f3afd7 100644
--- a/dbaccess/source/ui/querydesign/JAccess.cxx
+++ b/dbaccess/source/ui/querydesign/JAccess.cxx
@@ -38,7 +38,7 @@ namespace dbaui
     }
     OUString SAL_CALL OJoinDesignViewAccess::getImplementationName()
     {
-        return "org.openoffice.comp.dbu.JoinViewAccessibility";
+        return u"org.openoffice.comp.dbu.JoinViewAccessibility"_ustr;
     }
     void OJoinDesignViewAccess::clearTableView()
     {
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index abfe67fd7288..cac9082a0903 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -280,13 +280,13 @@ void OJoinController::removeConnectionData(const TTableConnectionData::value_typ
 void OJoinController::describeSupportedFeatures()
 {
     OJoinController_BASE::describeSupportedFeatures();
-    implDescribeSupportedFeature( ".uno:Redo",      ID_BROWSER_REDO,    CommandGroup::EDIT );
-    implDescribeSupportedFeature( ".uno:Save",      ID_BROWSER_SAVEDOC, CommandGroup::DOCUMENT );
-    implDescribeSupportedFeature( ".uno:Undo",      ID_BROWSER_UNDO,    CommandGroup::EDIT );
-    implDescribeSupportedFeature( ".uno:AddTable",  ID_BROWSER_ADDTABLE,CommandGroup::EDIT );
-    implDescribeSupportedFeature( ".uno:EditDoc",   ID_BROWSER_EDITDOC, CommandGroup::EDIT );
-    implDescribeSupportedFeature( ".uno:GetUndoStrings", SID_GETUNDOSTRINGS );
-    implDescribeSupportedFeature( ".uno:GetRedoStrings", SID_GETREDOSTRINGS );
+    implDescribeSupportedFeature( u".uno:Redo"_ustr,      ID_BROWSER_REDO,    CommandGroup::EDIT );
+    implDescribeSupportedFeature( u".uno:Save"_ustr,      ID_BROWSER_SAVEDOC, CommandGroup::DOCUMENT );
+    implDescribeSupportedFeature( u".uno:Undo"_ustr,      ID_BROWSER_UNDO,    CommandGroup::EDIT );
+    implDescribeSupportedFeature( u".uno:AddTable"_ustr,  ID_BROWSER_ADDTABLE,CommandGroup::EDIT );
+    implDescribeSupportedFeature( u".uno:EditDoc"_ustr,   ID_BROWSER_EDITDOC, CommandGroup::EDIT );
+    implDescribeSupportedFeature( u".uno:GetUndoStrings"_ustr, SID_GETUNDOSTRINGS );
+    implDescribeSupportedFeature( u".uno:GetRedoStrings"_ustr, SID_GETREDOSTRINGS );
 }
 
 sal_Bool SAL_CALL OJoinController::suspend(sal_Bool _bSuspend)
@@ -314,7 +314,7 @@ void OJoinController::loadTableWindows( const ::comphelper::NamedValueCollection
 
     m_aMinimumTableViewSize = Point();
 
-    for (auto& table : i_rViewSettings.getOrDefault("Tables", Sequence<PropertyValue>()))
+    for (auto& table : i_rViewSettings.getOrDefault(u"Tables"_ustr, Sequence<PropertyValue>()))
     {
         ::comphelper::NamedValueCollection aSingleTableData(table.Value);
         loadTableWindow( aSingleTableData );
@@ -332,14 +332,14 @@ void OJoinController::loadTableWindow( const ::comphelper::NamedValueCollection&
     OUString sComposedName,sTableName,sWindowName;
     bool bShowAll = false;
 
-    sComposedName = i_rTableWindowSettings.getOrDefault( "ComposedName", sComposedName );
-    sTableName = i_rTableWindowSettings.getOrDefault( "TableName", sTableName );
-    sWindowName = i_rTableWindowSettings.getOrDefault( "WindowName", sWindowName );
-    nY = i_rTableWindowSettings.getOrDefault( "WindowTop", nY );
-    nX = i_rTableWindowSettings.getOrDefault( "WindowLeft", nX );
-    nWidth = i_rTableWindowSettings.getOrDefault( "WindowWidth", nWidth );
-    nHeight = i_rTableWindowSettings.getOrDefault( "WindowHeight", nHeight );
-    bShowAll = i_rTableWindowSettings.getOrDefault( "ShowAll", bShowAll );
+    sComposedName = i_rTableWindowSettings.getOrDefault( u"ComposedName"_ustr, sComposedName );
+    sTableName = i_rTableWindowSettings.getOrDefault( u"TableName"_ustr, sTableName );
+    sWindowName = i_rTableWindowSettings.getOrDefault( u"WindowName"_ustr, sWindowName );
+    nY = i_rTableWindowSettings.getOrDefault( u"WindowTop"_ustr, nY );
+    nX = i_rTableWindowSettings.getOrDefault( u"WindowLeft"_ustr, nX );
+    nWidth = i_rTableWindowSettings.getOrDefault( u"WindowWidth"_ustr, nWidth );
+    nHeight = i_rTableWindowSettings.getOrDefault( u"WindowHeight"_ustr, nHeight );
+    bShowAll = i_rTableWindowSettings.getOrDefault( u"ShowAll"_ustr, bShowAll );
 
     TTableWindowData::value_type pData = createTableWindowData(sComposedName,sTableName,sWindowName);
     if ( pData )
@@ -366,20 +366,20 @@ void OJoinController::saveTableWindows( ::comphelper::NamedValueCollection& o_rV
     for (auto const& elem : m_vTableData)
     {
         ::comphelper::NamedValueCollection aWindowData;
-        aWindowData.put( "ComposedName", elem->GetComposedName() );
-        aWindowData.put( "TableName", elem->GetTableName() );
-        aWindowData.put( "WindowName", elem->GetWinName() );
-        aWindowData.put( "WindowTop", static_cast<sal_Int32>(elem->GetPosition().Y()) );
-        aWindowData.put( "WindowLeft", static_cast<sal_Int32>(elem->GetPosition().X()) );
-        aWindowData.put( "WindowWidth", static_cast<sal_Int32>(elem->GetSize().Width()) );
-        aWindowData.put( "WindowHeight", static_cast<sal_Int32>(elem->GetSize().Height()) );
-        aWindowData.put( "ShowAll", elem->IsShowAll() );
+        aWindowData.put( u"ComposedName"_ustr, elem->GetComposedName() );
+        aWindowData.put( u"TableName"_ustr, elem->GetTableName() );
+        aWindowData.put( u"WindowName"_ustr, elem->GetWinName() );
+        aWindowData.put( u"WindowTop"_ustr, static_cast<sal_Int32>(elem->GetPosition().Y()) );
+        aWindowData.put( u"WindowLeft"_ustr, static_cast<sal_Int32>(elem->GetPosition().X()) );
+        aWindowData.put( u"WindowWidth"_ustr, static_cast<sal_Int32>(elem->GetSize().Width()) );
+        aWindowData.put( u"WindowHeight"_ustr, static_cast<sal_Int32>(elem->GetSize().Height()) );
+        aWindowData.put( u"ShowAll"_ustr, elem->IsShowAll() );
 
         const OUString sTableName( "Table" + OUString::number( i++ ) );
         aAllTablesData.put( sTableName, aWindowData.getPropertyValues() );
     }
 
-    o_rViewSettings.put( "Tables", aAllTablesData.getPropertyValues() );
+    o_rViewSettings.put( u"Tables"_ustr, aAllTablesData.getPropertyValues() );
 }
 
 TTableWindowData::value_type OJoinController::createTableWindowData(const OUString& _sComposedName,const OUString& _sTableName,const OUString& _sWindowName)
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 88085c8eadd8..3bfa4d4bbf1c 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1119,8 +1119,8 @@ void OJoinTableView::executePopup(const Point& rPos, VclPtr<OTableConnection>& r
 {
     ::tools::Rectangle aRect(rPos, Size(1, 1));
     weld::Window* pPopupParent = weld::GetPopupParent(*this, aRect);
-    std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, "dbaccess/ui/joinviewmenu.ui"));
-    std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu("menu"));
+    std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, u"dbaccess/ui/joinviewmenu.ui"_ustr));
+    std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu(u"menu"_ustr));
     OUString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect);
     if (sIdent == "delete")
         RemoveConnection(rSelConnection, true);
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 430748a25b0c..108d36fd5729 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -1475,7 +1475,7 @@ namespace
                     for (auto const& table : rTabList)
                     {
                         OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(table.second.get());
-                        if (pTabWin->ExistsField( "*", aDragLeft ))
+                        if (pTabWin->ExistsField( u"*"_ustr, aDragLeft ))
                         {
                             aDragLeft->SetAlias(OUString());
                             aDragLeft->SetTable(OUString());
@@ -2026,7 +2026,7 @@ namespace
         {
             OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(table.second.get());
             OTableFieldDescRef  aInfo = new OTableFieldDesc();
-            if (pTabWin->ExistsField( "*", aInfo ))
+            if (pTabWin->ExistsField( u"*"_ustr, aInfo ))
             {
                 eErrorCode = _pView->InsertField(aInfo, bFirstField);
                 bFirstField = false;
@@ -2122,7 +2122,7 @@ namespace
                                 for (auto const& table : *pTabList)
                                 {
                                     OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(table.second.get());
-                                    if (pTabWin->ExistsField( "*", aInfo ))
+                                    if (pTabWin->ExistsField( u"*"_ustr, aInfo ))
                                     {
                                         aInfo->SetAlias(OUString());
                                         aInfo->SetTable(OUString());
@@ -2624,7 +2624,7 @@ SqlParseError OQueryDesignView::InsertField( const OTableFieldDescRef& rInfo, bo
 
 sal_Int32 OQueryDesignView::getColWidth(sal_uInt16 _nColPos) const
 {
-    static sal_Int32 s_nDefaultWidth = GetTextWidth("0") * 15;
+    static sal_Int32 s_nDefaultWidth = GetTextWidth(u"0"_ustr) * 15;
     sal_Int32 nWidth = static_cast<OQueryController&>(getController()).getColWidth(_nColPos);
     if ( !nWidth )
         nWidth = s_nDefaultWidth;
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index f8d8471e53e3..d08de914530d 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -29,10 +29,10 @@ using namespace dbaui;
 
 // end of temp classes
 OQueryTextView::OQueryTextView(OQueryContainerWindow* pParent, OQueryController& rController)
-    : InterimItemWindow(pParent, "dbaccess/ui/queryview.ui", "QueryView")
+    : InterimItemWindow(pParent, u"dbaccess/ui/queryview.ui"_ustr, u"QueryView"_ustr)
     , m_rController(rController)
-    , m_xSQL(new SQLEditView(m_xBuilder->weld_scrolled_window("scrolledwindow", true)))
-    , m_xSQLEd(new weld::CustomWeld(*m_xBuilder, "sql", *m_xSQL))
+    , m_xSQL(new SQLEditView(m_xBuilder->weld_scrolled_window(u"scrolledwindow"_ustr, true)))
+    , m_xSQLEd(new weld::CustomWeld(*m_xBuilder, u"sql"_ustr, *m_xSQL))
     , m_timerUndoActionCreation("dbaccess OQueryTextView m_timerUndoActionCreation")
     , m_timerInvalidate("dbaccess OQueryTextView m_timerInvalidate")
     , m_bStopTimer(false)
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 4653c0e6174b..ea92978fd4a6 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -707,7 +707,7 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef co
             bool bQuote = ( nPass <= 2 );
             bool bInternational = ( nPass % 2 ) == 0;
 
-            OUString sSql {"SELECT "};
+            OUString sSql {u"SELECT "_ustr};
             if ( bQuote )
                 sSql += sQuotedFullFieldName;
             else
@@ -811,7 +811,7 @@ bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRef co
                     if ( nFunCount == 4 && SQL_ISRULE(pColumnRef->getChild(3),column_ref) )
                         bError = fillColumnRef( pColumnRef->getChild(3), xConnection, aSelEntry, _bListAction );
                     else if ( nFunCount == 3 ) // we have a COUNT(*) here, so take the first table
-                        bError = fillColumnRef( "*", std::u16string_view(), xMetaData, aSelEntry, _bListAction );
+                        bError = fillColumnRef( u"*"_ustr, std::u16string_view(), xMetaData, aSelEntry, _bListAction );
                     else
                     {
                         nFunctionType |= FKT_NUMERIC;
@@ -1063,7 +1063,7 @@ bool OSelectionBrowseBox::SaveModified()
                             // we have to change the visible flag, so we must append also an undo action
                             pEntry->SetVisible();
                             m_pVisibleCell->GetBox().set_active(true);
-                            appendUndoAction("0",u"1",BROW_VIS_ROW,bListAction);
+                            appendUndoAction(u"0"_ustr,u"1",BROW_VIS_ROW,bListAction);
                             RowModified(GetBrowseRow(BROW_VIS_ROW), GetCurColumnId());
                         }
 
@@ -1204,7 +1204,7 @@ bool OSelectionBrowseBox::SaveModified()
     {
         // Default to visible
         pEntry->SetVisible();
-        appendUndoAction("0",u"1",BROW_VIS_ROW,bListAction);
+        appendUndoAction(u"0"_ustr,u"1",BROW_VIS_ROW,bListAction);
         RowModified(BROW_VIS_ROW, GetCurColumnId());
 
         // if required add empty columns
@@ -1949,8 +1949,8 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt)
                 {
                     ::tools::Rectangle aRect(aMenuPos, Size(1, 1));
                     weld::Window* pPopupParent = weld::GetPopupParent(*this, aRect);
-                    std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, "dbaccess/ui/querycolmenu.ui"));
-                    std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu("menu"));
+                    std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, u"dbaccess/ui/querycolmenu.ui"_ustr));
+                    std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu(u"menu"_ustr));
                     OUString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect);
                     if (sIdent == "delete")
                        RemoveField(nColId);
@@ -1964,12 +1964,12 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt)
                 {
                     ::tools::Rectangle aRect(aMenuPos, Size(1, 1));
                     weld::Window* pPopupParent = weld::GetPopupParent(*this, aRect);
-                    std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, "dbaccess/ui/queryfuncmenu.ui"));
-                    std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu("menu"));
-                    xContextMenu->set_active("functions", m_bVisibleRow[BROW_FUNCTION_ROW]);
-                    xContextMenu->set_active("tablename", m_bVisibleRow[BROW_TABLE_ROW]);
-                    xContextMenu->set_active("alias", m_bVisibleRow[BROW_COLUMNALIAS_ROW]);
-                    xContextMenu->set_active("distinct", static_cast<OQueryController&>(getDesignView()->getController()).isDistinct());
+                    std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, u"dbaccess/ui/queryfuncmenu.ui"_ustr));
+                    std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu(u"menu"_ustr));
+                    xContextMenu->set_active(u"functions"_ustr, m_bVisibleRow[BROW_FUNCTION_ROW]);
+                    xContextMenu->set_active(u"tablename"_ustr, m_bVisibleRow[BROW_TABLE_ROW]);
+                    xContextMenu->set_active(u"alias"_ustr, m_bVisibleRow[BROW_COLUMNALIAS_ROW]);
+                    xContextMenu->set_active(u"distinct"_ustr, static_cast<OQueryController&>(getDesignView()->getController()).isDistinct());
 
                     OUString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect);
                     if (sIdent == "functions")
diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
index 4d556f94f203..b835f3b62aff 100644
--- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
+++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
@@ -130,23 +130,23 @@ void OTableFieldDesc::Load( const css::beans::PropertyValue& i_rSettings, const
 {
 
     ::comphelper::NamedValueCollection aFieldDesc( i_rSettings.Value );
-    m_aAliasName = aFieldDesc.getOrDefault( "AliasName", m_aAliasName );
-    m_aTableName = aFieldDesc.getOrDefault( "TableName", m_aTableName );
-    m_aFieldName = aFieldDesc.getOrDefault( "FieldName", m_aFieldName );
-    m_aFieldAlias = aFieldDesc.getOrDefault( "FieldAlias", m_aFieldAlias );
-    m_aFunctionName = aFieldDesc.getOrDefault( "FunctionName", m_aFunctionName );
-    m_eDataType = aFieldDesc.getOrDefault( "DataType", m_eDataType );
-    m_eFunctionType = aFieldDesc.getOrDefault( "FunctionType", m_eFunctionType );
-    m_nColWidth = aFieldDesc.getOrDefault( "ColWidth", m_nColWidth );
-    m_bGroupBy = aFieldDesc.getOrDefault( "GroupBy", m_bGroupBy );
-    m_bVisible = aFieldDesc.getOrDefault( "Visible", m_bVisible );
-
-    m_eFieldType = static_cast< ETableFieldType >( aFieldDesc.getOrDefault( "FieldType", static_cast< sal_Int32 >( m_eFieldType ) ) );
-    m_eOrderDir = static_cast< EOrderDir >( aFieldDesc.getOrDefault( "OrderDir", static_cast< sal_Int32 >( m_eOrderDir ) ) );
+    m_aAliasName = aFieldDesc.getOrDefault( u"AliasName"_ustr, m_aAliasName );
+    m_aTableName = aFieldDesc.getOrDefault( u"TableName"_ustr, m_aTableName );
+    m_aFieldName = aFieldDesc.getOrDefault( u"FieldName"_ustr, m_aFieldName );
+    m_aFieldAlias = aFieldDesc.getOrDefault( u"FieldAlias"_ustr, m_aFieldAlias );
+    m_aFunctionName = aFieldDesc.getOrDefault( u"FunctionName"_ustr, m_aFunctionName );
+    m_eDataType = aFieldDesc.getOrDefault( u"DataType"_ustr, m_eDataType );
+    m_eFunctionType = aFieldDesc.getOrDefault( u"FunctionType"_ustr, m_eFunctionType );
+    m_nColWidth = aFieldDesc.getOrDefault( u"ColWidth"_ustr, m_nColWidth );
+    m_bGroupBy = aFieldDesc.getOrDefault( u"GroupBy"_ustr, m_bGroupBy );
+    m_bVisible = aFieldDesc.getOrDefault( u"Visible"_ustr, m_bVisible );
+
+    m_eFieldType = static_cast< ETableFieldType >( aFieldDesc.getOrDefault( u"FieldType"_ustr, static_cast< sal_Int32 >( m_eFieldType ) ) );
+    m_eOrderDir = static_cast< EOrderDir >( aFieldDesc.getOrDefault( u"OrderDir"_ustr, static_cast< sal_Int32 >( m_eOrderDir ) ) );
 
     if ( i_bIncludingCriteria )
     {
-        const Sequence< PropertyValue > aCriteria( aFieldDesc.getOrDefault( "Criteria", Sequence< PropertyValue >() ) );
+        const Sequence< PropertyValue > aCriteria( aFieldDesc.getOrDefault( u"Criteria"_ustr, Sequence< PropertyValue >() ) );
         m_aCriteria.resize( aCriteria.getLength() );
         std::transform(
             aCriteria.begin(),
@@ -160,18 +160,18 @@ void OTableFieldDesc::Load( const css::beans::PropertyValue& i_rSettings, const
 void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, const bool i_bIncludingCriteria )
 {
 
-    o_rSettings.put( "AliasName", m_aAliasName );
-    o_rSettings.put( "TableName", m_aTableName );
-    o_rSettings.put( "FieldName", m_aFieldName );
-    o_rSettings.put( "FieldAlias", m_aFieldAlias );
-    o_rSettings.put( "FunctionName", m_aFunctionName );
-    o_rSettings.put( "DataType", m_eDataType );
-    o_rSettings.put( "FunctionType", m_eFunctionType );
-    o_rSettings.put( "FieldType", static_cast<sal_Int32>(m_eFieldType) );
-    o_rSettings.put( "OrderDir", static_cast<sal_Int32>(m_eOrderDir) );
-    o_rSettings.put( "ColWidth", m_nColWidth );
-    o_rSettings.put( "GroupBy", m_bGroupBy );
-    o_rSettings.put( "Visible", m_bVisible );
+    o_rSettings.put( u"AliasName"_ustr, m_aAliasName );
+    o_rSettings.put( u"TableName"_ustr, m_aTableName );
+    o_rSettings.put( u"FieldName"_ustr, m_aFieldName );
+    o_rSettings.put( u"FieldAlias"_ustr, m_aFieldAlias );
+    o_rSettings.put( u"FunctionName"_ustr, m_aFunctionName );
+    o_rSettings.put( u"DataType"_ustr, m_eDataType );
+    o_rSettings.put( u"FunctionType"_ustr, m_eFunctionType );
+    o_rSettings.put( u"FieldType"_ustr, static_cast<sal_Int32>(m_eFieldType) );
+    o_rSettings.put( u"OrderDir"_ustr, static_cast<sal_Int32>(m_eOrderDir) );
+    o_rSettings.put( u"ColWidth"_ustr, m_nColWidth );
+    o_rSettings.put( u"GroupBy"_ustr, m_bGroupBy );
+    o_rSettings.put( u"Visible"_ustr, m_bVisible );
 
     if ( !i_bIncludingCriteria )
         return;
@@ -189,7 +189,7 @@ void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, con
         ++c;
     }
 
-    o_rSettings.put( "Criteria", aCriteria );
+    o_rSettings.put( u"Criteria"_ustr, aCriteria );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 8fee333fc3eb..ac48bab4bb34 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -189,7 +189,7 @@ void OTableWindow::FillListBox()
 
     if (GetData()->IsShowAll())
     {
-        rTreeView.append(weld::toId(createUserData(nullptr,false)), OUString("*"));
+        rTreeView.append(weld::toId(createUserData(nullptr,false)), u"*"_ustr);
     }
 
     Reference<XNameAccess> xPKeyColumns;
@@ -539,8 +539,8 @@ void OTableWindow::Command(const CommandEvent& rEvt)
 
                 ::tools::Rectangle aRect(ptWhere, Size(1, 1));
                 weld::Window* pPopupParent = weld::GetPopupParent(*this, aRect);
-                std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, "dbaccess/ui/jointablemenu.ui"));
-                std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu("menu"));
+                std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, u"dbaccess/ui/jointablemenu.ui"_ustr));
+                std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu(u"menu"_ustr));
                 if (!xContextMenu->popup_at_rect(pPopupParent, aRect).isEmpty())
                     Remove();
             }
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 138850267c47..699c85a9e937 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -55,12 +55,12 @@ namespace dbaui
     }
     OUString SAL_CALL OTableWindowAccess::getImplementationName()
     {
-        return "org.openoffice.comp.dbu.TableWindowAccessibility";
+        return u"org.openoffice.comp.dbu.TableWindowAccessibility"_ustr;
     }
     Sequence< OUString > SAL_CALL OTableWindowAccess::getSupportedServiceNames()
     {
-        return { "com.sun.star.accessibility.Accessible",
-                 "com.sun.star.accessibility.AccessibleContext" };
+        return { u"com.sun.star.accessibility.Accessible"_ustr,
+                 u"com.sun.star.accessibility.AccessibleContext"_ustr };
     }
     // XAccessibleContext
     sal_Int64 SAL_CALL OTableWindowAccess::getAccessibleChildCount(  )
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 3066f8429f35..731aa9f0f0cb 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -42,8 +42,8 @@ OJoinExchangeData::OJoinExchangeData(OTableWindowListBox* pBox)
 }
 
 OTableWindowListBox::OTableWindowListBox(OTableWindow* pParent)
-    : InterimItemWindow(pParent, "dbaccess/ui/tablelistbox.ui", "TableListBox")
-    , m_xTreeView(m_xBuilder->weld_tree_view("treeview"))
+    : InterimItemWindow(pParent, u"dbaccess/ui/tablelistbox.ui"_ustr, u"TableListBox"_ustr)
+    , m_xTreeView(m_xBuilder->weld_tree_view(u"treeview"_ustr))
     , m_xDragDropTargetHelper(new TableWindowListBoxHelper(*this, m_xTreeView->get_drop_target()))
     , m_pTabWin(pParent)
     , m_nDropEvent(nullptr)
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 0b0ebaa4c7e1..0e3ad0573c7f 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -27,10 +27,10 @@
 
 using namespace dbaui;
 OTableWindowTitle::OTableWindowTitle(OTableWindow* pParent)
-    : InterimItemWindow(pParent, "dbaccess/ui/tabletitle.ui", "TableTitle")
+    : InterimItemWindow(pParent, u"dbaccess/ui/tabletitle.ui"_ustr, u"TableTitle"_ustr)
     , m_pTabWin( pParent )
-    , m_xLabel(m_xBuilder->weld_label("label"))
-    , m_xImage(m_xBuilder->weld_image("image"))
+    , m_xLabel(m_xBuilder->weld_label(u"label"_ustr))
+    , m_xImage(m_xBuilder->weld_image(u"image"_ustr))
 {
     m_xLabel->connect_mouse_press(LINK(this, OTableWindowTitle, MousePressHdl));
 }
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 37624aceb419..59d563388fd5 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -52,9 +52,9 @@ class LimitBox final : public InterimItemWindow
 {
 public:
     LimitBox(vcl::Window* pParent, LimitBoxController* pCtrl)
-        : InterimItemWindow(pParent, "dbaccess/ui/limitbox.ui", "LimitBox")
+        : InterimItemWindow(pParent, u"dbaccess/ui/limitbox.ui"_ustr, u"LimitBox"_ustr)
         , m_pControl( pCtrl )
-        , m_xWidget(m_xBuilder->weld_combo_box("limit"))
+        , m_xWidget(m_xBuilder->weld_combo_box(u"limit"_ustr))
     {
         InitControlBase(m_xWidget.get());
 
@@ -117,7 +117,7 @@ private:
                 nLimit = -1;
         }
         set_value(nLimit);
-        m_pControl->dispatchCommand({ comphelper::makePropertyValue("DBLimit.Value", nLimit) });
+        m_pControl->dispatchCommand({ comphelper::makePropertyValue(u"DBLimit.Value"_ustr, nLimit) });
     }
 
     ///Initialize entries
@@ -188,7 +188,7 @@ LimitBoxController::~LimitBoxController()
 /// XServiceInfo
 OUString SAL_CALL LimitBoxController::getImplementationName()
 {
-    return "org.libreoffice.comp.dbu.LimitBoxController";
+    return u"org.libreoffice.comp.dbu.LimitBoxController"_ustr;
 }
 
 sal_Bool SAL_CALL LimitBoxController::supportsService(const OUString& _rServiceName)
@@ -203,7 +203,7 @@ sal_Bool SAL_CALL LimitBoxController::supportsService(const OUString& _rServiceN
 
 css::uno::Sequence< OUString > SAL_CALL LimitBoxController::getSupportedServiceNames()
 {
-    return { "com.sun.star.frame.ToolbarController" };
+    return { u"com.sun.star.frame.ToolbarController"_ustr };
 }
 
 /// XComponent
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 29c69856b41b..2c1788620a24 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -183,7 +183,7 @@ namespace dbaui
             Reference < XPropertySet > xLMPropSet(m_xBeamer->getLayoutManager(), UNO_QUERY);
             if ( xLMPropSet.is() )
             {
-                xLMPropSet->setPropertyValue( "AutomaticToolbars", Any( false ));
+                xLMPropSet->setPropertyValue( u"AutomaticToolbars"_ustr, Any( false ));
             }
         }
         catch( Exception& )
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index d963ca3c293d..8c630ea13a0a 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -94,11 +94,11 @@ namespace dbaui
     {
         virtual OUString SAL_CALL getImplementationName() override
         {
-            return "org.openoffice.comp.dbu.OViewDesign";
+            return u"org.openoffice.comp.dbu.OViewDesign"_ustr;
         }
         virtual Sequence< OUString> SAL_CALL getSupportedServiceNames() override
         {
-            return { "com.sun.star.sdb.ViewDesign" };
+            return { u"com.sun.star.sdb.ViewDesign"_ustr };
         }
 
     public:
@@ -173,7 +173,7 @@ namespace
     void grabFocusFromLimitBox( OQueryController& _rController )
     {
         Reference< XLayoutManager > xLayoutManager = OGenericUnoController::getLayoutManager( _rController.getFrame() );
-        Reference< XUIElement > xUIElement = xLayoutManager->getElement("private:resource/toolbar/designobjectbar");
+        Reference< XUIElement > xUIElement = xLayoutManager->getElement(u"private:resource/toolbar/designobjectbar"_ustr);
         if (xUIElement.is())
         {
             Reference< XWindow > xWindow(xUIElement->getRealInterface(), css::uno::UNO_QUERY);
@@ -188,12 +188,12 @@ namespace
 
 OUString SAL_CALL OQueryController::getImplementationName()
 {
-    return "org.openoffice.comp.dbu.OQueryDesign";
+    return u"org.openoffice.comp.dbu.OQueryDesign"_ustr;
 }
 
 Sequence< OUString> SAL_CALL OQueryController::getSupportedServiceNames()
 {
-    return { "com.sun.star.sdb.QueryDesign" };
+    return { u"com.sun.star.sdb.QueryDesign"_ustr };
 }
 
 OQueryController::OQueryController(const Reference< XComponentContext >& _rM)
@@ -244,18 +244,18 @@ void SAL_CALL OQueryController::getFastPropertyValue( Any& o_rValue, sal_Int32 i
     case PROPERTY_ID_CURRENT_QUERY_DESIGN:
     {
         ::comphelper::NamedValueCollection aCurrentDesign;
-        aCurrentDesign.put( "GraphicalDesign", isGraphicalDesign() );
+        aCurrentDesign.put( u"GraphicalDesign"_ustr, isGraphicalDesign() );
         aCurrentDesign.put( PROPERTY_ESCAPE_PROCESSING, m_bEscapeProcessing );
 
         if ( isGraphicalDesign() )
         {
             getContainer()->SaveUIConfig();
             saveViewSettings( aCurrentDesign, true );
-            aCurrentDesign.put( "Statement", m_sStatement );
+            aCurrentDesign.put( u"Statement"_ustr, m_sStatement );
         }
         else
         {
-            aCurrentDesign.put( "Statement", getContainer()->getStatement() );
+            aCurrentDesign.put( u"Statement"_ustr, getContainer()->getStatement() );
         }
 
         o_rValue <<= aCurrentDesign.getPropertyValues();
@@ -283,7 +283,7 @@ void SAL_CALL OQueryController::getFastPropertyValue( Any& o_rValue, sal_Int32 i
     aProps.realloc( nLength + 1 );
     auto pProps = aProps.getArray();
     pProps[ nLength ] = Property(
-        "CurrentQueryDesign",
+        u"CurrentQueryDesign"_ustr,
         PROPERTY_ID_CURRENT_QUERY_DESIGN,
         ::cppu::UnoType< Sequence< PropertyValue > >::get(),
         PropertyAttribute::READONLY
@@ -495,7 +495,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
                                 aError = SQLException(
                                     DBA_RES(STR_QRY_NOSELECT),
                                     nullptr,
-                                    "S1000",
+                                    u"S1000"_ustr,
                                     1000,
                                     Any()
                                 );
@@ -518,7 +518,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
                         aError = SQLException(
                             DBA_RES(STR_QRY_SYNTAX),
                             nullptr,
-                            "S1000",
+                            u"S1000"_ustr,
                             1000,
                             Any()
                         );
@@ -657,7 +657,7 @@ void OQueryController::impl_initialize(const ::comphelper::NamedValueCollection&
 
     // legacy parameters first (later overwritten by regular parameters)
     OUString sIndependentSQLCommand;
-    if ( rArguments.get_ensureType( "IndependentSQLCommand", sIndependentSQLCommand ) )
+    if ( rArguments.get_ensureType( u"IndependentSQLCommand"_ustr, sIndependentSQLCommand ) )
     {
         OSL_FAIL( "OQueryController::impl_initialize: IndependentSQLCommand is regognized for compatibility only!" );
         sCommand = sIndependentSQLCommand;
@@ -665,7 +665,7 @@ void OQueryController::impl_initialize(const ::comphelper::NamedValueCollection&
     }
 
     OUString sCurrentQuery;
-    if ( rArguments.get_ensureType( "CurrentQuery", sCurrentQuery ) )
+    if ( rArguments.get_ensureType( u"CurrentQuery"_ustr, sCurrentQuery ) )
     {
         OSL_FAIL( "OQueryController::impl_initialize: CurrentQuery is regognized for compatibility only!" );
         sCommand = sCurrentQuery;
@@ -673,7 +673,7 @@ void OQueryController::impl_initialize(const ::comphelper::NamedValueCollection&
     }
 
     bool bCreateView( false );
-    if ( rArguments.get_ensureType( "CreateView", bCreateView ) && bCreateView )
+    if ( rArguments.get_ensureType( u"CreateView"_ustr, bCreateView ) && bCreateView )
     {
         OSL_FAIL( "OQueryController::impl_initialize: CurrentQuery is regognized for compatibility only!" );
         m_nCommandType = CommandType::TABLE;
@@ -727,7 +727,7 @@ void OQueryController::impl_initialize(const ::comphelper::NamedValueCollection&
     // initial design
     bool bForceInitialDesign = false;
     Sequence< PropertyValue > aCurrentQueryDesignProps;
-    aCurrentQueryDesignProps = rArguments.getOrDefault( "CurrentQueryDesign", aCurrentQueryDesignProps );
+    aCurrentQueryDesignProps = rArguments.getOrDefault( u"CurrentQueryDesign"_ustr, aCurrentQueryDesignProps );
 
     if ( aCurrentQueryDesignProps.hasElements() )
     {
@@ -740,11 +740,11 @@ void OQueryController::impl_initialize(const ::comphelper::NamedValueCollection&
         {
             aCurrentQueryDesign.get_ensureType( PROPERTY_ESCAPE_PROCESSING, m_bEscapeProcessing );
         }
-        if ( aCurrentQueryDesign.has( "Statement" ) )
+        if ( aCurrentQueryDesign.has( u"Statement"_ustr ) )
         {
             OUString sStatement;
-            aCurrentQueryDesign.get_ensureType( "Statement", sStatement );
-            aCurrentQueryDesign.remove( "Statement" );
+            aCurrentQueryDesign.get_ensureType( u"Statement"_ustr, sStatement );
+            aCurrentQueryDesign.remove( u"Statement"_ustr );
             setStatement_fireEvent( sStatement );
         }
 
@@ -919,23 +919,23 @@ OJoinDesignView* OQueryController::getJoinView()
 void OQueryController::describeSupportedFeatures()
 {
     OJoinController::describeSupportedFeatures();
-    implDescribeSupportedFeature( ".uno:SaveAs",            ID_BROWSER_SAVEASDOC,       CommandGroup::DOCUMENT );
-    implDescribeSupportedFeature( ".uno:SbaNativeSql",      ID_BROWSER_ESCAPEPROCESSING,CommandGroup::FORMAT );
-    implDescribeSupportedFeature( ".uno:DBViewFunctions",   SID_QUERY_VIEW_FUNCTIONS,   CommandGroup::VIEW );
-    implDescribeSupportedFeature( ".uno:DBViewTableNames",  SID_QUERY_VIEW_TABLES,      CommandGroup::VIEW );
-    implDescribeSupportedFeature( ".uno:DBViewAliases",     SID_QUERY_VIEW_ALIASES,     CommandGroup::VIEW );
-    implDescribeSupportedFeature( ".uno:DBDistinctValues",  SID_QUERY_DISTINCT_VALUES,  CommandGroup::FORMAT );
-    implDescribeSupportedFeature( ".uno:DBChangeDesignMode",ID_BROWSER_SQL,             CommandGroup::VIEW );
-    implDescribeSupportedFeature( ".uno:DBClearQuery",      SID_BROWSER_CLEAR_QUERY,    CommandGroup::EDIT );
-    implDescribeSupportedFeature( ".uno:SbaExecuteSql",     ID_BROWSER_QUERY_EXECUTE,   CommandGroup::VIEW );
-    implDescribeSupportedFeature( ".uno:DBAddRelation",     SID_RELATION_ADD_RELATION,  CommandGroup::EDIT );
-    implDescribeSupportedFeature( ".uno:DBQueryPreview",    SID_DB_QUERY_PREVIEW,       CommandGroup::VIEW );
-    implDescribeSupportedFeature( ".uno:DBLimit",           SID_QUERY_LIMIT,            CommandGroup::FORMAT );
-    implDescribeSupportedFeature( ".uno:DBQueryPropertiesDialog", SID_QUERY_PROP_DLG,         CommandGroup::FORMAT );
+    implDescribeSupportedFeature( u".uno:SaveAs"_ustr,            ID_BROWSER_SAVEASDOC,       CommandGroup::DOCUMENT );
+    implDescribeSupportedFeature( u".uno:SbaNativeSql"_ustr,      ID_BROWSER_ESCAPEPROCESSING,CommandGroup::FORMAT );
+    implDescribeSupportedFeature( u".uno:DBViewFunctions"_ustr,   SID_QUERY_VIEW_FUNCTIONS,   CommandGroup::VIEW );
+    implDescribeSupportedFeature( u".uno:DBViewTableNames"_ustr,  SID_QUERY_VIEW_TABLES,      CommandGroup::VIEW );
+    implDescribeSupportedFeature( u".uno:DBViewAliases"_ustr,     SID_QUERY_VIEW_ALIASES,     CommandGroup::VIEW );
+    implDescribeSupportedFeature( u".uno:DBDistinctValues"_ustr,  SID_QUERY_DISTINCT_VALUES,  CommandGroup::FORMAT );
+    implDescribeSupportedFeature( u".uno:DBChangeDesignMode"_ustr,ID_BROWSER_SQL,             CommandGroup::VIEW );
+    implDescribeSupportedFeature( u".uno:DBClearQuery"_ustr,      SID_BROWSER_CLEAR_QUERY,    CommandGroup::EDIT );
+    implDescribeSupportedFeature( u".uno:SbaExecuteSql"_ustr,     ID_BROWSER_QUERY_EXECUTE,   CommandGroup::VIEW );
+    implDescribeSupportedFeature( u".uno:DBAddRelation"_ustr,     SID_RELATION_ADD_RELATION,  CommandGroup::EDIT );
+    implDescribeSupportedFeature( u".uno:DBQueryPreview"_ustr,    SID_DB_QUERY_PREVIEW,       CommandGroup::VIEW );
+    implDescribeSupportedFeature( u".uno:DBLimit"_ustr,           SID_QUERY_LIMIT,            CommandGroup::FORMAT );
+    implDescribeSupportedFeature( u".uno:DBQueryPropertiesDialog"_ustr, SID_QUERY_PROP_DLG,         CommandGroup::FORMAT );
 
 #if OSL_DEBUG_LEVEL > 0
-    implDescribeSupportedFeature( ".uno:DBShowParseTree",   ID_EDIT_QUERY_SQL );
-    implDescribeSupportedFeature( ".uno:DBMakeDisjunct",    ID_EDIT_QUERY_DESIGN );
+    implDescribeSupportedFeature( u".uno:DBShowParseTree"_ustr,   ID_EDIT_QUERY_SQL );
+    implDescribeSupportedFeature( u".uno:DBMakeDisjunct"_ustr,    ID_EDIT_QUERY_DESIGN );
 #endif
 }
 
@@ -1010,18 +1010,18 @@ void OQueryController::saveViewSettings( ::comphelper::NamedValueCollection& o_r
         ++i;
     }
 
-    o_rViewSettings.put( "Fields", aAllFieldsData.getPropertyValues() );
-    o_rViewSettings.put( "SplitterPosition", m_nSplitPos );
-    o_rViewSettings.put( "VisibleRows", m_nVisibleRows );
+    o_rViewSettings.put( u"Fields"_ustr, aAllFieldsData.getPropertyValues() );
+    o_rViewSettings.put( u"SplitterPosition"_ustr, m_nSplitPos );
+    o_rViewSettings.put( u"VisibleRows"_ustr, m_nVisibleRows );
 }
 
 void OQueryController::loadViewSettings( const ::comphelper::NamedValueCollection& o_rViewSettings )
 {
     loadTableWindows( o_rViewSettings );
 
-    m_nSplitPos = o_rViewSettings.getOrDefault( "SplitterPosition", m_nSplitPos );
-    m_nVisibleRows = o_rViewSettings.getOrDefault( "VisibleRows", m_nVisibleRows );
-    m_aFieldInformation = o_rViewSettings.getOrDefault( "Fields", m_aFieldInformation );
+    m_nSplitPos = o_rViewSettings.getOrDefault( u"SplitterPosition"_ustr, m_nSplitPos );
+    m_nVisibleRows = o_rViewSettings.getOrDefault( u"VisibleRows"_ustr, m_nVisibleRows );
+    m_aFieldInformation = o_rViewSettings.getOrDefault( u"Fields"_ustr, m_aFieldInformation );
 }
 
 void OQueryController::execute_QueryPropDlg()
@@ -1547,7 +1547,7 @@ OUString OQueryController::translateStatement( bool _bFireStatementChange )
     }
     else if(m_sStatement.isEmpty())
     {
-        showError(SQLException(DBA_RES(STR_QRY_NOSELECT), nullptr, "S1000", 1000, Any()));
+        showError(SQLException(DBA_RES(STR_QRY_NOSELECT), nullptr, u"S1000"_ustr, 1000, Any()));
     }
     else
         sTranslatedStmt = m_sStatement;
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index 1a00dd11576b..5eb7bc96319f 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -45,14 +45,14 @@ DlgQryJoin::DlgQryJoin(const OQueryTableView* pParent,
                        const OJoinTableView::OTableWindowMap* _pTableMap,
                        const Reference< XConnection >& _xConnection,
                        bool _bAllowTableSelect)
-    : GenericDialogController(pParent->GetFrameWeld(), "dbaccess/ui/joindialog.ui", "JoinDialog")
+    : GenericDialogController(pParent->GetFrameWeld(), u"dbaccess/ui/joindialog.ui"_ustr, u"JoinDialog"_ustr)
     , eJoinType(static_cast<OQueryTableConnectionData*>(_pData.get())->GetJoinType())
     , m_pOrigConnData(_pData)
     , m_xConnection(_xConnection)
-    , m_xML_HelpText(m_xBuilder->weld_label("helptext"))
-    , m_xPB_OK(m_xBuilder->weld_button("ok"))
-    , m_xLB_JoinType(m_xBuilder->weld_combo_box("type"))
-    , m_xCBNatural(m_xBuilder->weld_check_button("natural"))
+    , m_xML_HelpText(m_xBuilder->weld_label(u"helptext"_ustr))
+    , m_xPB_OK(m_xBuilder->weld_button(u"ok"_ustr))
+    , m_xLB_JoinType(m_xBuilder->weld_combo_box(u"type"_ustr))
+    , m_xCBNatural(m_xBuilder->weld_check_button(u"natural"_ustr))
 {
     Size aSize(m_xML_HelpText->get_approximate_digit_width() * 44,
                m_xML_HelpText->get_text_height() * 6);
@@ -184,7 +184,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, weld::ComboBox&, void )
                 m_xTableControl->lateInit();
                 m_xCBNatural->set_active(false);
                 m_xTableControl->enableRelation(false);
-                m_pConnData->AppendConnLine("","");
+                m_pConnData->AppendConnLine(u""_ustr,u""_ustr);
                 m_xPB_OK->set_sensitive(true);
             }
             break;