diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-27 20:21:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-27 20:22:03 +0200 |
| commit | 6671fa81db0ecea4ada005bb79f55f08fb440ad4 (patch) | |
| tree | 85ad806ece8d60736b6b01310b04b053dc2f8179 /sfx2/source/control | |
| parent | b6d8251eee90b7e24ebb3f8452eff36a507e6d91 (diff) | |
Removed uses of rtl::O[U]String[Buffer]::operator sal_{char|Unicode} const *().
Diffstat (limited to 'sfx2/source/control')
| -rw-r--r-- | sfx2/source/control/msg.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/control/shell.cxx | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index 119b186f112b..def2a67aa651 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -70,8 +70,7 @@ 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); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index f18c2e74d78b..7a32326ad652 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -1071,7 +1071,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 = U2S(aVerbs[n].VerbName).getStr(); pNewSlot->pLinkedSlot = 0; pNewSlot->nArgDefCount = 0; pNewSlot->pFirstArgDef = 0; |