date:20120521

[Libreoffice-commits] .: 2 commits - writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source

2012-05-21 Thread Lubos Lunak

 writerfilter/Library_writerfilter.mk   |5 -
 writerfilter/inc/resourcemodel/SubSequence.hxx |2 +-
 writerfilter/source/dmapper/PropertyIds.cxx|2 +-
 writerfilter/source/dmapper/PropertyMap.hxx|2 +-
 writerfilter/source/doctok/Dff.cxx |2 +-
 writerfilter/source/doctok/Dff.hxx |4 ++--
 writerfilter/source/doctok/DffImpl.cxx |2 +-
 writerfilter/source/doctok/PLCF.hxx|2 +-
 writerfilter/source/doctok/WW8Annotation.cxx   |2 +-
 writerfilter/source/doctok/WW8Clx.cxx  |2 +-
 writerfilter/source/doctok/WW8Clx.hxx  |4 ++--
 writerfilter/source/doctok/WW8DocumentImpl.hxx |2 +-
 writerfilter/source/doctok/WW8FKP.hxx  |2 +-
 writerfilter/source/doctok/WW8FontTable.cxx|2 +-
 writerfilter/source/doctok/WW8LFOTable.cxx |2 +-
 writerfilter/source/doctok/WW8ListTable.cxx|2 +-
 writerfilter/source/doctok/WW8Picture.cxx  |2 +-
 writerfilter/source/doctok/WW8PropertySetImpl.hxx  |4 ++--
 writerfilter/source/doctok/WW8ResourceModelImpl.cxx|6 +++---
 writerfilter/source/doctok/WW8ResourceModelImpl.hxx|2 +-
 writerfilter/source/doctok/WW8StructBase.cxx   |2 +-
 writerfilter/source/doctok/WW8Sttbf.cxx|2 +-
 writerfilter/source/doctok/WW8Sttbf.hxx|4 ++--
 writerfilter/source/doctok/WW8StyleSheet.cxx   |2 +-
 writerfilter/source/doctok/WW8Table.cxx|2 +-
 writerfilter/source/doctok/WW8Text.cxx |2 +-
 writerfilter/source/doctok/resources.xsl   |8 
 writerfilter/source/doctok/resourcesimpl.xsl   |6 +++---
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx  |2 +-
 writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx |2 +-
 writerfilter/source/ooxml/factory.xsl  |2 +-
 writerfilter/source/ooxml/factory_ns.xsl   |4 ++--
 writerfilter/source/ooxml/factoryimpl.xsl  |6 +++---
 writerfilter/source/ooxml/factoryimpl_ns.xsl   |2 +-
 writerfilter/source/ooxml/gperffasttokenhandler.xsl|2 +-
 35 files changed, 48 insertions(+), 53 deletions(-)

New commits:
commit e1ff97ab62a94db662832bafe4441b063de2256a
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Tue May 22 08:51:37 2012 +0200

remove number of -I directives in writerfilter

Windows length path limitations strike again, and this should reduce the 
total
argument length.

Change-Id: I76fefabc8201e51494a7003d7ca4f9fd92ffa3b9

diff --git a/writerfilter/Library_writerfilter.mk 
b/writerfilter/Library_writerfilter.mk
index b06ee75..3644c42 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -38,11 +38,6 @@ $(eval $(call gb_Library_set_include,writerfilter,\
 $$(INCLUDE) \
 -I$(SRCDIR)/writerfilter/inc \
 -I$(SRCDIR)/writerfilter/source \
--I$(SRCDIR)/writerfilter/source/dmapper \
--I$(SRCDIR)/writerfilter/source/doctok \
--I$(SRCDIR)/writerfilter/source/ooxml \
--I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
--I$(WORKDIR)/CustomTarget/writerfilter/source/ooxml \
 ))
 
 $(eval $(call gb_Library_use_api,writerfilter,\
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index 62445ab..0f46606 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -25,7 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  /
-#include 
+#include "PropertyIds.hxx"
 #include 
 #include 
 
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx 
b/writerfilter/source/dmapper/PropertyMap.hxx
index 5c455dd..ba5e1ab 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -33,7 +33,7 @@
 #include 
 #include 
 #include 
-#include 
+#include "PropertyIds.hxx"
 #include 
 #include 
 #include 
diff --git a/writerfilter/source/doctok/Dff.cxx 
b/writerfilter/source/doctok/Dff.cxx
index 8ec8f45..41a9482 100644
--- a/writerfilter/source/doctok/Dff.cxx
+++ b/writerfilter/source/doctok/Dff.cxx
@@ -30,7 +30,7 @@
 #include "Dff.hxx"
 #include 
 #include 
-#include "resources.hxx"
+#include "doctok/resources.hxx"
 
 namespace writerfilter {
 namespace doctok {
diff --git a/writerfilter/source/doctok/Dff.hxx 
b/writerfilter/source/doctok/Dff.hxx
index c987e52..3a1f18c 100644
--- a/writerfilter/source/doctok/Dff.hxx
+++ b/writerfilter/source/doctok/Dff.hxx
@@ -30,8 +30,8 @@
 #define INCLUDED_DFF_HXX
 
 #include 
-#include 
-#include 
+#include "WW8StructBase.hxx"
+#include "WW8ResourceModelImpl.hxx"
 
 namespace writerfilter {
 namespace doctok
diff --git a/writerfilter/s

Re: [PATCH] fdo#50162 merge rtlbootstrap.mk into configure.in

2012-05-21 Thread David Ostrovsky


Hi Rene,

thank you for review and comments!
I was indeed not sure with arm and was told on irc that eabi would be 
the right way to go...

And who really cares, which ARCH are we using for Mips ;-)
Anyway I fixed it accordingly and here is the new version.

Ciao
David

On 21.05.2012 23:17, Rene Engelhard wrote:

Hi,

On Mon, May 21, 2012 at 09:39:52PM +0200, David Ostrovsky wrote:

with this patch sal/rtl/source/macro.hxx is merged into configure
process and
rtlbootstrap.mk is not generated any more.

  arm*)
  CPU=R
  CPUNAME=ARM
+RTL_ARCH=ARM_EABI
  EPM_FLAGS="-a arm"
  OUTPATH=unxlngr
  ;;

is wrong.

arm*-linux-gnueabi) is RTL_ARCH=ARM_EABI.
arm*-linux) is RTL_ARCH=ARM_OABI.

Yes, arm oabi is dead...

  mips64el)
  CPU=M
  CPUNAME=GODSON
+RTL_ARCH=MIPS_EB
  EPM_FLAGS="-a mips64el"
  OUTPATH=unxlngmips
  ;;
  mipsel)
  CPU=M
  CPUNAME=GODSON
+RTL_ARCH=MIPS_EB
  EPM_FLAGS="-a mipsel"
  OUTPATH=unxlngmips
  ;;

is obviously also wrong. it's called mipsel for a reason. Yes, it's little 
endian,
so MIPS_EL would be right here.

I bet that more of this might be wrong,
I actually think that getting these values from what the compiler gives is 
safest as
that one *does* know what it's supoosed to compile for.

Regards,

Rene


>From 6ba134db991f0445b45806022d89ea6eae8a95e0 Mon Sep 17 00:00:00 2001
From: David Ostrovsky 
Date: Mon, 21 May 2012 19:01:29 +0200
Subject: [PATCH] fdo#50162 merge rtlbootstrap.mk into configure.in

Change-Id: I241be2704a069ec1f6be5861084039569673cc12
---
 config_host.mk.in |2 +
 configure.in  |   54 +-
 instsetoo_native/util/makefile.mk |1 -
 sal/CustomTarget_generated.mk |   21 +--
 sal/Library_sal.mk|2 +
 sal/Package_generated.mk  |1 -
 sal/rtl/source/bootstrap.cxx  |6 +-
 sal/rtl/source/macro.hxx  |  116 -
 sdext/platform.mk |8 +-
 solenv/inc/settings.mk|2 -
 10 files changed, 64 insertions(+), 149 deletions(-)
 delete mode 100644 sal/rtl/source/macro.hxx

diff --git a/config_host.mk.in b/config_host.mk.in
index 0a85bfd..76d4a1d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -426,6 +426,8 @@ export REDLAND_CFLAGS=@REDLAND_CFLAGS@
 export REDLAND_LIBS=@REDLAND_LIBS@
 export RHINO_JAR=@RHINO_JAR@
 export RPM=@RPM@
