fpicker/source/office/OfficeFilePicker.cxx | 10 +--
fpicker/source/office/OfficeFolderPicker.cxx | 4 -
fpicker/source/office/RemoteFilesDialog.cxx | 70 ++++++++++-----------
fpicker/source/office/breadcrumb.cxx | 16 ++--
fpicker/source/office/commonpicker.cxx | 4 -
fpicker/source/office/contentenumeration.cxx | 28 ++++----
fpicker/source/office/fileview.cxx | 18 ++---
fpicker/source/office/fpsmartcontent.cxx | 4 -
fpicker/source/office/iodlg.cxx | 88 +++++++++++++--------------
fpicker/source/office/iodlgimp.cxx | 2
10 files changed, 122 insertions(+), 122 deletions(-)
New commits:
commit d9427b9f0c291bd24e5e5e53e3f415c724dad746
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed May 8 11:57:48 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed May 8 21:23:12 2024 +0200
loplugin:ostr in fpicker
Change-Id: I891d31ae35419fb26d7070c8a9e3437b86e124d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167338
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/fpicker/source/office/OfficeFilePicker.cxx
b/fpicker/source/office/OfficeFilePicker.cxx
index c0ba40632a0c..e348789037e9 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -879,7 +879,7 @@ void SAL_CALL SvtFilePicker::appendFilterGroup( const
OUString& sGroupTitle,
// check the names
if ( FilterNameExists( aFilters ) )
throw IllegalArgumentException(
- "filter name exists",
+ u"filter name exists"_ustr,
getXWeak(), 1);
// ensure that we have a filter list
@@ -1029,7 +1029,7 @@ bool SvtFilePicker::implHandleInitializationArgument(
const OUString& _rName, co
/* XServiceInfo */
OUString SAL_CALL SvtFilePicker::getImplementationName()
{
- return "com.sun.star.svtools.OfficeFilePicker";
+ return u"com.sun.star.svtools.OfficeFilePicker"_ustr;
}
/* XServiceInfo */
@@ -1041,7 +1041,7 @@ sal_Bool SAL_CALL SvtFilePicker::supportsService( const
OUString& sServiceName )
/* XServiceInfo */
Sequence< OUString > SAL_CALL SvtFilePicker::getSupportedServiceNames()
{
- return { "com.sun.star.ui.dialogs.OfficeFilePicker" };
+ return { u"com.sun.star.ui.dialogs.OfficeFilePicker"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
@@ -1081,7 +1081,7 @@ std::shared_ptr<SvtFileDialog_Base>
SvtRemoteFilePicker::implCreateDialog(weld::
/* XServiceInfo */
OUString SAL_CALL SvtRemoteFilePicker::getImplementationName()
{
- return "com.sun.star.svtools.RemoteFilePicker";
+ return u"com.sun.star.svtools.RemoteFilePicker"_ustr;
}
/* XServiceInfo */
@@ -1093,7 +1093,7 @@ sal_Bool SAL_CALL SvtRemoteFilePicker::supportsService(
const OUString& sService
/* XServiceInfo */
Sequence< OUString > SAL_CALL SvtRemoteFilePicker::getSupportedServiceNames()
{
- return { "com.sun.star.ui.dialogs.RemoteFilePicker" };
+ return { u"com.sun.star.ui.dialogs.RemoteFilePicker"_ustr };
}
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx
b/fpicker/source/office/OfficeFolderPicker.cxx
index 779bbffda7ad..1c803e737820 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -149,7 +149,7 @@ void SvtFolderPicker::cancel()
/* XServiceInfo */
OUString SAL_CALL SvtFolderPicker::getImplementationName()
{
- return "com.sun.star.svtools.OfficeFolderPicker";
+ return u"com.sun.star.svtools.OfficeFolderPicker"_ustr;
}
/* XServiceInfo */
@@ -161,7 +161,7 @@ sal_Bool SAL_CALL SvtFolderPicker::supportsService( const
OUString& sServiceName
/* XServiceInfo */
Sequence< OUString > SAL_CALL SvtFolderPicker::getSupportedServiceNames()
{
- return { "com.sun.star.ui.dialogs.OfficeFolderPicker" };
+ return { u"com.sun.star.ui.dialogs.OfficeFolderPicker"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx
b/fpicker/source/office/RemoteFilesDialog.cxx
index ad23cc0dd888..50c897f35b48 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -27,20 +27,20 @@
using namespace ::svt;
RemoteFilesDialog::RemoteFilesDialog( weld::Window* pParent, PickerFlags nBits
)
- : SvtFileDialog_Base( pParent, "fps/ui/remotefilesdialog.ui",
"RemoteFilesDialog" )
+ : SvtFileDialog_Base( pParent, u"fps/ui/remotefilesdialog.ui"_ustr,
u"RemoteFilesDialog"_ustr )
, m_xContext( comphelper::getProcessComponentContext() )
, m_xMasterPasswd( PasswordContainer::create( m_xContext ) )
, m_bIsInExecute( false )
- , m_xOk_btn(m_xBuilder->weld_button("ok"))
- , m_xCancel_btn(m_xBuilder->weld_button("cancel"))
- , m_xManageServices(m_xBuilder->weld_menu_button("add_service_btn"))
- , m_xServices_lb(m_xBuilder->weld_combo_box("services_lb"))
- , m_xPathContainer(m_xBuilder->weld_container("breadcrumb_container"))
- , m_xNewFolder(m_xBuilder->weld_button("new_folder"))
- , m_xListView_btn(m_xBuilder->weld_toggle_button("list_view"))
- , m_xIconView_btn(m_xBuilder->weld_toggle_button("icon_view"))
- , m_xFilter_lb(m_xBuilder->weld_combo_box("filter_lb"))
- , m_xName_ed(new AutocompleteEdit(m_xBuilder->weld_entry("filename")))
+ , m_xOk_btn(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xCancel_btn(m_xBuilder->weld_button(u"cancel"_ustr))
+ , m_xManageServices(m_xBuilder->weld_menu_button(u"add_service_btn"_ustr))
+ , m_xServices_lb(m_xBuilder->weld_combo_box(u"services_lb"_ustr))
+ ,
m_xPathContainer(m_xBuilder->weld_container(u"breadcrumb_container"_ustr))
+ , m_xNewFolder(m_xBuilder->weld_button(u"new_folder"_ustr))
+ , m_xListView_btn(m_xBuilder->weld_toggle_button(u"list_view"_ustr))
+ , m_xIconView_btn(m_xBuilder->weld_toggle_button(u"icon_view"_ustr))
+ , m_xFilter_lb(m_xBuilder->weld_combo_box(u"filter_lb"_ustr))
+ , m_xName_ed(new
AutocompleteEdit(m_xBuilder->weld_entry(u"filename"_ustr)))
{
m_eMode = ( nBits & PickerFlags::SaveAs ) ? REMOTEDLG_MODE_SAVE :
REMOTEDLG_MODE_OPEN;
m_eType = ( nBits & PickerFlags::PathDialog ) ? REMOTEDLG_TYPE_PATHDLG :
REMOTEDLG_TYPE_FILEDLG;
@@ -83,12 +83,12 @@ RemoteFilesDialog::RemoteFilesDialog( weld::Window*
pParent, PickerFlags nBits )
m_xPath->connect_clicked( LINK( this, RemoteFilesDialog,
SelectBreadcrumbHdl ) );
m_xPath->SetMode( SvtBreadcrumbMode::ALL_VISITED );
- m_xContainer = m_xBuilder->weld_container("container");
+ m_xContainer = m_xBuilder->weld_container(u"container"_ustr);
m_xContainer->set_size_request(m_xContainer->get_approximate_digit_width()
* 82, -1);
m_xFileView.reset(new SvtFileView(m_xDialog.get(),
- m_xBuilder->weld_tree_view("fileview"),
- m_xBuilder->weld_icon_view("iconview"),
+
m_xBuilder->weld_tree_view(u"fileview"_ustr),
+
m_xBuilder->weld_icon_view(u"iconview"_ustr),
REMOTEDLG_TYPE_PATHDLG == m_eType,
bMultiselection, false));
@@ -96,7 +96,7 @@ RemoteFilesDialog::RemoteFilesDialog( weld::Window* pParent,
PickerFlags nBits )
m_xFileView->SetSelectHdl( LINK( this, RemoteFilesDialog, SelectHdl ) );
m_xFileView->EnableDelete( true );
- m_xTreeView.reset(new FolderTree(m_xBuilder->weld_tree_view("foldertree"),
m_xDialog.get()));
+ m_xTreeView.reset(new
FolderTree(m_xBuilder->weld_tree_view(u"foldertree"_ustr), m_xDialog.get()));
m_xTreeView->connect_changed(LINK(this, RemoteFilesDialog, TreeSelectHdl));
m_xContainer->set_sensitive(false);
@@ -132,7 +132,7 @@ RemoteFilesDialog::~RemoteFilesDialog()
sSize = sSize + OUString::number( aSize.Height() ) + "|";
OUString sUserData = m_xFileView->GetConfigString();
- aDlgOpt.SetUserItem( "UserData",
+ aDlgOpt.SetUserItem( u"UserData"_ustr,
Any( sSize + sUserData ) );
}
@@ -165,10 +165,10 @@ RemoteFilesDialog::~RemoteFilesDialog()
void RemoteFilesDialog::EnableExtraMenuItems(bool bEnable)
{
- m_xManageServices->set_item_visible("change_password", bEnable);
- m_xManageServices->set_item_visible("edit_service", bEnable);
- m_xManageServices->set_item_visible("delete_service", bEnable);
- m_xManageServices->set_item_visible("change_password", bEnable);
+ m_xManageServices->set_item_visible(u"change_password"_ustr, bEnable);
+ m_xManageServices->set_item_visible(u"edit_service"_ustr, bEnable);
+ m_xManageServices->set_item_visible(u"delete_service"_ustr, bEnable);
+ m_xManageServices->set_item_visible(u"change_password"_ustr, bEnable);
}
short RemoteFilesDialog::run()
@@ -200,24 +200,24 @@ static OUString lcl_GetServiceType( const ServicePtr&
pService )
OUString sHost = pService->GetUrlObject().GetHost(
INetURLObject::DecodeMechanism::WithCharset );
if( sHost.startsWith( GDRIVE_BASE_URL ) )
- return "Google Drive";
+ return u"Google Drive"_ustr;
else if( sHost.startsWith( ALFRESCO_CLOUD_BASE_URL ) )
- return "Alfresco Cloud";
+ return u"Alfresco Cloud"_ustr;
else if( sHost.startsWith( ONEDRIVE_BASE_URL ) )
- return "OneDrive";
+ return u"OneDrive"_ustr;
- return "CMIS";
+ return u"CMIS"_ustr;
}
case INetProtocol::Smb:
- return "Windows Share";
+ return u"Windows Share"_ustr;
case INetProtocol::File:
- return "SSH";
+ return u"SSH"_ustr;
case INetProtocol::Http:
- return "WebDAV";
+ return u"WebDAV"_ustr;
case INetProtocol::Https:
- return "WebDAV";
+ return u"WebDAV"_ustr;
case INetProtocol::Generic:
- return "SSH";
+ return u"SSH"_ustr;
default:
return OUString();
}
@@ -236,7 +236,7 @@ void RemoteFilesDialog::InitSize()
m_xDialog->set_window_state(aDlgOpt.GetWindowState());
- Any aUserData = aDlgOpt.GetUserItem( "UserData" );
+ Any aUserData = aDlgOpt.GetUserItem( u"UserData"_ustr );
OUString sCfgStr;
if( aUserData >>= sCfgStr )
{
@@ -327,7 +327,7 @@ void RemoteFilesDialog::AddFilter( const OUString& rFilter,
const OUString& rTyp
m_aFilters.emplace_back( rFilter, rType );
if (rType.isEmpty())
- m_xFilter_lb->append_separator("");
+ m_xFilter_lb->append_separator(u""_ustr);
else
m_xFilter_lb->append_text(sName);
@@ -363,7 +363,7 @@ void RemoteFilesDialog::OpenURL( OUString const & sURL )
m_pCurrentAsyncAction->execute( sURL, sFilter, -1, -1, GetDenyList() );
if( m_eMode != REMOTEDLG_MODE_SAVE )
- m_xName_ed->set_text( "" );
+ m_xName_ed->set_text( u""_ustr );
m_xFileView->grab_focus();
}
@@ -400,7 +400,7 @@ void RemoteFilesDialog::EnableControls()
if (m_xServices_lb->get_active() != -1)
{
- m_xManageServices->set_item_sensitive("change_password", false);
+ m_xManageServices->set_item_sensitive(u"change_password"_ustr,
false);
try
{
@@ -416,7 +416,7 @@ void RemoteFilesDialog::EnableControls()
if( aURLEntries.UserList.hasElements() )
{
-
m_xManageServices->set_item_sensitive("change_password", true);
+
m_xManageServices->set_item_sensitive(u"change_password"_ustr, true);
}
}
}
@@ -739,7 +739,7 @@ IMPL_LINK_NOARG( RemoteFilesDialog, SelectHdl,
SvtFileView*, void )
if( m_eMode == REMOTEDLG_MODE_OPEN )
{
m_sPath.clear();
- m_xName_ed->set_text( "" );
+ m_xName_ed->set_text( u""_ustr );
}
}
diff --git a/fpicker/source/office/breadcrumb.cxx
b/fpicker/source/office/breadcrumb.cxx
index 0b27367d8a8e..083e388a897f 100644
--- a/fpicker/source/office/breadcrumb.cxx
+++ b/fpicker/source/office/breadcrumb.cxx
@@ -57,7 +57,7 @@ void Breadcrumb::SetRootName( const OUString& rURL )
// we changed root - clear all fields
for (size_t i = 1; i < m_aSegments.size(); ++i)
{
- m_aSegments[i]->m_xLink->set_label("");
+ m_aSegments[i]->m_xLink->set_label(u""_ustr);
m_aSegments[i]->m_xLink->hide();
m_aSegments[i]->m_xSeparator->hide();
@@ -115,7 +115,7 @@ void Breadcrumb::SetURL( const OUString& rURL )
for (size_t i = nSegments + 1; i < m_aSegments.size(); i++ )
{
if( bClear )
- m_aSegments[i]->m_xLink->set_label( "" );
+ m_aSegments[i]->m_xLink->set_label( u""_ustr );
m_aSegments[i]->m_xLink->hide();
m_aSegments[i]->m_xSeparator->hide();
@@ -151,7 +151,7 @@ void Breadcrumb::SetURL( const OUString& rURL )
// label is too long
if( nSegments != 0 )
{
- m_aSegments[0]->m_xLink->set_label("...");
+ m_aSegments[0]->m_xLink->set_label(u"..."_ustr);
m_aSegments[0]->m_xLink->set_sensitive(false);
}
bLeft = false;
@@ -202,7 +202,7 @@ void Breadcrumb::appendField()
size_t nIndex = m_aSegments.size() - 1;
m_aSegments[nIndex]->m_xLink->hide();
m_aSegments[nIndex]->m_xLink->connect_activate_link(LINK(this, Breadcrumb,
ClickLinkHdl));
- m_aSegments[nIndex]->m_xSeparator->set_label( ">" );
+ m_aSegments[nIndex]->m_xSeparator->set_label( u">"_ustr );
m_aSegments[nIndex]->m_xSeparator->hide();
}
@@ -236,10 +236,10 @@ IMPL_LINK(Breadcrumb, ClickLinkHdl, weld::LinkButton&,
rLink, bool)
}
BreadcrumbPath::BreadcrumbPath(weld::Container* pContainer)
- : m_xBuilder(Application::CreateBuilder(pContainer,
"fps/ui/breadcrumb.ui"))
- , m_xContainer(m_xBuilder->weld_container("container"))
- , m_xLink(m_xBuilder->weld_link_button("link"))
- , m_xSeparator(m_xBuilder->weld_label("label"))
+ : m_xBuilder(Application::CreateBuilder(pContainer,
u"fps/ui/breadcrumb.ui"_ustr))
+ , m_xContainer(m_xBuilder->weld_container(u"container"_ustr))
+ , m_xLink(m_xBuilder->weld_link_button(u"link"_ustr))
+ , m_xSeparator(m_xBuilder->weld_label(u"label"_ustr))
{
}
diff --git a/fpicker/source/office/commonpicker.cxx
b/fpicker/source/office/commonpicker.cxx
index 8b7f2827df4a..b57112d56d2c 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -58,13 +58,13 @@ namespace svt
{
// the two properties we have
registerProperty(
- "HelpURL", PROPERTY_ID_HELPURL,
+ u"HelpURL"_ustr, PROPERTY_ID_HELPURL,
PropertyAttribute::TRANSIENT,
&m_sHelpURL, cppu::UnoType<decltype(m_sHelpURL)>::get()
);
registerProperty(
- "Window", PROPERTY_ID_WINDOW,
+ u"Window"_ustr, PROPERTY_ID_WINDOW,
PropertyAttribute::TRANSIENT | PropertyAttribute::READONLY,
&m_xWindow, cppu::UnoType<decltype(m_xWindow)>::get()
);
diff --git a/fpicker/source/office/contentenumeration.cxx
b/fpicker/source/office/contentenumeration.cxx
index 2a5b0156480a..1ef80e8d7c20 100644
--- a/fpicker/source/office/contentenumeration.cxx
+++ b/fpicker/source/office/contentenumeration.cxx
@@ -136,18 +136,18 @@ namespace svt
{
Reference< XResultSet > xResultSet;
- Sequence< OUString > aProps{ "Title",
- "Size",
- "DateModified",
- "DateCreated",
- "IsFolder",
- "TargetURL",
- "IsHidden",
- "IsVolume",
- "IsRemote",
- "IsRemoveable",
- "IsFloppy",
- "IsCompactDisc" };
+ Sequence< OUString > aProps{ u"Title"_ustr,
+ u"Size"_ustr,
+ u"DateModified"_ustr,
+ u"DateCreated"_ustr,
+ u"IsFolder"_ustr,
+ u"TargetURL"_ustr,
+ u"IsHidden"_ustr,
+ u"IsVolume"_ustr,
+ u"IsRemote"_ustr,
+ u"IsRemoveable"_ustr,
+ u"IsFloppy"_ustr,
+ u"IsCompactDisc"_ustr };
Reference< XCommandEnvironment > xEnvironment;
try
@@ -235,8 +235,8 @@ namespace svt
::ucbhelper::Content aCnt( aTargetURL,
xEnvironment, comphelper::getProcessComponentContext() );
try
{
- aCnt.getPropertyValue("Size") >>=
pData->maSize;
- aCnt.getPropertyValue("DateModified") >>= aDT;
+ aCnt.getPropertyValue(u"Size"_ustr) >>=
pData->maSize;
+ aCnt.getPropertyValue(u"DateModified"_ustr)
>>= aDT;
}
catch (...) {}
}
diff --git a/fpicker/source/office/fileview.cxx
b/fpicker/source/office/fileview.cxx
index 9dcb55a8cbfb..a371ceb5f2cc 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -525,7 +525,7 @@ IMPL_LINK(ViewTabListBox_Impl, CommandHdl, const
CommandEvent&, rCEvt, bool)
{
Reference< XCommandInfo > aCommands = aCnt.getCommands();
if ( aCommands.is() )
- bEnableDelete = aCommands->hasCommandByName( "delete" );
+ bEnableDelete = aCommands->hasCommandByName(
u"delete"_ustr );
else
bEnableDelete = false;
}
@@ -542,7 +542,7 @@ IMPL_LINK(ViewTabListBox_Impl, CommandHdl, const
CommandEvent&, rCEvt, bool)
Reference< XPropertySetInfo > aProps = aCnt.getProperties();
if ( aProps.is() )
{
- Property aProp = aProps->getPropertyByName("Title");
+ Property aProp = aProps->getPropertyByName(u"Title"_ustr);
bEnableRename
= !( aProp.Attributes & PropertyAttribute::READONLY );
}
@@ -566,10 +566,10 @@ IMPL_LINK(ViewTabListBox_Impl, CommandHdl, const
CommandEvent&, rCEvt, bool)
if (bEnableDelete || bEnableRename)
{
- std::unique_ptr<weld::Builder>
xBuilder(Application::CreateBuilder(mxTreeView.get(),
"svt/ui/fileviewmenu.ui"));
- auto xContextMenu = xBuilder->weld_menu("menu");
- xContextMenu->set_visible("delete", bEnableDelete);
- xContextMenu->set_visible("rename", bEnableRename);
+ std::unique_ptr<weld::Builder>
xBuilder(Application::CreateBuilder(mxTreeView.get(),
u"svt/ui/fileviewmenu.ui"_ustr));
+ auto xContextMenu = xBuilder->weld_menu(u"menu"_ustr);
+ xContextMenu->set_visible(u"delete"_ustr, bEnableDelete);
+ xContextMenu->set_visible(u"rename"_ustr, bEnableRename);
OUString sCommand(xContextMenu->popup_at_rect(mxTreeView.get(),
tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))));
ExecuteContextMenuAction(sCommand);
}
@@ -616,7 +616,7 @@ void ViewTabListBox_Impl::DeleteEntries()
::ucbhelper::Content aCnt( aURL, mxCmdEnv,
comphelper::getProcessComponentContext() );
Reference< XCommandInfo > aCommands = aCnt.getCommands();
if ( aCommands.is() )
- canDelete = aCommands->hasCommandByName( "delete" );
+ canDelete = aCommands->hasCommandByName( u"delete"_ustr );
else
canDelete = false;
}
@@ -688,7 +688,7 @@ IMPL_LINK(ViewTabListBox_Impl, EditedEntryHdl, const
IterString&, rIterString, b
try
{
- OUString aPropName( "Title" );
+ OUString aPropName( u"Title"_ustr );
bool canRename = true;
::ucbhelper::Content aContent( aURL, mxCmdEnv,
comphelper::getProcessComponentContext() );
@@ -771,7 +771,7 @@ bool ViewTabListBox_Impl::Kill( const OUString& rContent )
try
{
::ucbhelper::Content aCnt( rContent, mxCmdEnv,
comphelper::getProcessComponentContext() );
- aCnt.executeCommand( "delete", Any( true ) );
+ aCnt.executeCommand( u"delete"_ustr, Any( true ) );
}
catch( css::ucb::CommandAbortedException const & )
{
diff --git a/fpicker/source/office/fpsmartcontent.cxx
b/fpicker/source/office/fpsmartcontent.cxx
index 66f531ec5732..36f581232daf 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -208,7 +208,7 @@ namespace svt
try
{
OUString sTitle;
- m_oContent->getPropertyValue("Title") >>= sTitle;
+ m_oContent->getPropertyValue(u"Title"_ustr) >>= sTitle;
_rTitle = sTitle;
// from here on, we definitely know that the content is valid
@@ -304,7 +304,7 @@ namespace svt
if ( !sFolderType.isEmpty() )
{
ucbhelper::Content aCreated;
- Sequence< OUString > aNames { "Title" };
+ Sequence< OUString > aNames { u"Title"_ustr };
Sequence< Any > aValues { Any(_rTitle) };
m_oContent->insertNewContent( sFolderType, aNames, aValues,
aCreated );
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 801bf0080917..d154cb928832 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -274,14 +274,14 @@ namespace
// SvtFileDialog
SvtFileDialog::SvtFileDialog(weld::Window* pParent, PickerFlags nStyle)
- : SvtFileDialog_Base(pParent, "fps/ui/explorerfiledialog.ui",
"ExplorerFileDialog")
- , m_xCbReadOnly(m_xBuilder->weld_check_button("readonly"))
- , m_xCbLinkBox(m_xBuilder->weld_check_button("link"))
- , m_xCbPreviewBox(m_xBuilder->weld_check_button("cb_preview"))
- , m_xCbSelection(m_xBuilder->weld_check_button("selection"))
- , m_xPbPlay(m_xBuilder->weld_button("play"))
- , m_xPreviewFrame(m_xBuilder->weld_widget("previewframe"))
- , m_xPrevBmp(m_xBuilder->weld_image("preview"))
+ : SvtFileDialog_Base(pParent, u"fps/ui/explorerfiledialog.ui"_ustr,
u"ExplorerFileDialog"_ustr)
+ , m_xCbReadOnly(m_xBuilder->weld_check_button(u"readonly"_ustr))
+ , m_xCbLinkBox(m_xBuilder->weld_check_button(u"link"_ustr))
+ , m_xCbPreviewBox(m_xBuilder->weld_check_button(u"cb_preview"_ustr))
+ , m_xCbSelection(m_xBuilder->weld_check_button(u"selection"_ustr))
+ , m_xPbPlay(m_xBuilder->weld_button(u"play"_ustr))
+ , m_xPreviewFrame(m_xBuilder->weld_widget(u"previewframe"_ustr))
+ , m_xPrevBmp(m_xBuilder->weld_image(u"preview"_ustr))
, m_pFileNotifier(nullptr)
, m_xImpl(new SvtExpFileDlg_Impl)
, m_nPickerFlags(nStyle)
@@ -289,22 +289,22 @@ SvtFileDialog::SvtFileDialog(weld::Window* pParent,
PickerFlags nStyle)
, m_bInExecuteAsync(false)
, m_bHasFilename(false)
{
- m_xImpl->m_xCbOptions = m_xBuilder->weld_check_button("options");
- m_xImpl->m_xFtFileName = m_xBuilder->weld_label("file_name_label");
- m_xImpl->m_xEdFileName.reset(new
SvtURLBox(m_xBuilder->weld_combo_box("file_name")));
- m_xImpl->m_xFtFileType = m_xBuilder->weld_label("file_type_label");
- m_xImpl->m_xLbFilter = m_xBuilder->weld_combo_box("file_type");
- m_xImpl->m_xEdCurrentPath.reset(new
SvtURLBox(m_xBuilder->weld_combo_box("current_path")));
- m_xImpl->m_xBtnFileOpen = m_xBuilder->weld_button("open");
- m_xImpl->m_xBtnCancel = m_xBuilder->weld_button("cancel");
- m_xImpl->m_xBtnHelp = m_xBuilder->weld_button("help");
- m_xImpl->m_xBtnConnectToServer =
m_xBuilder->weld_button("connect_to_server");
- m_xImpl->m_xBtnNewFolder = m_xBuilder->weld_button("new_folder");
- m_xImpl->m_xCbPassword = m_xBuilder->weld_check_button("password");
- m_xImpl->m_xCbGPGEncrypt = m_xBuilder->weld_check_button("gpgencrypt");
- m_xImpl->m_xCbAutoExtension = m_xBuilder->weld_check_button("extension");
- m_xImpl->m_xSharedLabel = m_xBuilder->weld_label("shared_label");
- m_xImpl->m_xSharedListBox = m_xBuilder->weld_combo_box("shared");
+ m_xImpl->m_xCbOptions = m_xBuilder->weld_check_button(u"options"_ustr);
+ m_xImpl->m_xFtFileName = m_xBuilder->weld_label(u"file_name_label"_ustr);
+ m_xImpl->m_xEdFileName.reset(new
SvtURLBox(m_xBuilder->weld_combo_box(u"file_name"_ustr)));
+ m_xImpl->m_xFtFileType = m_xBuilder->weld_label(u"file_type_label"_ustr);
+ m_xImpl->m_xLbFilter = m_xBuilder->weld_combo_box(u"file_type"_ustr);
+ m_xImpl->m_xEdCurrentPath.reset(new
SvtURLBox(m_xBuilder->weld_combo_box(u"current_path"_ustr)));
+ m_xImpl->m_xBtnFileOpen = m_xBuilder->weld_button(u"open"_ustr);
+ m_xImpl->m_xBtnCancel = m_xBuilder->weld_button(u"cancel"_ustr);
+ m_xImpl->m_xBtnHelp = m_xBuilder->weld_button(u"help"_ustr);
+ m_xImpl->m_xBtnConnectToServer =
m_xBuilder->weld_button(u"connect_to_server"_ustr);
+ m_xImpl->m_xBtnNewFolder = m_xBuilder->weld_button(u"new_folder"_ustr);
+ m_xImpl->m_xCbPassword = m_xBuilder->weld_check_button(u"password"_ustr);
+ m_xImpl->m_xCbGPGEncrypt =
m_xBuilder->weld_check_button(u"gpgencrypt"_ustr);
+ m_xImpl->m_xCbAutoExtension =
m_xBuilder->weld_check_button(u"extension"_ustr);
+ m_xImpl->m_xSharedLabel = m_xBuilder->weld_label(u"shared_label"_ustr);
+ m_xImpl->m_xSharedListBox = m_xBuilder->weld_combo_box(u"shared"_ustr);
// because the "<All Formats> (*.bmp,*...)" entry is too wide,
// we need to disable the auto width feature of the filter box
@@ -312,8 +312,8 @@ SvtFileDialog::SvtFileDialog(weld::Window* pParent,
PickerFlags nStyle)
m_xImpl->m_xSharedListBox->set_size_request(nWidth, -1);
m_xImpl->m_xLbFilter->set_size_request(nWidth, -1);
- m_xImpl->m_xBtnUp.reset(new
SvtUpButton_Impl(m_xBuilder->weld_toolbar("up_bar"),
-
m_xBuilder->weld_menu("up_menu"),
+ m_xImpl->m_xBtnUp.reset(new
SvtUpButton_Impl(m_xBuilder->weld_toolbar(u"up_bar"_ustr),
+
m_xBuilder->weld_menu(u"up_menu"_ustr),
this));
m_xImpl->m_xBtnUp->set_help_id(HID_FILEOPEN_LEVELUP);
m_xImpl->m_xBtnUp->show();
@@ -344,12 +344,12 @@ SvtFileDialog::SvtFileDialog(weld::Window* pParent,
PickerFlags nStyle)
if (nStyle & PickerFlags::MultiSelection)
m_xImpl->m_bMultiSelection = true;
- m_xContainer = m_xBuilder->weld_container("container");
+ m_xContainer = m_xBuilder->weld_container(u"container"_ustr);
m_xContainer->set_size_request(m_xContainer->get_approximate_digit_width()
* 95, -1);
m_xFileView.reset(new SvtFileView(m_xDialog.get(),
- m_xBuilder->weld_tree_view("fileview"),
- m_xBuilder->weld_icon_view("iconview"),
+
m_xBuilder->weld_tree_view(u"fileview"_ustr),
+
m_xBuilder->weld_icon_view(u"iconview"_ustr),
FILEDLG_TYPE_PATHDLG ==
m_xImpl->m_eDlgType,
m_xImpl->m_bMultiSelection));
m_xFileView->set_help_id( HID_FILEDLG_STANDARD );
@@ -451,7 +451,7 @@ SvtFileDialog::SvtFileDialog(weld::Window* pParent,
PickerFlags nStyle)
/// read our settings from the configuration
m_aConfiguration = OConfigurationTreeRoot::createWithComponentContext(
::comphelper::getProcessComponentContext(),
- "/org.openoffice.Office.UI/FilePicker"
+ u"/org.openoffice.Office.UI/FilePicker"_ustr
);
m_xDialog->connect_size_allocate(LINK(this, SvtFileDialog, SizeAllocHdl));
@@ -468,7 +468,7 @@ SvtFileDialog::~SvtFileDialog()
SvtViewOptions aDlgOpt( EViewType::Dialog, m_xImpl->m_aIniKey );
aDlgOpt.SetWindowState(m_xDialog->get_window_state(vcl::WindowDataMask::All));
OUString sUserData = m_xFileView->GetConfigString();
- aDlgOpt.SetUserItem( "UserData",
+ aDlgOpt.SetUserItem( u"UserData"_ustr,
Any( sUserData ) );
}
@@ -1392,7 +1392,7 @@ void SvtFileDialog::displayIOException( const OUString&
_rURL, IOErrorCode _eCod
aException.Arguments =
{ css::uno::Any(sDisplayPath),
css::uno::Any(PropertyValue(
- "Uri",
+ u"Uri"_ustr,
-1, aException.Arguments[ 0 ], PropertyState_DIRECT_VALUE
)) };
// (formerly, it was sufficient to put the URL first parameter.
Nowadays,
@@ -1463,7 +1463,7 @@ bool SvtFileDialog::PrepareExecute()
INetURLObject::DecodeMechanism::NONE ),
Reference< XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- Sequence< OUString > aProps { "IsVolume", "IsRemoveable" };
+ Sequence< OUString > aProps { u"IsVolume"_ustr,
u"IsRemoveable"_ustr };
Reference< XResultSet > xResultSet
= aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_FOLDERS_ONLY
);
@@ -1620,12 +1620,12 @@ void SvtFileDialog::executeAsync(
::svt::AsyncPickerAction::Action eAction,
m_pCurrentAsyncAction = new AsyncPickerAction( this, m_xFileView.get(),
eAction );
bool bReallyAsync = true;
- m_aConfiguration.getNodeValue( OUString( "FillAsynchronously" ) ) >>=
bReallyAsync;
+ m_aConfiguration.getNodeValue( u"FillAsynchronously"_ustr ) >>=
bReallyAsync;
sal_Int32 nMinTimeout = 0;
- m_aConfiguration.getNodeValue( OUString( "Timeout/Min" ) ) >>= nMinTimeout;
+ m_aConfiguration.getNodeValue( u"Timeout/Min"_ustr ) >>= nMinTimeout;
sal_Int32 nMaxTimeout = 0;
- m_aConfiguration.getNodeValue( OUString( "Timeout/Max" ) ) >>= nMaxTimeout;
+ m_aConfiguration.getNodeValue( u"Timeout/Max"_ustr ) >>= nMaxTimeout;
m_bInExecuteAsync = true;
m_pCurrentAsyncAction->execute(rURL, rFilter, bReallyAsync ? nMinTimeout :
-1, nMaxTimeout, GetDenyList());
@@ -1784,7 +1784,7 @@ void SvtFileDialog::InitSize()
{
m_xDialog->set_window_state(aDlgOpt.GetWindowState());
- Any aUserData = aDlgOpt.GetUserItem( "UserData");
+ Any aUserData = aDlgOpt.GetUserItem( u"UserData"_ustr);
OUString sCfgStr;
if ( aUserData >>= sCfgStr )
m_xFileView->SetConfigString( sCfgStr );
@@ -2130,11 +2130,11 @@ void SvtFileDialog::AddControls_Impl( )
m_xImpl->m_xSharedListBox->show();
}
- m_xImpl->m_xPlaces.reset(new
PlacesListBox(m_xBuilder->weld_tree_view("places"),
- m_xBuilder->weld_button("add"),
- m_xBuilder->weld_button("del"),
+ m_xImpl->m_xPlaces.reset(new
PlacesListBox(m_xBuilder->weld_tree_view(u"places"_ustr),
+
m_xBuilder->weld_button(u"add"_ustr),
+
m_xBuilder->weld_button(u"del"_ustr),
this));
- m_xImpl->m_xPlaces->set_help_id("SVT_HID_FILESAVE_PLACES_LISTBOX");
+ m_xImpl->m_xPlaces->set_help_id(u"SVT_HID_FILESAVE_PLACES_LISTBOX"_ustr);
m_xImpl->m_xPlaces->SetAddHdl( LINK ( this, SvtFileDialog,
AddPlacePressed_Hdl ) );
m_xImpl->m_xPlaces->SetDelHdl( LINK ( this, SvtFileDialog,
RemovePlacePressed_Hdl ) );
@@ -2298,9 +2298,9 @@ void SvtFileDialog::initDefaultPlaces( )
QueryFolderNameDialog::QueryFolderNameDialog(weld::Window* _pParent,
const OUString& rTitle, const OUString& rDefaultText)
- : GenericDialogController(_pParent, "fps/ui/foldernamedialog.ui",
"FolderNameDialog")
- , m_xNameEdit(m_xBuilder->weld_entry("entry"))
- , m_xOKBtn(m_xBuilder->weld_button("ok"))
+ : GenericDialogController(_pParent, u"fps/ui/foldernamedialog.ui"_ustr,
u"FolderNameDialog"_ustr)
+ , m_xNameEdit(m_xBuilder->weld_entry(u"entry"_ustr))
+ , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr))
{
m_xDialog->set_title(rTitle);
m_xNameEdit->set_text(rDefaultText);
diff --git a/fpicker/source/office/iodlgimp.cxx
b/fpicker/source/office/iodlgimp.cxx
index 547456c2cf68..71886c87a9e4 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -53,7 +53,7 @@
SvtUpButton_Impl::SvtUpButton_Impl(std::unique_ptr<weld::Toolbar> xToolbar,
, m_xMenu(std::move(xMenu))
, m_pDlg(pDlg)
{
- m_xToolbar->set_item_menu("up_btn", m_xMenu.get());
+ m_xToolbar->set_item_menu(u"up_btn"_ustr, m_xMenu.get());
m_xToolbar->connect_clicked(LINK(this, SvtUpButton_Impl, ClickHdl));
m_xMenu->connect_activate(LINK(this, SvtUpButton_Impl, SelectHdl));
}
