[Libreoffice-commits] core.git: 6 commits - connectivity/source dbaccess/source include/connectivity vcl/Library_vcl.mk

Tor Lillqvist tml at iki.fi
Wed Jul 10 10:58:16 PDT 2013 

 connectivity/source/inc/internalnode.hxx           |   51 ------------
 connectivity/source/inc/parse/sqlbison_exports.hxx |   23 -----
 connectivity/source/inc/sqlscan.hxx                |   83 ---------------------
 connectivity/source/parse/internalnode.cxx         |    4 -
 connectivity/source/parse/sqlbison.y               |   13 ++-
 connectivity/source/parse/sqlflex.l                |   10 +-
 connectivity/source/parse/sqlnode.cxx              |    8 +-
 dbaccess/source/ui/browser/brwctrlr.cxx            |    2 
 include/connectivity/internalnode.hxx              |   51 ++++++++++++
 include/connectivity/sqlbison_exports.hxx          |   23 +++++
 include/connectivity/sqlscan.hxx                   |   83 +++++++++++++++++++++
 vcl/Library_vcl.mk                                 |   13 ---
 12 files changed, 177 insertions(+), 187 deletions(-)

New commits:
commit d3a221df1a513642da16f1301db7734fc003a0c7
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jul 10 20:47:32 2013 +0300

    Fix error: reference to 'ErrorCondition' is ambiguous
    
    Either 'connectivity::ErrorCondition' or
    'com::sun::star::sdb::ErrorCondition'.
    
    Change-Id: Ifeaa895497c8635b7801b2e79400634b11541373

diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index e208d3e..7411241 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -696,7 +696,7 @@ void SbaXDataBrowserController::onStartLoading( const Reference< XLoadable >& _r
 void SbaXDataBrowserController::impl_checkForCannotSelectUnfiltered( const SQLExceptionInfo& _rError )
 {
     ::connectivity::SQLError aError( getORB() );
-    ::connectivity::ErrorCode nErrorCode( aError.getErrorCode( ErrorCondition::DATA_CANNOT_SELECT_UNFILTERED ) );
+    ::connectivity::ErrorCode nErrorCode( aError.getErrorCode( sdb::ErrorCondition::DATA_CANNOT_SELECT_UNFILTERED ) );
     if ( ((const SQLException*)_rError)->ErrorCode == nErrorCode )
     {
         m_bCannotSelectUnfiltered = true;
commit a0c50b739c79d41e8166e2dab862dca0d093e7c3
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jul 10 20:44:17 2013 +0300

    Further fallout from the connectivity SQL parser changes
    
    A couple of headers now need to be public because they are indirectly
    included in other modules.
    
    Change-Id: Id01945197b67183a0a042e854289875ae147a0eb

diff --git a/connectivity/source/parse/internalnode.cxx b/connectivity/source/parse/internalnode.cxx
index 57d28b4..19caebb 100644
--- a/connectivity/source/parse/internalnode.cxx
+++ b/connectivity/source/parse/internalnode.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "internalnode.hxx"
-
 #include <algorithm>
+
 #include <connectivity/sqlparse.hxx>
+#include <connectivity/internalnode.hxx>
 
 using namespace connectivity;
 
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index d5bc6fb..0b661e9 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -21,11 +21,12 @@
 
 #include <vector>
 #include <string.h>
-#include "parse/sqlbison_exports.hxx"
 
 #include <connectivity/sqlnode.hxx>
 #include <connectivity/sqlparse.hxx>
-#include <internalnode.hxx>
+#include <connectivity/sqlbison_exports.hxx>
+#include <connectivity/sqlscan.hxx>
+#include <connectivity/internalnode.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/util/Date.hpp>
@@ -40,7 +41,6 @@
 #include <com/sun/star/i18n/KParseType.hpp>
 #include <com/sun/star/i18n/KParseTokens.hpp>
 
-#include "sqlscan.hxx"
 #include <osl/diagnose.h>
 #include "connectivity/dbconversion.hxx"
 #include <rtl/ustrbuf.hxx>
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 47a42ec..e3629d7 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -28,7 +28,7 @@
 
 #include <string.h>
 
-#include "internalnode.hxx"
+#include <connectivity/internalnode.hxx>
 
 #ifndef _CONNECTIVITY_SQLYACC_HXX
 #define _CONNECTIVITY_SQLYACC_HXX
@@ -41,10 +41,10 @@
 #undef SQLyylex
 #undef SQLyyerror
 #endif
-#include "sqlscan.hxx"
 #include <osl/diagnose.h>
 #include <rtl/strbuf.hxx>
 #include <connectivity/sqlparse.hxx>
+#include <connectivity/sqlscan.hxx>
 
 #if defined __SUNPRO_CC
 #pragma disable_warn
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 787b1fa..1c748ab 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "parse/sqlbison_exports.hxx"
-
 #include <sal/macros.h>
 #include <connectivity/sqlnode.hxx>
 #include <connectivity/sqlerror.hxx>
-#include <internalnode.hxx>
+#include <connectivity/sqlbison_exports.hxx>
+#include <connectivity/internalnode.hxx>
 #define YYBISON   1
 #include <sqlbison.hxx>
 #include <connectivity/sqlparse.hxx>
+#include <connectivity/sqlscan.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
@@ -47,7 +47,6 @@
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include "TConnection.hxx"
-#include "sqlscan.hxx"
 #include <comphelper/numbers.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/stl_types.hxx>
diff --git a/connectivity/source/inc/internalnode.hxx b/include/connectivity/internalnode.hxx
similarity index 100%
rename from connectivity/source/inc/internalnode.hxx
rename to include/connectivity/internalnode.hxx
diff --git a/connectivity/source/inc/parse/sqlbison_exports.hxx b/include/connectivity/sqlbison_exports.hxx
similarity index 100%
rename from connectivity/source/inc/parse/sqlbison_exports.hxx
rename to include/connectivity/sqlbison_exports.hxx
diff --git a/connectivity/source/inc/sqlscan.hxx b/include/connectivity/sqlscan.hxx
similarity index 100%
rename from connectivity/source/inc/sqlscan.hxx
rename to include/connectivity/sqlscan.hxx
commit 986b39aa4f9ccafc4aafb0c4959832ad47aa83c9
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jul 10 20:09:00 2013 +0300

    Avoid duplicate definition of xxx_pGLOBAL_SQLPARSER at linking stage
    
    Change-Id: I29a3a68f9ee434332cad7199a90a1b01c22fbe0e

diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index a3703b7..d5bc6fb 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -89,7 +89,7 @@ static connectivity::OSQLInternalNode* newNode(const ::rtl::OUString& _NewValue,
 #define SQL_NEW_COMMALISTRULE   newNode(aEmptyString, SQL_NODE_COMMALISTRULE, yyr1[yyn])
 
 
-connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
+extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
 
 #if !(defined MACOSX && defined PPC)
 #define YYERROR_VERBOSE
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 07143e8..787b1fa 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -73,6 +73,7 @@ using namespace ::osl;
 using namespace ::dbtools;
 using namespace ::comphelper;
 
+connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
 
 namespace
 {
commit 60a1254495bfd4895fb46b671e562262fb7358ee
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jul 10 20:07:59 2013 +0300

    WaE: unused functions
    
    Change-Id: Ie54546ef97fe102de09888ce9c7eefe6c879aae4

diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index b7fac32..a3703b7 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -55,6 +55,11 @@
 
 static const ::rtl::OUString aEmptyString;
 
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+# pragma GCC diagnostic ignored "-Wwrite-strings"
+# pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
 static connectivity::OSQLInternalNode* newNode(const sal_Char* pNewValue,
 							     const connectivity::SQLNodeType eNodeType,
 								 const sal_uInt32 nNodeID = 0)
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index a626e94..47a42ec 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -46,10 +46,7 @@
 #include <rtl/strbuf.hxx>
 #include <connectivity/sqlparse.hxx>
 
-#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
-# pragma GCC diagnostic ignored "-Wwrite-strings"
-# pragma GCC diagnostic ignored "-Wunused-function"
-#elif defined __SUNPRO_CC
+#if defined __SUNPRO_CC
 #pragma disable_warn
 #elif defined _MSC_VER
 #pragma warning(push, 1)
commit 911a229cc6c6671b833592248b1d6cac75588ae7
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jul 10 19:55:43 2013 +0300

    Undef SQLyyerror, too
    
    Change-Id: Id80d373d93df140b8fc0d0d0c44044b94ceb97a9

diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 803b634..a626e94 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -39,6 +39,7 @@
 
 #include "sqlbison.hxx"
 #undef SQLyylex
+#undef SQLyyerror
 #endif
 #include "sqlscan.hxx"
 #include <osl/diagnose.h>
commit 989a7f41004d4d0d6ec0e235b0007a05091db6e5
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jul 10 19:42:40 2013 +0300

    Use the ApplicationServices framework for all OS X SDK versions
    
    Linking with CoreGraphics and CoreText works when building against the
    10.8 SDK, but fails at run-time.
    
    Change-Id: Ia7b9f383fc456638eada274f801bf757db600361

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 34c5ce0..6216d67 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -363,22 +363,9 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     $(vcl_coretext_code) \
 ))
 
-ifeq ($(MACOSX_SDK_VERSION),1070)
 $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
 	ApplicationServices \
 ))
-else
-ifeq ($(MACOSX_SDK_VERSION),1060)
-$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
-	ApplicationServices \
-))
-else
-$(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
-	CoreGraphics \
-	CoreText \
-))
-endif
-endif
 
 else # ATSUI

More information about the Libreoffice-commits mailing list