[Libreoffice-commits] core.git: 2 commits - scp2/source sw/inc sw/source

[Matteo Casalin]

 scp2/source/ooo/common_brand.scp |    2 +-
 sw/inc/editsh.hxx                |    2 +-
 sw/source/core/edit/edfldexp.cxx |    2 +-
 sw/source/ui/uiview/view2.cxx    |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 267e507fd6ebaa46a1121f19c263b2553968d7c9
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Sun Sep 29 21:13:01 2013 +0200

    String to OUString
    
    Change-Id: I93200c35bf33da16efc6f0dc5dfe2c79d8752250
    Reviewed-on: https://gerrit.libreoffice.org/6095
    Reviewed-by: Matteo Casalin <matteo.casalin at yahoo.com>
    Tested-by: Matteo Casalin <matteo.casalin at yahoo.com>

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index d1eb77b..4f5212e 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 b7a0d6a..452fa56 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 9bb1e6a..cb5faee 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());
commit 9d6eb23cdfaa4e2176866c6aab8f47b1f4e99060
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 30 23:09:03 2013 +0200

    Consistently (but arbitrarily?) exclude gdbtrace on Mac OS X
    
    Change-Id: Ia5acd5b6be61364aab2e799088bd2592bd2b4b62

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 8eb6ac6..1b2e7df 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -489,7 +489,7 @@ File gid_Brand_File_Html_Thirdpartylicensereadme
     TXT_FILE_BODY;
 End
 
-#if defined UNX && !defined ENABLE_MACOSX_SANDBOX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+#if defined UNX && !defined MACOSX
 
 File gid_Brand_File_Gdb_Trace
     TXT_FILE_BODY;