[Libreoffice-commits] .: fpicker/source sfx2/source

[Caolán McNamara]

 fpicker/source/office/iodlg.cxx |    2 +-
 sfx2/source/dialog/basedlgs.cxx |    4 ++--
 sfx2/source/dialog/tabdlg.cxx   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ae8f555635d76ec1f990bc07917285454303679d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 22 00:59:11 2011 +0100

    adapt for new api

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index a0b3334..ed3cf65 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 c88f0ef..978fdee 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 0a4825f..7b20081 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() );