[Libreoffice-commits] core.git: external/mysqlcppconn mysqlc/source

2017-02-23 Thread Stephan Bergmann 
 external/mysqlcppconn/Library_mysqlcppconn.mk |9 -
 external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk |1 +
 external/mysqlcppconn/patches/dynexcspec.patch.0  |   15 +++
 mysqlc/source/mysqlc_general.hxx  |7 ---
 4 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit f89f9aa6adcc5af5adff7ba1c589734c73ed80ab
Author: Stephan Bergmann 
Date:   Thu Feb 23 12:20:49 2017 +0100

With GCC -std=gnu++17, dynamic exception specifications cause an error

...instead of a warning (as with Clang), so this follow-up to
e16644fa1c042b56a1301f0476d7ddb71c8765ea "external/mysqlcppconn: Silence
-Wdynamic-exception-spec errors" patches the (few) dynamic exception
specifications out of external/mysqlcppconn completely

Change-Id: I83a42f1c09e60c15fad1564cf7c42eb3370485da

diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk 
b/external/mysqlcppconn/Library_mysqlcppconn.mk
index 70599b0..e289482 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -58,15 +58,6 @@ $(eval $(call gb_Library_add_libs,mysqlcppconn,\
 ))
 endif
 
-# Avoid -Wdynamic-exception-spec errors in Clang C++17 mode:
-ifeq ($(COM_IS_CLANG),TRUE)
-$(eval $(call gb_Library_add_cxxflags,mysqlcppconn, \
-$(if $(filter -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z, \
-$(CXXFLAGS_CXX11)), \
--Wno-error=dynamic-exception-spec) \
-))
-endif
-
 $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
UnpackedTarball/mysqlcppconn/driver/mysql_art_resultset \
UnpackedTarball/mysqlcppconn/driver/mysql_art_rset_metadata \
diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk 
b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
index 65f0f83..82a3684 100644
--- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
external/mysqlcppconn/patches/warnings.patch.0 \
 external/mysqlcppconn/patches/enable-libmysql-proxy.patch \
+   external/mysqlcppconn/patches/dynexcspec.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/mysqlcppconn/patches/dynexcspec.patch.0 
b/external/mysqlcppconn/patches/dynexcspec.patch.0
new file mode 100644
index 000..ed7ac36
--- /dev/null
+++ b/external/mysqlcppconn/patches/dynexcspec.patch.0
@@ -0,0 +1,15 @@
+--- cppconn/exception.h
 cppconn/exception.h
