diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-07-10 18:21:24 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-07-10 18:21:24 +0200 |
commit | d1f6ae4254c5f3b6047551d95fe341ac8d6dd56b (patch) | |
tree | 72e848a53a340208396efb60ac98793c3afb9698 /reportdesign/source/ui/dlg/Formula.cxx | |
parent | fix warnings (diff) | |
download | core-d1f6ae4254c5f3b6047551d95fe341ac8d6dd56b.tar.gz core-d1f6ae4254c5f3b6047551d95fe341ac8d6dd56b.zip |
CWS changehid: #i111874#: change code to support HelpIds as byte strings
Diffstat (limited to 'reportdesign/source/ui/dlg/Formula.cxx')
-rw-r--r-- | reportdesign/source/ui/dlg/Formula.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index c54380cb7d2a..682ec6b17438 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -99,7 +99,7 @@ FormulaDialog::~FormulaDialog() { if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( HID_RPT_FIELD_SEL_WIN ) ); + SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) ); aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)).GetBuffer() ) ); ::std::auto_ptr<Window> aTemp2(m_pAddField); @@ -209,7 +209,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) { m_pAddField = new OAddFieldWindow(this,m_xRowSet); m_pAddField->SetCreateHdl(LINK( this, FormulaDialog, OnClickHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( HID_RPT_FIELD_SEL_WIN ) ); + SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) ); if ( aDlgOpt.Exists() ) { m_pAddField->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); |