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 /include/svl | |
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 'include/svl')
-rw-r--r-- | include/svl/poolitem.hxx | 5 | ||||
-rw-r--r-- | include/svl/slstitm.hxx | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 5e041825186a..1a7765c9995e 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -27,7 +27,6 @@ #include <limits.h> #include <tools/solar.h> #include <tools/debug.hxx> -#include <tools/string.hxx> #include <svl/hint.hxx> typedef long SfxArgumentError; @@ -226,9 +225,7 @@ public: @param rStream Some (input) stream. Its Stream/TargetCharSets must be set to correct values! - @param rString On success, returns the reconstructed Unicode string. - - @return True if the string was successfully read and reconstructed. + @return On success, returns the reconstructed Unicode string. */ static OUString readByteString(SvStream & rStream); diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 90c873119b80..f42686e81f9a 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -37,18 +37,18 @@ public: TYPEINFO(); SfxStringListItem(); - SfxStringListItem( sal_uInt16 nWhich, const std::vector<String> *pList=NULL ); + SfxStringListItem( sal_uInt16 nWhich, const std::vector<OUString> *pList=NULL ); SfxStringListItem( sal_uInt16 nWhich, SvStream& rStream ); SfxStringListItem( const SfxStringListItem& rItem ); ~SfxStringListItem(); - std::vector<String>& GetList(); + std::vector<OUString>& GetList(); - const std::vector<String>& GetList() const; + const std::vector<OUString>& GetList() const; // String-Separator: \n - virtual void SetString( const XubString& ); - virtual XubString GetString(); + virtual void SetString( const OUString& ); + virtual OUString GetString(); void SetStringList( const com::sun::star::uno::Sequence< OUString >& rList ); void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const; |