summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-06-20 00:29:10 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-06-20 11:00:40 +0100
commit6f889198695ef3aef966098fee7a68f3e4d68c6e (patch)
treef770c8f52ebf027202459e16e3d2ea5f72a5c968
parent7032e992fdc6ba3560c233a21e3bbb8d00a98894 (diff)
ByteString -> rtl::OStringBuffer
-rw-r--r--cui/source/dialogs/iconcdlg.cxx2
-rw-r--r--cui/source/dialogs/srchxtra.cxx8
2 files changed, 6 insertions, 4 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 5dd9edc7a..f8a558b33 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -1106,7 +1106,7 @@ void IconChoiceDialog::Start_Impl()
if ( aTabDlgOpt.Exists() )
{
// ggf. Position aus Konfig
- SetWindowState( ByteString( aTabDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) );
+ SetWindowState(rtl::OUStringToOString(aTabDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US));
// initiale TabPage aus Programm/Hilfe/Konfig
nActPage = (sal_uInt16)aTabDlgOpt.GetPageID();
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index db8028a11..780233c4d 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -45,6 +45,7 @@
#include "backgrnd.hxx"
#include <svx/dialogs.hrc> // RID_SVXPAGE_...
#include <tools/resary.hxx>
+#include <rtl/strbuf.hxx>
// class SvxSearchFormatDialog -------------------------------------------
@@ -186,9 +187,10 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
pEntry = aAttrLB.SvTreeListBox::InsertEntry( aAttrNames.GetString(nId) );
else
{
- ByteString sError( "no resource for slot id\nslot = " );
- sError += ByteString::CreateFromInt32( nSlot );
- DBG_ERRORFILE( sError.GetBuffer() );
+ rtl::OStringBuffer sError(
+ RTL_CONSTASCII_STRINGPARAM("no resource for slot id\nslot = "));
+ sError.append(nSlot);
+ DBG_ERRORFILE(sError.getStr());
}
if ( pEntry )