+@@ -36,10 +36,10 @@
+ {
+ 
+ #define MEMORY_ALLOC_OPERATORS(Class) \
+-  void* operator new(size_t size) throw (std::bad_alloc) { return 
::operator new(size); }  \
++  void* operator new(size_t size) { return ::operator new(size); }  \
+   void* operator new(size_t, void*) throw(); \
+   void* operator new(size_t, const std::nothrow_t&) throw(); \
+-  void* operator new[](size_t) throw (std::bad_alloc); \
++  void* operator new[](size_t); \
+   void* operator new[](size_t, void*) throw(); \
+   void* operator new[](size_t, const std::nothrow_t&) throw(); \
+   void* operator new(size_t N, std::allocator&);
diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx
index d3e12ee..5d0b828 100644
--- a/mysqlc/source/mysqlc_general.hxx
+++ b/mysqlc/source/mysqlc_general.hxx
@@ -29,14 +29,7 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #endif
-#if defined __clang__ && __cplusplus > 201402L
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdynamic-exception-spec"
-#endif
 #include 
-#if defined __clang__ && __cplusplus > 201402L
-#pragma clang diagnostic pop
-#endif
 #if defined __GNUC__
 #pragma GCC diagnostic pop
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/mysqlcppconn mysqlc/source

2017-02-16 Thread Stephan Bergmann 
 external/mysqlcppconn/Library_mysqlcppconn.mk |9 +
 mysqlc/source/mysqlc_general.hxx  |7 +++
 2 files changed, 16 insertions(+)

New commits:
commit e16644fa1c042b56a1301f0476d7ddb71c8765ea
Author: Stephan Bergmann 
Date:   Thu Feb 16 18:11:24 2017 +0100

external/mysqlcppconn: Silence -Wdynamic-exception-spec errors

...with Clang in C++17 mode

Change-Id: If51c0788439688f6fbd77c1a05cb3295ac6e8cb4

diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk 
b/external/mysqlcppconn/Library_mysqlcppconn.mk
index e289482..70599b0 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -58,6 +58,15 @@ $(eval $(call gb_Library_add_libs,mysqlcppconn,\
 ))
 endif
 
+# Avoid -Wdynamic-exception-spec errors in Clang C++17 mode:
+ifeq ($(COM_IS_CLANG),TRUE)
+$(eval $(call gb_Library_add_cxxflags,mysqlcppconn, \
+$(if $(filter -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z, \
+$(CXXFLAGS_CXX11)), \
+-Wno-error=dynamic-exception-spec) \
+))
+endif
+
 $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
UnpackedTarball/mysqlcppconn/driver/mysql_art_resultset \
UnpackedTarball/mysqlcppconn/driver/mysql_art_rset_metadata \
diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx
index 5d0b828..d3e12ee 100644
--- a/mysqlc/source/mysqlc_general.hxx
+++ b/mysqlc/source/mysqlc_general.hxx
@@ -29,7 +29,14 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
 #endif
+#if defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdynamic-exception-spec"
+#endif
 #include 
+#if defined __clang__ && __cplusplus > 201402L
+#pragma clang diagnostic pop
+#endif
 #if defined __GNUC__
 #pragma GCC diagnostic pop
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/mysqlcppconn

2014-12-09 Thread Stephan Bergmann 
 external/mysqlcppconn/patches/cmake.patch |  363 --
 1 file changed, 363 deletions(-)

New commits:
commit efc0752802ea526a326447cc8827e66f8af00cad
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 9 16:45:02 2014 +0100

external/mysqlcppconn/patches/cmake.patch is dead

...since 4c232e49621065d6b12e087333f44a224f788d71 remove build dependency 
on
cmake for sqlconnector

Change-Id: I9ed77e7db6214e07e5671b07a0d878be1c34be6c

diff --git a/external/mysqlcppconn/patches/cmake.patch 
b/external/mysqlcppconn/patches/cmake.patch
deleted file mode 100644
index 79fe064..000
--- a/external/mysqlcppconn/patches/cmake.patch
+++ /dev/null
@@ -1,363 +0,0 @@
-diff --recursive -u UnpackedTarball/mysqlcppconn.origin/CMakeLists.txt 
UnpackedTarball/mysqlcppconn/CMakeLists.txt
 UnpackedTarball/mysqlcppconn.origin/CMakeLists.txt 2014-08-12 
08:44:13.262850586 +0200
-+++ UnpackedTarball/mysqlcppconn/CMakeLists.txt2014-08-12 
08:51:01.572088747 +0200
-@@ -61,282 +61,3 @@
- SET( LICENSE_FILENAME ${LICENSE_FILENAME}))
- ENDIF(WIN32)
- 
--#-
--# CPPFLAGS, CXXFLAGS and LDFLAGS from the environment
--SET(MYSQLCPPCONN_COMPILE_FLAGS_ENV $ENV{CPPFLAGS} ${MYSQL_CXXFLAGS} 
$ENV{CXXFLAGS})
--MESSAGE(STATUS Environment compile flags: ${MYSQLCPPCONN_COMPILE_FLAGS_ENV})
--
--SET(MYSQLCPPCONN_LINK_FLAGS_ENV $ENV{LDFLAGS})
--MESSAGE(STATUS Environment link flags: ${MYSQLCPPCONN_LINK_FLAGS_ENV})
--
--#-
--# ICU
--
--SET(MYSQLCPPCONN_ICU_ENABLE 0 CACHE BOOL development only: search icu 
although we do not make use of it yet.)
--
--IF(MYSQLCPPCONN_ICU_ENABLE)
--  SET(MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE)
--  SET(MYSQLCPPCONN_ICU_LIBRARY)
--  SET(MYSQLCPPCONN_ICU_INCLUDE)
--
--  FIND_PROGRAM (MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE icu-config)
--
--  IF (NOT MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE)
--  SET (MYSQLCPPCONN_ICU_FOUND FALSE)
--  MESSAGE(STATUS icu-config not found)
--  ELSE (NOT MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE)
--
--  EXEC_PROGRAM (${MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE} 
--ldflags-libsonly
--  OUTPUT_VARIABLE MYSQLCPPCONN_ICU_LIBRARY
--  RETURN_VALUE ERROR_CODE
--  )
--
--  EXEC_PROGRAM (${MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE} 
--cppflags-searchpath|sed s/^-I//
--  OUTPUT_VARIABLE MYSQLCPPCONN_ICU_INCLUDE
--  RETURN_VALUE ERROR_CODE
--  )
--
--  EXEC_PROGRAM (${MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE} 
--ldflags-searchpath|sed s/^-L//
--  OUTPUT_VARIABLE MYSQLCPPCONN_ICU_LDLIB
--  RETURN_VALUE ERROR_CODE
--  )
--
--  IF (MYSQLCPPCONN_ICU_LIBRARY)
--  SET (MYSQLCPPCONN_ICU_FOUND TRUE)
--  ENDIF (MYSQLCPPCONN_ICU_LIBRARY)
--
--  MESSAGE(STATUS ICU::CONFIG: 
${MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE})
--  MESSAGE(STATUS ICU::LIBRARY: ${MYSQLCPPCONN_ICU_LIBRARY})
--  MESSAGE(STATUS ICU::INCLUDE: ${MYSQLCPPCONN_ICU_INCLUDE})
--  MESSAGE(STATUS ICU::LDLIB: ${MYSQLCPPCONN_ICU_LDLIB})
--
--  INCLUDE_DIRECTORIES(${MYSQLCPPCONN_ICU_INCLUDE})
--  LINK_DIRECTORIES(${MYSQLCPPCONN_ICU_LDLIB})
--  ENDIF (NOT MYSQLCPPCONN_ICU_CONFIG_EXECUTABLE)
--ENDIF(MYSQLCPPCONN_ICU_ENABLE)
--#-
--
--#-
--# BOOST
--SET(ENV_BOOST $ENV{BOOST_ROOT})
--IF(NOT BOOST_ROOT AND ENV_BOOST)
--  SET(BOOST_ROOT ${ENV_BOOST})
--ENDIF(NOT BOOST_ROOT AND ENV_BOOST)
--
--IF(NOT BOOST_ROOT AND WIN32)
--SET(BOOST_ROOT C:/Program Files/Boost)
--ENDIF(NOT BOOST_ROOT AND WIN32)
--
--# Prefer static linking in all cases
--SET(Boost_ADDITIONAL_VERSIONS 1.37.0 1.37 1.38.0 1.38 1.39.0 1.39)
--SET(MYSQLCPPCONN_BOOST_COMPONENTS thread date_time)
--SET(Boost_USE_STATIC_LIBS TRUE)
--#FIND_PACKAGE(Boost COMPONENTS ${MYSQLCPPCONN_BOOST_COMPONENTS})
--FIND_PACKAGE(Boost)
--IF(NOT Boost_FOUND)
--  # Try dynamic
--  set(Boost_USE_STATIC_LIBS FALSE)
--  FIND_PACKAGE(Boost COMPONENTS ${MYSQLCPPCONN_BOOST_COMPONENTS})
--  IF(NOT Boost_FOUND)
--  MESSAGE(FATAL_ERROR Boost or some of its libraries found. If 
not in standard place please set -DBOOST_ROOT:STRING=)
--  ENDIF(NOT Boost_FOUND)
--ENDIF(NOT Boost_FOUND)
--
--SET(MYSQLCPPCONN_BOOST_INCLUDE_DIRS ${Boost_INCLUDE_DIRS})
--SET(MYSQLCPPCONN_BOOST_SYSTEM_LIBS ${Boost_SYSTEM_LIBRARY})
--SET(MYSQLCPPCONN_BOOST_THREAD_LIBS ${Boost_THREAD_LIBRARY})
--SET(MYSQLCPPCONN_BOOST_LIBRARY_DIRS ${Boost_LIBRARY_DIRS})
--
--INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
--MESSAGE(STATUS BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
--
--
--#-
--
--
--if(COMMAND cmake_policy)
--cmake_policy(SET CMP0003 NEW)
--endif(COMMAND cmake_policy)
--
--INCLUDE(CheckIncludeFiles)
--INCLUDE(CheckFunctionExists)
--INCLUDE(CheckTypeSize)
--
--

[Libreoffice-commits] core.git: external/mysqlcppconn

2014-09-05 Thread Norbert Thiebaud 
 external/mysqlcppconn/Library_mysqlcppconn.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 67034cb6689645cf8eed497444ea4b1ba7ca3848
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Fri Sep 5 12:52:56 2014 +0200

mariadb iconv dep apparently is only for Mac

Change-Id: Ic49fa8c62eb7ce01e4488bc32ef9167a9b77662d

diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk 
b/external/mysqlcppconn/Library_mysqlcppconn.mk
index 2d9b353..3a5da71 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -24,11 +24,13 @@ $(eval $(call gb_Library_add_libs,mysqlcppconn,\
 
 endif
 
+ifeq ($(OS),MACOSX)
 ifeq ($(SYSTEM_MARIADB),)
 $(eval $(call gb_Library_use_externals,mysqlcppconn,\
iconv \
 ))
 endif
+endif
 
 $(eval $(call gb_Library_set_warnings_not_errors,mysqlcppconn))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/mysqlcppconn

2014-08-12 Thread Lionel Elie Mamane 
 external/mysqlcppconn/Library_mysqlcppconn.mk |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 8994fac52888fb563751cb79aea88e2fde26263d
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Aug 12 10:03:47 2014 +0200

mysqlcppconn: do not force (partial) rebuild each time

Change-Id: I2eb014f143dda22011161e82fbf06fcba32ce3c6

diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk 
b/external/mysqlcppconn/Library_mysqlcppconn.mk
index 1e33370..1670de8 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -74,15 +74,13 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mysqlcppconn,\

UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_statement_wrapper \
 ))
 
-$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_metadata.o 
$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_driver.o: 
mysqlcppconn_configure
+$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_metadata.o 
$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_driver.o: 
$(WORKDIR)/UnpackedTarball/mysqlcppconn/driver/version_info.h
 
 ifeq ($(SYSTEM_BOOST),)
 MYSQLCPPCONN_BOOST:=-DBOOST_ROOT:STRING=$(call 
gb_UnpackedTarball_get_dir,boost)
 endif
 
-mysqlcppconn_configure: $(call gb_UnpackedTarball_get_target,mysqlcppconn) 
$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_util.o
+$(WORKDIR)/UnpackedTarball/mysqlcppconn/driver/version_info.h: $(call 
gb_UnpackedTarball_get_target,mysqlcppconn) 
$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_util.o
cd $(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn  cmake 
$(MYSQLCPPCONN_BOOST) ../../../UnpackedTarball/mysqlcppconn/
 
-.PHONY: mysqlcppconn_configure
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/mysqlcppconn

2014-08-11 Thread Lionel Elie Mamane 
 external/mysqlcppconn/Library_mysqlcppconn.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 213e1f9f85b5edb266607a29f5b02e36904d1070
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Aug 11 16:27:14 2014 +0200

fixup

Change-Id: I35996d4337421317ae1c6da2a4647b231782d882

diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk 
b/external/mysqlcppconn/Library_mysqlcppconn.mk
index 0bc28b6..3a6262f 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
@@ -77,7 +77,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mysqlcppconn,\
 $(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_metadata.o 
$(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn/driver/mysql_driver.o: 
mysqlcppconn_configure
 
 mysqlcppconn_configure: $(call gb_UnpackedTarball_get_target,mysqlcppconn)
-   cd ../../workdir/GenCxxObject/UnpackedTarball/mysqlcppconn  cmake 
../../../UnpackedTarball/mysqlcppconn/
+   cd $(WORKDIR)/GenCxxObject/UnpackedTarball/mysqlcppconn  cmake 
../../../UnpackedTarball/mysqlcppconn/
 
 .PHONY: mysqlcppconn_configure
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/mysqlcppconn

2014-03-26 Thread Julien Nabet 
 external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk |1 
 external/mysqlcppconn/patches/retrieve_grants.patch.1 |   31 --
 2 files changed, 32 deletions(-)

New commits:
commit b26f2645d30de5ef86eaeb91ef5346135cfe256d
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed Mar 26 18:59:33 2014 +0100

Resolves: fdo#76638 Patch retrieve_grants.patch.1 fails

Let's remove this since the future is MariaDB

Change-Id: I39641f81c59e7d024aaf48e8e3cc9fc9a7c3127c

diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk 
b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
index ddcb522..9c2282e 100644
--- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
@@ -18,7 +18,6 @@ $(eval $(call 
gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_
 $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
external/mysqlcppconn/patches/default_to_protocol_tcp.patch \
-   external/mysqlcppconn/patches/retrieve_grants.patch.1 \
external/mysqlcppconn/patches/warnings.patch.0 \
 ))
 
diff --git a/external/mysqlcppconn/patches/retrieve_grants.patch.1 
b/external/mysqlcppconn/patches/retrieve_grants.patch.1
deleted file mode 100644
index eb63cff..000
--- a/external/mysqlcppconn/patches/retrieve_grants.patch.1
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur mysqlcppconn.org/driver/mysql_metadata.cpp 
mysqlcppconn/driver/mysql_metadata.cpp
 mysqlcppconn.org/driver/mysql_metadata.cpp 2013-12-20 22:12:07.044698692 
+0100
-+++ mysqlcppconn/driver/mysql_metadata.cpp 2013-12-20 22:14:56.320394472 
+0100
-@@ -3633,12 +3633,14 @@
--  sql::SQLString strAllPrivs(ALTER, DELETE, DROP, INDEX, INSERT, LOCK 
TABLES, SELECT, UPDATE);
-+  sql::SQLString strAllPrivs(SELECT, INSERT, UPDATE, DELETE, CREATE, 
DROPT, GRANT, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER);
- 
-   sql::SQLString cQuote(getIdentifierQuoteString());
-+  size_t posIsGrantable = sql::SQLString::npos;
- 
-   while (rs-next() ) {
-   sql::SQLString aGrant = rs-getString(1);
-   aGrant = aGrant.replace(0, 6, );
- 
-   size_t pos = aGrant.find(ALL PRIVILEGES);
-+  posIsGrantable = aGrant.find(WITH GRANT OPTION);
- 
-   if (pos != sql::SQLString::npos) {
-   aGrant = aGrant.replace(pos, sizeof(ALL PRIVILEGES) - 
1, strAllPrivs);
-@@ -3737,7 +3739,10 @@
-   rs_data_row.push_back();  
// GRANTOR
-   
rs_data_row.push_back(getUserName());   // GRANTEE
-   
rs_data_row.push_back(privToken);   // PRIVILEGE
--  rs_data_row.push_back();  
// IS_GRANTABLE - ToDo maybe here WITH GRANT OPTION??
-+if (posIsGrantable != 
sql::SQLString::npos)
-+ 
rs_data_row.push_back(YES);
-+else
-+   rs_data_row.push_back(); 
// IS_GRANTABLE
- 
-   rs_data-push_back(rs_data_row);
-   }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits