summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--basic/inc/basic/sbx.hxx1
-rw-r--r--basic/inc/basic/sbxcore.hxx1
-rw-r--r--basic/inc/basic/sbxfac.hxx1
-rw-r--r--basic/source/sbx/sbxvalue.cxx2
-rw-r--r--fpicker/source/office/iodlg.cxx6
-rw-r--r--openssl/makefile.mk2
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx12
-rw-r--r--starmath/source/parse.cxx4
-rw-r--r--svtools/inc/svtools/filectrl.hxx6
-rw-r--r--svtools/inc/svtools/filedlg.hxx7
-rw-r--r--svtools/inc/svtools/fileview.hxx4
-rw-r--r--svtools/source/dialogs/filedlg.cxx4
-rw-r--r--svx/source/svdraw/svdibrow.cxx61
-rw-r--r--sw/source/filter/html/parcss1.cxx2
-rw-r--r--tools/inc/tools/config.hxx2
-rw-r--r--tools/inc/tools/inetmime.hxx8
-rw-r--r--tools/inc/tools/rc.hxx2
-rw-r--r--tools/inc/tools/string.hxx2
-rw-r--r--tools/source/generic/config.cxx2
-rw-r--r--tools/source/inet/inetmime.cxx10
-rw-r--r--tools/source/rc/resmgr.cxx4
-rw-r--r--tools/source/string/tustring.cxx18
-rwxr-xr-xunusedcode.easy2
-rw-r--r--vcl/source/control/field.cxx2
24 files changed, 66 insertions, 99 deletions
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index b4db6e65b5d5..a652bec26b87 100644
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -44,7 +44,6 @@
#include <boost/ptr_container/ptr_vector.hpp>
class String;
-class UniString;
class SvStream;
class SbxBase;
class SbxVariable;
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index 1969adf0cc1c..781c58e792be 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -38,7 +38,6 @@
class SvStream;
class String;
-class UniString;
namespace rtl { class OUString; }
// The following Macro defines four (five) necessary methods within a
diff --git a/basic/inc/basic/sbxfac.hxx b/basic/inc/basic/sbxfac.hxx
index 2ef93a1140f8..3759ea809c18 100644
--- a/basic/inc/basic/sbxfac.hxx
+++ b/basic/inc/basic/sbxfac.hxx
@@ -35,7 +35,6 @@
class SbxBase;
class SbxObject;
class String;
-class UniString;
class BASIC_DLLPUBLIC SbxFactory
{
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 74b9d9c96a3e..dcefac7b556d 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -854,7 +854,7 @@ sal_Bool SbxValue::SetType( SbxDataType t )
sal_uInt16 nSlotId = pThisVar
? ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) )
: 0;
- DBG_ASSERT( nSlotId != 5345 || pThisVar->GetName() == UniString::CreateFromAscii( "Parent" ),
+ DBG_ASSERT( nSlotId != 5345 || pThisVar->GetName().EqualsAscii("Parent"),
"SID_PARENTOBJECT heisst nicht 'Parent'" );
sal_Bool bParentProp = 5345 == nSlotId;
if ( !bParentProp )
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 9ea83da4b3e1..5290c785bccd 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1592,11 +1592,11 @@ IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTabListBox*, pBox )
else if ( !pUserData->mbIsFolder )
{
_pImp->_pEdFileName->SetText( pUserData->maURL );
- _pImp->_pEdFileName->SetSelection( Selection( 0, pUserData->maURL.Len() ) );
+ _pImp->_pEdFileName->SetSelection( Selection( 0, pUserData->maURL.getLength() ) );
_aPath = pUserData->maURL;
}
else
- _pImp->_pEdFileName->SetText( UniString() );
+ _pImp->_pEdFileName->SetText( rtl::OUString() );
}
else
{
@@ -2153,7 +2153,7 @@ short SvtFileDialog::PrepareExecute()
// if applicable set respectively create filter for all files
if ( !bHasAll )
{
- SvtFileDialogFilter_Impl* pAllFilter = implAddFilter( aAll, UniString(RTL_CONSTASCII_USTRINGPARAM(FILEDIALOG_FILTER_ALL)) );
+ SvtFileDialogFilter_Impl* pAllFilter = implAddFilter( aAll, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FILEDIALOG_FILTER_ALL)) );
_pImp->InsertFilterListEntry( pAllFilter );
_pImp->SetCurFilter( pAllFilter, aAll );
}
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 45854c26256c..226e86cf2711 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -75,7 +75,7 @@ COMPILER_AND_FLAGS=$(CC)
COMPILER_AND_FLAGS+=-fvisibility=hidden
.ENDIF
-BUILD_ACTION=make build_libs CC='$(COMPILER_AND_FLAGS)'
+BUILD_ACTION=make build_libs CC='$(COMPILER_AND_FLAGS)' -j1
OUT2LIB = libssl.*
OUT2LIB += libcrypto.*
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index d1820317739e..8e42e16aa680 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -2104,9 +2104,9 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
break;
default:
{
- String aText( mpCBRepeat->GetText() );
- if( aText.Len() )
- aRepeatCount <<= aText.ToDouble();
+ rtl::OUString aText( mpCBRepeat->GetText() );
+ if( !aText.isEmpty() )
+ aRepeatCount <<= aText.toDouble();
}
}
@@ -2135,10 +2135,10 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
}
else
{
- String aText( mpCBDuration->GetText() );
- if( aText.Len() )
+ rtl::OUString aText( mpCBDuration->GetText() );
+ if( !aText.isEmpty() )
{
- fDuration = aText.ToDouble();
+ fDuration = aText.toDouble();
}
}
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 3b1f2a4f6f85..b386cf36fbab 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1972,8 +1972,8 @@ void SmParser::FontSize()
Fraction aValue( 1L );
if (lcl_IsNumber( m_aCurToken.aText ))
{
- double fTmp;
- if ((fTmp = m_aCurToken.aText.ToDouble()) != 0.0)
+ double fTmp = rtl::OUString(m_aCurToken.aText).toDouble();
+ if (fTmp != 0.0)
{
aValue = fTmp;
diff --git a/svtools/inc/svtools/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx
index 14dcc75e615e..e1c2b04e5cf4 100644
--- a/svtools/inc/svtools/filectrl.hxx
+++ b/svtools/inc/svtools/filectrl.hxx
@@ -86,7 +86,7 @@ public:
void SetText( const XubString& rStr );
XubString GetText() const;
- UniString GetSelectedText() const { return maEdit.GetSelected(); }
+ rtl::OUString GetSelectedText() const { return maEdit.GetSelected(); }
void SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); }
Selection GetSelection() const { return maEdit.GetSelection(); }
@@ -95,10 +95,6 @@ public:
sal_Bool IsReadOnly() const { return maEdit.IsReadOnly(); }
//------
- //manipulate the Button-Text:
- XubString GetButtonText() const { return maButtonText; }
-
- //------
//use this to manipulate the dialog bevore executing it:
void SetDialogCreatedHdl( const Link& rLink ) { maDialogCreatedHdl = rLink; }
const Link& GetDialogCreatedHdl() const { return maDialogCreatedHdl; }
diff --git a/svtools/inc/svtools/filedlg.hxx b/svtools/inc/svtools/filedlg.hxx
index e774fa559f93..6fa7333fde35 100644
--- a/svtools/inc/svtools/filedlg.hxx
+++ b/svtools/inc/svtools/filedlg.hxx
@@ -46,17 +46,14 @@ private:
ImpSvFileDlg* pImpFileDlg; // Implementation
Link aOKHdlLink; // Link to OK-Handler
-protected:
- UniString aDfltExt; // Default - Extension
-
public:
PathDialog( Window* pParent, WinBits nWinStyle = 0, sal_Bool bCreateDir = sal_True );
~PathDialog();
virtual long OK();
- void SetPath( const UniString& rNewPath );
- UniString GetPath() const;
+ void SetPath( const rtl::OUString& rNewPath );
+ rtl::OUString GetPath() const;
void SetOKHdl( const Link& rLink ) { aOKHdlLink = rLink; }
const Link& GetOKHdl() const { return aOKHdlLink; }
diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx
index ec40c0519447..c5ec78ead9fb 100644
--- a/svtools/inc/svtools/fileview.hxx
+++ b/svtools/inc/svtools/fileview.hxx
@@ -215,9 +215,9 @@ protected:
struct SvtContentEntry
{
sal_Bool mbIsFolder;
- UniString maURL;
+ rtl::OUString maURL;
- SvtContentEntry( const UniString& rURL, sal_Bool bIsFolder ) :
+ SvtContentEntry( const rtl::OUString& rURL, sal_Bool bIsFolder ) :
mbIsFolder( bIsFolder ), maURL( rURL ) {}
};
diff --git a/svtools/source/dialogs/filedlg.cxx b/svtools/source/dialogs/filedlg.cxx
index a985eda0ab01..fb56769f2b3e 100644
--- a/svtools/source/dialogs/filedlg.cxx
+++ b/svtools/source/dialogs/filedlg.cxx
@@ -49,12 +49,12 @@ short PathDialog::Execute()
return n;
}
-UniString PathDialog::GetPath() const
+rtl::OUString PathDialog::GetPath() const
{
return pImpFileDlg->GetDialog()->GetPath();
}
-void PathDialog::SetPath( const UniString& rPath )
+void PathDialog::SetPath( const rtl::OUString& rPath )
{
pImpFileDlg->GetDialog()->SetPath( rPath );
}
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 56e93dabed68..b21bc0bfe43a 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -1171,18 +1171,17 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
pView->GetAttributes(aSet);
SfxItemSet aNewSet(*aSet.GetPool(),pEntry->nWhichId,pEntry->nWhichId);
- XubString aNewText(pBrowse->GetNewEntryValue());
- sal_Bool bDel( aNewText.EqualsAscii("del")
- || aNewText.EqualsAscii("Del")
- || aNewText.EqualsAscii("DEL")
- || aNewText.EqualsAscii("default")
- || aNewText.EqualsAscii("Default")
- || aNewText.EqualsAscii("DEFAULT"));
+ rtl::OUString aNewText(pBrowse->GetNewEntryValue());
+ sal_Bool bDel( aNewText == "del"
+ || aNewText == "Del"
+ || aNewText == "DEL"
+ || aNewText == "default"
+ || aNewText == "Default"
+ || aNewText == "DEFAULT" );
if (!bDel) {
SfxPoolItem* pNewItem=aSet.Get(pEntry->nWhichId).Clone();
- long nLongVal=0;
- nLongVal = aNewText.ToInt32();
+ long nLongVal = aNewText.toInt32();
if (pEntry->bCanNum) {
if (nLongVal>pEntry->nMax) nLongVal=pEntry->nMax;
if (nLongVal<pEntry->nMin) nLongVal=pEntry->nMin;
@@ -1190,18 +1189,18 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
bool bPairX = true;
bool bPairY = false;
sal_uInt16 nSepLen=1;
- long nLongX = aNewText.ToInt32();
+ long nLongX = aNewText.toInt32();
long nLongY=0;
- xub_StrLen nPos = aNewText.Search(sal_Unicode('/'));
- if (nPos==STRING_NOTFOUND) nPos=aNewText.Search(sal_Unicode(':'));
- if (nPos==STRING_NOTFOUND) nPos=aNewText.Search(sal_Unicode(' '));
- if (nPos==STRING_NOTFOUND) { nPos=aNewText.SearchAscii(".."); if (nPos!=STRING_NOTFOUND) nSepLen=2; }
- if (nPos!=STRING_NOTFOUND) {
+ sal_Int32 nPos = aNewText.indexOf(sal_Unicode('/'));
+ if (nPos==-1) nPos=aNewText.indexOf(sal_Unicode(':'));
+ if (nPos==-1) nPos=aNewText.indexOf(sal_Unicode(' '));
+ if (nPos==-1) { nPos=aNewText.indexOf(".."); if (nPos!=-1) nSepLen=2; }
+ if (nPos!=01)
+ {
bPairX=nPos>0;
- XubString s(aNewText);
- s.Erase(0,nPos+nSepLen);
- bPairY = (sal_Bool)aNewText.Len();
- nLongY = s.ToInt32();
+ rtl::OUString s(aNewText.copy(nPos+nSepLen));
+ bPairY = !aNewText.isEmpty();
+ nLongY = s.toInt32();
}
switch (pEntry->eItemType) {
case ITEM_BYTE : ((SfxByteItem *)pNewItem)->SetValue((sal_uInt8 )nLongVal); break;
@@ -1210,22 +1209,22 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
case ITEM_INT32: {
if(HAS_BASE(SdrAngleItem, pNewItem))
{
- aNewText.SearchAndReplace(sal_Unicode(','), sal_Unicode('.'));
- double nVal = aNewText.ToFloat();
+ aNewText = aNewText.replace(',', '.');
+ double nVal = aNewText.toFloat();
nLongVal = (long)(nVal * 100 + 0.5);
}
((SfxInt32Item *)pNewItem)->SetValue((sal_Int32)nLongVal);
} break;
- case ITEM_UINT32: ((SfxUInt32Item*)pNewItem)->SetValue(aNewText.ToInt32()); break;
+ case ITEM_UINT32: ((SfxUInt32Item*)pNewItem)->SetValue(aNewText.toInt32()); break;
case ITEM_ENUM : ((SfxEnumItemInterface*)pNewItem)->SetEnumValue((sal_uInt16)nLongVal); break;
case ITEM_BOOL: {
- aNewText.ToUpperAscii();
- if (aNewText.EqualsAscii("TRUE")) nLongVal=1;
- if (aNewText.EqualsAscii("JA")) nLongVal=1;
- if (aNewText.EqualsAscii("AN")) nLongVal=1;
- if (aNewText.EqualsAscii("EIN")) nLongVal=1;
- if (aNewText.EqualsAscii("ON")) nLongVal=1;
- if (aNewText.EqualsAscii("YES")) nLongVal=1;
+ aNewText = aNewText.toAsciiUpperCase();
+ if (aNewText == "TRUE") nLongVal=1;
+ if (aNewText == "JA") nLongVal=1;
+ if (aNewText == "AN") nLongVal=1;
+ if (aNewText == "EIN") nLongVal=1;
+ if (aNewText == "ON") nLongVal=1;
+ if (aNewText == "YES") nLongVal=1;
((SfxBoolItem*)pNewItem)->SetValue((sal_Bool)nLongVal);
} break;
case ITEM_FLAG : ((SfxFlagItem *)pNewItem)->SetValue((sal_uInt16)nLongVal); break;
@@ -1253,7 +1252,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
case ITEM_FONTHEIGHT: {
sal_uIntPtr nHgt=0;
sal_uInt16 nProp=100;
- if (aNewText.Search(sal_Unicode('%'))!=STRING_NOTFOUND) {
+ if (aNewText.indexOf(sal_Unicode('%')) != -1) {
nProp=(sal_uInt16)nLongVal;
} else {
nHgt=nLongVal;
@@ -1262,7 +1261,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
} break;
case ITEM_FONTWIDTH: {
sal_uInt16 nProp=100;
- if (aNewText.Search(sal_Unicode('%'))!=STRING_NOTFOUND) {
+ if (aNewText.indexOf(sal_Unicode('%')) != -1) {
nProp=(sal_uInt16)nLongVal;
}
((SvxCharScaleWidthItem*)pNewItem)->SetValue(nProp);
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index feb6c1851718..67f519da5885 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -360,7 +360,7 @@ CSS1Token CSS1Parser::GetNextToken()
!IsEOF() );
aToken += String(sTmpBuffer.makeStringAndClear());
- nValue = aToken.ToDouble();
+ nValue = rtl::OUString(aToken).toDouble();
// White Space ueberlesen
while( ( ' ' == cNextCh ||
diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx
index 478f7653291e..59b813a83344 100644
--- a/tools/inc/tools/config.hxx
+++ b/tools/inc/tools/config.hxx
@@ -69,7 +69,7 @@ public:
sal_Bool HasGroup(const rtl::OString& rGroup) const;
rtl::OString ReadKey(const rtl::OString& rKey) const;
- UniString ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const;
+ rtl::OUString ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const;
rtl::OString ReadKey(const rtl::OString& rKey, const rtl::OString& rDefault) const;
void WriteKey(const rtl::OString& rKey, const rtl::OString& rValue);
void DeleteKey(const rtl::OString& rKey);
diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index 6259c20a887e..4c66c4dd068f 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.hxx
@@ -514,7 +514,7 @@ public:
static void writeHeaderFieldBody(INetMIMEOutputSink & rSink,
HeaderFieldType eType,
- const UniString & rBody,
+ const rtl::OUString& rBody,
rtl_TextEncoding ePreferredEncoding,
bool bInitialSpace = true);
@@ -523,7 +523,7 @@ public:
rtl_TextEncoding eEncoding,
sal_uInt32 & rCharacter);
- static UniString decodeHeaderFieldBody(HeaderFieldType eType,
+ static rtl::OUString decodeHeaderFieldBody(HeaderFieldType eType,
const rtl::OString& rBody);
// #i70651#: Prevent warnings on Mac OS X.
@@ -1237,7 +1237,7 @@ struct INetContentTypeParameter
within Unicode's Private Use Area (effectively adding 0xF800 to the
character's numeric value).
*/
- const UniString m_sValue;
+ const rtl::OUString m_sValue;
/** This is true if the value is successfuly converted to Unicode, and
false if the value is a special mixture of ISO-LATIN-1 characters and
@@ -1247,7 +1247,7 @@ struct INetContentTypeParameter
INetContentTypeParameter(const rtl::OString& rTheAttribute,
const rtl::OString& rTheCharset, const rtl::OString& rTheLanguage,
- const UniString & rTheValue, bool bTheConverted)
+ const rtl::OUString& rTheValue, bool bTheConverted)
: m_sAttribute(rTheAttribute)
, m_sCharset(rTheCharset)
, m_sLanguage(rTheLanguage)
diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx
index 1bca5f99d35b..0ee95dbef5ef 100644
--- a/tools/inc/tools/rc.hxx
+++ b/tools/inc/tools/rc.hxx
@@ -82,7 +82,7 @@ class TOOLS_DLLPUBLIC Resource
sal_Int16 ReadShortRes()
{ return m_pResMgr->ReadShort(); }
// read a string from resource data and increment pointer
- UniString ReadStringRes()
+ rtl::OUString ReadStringRes()
{ return m_pResMgr->ReadString(); }
// read a byte string from resource data and increment pointer
rtl::OString ReadByteStringRes()
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index d4ba851c9dac..2d1e6a964954 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -183,8 +183,6 @@ public:
static const UniString& EmptyString();
sal_Int32 ToInt32() const;
sal_Int64 ToInt64() const;
- float ToFloat() const;
- double ToDouble() const;
UniString& Assign( const UniString& rStr );
UniString& Assign( const rtl::OUString& rStr );
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index dc0c08b56821..767e17a736c1 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -888,7 +888,7 @@ rtl::OString Config::ReadKey(const rtl::OString& rKey) const
// -----------------------------------------------------------------------
-UniString Config::ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const
+rtl::OUString Config::ReadKey(const rtl::OString& rKey, rtl_TextEncoding eEncoding) const
{
if ( mpData->mbIsUTF8BOM )
eEncoding = RTL_TEXTENCODING_UTF8;
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index a711e4adc0a9..531d5fc3c3c1 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -1947,7 +1947,7 @@ void INetMIME::writeUTF8(INetMIMEOutputSink & rSink, sal_uInt32 nChar)
// static
void INetMIME::writeHeaderFieldBody(INetMIMEOutputSink & rSink,
HeaderFieldType eType,
- const UniString & rBody,
+ const rtl::OUString& rBody,
rtl_TextEncoding ePreferredEncoding,
bool bInitialSpace)
{
@@ -1959,7 +1959,7 @@ void INetMIME::writeHeaderFieldBody(INetMIMEOutputSink & rSink,
INetMIMEEncodedWordOutputSink::SPACE_ALWAYS :
INetMIMEEncodedWordOutputSink::SPACE_NO,
ePreferredEncoding);
- aOutput.write(rBody.GetBuffer(), rBody.GetBuffer() + rBody.Len());
+ aOutput.write(rBody.getStr(), rBody.getStr() + rBody.getLength());
aOutput.flush();
}
else
@@ -1967,8 +1967,8 @@ void INetMIME::writeHeaderFieldBody(INetMIMEOutputSink & rSink,
enum Brackets { BRACKETS_OUTSIDE, BRACKETS_OPENING, BRACKETS_INSIDE };
Brackets eBrackets = BRACKETS_OUTSIDE;
- const sal_Unicode * pBodyPtr = rBody.GetBuffer();
- const sal_Unicode * pBodyEnd = pBodyPtr + rBody.Len();
+ const sal_Unicode * pBodyPtr = rBody.getStr();
+ const sal_Unicode * pBodyEnd = pBodyPtr + rBody.getLength();
while (pBodyPtr != pBodyEnd)
switch (*pBodyPtr)
{
@@ -2757,7 +2757,7 @@ bool INetMIME::translateUTF8Char(const sal_Char *& rBegin,
//============================================================================
// static
-UniString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType,
+rtl::OUString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType,
const rtl::OString& rBody)
{
// Due to a bug in INetCoreRFC822MessageStream::ConvertTo7Bit(), old
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 8e9931e9f050..bc4e4ad65119 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -727,7 +727,7 @@ UniString GetTypeRes_Impl( const ResId& rTypeId )
{
// Funktion verlassen, falls Resourcefehler in dieser Funktion
static int bInUse = sal_False;
- UniString aTypStr( UniString::CreateFromInt32( rTypeId.GetId() ) );
+ rtl::OUString aTypStr(OUString::valueOf(static_cast<sal_Int32>(rTypeId.GetId())));
if ( !bInUse )
{
@@ -741,7 +741,7 @@ UniString GetTypeRes_Impl( const ResId& rTypeId )
rTypeId.SetRT( RSC_STRING );
if ( rTypeId.GetResMgr()->IsAvailable( rTypeId ) )
{
- aTypStr = UniString( rTypeId );
+ aTypStr = ResId::toString(rTypeId);
// Versions Resource Klassenzeiger ans Ende setzen
rTypeId.GetResMgr()->Increment( sizeof( RSHEADER_TYPE ) );
}
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index 53f5473eb29a..f3879e8d8126 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -105,24 +105,6 @@ sal_Int64 UniString::ToInt64() const
// -----------------------------------------------------------------------
-float UniString::ToFloat() const
-{
- DBG_CHKTHIS( UniString, DbgCheckUniString );
-
- return rtl_ustr_toFloat( mpData->maStr );
-}
-
-// -----------------------------------------------------------------------
-
-double UniString::ToDouble() const
-{
- DBG_CHKTHIS( UniString, DbgCheckUniString );
-
- return rtl_ustr_toDouble( mpData->maStr );
-}
-
-// -----------------------------------------------------------------------
-
xub_StrLen STRING::SearchChar( const STRCODE* pChars, xub_StrLen nIndex ) const
{
DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/unusedcode.easy b/unusedcode.easy
index 112e3f7ba333..5c516ed30e1a 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -563,8 +563,6 @@ binfilter::String::Search(unsigned short const*, unsigned short) const
binfilter::String::SearchAndReplaceAll(binfilter::String const&, binfilter::String const&)
binfilter::String::SearchAndReplaceAllAscii(char const*, binfilter::String const&)
binfilter::String::SearchChar(unsigned short const*, unsigned short) const
-binfilter::String::ToFloat() const
-binfilter::String::intern() const
binfilter::SvBools::Insert(binfilter::SvBools const*, unsigned short, unsigned short, unsigned short)
binfilter::SvBools::Replace(unsigned char const&, unsigned short)
binfilter::SvBools::Replace(unsigned char const*, unsigned short, unsigned short)
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index bcb676d37ba5..1a880eb3335b 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -205,7 +205,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, double& rValue,
aStr += aStr2;
// Bereichsueberpruefung
- double nValue = aStr.ToDouble();
+ double nValue = rtl::OUString(aStr).toDouble();
if ( bRound )
{
if ( !bNegative )
generated by cgit (git 2.34.1) at 2024-12-26 13:27:35 +0000