[Libreoffice-commits] .: sd/source
Caolán McNamara
caolan at kemper.freedesktop.org
Sun Nov 14 13:17:07 PST 2010
sd/source/ui/dlg/dlgass.cxx | 4 ++--
sd/source/ui/view/ViewClipboard.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d8d8f009ce1788287b7901a56ba30847530947aa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Nov 14 21:02:32 2010 +0000
Misuse of RTL_CONSTASCII_STRINGPARAM instead of RTL_CONSTASCII_USTRINGPARAM
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index e0c952c..5d7a7cd 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -438,8 +438,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
String sText (GetUiTextForCommand(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Open"))));
// Remove the mnemonic and add a leading space so that icon and text
// are not too close together.
- sText.SearchAndReplaceAll(String(RTL_CONSTASCII_STRINGPARAM("~")),String());
- sText.Insert(String(RTL_CONSTASCII_STRINGPARAM(" ")),0);
+ sText.SearchAndReplaceAll(String(RTL_CONSTASCII_USTRINGPARAM("~")),String());
+ sText.Insert(String(RTL_CONSTASCII_USTRINGPARAM(" ")),0);
mpPage1OpenPB->SetText(sText);
// Place icon left of text and both centered in the button.
mpPage1OpenPB->SetModeImage(
diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx
index 87ad96d..969fa10 100644
--- a/sd/source/ui/view/ViewClipboard.cxx
+++ b/sd/source/ui/view/ViewClipboard.cxx
@@ -169,7 +169,7 @@ void ViewClipboard::AssignMasterPage (
// We have to remove the layout suffix from the layout name which is
// appended again by SetMasterPage() to the given name. Don't ask.
- String sLayoutSuffix (RTL_CONSTASCII_STRINGPARAM(SD_LT_SEPARATOR));
+ String sLayoutSuffix (RTL_CONSTASCII_USTRINGPARAM(SD_LT_SEPARATOR));
sLayoutSuffix.Append (SdResId(STR_LAYOUT_OUTLINE));
USHORT nLength = sLayoutSuffix.Len();
String sLayoutName (pMasterPage->GetLayoutName());
More information about the Libreoffice-commits
mailing list