diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-09-29 21:13:01 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-09-30 21:09:10 +0000 |
| commit | 267e507fd6ebaa46a1121f19c263b2553968d7c9 (patch) | |
| tree | 9e8e6a76d5dace5f7cad6aa984e79dfbde8f63e0 /sw | |
| parent | 9d6eb23cdfaa4e2176866c6aab8f47b1f4e99060 (diff) | |
String to OUString
Change-Id: I93200c35bf33da16efc6f0dc5dfe2c79d8752250
Reviewed-on: https://gerrit.libreoffice.org/6095
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
Tested-by: Matteo Casalin <matteo.casalin@yahoo.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/editsh.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/edit/edfldexp.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/uiview/view2.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index d1eb77b779b7..4f5212e9205c 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -390,7 +390,7 @@ public: sal_Bool IsAnyDatabaseFieldInDoc()const; /// Check whether DB fields point to an available data source and returns it. - sal_Bool IsFieldDataSourceAvailable(String& rUsedDataSource) const; + sal_Bool IsFieldDataSourceAvailable(OUString& rUsedDataSource) const; void UpdateExpFlds(sal_Bool bCloseDB = sal_False);///< only every expression fields update void LockExpFlds(); void UnlockExpFlds(); diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx index b7a0d6a3e695..452fa561176b 100644 --- a/sw/source/core/edit/edfldexp.cxx +++ b/sw/source/core/edit/edfldexp.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star; -sal_Bool SwEditShell::IsFieldDataSourceAvailable(String& rUsedDataSource) const +sal_Bool SwEditShell::IsFieldDataSourceAvailable(OUString& rUsedDataSource) const { const SwFldTypes * pFldTypes = GetDoc()->GetFldTypes(); const sal_uInt16 nSize = pFldTypes->size(); diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 9bb1e6acd768..cb5faee86988 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -2337,7 +2337,7 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument) else { // check whether the - String sSource; + OUString sSource; if(!GetWrtShell().IsFieldDataSourceAvailable(sSource)) { SwMergeSourceWarningBox_Impl aWarning( &GetViewFrame()->GetWindow()); |