+export RTL_OS=@RTL_OS@
+export RTL_ARCH=@RTL_ARCH@
 export SAC_JAR=@SAC_JAR@
 export SAL_ENABLE_FILE_LOCKING=1
 export SAMPLEICC_CFLAGS=@SAMPLEICC_CFLAGS@
diff --git a/configure.in b/configure.in
index 510d82a..acc0030 100644
--- a/configure.in
+++ b/configure.in
@@ -2991,6 +2991,8 @@ aix*)
 GUI=UNX
 GUIBASE=unx
 OS=AIX
+RTL_OS=AIX
+RTL_ARCH=PowerPC
 OUTPATH=unxaigppc
 P_SEP=:
 SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
@@ -3003,6 +3005,7 @@ cygwin*)
 GUI=WNT
 GUIBASE=WIN
 OS=WNT
+RTL_OS=Windows
 P_SEP=";"
 
 case "$host_cpu" in
@@ -3010,11 +3013,13 @@ cygwin*)
 if test "$CL_X64" != ""; then
 CPU=X
 CPUNAME=X86_64
+RTL_ARCH=X86_64
 LIB64="lib/x64"
 OUTPATH=wntmscx$COMEX
 else
 CPU=I
 CPUNAME=INTEL
+RTL_ARCH=x86
 OUTPATH=wntmsci$COMEX
 fi
 ;;
@@ -3033,12 +3038,14 @@ darwin*)
 # Not sure if "Aqua" is the right term to use?
 GUIBASE="aqua"
 OS=MACOSX
+RTL_OS=MacOSX
 P_SEP=:
 
 case "$host_cpu" in
 arm*)
 CPU=R
 CPUNAME=ARM
+RTL_ARCH=ARM_EABI
 GUIBASE=cocoatouch
 OUTPATH=unxiosr
 OS=IOS;
@@ -3046,11 +3053,13 @@ darwin*)
 powerpc*)
 CPU=P
 CPUNAME=POWERPC
+RTL_ARCH=PowerPC
 OUTPATH=unxmacxp
 ;;
 i*86|x86_64)
 CPU=I
 CPUNAME=INTEL
+RTL_ARCH=x86
 OUTPATH=unxmacxi
 ;;
 *)
@@ -3065,6 +3074,7 @@ dragonfly*)
 GUI=UNX
 GUIBASE=unx
 OS=DRAGONFLY
+RTL_OS=DragonFly
 OUTPATH=unxdfly
 P_SEP=:
 
@@ -3072,10 +3082,12 @@ dragonfly*)
 i*86)
 CPU=I
 CPUNAME=INTEL
+RTL_ARCH=x86
 ;;
 x86_64)
 CPU=X
 CPUNAME=X86_64
+RTL_ARCH=X86_64
 ;;
 *)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
@@ -3090,6 +3102,7 @@ freebsd*)
 COM=GCC
 GUI=UNX
 GUIBASE=unx
+RTL_OS=FreeBSD
 OS=FREEBSD
 OUTPATH=unxfbsd
 P_SEP=:
@@ -3098,11 +3111,13 @@ freebsd*)
 i*86)
 CPU=I
 CPUNAME=INTEL
+RTL_ARCH=x86
 OUTPATH=unxfbsdi
 ;;
 x86_64)
 CPU=X
 CPUNAME=X86_64
+RTL_ARCH=X86_64
 ;;
 *)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
@@ -3118,17 +31

Re: main in libsofficeapp ...

2012-05-21 Thread Stephan Bergmann


On 05/21/2012 11:16 PM, Michael Stahl wrote:

On 21/05/12 23:08, Michael Meeks wrote:

commit c7458a4a71a1e875e03772b0f6e8ad9e1a982006
Author: Michael Stahl
Date:   Mon Mar 12 16:24:34 2012 +0100

 desktop: libsofficeapp shouln't need a main()

Is that a random cleanup, or something that fixes an issue ? if the
latter, which issue ? :-)


the issue was that some object ended up being linked into 2 LinkTargets,
and this somehow fixed it, though i don't remember details...


The lo_main generated in there is needed by android to get some of our
samples bootstrapped&  runnning.


perhaps the other thing that links this doesn't exist on android, then
add it back with an "if ANDROID"?


BTW, splitting libsofficeapp.so out of soffice.bin was done for the 
infamous three-layer thing.  It could be folded back in nowadays.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Calc/ODFF spreadsheet functions

2012-05-21 Thread Regina Henschel

Hi,

Eike Rathke schrieb:

Hi,

On Wednesday, 2012-05-16 09:28:16 +0200, Winfried Donkers wrote:

Ehh.. I'm not familiar with adding content to (wiki/web) pages. And
anyway, Eike deserves at least as much credit for this patch.

I've no problem with being not explicitly mentioned, but add me if you
think I deserve it ;-)

I don't see any LibreOffice comments, would this (DATEDIF) be the first one?

Yes, indeed, this would be an interesting precedence case.. it's
probably better to setup our own page for this.

I'm not sure about that. It means to double the work and makes
information scattered.

Also Wolfgang's BIT*

functions are in LibO, so would need to be flagged as integrated, same
with Regina's CSC/SEC functions.

Yes, I haven't update the Wiki. But it is a Wiki and in no way _my_
page. So you can alter it as needed.

@Regina:
As all significant work on that OOo wiki page is your's, would you be
willing to contribute it in its entirety to the TDF/LibO wiki?

If you want to copy the content, you may do it. But I see no necessity.

Btw, seeing your work on IMSEC and such is lingering as a patch attached
to https://issues.apache.org/ooo/show_bug.cgi?id=111609 what's the state
of the patch? Would it be ready to be integrated? And if so, would you
contribute it?

Oh, that is two years old and I've lost sight of it. As far as I
remember, the mathematics are right, but there have been some problems
with xls and sxc file format, import/export and round trips. Some
problems are mentioned in
http://www.mail-archive.com/dev@sc.openoffice.org/msg02387.html, for
example. And the parts for the help are missing too. So no, that is not
ready to integrate. From point of license I prefer to get it under
APL2.0 license too, otherwise an integration to AOO will be difficult.
Differences in UI for AOO and LO are OK, but things which are close to
ODF file format and touch import/export filters should be exchangeable.

Also, coukld this page be a source for me to add more formulas that are in
ODF1.2 and not yet in calc?

Yes, it should be pretty up-to-date. Just give us a heads-up what you
would like to pick so we can get into details. If possible we should
focus on functions defined in the Small/Medium/Large sets of ODFF in
that order, see
http://docs.oasis-open.org/office/v1.2/cs01/OpenDocument-v1.2-cs01-part2.html#__RefHeading__1018916_7159801101

I think we cover all of Small and most of Medium, only a few missing,
a double check would be good.

Kind regards
Regina

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] fdo#50162 merge rtlbootstrap.mk into configure.in

2012-05-21 Thread Tor Lillqvist

On 22 May 2012 08:51, David Tardon  wrote:
>  IMHO it makes sense to put the
> definitions together in one place.

Definitely, yes, and (the other) David's patch seems nice, just needs
some minor fixes as Rene said.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: GSoC Week 1

2012-05-21 Thread Tor Lillqvist

> you mean, with 10.000 lines of changes per week, in the fine tradition
> of OpenOffice.org?  :-P

That is a possibility, yes. *I* don't need it, and I assume GSoC
students don't need it either, they should be capable of building and
installing automake and autoconf.

(Another possibility is to keep the pre-generated configure script on
the web and download it when necessary.)

But we need more Mac-knowledgeable developers to make LO into a better
app on the Mac, don't we? And we want to make it as easy as possible
for them to start hacking on the actual code. Now when it is possible
to build LO with the *current* Xcode (one doesn't need to hunt for the
obsolete, ever more difficult to find and difficult to install, Xcode
3), we are a big step in that direction. Our principle has always been
that for the Mac one shouldn't need any 3rd-party software. But now
when Apple in their wisdom (or by accident) stopped including automake
and autoconf in Xcode, that isn't true any more.

