[Libreoffice-commits] .: solenv/inc
solenv/inc/premac.h |6 ++ 1 file changed, 6 insertions(+) New commits: commit 6a8694d91e051412108601806cc5325b0641b5f2 Author: Tor Lillqvist t...@iki.fi Date: Thu Sep 20 08:51:33 2012 +0300 Add typedefs not in the 10.4 SDK Change-Id: I67f6c5392feda674b3d7d53b5dd20ec86e4f9023 diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h index b5fff62..5dc085c 100644 --- a/solenv/inc/premac.h +++ b/solenv/inc/premac.h @@ -56,4 +56,10 @@ typedef int NSColorRenderingIntent; #endif #endif +#if MACOSX_SDK_VERSION 1050 +typedef float CGFloat; +typedef int NSInteger; +typedef unsigned NSUInteger; +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: liborcus/liborcus_0.1.0-warnings.patch liborcus/UnpackedTarball_orcus.mk
liborcus/UnpackedTarball_orcus.mk |2 +-
liborcus/liborcus_0.1.0-warnings.patch | 14 ++
2 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit bed5557e8bdfe5c698a45a4cc82619a7c22de001
Author: Tor Lillqvist t...@iki.fi
Date: Thu Sep 20 09:05:57 2012 +0300
WaE: declaration of 'size' shadows a member of 'this'
Change-Id: Ie620d906184efcba0eb92cd8757a90a97d61ff87
diff --git a/liborcus/UnpackedTarball_orcus.mk
b/liborcus/UnpackedTarball_orcus.mk
index 030eebd..f6a054b 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_orcus.mk
@@ -14,7 +14,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,orcus,$(ORCUS_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0))
orcus_patches :=
-# -Werror,-Wunused-variable -Werror,-Wunused-private-field
+# -Werror=unused-variable -Werror=unused-private-field -Werror=shadow
orcus_patches += liborcus_0.1.0-warnings.patch
# make config.sub recognize arm-linux-androideabi
orcus_patches += liborcus_0.1.0-configure.patch
diff --git a/liborcus/liborcus_0.1.0-warnings.patch
b/liborcus/liborcus_0.1.0-warnings.patch
index 8ce6533..8eb98bb 100644
--- a/liborcus/liborcus_0.1.0-warnings.patch
+++ b/liborcus/liborcus_0.1.0-warnings.patch
@@ -60,3 +60,17 @@
}
else
{
+--- include/orcus/pstring.hpp
include/orcus/pstring.hpp
+@@ -82,8 +82,8 @@
+ };
+
+ pstring() : m_pos(NULL), m_size(0) {}
+-pstring(const char* pos) : m_pos(pos) { m_size = ::std::strlen(pos); }
+-pstring(const char* pos, size_t size) : m_pos(pos), m_size(size) {}
++pstring(const char* pos_) : m_pos(pos_) { m_size = ::std::strlen(pos_); }
++pstring(const char* pos_, size_t size_) : m_pos(pos_), m_size(size_) {}
+
+ ::std::string str() const { return ::std::string(m_pos, m_size); }
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/filter/inc/lotattr.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit acc7209c97469c6e4c7633f2a206f345139818e2
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Sep 10 10:08:30 2012 +0200
-Werror,-Wmismatched-tags
Change-Id: I69219a86b6530a7bac5f1726e980655bf5f0
(cherry picked from commit d3bc83f04314108cda530fb6663107a45a4a1cfc)
diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx
index 844da07..cc8971a 100644
--- a/sc/source/filter/inc/lotattr.hxx
+++ b/sc/source/filter/inc/lotattr.hxx
@@ -42,7 +42,7 @@ class ScPatternAttr;
class SvxColorItem;
class Color;
class LotAttrTable;
-class LOTUS_ROOT;
+struct LOTUS_ROOT;
namespace editeng { class SvxBorderLine; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: liborcus/liborcus_0.1.0-warnings.patch
liborcus/liborcus_0.1.0-warnings.patch | 16
1 file changed, 16 insertions(+)
New commits:
commit 21b5706f83edecad8cd3d0ab3ce5110b82e75a46
Author: Tor Lillqvist t...@iki.fi
Date: Thu Sep 20 09:29:21 2012 +0300
WaE: declaration of 'str' shadows a member of 'this'
Change-Id: Ibbbe331421434e15c4659b5c566dadecf441dff8
diff --git a/liborcus/liborcus_0.1.0-warnings.patch
b/liborcus/liborcus_0.1.0-warnings.patch
index 8eb98bb..8ddcdad 100644
--- a/liborcus/liborcus_0.1.0-warnings.patch
+++ b/liborcus/liborcus_0.1.0-warnings.patch
@@ -73,4 +73,20 @@
::std::string str() const { return ::std::string(m_pos, m_size); }
+@@ -110,11 +110,11 @@
+
+ bool operator (const pstring r) const;
+
+-bool operator== (const char* str) const;
++bool operator== (const char* str_) const;
+
+-bool operator!= (const char* str) const
++bool operator!= (const char* str_) const
+ {
+-return !operator==(str);
++return !operator==(str_);
+ }
+
+ pstring trim() const;
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/filter/oox/extlstcontext.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 973574cbd4d9ec39efff3961b8121e27890a56da Author: Michael Stahl mst...@redhat.com Date: Thu Jul 12 23:45:35 2012 +0200 ExtGlobalContext::onCreateContext: warning C4702: unreachable code Change-Id: Iccbf66d8838fcfa2f2c620dd768aba75f9e071f4 (cherry picked from commit d0e4215b653b0fab6718b06a5dc0e566170f538d) Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx index 6435128..740a841 100644 --- a/sc/source/filter/oox/extlstcontext.cxx +++ b/sc/source/filter/oox/extlstcontext.cxx @@ -180,8 +180,6 @@ ContextHandlerRef ExtGlobalContext::onCreateContext( sal_Int32 nElement, const A else return this; } - -return 0; } void ExtGlobalContext::onStartElement( const AttributeList rAttribs ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Options included in CC/CXX vs. in gb_CFLAGS/gb_CXXFLAGS
I think there is some fuzziness about what compiler options should be part of the CC/CXX variables and what should be in gb_CFLAGS/gb_CXXFLAGS. In some cases, like my Mac build tree that uses the 10.4 SDK, from Xcode 3 installed in /Xcode3, gb_CXXFLAGS contains at least one flag that apparently *must* be used for also external projects (well, liborcus in particular) to compile successfully. This is the -isysroot from solenv/gbuild/platform/macosx.mk. In different Mac build environments, this apparently is not the case, there the gcc from Xcode 3 (or 2 even) works fine for liborcus even if no -isysroot is used. These are perhaps older versions of the OS, and/or with Xcode 3 in a different location? In other cases (normal Linuxes?) gb_CXXFLAGS contains just optional flags that will in fact hurt an external project that isn't prepared for them, like -Werror. Should the -isysroot flag actually be part ot CC/CXX, not gb_CXXFLAGS? Should configure.in and macosx.mk be modified thusly? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: liborcus/liborcus_0.1.0-warnings.patch
liborcus/liborcus_0.1.0-warnings.patch | 15 +++ 1 file changed, 15 insertions(+) New commits: commit 7e871bbaf7b208dd884528259211385b8074da39 Author: Tor Lillqvist t...@iki.fi Date: Thu Sep 20 09:52:13 2012 +0300 WaE: declaration of 'content' shadows a member of 'this' Change-Id: I1cc06ac0608ef159eb3027bea614b2dade8b857c diff --git a/liborcus/liborcus_0.1.0-warnings.patch b/liborcus/liborcus_0.1.0-warnings.patch index 8ddcdad..9ba566c 100644 --- a/liborcus/liborcus_0.1.0-warnings.patch +++ b/liborcus/liborcus_0.1.0-warnings.patch @@ -90,3 +90,18 @@ pstring trim() const; +--- include/orcus/sax_parser.hpp include/orcus/sax_parser.hpp +@@ -159,9 +159,9 @@ + + templatetypename _Handler + sax_parser_Handler::sax_parser( +-const char* content, const size_t size, handler_type handler) : +-m_content(content), +-m_char(content), ++const char* content_, const size_t size, handler_type handler) : ++m_content(content_), ++m_char(content_), + m_size(size), + m_pos(0), + m_nest_level(0), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Options included in CC/CXX vs. in gb_CFLAGS/gb_CXXFLAGS
On 09/20/2012 08:48 AM, Tor Lillqvist wrote: I think there is some fuzziness about what compiler options should be part of the CC/CXX variables and what should be in gb_CFLAGS/gb_CXXFLAGS. In some cases, like my Mac build tree that uses the 10.4 SDK, from Xcode 3 installed in /Xcode3, gb_CXXFLAGS contains at least one flag that apparently *must* be used for also external projects (well, liborcus in particular) to compile successfully. This is the -isysroot from solenv/gbuild/platform/macosx.mk. [...] In other cases (normal Linuxes?) gb_CXXFLAGS contains just optional flags that will in fact hurt an external project that isn't prepared for them, like -Werror. Should the -isysroot flag actually be part ot CC/CXX, not gb_CXXFLAGS? Should configure.in and macosx.mk be modified thusly? I think there has traditionally not been much consistency in this area in OOo. Originally, I think this was exclusively handled via flags variables (and re-crafting similar such variables for passing to external projects, with values more or less similar to the primary OOo variables). Much cruft here also stems from the fact that Sun's internal OOo build environment required lots of overrides (as builds on arbitrary machines used a centralized toolchain instead of a local one), and this was typically achieved with ad-hoc fixes instead of a truly principled approach. That said, your rule of when to put something into CC/CXX vs. gb_CXXFLAGS etc. sounds good to me. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - configure.in liborcus/ExternalProject_liborcus.mk liborcus/liborcus_0.1.0-warnings.patch liborcus/UnpackedTarball_orcus.mk solenv/gbuild solenv/inc
configure.in | 12
liborcus/ExternalProject_liborcus.mk |2 -
liborcus/UnpackedTarball_orcus.mk |2 -
liborcus/liborcus_0.1.0-warnings.patch | 45 -
solenv/gbuild/platform/macosx.mk |2 -
solenv/inc/unxmacx.mk |2 -
6 files changed, 9 insertions(+), 56 deletions(-)
New commits:
commit 288d4bf31399f474aadcd16b9a800aade0741aa2
Author: Tor Lillqvist t...@iki.fi
Date: Thu Sep 20 10:37:10 2012 +0300
Move -isysroot from gb_CFLAGS/gb_CXXFLAGS to CC/CXX
That is a much better place for it. The gb_C(XX)FLAGS don't get passed
on to external modules, so they should not contain flags that are
essential for the compilation to work at all. I think.
At least for me, in my MacOSX SDK 10.4 -based build tree, using Xcode
3 installed in /Xcode3, on OS X 10.8, the -isysroot is essential for
liborcus to compile.
Change-Id: I1f11c690585e4ba512eb87d2fddf11872b91dd57
diff --git a/configure.in b/configure.in
index c719859..1010672 100644
--- a/configure.in
+++ b/configure.in
@@ -2740,19 +2740,19 @@ if test $_os = Darwin; then
AC_MSG_ERROR([Cannot guess gcc location for this SDK])
;;
esac
-CC=${gccprefix}gcc-4.0
-mmacosx-version-min=$with_macosx_version_min_required
-CXX=${gccprefix}g++-4.0
-mmacosx-version-min=$with_macosx_version_min_required
+CC=${gccprefix}gcc-4.0
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH
+CXX=${gccprefix}g++-4.0
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH
;;
10.6)
# Is similar logic as above needed? Is it likely somebody
# has both an older Xcode with the 10.6 SDK and a current
# Xcode?
-CC=gcc-4.2 $bitness
-mmacosx-version-min=$with_macosx_version_min_required
-CXX=g++-4.2 $bitness
-mmacosx-version-min=$with_macosx_version_min_required
+CC=gcc-4.2 $bitness
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH
+CXX=g++-4.2 $bitness
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH
;;
10.7|10.8)
-CC=`xcrun -find clang` $bitness
-mmacosx-version-min=$with_macosx_version_min_required
-CXX=`xcrun -find clang++` $bitness
-mmacosx-version-min=$with_macosx_version_min_required
+CC=`xcrun -find clang` $bitness
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH
+CXX=`xcrun -find clang++` $bitness
-mmacosx-version-min=$with_macosx_version_min_required -isysroot
$MACOSX_SDK_PATH
;;
esac
AC_MSG_RESULT([$CC and $CXX])
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 3d6810b..e81f0f5 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -49,7 +49,6 @@ gb_OSDEFS := \
gb_CFLAGS := \
- -isysroot $(gb_SDKDIR) \
$(gb_CFLAGS_COMMON) \
-fPIC \
-fno-strict-aliasing \
@@ -59,7 +58,6 @@ gb_CFLAGS := \
# Re: [dev] warnings01: -Wnon-virtual-dtor message to d...@openoffice.org
from
# Feb 1, 2006:
gb_CXXFLAGS := \
- -isysroot $(gb_SDKDIR) \
$(gb_CXXFLAGS_COMMON) \
-fPIC \
-Wno-ctor-dtor-privacy \
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index a5ea287..0a58f4c 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -49,7 +49,7 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT
-DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFI
#.EXPORT: MACOSX_DEPLOYMENT_TARGET
CDEFS+:=-DQUARTZ
-EXTRA_CDEFS+:=-isysroot $(MACOSX_SDK_PATH)
-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED)
-DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED)
-DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION)
+EXTRA_CDEFS+:=-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED)
-DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED)
-DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION)
# Name of library where static data members are initialized
# STATICLIBNAME=static$(DLLPOSTFIX)
commit 90fc5593a44f41489719bc882db21813416f80da
Author: Tor Lillqvist t...@iki.fi
Date: Thu Sep 20 10:25:01 2012 +0300
Revert Pass also gb_CXXFLAGS to the liborcus configury
Causes way too much problems with the tinderboxes, thanks to -Werror
getting passed to the liborcus configury, and liborcus apparently is
quite -Werror-unclean.
Thus also revert the initial fixes for those WaEs. (Many more would be
needed, it seems. I rather leave it to Kohei to make upstream liborcus
warning-free.
This reverts commit 083fa89dd8f894f9cd0ef217a900fab777db9f2a.
This reverts commit 7e871bbaf7b208dd884528259211385b8074da39.
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - pyuno/source
pyuno/source/module/pyuno_runtime.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit ed39debbc379628ce74b096f7b7b179ab826551b Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jul 20 10:32:47 2012 +0200 warning C4702: unreachable code (cherry picked from commit 618376bcb55906913bc76365d7db9b71eb422daa) Conflicts: pyuno/source/module/pyuno_runtime.cxx Change-Id: Ie2cc83dde7e0522e0bf669a1dd3d7a8ca680f7e2 diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 56ee7fa..0cf2998 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -598,9 +598,6 @@ PyRef Runtime::any2PyObject (const Any a ) const throw RuntimeException(buf.makeStringAndClear( ), Reference XInterface () ); } } -//We shouldn't be here... -Py_INCREF( Py_None ); -return Py_None; } static Sequence Type invokeGetTypes( const Runtime r , PyObject * o ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6] acclerate large OLE2 file reading ...
Marking as pushed. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
preventing gerrit changes from being merged
Hi, recently some gerrit changes were accidentally merged into master through gerrit UI. While there are ways to prevent it, like voting -2 for a change or prefixing the commit message with work in progress, please don't merge or something like that, I want to share with you the gerrit way to achieve that: draft queue feature. Default queue in gerrit is publish queue. All changes are submitted to it per default. Recently draft queue was introduced in gerrit. If you submit a change to draft queue it cannot be merged. That change must be first promoted to publish queue. To use draft queue, all you need is to pass -D switch to git-review: git-review -D If you don't use git-review, you can specify the draft queue on command line: git push logerrit master:refs/draft/master (or whatever branch you need). When you are ready you can promote your change to publish queue with UI or with command line: ssh logerrit gerrit review --publish COMMIT | CHANGEID See https://gerrit.libreoffice.org/Documentation/cmd-review.html for more details. Ciao David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - solenv/inc
solenv/inc/wntmsc.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6779927cfcfbd386c8d9129ac49385cd54af6739 Author: Michael Stahl mst...@redhat.com Date: Fri Jul 13 16:10:02 2012 +0200 wntmsc.mk: disable warnings-as-errors for binfilter Change-Id: If5ac0aa620d514ca4affe2b20d647a9e9129032e (cherry picked from commit 158a7c73bb0a701b12fc3e2e96eff965c73435cc) Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk index afafe38..ec84e98 100644 --- a/solenv/inc/wntmsc.mk +++ b/solenv/inc/wntmsc.mk @@ -195,7 +195,7 @@ CFLAGSWERRCC=-WX -DLIBO_WERROR # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := +MODULES_WITH_WARNINGS := binfilter CDEFS+=-DWIN32 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500 .IF $(COMEX) == 11 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Dialogs - Why so Inconsistent
On Wed, Sep 19, 2012 at 10:10:04AM -0700, Joel Madero jmadero@gmail.com wrote: Even simple things like position are handled different, some define columns as COL and then use those in the src file while others directly put in positions (X,Y). My questions are: 1. Is this okay? 2. Is this efficient? 3. Out of the dialogs, which has the best methodology and then maybe I'l slowly start cleaning the others to be similar to the best one The best is what Caolán does in the feature/cmclayouttrans branch to get rid of the src format for dialog definitions. If you want to help, I'm sure you can join the effort there. :-) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] i18npool Add locale data for ebo_CG and tyx_CG
Hi Jeremy, On Wed, Sep 19, 2012 at 10:30:52PM +0100, Jeremy Brown jeremy.r.br...@gmail.com wrote: This is my first patch submission to LibreOffice or anywhere else so let me know if there's something I haven't done right or should do differently. Thanks. All you need is to submit a license mail what we can link from http://wiki.documentfoundation.org/Development/Developers, stating: All my contributions, past and future, to LibreOffice are licensed under the terms of the MPL / LGPLv3+. + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the License); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . Is this really based on work from the ASF or you only copied the wrong license header? See TEMPLATE.SOURCECODE.HEADER in the root directory on what header to use when the new file is based only on your own work. diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk index 5ba2dc8..b35dd20 100644 --- a/solenv/inc/langlist.mk +++ b/solenv/inc/langlist.mk @@ -47,6 +47,7 @@ da \ de \ dgo \ dz \ +ebo \ el \ en-GB \ en-US \ @@ -127,6 +128,7 @@ tn \ tr \ ts \ tt \ +tyx \ ug \ uk \ uz \ Hmm, all languages in langlist.mk have a relevant English description in scp2/source/ooo/module_langpack.ulf. Is it intentional that you left out the descriptions for these two languages? Thanks, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: avmedia/source
avmedia/source/quicktime/manager.hxx |8
avmedia/source/quicktime/manager.mm |2 +-
avmedia/source/quicktime/player.hxx | 10 +-
avmedia/source/quicktime/player.mm |2 +-
avmedia/source/quicktime/quicktimeuno.mm |2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 37d21245b5f03fd261c681951f1d819a0bc4423a
Author: Ricardo Montania rica...@linuxafundo.com.br
Date: Tue Sep 18 13:10:32 2012 -0300
Some OUString cleanup and ::rtl::OUString to OUString in avmedia
Change-Id: If79fffec7388e73fd85f5279e773af363c5f97e3
Reviewed-on: https://gerrit.libreoffice.org/645
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/avmedia/source/quicktime/manager.hxx
b/avmedia/source/quicktime/manager.hxx
index adab01f..ecd344c 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -48,12 +48,12 @@ public:
~Manager();
// XManager
-virtual ::com::sun::star::uno::Reference ::com::sun::star::media::XPlayer
SAL_CALL createPlayer( const ::rtl::OUString aURL ) throw
(::com::sun::star::uno::RuntimeException);
+virtual ::com::sun::star::uno::Reference ::com::sun::star::media::XPlayer
SAL_CALL createPlayer( const OUString aURL ) throw
(::com::sun::star::uno::RuntimeException);
// XServiceInfo
-virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw
(::com::sun::star::uno::RuntimeException);
-virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-virtual ::com::sun::star::uno::Sequence ::rtl::OUString SAL_CALL
getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+virtual OUString SAL_CALL getImplementationName( ) throw
(::com::sun::star::uno::RuntimeException);
+virtual sal_Bool SAL_CALL supportsService( const OUString ServiceName )
throw (::com::sun::star::uno::RuntimeException);
+virtual ::com::sun::star::uno::Sequence OUString SAL_CALL
getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
private:
::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory mxMgr;
diff --git a/avmedia/source/quicktime/manager.mm
b/avmedia/source/quicktime/manager.mm
index ca8da8e..ec36906 100644
--- a/avmedia/source/quicktime/manager.mm
+++ b/avmedia/source/quicktime/manager.mm
@@ -88,7 +88,7 @@ uno::Sequence ::rtl::OUString SAL_CALL
Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
uno::Sequence ::rtl::OUString aRet(1);
-aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM (
AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) );
+aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) );
return aRet;
}
diff --git a/avmedia/source/quicktime/player.hxx
b/avmedia/source/quicktime/player.hxx
index 9bffa99..8bd8a77 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -50,7 +50,7 @@ public:
Player( const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory rxMgr );
~Player();
-bool create( const ::rtl::OUString rURL );
+bool create( const OUString rURL );
// XPlayer
virtual void SAL_CALL start( ) throw
(::com::sun::star::uno::RuntimeException);
@@ -70,16 +70,16 @@ public:
virtual ::com::sun::star::uno::Reference
::com::sun::star::media::XPlayerWindow SAL_CALL createPlayerWindow( const
::com::sun::star::uno::Sequence ::com::sun::star::uno::Any aArguments )
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference
::com::sun::star::media::XFrameGrabber SAL_CALL createFrameGrabber( ) throw
(::com::sun::star::uno::RuntimeException);
// XServiceInfo
-virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw
(::com::sun::star::uno::RuntimeException);
-virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString
ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-virtual ::com::sun::star::uno::Sequence ::rtl::OUString SAL_CALL
getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+virtual OUString SAL_CALL getImplementationName( ) throw
(::com::sun::star::uno::RuntimeException);
+virtual sal_Bool SAL_CALL supportsService( const OUString ServiceName )
throw (::com::sun::star::uno::RuntimeException);
+virtual ::com::sun::star::uno::Sequence OUString SAL_CALL
getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
QTMovie* getMovie();
private:
::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory mxMgr;
-::rtl::OUString maURL;
+OUStringmaURL;
QTMovie *mpMovie; // the Movie object
diff --git
Re: [PATCH] i18npool Add locale data for ebo_CG and tyx_CG
2012/9/20 Miklos Vajna vmik...@suse.cz: Hi Jeremy, On Wed, Sep 19, 2012 at 10:30:52PM +0100, Jeremy Brown wrote: This is my first patch submission to LibreOffice or anywhere else so let me know if there's something I haven't done right or should do differently. Thanks. All you need is to submit a license mail what we can link from http://wiki.documentfoundation.org/Development/Developers, stating: All my contributions, past and future, to LibreOffice are licensed under the terms of the MPL / LGPLv3+. + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the License); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . Is this really based on work from the ASF or you only copied the wrong license header? See TEMPLATE.SOURCECODE.HEADER in the root directory on what header to use when the new file is based only on your own work. diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk index 5ba2dc8..b35dd20 100644 --- a/solenv/inc/langlist.mk +++ b/solenv/inc/langlist.mk @@ -47,6 +47,7 @@ da \ de \ dgo \ dz \ +ebo \ el \ en-GB \ en-US \ @@ -127,6 +128,7 @@ tn \ tr \ ts \ tt \ +tyx \ ug \ uk \ uz \ Hmm, all languages in langlist.mk have a relevant English description in scp2/source/ooo/module_langpack.ulf. Is it intentional that you left out the descriptions for these two languages? Please don't patch langlist.mk unless you want to provide UI (and help) localization in these languages. Thanks, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Some OUString cleanup and ::rtl::OUString to OUString in avm...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/645 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/645 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If79fffec7388e73fd85f5279e773af363c5f97e3 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Ricardo Montania rica...@linuxafundo.com.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx | 63 ++---
1 file changed, 47 insertions(+), 16 deletions(-)
New commits:
commit cf480d6c37e8c58972ee8a3e3ce04747f3ae0b5e
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Sep 20 09:54:29 2012 +0200
Move the DBusGObjectPath typedef and formatting changes to Bluetooth
includes.
Change-Id: I7c1338ef2dae7831cddda8378a031a58011d7b17
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 69841c8..56fd471 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -12,17 +12,19 @@
#include sal/log.hxx
#if (defined(LINUX) !defined(__FreeBSD_kernel__)) defined(ENABLE_DBUS)
-#include glib.h
-#include dbus/dbus-glib.h
-#include sys/unistd.h
-#include sys/socket.h
-#include bluetooth/bluetooth.h
-#include bluetooth/rfcomm.h
-#define DBUS_TYPE_G_STRING_ANY_HASHTABLE (dbus_g_type_get_map( GHashTable,
G_TYPE_STRING, G_TYPE_VALUE ))
-
-#ifndef G_VALUE_INIT
- #define G_VALUE_INIT {0,{{0}}} // G_VALUE_INIT only present in glib = 2.30
-#endif
+ #include glib.h
+ #include dbus/dbus-glib.h
+ #include sys/unistd.h
+ #include sys/socket.h
+ #include bluetooth/bluetooth.h
+ #include bluetooth/rfcomm.h
+ #define DBUS_TYPE_G_STRING_ANY_HASHTABLE (dbus_g_type_get_map( GHashTable,
G_TYPE_STRING, G_TYPE_VALUE ))
+ #ifndef G_VALUE_INIT
+#define G_VALUE_INIT {0,{{0}}} // G_VALUE_INIT only present in glib = 2.30
+ #endif
+ #ifndef DBusGObjectPath
+#define DBusGObjectPath char // DBusGObjectPath is only present in newer
version of dbus-glib
+ #endif
#endif
#ifdef WIN32
@@ -59,9 +61,7 @@ DBusGProxy* bluezGetDefaultAdapter( DBusGConnection*
aConnection,
}
gboolean aResult;
-// The following should be a DBusGObjectPath, however the necessary
-// typedef is missing in older version of dbus-glib.
-char *aAdapterPath = NULL;
+DBusGObjectPath* aAdapterPath = NULL;
aResult = dbus_g_proxy_call( aManager, DefaultAdapter, aError,
G_TYPE_INVALID,
DBUS_TYPE_G_OBJECT_PATH, aAdapterPath,
commit 85267897633bffe791d581140c0397aeddcad674
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Sep 20 09:49:29 2012 +0200
Add SAL_INFO and SAL_WARN to linux bluetooth implementation.
Change-Id: Id2b7d3ca0881bf5b446692e1351517f1e8971fd7
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 352275d..69841c8 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -9,6 +9,8 @@
#include BluetoothServer.hxx
#include stdio.h
+#include sal/log.hxx
+
#if (defined(LINUX) !defined(__FreeBSD_kernel__)) defined(ENABLE_DBUS)
#include glib.h
#include dbus/dbus-glib.h
@@ -51,6 +53,7 @@ DBusGProxy* bluezGetDefaultAdapter( DBusGConnection*
aConnection,
if ( aManager == NULL )
{
+SAL_WARN( sdremote.bluetooth, getting org.bluez.Manager failed );
dbus_g_connection_unref( aConnection );
return NULL;
}
@@ -67,6 +70,7 @@ DBusGProxy* bluezGetDefaultAdapter( DBusGConnection*
aConnection,
g_object_unref( G_OBJECT( aManager ));
if ( !aResult || aError )
{
+SAL_WARN( sdremote.bluetooth, getting DefaultAdapter path failed );
if ( aError )
g_error_free( aError );
return NULL;
@@ -77,6 +81,7 @@ DBusGProxy* bluezGetDefaultAdapter( DBusGConnection*
aConnection,
aAdapterPath, aInterfaceType );
g_free( aAdapterPath );
+SAL_INFO( sdremote.bluetooth, DefaultAdapter retrieved );
return aAdapter;
}
#endif // defined(LINUX) defined(ENABLE_DBUS)
@@ -94,6 +99,7 @@ BluetoothServer::~BluetoothServer()
bool BluetoothServer::isDiscoverable()
{
#if (defined(LINUX) !defined(__FreeBSD_kernel__)) defined(ENABLE_DBUS)
+SAL_INFO( sdremote.bluetooth, BluetoothServer::isDiscoverable called );
g_type_init();
gboolean aResult;
@@ -141,6 +147,7 @@ bool BluetoothServer::isDiscoverable()
void BluetoothServer::setDiscoverable( bool aDiscoverable )
{
#if (defined(LINUX) !defined(__FreeBSD_kernel__)) defined(ENABLE_DBUS)
+SAL_INFO( sdremote.bluetooth, BluetoothServer::isDiscoverable called );
g_type_init();
gboolean aResult;
@@ -170,8 +177,12 @@ void BluetoothServer::setDiscoverable( bool aDiscoverable )
if ( !aResult || aError )
{
+SAL_WARN( sdremote.bluetooth, GetProperties failed );
if ( aError )
+{
g_error_free( aError );
+SAL_WARN( sdremote.bluetooth, with error aError-message );
+}
return;
}
@@ -181,6 +192,7 @@ void BluetoothServer::setDiscoverable( bool aDiscoverable )
g_free( aProperties );
if ( !aPowered )
{
+SAL_INFO(
Re: Options included in CC/CXX vs. in gb_CFLAGS/gb_CXXFLAGS
Should the -isysroot flag actually be part ot CC/CXX, not gb_CXXFLAGS? Should configure.in and macosx.mk be modified thusly? That's what I did, and reverted my other attempts from this morning to get liborcus to build, and it seems that it was a good move, the tinderboxes are getting greener now. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: offapi/com offapi/UnoApi_offapi.mk sax/source unusedcode.easy
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/xml/sax/XFastSerializer.idl | 165
sax/source/tools/fastserializer.cxx | 97 --
sax/source/tools/fastserializer.hxx | 93 -
unusedcode.easy |1
5 files changed, 61 insertions(+), 296 deletions(-)
New commits:
commit b7c41f1d1fcabc8f4abc670d5a18546a117b540a
Author: Matúš Kukan matus.ku...@gmail.com
Date: Tue Sep 18 18:06:36 2012 +0200
unusedcode: FastSaxSerializer is not used through UNO
Change-Id: I07d7b78be200f5f4a0674361237ef45b2bd1e3e1
Reviewed-on: https://gerrit.libreoffice.org/651
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index e5606da..b053b9b 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -4241,7 +4241,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xml/sax,\
XFastDocumentHandler \
XFastParser \
XFastSAXSerializable \
- XFastSerializer \
XFastShapeContextHandler \
XFastTokenHandler \
XLocator \
diff --git a/offapi/com/sun/star/xml/sax/XFastSerializer.idl
b/offapi/com/sun/star/xml/sax/XFastSerializer.idl
deleted file mode 100644
index 6601a00..000
--- a/offapi/com/sun/star/xml/sax/XFastSerializer.idl
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- 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.
- *
- /
-#ifndef __com_sun_star_xml_sax_XFastSerializer_idl__
-#define __com_sun_star_xml_sax_XFastSerializer_idl__
-
-#include com/sun/star/uno/XInterface.idl
-#include com/sun/star/xml/sax/SAXException.idl
-#include com/sun/star/xml/sax/XFastDocumentHandler.idl
-#include com/sun/star/io/XOutputStream.idl
-#include com/sun/star/xml/sax/XFastTokenHandler.idl
-
-
-module com { module sun { module star { module xml { module sax {
-
-
-/** receives notification of sax document events to write into an
XOutputStream.
- */
-interface XFastSerializer: com::sun::star::uno::XInterface
-{
-
-/** called by the parser when parsing of an XML stream is started.
- */
-void startDocument()
-raises( com::sun::star::xml::sax::SAXException );
-
-
-/** called by the parser after the last XML element of a stream is
processed.
- */
-void endDocument()
-raises( com::sun::star::xml::sax::SAXException );
-
-
-/** receives notification of the beginning of an element .
-
-@param Element
-contains the integer token from the typeXFastTokenHandler/type
-registered at the typeXFastParser/type.br
-
-If the element has a namespace that was registered with the
-typeXFastParser/type, paramElement/param contains the
integer
-token of the elements local name from the
typeXFastTokenHandler/type
-and the integer token of the namespace combined with an arithmetic
-bor/b operation.
-
-@param Attribs
-Contains a typeXFastAttrbitueList/type to access the attributes
-from the element.
-
-*/
-void startFastElement( [in] long Element, [in] XFastAttributeList Attribs )
-raises( com::sun::star::xml::sax::SAXException );
-
-
-/** receives notification of the beginning of an unknown element .
-
-@param Namespace
-contains the namespace url (not the prefix!) of this element.
-@param Name
-contains the elements local name.
-@param Attribs
-Contains a typeXFastAttrbitueList/type to access the attributes
-from the element.
- */
-void startUnknownElement( [in] string Namespace, [in] string Name, [in]
[PUSHED] unusedcode: FastSaxSerializer is not used through UNO
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/651 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/651 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I07d7b78be200f5f4a0674361237ef45b2bd1e3e1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/core/crsr/crsrsh.cxx | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 6bcbf68b29b609cf06dbea0e192533e11eb523c3
Author: Michael Stahl mst...@redhat.com
Date: Wed Sep 19 20:47:48 2012 +0200
rhbz#689053: fix crash following delete at last table cell:
The IsSelOvr() in SwCrsrShell::Combine() detects that the PaM with mark
in the last table cell and point ouside the table is invalid, but
unfortunatley restores the wrong position, which does not actually
correct the PaM; the deletion on the invalid PaM then removes the
last SwTxtNode in the document, which leads to crash later.
(cherry picked from commit af4b6c94c68b5f67b931cde8d0acda6ec8b288bb)
Conflicts:
sw/source/core/crsr/crsrsh.cxx
Change-Id: Ib2ae0b54e6c15dbe5b6811d8696531bf2022e1a4
Reviewed-on: https://gerrit.libreoffice.org/652
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index ca62c55..1493d14 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2012,26 +2012,27 @@ void SwCrsrShell::Combine()
return;
SwCallLink aLk( *this );// Crsr-Moves ueberwachen, evt. Link callen
-SwCrsrSaveState aSaveState( *pCurCrsr );
+// rhbz#689053: IsSelOvr must restore the saved stack position, not the
+// current one, because current point + stack mark may be invalid PaM
+SwCrsrSaveState aSaveState(*pCrsrStk);
if( pCrsrStk-HasMark() ) // nur wenn GetMark gesetzt wurde
{
bool const bResult =
CheckNodesRange( pCrsrStk-GetMark()-nNode,
pCurCrsr-GetPoint()-nNode, sal_True );
OSL_ENSURE(bResult, StackCrsr act. Crsr not in same Section.);
(void) bResult; // non-debug: unused
-// kopiere das GetMark
-if( !pCurCrsr-HasMark() )
-pCurCrsr-SetMark();
-*pCurCrsr-GetMark() = *pCrsrStk-GetMark();
-pCurCrsr-GetMkPos() = pCrsrStk-GetMkPos();
}
+*pCrsrStk-GetPoint() = *pCurCrsr-GetPoint();
+pCrsrStk-GetPtPos() = pCurCrsr-GetPtPos();
SwShellCrsr * pTmp = 0;
if( pCrsrStk-GetNext() != pCrsrStk )
{
pTmp = dynamic_castSwShellCrsr*(pCrsrStk-GetNext());
}
-delete pCrsrStk;
+delete pCurCrsr;
+pCurCrsr = pCrsrStk;
+pCrsrStk-MoveTo(0); // remove from ring
pCrsrStk = pTmp;
if( !pCurCrsr-IsInProtectTable( sal_True )
!pCurCrsr-IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: rhbz#689053: fix crash following delete at last table cell:
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/652 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/652 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib2ae0b54e6c15dbe5b6811d8696531bf2022e1a4 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: sal/config.g sal/types.h and sal/osl/rtl includes in general
On Wednesday 19 of September 2012, Norbert Thiebaud wrote: So there is no automatic way to verify that an include set is 'minimal', but there isn't even a way to do that with eyeballing... Actually, there possibly is an automatic way to do that: http://code.google.com/p/include-what-you-use/ . I haven't tried it though. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LibreOffice 3.5.7 RC1 available
Dear Community, The Document Foundation is happy to announce the first release candidate of LibreOffice 3.5.7. The upcoming 3.5.7 will be the seventh in a series of frequent bugfix releases for our 3.5 code line. Please be aware that LibreOffice 3.5.7 RC1 is not yet ready for production use, you should continue to use LibreOffice 3.5.6 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the beta quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test (and the announcement mail: http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html) For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/Translation_for_3.5 or help with funding our operations: http://challenge.documentfoundation.org/ A list of known issues and fixed bugs with 3.5.7 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/3.5.7/RC1 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors -- The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint pgp50QicSJl2f.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sal/inc
sal/inc/rtl/string.hxx |7 ++-
sal/inc/rtl/ustring.hxx |7 ++-
2 files changed, 4 insertions(+), 10 deletions(-)
New commits:
commit ab76bfc0366d72d80698e4145130a072aed64d31
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Jul 23 12:09:12 2012 +0200
Make rtl::O[U]String::isEmpty return true bool
...instead of sal_Bool, to work around MSVC warning C4805: unsafe mix of
type
'sal_Bool' and type 'bool'.
Change-Id: Ia3477539ccc23aa9daec49d633f023d414f2b4bf
(cherry picked from commit 8ee7c47404cdf408bcd3b6ea0267fbe54193c93f)
Reviewed-on: https://gerrit.libreoffice.org/650
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 4e76b74..e70f3ac 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -320,12 +320,9 @@ public:
@since LibreOffice 3.4
*/
-sal_Bool isEmpty() const SAL_THROW(())
+bool isEmpty() const SAL_THROW(())
{
-if ( pData-length )
-return sal_False;
-else
-return sal_True;
+return pData-length == 0;
}
/**
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index f3d224e..5962752 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -405,12 +405,9 @@ public:
@since LibreOffice 3.4
*/
-sal_Bool isEmpty() const SAL_THROW(())
+bool isEmpty() const SAL_THROW(())
{
-if ( pData-length )
-return sal_False;
-else
-return sal_True;
+return pData-length == 0;
}
/**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: Make rtl::O[U]String::isEmpty return true bool
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/650 Approvals: Miklos Vajna: Verified; Looks good to me, approved Luboš Luňák: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/650 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia3477539ccc23aa9daec49d633f023d414f2b4bf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: config_host.mk.in configure.in filter/Module_filter.mk sc/CppunitTest_sc_filters_test.mk sc/qa sd/CppunitTest_sd_filters_test.mk sd/qa svtools/Module_svtools.mk sw/Module_sw.m
config_host.mk.in |1 +
configure.in | 17 +
filter/Module_filter.mk |2 ++
sc/CppunitTest_sc_filters_test.mk |6 ++
sc/qa/unit/filters-test.cxx |2 ++
sd/CppunitTest_sd_filters_test.mk |6 ++
sd/qa/unit/filters-test.cxx |2 ++
svtools/Module_svtools.mk |2 ++
sw/Module_sw.mk |7 ++-
9 files changed, 44 insertions(+), 1 deletion(-)
New commits:
commit e0f90c3060f542885d834314a9097353d0cb2ba2
Author: David Ostrovsky da...@ostrovsky.org
Date: Wed Sep 19 22:13:36 2012 +0200
introduce new option --disable-cve-tests
Change-Id: I288638c4a70396ccb7354b20e901aa0c46ffe442
Reviewed-on: https://gerrit.libreoffice.org/653
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/config_host.mk.in b/config_host.mk.in
index b6d1ce9..753c901 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -103,6 +103,7 @@ export DISABLE_EXTENSIONS=@DISABLE_EXTENSIONS@
export DISABLE_SCRIPTING=@DISABLE_SCRIPTING@
export DISABLE_LINKOO=@DISABLE_LINKOO@
export DISABLE_NEON=@DISABLE_NEON@
+export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@
export DISABLE_PYTHON=@DISABLE_PYTHON@
export DLLTOOL=@DLLTOOL@
export DMAKEROOT=@SRC_ROOT@/solenv/inc/startup
diff --git a/configure.in b/configure.in
index 1010672..e29a0e8 100644
--- a/configure.in
+++ b/configure.in
@@ -988,6 +988,11 @@ AC_ARG_ENABLE(neon,
[Disable neon and the compilation of webdav binding.]),
,)
+AC_ARG_ENABLE(cve-tests,
+AS_HELP_STRING([--disable-cve-tests],
+[Prevent CVE tests to be executed]),
+,)
+
AC_ARG_ENABLE(build-unowinreg,
AS_HELP_STRING([--enable-build-unowinreg],
[Do not use the prebuilt unowinreg.dll. Build it instead. The MinGW C++
@@ -8623,6 +8628,18 @@ AC_SUBST([MINGW_TASN1_DLL])
fi
dnl ===
+dnl Check for disabling cve_tests
+dnl ===
+AC_MSG_CHECKING([whether to execute CVE tests])
+if test $enable_cve_tests = no; then
+AC_MSG_RESULT([no])
+DISABLE_CVE_TESTS=TRUE
+AC_SUBST(DISABLE_CVE_TESTS)
+else
+AC_MSG_RESULT([yes])
+fi
+
+dnl ===
dnl Check for system openssl
dnl ===
if test $_os = Darwin -o $_os = NetBSD -o $_os = OpenBSD -o \
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 2a3ef79..b3ec2a3 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -80,11 +80,13 @@ $(eval $(call gb_Module_add_targets,filter,\
))
endif
+ifneq ($(DISABLE_CVE_TESTS),TRUE)
$(eval $(call gb_Module_add_check_targets,filter,\
CppunitTest_filter_pict_test \
CppunitTest_filter_tga_test \
CppunitTest_filter_tiff_test \
))
+endif
# TODO
#$(eval $(call gb_Module_add_subsequentcheck_targets,filter,\
diff --git a/sc/CppunitTest_sc_filters_test.mk
b/sc/CppunitTest_sc_filters_test.mk
index 37a4b14..ef47365 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -31,6 +31,12 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,sc_filters_test, \
sc/qa/unit/filters-test \
))
+ifeq ($(DISABLE_CVE_TESTS),TRUE)
+$(eval $(call gb_CppunitTest_add_defs,sc_filters_test,\
+-DDISABLE_CVE_TESTS \
+))
+endif
+
$(eval $(call gb_CppunitTest_use_externals,sc_filters_test, \
mdds_headers \
orcus \
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index dc6df6d..a7b050d 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -196,6 +196,7 @@ void ScFiltersTest::createCSVPath(const rtl::OUString
aFileBase, rtl::OUString
void ScFiltersTest::testCVEs()
{
+#ifndef DISABLE_CVE_TESTS
testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Quattro Pro 6.0)),
getURLFromSrc(/sc/qa/unit/data/qpro/), rtl::OUString());
@@ -207,6 +208,7 @@ void ScFiltersTest::testCVEs()
testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MS Excel 97)),
getURLFromSrc(/sc/qa/unit/data/xls/), rtl::OUString());
+#endif
}
#if TEST_BUG_FILES
diff --git a/sd/CppunitTest_sd_filters_test.mk
b/sd/CppunitTest_sd_filters_test.mk
index 6afe52d..4394230 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -33,6 +33,12 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,sd_filters_test, \
sd/qa/unit/filters-test \
))
+ifeq ($(DISABLE_CVE_TESTS),TRUE)
+$(eval $(call gb_CppunitTest_add_defs,sd_filters_test,\
+-DDISABLE_CVE_TESTS \
+))
+endif
+
$(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \
avmedia \
basegfx \
diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx
index b5ae803..76fd560 100644
---
[PUSHED] introduce new option --disable-cve-tests
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/653 Approvals: Michael Meeks: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/653 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I288638c4a70396ccb7354b20e901aa0c46ffe442 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: offapi/com offapi/UnoApi_offapi.mk officecfg/Configuration_officecfg.mk officecfg/registry
offapi/UnoApi_offapi.mk|1
offapi/com/sun/star/setup/ProductRegistration.idl | 82 -
officecfg/Configuration_officecfg.mk |1
officecfg/registry/data/org/openoffice/Office/Jobs.xcu | 39
4 files changed, 123 deletions(-)
New commits:
commit 1f77f1ac177521698ee7c978f218127cb5840046
Author: Matúš Kukan matus.ku...@gmail.com
Date: Thu Sep 20 11:46:48 2012 +0200
remove remnants of ProductRegistration
Implementation is gone since b2d7ede98716806cc4b3ea8547247175d5f04d18
Change-Id: I3986ca99748f0010d80d2c788723a42a1725e83c
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index b053b9b..047a2ec 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1051,7 +1051,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\
ViewDescriptor \
))
$(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/setup,\
- ProductRegistration \
Setup \
))
$(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\
diff --git a/offapi/com/sun/star/setup/ProductRegistration.idl
b/offapi/com/sun/star/setup/ProductRegistration.idl
deleted file mode 100644
index 3dbdf57..000
--- a/offapi/com/sun/star/setup/ProductRegistration.idl
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_setup_ProductRegistration_idl__
-#define __com_sun_star_setup_ProductRegistration_idl__
-
-#include com/sun/star/task/JobExecutor.idl
-#include com/sun/star/task/XJob.idl
-
-module com { module sun { module star { module setup {
-
-/** provides a mechanism for registering the product.
-
-pTwo main functionalities are covered by this service:
-ulilemTriggering Online Registration/embr/
-If, by any user interface of your choice, the user tells she wants
to register
-their product copy, ProductRegistration is the service of your
choice.
-/ilbr/
-ilemExecuting Registration Requests/embr/
-ProductRegistration allows to remind your users to register, using
a dialog with various
-choices.
-/il
-/ul/p
-
-@since OOo 1.1.2
-*/
-published service ProductRegistration
-{
-/** allows to trigger certain events.
-
-pThe string argument of method
scope=com::sun::star::taskXJobExecutor::trigger/method is
-used to determine the type of the event. Currently supported
events are:br/
-ullibRegistrationRequired/bbr/
-Determines that the registration is required to be
executed.br/
-This is usually triggered by some user interaction, for
instance upon choosing a menu item
-called emRegistration/em./p
-/li
-/ul
-/p
-*/
-service com::sun::star::task::JobExecutor;
-
-/** allows the registration request to be scheduled automatically.
-
-pThere are processes which allow to schedule events and jobs, for
instance there
-can be configuration settings scheduling which operations are to be
executed upon an program
-startup. Such processes usually require the jobs to be executed to
support the
-type scope=com::sun::star::taskXJob/type interface./p
-
-pThat's why this service supports the type
scope=com::sun::star::taskXJob/type, too.br/
-Calling the method
scope=com::sun::star::taskXJob::execute/method method results in
displaying a
-dialog which asks the user to register. This is done once per session,
means you need to restart the
-process which called this./p
-
-pAt the moment, there is no specification about how to use the
arguments given in the
-method scope=com::sun::star::taskXJob::execute/method method,
but this may change in future versions of the service
-descriptions, so to keep your implementation compatible, you should
not use these arguments./p
-*/
-interface com::sun::star::task::XJob;
-};
-
[Libreoffice-commits] .: bridges/source cppu/inc cppu/source
bridges/source/jni_uno/jni_bridge.cxx |9 +
cppu/inc/uno/environment.h|7 ++-
cppu/source/uno/lbenv.cxx |4
3 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 69765868e30494eb39a2b4b7566f161ef1f3db04
Author: Tor Lillqvist t...@iki.fi
Date: Thu Sep 20 12:42:48 2012 +0300
DISABLE_DYNLOADING magic also for the jni_uno environment
Change-Id: I5e966a5734308381ad305b891ecfc830dc1419f6
diff --git a/bridges/source/jni_uno/jni_bridge.cxx
b/bridges/source/jni_uno/jni_bridge.cxx
index 87d210d..f8fdbce 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -456,6 +456,10 @@ void SAL_CALL java_env_disposing( uno_Environment *
java_env )
}
}
+#ifdef DISABLE_DYNLOADING
+#define uno_initEnvironment java_uno_initEnvironment
+#endif
+
//--
void SAL_CALL uno_initEnvironment( uno_Environment * java_env )
SAL_THROW_EXTERN_C()
@@ -554,12 +558,17 @@ void SAL_CALL uno_ext_getMapping(
}
}
+#ifndef DISABLE_DYNLOADING
+
//--
SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime )
SAL_THROW_EXTERN_C()
{
return (*g_moduleCount.canUnload)( g_moduleCount, pTime );
}
+
+#endif
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppu/inc/uno/environment.h b/cppu/inc/uno/environment.h
index bbba4c9..e76ed2f 100644
--- a/cppu/inc/uno/environment.h
+++ b/cppu/inc/uno/environment.h
@@ -258,9 +258,14 @@ typedef void (SAL_CALL * uno_initEnvironmentFunc)(
uno_Environment * pEnv );
#define UNO_INIT_ENVIRONMENT uno_initEnvironment
#ifdef DISABLE_DYNLOADING
-/* We link statically and have just one kind of environment */
+/* We link statically and have just the C++ environment */
void SAL_CALL CPPU_ENV_uno_initEnvironment( uno_Environment * Env )
SAL_THROW_EXTERN_C();
+#ifdef SOLAR_JAVA
+/* We also have the Java environment */
+void SAL_CALL java_uno_initEnvironment( uno_Environment * Env )
+ SAL_THROW_EXTERN_C();
+#endif
#endif
/** Gets a specific environment. If the specified environment does not exist,
then a default one
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index ff6de9a..439d49b 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1058,6 +1058,10 @@ static bool loadEnv(OUString const cLibStem,
if ( cLibStem == CPPU_CURRENT_LANGUAGE_BINDING_NAME _uno )
fpInit = CPPU_ENV_uno_initEnvironment;
+#ifdef SOLAR_JAVA
+else if ( cLibStem == java_uno )
+fpInit = java_uno_initEnvironment;
+#endif
else
{
#if OSL_DEBUG_LEVEL 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: postprocess/packregistry
postprocess/packregistry/makefile.mk |1 - 1 file changed, 1 deletion(-) New commits: commit b590d87b380389371eca94ffb0e6f47f86d1c917 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Sep 20 11:57:41 2012 +0200 forgot to remove this one Change-Id: Idd33388f61461a55021b93498e2c992d7ae560d0 diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 9a8b330..aab9e01 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -227,7 +227,6 @@ MY_FILES_main = \ $(MY_XCU)/Office/FormWizard.xcu \ $(MY_XCU)/Office/Histories.xcu \ $(MY_XCU)/Office/Impress.xcu \ -$(MY_XCU)/Office/Jobs.xcu \ $(MY_XCU)/Office/Labels.xcu \ $(MY_XCU)/Office/Logging.xcu \ $(MY_XCU)/Office/Math.xcu \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/remotecontrol/Server.cxx | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
New commits:
commit e2e701b5747982d037f76021ed64ab15a49cb573
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Sep 20 12:02:05 2012 +0200
Add SAL_WARN/INFO to network server + remove static reference on exit.
Change-Id: I76e737f59aa36bf7982255fa9bb41ef9d6abfe8d
diff --git a/sd/source/ui/remotecontrol/Server.cxx
b/sd/source/ui/remotecontrol/Server.cxx
index 388ef9d..8ec942d 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -19,6 +19,7 @@
#include comphelper/processfactory.hxx
#include comphelper/configuration.hxx
+#include sal/log.hxx
#include sddll.hxx
@@ -75,23 +76,26 @@ RemoteServer::~RemoteServer()
void RemoteServer::execute()
{
+SAL_INFO( sdremote, RemoteServer::execute called );
osl::SocketAddr aAddr( 0, PORT );
if ( !mSocket.bind( aAddr ) )
{
-// Error binding
+SAL_WARN( sdremote, bind failed mSocket.getErrorAsString() );
return;
}
if ( !mSocket.listen(3) )
{
-// Error listening
+SAL_WARN( sdremote, listen failed mSocket.getErrorAsString() );
return;
}
while ( true )
{
StreamSocket aSocket;
+SAL_INFO( sdremote, waiting on accept );
if ( mSocket.acceptConnection( aSocket ) == osl_Socket_Error )
{
+SAL_WARN( sdremote, accept failed
mSocket.getErrorAsString() );
return; // Closed, or other issue.
}
BufferedStreamSocket *pSocket = new BufferedStreamSocket( aSocket);
@@ -138,6 +142,7 @@ void RemoteServer::execute()
axPin = sPin;
if ( sPin.equals( pClient-mPin ) ) {
+SAL_INFO( sdremote, client found on validated list
-- connecting );
connectClient( pClient, sPin );
aFound = true;
break;
@@ -147,13 +152,17 @@ void RemoteServer::execute()
}
// Pin not found so inform the client.
if ( !aFound )
+{
+SAL_INFO( sdremote, client not found on validated list );
pSocket-write( LO_SERVER_VALIDATING_PIN\n\n,
strlen( LO_SERVER_VALIDATING_PIN\n\n ) );
+}
} else {
+SAL_INFO( sdremote, client failed to send
LO_SERVER_CLIENT_PAIR, ignoring );
delete pSocket;
}
}
-
+spServer = NULL; // Object is destroyed when Thread::execute() ends.
}
RemoteServer *sd::RemoteServer::spServer = NULL;
@@ -224,6 +233,7 @@ std::vectorClientInfo* RemoteServer::getClients()
sal_Bool RemoteServer::connectClient( ClientInfo* pClient, rtl::OUString aPin )
{
+SAL_INFO( sdremote, RemoteServer::connectClient called );
if ( !spServer )
return false;
@@ -285,6 +295,7 @@ sal_Bool RemoteServer::connectClient( ClientInfo* pClient,
rtl::OUString aPin )
void SdDLL::RegisterRemotes()
{
// Disable unless in experimental mode for now
+SAL_INFO( sdremote, SdDLL::RegisterRemotes called );
uno::Reference uno::XComponentContext xContext =
comphelper::getProcessComponentContext();
if (!xContext.is() ||
!officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED:3-6-2] [PATCH] fdo#37529 clear DataColumns read-only information when we cl...
On Thu, 2012-09-13 at 17:28 +0200, Miklos Vajna wrote: On Thu, Sep 13, 2012 at 04:38:34PM +0200, Lionel Elie Mamane lio...@mamane.lu wrote: It is (yet another) Base crash. 't would be nice to have it in libreoffice-3-6-2, too. Looks OK to me, one more needed. Pushed to -3-6-2 :-) Thanks Lionel ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6-2' - dbaccess/source
dbaccess/source/core/api/RowSet.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 2fca05d5e4dee32feb6f9c9ba5f2c3792b72d5d1
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Sep 13 16:24:38 2012 +0200
fdo#37529 clear DataColumns read-only information when we clear DataColumns
Change-Id: I6f3b4f1646df1244d97ae98f56ba054bc26e3314
Reviewed-on: https://gerrit.libreoffice.org/608
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
Signed-off-by: Miklos Vajna vmik...@suse.cz
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/dbaccess/source/core/api/RowSet.cxx
b/dbaccess/source/core/api/RowSet.cxx
index afad13c..06a84a8 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -569,6 +569,8 @@ void ORowSet::freeResources( bool _bComplete )
// the columns must be disposed before the querycomposer is disposed
because
// their owner can be the composer
TDataColumns().swap(m_aDataColumns);// clear and resize capacity
+::std::vectorbool().swap(m_aReadOnlyDataColumns);
+
m_xColumns = NULL;
if ( m_pColumns )
m_pColumns-disposing();
@@ -1250,6 +1252,7 @@ void ORowSet::impl_setDataColumnsWriteable_throw()
void ORowSet::impl_restoreDataColumnsWriteable_throw()
{
+assert(m_aDataColumns.size() == m_aReadOnlyDataColumns.size() ||
m_aReadOnlyDataColumns.size() == 0 );
TDataColumns::iterator aIter = m_aDataColumns.begin();
::std::vectorbool, std::allocatorbool ::iterator aReadIter =
m_aReadOnlyDataColumns.begin();
for(;aReadIter != m_aReadOnlyDataColumns.end();++aIter,++aReadIter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: sal/config.g sal/types.h and sal/osl/rtl includes in general
On Thu, Sep 20, 2012 at 4:00 AM, Lubos Lunak l.lu...@suse.cz wrote: On Wednesday 19 of September 2012, Norbert Thiebaud wrote: So there is no automatic way to verify that an include set is 'minimal', but there isn't even a way to do that with eyeballing... Actually, there possibly is an automatic way to do that: http://code.google.com/p/include-what-you-use/ . I haven't tried it though. thanks... looks like exactly what we need... /me will have to build a clang and build that plugin to try it :-) norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO build can not find external dependencies
Hi there, On Wed, 2012-09-19 at 10:35 +0200, Henrik /KaarPoSoft wrote: I am trying to build version 3.6.2.1 from source on a Linux box. Sounds great. I want to use headers already on system and system installed versions of libraries as much as possible, so I pass --with-system-headers --with-system-libs to ./configure. Seems reasonable. generates this error: -- /home/kaarpux/KX_OO/kaarpux/linux/build/opt/libreoffice-core-3.6.2.1/solver/unxlngi6.pro/bin/cppunit/cppunittester: error while loading shared libraries: libcppunit-1.12.so.1: cannot open shared object file: No such file or directory Ok. -- Even though the shared library IS present under /opt/lib, and the symlinks are not broken. Workaround: --without-system-cppunit So - is /opt/lib in your system linker path ? ie. in /etc/ld.so.conf - it's an unusual place to have in there ;-) and have you run sudo /sbin/ldconfig to re-build whatever caches there are there ? Out of interest, what Linux are you using ? :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO build can not find external dependencies
On 19/09/12 10:35, Henrik /KaarPoSoft wrote: Dear all, I am trying to build version 3.6.2.1 from source on a Linux box. I want to use headers already on system and system installed versions of libraries as much as possible, so I pass --with-system-headers --with-system-libs to ./configure. The external dependencies are installed in /opt, so I export CPPFLAGS=-I/opt/include export LDFLAGS=-L/opt/lib before running ./autogen.sh LibreOffice currently has 2 build systems; the new one should respect these variables, but the old one probably does not, which effectively makes them useless today. you will probably have a better time by setting PATH to /opt/bin and whatever variable is used by pkg-config, as long as all the externals you have installed there have a foo-config script or are pkg-config enabled the LO configure script should set things up the right way. another alternative would be to install a complete baseline (i.e. incl. libc and everything needed) into some prefix and make use of the existing GCC --sysroot support, but i've actually never done that in a configure environment (i just remember that it was used to build OOo at Sun), and you probably have to fix up some bitrot to get it to actually work (reading configure it seems you'd need to set SYSBASE var). I also have export LD_LIBRARY_PATH=/opt/lib apparently the new build system overwrites this always, guess nobody ever needed to set this from the outside; you could try to edit various occurrences in solenv/gbuild to prepend the values if it is already defined. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: sal/config.g sal/types.h and sal/osl/rtl includes in general
On Thu, 2012-09-20 at 11:00 +0200, Lubos Lunak wrote: On Wednesday 19 of September 2012, Norbert Thiebaud wrote: So there is no automatic way to verify that an include set is 'minimal', but there isn't even a way to do that with eyeballing... Actually, there possibly is an automatic way to do that: http://code.google.com/p/include-what-you-use/ . I haven't tried it though. I -believe- this was tried - someone in bugzilla had an easy hack to look at it, and it produced pretty awful / unusable results IIRC: mostly adding dozens of new includes. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Don't access broken service mgr during bootstrap failure
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/654 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/654/1 Don't access broken service mgr during bootstrap failure ...so that displaying a (non-translated) error box upon BE_UNO_SERVICEMANAGER works after all. Augment the error text with an exception message where appropriate. This allows to revert fdfb7a3c4b3a89b73ab5546b9620348bc4984d8f Related fdo#51252: Report uncaught exceptions with MessageBox on Windows as that was to catch and display failures from instantiating the service mgr. (cherry picked from commit 6bcfa095121c91e8bbc396f5bcf7e95424b9) Change-Id: I049a38e95342634796eb0e940e2ee8e55193c9d3 --- M desktop/inc/app.hxx M desktop/source/app/app.cxx M desktop/source/app/desktop.hrc M desktop/source/app/desktop.src M desktop/source/app/sofficemain.cxx M vcl/aqua/source/app/salsys.cxx M vcl/generic/app/gensys.cxx M vcl/inc/aqua/salsys.h M vcl/inc/generic/gensys.h M vcl/inc/ios/salsys.h M vcl/inc/salsys.hxx M vcl/inc/win/salsys.h M vcl/ios/source/app/salsys.cxx M vcl/source/app/svapp.cxx M vcl/source/app/svdata.cxx M vcl/win/source/app/salinfo.cxx 16 files changed, 172 insertions(+), 142 deletions(-) -- To view, visit https://gerrit.libreoffice.org/654 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I049a38e95342634796eb0e940e2ee8e55193c9d3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-6][REVIEW 3-6-2 2/3] fdo#55059, use correct cell for broadcasting
On Wed, Sep 19, 2012 at 01:22:54PM -0400, Kohei Yoshida kohei.yosh...@gmail.com wrote: Looks good to me. Pushed to 3-6 with my sign off. Two more needed for 3-6-2. Looks reasonable to me. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Is there easy way to find unused .idl files ?
Hi, recently I've touched .idl files in http://cgit.freedesktop.org/libreoffice/core/commit/?id=b7c41f1d1fcabc8f4abc670d5a18546a117b540a http://cgit.freedesktop.org/libreoffice/core/commit/?id=1f77f1ac177521698ee7c978f218127cb5840046 And I wonder if there is an easy way how to tell, they can be removed. For files added with gb_UnoApi_add_idlfile_noheader, one probably have to grep in the code. But maybe for files in gb_UnoApi_add_idlfile_nohdl, it is possible to know they are unused if there is no #include foo.hpp ? And something similar for gb_UnoApi_add_idlfile ? Is there something better than check each and every .idl file ? I think we would find few(many?) unused ones. Thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oox/source
oox/source/export/chartexport.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f3b2fc9be23739cec600b349e6b28b71be9acc3d Author: Radek Doulik r...@novell.com Date: Thu Sep 20 12:46:15 2012 +0200 write only non NaN chart series values (fixes part of n#760997 Change-Id: I7c5bc8b9375a325d4ea78f033f577eff44cfd6e9 diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index b51afcf..6519543 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1801,7 +1801,8 @@ void ChartExport::exportSeriesValues( const Reference chart2::data::XDataSequen FSEND ); pFS-startElement( FSNS( XML_c, XML_v ), FSEND ); -pFS-write( aValues[i] ); +if (aValues[i] == aValues[i]) +pFS-write( aValues[i] ); pFS-endElement( FSNS( XML_c, XML_v ) ); pFS-endElement( FSNS( XML_c, XML_pt ) ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sot/source
sot/source/sdstor/stgcache.cxx | 67 +
sot/source/sdstor/stgcache.hxx | 19 ++-
2 files changed, 52 insertions(+), 34 deletions(-)
New commits:
commit 540ab389f2adb021a95b5ac52c55c97fc5db5c17
Author: Michael Meeks michael.me...@suse.com
Date: Thu Sep 20 11:52:49 2012 +0100
sot: memory savings to avoid duplicating the whole stream in RAM
re-work LRU cache to really be an 8 entry LRU cache.
only force dirty pages to stay in memory, hopefully huge reads
should now stream through memory.
Change-Id: I0bedc762086f5f02202795568743750aefaaa50b
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 06a0ee0..e787c08 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -88,14 +88,17 @@ sal_Int32 lcl_GetPageCount( sal_uLong nFileSize, short
nPageSize )
}
StgCache::StgCache()
+ : nError( SVSTREAM_OK )
+ , nPages( 0 )
+ , nRef( 0 )
+ , nReplaceIdx( 0 )
+ , maLRUPages( 8 ) // entries in the LRU lookup
+ , nPageSize( 512 )
+ , pStorageStream( NULL )
+ , pStrm( NULL )
+ , bMyStream( sal_False )
+ , bFile( sal_False )
{
-nRef = 0;
-pStrm = NULL;
-nPageSize = 512;
-nError = SVSTREAM_OK;
-bMyStream = sal_False;
-bFile = sal_False;
-pStorageStream = NULL;
}
StgCache::~StgCache()
@@ -122,7 +125,7 @@ void StgCache::SetPhysPageSize( short n )
rtl::Reference StgPage StgCache::Create( sal_Int32 nPg )
{
rtl::Reference StgPage xElem( StgPage::Create( nPageSize, nPg ) );
-maLRUCache[ xElem-GetPage() ] = xElem;
+maLRUPages[ nReplaceIdx++ % maLRUPages.size() ] = xElem;
return xElem;
}
@@ -131,8 +134,14 @@ rtl::Reference StgPage StgCache::Create( sal_Int32 nPg )
void StgCache::Erase( const rtl::Reference StgPage xElem )
{
OSL_ENSURE( xElem.is(), The pointer should not be NULL! );
-if ( xElem.is() )
-maLRUCache.erase( xElem-GetPage() );
+if ( xElem.is() ) {
+for ( LRUList::iterator it = maLRUPages.begin(); it !=
maLRUPages.end(); it++ ) {
+if ( it-is() (*it)-GetPage() == xElem-GetPage() ) {
+it-clear();
+break;
+}
+}
+}
}
// remove all cache elements without flushing them
@@ -140,16 +149,20 @@ void StgCache::Erase( const rtl::Reference StgPage
xElem )
void StgCache::Clear()
{
maDirtyPages.clear();
-maLRUCache.clear();
+for ( LRUList::iterator it = maLRUPages.begin(); it != maLRUPages.end();
it++ )
+it-clear();
}
// Look for a cached page
rtl::Reference StgPage StgCache::Find( sal_Int32 nPage )
{
-IndexToStgPage::iterator aIt = maLRUCache.find( nPage );
-if( aIt != maLRUCache.end() )
-return (*aIt).second;
+for ( LRUList::iterator it = maLRUPages.begin(); it != maLRUPages.end();
it++ )
+if ( it-is() (*it)-GetPage() == nPage )
+return *it;
+IndexToStgPage::iterator it2 = maDirtyPages.find( nPage );
+if ( it2 != maDirtyPages.end() )
+return it2-second;
return rtl::Reference StgPage ();
}
@@ -199,18 +212,21 @@ rtl::Reference StgPage StgCache::Copy( sal_Int32 nNew,
sal_Int32 nOld )
// continue that tradition.
sal_Bool StgCache::Commit()
{
-std::vector StgPage * aToWrite;
-for ( IndexToStgPage::iterator aIt = maDirtyPages.begin();
- aIt != maDirtyPages.end(); aIt++ )
-aToWrite.push_back( aIt-second.get() );
-
-std::sort( aToWrite.begin(), aToWrite.end(), StgPage::IsPageGreater );
-for (std::vector StgPage * ::iterator aWr = aToWrite.begin();
- aWr != aToWrite.end(); aWr++)
+if ( Good() ) // otherwise Write does nothing
{
-const rtl::Reference StgPage pPage = *aWr;
-if ( !Write( pPage-GetPage(), pPage-GetData(), 1 ) )
-return sal_False;
+std::vector StgPage * aToWrite;
+for ( IndexToStgPage::iterator aIt = maDirtyPages.begin();
+ aIt != maDirtyPages.end(); aIt++ )
+aToWrite.push_back( aIt-second.get() );
+
+std::sort( aToWrite.begin(), aToWrite.end(), StgPage::IsPageGreater );
+for ( std::vector StgPage * ::iterator aWr = aToWrite.begin();
+ aWr != aToWrite.end(); aWr++)
+{
+const rtl::Reference StgPage pPage = *aWr;
+if ( !Write( pPage-GetPage(), pPage-GetData(), 1 ) )
+return sal_False;
+}
}
maDirtyPages.clear();
@@ -259,6 +275,7 @@ void StgCache::SetStrm( UCBStorageStream* pStgStream )
void StgCache::SetDirty( const rtl::Reference StgPage xPage )
{
+assert( IsWritable() );
maDirtyPages[ xPage-GetPage() ] = xPage;
}
diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index 2687846..e134e25 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.hxx
@@ -33,20 +33,21 @@ class StgPage;
class StgDirEntry;
class StorageBase;
[Libreoffice-commits] .: sw/source
sw/source/core/unocore/unodraw.cxx | 18 -- 1 file changed, 18 deletions(-) New commits: commit 21359dc87000c65665e49652d1c255e679817787 Author: Miklos Vajna vmik...@suse.cz Date: Thu Sep 20 13:01:04 2012 +0200 sw: drop unused includes in unodraw Change-Id: I2cae970f532c3441a7ec7c8318987ea343aaf1cd diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 43546dd..2e37dd6 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -27,17 +27,13 @@ / -#include swtypes.hxx #include cmdid.h -#include unomid.h #include unodraw.hxx #include unocoll.hxx #include unoframe.hxx #include unoparagraph.hxx #include unotextrange.hxx -#include unoprnms.hxx -#include editeng/unoprnms.hxx #include svx/svditer.hxx #include swunohelper.hxx #include doc.hxx @@ -48,9 +44,7 @@ #include docsh.hxx #include unomap.hxx #include unoport.hxx -#include unocrsr.hxx #include TextCursorHelper.hxx -#include swundo.hxx #include dflyobj.hxx #include ndtxt.hxx #include svx/svdview.hxx @@ -58,7 +52,6 @@ #include dcontact.hxx #include svx/fmglob.hxx #include fmtornt.hxx -#include fmtanchr.hxx #include fmtsrnd.hxx #include fmtfollowtextflow.hxx #include rootfrm.hxx @@ -66,26 +59,15 @@ #include editeng/ulspitem.hxx #include svx/shapepropertynotifier.hxx #include crstate.hxx -#include osl/mutex.hxx #include comphelper/extract.hxx #include comphelper/stl_types.hxx #include comphelper/makesequence.hxx -#include comphelper/servicehelper.hxx #include svx/scene3d.hxx -#include com/sun/star/beans/PropertyAttribute.hpp #include com/sun/star/drawing/XDrawPageSupplier.hpp -#include com/sun/star/text/HoriOrientation.hpp -#include com/sun/star/text/VertOrientation.hpp -#include basegfx/numeric/ftools.hxx -#include algorithm #include fmtwrapinfluenceonobjpos.hxx #include com/sun/star/text/TextContentAnchorType.hpp -#include basegfx/matrix/b2dhommatrix.hxx #include basegfx/matrix/b2dhommatrixtools.hxx #include com/sun/star/drawing/PointSequence.hpp -#include vcl/svapp.hxx -#include list -#include iterator #include switerator.hxx using ::rtl::OUString; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: offapi/com offapi/UnoApi_offapi.mk officecfg/Configuration_officecfg.mk officecfg/registry postprocess/packregistry
offapi/UnoApi_offapi.mk|1
offapi/com/sun/star/setup/ProductRegistration.idl | 82 +
officecfg/Configuration_officecfg.mk |1
officecfg/registry/data/org/openoffice/Office/Jobs.xcu | 39
postprocess/packregistry/makefile.mk |1
5 files changed, 124 insertions(+)
New commits:
commit 6751cf5017fca96e6bef8ef2c316f676055eefb6
Author: Matúš Kukan matus.ku...@gmail.com
Date: Thu Sep 20 12:52:49 2012 +0200
Revert remove remnants of ProductRegistration
This reverts commit 1f77f1ac177521698ee7c978f218127cb5840046
and b590d87b380389371eca94ffb0e6f47f86d1c917.
Do this again when we will know how to get rid of published service
in offapi/type_reference/types.rdb.
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 047a2ec..b053b9b 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1051,6 +1051,7 @@ $(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sdbcx,\
ViewDescriptor \
))
$(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/setup,\
+ ProductRegistration \
Setup \
))
$(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\
diff --git a/offapi/com/sun/star/setup/ProductRegistration.idl
b/offapi/com/sun/star/setup/ProductRegistration.idl
new file mode 100644
index 000..3dbdf57
--- /dev/null
+++ b/offapi/com/sun/star/setup/ProductRegistration.idl
@@ -0,0 +1,82 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef __com_sun_star_setup_ProductRegistration_idl__
+#define __com_sun_star_setup_ProductRegistration_idl__
+
+#include com/sun/star/task/JobExecutor.idl
+#include com/sun/star/task/XJob.idl
+
+module com { module sun { module star { module setup {
+
+/** provides a mechanism for registering the product.
+
+pTwo main functionalities are covered by this service:
+ulilemTriggering Online Registration/embr/
+If, by any user interface of your choice, the user tells she wants
to register
+their product copy, ProductRegistration is the service of your
choice.
+/ilbr/
+ilemExecuting Registration Requests/embr/
+ProductRegistration allows to remind your users to register, using
a dialog with various
+choices.
+/il
+/ul/p
+
+@since OOo 1.1.2
+*/
+published service ProductRegistration
+{
+/** allows to trigger certain events.
+
+pThe string argument of method
scope=com::sun::star::taskXJobExecutor::trigger/method is
+used to determine the type of the event. Currently supported
events are:br/
+ullibRegistrationRequired/bbr/
+Determines that the registration is required to be
executed.br/
+This is usually triggered by some user interaction, for
instance upon choosing a menu item
+called emRegistration/em./p
+/li
+/ul
+/p
+*/
+service com::sun::star::task::JobExecutor;
+
+/** allows the registration request to be scheduled automatically.
+
+pThere are processes which allow to schedule events and jobs, for
instance there
+can be configuration settings scheduling which operations are to be
executed upon an program
+startup. Such processes usually require the jobs to be executed to
support the
+type scope=com::sun::star::taskXJob/type interface./p
+
+pThat's why this service supports the type
scope=com::sun::star::taskXJob/type, too.br/
+Calling the method
scope=com::sun::star::taskXJob::execute/method method results in
displaying a
+dialog which asks the user to register. This is done once per session,
means you need to restart the
+process which called this./p
+
+pAt the moment, there is no specification about how to use the
arguments given in the
+method scope=com::sun::star::taskXJob::execute/method method,
but this may change in future versions of the service
+
Re: sal/config.g sal/types.h and sal/osl/rtl includes in general
On 20/09/12 11:12, Norbert Thiebaud wrote: On Thu, Sep 20, 2012 at 4:00 AM, Lubos Lunak l.lu...@suse.cz wrote: On Wednesday 19 of September 2012, Norbert Thiebaud wrote: So there is no automatic way to verify that an include set is 'minimal', but there isn't even a way to do that with eyeballing... Actually, there possibly is an automatic way to do that: http://code.google.com/p/include-what-you-use/ . I haven't tried it though. thanks... looks like exactly what we need... /me will have to build a clang and build that plugin to try it :-) norbert https://bugs.freedesktop.org/show_bug.cgi?id=42949 accelerating compile times ... is the bug Michael mentioned. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/inc vcl/unx
vcl/inc/cupsmgr.hxx |2 +-
vcl/unx/generic/printer/cupsmgr.cxx |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 8e1e27ae6d0751097d276eb3394b57af123e09f3
Author: Michael Meeks michael.me...@suse.com
Date: Thu Sep 20 12:00:11 2012 +0100
cups: initialize thread running member
Change-Id: Idf8b079857638558075fa6b1fb5f7ea6b3c9f632
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index f3cee19..d2ae11d 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -47,7 +47,7 @@ struct FPtrHash
class CUPSManager : public PrinterInfoManager
{
-boost::unordered_map FILE*, rtl::OString, FPtrHash
m_aSpoolFiles;
+boost::unordered_map FILE*, rtl::OString, FPtrHashm_aSpoolFiles;
int m_nDests;
void* m_pDests;
boolm_bNewDests;
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index f13b774..616385e 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -193,7 +193,8 @@ CUPSManager::CUPSManager() :
PrinterInfoManager( CUPS ),
m_nDests( 0 ),
m_pDests( NULL ),
-m_bNewDests( false )
+m_bNewDests( false ),
+m_bPPDThreadRunning( false )
{
m_aDestThread = osl_createThread( run_dest_thread_stub, this );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW-3-6] trivial cups thread init issue ...
As attached,
I've noticed a number of these straying in. Did we disable a warning on
un-initialized members for some reason ? I could swear the compiler used
to complain helpfully about this.
Thanks,
Michael.
--
michael.me...@suse.com , Pseudo Engineer, itinerant idiot
From 23c4a5bf342abdddb3df13c1d8d8f6fc36ecd94a Mon Sep 17 00:00:00 2001
From: Michael Meeks michael.me...@suse.com
Date: Thu, 20 Sep 2012 12:00:11 +0100
Subject: [PATCH] cups: initialize thread running member
Change-Id: Idf8b079857638558075fa6b1fb5f7ea6b3c9f632
---
vcl/inc/cupsmgr.hxx |2 +-
vcl/unx/generic/printer/cupsmgr.cxx |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index f3cee19..d2ae11d 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.hxx
@@ -47,7 +47,7 @@ struct FPtrHash
class CUPSManager : public PrinterInfoManager
{
-boost::unordered_map FILE*, rtl::OString, FPtrHashm_aSpoolFiles;
+boost::unordered_map FILE*, rtl::OString, FPtrHashm_aSpoolFiles;
int m_nDests;
void* m_pDests;
boolm_bNewDests;
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index f13b774..616385e 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -193,7 +193,8 @@ CUPSManager::CUPSManager() :
PrinterInfoManager( CUPS ),
m_nDests( 0 ),
m_pDests( NULL ),
-m_bNewDests( false )
+m_bNewDests( false ),
+m_bPPDThreadRunning( false )
{
m_aDestThread = osl_createThread( run_dest_thread_stub, this );
}
--
1.7.7
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO build can not find external dependencies
On 09/20/12 12:15, Michael Stahl wrote: On 19/09/12 10:35, Henrik /KaarPoSoft wrote: Dear all, I am trying to build version 3.6.2.1 from source on a Linux box. I want to use headers already on system and system installed versions of libraries as much as possible, so I pass --with-system-headers --with-system-libs to ./configure. The external dependencies are installed in /opt, so I export CPPFLAGS=-I/opt/include export LDFLAGS=-L/opt/lib before running ./autogen.sh LibreOffice currently has 2 build systems; the new one should respect these variables, but the old one probably does not, which effectively makes them useless today. you will probably have a better time by setting PATH to /opt/bin and whatever variable is used by pkg-config, as long as all the externals you have installed there have a foo-config script or are pkg-config enabled the LO configure script should set things up the right way. I already have export PATH=$PATH:/opt/sbin:/opt/bin export LD_LIBRARY_PATH=/local/lib:/lib:/opt/lib export PKG_CONFIG_PATH=/opt/lib/pkgconfig and LO configuration seems to pick up the dependencies with pkg-config, as config_host.mk has a lot of export *_CFLAGS= and export *_LIBS with info from pkg-config. another alternative would be to install a complete baseline (i.e. incl. libc and everything needed) into some prefix and make use of the existing GCC --sysroot support, but i've actually never done that in a configure environment (i just remember that it was used to build OOo at Sun), and you probably have to fix up some bitrot to get it to actually work (reading configure it seems you'd need to set SYSBASE var). I would rather not go into this, as it seems much to complex for this simple problem. Anyway, I do not think it would solve the problem. It is not gcc which is complaining about the missing libraries, but rather the system linker which complains when trying to run some executable created by LO. I also have export LD_LIBRARY_PATH=/opt/lib apparently the new build system overwrites this always, guess nobody ever needed to set this from the outside; you could try to edit various occurrences in solenv/gbuild to prepend the values if it is already defined. *Do you have any suggestions as to which files to look into/edit?* I do not have much experience with the LO codebase, and a grep for LD_LIBRARY_PATH returns almost 1000 files... I am now trying to build with: ./autogen.sh [...lots-of-options...] --with-system-headers --with-system-libs CPPFLAGS=-I/opt/include LDFLAGS=-L/opt/lib export CPPFLAGS=-I/opt/include export LDFLAGS=-L/opt/lib make verbose=t CPPFLAGS=-I/opt/include LDFLAGS=-L/opt/lib build but running into the same problems. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - desktop/inc desktop/source vcl/aqua vcl/generic vcl/inc vcl/ios vcl/source vcl/win
desktop/inc/app.hxx| 19 ++---
desktop/source/app/app.cxx | 139 +
desktop/source/app/desktop.hrc |1
desktop/source/app/desktop.src |5 -
desktop/source/app/sofficemain.cxx | 21 -
vcl/aqua/source/app/salsys.cxx | 19 +++--
vcl/generic/app/gensys.cxx | 60 +--
vcl/inc/aqua/salsys.h |2
vcl/inc/generic/gensys.h |2
vcl/inc/ios/salsys.h |2
vcl/inc/salsys.hxx |7 +
vcl/inc/win/salsys.h |2
vcl/ios/source/app/salsys.cxx | 19 +++--
vcl/source/app/svapp.cxx |2
vcl/source/app/svdata.cxx | 12 +--
vcl/win/source/app/salinfo.cxx |2
16 files changed, 172 insertions(+), 142 deletions(-)
New commits:
commit 98acef27d06dfa63274ec4ce0ec934fc52e5a15d
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Sep 18 12:40:57 2012 +0200
Don't access broken service mgr during bootstrap failure
...so that displaying a (non-translated) error box upon
BE_UNO_SERVICEMANAGER
works after all. Augment the error text with an exception message where
appropriate. This allows to revert fdfb7a3c4b3a89b73ab5546b9620348bc4984d8f
Related fdo#51252: Report uncaught exceptions with MessageBox on Windows
as
that was to catch and display failures from instantiating the service mgr.
(cherry picked from commit 6bcfa095121c91e8bbc396f5bcf7e95424b9)
Change-Id: I049a38e95342634796eb0e940e2ee8e55193c9d3
Reviewed-on: https://gerrit.libreoffice.org/654
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index c830b02..8805c57 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -107,15 +107,16 @@ class Desktop : public Application
static ResMgr* GetDesktopResManager();
static CommandLineArgs GetCommandLineArgs();
-voidHandleBootstrapErrors( BootstrapError );
-voidSetBootstrapError( BootstrapError nError )
+voidHandleBootstrapErrors(
+BootstrapError nError, rtl::OUString const aMessage );
+voidSetBootstrapError(
+BootstrapError nError, rtl::OUString const aMessage )
{
if ( m_aBootstrapError == BE_OK )
+{
m_aBootstrapError = nError;
-}
-BootstrapError GetBootstrapError() const
-{
-return m_aBootstrapError;
+m_aBootstrapErrorMessage = aMessage;
+}
}
voidSetBootstrapStatus( BootstrapStatus nStatus )
@@ -139,8 +140,6 @@ class Desktop : public Application
voidSetSplashScreenText( const ::rtl::OUString
rText );
voidSetSplashScreenProgress( sal_Int32 );
-static void ensureProcessServiceFactory();
-
private:
// Bootstrap methods
static ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory
CreateApplicationServiceManager();
@@ -163,9 +162,6 @@ class Desktop : public Application
voidHandleBootstrapPathErrors(
::utl::Bootstrap::Status, const ::rtl::OUString aMsg );
voidStartSetup( const ::rtl::OUString aParameters
);
-// Get a resource message string securely e.g. if resource cannot be
retrieved return aFaultBackMsg
-::rtl::OUString GetMsgString( sal_uInt16 nId, const
::rtl::OUString aFaultBackMsg );
-
// Create a error message depending on bootstrap failure code and an
optional file url
::rtl::OUString CreateErrorMsgString(
utl::Bootstrap::FailureCode nFailureCode,
const ::rtl::OUString
aFileURL );
@@ -207,6 +203,7 @@ class Desktop : public Application
boolm_bServicesRegistered;
sal_uInt16 m_nAppEvents;
BootstrapError m_aBootstrapError;
+rtl::OUString m_aBootstrapErrorMessage;
BootstrapStatus m_aBootstrapStatus;
std::auto_ptr Lockfile m_pLockfile;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 5fb653b..ea350ca 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -373,28 +373,34 @@ ResMgr* Desktop::GetDesktopResManager()
return Desktop::pResMgr;
}
+namespace {
+
//
// Get a message string securely. There is a fallback string if the resource
// is not available.
-OUString Desktop::GetMsgString( sal_uInt16 nId, const OUString
[PUSHED] Change in core[libreoffice-3-6]: Don't access broken service mgr during bootstrap failure
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/654 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/654 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I049a38e95342634796eb0e940e2ee8e55193c9d3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 4 commits - sc/source stoc/source sw/source xmloff/source
sc/source/ui/unoobj/dispuno.cxx |4 ++--
stoc/source/corereflection/crefl.cxx |5 +
sw/source/core/text/porlay.cxx|6 +++---
sw/source/ui/lingu/olmenu.cxx |2 +-
sw/source/ui/uno/unodispatch.cxx | 12 ++--
xmloff/source/style/XMLBackgroundImageContext.cxx |4 ++--
6 files changed, 19 insertions(+), 14 deletions(-)
New commits:
commit e7c9b468f364fd4796f0ff6fc6b76045ad58b26f
Author: Tor Lillqvist t...@iki.fi
Date: Thu Sep 20 14:05:17 2012 +0300
Add some static goodness here, too
Change-Id: I7de335925748b2cfe28a01f6975a630081b3172e
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index 7d0c2e9..9ca3481 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -45,8 +45,8 @@ using namespace com::sun::star;
//
-const char* cURLInsertColumns = .uno:DataSourceBrowser/InsertColumns; //data
into text
-const char* cURLDocDataSource = .uno:DataSourceBrowser/DocumentDataSource;
+static const char* cURLInsertColumns = .uno:DataSourceBrowser/InsertColumns;
//data into text
+static const char* cURLDocDataSource =
.uno:DataSourceBrowser/DocumentDataSource;
//
commit fed4ca185bc2fa29b915e6ea63b0bf7aeec29e5f
Author: Tor Lillqvist t...@iki.fi
Date: Thu Sep 20 13:56:26 2012 +0300
Sprinkle some staticness to avoid duplicate symbols when DISABLE_DYNLOADING
Change-Id: I9c5203400904902238c1f9a8f01338fdcf2904d8
diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx
b/xmloff/source/style/XMLBackgroundImageContext.cxx
index 3c46600..ae1e77b 100644
--- a/xmloff/source/style/XMLBackgroundImageContext.cxx
+++ b/xmloff/source/style/XMLBackgroundImageContext.cxx
@@ -82,14 +82,14 @@ const SvXMLTokenMapEntry*
lcl_getBGImgAttributesAttrTokenMap()
-SvXMLEnumMapEntry psXML_BrushHoriPos[] =
+static SvXMLEnumMapEntry psXML_BrushHoriPos[] =
{
{ XML_LEFT, GraphicLocation_LEFT_MIDDLE },
{ XML_RIGHT,GraphicLocation_RIGHT_MIDDLE},
{ XML_TOKEN_INVALID,0 }
};
-SvXMLEnumMapEntry psXML_BrushVertPos[] =
+static SvXMLEnumMapEntry psXML_BrushVertPos[] =
{
{ XML_TOP, GraphicLocation_MIDDLE_TOP },
{ XML_BOTTOM, GraphicLocation_MIDDLE_BOTTOM },
commit c672b1f43c64e5f411badc2deb2d39a7c0fe6373
Author: Tor Lillqvist t...@iki.fi
Date: Thu Sep 20 13:55:38 2012 +0300
No point with component_canUnload when DISABLE_DYNLOADING
Change-Id: I85016d1e70dbb5e499aefad568179800b5d00ab7
diff --git a/stoc/source/corereflection/crefl.cxx
b/stoc/source/corereflection/crefl.cxx
index 1af1b3a..3357a54 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -464,11 +464,16 @@ static struct ImplementationEntry g_entries[] =
extern C
{
+
+#ifndef DISABLE_DYNLOADING
+
SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
{
return g_moduleCount.canUnload( g_moduleCount , pTime );
}
+#endif
+
//==
SAL_DLLPUBLIC_EXPORT void * SAL_CALL reflection_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
commit 29b0c6093db08ed959022af7ee53b42b155c7fb5
Author: Tor Lillqvist t...@iki.fi
Date: Thu Sep 20 13:54:27 2012 +0300
Sprinkle some staticness to avoid duplicate symbols when DISABLE_DYNLOADING
Change-Id: I2d62eddb561baa28e320f7d89a8655d2806d7b10
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index d03304a..f1205dc 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -99,7 +99,7 @@ sal_Bool isTransparentChar ( xub_Unicode cCh )
* Checks if cCh + cNectCh builds a ligature (used for Kashidas)
*/
-sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh )
+static sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh )
{
// Lam + Alef
return ( isLamChar ( cCh ) isAlefChar ( cNextCh ));
@@ -111,7 +111,7 @@ sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode
cNextCh )
* Checks if cCh is connectable to cPrevCh (used for Kashidas)
*/
-sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh )
+static sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh )
{
const int32_t nJoiningType = u_getIntPropertyValue( cPrevCh,
UCHAR_JOINING_TYPE );
sal_Bool bRet = nJoiningType != U_JT_RIGHT_JOINING nJoiningType !=
U_JT_NON_JOINING;
@@ -126,7 +126,7 @@ sal_Bool lcl_ConnectToPrev( xub_Unicode cCh,
Re: LO build can not find external dependencies
On 20/09/12 13:12, Henrik /KaarPoSoft wrote: On 09/20/12 12:15, Michael Stahl wrote: On 19/09/12 10:35, Henrik /KaarPoSoft wrote: I also have export LD_LIBRARY_PATH=/opt/lib apparently the new build system overwrites this always, guess nobody ever needed to set this from the outside; you could try to edit various occurrences in solenv/gbuild to prepend the values if it is already defined. *Do you have any suggestions as to which files to look into/edit?* I do not have much experience with the LO codebase, and a grep for LD_LIBRARY_PATH returns almost 1000 files... look in solenv/gbuild, only 11 hits there; one of which to set gb_Helper_LIBRARY_PATH_VAR , which is used here: solenv/gbuild/platform/com_GCC_defs.mk:gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: javaunohelper/com javaunohelper/Library_juh.mk javaunohelper/Module_javaunohelper.mk
javaunohelper/Library_juh.mk | 11 ++
javaunohelper/Module_javaunohelper.mk |9 -
javaunohelper/com/sun/star/comp/helper/Bootstrap.java | 32 +-
3 files changed, 50 insertions(+), 2 deletions(-)
New commits:
commit 4b326ea35cb9193dbb530b9445a778d61bf8273d
Author: Tor Lillqvist t...@iki.fi
Date: Thu Sep 20 14:16:40 2012 +0300
No need for the juh/juhx dance when DISABLE_DYNLOADING
Change-Id: Ifc2bfb278947344d14b855ebf5527b603e333f15
diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk
index 4783bd9..1336469 100644
--- a/javaunohelper/Library_juh.mk
+++ b/javaunohelper/Library_juh.mk
@@ -36,8 +36,19 @@ $(eval $(call gb_Library_use_libraries,juh,\
$(gb_STDLIBS) \
))
+ifneq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_Library_add_exception_objects,juh,\
javaunohelper/source/preload \
))
+else
+# In the DISABLE_DYNLOADING case the juh library is a static archive that gets
+# linked into the single .so, so we can put directly into it the code that in
+# normal cases goes into the juhx library
+$(eval $(call gb_Library_add_exception_objects,juh,\
+javaunohelper/source/bootstrap \
+javaunohelper/source/javaunohelper \
+javaunohelper/source/vm \
+))
+endif
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/Module_javaunohelper.mk
b/javaunohelper/Module_javaunohelper.mk
index 27c53e4..181e10f 100644
--- a/javaunohelper/Module_javaunohelper.mk
+++ b/javaunohelper/Module_javaunohelper.mk
@@ -28,12 +28,19 @@
$(eval $(call gb_Module_Module,javaunohelper))
ifneq ($(SOLAR_JAVA),)
+
$(eval $(call gb_Module_add_targets,javaunohelper,\
Library_juh \
-Library_juhx \
Jar_juh \
Zip_juh \
))
+
+ifneq ($(DISABLE_DYNLOADING),TRUE)
+$(eval $(call gb_Module_add_targets,javaunohelper,\
+Library_juhx \
+))
+endif
+
endif
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index 120217f..2087aec 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -1,3 +1,5 @@
+// -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+
/*
* This file is part of the LibreOffice project.
*
@@ -191,7 +193,33 @@ public class Bootstrap {
if (! m_loaded_juh)
{
-NativeLibraryLoader.loadLibrary( Bootstrap.class.getClassLoader(),
juh );
+if (System.getProperty(java.vendor) == The Android Project)
+{
+// Find out if we are configured with DISABLE_DYNLOADING or
+// not. Try to load the lo-bootstrap shared library which
+// won't exist in the DISABLE_DYNLOADING case. (And which will
+// be already loaded otherwise, so nothing unexpected happens
+// that case.) Yeah, this would be simpler if I just could be
+// bothered to keep a separate branch for DISABLE_DYNLOADING
+// on Android, merging in master periodically, until I know
+// for sure whether it is what I want, or not.
+
+boolean disable_dynloading = false;
+try {
+System.loadLibrary( lo-bootstrap );
+} catch ( UnsatisfiedLinkError e ) {
+disable_dynloading = true;
+}
+
+if (!disable_dynloading)
+{
+NativeLibraryLoader.loadLibrary(
Bootstrap.class.getClassLoader(), juh );
+}
+}
+else
+{
+NativeLibraryLoader.loadLibrary(
Bootstrap.class.getClassLoader(), juh );
+}
m_loaded_juh = true;
}
return UnoRuntime.queryInterface(
@@ -318,3 +346,5 @@ public class Bootstrap {
}.start();
}
}
+
+// vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: idl/source
idl/source/objects/types.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit b869b73947659c45c1edc5f9cff80bfbe61e52ac
Author: Tor Lillqvist t...@iki.fi
Date: Thu Sep 20 14:18:22 2012 +0300
Avoid duplicate symbols when DISABLE_DYNLOADING for Android
Change-Id: Iecd0ed802f6cc715ac77256bb4b49082b5976b4f
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 9186857..e6cc629 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1410,6 +1410,9 @@ void SvMetaType::WriteSfxItem(
// write the implementation part
rOutStm #ifdef SFX_TYPEMAP endl
+ #if defined(DISABLE_DYNLOADING) defined(ANDROID) endl
+ __attribute__((__weak__)) endl
+ #endif endl
aTypeName.getStr() aVarName.getStr()
= endl;
rOutStm '{' endl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editview.cxx |2 +-
editeng/source/editeng/impedit2.cxx |2 +-
editeng/source/editeng/impedit3.cxx |4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 45bae63f0f56060e2a609ebb2610502a3722dfee
Author: Tor Lillqvist t...@iki.fi
Date: Thu Sep 20 14:19:46 2012 +0300
Add some static goodness here, too, to avoid duplicate symbols
Change-Id: Ie5e7aecd4f1c0e5b4dda9250ae755bf9210e048f
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index bd13494..9cb8900 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -85,7 +85,7 @@ DBG_NAME( EditView )
// From SW = Create common method
-LanguageType lcl_CheckLanguage(
+static LanguageType lcl_CheckLanguage(
const OUString rText,
Reference XSpellChecker1 xSpell,
Reference linguistic2::XLanguageGuessing xLangGuess,
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index a85b163..3c9990e 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -1675,7 +1675,7 @@ sal_Bool ImpEditEngine::IsInputSequenceCheckingRequired(
sal_Unicode nChar, cons
return bIsSequenceChecking;
}
- bool lcl_HasStrongLTR ( const String rTxt, xub_StrLen nStart, xub_StrLen
nEnd )
+static bool lcl_HasStrongLTR ( const String rTxt, xub_StrLen nStart,
xub_StrLen nEnd )
{
for ( xub_StrLen nCharIdx = nStart; nCharIdx nEnd; ++nCharIdx )
{
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 027302f..8e20ae0 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -254,7 +254,7 @@ Point lcl_ImplCalcRotatedPos( Point rPos, Point rOrigin,
double nSin, double nCo
return aTranslatedPos;
}
-sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh ) // For
Kashidas from sw/source/core/text/porlay.txt
+static sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh ) // For
Kashidas from sw/source/core/text/porlay.txt
{
// Lam + Alef
return ( 0x644 == cCh 0x627 == cNextCh ) ||
@@ -262,7 +262,7 @@ sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode
cNextCh ) // For Kashidas
( 0x628 == cCh 0x631 == cNextCh );
}
-sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh ) // For
Kashidas from sw/source/core/text/porlay.txt
+static sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh ) //
For Kashidas from sw/source/core/text/porlay.txt
{
// Alef, Dal, Thal, Reh, Zain, and Waw do not connect to the left
sal_Bool bRet = 0x627 != cPrevCh 0x62F != cPrevCh 0x630 != cPrevCh
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Options included in CC/CXX vs. in gb_CFLAGS/gb_CXXFLAGS
On 20/09/12 09:08, Stephan Bergmann wrote: On 09/20/2012 08:48 AM, Tor Lillqvist wrote: I think there is some fuzziness about what compiler options should be part of the CC/CXX variables and what should be in gb_CFLAGS/gb_CXXFLAGS. In some cases, like my Mac build tree that uses the 10.4 SDK, from Xcode 3 installed in /Xcode3, gb_CXXFLAGS contains at least one flag that apparently *must* be used for also external projects (well, liborcus in particular) to compile successfully. This is the -isysroot from solenv/gbuild/platform/macosx.mk. [...] In other cases (normal Linuxes?) gb_CXXFLAGS contains just optional flags that will in fact hurt an external project that isn't prepared for them, like -Werror. agree, there is some distinction to be made between mandatory flags that must be used for everything like sysroot and flags that are just intended for LO code. Should the -isysroot flag actually be part ot CC/CXX, not gb_CXXFLAGS? Should configure.in and macosx.mk be modified thusly? I think there has traditionally not been much consistency in this area in OOo. Originally, I think this was exclusively handled via flags variables (and re-crafting similar such variables for passing to external projects, with values more or less similar to the primary OOo variables). Much cruft here also stems from the fact that Sun's internal OOo build environment required lots of overrides (as builds on arbitrary machines used a centralized toolchain instead of a local one), and this was typically achieved with ad-hoc fixes instead of a truly principled approach. That said, your rule of when to put something into CC/CXX vs. gb_CXXFLAGS etc. sounds good to me. i didn't quite get what tml's rule is exactly :) but anyway there are basically 2 options for getting mandatory flags like -isysroot used everywhere: either include them in CC/CXX, or manage some additional gb_MANDATORY_CFLAGS or whatever that are passed as CFLAGS=$(gb_MANDATORY_CFLAGS) $(CFLAGS) to all invoked external configure etc. scripts or makefiles. i think the CC/CXX apporach is harder to get wrong. btw, why doesn't macosx.mk use --sysroot, which is much better than -isysroot because it mangles the library search path as well? is the gcc too old for it? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Options included in CC/CXX vs. in gb_CFLAGS/gb_CXXFLAGS
btw, why doesn't macosx.mk use --sysroot, which is much better than -isysroot because it mangles the library search path as well? is the gcc too old for it? man gcc: -isysroot dir This option is like the --sysroot option, but applies only to header files, except for Apple's version of GCC, where it applies to both header files and libraries and effectively replaces the --sysroot option. See the --sysroot option for more information. man clang doesn't mention either option, but presumably they have it meaning the same as in gcc. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx import: position table using tblInd OR tblCellMar
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/655 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/655/1 docx import: position table using tblInd OR tblCellMar Previously cell-margin was unconditionnaly used to compute table position. Office only does so on top-level tables and if tblInd is missing. Change-Id: I183647bcf090d5822b3f2e04e097c8bbd277168d --- M writerfilter/inc/resourcemodel/TableManager.hxx M writerfilter/source/dmapper/DomainMapperTableHandler.cxx M writerfilter/source/dmapper/DomainMapperTableHandler.hxx M writerfilter/source/resourcemodel/resourcemodel.cxx 4 files changed, 27 insertions(+), 7 deletions(-) -- To view, visit https://gerrit.libreoffice.org/655 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I183647bcf090d5822b3f2e04e097c8bbd277168d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] docx export: if table has no width use w:tblW 'auto' type
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/657 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/657/1 docx export: if table has no width use w:tblW 'auto' type Change-Id: I085febf04205181e7c4488bc948f346f92070fe2 --- M sw/source/filter/ww8/docxattributeoutput.cxx 1 file changed, 2 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/657 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I085febf04205181e7c4488bc948f346f92070fe2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Options included in CC/CXX vs. in gb_CFLAGS/gb_CXXFLAGS
Hi Tor, *, rantIt is pointless to write to the mailinglist for feedback, if you don't even wait two ours before taking the action you ask to be OK or not. If you want to do it, just do it, but such alibi posts don't really make much sense then./rant On Thu, Sep 20, 2012 at 10:29 AM, Tor Lillqvist t...@iki.fi wrote: Should the -isysroot flag actually be part ot CC/CXX, not gb_CXXFLAGS? Should configure.in and macosx.mk be modified thusly? That's what I did, and reverted my other attempts from this morning to get liborcus to build, external modules traditionally got EXTRA_CDEFS as their CPPFLAGS and EXTRA_CFLAGS in their CFLAGS. and it seems that it was a good move, the tinderboxes are getting greener now. And now the build will break for those who use CC=/path/to/ccache gcc, won't it? I don't care personally, as I have it setup using path symlinks. (that configure happily doubles to call it with an additional ccache - doppelt hält besser.) ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Options included in CC/CXX vs. in gb_CFLAGS/gb_CXXFLAGS
And now the build will break for those who use CC=/path/to/ccache gcc, won't it? Probably, yes. But that might well have happened earlier, too. Living on the master branch requires some manual adaption now and then. The alternative would be to make no progress. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Failed to compile accessibility module due to gb_Deliver_deliver file is missing.
It looks like you're trying to build individual pieces without doing a complete build first. Before you try hacking on individual modules, you have to first have a complete build i.e. ./autogen.sh make and let it run to completion. May take several hours. On 2012-09-20 14:54, LOH KOK HOE wrote: Hi noel, When I issue the command make rsc I got this error: make -r -f /home/kokhoe/workspace/LibreOffice/core/Makefile.top rsc make[1]: Entering directory `/home/kokhoe/workspace/LibreOffice/core' cd rsc make -j 2 -rs gb_PARTIALBUILD=T make[2]: Entering directory `/home/kokhoe/workspace/LibreOffice/core/rsc' [build DEP] LNK:Executable/rsc make[2]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core/rsc' make[2]: Entering directory `/home/kokhoe/workspace/LibreOffice/core/rsc' [info ALL] LinkTarget Library/libi18nisolang1gcc3.so not defined: Assuming headers to be there! [info ALL] LinkTarget Library/libtllo.so not defined: Assuming headers to be there! [build YAC] rsc/source/parser/rscyacc /home/kokhoe/workspace/LibreOffice/core/solenv/gbuild/Library.mk:54: *** gb_Deliver_deliver: file does not exist in solver, and cannot be delivered: /home/kokhoe/workspace/LibreOffice/core/solver/unxlngx6.pro/lib/libi18nisolang1gcc3.so http://unxlngx6.pro/lib/libi18nisolang1gcc3.so. Stop. make[2]: *** Waiting for unfinished jobs /home/kokhoe/workspace/LibreOffice/core/rsc/source/parser/rscyacc.y: conflicts: 2 shift/reduce make[2]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core/rsc' make[1]: *** [rsc] Error 2 make[1]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core' make: *** [rsc] Error 2 It seems that I was missing the libi18nisolang1gcc3.so file. Any advice? THanks @! On Wed, Sep 19, 2012 at 10:04 PM, Noel Grandin n...@peralex.com mailto:n...@peralex.com wrote: Looks like the RSC module build failed. Try building RSC by itself first (make rsc) On 2012-09-19 16:01, LOH KOK HOE wrote: I am trying to compile accessibility module by using following command make accessibility Unfortunately the compilation was fail due to the file named gb_Deliver_deliver was missing. May I know where can I get the missing file so that I can complete the compilation. Here is the full stack trace: * * Running the post download checks. * checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu cd accessibility make -j 2 -rs gb_PARTIALBUILD=T make[2]: Entering directory `/home/kokhoe/workspace/LibreOffice/core/accessibility' /home/kokhoe/workspace/LibreOffice/core/solenv/gbuild/Package.mk:44: *** gb_Deliver_deliver: file does not exist in solver, and cannot be delivered: /home/kokhoe/workspace/LibreOffice/core/solver/unxlngx6.pro/bin/rsc http://unxlngx6.pro/bin/rsc. Stop. make[2]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core/accessibility' make[1]: *** [accessibility] Error 2 make[1]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core' make: *** [accessibility] Error 2 THanks @! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org mailto:LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice Disclaimer: http://www.peralex.com/disclaimer.html Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] i18npool Add locale data for ebo_CG and tyx_CG
I hereby declare that: All my contributions, past and future, to LibreOffice are licensed under the terms of the MPL / LGPLv3+. Jeremy Brown ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Failed to compile accessibility module due to gb_Deliver_deliver file is missing.
Sorry noel, I just want to know the options available for ./autogen.sh, and I had accidentally type ./autogen.sh help. Thus the next time I issuing the command ./autogen.sh I have following error. Is there a way to clean it? *console output* running ./configure with 'help' configure: WARNING: you should use --build, --host, --target * * Running LibreOffice build configuration. * checking build system type... Invalid configuration `help': machine `help' not recognized configure: error: /bin/sh ./config.sub help failed Error running configure at ./autogen.sh line 187. THanks @! On Thu, Sep 20, 2012 at 9:06 PM, Noel Grandin n...@peralex.com wrote: It looks like you're trying to build individual pieces without doing a complete build first. Before you try hacking on individual modules, you have to first have a complete build i.e. ./autogen.sh make and let it run to completion. May take several hours. On 2012-09-20 14:54, LOH KOK HOE wrote: Hi noel, When I issue the command make rsc I got this error: make -r -f /home/kokhoe/workspace/LibreOffice/core/Makefile.top rsc make[1]: Entering directory `/home/kokhoe/workspace/LibreOffice/core' cd rsc make -j 2 -rs gb_PARTIALBUILD=T make[2]: Entering directory `/home/kokhoe/workspace/LibreOffice/core/rsc' [build DEP] LNK:Executable/rsc make[2]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core/rsc' make[2]: Entering directory `/home/kokhoe/workspace/LibreOffice/core/rsc' [info ALL] LinkTarget Library/libi18nisolang1gcc3.so not defined: Assuming headers to be there! [info ALL] LinkTarget Library/libtllo.so not defined: Assuming headers to be there! [build YAC] rsc/source/parser/rscyacc /home/kokhoe/workspace/LibreOffice/core/solenv/gbuild/Library.mk:54: *** gb_Deliver_deliver: file does not exist in solver, and cannot be delivered: /home/kokhoe/workspace/LibreOffice/core/solver/ unxlngx6.pro/lib/libi18nisolang1gcc3.so. Stop. make[2]: *** Waiting for unfinished jobs /home/kokhoe/workspace/LibreOffice/core/rsc/source/parser/rscyacc.y: conflicts: 2 shift/reduce make[2]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core/rsc' make[1]: *** [rsc] Error 2 make[1]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core' make: *** [rsc] Error 2 It seems that I was missing the libi18nisolang1gcc3.so file. Any advice? THanks @! On Wed, Sep 19, 2012 at 10:04 PM, Noel Grandin n...@peralex.com wrote: Looks like the RSC module build failed. Try building RSC by itself first (make rsc) On 2012-09-19 16:01, LOH KOK HOE wrote: I am trying to compile accessibility module by using following command make accessibility Unfortunately the compilation was fail due to the file named gb_Deliver_deliver was missing. May I know where can I get the missing file so that I can complete the compilation. Here is the full stack trace: * * Running the post download checks. * checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu cd accessibility make -j 2 -rs gb_PARTIALBUILD=T make[2]: Entering directory `/home/kokhoe/workspace/LibreOffice/core/accessibility' /home/kokhoe/workspace/LibreOffice/core/solenv/gbuild/Package.mk:44: *** gb_Deliver_deliver: file does not exist in solver, and cannot be delivered: /home/kokhoe/workspace/LibreOffice/core/solver/unxlngx6.pro/bin/rsc. Stop. make[2]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core/accessibility' make[1]: *** [accessibility] Error 2 make[1]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core' make: *** [accessibility] Error 2 THanks @! ___ LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice -- Disclaimer: http://www.peralex.com/disclaimer.html -- Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] neon: convert to gbuild
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/659 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/659/1 neon: convert to gbuild Change-Id: I1cca0e3be7e148c835af26d2c001878b849e8432 --- M Makefile.top M Module_tail_build.mk M RepositoryExternal.mk M RepositoryModule_ooo.mk M config_host.mk.in M configure.in A neon/Library_neon.mk A neon/Makefile A neon/Module_neon.mk A neon/UnpackedTarball_neon.mk A neon/configs/config.h D neon/makefile.mk M neon/neon.patch D neon/neon_exports_unix.patch D neon/neon_exports_win.patch M neon/neon_ne_set_request_flag.patch M neon/prj/d.lst D neon/prj/dmake D neon/version.mk M ooo.lst.in M solenv/inc/libs.mk M tail_build/prj/build.lst M ucb/prj/build.lst M xmlsecurity/prj/build.lst 24 files changed, 647 insertions(+), 1,367 deletions(-) -- To view, visit https://gerrit.libreoffice.org/659 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1cca0e3be7e148c835af26d2c001878b849e8432 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] allow Library to disable hidden visibility
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/658 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/658/1 allow Library to disable hidden visibility Change-Id: I1f676b7536183f68795595f216ae23610cadb1eb --- M solenv/gbuild/Library.mk M solenv/gbuild/LinkTarget.mk M solenv/gbuild/platform/com_GCC_class.mk M solenv/gbuild/platform/com_GCC_defs.mk M solenv/gbuild/platform/macosx.mk M solenv/gbuild/platform/solaris.mk M solenv/gbuild/platform/unxgcc.mk 7 files changed, 22 insertions(+), 54 deletions(-) -- To view, visit https://gerrit.libreoffice.org/658 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f676b7536183f68795595f216ae23610cadb1eb Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Failed to compile accessibility module due to gb_Deliver_deliver file is missing.
Maybe you should try reading the documentation? http://wiki.documentfoundation.org/Development/Native_Build On 2012-09-20 15:46, LOH KOK HOE wrote: Sorry noel, I just want to know the options available for ./autogen.sh, and I had accidentally type ./autogen.sh help. Thus the next time I issuing the command ./autogen.sh I have following error. Is there a way to clean it? *_console output_* running ./configure with 'help' configure: WARNING: you should use --build, --host, --target * * Running LibreOffice build configuration. * checking build system type... Invalid configuration `help': machine `help' not recognized configure: error: /bin/sh ./config.sub help failed Error running configure at ./autogen.sh line 187. THanks @! On Thu, Sep 20, 2012 at 9:06 PM, Noel Grandin n...@peralex.com mailto:n...@peralex.com wrote: It looks like you're trying to build individual pieces without doing a complete build first. Before you try hacking on individual modules, you have to first have a complete build i.e. ./autogen.sh make and let it run to completion. May take several hours. On 2012-09-20 14:54, LOH KOK HOE wrote: Hi noel, When I issue the command make rsc I got this error: make -r -f /home/kokhoe/workspace/LibreOffice/core/Makefile.top rsc make[1]: Entering directory `/home/kokhoe/workspace/LibreOffice/core' cd rsc make -j 2 -rs gb_PARTIALBUILD=T make[2]: Entering directory `/home/kokhoe/workspace/LibreOffice/core/rsc' [build DEP] LNK:Executable/rsc make[2]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core/rsc' make[2]: Entering directory `/home/kokhoe/workspace/LibreOffice/core/rsc' [info ALL] LinkTarget Library/libi18nisolang1gcc3.so not defined: Assuming headers to be there! [info ALL] LinkTarget Library/libtllo.so not defined: Assuming headers to be there! [build YAC] rsc/source/parser/rscyacc /home/kokhoe/workspace/LibreOffice/core/solenv/gbuild/Library.mk:54: *** gb_Deliver_deliver: file does not exist in solver, and cannot be delivered: /home/kokhoe/workspace/LibreOffice/core/solver/unxlngx6.pro/lib/libi18nisolang1gcc3.so http://unxlngx6.pro/lib/libi18nisolang1gcc3.so. Stop. make[2]: *** Waiting for unfinished jobs /home/kokhoe/workspace/LibreOffice/core/rsc/source/parser/rscyacc.y: conflicts: 2 shift/reduce make[2]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core/rsc' make[1]: *** [rsc] Error 2 make[1]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core' make: *** [rsc] Error 2 It seems that I was missing the libi18nisolang1gcc3.so file. Any advice? THanks @! On Wed, Sep 19, 2012 at 10:04 PM, Noel Grandin n...@peralex.com mailto:n...@peralex.com wrote: Looks like the RSC module build failed. Try building RSC by itself first (make rsc) On 2012-09-19 16:01, LOH KOK HOE wrote: I am trying to compile accessibility module by using following command make accessibility Unfortunately the compilation was fail due to the file named gb_Deliver_deliver was missing. May I know where can I get the missing file so that I can complete the compilation. Here is the full stack trace: * * Running the post download checks. * checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu cd accessibility make -j 2 -rs gb_PARTIALBUILD=T make[2]: Entering directory `/home/kokhoe/workspace/LibreOffice/core/accessibility' /home/kokhoe/workspace/LibreOffice/core/solenv/gbuild/Package.mk:44: *** gb_Deliver_deliver: file does not exist in solver, and cannot be delivered: /home/kokhoe/workspace/LibreOffice/core/solver/unxlngx6.pro/bin/rsc http://unxlngx6.pro/bin/rsc. Stop. make[2]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core/accessibility' make[1]: *** [accessibility] Error 2 make[1]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core' make: *** [accessibility] Error 2 THanks @! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org mailto:LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice Disclaimer: http://www.peralex.com/disclaimer.html
Re: How to use internal neon ?
On 10 September 2012 21:53, Caolán McNamara caol...@redhat.com wrote: On Mon, 2012-09-10 at 18:55 +0200, Matúš Kukan wrote: Hi, I am pondering gbuildizing neon. It's built by dmake as dynamic library currently. Could it be used as static library ? It used to be a static library but got converted to a shared library with 386b66d1a91f081b7f5f7673bfe640fa0d6b602c for https://issues.apache.org/ooo/show_bug.cgi?id=105418 I see, so it will be a little complicated with exporting symbols. Currently, there is even .map file used. (probably, I don't know how dmake works) I've removed .map files, allowed to turn of -fvisibility=hidden in https://gerrit.libreoffice.org/#/c/658/ and then tried to convert neon in https://gerrit.libreoffice.org/#/c/659/ Seems to work for me on Linux. Is this approach right ? If anybody could try make ucb.all with MinGW and MacOSX, to see if it links, that would be nice. ( with --enable-neon of course ) And why there is --disable-neon option if we can build internal copy ? This comes from https://issues.apache.org/ooo/show_bug.cgi?id=61380 as a5a236bc116ba38a6668f38bbb924ad333b7fdab Good to know. Thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/unxgcc.mk |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 4ba760078019fba15f9d0d33a6094960026b9dfb
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Sep 20 15:54:23 2012 +0200
Make make debugrun less fancy but more useful
For one, --tui has negative impact on terminal behavior in certain ssh
scenarios
for me. Whether and how to use it should be a user's personal choice
anyway.
For another, you sometimes need to interact with gdb early, so do not
automatically start to run soffice.bin.
Change-Id: I1a1a02f5359aae2a11effa6620aebf01202357f9
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index e6ed9e3..080a3ad 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -390,9 +390,8 @@ endef
define gb_Module_DEBUGRUNCOMMAND
OFFICESCRIPT=`mktemp` \
printf 'if [ -e $(DEVINSTALLDIR)/opt/program/ooenv ]; then .
$(DEVINSTALLDIR)/opt/program/ooenv; fi\n' $${OFFICESCRIPT} \
-printf gdb --tui $(DEVINSTALLDIR)/opt/program/soffice.bin
$${OFFICESCRIPT} \
+printf gdb $(DEVINSTALLDIR)/opt/program/soffice.bin $${OFFICESCRIPT} \
printf -ex \set args --norestore --nologo '--accept=pipe,name=$(USER);urp;'
-env:UserInstallation=file://$(DEVINSTALLDIR)/\ $${OFFICESCRIPT} \
-printf -ex \r\\\n $${OFFICESCRIPT} \
$(SHELL) $${OFFICESCRIPT} \
rm $${OFFICESCRIPT}
endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Failed to compile accessibility module due to gb_Deliver_deliver file is missing.
I have already figure it out how to resolve my problem by re-issuing the ./autogen.sh command with new options. BTW, I have read that document before I start compiling, just that my typing skills is very bad. :p Anyway, thank you so much on your help. THanks @! On Thu, Sep 20, 2012 at 9:58 PM, Noel Grandin n...@peralex.com wrote: Maybe you should try reading the documentation? http://wiki.documentfoundation.org/Development/Native_Build On 2012-09-20 15:46, LOH KOK HOE wrote: Sorry noel, I just want to know the options available for ./autogen.sh, and I had accidentally type ./autogen.sh help. Thus the next time I issuing the command ./autogen.sh I have following error. Is there a way to clean it? *console output* running ./configure with 'help' configure: WARNING: you should use --build, --host, --target * * Running LibreOffice build configuration. * checking build system type... Invalid configuration `help': machine `help' not recognized configure: error: /bin/sh ./config.sub help failed Error running configure at ./autogen.sh line 187. THanks @! On Thu, Sep 20, 2012 at 9:06 PM, Noel Grandin n...@peralex.com wrote: It looks like you're trying to build individual pieces without doing a complete build first. Before you try hacking on individual modules, you have to first have a complete build i.e. ./autogen.sh make and let it run to completion. May take several hours. On 2012-09-20 14:54, LOH KOK HOE wrote: Hi noel, When I issue the command make rsc I got this error: make -r -f /home/kokhoe/workspace/LibreOffice/core/Makefile.top rsc make[1]: Entering directory `/home/kokhoe/workspace/LibreOffice/core' cd rsc make -j 2 -rs gb_PARTIALBUILD=T make[2]: Entering directory `/home/kokhoe/workspace/LibreOffice/core/rsc' [build DEP] LNK:Executable/rsc make[2]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core/rsc' make[2]: Entering directory `/home/kokhoe/workspace/LibreOffice/core/rsc' [info ALL] LinkTarget Library/libi18nisolang1gcc3.so not defined: Assuming headers to be there! [info ALL] LinkTarget Library/libtllo.so not defined: Assuming headers to be there! [build YAC] rsc/source/parser/rscyacc /home/kokhoe/workspace/LibreOffice/core/solenv/gbuild/Library.mk:54: *** gb_Deliver_deliver: file does not exist in solver, and cannot be delivered: /home/kokhoe/workspace/LibreOffice/core/solver/ unxlngx6.pro/lib/libi18nisolang1gcc3.so. Stop. make[2]: *** Waiting for unfinished jobs /home/kokhoe/workspace/LibreOffice/core/rsc/source/parser/rscyacc.y: conflicts: 2 shift/reduce make[2]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core/rsc' make[1]: *** [rsc] Error 2 make[1]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core' make: *** [rsc] Error 2 It seems that I was missing the libi18nisolang1gcc3.so file. Any advice? THanks @! On Wed, Sep 19, 2012 at 10:04 PM, Noel Grandin n...@peralex.com wrote: Looks like the RSC module build failed. Try building RSC by itself first (make rsc) On 2012-09-19 16:01, LOH KOK HOE wrote: I am trying to compile accessibility module by using following command make accessibility Unfortunately the compilation was fail due to the file named gb_Deliver_deliver was missing. May I know where can I get the missing file so that I can complete the compilation. Here is the full stack trace: * * Running the post download checks. * checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu cd accessibility make -j 2 -rs gb_PARTIALBUILD=T make[2]: Entering directory `/home/kokhoe/workspace/LibreOffice/core/accessibility' /home/kokhoe/workspace/LibreOffice/core/solenv/gbuild/Package.mk:44: *** gb_Deliver_deliver: file does not exist in solver, and cannot be delivered: /home/kokhoe/workspace/LibreOffice/core/solver/unxlngx6.pro/bin/rsc. Stop. make[2]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core/accessibility' make[1]: *** [accessibility] Error 2 make[1]: Leaving directory `/home/kokhoe/workspace/LibreOffice/core' make: *** [accessibility] Error 2 THanks @! ___ LibreOffice mailing listLibreOffice@lists.freedesktop.orghttp://lists.freedesktop.org/mailman/listinfo/libreoffice -- Disclaimer: http://www.peralex.com/disclaimer.html -- Disclaimer: http://www.peralex.com/disclaimer.html -- Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org
Build error in offapi module
I was trying to make a clean build using this command ./autogen.sh and have encountering a build error in offapi module. I am running out of clue on how this problem could be solve. Below are the details of the stack trace, hope you guys can give some pointer. *Trace extract from build_error.log* === log for /home/kokhoe/workspace/LibreOffice/core/offapi/prj make[2]: *** No rule to make target `/home/kokhoe/workspace/LibreOffice/core/offapi/com/sun/star/auth/SSOExceptions.idl', needed by `/home/kokhoe/workspace/LibreOffice/core/workdir/ unxlngx6.pro/UnoApiPartTarget/offapi/com/sun/star/auth/SSOManagerFactory.urd'. Stop. *Trace from Terminal output* = (60/77) Building module jurt = Entering /home/kokhoe/workspace/LibreOffice/core/jurt/prj gbuild module /home/kokhoe/workspace/LibreOffice/core/jurt: make -f Makefile -j1 -rs all slowcheck gb_PARTIALBUILD=T [javac] Note: Some input files use or override a deprecated API. [javac] Note: Recompile with -Xlint:deprecation for details. [javac] Note: Some input files use unchecked or unsafe operations. [javac] Note: Recompile with -Xlint:unchecked for details. [copy] Copying 29 files to /home/kokhoe/workspace/LibreOffice/core/jfreereport/ unxlngx6.pro/misc/build/flow-engine-0.9.4/build/classes jar: [copy] Copying 1 file to /home/kokhoe/workspace/LibreOffice/core/jfreereport/ unxlngx6.pro/misc/build/flow-engine-0.9.4/build [jar] Building jar: /home/kokhoe/workspace/LibreOffice/core/jfreereport/ unxlngx6.pro/misc/build/flow-engine-0.9.4/build/lib/flow-engine.jar [build JCS] Jar/jurt BUILD SUCCESSFUL Total time: 2 seconds cp -f ../../ unxlngx6.pro/misc/build/flow-engine-0.9.4/build/lib/flow-engine.jar ../../ unxlngx6.pro/class/flow-engine-0.9.4.jar jfreereport deliver Module 'jfreereport' delivered successfully. 13 files copied, 0 files unchanged Note: Some input files use or override a deprecated API. Note: Recompile with -Xlint:deprecation for details. [build JAR] jurt [build C ] jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c [build LNK] Library/libjpipe.so [build ZIP] jurt_src [build MOD] jurt [build ALL] top level modules: jurt [build ALL] loaded modules: jurt [build CHK] loaded modules: jurt [build SLC] jurt [build SLC] loaded modules: jurt jurt deliver THanks @! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oox/source
oox/source/vml/vmlshape.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit b5a1db961372b3fa66724ee580726c67e7683dbc Author: Miklos Vajna vmik...@suse.cz Date: Thu Sep 20 16:13:51 2012 +0200 n#779834 fix VML import of absolutely positioned image with no left margin Given that we talk about mm100, changing 0 to 1 is not that harmful, and it seems later core would crash without at least a small margin. Change-Id: I913e4a5eeaba2e36b55f2d7d7fb5bdfbad8eae94 diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 0bd3399..fecade9 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -172,8 +172,13 @@ Rectangle ShapeType::getAbsRectangle() const if ( nHeight == 0 ) nHeight = 1; +sal_Int32 nLeft = ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maLeft, 0, true, true ) ++ ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maMarginLeft, 0, true, true ); +if (nLeft == 0 maTypeModel.maPosition == absolute) +nLeft = 1; + return Rectangle( -ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maLeft, 0, true, true ) + ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maMarginLeft, 0, true, true ), +nLeft, ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maTop, 0, false, true ) + ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maTypeModel.maMarginTop, 0, false, true ), nWidth, nHeight ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#39468: Translated German comments in sw/source/core/text
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/660 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/660/1 fdo#39468: Translated German comments in sw/source/core/text Change-Id: I53a415e1ec573d342e06d0cf10bad6f8cb95b478 --- M sw/source/core/text/txttab.cxx M sw/source/core/text/widorp.cxx 2 files changed, 94 insertions(+), 100 deletions(-) -- To view, visit https://gerrit.libreoffice.org/660 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I53a415e1ec573d342e06d0cf10bad6f8cb95b478 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gerhard öttl lo...@ogersoft.at ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/rangenam.hxx |3 +-
sc/source/core/tool/rangenam.cxx| 36 +---
sc/source/filter/oox/defnamesbuffer.cxx | 13 +--
3 files changed, 37 insertions(+), 15 deletions(-)
New commits:
commit 7539a695b801b92d10ff30463a8c08672a258442
Author: Noel Power noel.po...@suse.com
Date: Thu Sep 20 15:05:00 2012 +0100
xlsx fix cyclic referenced defined names partially fixes bnc#780296
bnc#781166
Change-Id: Ibad37ac05c608c0211063bfa73931427d48c11f9
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index d370328..64955e1 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -87,7 +87,7 @@ private:
SCCOL mnMaxCol;
void CompileRangeData( const String rSymbol, bool bSetError );
-
+void InitCode();
public:
typedef ::std::mapsal_uInt16, sal_uInt16 IndexMap;
@@ -120,6 +120,7 @@ public:
voidSetIndex( sal_uInt16 nInd ) { nIndex = nInd; }
sal_uInt16GetIndex() const{ return nIndex; }
ScTokenArray* GetCode() { return pCode; }
+SC_DLLPUBLIC void SetCode( ScTokenArray );
const ScTokenArray* GetCode() const { return pCode; }
SC_DLLPUBLIC sal_uInt16 GetErrCode() const;
boolHasReferences() const;
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index a2f67a2..8a52a71 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -100,18 +100,7 @@ ScRangeData::ScRangeData( ScDocument* pDok,
mnMaxRow(-1),
mnMaxCol(-1)
{
-if( !pCode-GetCodeError() )
-{
-pCode-Reset();
-FormulaToken* p = pCode-GetNextReference();
-if( p ) // exact one reference at first
-{
-if( p-GetType() == svSingleRef )
-eType = eType | RT_ABSPOS;
-else
-eType = eType | RT_ABSAREA;
-}
-}
+InitCode();
}
ScRangeData::ScRangeData( ScDocument* pDok,
@@ -648,6 +637,29 @@ void ScRangeData::ValidateTabRefs()
}
}
+void ScRangeData::SetCode( ScTokenArray rArr )
+{
+::std::auto_ptrScTokenArray pOldCode( pCode); // old pCode will be
deleted
+pCode = new ScTokenArray( rArr );
+InitCode();
+}
+
+void ScRangeData::InitCode()
+{
+if( !pCode-GetCodeError() )
+{
+pCode-Reset();
+FormulaToken* p = pCode-GetNextReference();
+if( p ) // exact one reference at first
+{
+if( p-GetType() == svSingleRef )
+eType = eType | RT_ABSPOS;
+else
+eType = eType | RT_ABSAREA;
+}
+}
+}
+
extern C
int SAL_CALL ScRangeData_QsortNameCompare( const void* p1, const void* p2 )
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx
b/sc/source/filter/oox/defnamesbuffer.cxx
index b31b5fb..6a3a3aa 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -382,9 +382,9 @@ void DefinedName::createNameObject( sal_Int32 nIndex )
// create the name and insert it into the document, maCalcName will be
changed to the resulting name
if (maModel.mnSheet = 0)
-mpScRangeData = createLocalNamedRangeObject( maCalcName, getTokens(),
nIndex, nNameFlags, maModel.mnSheet );
+mpScRangeData = createLocalNamedRangeObject( maCalcName,
ApiTokenSequence(), nIndex, nNameFlags, maModel.mnSheet );
else
-mpScRangeData = createNamedRangeObject( maCalcName, getTokens(),
nIndex, nNameFlags );
+mpScRangeData = createNamedRangeObject( maCalcName,
ApiTokenSequence(), nIndex, nNameFlags );
mnTokenIndex = nIndex;
}
@@ -426,6 +426,15 @@ DefinedName::getTokens()
void DefinedName::convertFormula()
{
+// convert and set formula of the defined name
+if ( getFilterType() == FILTER_OOXML )
+{
+ApiTokenSequence aTokens = getTokens();
+ScTokenArray aTokenArray;
+(void)ScTokenConversion::ConvertToTokenArray( this-getScDocument(),
aTokenArray, aTokens );
+mpScRangeData-SetCode( aTokenArray );
+}
+
ScTokenArray* pTokenArray = mpScRangeData-GetCode();
Sequence FormulaToken aFTokenSeq;
(void)ScTokenConversion::ConvertToTokenSequence( this-getScDocument(),
aFTokenSeq, *pTokenArray );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build error in offapi module
On 09/20/2012 04:18 PM, LOH KOK HOE wrote: I was trying to make a clean build Did you actually do make clean? offapi/com/sun/star/auth/SSOExceptions.idl was removed quite a while ago on master, so it looks to me like you still have some remains from on old build around. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to use internal neon ?
On 09/20/2012 04:00 PM, Matúš Kukan wrote: I see, so it will be a little complicated with exporting symbols. Currently, there is even .map file used. (probably, I don't know how dmake works) I've removed .map files, allowed to turn of -fvisibility=hidden in https://gerrit.libreoffice.org/#/c/658/ and then tried to convert neon in https://gerrit.libreoffice.org/#/c/659/ Seems to work for me on Linux. Is this approach right ? In case that dramatically increases the amount of symbols exported from neon, it might make sense to keep the mapfile, no? What's the output of nm -D --defined solver/*/lib/libneon,so | wc -l for you with those changes? For me the old one is 280. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: helpcontent2/source
helpcontent2/source/auxiliary/sbasic.tree | 22 +++--- helpcontent2/source/auxiliary/scalc.tree| 12 ++-- helpcontent2/source/auxiliary/shared.tree | 22 +++--- helpcontent2/source/auxiliary/simpress.tree |2 +- helpcontent2/source/auxiliary/swriter.tree | 16 5 files changed, 37 insertions(+), 37 deletions(-) New commits: commit c87e800a0da6ae192b74df3f05527ca3cd4588c3 Author: Andras Timar ati...@suse.com Date: Thu Sep 20 17:37:09 2012 +0200 update tree files from topic titles Change-Id: Ia49783c59614c4f01978ba4eef671daf74aeee07 diff --git a/helpcontent2/source/auxiliary/sbasic.tree b/helpcontent2/source/auxiliary/sbasic.tree index 8766b4a..70c5aa3 100644 --- a/helpcontent2/source/auxiliary/sbasic.tree +++ b/helpcontent2/source/auxiliary/sbasic.tree @@ -17,11 +17,11 @@ node id=0702 title=Command Reference topic id=sbasic/text/sbasic/shared/01020300.xhpUsing Procedures and Functions/topic topic id=sbasic/text/sbasic/shared/01020500.xhpLibraries, Modules and Dialogs/topic - node id=070202 title=Runtime Functions, Statements, and Operators + node id=070202 title=Run-Time Functions, Statements, and Operators topic id=sbasic/text/sbasic/shared/0301.xhpScreen I/O Functions/topic topic id=sbasic/text/sbasic/shared/0302.xhpFile I/O Functions/topic topic id=sbasic/text/sbasic/shared/0303.xhpDate and Time Functions/topic -topic id=sbasic/text/sbasic/shared/0305.xhpError Handling Functions/topic +topic id=sbasic/text/sbasic/shared/0305.xhpError-Handling Functions/topic topic id=sbasic/text/sbasic/shared/0306.xhpLogical Operators/topic topic id=sbasic/text/sbasic/shared/0307.xhpMathematical Operators/topic topic id=sbasic/text/sbasic/shared/0308.xhpNumeric Functions/topic @@ -31,7 +31,7 @@ topic id=sbasic/text/sbasic/shared/0312.xhpStrings/topic topic id=sbasic/text/sbasic/shared/0313.xhpOther Commands/topic /node - node id=070201 title=List of common Functions, Statements, and Operators + node id=070201 title=Alphabetic List of Functions, Statements, and Operators topic id=sbasic/text/sbasic/shared/03080601.xhpAbs Function [Runtime]/topic topic id=sbasic/text/sbasic/shared/03060100.xhpAND Operator [Runtime]/topic topic id=sbasic/text/sbasic/shared/03104200.xhpArray Function [Runtime]/topic @@ -90,14 +90,14 @@ topic id=sbasic/text/sbasic/shared/03050100.xhpErl Function [Runtime]/topic topic id=sbasic/text/sbasic/shared/03050200.xhpErr Function [Runtime]/topic topic id=sbasic/text/sbasic/shared/03050300.xhpError Function [Runtime]/topic -topic id=sbasic/text/sbasic/shared/0305.xhpError Handling Functions/topic +topic id=sbasic/text/sbasic/shared/0305.xhpError-Handling Functions/topic topic id=sbasic/text/sbasic/shared/03090412.xhpExit Statement [Runtime]/topic topic id=sbasic/text/sbasic/shared/03080201.xhpExp Function [Runtime]/topic -topic id=sbasic/text/sbasic/shared/03020405.xhpFileAttr Function [Runtime]/topic +topic id=sbasic/text/sbasic/shared/03020405.xhpFileAttr-Function [Runtime]/topic topic id=sbasic/text/sbasic/shared/03020406.xhpFileCopy Statement [Runtime]/topic topic id=sbasic/text/sbasic/shared/03020407.xhpFileDateTime Function [Runtime]/topic topic id=sbasic/text/sbasic/shared/03020415.xhpFileExists Function [Runtime]/topic -topic id=sbasic/text/sbasic/shared/03020408.xhpFileLen Function [Runtime]/topic +topic id=sbasic/text/sbasic/shared/03020408.xhpFileLen-Function [Runtime]/topic topic id=sbasic/text/sbasic/shared/03103800.xhpFindObject Function [Runtime]/topic topic id=sbasic/text/sbasic/shared/03103900.xhpFindPropertyObject Function [Runtime]/topic topic id=sbasic/text/sbasic/shared/03080501.xhpFix Function [Runtime]/topic @@ -122,7 +122,7 @@ topic id=sbasic/text/sbasic/shared/03030201.xhpHour Function [Runtime]/topic topic id=sbasic/text/sbasic/shared/03090103.xhpIIf Statement [Runtime]/topic topic id=sbasic/text/sbasic/shared/03090101.xhpIf...Then...Else Statement [Runtime]/topic -topic id=sbasic/text/sbasic/shared/03060300.xhpImp Operator [Runtime]/topic +topic id=sbasic/text/sbasic/shared/03060300.xhpImp-Operator [Runtime]/topic topic id=sbasic/text/sbasic/shared/03120401.xhpInStr Function [Runtime]/topic topic id=sbasic/text/sbasic/shared/03010201.xhpInputBox Function [Runtime]/topic topic id=sbasic/text/sbasic/shared/03020202.xhpInput# Statement [Runtime]/topic @@ -151,12 +151,12 @@ topic id=sbasic/text/sbasic/shared/03120306.xhpMid Function, Mid Statement [Runtime]/topic topic id=sbasic/text/sbasic/shared/03030202.xhpMinute Function [Runtime]/topic topic id=sbasic/text/sbasic/shared/03020411.xhpMkDir Statement [Runtime]/topic -topic id=sbasic/text/sbasic/shared/03070600.xhpMod Operator [Runtime]/topic +topic
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - oox/source
oox/source/docprop/ooxmldocpropimport.cxx | 22 +++---
1 file changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 3ad52a6453ff612409123db29dc74a9071789aab
Author: Muthu Subramanian sumu...@suse.com
Date: Tue Sep 11 12:44:44 2012 +0530
fdo#54609, fdo#45366: Exception while importing xlsx.
* Handle any exception thrown during document properties
import. This is not so critical so as to stop the import.
We anyways check for hasElements().
* Also lclGetRelatedStreams might throw IllegalArgumentException
Change-Id: I5206ff1ab07f2853e6a20aebea3f892460b881ad
Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx
b/oox/source/docprop/ooxmldocpropimport.cxx
index ef65173..b80069e 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -77,7 +77,7 @@ Reference XInterface SAL_CALL
DocumentPropertiesImport_createInstance( const
namespace {
-Sequence InputSource lclGetRelatedStreams( const Reference XStorage
rxStorage, const OUString rStreamType ) throw (RuntimeException)
+Sequence InputSource lclGetRelatedStreams( const Reference XStorage
rxStorage, const OUString rStreamType ) throw (RuntimeException,
IllegalArgumentException)
{
Reference XRelationshipAccess xRelation( rxStorage, UNO_QUERY_THROW );
Reference XHierarchicalStorageAccess xHierarchy( rxStorage,
UNO_QUERY_THROW );
@@ -147,19 +147,27 @@ void SAL_CALL DocumentPropertiesImport::importProperties(
const Reference XStorage rxSource, const Reference
XDocumentProperties rxDocumentProperties )
throw (RuntimeException, IllegalArgumentException, SAXException,
Exception)
{
+Sequence InputSource aCoreStreams;
+Sequence InputSource aExtStreams;
+Sequence InputSource aCustomStreams;
+
if( !mxContext.is() )
throw RuntimeException();
if( !rxSource.is() || !rxDocumentProperties.is() )
throw IllegalArgumentException();
-Sequence InputSource aCoreStreams = lclGetRelatedStreams( rxSource,
CREATE_OFFICEDOC_RELATION_TYPE( metadata/core-properties ) );
-// MS Office seems to have a bug, so we have to do similar handling
-if( !aCoreStreams.hasElements() )
-aCoreStreams = lclGetRelatedStreams( rxSource,
CREATE_PACKAGE_RELATION_TYPE( metadata/core-properties ) );
+try
+{
+aCoreStreams = lclGetRelatedStreams( rxSource,
CREATE_OFFICEDOC_RELATION_TYPE( metadata/core-properties ) );
+// MS Office seems to have a bug, so we have to do similar handling
+if( !aCoreStreams.hasElements() )
+aCoreStreams = lclGetRelatedStreams( rxSource,
CREATE_PACKAGE_RELATION_TYPE( metadata/core-properties ) );
-Sequence InputSource aExtStreams = lclGetRelatedStreams( rxSource,
CREATE_OFFICEDOC_RELATION_TYPE( extended-properties ) );
-Sequence InputSource aCustomStreams = lclGetRelatedStreams( rxSource,
CREATE_OFFICEDOC_RELATION_TYPE( custom-properties ) );
+aExtStreams = lclGetRelatedStreams( rxSource,
CREATE_OFFICEDOC_RELATION_TYPE( extended-properties ) );
+aCustomStreams = lclGetRelatedStreams( rxSource,
CREATE_OFFICEDOC_RELATION_TYPE( custom-properties ) );
+}
+catch (const Exception) {}
if( aCoreStreams.hasElements() || aExtStreams.hasElements() ||
aCustomStreams.hasElements() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6-2 1/3] Crasher fix for xlsx import
I've cherry-picked https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=3ad52a6453ff612409123db29dc74a9071789aab Just a minute ago to fix https://bugs.freedesktop.org/show_bug.cgi?id=48366 https://bugs.freedesktop.org/show_bug.cgi?id=54609 the latter of which is a hard-hack. The cherry-picking to the 3-6 branch was done with my sign-off, and we need two more sign-offs to push this change into 3-6-2. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Add RPATH to liblangtag
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/661 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/661/1 Add RPATH to liblangtag ...so that it consistenly uses the LO versions of libxml2/glibc libs at runtime. Change-Id: I89b7fd13a8b5b7e697ec21db74fdf8ef088fdb92 (cherry picked from commit 179a6db61ee30cf776747802f06edeef45fec461) --- M liblangtag/makefile.mk 1 file changed, 8 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/661 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89b7fd13a8b5b7e697ec21db74fdf8ef088fdb92 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Do not call xmlCleanupParser from liblangtag
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/662 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/662/1 Do not call xmlCleanupParser from liblangtag Despite its name, it is a cleanup function for libxml2 that must only be called when the process as a whole no longer needs libxml2. Calling it from a library like liblangtag is not appropriate (just like liblangtag does not call xmlInitParser, either). In LibreOffice, this caused confusion about pthread keys for thread-local storage (xmlCleanupParser calls pthread_key_delete, but apparently if libxml2 is later used by unrelated code in LibreOffice again, it still uses the stale key, and if that key is now reused via an unrelated pthread_key_create, arbitrary crashes happen during thread termination in pthread's __nptl_deallocate_tsd). (cherry picked from commit 5e6c595e9d698caf23ae68d38b9cab30ff9c9b94) Conflicts: liblangtag/makefile.mk Change-Id: I82cef8bc400d48f19eaa94f26d50d4b8589da106 --- A liblangtag/liblangtag-0.2-xmlCleanupParser.patch M liblangtag/makefile.mk 2 files changed, 21 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/662 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82cef8bc400d48f19eaa94f26d50d4b8589da106 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
On Thu, Sep 20, 2012 at 04:24:09PM +0100, Michael Meeks wrote: + gerrit - patch abandonment can only be done by owner or gerrit admin (Bjoern) please drop, nothing actionable there ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] minutes of ESC call ...
On Thu, Sep 20, 2012 at 04:24:09PM +0100, Michael Meeks wrote: * Present: + propose new Difficulty: DifficultyHard Eek, multiple questions on that: - What would be the difference to DifficultyInteresting in hard and objective terms? - How do we make sure we would all judge the EasyHack the same way as either DifficultyBeginner, DifficultyInteresting and DifficultyHard? If we cant sufficiently safely make the second answer a yes without generating a huge wikipage describing the process of judging an EasyHack in an objective manner, the finegrained classification is worthless as it will be inconsistent. If we need a huge wikipage, a/ we have already lost b/ we have hours of bikeshedding on that in front of us. AI: + add/adapt the wiki page / generation scripts (Bjoern) Rejecting, and invoking you touch it, you own it on Michael. ;) Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 4 commits - oox/inc oox/source sw/source writerfilter/inc writerfilter/source
oox/inc/oox/vml/vmlshape.hxx |1
oox/source/token/properties.txt |1
oox/source/vml/vmlshape.cxx | 19 +++
oox/source/vml/vmlshapecontext.cxx |3 +
sw/source/core/text/porrst.cxx | 10 +++---
sw/source/core/text/txtfrm.cxx | 11 ++
writerfilter/inc/resourcemodel/TableManager.hxx |4 +-
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 24 +--
writerfilter/source/dmapper/DomainMapperTableHandler.hxx |2 -
writerfilter/source/doctok/WW8ResourceModelImpl.cxx |4 +-
writerfilter/source/filter/ImportFilter.cxx | 14
writerfilter/source/resourcemodel/resourcemodel.cxx |4 +-
12 files changed, 76 insertions(+), 21 deletions(-)
New commits:
commit 53b7f7df0617bcbd7bbef9a34ef53e5097eb16dc
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Thu Sep 20 11:49:29 2012 +0200
docx import: position table using tblInd OR tblCellMar
Previously cell-margin was unconditionnaly used to compute table position.
Office only does so on top-level tables and if tblInd is missing.
Change-Id: I183647bcf090d5822b3f2e04e097c8bbd277168d
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx
b/writerfilter/inc/resourcemodel/TableManager.hxx
index bb72934..c601adf 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -62,7 +62,7 @@ public:
/**
Handle end of table.
*/
-virtual void endTable() = 0;
+virtual void endTable(unsigned int nestedTableLevel) = 0;
/**
Handle start of row.
@@ -994,7 +994,7 @@ void TableManagerT,
PropertiesPointer::resolveCurrentTable()
mpTableDataHandler-endRow();
}
-mpTableDataHandler-endTable();
+mpTableDataHandler-endTable(mTableDataStack.size() - 1);
}
catch (uno::Exception const e)
{
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index fbdabd9..dce337d 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -262,6 +262,7 @@ struct WRITERFILTER_DLLPRIVATE TableInfo
sal_Int32 nRightBorderDistance;
sal_Int32 nTopBorderDistance;
sal_Int32 nBottomBorderDistance;
+sal_Int32 nNestLevel;
PropertyMapPtr pTableDefaults;
PropertyMapPtr pTableBorders;
TableStyleSheetEntry* pTableStyle;
@@ -272,6 +273,7 @@ struct WRITERFILTER_DLLPRIVATE TableInfo
, nRightBorderDistance(DEF_BORDER_DIST)
, nTopBorderDistance(0)
, nBottomBorderDistance(0)
+, nNestLevel(0)
, pTableDefaults(new PropertyMap)
, pTableBorders(new PropertyMap)
, pTableStyle(NULL)
@@ -433,7 +435,24 @@ TableStyleSheetEntry *
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
lcl_debug_TableBorder(aTableBorder);
#endif
-m_aTableProperties-Insert( PROP_LEFT_MARGIN, false, uno::makeAny(
nLeftMargin - nGapHalf - rInfo.nLeftBorderDistance));
+// Mimic Office behavior : if tlbInd is defined, use it place table.
+// Otherwise, top-level table's position depends w:tblCellMar
attribute (but not nested tables)
+if (nLeftMargin)
+{
+m_aTableProperties-Insert( PROP_LEFT_MARGIN, false, uno::makeAny(
nLeftMargin - nGapHalf));
+}
+else
+{
+// TODO: top-level position depends on w:tblCellMar attribute, not
w:cellMar
+if (rInfo.nNestLevel 1)
+{
+m_aTableProperties-Insert( PROP_LEFT_MARGIN, false,
uno::makeAny( - nGapHalf));
+}
+else
+{
+m_aTableProperties-Insert( PROP_LEFT_MARGIN, false,
uno::makeAny( - nGapHalf - rInfo.nLeftBorderDistance));
+}
+}
m_aTableProperties-getValue( TablePropertyMap::TABLE_WIDTH,
nTableWidth );
if( nTableWidth 0 )
@@ -672,13 +691,14 @@ RowPropertyValuesSeq_t
DomainMapperTableHandler::endTableGetRowProperties()
return aRowProperties;
}
-void DomainMapperTableHandler::endTable()
+void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
{
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
dmapper_logger-startElement(tablehandler.endTable);
#endif
TableInfo aTableInfo;
+aTableInfo.nNestLevel = nestedTableLevel;
aTableInfo.pTableStyle = endTableGetTableStyle(aTableInfo);
// expands to uno::Sequence Sequence beans::PropertyValues
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 0ccd71c..ea4c421 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
Re: How to use internal neon ?
On 20 September 2012 17:09, Stephan Bergmann sberg...@redhat.com wrote: On 09/20/2012 04:00 PM, Matúš Kukan wrote: I see, so it will be a little complicated with exporting symbols. Currently, there is even .map file used. (probably, I don't know how dmake works) I've removed .map files, allowed to turn of -fvisibility=hidden in https://gerrit.libreoffice.org/#/c/658/ and then tried to convert neon in https://gerrit.libreoffice.org/#/c/659/ Seems to work for me on Linux. Is this approach right ? In case that dramatically increases the amount of symbols exported from neon, it might make sense to keep the mapfile, no? Originally, I wanted to keep it. But current gbuild implementation of gb_Library_set_soversion_script is linux only anyway (with, in this case pointless, SOVERSION number) and it just seemed unnecessary to me. ( maybe I am lazy ) What's the output of nm -D --defined solver/*/lib/libneon,so | wc -l for you with those changes? For me the old one is 280. the old one: nm -D --defined solver/*/lib/libneon.so | wc -l : 285 ll solver/*/lib/libneon.so* : 1732824 the new one, without .map file: 330 1732932 new one, with .map file: 283 1732672 So, it's best, but linux only and the size is almost the same. Thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6-2 1/3] Crasher fix for xlsx import
Hey, 2012/9/20 Kohei Yoshida kohei.yosh...@gmail.com: I've cherry-picked https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=3ad52a6453ff612409123db29dc74a9071789aab Just a minute ago to fix https://bugs.freedesktop.org/show_bug.cgi?id=48366 https://bugs.freedesktop.org/show_bug.cgi?id=54609 the latter of which is a hard-hack. The cherry-picking to the 3-6 branch was done with my sign-off, and we need two more sign-offs to push this change into 3-6-2. Looks good to me. One more needed for 3-6-2. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - liblangtag/makefile.mk
liblangtag/makefile.mk |8 1 file changed, 8 insertions(+) New commits: commit c5f049680130a9af6c97856ea18869738811822b Author: Stephan Bergmann sberg...@redhat.com Date: Thu Sep 20 15:00:50 2012 +0200 Add RPATH to liblangtag ...so that it consistenly uses the LO versions of libxml2/glibc libs at runtime. Change-Id: I89b7fd13a8b5b7e697ec21db74fdf8ef088fdb92 (cherry picked from commit 179a6db61ee30cf776747802f06edeef45fec461) Reviewed-on: https://gerrit.libreoffice.org/661 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk index a8efa55..7efbc32 100644 --- a/liblangtag/makefile.mk +++ b/liblangtag/makefile.mk @@ -72,6 +72,14 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) .$/configure BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) -j$(EXTMAXPROCESS) \ $(AUGMENT_LIBRARY_PATH) $(GNUMAKE) install +.IF $(SYSTEM_LIBXML)!=YES || $(SYSTEM_GLIB)!=YES +.IF $(OS)==FREEBSD || $(OS)==LINUX +CONFIGURE_FLAGS+= \ + LDFLAGS=-Wl,-z,origin\ -Wl,-rpath,\'\$$\$$ORIGIN:\$$\$$ORIGIN/../ure-link/lib\' +.ELIF $(OS)==SOLARIS +CONFIGURE_FLAGS+= LDFLAGS=-Wl,-R\'\$$\$$ORIGIN:\$$\$$ORIGIN/../ure-link/lib\' +.END +.END .IF $(GUI)==WNT .IF $(COM)==GCC ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - liblangtag/liblangtag-0.2-xmlCleanupParser.patch liblangtag/makefile.mk
liblangtag/liblangtag-0.2-xmlCleanupParser.patch | 20
liblangtag/makefile.mk |1 +
2 files changed, 21 insertions(+)
New commits:
commit c63f4962caefc22cbf0fa9cde87f3a49d79f0b85
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Sep 20 15:40:30 2012 +0200
Do not call xmlCleanupParser from liblangtag
Despite its name, it is a cleanup function for libxml2 that must only be
called
when the process as a whole no longer needs libxml2. Calling it from a
library
like liblangtag is not appropriate (just like liblangtag does not call
xmlInitParser, either).
In LibreOffice, this caused confusion about pthread keys for thread-local
storage (xmlCleanupParser calls pthread_key_delete, but apparently if
libxml2 is
later used by unrelated code in LibreOffice again, it still uses the stale
key,
and if that key is now reused via an unrelated pthread_key_create, arbitrary
crashes happen during thread termination in pthread's
__nptl_deallocate_tsd).
(cherry picked from commit 5e6c595e9d698caf23ae68d38b9cab30ff9c9b94)
Conflicts:
liblangtag/makefile.mk
Change-Id: I82cef8bc400d48f19eaa94f26d50d4b8589da106
Reviewed-on: https://gerrit.libreoffice.org/662
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/liblangtag/liblangtag-0.2-xmlCleanupParser.patch
b/liblangtag/liblangtag-0.2-xmlCleanupParser.patch
new file mode 100644
index 000..3617125
--- /dev/null
+++ b/liblangtag/liblangtag-0.2-xmlCleanupParser.patch
@@ -0,0 +1,20 @@
+--- misc/liblangtag-0.2/liblangtag/lt-xml.c
misc/build/liblangtag-0.2/liblangtag/lt-xml.c
+@@ -101,8 +101,6 @@ lt_xml_read_subtag_registry(lt_xml_t *x
+ if (xmlparser)
+ xmlFreeParserCtxt(xmlparser);
+
+- xmlCleanupParser();
+-
+ if (err) {
+ if (error)
+ *error = g_error_copy(err);
+@@ -158,8 +156,6 @@ lt_xml_read_cldr_bcp47(lt_xml_t *xml
+ if (xmlparser)
+ xmlFreeParserCtxt(xmlparser);
+
+- xmlCleanupParser();
+-
+ if (err) {
+ if (error)
+ *error = g_error_copy(err);
diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index 7efbc32..3272698 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -37,6 +37,7 @@ PATCH_FILES=liblangtag-0.2-0001-Fix-a-memory-leak.patch
PATCH_FILES+=liblangtag-0.2-0002-Fix-invalid-memory-access.patch
PATCH_FILES+=liblangtag-0.2-configure.patch
PATCH_FILES+=liblangtag-0.2-datadir.patch
+PATCH_FILES+=liblangtag-0.2-xmlCleanupParser.patch
CONFIGURE_DIR=.
BUILD_DIR=$(CONFIGURE_DIR)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: Add RPATH to liblangtag
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/661 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/661 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I89b7fd13a8b5b7e697ec21db74fdf8ef088fdb92 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
‘auto_ptr’ is deprecated in sc/source/core/tool/rangenam.cxx
Hello,
WAE is enabled in my autogen.lastrun for master sources. I just updated and
had this during compilation:
/home/julien/compile-libreoffice/libo/sc/source/core/tool/rangenam.cxx: In
member function ‘void ScRangeData::SetCode(ScTokenArray)’:
/home/julien/compile-libreoffice/libo/sc/source/core/tool/rangenam.cxx:642:50:
error: ‘auto_ptr’ is deprecated (declared at
/usr/include/c++/4.7/backward/auto_ptr.h:87)
[-Werror=deprecated-declarations]
cc1plus: all warnings being treated as errors
Here are the lines:
640 void ScRangeData::SetCode( ScTokenArray rArr )
641 {
642 ::std::auto_ptrScTokenArray pOldCode( pCode); // old pCode
will be deleted
643 pCode = new ScTokenArray( rArr );
644 InitCode();
645 }
Could it be replaced by a non deprecated function (I don't know between
std::shared_ptr, std::unique_ptr or boost functions)?
Julien
--
View this message in context:
http://nabble.documentfoundation.org/auto-ptr-is-deprecated-in-sc-source-core-tool-rangenam-cxx-tp4008439.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
getting started
Hi iam just learning how to develop; my first step is to understand the examples i already install the sdk from the repository aim currently using ubuntu 12.04.1 but when i run make to the bookmarkInsertation(example in java) it do not find any library i'm i missing something could anybody help me with this. Iam just having this problems with java examples, since i test c++ ex and they work ok. thanks in advanced PS: this is a section of the output when running make make mkdir -p /usr/lib/libreoffice/sdk//LINUXexample.out/class/JavaTextExamples /bin/javac -classpath :/usr/lib/libreoffice/sdk//LINUXexample.out/class/JavaTextExamples -d /usr/lib/libreoffice/sdk//LINUXexample.out/class/JavaTextExamples BookmarkInsertion.java BookmarkInsertion.java:44: error: package com.sun.star.uno does not exist import com.sun.star.uno.UnoRuntime; ^ BookmarkInsertion.java:78: error: package com.sun.star.text does not exist public static void markList(com.sun.star.text.XTextDocument xTextDocument, ^ BookmarkInsertion.java:108: error: package com.sun.star.text does not exist public static void InsertBookmark(com.sun.star.text.XTextDocument xTextDocument, ^ BookmarkInsertion.java:109: error: package com.sun.star.text does not exist com.sun.star.text.XTextRange xTextRange, ^ BookmarkInsertion.java:149: error: package com.sun.star.text does not exist com.sun.star.text.XTextDocument xTextDocument, String sSearchString) ^ BookmarkInsertion.java:148: error: package com.sun.star.uno does not exist Best Regards, Jorge Luis 10mo. ANIVERSARIO DE LA CREACION DE LA UNIVERSIDAD DE LAS CIENCIAS INFORMATICAS... CONECTADOS AL FUTURO, CONECTADOS A LA REVOLUCION http://www.uci.cu http://www.facebook.com/universidad.uci http://www.flickr.com/photos/universidad_uci ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ‘auto_ptr’ is deprecated in sc/source/core/tool/rangenam.cxx
On 20/09/12 19:23, julien2412 wrote:
Hello,
WAE is enabled in my autogen.lastrun for master sources. I just updated and
had this during compilation:
/home/julien/compile-libreoffice/libo/sc/source/core/tool/rangenam.cxx: In
member function ‘void ScRangeData::SetCode(ScTokenArray)’:
/home/julien/compile-libreoffice/libo/sc/source/core/tool/rangenam.cxx:642:50:
error: ‘auto_ptr’ is deprecated (declared at
/usr/include/c++/4.7/backward/auto_ptr.h:87)
[-Werror=deprecated-declarations]
cc1plus: all warnings being treated as errors
Here are the lines:
640 void ScRangeData::SetCode( ScTokenArray rArr )
641 {
642 ::std::auto_ptrScTokenArray pOldCode( pCode); // old pCode
will be deleted
643 pCode = new ScTokenArray( rArr );
644 InitCode();
645 }
Could it be replaced by a non deprecated function (I don't know between
std::shared_ptr, std::unique_ptr or boost functions)?
usually can be replaced with boost::scoped_ptr.
but in this case i wonder, what purpose does pOldCode serve?
why isn't pCode some kind of smart pointer?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Is there easy way to find unused .idl files ?
On 20 September 2012 13:01, Michael Stahl mst...@redhat.com wrote: And I wonder if there is an easy way how to tell, they can be removed. For files added with gb_UnoApi_add_idlfile_noheader, one probably have to grep in the code. technically all of those are unused because they are mere documentation. but that documentation is still nice to have :) well, Noel is currently working on converting these to the less-unused new-style services... So, it seems, he is almost done in oovbaapi :-) But there are more interfaces like services. And I have often seen (unused ?) constants in there. In files without license part like oovbaapi/ooo/vba/access/AcCloseSave.idl my opinion is that while there are probably a few more useless relics like ProductRegistration, IDL removal requires a case-by-case review anyway. Well, I guess it's better to suppose they are mostly used and let it be :-) It's not that long to build udkapi, offapi and oovbaapi. And this whole UNO .idl thing is quite mysterious to me. Thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/text/txttab.cxx | 48 ++--
sw/source/core/text/widorp.cxx | 152 +++--
2 files changed, 97 insertions(+), 103 deletions(-)
New commits:
commit 606b57c625aebabd004a4f3e3a2552f3a03551a0
Author: Michael Stahl mst...@redhat.com
Date: Thu Sep 20 20:28:00 2012 +0200
sw: tweak previous comment translation
Change-Id: Id4a89bd131f37b6844046803aae9b2f6e081af0d
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index b761ce3..4fe8c41 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -94,10 +94,10 @@ SwTxtFrmBreak::SwTxtFrmBreak( SwTxtFrm *pNewFrm, const
SwTwips nRst )
/* BP 18.6.93: Widows.
* In contrast to the first implementation the Widows are not calculated
- * in advance but detected when formating the splitted Follow.
+ * in advance but detected when formating the split Follow.
* In Master the Widows-calculation is dropped completely
* (nWidows is manipulated). If the Follow detects that the
- * Widows rule applies it sends a Prepare to its ancestor.
+ * Widows rule applies it sends a Prepare to its predecessor.
* A special problem is when the Widow rule applies but in Master
* there are some lines available.
*
@@ -113,9 +113,9 @@ SwTxtFrmBreak::SwTxtFrmBreak( SwTxtFrm *pNewFrm, const
SwTwips nRst )
* One difficulty with Widows and different formats between
* Master- and Follow-Frame:
* Example: If the first column is 3cm and the second is 4cm and
- * Widows is set to 3. The decision if the Widows rule matches can not
+ * Widows is set to 3, the decision if the Widows rule matches can not
* be done until the Follow is formated. Unfortunately this is crucial
- * sto decide if the whole paragraph goes to the next page or not.
+ * to decide if the whole paragraph goes to the next page or not.
*/
sal_Bool SwTxtFrmBreak::IsInside( SwTxtMargin rLine ) const
@@ -167,9 +167,9 @@ sal_Bool SwTxtFrmBreak::IsInside( SwTxtMargin rLine ) const
// grow the requested area.
nHeight += pFrm-GrowTst( LONG_MAX );
-// The Grow() returnes the height, that the Upper of the TxtFrm
-// would grow the TxtFrm.
-// The TxtFrm itself can grow as much as it want.
+// The Grow() returns the height by which the Upper of the TxtFrm
+// would let the TxtFrm grow.
+// The TxtFrm itself can grow as much as it wants.
bFit = nHeight = nLineHeight;
}
}
@@ -188,7 +188,7 @@ sal_Bool SwTxtFrmBreak::IsBreakNow( SwTxtMargin rLine )
SWAP_IF_SWAPPED( pFrm )
// bKeep is stronger than IsBreakNow()
-// Is enough space ?
+// Is there enough space ?
if( bKeep || IsInside( rLine ) )
bBreak = sal_False;
else
@@ -255,13 +255,13 @@ WidowsAndOrphans::WidowsAndOrphans( SwTxtFrm *pNewFrm,
const SwTwips nRst,
if( bKeep )
{
-// 5652: If pararagraph should not be splited but is larger than
+// 5652: If pararagraph should not be split but is larger than
// the page, then bKeep is overruled.
if( bChkKeep !pFrm-GetPrev() !pFrm-IsInFtn()
pFrm-IsMoveable()
( !pFrm-IsInSct() || pFrm-FindSctFrm()-MoveAllowed(pFrm) ) )
bKeep = sal_False;
-// Even if Keep is set, the Orphans has to be regarded
+// Even if Keep is set, Orphans has to be respected.
// e.g. if there are chained frames where a Follow in the last frame
// receives a Keep, because it is not (forward) movable -
// nevertheless the paragraph can request lines from the Master
@@ -360,8 +360,8 @@ sal_Bool WidowsAndOrphans::FindBreak( SwTxtFrm *pFrame,
SwTxtMargin rLine,
else
break;
}
-// Normaly Orphans are not taken into account for HasToFit.
-// But if Dummy-Lines are concerned and they violate the orphans rules
+// Usually Orphans are not taken into account for HasToFit.
+// But if Dummy-Lines are concerned and the Orphans rule is violated
// we make an exception: We leave behind one Dummyline and take
// the whole text to the next page/column.
if( rLine.GetLineNr() = nOldOrphans
@@ -383,10 +383,10 @@ sal_Bool WidowsAndOrphans::FindBreak( SwTxtFrm *pFrame,
SwTxtMargin rLine,
* WidowsAndOrphans::FindWidows()
*/
-/* FindWidows positiones the SwTxtMargin of the Master to the line where to
+/* FindWidows positions the SwTxtMargin of the Master to the line where to
* break by examining and formatting the Follow.
* Returns sal_True if the Widows-rule matches, that means that the
- * paragraph should be not splitted (keep) !
+ * paragraph should not be split (keep) !
*/
sal_Bool WidowsAndOrphans::FindWidows( SwTxtFrm *pFrame, SwTxtMargin rLine )
@@ -433,13
[Libreoffice-commits] .: Branch 'feature/killsdf' - l10ntools/Executable_cfgex.mk l10ntools/Executable_helpex.mk l10ntools/Executable_transex3.mk l10ntools/Executable_ulfex.mk l10ntools/Executable_xrm
l10ntools/Executable_cfgex.mk|1
l10ntools/Executable_helpex.mk |1
l10ntools/Executable_transex3.mk |1
l10ntools/Executable_ulfex.mk|1
l10ntools/Executable_xrmex.mk|1
l10ntools/inc/po.hxx | 18 +++
l10ntools/source/merge.cxx | 108 -
l10ntools/source/po.cxx | 175 ++-
l10ntools/source/renewpo.cxx |6 -
solenv/gbuild/AllLangResTarget.mk| 22 +++-
solenv/gbuild/Configuration.mk | 19 ++-
solenv/gbuild/ExtensionTarget.mk | 31 --
solenv/gbuild/InstallModuleTarget.mk | 11 +-
solenv/gbuild/TargetLocations.mk |2
solenv/inc/rules.mk | 12 --
15 files changed, 299 insertions(+), 110 deletions(-)
New commits:
commit 161f4ac95ae3df1daaede762862ea1c3ac4bb399
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Mon Sep 10 20:31:38 2012 +0200
Use po file for merge 1. step
Make executables to waiting for po as input
Add some function to po files
Rewrite makefiles to use po files for merge
Change KeyId generator not to use xml special
charachters
One filetype remain: properties
Change-Id: If2bd2ae7afc61518c2d838a3cae301ef62dd9761
Reviewed-on: https://gerrit.libreoffice.org/593
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk
index 7dc2327..9fea979 100644
--- a/l10ntools/Executable_cfgex.mk
+++ b/l10ntools/Executable_cfgex.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,cfgex,\
$(eval $(call gb_Executable_use_libraries,cfgex,\
sal \
+i18nregexp \
))
$(eval $(call gb_Executable_add_scanners,cfgex,\
diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk
index 470bd4c..3569dff 100644
--- a/l10ntools/Executable_helpex.mk
+++ b/l10ntools/Executable_helpex.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,helpex,\
$(eval $(call gb_Executable_use_libraries,helpex,\
sal \
+i18nregexp \
))
$(eval $(call gb_Executable_use_external,helpex,expat_utf8))
diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk
index bc9a852..2d95906 100644
--- a/l10ntools/Executable_transex3.mk
+++ b/l10ntools/Executable_transex3.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,transex3,\
$(eval $(call gb_Executable_use_libraries,transex3,\
sal \
+i18nregexp \
))
$(eval $(call gb_Executable_add_scanners,transex3,\
diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk
index e82c9b8..f3fd559 100644
--- a/l10ntools/Executable_ulfex.mk
+++ b/l10ntools/Executable_ulfex.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,ulfex,\
$(eval $(call gb_Executable_use_libraries,ulfex,\
sal \
+i18nregexp \
))
$(eval $(call gb_Executable_use_static_libraries,ulfex,\
diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk
index 33255f4..b86dbc4 100644
--- a/l10ntools/Executable_xrmex.mk
+++ b/l10ntools/Executable_xrmex.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,xrmex,\
$(eval $(call gb_Executable_use_libraries,xrmex,\
sal \
+i18nregexp \
))
$(eval $(call gb_Executable_add_scanners,xrmex,\
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index b4b18c4..81bafe7 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -25,6 +25,7 @@ private:
OStringm_sUnTransStr;
OStringm_sTransStr;
bool m_bFuzzy;
+bool m_bNull;
OStringm_sKeyId;
public:
@@ -38,6 +39,8 @@ public:
virtual OString getUnTransStr() const { return m_sUnTransStr; }
virtual OString getTransStr() const { return m_sTransStr; }
virtual boolgetFuzzy() const{ return m_bFuzzy; }
+virtual boolisNull() const { return m_bNull; }
+virtual OString getKeyId() const{ return m_sKeyId; }
virtual voidsetWhiteSpace(const OString rWhiteSpace);
virtual voidsetExtractCom(const OString rExtractCom);
@@ -68,6 +71,8 @@ private:
OString m_sResourceType;
TYPEm_eType;
OString m_sHelpText;
+
+voidSetMembers();
public:
PoEntry();
@@ -84,6 +89,8 @@ public:
OString getUnTransStr() const;
OString getTransStr() const;
boolgetFuzzy() const{ return m_aGenPo.getFuzzy(); }
+boolisNull() const { return m_aGenPo.isNull(); }
+OString getKeyId() const{ return m_aGenPo.getKeyId(); }
voidsetUnTransStr(const OString rUnTransStr);
voidsetTransStr(const OString rTransStr);
voidsetFuzzy(const bool bFuzzy);
@@ -91,6 +98,8 @@ public:
void
Re: [Libreoffice-qa] minutes of ESC call ...
On Thu, 2012-09-20 at 18:19 +0200, Bjoern Michaelsen wrote: On Thu, Sep 20, 2012 at 04:24:09PM +0100, Michael Meeks wrote: * Present: + propose new Difficulty: DifficultyHard Eek, multiple questions on that: - What would be the difference to DifficultyInteresting in hard and objective terms? Why does it have to have hard and objective terms ? Most reasonable people can make a distinction between a beginner problem: ie. something almost anyone can pickup and do as their very first commit ever, from something that requires a little experience, from something that takes a week of work [eg.] :-) - How do we make sure we would all judge the EasyHack the same way as either DifficultyBeginner, DifficultyInteresting and DifficultyHard? Is it the end of the world if we cannot ? :-) If we cant sufficiently safely make the second answer a yes without generating a huge wikipage describing the process of judging an EasyHack in an objective manner, the finegrained classification is worthless as it will be inconsistent. A rough measure of Severity / Importance is not intrinsically useless in my view for it's rough-ness. Not all ladders should have only two rungs ;-) We could add a rough guideline (like the above) in a paragraph to the wiki page easily enough if even that is needed. If we need a huge wikipage, a/ we have already lost b/ we have hours of bikeshedding on that in front of us. How about avoiding the bikeshedding altogether just restoring the original(?) three-way categorisation of difficulty :-) AI: + add/adapt the wiki page / generation scripts (Bjoern) Rejecting, and invoking you touch it, you own it on Michael. ;) So - how does that magic bugzilla - wiki page generation thing work ? is that documented somewhere ? I'm happy to do it if you hand-hold me - though there is a risk that that takes longer. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[feature/killsdf]: Use po file for merge 1. step
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/593 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/593 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2bd2ae7afc61518c2d838a3cae301ef62dd9761 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: feature/killsdf Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Zolnai Tamás zolnaitamas2...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
