[Libreoffice-commits] .: 2 commits - configure.in
configure.in |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit febdb8aeb7dbb07b7380808ce0cecfa7bb2b6101 Author: Tor Lillqvist t...@iki.fi Date: Fri Mar 30 09:39:07 2012 +0300 Use mktemp(1) more portably diff --git a/configure.in b/configure.in index dcfb3ec..face6c2 100644 --- a/configure.in +++ b/configure.in @@ -3654,7 +3654,7 @@ if test $_make_longver -ge 038200; then elif test $_make_longver -ge 038100; then AC_MSG_RESULT([$GNUMAKE $_make_version]) AC_MSG_CHECKING([for GNU make bug 20033]) -TESTGMAKEBUG20033=`mktemp -d` +TESTGMAKEBUG20033=`mktemp -d tmp.XX` cat $TESTGMAKEBUG20033/Makefile EOF A := \$(wildcard *.a) commit adf0076b56869d804fbdac774318e65ec0b28554 Author: Tor Lillqvist t...@iki.fi Date: Fri Mar 30 09:35:09 2012 +0300 Look for shasum (as on Mac OS X) too Hmm, /usr/bin/shasum is a Perl implementation (!), should we use openssl sha1 instead? diff --git a/configure.in b/configure.in index bed0180..dcfb3ec 100644 --- a/configure.in +++ b/configure.in @@ -3616,9 +3616,9 @@ AC_MSG_RESULT([no, obsolete]) dnl === dnl Search all the common names for sha1sum dnl === -AC_PATH_PROGS(SHA1SUM, sha1sum sha1) +AC_PATH_PROGS(SHA1SUM, sha1sum sha1 shasum) if test -z $SHA1SUM; then -AC_MSG_ERROR([install sha1sum to run this script]) +AC_MSG_ERROR([install the approproate SHA-1 checksumming program for this OS]) fi dnl === ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vigra/makefile.mk
vigra/makefile.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 8be1a00efb10c427cb05412250fe4442959f75a0 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Mar 30 09:08:13 2012 +0200 Updated patch comment diff --git a/vigra/makefile.mk b/vigra/makefile.mk index 7c1e57c..ff35173 100644 --- a/vigra/makefile.mk +++ b/vigra/makefile.mk @@ -59,9 +59,9 @@ PATCH_FILES += vigra1.4.0-unused-parameters.patch # the closing brace of the enum-specifier (see [dcl.enum] in the C++ 2003 # Standard), leading to comparison between enum1 and enum2 [-Werror=enum- # compare] and enumeral mismatch in conditional expression [-Werror] -# warnings (see https://mailhost.informatik.uni-hamburg.de/pipermail/vigra/ -# 2012-March/000956.html GCC 4.7 picky about sized_int.hxx (-Werror=enum- -# compare) about getting this upstreamed): +# warnings (included upstream as https://github.com/ukoethe/vigra/commit/ +# e0dcd31c76bb13c98920e21544b309ca47bb3c5c added explicit cast (gcc 4.7 +# compatibility patch by Stephan Bergmann)): PATCH_FILES += vigra1.4.0-enumwarn.patch CONFIGURE_DIR= ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/qa
sw/qa/extras/rtftok/data/fdo45394.rtf | 19 +++
sw/qa/extras/rtftok/rtftok.cxx| 22 ++
2 files changed, 41 insertions(+)
New commits:
commit 0827e813f9b5afcec393bad7894c4ec1954d88f1
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Mar 30 10:44:09 2012 +0200
testcase for fdo#45394
diff --git a/sw/qa/extras/rtftok/data/fdo45394.rtf
b/sw/qa/extras/rtftok/data/fdo45394.rtf
new file mode 100644
index 000..6d02f50
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo45394.rtf
@@ -0,0 +1,19 @@
+{\rtf1
+{\fonttbl
+{\f37\fswiss\fcharset204\fprq2
+Verdana;}
+}
+{\headerr
+\f37 \'cf\'ca \'d0\'c8\'ca\par
+}
+\trowd \cellx4498\cellx9104
+\pard\plain\intbl
+\cell \cell
+\row
+\trowd \cellx4498\cellx9104
+\pard\plain\intbl
+c\cell d\cell
+\row
+\pard\plain
+\par
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index 472e775..f13e15d 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -39,6 +39,7 @@
#include com/sun/star/text/XTextDocument.hpp
#include com/sun/star/text/XTextGraphicObjectsSupplier.hpp
#include com/sun/star/text/XTextFramesSupplier.hpp
+#include com/sun/star/text/XTextTablesSupplier.hpp
#include com/sun/star/text/XTextViewCursorSupplier.hpp
#include rtl/oustringostreaminserter.hxx
@@ -73,6 +74,7 @@ public:
void testFdo47326();
void testFdo47036();
void testFdo46955();
+void testFdo45394();
CPPUNIT_TEST_SUITE(RtfModelTest);
#if !defined(MACOSX) !defined(WNT)
@@ -90,6 +92,7 @@ public:
CPPUNIT_TEST(testFdo47326);
CPPUNIT_TEST(testFdo47036);
CPPUNIT_TEST(testFdo46955);
+CPPUNIT_TEST(testFdo45394);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -449,6 +452,25 @@ void RtfModelTest::testFdo46955()
}
}
+void RtfModelTest::testFdo45394()
+{
+load(OUString(RTL_CONSTASCII_USTRINGPARAM(fdo45394.rtf)));
+
+uno::Referencestyle::XStyleFamiliesSupplier
xStyleFamiliesSupplier(mxComponent, uno::UNO_QUERY);
+uno::Referencecontainer::XNameAccess
xStyles(xStyleFamiliesSupplier-getStyleFamilies(), uno::UNO_QUERY);
+uno::Referencecontainer::XNameAccess
xPageStyles(xStyles-getByName(PageStyles), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet
xPropertySet(xPageStyles-getByName(Default), uno::UNO_QUERY);
+uno::Referencetext::XText
xHeaderText(xPropertySet-getPropertyValue(HeaderText), uno::UNO_QUERY);
+OUString aActual = xHeaderText-getString();
+// Encoding in the header was wrong.
+OUString aExpected(ÐÐ Ð ÐÐ, 11, RTL_TEXTENCODING_UTF8);
+CPPUNIT_ASSERT_EQUAL(aExpected, aActual);
+
+uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xIndexAccess(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess-getCount());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(RtfModelTest);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source
chart2/source/view/main/ChartView.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0f1e33c54d02a20c476413ceebc99460a9cfef1f
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Mar 30 11:52:33 2012 +0300
WaE: format '%i' expects type 'int', but argument has type 'long int'
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 77fe6ab..fbc507d 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3044,12 +3044,12 @@ int closeCallback(void* )
void dumpPositionAsAttribute(const awt::Point rPoint, xmlTextWriterPtr
xmlWriter)
{
-xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST(position),
%i,%i, rPoint.X, rPoint.Y);
+xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST(position),
%li,%li, rPoint.X, rPoint.Y);
}
void dumpSizeAsAttribute(const awt::Size rSize, xmlTextWriterPtr xmlWriter)
{
-xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST(size), %ix%i,
rSize.Width, rSize.Height);
+xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST(size), %lix%li,
rSize.Width, rSize.Height);
}
void dumpShapeDescriptorAsAttribute( uno::Reference drawing::XShapeDescriptor
xDescr, xmlTextWriterPtr xmlWriter )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - berkeleydb/db-4.7.25.NC-mingw32hack.patch berkeleydb/makefile.mk bridges/source
berkeleydb/db-4.7.25.NC-mingw32hack.patch| 11 +
berkeleydb/makefile.mk |6
bridges/source/cpp_uno/mingw_intel/callvirtualmethod.cxx | 148 +++
bridges/source/cpp_uno/mingw_intel/callvirtualmethod.hxx | 49
bridges/source/cpp_uno/mingw_intel/makefile.mk |1
bridges/source/cpp_uno/mingw_intel/share.hxx |3
bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx | 117 ---
7 files changed, 220 insertions(+), 115 deletions(-)
New commits:
commit afde0ef9fe127393ab445cb6798ce718245734b4
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Mar 30 11:13:40 2012 +0200
MinGW: callVirtualMethod needs same treatment as on gcc3_linux_x86_64
...for reasons that are yet unclear to me.
diff --git a/bridges/source/cpp_uno/mingw_intel/callvirtualmethod.cxx
b/bridges/source/cpp_uno/mingw_intel/callvirtualmethod.cxx
new file mode 100644
index 000..b8c17fb
--- /dev/null
+++ b/bridges/source/cpp_uno/mingw_intel/callvirtualmethod.cxx
@@ -0,0 +1,148 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * http://www.openoffice.org/license.html
+ * for a copy of the LGPLv3 License.
+ *
+ /
+
+#include sal/config.h
+
+#include cppu/macros.hxx
+#include osl/diagnose.h
+#include sal/types.h
+#include typelib/typeclass.h
+#include typelib/typedescription.h
+
+#include callvirtualmethod.hxx
+#include share.hxx
+#include smallstruct.hxx
+
+// For some reason, callVirtualMethod needs to be in a source file of its own,
+// so that stack unwinding upon a thrown exception from within the asm block
+// call works, at least with GCC 4.7.0 and --enable-dbgutil.
+
+// The call instruction within the asm section of callVirtualMethod may throw
+// exceptions. So that the compiler handles this correctly, it is important
+// that (a) callVirtualMethod might call dummy_can_throw_anything (although
this
+// never happens at runtime), which in turn can throw exceptions, and (b)
+// callVirtualMethod is not inlined at its call site (so that any exceptions
are
+// caught which are thrown from the instruction calling callVirtualMethod).
[It
+// is unclear how much of this comment is still relevent -- see the above
+// comment.]
+void CPPU_CURRENT_NAMESPACE::callVirtualMethod(
+void * pAdjustedThisPtr, sal_Int32 nVtableIndex, void * pRegisterReturn,
+typelib_TypeDescription const * returnType, sal_Int32 * pStackLongs,
+sal_Int32 nStackLongs)
+{
+// parameter list is mixed list of * and values
+// reference parameters are pointers
+
+OSL_ENSURE( pStackLongs pAdjustedThisPtr, ### null ptr! );
+OSL_ENSURE( (sizeof(void *) == 4) (sizeof(sal_Int32) == 4), ###
unexpected size of int! );
+OSL_ENSURE( nStackLongs pStackLongs, ### no stack in callVirtualMethod
! );
+
+// never called
+if (! pAdjustedThisPtr)
CPPU_CURRENT_NAMESPACE::dummy_can_throw_anything(xxx); // address something
+
+volatile long edx = 0, eax = 0; // for register returns
+void * stackptr;
+asm volatile (
+mov %%esp, %6\n\t
+// copy values
+mov %0, %%eax\n\t
+mov %%eax, %%edx\n\t
+dec %%edx\n\t
+shl $2, %%edx\n\t
+add %1, %%edx\n
+Lcopy:\n\t
+pushl 0(%%edx)\n\t
+sub $4, %%edx\n\t
+dec %%eax\n\t
+jne Lcopy\n\t
+// do the actual call
+mov %2, %%edx\n\t
+mov 0(%%edx), %%edx\n\t
+mov %3, %%eax\n\t
+shl $2, %%eax\n\t
+add %%eax, %%edx\n\t
+mov 0(%%edx), %%edx\n\t
+call *%%edx\n\t
+// save return registers
+ mov %%eax, %4\n\t
+ mov %%edx, %5\n\t
+// cleanup stack
+mov %6, %%esp\n\t
+:
+: m(nStackLongs), m(pStackLongs), m(pAdjustedThisPtr),
+
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/filter-showIncludes.pl | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 3cf66a899ec1c8eed3a95b7f08824d5c8db0d0a8
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Mar 30 13:44:33 2012 +0200
filter-showIncludes.pl: Attempt to prevent creating incomplete .d files.
diff --git a/solenv/gbuild/filter-showIncludes.pl
b/solenv/gbuild/filter-showIncludes.pl
index ee9a34b..d7082a2 100755
--- a/solenv/gbuild/filter-showIncludes.pl
+++ b/solenv/gbuild/filter-showIncludes.pl
@@ -13,6 +13,10 @@
#
# Original author: Jan Holesovsky ke...@suse.cz
+use File::Basename;
+use File::Copy;
+use File::Temp qw/tempfile/;
+
my $outfile = $ARGV[0];
my $objfile = $ARGV[1];
my $srcfile = $ARGV[2];
@@ -25,8 +29,9 @@ if ( !defined( $showincludes_prefix ) || $showincludes_prefix
eq ) {
$showincludes_prefix = 'Note: including file:';
}
-open( OUT, $outfile ) or die Cannot open $outfile for writing.;
-print OUT $objfile: \\\n $srcfile;
+my ($OUT, $tmp_filename) = tempfile( 'showIncludesXX', DIR = dirname(
$outfile ) ) or die Cannot create a temp file.;
+
+print $OUT $objfile: \\\n $srcfile;
my %seen;
my $first_line = 1;
@@ -45,7 +50,7 @@ while ( STDIN ) {
if ( !defined $seen{$_} ) {
$seen{$_} = 1;
-print OUT \\\n $_;
+print $OUT \\\n $_;
}
}
else {
@@ -56,7 +61,7 @@ while ( STDIN ) {
$first_line = 0;
}
-print OUT \n;
+print $OUT \n;
# fdo#40099 if header.h does not exist, it will simply be considered out of
# date and any targets that use it as a prerequisite will be updated,
@@ -64,9 +69,11 @@ print OUT \n;
# as an include
# see http://www.makelinux.net/make3/make3-CHP-8-SECT-3
foreach my $key ( keys %seen ) {
- print OUT \n$key:\n;
+ print $OUT \n$key:\n;
}
-close( OUT ) or die Cannot close $outfile.;
+close( $OUT ) or die Cannot close $tmp_filename.;
+
+move( $tmp_filename, $outfile ) or die Cannot move $tmp_filename to
$outfile.;
# vim: shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes2' - Module_tail_build.mk sc/prj
Module_tail_build.mk |1 + sc/prj/build.lst |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit c2bf5b555624bb362307fa98266641afe0c67cea Author: Michael Meeks michael.me...@suse.com Date: Fri Mar 30 12:54:06 2012 +0100 tubes: couple tubes up to the build logic diff --git a/Module_tail_build.mk b/Module_tail_build.mk index dcbbdda..e56ea5c 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -82,6 +82,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ swext \ test \ toolkit \ +tubes \ ucb \ UnoControls \ unoxml \ diff --git a/sc/prj/build.lst b/sc/prj/build.lst index bf5e7d4..4168f67 100644 --- a/sc/prj/build.lst +++ b/sc/prj/build.lst @@ -1,2 +1,2 @@ -sc sc : basic filter TRANSLATIONS:translations vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml ure test xmloff desktop ucb package configmgr officecfg scripting chart2 eventattacher forms scaddins xmlsecurity NULL +sc sc : basic filter TRANSLATIONS:translations vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml ure test xmloff desktop ucb package configmgr officecfg scripting chart2 eventattacher forms scaddins xmlsecurity tubes NULL sc sc\prj nmake - all sc_prj NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - bridges/source
bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx |1
bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx |1
bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx|9 +++-
bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx | 21
+++---
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |2
5 files changed, 26 insertions(+), 8 deletions(-)
New commits:
commit 166be18da0686f2c445f521e3f1a83db8a3c3360
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Mar 30 14:01:23 2012 +0200
Missing includes
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx
index 901265d..57d0395 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx
@@ -30,6 +30,7 @@
#include cstring
+#include cppu/macros.hxx
#include sal/types.h
#include typelib/typeclass.h
#include typelib/typedescription.h
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx
index adc05ed..2a776b9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.hxx
@@ -31,6 +31,7 @@
#include sal/config.h
+#include cppu/macros.hxx
#include sal/types.h
#include typelib/typedescription.h
commit fa09866ccb5bc197ad3e1ec1a453d6fab20cd7df
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Mar 30 13:58:34 2012 +0200
Adapt cpp_uno/gcc3_linux_x86-64 to GCC 4.7 cxxabi.h
...the same way cpp_uno/mingw_intel was already adapted.
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index 08e681d..8373d14 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -30,7 +30,12 @@
#include stdio.h
#include string.h
#include dlfcn.h
+
#include cxxabi.h
+#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h
+#define _GLIBCXX_CDTOR_CALLABI
+#endif
+
#include boost/unordered_map.hpp
#include rtl/instance.hxx
@@ -213,7 +218,8 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription
*pTypeDescr ) SAL_THR
struct RTTISingleton: public rtl::Static RTTI, RTTISingleton {};
//--
-static void deleteException( void * pExc )
+extern C {
+static void _GLIBCXX_CDTOR_CALLABI deleteException( void * pExc )
{
__cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
typelib_TypeDescription * pTD = 0;
@@ -226,6 +232,7 @@ static void deleteException( void * pExc )
::typelib_typedescription_release( pTD );
}
}
+}
//==
void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
index b01ae9e..a02ccb2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
@@ -66,17 +66,26 @@ struct __cxa_exception
_Unwind_Exception unwindHeader;
};
-extern C void *__cxa_allocate_exception(
-std::size_t thrown_size ) throw();
-extern C void __cxa_throw (
-void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) )
__attribute__((noreturn));
-
struct __cxa_eh_globals
{
__cxa_exception *caughtExceptions;
unsigned int uncaughtExceptions;
};
-extern C __cxa_eh_globals *__cxa_get_globals () throw();
+
+}
+
+extern C CPPU_CURRENT_NAMESPACE::__cxa_eh_globals *__cxa_get_globals ()
throw();
+
+// The following are in cxxabi.h since GCC 4.7:
+#if __GNUC__ == 4 __GNUC_MINOR__ = 6
+extern C void *__cxa_allocate_exception(
+std::size_t thrown_size ) throw();
+extern C void __cxa_throw (
+void *thrown_exception, void *tinfo, void (*dest) (void *) )
__attribute__((noreturn));
+#endif
+
+namespace CPPU_CURRENT_NAMESPACE
+{
// -
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index a9abb5c..ff6fbdd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -300,7 +300,7 @@ static void cpp_call(
catch (...)
{
// fill uno exception
-fillUnoException(
CPPU_CURRENT_NAMESPACE::__cxa_get_globals()-caughtExceptions, *ppUnoExc,
pThis-getBridge()-getCpp2Uno() );
+fillUnoException( __cxa_get_globals()-caughtExceptions, *ppUnoExc,
pThis-getBridge()-getCpp2Uno() );
// temporary params
for ( ; nTempIndizes--; )
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/rtfattributeoutput.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8836b45de536a3a2fd72533c3210e439bc2fbca1
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Mar 30 14:18:40 2012 +0200
fdo#40735 RTF export: CJK text is typically not single-byte
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 7cdae5f..1eb0803 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2100,7 +2100,7 @@ void RtfAttributeOutput::CharFontCJK( const SvxFontItem
rFont )
{
SAL_INFO(sw.rtf, OSL_THIS_FUNC);
-m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HICH);
+m_aStyles.append(OOO_STRING_SVTOOLS_RTF_DBCH);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_AF);
m_aStyles.append((sal_Int32)m_rExport.maFontHelper.GetId(rFont));
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source editeng/inc editeng/source
desktop/source/app/appinit.cxx |1 -
desktop/source/app/officeipcthread.cxx |1 -
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx |3 ---
desktop/source/deployment/manager/dp_manager.cxx |1 -
editeng/inc/editeng/unotext.hxx |3 ---
editeng/source/editeng/editdoc.cxx |1 -
editeng/source/editeng/editview.cxx |3 ---
editeng/source/editeng/eerdll.cxx|2 --
editeng/source/editeng/impedit3.cxx |2 --
editeng/source/items/optitems.cxx|2 --
editeng/source/items/textitem.cxx|4
editeng/source/misc/svxacorr.cxx |1 -
editeng/source/misc/unolingu.cxx |2 --
editeng/source/outliner/outlvw.cxx |1 -
editeng/source/uno/unonrule.cxx |1 -
editeng/source/uno/unotext.cxx |1 -
16 files changed, 29 deletions(-)
New commits:
commit e60911f5fc6f76032942cd16c24a8f2673dae5d2
Author: Takeshi Abe t...@fixedpoint.jp
Date: Fri Mar 30 21:44:37 2012 +0900
removed duplicate includes in desktop / editeng
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index fe8618a..92da668 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -56,7 +56,6 @@
#include rtl/bootstrap.hxx
#include ucbhelper/configurationkeys.hxx
-#include cppuhelper/bootstrap.hxx
#include tools/rcid.h
#include rtl/logfile.hxx
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 4306a67..8ca6083 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -49,7 +49,6 @@
#include comphelper/processfactory.hxx
#include osl/file.hxx
#include rtl/process.h
-#include rtl/instance.hxx
#include tools/getprocessworkingdir.hxx
using namespace desktop;
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index fd6154e..8852e93 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -40,7 +40,6 @@
#include vcl/msgbox.hxx
#include vcl/svapp.hxx
#include osl/mutex.hxx
-#include vcl/dialog.hxx
#include cppuhelper/implbase3.hxx
#include com/sun/star/beans/PropertyValue.hpp
@@ -69,14 +68,12 @@
#include dp_gui.hrc
#include dp_gui_updateinstalldialog.hxx
#include dp_gui_shared.hxx
-#include dp_gui_updatedata.hxx
#include dp_ucb.h
#include dp_misc.h
#include dp_version.hxx
#include dp_gui_extensioncmdqueue.hxx
#include ucbhelper/content.hxx
#include osl/mutex.hxx
-#include osl/mutex.hxx
#include rtl/ref.hxx
#include salhelper/thread.hxx
#include com/sun/star/uno/Sequence.h
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 0ed519b..1a221c9 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -64,7 +64,6 @@
#include boost/bind.hpp
#include unotools/tempfile.hxx
-#include osl/file.hxx
#include vector
#include list
#include dp_descriptioninfoset.hxx
diff --git a/editeng/inc/editeng/unotext.hxx b/editeng/inc/editeng/unotext.hxx
index ace08dd..162a73a 100644
--- a/editeng/inc/editeng/unotext.hxx
+++ b/editeng/inc/editeng/unotext.hxx
@@ -54,7 +54,6 @@
#include com/sun/star/style/LineSpacing.hpp
#include com/sun/star/style/TabStop.hpp
#include com/sun/star/lang/XUnoTunnel.hpp
-#include com/sun/star/text/XTextRange.hpp
#include cppuhelper/implbase1.hxx
#include cppuhelper/implbase2.hxx
#include cppuhelper/implbase4.hxx
@@ -492,8 +491,6 @@ public:
//
-#include cppuhelper/implbase1.hxx
-
class SvxUnoTextContentEnumeration : public ::cppu::WeakAggImplHelper1
::com::sun::star::container::XEnumeration
{
private:
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 43c64c4..6b35b47 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -61,7 +61,6 @@
#include tools/stream.hxx
#include tools/debug.hxx
#include tools/shl.hxx
-#include vcl/svapp.hxx
#include com/sun/star/i18n/ScriptType.hpp
#include boost/bind.hpp
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index 36bafa0..c35591c 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -68,10 +68,7 @@
#include com/sun/star/beans/PropertyValues.hdl
#include com/sun/star/lang/Locale.hpp
#include linguistic/lngprops.hxx
-#include vcl/svapp.hxx
[Libreoffice-commits] .: 2 commits - filter/inc filter/qa filter/source i18npool/inc i18npool/source sdext/source sfx2/inc sfx2/source
filter/inc/filter/msfilter/escherex.hxx |1 - filter/qa/cppunit/filters-tga-test.cxx|1 - filter/qa/cppunit/filters-tiff-test.cxx |1 - filter/source/filtertracer/filtertracer.hxx |1 - filter/source/flash/swfexporter.cxx |1 - filter/source/graphicfilter/epict/epict.cxx |2 -- filter/source/graphicfilter/ieps/ieps.cxx |1 - filter/source/msfilter/powerpoint/pptcom.hxx |1 - filter/source/msfilter/svdfppt.cxx|1 - filter/source/svg/svgfilter.hxx |2 -- filter/source/svg/svgreader.cxx |1 - filter/source/svg/svgwriter.hxx |1 - filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx |1 - filter/source/xmlfilterdetect/filterdetect.cxx|1 - filter/source/xsltdialog/xmlfileview.hxx |1 - filter/source/xsltdialog/xmlfilterdialogcomponent.cxx |2 -- i18npool/inc/localedata.hxx |1 - i18npool/source/localedata/LocaleNode.hxx |2 -- sdext/source/minimizer/fileopendialog.cxx |1 - sdext/source/minimizer/impoptimizer.cxx |1 - sfx2/inc/sfx2/appuno.hxx |1 - sfx2/inc/sfx2/dinfdlg.hxx |1 - sfx2/inc/sfx2/doctdlg.hxx |1 - sfx2/inc/sfx2/mgetempl.hxx|1 - sfx2/inc/sfx2/objsh.hxx |1 - sfx2/inc/sfx2/printopt.hxx|1 - sfx2/inc/sfx2/sfxbasemodel.hxx|1 - sfx2/source/appl/app.cxx |2 -- sfx2/source/appl/appdata.cxx |1 - sfx2/source/appl/appdde.cxx |1 - sfx2/source/appl/appserv.cxx |2 -- sfx2/source/appl/appuno.cxx |1 - sfx2/source/appl/imestatuswindow.cxx |1 - sfx2/source/appl/newhelp.cxx |1 - sfx2/source/appl/shutdownicon.cxx |1 - sfx2/source/appl/shutdownicon.hxx |1 - sfx2/source/appl/workwin.cxx |2 -- sfx2/source/bastyp/fltfnc.cxx |3 --- sfx2/source/control/dispatch.cxx |3 --- sfx2/source/control/shell.cxx |1 - sfx2/source/dialog/dinfdlg.cxx|2 -- sfx2/source/dialog/recfloat.cxx |1 - sfx2/source/dialog/taskpane.cxx |1 - sfx2/source/dialog/templdlg.cxx |1 - sfx2/source/doc/docfile.cxx |2 -- sfx2/source/doc/doctemplates.cxx |1 - sfx2/source/doc/docvor.cxx|1 - sfx2/source/doc/guisaveas.cxx |1 - sfx2/source/doc/objstor.cxx |1 - sfx2/source/doc/objuno.cxx|1 - sfx2/source/doc/sfxbasemodel.cxx |2 -- sfx2/source/inc/eventsupplier.hxx |1 - sfx2/source/menu/mnuitem.cxx |1 - sfx2/source/statbar/stbitem.cxx |1 - sfx2/source/toolbox/tbxitem.cxx |4 sfx2/source/view/frame.cxx|1 - sfx2/source/view/ipclient.cxx |1 - sfx2/source/view/sfxbasecontroller.cxx|3 --- sfx2/source/view/viewfrm.cxx |3 --- sfx2/source/view/viewsh.cxx |3 --- 60 files changed, 83 deletions(-) New commits: commit f447ac9ec99e5db055056e2f89dab741f94fba0a Author: Takeshi Abe t...@fixedpoint.jp Date: Fri Mar 30 22:30:06 2012 +0900 removed duplicate includes in sfx2 diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx index 00e8129..40dfada 100644 --- a/sfx2/inc/sfx2/appuno.hxx +++ b/sfx2/inc/sfx2/appuno.hxx @@ -44,7 +44,6 @@ #include com/sun/star/frame/XDispatchResultListener.hpp #include com/sun/star/frame/DispatchDescriptor.hpp #include com/sun/star/frame/XDispatchInformationProvider.hpp -#include com/sun/star/lang/XMultiServiceFactory.hpp #include com/sun/star/uno/Any.h #include com/sun/star/uno/Reference.h diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx index 8e1dbee..47b071c 100644 --- a/sfx2/inc/sfx2/dinfdlg.hxx +++ b/sfx2/inc/sfx2/dinfdlg.hxx @@ -38,7 +38,6 @@ #include svl/stritem.hxx #include svtools/svmedit.hxx -#include vcl/edit.hxx #include vcl/lstbox.hxx #include vcl/scrbar.hxx #include svtools/headbar.hxx diff --git a/sfx2/inc/sfx2/doctdlg.hxx b/sfx2/inc/sfx2/doctdlg.hxx index 9d3261b..1d9160c 100644 ---
[Libreoffice-commits] .: sal/rtl
sal/rtl/source/strtmpl.cxx | 46 -
sal/rtl/source/ustring.cxx | 18 +
2 files changed, 51 insertions(+), 13 deletions(-)
New commits:
commit 81a4e4ba99b1534949e66bf81c723c2123fd47f0
Author: Michael Meeks michael.me...@suse.com
Date: Fri Mar 30 15:14:10 2012 +0100
sal: add a more permanant set of annotations for lifetime tracking.
Having done this on a temporary basis a couple of times before,
it'd be good to avoid having to do the instrumentation again.
diff --git a/sal/rtl/source/strtmpl.cxx b/sal/rtl/source/strtmpl.cxx
index 2d8c44b..026d647 100644
--- a/sal/rtl/source/strtmpl.cxx
+++ b/sal/rtl/source/strtmpl.cxx
@@ -49,6 +49,12 @@ inline void rtl_str_ImplCopy( IMPL_RTL_STRCODE* pDest,
}
*/
+// for instrumentation / diagnostics
+#ifndef RTL_LOG_STRING_NEW
+# define RTL_LOG_STRING_NEW(s)
+# define RTL_LOG_STRING_DELETE(s)
+#endif
+
#define rtl_str_ImplCopy( _pDest, _pSrc, _nCount ) \
{ \
IMPL_RTL_STRCODE* __mm_pDest = _pDest; \
@@ -1014,6 +1020,8 @@ static IMPL_RTL_STRCODE* IMPL_RTL_STRINGNAME( ImplNewCopy
)( IMPL_RTL_STRINGDATA
}
*ppThis = pData;
+
+RTL_LOG_STRING_NEW( pData );
return pDest;
}
@@ -1055,6 +1063,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( release )(
IMPL_RTL_STRINGDATA* pThis )
if ( pThis-refCount == 1 ||
!osl_decrementInterlockedCount( (pThis-refCount) ) )
{
+RTL_LOG_STRING_DELETE( pThis );
rtl_freeMemory( pThis );
}
}
@@ -1112,8 +1121,9 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromString )(
IMPL_RTL_STRINGDATA** ppThis
*ppThis = IMPL_RTL_STRINGNAME( ImplAlloc )( pStr-length );
OSL_ASSERT(*ppThis != NULL);
rtl_str_ImplCopy( (*ppThis)-buffer, pStr-buffer, pStr-length );
+RTL_LOG_STRING_NEW( *ppThis );
-/* must be done at least, if pStr == *ppThis */
+/* must be done last, if pStr == *ppThis */
if ( pOrg )
IMPL_RTL_STRINGNAME( release )( pOrg );
}
@@ -1156,7 +1166,9 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromStr )(
IMPL_RTL_STRINGDATA** ppThis,
}
while ( *pCharStr );
-/* must be done at least, if pCharStr == *ppThis */
+RTL_LOG_STRING_NEW( *ppThis );
+
+/* must be done last, if pCharStr == *ppThis */
if ( pOrg )
IMPL_RTL_STRINGNAME( release )( pOrg );
}
@@ -1181,7 +1193,9 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromStr_WithLength
)( IMPL_RTL_STRINGDATA*
OSL_ASSERT(*ppThis != NULL);
rtl_str_ImplCopy( (*ppThis)-buffer, pCharStr, nLen );
-/* must be done at least, if pCharStr == *ppThis */
+RTL_LOG_STRING_NEW( *ppThis );
+
+/* must be done last, if pCharStr == *ppThis */
if ( pOrg )
IMPL_RTL_STRINGNAME( release )( pOrg );
}
@@ -1220,6 +1234,8 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newFromLiteral)(
IMPL_RTL_STRINGDATA** ppThis
pCharStr++;
}
}
+
+RTL_LOG_STRING_NEW( *ppThis );
}
/* --- */
@@ -1280,9 +1296,11 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newConcat )(
IMPL_RTL_STRINGDATA** ppThis,
rtl_str_ImplCopy( pTempStr-buffer, pLeft-buffer, pLeft-length );
rtl_str_ImplCopy( pTempStr-buffer+pLeft-length, pRight-buffer,
pRight-length );
*ppThis = pTempStr;
+
+RTL_LOG_STRING_NEW( *ppThis );
}
-/* must be done at least, if left or right == *ppThis */
+/* must be done last, if left or right == *ppThis */
if ( pOrg )
IMPL_RTL_STRINGNAME( release )( pOrg );
}
@@ -1334,7 +1352,6 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newReplaceStrAt )(
IMPL_RTL_STRINGDATA** ppTh
return;
}
-{
IMPL_RTL_STRINGDATA*pOrg = *ppThis;
IMPL_RTL_STRCODE* pBuffer;
sal_Int32 nNewLen;
@@ -1360,10 +1377,10 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newReplaceStrAt )(
IMPL_RTL_STRINGDATA** ppTh
}
rtl_str_ImplCopy( pBuffer, pStr-buffer+nIndex+nCount,
pStr-length-nIndex-nCount );
-/* must be done at least, if pStr or pNewSubStr == *ppThis */
+RTL_LOG_STRING_NEW( *ppThis );
+/* must be done last, if pStr or pNewSubStr == *ppThis */
if ( pOrg )
IMPL_RTL_STRINGNAME( release )( pOrg );
-}
}
/* --- */
@@ -1421,7 +1438,8 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newReplace )(
IMPL_RTL_STRINGDATA** ppThis,
IMPL_RTL_AQUIRE( pStr );
}
-/* must be done at least, if pStr == *ppThis */
+RTL_LOG_STRING_NEW( *ppThis );
+/* must be done last, if pStr == *ppThis */
if ( pOrg )
IMPL_RTL_STRINGNAME( release )( pOrg );
}
@@ -1482,7 +1500,8 @@ void SAL_CALL IMPL_RTL_STRINGNAME( newToAsciiLowerCase )(
IMPL_RTL_STRINGDATA**
IMPL_RTL_AQUIRE( pStr );
}
-/* must be done at
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editattr.cxx | 10 --
editeng/source/editeng/editattr.hxx |4 +---
editeng/source/editeng/editdoc.cxx |2 +-
3 files changed, 2 insertions(+), 14 deletions(-)
New commits:
commit d52d301660df47527a69c12bca49bb4e0199b4f5
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Mar 30 16:36:01 2012 +0200
avoid sc crashes
Boost is reportedly 'expertly designed C++ library', so why do I
find the idea of a container containing pointers but exposing them
by value to be rather retarded? I don't know why exactly this
crashes, but I expect std::sort() either either does unwanted
copies that break things or the copies slice off inherited classes.
diff --git a/editeng/source/editeng/editattr.cxx
b/editeng/source/editeng/editattr.cxx
index 171eb36..2e79644 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -66,12 +66,6 @@ EditAttrib::EditAttrib( const SfxPoolItem rAttr )
pItem = rAttr;
}
-EditAttrib::EditAttrib(const EditAttrib r) :
-pItem(r.pItem)
-{
-DBG_CTOR( EE_EditAttrib, 0 );
-}
-
EditAttrib::~EditAttrib()
{
DBG_DTOR( EE_EditAttrib, 0 );
@@ -88,10 +82,6 @@ EditCharAttrib::EditCharAttrib( const SfxPoolItem rAttr,
sal_uInt16 nS, sal_uIn
DBG_ASSERT( ( rAttr.Which() EE_FEATURE_START ) || ( rAttr.Which()
EE_FEATURE_END ) || ( nE == (nS+1) ), EditCharAttrib CTOR: Invalid feature! );
}
-EditCharAttrib::EditCharAttrib(const EditCharAttrib r) :
-EditAttrib(r),
-nStart(r.nStart), nEnd(r.nEnd), bFeature(r.bFeature), bEdge(r.bEdge) {}
-
void EditCharAttrib::SetFont( SvxFont, OutputDevice* )
{
}
diff --git a/editeng/source/editeng/editattr.hxx
b/editeng/source/editeng/editattr.hxx
index 0ad35a2..5855e47 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -68,7 +68,7 @@ class SfxVoidItem;
// -
// class EditAttrib
// -
-class EditAttrib
+class EditAttrib : public boost::noncopyable
{
private:
EditAttrib();
@@ -77,7 +77,6 @@ protected:
const SfxPoolItem* pItem;
EditAttrib( const SfxPoolItem rAttr );
-EditAttrib(const EditAttrib r);
virtual ~EditAttrib();
public:
@@ -104,7 +103,6 @@ protected:
public:
EditCharAttrib( const SfxPoolItem rAttr, sal_uInt16 nStart, sal_uInt16
nEnd );
-EditCharAttrib(const EditCharAttrib r);
sal_uInt16 GetStart() { return nStart; }
sal_uInt16 GetEnd(){ return nEnd; }
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 6b35b47..86a709b 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2005,7 +2005,7 @@ void CharAttribList::InsertAttrib( EditCharAttrib*
pAttrib )
void CharAttribList::ResortAttribs()
{
-std::sort(aAttribs.begin(), aAttribs.end(), LessByStart());
+aAttribs.sort(LessByStart());
}
void CharAttribList::OptimizeRanges( SfxItemPool rItemPool )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bridges/source
bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx | 12
bridges/source/cpp_uno/mingw_intel/share.hxx | 12
2 files changed, 16 insertions(+), 8 deletions(-)
New commits:
commit a8e489495af7b0e74c3aca256e673fa6a34b9244
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Mar 30 16:32:53 2012 +0200
Hack around different __cxa_* declarations in different GCC versions
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
index a02ccb2..f84958b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
@@ -76,7 +76,14 @@ struct __cxa_eh_globals
extern C CPPU_CURRENT_NAMESPACE::__cxa_eh_globals *__cxa_get_globals ()
throw();
-// The following are in cxxabi.h since GCC 4.7:
+namespace CPPU_CURRENT_NAMESPACE
+{
+
+// The following are in cxxabi.h since GCC 4.7 (they are wrapped in
+// CPPU_CURRENT_NAMESPACE here as different GCC versions have slightly
different
+// declarations for them, e.g., with or without throw() specification, so would
+// complain about redeclarations of these somewhat implicitly declared
+// functions):
#if __GNUC__ == 4 __GNUC_MINOR__ = 6
extern C void *__cxa_allocate_exception(
std::size_t thrown_size ) throw();
@@ -84,9 +91,6 @@ extern C void __cxa_throw (
void *thrown_exception, void *tinfo, void (*dest) (void *) )
__attribute__((noreturn));
#endif
-namespace CPPU_CURRENT_NAMESPACE
-{
-
// -
//==
diff --git a/bridges/source/cpp_uno/mingw_intel/share.hxx
b/bridges/source/cpp_uno/mingw_intel/share.hxx
index e813f49..46252e4 100644
--- a/bridges/source/cpp_uno/mingw_intel/share.hxx
+++ b/bridges/source/cpp_uno/mingw_intel/share.hxx
@@ -81,7 +81,14 @@ struct __cxa_eh_globals
extern C CPPU_CURRENT_NAMESPACE::__cxa_eh_globals *__cxa_get_globals ()
throw();
-// The following are in cxxabi.h since GCC 4.7:
+namespace CPPU_CURRENT_NAMESPACE
+{
+
+// The following are in cxxabi.h since GCC 4.7 (they are wrapped in
+// CPPU_CURRENT_NAMESPACE here as different GCC versions have slightly
different
+// declarations for them, e.g., with or without throw() specification, so would
+// complain about redeclarations of these somewhat implicitly declared
+// functions):
#if __GNUC__ == 4 __GNUC_MINOR__ = 6
extern C void *__cxa_allocate_exception(
std::size_t thrown_size ) throw();
@@ -89,9 +96,6 @@ extern C void __cxa_throw (
void *thrown_exception, void *tinfo, void (*dest) (void *) )
__attribute__((noreturn));
#endif
-namespace CPPU_CURRENT_NAMESPACE
-{
-
// -
//==
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: berkeleydb/makefile.mk
berkeleydb/makefile.mk |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 8bc439333a970895b0f1dd5f353ac9f8c9031c56 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Mar 30 17:00:08 2012 +0200 Updated patch comment diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 6a5809a..6ee001d 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -64,7 +64,9 @@ PATCH_FILES += db-4.7.25.NC-mingw32hack.patch # which causes /usr/i686-w64-mingw32/sys-root/mingw/include/_mingw.h to not # define _USE_32BIT_TIME_T, so that berkeleydb uses a 64 bit time_t while # the rest of LibreOffice uses a 32 bit time_t, which causes problems as -# there is e.g. a member time_t timestamp of struct __db in db.h +# there is e.g. a member time_t timestamp of struct __db in db.h; see +# http://sourceforge.net/support/tracker.php?aid=3513251 _mingw.h: size +# of time_t depends on _FILE_OFFSET_BITS .ELSE PATCH_FILES=\ db-4.7.25.patch \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - editeng/source sal/inc sal/rtl svl/inc svl/source
editeng/source/editeng/editdoc.cxx | 12 ++--
sal/inc/rtl/string.hxx |2 +-
sal/inc/rtl/ustring.hxx| 29 +++--
sal/rtl/source/strtmpl.cxx |2 +-
svl/inc/svl/itempool.hxx |2 +-
svl/source/inc/poolio.hxx |4 ++--
svl/source/items/poolio.cxx|2 +-
7 files changed, 15 insertions(+), 38 deletions(-)
New commits:
commit fb5ede9e31dd2fee767d7e5438c8e3376e926daa
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Mar 30 17:27:59 2012 +0200
add const
diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx
index 15e88e9..12f7067 100644
--- a/svl/inc/svl/itempool.hxx
+++ b/svl/inc/svl/itempool.hxx
@@ -225,7 +225,7 @@ public:
voidSetVersionMap( sal_uInt16 nVer,
sal_uInt16 nOldStart,
sal_uInt16 nOldEnd,
- sal_uInt16 *pWhichIdTab );
+ const sal_uInt16
*pWhichIdTab );
sal_uInt16 GetNewWhich( sal_uInt16 nOldWhich ) const;
sal_uInt16 GetVersion() const;
voidSetFileFormatVersion( sal_uInt16
nFileFormatVersion );
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index d59792e..b334e05 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -39,10 +39,10 @@ struct SfxPoolVersion_Impl
{
sal_uInt16 _nVer;
sal_uInt16 _nStart, _nEnd;
-sal_uInt16* _pMap;
+const sal_uInt16* _pMap;
SfxPoolVersion_Impl( sal_uInt16 nVer, sal_uInt16 nStart,
sal_uInt16 nEnd,
- sal_uInt16 *pMap )
+ const sal_uInt16 *pMap )
: _nVer( nVer ),
_nStart( nStart ),
_nEnd( nEnd ),
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 92e1d7e..416a595 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -1267,7 +1267,7 @@ void SfxItemPool::SetVersionMap
sal_uInt16 nVer, /* neue Versionsnummer */
sal_uInt16 nOldStart, /* alte erste Which-Id */
sal_uInt16 nOldEnd,/* alte letzte Which-Id */
-sal_uInt16* pOldWhichIdTab /* Array mit genau dem Aufbau der
Which-Ids
+const sal_uInt16* pOldWhichIdTab /* Array mit genau dem Aufbau der
Which-Ids
der vorhergehenden Version, in denen
die jeweils neue Which-Id steht. */
)
commit 05322eb0ad1b1ff676e7f2e583d747079803e12a
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Mar 30 17:03:14 2012 +0200
const data
Especially given it's not namespaced (const is automatically static).
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 86a709b..51f0112 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -167,7 +167,7 @@ DBG_NAME( EE_EditLine );
DBG_NAME( EE_ContentNode );
DBG_NAME( EE_CharAttribList );
-SfxItemInfo aItemInfos[EDITITEMCOUNT] = {
+const SfxItemInfo aItemInfos[EDITITEMCOUNT] = {
{ SID_ATTR_FRAMEDIRECTION, SFX_ITEM_POOLABLE }, //
EE_PARA_WRITINGDIR
{ 0, SFX_ITEM_POOLABLE }, //
EE_PARA_XMLATTRIBS
{ SID_ATTR_PARA_HANGPUNCTUATION, SFX_ITEM_POOLABLE }, //
EE_PARA_HANGINGPUNCTUATION
@@ -222,23 +222,23 @@ SfxItemInfo aItemInfos[EDITITEMCOUNT] = {
{ SID_FIELD, SFX_ITEM_POOLABLE }
};
-sal_uInt16 aV1Map[] = {
+const sal_uInt16 aV1Map[] = {
3999, 4001, 4002, 4003, 4004, 4005, 4006,
4007, 4008, 4009, 4010, 4011, 4012, 4013, 4017, 4018, 4019 // MI: 4019?
};
-sal_uInt16 aV2Map[] = {
+const sal_uInt16 aV2Map[] = {
3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007, 4008, 4009,
4010, 4011, 4012, 4013, 4014, 4015, 4016, 4018, 4019, 4020
};
-sal_uInt16 aV3Map[] = {
+const sal_uInt16 aV3Map[] = {
3997, 3998, 3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007,
4009, 4010, 4011, 4012, 4013, 4014, 4015, 4016, 4017, 4018, 4019,
4020, 4021
};
-sal_uInt16 aV4Map[] = {
+const sal_uInt16 aV4Map[] = {
3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003,
4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013,
4014, 4015, 4016, 4017, 4018,
@@ -246,7 +246,7 @@ sal_uInt16 aV4Map[] = {
4034, 4035, 4036, 4037
};
-sal_uInt16 aV5Map[] = {
+const sal_uInt16 aV5Map[] = {
3994, 3995, 3996, 3997, 3998, 3999, 4000, 4001, 4002, 4003,
4004, 4005, 4006, 4007, 4008, 4009, 4010, 4011, 4012, 4013,
4014, 4015, 4016, 4017, 4018, 4019, 4020, 4021, 4022, 4023,
commit 1b9772c6edb124bbd28004e312957d7ac854dcbe
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdoc.cxx |9 -
editeng/source/editeng/editdoc.hxx |4
editeng/source/editeng/editdoc2.cxx |8
editeng/source/editeng/impedit2.cxx |7 ---
4 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit 46da0b6837bffa7d8a72624d2587159737e3d7e2
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Mar 30 23:32:21 2012 +0200
further sc/editeng unbreaking
this boost::ptr_vector idea is seriously broken
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 51f0112..c05e379 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1816,7 +1816,7 @@ void EditDoc::InsertAttrib( ContentNode* pNode,
sal_uInt16 nStart, sal_uInt16 nE
if ( pAttr )
{
// Remove attribute
-rAttrList.Remove(pAttr);
+rAttrList.Release(pAttr);
}
// check whether 'the same' attribute exist at this place.
@@ -2137,6 +2137,13 @@ void CharAttribList::Remove(size_t nPos)
aAttribs.erase(aAttribs.begin()+nPos);
}
+void CharAttribList::Release(const EditCharAttrib* p)
+{
+AttribsType::iterator it = std::find_if(aAttribs.begin(), aAttribs.end(),
FindByAddress(p));
+if (it != aAttribs.end())
+aAttribs.release(it).release();
+}
+
void CharAttribList::SetHasEmptyAttribs(bool b)
{
bHasEmptyAttribs = b;
diff --git a/editeng/source/editeng/editdoc.hxx
b/editeng/source/editeng/editdoc.hxx
index bf00c76..609e2bd 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -253,6 +253,7 @@ public:
void Remove(const EditCharAttrib* p);
void Remove(size_t nPos);
+void Release(const EditCharAttrib* p);
#if OSL_DEBUG_LEVEL 2
// Debug:
@@ -315,7 +316,10 @@ public:
ContentNode* operator[](size_t nPos);
void Insert(size_t nPos, ContentNode* p);
+/// deletes
void Remove(size_t nPos);
+/// does not delete
+void Release(size_t nPos);
size_t Count() const;
void Clear();
};
diff --git a/editeng/source/editeng/editdoc2.cxx
b/editeng/source/editeng/editdoc2.cxx
index b22c10b..fc65c9c 100644
--- a/editeng/source/editeng/editdoc2.cxx
+++ b/editeng/source/editeng/editdoc2.cxx
@@ -419,6 +419,14 @@ void ContentList::Remove(size_t nPos)
maContents.erase(maContents.begin() + nPos);
}
+void ContentList::Release(size_t nPos)
+{
+if (nPos = maContents.size())
+return;
+
+maContents.release(maContents.begin() + nPos).release();
+}
+
size_t ContentList::Count() const
{
return maContents.size();
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index a4654f0..9bab5db 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2192,7 +2192,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range
aOldPositions, sal_uInt16
{
// always aOldPositions.Min(), since Remove().
ParaPortion* pTmpPortion =
GetParaPortions().Release(aOldPositions.Min());
-aEditDoc.Remove( (sal_uInt16)aOldPositions.Min() );
+aEditDoc.Release( (sal_uInt16)aOldPositions.Min() );
aTmpPortionList.Append(pTmpPortion);
}
@@ -2237,7 +2237,8 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range
aOldPositions, sal_uInt16
if ( pRecalc4 )
CalcHeight( pRecalc4 );
-aTmpPortionList.Reset();
+while( aTmpPortionList.Count() 0 )
+aTmpPortionList.Release( aTmpPortionList.Count() - 1 );
#if OSL_DEBUG_LEVEL 2
GetParaPortions().DbgCheck(aEditDoc);
@@ -2484,7 +2485,7 @@ void ImpEditEngine::ImpRemoveParagraph( sal_uInt16 nPara )
aDeletedNodes.Insert( pInf, aDeletedNodes.Count() );
// The node is managed by the undo and possibly destroyed!
-aEditDoc.Remove( nPara );
+aEditDoc.Release( nPara );
GetParaPortions().Remove( nPara );
if ( IsCallParaInsertedOrDeleted() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