Consider some Mac-savvy developer with a slight interest in FLOSS, who
tries LO and notices some of the many things that are a bit broken on
the Mac. "Oh, I could try to fix that", would be the reaction we want,
right? So source is downloaded, some getting started wiki pages read,
and then ./autogen.sh stops with a missing aclocal. "aclocal, never
heard of that, must be some Linux crack, oh well, I have other things
to do".

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: vcl/inc

2012-05-21 Thread Tor Lillqvist

 vcl/inc/vcl/outdev.hxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 11e9ba6353dc42e85dddc346a174503d493bf82a
Author: Tor Lillqvist 
Date:   Mon May 21 17:38:44 2012 +0300

Bin unused OUTDEV_BUFFER_SIZE

Change-Id: I14bc964e931d9ae1981e7a22e66d2699e16457f3

diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index 284340f..c1459c0 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -112,9 +112,6 @@ namespace vcl
 class RenderGraphic;
 }
 
-#define OUTDEV_BUFFER_SIZE  128
-
-
 // -
 // - OutputDevice-Data -
 // -
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] fdo#50162 merge rtlbootstrap.mk into configure.in

2012-05-21 Thread David Tardon

On Mon, May 21, 2012 at 11:17:23PM +0200, Rene Engelhard wrote:
> I actually think that getting these values from what the compiler gives is 
> safest as
> that one *does* know what it's supoosed to compile for.

The point is that determination of values for THIS_OS and THIS_ARCH in
sal/rtl/source/macro.hxx (which are then assigned to RTL_OS and
RTL_ARCH, see sal/CustomTarget_generated.mk) is in big part based on
variables set by configure (CPUNAME, OS). IMHO it makes sense to put the
definitions together in one place.

D.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: css::uno::DeploymentException

2012-05-21 Thread Terrence Enger

On Mon, 2012-05-21 at 23:22 +0200, Michael Stahl wrote:
> 
> you are probably running into this problem, which can be resolved by
> deleting something from your user profile:
> 
> http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/28734

Heh, heh, heh.  When I was watching the exceptions roll by in gdb, I
wrote myself a note (just in case I run out of things to do )
to look into the four exceptions css::uno::RuntimeException thrown
from xmlreader::XmlReader::XmlReader( ... ) with message text "missing
whitespace before attribute in " and naming files ...

.config/libreoffice/3/user/uno_packages/cache/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/common.rdb

.config/libreoffice/3/user/uno_packages/cache/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/Linux_x86.rdb

.config/libreoffice/3/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/common_.rdb

.config/libreoffice/3/user/extensions/bundled/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/Linux_x86_.rdb

Each of the these files looks like it has binary data, and each was
last changed at least several months ago.  What, I wondered, *should*
these files be doing for LibreOffice?

So, I have moved those four files away, and both localbuilt LO and LO
provided with ubuntu-natty run normally; neither recreates any of the
four files.

Now, if only I can remember what bug I wanted a new LO for hacking on!

Thank you, Michael, for your help.
Terry.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH-3-5] fdo#35270 - kill first-use grammar checker freeze ...

2012-05-21 Thread Daniel Naber

On Montag, 21. Mai 2012, Olivier R. wrote:

Hello Olivier,

> The differences look imho more technical than philosophical, even if
> there are specific features in both of them.

thanks for your explanations of the LT/Lightproof differences.

> Another solution might be to tag Hunspell dictionaries with
> LT tags, but all Hunspell dictionaries were probably not conceived with
> grammar checking in mind, and that’s probably more a dream than a
> doable solution.

Yes, the difficulty comes from the flags used in hunspell. If a hunspell 
dictionary was just a long list of words without flags, one could easily add 
the tags from LT to each word.

> If Lightproof could use LT lexicons, that could be a temporary solution,
> but maybe memory-consuming, as you would have a dictionary for spell
> checking and a lexicon for grammar checking.

I have never tried that but I think the finite state machine used internally 
by LT is quite memory-friendly.

If we could work together more closely that would be great. As you know, 
each rule in LT has an id so it can be identified. Maybe that id could be 
used to keep track of similar rules. Does LightProof also have integrated 
test sentences? Then LT could use them to see what rules are missing in LT 
and vice-versa.

Regards
 Daniel

-- 
http://www.danielnaber.de
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: scp2/source

2012-05-21 Thread Jesús Corrius

 scp2/source/base/registryitem_base.scp   |8 +++
 scp2/source/calc/registryitem_calc.scp   |   32 +++
 scp2/source/draw/registryitem_draw.scp   |   32 +++
 scp2/source/impress/registryitem_impress.scp |   32 +++
 scp2/source/math/registryitem_math.scp   |   16 +++
 scp2/source/writer/registryitem_writer.scp   |   56 +++
 6 files changed, 176 insertions(+)

New commits:
commit 3cd1a896d41e30294fd4113101a69432ee3cae02
Author: JesÃºs Corrius 
Date:   Mon May 21 23:49:49 2012 +0200

Use Aplication User Model IDs for the native file types

Change-Id: I4941d97a8eb540bbf63320db83230707ced9f90f

diff --git a/scp2/source/base/registryitem_base.scp 
b/scp2/source/base/registryitem_base.scp
index fce66e8..e763fd3 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -94,6 +94,14 @@ RegistryItem 
gid_Regitem_Openoffice_Databasedocument_1_Defaulticon
 Value = "\program\soffice.bin,11";
 End
 
+RegistryItem gid_Regitem_Openoffice_Databasedocument_1_AppUserModelID
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Base_Bin;
+Subkey = "opendocument.DatabaseDocument.1";
+Name = "AppUserModelID";
+Value = "TheDocumentFoundation.LibreOffice.Base";
+End
+
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_odb_FullDetails
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/calc/registryitem_calc.scp 
b/scp2/source/calc/registryitem_calc.scp
index 0824608..08dfece 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -286,6 +286,14 @@ RegistryItem 
gid_Regitem_Soffice_Starcalcdocument_6_Defaulticon
 Value = "\program\soffice.bin,3";
 End
 
+RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_AppUserModelID
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Calc_Bin;
+Subkey = "soffice.StarCalcDocument.6";
+Name = "AppUserModelID";
+Value = "TheDocumentFoundation.LibreOffice.Calc";
+End
+
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Insertable
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 ModuleID = gid_Module_Prg_Calc_Bin;
@@ -383,6 +391,14 @@ RegistryItem 
gid_Regitem_Soffice_Starcalctemplate_6_Defaulticon
 Value = "\program\soffice.bin,4";
 End
 
+RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_AppUserModelID
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Calc_Bin;
+Subkey = "soffice.StarCalcTemplate.6";
+Name = "AppUserModelID";
+Value = "TheDocumentFoundation.LibreOffice.Calc";
+End
+
 RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 Subkey = "soffice.StarCalcTemplate.6\shell";
@@ -672,6 +688,14 @@ RegistryItem 
gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
 Value = "\program\soffice.bin,3";
 End
 
+RegistryItem gid_Regitem_Openoffice_Calcdocument_1_AppUserModelID
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Calc_Bin;
+Subkey = "opendocument.CalcDocument.1";
+Name = "AppUserModelID";
+Value = "TheDocumentFoundation.LibreOffice.Calc";
+End
+
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_ods_FullDetails
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -881,6 +905,14 @@ RegistryItem 
gid_Regitem_Openoffice_Calctemplate_1_Defaulticon
 Value = "\program\soffice.bin,4";
 End
 
+RegistryItem gid_Regitem_Openoffice_Calctemplate_1_AppUserModelID
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Calc_Bin;
+Subkey = "opendocument.CalcTemplate.1";
+Name = "AppUserModelID";
+Value = "TheDocumentFoundation.LibreOffice.Calc";
+End
+
 #ifdef _MSC_VER
 RegistryItem gid_Regitem_ots_FullDetails
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/draw/registryitem_draw.scp 
b/scp2/source/draw/registryitem_draw.scp
index 5357146..c461a4f 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -286,6 +286,14 @@ RegistryItem 
gid_Regitem_Soffice_Stardrawdocument_6_Defaulticon
 Value = "\program\soffice.bin,5";
 End
 
+RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_AppUserModelID
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Draw_Bin;
+Subkey = "soffice.StarDrawDocument.6";
+Name = "AppUserModelID";
+Value = "TheDocumentFoundation.LibreOffice.Draw";
+End
+
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 ModuleID = gid_Module_Prg_Draw_Bin;
@@ -383,6 +391,14 @@ RegistryItem 
gid_Regitem_Soffice_Stardrawtemplate_6_Defaulticon
 Value = "\program\soffice.bin,6";
 End
 
+RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_AppUserModelID
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Draw_Bin;
+Subkey = "soffice.StarDrawTemplate.6";
+Name = "AppUserMo

Re: [PUSHED:3-5-4] fdo#47035: Fix loading & saving of jpeg files on Mac/PPC

2012-05-21 Thread Christian Lohmaier

HI *,

On Mon, May 21, 2012 at 4:30 PM, Petr Mladek  wrote:
> Fridrich Strba píše v Po 21. 05. 2012 v 16:12 +0200:
>> +1 from me for 3.5.4
>
> Thanks for approvals. This was the third one => pushed into 3-5-4
> branch, see
> http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5-4&id=20987a1d0ec675f3a23a4be58eb7309f60fc62de
> http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5-4&id=d4f45305ecdb38d3c2b5f91ec4f29cb89e29f770

Thanks a lot for the reviews & pushing it :-)

ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [GSoC 2011][svg export filter] GSoC project start

2012-05-21 Thread Christian Lohmaier

Hi *,

On Mon, May 21, 2012 at 4:32 PM, Marco Cecchetti  wrote:
> On Mon, 21 May 2012 12:45:37 +0200, Christian Lohmaier
>  wrote:
>>
>> https://bugs.freedesktop.org/show_bug.cgi?id=43060
>>
>> So please put
>> * use coordinate system that all tools agree upon.
> [...]
> I was not aware of this problem, anyway having a presentation
> not resized automatically and placed top left is not really appealing.
> For these reasons I take the following decision: export of page extents
> with units is back but only when a single slide/page is exported.

Sounds very reasonable.  - Thanks a lot!

ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] fdo#50162 merge rtlbootstrap.mk into configure.in

2012-05-21 Thread Rene Engelhard

Hi,

On Mon, May 21, 2012 at 09:39:52PM +0200, David Ostrovsky wrote:
> with this patch sal/rtl/source/macro.hxx is merged into configure
> process and
> rtlbootstrap.mk is not generated any more.

 arm*)
 CPU=R
 CPUNAME=ARM
+RTL_ARCH=ARM_EABI
 EPM_FLAGS="-a arm"
 OUTPATH=unxlngr
 ;;

is wrong.

arm*-linux-gnueabi) is RTL_ARCH=ARM_EABI.
arm*-linux) is RTL_ARCH=ARM_OABI.

Yes, arm oabi is dead...

 mips64el)
 CPU=M
 CPUNAME=GODSON
+RTL_ARCH=MIPS_EB
 EPM_FLAGS="-a mips64el"
 OUTPATH=unxlngmips
 ;;
 mipsel)
 CPU=M
 CPUNAME=GODSON
+RTL_ARCH=MIPS_EB
 EPM_FLAGS="-a mipsel"
 OUTPATH=unxlngmips
 ;;

is obviously also wrong. it's called mipsel for a reason. Yes, it's little 
endian,
so MIPS_EL would be right here.

I bet that more of this might be wrong,
I actually think that getting these values from what the compiler gives is 
safest as
that one *does* know what it's supoosed to compile for.

Regards,

Rene
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [GSoC 2011][svg export filter] GSoC project start

2012-05-21 Thread Thorsten Behrens

Marco Cecchetti wrote:
> At present there are two initial commits: the first one is
> a technical commit where I fixed some indentation issue,
> the second is an improvement of the Python script that generates
> the c++ header from the JavaScript engine: now debug printers are
> turned off automatically by the Python script, so there is no more
> the need to turn them off manually before performing a commit.
> 
Hi Marco,

nice, and much appreciated - while sounding trifle, I personally
enjoy reading nicely formatted code much more. :)

> [snip]
> 
> So, that is the initial plan.
> I'll provide a log book and a weekly report.
> 
Perfect - let's go for it. Just, you sure I can't talk into blogging
that weekly report instead? In that case, IIRC Miklos had a nice
text2rss script around somewhere. ;)

Cheers,

-- Thorsten


pgpOVkUYx6UOB.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: css::uno::DeploymentException

2012-05-21 Thread Michael Stahl

On 21/05/12 23:14, Terrence Enger wrote:
> ServiceManager::readRdbFile() throws
> css::uno::DeploymentException.  The program is well on its way to
> falling over.  e.Message in the thrown exception says, with
> newlines inserted freely, ...
> 
> file:///home/terry/lo_hacking/git/libo/solver/unxlngi6/
> installation/opt/program/../share/extensions/
> script-provider-for-python/components.rdb: duplicate
> 
> 

you are probably running into this problem, which can be resolved by
deleting something from your user profile:

http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/28734

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] [WIP] fdo#45747 - [EasyHack] remove the limitation to 3 sort entries in calc, part 2

2012-05-21 Thread Albert Thuswaldner

Hi Markus,

Forgot to CC the list in my previous mail, sorry for the noise.
The patch in the last mail was also wrong.

On Fri, May 18, 2012 at 12:10 PM, Markus Mohrhard
 wrote:
> Hello Albert,
>
> Sorry that it took me a bit to review your patch but my master trees
> are totally screwed for my own feature. I now checked your patch and
> solved the conflicts that were related to my last fix for sort
> dialogs. Attached you'll find a patch that applies cleanly on master.

Thanks.

> I checked the dialog and it looks like we need to move some items a
> bit.

Yea, that's related to different themes/widget set, I guess. It looks
great on my computer running LO under KDE. I had a fixed offset which
dictated the spacing between two sort key items, in the new patch I
now calculate the spacing based on position and height of the widgets.
Still not perfect, needs some wiggling.
It would be great if someone could help out with this :)

> I've attached a simple patch showing how to do this. The patch will
> not compile but shows already the basic ideas. The idea is to move the
> ScSortKeyItems variable into tpsort and only pass a reference. I think
> a good final step is to use a boost::ptr_vector which will control the
> lifetime of the contained objects.

Thanks for the code pointer regarding the reference, It was along the
line what I was thinking. I've now implemented this using
boost::ptr_vector in the new patch. It seems to work, however
strangely enough LO now segfaults on exit of the sort dialog. The
stack trace suggest the problem to be in the Window class, however
boost::ptr_vector should take care of the deletion of its members, so
no dedicated destructor should be necessary. I'm confused...

Could you have a look at this problem. Thanks. I'm feeling the heat of
the feature freeze...

/Albert
From 1237b47bd646285deebc792a469e509640233b79 Mon Sep 17 00:00:00 2001
From: Albert Thuswaldner 
Date: Mon, 21 May 2012 23:04:12 +0200
Subject: [PATCH] fdo#45747 remove the limitation to 3 sort entries in calc part2

Change-Id: I699c424f536b0096b35d3db3aee371793e9e56c4
---
 sc/Library_scui.mk|1 +
 sc/inc/helpids.h  |1 +
 sc/inc/sc.hrc |4 +-
 sc/source/ui/dbgui/sortkeydlg.cxx |  196 
 sc/source/ui/dbgui/tpsort.cxx |  255 -
 sc/source/ui/inc/sortdlg.hrc  |   23 ++--
 sc/source/ui/inc/sortkeydlg.hxx   |  107 
 sc/source/ui/inc/tpsort.hxx   |   28 +
 sc/source/ui/src/sortdlg.src  |  142 +++--
 9 files changed, 485 insertions(+), 272 deletions(-)
 create mode 100644 sc/source/ui/dbgui/sortkeydlg.cxx
 create mode 100644 sc/source/ui/inc/sortkeydlg.hxx

diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index 9af5a63..37478a2 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_Library_add_exception_objects,scui,\
 sc/source/ui/dbgui/scuiasciiopt \
 sc/source/ui/dbgui/scuiimoptdlg \
 sc/source/ui/dbgui/sortdlg \
+sc/source/ui/dbgui/sortkeydlg \
 sc/source/ui/dbgui/subtdlg \
 sc/source/ui/dbgui/textimportoptions \
 sc/source/ui/dbgui/tpsort \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 8d41ab7..7c5955c 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -88,6 +88,7 @@
 #define HID_SC_FORM_ARGS"SC_HID_SC_FORM_ARGS"
 #define HID_SCPAGE_SORT_FIELDS  "SC_HID_SCPAGE_SORT_FIELDS"
 #define HID_SCPAGE_SORT_OPTIONS "SC_HID_SCPAGE_SORT_OPTIONS"
