diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:35:13 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:34 +0100 |
commit | b1fab4ab325636eacf7c0387d55b6cc184f89c5f (patch) | |
tree | ae4fc4883d0106d08384eb9f628b28087babe991 /sw/source/ui/dbui | |
parent | e5bd0f8b0a83f5c7f0f204adc081b102c765ca8e (diff) |
sw: Use appropriate OUString functions on string constants
Change-Id: I9c3e03324c69beb5af4c43da208086600876f875
Diffstat (limited to 'sw/source/ui/dbui')
-rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmoutputpage.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 14c36fd94080..a89ed65b32c5 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -385,7 +385,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame( SwInsertFld_Data aData(TYP_HIDDENPARAFLD, 0, sHideParagraphsExpression, aEmptyOUStr, 0, &rShell ); aFldMgr.InsertFld( aData ); } - sHideParagraphsExpression = ""; + sHideParagraphsExpression.clear(); //now add a new paragraph rShell.SplitNode(); } diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 01a4d1f20d20..b5af54400312 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -1244,8 +1244,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton) OUString::createFromAscii(rtl_getBestMimeCharsetFromTextEncoding( eEncoding )); } else - aDesc.sBodyMimeType = - OUString("text/plain; charset=UTF-8; format=flowed"); + aDesc.sBodyMimeType = "text/plain; charset=UTF-8; format=flowed"; aDesc.sSubject = m_pSubjectED->GetText(); aDesc.sCC = m_sCC; |