sdext/qa/unit/pdfimport.cxx | 92 +++++------
sdext/source/minimizer/configurationaccess.cxx | 68 ++++----
sdext/source/minimizer/fileopendialog.cxx | 4
sdext/source/minimizer/graphiccollector.cxx | 38 ++--
sdext/source/minimizer/impoptimizer.cxx | 98 ++++++------
sdext/source/minimizer/informationdialog.cxx | 8 -
sdext/source/minimizer/optimizerdialog.cxx | 78 +++++-----
sdext/source/minimizer/optimizerdialogcontrols.cxx | 12 -
sdext/source/minimizer/pppoptimizerdialog.cxx | 4
sdext/source/pdfimport/filterdet.cxx | 12 -
sdext/source/pdfimport/inc/pdfihelper.hxx | 12 -
sdext/source/pdfimport/misc/pdfihelper.cxx | 4
sdext/source/pdfimport/odf/odfemitter.cxx | 2
sdext/source/pdfimport/pdfiadaptor.cxx | 18 +-
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 2
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 152 +++++++++----------
sdext/source/pdfimport/tree/imagecontainer.cxx | 4
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 42 ++---
sdext/source/pdfimport/tree/style.cxx | 12 -
sdext/source/pdfimport/tree/writertreevisiting.cxx | 162 ++++++++++-----------
sdext/source/pdfimport/wrapper/wrapper.cxx | 4
uui/source/authfallbackdlg.cxx | 18 +-
uui/source/fltdlg.cxx | 7
uui/source/iahndl-filter.cxx | 10 -
uui/source/iahndl.cxx | 4
uui/source/interactionhandler.cxx | 24 +--
uui/source/logindlg.cxx | 30 +--
uui/source/masterpasscrtdlg.cxx | 12 -
uui/source/masterpassworddlg.cxx | 6
uui/source/nameclashdlg.cxx | 12 -
uui/source/openlocked.cxx | 16 +-
uui/source/passwordcontainer.cxx | 4
uui/source/passworddlg.cxx | 12 -
uui/source/requeststringresolver.cxx | 4
uui/source/secmacrowarnings.cxx | 22 +-
uui/source/sslwarndlg.cxx | 4
uui/source/unknownauthdlg.cxx | 9 -
37 files changed, 512 insertions(+), 510 deletions(-)
New commits:
commit 4a19fefaee65b62377fa296698a4ca16dc279c4f
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed May 15 20:46:04 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu May 16 08:49:53 2024 +0200
loplugin:ostr in uui
Change-Id: I17bab541e4efb6cff0818ee0fad48800d7ff73be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167708
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx
index daad28b77feb..7b101b5258c0 100644
--- a/uui/source/authfallbackdlg.cxx
+++ b/uui/source/authfallbackdlg.cxx
@@ -11,16 +11,16 @@
AuthFallbackDlg::AuthFallbackDlg(weld::Window* pParent, const OUString&
instructions,
const OUString& url)
- : GenericDialogController(pParent, "uui/ui/authfallback.ui",
"AuthFallbackDlg")
+ : GenericDialogController(pParent, u"uui/ui/authfallback.ui"_ustr,
u"AuthFallbackDlg"_ustr)
, m_bGoogleMode(false)
- , m_xTVInstructions(m_xBuilder->weld_label("instructions"))
- , m_xEDUrl(m_xBuilder->weld_entry("url"))
- , m_xEDCode(m_xBuilder->weld_entry("code"))
- , m_xEDGoogleCode(m_xBuilder->weld_entry("google_code"))
- , m_xBTOk(m_xBuilder->weld_button("ok"))
- , m_xBTCancel(m_xBuilder->weld_button("cancel"))
- , m_xGoogleBox(m_xBuilder->weld_widget("GDrive"))
- , m_xOneDriveBox(m_xBuilder->weld_widget("OneDrive"))
+ , m_xTVInstructions(m_xBuilder->weld_label(u"instructions"_ustr))
+ , m_xEDUrl(m_xBuilder->weld_entry(u"url"_ustr))
+ , m_xEDCode(m_xBuilder->weld_entry(u"code"_ustr))
+ , m_xEDGoogleCode(m_xBuilder->weld_entry(u"google_code"_ustr))
+ , m_xBTOk(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xBTCancel(m_xBuilder->weld_button(u"cancel"_ustr))
+ , m_xGoogleBox(m_xBuilder->weld_widget(u"GDrive"_ustr))
+ , m_xOneDriveBox(m_xBuilder->weld_widget(u"OneDrive"_ustr))
{
m_xBTOk->connect_clicked(LINK(this, AuthFallbackDlg, OKHdl));
m_xBTCancel->connect_clicked(LINK(this, AuthFallbackDlg, CancelHdl));
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 748a2dc421a2..0aeee3a221f6 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -40,10 +40,11 @@ namespace uui
@threadsafe no
*/
/*-*************************************************************************************************************/
FilterDialog::FilterDialog(weld::Window* pParentWindow)
- : GenericDialogController(pParentWindow, "uui/ui/filterselect.ui",
"FilterSelectDialog")
+ : GenericDialogController(pParentWindow, u"uui/ui/filterselect.ui"_ustr,
+ u"FilterSelectDialog"_ustr)
, m_pFilterNames(nullptr)
- , m_xFtURL(m_xBuilder->weld_label("url"))
- , m_xLbFilters(m_xBuilder->weld_tree_view("filters"))
+ , m_xFtURL(m_xBuilder->weld_label(u"url"_ustr))
+ , m_xLbFilters(m_xBuilder->weld_tree_view(u"filters"_ustr))
{
m_xLbFilters->set_size_request(m_xLbFilters->get_approximate_digit_width()
* 42,
m_xLbFilters->get_height_rows(15));
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index b2f0bf71be9c..95b3450b9881 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -90,7 +90,7 @@ handleNoSuchFilterRequest_(
try
{
xFilterContainer.set(
xContext->getServiceManager()->createInstanceWithContext(
- "com.sun.star.document.FilterFactory",
xContext ),
+ u"com.sun.star.document.FilterFactory"_ustr,
xContext ),
uno::UNO_QUERY );
}
catch ( uno::Exception const & )
@@ -120,7 +120,7 @@ handleNoSuchFilterRequest_(
// out by using DocumentService property later!
uno::Reference< container::XEnumeration > xFilters
= xFilterContainer->createSubSetEnumerationByQuery(
- "_query_all:sort_prop=uiname:iflags=1:eflags=143360");
+ u"_query_all:sort_prop=uiname:iflags=1:eflags=143360"_ustr);
while (xFilters->hasMoreElements())
{
try
@@ -129,9 +129,9 @@ handleNoSuchFilterRequest_(
uui::FilterNamePair aPair;
aPair.sInternal = lProps.getUnpackedValueOrDefault(
- "Name", OUString());
+ u"Name"_ustr, OUString());
aPair.sUI = lProps.getUnpackedValueOrDefault(
- "UIName", OUString());
+ u"UIName"_ustr, OUString());
if ( aPair.sInternal.isEmpty() || aPair.sUI.isEmpty() )
{
continue;
@@ -192,7 +192,7 @@ handleFilterOptionsRequest_(
try
{
xFilterCFG.set(
xContext->getServiceManager()->createInstanceWithContext(
- "com.sun.star.document.FilterFactory", xContext ),
+ u"com.sun.star.document.FilterFactory"_ustr,
xContext ),
uno::UNO_QUERY );
}
catch ( uno::Exception const & )
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 57613be71308..298754138990 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -294,7 +294,7 @@ bool UUIInteractionHelper::handleCustomRequest( const
Reference< XInteractionReq
if ( xHandlerInit.is() )
{
::comphelper::NamedValueCollection aInitArgs;
- aInitArgs.put( "Parent", getParentXWindow() );
+ aInitArgs.put( u"Parent"_ustr, getParentXWindow() );
xHandlerInit->initialize( aInitArgs.getWrappedPropertyValues() );
}
@@ -321,7 +321,7 @@ bool
UUIInteractionHelper::handleTypedHandlerImplementations( Reference< XIntera
// the base registration node for "typed" interaction handlers
const ::utl::OConfigurationTreeRoot aConfigRoot(
::utl::OConfigurationTreeRoot::createWithComponentContext(
m_xContext,
- "/org.openoffice.Interaction/InteractionHandlers",
+ u"/org.openoffice.Interaction/InteractionHandlers"_ustr,
-1,
::utl::OConfigurationTreeRoot::CM_READONLY
) );
diff --git a/uui/source/interactionhandler.cxx
b/uui/source/interactionhandler.cxx
index ea6ebf6d36a4..f35c32b126ba 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -77,28 +77,28 @@ public:
addPropertyChangeListener( const OUString& /*aPropertyName*/, const
css::uno::Reference< css::beans::XPropertyChangeListener >& /*xListener*/ )
override
{
throw css::uno::RuntimeException(
- "UUIInteractionHandler addPropertyChangeListener is not
supported");
+ u"UUIInteractionHandler addPropertyChangeListener is not
supported"_ustr);
}
virtual void SAL_CALL
removePropertyChangeListener( const OUString& /*aPropertyName*/, const
css::uno::Reference< css::beans::XPropertyChangeListener >& /*xListener*/ )
override
{
throw css::uno::RuntimeException(
- "UUIInteractionHandler removePropertyChangeListener is not
supported");
+ u"UUIInteractionHandler removePropertyChangeListener is not
supported"_ustr);
}
virtual void SAL_CALL
addVetoableChangeListener( const OUString& /*aPropertyName*/, const
css::uno::Reference< css::beans::XVetoableChangeListener >& /*xListener*/ )
override
{
throw css::uno::RuntimeException(
- "UUIInteractionHandler addVetoableChangeListener is not
supported");
+ u"UUIInteractionHandler addVetoableChangeListener is not
supported"_ustr);
}
virtual void SAL_CALL
removeVetoableChangeListener( const OUString& /*aPropertyName*/, const
css::uno::Reference< css::beans::XVetoableChangeListener >& /*xListener*/ )
override
{
throw css::uno::RuntimeException(
- "UUIInteractionHandler removeVetoableChangeListener is not
supported");
+ u"UUIInteractionHandler removeVetoableChangeListener is not
supported"_ustr);
}
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
@@ -137,7 +137,7 @@ UUIInteractionHandler::UUIInteractionHandler(
OUString SAL_CALL UUIInteractionHandler::getImplementationName()
{
- return "com.sun.star.comp.uui.UUIInteractionHandler";
+ return u"com.sun.star.comp.uui.UUIInteractionHandler"_ustr;
}
sal_Bool SAL_CALL
@@ -149,11 +149,11 @@ UUIInteractionHandler::supportsService(OUString const &
rServiceName)
uno::Sequence< OUString > SAL_CALL
UUIInteractionHandler::getSupportedServiceNames()
{
- return { "com.sun.star.task.InteractionHandler",
+ return { u"com.sun.star.task.InteractionHandler"_ustr,
// added to indicate support for configuration.backend.MergeRecoveryRequest
- "com.sun.star.configuration.backend.InteractionHandler",
+ u"com.sun.star.configuration.backend.InteractionHandler"_ustr,
// for backwards compatibility
- "com.sun.star.uui.InteractionHandler" };
+ u"com.sun.star.uui.InteractionHandler"_ustr };
}
void SAL_CALL
@@ -171,13 +171,13 @@ UUIInteractionHandler::initialize(
(rArguments[1] >>= aContext))))
{
::comphelper::NamedValueCollection aProperties( rArguments );
- if ( aProperties.has( "Parent" ) )
+ if ( aProperties.has( u"Parent"_ustr ) )
{
- OSL_VERIFY( aProperties.get( "Parent" ) >>= xWindow );
+ OSL_VERIFY( aProperties.get( u"Parent"_ustr ) >>= xWindow );
}
- if ( aProperties.has( "Context" ) )
+ if ( aProperties.has( u"Context"_ustr ) )
{
- OSL_VERIFY( aProperties.get( "Context" ) >>= aContext );
+ OSL_VERIFY( aProperties.get( u"Context"_ustr ) >>= aContext );
}
}
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index cb661c3534c5..4449506b5175 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -83,13 +83,13 @@ void LoginDialog::SetRequest()
OUString aRequest;
if (m_xAccountFT->get_visible() && !m_realm.isEmpty())
{
- std::unique_ptr<weld::Label> xText(m_xBuilder->weld_label(oldPwd ?
OUString("wrongloginrealm") : OUString("loginrealm")));
+ std::unique_ptr<weld::Label> xText(m_xBuilder->weld_label(oldPwd ?
u"wrongloginrealm"_ustr : u"loginrealm"_ustr));
aRequest = xText->get_label();
aRequest = aRequest.replaceAll("%2", m_realm);
}
else
{
- std::unique_ptr<weld::Label> xText(m_xBuilder->weld_label(oldPwd ?
OUString("wrongrequestinfo") : OUString("requestinfo")));
+ std::unique_ptr<weld::Label> xText(m_xBuilder->weld_label(oldPwd ?
u"wrongrequestinfo"_ustr : u"requestinfo"_ustr));
aRequest = xText->get_label();
}
aRequest = aRequest.replaceAll("%1", m_server);
@@ -111,19 +111,19 @@ IMPL_LINK_NOARG(LoginDialog, UseSysCredsHdl_Impl,
weld::Toggleable&, void)
LoginDialog::LoginDialog(weld::Window* pParent, LoginFlags nFlags,
OUString aServer, OUString aRealm)
- : GenericDialogController(pParent, "uui/ui/logindialog.ui", "LoginDialog")
- , m_xErrorFT(m_xBuilder->weld_label("errorft"))
- , m_xErrorInfo(m_xBuilder->weld_label("errorinfo"))
- , m_xRequestInfo(m_xBuilder->weld_label("requestinfo"))
- , m_xNameFT(m_xBuilder->weld_label("nameft"))
- , m_xNameED(m_xBuilder->weld_entry("nameed"))
- , m_xPasswordFT(m_xBuilder->weld_label("passwordft"))
- , m_xPasswordED(m_xBuilder->weld_entry("passworded"))
- , m_xAccountFT(m_xBuilder->weld_label("accountft"))
- , m_xAccountED(m_xBuilder->weld_entry("accounted"))
- , m_xSavePasswdBtn(m_xBuilder->weld_check_button("remember"))
- , m_xUseSysCredsCB(m_xBuilder->weld_check_button("syscreds"))
- , m_xOKBtn(m_xBuilder->weld_button("ok"))
+ : GenericDialogController(pParent, u"uui/ui/logindialog.ui"_ustr,
u"LoginDialog"_ustr)
+ , m_xErrorFT(m_xBuilder->weld_label(u"errorft"_ustr))
+ , m_xErrorInfo(m_xBuilder->weld_label(u"errorinfo"_ustr))
+ , m_xRequestInfo(m_xBuilder->weld_label(u"requestinfo"_ustr))
+ , m_xNameFT(m_xBuilder->weld_label(u"nameft"_ustr))
+ , m_xNameED(m_xBuilder->weld_entry(u"nameed"_ustr))
+ , m_xPasswordFT(m_xBuilder->weld_label(u"passwordft"_ustr))
+ , m_xPasswordED(m_xBuilder->weld_entry(u"passworded"_ustr))
+ , m_xAccountFT(m_xBuilder->weld_label(u"accountft"_ustr))
+ , m_xAccountED(m_xBuilder->weld_entry(u"accounted"_ustr))
+ , m_xSavePasswdBtn(m_xBuilder->weld_check_button(u"remember"_ustr))
+ , m_xUseSysCredsCB(m_xBuilder->weld_check_button(u"syscreds"_ustr))
+ , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr))
, m_server(std::move(aServer)), m_realm(std::move(aRealm))
{
if ( !( nFlags & LoginFlags::NoUseSysCreds ) )
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index f0c456365646..f38861a04cca 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -72,13 +72,13 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl,
weld::Button&, void)
}
MasterPasswordCreateDialog::MasterPasswordCreateDialog(weld::Window* pParent,
const std::locale& rLocale)
- : GenericDialogController(pParent, "uui/ui/setmasterpassworddlg.ui",
"SetMasterPasswordDialog")
+ : GenericDialogController(pParent, u"uui/ui/setmasterpassworddlg.ui"_ustr,
u"SetMasterPasswordDialog"_ustr)
, rResLocale(rLocale)
- , m_xEDMasterPasswordCrt(m_xBuilder->weld_entry("password1"))
- , m_xPasswordPolicyLabel(m_xBuilder->weld_label("passpolicylabel"))
- , m_xEDMasterPasswordRepeat(m_xBuilder->weld_entry("password2"))
- , m_xOKBtn(m_xBuilder->weld_button("ok"))
- , m_xPasswdStrengthBar(m_xBuilder->weld_level_bar("password1levelbar"))
+ , m_xEDMasterPasswordCrt(m_xBuilder->weld_entry(u"password1"_ustr))
+ , m_xPasswordPolicyLabel(m_xBuilder->weld_label(u"passpolicylabel"_ustr))
+ , m_xEDMasterPasswordRepeat(m_xBuilder->weld_entry(u"password2"_ustr))
+ , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr))
+ ,
m_xPasswdStrengthBar(m_xBuilder->weld_level_bar(u"password1levelbar"_ustr))
,
m_oPasswordPolicy(officecfg::Office::Common::Security::Scripting::PasswordPolicy::get())
{
m_xOKBtn->set_sensitive(false);
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index 7fcc7f2d7972..14235d77c80a 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -36,9 +36,9 @@ MasterPasswordDialog::MasterPasswordDialog
css::task::PasswordRequestMode nDialogMode,
const std::locale& rLocale
)
- : GenericDialogController(pParent, "uui/ui/masterpassworddlg.ui",
"MasterPasswordDialog")
- , m_xEDMasterPassword(m_xBuilder->weld_entry("password"))
- , m_xOKBtn(m_xBuilder->weld_button("ok"))
+ : GenericDialogController(pParent, u"uui/ui/masterpassworddlg.ui"_ustr,
u"MasterPasswordDialog"_ustr)
+ , m_xEDMasterPassword(m_xBuilder->weld_entry(u"password"_ustr))
+ , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr))
{
if( nDialogMode == css::task::PasswordRequestMode_PASSWORD_REENTER )
{
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index e49174bd688e..aec4e918422c 100644
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -56,13 +56,13 @@ NameClashDialog::NameClashDialog( weld::Window* pParent,
const std::locale& rRes
OUString const & rClashingName,
OUString const & rProposedNewName,
bool bAllowOverwrite )
- : GenericDialogController(pParent, "uui/ui/simplenameclash.ui",
"SimpleNameClashDialog")
+ : GenericDialogController(pParent, u"uui/ui/simplenameclash.ui"_ustr,
u"SimpleNameClashDialog"_ustr)
, m_aNewName(rClashingName)
- , m_xFTMessage(m_xBuilder->weld_label("warning"))
- , m_xEDNewName(m_xBuilder->weld_entry("newname"))
- , m_xBtnOverwrite(m_xBuilder->weld_button("replace"))
- , m_xBtnRename(m_xBuilder->weld_button("rename"))
- , m_xBtnCancel(m_xBuilder->weld_button("cancel"))
+ , m_xFTMessage(m_xBuilder->weld_label(u"warning"_ustr))
+ , m_xEDNewName(m_xBuilder->weld_entry(u"newname"_ustr))
+ , m_xBtnOverwrite(m_xBuilder->weld_button(u"replace"_ustr))
+ , m_xBtnRename(m_xBuilder->weld_button(u"rename"_ustr))
+ , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr))
{
Link<weld::Button&,void> aLink( LINK( this, NameClashDialog,
ButtonHdl_Impl ) );
m_xBtnOverwrite->connect_clicked( aLink );
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index adcf060a2274..51e86e1b2bbe 100644
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
@@ -48,14 +48,14 @@ IMPL_LINK(OpenLockedQueryBox, ClickHdl, weld::Button&,
rButton, void)
}
OpenLockedQueryBox::OpenLockedQueryBox(weld::Window* pParent, const OUString&
rHiddenData, bool bEnableOverride)
- : GenericDialogController(pParent, "vcl/ui/openlockedquerybox.ui",
"OpenLockedQueryBox")
- , mxQuestionMarkImage(m_xBuilder->weld_image("questionmark"))
- , mxOpenReadOnlyBtn(m_xBuilder->weld_button("readonly"))
- , mxOpenCopyBtn(m_xBuilder->weld_button("opencopy"))
- , mxOpenBtn(m_xBuilder->weld_button("open"))
- , mxCancelBtn(m_xBuilder->weld_button("cancel"))
- , mxNotifyBtn(m_xBuilder->weld_check_button("notify"))
- , mxHiddenText(m_xBuilder->weld_label("hiddentext"))
+ : GenericDialogController(pParent, u"vcl/ui/openlockedquerybox.ui"_ustr,
u"OpenLockedQueryBox"_ustr)
+ , mxQuestionMarkImage(m_xBuilder->weld_image(u"questionmark"_ustr))
+ , mxOpenReadOnlyBtn(m_xBuilder->weld_button(u"readonly"_ustr))
+ , mxOpenCopyBtn(m_xBuilder->weld_button(u"opencopy"_ustr))
+ , mxOpenBtn(m_xBuilder->weld_button(u"open"_ustr))
+ , mxCancelBtn(m_xBuilder->weld_button(u"cancel"_ustr))
+ , mxNotifyBtn(m_xBuilder->weld_check_button(u"notify"_ustr))
+ , mxHiddenText(m_xBuilder->weld_label(u"hiddentext"_ustr))
{
//setup click hdl
mxOpenReadOnlyBtn->connect_clicked(LINK(this, OpenLockedQueryBox,
ClickHdl));
diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx
index 80ad1495a72d..6ee43e14b327 100644
--- a/uui/source/passwordcontainer.cxx
+++ b/uui/source/passwordcontainer.cxx
@@ -290,7 +290,7 @@
PasswordContainerInteractionHandler::~PasswordContainerInteractionHandler()
OUString SAL_CALL
PasswordContainerInteractionHandler::getImplementationName()
{
- return "com.sun.star.comp.uui.PasswordContainerInteractionHandler";
+ return u"com.sun.star.comp.uui.PasswordContainerInteractionHandler"_ustr;
}
@@ -307,7 +307,7 @@ PasswordContainerInteractionHandler::supportsService(
uno::Sequence< OUString > SAL_CALL
PasswordContainerInteractionHandler::getSupportedServiceNames()
{
- return { "com.sun.star.task.PasswordContainerInteractionHandler" };
+ return { u"com.sun.star.task.PasswordContainerInteractionHandler"_ustr };
}
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index fb4c95e623f6..7579a8d6d567 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -32,12 +32,12 @@ using namespace ::com::sun::star;
PasswordDialog::PasswordDialog(weld::Window* pParent,
task::PasswordRequestMode nDialogMode, const std::locale& rResLocale,
const OUString& aDocURL, bool bOpenToModify, bool bIsSimplePasswordRequest)
- : GenericDialogController(pParent, "uui/ui/password.ui", "PasswordDialog")
- , m_xFTPassword(m_xBuilder->weld_label("newpassFT"))
- , m_xEDPassword(m_xBuilder->weld_entry("newpassEntry"))
- , m_xFTConfirmPassword(m_xBuilder->weld_label("confirmpassFT"))
- , m_xEDConfirmPassword(m_xBuilder->weld_entry("confirmpassEntry"))
- , m_xOKBtn(m_xBuilder->weld_button("ok"))
+ : GenericDialogController(pParent, u"uui/ui/password.ui"_ustr,
u"PasswordDialog"_ustr)
+ , m_xFTPassword(m_xBuilder->weld_label(u"newpassFT"_ustr))
+ , m_xEDPassword(m_xBuilder->weld_entry(u"newpassEntry"_ustr))
+ , m_xFTConfirmPassword(m_xBuilder->weld_label(u"confirmpassFT"_ustr))
+ , m_xEDConfirmPassword(m_xBuilder->weld_entry(u"confirmpassEntry"_ustr))
+ , m_xOKBtn(m_xBuilder->weld_button(u"ok"_ustr))
, nMinLen(1)
, aPasswdMismatch(Translate::get(STR_PASSWORD_MISMATCH, rResLocale))
{
diff --git a/uui/source/requeststringresolver.cxx
b/uui/source/requeststringresolver.cxx
index baaaf088713c..52a036980f01 100644
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
@@ -39,7 +39,7 @@
UUIInteractionRequestStringResolver::~UUIInteractionRequestStringResolver()
OUString SAL_CALL
UUIInteractionRequestStringResolver::getImplementationName()
{
- return "com.sun.star.comp.uui.UUIInteractionRequestStringResolver";
+ return u"com.sun.star.comp.uui.UUIInteractionRequestStringResolver"_ustr;
}
sal_Bool SAL_CALL
@@ -53,7 +53,7 @@ UUIInteractionRequestStringResolver::supportsService(
uno::Sequence< OUString > SAL_CALL
UUIInteractionRequestStringResolver::getSupportedServiceNames()
{
- return { "com.sun.star.task.InteractionRequestStringResolver" };
+ return { u"com.sun.star.task.InteractionRequestStringResolver"_ustr };
}
beans::Optional< OUString > SAL_CALL
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 8868e93d5cd2..701bf73721f4 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -40,16 +40,16 @@ using namespace ::com::sun::star;
using namespace comphelper;
MacroWarning::MacroWarning(weld::Window* pParent, bool _bWithSignatures)
- : MessageDialogController(pParent, "uui/ui/macrowarnmedium.ui",
"MacroWarnMedium", "grid")
- , mxGrid(m_xBuilder->weld_widget("grid"))
- , mxSignsFI(m_xBuilder->weld_label("signsLabel"))
- , mxNotYetValid(m_xBuilder->weld_label("certNotYetValidLabel"))
- , mxNoLongerValid(m_xBuilder->weld_label("certNoLongerValidLabel"))
- , mxViewSignsBtn(m_xBuilder->weld_button("viewSignsButton"))
- , mxViewCertBtn(m_xBuilder->weld_button("viewCertButton"))
- , mxAlwaysTrustCB(m_xBuilder->weld_check_button("alwaysTrustCheckbutton"))
- , mxEnableBtn(m_xBuilder->weld_button("ok"))
- , mxDisableBtn(m_xBuilder->weld_button("cancel"))
+ : MessageDialogController(pParent, u"uui/ui/macrowarnmedium.ui"_ustr,
u"MacroWarnMedium"_ustr, u"grid"_ustr)
+ , mxGrid(m_xBuilder->weld_widget(u"grid"_ustr))
+ , mxSignsFI(m_xBuilder->weld_label(u"signsLabel"_ustr))
+ , mxNotYetValid(m_xBuilder->weld_label(u"certNotYetValidLabel"_ustr))
+ , mxNoLongerValid(m_xBuilder->weld_label(u"certNoLongerValidLabel"_ustr))
+ , mxViewSignsBtn(m_xBuilder->weld_button(u"viewSignsButton"_ustr))
+ , mxViewCertBtn(m_xBuilder->weld_button(u"viewCertButton"_ustr))
+ ,
mxAlwaysTrustCB(m_xBuilder->weld_check_button(u"alwaysTrustCheckbutton"_ustr))
+ , mxEnableBtn(m_xBuilder->weld_button(u"ok"_ustr))
+ , mxDisableBtn(m_xBuilder->weld_button(u"cancel"_ustr))
, mpInfos ( nullptr )
, mbShowSignatures ( _bWithSignatures )
, mnActSecLevel ( 0 )
@@ -156,7 +156,7 @@ void MacroWarning::EnableOkBtn(bool bEnable)
{
mxEnableBtn->set_sensitive(bEnable);
std::locale aResLocale(Translate::Create("uui"));
- mxEnableBtn->set_tooltip_text(bEnable ? "" :
Translate::get(STR_VERIFY_CERT, aResLocale));
+ mxEnableBtn->set_tooltip_text(bEnable ? u""_ustr :
Translate::get(STR_VERIFY_CERT, aResLocale));
}
void MacroWarning::SetStorage( const css::uno::Reference <
css::embed::XStorage >& rxStore,
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index be57ea1b2c57..9bd665d1ee0b 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -34,8 +34,8 @@ IMPL_LINK_NOARG(SSLWarnDialog, ViewCertHdl, weld::Button&,
void)
SSLWarnDialog::SSLWarnDialog(weld::Window* pParent,
const css::uno::Reference< css::security::XCertificate >& rXCert,
const css::uno::Reference< css::uno::XComponentContext >& xContext)
- : MessageDialogController(pParent, "uui/ui/sslwarndialog.ui",
"SSLWarnDialog")
- , m_xView(m_xBuilder->weld_button("view"))
+ : MessageDialogController(pParent, u"uui/ui/sslwarndialog.ui"_ustr,
u"SSLWarnDialog"_ustr)
+ , m_xView(m_xBuilder->weld_button(u"view"_ustr))
, m_xContext(xContext)
, m_rXCert(rXCert)
{
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 783e6c3f48a4..c8fa6cc2e14c 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -46,10 +46,11 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl,
weld::Button&, void)
UnknownAuthDialog::UnknownAuthDialog(
weld::Window* pParent, const
css::uno::Reference<css::security::XCertificate>& rXCert,
const css::uno::Reference<css::uno::XComponentContext>& xContext)
- : MessageDialogController(pParent, "uui/ui/unknownauthdialog.ui",
"UnknownAuthDialog")
- , m_xCommandButtonOK(m_xBuilder->weld_button("ok"))
- , m_xView_Certificate(m_xBuilder->weld_button("examine"))
- , m_xOptionButtonAccept(m_xBuilder->weld_radio_button("accept"))
+ : MessageDialogController(pParent, u"uui/ui/unknownauthdialog.ui"_ustr,
+ u"UnknownAuthDialog"_ustr)
+ , m_xCommandButtonOK(m_xBuilder->weld_button(u"ok"_ustr))
+ , m_xView_Certificate(m_xBuilder->weld_button(u"examine"_ustr))
+ , m_xOptionButtonAccept(m_xBuilder->weld_radio_button(u"accept"_ustr))
, m_xContext(xContext)
, m_rXCert(rXCert)
{
commit 07b673a1a6fb5edc7d58ed496f4181d59070a2a6
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed May 15 20:44:33 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu May 16 08:49:45 2024 +0200
loplugin:ostr in sdext
Change-Id: I0b67b8c8f9dbdf2fdc8192e22b838c15db960cfd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167704
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sdext/qa/unit/pdfimport.cxx b/sdext/qa/unit/pdfimport.cxx
index 462edf2e7772..6351ed999d35 100644
--- a/sdext/qa/unit/pdfimport.cxx
+++ b/sdext/qa/unit/pdfimport.cxx
@@ -94,7 +94,7 @@ namespace
rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) );
CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink bounding box",
rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI",
OUString("http://download.openoffice.org/";), m_aURI );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE( "Correct hyperlink URI",
u"http://download.openoffice.org/"_ustr, m_aURI );
const char* const sText = "
This is a testtext
New paragraph,
new line
"
"Hyperlink, this is
?
This is more text
outline mode
?
New paragraph
";
@@ -359,9 +359,9 @@ namespace
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMask received two properties",
sal_Int32(3), xBitmap.getLength() );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMask got URL param",
- OUString("URL"), xBitmap[0].Name );
+ u"URL"_ustr, xBitmap[0].Name );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMask got InputStream param",
- OUString("InputStream"), xBitmap[1].Name );
+ u"InputStream"_ustr, xBitmap[1].Name );
}
virtual void drawImage(const uno::Sequence<beans::PropertyValue>&
xBitmap ) override
@@ -369,9 +369,9 @@ namespace
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawImage received two properties",
sal_Int32(3), xBitmap.getLength() );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawImage got URL param",
- OUString("URL"), xBitmap[0].Name );
+ u"URL"_ustr, xBitmap[0].Name );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawImage got InputStream param",
- OUString("InputStream"), xBitmap[1].Name );
+ u"InputStream"_ustr, xBitmap[1].Name );
m_bImageSeen = true;
}
@@ -381,9 +381,9 @@ namespace
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawColorMaskedImage received two
properties",
sal_Int32(3), xBitmap.getLength() );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawColorMaskedImage got URL param",
- OUString("URL"), xBitmap[0].Name );
+ u"URL"_ustr, xBitmap[0].Name );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawColorMaskedImage got
InputStream param",
- OUString("InputStream"), xBitmap[1].Name );
+ u"InputStream"_ustr, xBitmap[1].Name );
}
virtual void drawMaskedImage(const
uno::Sequence<beans::PropertyValue>& xBitmap,
@@ -393,16 +393,16 @@ namespace
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMaskedImage received two
properties #1",
sal_Int32(3), xBitmap.getLength() );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMaskedImage got URL param #1",
- OUString("URL"), xBitmap[0].Name );
+ u"URL"_ustr, xBitmap[0].Name );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMaskedImage got InputStream
param #1",
- OUString("InputStream"), xBitmap[1].Name );
+ u"InputStream"_ustr, xBitmap[1].Name );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMaskedImage received two
properties #2",
sal_Int32(3), xMask.getLength() );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMaskedImage got URL param #2",
- OUString("URL"), xMask[0].Name );
+ u"URL"_ustr, xMask[0].Name );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawMaskedImage got InputStream
param #2",
- OUString("InputStream"), xMask[1].Name );
+ u"InputStream"_ustr, xMask[1].Name );
}
virtual void drawAlphaMaskedImage(const
uno::Sequence<beans::PropertyValue>& xBitmap,
@@ -411,16 +411,16 @@ namespace
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawAlphaMaskedImage received two
properties #1",
sal_Int32(3), xBitmap.getLength() );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawAlphaMaskedImage got URL param
#1",
- OUString("URL"), xBitmap[0].Name );
+ u"URL"_ustr, xBitmap[0].Name );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawAlphaMaskedImage got
InputStream param #1",
- OUString("InputStream"), xBitmap[1].Name );
+ u"InputStream"_ustr, xBitmap[1].Name );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawAlphaMaskedImage received two
properties #2",
sal_Int32(3), xMask.getLength() );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawAlphaMaskedImage got URL param
#2",
- OUString("URL"), xMask[0].Name );
+ u"URL"_ustr, xMask[0].Name );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "drawAlphaMaskedImage got
InputStream param #2",
- OUString("InputStream"), xMask[1].Name );
+ u"InputStream"_ustr, xMask[1].Name );
}
virtual void setTextRenderMode( sal_Int32 ) override
@@ -470,7 +470,7 @@ namespace
pSink,
uno::Reference< task::XInteractionHandler >(),
OUString(),
- getComponentContext(), "" ) );
+ getComponentContext(), u""_ustr ) );
pSink->check();
#endif
}
@@ -605,7 +605,7 @@ namespace
OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
"\"]/style:text-properties";
// the font-weight and font-style should be normal
- assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "normal");
+ assertXPath(pXmlDoc, xpath, "font-weight"_ostr, u"normal"_ustr);
assertXPathNoAttribute(pXmlDoc, xpath, "font-style"_ostr);
/* Test for the 2nd paragraph */
@@ -614,7 +614,7 @@ namespace
OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
"\"]/style:text-properties";
// there should be a font-weight="bold", but no font-style italic
- assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "bold");
+ assertXPath(pXmlDoc, xpath, "font-weight"_ostr, u"bold"_ustr);
assertXPathNoAttribute(pXmlDoc, xpath, "font-style"_ostr);
/* Test for the 3rd paragraph */
@@ -623,8 +623,8 @@ namespace
OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
"\"]/style:text-properties";
// there should be a font-style="italic", but no font-weight bold
- assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "normal");
- assertXPath(pXmlDoc, xpath, "font-style"_ostr, "italic");
+ assertXPath(pXmlDoc, xpath, "font-weight"_ostr, u"normal"_ustr);
+ assertXPath(pXmlDoc, xpath, "font-style"_ostr, u"italic"_ustr);
/* Test for the 4th paragraph */
styleName = getXPath(pXmlDoc,
"//draw:frame[4]//text:span[1]"_ostr, "style-name"_ostr);
@@ -632,8 +632,8 @@ namespace
OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
"\"]/style:text-properties";
// there should be both font-style="italic" and font-weight="bold"
- assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "bold");
- assertXPath(pXmlDoc, xpath, "font-style"_ostr, "italic");
+ assertXPath(pXmlDoc, xpath, "font-weight"_ostr, u"bold"_ustr);
+ assertXPath(pXmlDoc, xpath, "font-style"_ostr, u"italic"_ustr);
/* Test for the 5th paragraph */
styleName = getXPath(pXmlDoc,
"//draw:frame[5]//text:span[1]"_ostr, "style-name"_ostr);
@@ -641,8 +641,8 @@ namespace
OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
"\"]/style:text-properties";
// the font should be Arial and font-weight="bold", no font-style
- assertXPath(pXmlDoc, xpath, "font-family"_ostr, "Arial");
- assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "bold");
+ assertXPath(pXmlDoc, xpath, "font-family"_ostr, u"Arial"_ustr);
+ assertXPath(pXmlDoc, xpath, "font-weight"_ostr, u"bold"_ustr);
assertXPathNoAttribute(pXmlDoc, xpath, "font-style"_ostr);
/* Test for the 6th paragraph */
@@ -651,8 +651,8 @@ namespace
OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
"\"]/style:text-properties";
// the font should be Arial without font-weight and font-style
- assertXPath(pXmlDoc, xpath, "font-family"_ostr, "Arial");
- assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "normal");
+ assertXPath(pXmlDoc, xpath, "font-family"_ostr, u"Arial"_ustr);
+ assertXPath(pXmlDoc, xpath, "font-weight"_ostr, u"normal"_ustr);
assertXPathNoAttribute(pXmlDoc, xpath, "font-style"_ostr);
/* Test for the 7th paragraph */
@@ -661,8 +661,8 @@ namespace
OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
"\"]/style:text-properties";
// the font should be SimSun without font-weight and font-style
- assertXPath(pXmlDoc, xpath, "font-family"_ostr, "SimSun"); //
TODO: tdf#143095 use localized font name rather than PS name
- assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "normal");
+ assertXPath(pXmlDoc, xpath, "font-family"_ostr, u"SimSun"_ustr);
// TODO: tdf#143095 use localized font name rather than PS name
+ assertXPath(pXmlDoc, xpath, "font-weight"_ostr, u"normal"_ustr);
assertXPathNoAttribute(pXmlDoc, xpath, "font-style"_ostr);
/* Test for the 8th paragraph */
@@ -671,8 +671,8 @@ namespace
OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
"\"]/style:text-properties";
// the font should be SimSun and font-weight="bold", no font-style
italic
- assertXPath(pXmlDoc, xpath, "font-family"_ostr, "SimSun");
- assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "bold");
+ assertXPath(pXmlDoc, xpath, "font-family"_ostr, u"SimSun"_ustr);
+ assertXPath(pXmlDoc, xpath, "font-weight"_ostr, u"bold"_ustr);
assertXPathNoAttribute(pXmlDoc, xpath, "font-style"_ostr);
/* Test for the 9th paragraph */
@@ -681,8 +681,8 @@ namespace
OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
"\"]/style:text-properties";
// the font should be SimSun, font-weight should be "normal",
font-style="italic"
- assertXPath(pXmlDoc, xpath, "font-family"_ostr, "SimSun");
- assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "normal");
+ assertXPath(pXmlDoc, xpath, "font-family"_ostr, u"SimSun"_ustr);
+ assertXPath(pXmlDoc, xpath, "font-weight"_ostr, u"normal"_ustr);
// FIXME and remove the below comment:
// the chinese chars are shown in pdf as faux italic (fake
italic). It is currencly imported wrongly as normal font style.
// See tdf#78427 for how the faux bold problem was handled. Faux
italic may be handled using the transformation pattern.
@@ -694,8 +694,8 @@ namespace
OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
"\"]/style:text-properties";
// the font should be SimSun font-weight="bold" and
font-style="italic"
- assertXPath(pXmlDoc, xpath, "font-family"_ostr, "SimSun");
- assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "bold");
+ assertXPath(pXmlDoc, xpath, "font-family"_ostr, u"SimSun"_ustr);
+ assertXPath(pXmlDoc, xpath, "font-weight"_ostr, u"bold"_ustr);
// FIXME: faux italic, see above
// assertXPath(pXmlDoc, xpath, "font-style", "italic");
@@ -706,10 +706,10 @@ namespace
"\"]/style:text-properties";
// the font should be SimSun and there should be
style:text-outline="true"
// (i.e., the real "outline" font rather than faux bold / fake
bold)
- assertXPath(pXmlDoc, xpath, "font-family"_ostr, "SimSun");
- assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "normal");
+ assertXPath(pXmlDoc, xpath, "font-family"_ostr, u"SimSun"_ustr);
+ assertXPath(pXmlDoc, xpath, "font-weight"_ostr, u"normal"_ustr);
assertXPathNoAttribute(pXmlDoc, xpath, "font-style"_ostr);
- assertXPath(pXmlDoc, xpath, "text-outline"_ostr, "true");
+ assertXPath(pXmlDoc, xpath, "text-outline"_ostr, u"true"_ustr);
#endif
}
@@ -736,7 +736,7 @@ namespace
OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
"\"]/style:text-properties";
// the font-weight and font-style should be 600 (Semibold)
- assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "600");
+ assertXPath(pXmlDoc, xpath, "font-weight"_ostr, u"600"_ustr);
// The for the 2nd frame */
styleName = getXPath(pXmlDoc,
"//draw:frame[2]//text:span[1]"_ostr, "style-name"_ostr);
@@ -744,7 +744,7 @@ namespace
OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
"\"]/style:text-properties";
// the font-weight and font-style should be 300 (Light)
- assertXPath(pXmlDoc, xpath, "font-weight"_ostr, "300");
+ assertXPath(pXmlDoc, xpath, "font-weight"_ostr, u"300"_ustr);
#endif
}
@@ -768,7 +768,7 @@ namespace
OString xpath =
"//office:automatic-styles/style:style[@style:name=\"" +
OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
"\"]/style:text-properties";
- CPPUNIT_ASSERT_EQUAL(OUString("TimesNewRoman"),
+ CPPUNIT_ASSERT_EQUAL(u"TimesNewRoman"_ustr,
getXPath(pXmlDoc, xpath,
"font-family"_ostr).replaceAll(u" ", u""));
/* Test for the "TOTAL ESTA HOJA USD" paragraph" */
@@ -776,9 +776,9 @@ namespace
xpath = "//office:automatic-styles/style:style[@style:name=\"" +
OUStringToOString(styleName, RTL_TEXTENCODING_UTF8) +
"\"]/style:text-properties";
- CPPUNIT_ASSERT_EQUAL(OUString("TimesNewRoman"),
+ CPPUNIT_ASSERT_EQUAL(u"TimesNewRoman"_ustr,
getXPath(pXmlDoc, xpath,
"font-family"_ostr).replaceAll(u" ", u""));
- CPPUNIT_ASSERT_EQUAL(OUString("bold"),
+ CPPUNIT_ASSERT_EQUAL(u"bold"_ustr,
getXPath(pXmlDoc, xpath, "font-weight"_ostr));
#endif
}
@@ -860,24 +860,24 @@ namespace
// thus the 10th text:s should exist and the attribute "text:c"
should be "1".
OString xpath =
"//draw:frame[@draw:z-index='1'][1]/draw:text-box/text:p/text:span/text:s[10]"_ostr;
OUString sContent = getXPath(pXmlDoc, xpath, "c"_ostr);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), OUString("1"),
sContent);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), u"1"_ustr,
sContent);
// Tab test: there are 10 tabs. Text before and after the tabs are
shown in different draw frames.
// With the Liberation Serif font, the horizontal position of the
first frame is 20.03mm and the
// second frame is 94.12mm.
xpath = "//draw:frame[@draw:z-index='2'][1]"_ostr;
sContent = getXPath(pXmlDoc, xpath, "transform"_ostr);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(),
OUString("translate( 20.03mm 25.05mm )"), sContent);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), u"translate(
20.03mm 25.05mm )"_ustr, sContent);
xpath = "//draw:frame[@draw:z-index='3'][1]"_ostr;
sContent = getXPath(pXmlDoc, xpath, "transform"_ostr);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(),
OUString("translate( 94.12mm 25.05mm )"), sContent);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), u"translate(
94.12mm 25.05mm )"_ustr, sContent);
// Non-breaking space test: there are 10 NBSpaces, which are
treated as the same as normal space in PDF,
// thus each is expressed as a <text:s text:c="1" ...>.
// The 10th text:s should exist and the attribute "text:c" should
be "1".
xpath =
"//draw:frame[@draw:z-index='4'][1]/draw:text-box/text:p/text:span/text:s[10]"_ostr;
sContent = getXPath(pXmlDoc, xpath, "c"_ostr);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), OUString("1"),
sContent);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(aOutput.getStr(), u"1"_ustr,
sContent);
#endif
}
diff --git a/sdext/source/minimizer/configurationaccess.cxx
b/sdext/source/minimizer/configurationaccess.cxx
index 55e60c52ca96..de2a582a93eb 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::container;
static OUString GetPathToConfigurationRoot()
{
- return "org.openoffice.Office.PresentationMinimizer";
+ return u"org.openoffice.Office.PresentationMinimizer"_ustr;
}
void OptimizerSettings::LoadSettingsFromConfiguration( const Reference<
XNameAccess >& rSettings )
@@ -83,21 +83,21 @@ void OptimizerSettings::SaveSettingsToConfiguration( const
Reference< XNameRepla
return;
OUString pNames[] = {
- OUString("Name"),
- OUString("JPEGCompression"),
- OUString("JPEGQuality"),
- OUString("RemoveCropArea"),
- OUString("ImageResolution"),
- OUString("EmbedLinkedGraphics"),
- OUString("OLEOptimization"),
- OUString("OLEOptimizationType"),
- OUString("DeleteUnusedMasterPages"),
- OUString("DeleteHiddenSlides"),
- OUString("DeleteNotesPages"),
- OUString("SaveAs"),
+ u"Name"_ustr,
+ u"JPEGCompression"_ustr,
+ u"JPEGQuality"_ustr,
+ u"RemoveCropArea"_ustr,
+ u"ImageResolution"_ustr,
+ u"EmbedLinkedGraphics"_ustr,
+ u"OLEOptimization"_ustr,
+ u"OLEOptimizationType"_ustr,
+ u"DeleteUnusedMasterPages"_ustr,
+ u"DeleteHiddenSlides"_ustr,
+ u"DeleteNotesPages"_ustr,
+ u"SaveAs"_ustr,
// OUString("SaveAsURL"),
// OUString("FilterName"),
- OUString("OpenNewDocument") };
+ u"OpenNewDocument"_ustr };
Any pValues[] = {
Any( maName ),
@@ -170,7 +170,7 @@ void ConfigurationAccess::LoadStrings()
Reference< XInterface > xRoot( OpenConfiguration( true ) );
if ( !xRoot.is() )
break;
- Reference< container::XNameAccess > xSet( GetConfigurationNode(
xRoot, "Strings" ), UNO_QUERY );
+ Reference< container::XNameAccess > xSet( GetConfigurationNode(
xRoot, u"Strings"_ustr ), UNO_QUERY );
if ( xSet.is() )
{
const Sequence< OUString > aElements( xSet->getElementNames()
);
@@ -204,13 +204,13 @@ void ConfigurationAccess::LoadConfiguration()
Reference< XInterface > xRoot( OpenConfiguration( true ) );
if ( !xRoot.is() )
break;
- Reference< container::XNameAccess > xSet( GetConfigurationNode(
xRoot, "LastUsedSettings" ), UNO_QUERY );
+ Reference< container::XNameAccess > xSet( GetConfigurationNode(
xRoot, u"LastUsedSettings"_ustr ), UNO_QUERY );
if ( xSet.is() )
{
OptimizerSettings& rCurrent( maSettings.front() );
rCurrent.LoadSettingsFromConfiguration( xSet );
}
- xSet.set( GetConfigurationNode( xRoot, "Settings/Templates" ),
UNO_QUERY );
+ xSet.set( GetConfigurationNode( xRoot, u"Settings/Templates"_ustr
), UNO_QUERY );
if ( xSet.is() )
{
const Sequence< OUString > aElements( xSet->getElementNames()
);
@@ -248,12 +248,12 @@ void ConfigurationAccess::SaveConfiguration()
Reference<util::XChangesBatch> xRoot( OpenConfiguration( false ),
UNO_QUERY_THROW );
// storing the last used settings
- Reference< container::XNameReplace > xSet( GetConfigurationNode(
xRoot, "LastUsedSettings" ), UNO_QUERY_THROW );
+ Reference< container::XNameReplace > xSet( GetConfigurationNode(
xRoot, u"LastUsedSettings"_ustr ), UNO_QUERY_THROW );
OptimizerSettings& rCurrent( maSettings.front() );
rCurrent.SaveSettingsToConfiguration( xSet );
// updating template elements
- xSet.set( GetConfigurationNode( xRoot, "Settings/Templates" ),
UNO_QUERY_THROW );
+ xSet.set( GetConfigurationNode( xRoot, u"Settings/Templates"_ustr
), UNO_QUERY_THROW );
Reference< container::XNameContainer > xNameContainer( xSet,
UNO_QUERY_THROW );
const Sequence< OUString > aElements( xSet->getElementNames() );
@@ -428,21 +428,21 @@ Sequence< PropertyValue >
ConfigurationAccess::GetConfigurationSequence()
{
OptimizerSettings& rSettings( maSettings.front() );
Sequence< PropertyValue > aRet{
- comphelper::makePropertyValue("JPEGCompression",
rSettings.mbJPEGCompression),
- comphelper::makePropertyValue("JPEGQuality", rSettings.mnJPEGQuality),
- comphelper::makePropertyValue("RemoveCropArea",
rSettings.mbRemoveCropArea),
- comphelper::makePropertyValue("ImageResolution",
rSettings.mnImageResolution),
- comphelper::makePropertyValue("EmbedLinkedGraphics",
rSettings.mbEmbedLinkedGraphics),
- comphelper::makePropertyValue("OLEOptimization",
rSettings.mbOLEOptimization),
- comphelper::makePropertyValue("OLEOptimizationType",
rSettings.mnOLEOptimizationType),
- comphelper::makePropertyValue("DeleteUnusedMasterPages",
rSettings.mbDeleteUnusedMasterPages),
- comphelper::makePropertyValue("DeleteHiddenSlides",
rSettings.mbDeleteHiddenSlides),
- comphelper::makePropertyValue("DeleteNotesPages",
rSettings.mbDeleteNotesPages),
- comphelper::makePropertyValue("CustomShowName",
rSettings.maCustomShowName),
- comphelper::makePropertyValue("SaveAsURL", rSettings.maSaveAsURL),
- comphelper::makePropertyValue("FilterName", rSettings.maFilterName),
- comphelper::makePropertyValue("OpenNewDocument",
rSettings.mbOpenNewDocument),
- comphelper::makePropertyValue("EstimatedFileSize",
rSettings.mnEstimatedFileSize)
+ comphelper::makePropertyValue(u"JPEGCompression"_ustr,
rSettings.mbJPEGCompression),
+ comphelper::makePropertyValue(u"JPEGQuality"_ustr,
rSettings.mnJPEGQuality),
+ comphelper::makePropertyValue(u"RemoveCropArea"_ustr,
rSettings.mbRemoveCropArea),
+ comphelper::makePropertyValue(u"ImageResolution"_ustr,
rSettings.mnImageResolution),
+ comphelper::makePropertyValue(u"EmbedLinkedGraphics"_ustr,
rSettings.mbEmbedLinkedGraphics),
+ comphelper::makePropertyValue(u"OLEOptimization"_ustr,
rSettings.mbOLEOptimization),
+ comphelper::makePropertyValue(u"OLEOptimizationType"_ustr,
rSettings.mnOLEOptimizationType),
+ comphelper::makePropertyValue(u"DeleteUnusedMasterPages"_ustr,
rSettings.mbDeleteUnusedMasterPages),
+ comphelper::makePropertyValue(u"DeleteHiddenSlides"_ustr,
rSettings.mbDeleteHiddenSlides),
+ comphelper::makePropertyValue(u"DeleteNotesPages"_ustr,
rSettings.mbDeleteNotesPages),
+ comphelper::makePropertyValue(u"CustomShowName"_ustr,
rSettings.maCustomShowName),
+ comphelper::makePropertyValue(u"SaveAsURL"_ustr,
rSettings.maSaveAsURL),
+ comphelper::makePropertyValue(u"FilterName"_ustr,
rSettings.maFilterName),
+ comphelper::makePropertyValue(u"OpenNewDocument"_ustr,
rSettings.mbOpenNewDocument),
+ comphelper::makePropertyValue(u"EstimatedFileSize"_ustr,
rSettings.mnEstimatedFileSize)
};
return aRet;
}
diff --git a/sdext/source/minimizer/fileopendialog.cxx
b/sdext/source/minimizer/fileopendialog.cxx
index 7ae877b13549..3f14b14c2e44 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -55,7 +55,7 @@ FileOpenDialog::FileOpenDialog( const Reference<
XComponentContext >& rxContext
// collecting a list of impress filters
Reference< XNameAccess > xFilters(
rxContext->getServiceManager()->createInstanceWithContext(
- "com.sun.star.document.FilterFactory", rxContext ), UNO_QUERY_THROW );
+ u"com.sun.star.document.FilterFactory"_ustr, rxContext ),
UNO_QUERY_THROW );
const Sequence< OUString > aFilterList( xFilters->getElementNames() );
for ( const auto& rFilter : aFilterList )
{
@@ -103,7 +103,7 @@ FileOpenDialog::FileOpenDialog( const Reference<
XComponentContext >& rxContext
}
Reference< XNameAccess > xTypes(
rxContext->getServiceManager()->createInstanceWithContext(
- "com.sun.star.document.TypeDetection", rxContext ), UNO_QUERY_THROW );
+ u"com.sun.star.document.TypeDetection"_ustr, rxContext ),
UNO_QUERY_THROW );
for (auto& rFilterEntry : aFilterEntryList)
{
diff --git a/sdext/source/minimizer/graphiccollector.cxx
b/sdext/source/minimizer/graphiccollector.cxx
index c307b04b09a1..ec7171a89ecf 100644
--- a/sdext/source/minimizer/graphiccollector.cxx
+++ b/sdext/source/minimizer/graphiccollector.cxx
@@ -84,7 +84,7 @@ static void ImpAddGraphicEntity( const Reference<
XComponentContext >& rxMSF, Re
{
Reference< XGraphic > xGraphic;
Reference< XPropertySet > xShapePropertySet( rxShape, UNO_QUERY_THROW );
- if ( !(xShapePropertySet->getPropertyValue( "Graphic" ) >>= xGraphic) )
+ if ( !(xShapePropertySet->getPropertyValue( u"Graphic"_ustr ) >>=
xGraphic) )
return;
text::GraphicCrop aGraphicCropLogic( 0, 0, 0, 0 );
@@ -93,7 +93,7 @@ static void ImpAddGraphicEntity( const Reference<
XComponentContext >& rxMSF, Re
aUser.mxShape = rxShape;
aUser.mbFillBitmap = false;
aUser.mxGraphic = xGraphic;
- xShapePropertySet->getPropertyValue( "GraphicCrop" ) >>= aGraphicCropLogic;
+ xShapePropertySet->getPropertyValue( u"GraphicCrop"_ustr ) >>=
aGraphicCropLogic;
awt::Size aLogicalSize( rxShape->getSize() );
// calculating the logical size, as if there were no cropping
@@ -123,30 +123,30 @@ static void ImpAddFillBitmapEntity( const Reference<
XComponentContext >& rxMSF,
try
{
FillStyle eFillStyle;
- if ( rxPropertySet->getPropertyValue( "FillStyle" ) >>= eFillStyle )
+ if ( rxPropertySet->getPropertyValue( u"FillStyle"_ustr ) >>=
eFillStyle )
{
if ( eFillStyle == FillStyle_BITMAP )
{
Reference< XBitmap > xFillBitmap;
- if ( rxPropertySet->getPropertyValue( "FillBitmap" ) >>=
xFillBitmap )
+ if ( rxPropertySet->getPropertyValue( u"FillBitmap"_ustr ) >>=
xFillBitmap )
{
Reference< XGraphic > xGraphic( xFillBitmap,
UNO_QUERY_THROW );
awt::Size aLogicalSize( rLogicalSize );
Reference< XPropertySetInfo > axPropSetInfo(
rxPropertySet->getPropertySetInfo() );
if ( axPropSetInfo.is() )
{
- if ( axPropSetInfo->hasPropertyByName(
"FillBitmapMode" ) )
+ if ( axPropSetInfo->hasPropertyByName(
u"FillBitmapMode"_ustr ) )
{
BitmapMode eBitmapMode;
- if ( rxPropertySet->getPropertyValue(
"FillBitmapMode" ) >>= eBitmapMode )
+ if ( rxPropertySet->getPropertyValue(
u"FillBitmapMode"_ustr ) >>= eBitmapMode )
{
if ( ( eBitmapMode == BitmapMode_REPEAT ) || (
eBitmapMode == BitmapMode_NO_REPEAT ) )
{
bool bLogicalSize = false;
awt::Size aSize( 0, 0 );
- if ( ( rxPropertySet->getPropertyValue(
"FillBitmapLogicalSize" ) >>= bLogicalSize )
- && ( rxPropertySet->getPropertyValue(
"FillBitmapSizeX" ) >>= aSize.Width )
- && ( rxPropertySet->getPropertyValue(
"FillBitmapSizeY" ) >>= aSize.Height ) )
+ if ( ( rxPropertySet->getPropertyValue(
u"FillBitmapLogicalSize"_ustr ) >>= bLogicalSize )
+ && ( rxPropertySet->getPropertyValue(
u"FillBitmapSizeX"_ustr ) >>= aSize.Width )
+ && ( rxPropertySet->getPropertyValue(
u"FillBitmapSizeY"_ustr ) >>= aSize.Height ) )
{
if ( bLogicalSize )
{
@@ -191,11 +191,11 @@ static void ImpCollectBackgroundGraphic( const Reference<
XComponentContext >& r
{
awt::Size aLogicalSize( 28000, 21000 );
Reference< XPropertySet > xPropertySet( rxDrawPage, UNO_QUERY_THROW );
- xPropertySet->getPropertyValue( "Width" ) >>= aLogicalSize.Width;
- xPropertySet->getPropertyValue( "Height" ) >>= aLogicalSize.Height;
+ xPropertySet->getPropertyValue( u"Width"_ustr ) >>= aLogicalSize.Width;
+ xPropertySet->getPropertyValue( u"Height"_ustr ) >>=
aLogicalSize.Height;
Reference< XPropertySet > xBackgroundPropSet;
- if ( xPropertySet->getPropertyValue( "Background" ) >>=
xBackgroundPropSet )
+ if ( xPropertySet->getPropertyValue( u"Background"_ustr ) >>=
xBackgroundPropSet )
ImpAddFillBitmapEntity( rxMSF, xBackgroundPropSet, aLogicalSize,
rGraphicEntities, rGraphicSettings, xPropertySet );
}
catch( Exception& )
@@ -238,12 +238,12 @@ awt::Size GraphicCollector::GetOriginalSize( const
Reference< XComponentContext
{
awt::Size aSize100thMM( 0, 0 );
Reference< XPropertySet > xGraphicPropertySet( rxGraphic, UNO_QUERY_THROW
);
- if ( xGraphicPropertySet->getPropertyValue( "Size100thMM" ) >>=
aSize100thMM )
+ if ( xGraphicPropertySet->getPropertyValue( u"Size100thMM"_ustr ) >>=
aSize100thMM )
{
if ( !aSize100thMM.Width && !aSize100thMM.Height )
{ // MAPMODE_PIXEL USED :-(
awt::Size aSourceSizePixel( 0, 0 );
- if ( xGraphicPropertySet->getPropertyValue( "SizePixel" ) >>=
aSourceSizePixel )
+ if ( xGraphicPropertySet->getPropertyValue( u"SizePixel"_ustr )
>>= aSourceSizePixel )
{
const DeviceInfo& rDeviceInfo(
GraphicCollector::GetDeviceInfo( rxMSF ) );
if ( rDeviceInfo.PixelPerMeterX && rDeviceInfo.PixelPerMeterY )
@@ -345,7 +345,7 @@ static void ImpCountGraphicObjects( const Reference<
XComponentContext >& rxMSF,
// now check for a fillstyle
Reference< XPropertySet > xShapePropertySet( xShape,
UNO_QUERY_THROW );
FillStyle eFillStyle;
- if ( xShapePropertySet->getPropertyValue( "FillStyle" ) >>=
eFillStyle )
+ if ( xShapePropertySet->getPropertyValue( u"FillStyle"_ustr ) >>=
eFillStyle )
{
if ( eFillStyle == FillStyle_BITMAP )
{
@@ -366,14 +366,14 @@ static void ImpCountBackgroundGraphic(
{
awt::Size aLogicalSize( 28000, 21000 );
Reference< XPropertySet > xPropertySet( rxDrawPage, UNO_QUERY_THROW );
- xPropertySet->getPropertyValue( "Width" ) >>= aLogicalSize.Width;
- xPropertySet->getPropertyValue( "Height" ) >>= aLogicalSize.Height;
+ xPropertySet->getPropertyValue( u"Width"_ustr ) >>= aLogicalSize.Width;
+ xPropertySet->getPropertyValue( u"Height"_ustr ) >>=
aLogicalSize.Height;
Reference< XPropertySet > xBackgroundPropSet;
- if ( xPropertySet->getPropertyValue( "Background" ) >>=
xBackgroundPropSet )
+ if ( xPropertySet->getPropertyValue( u"Background"_ustr ) >>=
xBackgroundPropSet )
{
FillStyle eFillStyle;
- if ( xBackgroundPropSet->getPropertyValue( "FillStyle" ) >>=
eFillStyle )
+ if ( xBackgroundPropSet->getPropertyValue( u"FillStyle"_ustr ) >>=
eFillStyle )
{
if ( eFillStyle == FillStyle_BITMAP )
{
diff --git a/sdext/source/minimizer/impoptimizer.cxx
b/sdext/source/minimizer/impoptimizer.cxx
index abf54e296a77..aba148cc6f39 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -110,7 +110,7 @@ static void ImpDeleteHiddenSlides( const Reference< XModel
>& rxModel )
Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY_THROW );
bool bVisible = true;
- if ( xPropSet->getPropertyValue( "Visible" ) >>= bVisible )
+ if ( xPropSet->getPropertyValue( u"Visible"_ustr ) >>= bVisible )
{
if (!bVisible )
{
@@ -140,7 +140,7 @@ static void ImpDeleteNotesPages( const Reference< XModel >&
rxModel )
while( xShapes->getCount() )
xShapes->remove( Reference< XShape >( xShapes->getByIndex(
xShapes->getCount() - 1 ), UNO_QUERY_THROW ) );
- xPropSet->setPropertyValue( "Layout", Any( sal_Int16(21) ) );
+ xPropSet->setPropertyValue( u"Layout"_ustr, Any( sal_Int16(21) ) );
}
}
catch( Exception& )
@@ -168,23 +168,23 @@ static void ImpConvertOLE( const Reference< XModel >&
rxModel, sal_Int32 nOLEOpt
if ( nOLEOptimizationType == 1 )
{
bool bIsInternal = true;
- xPropSet->getPropertyValue( "IsInternal" ) >>=
bIsInternal;
+ xPropSet->getPropertyValue( u"IsInternal"_ustr ) >>=
bIsInternal;
bConvertOLE = !bIsInternal;
}
if ( bConvertOLE )
{
Reference< XGraphic > xGraphic;
- if ( xPropSet->getPropertyValue( "Graphic" ) >>=
xGraphic )
+ if ( xPropSet->getPropertyValue( u"Graphic"_ustr ) >>=
xGraphic )
{
Reference< XMultiServiceFactory > xFact( rxModel,
UNO_QUERY_THROW );
- Reference< XShape > xShape2(
xFact->createInstance( "com.sun.star.drawing.GraphicObjectShape" ),
UNO_QUERY_THROW );
+ Reference< XShape > xShape2(
xFact->createInstance( u"com.sun.star.drawing.GraphicObjectShape"_ustr ),
UNO_QUERY_THROW );
xShapes->add( xShape2 );
xShape2->setPosition( xShape->getPosition() );
xShape2->setSize( xShape->getSize() );
Reference< XPropertySet > xPropSet2( xShape2,
UNO_QUERY_THROW );
- xPropSet2->setPropertyValue( "Graphic", Any(
xGraphic ) );
+ xPropSet2->setPropertyValue( u"Graphic"_ustr, Any(
xGraphic ) );
xShapes->remove( xShape );
- xPropSet2->setPropertyValue( "ZOrder", Any( j ) );
+ xPropSet2->setPropertyValue( u"ZOrder"_ustr, Any(
j ) );
}
}
}
@@ -204,20 +204,20 @@ static void ImpCompressGraphic( Reference<
XGraphicProvider > const & rxGraphicP
if ( rxGraphicProvider.is() && rxOutputStream.is() )
{
Sequence< PropertyValue > aFilterData{
- comphelper::makePropertyValue("ImageResolution",
nImageResolution),
- comphelper::makePropertyValue("ColorMode", sal_Int32(0)), //
todo: jpeg color mode (0->true color, 1->greyscale)
- comphelper::makePropertyValue("Quality", nJPEGQuality), //
quality that is used if we export to jpeg
- comphelper::makePropertyValue("Compression", sal_Int32(6)), //
compression that is used if we export to png
- comphelper::makePropertyValue("Interlaced", sal_Int32(0)), //
interlaced is turned off if we export to png
- comphelper::makePropertyValue("LogicalSize", rLogicalSize),
- comphelper::makePropertyValue("RemoveCropArea",
bRemoveCropping),
- comphelper::makePropertyValue("GraphicCropLogic",
rGraphicCropLogic)
+ comphelper::makePropertyValue(u"ImageResolution"_ustr,
nImageResolution),
+ comphelper::makePropertyValue(u"ColorMode"_ustr,
sal_Int32(0)), // todo: jpeg color mode (0->true color, 1->greyscale)
+ comphelper::makePropertyValue(u"Quality"_ustr, nJPEGQuality),
// quality that is used if we export to jpeg
+ comphelper::makePropertyValue(u"Compression"_ustr,
sal_Int32(6)), // compression that is used if we export to png
+ comphelper::makePropertyValue(u"Interlaced"_ustr,
sal_Int32(0)), // interlaced is turned off if we export to png
+ comphelper::makePropertyValue(u"LogicalSize"_ustr,
rLogicalSize),
+ comphelper::makePropertyValue(u"RemoveCropArea"_ustr,
bRemoveCropping),
+ comphelper::makePropertyValue(u"GraphicCropLogic"_ustr,
rGraphicCropLogic)
};
Sequence< PropertyValue > aArgs{
- comphelper::makePropertyValue("MimeType", rDestMimeType), //
the GraphicProvider is using "MimeType", the GraphicExporter "MediaType"...
- comphelper::makePropertyValue("OutputStream", rxOutputStream),
- comphelper::makePropertyValue("FilterData", aFilterData)
+ comphelper::makePropertyValue(u"MimeType"_ustr,
rDestMimeType), // the GraphicProvider is using "MimeType", the GraphicExporter
"MediaType"...
+ comphelper::makePropertyValue(u"OutputStream"_ustr,
rxOutputStream),
+ comphelper::makePropertyValue(u"FilterData"_ustr, aFilterData)
};
rxGraphicProvider->storeGraphic( rxGraphic, aArgs );
@@ -237,7 +237,7 @@ static Reference< XGraphic > ImpCompressGraphic( const
Reference< XComponentCont
{
OUString aSourceMimeType;
Reference< XPropertySet > xGraphicPropertySet( xGraphic,
UNO_QUERY_THROW );
- if ( xGraphicPropertySet->getPropertyValue( "MimeType" ) >>=
aSourceMimeType )
+ if ( xGraphicPropertySet->getPropertyValue( u"MimeType"_ustr ) >>=
aSourceMimeType )
{
sal_Int8 nGraphicType( xGraphic->getType() );
if ( nGraphicType == css::graphic::GraphicType::PIXEL )
@@ -249,10 +249,10 @@ static Reference< XGraphic > ImpCompressGraphic( const
Reference< XComponentCont
awt::Size aSourceSizePixel( 0, 0 );
text::GraphicCrop aGraphicCropPixel( 0, 0, 0, 0 );
- if ( ( xGraphicPropertySet->getPropertyValue( "SizePixel" )
>>= aSourceSizePixel ) &&
- ( xGraphicPropertySet->getPropertyValue( "Transparent" )
>>= bTransparent ) &&
- ( xGraphicPropertySet->getPropertyValue( "Alpha" ) >>=
bAlpha ) &&
- ( xGraphicPropertySet->getPropertyValue( "Animated" ) >>=
bAnimated ) )
+ if ( ( xGraphicPropertySet->getPropertyValue(
u"SizePixel"_ustr ) >>= aSourceSizePixel ) &&
+ ( xGraphicPropertySet->getPropertyValue(
u"Transparent"_ustr ) >>= bTransparent ) &&
+ ( xGraphicPropertySet->getPropertyValue( u"Alpha"_ustr )
>>= bAlpha ) &&
+ ( xGraphicPropertySet->getPropertyValue( u"Animated"_ustr
) >>= bAnimated ) )
{
awt::Size aDestSizePixel( aSourceSizePixel );
if ( !bAnimated )
@@ -286,7 +286,7 @@ static Reference< XGraphic > ImpCompressGraphic( const
Reference< XComponentCont
}
if ( ( aSourceSizePixel.Width > 0 ) && (
aSourceSizePixel.Height > 0 ) )
{
- OUString aDestMimeType( "image/png" );
+ OUString aDestMimeType( u"image/png"_ustr );
if (rGraphicSettings.mbJPEGCompression &&
!bTransparent && !bAlpha)
{
aDestMimeType = "image/jpeg";
@@ -321,7 +321,7 @@ static Reference< XGraphic > ImpCompressGraphic( const
Reference< XComponentCont
Reference< XSeekable > xSeekable(
xInputStream, UNO_QUERY_THROW );
xSeekable->seek( 0 );
Sequence< PropertyValue > aArgs{
comphelper::makePropertyValue(
- "InputStream", xInputStream) };
+ u"InputStream"_ustr, xInputStream) };
xNewGraphic = xGraphicProvider->queryGraphic(
aArgs );
}
}
@@ -338,7 +338,7 @@ static Reference< XGraphic > ImpCompressGraphic( const
Reference< XComponentCont
Reference< XInputStream > xInputStream(
xTempFile->getInputStream() );
Reference< XSeekable > xSeekable( xInputStream,
UNO_QUERY_THROW );
xSeekable->seek( 0 );
- Sequence< PropertyValue > aArgs{
comphelper::makePropertyValue("InputStream",
+ Sequence< PropertyValue > aArgs{
comphelper::makePropertyValue(u"InputStream"_ustr,
xInputStream) };
xNewGraphic = xGraphicProvider->queryGraphic( aArgs );
}
@@ -372,13 +372,13 @@ static void CompressGraphics( ImpOptimizer& rOptimizer,
const Reference< XCompon
if ( rGraphic.maUser[ 0 ].mbFillBitmap && rGraphic.maUser[ 0
].mxPropertySet.is() )
{
Reference< rendering::XBitmap > xFillBitmap;
- if ( rGraphic.maUser[ 0 ].mxPropertySet->getPropertyValue(
"FillBitmap" ) >>= xFillBitmap )
+ if ( rGraphic.maUser[ 0 ].mxPropertySet->getPropertyValue(
u"FillBitmap"_ustr ) >>= xFillBitmap )
xGraphic.set( xFillBitmap, UNO_QUERY_THROW );
}
else if ( rGraphic.maUser[ 0 ].mxShape.is() )
{
Reference< XPropertySet > xShapePropertySet(
rGraphic.maUser[ 0 ].mxShape, UNO_QUERY_THROW );
- xShapePropertySet->getPropertyValue( "Graphic" ) >>=
xGraphic;
+ xShapePropertySet->getPropertyValue( u"Graphic"_ustr ) >>=
xGraphic;
}
if ( xGraphic.is() )
{
@@ -393,7 +393,7 @@ static void CompressGraphics( ImpOptimizer& rOptimizer,
const Reference< XCompon
if ( rGraphicUser.mxShape.is() )
{
Reference< XPropertySet > xShapePropertySet(
rGraphicUser.mxShape, UNO_QUERY_THROW );
- xShapePropertySet->setPropertyValue(
"Graphic", Any( xNewGraphic ) );
+ xShapePropertySet->setPropertyValue(
u"Graphic"_ustr, Any( xNewGraphic ) );
if ( rGraphicUser.maGraphicCropLogic.Left ||
rGraphicUser.maGraphicCropLogic.Top
|| rGraphicUser.maGraphicCropLogic.Right ||
rGraphicUser.maGraphicCropLogic.Bottom )
@@ -407,7 +407,7 @@ static void CompressGraphics( ImpOptimizer& rOptimizer,
const Reference< XCompon
aGraphicCropLogic.Right =
static_cast<sal_Int32>(static_cast<double>(rGraphicUser.maGraphicCropLogic.Right)
* (static_cast<double>(aNewSize.Width) /
static_cast<double>(aSize100thMM.Width)));
aGraphicCropLogic.Bottom =
static_cast<sal_Int32>(static_cast<double>(rGraphicUser.maGraphicCropLogic.Bottom)
* (static_cast<double>(aNewSize.Height) /
static_cast<double>(aSize100thMM.Height)));
}
- xShapePropertySet->setPropertyValue(
"GraphicCrop", Any( aGraphicCropLogic ) );
+ xShapePropertySet->setPropertyValue(
u"GraphicCrop"_ustr, Any( aGraphicCropLogic ) );
}
}
else if ( rGraphicUser.mxPropertySet.is() )
@@ -419,20 +419,20 @@ static void CompressGraphics( ImpOptimizer& rOptimizer,
const Reference< XCompon
bool bLogicalSize;
Reference< XPropertySet >& rxPropertySet(
rGraphicUser.mxPropertySet );
- rxPropertySet->setPropertyValue(
"FillBitmap", Any( xFillBitmap ) );
- if ( ( rxPropertySet->getPropertyValue(
"FillBitmapLogicalSize" ) >>= bLogicalSize )
- && ( rxPropertySet->getPropertyValue(
"FillBitmapSizeX" ) >>= aSize.Width )
- && ( rxPropertySet->getPropertyValue(
"FillBitmapSizeY" ) >>= aSize.Height ) )
+ rxPropertySet->setPropertyValue(
u"FillBitmap"_ustr, Any( xFillBitmap ) );
+ if ( ( rxPropertySet->getPropertyValue(
u"FillBitmapLogicalSize"_ustr ) >>= bLogicalSize )
+ && ( rxPropertySet->getPropertyValue(
u"FillBitmapSizeX"_ustr ) >>= aSize.Width )
+ && ( rxPropertySet->getPropertyValue(
u"FillBitmapSizeY"_ustr ) >>= aSize.Height ) )
{
if ( !aSize.Width || !aSize.Height )
{
- rxPropertySet->setPropertyValue(
"FillBitmapLogicalSize", Any( true ) );
- rxPropertySet->setPropertyValue(
"FillBitmapSizeX", Any( rGraphicUser.maLogicalSize.Width ) );
- rxPropertySet->setPropertyValue(
"FillBitmapSizeY", Any( rGraphicUser.maLogicalSize.Height ) );
+ rxPropertySet->setPropertyValue(
u"FillBitmapLogicalSize"_ustr, Any( true ) );
+ rxPropertySet->setPropertyValue(
u"FillBitmapSizeX"_ustr, Any( rGraphicUser.maLogicalSize.Width ) );
+ rxPropertySet->setPropertyValue(
u"FillBitmapSizeY"_ustr, Any( rGraphicUser.maLogicalSize.Height ) );
}
}
if ( rGraphicUser.mxPagePropertySet.is() )
-
rGraphicUser.mxPagePropertySet->setPropertyValue( "Background", Any(
rxPropertySet ) );
+
rGraphicUser.mxPagePropertySet->setPropertyValue( u"Background"_ustr, Any(
rxPropertySet ) );
}
}
}
@@ -491,14 +491,14 @@ void ImpOptimizer::Optimize()
if ( mbDeleteHiddenSlides )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
- SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
+ SetStatusValue( TK_Status, Any( u"STR_DELETING_SLIDES"_ustr ) );
DispatchStatus();
ImpDeleteHiddenSlides( mxModel );
}
if ( mbDeleteNotesPages )
{
- SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
+ SetStatusValue( TK_Status, Any( u"STR_DELETING_SLIDES"_ustr ) );
DispatchStatus();
ImpDeleteNotesPages( mxModel );
}
@@ -506,7 +506,7 @@ void ImpOptimizer::Optimize()
if ( mbDeleteUnusedMasterPages )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 40 ) ) );
- SetStatusValue( TK_Status, Any( OUString("STR_DELETING_SLIDES") ) );
+ SetStatusValue( TK_Status, Any( u"STR_DELETING_SLIDES"_ustr ) );
DispatchStatus();
ImpDeleteUnusedMasterPages( mxModel );
}
@@ -514,7 +514,7 @@ void ImpOptimizer::Optimize()
if ( mbOLEOptimization )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 45 ) ) );
- SetStatusValue( TK_Status, Any(
OUString("STR_CREATING_OLE_REPLACEMENTS") ) );
+ SetStatusValue( TK_Status, Any( u"STR_CREATING_OLE_REPLACEMENTS"_ustr
) );
DispatchStatus();
ImpConvertOLE( mxModel, mnOLEOptimizationType );
}
@@ -522,7 +522,7 @@ void ImpOptimizer::Optimize()
if ( mbJPEGCompression || mbRemoveCropArea || mnImageResolution )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 50 ) ) );
- SetStatusValue( TK_Status, Any( OUString("STR_OPTIMIZING_GRAPHICS") )
);
+ SetStatusValue( TK_Status, Any( u"STR_OPTIMIZING_GRAPHICS"_ustr ) );
DispatchStatus();
std::vector< GraphicCollector::GraphicEntity > aGraphicList;
@@ -610,7 +610,7 @@ void ImpOptimizer::Optimize( const Sequence< PropertyValue
>& rArguments )
{
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 10 ) ) );
- SetStatusValue( TK_Status, Any(
OUString("STR_DUPLICATING_PRESENTATION") ) );
+ SetStatusValue( TK_Status, Any( u"STR_DUPLICATING_PRESENTATION"_ustr )
);
DispatchStatus();
Reference< XStorable >xStorable( mxModel, UNO_QUERY );
@@ -633,16 +633,16 @@ void ImpOptimizer::Optimize( const Sequence<
PropertyValue >& rArguments )
nSourceSize = PPPOptimizer::GetFileSize( maSaveAsURL );
SetStatusValue( TK_Progress, Any( static_cast< sal_Int32 >( 30 ) )
);
- SetStatusValue( TK_Status, Any(
OUString("STR_DUPLICATING_PRESENTATION") ) );
+ SetStatusValue( TK_Status, Any(
u"STR_DUPLICATING_PRESENTATION"_ustr ) );
DispatchStatus();
Reference< XDesktop2 > xDesktop = Desktop::create( mxContext );
- xSelf = xDesktop->findFrame( "_blank", FrameSearchFlag::CREATE );
+ xSelf = xDesktop->findFrame( u"_blank"_ustr,
FrameSearchFlag::CREATE );
Reference< XComponentLoader > xComponentLoader( xSelf, UNO_QUERY );
- Sequence< PropertyValue > aLoadProps{
comphelper::makePropertyValue("Hidden", true) };
+ Sequence< PropertyValue > aLoadProps{
comphelper::makePropertyValue(u"Hidden"_ustr, true) };
mxModel.set( xComponentLoader->loadComponentFromURL(
- maSaveAsURL, "_self", 0, aLoadProps ), UNO_QUERY );
+ maSaveAsURL, u"_self"_ustr, 0, aLoadProps ), UNO_QUERY );
}
}
@@ -658,7 +658,7 @@ void ImpOptimizer::Optimize( const Sequence< PropertyValue
>& rArguments )
Reference< XFrame > xFrame( xSelf.is() ? xSelf : mxDocumentFrame );
if ( xFrame.is() )
{
- DispatchURL(mxContext, ".uno:ClearUndoStack", xFrame);
+ DispatchURL(mxContext, u".uno:ClearUndoStack"_ustr, xFrame);
}
}
diff --git a/sdext/source/minimizer/informationdialog.cxx
b/sdext/source/minimizer/informationdialog.cxx
index 9872990a0f45..252863231bff 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -92,8 +92,8 @@ void InformationDialog::InitDialog()
OUString sSecondary( getString( eInfoString ) );
static constexpr OUString aOldSizePlaceholder( u"%OLDFILESIZE"_ustr );
static constexpr OUString aNewSizePlaceholder( u"%NEWFILESIZE"_ustr );
- const OUString aTitlePlaceholder( !aTitle.isEmpty() ? OUString("%TITLE" )
- :
OUString("'%TITLE'") );
+ const OUString aTitlePlaceholder( !aTitle.isEmpty() ? u"%TITLE"_ustr
+ : u"'%TITLE'"_ustr );
sal_Int32 i = sSecondary.indexOf( aOldSizePlaceholder );
if ( i >= 0 )
@@ -116,9 +116,9 @@ void InformationDialog::InitDialog()
InformationDialog::InformationDialog(const Reference< XComponentContext >
&rxContext, const Reference<XWindow>& rxDialogParent,
const OUString& rSaveAsURL, bool&
rbOpenNewDocument,
sal_Int64 rSourceSize, sal_Int64
rDestSize, sal_Int64 rApproxSize)
- : MessageDialogController(Application::GetFrameWeld(rxDialogParent),
"modules/simpress/ui/pminfodialog.ui", "PMInfoDialog", "ask")
+ : MessageDialogController(Application::GetFrameWeld(rxDialogParent),
u"modules/simpress/ui/pminfodialog.ui"_ustr, u"PMInfoDialog"_ustr, u"ask"_ustr)
, ConfigurationAccess(rxContext)
- , mxCheckBox(m_xBuilder->weld_check_button("ask"))
+ , mxCheckBox(m_xBuilder->weld_check_button(u"ask"_ustr))
, mnSourceSize(rSourceSize)
, mnDestSize(rDestSize)
, mnApproxSize(rApproxSize)
diff --git a/sdext/source/minimizer/optimizerdialog.cxx
b/sdext/source/minimizer/optimizerdialog.cxx
index 7efef618af9b..8c85d14fcaec 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -53,10 +53,10 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
IntroPage::IntroPage(weld::Container* pPage, OptimizerDialog& rOptimizerDialog)
- : vcl::OWizardPage(pPage, &rOptimizerDialog,
"modules/simpress/ui/pmintropage.ui", "PMIntroPage")
+ : vcl::OWizardPage(pPage, &rOptimizerDialog,
u"modules/simpress/ui/pmintropage.ui"_ustr, u"PMIntroPage"_ustr)
, mrOptimizerDialog(rOptimizerDialog)
- , mxComboBox(m_xBuilder->weld_combo_box("LB_SETTINGS"))
- , mxButton(m_xBuilder->weld_button("STR_REMOVE"))
+ , mxComboBox(m_xBuilder->weld_combo_box(u"LB_SETTINGS"_ustr))
+ , mxButton(m_xBuilder->weld_button(u"STR_REMOVE"_ustr))
{
rOptimizerDialog.SetIntroPage(this);
mxComboBox->connect_changed(LINK(this, IntroPage,
ComboBoxActionPerformed));
@@ -73,13 +73,13 @@ void IntroPage::UpdateControlStates(const
std::vector<OUString>& rItemList, int
}
SlidesPage::SlidesPage(weld::Container* pPage, OptimizerDialog&
rOptimizerDialog)
- : vcl::OWizardPage(pPage, &rOptimizerDialog,
"modules/simpress/ui/pmslidespage.ui", "PMSlidesPage")
+ : vcl::OWizardPage(pPage, &rOptimizerDialog,
u"modules/simpress/ui/pmslidespage.ui"_ustr, u"PMSlidesPage"_ustr)
, mrOptimizerDialog(rOptimizerDialog)
- , mxMasterSlides(m_xBuilder->weld_check_button("STR_DELETE_MASTER_PAGES"))
- , mxHiddenSlides(m_xBuilder->weld_check_button("STR_DELETE_HIDDEN_SLIDES"))
- , mxUnusedSlides(m_xBuilder->weld_check_button("STR_CUSTOM_SHOW"))
- , mxComboBox(m_xBuilder->weld_combo_box("LB_SLIDES"))
- , mxClearNodes(m_xBuilder->weld_check_button("STR_DELETE_NOTES_PAGES"))
+ ,
mxMasterSlides(m_xBuilder->weld_check_button(u"STR_DELETE_MASTER_PAGES"_ustr))
+ ,
mxHiddenSlides(m_xBuilder->weld_check_button(u"STR_DELETE_HIDDEN_SLIDES"_ustr))
+ , mxUnusedSlides(m_xBuilder->weld_check_button(u"STR_CUSTOM_SHOW"_ustr))
+ , mxComboBox(m_xBuilder->weld_combo_box(u"LB_SLIDES"_ustr))
+ ,
mxClearNodes(m_xBuilder->weld_check_button(u"STR_DELETE_NOTES_PAGES"_ustr))
{
rOptimizerDialog.SetSlidesPage(this);
mxMasterSlides->connect_toggled(LINK(this, SlidesPage,
UnusedMasterPagesActionPerformed));
@@ -105,15 +105,15 @@ void SlidesPage::UpdateControlStates(bool
bDeleteUnusedMasterPages, bool bDelete
}
ImagesPage::ImagesPage(weld::Container* pPage, OptimizerDialog&
rOptimizerDialog)
- : vcl::OWizardPage(pPage, &rOptimizerDialog,
"modules/simpress/ui/pmimagespage.ui", "PMImagesPage")
+ : vcl::OWizardPage(pPage, &rOptimizerDialog,
u"modules/simpress/ui/pmimagespage.ui"_ustr, u"PMImagesPage"_ustr)
, mrOptimizerDialog(rOptimizerDialog)
- ,
m_xLossLessCompression(m_xBuilder->weld_radio_button("STR_LOSSLESS_COMPRESSION"))
- , m_xQualityLabel(m_xBuilder->weld_label("STR_QUALITY"))
- , m_xQuality(m_xBuilder->weld_spin_button("SB_QUALITY"))
- , m_xJpegCompression(m_xBuilder->weld_radio_button("STR_JPEG_COMPRESSION"))
- , m_xResolution(m_xBuilder->weld_combo_box("LB_RESOLUTION"))
- , m_xRemoveCropArea(m_xBuilder->weld_check_button("STR_REMOVE_CROP_AREA"))
- ,
m_xEmbedLinkedGraphics(m_xBuilder->weld_check_button("STR_EMBED_LINKED_GRAPHICS"))
+ ,
m_xLossLessCompression(m_xBuilder->weld_radio_button(u"STR_LOSSLESS_COMPRESSION"_ustr))
+ , m_xQualityLabel(m_xBuilder->weld_label(u"STR_QUALITY"_ustr))
+ , m_xQuality(m_xBuilder->weld_spin_button(u"SB_QUALITY"_ustr))
+ ,
m_xJpegCompression(m_xBuilder->weld_radio_button(u"STR_JPEG_COMPRESSION"_ustr))
+ , m_xResolution(m_xBuilder->weld_combo_box(u"LB_RESOLUTION"_ustr))
+ ,
m_xRemoveCropArea(m_xBuilder->weld_check_button(u"STR_REMOVE_CROP_AREA"_ustr))
+ ,
m_xEmbedLinkedGraphics(m_xBuilder->weld_check_button(u"STR_EMBED_LINKED_GRAPHICS"_ustr))
{
rOptimizerDialog.SetImagesPage(this);
m_xRemoveCropArea->connect_toggled(LINK(this, ImagesPage,
RemoveCropAreaActionPerformed));
@@ -139,12 +139,12 @@ void ImagesPage::UpdateControlStates(bool
bJPEGCompression, int nJPEGQuality, bo
}
ObjectsPage::ObjectsPage(weld::Container* pPage, OptimizerDialog&
rOptimizerDialog)
- : vcl::OWizardPage(pPage, &rOptimizerDialog,
"modules/simpress/ui/pmobjectspage.ui", "PMObjectsPage")
+ : vcl::OWizardPage(pPage, &rOptimizerDialog,
u"modules/simpress/ui/pmobjectspage.ui"_ustr, u"PMObjectsPage"_ustr)
, mrOptimizerDialog(rOptimizerDialog)
- , m_xCreateStaticImage(m_xBuilder->weld_check_button("STR_OLE_REPLACE"))
- , m_xAllOLEObjects(m_xBuilder->weld_radio_button("STR_ALL_OLE_OBJECTS"))
- ,
m_xForeignOLEObjects(m_xBuilder->weld_radio_button("STR_ALIEN_OLE_OBJECTS_ONLY"))
- , m_xLabel(m_xBuilder->weld_label("STR_OLE_OBJECTS_DESC"))
+ ,
m_xCreateStaticImage(m_xBuilder->weld_check_button(u"STR_OLE_REPLACE"_ustr))
+ ,
m_xAllOLEObjects(m_xBuilder->weld_radio_button(u"STR_ALL_OLE_OBJECTS"_ustr))
+ ,
m_xForeignOLEObjects(m_xBuilder->weld_radio_button(u"STR_ALIEN_OLE_OBJECTS_ONLY"_ustr))
+ , m_xLabel(m_xBuilder->weld_label(u"STR_OLE_OBJECTS_DESC"_ustr))
{
rOptimizerDialog.SetObjectsPage(this);
m_xCreateStaticImage->connect_toggled(LINK(this, ObjectsPage,
OLEOptimizationActionPerformed));
@@ -167,19 +167,19 @@ void ObjectsPage::UpdateControlStates(bool
bConvertOLEObjects, int nOLEOptimizat
}
SummaryPage::SummaryPage(weld::Container* pPage, OptimizerDialog&
rOptimizerDialog)
- : vcl::OWizardPage(pPage, &rOptimizerDialog,
"modules/simpress/ui/pmsummarypage.ui", "PMSummaryPage")
+ : vcl::OWizardPage(pPage, &rOptimizerDialog,
u"modules/simpress/ui/pmsummarypage.ui"_ustr, u"PMSummaryPage"_ustr)
, mrOptimizerDialog(rOptimizerDialog)
- , m_xLabel1(m_xBuilder->weld_label("LABEL1"))
- , m_xLabel2(m_xBuilder->weld_label("LABEL2"))
- , m_xLabel3(m_xBuilder->weld_label("LABEL3"))
- , m_xCurrentSize(m_xBuilder->weld_label("CURRENT_FILESIZE"))
- , m_xEstimatedSize(m_xBuilder->weld_label("ESTIMATED_FILESIZE"))
- , m_xStatus(m_xBuilder->weld_label("STR_STATUS"))
- , m_xProgress(m_xBuilder->weld_progress_bar("PROGRESS"))
- , m_xApplyToCurrent(m_xBuilder->weld_radio_button("STR_APPLY_TO_CURRENT"))
- , m_xSaveToNew(m_xBuilder->weld_radio_button("STR_SAVE_AS"))
- , m_xComboBox(m_xBuilder->weld_combo_box("MY_SETTINGS"))
- , m_xSaveSettings(m_xBuilder->weld_check_button("STR_SAVE_SETTINGS"))
+ , m_xLabel1(m_xBuilder->weld_label(u"LABEL1"_ustr))
+ , m_xLabel2(m_xBuilder->weld_label(u"LABEL2"_ustr))
+ , m_xLabel3(m_xBuilder->weld_label(u"LABEL3"_ustr))
+ , m_xCurrentSize(m_xBuilder->weld_label(u"CURRENT_FILESIZE"_ustr))
+ , m_xEstimatedSize(m_xBuilder->weld_label(u"ESTIMATED_FILESIZE"_ustr))
+ , m_xStatus(m_xBuilder->weld_label(u"STR_STATUS"_ustr))
+ , m_xProgress(m_xBuilder->weld_progress_bar(u"PROGRESS"_ustr))
+ ,
m_xApplyToCurrent(m_xBuilder->weld_radio_button(u"STR_APPLY_TO_CURRENT"_ustr))
+ , m_xSaveToNew(m_xBuilder->weld_radio_button(u"STR_SAVE_AS"_ustr))
+ , m_xComboBox(m_xBuilder->weld_combo_box(u"MY_SETTINGS"_ustr))
+ , m_xSaveSettings(m_xBuilder->weld_check_button(u"STR_SAVE_SETTINGS"_ustr))
{
rOptimizerDialog.SetSummaryPage(this);
m_xApplyToCurrent->connect_toggled(LINK(this, SummaryPage,
SaveAsNewActionPerformed));
@@ -244,7 +244,7 @@ void OptimizerDialog::InitRoadmap()
ITEM_ID_SUMMARY}
);
- m_xAssistant->set_page_side_image(BMP_PRESENTATION_MINIMIZER);
+ m_xAssistant->set_page_side_image(u"" BMP_PRESENTATION_MINIMIZER ""_ustr);
}
void OptimizerDialog::UpdateConfiguration()
@@ -579,10 +579,10 @@ bool OptimizerDialog::onFinish()
aURL.Path = "optimize";
Sequence< PropertyValue > lArguments{
- comphelper::makePropertyValue("Settings",
GetConfigurationSequence()),
- comphelper::makePropertyValue("StatusDispatcher",
GetStatusDispatcher()),
- comphelper::makePropertyValue("DocumentFrame", GetFrame()),
- comphelper::makePropertyValue("DialogParentWindow",
m_xAssistant->GetXWindow())
+ comphelper::makePropertyValue(u"Settings"_ustr,
GetConfigurationSequence()),
+ comphelper::makePropertyValue(u"StatusDispatcher"_ustr,
GetStatusDispatcher()),
+ comphelper::makePropertyValue(u"DocumentFrame"_ustr, GetFrame()),
+ comphelper::makePropertyValue(u"DialogParentWindow"_ustr,
m_xAssistant->GetXWindow())
};
ErrCode errorCode;
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx
b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index d2c4e49f3b95..99f7740be9fa 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -211,7 +211,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY_THROW );
bool bVisible = true;
- if ( xPropSet->getPropertyValue( "Visible" ) >>= bVisible )
+ if ( xPropSet->getPropertyValue( u"Visible"_ustr ) >>= bVisible )
{
if (!bVisible )
nDeletedSlides++;
@@ -230,7 +230,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
if ( nDeletedSlides > 1 )
{
OUString aStr( getString( STR_DELETE_SLIDES ) );
- OUString aPlaceholder( "%SLIDES" );
+ OUString aPlaceholder( u"%SLIDES"_ustr );
sal_Int32 i = aStr.indexOf( aPlaceholder );
if ( i >= 0 )
aStr = aStr.replaceAt( i, aPlaceholder.getLength(),
OUString::number( nDeletedSlides ) );
@@ -248,9 +248,9 @@ void OptimizerDialog::UpdateControlStatesPage4()
if ( nGraphics > 1 )
{
OUString aStr( getString( STR_OPTIMIZE_IMAGES ) );
- OUString aImagePlaceholder( "%IMAGES" );
- OUString aQualityPlaceholder( "%QUALITY" );
- OUString aResolutionPlaceholder( "%RESOLUTION" );
+ OUString aImagePlaceholder( u"%IMAGES"_ustr );
+ OUString aQualityPlaceholder( u"%QUALITY"_ustr );
+ OUString aResolutionPlaceholder( u"%RESOLUTION"_ustr );
sal_Int32 i = aStr.indexOf( aImagePlaceholder );
if ( i >= 0 )
aStr = aStr.replaceAt( i, aImagePlaceholder.getLength(),
OUString::number( nGraphics ) );
@@ -284,7 +284,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
if ( nOLEReplacements > 1 )
{
OUString aStr( getString( STR_CREATE_REPLACEMENT ) );
- OUString aPlaceholder( "%OLE" );
+ OUString aPlaceholder( u"%OLE"_ustr );
sal_Int32 i = aStr.indexOf( aPlaceholder );
if ( i >= 0 )
aStr = aStr.replaceAt( i, aPlaceholder.getLength(),
OUString::number( nOLEReplacements ) );
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx
b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 74a89bfbac1a..889bf3a85190 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -51,7 +51,7 @@ void SAL_CALL PPPOptimizerDialog::initialize( const Sequence<
Any >& aArguments
OUString SAL_CALL PPPOptimizerDialog::getImplementationName()
{
- return "com.sun.star.comp.PresentationMinimizerImp";
+ return u"com.sun.star.comp.PresentationMinimizerImp"_ustr;
}
sal_Bool SAL_CALL PPPOptimizerDialog::supportsService( const OUString&
ServiceName )
@@ -61,7 +61,7 @@ sal_Bool SAL_CALL PPPOptimizerDialog::supportsService( const
OUString& ServiceNa
Sequence< OUString > SAL_CALL PPPOptimizerDialog::getSupportedServiceNames()
{
- return { "com.sun.star.comp.PresentationMinimizer" };
+ return { u"com.sun.star.comp.PresentationMinimizer"_ustr };
}
Reference< css::frame::XDispatch > SAL_CALL PPPOptimizerDialog::queryDispatch(
diff --git a/sdext/source/pdfimport/filterdet.cxx
b/sdext/source/pdfimport/filterdet.cxx
index d9fdcc03c6ab..3a5e0f2ec480 100644
--- a/sdext/source/pdfimport/filterdet.cxx
+++ b/sdext/source/pdfimport/filterdet.cxx
@@ -197,7 +197,7 @@ sal_Int32
fillAttributes(uno::Sequence<beans::PropertyValue> const& rFilterData,
sal_Int32 nAttribs = rFilterData.getLength();
for (sal_Int32 i = 0; i < nAttribs; i++)
{
- OUString aVal( "<no string>" );
+ OUString aVal( u"<no string>"_ustr );
pAttribs[i].Value >>= aVal;
SAL_INFO("sdext.pdfimport", "doDetection: Attrib: " + pAttribs[i].Name
+ " = " + aVal);
@@ -411,15 +411,15 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence<
beans::PropertyValue >& rF
switch (nDocumentType)
{
case 0:
- pFilterData[nFilterNamePos].Value <<= OUString(
"draw_pdf_import" );
+ pFilterData[nFilterNamePos].Value <<=
u"draw_pdf_import"_ustr;
break;
case 1:
- pFilterData[nFilterNamePos].Value <<= OUString(
"impress_pdf_import" );
+ pFilterData[nFilterNamePos].Value <<=
u"impress_pdf_import"_ustr;
break;
case 2:
- pFilterData[nFilterNamePos].Value <<= OUString(
"writer_pdf_import" );
+ pFilterData[nFilterNamePos].Value <<=
u"writer_pdf_import"_ustr;
break;
default:
@@ -435,7 +435,7 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence<
beans::PropertyValue >& rF
OUString PDFDetector::getImplementationName()
{
- return "org.libreoffice.comp.documents.PDFDetector";
+ return u"org.libreoffice.comp.documents.PDFDetector"_ustr;
}
sal_Bool PDFDetector::supportsService(OUString const & ServiceName)
@@ -445,7 +445,7 @@ sal_Bool PDFDetector::supportsService(OUString const &
ServiceName)
css::uno::Sequence<OUString> PDFDetector::getSupportedServiceNames()
{
- return {"com.sun.star.document.ImportFilter"};
+ return {u"com.sun.star.document.ImportFilter"_ustr};
}
bool checkDocChecksum( const OUString& rInPDFFileURL,
diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx
b/sdext/source/pdfimport/inc/pdfihelper.hxx
index c6be1a6ba73e..1b6ba6b0ca04 100644
--- a/sdext/source/pdfimport/inc/pdfihelper.hxx
+++ b/sdext/source/pdfimport/inc/pdfihelper.hxx
@@ -155,11 +155,11 @@ namespace pdfi
{
default:
case css::rendering::PathJoinType::MITER:
- return "miter";
+ return u"miter"_ustr;
case css::rendering::PathJoinType::ROUND:
- return "round";
+ return u"round"_ustr;
case css::rendering::PathJoinType::BEVEL:
- return "bevel";
+ return u"bevel"_ustr;
}
}
@@ -169,11 +169,11 @@ namespace pdfi
{
default:
case css::rendering::PathCapType::BUTT:
- return "butt";
+ return u"butt"_ustr;
case css::rendering::PathCapType::ROUND:
- return "round";
+ return u"round"_ustr;
case css::rendering::PathCapType::SQUARE:
- return "square";
+ return u"square"_ustr;
}
}
diff --git a/sdext/source/pdfimport/misc/pdfihelper.cxx
b/sdext/source/pdfimport/misc/pdfihelper.cxx
index 8268be6b9d46..b30624025faa 100644
--- a/sdext/source/pdfimport/misc/pdfihelper.cxx
+++ b/sdext/source/pdfimport/misc/pdfihelper.cxx
@@ -46,8 +46,8 @@ void pdfi::FillDashStyleProps(PropertyMap& props, const
std::vector<double>& das
distance += dashArray[i * 2 + 1];
distance /= pairCount;
- props["draw:style"] = "rect";
- props["draw:distance"] = convertPixelToUnitString(distance * scale);
+ props[u"draw:style"_ustr] = "rect";
+ props[u"draw:distance"_ustr] = convertPixelToUnitString(distance * scale);
int dotStage = 0;
int dotCounts[3] = {0, 0, 0};
diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx
b/sdext/source/pdfimport/odf/odfemitter.cxx
index 1ff92deb73a4..c4ee6df310b2 100644
--- a/sdext/source/pdfimport/odf/odfemitter.cxx
+++ b/sdext/source/pdfimport/odf/odfemitter.cxx
@@ -57,7 +57,7 @@ OdfEmitter::OdfEmitter( uno::Reference<io::XOutputStream>
xOutput ) :
{
OSL_PRECOND(m_xOutput.is(), "OdfEmitter(): invalid output stream");
- write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+ write(u"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"_ustr);
}
void OdfEmitter::beginTag( const char* pTag, const PropertyMap& rProperties )
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx
b/sdext/source/pdfimport/pdfiadaptor.cxx
index 0d5bad2d6373..136f6d586d61 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -64,7 +64,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const
uno::Sequence< beans::Propert
SAL_INFO("sdext.pdfimport", "filter: Attrib: " << pAttribs[i].Name
<< " = " << (pAttribs[i].Value.has<OUString>()
? pAttribs[i].Value.get<OUString>()
- : OUString("<no string>"))
+ : u"<no string>"_ustr)
<< "
");
if ( pAttribs[i].Name == "EmbeddedSubstream" )
pAttribs[i].Value >>= xSubStream;
@@ -135,7 +135,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const
uno::Sequence< beans::Propert
try {
xSubFilter.set(
m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
- "com.sun.star.document.OwnSubFilter",
+ u"com.sun.star.document.OwnSubFilter"_ustr,
aArgs,
m_xContext ),
uno::UNO_QUERY );
@@ -188,7 +188,7 @@ void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const
uno::Reference< lang::
OUString PDFIHybridAdaptor::getImplementationName()
{
- return "org.libreoffice.comp.documents.HybridPDFImport";
+ return u"org.libreoffice.comp.documents.HybridPDFImport"_ustr;
}
sal_Bool PDFIHybridAdaptor::supportsService(OUString const & ServiceName)
@@ -198,7 +198,7 @@ sal_Bool PDFIHybridAdaptor::supportsService(OUString const
& ServiceName)
css::uno::Sequence<OUString> PDFIHybridAdaptor::getSupportedServiceNames()
{
- return {"com.sun.star.document.ImportFilter"};
+ return {u"com.sun.star.document.ImportFilter"_ustr};
}
PDFIRawAdaptor::PDFIRawAdaptor( OUString const & implementationName, const
uno::Reference< uno::XComponentContext >& xContext ) :
@@ -246,7 +246,7 @@ bool PDFIRawAdaptor::odfConvert( const OUString&
rURL,
const bool bSuccess = parse(uno::Reference<io::XInputStream>(),
uno::Reference<task::XInteractionHandler>(),
OUString(),
- xStatus,pEmitter,rURL, "");
+ xStatus,pEmitter,rURL, u""_ustr);
// tell input stream that it is no longer needed
xOutput->closeOutput();
@@ -317,7 +317,7 @@ sal_Bool PDFIRawAdaptor::supportsService(OUString const &
ServiceName)
css::uno::Sequence<OUString> PDFIRawAdaptor::getSupportedServiceNames()
{
- return {"com.sun.star.document.ImportFilter"};
+ return {u"com.sun.star.document.ImportFilter"_ustr};
}
@@ -326,7 +326,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
sdext_PDFIRawAdaptor_Writer_get_implementation(
css::uno::XComponentContext* context , css::uno::Sequence<css::uno::Any>
const&)
{
-e
... etc. - the rest is truncated