+#define HID_SCPAGE_SORTKEY_FIELDS   "SC_HID_SCPAGE_SORTKEY_FIELDS"
 #define HID_SCPAGE_SUBT_OPTIONS "SC_HID_SCPAGE_SUBT_OPTIONS"
 #define HID_SCPAGE_SUBT_GROUP   "SC_HID_SCPAGE_SUBT_GROUP"
 #define HID_SCPAGE_PROTECTION   "SC_HID_SCPAGE_PROTECTION"
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 59b6564..ee8c042 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1225,7 +1225,9 @@
 #define RID_POPUP_FILTER(SC_DIALOGS_START + 153)
 #define RID_SCDLG_TAB_BG_COLOR  (SC_DIALOGS_START + 154)
 
-#define SC_DIALOGS_END  (SC_DIALOGS_START + 155)
+#define RID_SCPAGE_SORTKEY_FIELDS   (SC_DIALOGS_START + 155)
+#define RID_SCDLG_SORTKEY   (SC_DIALOGS_START + 156)
+#define SC_DIALOGS_END  (SC_DIALOGS_START + 157)
 
 #ifndef STD_MASKCOLOR
 #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x; Blue = 0xFF00; }
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx
new file mode 100644
index 000..0801b8d
--- /dev/null
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -0,0 +1,196 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents o

Re: main in libsofficeapp ...

2012-05-21 Thread Michael Stahl

On 21/05/12 23:08, Michael Meeks wrote:
> Hi Michael,
> 
> commit c7458a4a71a1e875e03772b0f6e8ad9e1a982006
> Author: Michael Stahl 
> Date:   Mon Mar 12 16:24:34 2012 +0100
> 
> desktop: libsofficeapp shouln't need a main()
> 
>   Is that a random cleanup, or something that fixes an issue ? if the
> latter, which issue ? :-)

the issue was that some object ended up being linked into 2 LinkTargets,
and this somehow fixed it, though i don't remember details...

>   The lo_main generated in there is needed by android to get some of our
> samples bootstrapped & runnning.

perhaps the other thing that links this doesn't exist on android, then
add it back with an "if ANDROID"?

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Corrected max inital worksheet number in debughelper message

2012-05-21 Thread Albert Thuswaldner

Hi,
A simple fix of a debughelper message, which I forgot to correct in
one of my previous path.
/Albert
From b4e9b7ff4c371b18d787d5482c28f219f018af84 Mon Sep 17 00:00:00 2001
From: Albert Thuswaldner 
Date: Mon, 21 May 2012 23:02:12 +0200
Subject: [PATCH] Corrected max inital worksheet number in debughelper message

Change-Id: Icd40cc3bdc70e0ff55c82a6a4099411d1da47f56
---
 sc/source/ui/vba/vbaapplication.cxx |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index bb31732..d962395 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -1030,7 +1030,7 @@ void SAL_CALL ScVbaApplication::setSheetsInNewWorkbook( sal_Int32 SheetsInNewWor
 if ( SheetsInNewWorkbook < MININITTAB
   || SheetsInNewWorkbook > MAXINITTAB )
 {
-DebugHelper::exception( OUString(RTL_CONSTASCII_USTRINGPARAM("The number must be between 1 and 1")),
+DebugHelper::exception( OUString(RTL_CONSTASCII_USTRINGPARAM("The number must be between 1 and 1024")),
 uno::Exception(), SbERR_METHOD_FAILED, OUString() );
 }
 else
-- 
1.7.3.4

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

css::uno::DeploymentException

2012-05-21 Thread Terrence Enger

First, my thanks to Caolán McNamara and Stephan Bergmann for helping
me with my build problems.


Now, my build is successful, but soffice.bin falls over quickly with
css::uno::DeploymentException.  Before the program ends, I see ten
exceptions being thrown and caught; the attachment has a backtrace
from what I guess might be an interesting point.  Continuing from
there, I see ...

OStoreSuperBlock::verify(), finds m_aGuard.m_nMagic !=
STORE_MAGIC_SUPERBLOCK and returns store_E_WrongFormat.

SuperBlockPage::verify() sees this twice and returns
store_E_WrongFormat.  This return value propagates through six
call levels to ORegistry::initRegistry().

ORegistry::initRegistry() returns REG_INVALID_REGISTRY.  This
return value propagates through three call levels to
ServiceManager::readLegacyRdbFile().

ServiceManager::readLegacyRdbFile() decides that there is no good
reason for this result, and it returns false.

ServiceManager::readRdbFile() throws
css::uno::DeploymentException.  The program is well on its way to
falling over.  e.Message in the thrown exception says, with
newlines inserted freely, ...

file:///home/terry/lo_hacking/git/libo/solver/unxlngi6/
installation/opt/program/../share/extensions/
script-provider-for-python/components.rdb: duplicate



I have master commit d015384, pulled around 2012-05-20 12:53 UTC; but
I also saw the problem with master commit cdd4d96, pulled around
2012-05-15 15:15 UTC.  My latest configuration parameters are ...

--disable-mozilla
--enable-symbols
--enable-dbgutil
--enable-crashdump
--disable-build-mozilla
--without-system-postgresql
--enable-debug

but I also saw the problem when I configured with an additional ...

--enable-python=internal

(Yes, I have been reduced to poking things at random.  Sigh!)


Suggestions welcome.


Thanks,
Terry.

#0  OStoreSuperBlock::verify (this=0x8077f98) at 
/home/terry/lo_hacking/git/libo/store/source/storbios.cxx:161
#1  0x040dc83d in store::SuperBlockPage::verify (this=0x8077f78, rBIOS=...) at 
/home/terry/lo_hacking/git/libo/store/source/storbios.cxx:387
#2  0x040dcf21 in store::OStorePageBIOS::initialize_Impl (this=0x8068640, 
pLockBytes=0x8073d64, eAccessMode=store_AccessReadOnly, rnPageSize=@0xbfffe4fc) 
at /home/terry/lo_hacking/git/libo/store/source/storbios.cxx:624
#3  0x040dcde8 in store::OStorePageBIOS::initialize (this=0x8068640, 
pLockBytes=0x8073d64, eAccessMode=store_AccessReadOnly, rnPageSize=@0xbfffe4fc) 
at /home/terry/lo_hacking/git/libo/store/source/storbios.cxx:585
#4  0x040e7af9 in store::OStorePageManager::initialize (this=0x8068640, 
pLockBytes=0x8073d64, eAccessMode=store_AccessReadOnly, rnPageSize=@0xbfffe4fc) 
at /home/terry/lo_hacking/git/libo/store/source/storpage.cxx:95
#5  0x040eb796 in store_openFile (pFilename=0x806d8b0, 
eAccessMode=store_AccessReadOnly, nPageSize=512, phFile=0xbfffe59c) at 
/home/terry/lo_hacking/git/libo/store/source/store.cxx:174
#6  0x02f0f585 in store::OStoreFile::create (this=0xbfffe59c, rFilename=..., 
eAccessMode=store_AccessReadOnly, nPageSize=512) at 
/home/terry/lo_hacking/git/libo/solver/unxlngi6/inc/store/store.hxx:450
#7  0x02f0abd9 in ORegistry::initRegistry (this=0x8073fa0, regName=..., 
accessMode=1) at /home/terry/lo_hacking/git/libo/registry/source/regimpl.cxx:489
#8  0x02f153b8 in openRegistry (registryName=0x806d8b0, phRegistry=0xbfffe77c, 
accessMode=1) at 
/home/terry/lo_hacking/git/libo/registry/source/registry.cxx:174
#9  0x008e5ad3 in Registry::open (this=0xbfffe778, registryName=..., 
accessMode=1) at 
/home/terry/lo_hacking/git/libo/solver/unxlngi6/inc/registry/registry.hxx:1223
#10 0x008c2204 in (anonymous namespace)::ServiceManager::readLegacyRdbFile 
(this=0x806b890, uri=...) at 
/home/terry/lo_hacking/git/libo/cppuhelper/source/defaultbootstrap.cxx:1311
#11 0x008c20c0 in (anonymous namespace)::ServiceManager::readRdbFile 
(this=0x806b890, uri=..., optional=true) at 
/home/terry/lo_hacking/git/libo/cppuhelper/source/defaultbootstrap.cxx:1297
#12 0x008c1a3a in (anonymous namespace)::ServiceManager::readRdbs 
(this=0x806b890, uris=...) at 
/home/terry/lo_hacking/git/libo/cppuhelper/source/defaultbootstrap.cxx:1254
#13 0x008be354 in (anonymous namespace)::ServiceManager::ServiceManager 
(this=0x806b890, rdbUris=...) at 
/home/terry/lo_hacking/git/libo/cppuhelper/source/defaultbootstrap.cxx:575
#14 0x008c6a3a in (anonymous namespace)::bootstrapComponentContext 
(typeRegistry=uno::Reference to { = 
{_vptr.XInterface = 0x43b4d48}, }, serviceUris=..., 
bootstrap=...) at 
/home/terry/lo_hacking/git/libo/cppuhelper/source/defaultbootstrap.cxx:1791
#15 0x008c8563 in cppu::defaultBootstrap_InitialComponentContext (iniUri=...) 
at /home/terry/lo_hacking/git/libo/cppuhelper/source/defaultbootstrap.cxx:1995
#16 0x008c86ac in cppu::defaultBootstrap_InitialComponentContext () at 
/home/terry/lo_hacking/git/libo/cppuhelper/source/defaultbootstrap.cxx:

