#i123068# remove implicit conversions from rtl strings to their elements

3 files changed, 3 insertions, 4 deletions

diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index 7f31ac703a09..f38926267e34 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -334,7 +334,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
         aStatement += '.';
 
     // der Name des Slots ist der Name der Methode / des Properties
-    aStatement += String::CreateFromAscii(rSlot.pName);
+    aStatement += String( rtl::OStringToOUString( rSlot.pName, RTL_TEXTENCODING_UTF8));
     if ( rSlot.IsMode(SFX_SLOT_METHOD) )
         aStatement += DEFINE_CONST_UNICODE("( ");
     else
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index 19f424dc154b..398da943e770 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -65,7 +65,6 @@ sal_uInt16 SfxSlot::GetWhich( const SfxItemPool &rPool ) const
 
 ::rtl::OUString SfxSlot::GetCommandString() const
 {
-    rtl::OString aCmd(GetCommand());
-    return rtl::OUString( aCmd, aCmd.getLength(), RTL_TEXTENCODING_UTF8 );
+    return rtl::OStringToOUString( GetCommand(), RTL_TEXTENCODING_UTF8);
 }
 
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index c9ebfb90f5d4..c4d348c2f047 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -1115,7 +1115,7 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::em
         pNewSlot->fnExec = SFX_STUB_PTR(SfxShell,VerbExec);
         pNewSlot->fnState = SFX_STUB_PTR(SfxShell,VerbState);
         pNewSlot->pType = 0; HACK(SFX_TYPE(SfxVoidItem))
-        pNewSlot->pName = U2S(aVerbs[n].VerbName);
+        pNewSlot->pName = OUStringToOString( aVerbs[n].VerbName, RTL_TEXTENCODING_UTF8).getStr(); // TODO: life time of temp is suspicious!!!
         pNewSlot->pLinkedSlot = 0;
         pNewSlot->nArgDefCount = 0;
         pNewSlot->pFirstArgDef = 0;