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

convert svx/source/sidebar/*.cxx from String to OUString

Browse Source 
Change-Id: I57bd0ade23a17cd2c8edfd2549ae131d80ab7592
This commit is contained in:
Noel Grandin
2013-09-04 14:11:37 +02:00
parent a4da41c429
commit 71622632e6
10 changed files with 127 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/svx/sidebar/ColorControl.hxx
View File

@@ -58,7 +58,7 @@ public:
const ResId& rControlResId, const ResId& rControlResId,
const ResId& rValueSetResId, const ResId& rValueSetResId,
const ::boost::function<Color(void)>& rNoColorGetter, const ::boost::function<Color(void)>& rNoColorGetter,
const ::boost::function<void(String&,Color)>& rColorSetter, const ::boost::function<void(OUString&,Color)>& rColorSetter,
FloatingWindow* pFloatingWindow, FloatingWindow* pFloatingWindow,
const ResId* pNoColorStringResId); const ResId* pNoColorStringResId);
virtual ~ColorControl (void); virtual ~ColorControl (void);
@@ -73,7 +73,7 @@ private:
FloatingWindow* mpFloatingWindow; FloatingWindow* mpFloatingWindow;
const OUString msNoColorString; const OUString msNoColorString;
::boost::function<Color(void)> maNoColorGetter; ::boost::function<Color(void)> maNoColorGetter;
::boost::function<void(String&,Color)> maColorSetter; ::boost::function<void(OUString&,Color)> maColorSetter;
void FillColors (void); void FillColors (void);
DECL_LINK(VSSelectHdl, void *); DECL_LINK(VSSelectHdl, void *);

14
svx/source/sidebar/area/AreaPropertyPanel.cxx
View File

@@ -236,7 +236,7 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox )
{ {
mpLbFillAttr->Hide(); mpLbFillAttr->Hide();
mpToolBoxColor->Show(); mpToolBoxColor->Show();
const String aTmpStr; const OUString aTmpStr;
const Color aColor = maLastColor; const Color aColor = maLastColor;
const XFillColorItem aXFillColorItem( aTmpStr, aColor ); const XFillColorItem aXFillColorItem( aTmpStr, aColor );
@@ -998,7 +998,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
{ {
if(mpFillGradientItem) if(mpFillGradientItem)
{ {
const String aString( mpFillGradientItem->GetName() ); const OUString aString( mpFillGradientItem->GetName() );
const SfxObjectShell* pSh = SfxObjectShell::Current(); const SfxObjectShell* pSh = SfxObjectShell::Current();
const SvxGradientListItem aItem( *(const SvxGradientListItem*)(pSh->GetItem(SID_GRADIENT_LIST))); const SvxGradientListItem aItem( *(const SvxGradientListItem*)(pSh->GetItem(SID_GRADIENT_LIST)));
@@ -1023,7 +1023,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
{ {
if(mpHatchItem) if(mpHatchItem)
{ {
const String aString( mpHatchItem->GetName() ); const OUString aString( mpHatchItem->GetName() );
const SfxObjectShell* pSh = SfxObjectShell::Current(); const SfxObjectShell* pSh = SfxObjectShell::Current();
const SvxHatchListItem aItem(*(const SvxHatchListItem*)(pSh->GetItem(SID_HATCH_LIST))); const SvxHatchListItem aItem(*(const SvxHatchListItem*)(pSh->GetItem(SID_HATCH_LIST)));
@@ -1048,7 +1048,7 @@ void AreaPropertyPanel::NotifyItemUpdate(
{ {
if(mpBitmapItem) if(mpBitmapItem)
{ {
const String aString( mpBitmapItem->GetName() ); const OUString aString( mpBitmapItem->GetName() );
const SfxObjectShell* pSh = SfxObjectShell::Current(); const SfxObjectShell* pSh = SfxObjectShell::Current();
const SvxBitmapListItem aItem(*(const SvxBitmapListItem*)(pSh->GetItem(SID_BITMAP_LIST))); const SvxBitmapListItem aItem(*(const SvxBitmapListItem*)(pSh->GetItem(SID_BITMAP_LIST)));
@@ -1120,7 +1120,7 @@ void AreaPropertyPanel::Update()
if(mpFillGradientItem) if(mpFillGradientItem)
{ {
const String aString(mpFillGradientItem->GetName()); const OUString aString(mpFillGradientItem->GetName());
mpLbFillAttr->SelectEntry(aString); mpLbFillAttr->SelectEntry(aString);
} }
@@ -1149,7 +1149,7 @@ void AreaPropertyPanel::Update()
if(mpHatchItem) if(mpHatchItem)
{ {
const String aString(mpHatchItem->GetName()); const OUString aString(mpHatchItem->GetName());
mpLbFillAttr->SelectEntry( aString ); mpLbFillAttr->SelectEntry( aString );
} }
@@ -1178,7 +1178,7 @@ void AreaPropertyPanel::Update()
if(mpBitmapItem) if(mpBitmapItem)
{ {
const String aString(mpBitmapItem->GetName()); const OUString aString(mpBitmapItem->GetName());
mpLbFillAttr->SelectEntry(aString); mpLbFillAttr->SelectEntry(aString);
} }

10
svx/source/sidebar/line/LineWidthControl.cxx
View File

@@ -214,14 +214,14 @@ void LineWidthControl::SetWidthSelect( long lValue, bool bValuable, SfxMapUnit e
if ( aSeq.getLength()) if ( aSeq.getLength())
aSeq[0].Value >>= aTmp; aSeq[0].Value >>= aTmp;
String aWinData( aTmp ); OUString aWinData( aTmp );
mnCustomWidth = aWinData.ToInt32(); mnCustomWidth = aWinData.toInt32();
mbCustom = true; mbCustom = true;
maVSWidth.SetImage(maIMGCus); maVSWidth.SetImage(maIMGCus);
maVSWidth.SetCusEnable(true); maVSWidth.SetCusEnable(true);
String aStrTip( OUString::number( (double)mnCustomWidth / 10)); OUString aStrTip( OUString::number( (double)mnCustomWidth / 10));
aStrTip.Append(mstrPT); // aStrTip += mstrPT;
maVSWidth.SetItemText(9, aStrTip); maVSWidth.SetItemText(9, aStrTip);
} }
else else
@@ -243,7 +243,7 @@ void LineWidthControl::SetWidthSelect( long lValue, bool bValuable, SfxMapUnit e
} }
else else
{ {
maMFWidth.SetText( String() ); maMFWidth.SetText( "" );
} }
MapUnit eOrgUnit = (MapUnit)eMapUnit; MapUnit eOrgUnit = (MapUnit)eMapUnit;

139
svx/source/sidebar/nbdtmg.cxx
View File

@@ -65,8 +65,7 @@ namespace svx { namespace sidebar {
Font& lcl_GetDefaultBulletFont() Font& lcl_GetDefaultBulletFont()
{ {
static sal_Bool bInit = 0; static sal_Bool bInit = 0;
static Font aDefBulletFont( OUString("StarSymbol" ), static Font aDefBulletFont( "StarSymbol", "", Size( 0, 14 ) );
String(), Size( 0, 14 ) );
if(!bInit) if(!bInit)
{ {
aDefBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL ); aDefBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL );
@@ -132,7 +131,7 @@ NumSettings_ImplPtr lcl_CreateNumberingSettingsPtr(const Sequence<PropertyValue>
} }
const sal_Unicode cLocalPrefix = pNew->sPrefix.getLength() ? pNew->sPrefix.getStr()[0] : 0; const sal_Unicode cLocalPrefix = pNew->sPrefix.getLength() ? pNew->sPrefix.getStr()[0] : 0;
const sal_Unicode cLocalSuffix = pNew->sSuffix.getLength() ? pNew->sSuffix.getStr()[0] : 0; const sal_Unicode cLocalSuffix = pNew->sSuffix.getLength() ? pNew->sSuffix.getStr()[0] : 0;
String aEmptyStr; OUString aEmptyStr;
if( cLocalPrefix == ' ') pNew->sPrefix=aEmptyStr; if( cLocalPrefix == ' ') pNew->sPrefix=aEmptyStr;
if( cLocalSuffix == ' ') pNew->sSuffix=aEmptyStr; if( cLocalSuffix == ' ') pNew->sSuffix=aEmptyStr;
return pNew; return pNew;
@@ -167,7 +166,7 @@ void NBOTypeMgrBase::StoreBulCharFmtName_impl() {
if ( pBulletCharFmt ) if ( pBulletCharFmt )
{ {
aNumCharFmtName = String(pBulletCharFmt->GetValue()); aNumCharFmtName = pBulletCharFmt->GetValue();
} }
} }
} }
@@ -417,10 +416,10 @@ sal_Bool BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_
pActualBullets[nIndex]->aFont = *pFont; pActualBullets[nIndex]->aFont = *pFont;
pActualBullets[nIndex]->bIsCustomized = sal_True; pActualBullets[nIndex]->bIsCustomized = sal_True;
String aStrFromRES = String(SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION)); OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION);
String aReplace = OUString("%LIST_NUM"); OUString aReplace = OUString("%LIST_NUM");
String sNUM = OUString::number( nIndex + 1 ); OUString sNUM = OUString::number( nIndex + 1 );
aStrFromRES.SearchAndReplace(aReplace,sNUM); aStrFromRES = aStrFromRES.replaceFirst(aReplace,sNUM);
pActualBullets[nIndex]->sDescription = aStrFromRES; pActualBullets[nIndex]->sDescription = aStrFromRES;
return sal_True; return sal_True;
@@ -458,7 +457,7 @@ sal_Bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uIn
Font rActBulletFont = pActualBullets[nIndex]->aFont; Font rActBulletFont = pActualBullets[nIndex]->aFont;
sal_uInt16 nMask = 1; sal_uInt16 nMask = 1;
String sBulletCharFmtName = GetBulCharFmtName(); OUString sBulletCharFmtName = GetBulCharFmtName();
for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++) for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
{ {
if(mLevel & nMask) if(mLevel & nMask)
@@ -479,7 +478,7 @@ sal_Bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uIn
OUString BulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool /*isDefault*/) OUString BulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool /*isDefault*/)
{ {
String sRet; OUString sRet;
//sal_uInt16 nLength = 0; //sal_uInt16 nLength = 0;
//nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl); //nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl);
@@ -586,7 +585,7 @@ void GraphyicBulletsTypeMgr::Init()
GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames);
for(sal_uInt16 i = 0; i < aGrfNames.size(); i++) for(sal_uInt16 i = 0; i < aGrfNames.size(); i++)
{ {
String sGrfNm = aGrfNames[i]; OUString sGrfNm = aGrfNames[i];
INetURLObject aObj(sGrfNm); INetURLObject aObj(sGrfNm);
if(aObj.GetProtocol() == INET_PROT_FILE) if(aObj.GetProtocol() == INET_PROT_FILE)
sGrfNm = aObj.PathToFileName(); sGrfNm = aObj.PathToFileName();
@@ -678,10 +677,9 @@ sal_Bool GraphyicBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIn
//pEntry->sDescription = sEmpty; //pEntry->sDescription = sEmpty;
pEntry->nGallaryIndex = (sal_uInt16)0xFFFF; pEntry->nGallaryIndex = (sal_uInt16)0xFFFF;
pEntry->bIsCustomized = sal_True; pEntry->bIsCustomized = sal_True;
String aStrFromRES = String(SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION)); OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION);
String aReplace = OUString("%LIST_NUM"); OUString sNUM = OUString::number( nIndex + 1 );
String sNUM = OUString::number( nIndex + 1 ); aStrFromRES = aStrFromRES.replaceFirst("%LIST_NUM",sNUM);
aStrFromRES.SearchAndReplace(aReplace,sNUM);
pEntry->sDescription = aStrFromRES; pEntry->sDescription = aStrFromRES;
}else }else
{ {
@@ -699,14 +697,14 @@ sal_Bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex
if ( nIndex >= aGrfDataLst.size() ) if ( nIndex >= aGrfDataLst.size() )
return sal_False; return sal_False;
String sGrfName; OUString sGrfName;
GrfBulDataRelation* pEntry = aGrfDataLst[nIndex]; GrfBulDataRelation* pEntry = aGrfDataLst[nIndex];
sGrfName= pEntry->sGrfName; sGrfName= pEntry->sGrfName;
sal_uInt16 nMask = 1; sal_uInt16 nMask = 1;
String aEmptyStr; OUString aEmptyStr;
sal_uInt16 nSetNumberingType = SVX_NUM_BITMAP; sal_uInt16 nSetNumberingType = SVX_NUM_BITMAP;
String sNumCharFmtName = GetBulCharFmtName(); OUString sNumCharFmtName = GetBulCharFmtName();
for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++) for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
{ {
if(mLevel & nMask) if(mLevel & nMask)
@@ -738,7 +736,7 @@ sal_Bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex
} }
OUString GraphyicBulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool /*isDefault*/) OUString GraphyicBulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool /*isDefault*/)
{ {
String sRet; OUString sRet;
sal_uInt16 nLength = 0; sal_uInt16 nLength = 0;
nLength = aGrfDataLst.size(); nLength = aGrfDataLst.size();
@@ -1041,10 +1039,9 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s
pEntry->cBulletChar = cChar; pEntry->cBulletChar = cChar;
pEntry->aFont = pFont?*pFont:lcl_GetDefaultBulletFont(); pEntry->aFont = pFont?*pFont:lcl_GetDefaultBulletFont();
pEntry->bIsCustomized = sal_True; pEntry->bIsCustomized = sal_True;
String aStrFromRES = String(SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION)); OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION);
String aReplace = OUString("%LIST_NUM"); OUString sNUM = OUString::number( nIndex + 1 );
String sNUM = OUString::number( nIndex + 1 ); aStrFromRES = aStrFromRES.replaceFirst("%LIST_NUM",sNUM);
aStrFromRES.SearchAndReplace(aReplace,sNUM);
pEntry->sDescription = aStrFromRES; pEntry->sDescription = aStrFromRES;
}else if ( (eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP && pActualBullets[nIndex]->eType == eNBType::GRAPHICBULLETS ) }else if ( (eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP && pActualBullets[nIndex]->eType == eNBType::GRAPHICBULLETS )
@@ -1056,7 +1053,7 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s
else else
return sal_False; return sal_False;
String sEmpty; OUString sEmpty;
if ( pGrf ) if ( pGrf )
{ {
const String* pGrfName = pBrsh->GetGraphicLink(); const String* pGrfName = pBrsh->GetGraphicLink();
@@ -1074,10 +1071,9 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s
//}else //}else
{ {
pActualBullets[nIndex]->nIndexDefault = (sal_uInt16)0xFFFF; pActualBullets[nIndex]->nIndexDefault = (sal_uInt16)0xFFFF;
sEmpty = String(SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION)); sEmpty = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION);
String aReplace = OUString("%LIST_NUM"); OUString sNUM = OUString::number( nIndex + 1 );
String sNUM = OUString::number( nIndex + 1 ); sEmpty = sEmpty.replaceFirst("%LIST_NUM",sNUM);
sEmpty.SearchAndReplace(aReplace,sNUM);
//pEntry->pGrfObj = pGrf; //pEntry->pGrfObj = pGrf;
pEntry->pGrfObj = new Graphic(*pGrf); pEntry->pGrfObj = new Graphic(*pGrf);
pEntry->aSize = aFmt.GetGraphicSize(); pEntry->aSize = aFmt.GetGraphicSize();
@@ -1118,10 +1114,9 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s
//}else //}else
{ {
pActualBullets[nIndex]->nIndexDefault = (sal_uInt16)0xFFFF; pActualBullets[nIndex]->nIndexDefault = (sal_uInt16)0xFFFF;
String aStrFromRES = String(SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION)); OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION);
String aReplace = OUString("%LIST_NUM"); OUString sNUM = OUString::number( nIndex + 1 );
String sNUM = OUString::number( nIndex + 1 ); aStrFromRES = aStrFromRES.replaceFirst("%LIST_NUM",sNUM);
aStrFromRES.SearchAndReplace(aReplace,sNUM);
((BulletsSettings_Impl*)(pActualBullets[nIndex]->pBullets))->sDescription = aStrFromRES; ((BulletsSettings_Impl*)(pActualBullets[nIndex]->pBullets))->sDescription = aStrFromRES;
} }
} }
@@ -1157,10 +1152,9 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s
//}else //}else
{ {
pActualBullets[nIndex]->nIndexDefault = (sal_uInt16)0xFFFF; pActualBullets[nIndex]->nIndexDefault = (sal_uInt16)0xFFFF;
String aStrFromRES = String(SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION)); OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION);
String aReplace = OUString("%LIST_NUM"); OUString sNUM = OUString::number( nIndex + 1 );
String sNUM = OUString::number( nIndex + 1 ); aStrFromRES = aStrFromRES.replaceFirst("%LIST_NUM",sNUM);
aStrFromRES.SearchAndReplace(aReplace,sNUM);
((GrfBulDataRelation*)(pActualBullets[nIndex]->pBullets))->sDescription = aStrFromRES; ((GrfBulDataRelation*)(pActualBullets[nIndex]->pBullets))->sDescription = aStrFromRES;
//((GrfBulDataRelation*)(pActualBullets[nIndex]->pBullets))->pGrfObj = pGrf; //((GrfBulDataRelation*)(pActualBullets[nIndex]->pBullets))->pGrfObj = pGrf;
((GrfBulDataRelation*)(pActualBullets[nIndex]->pBullets))->pGrfObj = new Graphic(*pGrf); ((GrfBulDataRelation*)(pActualBullets[nIndex]->pBullets))->pGrfObj = new Graphic(*pGrf);
@@ -1210,7 +1204,7 @@ sal_Bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_
//Font& rActBulletFont = lcl_GetDefaultBulletFont(); //Font& rActBulletFont = lcl_GetDefaultBulletFont();
Font rActBulletFont = ((BulletsSettings_Impl*)(pCurrentBullets->pBullets))->aFont; Font rActBulletFont = ((BulletsSettings_Impl*)(pCurrentBullets->pBullets))->aFont;
sal_uInt16 nMask = 1; sal_uInt16 nMask = 1;
String sBulletCharFmtName = GetBulCharFmtName(); OUString sBulletCharFmtName = GetBulCharFmtName();
for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++) for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
{ {
if(mLevel & nMask) if(mLevel & nMask)
@@ -1221,7 +1215,7 @@ sal_Bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_
aFmt.SetBulletFont(&rActBulletFont); aFmt.SetBulletFont(&rActBulletFont);
aFmt.SetBulletChar(cChar ); aFmt.SetBulletChar(cChar );
aFmt.SetCharFmtName(sBulletCharFmtName); aFmt.SetCharFmtName(sBulletCharFmtName);
String aEmptyStr; OUString aEmptyStr;
aFmt.SetPrefix( aEmptyStr ); aFmt.SetPrefix( aEmptyStr );
aFmt.SetSuffix( aEmptyStr ); aFmt.SetSuffix( aEmptyStr );
if (isResetSize) aFmt.SetBulletRelSize(45); if (isResetSize) aFmt.SetBulletRelSize(45);
@@ -1231,14 +1225,14 @@ sal_Bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_
} }
}else if ( pCurrentBullets->eType == eNBType::GRAPHICBULLETS ) }else if ( pCurrentBullets->eType == eNBType::GRAPHICBULLETS )
{ {
String sGrfName; OUString sGrfName;
GrfBulDataRelation* pEntry = (GrfBulDataRelation*) (pCurrentBullets->pBullets); GrfBulDataRelation* pEntry = (GrfBulDataRelation*) (pCurrentBullets->pBullets);
sGrfName= pEntry->sGrfName; sGrfName= pEntry->sGrfName;
sal_uInt16 nMask = 1; sal_uInt16 nMask = 1;
String aEmptyStr; OUString aEmptyStr;
sal_uInt16 nSetNumberingType = SVX_NUM_BITMAP; sal_uInt16 nSetNumberingType = SVX_NUM_BITMAP;
String sNumCharFmtName = GetBulCharFmtName(); OUString sNumCharFmtName = GetBulCharFmtName();
for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++) for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
{ {
if(mLevel & nMask) if(mLevel & nMask)
@@ -1293,7 +1287,7 @@ sal_Bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_
OUString MixBulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault) OUString MixBulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault)
{ {
String sRet; OUString sRet;
//sal_uInt16 nLength = 0; //sal_uInt16 nLength = 0;
//nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl); //nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl);
@@ -1366,7 +1360,7 @@ void NumberingTypeMgr::Init()
pNumEntry->pNumSetting = pNew; pNumEntry->pNumSetting = pNew;
//SetItemText( i + 1, SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i )); //SetItemText( i + 1, SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i ));
{ {
String sText; OUString sText;
//const OUString sValue(C2U("Value")); //const OUString sValue(C2U("Value"));
Reference<XNumberingFormatter> xFormatter(xDefNum, UNO_QUERY); Reference<XNumberingFormatter> xFormatter(xDefNum, UNO_QUERY);
if(xFormatter.is() && aNumberings.getLength() > i) if(xFormatter.is() && aNumberings.getLength() > i)
@@ -1393,9 +1387,8 @@ void NumberingTypeMgr::Init()
} }
} }
} }
String aStrFromRES(SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS)); OUString aStrFromRES(SVX_RESSTR( RID_SVXSTR_SINGLENUM_DESCRIPTIONS));
String aReplace = OUString("%NUMBERINGSAMPLE"); aStrFromRES = aStrFromRES.replaceFirst("%NUMBERINGSAMPLE",sText);
aStrFromRES.SearchAndReplace(aReplace,sText);
pNumEntry->sDescription = aStrFromRES; pNumEntry->sDescription = aStrFromRES;
} }
//End modification //End modification
@@ -1422,8 +1415,8 @@ sal_uInt16 NumberingTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 m
SvxNumberFormat aFmt(aNum.GetLevel(nActLv)); SvxNumberFormat aFmt(aNum.GetLevel(nActLv));
//sal_Unicode cPrefix = rtl::OUString(aFmt.GetPrefix()).getStr()[0]; //sal_Unicode cPrefix = rtl::OUString(aFmt.GetPrefix()).getStr()[0];
//sal_Unicode cSuffix = rtl::OUString(aFmt.GetSuffix()).getStr()[0]; //sal_Unicode cSuffix = rtl::OUString(aFmt.GetSuffix()).getStr()[0];
String sPreFix = aFmt.GetPrefix(); OUString sPreFix = aFmt.GetPrefix();
String sLclSuffix = aFmt.GetSuffix(); OUString sLclSuffix = aFmt.GetSuffix();
sal_Int16 eNumType = aFmt.GetNumberingType(); sal_Int16 eNumType = aFmt.GetNumberingType();
sal_uInt16 nCount = pNumberSettingsArr->size(); sal_uInt16 nCount = pNumberSettingsArr->size();
@@ -1431,10 +1424,10 @@ sal_uInt16 NumberingTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 m
{ {
NumberSettings_ImplPtr _pSet = (*pNumberSettingsArr)[i].get(); NumberSettings_ImplPtr _pSet = (*pNumberSettingsArr)[i].get();
sal_Int16 eNType = _pSet->pNumSetting->nNumberType; sal_Int16 eNType = _pSet->pNumSetting->nNumberType;
String sLocalPreFix = _pSet->pNumSetting->sPrefix; OUString sLocalPreFix = _pSet->pNumSetting->sPrefix;
String sLocalSuffix = _pSet->pNumSetting->sSuffix; OUString sLocalSuffix = _pSet->pNumSetting->sSuffix;
if (sPreFix.CompareTo(sLocalPreFix)==COMPARE_EQUAL && if (sPreFix == sLocalPreFix &&
sLclSuffix.CompareTo(sLocalSuffix)==COMPARE_EQUAL && sLclSuffix == sLocalSuffix &&
eNumType == eNType ) eNumType == eNType )
{ {
return i+1; return i+1;
@@ -1480,10 +1473,9 @@ sal_Bool NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sa
ApplyNumRule(aTmpRule2,nIndex,mLevel,false); ApplyNumRule(aTmpRule2,nIndex,mLevel,false);
if (aTmpRule1==aTmpRule2) _pSet->bIsCustomized=false; if (aTmpRule1==aTmpRule2) _pSet->bIsCustomized=false;
if (_pSet->bIsCustomized) { if (_pSet->bIsCustomized) {
String aStrFromRES = String(SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION)); OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION);
String aReplace = OUString("%LIST_NUM"); OUString sNUM = OUString::number( nIndex + 1 );
String sNUM = OUString::number( nIndex + 1 ); aStrFromRES = aStrFromRES.replaceFirst("%LIST_NUM",sNUM);
aStrFromRES.SearchAndReplace(aReplace,sNUM);
_pSet->sDescription = aStrFromRES; _pSet->sDescription = aStrFromRES;
} else { } else {
_pSet->sDescription = GetDescription(nIndex,true); _pSet->sDescription = GetDescription(nIndex,true);
@@ -1506,7 +1498,7 @@ sal_Bool NumberingTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_u
sal_Int16 eNewType = _pSet->pNumSetting->nNumberType; sal_Int16 eNewType = _pSet->pNumSetting->nNumberType;
sal_uInt16 nMask = 1; sal_uInt16 nMask = 1;
String sNumCharFmtName = GetBulCharFmtName(); OUString sNumCharFmtName = GetBulCharFmtName();
for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++) for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
{ {
if(mLevel & nMask) if(mLevel & nMask)
@@ -1528,7 +1520,7 @@ sal_Bool NumberingTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_u
} }
OUString NumberingTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault) OUString NumberingTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault)
{ {
String sRet; OUString sRet;
sal_uInt16 nLength = 0; sal_uInt16 nLength = 0;
nLength = pNumberSettingsArr->size(); nLength = pNumberSettingsArr->size();
@@ -1644,8 +1636,8 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m
sal_Int16 eNType = _pSet->nNumberType; sal_Int16 eNType = _pSet->nNumberType;
SvxNumberFormat aFmt(aNum.GetLevel(iLevel)); SvxNumberFormat aFmt(aNum.GetLevel(iLevel));
String sPreFix = aFmt.GetPrefix(); OUString sPreFix = aFmt.GetPrefix();
String sLclSuffix = aFmt.GetSuffix(); OUString sLclSuffix = aFmt.GetSuffix();
sal_Int16 eNumType = aFmt.GetNumberingType(); sal_Int16 eNumType = aFmt.GetNumberingType();
if( eNumType == SVX_NUM_CHAR_SPECIAL) if( eNumType == SVX_NUM_CHAR_SPECIAL)
{ {
@@ -1684,14 +1676,14 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m
} }
} else } else
{ {
if (!((sPreFix.CompareTo(_pSet->sPrefix)==COMPARE_EQUAL) && if (!(sPreFix == _pSet->sPrefix &&
( sLclSuffix.CompareTo(_pSet->sSuffix)==COMPARE_EQUAL ) && sLclSuffix == _pSet->sSuffix &&
eNumType == eNType && eNumType == eNType &&
_pSet->eLabelFollowedBy == aFmt.GetLabelFollowedBy() && _pSet->eLabelFollowedBy == aFmt.GetLabelFollowedBy() &&
_pSet->nTabValue == aFmt.GetListtabPos() && _pSet->nTabValue == aFmt.GetListtabPos() &&
_pSet->eNumAlign == aFmt.GetNumAdjust() && _pSet->eNumAlign == aFmt.GetNumAdjust() &&
_pSet->nNumAlignAt == aFmt.GetFirstLineIndent() && _pSet->nNumAlignAt == aFmt.GetFirstLineIndent() &&
_pSet->nNumIndentAt == aFmt.GetIndentAt())) _pSet->nNumIndentAt == aFmt.GetIndentAt()))
{ {
bNotMatch = sal_True; bNotMatch = sal_True;
break; break;
@@ -1766,10 +1758,9 @@ sal_Bool OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_
ApplyNumRule(aTmpRule2,nIndex,mLevel,false); ApplyNumRule(aTmpRule2,nIndex,mLevel,false);
if (aTmpRule1==aTmpRule2) pItemArr->bIsCustomized=false; if (aTmpRule1==aTmpRule2) pItemArr->bIsCustomized=false;
if (pItemArr->bIsCustomized) { if (pItemArr->bIsCustomized) {
String aStrFromRES = String(SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_MULTILEVEL_DESCRIPTION)); OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_MULTILEVEL_DESCRIPTION);
String aReplace = OUString("%LIST_NUM"); OUString sNUM = OUString::number( nIndex + 1 );
String sNUM = OUString::number( nIndex + 1 ); aStrFromRES = aStrFromRES.replaceFirst("%LIST_NUM",sNUM);
aStrFromRES.SearchAndReplace(aReplace,sNUM);
pItemArr->sDescription = aStrFromRES; pItemArr->sDescription = aStrFromRES;
} else { } else {
pItemArr->sDescription = GetDescription(nIndex,true); pItemArr->sDescription = GetDescription(nIndex,true);
@@ -1796,7 +1787,7 @@ sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uIn
NumSettingsArr_Impl *pNumSettingsArr=pItemArr->pNumSettingsArr; NumSettingsArr_Impl *pNumSettingsArr=pItemArr->pNumSettingsArr;
NumSettings_ImplPtr pLevelSettings = 0; NumSettings_ImplPtr pLevelSettings = 0;
String sBulletCharFmtName = GetBulCharFmtName(); OUString sBulletCharFmtName = GetBulCharFmtName();
for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++) for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
{ {
if(pNumSettingsArr->size() > i) if(pNumSettingsArr->size() > i)
@@ -1897,7 +1888,7 @@ sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uIn
} }
OUString OutlineTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault) OUString OutlineTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault)
{ {
String sRet; OUString sRet;
sal_uInt16 nLength = 0; sal_uInt16 nLength = 0;
nLength = sizeof(pOutlineSettingsArrs)/sizeof(OutlineSettings_Impl*); nLength = sizeof(pOutlineSettingsArrs)/sizeof(OutlineSettings_Impl*);

42
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
View File

@@ -187,8 +187,8 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
if ( aSeq.getLength()) if ( aSeq.getLength())
aSeq[0].Value >>= aTmp; aSeq[0].Value >>= aTmp;
String aWinData( aTmp ); OUString aWinData( aTmp );
maPos = (sal_uInt16)aWinData.ToInt32(); maPos = (sal_uInt16)aWinData.toInt32();
} }
SvtViewOptions aWinOpt2( E_WINDOW, LSP_LV_GLOBAL_VALUE ); SvtViewOptions aWinOpt2( E_WINDOW, LSP_LV_GLOBAL_VALUE );
@@ -199,10 +199,10 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
if ( aSeq.getLength()) if ( aSeq.getLength())
aSeq[0].Value >>= aTmp; aSeq[0].Value >>= aTmp;
String aWinData( aTmp ); OUString aWinData( aTmp );
maValue = (sal_uInt16)aWinData.ToInt32(); maValue = (sal_uInt16)aWinData.toInt32();
} }
String sHelpText; OUString sHelpText;
switch(maPos) switch(maPos)
{ {
case LLINESPACE_1: case LLINESPACE_1:
@@ -216,27 +216,27 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
break; break;
case LLINESPACE_PROP: case LLINESPACE_PROP:
sHelpText +=maLine; sHelpText +=maLine;
sHelpText.Append(String("Proportion: ", 12, RTL_TEXTENCODING_ASCII_US)); sHelpText += "Proportion: ";
sHelpText += maOf; sHelpText += maOf;
sHelpText.Append( OUString::number( maValue )); sHelpText += OUString::number( maValue );
break; break;
case LLINESPACE_MIN: case LLINESPACE_MIN:
sHelpText += maLine; sHelpText += maLine;
sHelpText.Append(String("At Least: ", 10, RTL_TEXTENCODING_ASCII_US)); sHelpText += "At Least: ";
sHelpText += maOf; sHelpText += maOf;
sHelpText.Append( OUString::number( maValue )); sHelpText += OUString::number( maValue );
break; break;
case LLINESPACE_DURCH: case LLINESPACE_DURCH:
sHelpText += maLine; sHelpText += maLine;
sHelpText.Append(String("Leading: ", 9, RTL_TEXTENCODING_ASCII_US)); sHelpText += "Leading: ";
sHelpText += maOf; sHelpText += maOf;
sHelpText.Append( OUString::number( maValue )); sHelpText += OUString::number( maValue );
break; break;
case LLINESPACE_FIX: case LLINESPACE_FIX:
sHelpText += maLine; sHelpText += maLine;
sHelpText.Append(String("Fixed: ", 7, RTL_TEXTENCODING_ASCII_US)); sHelpText += "Fixed: ";
sHelpText += maOf; sHelpText += maOf;
sHelpText.Append( OUString::number( maValue )); sHelpText += OUString::number( maValue );
break; break;
} }
if( !aWinOpt.Exists() && !aWinOpt2.Exists() ) if( !aWinOpt.Exists() && !aWinOpt2.Exists() )
@@ -259,7 +259,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
// mpLineSPPage->SetAllNoSel(); // mpLineSPPage->SetAllNoSel();
aLineDist.Enable(); aLineDist.Enable();
pActLineDistFld->Enable(); pActLineDistFld->Enable();
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
//bool bValueSetFocus = sal_False; //wj //bool bValueSetFocus = sal_False; //wj
if( eState >= SFX_ITEM_AVAILABLE ) if( eState >= SFX_ITEM_AVAILABLE )
@@ -280,7 +280,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
{ {
aLineDist.SelectEntryPos( LLINESPACE_1 ); aLineDist.SelectEntryPos( LLINESPACE_1 );
pActLineDistFld->Disable(); pActLineDistFld->Disable();
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
mbUseLineSPCustom = DO_NOT_CUSTOM; mbUseLineSPCustom = DO_NOT_CUSTOM;
if ( LINESPACE_1 == currSPItem->GetPropLineSpace() ) if ( LINESPACE_1 == currSPItem->GetPropLineSpace() )
{ {
@@ -296,7 +296,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
{ {
aLineDist.SelectEntryPos( LLINESPACE_1 ); aLineDist.SelectEntryPos( LLINESPACE_1 );
pActLineDistFld->Disable(); pActLineDistFld->Disable();
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
mbUseLineSPCustom = DO_NOT_CUSTOM; mbUseLineSPCustom = DO_NOT_CUSTOM;
maLineSpacing.SelectItem(1); maLineSpacing.SelectItem(1);
//bValueSetFocus = sal_True; //wj //bValueSetFocus = sal_True; //wj
@@ -306,7 +306,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
{ {
aLineDist.SelectEntryPos( LLINESPACE_15 ); aLineDist.SelectEntryPos( LLINESPACE_15 );
pActLineDistFld->Disable(); pActLineDistFld->Disable();
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
mbUseLineSPCustom = DO_NOT_CUSTOM; mbUseLineSPCustom = DO_NOT_CUSTOM;
maLineSpacing.SelectItem(3); maLineSpacing.SelectItem(3);
@@ -317,7 +317,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
{ {
aLineDist.SelectEntryPos( LLINESPACE_2 ); aLineDist.SelectEntryPos( LLINESPACE_2 );
pActLineDistFld->Disable(); pActLineDistFld->Disable();
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
mbUseLineSPCustom = DO_NOT_CUSTOM; mbUseLineSPCustom = DO_NOT_CUSTOM;
maLineSpacing.SelectItem(4); maLineSpacing.SelectItem(4);
@@ -452,7 +452,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
{ {
aLineDist.Disable(); aLineDist.Disable();
pActLineDistFld->Enable(sal_False); pActLineDistFld->Enable(sal_False);
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
maLineSpacing.SetNoSelection(); maLineSpacing.SetNoSelection();
maLineSpacing.SelectItem(0); maLineSpacing.SelectItem(0);
@@ -461,7 +461,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
else else
{ {
pActLineDistFld->Enable(sal_False); pActLineDistFld->Enable(sal_False);
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
aLineDist.SetNoSelection(); aLineDist.SetNoSelection();
maLineSpacing.SetNoSelection(); maLineSpacing.SetNoSelection();
maLineSpacing.SelectItem(0); maLineSpacing.SelectItem(0);
@@ -523,7 +523,7 @@ IMPL_LINK( ParaLineSpacingControl, LineSPDistHdl_Impl, ListBox*, pBox )
case LLINESPACE_15: case LLINESPACE_15:
case LLINESPACE_2: case LLINESPACE_2:
pActLineDistFld->Enable(sal_False); pActLineDistFld->Enable(sal_False);
pActLineDistFld->SetText( String() ); pActLineDistFld->SetText( "" );
break; break;
case LLINESPACE_DURCH: case LLINESPACE_DURCH:

16
svx/source/sidebar/possize/PosSizePropertyPanel.cxx
View File

@@ -616,7 +616,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
} }
} }
mpMtrWidth->SetText( String()); mpMtrWidth->SetText( "" );
break; break;
case SID_ATTR_TRANSFORM_HEIGHT: case SID_ATTR_TRANSFORM_HEIGHT:
@@ -636,7 +636,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
} }
} }
mpMtrHeight->SetText( String()); mpMtrHeight->SetText( "");
break; break;
case SID_ATTR_TRANSFORM_POS_X: case SID_ATTR_TRANSFORM_POS_X:
@@ -654,7 +654,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
} }
} }
mpMtrPosX->SetText( String()); mpMtrPosX->SetText( "" );
break; break;
case SID_ATTR_TRANSFORM_POS_Y: case SID_ATTR_TRANSFORM_POS_Y:
@@ -672,7 +672,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
} }
} }
mpMtrPosY->SetText( String()); mpMtrPosY->SetText( "" );
break; break;
case SID_ATTR_TRANSFORM_ROT_X: case SID_ATTR_TRANSFORM_ROT_X:
@@ -801,7 +801,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
} }
} }
mpMtrAngle->SetText( String() ); mpMtrAngle->SetText( "" );
mpDial->SetRotation( 0 ); mpDial->SetRotation( 0 );
break; break;
@@ -883,12 +883,12 @@ void PosSizePropertyPanel::NotifyItemUpdate(
// mpCbxScale must synchronized with that on Position and Size tabpage on Shape Properties dialog // mpCbxScale must synchronized with that on Position and Size tabpage on Shape Properties dialog
SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( RID_SVXPAGE_POSITION_SIZE ) ); SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( RID_SVXPAGE_POSITION_SIZE ) );
String sUserData; OUString sUserData;
::com::sun::star::uno::Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME ); ::com::sun::star::uno::Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME );
::rtl::OUString aTemp; ::rtl::OUString aTemp;
if ( aUserItem >>= aTemp ) if ( aUserItem >>= aTemp )
sUserData = String( aTemp ); sUserData = aTemp;
mpCbxScale->Check( (bool)sUserData.ToInt32() ); mpCbxScale->Check( (bool)sUserData.toInt32() );
} }