main in libsofficeapp ...

2012-05-21 Thread Michael Meeks

Hi Michael,

commit c7458a4a71a1e875e03772b0f6e8ad9e1a982006
Author: Michael Stahl 
Date:   Mon Mar 12 16:24:34 2012 +0100

desktop: libsofficeapp shouln't need a main()

Is that a random cleanup, or something that fixes an issue ? if the
latter, which issue ? :-)

The lo_main generated in there is needed by android to get some of our
samples bootstrapped & runnning.

Thanks,

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

License statement: Dwayne Bailey

2012-05-21 Thread Dwayne Bailey


Hi All,

All of my past and future contributions to LibreOffice may be licensed 
under the MPL/LGPLv3+ dual license.


--
Dwayne Bailey
+27 12 460 1095

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: --enable-debug vs --enable-symbols (Re: [Libreoffice-commits] .: 12 commits - config_host.mk.in configure.in filter/source oox/source sal/inc sc/source solenv/gbuild toolkit/source xmlhelp/source)

2012-05-21 Thread Michael Meeks


On Mon, 2012-05-21 at 18:06 +0200, Stephan Bergmann wrote:
> I rarely use a debugger to step through code, so I prefer to avoid the 

Egad - is this thread still going on :-) Could we create a set of the
pros / cons & a concrete proposal for the ESC call on Thursday ?

Thanks,

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#50162 merge rtlbootstrap.mk into configure.in

2012-05-21 Thread David Ostrovsky


Hi,

with this patch sal/rtl/source/macro.hxx is merged into configure 
process and

rtlbootstrap.mk is not generated any more.

Btw, it seems that we still do not have native 64-bit MacOS X port, why?

cat configure.in
[...]
darwin*)
[...]
i*86|x86_64)
CPU=I
CPUNAME=INTEL
RTL_ARCH=x86
[...]

Ciao
David

>From 3aa8559bddb9db832bd7c451d546ad970aae9f71 Mon Sep 17 00:00:00 2001
From: David Ostrovsky 
Date: Mon, 21 May 2012 19:01:29 +0200
Subject: [PATCH] fdo#50162 merge rtlbootstrap.mk into configure.in

Change-Id: I241be2704a069ec1f6be5861084039569673cc12
---
 config_host.mk.in |2 +
 configure.in  |   54 +-
 instsetoo_native/util/makefile.mk |1 -
 sal/CustomTarget_generated.mk |   21 +--
 sal/Library_sal.mk|2 +
 sal/Package_generated.mk  |1 -
 sal/rtl/source/bootstrap.cxx  |6 +-
 sal/rtl/source/macro.hxx  |  116 -
 sdext/platform.mk |8 +-
 solenv/inc/settings.mk|2 -
 10 files changed, 64 insertions(+), 149 deletions(-)
 delete mode 100644 sal/rtl/source/macro.hxx

diff --git a/config_host.mk.in b/config_host.mk.in
index 0a85bfd..76d4a1d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -426,6 +426,8 @@ export REDLAND_CFLAGS=@REDLAND_CFLAGS@
 export REDLAND_LIBS=@REDLAND_LIBS@
 export RHINO_JAR=@RHINO_JAR@
 export RPM=@RPM@
+export RTL_OS=@RTL_OS@
+export RTL_ARCH=@RTL_ARCH@
 export SAC_JAR=@SAC_JAR@
 export SAL_ENABLE_FILE_LOCKING=1
 export SAMPLEICC_CFLAGS=@SAMPLEICC_CFLAGS@
diff --git a/configure.in b/configure.in
index 510d82a..64efe0a 100644
--- a/configure.in
+++ b/configure.in
@@ -2991,6 +2991,8 @@ aix*)
 GUI=UNX
 GUIBASE=unx
 OS=AIX
+RTL_OS=AIX
+RTL_ARCH=PowerPC
 OUTPATH=unxaigppc
 P_SEP=:
 SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
@@ -3003,6 +3005,7 @@ cygwin*)
 GUI=WNT
 GUIBASE=WIN
 OS=WNT
+RTL_OS=Windows
 P_SEP=";"
 
 case "$host_cpu" in
@@ -3010,11 +3013,13 @@ cygwin*)
 if test "$CL_X64" != ""; then
 CPU=X
 CPUNAME=X86_64
+RTL_ARCH=X86_64
 LIB64="lib/x64"
 OUTPATH=wntmscx$COMEX
 else
 CPU=I
 CPUNAME=INTEL
+RTL_ARCH=x86
 OUTPATH=wntmsci$COMEX
 fi
 ;;
@@ -3033,12 +3038,14 @@ darwin*)
 # Not sure if "Aqua" is the right term to use?
 GUIBASE="aqua"
 OS=MACOSX
+RTL_OS=MacOSX
 P_SEP=:
 
 case "$host_cpu" in
 arm*)
 CPU=R
 CPUNAME=ARM
+RTL_ARCH=ARM_EABI
 GUIBASE=cocoatouch
 OUTPATH=unxiosr
 OS=IOS;
@@ -3046,11 +3053,13 @@ darwin*)
 powerpc*)
 CPU=P
 CPUNAME=POWERPC
+RTL_ARCH=PowerPC
 OUTPATH=unxmacxp
 ;;
 i*86|x86_64)
 CPU=I
 CPUNAME=INTEL
+RTL_ARCH=x86
 OUTPATH=unxmacxi
 ;;
 *)
@@ -3065,6 +3074,7 @@ dragonfly*)
 GUI=UNX
 GUIBASE=unx
 OS=DRAGONFLY
+RTL_OS=DragonFly
 OUTPATH=unxdfly
 P_SEP=:
 
@@ -3072,10 +3082,12 @@ dragonfly*)
 i*86)
 CPU=I
 CPUNAME=INTEL
+RTL_ARCH=x86
 ;;
 x86_64)
 CPU=X
 CPUNAME=X86_64
+RTL_ARCH=X86_64
 ;;
 *)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
@@ -3090,6 +3102,7 @@ freebsd*)
 COM=GCC
 GUI=UNX
 GUIBASE=unx
+RTL_OS=FreeBSD
 OS=FREEBSD
 OUTPATH=unxfbsd
 P_SEP=:
@@ -3098,11 +3111,13 @@ freebsd*)
 i*86)
 CPU=I
 CPUNAME=INTEL
+RTL_ARCH=x86
 OUTPATH=unxfbsdi
 ;;
 x86_64)
 CPU=X
 CPUNAME=X86_64
+RTL_ARCH=X86_64
 ;;
 *)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
@@ -3118,17 +3133,19 @@ kfreebsd*)
 GUI=UNX
 GUIBASE=unx
 OS=LINUX
-
+RTL_OS=kFreeBSD
 case "$host_cpu" in
 
 i*86)
 CPU=I
 CPUNAME=INTEL
+RTL_ARCH=x86
 OUTPATH=unxkfgi6
 ;;
 x86_64)
 CPU=X
 CPUNAME=X86_64
