diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-01-24 15:12:43 +0100 |
|---|---|---|
| committer | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-01-24 22:26:40 +0100 |
| commit | 2dab78ee2199d70b951aee86b80aab4374cc7c4f (patch) | |
| tree | 40e1d3652242d7edd900b5d3f73002e77954e92f /sw/source/ui/dbui/mmgreetingspage.cxx | |
| parent | 0057803c228e10bc1247ebb35c28cfc9ffc4cc5c (diff) | |
Change GetSavedValue() to return OUString
removed temporarily added OUString(...GetSavedValue()...) constructs again
Change-Id: I11477654d217a5ae127c1ef1b19cbff56ed052a6
Diffstat (limited to 'sw/source/ui/dbui/mmgreetingspage.cxx')
| -rw-r--r-- | sw/source/ui/dbui/mmgreetingspage.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 5cbaa819da84..4e591ecf4c5a 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -367,7 +367,7 @@ sal_Bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPage aAssignment[MM_PART_GENDER] = m_aFemaleColumnLB.GetSelectEntry(); rConfig.SetColumnAssignment( rDBData, aAssignment ); } - if(m_aFemaleFieldCB.GetText() != OUString(m_aFemaleFieldCB.GetSavedValue())) + if(m_aFemaleFieldCB.GetText() != m_aFemaleFieldCB.GetSavedValue()) rConfig.SetFemaleGenderValue(m_aFemaleFieldCB.GetText()); lcl_StoreGreetingsBox(m_aFemaleLB, rConfig, SwMailMergeConfigItem::FEMALE); @@ -561,7 +561,7 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl) aAssignment[MM_PART_GENDER] = ::rtl::OUString(); rConfigItem.SetColumnAssignment( rDBData, aAssignment ); } - if(m_aFemaleFieldCB.GetText() != OUString(m_aFemaleFieldCB.GetSavedValue())) + if(m_aFemaleFieldCB.GetText() != m_aFemaleFieldCB.GetSavedValue()) rConfigItem.SetFemaleGenderValue(m_aFemaleFieldCB.GetText()); EndDialog(RET_OK); |