Makefile.in | 2 +-
config_host.mk.in | 1 -
connectivity/inc/connectivity/CommonTools.hxx | 3 ++-
connectivity/inc/connectivity/FValue.hxx | 1 +
connectivity/source/commontools/CommonTools.cxx | 1 +
dbaccess/source/filter/xml/xmlfilter.cxx | 1 +
dbaccess/source/ui/dlg/ConnectionPage.cxx | 1 +
i18npool/source/textconversion/textconversion_ko.cxx | 4 +---
l10ntools/source/cfglex.l | 2 +-
l10ntools/source/srclex.l | 2 +-
l10ntools/source/xrmlex.l | 2 +-
solenv/gbuild/platform/com_GCC_defs.mk | 4 ++--
solenv/gbuild/platform/com_MSC_defs.mk | 4 ++--
13 files changed, 15 insertions(+), 13 deletions(-)
New commits:
commit cd235e389d6ea2c9d9c8b15722659d9c3d5bf0a3
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Mar 26 17:21:14 2013 +0100
No (more/apparent) need for LIBO_WERROR
Change-Id: I8483047631f512513cae017fdbb2dee77ce0f52f
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx
b/i18npool/source/textconversion/textconversion_ko.cxx
index f20a1e6..d9fe16c 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -137,7 +137,6 @@ TextConversion_ko::getCharConversions(const OUString&
aText, sal_Int32 nStartPos
const sal_uInt16* (*getHanja2HangulIndex)() = (const sal_uInt16* (*)())
getFunctionBySymbol("getHanja2HangulIndex");
const sal_Unicode* (*getHanja2HangulData)() = (const sal_Unicode* (*)())
getFunctionBySymbol("getHanja2HangulData");
#else
-#ifdef LIBO_WERROR
#pragma GCC diagnostic push
#ifdef __clang__
#pragma GCC diagnostic warning "-Wbool-conversions"
@@ -145,7 +144,6 @@ TextConversion_ko::getCharConversions(const OUString&
aText, sal_Int32 nStartPos
#pragma GCC diagnostic warning "-Waddress"
#endif
#endif
-#endif
if (toHanja && getHangul2HanjaIndex && getHangul2HanjaIndexCount &&
getHangul2HanjaData) {
ch = aText[nStartPos];
const Hangul_Index *Hangul_ko = getHangul2HanjaIndex();
@@ -192,7 +190,7 @@ TextConversion_ko::getCharConversions(const OUString&
aText, sal_Int32 nStartPos
}
delete[] newStr;
}
-#if defined(DISABLE_DYNLOADING) && defined(LIBO_WERROR)
+#if defined(DISABLE_DYNLOADING)
#pragma GCC diagnostic pop
#endif
return output;
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index d20b9f7..a695a2f 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -100,8 +100,8 @@ endif
endif
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -Werror -DLIBO_WERROR
-gb_CXXFLAGS_WERROR := -Werror -DLIBO_WERROR
+gb_CFLAGS_WERROR := -Werror
+gb_CXXFLAGS_WERROR := -Werror
endif
ifeq ($(MERGELIBS),TRUE)
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index 2466422..e8488ef 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -233,8 +233,8 @@ gb_STDLIBS := \
advapi32.lib \
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
-gb_CFLAGS_WERROR := -WX -DLIBO_WERROR
-gb_CXXFLAGS_WERROR := -WX -DLIBO_WERROR
+gb_CFLAGS_WERROR := -WX
+gb_CXXFLAGS_WERROR := -WX
endif
ifeq ($(MERGELIBS),TRUE)
commit 6ecf41eb2dcc4f15399cc8dc78547a517294781f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Mar 26 17:21:01 2013 +0100
Typo __SINPRO_CC -> __SUNPRO_CC
Change-Id: I831abe80f9b4b160f4af10a16f4d45cc68fa3bb6
diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index ea9e7b4..0ecb314 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -48,7 +48,7 @@
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
-#elif defined __SINPRO_CC
+#elif defined __SUNPRO_CC
#pragma disable_warn
#elif defined _MSC_VER
#pragma warning(push, 1)
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 6716b1b..2826dce 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -49,7 +49,7 @@
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
-#elif defined __SINPRO_CC
+#elif defined __SUNPRO_CC
#pragma disable_warn
#elif defined _MSC_VER
#pragma warning(push, 1)
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 7513edd..a2b5c0c 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -48,7 +48,7 @@
#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#endif
-#elif defined __SINPRO_CC
+#elif defined __SUNPRO_CC
#pragma disable_warn
#elif defined _MSC_VER
#pragma warning(push, 1)
commit d3f7d05d1b9bb29e168c49bda1e1a28734567993
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Mar 26 17:03:21 2013 +0100
Clean up OOO_SHELL
...which is no longer used. Also, use the detected BASH value in
Makefile.in
instead of re-detecting there. (Though setting SHELL in Makefile.in is
likely
bogus anyway, cf. "this is overridden by solenv/gbuild/gubild.mk [...] i
don't
know what needs the 'SHELL=bash' in top-level makefile",
<http://lists.freedesktop.org/archives/libreoffice/2013-March/048552.html>
"Re:
need help with shell / configure.")
Change-Id: I09c8b5eb9fb1244321d1fb998bb78e458e8ebf37
diff --git a/Makefile.in b/Makefile.in
index 626c726..79740bb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@ ifeq ($(MAKECMDGOALS),)
MAKECMDGOALS:=all
endif
-SHELL=/usr/bin/env bash
+SHELL=@BASH@
SRCDIR := @SRC_ROOT@
BUILDDIR := @BUILDDIR@
diff --git a/config_host.mk.in b/config_host.mk.in
index 354dc3a..5f0267f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -427,7 +427,6 @@ export OOOP_GALLERY_PACK=@OOOP_GALLERY_PACK@
export OOOP_SAMPLES_PACK=@OOOP_SAMPLES_PACK@
export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@
export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
-export OOO_SHELL=@BASH@
export OOO_VENDOR=@OOO_VENDOR@
export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@
export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
commit cec22e4510bb0a196717cf5a68a405c0c34ec295
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Mar 26 15:50:51 2013 +0100
Do not needlessly include jvmaccess/virtualmachine.hxx in header
Change-Id: Ieb1564eb7b477a7b239b07347f46fc55b64bd92b
diff --git a/connectivity/inc/connectivity/CommonTools.hxx
b/connectivity/inc/connectivity/CommonTools.hxx
index f562d67..fa7ab75 100644
--- a/connectivity/inc/connectivity/CommonTools.hxx
+++ b/connectivity/inc/connectivity/CommonTools.hxx
@@ -19,6 +19,7 @@
#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
#define _CONNECTIVITY_COMMONTOOLS_HXX_
+#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/uno/Any.hxx>
@@ -30,7 +31,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <osl/interlck.h>
-#include <jvmaccess/virtualmachine.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include "connectivity/dbtoolsdllapi.hxx"
@@ -40,6 +40,7 @@ namespace com { namespace sun { namespace star { namespace
util {
struct Time;
}
}}}
+namespace jvmaccess { class VirtualMachine; }
namespace connectivity
{
diff --git a/connectivity/inc/connectivity/FValue.hxx
b/connectivity/inc/connectivity/FValue.hxx
index 02b4a4b..b425fe0 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
@@ -23,6 +23,7 @@
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <rtl/ustring.hxx>
+#include <salhelper/simplereferenceobject.hxx>
#include <osl/diagnose.h>
#include <comphelper/stl_types.hxx>
#include <rtl/ref.hxx>
diff --git a/connectivity/source/commontools/CommonTools.cxx
b/connectivity/source/commontools/CommonTools.cxx
index 9181934..75015c7 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -31,6 +31,7 @@
#include "TConnection.hxx"
#include <comphelper/types.hxx>
#include <com/sun/star/java/JavaVirtualMachine.hpp>
+#include <jvmaccess/virtualmachine.hxx>
#include <rtl/process.h>
using namespace ::comphelper;
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx
b/dbaccess/source/filter/xml/xmlfilter.cxx
index c838f1b..2bb5679 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
+#include <jvmaccess/virtualmachine.hxx>
#include "xmlfilter.hxx"
#include "flt_reghelper.hxx"
#include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx
b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 8b982d9..688b089 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -22,6 +22,7 @@
#include "ConnectionPage.hrc"
#include "dbu_dlg.hrc"
#include "dsmeta.hxx"
+#include <jvmaccess/virtualmachine.hxx>
#include <svl/itemset.hxx>
#include <unotools/pathoptions.hxx>
#include <svl/stritem.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
