Kaydet (Commit) 267e507f authored tarafından Matteo Casalin's avatar Matteo Casalin

String to OUString

Change-Id: I93200c35bf33da16efc6f0dc5dfe2c79d8752250
Reviewed-on: https://gerrit.libreoffice.org/6095Reviewed-by: 's avatarMatteo Casalin <matteo.casalin@yahoo.com>
Tested-by: 's avatarMatteo Casalin <matteo.casalin@yahoo.com>
üst 9d6eb23c
...@@ -390,7 +390,7 @@ public: ...@@ -390,7 +390,7 @@ public:
sal_Bool IsAnyDatabaseFieldInDoc()const; sal_Bool IsAnyDatabaseFieldInDoc()const;
/// Check whether DB fields point to an available data source and returns it. /// 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 UpdateExpFlds(sal_Bool bCloseDB = sal_False);///< only every expression fields update
void LockExpFlds(); void LockExpFlds();
void UnlockExpFlds(); void UnlockExpFlds();
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
using namespace com::sun::star; 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 SwFldTypes * pFldTypes = GetDoc()->GetFldTypes();
const sal_uInt16 nSize = pFldTypes->size(); const sal_uInt16 nSize = pFldTypes->size();
......
...@@ -2337,7 +2337,7 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument) ...@@ -2337,7 +2337,7 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument)
else else
{ {
// check whether the // check whether the
String sSource; OUString sSource;
if(!GetWrtShell().IsFieldDataSourceAvailable(sSource)) if(!GetWrtShell().IsFieldDataSourceAvailable(sSource))
{ {
SwMergeSourceWarningBox_Impl aWarning( &GetViewFrame()->GetWindow()); SwMergeSourceWarningBox_Impl aWarning( &GetViewFrame()->GetWindow());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment