diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-09 15:19:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-11 09:45:34 +0200 |
| commit | cfb4463d2afd36ca6d0fbb9e374bf5387fee84df (patch) | |
| tree | 4411584498dcf21eff5e71c284e7af1ed6b5489a /svx | |
| parent | b044a9535e0fb573fe5d28b0d44c96a3b5db66c2 (diff) | |
convert include/editeng/brushitem.hxx from String to OUString
and convert String* to OUString, no need to hold a pointer
to a ref-counted value type.
Change-Id: I79c62979ee8ec0d5e6d2efc50609ad5595571a7d
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index e11819860731..055edd3ead5e 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -682,11 +682,11 @@ sal_Bool GraphyicBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIn if ( pGrf ) { - const String* pGrfName = pBrsh->GetGraphicLink(); + const OUString aGrfName = pBrsh->GetGraphicLink(); //String* pGrfName = (String*)(pBrsh->GetGraphicLink()); GrfBulDataRelation* pEntry = aGrfDataLst[nIndex]; - if ( pGrfName ) - pEntry->sGrfName = *pGrfName; + if ( !aGrfName.isEmpty() ) + pEntry->sGrfName = aGrfName; //pEntry->sDescription = sEmpty; pEntry->nGallaryIndex = (sal_uInt16)0xFFFF; pEntry->bIsCustomized = sal_True; @@ -1073,10 +1073,10 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s OUString sEmpty; if ( pGrf ) { - const String* pGrfName = pBrsh->GetGraphicLink(); + const OUString aGrfName = pBrsh->GetGraphicLink(); GrfBulDataRelation* pEntry = (GrfBulDataRelation*) (pActualBullets[nIndex]->pBullets); - if ( pGrfName ) - pEntry->sGrfName = *pGrfName; + if ( !aGrfName.isEmpty() ) + pEntry->sGrfName = aGrfName; GraphyicBulletsTypeMgr& rGrfTMgr = GraphyicBulletsTypeMgr::GetInstance(); { pActualBullets[nIndex]->nIndexDefault = (sal_uInt16)0xFFFF; @@ -1125,16 +1125,16 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s else return sal_False; - const String* pGrfName = 0; + OUString aGrfName; if ( pGrf ) { - pGrfName = pBrsh->GetGraphicLink(); + aGrfName = pBrsh->GetGraphicLink(); pActualBullets[nIndex]->eType = eNBType::GRAPHICBULLETS; pActualBullets[nIndex]->nIndex = nIndex+1; //index in the tab page display,decrease 1 to the index within arr pActualBullets[nIndex]->pBullets = new GrfBulDataRelation(eNBType::GRAPHICBULLETS) ; - if (pGrfName) - ((GrfBulDataRelation*)(pActualBullets[nIndex]->pBullets))->sGrfName = *pGrfName; + if (!aGrfName.isEmpty()) + ((GrfBulDataRelation*)(pActualBullets[nIndex]->pBullets))->sGrfName = aGrfName; ((GrfBulDataRelation*)(pActualBullets[nIndex]->pBullets))->bIsCustomized = sal_True; ((GrfBulDataRelation*)(pActualBullets[nIndex]->pBullets))->eType = eNBType::GRAPHICBULLETS; GraphyicBulletsTypeMgr& rGrfTMgr = GraphyicBulletsTypeMgr::GetInstance(); |