diff options
| author | Gergő Mocsi <gmocsi91@gmail.com> | 2013-02-20 04:33:49 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-02-22 09:48:50 +0000 |
| commit | 1da3af5f1eb6a32fd0ab10da7cf2f8ddb298a3a1 (patch) | |
| tree | 11991caeeb5fb6f8a70b617430f09944e41398b0 /svl | |
| parent | fc090acf829d0053c0a611acd73f08b51128031d (diff) | |
fdo#38838, ::rtl::OUString, String to OUString
I have cleared out String and ::rtl::OUString calls in module dbaccess/source/core/misc.
It was mainly file dbaccess/source/core/misc/dnstypes.cxx , and it's usages. There are
still some calls in dbaccess for this class(ODnsTypeCollection), that needs refactoring
(eg. in file DbAdminImpl.cxx, method "String ODbDataSourceAdministrationHelper::getConnectionURL() const").
Remaining calls will be my next task (in module dbaccess). I also clear out deprecated macro
RTL_CONSTASCII_USTRINGPARAM every time I find one. The class I've mentioned above
(ODnsTypeCollector) is OK.
Change-Id: Ia0f3bb8cc649d1ecf8decc093f8a1a20ee23c33c
Reviewed-on: https://gerrit.libreoffice.org/2289
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/inc/svl/custritm.hxx | 10 | ||||
| -rw-r--r-- | svl/source/items/custritm.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svl/inc/svl/custritm.hxx b/svl/inc/svl/custritm.hxx index bd2964cbc12f..70948d8fbf43 100644 --- a/svl/inc/svl/custritm.hxx +++ b/svl/inc/svl/custritm.hxx @@ -29,7 +29,7 @@ DBG_NAMEEX_VISIBILITY(CntUnencodedStringItem, SVL_DLLPUBLIC) class SVL_DLLPUBLIC CntUnencodedStringItem: public SfxPoolItem { - XubString m_aValue; + OUString m_aValue; public: TYPEINFO(); @@ -37,7 +37,7 @@ public: CntUnencodedStringItem(sal_uInt16 which = 0): SfxPoolItem(which) { DBG_CTOR(CntUnencodedStringItem, 0); } - CntUnencodedStringItem(sal_uInt16 which, const XubString & rTheValue): + CntUnencodedStringItem(sal_uInt16 which, const OUString & rTheValue): SfxPoolItem(which), m_aValue(rTheValue) { DBG_CTOR(CntUnencodedStringItem, 0); } @@ -68,12 +68,12 @@ public: virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; - const XubString & GetValue() const { return m_aValue; } + const OUString & GetValue() const { return m_aValue; } - inline void SetValue(const XubString & rTheValue); + inline void SetValue(const OUString & rTheValue); }; -inline void CntUnencodedStringItem::SetValue(const XubString & rTheValue) +inline void CntUnencodedStringItem::SetValue(const OUString & rTheValue) { DBG_ASSERT(GetRefCount() == 0, "CntUnencodedStringItem::SetValue(): Pooled item"); diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index 2b492e9a8c89..3b3128dc7413 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -54,7 +54,7 @@ int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith) const DBG_CHKTHIS(CntUnencodedStringItem, 0); DBG_ASSERT(rWith.ISA(CntUnencodedStringItem), "CntUnencodedStringItem::Compare(): Bad type"); - switch (m_aValue.CompareTo(static_cast< CntUnencodedStringItem const * >( + switch (m_aValue.compareTo(static_cast< CntUnencodedStringItem const * >( &rWith)-> m_aValue)) { |