diff options
Diffstat (limited to 'sw/source/uibase/envelp')
-rw-r--r-- | sw/source/uibase/envelp/envimg.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/envelp/labelcfg.cxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/envelp/labimg.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/envelp/syncbtn.cxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx index b36cfdfa51f3..ddbee828fba0 100644 --- a/sw/source/uibase/envelp/envimg.cxx +++ b/sw/source/uibase/envelp/envimg.cxx @@ -150,7 +150,7 @@ SwEnvItem* SwEnvItem::Clone(SfxItemPool*) const } SwEnvCfgItem::SwEnvCfgItem() : - ConfigItem("Office.Writer/Envelope") + ConfigItem(u"Office.Writer/Envelope"_ustr) { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx index f974a3e799db..c103439bc674 100644 --- a/sw/source/uibase/envelp/labelcfg.cxx +++ b/sw/source/uibase/envelp/labelcfg.cxx @@ -69,9 +69,9 @@ static Sequence<OUString> lcl_CreatePropertyNames(const OUString& rPrefix) } SwLabelConfig::SwLabelConfig() : - ConfigItem("Office.Labels/Manufacturer") + ConfigItem(u"Office.Labels/Manufacturer"_ustr) { - OUString uri("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/labels/labels.xml"); + OUString uri(u"$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/labels/labels.xml"_ustr); rtl::Bootstrap::expandMacros(uri); xmlreader::XmlReader reader(uri); int nsId; @@ -210,7 +210,7 @@ static Sequence<PropertyValue> lcl_CreateProperties( const OUString* pNames = rPropNames.getConstArray(); Sequence<PropertyValue> aRet(rPropNames.getLength()); PropertyValue* pValues = aRet.getArray(); - OUString sColon(";"); + OUString sColon(u";"_ustr); for(sal_Int32 nProp = 0; nProp < rPropNames.getLength(); nProp++) { @@ -283,7 +283,7 @@ void SwLabelConfig::SaveLabel( const OUString& rManufacturer, // type does not yet exist, add to config const Sequence<OUString> aLabels = GetNodeNames( rManufacturer ); sal_Int32 nIndex = aLabels.getLength(); - OUString sPrefix( "Label" ); + OUString sPrefix( u"Label"_ustr ); sFoundNode = sPrefix + OUString::number( nIndex ); while ( comphelper::findValue(aLabels, sFoundNode) != -1 ) { diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx index b87f9bf5fb29..aab428d59426 100644 --- a/sw/source/uibase/envelp/labimg.cxx +++ b/sw/source/uibase/envelp/labimg.cxx @@ -257,7 +257,7 @@ Sequence<OUString> SwLabCfgItem::GetPropertyNames() const } SwLabCfgItem::SwLabCfgItem(bool bLabel) : - ConfigItem(bLabel ? OUString("Office.Writer/Label") : OUString("Office.Writer/BusinessCard")), + ConfigItem(bLabel ? u"Office.Writer/Label"_ustr : u"Office.Writer/BusinessCard"_ustr), m_bIsLabel(bLabel) { Sequence<OUString> aNames = GetPropertyNames(); diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx index 715d769633f0..5fd3bfa71914 100644 --- a/sw/source/uibase/envelp/syncbtn.cxx +++ b/sw/source/uibase/envelp/syncbtn.cxx @@ -67,8 +67,8 @@ SwSyncChildWin::SwSyncChildWin(vcl::Window* _pParent, SwSyncBtnDlg::SwSyncBtnDlg(SfxBindings* pBindings, SfxChildWindow* pChild, weld::Window *pParent) - : SfxModelessDialogController(pBindings, pChild, pParent, "modules/swriter/ui/floatingsync.ui", "FloatingSync") - , m_xSyncBtn(m_xBuilder->weld_button("sync")) + : SfxModelessDialogController(pBindings, pChild, pParent, u"modules/swriter/ui/floatingsync.ui"_ustr, u"FloatingSync"_ustr) + , m_xSyncBtn(m_xBuilder->weld_button(u"sync"_ustr)) { m_xSyncBtn->connect_clicked(LINK(this, SwSyncBtnDlg, BtnHdl)); } |