summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-10-16 15:06:23 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-10-17 07:28:49 +0200
commit8b4719c29fc9bd7e198ad6ced301e1ff7a350f16 (patch)
treed3ec594b343f56c76056418d835d3bc7b696a9ab /cui/source
parentf51cd77bcecc5134e0e04c398bfb7b34eb65d68d (diff)
Rename OUStringLiteral1 to OUStringChar
It started out as a wrapper around character literals, but has by now become a wrapper around arbitrary single characters. Besides updating the documentation, this change is a mechanical for i in $(git grep -Fl OUStringLiteral1); do sed -i -e s/OUStringLiteral1/OUStringChar/g "$i"; done Change-Id: I1b9eaa4b3fbc9025ce4a4bffea3db1c16188b76f Reviewed-on: https://gerrit.libreoffice.org/80892 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/dialogs/FontFeaturesDialog.cxx2
-rw-r--r--cui/source/dialogs/hlinettp.cxx2
-rw-r--r--cui/source/options/optjava.cxx2
-rw-r--r--cui/source/options/optpath.cxx10
-rw-r--r--cui/source/tabpages/grfpage.cxx4
5 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx
index 6e9831561ce0..20ac4b67e3c8 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -207,7 +207,7 @@ OUString FontFeaturesDialog::createFontNameWithFeatures()
sResultFontName = vcl::font::trimFontNameFeatures(m_sFontName);
if (!sNameSuffix.isEmpty())
sResultFontName
- += OUStringLiteral1(vcl::font::FeaturePrefix) + sNameSuffix.makeStringAndClear();
+ += OUStringChar(vcl::font::FeaturePrefix) + sNameSuffix.makeStringAndClear();
return sResultFontName;
}
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 4867a43bbe00..18df910f6054 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -376,7 +376,7 @@ void SvxHyperlinkInternetTp::SetMarkStr ( const OUString& aStrMark )
if( nPos != -1 )
aStrURL = aStrURL.copy(0, nPos);
- aStrURL += OUStringLiteral1(sUHash) + aStrMark;
+ aStrURL += OUStringChar(sUHash) + aStrMark;
m_xCbbTarget->set_entry_text(aStrURL);
}
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index bd88d04f7ce5..1073b71b23b6 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -155,7 +155,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl, weld::TreeView&, void)
OUString sLocation = m_xJavaList->get_selected_id();
OUString sInfo = m_sInstallText;
// tdf#80646 insert LTR mark after label
- sInfo += OUStringLiteral1(0x200E);
+ sInfo += OUStringChar(0x200E);
sInfo += sLocation;
m_xJavaPathText->set_label(sInfo);
}
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 73110b9e193f..b287852f2329 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -292,7 +292,7 @@ void SvxPathTabPage::Reset( const SfxItemSet* )
OUString sTmpPath = sUser;
if ( !sTmpPath.isEmpty() && !sWritable.isEmpty() )
- sTmpPath += OUStringLiteral1(MULTIPATH_DELIMITER);
+ sTmpPath += OUStringChar(MULTIPATH_DELIMITER);
sTmpPath += sWritable;
const OUString aValue = Convert_Impl( sTmpPath );
@@ -364,7 +364,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl, weld::Button&, void)
if ( !bFound )
{
if ( !sTemp.isEmpty() )
- sTemp += OUStringLiteral1(MULTIPATH_DELIMITER);
+ sTemp += OUStringChar(MULTIPATH_DELIMITER);
sTemp += sOnePath;
}
}
@@ -487,7 +487,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl, weld::Button&, void)
OUString sPath( sUser );
if ( !sPath.isEmpty() )
- sPath += OUStringLiteral1(MULTIPATH_DELIMITER);
+ sPath += OUStringChar(MULTIPATH_DELIMITER);
sPath += sWritable;
pMultiDlg->SetPath( sPath );
@@ -514,12 +514,12 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl, weld::Button&, void)
break;
}
if ( !sUser.isEmpty() )
- sUser += OUStringLiteral1(MULTIPATH_DELIMITER);
+ sUser += OUStringChar(MULTIPATH_DELIMITER);
sUser += sToken;
}
sFullPath = sUser;
if ( !sFullPath.isEmpty() )
- sFullPath += OUStringLiteral1(MULTIPATH_DELIMITER);
+ sFullPath += OUStringChar(MULTIPATH_DELIMITER);
sFullPath += sWritable;
}
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index f76d2da53fe2..b63f04ecb0c7 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -635,7 +635,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
OUString sTemp = aFld->GetText();
aFld->SetValue( aFld->Normalize( aOrigSize.Height() ), eUnit );
// multiplication sign (U+00D7)
- sTemp += OUStringLiteral1(0x00D7) + aFld->GetText();
+ sTemp += OUStringChar(0x00D7) + aFld->GetText();
if ( aOrigPixelSize.Width() && aOrigPixelSize.Height() ) {
sal_Int32 ax = sal_Int32(floor(static_cast<float>(aOrigPixelSize.Width()) /
@@ -645,7 +645,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
sTemp += " " + CuiResId( RID_SVXSTR_PPI );
OUString sPPI = OUString::number(ax);
if (abs(ax - ay) > 1) {
- sPPI += OUStringLiteral1(0x00D7) + OUString::number(ay);
+ sPPI += OUStringChar(0x00D7) + OUString::number(ay);
}
sTemp = sTemp.replaceAll("%1", sPPI);
}