diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-22 00:59:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-22 00:59:11 +0100 |
| commit | 4f314412dee35856ae70a8331047f7c54e07073b (patch) | |
| tree | d236058b70db76555e70adc34c2ad26f3a78a97d | |
| parent | 9e5ce467898ee588b318f2efe8ee6fa4adc5a2dc (diff) | |
adapt for new api
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 9bae8ceec789..81298c5a1dcd 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -515,7 +515,7 @@ SvtFileDialog::~SvtFileDialog() { // save window state SvtViewOptions aDlgOpt( E_DIALOG, _pImp->_aIniKey ); - aDlgOpt.SetWindowState( String( GetWindowState(), osl_getThreadTextEncoding() ) ); + aDlgOpt.SetWindowState(::rtl::OStringToOUString(GetWindowState(), osl_getThreadTextEncoding())); String sUserData = _pFileView->GetConfigString(); aDlgOpt.SetUserItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserData" )), makeAny( ::rtl::OUString( sUserData ) ) ); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 8c69e1b4bbc5..81f0d6ece67f 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -127,8 +127,8 @@ void SfxModalDialog::SetDialogData_Impl() { // save settings (position and user data) SvtViewOptions aDlgOpt( E_DIALOG, String::CreateFromInt32( nUniqId ) ); - aDlgOpt.SetWindowState( - OUString::createFromAscii( GetWindowState( WINDOWSTATE_MASK_POS ).GetBuffer() ) ); + aDlgOpt.SetWindowState(OStringToOUString( + GetWindowState(WINDOWSTATE_MASK_POS), RTL_TEXTENCODING_ASCII_US)); if ( aExtraData.Len() ) aDlgOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( aExtraData ) ) ); } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index c9d90ae59b0b..e816322a0718 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -586,7 +586,7 @@ SfxTabDialog::~SfxTabDialog() // save settings (screen position and current page) SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) ); #if !ENABLE_LAYOUT_SFX_TABDIALOG - aDlgOpt.SetWindowState( OUString::createFromAscii( GetWindowState( WINDOWSTATE_MASK_POS ).GetBuffer() ) ); + aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WINDOWSTATE_MASK_POS),RTL_TEXTENCODING_ASCII_US)); #endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */ aDlgOpt.SetPageID( aTabCtrl.GetCurPageId() ); |