mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some tools/string.hxx

Browse Source
This commit is contained in:
Caolán McNamara
2012-01-12 22:33:55 +00:00
parent 6248f7037c
commit 2e303c175c
4 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cui/source/dialogs/insrc.cxx
View File

@@ -50,24 +50,15 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString&
aBeforeBtn( this, CUI_RES( CB_POS_BEFORE ) ), aBeforeBtn( this, CUI_RES( CB_POS_BEFORE ) ),
aAfterBtn( this, CUI_RES( CB_POS_AFTER ) ), aAfterBtn( this, CUI_RES( CB_POS_AFTER ) ),
aPosFL( this, CUI_RES( FL_POS ) ), aPosFL( this, CUI_RES( FL_POS ) ),
aRow(CUI_RES(STR_ROW)), aRow(ResId::toString(CUI_RES(STR_ROW))),
aCol(CUI_RES(STR_COL)), aCol(ResId::toString(CUI_RES(STR_COL))),
aOKBtn( this, CUI_RES( BT_OK ) ), aOKBtn( this, CUI_RES( BT_OK ) ),
aCancelBtn( this, CUI_RES( BT_CANCEL ) ), aCancelBtn( this, CUI_RES( BT_CANCEL ) ),
aHelpBtn( this, CUI_RES( BT_HELP ) ), aHelpBtn( this, CUI_RES( BT_HELP ) ),
bColumn( bCol ) bColumn( bCol )
{ {
FreeResource(); FreeResource();
String aTmp; SetText( bColumn ? aCol : aRow );
if( bColumn )
{
aTmp += aCol;
}
else
{
aTmp += aRow;
}
SetText( aTmp );
SetHelpId( sHelpId ); SetHelpId( sHelpId );
} }
@@ -76,6 +67,4 @@ short SvxInsRowColDlg::Execute(void)
return ModalDialog::Execute(); return ModalDialog::Execute();
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

9
cui/source/inc/insrc.hxx
View File

@@ -28,6 +28,9 @@
#ifndef _SVX_INSRC_HXX #ifndef _SVX_INSRC_HXX
#define _SVX_INSRC_HXX #define _SVX_INSRC_HXX
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
#include <svx/stddlg.hxx> #include <svx/stddlg.hxx>
#include <vcl/fixed.hxx> #include <vcl/fixed.hxx>
@@ -35,8 +38,6 @@
#include <vcl/group.hxx> #include <vcl/group.hxx>
#include <vcl/button.hxx> #include <vcl/button.hxx>
#include <tools/string.hxx>
class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog
{ {
FixedText aCount; FixedText aCount;
@@ -47,8 +48,8 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog
RadioButton aAfterBtn; RadioButton aAfterBtn;
FixedLine aPosFL; FixedLine aPosFL;
String aRow; rtl::OUString aRow;
String aCol; rtl::OUString aCol;
OKButton aOKBtn; OKButton aOKBtn;
CancelButton aCancelBtn; CancelButton aCancelBtn;

4
svtools/inc/svtools/indexentryres.hxx
View File

@@ -4,7 +4,7 @@
#define SVTOOLS_INDEXENTRYRESSOURCE_HXX #define SVTOOLS_INDEXENTRYRESSOURCE_HXX
#include "svtools/svtdllapi.h" #include "svtools/svtdllapi.h"
#include <tools/string.hxx> #include <rtl/ustring.hxx>
class IndexEntryRessourceData; class IndexEntryRessourceData;
@@ -16,7 +16,7 @@ class SVT_DLLPUBLIC IndexEntryRessource
public: public:
IndexEntryRessource (); IndexEntryRessource ();
~IndexEntryRessource (); ~IndexEntryRessource ();
const String& GetTranslation (const String& r_Algorithm); const rtl::OUString& GetTranslation (const rtl::OUString& r_Algorithm);
}; };
#endif /* SVTOOLS_INDEXENTRYRESSOURCE_HXX */ #endif /* SVTOOLS_INDEXENTRYRESSOURCE_HXX */

25
svtools/source/control/indexentryres.cxx
View File

@@ -41,17 +41,17 @@ class IndexEntryRessourceData
{ {
friend class IndexEntryRessource; friend class IndexEntryRessource;
private: /* data */ private: /* data */
String ma_Name; rtl::OUString ma_Name;
String ma_Translation; rtl::OUString ma_Translation;
private: /* member functions */ private: /* member functions */
IndexEntryRessourceData () {} IndexEntryRessourceData () {}
public: public:
IndexEntryRessourceData ( const String &r_Algorithm, const String &r_Translation) IndexEntryRessourceData ( const rtl::OUString &r_Algorithm, const rtl::OUString &r_Translation)
: ma_Name (r_Algorithm), ma_Translation (r_Translation) {} : ma_Name (r_Algorithm), ma_Translation (r_Translation) {}
const String& GetAlgorithm () const { return ma_Name; } const rtl::OUString& GetAlgorithm () const { return ma_Name; }
const String& GetTranslation () const { return ma_Translation; } const rtl::OUString& GetTranslation () const { return ma_Translation; }
~IndexEntryRessourceData () {} ~IndexEntryRessourceData () {}
@@ -75,8 +75,8 @@ IndexEntryRessource::IndexEntryRessource()
{ {
mp_Data = new IndexEntryRessourceData[INDEXENTRY_RESSOURCE_COUNT]; mp_Data = new IndexEntryRessourceData[INDEXENTRY_RESSOURCE_COUNT];
#define ASCSTR(str) String(RTL_CONSTASCII_USTRINGPARAM(str)) #define ASCSTR(str) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(str))
#define RESSTR(rid) String(SvtResId(rid)) #define RESSTR(rid) ResId::toString(SvtResId(rid))
mp_Data[STR_SVT_INDEXENTRY_ALPHANUMERIC - STR_SVT_INDEXENTRY_START] = mp_Data[STR_SVT_INDEXENTRY_ALPHANUMERIC - STR_SVT_INDEXENTRY_START] =
IndexEntryRessourceData (ASCSTR("alphanumeric"), RESSTR(STR_SVT_INDEXENTRY_ALPHANUMERIC)); IndexEntryRessourceData (ASCSTR("alphanumeric"), RESSTR(STR_SVT_INDEXENTRY_ALPHANUMERIC));
@@ -109,17 +109,16 @@ IndexEntryRessource::~IndexEntryRessource()
delete[] mp_Data; delete[] mp_Data;
} }
const String& const rtl::OUString& IndexEntryRessource::GetTranslation(const rtl::OUString &r_Algorithm)
IndexEntryRessource::GetTranslation (const String &r_Algorithm)
{ {
xub_StrLen nIndex = r_Algorithm.Search('.'); sal_Int32 nIndex = r_Algorithm.indexOf('.');
String aLocaleFreeAlgorithm; rtl::OUString aLocaleFreeAlgorithm;
if (nIndex == STRING_NOTFOUND) if (nIndex == -1)
aLocaleFreeAlgorithm = r_Algorithm; aLocaleFreeAlgorithm = r_Algorithm;
else { else {
nIndex += 1; nIndex += 1;
aLocaleFreeAlgorithm = String(r_Algorithm, nIndex, r_Algorithm.Len() - nIndex); aLocaleFreeAlgorithm = r_Algorithm.copy(nIndex, r_Algorithm.getLength() - nIndex);
} }
for (sal_uInt32 i = 0; i < INDEXENTRY_RESSOURCE_COUNT; i++) for (sal_uInt32 i = 0; i < INDEXENTRY_RESSOURCE_COUNT; i++)