diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-03 16:08:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-05 08:54:50 +0200 |
| commit | a5c93041794164ecaae9e71ee1c83c187ad17aab (patch) | |
| tree | bdc307b538d7cec104a430d33920b351976fe0de | |
| parent | 10cbf4838e6e05e58887e5a14aa5e274521854b2 (diff) | |
convert include/svx/XPropertyEntry.hxx from String to OUString
Change-Id: Ie112b2e8af32eba60f67f767dd6a098980d907b4
| -rw-r--r-- | include/svx/XPropertyEntry.hxx | 10 | ||||
| -rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.cxx | 2 | ||||
| -rw-r--r-- | svx/source/xoutdev/XPropertyEntry.cxx | 2 | ||||
| -rw-r--r-- | svx/source/xoutdev/xattr.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx index 32b5b409c27b..e006e2e5ad0f 100644 --- a/include/svx/XPropertyEntry.hxx +++ b/include/svx/XPropertyEntry.hxx @@ -28,18 +28,18 @@ class SVX_DLLPUBLIC XPropertyEntry { private: - String maName; - Bitmap maUiBitmap; + OUString maName; + Bitmap maUiBitmap; protected: - XPropertyEntry(const String& rName); + XPropertyEntry(const OUString& rName); XPropertyEntry(const XPropertyEntry& rOther); public: virtual ~XPropertyEntry(); - void SetName(const String& rName) { maName = rName; } - const String& GetName() const { return maName; } + void SetName(const OUString& rName) { maName = rName; } + const OUString& GetName() const { return maName; } void SetUiBitmap(const Bitmap& rUiBitmap) { maUiBitmap = rUiBitmap; } const Bitmap& GetUiBitmap() const { return maUiBitmap; } }; diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 1d149bf516ed..57cb65d77d47 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -725,7 +725,7 @@ IMPL_LINK_NOARG(LinePropertyPanel, ChangeLineStyleHdl) const XDashEntry* pDashEntry = mxLineStyleList->GetDash(nPos - 2); OSL_ENSURE(pDashEntry, "OOps, got empty XDash from XDashList (!)"); const XLineDashItem aItemB( - pDashEntry ? pDashEntry->GetName() : String(), + pDashEntry ? pDashEntry->GetName() : OUString(), pDashEntry ? pDashEntry->GetDash() : XDash()); GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SFX_CALLMODE_RECORD, &aItemA, 0L); diff --git a/svx/source/xoutdev/XPropertyEntry.cxx b/svx/source/xoutdev/XPropertyEntry.cxx index ca42908e835f..62ae82dd9e37 100644 --- a/svx/source/xoutdev/XPropertyEntry.cxx +++ b/svx/source/xoutdev/XPropertyEntry.cxx @@ -19,7 +19,7 @@ #include <svx/XPropertyEntry.hxx> -XPropertyEntry::XPropertyEntry(const String& rName) +XPropertyEntry::XPropertyEntry(const OUString& rName) : maName(rName), maUiBitmap() { diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 31a0d2c19add..fd5f845b001b 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -220,7 +220,7 @@ OUString NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_u } else { - sal_Int32 nThisIndex = pEntry->GetName().Copy( aUser.Len() ).ToInt32(); + sal_Int32 nThisIndex = pEntry->GetName().copy( aUser.Len() ).toInt32(); if( nThisIndex >= nUserIndex ) nUserIndex = nThisIndex + 1; } |