diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-12 22:33:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-13 09:05:59 +0000 |
| commit | 2e303c175c3969acdb1912c47c1c9d2fab30dfa2 (patch) | |
| tree | 9b807421d23644ce16f1d8f3025093ee4a6f8d0c /cui | |
| parent | 6248f7037c6d034a352566457ebbab29ea9d817c (diff) | |
remove some tools/string.hxx
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/insrc.cxx | 17 | ||||
| -rw-r--r-- | cui/source/inc/insrc.hxx | 9 |
2 files changed, 8 insertions, 18 deletions
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index d6bb8b23ffe8..279dba93d665 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -50,24 +50,15 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString& aBeforeBtn( this, CUI_RES( CB_POS_BEFORE ) ), aAfterBtn( this, CUI_RES( CB_POS_AFTER ) ), aPosFL( this, CUI_RES( FL_POS ) ), - aRow(CUI_RES(STR_ROW)), - aCol(CUI_RES(STR_COL)), + aRow(ResId::toString(CUI_RES(STR_ROW))), + aCol(ResId::toString(CUI_RES(STR_COL))), aOKBtn( this, CUI_RES( BT_OK ) ), aCancelBtn( this, CUI_RES( BT_CANCEL ) ), aHelpBtn( this, CUI_RES( BT_HELP ) ), bColumn( bCol ) { FreeResource(); - String aTmp; - if( bColumn ) - { - aTmp += aCol; - } - else - { - aTmp += aRow; - } - SetText( aTmp ); + SetText( bColumn ? aCol : aRow ); SetHelpId( sHelpId ); } @@ -76,6 +67,4 @@ short SvxInsRowColDlg::Execute(void) return ModalDialog::Execute(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 33e8efabeb70..7e4f186059e5 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -28,6 +28,9 @@ #ifndef _SVX_INSRC_HXX #define _SVX_INSRC_HXX +#include <rtl/string.hxx> +#include <rtl/ustring.hxx> + #include <svx/stddlg.hxx> #include <vcl/fixed.hxx> @@ -35,8 +38,6 @@ #include <vcl/group.hxx> #include <vcl/button.hxx> -#include <tools/string.hxx> - class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog { FixedText aCount; @@ -47,8 +48,8 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog RadioButton aAfterBtn; FixedLine aPosFL; - String aRow; - String aCol; + rtl::OUString aRow; + rtl::OUString aCol; OKButton aOKBtn; CancelButton aCancelBtn; |