18
svx/source/sidebar/text/TextCharacterSpacingControl.cxx
View File

@@ -150,8 +150,8 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l
if ( aSeq.getLength()) if ( aSeq.getLength())
aSeq[0].Value >>= aTmp; aSeq[0].Value >>= aTmp;
String aWinData( aTmp ); OUString aWinData( aTmp );
mnCustomKern = aWinData.ToInt32(); mnCustomKern = aWinData.toInt32();
mnLastCus = SPACING_CLOSE_BY_CUS_EDIT; mnLastCus = SPACING_CLOSE_BY_CUS_EDIT;
mbCusEnable = true; mbCusEnable = true;
} }
@@ -171,21 +171,21 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l
maVSSpacing.ReplaceItemImages(6, maImgCus,0); maVSSpacing.ReplaceItemImages(6, maImgCus,0);
if(mnCustomKern > 0) if(mnCustomKern > 0)
{ {
String aStrTip( maStrCusE); //LAST CUSTOM no tip defect //add OUString aStrTip( maStrCusE); //LAST CUSTOM no tip defect //add
aStrTip.Append( OUString::number( (double)mnCustomKern / 10)); aStrTip += OUString::number( (double)mnCustomKern / 10);
aStrTip.Append(maStrUnit); // modify aStrTip += maStrUnit; // modify
maVSSpacing.SetItemText(6,aStrTip); maVSSpacing.SetItemText(6,aStrTip);
} }
else if(mnCustomKern < 0) else if(mnCustomKern < 0)
{ {
String aStrTip(maStrCusC) ; //LAST CUSTOM no tip defect //add OUString aStrTip(maStrCusC) ; //LAST CUSTOM no tip defect //add
aStrTip.Append( OUString::number( (double)-mnCustomKern / 10)); aStrTip += OUString::number( (double)-mnCustomKern / 10);
aStrTip.Append(maStrUnit); // modify aStrTip += maStrUnit; // modify
maVSSpacing.SetItemText( 6, aStrTip ); maVSSpacing.SetItemText( 6, aStrTip );
} }
else else
{ {
String aStrTip(maStrCusN) ; //LAST CUSTOM no tip defect //add OUString aStrTip(maStrCusN) ; //LAST CUSTOM no tip defect //add
maVSSpacing.SetItemText( 6, aStrTip ); maVSSpacing.SetItemText( 6, aStrTip );
} }