+RTL_ARCH=X86_64
 LIB64="lib64"
 OUTPATH=unxkfgx6
 ;;
@@ -3146,6 +3163,7 @@ linux-gnu*)
 GUI=UNX
 GUIBASE=unx
 OS=LINUX
+RTL_OS=Linux
 P_SEP=:
 
 case "$host_cpu" in
@@ -3153,89 +3171,105 @@ linux-gnu*)
 alpha)
 CPU=L
 CPUNAME=AXP
+RTL_ARCH=ALPHA
 OUTPATH=unxlngaxp
 ;;
 arm*)
 CPU=R
 CPUNAME=ARM
+RTL_ARCH=ARM_EABI
 EPM_FLAGS="-a arm"
 OUTPATH=unxlngr
 ;;
 hppa)
 CPU=H
 CPUNAME=HPPA
+RTL_ARCH=HPPA
 EPM_FLAGS="-a hppa"
 OUTPATH=unxlnghppa
 ;;
 i*86)
 CPU=I
 CPUNAME=INTEL
+RTL_ARCH=x86
 OUTPATH=unxlngi6
 ;;
 ia64)
 CPU=A

Re: GSoC Week 1

2012-05-21 Thread Michael Stahl

On 21/05/12 13:45, Tor Lillqvist wrote:
> You need to download tarballs for some recent version of automake and
> autoconf, configure and install them somewhere, like /usr/local. A bit
> of bother, yes. I wonder if we should start including a pre-autogened
> configure script somewhere in the git tree.

you mean, with 10.000 lines of changes per week, in the fine tradition
of OpenOffice.org?  :-P


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 3 commits - instsetoo_native/inc_openoffice solenv/bin

2012-05-21 Thread Andras Timar

 instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf |2 --
 instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf |6 
+++---
 instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf  |8 
+---
 instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt |1 -
 solenv/bin/modules/installer/windows/property.pm   |3 ---
 5 files changed, 4 insertions(+), 16 deletions(-)

New commits:
commit 3d5c23f1cfeec3a9bc2f683e460e21afef728a6a
Author: Andras Timar 
Date:   Mon May 21 16:25:49 2012 +0200

MSI: remove always true LaunchCondition

Change-Id: Ia2b63502dbd8b5e4e0ca7faa34e06df73f094a78

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
index 20f2a60..e3f6f7f 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
@@ -1,4 +1,2 @@
 [OOO_LAUNCH_1]
 en-US = "The Installation Wizard cannot be run properly because you are logged 
in as a user without sufficient administrator rights for this system."
-[OOO_LAUNCH_2]
-en-US = "Please use the file setup.exe to start the installation."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
index 7c8ee15..35d7869 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
@@ -2,4 +2,3 @@ Condition   Description
 s255   l255
 WINDOWSENCODINGTEMPLATELaunchCondition Condition
 Privileged OOO_LAUNCH_1
-(VersionNT < 900) or (SETUP_USED=1) or Installed   OOO_LAUNCH_2
diff --git a/solenv/bin/modules/installer/windows/property.pm 
b/solenv/bin/modules/installer/windows/property.pm
index 934802d..32195e1 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -333,9 +333,6 @@ sub set_important_properties
 {
 my $onepropertyline = "ISPATCH" . "\t" . "1" . "\n";
 push(@{$propertyfile}, $onepropertyline);
-
-$onepropertyline = "SETUP_USED" . "\t" . "0" . "\n";
-push(@{$propertyfile}, $onepropertyline);
 }
 
 if ( $installer::globals::languagepack )
commit c5766287c119f9af704538bf1f861b3f2b6c0863
Author: Andras Timar 
Date:   Mon May 21 16:09:56 2012 +0200

strings for MSI Summary Info

Change-Id: Iae8eb4a1a7f3a0d429ac47f64a77dcd4404d14d1

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf
index 6429037..3376c3d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/SIS.ulf
@@ -1,14 +1,8 @@
 [OOO_SIS_TITLE]
 en-US = "Installation database"
 
-[OOO_SIS_AUTHOR]
-en-US = "Author"
-
-[OOO_SIS_SUBJECT]
-en-US = "Subject"
-
 [OOO_SIS_COMMENT]
-en-US = "Comment"
+en-US = "This installer database contains the logic and data required to 
install LibreOffice."
 
 [OOO_SIS_KEYWORDS]
 en-US = "Install,MSI"
commit 911d5488c58bb513fe9242097a388faa950ab702
Author: Andras Timar 
Date:   Mon May 21 16:00:53 2012 +0200

MSI: ARP strings for Summary Info

Change-Id: If47645a381a8da9851ba1bc19431f6341151906f

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
index 81ae531..b1bc76c 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf
@@ -1,8 +1,8 @@
 [OOO_ARPCONTACTTEMPLATE]
-en-US = "Department for technical support"
+en-US = "LibreOffice Community"
 
 [OOO_ARPHELPLINKTEMPLATE]
-en-US = "http://www.documentfoundation.org";
+en-US = "http://www.libreoffice.org/get-help";
 
 [OOO_ARPHELPTELEPHONETEMPLATE]
 en-US = "x-xxx-xxx-xxx"
@@ -11,7 +11,7 @@ en-US = "x-xxx-xxx-xxx"
 en-US = "http://www.documentfoundation.org";
 
 [OOO_ARPURLUPDATEINFOTEMPLATE]
-en-US = "http://www.documentfoundation.org";
+en-US = "http://www.libreoffice.org/download";
 
 [OOO_STR_NEW_DISPLAY_NAME]
 en-US = "~New"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: --enable-debug vs --enable-symbols (Re: [Libreoffice-commits] .: 12 commits - config_host.mk.in configure.in filter/source oox/source sal/inc sc/source solenv/gbuild toolkit/source xmlhelp/source)

2012-05-21 Thread Pierre-André Jacquod


Hello,

On 05/20/2012 11:24 PM, Norbert Thiebaud wrote:

On Wed, May 16, 2012 at 11:30 PM, Pierre-André Jacquod
  wrote:

expecting to get symbols without optimization, not wanting all asserts
outputs.


If you are intending to debug why wouldn't you want the misnamed
'assert output' ?
Better said, I do not care of them / are not useful: I try to solve some 
bugzilla points and it happens I have not yet have seen one caught by an 
assert :- )


Hence the minimum is the best for me. But yeah, I admit I most probably 
did not get the power of all this stuff.


Regards
Pierre-André
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

UPDATE: Swedish hunspell dictionary

2012-05-21 Thread Göran Andersson

The Swedish spell checking dictionary has been updated.
The latest version, 2.5, is available at
http://extensions.libreoffice.org/extension-center/swedish-spelling-dictionary-den-stora-svenska-ordlistan
(it can also be downloaded from http://code.google.com/p/dsso/downloads/list
).

There are now two versions of the dictionary; one for the sv_SE locale and
one for the sv_FI locale.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: codemaker/source

2012-05-21 Thread Michael Stahl

 codemaker/source/javamaker/classfile.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 26643fb59e0005f0bc83708b785d20d62d8e7411
Author: Michael Stahl 
Date:   Fri May 18 00:50:25 2012 +0200

codemaker: write version 49 (1.5) class files

The trick of writing generic types into class files of versions < 49
does no longer work with javac from OpenJDK 7:

/comphelper/qa/complex/comphelper/Map.java:154: error: type Pair does
not take parameters
  Pair< ?, ? >[] initialMappings = new Pair< ?, ? >[ _keys.length ];

There appears to be a related JDK bug for this, at some time javac had
an undocumented option to produce similar class files that are also
rejected now, this has been closed as "Not a Defect":

http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7078419

Change-Id: I8a504f6cbb3bb58cd914aebb88637cc6feb0bd48

