diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-04 14:18:23 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:55:08 +0200 |
commit | ca713640ba61e456b73e285960b3105343373174 (patch) | |
tree | 6c6037dcd0abe5b681e017d897109b4118b1f53f /svx/source | |
parent | a41c9866bd9da0527468f7fe7c9eb6fa4839ccf1 (diff) |
convert svx/source/items/*.cxx from String to OUString
Change-Id: I4cd056b796e67cfafda1a90069234d49921d8ad2
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/items/customshapeitem.cxx | 6 | ||||
-rw-r--r-- | svx/source/items/hlnkitem.cxx | 4 | ||||
-rw-r--r-- | svx/source/items/numfmtsh.cxx | 20 | ||||
-rw-r--r-- | svx/source/items/numinf.cxx | 6 | ||||
-rw-r--r-- | svx/source/items/pageitem.cxx | 8 |
5 files changed, 22 insertions, 22 deletions
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 87b8cfc3dd3f..29473fe8156b 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -24,11 +24,11 @@ using namespace ::std; using namespace com::sun::star; SdrCustomShapeEngineItem::SdrCustomShapeEngineItem() -: SfxStringItem( SDRATTR_CUSTOMSHAPE_ENGINE, String() ) +: SfxStringItem( SDRATTR_CUSTOMSHAPE_ENGINE, "" ) {} SdrCustomShapeDataItem::SdrCustomShapeDataItem() -: SfxStringItem( SDRATTR_CUSTOMSHAPE_DATA, String() ) +: SfxStringItem( SDRATTR_CUSTOMSHAPE_DATA, "" ) {} TYPEINIT1_FACTORY( SdrCustomShapeGeometryItem, SfxPoolItem , new SdrCustomShapeGeometryItem); @@ -292,7 +292,7 @@ const uno::Sequence< beans::PropertyValue >& SdrCustomShapeGeometryItem::GetGeom } SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem() -: SfxStringItem( SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, String() ) +: SfxStringItem( SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, "" ) {} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 5faaef41b5f7..3e4d6923b3b5 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -152,7 +152,7 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer while( nCnt-- ) { sal_uInt16 nCurKey; - String aLibName, aMacName; + OUString aLibName, aMacName; rStrm >> nCurKey; // UNICODE: rStrm >> aLibName; @@ -168,7 +168,7 @@ SfxPoolItem* SvxHyperlinkItem::Create( SvStream &rStrm, sal_uInt16 /*nItemVer while( nCnt-- ) { sal_uInt16 nCurKey, nScriptType; - String aLibName, aMacName; + OUString aLibName, aMacName; rStrm >> nCurKey; diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 1040e2f4e142..c26468f7e557 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -672,8 +672,8 @@ short SvxNumberFormatShell::FillEListWithFormats_Impl( std::vector<OUString>& rL const SvNumberformat* pNumEntry = pCurFmtTable->empty() ? 0 : pCurFmtTable->begin()->second; sal_uInt32 nNFEntry; - String aStrComment; - String aNewFormNInfo; + OUString aStrComment; + OUString aNewFormNInfo; short nMyCat = SELPOS_NONE; @@ -713,8 +713,8 @@ short SvxNumberFormatShell::FillEListWithDateTime_Impl( std::vector<OUString>& r const SvNumberformat* pNumEntry = pCurFmtTable->empty() ? 0 : pCurFmtTable->begin()->second; sal_uInt32 nNFEntry; - String aStrComment; - String aNewFormNInfo; + OUString aStrComment; + OUString aNewFormNInfo; short nMyCat = SELPOS_NONE; @@ -793,8 +793,8 @@ short SvxNumberFormatShell::FillEListWithSysCurrencys( std::vector<OUString>& rL const SvNumberformat* pNumEntry = pCurFmtTable->empty() ? 0 : pCurFmtTable->begin()->second; sal_uInt32 nNFEntry; - String aStrComment; - String aNewFormNInfo; + OUString aStrComment; + OUString aNewFormNInfo; nCurCurrencyEntryPos=0; @@ -881,7 +881,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( std::vector<OUString>& r DBG_ASSERT( pCurFmtTable != NULL, "Unbekanntes Zahlenformat!" ); - String aStrComment; + OUString aStrComment; OUString aNewFormNInfo; short nMyCat = SELPOS_NONE; @@ -1015,7 +1015,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( std::vector<OUString>& r for( size_t i = 0, nPos = nOldListCount; i < aWSStringsDtor.size(); ++i ) { bool bFlag = true; - String aInsStr(aWSStringsDtor[i]); + OUString aInsStr(aWSStringsDtor[i]); size_t j; for( j=0; j < aList.size(); ++j ) { @@ -1075,8 +1075,8 @@ short SvxNumberFormatShell::FillEListWithUsD_Impl( std::vector<OUString>& rList, DBG_ASSERT( pCurFmtTable != NULL, "Unbekanntes Zahlenformat!" ); - String aStrComment; - String aNewFormNInfo; + OUString aStrComment; + OUString aNewFormNInfo; short nMyCat = SELPOS_NONE; bool bAdditional = (nPrivCat != CAT_USERDEFINED && diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index 9ceef227acc6..3ad62a7350a3 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -37,7 +37,7 @@ TYPEINIT1(SvxNumberInfoItem, SfxPoolItem); SvxNumberInfoItem::SvxNumberInfoItem( const sal_uInt16 nId ) : - INIT( NULL, SVX_VALUE_TYPE_UNDEFINED, 0, String() ) + INIT( NULL, SVX_VALUE_TYPE_UNDEFINED, 0, "" ) { } @@ -47,7 +47,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( const sal_uInt16 nId ) : SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const sal_uInt16 nId ) : - INIT( pNumFormatter, SVX_VALUE_TYPE_UNDEFINED, 0, String() ) + INIT( pNumFormatter, SVX_VALUE_TYPE_UNDEFINED, 0, "" ) { } @@ -67,7 +67,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, const sal_uInt16 nId ) : - INIT( pNumFormatter, SVX_VALUE_TYPE_NUMBER, rVal, String() ) + INIT( pNumFormatter, SVX_VALUE_TYPE_NUMBER, rVal, "" ) { } diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index adefbdb9dd40..8f1321e5eee6 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -123,8 +123,8 @@ SfxItemPresentation SvxPageItem::GetPresentation rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE); else rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_FALSE); - String aUsageText = GetUsageText( eUse ); - if (aUsageText.Len()) + OUString aUsageText = GetUsageText( eUse ); + if (!aUsageText.isEmpty()) { rText += cpDelimTmp + aUsageText; } @@ -143,8 +143,8 @@ SfxItemPresentation SvxPageItem::GetPresentation rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_TRUE); else rText += SVX_RESSTR(RID_SVXITEMS_PAGE_LAND_FALSE); - String aUsageText = GetUsageText( eUse ); - if (aUsageText.Len()) + OUString aUsageText = GetUsageText( eUse ); + if (!aUsageText.isEmpty()) { rText += cpDelimTmp + aUsageText; } |