summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-08-30 11:08:19 +0200
committerNoel Grandin <noel@peralex.com>2013-09-05 08:54:14 +0200
commit4f0bf3db08ba9b203e30883f260a35d378f20a9c (patch)
tree6301d44adabe56794db1adff31746b52594f7cc5
parentd7d3a0edb9415edf74362dcc43a8b748e25fc65e (diff)
convert include/svx/swframeposstrings.hxx from String to OUString
Change-Id: I762a08c61f6d7b3fa97195d9da19f54da1b553f4
-rw-r--r--include/svx/swframeposstrings.hxx2
-rw-r--r--svx/source/dialog/swframeposstrings.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/svx/swframeposstrings.hxx b/include/svx/swframeposstrings.hxx
index a6ecc3a7605e..7b9b7f2bd4be 100644
--- a/include/svx/swframeposstrings.hxx
+++ b/include/svx/swframeposstrings.hxx
@@ -80,7 +80,7 @@ public:
STR_MAX
};
- const String& GetString(StringId eId);
+ const OUString& GetString(StringId eId);
};
#endif
diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx
index ad4f1ecd3e28..3729bb6f5c14 100644
--- a/svx/source/dialog/swframeposstrings.cxx
+++ b/svx/source/dialog/swframeposstrings.cxx
@@ -26,7 +26,7 @@
class SvxSwFramePosString_Impl : public Resource
{
friend class SvxSwFramePosString;
- String aStrings[SvxSwFramePosString::STR_MAX];
+ OUString aStrings[SvxSwFramePosString::STR_MAX];
public:
SvxSwFramePosString_Impl();
};
@@ -51,7 +51,7 @@ SvxSwFramePosString::~SvxSwFramePosString()
delete pImpl;
}
-const String& SvxSwFramePosString::GetString(StringId eId)
+const OUString& SvxSwFramePosString::GetString(StringId eId)
{
DBG_ASSERT(eId >= 0 && eId < STR_MAX, "invalid StringId");
if(!(eId >= 0 && eId < STR_MAX))