4
svx/source/sidebar/text/TextPropertyPanel.cxx
View File

@@ -769,7 +769,7 @@ void TextPropertyPanel::NotifyItemUpdate (
} }
else else
{ {
mpFontNameBox->SetText( String() ); mpFontNameBox->SetText( "" );
if (SFX_ITEM_DISABLED == eState) if (SFX_ITEM_DISABLED == eState)
bIsControlEnabled = false; bIsControlEnabled = false;
} }
@@ -825,7 +825,7 @@ void TextPropertyPanel::NotifyItemUpdate (
else else
{ {
mpHeightItem = NULL; mpHeightItem = NULL;
mpFontSizeBox->SetText( String() ); mpFontSizeBox->SetText( "" );
//increase decrease diabled when multi-seletion have different font size //increase decrease diabled when multi-seletion have different font size
// font size +/- enhancement in sd // font size +/- enhancement in sd

6
svx/source/sidebar/tools/ColorControl.cxx
View File

@@ -89,7 +89,7 @@ ColorControl::ColorControl (
const ResId& rControlResId, const ResId& rControlResId,
const ResId& rValueSetResId, const ResId& rValueSetResId,
const ::boost::function<Color(void)>& rNoColorGetter, const ::boost::function<Color(void)>& rNoColorGetter,
const ::boost::function<void(String&,Color)>& rColorSetter, const ::boost::function<void(OUString&,Color)>& rColorSetter,
FloatingWindow* pFloatingWindow, FloatingWindow* pFloatingWindow,
const ResId* pNoColorStringResId) // const sal_uInt32 nNoColorStringResId) const ResId* pNoColorStringResId) // const sal_uInt32 nNoColorStringResId)
: PopupControl(pParent, rControlResId), : PopupControl(pParent, rControlResId),
@@ -200,10 +200,10 @@ IMPL_LINK(ColorControl, VSSelectHdl, void *, pControl)
{ {
sal_uInt16 iPos = maVSColor.GetSelectItemId(); sal_uInt16 iPos = maVSColor.GetSelectItemId();
Color aColor = maVSColor.GetItemColor( iPos ); Color aColor = maVSColor.GetItemColor( iPos );
String aTmpStr = maVSColor.GetItemText( iPos ); OUString aTmpStr = maVSColor.GetItemText( iPos );
// react when the WB_NONEFIELD created entry is selected // react when the WB_NONEFIELD created entry is selected
if (aColor.GetColor() == 0 && aTmpStr.Len() == 0) if (aColor.GetColor() == 0 && aTmpStr.isEmpty())
{ {
if (maNoColorGetter) if (maNoColorGetter)
aColor = maNoColorGetter(); aColor = maNoColorGetter();

13
svx/source/sidebar/tools/ValueSetWithTextControl.cxx
View File

@@ -346,7 +346,7 @@ void SvxNumValueSet2::UserDraw( const UserDrawEvent& rUDEvt )
Point aStart(aBLPos.X() + nRectWidth / 9,0); Point aStart(aBLPos.X() + nRectWidth / 9,0);
if ( nItemId == DEFAULT_NONE) if ( nItemId == DEFAULT_NONE)
{ {
String sText(SVX_RESSTR( RID_SVXSTR_NUMBULLET_NONE)); OUString sText(SVX_RESSTR( RID_SVXSTR_NUMBULLET_NONE));
Font aLclFont = pDev->GetFont(); Font aLclFont = pDev->GetFont();
Size aLclSize = aLclFont.GetSize(); Size aLclSize = aLclFont.GetSize();
aLclSize.Height() = nRectHeight/4; aLclSize.Height() = nRectHeight/4;
@@ -374,14 +374,12 @@ void SvxNumValueSet2::UserDraw( const UserDrawEvent& rUDEvt )
{ {
sal_uInt32 nY = 11 + i * 33; sal_uInt32 nY = 11 + i * 33;
aStart.Y() = aBLPos.Y() + nRectHeight * nY / 100; aStart.Y() = aBLPos.Y() + nRectHeight * nY / 100;
String sText; OUString sText;
sal_uInt16 nLvl = 0; sal_uInt16 nLvl = 0;
SvxNumRule aTempRule( 0, 10, false ); SvxNumRule aTempRule( 0, 10, false );
pNumbering->ApplyNumRule(aTempRule,nItemId -1,1<<nLvl); pNumbering->ApplyNumRule(aTempRule,nItemId -1,1<<nLvl);
SvxNumberFormat aNumFmt(aTempRule.GetLevel(nLvl)); SvxNumberFormat aNumFmt(aTempRule.GetLevel(nLvl));
sText=aNumFmt.GetNumStr(i+1); sText = aNumFmt.GetPrefix() + aNumFmt.GetNumStr(i+1) + aNumFmt.GetSuffix();
sText.Insert( aNumFmt.GetPrefix(), 0 );
sText += aNumFmt.GetSuffix();
aStart.X() = aBLPos.X() + 2; aStart.X() = aBLPos.X() + 2;
aStart.Y() -= pDev->GetTextHeight()/2; aStart.Y() -= pDev->GetTextHeight()/2;
pDev->DrawText(aStart, sText); pDev->DrawText(aStart, sText);
@@ -444,8 +442,7 @@ void SvxNumValueSet3::UserDraw( const UserDrawEvent& rUDEvt )
pDev->SetFont(aFont); pDev->SetFont(aFont);
pDev->SetFillColor( aBackColor ); //wj pDev->SetFillColor( aBackColor ); //wj
String sText; OUString sText(cChar);
sText = cChar;
Font aOldBulletFont = pDev->GetFont(); Font aOldBulletFont = pDev->GetFont();
Font aBulletFnt(aFmt.GetBulletFont() ? *aFmt.GetBulletFont() : aOldBulletFont); Font aBulletFnt(aFmt.GetBulletFont() ? *aFmt.GetBulletFont() : aOldBulletFont);
Size aBulSize = aOldBulletFont.GetSize(); Size aBulSize = aOldBulletFont.GetSize();
@@ -488,7 +485,7 @@ void SvxNumValueSet3::UserDraw( const UserDrawEvent& rUDEvt )
pDev->SetFont(aFont); pDev->SetFont(aFont);
pDev->SetFillColor( aBackColor ); pDev->SetFillColor( aBackColor );
String sText(SVX_RESSTR( RID_SVXSTR_NUMBULLET_NONE)); OUString sText(SVX_RESSTR( RID_SVXSTR_NUMBULLET_NONE));
long nTextWidth = pDev->GetTextWidth(sText); long nTextWidth = pDev->GetTextWidth(sText);
long nTextHeight = pDev->GetTextHeight(); long nTextHeight = pDev->GetTextHeight();