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

make basic XubString free

Browse Source 
Change-Id: Iea5c01fe902b052a55c86ca3b879bcca12c80690
This commit is contained in:
Caolán McNamara
2013-01-30 01:32:22 +00:00
parent 9a39ae6d2d
commit 015a93d6b6
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
basic/source/sbx/sbxvalue.cxx
View File

@@ -1420,7 +1420,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
case SbxSINGLE: case SbxSINGLE:
{ {
// Floats as ASCII // Floats as ASCII
XubString aVal = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(r, OUString aVal = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(r,
RTL_TEXTENCODING_ASCII_US); RTL_TEXTENCODING_ASCII_US);
double d; double d;
SbxDataType t; SbxDataType t;
@@ -1436,7 +1436,7 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
case SbxDOUBLE: case SbxDOUBLE:
{ {
// Floats as ASCII // Floats as ASCII
XubString aVal = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(r, OUString aVal = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(r,
RTL_TEXTENCODING_ASCII_US); RTL_TEXTENCODING_ASCII_US);
SbxDataType t; SbxDataType t;
if( ImpScan( aVal, aData.nDouble, t, NULL ) != SbxERR_OK ) if( ImpScan( aVal, aData.nDouble, t, NULL ) != SbxERR_OK )

8
svx/source/accessibility/charmapacc.cxx
View File

@@ -700,7 +700,7 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole()
ensureAlive(); ensureAlive();
String sDescription = SVX_RESSTR( RID_SVXSTR_CHARACTER_CODE ); String sDescription = SVX_RESSTR( RID_SVXSTR_CHARACTER_CODE );
sal_Unicode c = mpParent->maText.GetChar(0); sal_Unicode c = mpParent->maText[0];
char buf[16] = "0x0000"; char buf[16] = "0x0000";
sal_Unicode c_Shifted = c; sal_Unicode c_Shifted = c;
for( int i = 0; i < 4; ++i ) for( int i = 0; i < 4; ++i )
@@ -718,18 +718,18 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole()
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
::rtl::OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName() OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName()
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
OExternalLockGuard aGuard( this ); OExternalLockGuard aGuard( this );
ensureAlive(); ensureAlive();
String aRet; OUString aRet;
if( mpParent ) if( mpParent )
{ {
aRet = mpParent->maText; aRet = mpParent->maText;
if( !aRet.Len() ) if (aRet.isEmpty())
aRet = getAccessibleDescription(); aRet = getAccessibleDescription();
} }

4
svx/source/inc/charmapacc.hxx
View File

@@ -96,8 +96,8 @@ namespace svx
struct SvxShowCharSetItem struct SvxShowCharSetItem
{ {
SvxShowCharSet& mrParent; SvxShowCharSet& mrParent;
sal_uInt16 mnId; sal_uInt16 mnId;
XubString maText; OUString maText;
Rectangle maRect; Rectangle maRect;
SvxShowCharSetItemAcc* m_pItem; SvxShowCharSetItemAcc* m_pItem;
SvxShowCharSetAcc* m_pParent; SvxShowCharSetAcc* m_pParent;

3
svx/source/svdraw/svdattr.cxx
View File

@@ -85,7 +85,6 @@ SdrItemPool::SdrItemPool(
{ {
// prepare some constants // prepare some constants
const Color aNullCol(RGB_Color(COL_BLACK)); const Color aNullCol(RGB_Color(COL_BLACK));
const XubString aEmptyStr;
const sal_Int32 nDefEdgeDist(500L); // Defaulting hard for Draw (100TH_MM) currently. MapMode will have to be taken into account in the future. const sal_Int32 nDefEdgeDist(500L); // Defaulting hard for Draw (100TH_MM) currently. MapMode will have to be taken into account in the future.
// init the non-persistent items // init the non-persistent items
@@ -96,7 +95,7 @@ SdrItemPool::SdrItemPool(
// init own PoolDefaults // init own PoolDefaults
mppLocalPoolDefaults[SDRATTR_SHADOW -SDRATTR_START]=new SdrShadowItem; mppLocalPoolDefaults[SDRATTR_SHADOW -SDRATTR_START]=new SdrShadowItem;
mppLocalPoolDefaults[SDRATTR_SHADOWCOLOR -SDRATTR_START]=new SdrShadowColorItem(aEmptyStr,aNullCol); mppLocalPoolDefaults[SDRATTR_SHADOWCOLOR -SDRATTR_START]=new SdrShadowColorItem(OUString(),aNullCol);
mppLocalPoolDefaults[SDRATTR_SHADOWXDIST -SDRATTR_START]=new SdrShadowXDistItem; mppLocalPoolDefaults[SDRATTR_SHADOWXDIST -SDRATTR_START]=new SdrShadowXDistItem;
mppLocalPoolDefaults[SDRATTR_SHADOWYDIST -SDRATTR_START]=new SdrShadowYDistItem; mppLocalPoolDefaults[SDRATTR_SHADOWYDIST -SDRATTR_START]=new SdrShadowYDistItem;
mppLocalPoolDefaults[SDRATTR_SHADOWTRANSPARENCE-SDRATTR_START]=new SdrShadowTransparenceItem; mppLocalPoolDefaults[SDRATTR_SHADOWTRANSPARENCE-SDRATTR_START]=new SdrShadowTransparenceItem;

4
svx/source/table/svdotable.cxx
View File

@@ -1841,9 +1841,9 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
if(nParaAnz == 1) if(nParaAnz == 1)
{ {
// if its only one paragraph, check if it is empty // if its only one paragraph, check if it is empty
XubString aStr(rOutl.GetText(p1stPara)); OUString aStr(rOutl.GetText(p1stPara));
if(!aStr.Len()) if(aStr.isEmpty())
{ {
// gotcha! // gotcha!
nParaAnz = 0; nParaAnz = 0;