summaryrefslogtreecommitdiffstats
path: root/sw
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2011-11-15 23:53:00 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2011-11-16 00:43:11 +0900
commitdfd08cdf16e5b46b05dadb5fb3a2b32349ec5df5 (patch)
tree3e72cd620b9c5175853c0f587a330afd66b38d2b /sw
parentn#592912 and n#621744: Text Alignment fixes. (diff)
downloadcore-dfd08cdf16e5b46b05dadb5fb3a2b32349ec5df5.tar.gz
core-dfd08cdf16e5b46b05dadb5fb3a2b32349ec5df5.zip
replaced String in SfxPickList with rtl::OUString
this consists of 12df49396e6bcb07bafc95255a8526caac96e60a and related changes
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 6e2e5099c1b3..c7d7fd4223e4 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -1103,7 +1103,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
if(!pSfxFlt)
return 0;
- String sMimeType = pSfxFlt->GetMimeType();
+ ::rtl::OUString sMimeType = pSfxFlt->GetMimeType();
if(!m_aSubjectED.GetText().Len())
{