diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-10 17:32:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-15 12:25:38 +0200 |
| commit | 84a36663052a0089516aa0eeae18811317f78cd7 (patch) | |
| tree | a8d1a80d0d6882606d31e4653c974ca4caecf559 /sw/source/ui/app | |
| parent | 9bd7c5232a63de0ac03ee665a2f7092df4d3f6d3 (diff) | |
convert sw/inc/editsh.hxx from String to OUString
Change-Id: Ib24edf99414b2f1821bdfe37d3b27b9c79820947
Diffstat (limited to 'sw/source/ui/app')
| -rw-r--r-- | sw/source/ui/app/apphdl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx index a303fd749dc5..559176acaea4 100644 --- a/sw/source/ui/app/apphdl.cxx +++ b/sw/source/ui/app/apphdl.cxx @@ -342,8 +342,8 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs } else { - std::vector<String> aDBNameList; - std::vector<String> aAllDBNames; + std::vector<OUString> aDBNameList; + std::vector<OUString> aAllDBNames; m_pView->GetWrtShell().GetAllUsedDB( aDBNameList, &aAllDBNames ); if(!aDBNameList.empty()) { @@ -682,7 +682,7 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) // Are database fields contained? // Get all used databases for the first time SwDoc *pDoc = pDocSh->GetDoc(); - std::vector<String> aDBNameList; + std::vector<OUString> aDBNameList; pDoc->GetAllUsedDB( aDBNameList ); if(!aDBNameList.empty()) { // Open database beamer |