diff --git a/codemaker/source/javamaker/classfile.cxx 
b/codemaker/source/javamaker/classfile.cxx
index 1a8bf01..8efdddb 100644
--- a/codemaker/source/javamaker/classfile.cxx
+++ b/codemaker/source/javamaker/classfile.cxx
@@ -693,7 +693,7 @@ void ClassFile::addMethod(
 void ClassFile::write(FileStream & file) const {
 writeU4(file, 0xCAFEBABE);
 writeU2(file, 0);
-writeU2(file, 46);
+writeU2(file, 49); // class file version of JRE 1.5
 writeU2(file, m_constantPoolCount);
 writeStream(file, m_constantPool);
 writeU2(file, static_cast< sal_uInt16 >(m_accessFlags));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW][3-5] Re: fdo#40874 border macro regression

2012-05-21 Thread Michael Stahl

argh, set subject accordingly...

On 21/05/12 18:42, Michael Stahl wrote:
> 
> running macros that set borders is broken since 3.4, this commit should
> fix it and go into libreoffice-3-5:
> 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=18ab7f52ebf78f41f824b2245a8a180d97081716


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

fdo#40874 border macro regression

2012-05-21 Thread Michael Stahl


running macros that set borders is broken since 3.4, this commit should
fix it and go into libreoffice-3-5:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=18ab7f52ebf78f41f824b2245a8a180d97081716

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: 2 commits - editeng/source solenv/gbuild

2012-05-21 Thread Michael Stahl

 editeng/source/items/frmitems.cxx |   43 +++---
 solenv/gbuild/SdiTarget.mk|4 +++
 2 files changed, 44 insertions(+), 3 deletions(-)

New commits:
commit e81f02795425f2fcd910c9845adc8e9b919833f4
Author: Michael Stahl 
Date:   Mon May 21 18:10:46 2012 +0200

SdiTarget.mk: need explicit rule to get object files rebuilt

Without this, when changing sdi file, the objects that include the
generated header are only rebuilt at the second make invocation.

Change-Id: Idd52a12dd162ec780da3a3b9f24d3bdd9b408a33

diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index d911856..43e38ab 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -52,6 +52,10 @@ $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi 
$(gb_SdiTarget_SVIDLTARGET)
-fM$(call gb_SdiTarget_get_dep_target,$*) \
$<)
 
+# rule necessary to rebuild cxx files that include the header
+$(call gb_SdiTarget_get_target,%.hxx) : $(call gb_SdiTarget_get_target,%)
+   @true
+
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_SdiTarget_get_dep_target,%) :
$(if $(wildcard $@),touch $@,\
commit 18ab7f52ebf78f41f824b2245a8a180d97081716
Author: Michael Stahl 
Date:   Mon May 21 14:02:36 2012 +0200

fdo#40874: make recorded border macros run:

When the new BorderLine2 struct with its added members was introduced,
the PutValues methods that are called by the macro recorder with
seqeunces of Anys were not adapted, so running recorded macro for
".uno:BorderInner" ".uno:BorderOuter" ".uno:SetBorderStyle" fails.
(regression from b624e6e6cf2ecfc6e6e983af45212fce5e731006,
7db30f7aa037f52eb07cbb4fd2796bd869204af8)

Change-Id: Icd8a11d7f5c8d79c57020f213a1554540b6c666d

diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index f98058e..8651534 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -2064,7 +2064,7 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, 
sal_uInt8 nMemberId )
 catch (const uno::Exception&) {}
 
 aNew >>= aSeq;
-if ( aSeq.getLength() == 4 )
+if (aSeq.getLength() >= 4 && aSeq.getLength() <= 6)
 {
 sal_Int32 nVal = 0;
 if ( aSeq[0] >>= nVal )
@@ -2075,6 +2075,20 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, 
sal_uInt8 nMemberId )
 aBorderLine.OuterLineWidth = (sal_Int16) nVal;
 if ( aSeq[3] >>= nVal )
 aBorderLine.LineDistance = (sal_Int16) nVal;
+if (aSeq.getLength() >= 5) // fdo#40874 added fields
+{
+if (aSeq[4] >>= nVal)
+{
+aBorderLine.LineStyle = nVal;
+}
+if (aSeq.getLength() >= 6)
+{
+if (aSeq[5] >>= nVal)
+{
+aBorderLine.LineWidth = nVal;
+}
+}
+}
 }
 else
 return sal_False;
@@ -2854,7 +2868,8 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, 
sal_uInt8 nMemberId )
 try { aNew = xConverter->convertTo( rVal, ::getCppuType((const 
uno::Sequence < uno::Any >*)0) ); }
 catch (const uno::Exception&) {}
 
-if( (aNew >>= aSeq) && aSeq.getLength() == 4 )
+if ((aNew >>= aSeq) &&
+aSeq.getLength() >= 4  && aSeq.getLength() <= 6)
 {
 sal_Int32 nVal = 0;
 if ( aSeq[0] >>= nVal )
@@ -2865,6 +2880,20 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, 
sal_uInt8 nMemberId )
 aBorderLine.OuterLineWidth = (sal_Int16) nVal;
 if ( aSeq[3] >>= nVal )
 aBorderLine.LineDistance = (sal_Int16) nVal;
+if (aSeq.getLength() >= 5) // fdo#40874 added fields
+{
+if (aSeq[4] >>= nVal)
+{
+aBorderLine.LineStyle = nVal;
+}
+if (aSeq.getLength() >= 6)
+{
+if (aSeq[5] >>= nVal)
+{
+aBorderLine.LineWidth = nVal;
+}
+}
+}
 }
 else
 return sal_False;
@@ -2874,12 +2903,20 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, 
sal_uInt8 nMemberId )
 // serialization for basic macro recording
 ::com::sun::star::uno::Sequence < sal_Int16 > aSeq;
 rVal >>= aSeq;
-if ( aSeq.getL

Re: [REVIEW][3-5] fdo#42865, SVN 1.7, etc.

2012-05-21 Thread Michael Stahl

On 18/05/12 17:28, Michael Stahl wrote:
> * fdo#42865 the --enable-dbgutil only problem of _GLIBCXX_DEBUG adding a
> new symbol with unique linkage has re-surfaced and spread further, most
> likely due to the new std::string based SAL_LOG stuff; strangely it
> seems to work on Fedora 16 but on 17 it crashes and burns immediately in
> sal unit tests; attached patch fixes it for -3-5 (the Conflicts are all
> the gbuild converted libs on master, on -3-5 it is sufficient to fix the
> addsym.awk)

as cloph has found out, this breaks the build on Mac PPC (but
surprisingly not on Mac Intel), so the following commit is also necessary:
9b72a692ee3ef3381a0881ead4afa5bd73fff776

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: --enable-debug vs --enable-symbols (Re: [Libreoffice-commits] .: 12 commits - config_host.mk.in configure.in filter/source oox/source sal/inc sc/source solenv/gbuild toolkit/source xmlhelp/source)

2012-05-21 Thread Stephan Bergmann


On 05/21/2012 05:10 PM, Lubos Lunak wrote:

On Friday 18 of May 2012, Stephan Bergmann wrote:

Ah, you wanted --enable-dbgutil to disable -O2, the same way that
--enable-debug does.  Had missed that point.  Hm, as I said, I prefer my
--enable-dbgutil --disable-debug builds to be -O2.


  What is the point of that combination? As far as I can tell --enable-dbgutil
is like --enable-debug but for changes that are BIC, so only dbgutil without
debug does not make much sense to me.


I rarely use a debugger to step through code, so I prefer to avoid the 
--enable-debug settings that, AFAIU, are mainly there to aid in 
step-through debugging, but nevertheless cause potential deviation from 
a production build (like -O0, -fno-inline).



So if we change
--enable-dbgutil to imply -O0, I'd like to see that changeset also offer
a reliable way to get back -O2.  (And I'm not sure having to set
C(XX)FLAGS can be considered reliable enough, given that pre-set
C(XX)FLAGS impact more decisions in our build system than just -O2 vs.
-O0.  But maybe I'm asking for too much.)


  What other (relevant) decisions should be affected by that?


OK, tracing gb_LinkTarget__get_{c,objc,cxx,objcxx}flags 
(solenv/gbuild/LinkTarget.mk), for a --disable-debug build these 
environment variables indeed seem to only affect -O switches.  (From 
Michael Stahl's explanations, I would have assumed they would at least 
also affect -g switches, however.)  But looking at that code also shows 
that explicitly setting CFLAGS and CXXFLAGS would give potentially 
unexpected results -- one needs to set OBJCFLAGS and OBJCXXFLAGS as well 
-- which brings me back to my point of reliability.


Turning this around:  What is it that you find problematic with 
--enable-dbgutil not affecting the default -O2?


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-05-21 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=37361

Michael Meeks  changed:

   What|Removed |Added

 Depends on||50173

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

97 matches

Mail list logo