diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-10-28 21:44:12 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-01 09:27:22 +0000 |
commit | e2e684a49a8651ccc38a83e7d05ac756c6c4c2ed (patch) | |
tree | 214498c5ead880afe2a1b7f8fa550e77aad4b524 /sfx2 | |
parent | 77090e4e2515aefe547618487cdc96fde567e595 (diff) |
ByteString->rtl::OString
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index e1d90733c480..84e9a8a6d1a0 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -148,7 +148,7 @@ void SfxModalDialog::GetDialogData_Impl() if ( aDlgOpt.Exists() ) { // load settings - SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); + SetWindowState( rtl::OUStringToOString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); Any aUserItem = aDlgOpt.GetUserItem( USERITEM_NAME ); OUString aTemp; if ( aUserItem >>= aTemp ) diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 57e60136b617..cb1f2d8fa1d8 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -738,7 +738,7 @@ void SfxTabDialog::Start_Impl() if ( aDlgOpt.Exists() ) { #if !ENABLE_LAYOUT_SFX_TABDIALOG - SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); + SetWindowState(rtl::OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); #endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */ // initial TabPage from Program/Help/config |