[Libreoffice-commits] core.git: 3 commits - configure.ac desktop/source extensions/source include/sal

[Stephan Bergmann]

 configure.ac                                   |    2 +-
 desktop/source/lib/init.cxx                    |    2 +-
 extensions/source/abpilot/fieldmappingimpl.cxx |   12 ++++++------
 include/sal/log-areas.dox                      |    1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit a67d5c7604e8c420f6d63df89f04e33f940f952a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 11 16:00:52 2016 +0100

    Make --enable-firebird-sdbc the default again
    
    19ec3c5e2230f982789f18c8e7bf77eabef68ad0 "firebird compat issue with macosx
    10.11 was fixed by sberg some time ago" forgot to turn this back on when
    reverting 9af1331c9253426855ac0f3a26e7f4bfff900d61 "For now, firebird doe snot
    [sic] build on macosx 10.11."
    
    (But no, firebird still does not build out of the box on Mac OS X 10.11, one
    still needs to pass into the build a non-broken SHELL that does not filter away
    DYLD_* env vars.)
    
    Change-Id: I17321893a08d1f2a129ee14bf4f4453ff64ad2ad

diff --git a/configure.ac b/configure.ac
index 670acb0..3b780b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1450,7 +1450,7 @@ AC_ARG_ENABLE(lotuswordpro,
 AC_ARG_ENABLE(firebird-sdbc,
     AS_HELP_STRING([--disable-firebird-sdbc],
         [Disable the build of the Firebird-SDBC driver if it doesn't compile for you.]),
-)
+,enable_firebird_sdbc=yes)
 
 AC_ARG_ENABLE(winegcc,
     AS_HELP_STRING([--enable-winegcc],
commit 59adfe22eef256f26804d469b497872db638908b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 11 16:00:20 2016 +0100

    loplugin:stringconstant
    
    Change-Id: I78f28906c3ceae323b608018f929c66358e9aa39

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e236595..b24fbbc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -668,7 +668,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const cha
         if (aFilterOptions == "TakeOwnership")
         {
             bTakeOwnership = true;
-            aFilterOptions = "";
+            aFilterOptions.clear();
         }
         else if ((nIndex = aFilterOptions.indexOf(",TakeOwnership")) >= 0 || (nIndex = aFilterOptions.indexOf("TakeOwnership,")) >= 0)
         {
commit d6eaa8d863f5bc352ce6a06c910dc3a0fd0216f7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 11 15:55:00 2016 +0100

    Work around loplugin:oncevar with --disable-dbgutil
    
    Change-Id: I8f2a2910993609dec91e63074a5b9195a2352bb5

diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 4d7b07c..921a126 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -229,13 +229,13 @@ namespace abp
 
             for ( ; pExistentFields != pExistentFieldsEnd; ++pExistentFields )
             {
-#ifdef DBG_UTIL
-                OUString sRedundantProgrammaticName;
-                aFields.openNode( *pExistentFields ).getNodeValue( sProgrammaticNodeName ) >>= sRedundantProgrammaticName;
-                DBG_ASSERT( sRedundantProgrammaticName == *pExistentFields,
-                    "fieldmapping::writeTemplateAddressFieldMapping: inconsistent config data!" );
+                SAL_WARN_IF(
+                    ((aFields.openNode(*pExistentFields)
+                      .getNodeValue(sProgrammaticNodeName).get<OUString>())
+                     != *pExistentFields),
+                    "extensions.abpilot",
+                    "fieldmapping::writeTemplateAddressFieldMapping: inconsistent config data!");
                     // there should be a redundancy in the config data .... if this asserts, there isn't anymore!
-#endif
 
                 // do we have a new alias for the programmatic?
                 MapString2String::iterator aPos = aFieldAssignment.find( *pExistentFields );
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index d6251fc..b4b3184 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -174,6 +174,7 @@ certain functionality.
 
 @section extensions
 
+ at li @c extensions.abpilot
 @li @c extensions.biblio
 @li @c extensions.dbpilots
 @li @c extensions.plugin