Author: hdu
Date: Tue Nov 12 08:30:14 2013
New Revision: 1540967
URL: http://svn.apache.org/r1540967
Log:
updated "rejuvenate01" branch to trunk as of 2013/11/11
Modified:
openoffice/branches/rejuvenate01/ (props changed)
openoffice/branches/rejuvenate01/main/configure.in
openoffice/branches/rejuvenate01/main/libxmlsec/makefile.mk
openoffice/branches/rejuvenate01/main/nss/makefile.mk
openoffice/branches/rejuvenate01/main/sal/inc/sal/main.h
openoffice/branches/rejuvenate01/main/sal/rtl/source/alloc_cache.c
openoffice/branches/rejuvenate01/main/svx/source/unodraw/unoshape.cxx
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/makefile.mk
Propchange: openoffice/branches/rejuvenate01/
------------------------------------------------------------------------------
Merged /openoffice/trunk:r1539673-1540966
Modified: openoffice/branches/rejuvenate01/main/configure.in
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/configure.in?rev=1540967&r1=1540966&r2=1540967&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/configure.in (original)
+++ openoffice/branches/rejuvenate01/main/configure.in Tue Nov 12 08:30:14 2013
@@ -322,7 +322,7 @@ AC_ARG_ENABLE(static-gtk,
AC_ARG_ENABLE(layout,
[ --enable-layout Enable the compilation and use of layout dialogs
],,)
-AC_ARG_ENABLE(nss_module,
+AC_ARG_ENABLE(nss-module,
[ --disable-nss-module Whether to use the NSS module that is used for
xml-security
],,enable_nss_module=yes)
AC_ARG_ENABLE(kde,
@@ -1379,7 +1379,7 @@ dnl ====================================
dnl Build options
dnl ===================================================================
-# Disable or enable libraries seamonkey, nss, hunspell, hyphen, saxon,
+# Disable or enable category-B librariets: nss, hunspell, hyphen, saxon,
# rhino, silgraphite, beanshell.
# Note that further below they may be enabled or disabled again by
@@ -1407,7 +1407,7 @@ if test "$enable_category_b" = "yes"; th
enable_coinmp="yes"
enable_category_b_fonts="yes"
- AC_MSG_RESULT([yes: allow modules, nss, hunspell, hyphen, saxon, rhino,
beanshell, graphite, coinmp to be built])
+ AC_MSG_RESULT([yes: allow modules nss, hunspell, hyphen, saxon, rhino,
beanshell, graphite, coinmp to be built])
else
# Disable libaries.
enable_nss_module="no"
@@ -1420,7 +1420,7 @@ else
enable_coinmp="no"
enable_category_b_fonts="no"
- AC_MSG_RESULT([no: disabled modules, nss, hunspell, hyphen, saxon, rhino,
beanshell, graphite, coinmp])
+ AC_MSG_RESULT([no: disabled modules nss, hunspell, hyphen, saxon, rhino,
beanshell, graphite, coinmp])
fi
AC_SUBST(ENABLE_CATEGORY_B)
@@ -4651,7 +4651,7 @@ fi
AC_SUBST(WITH_LDAP)
AC_SUBST(WITH_OPENLDAP)
-AC_MSG_CHECKING([whether to build provided NSS module])
+AC_MSG_CHECKING([whether to build the internal NSS module])
if test "$enable_nss_module" != "no"; then
ENABLE_NSS_MODULE="YES"
BUILD_TYPE="$BUILD_TYPE NSS"
@@ -4659,9 +4659,12 @@ if test "$enable_nss_module" != "no"; th
if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([for Mozilla build tooling])
if test -z "$MOZILLABUILD" ; then
-AC_MSG_ERROR([Mozilla build tooling not found. It is needed for NSS.
-Use the --with-mozilla-build option after installling the tools obtained
-from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32])
+AC_MSG_ERROR([
+Mozilla build tooling not found!
+ It is required for NSS that is needed for AOO's security facilities.
+ Either disable NSS using the option --disable-nss-module
+ or use the --with-mozilla-build option after installing the tool obtained
+ from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32])
else
if test \( "$WITH_MINGWIN" = "yes" \) ; then
if test ! -d "$MOZILLABUILD" ; then
Modified: openoffice/branches/rejuvenate01/main/libxmlsec/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/libxmlsec/makefile.mk?rev=1540967&r1=1540966&r2=1540967&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/libxmlsec/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/libxmlsec/makefile.mk Tue Nov 12
08:30:14 2013
@@ -31,9 +31,9 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
.INCLUDE : settings.mk
-.IF "$(WITH_MOZILLA)" == "NO"
+.IF "$(ENABLE_NSS_MODULE)" == "NO"
@all:
- @echo "Mozilla disabled -> no nss -> no libxmlsec...."
+ @echo "No nss -> no libxmlsec...."
.ENDIF
# --- Files --------------------------------------------------------
@@ -95,9 +95,9 @@ xmlsec_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no
--with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl
--build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)"
LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)"
LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no
--enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32
--host=i586-pc-mingw32 CC="$(xmlsec_CC)" LDFLAGS="-no-undefined -L$(ILIB:s/;/
-L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB)
OBJDUMP="$(WRAPCMD) objdump"
-.IF "$(SYSTEM_MOZILLA)" != "YES"
+.IF "$(SYSTEM_NSS)" != "YES"
CONFIGURE_FLAGS+=--enable-pkgconfig=no
.ENDIF
BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
@@ -148,7 +148,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)"
CPPFLAGS="$(xmlsec_CPPFLAGS)"
CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl
--with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
-# system-mozilla needs pkgconfig to get the information about nss
+# system-nss needs pkgconfig to get the information about nss
# FIXME: This also will enable pkg-config usage for libxml2. It *seems*
# that the internal headers still are used when they are there but....
# (and that pkg-config is allowed to fail...)
@@ -157,7 +157,7 @@ CONFIGURE_FLAGS=--with-pic --disable-sha
# --with-nss or parse -pkg-config --libs / cflags mozilla-nss since
# the lib may a) be in /usr/lib (Debian) and be not in $with_nss/include
# $with_nss/lib.
-.IF "$(SYSTEM_MOZILLA)" != "YES"
+.IF "$(SYSTEM_NSS)" != "YES"
CONFIGURE_FLAGS+=--enable-pkgconfig=no
.ENDIF
BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
Modified: openoffice/branches/rejuvenate01/main/nss/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/nss/makefile.mk?rev=1540967&r1=1540966&r2=1540967&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/nss/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/nss/makefile.mk Tue Nov 12 08:30:14
2013
@@ -88,7 +88,7 @@ BUILD_DIR=mozilla$/security$/nss
BUILD_ACTION= $(GNUMAKE) nss_build_all
#See #i105566# && moz#513024#
.IF "$(OS)"=="LINUX"
-BUILD_ACTION+=FREEBL_NO_DEPEND=1
+BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_LOWHASH=1
PATCH_FILES+=nss_linux.patch
.ENDIF
Modified: openoffice/branches/rejuvenate01/main/sal/inc/sal/main.h
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/inc/sal/main.h?rev=1540967&r1=1540966&r2=1540967&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sal/inc/sal/main.h (original)
+++ openoffice/branches/rejuvenate01/main/sal/inc/sal/main.h Tue Nov 12
08:30:14 2013
@@ -43,6 +43,8 @@ void SAL_CALL sal_detail_deinitialize();
#define INCL_LOADEXCEPTQ
#include <exceptq.h>
+#include <osl/process.h>
+
#define sal_detail_initialize(a,b) \
EXCEPTIONREGISTRATIONRECORD exRegRec = {0}; \
LoadExceptq(&exRegRec, NULL, NULL); \
Modified: openoffice/branches/rejuvenate01/main/sal/rtl/source/alloc_cache.c
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/rtl/source/alloc_cache.c?rev=1540967&r1=1540966&r2=1540967&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sal/rtl/source/alloc_cache.c
(original)
+++ openoffice/branches/rejuvenate01/main/sal/rtl/source/alloc_cache.c Tue Nov
12 08:30:14 2013
@@ -39,6 +39,10 @@
#ifdef OS2
#undef OSL_TRACE
#define OSL_TRACE 1 ? ((void)0) : _OSL_GLOBAL osl_trace
+
+#define INCL_DOS
+#include <os2.h>
+
#endif
/* ================================================================= *
@@ -55,9 +59,12 @@ struct rtl_cache_list_st
rtl_memory_lock_type m_lock;
rtl_cache_type m_cache_head;
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
pthread_t m_update_thread;
pthread_cond_t m_update_cond;
+#elif defined(SAL_OS2)
+ TID m_update_thread;
+ HEV m_update_cond;
#elif defined(SAL_W32)
HANDLE m_update_thread;
HANDLE m_update_cond;
@@ -1376,7 +1383,7 @@ rtl_cache_wsupdate_fini (void);
/* ================================================================= */
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
#include <sys/time.h>
@@ -1431,6 +1438,62 @@ rtl_cache_wsupdate_fini (void)
/* ================================================================= */
+#elif defined(SAL_OS2)
+
+static void
+rtl_cache_wsupdate_all (void * arg);
+
+static void rtl_cache_fini (void);
+
+static void
+rtl_cache_wsupdate_init (void)
+{
+ ULONG ulThreadId;
+ APIRET rc;
+
+ RTL_MEMORY_LOCK_ACQUIRE(&(g_cache_list.m_lock));
+ g_cache_list.m_update_done = 0;
+
+ // we use atexit() because this allows CRT exit to process handler
before
+ // threads are killed. Otherwise with __attribute__(destructor) this
+ // function is called when DosExit starts processing DLL destruction
+ // which happens after ALL threads have been killed...
+ atexit( rtl_cache_fini);
+
+ //g_cache_list.m_update_cond = CreateEvent (0, TRUE, FALSE, 0);
+ /* Warp3 FP29 or Warp4 FP4 or better required */
+ rc = DosCreateEventSem( NULL, &g_cache_list.m_update_cond, 0x0800, 0);
+
+ g_cache_list.m_update_thread = (ULONG) _beginthread(
rtl_cache_wsupdate_all, NULL,
+ 65*1024, (void*) 10);
+ RTL_MEMORY_LOCK_RELEASE(&(g_cache_list.m_lock));
+}
+
+static void
+rtl_cache_wsupdate_wait (unsigned int seconds)
+{
+ APIRET rc;
+ if (seconds > 0)
+ {
+ RTL_MEMORY_LOCK_RELEASE(&(g_cache_list.m_lock));
+ rc = DosWaitEventSem(g_cache_list.m_update_cond, seconds*1000);
+ RTL_MEMORY_LOCK_ACQUIRE(&(g_cache_list.m_lock));
+ }
+}
+
+static void
+rtl_cache_wsupdate_fini (void)
+{
+ APIRET rc;
+ RTL_MEMORY_LOCK_ACQUIRE(&(g_cache_list.m_lock));
+ g_cache_list.m_update_done = 1;
+ rc = DosPostEventSem(g_cache_list.m_update_cond);
+ RTL_MEMORY_LOCK_RELEASE(&(g_cache_list.m_lock));
+ rc = DosWaitThread(&g_cache_list.m_update_thread, DCWW_WAIT);
+}
+
+/* ================================================================= */
+
#elif defined(SAL_W32)
static DWORD WINAPI
@@ -1542,8 +1605,10 @@ rtl_cache_wsupdate (
/** rtl_cache_wsupdate_all()
*
*/
-#if defined(SAL_UNX) || defined(SAL_OS2)
+#if defined(SAL_UNX)
static void *
+#elif defined(SAL_OS2)
+static void
#elif defined(SAL_W32)
static DWORD WINAPI
#endif /* SAL_UNX || SAL_W32 */
@@ -1570,7 +1635,9 @@ rtl_cache_wsupdate_all (void * arg)
}
RTL_MEMORY_LOCK_RELEASE(&(g_cache_list.m_lock));
+#if !defined(SAL_OS2)
return (0);
+#endif
}
/* ================================================================= *
@@ -1699,7 +1766,7 @@ rtl_cache_init (void)
Delegated the call to "rtl_cache_fini()" into a dummy C++ object,
see alloc_fini.cxx .
*/
-#if defined(__GNUC__) && !defined(MACOSX)
+#if defined(__GNUC__) && !defined(MACOSX) && !defined(SAL_OS2)
static void rtl_cache_fini (void) __attribute__((destructor));
#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
#pragma fini(rtl_cache_fini)
Modified: openoffice/branches/rejuvenate01/main/svx/source/unodraw/unoshape.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/svx/source/unodraw/unoshape.cxx?rev=1540967&r1=1540966&r2=1540967&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/svx/source/unodraw/unoshape.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/svx/source/unodraw/unoshape.cxx Tue
Nov 12 08:30:14 2013
@@ -92,6 +92,7 @@
#include <editeng/outlobj.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <vector>
@@ -2403,12 +2404,26 @@ bool SvxShape::setPropertyValueImpl( con
}
break;
}
- case OWN_ATTR_EDGE_POLYPOLYGONBEZIER:
- {
- drawing::PolyPolygonBezierCoords
aPolyPoly;
- if ( rValue >>= aPolyPoly )
- {
- basegfx::B2DPolyPolygon
aNewPolyPolygon( SvxConvertPolyPolygonBezierToB2DPolyPolygon( &aPolyPoly ) );
+ case OWN_ATTR_EDGE_POLYPOLYGONBEZIER:
+ {
+ basegfx::B2DPolyPolygon aNewPolyPolygon;
+
+ // #123616# be a little bit more flexible regardin gthe
data type used
+ if( rValue.getValueType() == ::getCppuType(( const
drawing::PointSequenceSequence*)0))
+ {
+ // get polygpon data from PointSequenceSequence
+ aNewPolyPolygon =
basegfx::tools::UnoPointSequenceSequenceToB2DPolyPolygon(
+ *(const
drawing::PointSequenceSequence*)rValue.getValue());
+ }
+ else if( rValue.getValueType() == ::getCppuType(( const
drawing::PolyPolygonBezierCoords*)0))
+ {
+ // get polygpon data from PolyPolygonBezierCoords
+ aNewPolyPolygon =
basegfx::tools::UnoPolyPolygonBezierCoordsToB2DPolyPolygon(
+ *(const
drawing::PolyPolygonBezierCoords*)rValue.getValue());
+ }
+
+ if(aNewPolyPolygon.count())
+ {
// --> OD 2010-02-19 #i108851# - reintroduction of fix
for issue i59051
ForceMetricToItemPoolMetric( aNewPolyPolygon );
// <--
@@ -2419,9 +2434,9 @@ bool SvxShape::setPropertyValueImpl( con
}
pEdgeObj->SetEdgeTrackPath( aNewPolyPolygon );
return true;
- }
- }
- }
+ }
+ }
+ }
}
break;
}
Modified:
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/makefile.mk?rev=1540967&r1=1540966&r2=1540967&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/makefile.mk
(original)
+++
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/makefile.mk
Tue Nov 12 08:30:14 2013
@@ -42,14 +42,14 @@ CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
@echo "No nss -> no libxmlsec -> no xmlsecurity/nss"
.ENDIF
-.IF "$(SYSTEM_MOZILLA)" != "YES"
+.IF "$(SYSTEM_NSS)" != "YES"
MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
NSS_INC = $(MOZ_INC)$/nss
NSPR_INC = $(MOZ_INC)$/nspr
.ELSE
-# MOZ_INC already defined from environment
-NSS_INC = $(MOZ_NSS_CFLAGS)
-NSPR_INC = $(MOZ_INC)$/nspr
+# TODO: better use pkgconfig to find the proper system include path
+NSS_INC = /usr/include/nss3
+NSPR_INC = /usr/include/nspr4
.ENDIF
.IF "$(GUI)" == "WNT"
@@ -105,9 +105,8 @@ CDEFS += -DXMLSEC_NO_XSLT
# --- Files --------------------------------------------------------
SOLARINC += \
- -I$(MOZ_INC) \
--I$(NSPR_INC) \
--I$(PRJ)$/source$/xmlsec
+ -I$(NSPR_INC) \
+ -I$(PRJ)$/source$/xmlsec
SOLARINC += -I$(NSS_INC)
