diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-06-13 22:07:41 +0200 |
|---|---|---|
| committer | Noel Power <noel.power@suse.com> | 2013-06-18 08:11:58 +0000 |
| commit | 8956854d8e7294b41e65d5aacbc43e11d1795711 (patch) | |
| tree | d9d87ffd48d048ddc46fbb34181c3c2c50243981 /sfx2 | |
| parent | 66a0713dc9c676182fcd7aa1e21f8dc25c05be5e (diff) | |
String to OUString (SfxStringItem and related)
Change-Id: I390413e9ff3efee720a6423fb8695b4c655d7efa
Reviewed-on: https://gerrit.libreoffice.org/4280
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sorgitm.hxx | 4 | ||||
| -rw-r--r-- | sfx2/source/appl/appcfg.cxx | 13 | ||||
| -rw-r--r-- | sfx2/source/control/sorgitm.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/objitem.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/view/frame.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 4 |
6 files changed, 14 insertions, 19 deletions
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index b87e4008d2bf..5c4c5a39118d 100644 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -26,7 +26,7 @@ class SfxScriptOrganizerItem : public SfxStringItem { private: - String aLanguage; + OUString aLanguage; public: TYPEINFO(); @@ -38,7 +38,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - String getLanguage() { return aLanguage; }; + OUString getLanguage() { return aLanguage; }; }; #endif diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 8b0022aec34c..f424310cb188 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -366,10 +366,9 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet ) if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_SECUREURLS)) { ::com::sun::star::uno::Sequence< OUString > seqURLs = aSecurityOptions.GetSecureURLs(); - std::vector<String> aList; + std::vector<OUString> aList; sal_uInt32 nCount = seqURLs.getLength(); - sal_uInt32 nURL; - for( nURL=0; nURL<nCount; ++nURL ) + for( sal_uInt32 nURL=0; nURL<nCount; ++nURL ) aList.push_back(seqURLs[nURL]); if( !rSet.Put( SfxStringListItem( rPool.GetWhich(SID_SECURE_URL), &aList ) ) ) @@ -757,12 +756,8 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) if ( SFX_ITEM_SET == rSet.GetItemState(SID_SECURE_URL, sal_True, &pItem)) { DBG_ASSERT(pItem->ISA(SfxStringListItem), "StringListItem expected"); - const std::vector<String> &aList = ((SfxStringListItem*)pItem)->GetList(); - sal_uInt32 nCount = aList.size(); - ::com::sun::star::uno::Sequence< OUString > seqURLs(nCount); - for( sal_uInt32 nPosition=0;nPosition<nCount;++nPosition) - seqURLs[nPosition] = aList[nPosition]; - + ::com::sun::star::uno::Sequence< OUString > seqURLs; + ((SfxStringListItem*)pItem)->GetStringList(seqURLs); aSecurityOptions.SetSecureURLs( seqURLs ); } diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx index 836becb6b171..fefc88794c27 100644 --- a/sfx2/source/control/sorgitm.cxx +++ b/sfx2/source/control/sorgitm.cxx @@ -69,7 +69,7 @@ int SfxScriptOrganizerItem::operator==( const SfxPoolItem& rItem) const bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { - String aValue; + OUString aValue; nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) { @@ -82,7 +82,7 @@ bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uIn return false; } - rVal <<= OUString( aValue ); + rVal <<= aValue; return true; } diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx index b4b74b2bde57..981afdea5b04 100644 --- a/sfx2/source/doc/objitem.cxx +++ b/sfx2/source/doc/objitem.cxx @@ -36,9 +36,9 @@ int SfxObjectShellItem::operator==( const SfxPoolItem &rItem ) const //-------------------------------------------------------------------- -String SfxObjectShellItem::GetValueText() const +OUString SfxObjectShellItem::GetValueText() const { - return String(); + return OUString(); } //-------------------------------------------------------------------- diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 071312aefaad..8476a92e8c31 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -541,9 +541,9 @@ int SfxFrameItem::operator==( const SfxPoolItem &rItem ) const //-------------------------------------------------------------------- -String SfxFrameItem::GetValueText() const +OUString SfxFrameItem::GetValueText() const { - return String(); + return OUString(); } SfxPoolItem* SfxFrameItem::Clone( SfxItemPool *) const diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 6aee3b0917d1..3e60a2f69c75 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1623,9 +1623,9 @@ int SfxViewFrameItem::operator==( const SfxPoolItem &rItem ) const } //-------------------------------------------------------------------- -String SfxViewFrameItem::GetValueText() const +OUString SfxViewFrameItem::GetValueText() const { - return String(); + return OUString(); } //-------------------------------------------------------------------- |