diff options
| -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()); |