Re: android / activation helpers / return values ?

2012-08-06 Thread Stephan Bergmann

On 08/04/2012 09:16 PM, Michael Meeks wrote:

No ExtensionManager: exception 'component context fails to
supply singleton com.sun.star.deployment.ExtensionManager of
type ...

Is it intended that that would throw an exception rather than returning
NULL ? that was apparently not clear to either to Caolan, or me reading
it :-)


The new-style service constructors/singleton getters never return null 
but throw DeplyomentException.  (Old createInstance stuff is vague on 
whether to return null or throw an exception, both happening in 
practice.  Maybe the code in question used to work with a null-returning 
createInstance line, and then has been changed to use the new style getter.)



Of course - Android has no real need for the extension manager, we'll
bundle a static image - so this sort of thing is expected; so just a
question: is a nil return, or an exception ideal ? and/or is some
QUERY_THROW type annotation wanted ? :-)


The general contract is that the services/singletons specified in UNOIDL 
are available from the global service manager.  That implies that 
throwing a DeploymentException (something fundamental is broken with 
this installation) is better than returning null.  One could rethink 
that for platform feature fragmentation (rethink it into both 
directions: on the one hand, throwing an exception is not ideal; on the 
other hand, ignoring the exception for non-Android is not ideal, 
either), but I'm not sure it is worth it.


In any case, I'd augment the patch to catch just DeploymentException, 
turn the fprintf into a SAL_WARN, and add a comment that the exception 
is only expected to happen on Android.


Stephan

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


Re: Static src analysis of LibreOffice

2012-08-06 Thread Stephan Bergmann

On 08/03/2012 03:42 PM, John Smith wrote:

- Still lots of external stuff, dmake, libxmlsec/unxlngi6.pro,
workdir/unxlngi6.pro/LexTarget, ...


Well, the analyzer simply follows/precedes whatever you tell 'make' to
do. So if the build includes 'make dbuild', then that *will* not only
get build, but analyzed as well and show up in the report. I was
hoping that adding '--with-system-libs' would solve that issue, but
apparently it doesnt. If there are ./configure switches to disable
compilation of those final parts - and Fedora pre-build system rpms to
replace them -  then all should be fine. Or perhaps the rest of this
'external stuff' should be added to  '--with-system-libs', or get it's
own ./configure switch ?


dmake will eventually be obsoleted by our new gbuild machinery and 
removed.  For the time being, it could help to start analyzing only 
after dmake has already been build (it is built in ./bootstrap, so 
something like ./autogen.sh  ./bootstrap  make instead of just 
make might help).


workdir/unxlngi6.pro/LexTarget contains generated flex output, which 
itself is not external code, but the quality of that code, at least 
partly, is under the control of the external flex tool.  Something of a 
special case (hopefully leading to only a few reports anyway, which also 
might be worthwhile addressing in upstream flex if they are not false 
positives).


In any case, such stuff should be something we can filter out in some 
way (post-processing the data -- is it only available as HTML, or also 
in some other format?), so I wouldn't worry about it too much.  Just 
wanted to note it down...


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


RE: Adding new label's format

2012-08-06 Thread Winfried Donkers
 Info Agipa wrote (27 juli 2012 09:28)

Hi Sylvain,

  How is the best way to perform this ?
  There is a description of this file to give the good informations ?
 See:
 officecfg/registry/data/org/openoffice/Office/Labels.xcu
 Winfried did some lovely work recently to improve label layout
 which made this more powerful, he'd be the best guy for a documentation
 pointer here I suspect.
 
 Yes, I've found it and see it's fields. I think I can prepare a file with our
 products.
 But how to put this parts in Libreoffice ? Can I send it to someone for adding
 it in the trunk ?

I'm willing to assist you (e.g. providing extra infromation or testing your 
changes to Labels.xcu).
(Sorry for the late reply, but I just returned from holiday)

Winfried

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


Re: Static src analysis of LibreOffice

2012-08-06 Thread Stephan Bergmann

On 08/03/2012 06:07 PM, John Smith wrote:

/usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/type_traits:256:39:
error: use of undeclared identifier '__float128'
 struct __is_floating_point_helper__float128


That smells like On recent Fedora 17, the included Clang (3.0) is 
unusable due to clang++ chokes on complex. However, a home-built Clang 
3.1 works fine. 
(https://wiki.documentfoundation.org/Development/Building_LibreOffice_with_Clang#Setup)


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


Re: [PUSHED 3-6][REVIEW][3-5-6 2/3] regression in fix for fdo#38056

2012-08-06 Thread Stephan Bergmann

On 08/04/2012 08:36 AM, Ivan Timofeev wrote:

On 04.08.2012 01:35, Michael Stahl wrote:

this is a rather stupid regression in 3.5.6, introduced by the fix for
fdo#38056 which can cause crashes because the invalidation is in the
wrong place

please push the fix to libreoffice-3-5-6 and libreoffice-3-6

http://cgit.freedesktop.org/libreoffice/core/commit/?id=9e74e9f3c0931f34fb5421056851a06b83501ce9



pushed to libreoffice-3-6, we need 2 more reviews for 3-5-6.


looks good; one more needed for -3-5-6.

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


Re: Static src analysis of LibreOffice

2012-08-06 Thread John Smith
On Mon, Aug 6, 2012 at 9:08 AM, Stephan Bergmann sberg...@redhat.com wrote:
 On 08/03/2012 06:07 PM, John Smith wrote:


 /usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/type_traits:256:39:
 error: use of undeclared identifier '__float128'
  struct __is_floating_point_helper__float128


 That smells like On recent Fedora 17, the included Clang (3.0) is unusable
 due to clang++ chokes on complex. However, a home-built Clang 3.1 works
 fine.
 (https://wiki.documentfoundation.org/Development/Building_LibreOffice_with_Clang#Setup)


 Stephan

Thanks for pointing that out. I am indeed running Fedora 17. I am not,
however, running the included clang, but the (almost) latest svn :

# clang --version
clang version 3.2 (trunk 161295)
Target: i386-pc-linux-gnu
Thread model: posix


Still weird that that shows up (again ?), though.


Regards,


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


Re: Static src analysis of LibreOffice

2012-08-06 Thread John Smith
On Mon, Aug 6, 2012 at 8:58 AM, Stephan Bergmann sberg...@redhat.com wrote:
 On 08/03/2012 03:42 PM, John Smith wrote:

 - Still lots of external stuff, dmake, libxmlsec/unxlngi6.pro,
 workdir/unxlngi6.pro/LexTarget, ...

 Well, the analyzer simply follows/precedes whatever you tell 'make' to
 do. So if the build includes 'make dbuild', then that *will* not only
 get build, but analyzed as well and show up in the report. I was
 hoping that adding '--with-system-libs' would solve that issue, but
 apparently it doesnt. If there are ./configure switches to disable
 compilation of those final parts - and Fedora pre-build system rpms to
 replace them -  then all should be fine. Or perhaps the rest of this
 'external stuff' should be added to  '--with-system-libs', or get it's
 own ./configure switch ?


 dmake will eventually be obsoleted by our new gbuild machinery and removed.
 For the time being, it could help to start analyzing only after dmake has
 already been build (it is built in ./bootstrap, so something like
 ./autogen.sh  ./bootstrap  make instead of just make might help).

 workdir/unxlngi6.pro/LexTarget contains generated flex output, which itself
 is not external code, but the quality of that code, at least partly, is
 under the control of the external flex tool.  Something of a special case
 (hopefully leading to only a few reports anyway, which also might be
 worthwhile addressing in upstream flex if they are not false positives).

 In any case, such stuff should be something we can filter out in some way
 (post-processing the data -- is it only available as HTML, or also in some
 other format?), so I wouldn't worry about it too much.  Just wanted to note
 it down...


 Stephan

I'll take a look at building dmake before I start another analysis
next time, and see where that gets me. But for the time being, because
analysis literally takes *hours* Im just going to wait and see how
useful the current report is to people. Has anyone actually fixed a
bug yet, based on a analysis report ? (I think I have seen 1 post
about a bugfix on this list so far.).


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


Re: feature/gbuild_ure needs testing

2012-08-06 Thread David Tardon
Hi,

On Sat, Aug 04, 2012 at 02:16:42PM -0500, Norbert Thiebaud wrote:
 ok so now windows fail with
 
 C:/lo/core/solenv/gbuild/Package.mk:44: *** gb_Deliver_deliver: file
 does not exist in solver, and cannot be delivered:
 C:/lo/core/solver/wntmsci12.pro/bin/cliuno.snk.  Stop.
 make[2]: *** Waiting for unfinished jobs
 
 the following seens to fix that:
 diff --git a/cli_ure/Package_config.mk b/cli_ure/Package_config.mk
 index 820f25e..175fd33 100644
 --- a/cli_ure/Package_config.mk
 +++ b/cli_ure/Package_config.mk
 @@ -9,7 +9,7 @@
 
  $(eval $(call gb_Package_Package,cli_ure_cliuno,$(SRCDIR)/cli_ure/source))
 
 -$(eval $(call gb_Package_add_files,bin,\
 +$(eval $(call gb_Package_add_files,cli_ure_cliuno,bin,\
 climaker/climaker.exe.config \
 cliuno.snk \
  ))

This is embarassing...

 S=C:/lo/core  O=$S/solver/wntmsci12.pro 
 W=$S/workdir/wntmsci12.pro   csc -noconfig -warnaserror+ -o
 -target:library -out:$W/CliLibraryTarget/cli_basetypes.dll
 -reference:System.dll   $S/cli_ure/source/basetypes/uno/Any.cs
 $S/cli_ure/source/basetypes/uno/BoundAttribute.cs
 $S/cli_ure/source/basetypes/uno/ExceptionAttribute.cs
 $S/cli_ure/source/basetypes/uno/OnewayAttribute.cs
 $S/cli_ure/source/basetypes/uno/ParameterizedTypeAttribute.cs
 $S/cli_ure/source/basetypes/uno/PolymorphicType.cs
 $S/cli_ure/source/basetypes/uno/TypeArgumentsAttribute.cs
 $S/cli_ure/source/basetypes/uno/TypeParametersAttribute.cs
 $W/CustomTarget/cli_ure/source/basetypes/assembly.cs
 Microsoft (R) Visual C# 2008 Compiler version 3.5.30729.5420
 for Microsoft (R) .NET Framework version 3.5
 Copyright (C) Microsoft Corporation. All rights reserved.
 
 error CS1504: Source file 'c:\lo\core\cli_ure\Any.cs' could not be
 opened ('The system cannot find the file specified. ')
 ...
 make: *** 
 [C:/lo/core/workdir/wntmsci12.pro/CliLibraryTarget/cli_basetypes.dll]
 Error 1
 
 which is stumping me  no idea where that MS stuff get the argument
 converted from what the command line says... i.e how
 /source/basetypes/uno get stripped (provided I know nothing of MSJava,
 nor do I care to learn, really)

That makes two of us, unfortunately... The command works with mcs
(mono's C# compiler), after changing -o to -optimize (-o is obsolete
synonym to -out in mcs).

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


[PATCH] Modifiying some comments to follow the Doxygen standards

2012-08-06 Thread Gerrit
From Faisal al-otaibi fmalota...@kacst.edu.sa:

Faisal al-otaibi has uploaded a new change for review.

Change subject: Modifiying some comments to follow the Doxygen standards
..

Modifiying some comments to follow the Doxygen standards

Change-Id: Ia64c66cfaaa9ed7b1c8f3984f797ac1605fac7d4
---
M cui/source/inc/connect.hxx
M cui/source/inc/cuicharmap.hxx
M cui/source/inc/cuifmsearch.hxx
M cui/source/inc/cuihyperdlg.hxx
M cui/source/inc/cuisrchdlg.hxx
M cui/source/inc/cuitabarea.hxx
M cui/source/inc/cuitabline.hxx
M cui/source/inc/dlgname.hxx
M cui/source/inc/hangulhanjadlg.hxx
M cui/source/inc/headertablistbox.hxx
M cui/source/inc/hldoctp.hxx
M cui/source/inc/hlinettp.hxx
M cui/source/inc/hlmailtp.hxx
M cui/source/inc/hltpbase.hxx
M cui/source/inc/iconcdlg.hxx
M cui/source/inc/insdlg.hxx
M cui/source/inc/labdlg.hxx
M cui/source/inc/measure.hxx
M cui/source/inc/numfmt.hxx
M cui/source/inc/numpages.hxx
20 files changed, 100 insertions(+), 181 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/371/1
--
To view, visit https://gerrit.libreoffice.org/371
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia64c66cfaaa9ed7b1c8f3984f797ac1605fac7d4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Faisal al-otaibi fmalota...@kacst.edu.sa

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


Re: Static src analysis of LibreOffice

2012-08-06 Thread John Smith
On Mon, Aug 6, 2012 at 9:08 AM, Stephan Bergmann sberg...@redhat.com wrote:

 That smells like On recent Fedora 17, the included Clang (3.0) is unusable
 due to clang++ chokes on complex. However, a home-built Clang 3.1 works
 fine.
 (https://wiki.documentfoundation.org/Development/Building_LibreOffice_with_Clang#Setup)


 Stephan

Hrm. I did some googling, and I doubt that it's the same bug. This one
occurs with something like this :

# cat test.cpp
#include iostream

int main() {
std::cout  Hello, world!  std::endl;
}

# clang++ test.cpp -o test -std=gnu++11
In file included from test.cpp:1:
In file included from
/usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/iostream:39:
In file included from
/usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/ostream:39:
In file included from
/usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/ios:40:
In file included from
/usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/bits/char_traits.h:40:
In file included from
/usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/bits/stl_algobase.h:65:
In file included from
/usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/bits/stl_pair.h:61:
In file included from
/usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/bits/move.h:57:
/usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/type_traits:256:39:
error: use of undeclared identifier '__float128'
struct __is_floating_point_helper__float128
  ^
1 error generated.



I submitted a bug report : http://llvm.org/bugs/show_bug.cgi?id=13530



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


Modifiying some comments to follow the Doxygen standards

2012-08-06 Thread Gerrit
From Faisal al-otaibi fmalota...@kacst.edu.sa:

Faisal al-otaibi has abandoned this change.

Change subject: Modifiying some comments to follow the Doxygen standards
..


Patch Set 1: Abandoned

I have submit new patch

--
To view, visit https://gerrit.libreoffice.org/369
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I5f65593544439f0b4ffd7e9733834e46889e7c3e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Faisal al-otaibi fmalota...@kacst.edu.sa
Gerrit-Reviewer: Philipp Riemer ruderphil...@gmail.com

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


Re: [PATCH] Bugzilla-assistant

2012-08-06 Thread Thorsten Behrens
Rob Snelders wrote:
 Can you revert the patch you made?
 
Is that still pending? I see
1e91864a92f986c253d8513d5f1d84676d55e063 still in the repo. Live
version is updated now, so everybody should be able to double-check.

Cheers,

-- Thorsten


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


[Libreoffice-commits] .: Branch 'libreoffice-3-5-6' - xmloff/source

2012-08-06 Thread David Tardon
 xmloff/source/style/PageMasterImportPropMapper.cxx |  103 ++---
 1 file changed, 52 insertions(+), 51 deletions(-)

New commits:
commit d5c66878ddb902c2121fc6efa77b376ff9fa752f
Author: Michael Stahl mst...@redhat.com
Date:   Fri Aug 3 21:09:34 2012 +0200

fdo#38056: fix XMLTextImportPropertyMapper regression:

The invalidation introduced in 7f9928bfa561ccb6ed4e2baacc7d6960bc1ce231
is unfortunately in the wrong place; the pAllFoo actually point at
vector elements, and so they must not be dereferenced after new elements
are added to the vector, so move the invalidation up a bit.

Change-Id: I244d1d5cfd40469ff6d2c081e057355460d34cf4
(cherry picked from commit 9e74e9f3c0931f34fb5421056851a06b83501ce9)

Signed-off-by: Ivan Timofeev timofeev@gmail.com
(cherry picked from commit 3347e2644f44d4a4165d594126bcd1c924b82a9a)

Signed-off-by: David Tardon dtar...@redhat.com
Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx 
b/xmloff/source/style/PageMasterImportPropMapper.cxx
index 005c732..0cacf02 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -353,6 +353,58 @@ void 
PageMasterImportPropertyMapper::finished(::std::vector XMLPropertyState 
 aAny.setValue( bValue, ::getBooleanCppuType() );
 pFooterDynamic = new XMLPropertyState(pFooterMinHeight-mnIndex + 1, 
aAny);
 }
+
+// fdo#38056: nerf the various AllFoo properties so they do not override
+// the individual Foo properties later on
+if (pAllPaddingProperty)
+{
+pAllPaddingProperty-mnIndex = -1;
+}
+if (pAllBorderProperty)
+{
+pAllBorderProperty-mnIndex = -1;
+}
+if (pAllBorderWidthProperty)
+{
+pAllBorderWidthProperty-mnIndex = -1;
+}
+if (pAllHeaderPaddingProperty)
+{
+pAllHeaderPaddingProperty-mnIndex = -1;
+}
+if (pAllHeaderBorderProperty)
+{
+pAllHeaderBorderProperty-mnIndex = -1;
+}
+if (pAllHeaderBorderWidthProperty)
+{
+pAllHeaderBorderWidthProperty-mnIndex = -1;
+}
+if (pAllFooterPaddingProperty)
+{
+pAllFooterPaddingProperty-mnIndex = -1;
+}
+if (pAllFooterBorderProperty)
+{
+pAllFooterBorderProperty-mnIndex = -1;
+}
+if (pAllFooterBorderWidthProperty)
+{
+pAllFooterBorderWidthProperty-mnIndex = -1;
+}
+if (pAllMarginProperty)
+{
+pAllMarginProperty-mnIndex = -1;
+}
+if (pAllHeaderMarginProperty)
+{
+pAllHeaderMarginProperty-mnIndex = -1;
+}
+if (pAllFooterMarginProperty)
+{
+pAllFooterMarginProperty-mnIndex = -1;
+}
+
 for (sal_uInt16 i = 0; i  4; i++)
 {
 if (pNewMargins[i].get())
@@ -408,57 +460,6 @@ void 
PageMasterImportPropertyMapper::finished(::std::vector XMLPropertyState 
 rProperties.push_back(*pFooterDynamic);
 delete pFooterDynamic;
 }
-
-// fdo#38056: nerf the various AllFoo properties so they do not override
-// the individual Foo properties later on
-if (pAllPaddingProperty)
-{
-pAllPaddingProperty-mnIndex = -1;
-}
-if (pAllBorderProperty)
-{
-pAllBorderProperty-mnIndex = -1;
-}
-if (pAllBorderWidthProperty)
-{
-pAllBorderWidthProperty-mnIndex = -1;
-}
-if (pAllHeaderPaddingProperty)
-{
-pAllHeaderPaddingProperty-mnIndex = -1;
-}
-if (pAllHeaderBorderProperty)
-{
-pAllHeaderBorderProperty-mnIndex = -1;
-}
-if (pAllHeaderBorderWidthProperty)
-{
-pAllHeaderBorderWidthProperty-mnIndex = -1;
-}
-if (pAllFooterPaddingProperty)
-{
-pAllFooterPaddingProperty-mnIndex = -1;
-}
-if (pAllFooterBorderProperty)
-{
-pAllFooterBorderProperty-mnIndex = -1;
-}
-if (pAllFooterBorderWidthProperty)
-{
-pAllFooterBorderWidthProperty-mnIndex = -1;
-}
-if (pAllMarginProperty)
-{
-pAllMarginProperty-mnIndex = -1;
-}
-if (pAllHeaderMarginProperty)
-{
-pAllHeaderMarginProperty-mnIndex = -1;
-}
-if (pAllFooterMarginProperty)
-{
-pAllFooterMarginProperty-mnIndex = -1;
-}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [PUSHED 3-6][PUSHED 3-5-6] regression in fix for fdo#38056

2012-08-06 Thread David Tardon
On Mon, Aug 06, 2012 at 09:20:41AM +0200, Stephan Bergmann wrote:
 On 08/04/2012 08:36 AM, Ivan Timofeev wrote:
 On 04.08.2012 01:35, Michael Stahl wrote:
 this is a rather stupid regression in 3.5.6, introduced by the fix for
 fdo#38056 which can cause crashes because the invalidation is in the
 wrong place
 
 please push the fix to libreoffice-3-5-6 and libreoffice-3-6
 
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=9e74e9f3c0931f34fb5421056851a06b83501ce9
 
 
 pushed to libreoffice-3-6, we need 2 more reviews for 3-5-6.
 
 looks good; one more needed for -3-5-6.

Pushed.

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


Re: [PATCH] Basic IDE Object Catalog improvements

2012-08-06 Thread Tor Lillqvist
Hmm, the patch doesn't apply for me?

patching file basctl/inc/basidesh.hrc
patching file basctl/source/basicide/baside2.cxx
Hunk #1 succeeded at 49 (offset -1 lines).
Hunk #2 FAILED at 1413.
Hunk #3 FAILED at 1484.
2 out of 3 hunks FAILED -- saving rejects to file
basctl/source/basicide/baside2.cxx.rej
patching file basctl/source/basicide/baside2.hxx
Hunk #2 FAILED at 427.
1 out of 4 hunks FAILED -- saving rejects to file
basctl/source/basicide/baside2.hxx.rej
patching file basctl/source/basicide/baside2b.cxx
Hunk #1 succeeded at 47 (offset -1 lines).
Hunk #2 succeeded at 1518 (offset -6 lines).

etc.

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


license statement

2012-08-06 Thread Babati Bence
Hi!

All my current and past contributions made to the LibreOffice project
are done under MPL1.1+ / GPLv3+ / LGPLv3+.

Until further notice, all my future contributions to the LibreOffice
project are available under MPL1.1+ / GPLv3+ / LGPLv3+.

Best regards,
Babati Bence
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [PATCH] Bugzilla-assistant

2012-08-06 Thread Petr Mladek
Thorsten Behrens píše v Po 06. 08. 2012 v 10:11 +0200:
 Rob Snelders wrote:
  Can you revert the patch you made?
  
 Is that still pending? I see
 1e91864a92f986c253d8513d5f1d84676d55e063 still in the repo. Live
 version is updated now, so everybody should be able to double-check.

Strange, I see the problem as well = I have reverted the commit.

Thorsten, could you please make it life again?


Best Regards,
Petr

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


[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - 2 commits - comphelper/Library_comphelper.mk officecfg/Configuration_officecfg.mk writerfilter/CppunitTest_writerfilter_rtftok.mk

2012-08-06 Thread Matus Kukan
 comphelper/Library_comphelper.mk|5 -
 officecfg/Configuration_officecfg.mk|   12 ++--
 writerfilter/CppunitTest_writerfilter_rtftok.mk |4 
 3 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 587ac17d51ded650ed72bb68a126587a9c2ca698
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Aug 6 10:22:56 2012 +0200

fix typo causing missing dependency

Change-Id: I9ac316b0491d2c2c69308c0a78e1be0009bf2caf

diff --git a/officecfg/Configuration_officecfg.mk 
b/officecfg/Configuration_officecfg.mk
index 682a3e2..4ae5d5a 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -16,9 +16,9 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-$(eval $(call gb_Configuration_Configuration,registry))
+$(eval $(call gb_Configuration_Configuration,officecfg))
 
-$(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
+$(eval $(call 
gb_Configuration_add_schemas,officecfg,officecfg/registry/schema,\
org/openoffice/LDAP.xcs \
org/openoffice/Inet.xcs \
org/openoffice/Setup.xcs \
@@ -119,7 +119,7 @@ $(eval $(call 
gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
org/openoffice/ucb/Store.xcs \
 ))
 
-$(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
+$(eval $(call gb_Configuration_add_datas,officecfg,officecfg/registry/data,\
org/openoffice/Inet.xcu \
org/openoffice/System.xcu \
org/openoffice/UserProfile.xcu \
@@ -149,7 +149,7 @@ $(eval $(call 
gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/ucb/Configuration.xcu \
 ))
 
-$(eval $(call 
gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\
+$(eval $(call 
gb_Configuration_add_spool_modules,officecfg,officecfg/registry/data,\
org/openoffice/Inet-macosx.xcu \
org/openoffice/Inet-unixdesktop.xcu \
org/openoffice/Inet-wnt.xcu \
@@ -210,11 +210,11 @@ $(eval $(call 
gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
 ))
 
 # perhaps this file should be moved 2 levels up?
-$(eval $(call 
gb_Configuration_add_spool_langpack,registry,officecfg/registry/data/org/openoffice,\
+$(eval $(call 
gb_Configuration_add_spool_langpack,officecfg,officecfg/registry/data/org/openoffice,\
Langpack.xcu \
 ))
 
-$(eval $(call 
gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\
+$(eval $(call 
gb_Configuration_add_localized_datas,officecfg,officecfg/registry/data,\
org/openoffice/Setup.xcu \
org/openoffice/Office/Accelerators.xcu \
org/openoffice/Office/Common.xcu \
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk 
b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index 9b660d3..79d13e7 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -64,8 +64,4 @@ $(eval $(call 
gb_CppunitTest_use_components,writerfilter_rtftok,\
 
 $(eval $(call gb_CppunitTest_use_configuration,writerfilter_rtftok))
 
-# we need to explicitly depend on library writerfilter because it is not 
implied
-# by a link relation
-$(call gb_CppunitTest_get_target,writerfilter_rtftok) : $(call 
gb_Library_get_target,writerfilter)
-
 # vim: set noet sw=4 ts=4:
commit 4e10bc77f9e6891980d8bb38aab78287a1aa6007
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Aug 6 00:40:31 2012 +0200

missing package dependency

Change-Id: I4171de4ad24ac1bb9956171f3256cbcd766dae29

diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 5a2074a..76c75f1 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -19,7 +19,10 @@
 
 $(eval $(call gb_Library_Library,comphelper))
 
-$(eval $(call gb_Library_use_package,comphelper,comphelper_inc))
+$(eval $(call gb_Library_use_packages,comphelper,\
+   comphelper_inc \
+   officecfg_cppheader \
+))
 
 $(eval $(call 
gb_Library_set_componentfile,comphelper,comphelper/util/comphelp))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] There is not need to allocate memory just for getting the 'i...

2012-08-06 Thread Gerrit
From Christophe JAILLET christophe.jail...@wanadoo.fr:

Christophe JAILLET has uploaded a new change for review.

Change subject: There is not need to allocate memory just for getting the 
'indexOf' a literal within a OUString.
..

There is not need to allocate memory just for getting the 'indexOf'
a literal within a OUString.

Change-Id: Icc8e22c43f6ddca25cb284a3d45ab39680ad6d1f
---
M connectivity/source/drivers/macab/macabutilities.hxx
M embeddedobj/source/msole/olecomponent.cxx
M filter/source/config/cache/filterfactory.cxx
M idlc/source/idlccompile.cxx
M package/source/zippackage/ZipPackageStream.cxx
M scripting/source/provider/ActiveMSPList.cxx
M sd/source/core/stlsheet.cxx
M svl/source/passwordcontainer/passwordcontainer.cxx
M svl/source/passwordcontainer/syscreds.cxx
M svtools/source/misc/transfer.cxx
M svx/source/dialog/docrecovery.cxx
M sw/source/ui/docvw/HeaderFooterWin.cxx
M uui/source/iahndl.cxx
13 files changed, 15 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/372/1
--
To view, visit https://gerrit.libreoffice.org/372
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc8e22c43f6ddca25cb284a3d45ab39680ad6d1f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christophe JAILLET christophe.jail...@wanadoo.fr

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


[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - 2 commits - cli_ure/Package_config.mk solenv/gbuild

2012-08-06 Thread David Tardon
 cli_ure/Package_config.mk   |2 +-
 solenv/gbuild/CliLibrary.mk |8 +++-
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 3a17a4a170af54c3b457cb2950e49d2319ac42b5
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Mon Aug 6 10:51:43 2012 +0200

add missing package name

Change-Id: I0f561c41c4e0a447521aae90885f3a75b624d7cb

diff --git a/cli_ure/Package_config.mk b/cli_ure/Package_config.mk
index 820f25e..175fd33 100644
--- a/cli_ure/Package_config.mk
+++ b/cli_ure/Package_config.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,cli_ure_cliuno,$(SRCDIR)/cli_ure/source))
 
-$(eval $(call gb_Package_add_files,bin,\
+$(eval $(call gb_Package_add_files,cli_ure_cliuno,bin,\
climaker/climaker.exe.config \
cliuno.snk \
 ))
commit 6be4b08aa2055ffb40f1727d3657f4a7634d33b9
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Mon Aug 6 10:50:51 2012 +0200

fix make syntax

Change-Id: I0cf922c1bccb554491ea8501c9f217af486088b6

diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index 36352b7..62c9d78 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -20,17 +20,15 @@ gb_CliLibraryTarget_CSCFLAGS_DEBUG := \
-define:DEBUG \
-define:TRACE \
 
-define gb_CliLibraryTarget__get_csflags
 ifeq ($(strip $(debug)),)
 ifeq ($(strip $(PRODUCT)),)
-$(gb_CliLibraryTarget_CSCFLAGS) $(gb_CliLibraryTarget_CSCFLAGS_DEBUG)
+gb_CliLibraryTarget__get_csflags = $(gb_CliLibraryTarget_CSCFLAGS) 
$(gb_CliLibraryTarget_CSCFLAGS_DEBUG)
 else
-$(gb_CliLibraryTarget_CSCFLAGS) -o
+gb_CliLibraryTarget__get_csflags = $(gb_CliLibraryTarget_CSCFLAGS) -o
 endif
 else
-$(gb_CliLibraryTarget_CSCFLAGS) $(gb_CliLibraryTarget_CSCFLAGS_DEBUG) -debug+
+gb_CliLibraryTarget__get_csflags = $(gb_CliLibraryTarget_CSCFLAGS) 
$(gb_CliLibraryTarget_CSCFLAGS_DEBUG) -debug+
 endif
-endef
 
 gb_CliLibraryTarget__get_source = $(SRCDIR)/$(1).cs
 gb_CliLibraryTarget__get_generated_source = $(WORKDIR)/$(1).cs
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[COMMITTED] Re: license statement

2012-08-06 Thread Tor Lillqvist
Added to the wiki page.

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


Re: [PATCH] Basic IDE Object Catalog improvements

2012-08-06 Thread Andras Timar
2012/8/6 János Uray uray.ja...@gmail.com:
 Now the Object Catalog window is undockable, and can be resized.
 Its button in the toolbar looks pressed when the Object Catalog is visible.

Unless you have a good reason, don't comment out code, just remove the
lines that you don't need.

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


[Libreoffice-commits] Changes to 'refs/head/master'

2012-08-06 Thread Andrzej J.R. Hunt

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] Changes to 'feature/sdremote'

2012-08-06 Thread Andrzej J.R. Hunt
New branch 'feature/sdremote' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [GSOC-UPDATE](03.08) Impress Remote

2012-08-06 Thread Michael Stahl
On 04/08/12 15:51, Andrzej J. R. Hunt wrote:
 Hi again,
 
 Everything now builds, courtesy of adding the following to the correct 
 build file:
 $(eval $(call gb_Library_use_externals,sd,\
   libxml2 \
 ))
 
 I'm not entirely sure why this should be done when I'm not using libxml 
 directly -- I'm going to try and look for what has changed in master on 
 Monday.
 
 On 08/04/2012 11:36 AM, Andrzej J. R. Hunt wrote:

 My build is now failing because 
 of a missing libxml/tree.h which is included in xmlsec/base64.h, which 
 one of my files uses, i.e. I'm now onto fixing my code to work with 
 master.

there is a Base64 implementation in sax/tools/converter.hxx
(encodeBase64,decodeBase64) that you can use without adding external
dependencies to sd (assuming that you want to add it to core office code
and not something stand-alone running on a phone).

libxmlsec headers depend on libxml2 so if you use the first you have to
use the latter as well, anything else may happen to work on some systems
by accident.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] .: 4 commits - android/Bootstrap android/experimental android/qa chart2/Library_chartcontroller.mk chart2/Library_chartcore.mk chart2/Library_chartmodel.mk chart2/Library_chartto

2012-08-06 Thread Michael Meeks
 Repository.mk  
  |4 
 android/Bootstrap/Makefile.shared  
  |6 
 android/experimental/LibreOffice4Android/Makefile  
  |   15 
 
android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
 |   34 +
 
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/FileUtilities.java
   |   33 -
 android/qa/desktop/Makefile
  |   16 
 chart2/Library_chartcontroller.mk  
  |3 
 chart2/Library_chartcore.mk
  |  230 ++
 chart2/Library_chartmodel.mk   
  |  115 -
 chart2/Library_charttools.mk   
  |  127 -
 chart2/Library_chartview.mk
  |  115 -
 chart2/Module_chart2.mk
  |4 
 ios/qa/sc/Makefile 
  |2 
 linguistic/source/lngsvcmgr.cxx
  |8 
 sal/android/lo-bootstrap.c 
  |6 
 scp2/source/ooo/file_library_ooo.scp   
  |4 
 scp2/source/ooo/module_hidden_ooo.scp  
  |4 
 17 files changed, 312 insertions(+), 414 deletions(-)

New commits:
commit f1d1986a97aa9812dd045f6864a61964b7b9301a
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Aug 6 10:31:21 2012 +0100

android: linguistic should cope with a missing extension manager

diff --git a/android/experimental/LibreOffice4Android/Makefile 
b/android/experimental/LibreOffice4Android/Makefile
index f3c4fe5..8bae333 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -58,7 +58,6 @@ copy-stuff:
   jvmaccessgcc3 \
   jvmfwk \
   libotouchlo \
-  lnglo \
   lnthlo \
   lo-bootstrap \
   localebe1.uno \
@@ -241,4 +240,4 @@ build-ant: copy-stuff properties
 
 run:
 # /data/local/tmp/sample-document.odt
-   adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input 
/assets/test1.odt
+   adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input 
/assets/test1.odt -e lo-main-delay 20
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index b2f57d1..84d8f81 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -116,7 +116,6 @@ copy-stuff: buildrcs
  jvmaccessgcc3 \
  jvmfwk \
  libotouchlo \
- lnglo \
  introspection.uno \
  lnthlo \
  localebe1.uno \
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 6dc2d69..0a5de43 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -491,8 +491,12 @@ LngSvcMgr::LngSvcMgr()
 // request to be notified if an extension has been added/removed
 uno::Referenceuno::XComponentContext 
xContext(comphelper::getProcessComponentContext());
 
-uno::Referencedeployment::XExtensionManager xExtensionManager(
-deployment::ExtensionManager::get(xContext));
+uno::Referencedeployment::XExtensionManager xExtensionManager;
+try {
+xExtensionManager = deployment::ExtensionManager::get(xContext);
+} catch ( const deployment::DeploymentException  ) {
+SAL_WARN( linguistic, no extension manager - should fire on mobile 
only );
+}
 if (xExtensionManager.is())
 {
 xMB = uno::Referenceutil::XModifyBroadcaster(xExtensionManager, 
uno::UNO_QUERY_THROW);
commit 5f09718dba16ac7eb8f0917051f1ea532940a788
Author: Michael Meeks michael.me...@suse.com
Date:   Fri Aug 3 21:07:43 2012 +0100

android: fewer exceptions, and more debug output on null renderables

cleanup some library mentions

diff --git a/android/experimental/LibreOffice4Android/Makefile 
b/android/experimental/LibreOffice4Android/Makefile
index 577cf38..f3c4fe5 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -21,11 +21,9 @@ copy-stuff:
 #
for F in $(strip \
   analysislo \
-  avmedialo \
   basebmplo \
   basegfxlo \
   bootstrap.uno \
-  canvastoolslo \
   chartcontrollerlo \
 

REMINDER: Release 3.5.6.2 from libreoffice-3-5-6 branch

2012-08-06 Thread Petr Mladek
Hi,

please note that the commit deadline for 3.5.6.2 (aka rc2) is today, Aug 6,
2012. It will be used as LO-3.5.6 final if no blocker is reported.

See also
http://wiki.documentfoundation.org/ReleasePlan#3.5_release
http://wiki.documentfoundation.org/Release_Criteria
http://wiki.documentfoundation.org/Development/Branches


Best Regards,
Petr


PS: Please, help with reviewing patches.


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


Re: Static src analysis of LibreOffice

2012-08-06 Thread John Smith
On Mon, Aug 6, 2012 at 8:58 AM, Stephan Bergmann sberg...@redhat.com wrote:

 In any case, such stuff should be something we can filter out in some way
 (post-processing the data -- is it only available as HTML, or also in some
 other format?), so I wouldn't worry about it too much.  Just wanted to note
 it down...


 Stephan


Oh, I almost forgot: Yes, the report is only available as HTML.



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


Re: [PATCH] translated German comments in starmath

2012-08-06 Thread Michael Meeks
Hi Alexander,

On Fri, 2012-08-03 at 10:28 +0200, Alexander Wilms wrote:
 this is my first patch, so I don't really what the procedure is.

Looks lovely :-) you did your license statement already.

 If it's alright, can I push it?

Yep - that'd be wonderful: 

git pull -r ; git push

should do it :-) great to kick-start the comment translation again with
eager hands. If you're confident in your translations, there is no real
need to have them reviewed - in general we strongly prefer to separate
concerns though - so try to separate any non-comment-translation code
cleanup out of the (typically large) comment work.

Otherwise this is excellent :-)

Thanks !

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] .: bug/bug.xhtml

2012-08-06 Thread Petr Mladek
 bug/bug.xhtml |   26 +++---
 1 file changed, 3 insertions(+), 23 deletions(-)

New commits:
commit 6f3a47a926123dbb843a98383a2f8b85d6f771f8
Author: Petr Mladek pmla...@suse.cz
Date:   Mon Aug 6 10:32:58 2012 +0200

Revert bug.xhtml: slightly improve indentation

Urgh, the box with the extra info is below the components
with the commit and next to the components without.
It is strange. It looks like a a bug with html or firefox.

This reverts commit 1e91864a92f986c253d8513d5f1d84676d55e063.

diff --git a/bug/bug.xhtml b/bug/bug.xhtml
index a2ec3ba..f4c4e05 100644
--- a/bug/bug.xhtml
+++ b/bug/bug.xhtml
@@ -124,29 +124,9 @@
   /div
   div
 div class=components_icons
-  div
-img src=icons/WRITER.png title=Text Document 
data=Writer alt=Text Document /
-img src=icons/Spreadsheet.png title=Spreadsheet 
data=Spreadsheet alt=Spreadsheet /
-img src=icons/Presentation.png title=Presentation 
data=Presentation alt=Presentation /
-img src=icons/Drawing.png title=Drawing 
data=Drawing alt=Drawing /
-img src=icons/Database.png title=Database 
data=Database alt=Database /
-img src=icons/Chart.png title=Chart data=Chart 
alt=Chart /
-  /div
- div
-   img src=icons/Libreoffice.png title=Localization 
data=Localization alt=Localization /
-   img src=icons/Documentation.png title=Documentation 
data=Documentation alt=Documentation /
-   img src=icons/Extensions.png title=Extensions 
data=Extensions alt=Extensions /
-   img src=icons/WWW.png title=Web Pages data=WWW 
alt=Web Pages /
-   img src=icons/Libreoffice.png title=Linguistic 
data=Linguistic alt=Linguistic /
-   img src=icons/Installation.png title=Installation 
data=Installation alt=Installation /
- /div
- div
-   img src=icons/Libreoffice.png title=BASIC data=BASIC 
alt=BASIC /
-   img src=icons/Formula_editor.png title=Formula Editor 
data=Formula_Editor alt=Formula Editor /
-   img src=icons/PDF_export.png title=Printing and PDF 
export data=Printing_and_PDF_export alt=Printing and PDF export /
-   img src=icons/Libreoffice.png title=User Interface 
data=UI alt=User Interface /
-   img src=icons/Libreoffice.png title=Unspecified 
data=Libreoffice alt=Unspecified /
- /div
+  divimg src=icons/WRITER.png title=Text Document 
data=Writer alt=Text Document /img src=icons/Spreadsheet.png 
title=Spreadsheet data=Spreadsheet alt=Spreadsheet /img 
src=icons/Presentation.png title=Presentation data=Presentation 
alt=Presentation /img src=icons/Drawing.png title=Drawing 
data=Drawing alt=Drawing /img src=icons/Database.png title=Database 
data=Database alt=Database /img src=icons/Chart.png title=Chart 
data=Chart alt=Chart //div
+ divimg src=icons/Libreoffice.png title=Localization 
data=Localization alt=Localization /img src=icons/Documentation.png 
title=Documentation data=Documentation alt=Documentation /img 
src=icons/Extensions.png title=Extensions data=Extensions 
alt=Extensions /img src=icons/WWW.png title=Web Pages data=WWW 
alt=Web Pages /img src=icons/Libreoffice.png title=Linguistic 
data=Linguistic alt=Linguistic /img src=icons/Installation.png 
title=Installation data=Installation alt=Installation //div
+ divimg src=icons/Libreoffice.png title=BASIC 
data=BASIC alt=BASIC /img src=icons/Formula_editor.png title=Formula 
Editor data=Formula_Editor alt=Formula Editor /img 
src=icons/PDF_export.png title=Printing and PDF export 
data=Printing_and_PDF_export alt=Printing and PDF export /img 
src=icons/Libreoffice.png title=User Interface data=UI alt=User 
Interface /img src=icons/Libreoffice.png title=Unspecified 
data=Libreoffice alt=Unspecified //div
 /div
 div 
class=component_comments_containercomponent_comments;/div
   /div
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 2 commits - chart2/Library_chartcore.mk chart2/source postprocess/packcomponents solenv/gbuild

2012-08-06 Thread Michael Stahl
 chart2/Library_chartcore.mk |5 
 chart2/source/chartcore.component   |  205 
 chart2/source/model/chartmodel.component|  141 ---
 chart2/source/model/main/_serviceregistration_model.cxx |   17 +
 chart2/source/tools/charttools.component|   83 --
 chart2/source/view/chartview.component  |   25 -
 postprocess/packcomponents/makefile.mk  |4 
 solenv/gbuild/Library.mk|3 
 8 files changed, 227 insertions(+), 256 deletions(-)

New commits:
commit 515ceca5153d67ea602ab8c4fb339a7b42e9063e
Author: Michael Stahl mst...@redhat.com
Date:   Mon Aug 6 13:10:58 2012 +0200

chart2: merge component files for new chartcore library

Change-Id: Id7cc969d854a98e9bd32fd396eb82ae92a06ba80

diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index c34bdb1..fe63ec8 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -45,8 +45,9 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
 $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore))
+
 # view pieces ...
-$(eval $(call 
gb_Library_set_componentfile,chartcore,chart2/source/view/chartview))
 $(eval $(call gb_Library_add_exception_objects,chartcore,\
 chart2/source/view/axes/DateHelper \
 chart2/source/view/axes/DateScaling \
@@ -100,7 +101,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
 ))
 
 # model pieces ...
-$(eval $(call 
gb_Library_set_componentfile,chartcore,chart2/source/model/chartmodel))
 $(eval $(call gb_Library_add_exception_objects,chartcore,\
 chart2/source/model/filter/XMLFilter \
 chart2/source/model/main/Axis \
@@ -154,7 +154,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
 ))
 
 # tools pieces
-$(eval $(call 
gb_Library_set_componentfile,chartcore,chart2/source/tools/charttools))
 $(eval $(call gb_Library_add_exception_objects,chartcore,\
 chart2/source/tools/AxisHelper \
 chart2/source/tools/BaseGFXHelper \
diff --git a/chart2/source/chartcore.component 
b/chart2/source/chartcore.component
new file mode 100644
index 000..68ddc0d
--- /dev/null
+++ b/chart2/source/chartcore.component
@@ -0,0 +1,205 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+ * 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 .
+ --
+
+component loader=com.sun.star.loader.SharedLibrary prefix=chartcore
+xmlns=http://openoffice.org/2010/uno-components;
+  implementation name=com.sun.star.chart2.ExponentialScaling
+service name=com.sun.star.chart2.ExponentialScaling/
+  /implementation
+  implementation name=com.sun.star.chart2.LinearScaling
+service name=com.sun.star.chart2.LinearScaling/
+  /implementation
+  implementation name=com.sun.star.chart2.LogarithmicScaling
+service name=com.sun.star.chart2.LogarithmicScaling/
+  /implementation
+  implementation name=com.sun.star.chart2.PowerScaling
+service name=com.sun.star.chart2.PowerScaling/
+  /implementation
+  implementation name=com.sun.star.comp.chart.CachedDataSequence
+service name=com.sun.star.chart2.data.DataSequence/
+service name=com.sun.star.chart2.data.NumericalDataSequence/
+service name=com.sun.star.chart2.data.TextualDataSequence/
+service name=com.sun.star.comp.chart.CachedDataSequence/
+  /implementation
+  implementation name=com.sun.star.comp.chart.DataSource
+service name=com.sun.star.chart2.data.DataSource/
+  /implementation
+  implementation name=com.sun.star.comp.chart.InternalDataProvider
+service name=com.sun.star.chart2.data.DataProvider/
+  /implementation
+  implementation name=com.sun.star.comp.chart2.ConfigDefaultColorScheme
+service name=com.sun.star.chart2.ColorScheme/
+  /implementation
+  implementation name=com.sun.star.comp.chart2.ErrorBar
+service name=com.sun.star.chart2.ErrorBar/
+service name=com.sun.star.comp.chart2.ErrorBar/
+  /implementation
+  implementation name=com.sun.star.comp.chart2.ExponentialRegressionCurve
+service name=com.sun.star.chart2.ExponentialRegressionCurve/
+service name=com.sun.star.chart2.RegressionCurve/
+  

[Libreoffice-commits] .: connectivity/source embeddedobj/source filter/source idlc/source package/source scripting/source sd/source svl/source svtools/source svx/source sw/source uui/source

2012-08-06 Thread Michael Meeks
 connectivity/source/drivers/macab/macabutilities.hxx |2 +-
 embeddedobj/source/msole/olecomponent.cxx|6 +++---
 filter/source/config/cache/filterfactory.cxx |2 +-
 idlc/source/idlccompile.cxx  |2 +-
 package/source/zippackage/ZipPackageStream.cxx   |2 +-
 scripting/source/provider/ActiveMSPList.cxx  |2 +-
 sd/source/core/stlsheet.cxx  |2 +-
 svl/source/passwordcontainer/passwordcontainer.cxx   |2 +-
 svl/source/passwordcontainer/syscreds.cxx|3 +--
 svtools/source/misc/transfer.cxx |2 +-
 svx/source/dialog/docrecovery.cxx|2 +-
 sw/source/ui/docvw/HeaderFooterWin.cxx   |2 +-
 uui/source/iahndl.cxx|3 +--
 13 files changed, 15 insertions(+), 17 deletions(-)

New commits:
commit cf239da5c403164e75c369173fe6bed747de9e09
Author: Christophe JAILLET christophe.jail...@wanadoo.fr
Date:   Mon Aug 6 10:40:32 2012 +0200

There is not need to allocate memory just for getting the 'indexOf'
a literal within a OUString.

Change-Id: Icc8e22c43f6ddca25cb284a3d45ab39680ad6d1f

diff --git a/connectivity/source/drivers/macab/macabutilities.hxx 
b/connectivity/source/drivers/macab/macabutilities.hxx
index 1417a5c..d2b2ed2 100644
--- a/connectivity/source/drivers/macab/macabutilities.hxx
+++ b/connectivity/source/drivers/macab/macabutilities.hxx
@@ -102,7 +102,7 @@ namespace connectivity
 /* Get the length, and make sure that there is actually a string
  * here.
  */
-if(_originalLabel.indexOf(::rtl::OUString(_$!)) == 0)
+if(_originalLabel.indexOf(_$!) == 0)
 {
 return _originalLabel.copy(4,_originalLabel.getLength()-8);
 }
diff --git a/embeddedobj/source/msole/olecomponent.cxx 
b/embeddedobj/source/msole/olecomponent.cxx
index 623811c..8893091 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -237,11 +237,11 @@ struct OleComponentNative_Impl {
 //--
 DWORD GetAspectFromFlavor( const datatransfer::DataFlavor aFlavor )
 {
-if ( aFlavor.MimeType.indexOf( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ;Aspect=THUMBNAIL )) ) != -1 )
+if ( aFlavor.MimeType.indexOf( ;Aspect=THUMBNAIL ) != -1 )
 return DVASPECT_THUMBNAIL;
-else if ( aFlavor.MimeType.indexOf( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ;Aspect=ICON )) ) != -1 )
+else if ( aFlavor.MimeType.indexOf( ;Aspect=ICON ) != -1 )
 return DVASPECT_ICON;
-else if ( aFlavor.MimeType.indexOf( 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ;Aspect=DOCPRINT )) ) != -1 )
+else if ( aFlavor.MimeType.indexOf( ;Aspect=DOCPRINT ) != -1 )
 return DVASPECT_DOCPRINT;
 else
 return DVASPECT_CONTENT;
diff --git a/filter/source/config/cache/filterfactory.cxx 
b/filter/source/config/cache/filterfactory.cxx
index 8292405..30c25d6 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -241,7 +241,7 @@ css::uno::Reference css::container::XEnumeration  
SAL_CALL FilterFactory::crea
 
 // convert _query_xxx:... to getByDocService=xxx:...
 ::rtl::OUString sNewQuery(sQuery);
-sal_Int32 pos = sNewQuery.indexOf(::rtl::OUString( _query_ ),0);
+sal_Int32 pos = sNewQuery.indexOf(_query_);
 if (pos != -1)
 {
 OSL_FAIL(DEPRECATED!\nPlease use new query format: 
'matchByDocumentService=...');
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx
index 68cf263..0491046 100644
--- a/idlc/source/idlccompile.cxx
+++ b/idlc/source/idlccompile.cxx
@@ -303,7 +303,7 @@ sal_Int32 compileFile(const OString * pathname)
 OSL_ASSERT(false);
 }
 
-sal_Int32 idx= cpp.lastIndexOf(OUString( 
RTL_CONSTASCII_USTRINGPARAM(idlc)) );
+sal_Int32 idx= cpp.lastIndexOf(idlc);
 cpp = cpp.copy(0, idx);
 
 #if defined(SAL_W32)
diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index fa066bd..d0e63fb 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -711,7 +711,7 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const 
OUString aPropertyName,
 {
 if ( !sMediaType.isEmpty() )
 {
-if ( sMediaType.indexOf ( OUString( 
RTL_CONSTASCII_USTRINGPARAM ( text ) ) ) != -1
+if ( sMediaType.indexOf ( text ) != -1
  || sMediaType == application/vnd.sun.star.oleobject )
 bToBeCompressed = sal_True;
 else if ( !m_bCompressedIsSetFromOutside )
diff --git a/scripting/source/provider/ActiveMSPList.cxx 
b/scripting/source/provider/ActiveMSPList.cxx
index 5f1fbb2..1edc4e9 100644
--- 

[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-08-06 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

Winfried Donkers o...@dci-electronics.nl changed:

   What|Removed |Added

 Depends on||52022

-- 
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


[PUSHED] There is not need to allocate memory just for getting the 'i...

2012-08-06 Thread Michael Meeks

On Mon, 2012-08-06 at 08:46 +, Gerrit wrote:
 Change subject: There is not need to allocate memory just for getting the 
 'indexOf' a literal within a OUString.

found pushed ... hmm :-)

Michael.

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

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


[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-08-06 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #68 from Winfried Donkers o...@dci-electronics.nl 2012-08-06 
11:27:39 UTC ---
Added bug 52022 (My macro's and imported macro libraries are lost after
update from 3.5.5) as this will give a lot of extra work when upgrading a
company from 3.5 to 3.6

-- 
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


[Libreoffice-commits] .: solenv/gbuild

2012-08-06 Thread Michael Stahl
 solenv/gbuild/Library.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4621e2dbef28b1307ec0b571c0838823a21ff62
Author: Michael Stahl mst...@redhat.com
Date:   Mon Aug 6 13:45:32 2012 +0200

gbuild: don't complain about duplicate components for libmerged

It seems that it is possible to have multiple components per library
nowadays, however i think it's confusing to actually do this except when
necessary, i.e. when using --enable-mergelibs.

Change-Id: I4d6260974f83ea8c42d02578f45c6d9aa2ace330

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index b9ea45e..0cb0fdb 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -109,7 +109,7 @@ endef
 # gb_Library__get_final_target has been invented for that purpose...
 define gb_Library_set_componentfile
 $(call gb_Library_get_target,$(gb_Library__get_name)) : \
-   COMPONENT := $$(if $$(COMPONENT),\
+   COMPONENT := $$(if $$(and $$(COMPONENT),$(filter-out 
$(gb_MERGEDLIBS),$(1))),\
  $$(call gb_Output_error,$(1) already has a component file 
$$(COMPONENT)))$(2)
 $(call gb_ComponentTarget_ComponentTarget,$(2),\
$(call gb_Library__get_componentprefix,$(gb_Library__get_name)),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: STL'ifying UNO API

2012-08-06 Thread Michael Stahl
On 06/08/12 13:19, Noel Grandin wrote:
 Hi
 
 I'm digging into converting the last of the tools/inc/tools/list.hxx 
 uses, and I ended up following the chain
 
 tools/inc/tools/list.hxx  class List
 to
 tools/inc/tools/ref.hxx   SV_DECL_REF_LIST
 to
 tools/inc/tools/pstm.hxx  SV_DECL_PERSIST_LIST
 to
 idl/inc/*.hxx
 
 At which point I decided I should check, since changing that stuff 
 potentially changes the UNO binary API.

actually idl has absolutely nothing to do with UNO, it is the other
IDL compiler we build called SvIDL that is used for the old non-UNO SFX
framework.  the UNO idl compiler is in idlc.


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


Re: STL'ifying UNO API

2012-08-06 Thread Noel Grandin


On 2012-08-06 13:52, Michael Stahl wrote:
actually idl has absolutely nothing to do with UNO, it is the 
other IDL compiler we build called SvIDL that is used for the old 
non-UNO SFX framework. the UNO idl compiler is in idlc. 


Excellent. Then I can go ahead and update the IDL module code.


Disclaimer: http://www.peralex.com/disclaimer.html


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


ref-count assertion in cppu::OWeakObject ...

2012-08-06 Thread Michael Meeks
So,

I was wondering reading:

https://bugs.freedesktop.org/show_bug.cgi?id=53154#c5

...either memory corruption or a ref-counted UNO object
forcefully being deleted before its ref-count is zero

It seemed to me that we could catch the latter case and avoid it
causing problems later, at least for people using the standard classes.
So I was thinking of:

--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -235,6 +235,9 @@ void OWeakObject::disposeWeakConnectionPoint()
 
 OWeakObject::~OWeakObject() SAL_THROW( (RuntimeException) )
 {
+fprintf( stderr, ~OWeakObject: %d\n, (int)m_refCount );
+if (m_refCount != 0)
+abort(); // memory corruption coming ...
 }
 
 // XWeak

Which kills ~1200 objects until we get to:

...
  1222  ~OWeakObject: 0
  1223  ~OWeakObject: 1

With a trace from the (already somewhat suspicious lifecycle-wise IMHO)
package/ code:

#1  0xb7c8e1d5 in __GI_abort () at abort.c:93
#2  0xb7a7e66d in cppu::OWeakObject::~OWeakObject (this=0xb07a79b0, 
__in_chrg=optimized out)
at /data/opt/libreoffice/master/cppuhelper/source/weak.cxx:239
#3  0xb0478280 in 
cppu::WeakImplHelper5com::sun::star::packages::zip::XZipFileAccess, 
com::sun::star::container::XNameAccess, com::sun::star::lang::XInitialization, 
com::sun::star::lang::XComponent, 
com::sun::star::lang::XServiceInfo::~WeakImplHelper5 (this=0xb07a79b0, 
__in_chrg=optimized out) at 
/data/opt/libreoffice/master/solver/unxlngi6.pro/inc/cppuhelper/implbase5.hxx:107
#4  0xb0476a69 in OZipFileAccess::~OZipFileAccess (this=0xb07a79b0, 
__in_chrg=optimized out)
at 
/data/opt/libreoffice/master/package/source/zippackage/zipfileaccess.cxx:53
#5  0xb0476af6 in OZipFileAccess::~OZipFileAccess (this=0xb07a79b0, 
__in_chrg=optimized out)
at 
/data/opt/libreoffice/master/package/source/zippackage/zipfileaccess.cxx:66
#6  0xb7a7e9b5 in release (this=0xb07a79b0) at 
/data/opt/libreoffice/master/cppuhelper/source/weak.cxx:213
#7  cppu::OWeakObject::release (this=0xb07a79b0) at 
/data/opt/libreoffice/master/cppuhelper/source/weak.cxx:206
#8  0xb04781ee in 
cppu::WeakImplHelper5com::sun::star::packages::zip::XZipFileAccess, 
com::sun::star::container::XNameAccess, com::sun::star::lang::XInitialization, 
com::sun::star::lang::XComponent, com::sun::star::lang::XServiceInfo::release 
(this=0xb07a79b0)
at 
/data/opt/libreoffice/master/solver/unxlngi6.pro/inc/cppuhelper/implbase5.hxx:119
...

Which makes me wonder - reading:

void SAL_CALL OWeakObject::release() throw()
{
if (osl_decrementInterlockedCount( m_refCount ) == 0) {
// notify/clear all weak-refs before object's dtor is executed
// (which may check weak-refs to this object):
disposeWeakConnectionPoint();
// destroy object:
delete this;
}
}

Who tries to take an additional reference during the weak connection
notification process, and - what are they doing with it ? :-)

Anyhow - the suggestion is, assuming we can find/cleanup this sort of
badness [ incidentally a GObject takes a reference on itself during it's
destruction to avoid double destruction ], is it a good idea to have an
abort/assert whatever is fashionable in run-time code so we can be
confident that we have caught these cases earlier ? I for one prefer an
assertion-fail abort-app to a hard-to-catch memory corrupter later.

Thoughts ?

Michael.

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

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


Re: ref-count assertion in cppu::OWeakObject ...

2012-08-06 Thread Noel Grandin


On 2012-08-06 13:53, Michael Meeks wrote:

Anyhow - the suggestion is, assuming we can find/cleanup this sort of
badness [ incidentally a GObject takes a reference on itself during it's
destruction to avoid double destruction ], is it a good idea to have an
abort/assert whatever is fashionable in run-time code so we can be
confident that we have caught these cases earlier ? I for one prefer an
assertion-fail abort-app to a hard-to-catch memory corrupter later.



My motto : Fail early, fail hard
Causes some screaming early on, then later on, generates a pleasant 
quietness from the people using my software :-)



Disclaimer: http://www.peralex.com/disclaimer.html


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


[Libreoffice-commits] .: 3 commits - icon-themes/galaxy sfx2/inc sfx2/source

2012-08-06 Thread Rafael Dominguez
 dev/null   |binary
 sfx2/inc/sfx2/templateonlineview.hxx   |5 +
 sfx2/inc/templatedlg.hxx   |1 
 sfx2/source/control/templateonlineview.cxx |   37 +
 sfx2/source/doc/templatedlg.cxx|   79 +
 sfx2/source/doc/templatedlg.hrc|   11 
 sfx2/source/doc/templatedlg.src|   63 ---
 7 files changed, 56 insertions(+), 140 deletions(-)

New commits:
commit 7eaabb2db296e2bdb67d633dd68209f23167243e
Author: Rafael Dominguez venccsra...@gmail.com
Date:   Sun Aug 5 07:59:38 2012 -0430

Remove create template menu and associated icons.

Change-Id: Ifb2c2a640de7961ef215c9359f53218cee9c9c0e

diff --git a/icon-themes/galaxy/sfx2/res/create_draw.png 
b/icon-themes/galaxy/sfx2/res/create_draw.png
deleted file mode 100644
index f99e503..000
Binary files a/icon-themes/galaxy/sfx2/res/create_draw.png and /dev/null differ
diff --git a/icon-themes/galaxy/sfx2/res/create_present.png 
b/icon-themes/galaxy/sfx2/res/create_present.png
deleted file mode 100644
index f3e7e26..000
Binary files a/icon-themes/galaxy/sfx2/res/create_present.png and /dev/null 
differ
diff --git a/icon-themes/galaxy/sfx2/res/create_sheet.png 
b/icon-themes/galaxy/sfx2/res/create_sheet.png
deleted file mode 100644
index e317659..000
Binary files a/icon-themes/galaxy/sfx2/res/create_sheet.png and /dev/null differ
diff --git a/icon-themes/galaxy/sfx2/res/create_text.png 
b/icon-themes/galaxy/sfx2/res/create_text.png
deleted file mode 100644
index 35bc877..000
Binary files a/icon-themes/galaxy/sfx2/res/create_text.png and /dev/null differ
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index e22fe8c..ffbfc31 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -120,7 +120,6 @@ private:
 TemplateAbstractView *mpCurView;
 TemplateLocalView *maView;
 TemplateOnlineView *mpOnlineView;
-PopupMenu *mpCreateMenu;
 PopupMenu *mpActionMenu;
 PopupMenu *mpRepositoryMenu;
 
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 0b851a2..5c1b666 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -109,13 +109,6 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window 
*parent)
 maButtonSelMode.SetStyle(maButtonSelMode.GetStyle() | WB_TOGGLE);
 
 // Create popup menus
-mpCreateMenu = new PopupMenu;
-
mpCreateMenu-InsertItem(MNI_CREATE_TEXT,SfxResId(STR_CREATE_TEXT).toString(),SfxResId(IMG_CREATE_TEXT));
-
mpCreateMenu-InsertItem(MNI_CREATE_SHEET,SfxResId(STR_CREATE_SHEET).toString(),SfxResId(IMG_CREATE_SHEET));
-
mpCreateMenu-InsertItem(MNI_CREATE_PRESENT,SfxResId(STR_CREATE_PRESENT).toString(),SfxResId(IMG_CREATE_PRESENT));
-
mpCreateMenu-InsertItem(MNI_CREATE_DRAW,SfxResId(STR_CREATE_DRAW).toString(),SfxResId(IMG_CREATE_DRAW));
-mpCreateMenu-SetSelectHdl(LINK(this, SfxTemplateManagerDlg, 
MenuSelectHdl));
-
 mpActionMenu = new PopupMenu;
 
mpActionMenu-InsertItem(MNI_ACTION_SORT_NAME,SfxResId(STR_ACTION_SORT_NAME).toString(),SfxResId(IMG_ACTION_SORT));
 mpActionMenu-SetSelectHdl(LINK(this,SfxTemplateManagerDlg,MenuSelectHdl));
@@ -154,7 +147,6 @@ SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window 
*parent)
 
 // Set toolbox button bits
 mpViewBar-EnableItem(TBI_TEMPLATE_IMPORT,false);
-mpViewBar-SetItemBits(TBI_TEMPLATE_CREATE, TIB_DROPDOWNONLY);
 mpViewBar-SetItemBits(TBI_TEMPLATE_REPOSITORY, TIB_DROPDOWNONLY);
 mpActionBar-SetItemBits(TBI_TEMPLATE_ACTION, TIB_DROPDOWNONLY);
 mpTemplateBar-SetItemBits(TBI_TEMPLATE_MOVE,TIB_DROPDOWNONLY);
@@ -268,7 +260,6 @@ SfxTemplateManagerDlg::~SfxTemplateManagerDlg ()
 delete mpSearchView;
 delete maView;
 delete mpOnlineView;
-delete mpCreateMenu;
 delete mpActionMenu;
 delete mpRepositoryMenu;
 }
@@ -398,16 +389,6 @@ IMPL_LINK(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, 
pBox)
 
 switch(nCurItemId)
 {
-case TBI_TEMPLATE_CREATE:
-pBox-SetItemDown( nCurItemId, true );
-
-mpCreateMenu-Execute(pBox,pBox-GetItemRect(TBI_TEMPLATE_CREATE),
-  POPUPMENU_EXECUTE_DOWN);
-
-pBox-SetItemDown( nCurItemId, false );
-pBox-EndSelection();
-pBox-Invalidate();
-break;
 case TBI_TEMPLATE_ACTION:
 pBox-SetItemDown( nCurItemId, true );
 
@@ -527,22 +508,6 @@ IMPL_LINK(SfxTemplateManagerDlg, MenuSelectHdl, Menu*, 
pMenu)
 
 switch(nMenuId)
 {
-case MNI_CREATE_TEXT:
-lcl_createTemplate(mxDesktop,FILTER_APP_WRITER);
-Close( );
-break;
-case MNI_CREATE_SHEET:
-lcl_createTemplate(mxDesktop,FILTER_APP_CALC);
-Close( );
-break;
-case MNI_CREATE_PRESENT:
-lcl_createTemplate(mxDesktop,FILTER_APP_IMPRESS);
-Close( );
-break;
-case MNI_CREATE_DRAW:
-

[PUSHED] Re: [PATCH] translated German comments in starmath

2012-08-06 Thread Philipp Riemer
Patch was pushed, see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=72778119fde55218354ee100481bfad2a1cedf35.

Sorry, forgot to send a mail/change the mail subject.

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


Re: core dump when compiling LibreOffice ~master

2012-08-06 Thread John Smith
On Mon, Aug 6, 2012 at 10:22 AM, John Smith lbalba...@gmail.com wrote:
 Hi,


 When I try to compile LibreOffice ~master on Linux, I get a build
 failure and a core dump.

 I have attached the build_error.log and the stack trace.


 My configure and make lines were:
 LDFLAGS+='-fprofile-arcs' CFLAGS+='-fprofile-arcs -ftest-coverage'
 CXXFLAGS+='-fprofile-arcs -ftest-coverage' CPPFLAGS+='-fprofile-arcs
 -ftest-coverage' ./configure --enable-debug --with-system-libcmis=no
 --with-system-saxon=no --with-system-libs
  LDFLAGS+='-fprofile-arcs' CFLAGS+='-fprofile-arcs -ftest-coverage'
 CXXFLAGS+='-fprofile-arcs -ftest-coverage' CPPFLAGS+='-fprofile-arcs
 -ftest-coverage' make


 Any and all help is appreciated,


 Regards,


 John Smith.

I decided to file a bug in LibreOffice bugzilla for this one, since it
is a component of LibreOffice itself
(src/libreoffice/solver/unxlngi6.pro/bin/uno) that is dumping core
here.

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


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


Today

2012-08-06 Thread Iain Billett
Hi,

I did a successful rebase of my new code onto my old code ( Not sure if
that's the right way of phrasing it) on test branches so I'll be in a
position to push soon, albeit with the document viewer activity navigation
code broken (Should I still proceed?).

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


[Libreoffice-commits] .: sd/source

2012-08-06 Thread Andrzej J.R. Hunt
 sd/source/ui/remotecontrol/ImagePreparer.cxx |4 ++--
 sd/source/ui/remotecontrol/Listener.cxx  |4 ++--
 sd/source/ui/remotecontrol/Transmitter.cxx   |4 ++--
 sd/source/ui/remotecontrol/Transmitter.hxx   |2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 5c0e6df23eeae7c836bd9cb548922ed53bc5b791
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Mon Aug 6 15:02:52 2012 +0200

Fixed scoped enums (for no C++0x).

Change-Id: I46759d420cac2a0975be45f20d1414c85979f5ed

diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx 
b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index defc863..3555aee 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -117,7 +117,7 @@ void ImagePreparer::sendPreview( sal_uInt32 aSlideNumber )
 aBuffer.append( aEncodedShortString.getStr() );
 aBuffer.append( \n\n );
 pTransmitter-addMessage( aBuffer.makeStringAndClear(),
-Transmitter::Priority::LOW );
+Transmitter::PRIORITY_LOW );
 
 }
 
@@ -219,7 +219,7 @@ void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber )
 aBuffer.append( /html/body );
 aBuffer.append( \n\n );
 pTransmitter-addMessage( aBuffer.makeStringAndClear(),
-Transmitter::Priority::LOW );
+Transmitter::PRIORITY_LOW );
 }
 
 sal_Bool ExportTo( uno::Reference drawing::XDrawPage aNotesPage, String 
aUrl );
diff --git a/sd/source/ui/remotecontrol/Listener.cxx 
b/sd/source/ui/remotecontrol/Listener.cxx
index 016becb..e326ea5 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -50,7 +50,7 @@ void Listener::init( const css::uno::Reference 
css::presentation::XSlideShowCon
   .append( OString::valueOf( aCurrentSlide ) ).append( \n\n );
 
 pTransmitter-addMessage( aBuffer.makeStringAndClear(),
-  Transmitter::Priority::HIGH );
+  Transmitter::PRIORITY_HIGH );
 
 mPreparer.set( new ImagePreparer( aController, pTransmitter, mPreparer 
) );
 mPreparer-launch();
@@ -118,7 +118,7 @@ void SAL_CALL Listener::slideTransitionStarted (void)
 if ( pTransmitter )
 {
 pTransmitter-addMessage( aBuilder.makeStringAndClear(),
-   Transmitter::Priority::HIGH );
+   Transmitter::PRIORITY_HIGH );
 }
 }
 
diff --git a/sd/source/ui/remotecontrol/Transmitter.cxx 
b/sd/source/ui/remotecontrol/Transmitter.cxx
index ba432c1..ef58097 100644
--- a/sd/source/ui/remotecontrol/Transmitter.cxx
+++ b/sd/source/ui/remotecontrol/Transmitter.cxx
@@ -61,10 +61,10 @@ void Transmitter::addMessage( const OString aMessage, 
const Priority aPriority
 ::osl::MutexGuard aQueueGuard( mQueueMutex );
 switch ( aPriority )
 {
-case Priority::LOW:
+case PRIORITY_LOW:
 mLowPriority.push( aMessage );
 break;
-case Priority::HIGH:
+case PRIORITY_HIGH:
 mHighPriority.push( aMessage );
 break;
 }
diff --git a/sd/source/ui/remotecontrol/Transmitter.hxx 
b/sd/source/ui/remotecontrol/Transmitter.hxx
index 14da76f..b042454 100644
--- a/sd/source/ui/remotecontrol/Transmitter.hxx
+++ b/sd/source/ui/remotecontrol/Transmitter.hxx
@@ -24,7 +24,7 @@ class Transmitter
 : public salhelper::Thread
 {
 public:
-enum Priority { LOW = 1, HIGH };
+enum Priority { PRIORITY_LOW = 1, PRIORITY_HIGH };
 Transmitter( osl::StreamSocket aSocket );
 ~Transmitter();
 void addMessage( const rtl::OString aMessage, const Priority aPriority );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 4 commits - sd/CppunitTest_sd_uimpress.mk sd/Library_sd.mk sd/source

2012-08-06 Thread Michael Stahl
 sd/CppunitTest_sd_uimpress.mk   |6 ++
 sd/Library_sd.mk|6 ++
 sd/source/ui/remotecontrol/DiscoveryService.cxx |8 +---
 sd/source/ui/remotecontrol/Receiver.cxx |2 +-
 sd/source/ui/remotecontrol/Server.cxx   |2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit 0e80e5fe412a19ca04b577d0cf93625b745f0dbc
Author: Michael Stahl mst...@redhat.com
Date:   Mon Aug 6 15:03:50 2012 +0200

sd: link against ws2_32 on WNT for socket API

Change-Id: I44db5170cd4d7c3074af42b59e6dc1f9f783a974

diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 94065b0..ee9046f 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -74,6 +74,12 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\
 $(gb_STDLIBS) \
 ))
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\
+   ws2_32 \
+))
+endif
+
 $(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\
 sd/qa/unit/uimpress \
 ))
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index ca00b19..1fb99e0 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -109,6 +109,12 @@ $(eval $(call gb_Library_use_libraries,sd,\
 $(gb_STDLIBS) \
 ))
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_use_libraries,sd,\
+   ws2_32 \
+))
+endif
+
 $(eval $(call gb_Library_set_componentfile,sd,sd/util/sd))
 
 $(eval $(call gb_Library_add_exception_objects,sd,\
commit e3b57c4de31c2180efa30dc8d86c533dd176686e
Author: Michael Stahl mst...@redhat.com
Date:   Mon Aug 6 15:00:18 2012 +0200

warning C4700: uninitialized local variable 'aRet' used

Change-Id: Ifb6a397372255b6e63e93a2f1f079e6d78531280

diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx 
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index fddaf3a..50f7d77 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -73,9 +73,9 @@ void DiscoveryService::replyTo( sockaddr_in rAddr )
 void DiscoveryService::execute()
 {
 fprintf( stderr, Discovery service is listening\n );;
-sal_uInt64 aRet, aRead;
+sal_uInt64 aRet(0);
+sal_uInt64 aRead(0);
 vectorchar aBuffer;
-aRead = 0;
 
 while ( true )
 {
commit 4a6ced8f94afba28e7e3a00573db2440b876d7d9
Author: Michael Stahl mst...@redhat.com
Date:   Mon Aug 6 14:59:08 2012 +0200

warning C4101: unreferenced local variable

Change-Id: I0eac170f7fafebb438b1516fa271cc4971a9704d

diff --git a/sd/source/ui/remotecontrol/Receiver.cxx 
b/sd/source/ui/remotecontrol/Receiver.cxx
index d7c97bb..8cdedb7 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -55,7 +55,7 @@ void Receiver::parseCommand( std::vectorOString aCommand )
 xSlideShowController =  
uno::Referencepresentation::XSlideShowController(
xPresentation-getController(), uno::UNO_QUERY_THROW );
 }
-catch ( com::sun::star::uno::RuntimeException e )
+catch (uno::RuntimeException )
 {
 fprintf( stderr, Error in retrieving Controller\n );
 //return;
diff --git a/sd/source/ui/remotecontrol/Server.cxx 
b/sd/source/ui/remotecontrol/Server.cxx
index 8371728..1550b57 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -54,7 +54,7 @@ void RemoteServer::listenThread()
 presentationStarted( xPresentation-getController() );
 }
 }
-catch ( com::sun::star::uno::RuntimeException e )
+catch (uno::RuntimeException )
 {
 }
 
commit 7040497038ce7dc3723887a28a4007cc9b5c942d
Author: Michael Stahl mst...@redhat.com
Date:   Mon Aug 6 14:16:04 2012 +0200

sd: remotecontrol: fix setsockopt call for WNT:

Apparently on Linux the 4th parameter to setsockopt has type void* while
on Windows it is const char*; add a cast in the hope that it will work.

Change-Id: I5506788a7fa12b03d9cec2756c84487db772fb0d

diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx 
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index f482158..fddaf3a 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -50,6 +50,9 @@ DiscoveryService::DiscoveryService()
 multicastRequest.imr_interface.s_addr = htonl(INADDR_ANY);
 
 setsockopt( mSocket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+#ifdef WNT
+(const char*)
+#endif
 multicastRequest, sizeof(multicastRequest));
 }
 
@@ -116,4 +119,4 @@ void DiscoveryService::setup()
   spService-launch();
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Today

2012-08-06 Thread Tor Lillqvist
 I'll be in a
 position to push soon, albeit with the document viewer activity navigation
 code broken (Should I still proceed?).

Go ahead, I think...

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


[GSoC] testing - Weekly Report no. 11

2012-08-06 Thread Artur Dorda
Hello.

And there was border test in Writer and there was border test in
Calc, the eleventh week... or this week's work:

* making new border test in Writer, all about checking all of the
different widths,
Status: working and finished
* making another brand new border test in Calc, however this time
checking not only a whole bunch of different width variables of all
the borders, but also their style.
Status: Also working and finished

Let it be considered done.

Best regards,
Artur
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: LibreOffice Android bootstrap

2012-08-06 Thread Tor Lillqvist
(Reply Cc:ed to LO development list with Guillaume's permission.)

 While searching some infos about the problem that I have I found one
 of your commit in LibreOffice [1].
 So I write you to know if you can tell me more about this commit. What
 does this patch does to solve the problem to load shared libraries
 properly?

 [1]
 http://cgit.freedesktop.org/libreoffice/core/commit/sal/android/lo-bootstrap.c?id=5510127e89d6971a219ce3664e4631d6c6dda2b1

Here is what I recall...

1) The Android run-time dynamic linker (the code that implements
dlopen() etc) in its C library (bionic) has a relatively low limit
on the number of shared libraries opened: 128. This is a problem for
LO, but hopefully not really for your application... I think LO is a
bit unique in being (normally) split into such a large number of
dynamically loaded libraries. We currently try to get around this by
simply combining these libraries into a smaller number. But this is
not really something we need code for.

2) Unlike System.loadLibrary() on the Java side, dlopen() doesn't
search the app's lib folder. So it's simplest and safest to make
sure to pass a full absolute path to the library to be loaded.

3) dlopen() doesn't look for dependent libraries recursively. (Or at
least not in the app's lib folder, as mentioned in the previous
point.) Additionally, once loading of a .so has failed, even if you
after that load more dependent libraries and try again, it remembers
that loading that library failed last time and won't try again, even
if it would succeed better this time... So you should not call
dlopen() unless you are sure all dependent libraries have already been
loaded. So the code in our lo_dlopen() traverses the library's ELF
import data and recursively loads needed libraries first before
calling the system dlopen().

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


[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

2012-08-06 Thread Petr Mladek
 sw/source/filter/ww8/wrtw8nds.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2e395b785b1d22922572e94f480a5f581027f9de
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu Aug 2 14:11:50 2012 +0200

fdo#46020: fixed missing footnote docx/doc/rtf export

Don't skip a next position when parsing a paragraph into runs to export.

Change-Id: If7e887ea84ad24256b37aa96187bc30ea154632b
Signed-off-by: Miklos Vajna vmik...@suse.cz
Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 50e6c60..cfb4a66 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1626,8 +1626,10 @@ void MSWordExportBase::UpdatePosition( SwWW8AttrIter* 
aAttrIter, xub_StrLen nAkt
 xub_StrLen nNextPos;
 
 // go to next attribute if no bookmark is found or if the bookmark is 
behind the next attribute position
+// It may happend that the WhereNext() wasn't used in the previous 
increment because there was a
+// bookmark before it. Use that position before trying to find another one.
 bool bNextBookmark = NearestBookmark( nNextPos, nAktPos, true );
-if( !bNextBookmark || nNextPos  aAttrIter-WhereNext() )
+if( nAktPos == aAttrIter-WhereNext()  ( !bNextBookmark || nNextPos  
aAttrIter-WhereNext() ) )
 aAttrIter-NextPos();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[REVIEW 3-5-6] fdo#46020: fixed missing footnote docx/doc/rtf export

2012-08-06 Thread Petr Mladek
Hi,

ape asked to backport the fix 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=108f7a5aa75e3f35b6fa57af402a1e903fefea24g=libreoffice-3-6
for 3.5.6. It fixes a data loss and MAB, the fix looks sane = it might
be worth.

It worked for 3-5 as is = I have pushed it into 3-5 branch 
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=2e395b785b1d22922572e94f480a5f581027f9de

Two more approvals are needed for 3-5-6.


Best Regards,
Petr



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


Re: [REVIEW-3-6] fix for fdo#52351, remove conditional formatting if all its cells are removed

2012-08-06 Thread Kohei Yoshida
Hi Markus,

On Sun, Aug 5, 2012 at 8:29 AM, Markus Mohrhard
markus.mohrh...@googlemail.com wrote:

 [1] is mostly a fix for a strange behavior of ScRangeList which
 affects also conditional formats. ScRangeList did not delete a ScRange
 if UpdateReference removed all the ScRange cells. The second step of
 the patch is to remove the conditional formatting if the ScRangeList
 is empty after updating the range.
...
 [1] 
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=76f56b5e8d4abf17682aa75b7cf183b883809234

Regarding

iterator itr = begin();
while(itr != end())
{
if(itr-GetRange().empty())
maConditionalFormats.erase(itr++);
else
++itr;
}

that erase line causes an undefined behavior, and subtle, hard-to-find
bug later.  maConditionalFormats is a boost::ptr_set which uses
std::set in its implementation.  The std::set's erase call invalidates
the iterator of the element that has just been deleted, and that line
increments the iterator after it's been invalidated.  Instead of doing
post-increment on the invalidated iterator, doing it this way

iterator itr = begin();
while(itr != end())
{
if(itr-GetRange().empty())
{
iterator itErase = itr;
++itr;
maConditionalFormats.erase(itErase);
}
else
++itr;
}

_should_ work.

c.f. 
http://stackoverflow.com/questions/1636578/iterator-validity-after-erase-call-in-stdset

Also, this line

class FindDeletedRange : public ::std::unary_functionbool, const ScRange*

should be

class FindDeletedRange : public ::std::unary_functionconst ScRange*,
bool (swap the 1st and 2nd template arguments.)

The rest looks good to me.

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


deadlock in sd cppunit test

2012-08-06 Thread Michael Stahl
hi Andrzej,

i got this deadlock from a unit test during a build with MSVC today.

also, the Windows Firewall warned about cppunittester.cxx wanting
network access, i wonder if that could be avoided, or if it's actually a
problem...

thread 2152:

ntdll.dll!76ff013d()
[Frames below may be incorrect and/or missing, no symbols loaded for 
ntdll.dll] 
ntdll.dll!76ff013d()
KernelBase.dll!75840bdd()   
user32.dll!756e0b69()   
   sal3.dll!osl_waitCondition(void * Condition=0x0244, const TimeValue 
 * pTimeout=0x)  Line 99 + 0x10 bytesC
fwilo.dll!framework::Gate::wait(const TimeValue * pTimeOut=0x)  
Line 220 + 0xc bytesC++

fwilo.dll!framework::TransactionManager::setWorkingMode(framework::EWorkingMode 
eMode=E_BEFORECLOSE)  Line 152  C++
fwklo.dll!framework::Desktop::dispose()  Line 1207  C++
cppuhelper3MSC.dll!cppu::OFactoryComponentHelper::dispose()  Line 528 + 
0x6 bytes   C++
cppuhelper3MSC.dll!cppu::OComponentHelper::release()  Line 100 + 0x9 
bytes  C++
cppuhelper3MSC.dll!`anonymous 
namespace'::Implementation::~Implementation()  + 0x49 bytes   C++
cppuhelper3MSC.dll!`anonymous namespace'::Implementation::`scalar 
deleting destructor'()  + 0xb bytes   C++
cppuhelper3MSC.dll!boost::checked_delete`anonymous 
namespace'::Implementation(`anonymous-namespace'::Implementation * 
x=0x00826200)  Line 35  C++
cppuhelper3MSC.dll!boost::detail::sp_counted_impl_p`anonymous 
namespace'::Implementation::dispose()  Line 78 + 0x8 bytes  C++
cppuhelper3MSC.dll!boost::detail::sp_counted_base::release()  Line 103  
C++
cppuhelper3MSC.dll!boost::shared_ptr`anonymous 
namespace'::Implementation::~shared_ptr`anonymous 
namespace'::Implementation()  + 0x1f bytes C++
cppuhelper3MSC.dll!boost::shared_ptr`anonymous 
namespace'::Implementation::`scalar deleting destructor'()  + 0xb bytes
C++

cppuhelper3MSC.dll!std::_Destroy_rangestd::allocatorboost::shared_ptr`anonymous
 namespace'::Implementation  (boost::shared_ptr`anonymous 
namespace'::Implementation * _First=0x00827d20, boost::shared_ptr`anonymous 
namespace'::Implementation * _Last=0x00827d28, 
std::allocatorboost::shared_ptr`anonymous namespace'::Implementation   
_Al={...}, std::_Nonscalar_ptr_iterator_tag __formal={...})  Line 234 + 0x9 
bytes C++

cppuhelper3MSC.dll!std::_Destroy_rangestd::allocatorboost::shared_ptr`anonymous
 namespace'::Implementation  (boost::shared_ptr`anonymous 
namespace'::Implementation * _First=0x00827d20, boost::shared_ptr`anonymous 
namespace'::Implementation * _Last=0x00827d28, 
std::allocatorboost::shared_ptr`anonymous namespace'::Implementation   
_Al={...})  Line 225 + 0x11 bytes C++
cppuhelper3MSC.dll!std::vectorboost::shared_ptr`anonymous 
namespace'::Implementation,std::allocatorboost::shared_ptr`anonymous 
namespace'::Implementation  ::_Destroy(boost::shared_ptr`anonymous 
namespace'::Implementation * _First=0x00827d20, boost::shared_ptr`anonymous 
namespace'::Implementation * _Last=0x00827d28)  Line 1119 + 0xf bytes C++
cppuhelper3MSC.dll!std::vectorboost::shared_ptr`anonymous 
namespace'::Implementation,std::allocatorboost::shared_ptr`anonymous 
namespace'::Implementation  ::_Tidy()  Line 1132 C++
cppuhelper3MSC.dll!std::vectorboost::shared_ptr`anonymous 
namespace'::Implementation,std::allocatorboost::shared_ptr`anonymous 
namespace'::Implementation  ::~vectorboost::shared_ptr`anonymous 
namespace'::Implementation,std::allocatorboost::shared_ptr`anonymous 
namespace'::Implementation  ()  Line 560   C++
cppuhelper3MSC.dll!std::pairrtl::OUString const 
,std::vectorboost::shared_ptr`anonymous 
namespace'::Implementation,std::allocatorboost::shared_ptr`anonymous 
namespace'::Implementation   ::~pairrtl::OUString const 
,std::vectorboost::shared_ptr`anonymous 
namespace'::Implementation,std::allocatorboost::shared_ptr`anonymous 
namespace'::Implementation   ()  + 0x1d bytes C++

cppuhelper3MSC.dll!std::_Tree_nodstd::_Tmap_traitsrtl::OUString,std::vectorboost::shared_ptr`anonymous
 namespace'::Implementation,std::allocatorboost::shared_ptr`anonymous 
namespace'::Implementation  
,std::lessrtl::OUString,std::allocatorstd::pairrtl::OUString const 
,std::vectorboost::shared_ptr`anonymous 
namespace'::Implementation,std::allocatorboost::shared_ptr`anonymous 
namespace'::Implementation,0 ::_Node::~_Node()  + 0x1b bytes  C++

cppuhelper3MSC.dll!std::_Tree_nodstd::_Tmap_traitsrtl::OUString,std::vectorboost::shared_ptr`anonymous
 namespace'::Implementation,std::allocatorboost::shared_ptr`anonymous 
namespace'::Implementation  
,std::lessrtl::OUString,std::allocatorstd::pairrtl::OUString const 
,std::vectorboost::shared_ptr`anonymous 
namespace'::Implementation,std::allocatorboost::shared_ptr`anonymous 
namespace'::Implementation,0 ::_Node::`scalar 

[Libreoffice-commits] .: sd/source

2012-08-06 Thread Andrzej J.R. Hunt
 sd/source/ui/remotecontrol/DiscoveryService.cxx |   36 
 sd/source/ui/remotecontrol/DiscoveryService.hxx |1 
 2 files changed, 14 insertions(+), 23 deletions(-)

New commits:
commit 3640fdd74406a0528ebc97f36fad47915da3c6d0
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Mon Aug 6 16:14:01 2012 +0200

Tidied up DiscoveryService::execute().

Change-Id: Ic9e101bf00780dec0f054fccc640cac0e3dacdb9

diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx 
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 50f7d77..6c85e2f 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -12,6 +12,7 @@
 
 #include comphelper/processfactory.hxx
 #include rtl/strbuf.hxx
+#include string.h
 
 #include DiscoveryService.hxx
 
@@ -73,37 +74,26 @@ void DiscoveryService::replyTo( sockaddr_in rAddr )
 void DiscoveryService::execute()
 {
 fprintf( stderr, Discovery service is listening\n );;
-sal_uInt64 aRet(0);
-sal_uInt64 aRead(0);
-vectorchar aBuffer;
+
+char aBuffer[BUFFER_SIZE];
 
 while ( true )
 {
-aBuffer.resize( aRead + 100 );
-
+memset( aBuffer, 0, sizeof(char) * BUFFER_SIZE );
 sockaddr_in aAddr;
 socklen_t aLen = sizeof( aAddr );
 fprintf( stderr, DiscoveryService waiting for packet\n );
-// aRet = mSocket.recvFrom( aBuffer[aRead], 100 );
-recvfrom( mSocket, aBuffer[aRead], 100, 0, (sockaddr*) aAddr, aLen 
);
+recvfrom( mSocket, aBuffer, BUFFER_SIZE, 0, (sockaddr*) aAddr, aLen 
);
 fprintf( stderr, DiscoveryService received a packet.\n );
-// if ( aRet == 0 )
-// {
-// fprintf( stderr, Socket returned 0\n );
-// // break; // I.e. transmission finished.
-// }
-aRead += aRet;
-vectorchar::iterator aIt;
-while ( (aIt = find( aBuffer.begin(), aBuffer.end(), '\n' ))
-!= aBuffer.end() )
-{
-sal_uInt64 aLocation = aIt - aBuffer.begin();
-OString aString( (*aBuffer.begin()), aLocation );
-if ( aString.compareTo( LOREMOTE_SEARCH ) == 0 ) {
-replyTo( aAddr );
+for (int i = 0; i  BUFFER_SIZE; i++ ) {
+if ( aBuffer[i] == '\n' )
+{
+OString aString( aBuffer, i );
+if ( aString.compareTo( LOREMOTE_SEARCH ) == 0 ) {
+replyTo( aAddr );
+}
+break;
 }
-aBuffer.erase( aBuffer.begin(), aIt + 1 ); // Also delete the 
newline
-aRead -= (aLocation + 1);
 }
 }
 }
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.hxx 
b/sd/source/ui/remotecontrol/DiscoveryService.hxx
index 94a2765..9ca4110 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.hxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.hxx
@@ -24,6 +24,7 @@ namespace css = ::com::sun::star;
 * The port for use for the main communication between LibO and remote control 
app.
 */
 #define PORT_DISCOVERY 1598
+#define BUFFER_SIZE 200
 
 #define CHARSET RTL_TEXTENCODING_UTF8
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

2012-08-06 Thread Petr Mladek
 sw/source/filter/ww8/docxattributeoutput.cxx |   25 ++---
 sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

New commits:
commit c26e0a21097f75c95e6e7ac317a0c3a8db9f4fe6
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date:   Thu Aug 2 10:20:59 2012 +0200

fdo#52610: Fixed several docx export bugs

 + hyperlink starting before a field and ending in its results isn't
   valid.
 + when footnotes have hyperlinks we need to add the proper XML
   namespace and output the relations to a different file.

Change-Id: I1c6cb8acba21c35e10bb0497eeaf96bbd73730d1
(cherry picked from commit 0e4846ec20c1aefc554037e8f08255019c08da47)

Signed-off-by: Miklos Vajna vmik...@suse.cz
Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f8615c6..036ddb4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -547,14 +547,6 @@ void DocxAttributeOutput::EndRun()
 m_pSerializer-endElementNS( XML_w, XML_hyperlink );
 m_closeHyperlinkInPreviousRun = false;
 }
-// prepend the actual run start
-if ( m_pHyperlinkAttrList )
-{
-XFastAttributeListRef xAttrList ( m_pHyperlinkAttrList );
-
-m_pSerializer-startElementNS( XML_w, XML_hyperlink, xAttrList );
-m_pHyperlinkAttrList = NULL;
-}
 
 // Write the hyperlink and toc fields starts
 for ( std::vectorFieldInfos::iterator pIt = m_Fields.begin(); pIt != 
m_Fields.end(); )
@@ -573,6 +565,15 @@ void DocxAttributeOutput::EndRun()
 ++pIt;
 }
 
+// Start the hyperlink after the fields separators or we would generate 
invalid file
+if ( m_pHyperlinkAttrList )
+{
+XFastAttributeListRef xAttrList ( m_pHyperlinkAttrList );
+
+m_pSerializer-startElementNS( XML_w, XML_hyperlink, xAttrList );
+m_pHyperlinkAttrList = NULL;
+}
+
 DoWriteBookmarks( );
 
 m_pSerializer-startElementNS( XML_w, XML_r, FSEND );
@@ -1212,9 +1213,10 @@ bool DocxAttributeOutput::StartURL( const String rUrl, 
const String rTarget )
 {
 OUString osUrl( sUrl );
 
-::rtl::OString sId = m_rExport.AddRelation(
-S( 
http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink; 
),
-osUrl );
+OString sId = rtl::OUStringToOString( 
GetExport().GetFilter().addRelation( m_pSerializer-getOutputStream(),
+S( 
http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink; 
),
+osUrl, true ), RTL_TEXTENCODING_UTF8 );
+
 m_pHyperlinkAttrList-add( FSNS( XML_r, XML_id), sId.getStr());
 }
 else
@@ -3534,6 +3536,7 @@ void DocxAttributeOutput::FootnotesEndnotes( bool 
bFootnotes )
 
 m_pSerializer-startElementNS( XML_w, nBody,
 FSNS( XML_xmlns, XML_w ), 
http://schemas.openxmlformats.org/wordprocessingml/2006/main;,
+FSNS( XML_xmlns, XML_r ), 
http://schemas.openxmlformats.org/officeDocument/2006/relationships;,
 FSEND );
 
 sal_Int32 nIndex = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 12a87d4..4d1b5a6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -611,7 +611,7 @@ public:
 virtual DocxExport GetExport();
 const DocxExport GetExport() const { return const_cast 
DocxAttributeOutput* ( this )-GetExport(); }
 
-/// For eg. the output of the styles, we need to switch the serializer to 
enother one.
+/// For eg. the output of the styles, we need to switch the serializer to 
an other one.
 void SetSerializer( ::sax_fastparser::FSHelperPtr pSerializer ) { 
m_pSerializer = pSerializer; }
 
 /// Occasionnaly need to use this serializer from the outside
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[REVIEW 3-5-6] fdo#52610: Fixed several docx export bugs

2012-08-06 Thread Petr Mladek
Hi,

this fixes https://bugs.freedesktop.org/show_bug.cgi?id=52610 and
https://bugs.freedesktop.org/show_bug.cgi?id=52612

It looks sane, works in 3-5 branch as well = pushed there.

I am not sure if this is worth the risk for 3.5.6-rc2. Anyway, two more
approvals could get it there.


Best Regards,
Petr


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


[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - solenv/gbuild

2012-08-06 Thread Matus Kukan
 solenv/gbuild/CliLibrary.mk   |5 +++--
 solenv/gbuild/CliNativeLibrary.mk |2 +-
 solenv/gbuild/Helper.mk   |5 +
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 5fae3213d72702e38d00a501e4e91d1f163fc867
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Aug 6 16:40:24 2012 +0200

get cli_ure closer to successful build

Change-Id: I28ba1f4e802b3736a9f82966a2c7908388df4a92

diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index 62c9d78..bf2c88c 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -36,14 +36,15 @@ gb_CliLibraryTarget__get_generated_source = 
$(WORKDIR)/$(1).cs
 define gb_CliLibraryTarget__command
 $(call gb_Output_announce,$(2),$(true),CSC,3)
 $(call gb_Helper_abbreviate_dirs,\
-   csc \
+   csc $(call gb_Helper_windows_path, \
$(call gb_CliLibraryTarget__get_csflags) \
$(CLI_CSCFLAGS) \
-target:library \
-out:$(1) \
-reference:System.dll \
-   $(foreach 
assembly,$(CLI_ASSEMBLIES),-reference:$(assembly).dll) \
+   $(foreach assembly,$(CLI_ASSEMBLIES),-reference:$(assembly)) \
$(CLI_SOURCES) \
+   ) \
 )
 endef
 
diff --git a/solenv/gbuild/CliNativeLibrary.mk 
b/solenv/gbuild/CliNativeLibrary.mk
index 5751cc8..a11c1d1 100644
--- a/solenv/gbuild/CliNativeLibrary.mk
+++ b/solenv/gbuild/CliNativeLibrary.mk
@@ -35,7 +35,7 @@ $(call gb_CliNativeLibraryTarget_get_target,%) :
 $(call gb_CliNativeLibraryTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),SN ,4)
$(call gb_Helper_abbreviate_dirs,\
-   rm -r $(call gb_CliNativeLibraryTarget_get_target,$*) \
+   rm -rf $(call gb_CliNativeLibraryTarget_get_target,$*) \
)
 
 define gb_CliNativeLibraryTarget_CliNativeLibraryTarget
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 93a0ad7..b83ecbe 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -55,6 +55,11 @@ define gb_Helper_native_path
 $(call gb_Output_error,gb_Helper_native_path: Do not use. Should not be 
necessary.)
 endef
 
+# cygwin seems to eat one backslash when executing command, thus replace with 
'\\'
+define gb_Helper_windows_path
+$(subst /,\\,$(1))
+endef
+
 define gb_Helper_make_clean_target
 gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [ANN] LibreOffice 3.5.6 RC1 available

2012-08-06 Thread Petr Mladek
ape píše v Pá 03. 08. 2012 v 21:00 -0700:
 Hi, Florian! 
 
 Yesterday Cedric Bosdonnat committed patches 3 errors (Writer, loss of data:
 fdo#46020, fdo#52610 and fdo#52612) and does pushed into libreoffice-3-6
 and libreoffice-3-7-Master.

I pushed the fixes into 3-5 branch for 3.5.7 and nominated them for
3.5.6. Let's see if we get the needed approvals in time for 3.5.6.2
(rc2).

Best Regards,
Petr

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


[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - cli_ure/CustomTarget_cli_ure_assemblies.mk

2012-08-06 Thread David Tardon
 cli_ure/CustomTarget_cli_ure_assemblies.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9fc7ccf1af12a77a9661abb2fb858e94f23c44ab
Author: David Tardon dtar...@redhat.com
Date:   Mon Aug 6 17:00:27 2012 +0200

add missing semicolons

Change-Id: I639f243263a37f8c26d1ba530eb0cfac5a7dfcd7

diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk 
b/cli_ure/CustomTarget_cli_ure_assemblies.mk
index ccdeb6e..2bcf5e5 100644
--- a/cli_ure/CustomTarget_cli_ure_assemblies.mk
+++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk
@@ -45,8 +45,8 @@ $(call 
gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs :
 # TODO use macros for this
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx :
$(GNUCOPY) $ $@.tmp  \
-   echo '[assembly:System.Reflection.AssemblyVersion( 
$(CLI_CPPUHELPER_NEW_VERSION) )]'  $@.tmp  \
-   echo '[assembly:System.Reflection.AssemblyKeyFile( 
$(OUTDIR)/bin/cliuno.snk )]'  $@.tmp  \
+   echo '[assembly:System.Reflection.AssemblyVersion( 
$(CLI_CPPUHELPER_NEW_VERSION) )];'  $@.tmp  \
+   echo '[assembly:System.Reflection.AssemblyKeyFile( 
$(OUTDIR)/bin/cliuno.snk )];'  $@.tmp  \
mv $@.tmp $@
 
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [REVIEW 3-5-6] fdo#52610: Fixed several docx export bugs

2012-08-06 Thread ape
Good, but today I found by chance something else (ODF to DOCX then FILE
REOPEN..), after fixing the
error by Cedric. Is there a need to create a new bug?



--
View this message in context: 
http://nabble.documentfoundation.org/REVIEW-3-5-6-fdo-52610-Fixed-several-docx-export-bugs-tp3999510p3999517.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


Re: Today

2012-08-06 Thread Iain Billett
Trying to work this out:

/LibreOfficeDev/gsoc/android/experimental/LibreOffice4Android/build.xml:89:
The following error occurred while executing this line:
/LibreOfficeDev/gsoc/android/experimental/LibreOffice4Android/build.xml:105:
aapt doesn't support the projectLibrariesPackageName attribute

I'm going to take a break from it.

On Mon, Aug 6, 2012 at 2:09 PM, Tor Lillqvist t...@iki.fi wrote:

  I'll be in a
  position to push soon, albeit with the document viewer activity
 navigation
  code broken (Should I still proceed?).

 Go ahead, I think...

 --tml

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


Re: [REVIEW-3-6] fix for fdo#52351, remove conditional formatting if all its cells are removed

2012-08-06 Thread Stephan Bergmann

On 08/06/2012 04:08 PM, Kohei Yoshida wrote:

Regarding

 iterator itr = begin();
 while(itr != end())
 {
 if(itr-GetRange().empty())
 maConditionalFormats.erase(itr++);
 else
 ++itr;
 }

that erase line causes an undefined behavior, and subtle, hard-to-find
bug later.  maConditionalFormats is a boost::ptr_set which uses
std::set in its implementation.  The std::set's erase call invalidates
the iterator of the element that has just been deleted, and that line
increments the iterator after it's been invalidated.


No, the line first increments itr, then calls erase (on the old itr value).

Stephan

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


[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-08-06 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

Julien Nabet serval2...@yahoo.fr changed:

   What|Removed |Added

 CC||serval2...@yahoo.fr
 Depends on||30571

--- Comment #69 from Julien Nabet serval2...@yahoo.fr 2012-08-06 15:22:29 UTC 
---
Added bug 30571 (Some items in vertical toolbar unusable)
It's a very old bug and this one must be quite annoying for those who prefer
vertical toolbars.
devs: any hint where to begin to chase this one ?

-- 
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


Re: Today

2012-08-06 Thread Michael Meeks

On Mon, 2012-08-06 at 16:21 +0100, Iain Billett wrote:
 Trying to work this out:

 /LibreOfficeDev/gsoc/android/experimental/LibreOffice4Android/build.xml:89: 
 The following error occurred while executing this line:
 /LibreOfficeDev/gsoc/android/experimental/LibreOffice4Android/build.xml:105: 
 aapt doesn't support the projectLibrariesPackageName attribute

That means you need to update your Android SDK to the latest version.
At least, if you have pulled up to master as of ~today. We clobber the
built-in rules (which have changed) in a different way.

Looking forward to seeing your updates ! :-)

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: [REVIEW-3-6] fix for fdo#52351, remove conditional formatting if all its cells are removed

2012-08-06 Thread Kohei Yoshida
On Mon, Aug 6, 2012 at 11:21 AM, Stephan Bergmann sberg...@redhat.com wrote:
 On 08/06/2012 04:08 PM, Kohei Yoshida wrote:

 Regarding

  iterator itr = begin();
  while(itr != end())
  {
  if(itr-GetRange().empty())
  maConditionalFormats.erase(itr++);
  else
  ++itr;
  }

 that erase line causes an undefined behavior, and subtle, hard-to-find
 bug later.  maConditionalFormats is a boost::ptr_set which uses
 std::set in its implementation.  The std::set's erase call invalidates
 the iterator of the element that has just been deleted, and that line
 increments the iterator after it's been invalidated.


 No, the line first increments itr, then calls erase (on the old itr value).

Ok then.  I have no problem with it.

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


[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - dbaccess/source

2012-08-06 Thread Petr Mladek
 dbaccess/source/core/api/KeySet.cxx |  278 +---
 dbaccess/source/core/api/KeySet.hxx |6 
 2 files changed, 174 insertions(+), 110 deletions(-)

New commits:
commit 186366967e7d57e1bd539a43c7383405adb8a575
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Jul 16 23:58:18 2012 +0200

fdo#51239 refresh row lazily (when data is requested)

This avoids fetching data that will not be requested when the cursor
is only moved and no data requested. That is typically what
RowSetCache does when its own cursor is moved within its window.

This basically makes the whole {next,previous,absolute,...}_checked
story obsolete, by basically always being as fast as the
i_bFetchRow==false case, but in a safer way.

Change-Id: I89eaf277069736b3077bde8b45325929db290f2d

Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 6dd8390..baed229 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -392,8 +392,7 @@ sal_Bool SAL_CALL OKeySet::moveToBookmark( const Any 
bookmark ) throw(SQLExcept
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com, 
OKeySet::moveToBookmark );
 m_bInserted = m_bUpdated = m_bDeleted = sal_False;
 m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark));
-if (m_aKeyIter != m_aKeyMap.end())
-refreshRow();
+invalidateRow();
 return m_aKeyIter != m_aKeyMap.end();
 }
 
@@ -1134,7 +1133,7 @@ sal_Bool SAL_CALL OKeySet::next(  ) throw(SQLException, 
RuntimeException)
 }
 }
 
-refreshRow();
+invalidateRow();
 return !isAfterLast();
 }
 
@@ -1201,7 +1200,7 @@ sal_Bool SAL_CALL OKeySet::first(  ) throw(SQLException, 
RuntimeException)
 }
 }
 else
-refreshRow();
+invalidateRow();
 return m_aKeyIter != m_aKeyMap.end()  m_aKeyIter != m_aKeyMap.begin();
 }
 
@@ -1210,7 +1209,7 @@ sal_Bool SAL_CALL OKeySet::last(  ) throw(SQLException, 
RuntimeException)
 return last_checked(sal_True);
 }
 
-sal_Bool OKeySet::last_checked( sal_Bool i_bFetchRow)
+sal_Bool OKeySet::last_checked( sal_Bool /* i_bFetchRow */ )
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com, 
OKeySet::last_checked );
 m_bInserted = m_bUpdated = m_bDeleted = sal_False;
@@ -1220,10 +1219,7 @@ sal_Bool OKeySet::last_checked( sal_Bool i_bFetchRow)
 --m_aKeyIter;
 if ( !fetchedRow )
 {
-if ( i_bFetchRow )
-refreshRow();
-else
-invalidateRow();
+invalidateRow();
 }
 return m_aKeyIter != m_aKeyMap.end()  m_aKeyIter != m_aKeyMap.begin();
 }
@@ -1241,7 +1237,7 @@ sal_Bool SAL_CALL OKeySet::absolute( sal_Int32 row ) 
throw(SQLException, Runtime
 {
 return absolute_checked(row,sal_True);
 }
-sal_Bool OKeySet::absolute_checked( sal_Int32 row,sal_Bool i_bFetchRow )
+sal_Bool OKeySet::absolute_checked( sal_Int32 row, sal_Bool /* i_bFetchRow */ )
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com, 
OKeySet::absolute );
 m_bInserted = m_bUpdated = m_bDeleted = sal_False;
@@ -1295,10 +1291,7 @@ sal_Bool OKeySet::absolute_checked( sal_Int32 
row,sal_Bool i_bFetchRow )
 }
 if ( !fetchedRow )
 {
-if ( i_bFetchRow )
-refreshRow();
-else
-invalidateRow();
+invalidateRow();
 }
 
 return m_aKeyIter != m_aKeyMap.end()  m_aKeyIter != m_aKeyMap.begin();
@@ -1309,23 +1302,20 @@ sal_Bool SAL_CALL OKeySet::relative( sal_Int32 rows ) 
throw(SQLException, Runtim
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com, 
OKeySet::relative );
 if(!rows)
 {
-refreshRow();
+invalidateRow();
 return sal_True;
 }
 return absolute(getRow()+rows);
 }
 
-sal_Bool OKeySet::previous_checked( sal_Bool i_bFetchRow )
+sal_Bool OKeySet::previous_checked( sal_Bool /* i_bFetchRow */ )
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com, 
OKeySet::previous );
 m_bInserted = m_bUpdated = m_bDeleted = sal_False;
 if(m_aKeyIter != m_aKeyMap.begin())
 {
 --m_aKeyIter;
-if ( i_bFetchRow )
-refreshRow();
-else
-invalidateRow();
+invalidateRow();
 }
 return m_aKeyIter != m_aKeyMap.begin();
 }
@@ -1503,139 +1493,153 @@ bool OKeySet::fillAllRows()
 sal_Bool SAL_CALL OKeySet::wasNull(  ) throw(SQLException, RuntimeException)
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com, 
OKeySet::wasNull );
+if ( ! m_xRow.is() )
+
throwGenericSQLException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Must call 
getFOO() for some FOO before wasNull())), *this);
+
+OSL_ENSURE(m_xRow.is(),m_xRow is null! I've thrown, but function 
execution continued?);
 return m_xRow-wasNull();
 }
 
+inline void 

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

2012-08-06 Thread Kohei Yoshida
 sc/source/core/data/conditio.cxx |   13 +
 sc/source/core/tool/rangelst.cxx |   31 +++
 2 files changed, 44 insertions(+)

New commits:
commit 73a465ed443e820974600ee291e21ed6413ecb9d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Tue Jul 24 08:54:58 2012 +0200

delete conditional format entries that are removed, fdo#52351

Change-Id: I9ab70d2b7a557ae5f717898edfb6c363343462f6
Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com
Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index a5ed065..97ffd61 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1650,6 +1650,19 @@ void ScConditionalFormatList::UpdateReference( 
UpdateRefMode eUpdateRefMode,
 {
 for( iterator itr = begin(); itr != end(); ++itr)
 itr-UpdateReference( eUpdateRefMode, rRange, nDx, nDy, nDz );
+
+if( eUpdateRefMode == URM_INSDEL )
+{
+// need to check which must be deleted
+iterator itr = begin();
+while(itr != end())
+{
+if(itr-GetRange().empty())
+maConditionalFormats.erase(itr++);
+else
+++itr;
+}
+}
 }
 
 void ScConditionalFormatList::RenameCellStyle( const String rOld, const 
String rNew )
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 16f9eca..88f9727 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -150,6 +150,29 @@ private:
 bool mbFirst;
 };
 
+class FindDeletedRange : public ::std::unary_functionconst ScRange*, bool
+{
+public:
+FindDeletedRange( SCsCOL nDx, SCsROW nDy): mnDx(nDx), mnDy(nDy) {}
+FindDeletedRange( const FindDeletedRange r) : mnDx(r.mnDx), mnDy(r.mnDy) 
{}
+bool operator() (const ScRange* p)
+{
+ScAddress rStart = p-aStart;
+ScAddress rEnd = p-aEnd;
+
+if( rEnd.Col() +mnDx  rStart.Col() )
+return true;
+if( rEnd.Row() + mnDy  rStart.Row() )
+return true;
+
+return false;
+}
+
+private:
+SCsCOL mnDx;
+SCsROW mnDy;
+};
+
 }
 
 // === ScRangeList 
@@ -384,6 +407,14 @@ bool ScRangeList::UpdateReference(
 SCTAB nTab2;
 rWhere.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
 
+// delete all entries that are fully deleted
+if( eUpdateRefMode == URM_INSDEL  (nDx  0 || nDy  0) )
+{
+vectorScRange*::iterator itr = std::remove_if(maRanges.begin(), 
maRanges.end(), FindDeletedRange(nDx, nDy));
+for_each(itr, maRanges.end(), ScDeleteObjectByPtrScRange());
+maRanges.erase(itr, maRanges.end());
+}
+
 vectorScRange*::iterator itr = maRanges.begin(), itrEnd = maRanges.end();
 for (; itr != itrEnd; ++itr)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [REVIEW 3-5-6] fdo#52610: Fixed several docx export bugs

2012-08-06 Thread Petr Mladek
ape píše v Po 06. 08. 2012 v 08:08 -0700:
 Good, but today I found by chance something else (ODF to DOCX then FILE
 REOPEN..), after fixing the
 error by Cedric. Is there a need to create a new bug?

Sure, please open a bug and write more details about the problem there.

Is it an older bug?
Or is it a regression caused by the Cedric's fix?


Best Regards,
Petr

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


Re: [REVIEW-3-6] [PUSHED 3-6] fix for fdo#52351, remove conditional formatting if all its cells are removed

2012-08-06 Thread Kohei Yoshida
On Mon, Aug 6, 2012 at 11:42 AM, Kohei Yoshida kohei.yosh...@gmail.com wrote:
 On Mon, Aug 6, 2012 at 11:21 AM, Stephan Bergmann sberg...@redhat.com wrote:
 On 08/06/2012 04:08 PM, Kohei Yoshida wrote:

 Regarding

  iterator itr = begin();
  while(itr != end())
  {
  if(itr-GetRange().empty())
  maConditionalFormats.erase(itr++);
  else
  ++itr;
  }

 that erase line causes an undefined behavior, and subtle, hard-to-find
 bug later.  maConditionalFormats is a boost::ptr_set which uses
 std::set in its implementation.  The std::set's erase call invalidates
 the iterator of the element that has just been deleted, and that line
 increments the iterator after it's been invalidated.


 No, the line first increments itr, then calls erase (on the old itr value).

 Ok then.  I have no problem with it.

Pushed to 3-6 with mine and Stephan's (I hope you don't mind).

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


Re: [PATCH] [PUSHED: 3-5] horrible performance regression

2012-08-06 Thread Petr Mladek
Hi Lionel,

sigh, I have somehow missed this mail.

Lionel Elie Mamane píše v St 18. 07. 2012 v 19:37 +0200:
 On Tue, Jul 17, 2012 at 12:10:05AM +0200, Lionel Elie Mamane wrote:
  Please cherry-pick 0cda6605844ef68e45db7a7c05cc4d09ef2bc49a
  (http://cgit.freedesktop.org/libreoffice/core/commit/?id=0cda6605844ef68e45db7a7c05cc4d09ef2bc49a
   and patch also attached)
  to libreoffice-3-6 in time for rc2.
 
  I'll make a backport to libreoffice-3-5 later this week
 
 So, the sorry situation is that backporting this without also
 backporting e581bef6dfc03d0bab9de1485c6f6cdcd034d581 is pointless.
 
 That's more than I'm comfortable with on a stable branch, but OTOH, if
 we don't fix this, we'd leave a huge problem for users of embedded
 HSQLDB. So I reluctantly ask for backport to libreoffice-3-5.
 
 Additionally, e581bef6dfc03d0bab9de1485c6f6cdcd034d581 moderately
 intertwined with 773668c6ab0963f56f98270b29d595f5df7c4bb2, so I
 decided that porting e581bef6dfc03d0bab9de1485c6f6cdcd034d581 without
 773668c6ab0963f56f98270b29d595f5df7c4bb2 is actually more risky than
 without it.
 
 
 So the backport of these three commits is attached as patches. I
 squashed with fixups that happened shortly after these commits.

I do not pretend that I understand everything. I do not see any obvious
problem. I agree that it is better to have the same code in 3.5 and 3.6
in this case = pushed to 3-5 branch, see
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=7f75bc39fc1f49fe0b8c5c550eb801c0974a53a2
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=6085d9cc065a0612ea10e29274774ee0a6548d3a
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=186366967e7d57e1bd539a43c7383405adb8a575


Note that I removed the hunk:

--- cut ---
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -150,6 +150,7 @@ void SAL_CALL
java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c
 
 ::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSet 
SAL_CALL java_sql_PreparedStatement::executeQuery(  )
throw(::com::sun::star::sdbc::SQLException, 
::com::sun::star::uno::RuntimeException)
 {
+std::cerr  ::rtl::OUStringToOString( this-m_sSqlStatement,
RTL_TEXTENCODING_UTF8 ).getStr()  std::endl;
 m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED_QUERY );
 ::osl::MutexGuard aGuard( m_aMutex );
 checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
--- cut ---

IMHO, it was just a debugging output.


Hmm, I think that it is too risky to push it into 3-5-6 for 3.5.6-rc2.
So, it needs to wait for 3.5.7. Well, we will at least get some feedback
from 3.6.0 users in the meantime.

Best Regards,
Petr


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


Re: [PATCH] [PUSHED: 3-5] horrible performance regression

2012-08-06 Thread Lionel Elie Mamane
On Mon, Aug 06, 2012 at 06:26:25PM +0200, Petr Mladek wrote:
 Lionel Elie Mamane píše v St 18. 07. 2012 v 19:37 +0200:
  On Tue, Jul 17, 2012 at 12:10:05AM +0200, Lionel Elie Mamane wrote:
   Please cherry-pick 0cda6605844ef68e45db7a7c05cc4d09ef2bc49a
   (http://cgit.freedesktop.org/libreoffice/core/commit/?id=0cda6605844ef68e45db7a7c05cc4d09ef2bc49a
and patch also attached)
   to libreoffice-3-6 in time for rc2.
  
   I'll make a backport to libreoffice-3-5 later this week
  
  So, the sorry situation is that backporting this without also
  backporting e581bef6dfc03d0bab9de1485c6f6cdcd034d581 is pointless.
  
  That's more than I'm comfortable with on a stable branch, but OTOH, if
  we don't fix this, we'd leave a huge problem for users of embedded
  HSQLDB. So I reluctantly ask for backport to libreoffice-3-5.
  
  Additionally, e581bef6dfc03d0bab9de1485c6f6cdcd034d581 moderately
  intertwined with 773668c6ab0963f56f98270b29d595f5df7c4bb2, so I
  decided that porting e581bef6dfc03d0bab9de1485c6f6cdcd034d581 without
  773668c6ab0963f56f98270b29d595f5df7c4bb2 is actually more risky than
  without it.
  
  
  So the backport of these three commits is attached as patches. I
  squashed with fixups that happened shortly after these commits.
 
 I do not pretend that I understand everything. I do not see any obvious
 problem. I agree that it is better to have the same code in 3.5 and 3.6
 in this case = pushed to 3-5 branch, see
 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=7f75bc39fc1f49fe0b8c5c550eb801c0974a53a2
 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=6085d9cc065a0612ea10e29274774ee0a6548d3a
 http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=186366967e7d57e1bd539a43c7383405adb8a575
 
 
 Note that I removed the hunk:
 
 --- cut ---
 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
 +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
 @@ -150,6 +150,7 @@ void SAL_CALL
 java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c
  
  ::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSet 
 SAL_CALL java_sql_PreparedStatement::executeQuery(  )
 throw(::com::sun::star::sdbc::SQLException, 
 ::com::sun::star::uno::RuntimeException)
  {
 +std::cerr  ::rtl::OUStringToOString( this-m_sSqlStatement,
 RTL_TEXTENCODING_UTF8 ).getStr()  std::endl;
  m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED_QUERY );
  ::osl::MutexGuard aGuard( m_aMutex );
  checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
 --- cut ---
 
 IMHO, it was just a debugging output.

Yes, and somebody else fixed in on master; I forgot to sqash it into
the libreoffice-3-5 backport. Sorry about that.

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


[Libreoffice-commits] .: sc/CppunitTest_sc_chart_regression_test.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_subsequent_filters_test.mk

2012-08-06 Thread Michael Stahl
 sc/CppunitTest_sc_chart_regression_test.mk   |4 +---
 sc/CppunitTest_sc_filters_test.mk|3 +--
 sc/CppunitTest_sc_subsequent_filters_test.mk |3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit c0e8588cae8cde4598b12c7b5317a09d0429ac74
Author: Michael Stahl mst...@redhat.com
Date:   Mon Aug 6 18:31:14 2012 +0200

sc: adapt tests to merged chart libraries

Change-Id: I32b76c0e3da184ee0a0091776e0767b08d4eb10f

diff --git a/sc/CppunitTest_sc_chart_regression_test.mk 
b/sc/CppunitTest_sc_chart_regression_test.mk
index 63778cf..3e3d580 100644
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ b/sc/CppunitTest_sc_chart_regression_test.mk
@@ -85,9 +85,7 @@ $(eval $(call 
gb_CppunitTest_use_ure,sc_chart_regression_test))
 $(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\
 basic/util/sb \
 chart2/source/controller/chartcontroller \
-chart2/source/model/chartmodel \
-chart2/source/tools/charttools \
-chart2/source/view/chartview \
+chart2/source/chartcore \
 comphelper/util/comphelp \
 configmgr/source/configmgr \
 dbaccess/util/dba \
diff --git a/sc/CppunitTest_sc_filters_test.mk 
b/sc/CppunitTest_sc_filters_test.mk
index 616a0d7..15469c1 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -85,8 +85,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_filters_test))
 $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
 basic/util/sb \
 chart2/source/controller/chartcontroller \
-chart2/source/tools/charttools \
-chart2/source/model/chartmodel \
+chart2/source/chartcore \
 comphelper/util/comphelp \
 configmgr/source/configmgr \
 dbaccess/util/dba \
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk 
b/sc/CppunitTest_sc_subsequent_filters_test.mk
index b47fe82..608fd66 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -84,8 +84,7 @@ $(eval $(call 
gb_CppunitTest_use_ure,sc_subsequent_filters_test))
 
 $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
 chart2/source/controller/chartcontroller \
-chart2/source/tools/charttools \
-chart2/source/model/chartmodel \
+chart2/source/chartcore \
 comphelper/util/comphelp \
 configmgr/source/configmgr \
 dbaccess/util/dba \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - 3 commits - cli_ure/CliNativeLibrary_cli_cppuhelper.mk cli_ure/CustomTarget_cli_ure_assemblies.mk solenv/gbuild

2012-08-06 Thread David Tardon
 cli_ure/CliNativeLibrary_cli_cppuhelper.mk |5 +
 cli_ure/CustomTarget_cli_ure_assemblies.mk |8 ++--
 solenv/gbuild/CliNativeLibrary.mk  |   25 +
 3 files changed, 36 insertions(+), 2 deletions(-)

New commits:
commit 431a4c7685ba563676b93da95adb5d48edd53627
Author: David Tardon dtar...@redhat.com
Date:   Mon Aug 6 18:47:50 2012 +0200

add missing deps

Change-Id: I11219716e92c8337a0dcbf2e4fc54e98fc35a67d

diff --git a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk 
b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
index 2e1ead7..23ed5fa 100644
--- a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
+++ b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
@@ -17,4 +17,9 @@ $(eval $(call 
gb_CliNativeLibrary_set_configfile,cli_cppuhelper,cli_ure/source/n
 
 $(eval $(call 
gb_CliNativeLibrary_set_policy,cli_cppuhelper,$(CLI_CPPUHELPER_POLICY_ASSEMBLY),$(CLI_CPPUHELPER_POLICY_VERSION)))
 
+$(eval $(call gb_CliNativeLibrary_use_assemblies,cli_cppuhelper,\
+   cli_ure \
+   cli_uretypes \
+))
+
 # vim: set noet sw=4 ts=4:
commit f183a066d6138db0ad6fe0124083b1a15a9501b8
Author: David Tardon dtar...@redhat.com
Date:   Mon Aug 6 18:47:02 2012 +0200

allow CliNativeLibrary to depend on other assemblies

Change-Id: I9b7e4c0f155e38d551c677803ee94b80639eb5de

diff --git a/solenv/gbuild/CliNativeLibrary.mk 
b/solenv/gbuild/CliNativeLibrary.mk
index a11c1d1..87909da 100644
--- a/solenv/gbuild/CliNativeLibrary.mk
+++ b/solenv/gbuild/CliNativeLibrary.mk
@@ -39,6 +39,7 @@ $(call gb_CliNativeLibraryTarget_get_clean_target,%) :
)
 
 define gb_CliNativeLibraryTarget_CliNativeLibraryTarget
+$(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_ASSEMBLIES := 
$(gb_Helper_MISCDUMMY)
 $(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_KEYFILE :=
 $(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_LIBRARY :=
 
@@ -46,9 +47,13 @@ $(call gb_CliNativeLibraryTarget_get_target,$(1)) :| $(dir 
$(call gb_CliNativeLi
 
 endef
 
+# TODO gb_Library_get_target might be sufficient here. I do not know if
+# #using assembly.dll actually does anything at compile time, or if it is
+# only needed at link time.
 define gb_CliNativeLibraryTarget_wrap_library
 $(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_LIBRARY := 
$(call gb_CliNativeLibraryTarget__get_library,$(2))
 $(call gb_CliNativeLibraryTarget_get_target,$(1)) : $(call 
gb_Library_get_target,$(2))
+$(call gb_Library_get_external_headers_target,$(2)) : $$(CLI_NATIVE_ASSEMBLIES)
 
 endef
 
@@ -58,6 +63,16 @@ $(call gb_CliNativeLibraryTarget_get_target,$(1)) : $(2)
 
 endef
 
+define gb_CliNativeLibraryTarget_use_assembly
+$(call gb_CliNativeLibraryTarget_get_target,$(1)) : CLI_NATIVE_ASSEMBLIES += 
$(call gb_CliLibrary_get_target,$(2))
+
+endef
+
+define gb_CliNativeLibraryTarget_use_assemblies
+$(foreach assembly,$(2),$(call 
gb_CliNativeLibraryTarget_use_assembly,$(1),$(assembly)))
+
+endef
+
 # CliNativeLibrary class
 
 gb_CliNativeLibrary_PLATFORM_DEFAULT := x86
@@ -111,4 +126,14 @@ $(call gb_CliNativeLibraryTarget_wrap_library,$(1),$(2))
 
 endef
 
+define gb_CliNativeLibrary_use_assembly
+$(call gb_CliNativeLibraryTarget_use_assembly,$(1),$(2))
+
+endef
+
+define gb_CliNativeLibrary_use_assemblies
+$(call gb_CliNativeLibraryTarget_use_assemblies,$(1),$(2))
+
+endef
+
 # vim: set noet sw=4 ts=4:
commit 0705eb2177945de3a15f828b2dfe9efa6efc9304
Author: David Tardon dtar...@redhat.com
Date:   Mon Aug 6 18:38:15 2012 +0200

use S.R.AssemblyKeyFile attribute if compiler version is sufficient

Change-Id: I5b80ca69637fe801e8392281669aaef421ee0553

diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk 
b/cli_ure/CustomTarget_cli_ure_assemblies.mk
index 4e200c8..bed0143 100644
--- a/cli_ure/CustomTarget_cli_ure_assemblies.mk
+++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk
@@ -9,6 +9,10 @@
 
 cli_ure_source_MAKEFILE := $(lastword $(MAKEFILE_LIST))
 
+# FIXME move this to configure.in ?
+cli_ure_CCNUMVER = $(shell $(CC) -V | $(gb_AWK) -v num=true -f 
$(SOLARENV)/bin/getcompver.awk)
+cli_ure_CCNUMVER_GOOD = $(shell expr $(cli_ure_CCNUMVER) -ge 0013)
+
 include $(SRCDIR)/cli_ure/version/version.txt
 
 $(eval $(call gb_CustomTarget_CustomTarget,cli_ure/source))
@@ -39,7 +43,7 @@ $(call 
gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs :
$(GNUCOPY) $ $@.tmp  \
echo '[assembly:System.Reflection.AssemblyVersion( 
$(CLI_BASETYPES_NEW_VERSION) )]'  $@.tmp  \
-   $(if $(cli_ure_CCNUMVER),echo 
'[assembly:System.Reflection.AssemblyKeyFile( @$(OUTDIR)/bin/cliuno.snk )]' 
 $@.tmp ) \
+   $(if $(cli_ure_CCNUMVER_GOOD),echo 
'[assembly:System.Reflection.AssemblyKeyFile( @$(OUTDIR)/bin/cliuno.snk )]' 
 $@.tmp ) \
mv $@.tmp $@
 
 # TODO use macros for this
@@ -52,7 +56,7 @@ $(call 
gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx :
 $(call 

[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - cli_ure/Library_cli_cppuhelper_native.mk

2012-08-06 Thread Matus Kukan
 cli_ure/Library_cli_cppuhelper_native.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit f7f593dd299d11edbb85ba66b10ca1c47cf26ca4
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Aug 6 19:32:37 2012 +0200

cli_ure: another missing dep

Change-Id: I3f7d0034500b52e363f5cc3e136b89a5d75aab64

diff --git a/cli_ure/Library_cli_cppuhelper_native.mk 
b/cli_ure/Library_cli_cppuhelper_native.mk
index 3364803..2b6e419 100644
--- a/cli_ure/Library_cli_cppuhelper_native.mk
+++ b/cli_ure/Library_cli_cppuhelper_native.mk
@@ -28,6 +28,10 @@ $(eval $(call 
gb_Library_use_internal_bootstrap_api,cli_cppuhelper_native,\
udkapi \
 ))
 
+$(eval $(call gb_Library_use_packages,cli_cppuhelper_native,\
+   cli_ure_cliuno \
+))
+
 $(eval $(call gb_Library_use_libraries,cli_cppuhelper_native,\
advapi32 \
cppu \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: 5 commits - config_host.mk.in configure.in i18npool/inc i18npool/Library_i18nisolang1.mk i18npool/prj i18npool/source liblangtag/makefile.mk liblangtag/prj RepositoryExternal.

2012-08-06 Thread Eike Rathke
 RepositoryExternal.mk   |   63 ++
 RepositoryFixes.mk  |3 
 config_host.mk.in   |1 
 configure.in|6 
 i18npool/Library_i18nisolang1.mk|8 
 i18npool/inc/i18npool/languagetag.hxx   |  168 ++
 i18npool/prj/build.lst  |2 
 i18npool/source/languagetag/languagetag.cxx |  760 
 liblangtag/makefile.mk  |   16 
 liblangtag/prj/d.lst|   10 
 scp2/InstallModule_ooo.mk   |1 
 scp2/source/ooo/directory_ooo.scp   |8 
 scp2/source/ooo/file_extra_ooo.scp  |9 
 scp2/source/ooo/file_library_ooo.scp|   20 
 14 files changed, 1064 insertions(+), 11 deletions(-)

New commits:
commit 15b95b224588743d629c7a9a305352357eb96a07
Author: Eike Rathke er...@redhat.com
Date:   Mon Aug 6 19:23:09 2012 +0200

LanguageTag Windows build

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5efe5eb..08b3aa6 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -442,7 +442,8 @@ endef
 else # !SYSTEM_GLIB
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-   glib \
+   glib-2.0 \
+   gmodule-2.0 \
 ))
 
 define gb_LinkTarget__use_glib
@@ -453,6 +454,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 $(call gb_LinkTarget_use_libraries,$(1),\
glib-2.0 \
+   gmodule-2.0 \
 )
 
 endef
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 12108f3..b5ecb1c 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -129,8 +129,11 @@ gb_Library_FILENAMES := $(patsubst 
z:z%,z:zlib%,$(gb_Library_FILENAMES))
 # change the names of all import libraries that don't have an i prefix as in 
our standard naming schema
 gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
 gb_Library_NOILIBFILENAMES += \
+glib-2.0 \
+gmodule-2.0 \
 graphite2_off \
 icudt icuin icule icuuc \
+langtag \
 lcms2 \
 msvcprt \
 nspr4 \
diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk
index db0cdf2..066f6f9 100644
--- a/i18npool/Library_i18nisolang1.mk
+++ b/i18npool/Library_i18nisolang1.mk
@@ -57,4 +57,6 @@ $(eval $(call gb_Library_use_external,i18nisolang1,glib))
 
 $(eval $(call gb_Library_use_external,i18nisolang1,liblangtag))
 
+$(eval $(call gb_Library_use_external,i18nisolang1,libxml2))
+
 # vim: set noet sw=4 ts=4:
commit 284bc79cc482e95b216b6eeb9c166022880d662b
Author: Eike Rathke er...@redhat.com
Date:   Mon Aug 6 19:23:08 2012 +0200

install liblangtag and data

diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index a8efa55..cbb522c 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -16,6 +16,9 @@ LIBLANGTAG_MINOR=2
 LIBLANGTAG_MICRO=0
 # Currently liblangtag.so.0.1.0 is generated instead of 0.2.0, presumably a 
bug?
 # For new versions adapt symlink in prj/d.lst
+# Version is currently hardcoded in scp2/source/ooo/file_library_ooo.scp
+# section gid_File_Lib_Langtag, adapt for new versions, or introduce
+# LIBLANGTAG_M* in configure!
 
 # --- Settings -
 
@@ -41,7 +44,11 @@ PATCH_FILES+=liblangtag-0.2-datadir.patch
 CONFIGURE_DIR=.
 BUILD_DIR=$(CONFIGURE_DIR)
 
-CONFIGURE_FLAGS+= --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC)$/install
+my_misc='$(SRC_ROOT)$/$(PRJNAME)$/$(MISC)'
+my_prefix='$(my_misc)$/install'
+my_data='$(my_prefix)$/share/liblangtag'
+
+CONFIGURE_FLAGS+= --prefix='$(my_prefix)'
 
 .IF $(SYSTEM_LIBXML)!=YES
 CONFIGURE_FLAGS+= LIBXML2_CFLAGS='-I$(SOLARINCDIR)$/external$/libxml'
@@ -92,6 +99,13 @@ PATCH_FILES+=liblangtag-0.2-msc-configure.patch
 
 # --- Targets --
 
+ALLTAR: $(MISC)/liblangtag_data.zip
+
 .INCLUDE : set_ext.mk
 .INCLUDE : target.mk
 .INCLUDE : tg_ext.mk
+
+$(MISC)/liblangtag_data.zip: $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
+   @-rm -f $@
+   @echo creating $@
+   $(COMMAND_ECHO)cd $(my_data)  zip $(ZIP_VERBOSITY) -r 
$(my_misc)$/$(@:f) *
diff --git a/liblangtag/prj/d.lst b/liblangtag/prj/d.lst
index 43e9c34..c4c9a23 100644
--- a/liblangtag/prj/d.lst
+++ b/liblangtag/prj/d.lst
@@ -3,15 +3,7 @@ mkdir: %_DEST%\inc\liblangtag
 ..\%__SRC%\misc\install\include\liblangtag\*%_DEST%\inc\liblangtag\
 ..\%__SRC%\misc\install\lib\liblangtag.so*  %_DEST%\lib\
 ..\%__SRC%\misc\install\lib\langtag.lib*%_DEST%\lib\
+..\%__SRC%\misc\liblangtag_data.zip %_DEST%\pck\
 
 symlink: %_DEST%\lib\liblangtag.so.0.1.0%_DEST%\lib\liblangtag.so.0
 symlink: %_DEST%\lib\liblangtag.so.0.1.0%_DEST%\lib\liblangtag.so
-
-mkdir: %_DEST%\share
-mkdir: %_DEST%\share\liblangtag
-mkdir: %_DEST%\share\liblangtag\common
-mkdir: %_DEST%\share\liblangtag\common\bcp47
-
-..\%__SRC%\misc\install\share\liblangtag\*  
%_DEST%\share\liblangtag\

[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - cli_ure/CustomTarget_cli_ure_assemblies.mk

2012-08-06 Thread David Tardon
 cli_ure/CustomTarget_cli_ure_assemblies.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 89356c494eee2f80c4193e9a4932a366e0970d66
Author: David Tardon dtar...@redhat.com
Date:   Mon Aug 6 19:53:21 2012 +0200

expr does not understand sh operators...

Change-Id: I8d02aa2112bf7af502281a8441dceed6dee5ef42

diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk 
b/cli_ure/CustomTarget_cli_ure_assemblies.mk
index bed0143..b68a5bd 100644
--- a/cli_ure/CustomTarget_cli_ure_assemblies.mk
+++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk
@@ -11,7 +11,7 @@ cli_ure_source_MAKEFILE := $(lastword $(MAKEFILE_LIST))
 
 # FIXME move this to configure.in ?
 cli_ure_CCNUMVER = $(shell $(CC) -V | $(gb_AWK) -v num=true -f 
$(SOLARENV)/bin/getcompver.awk)
-cli_ure_CCNUMVER_GOOD = $(shell expr $(cli_ure_CCNUMVER) -ge 0013)
+cli_ure_CCNUMVER_GOOD = $(shell expr $(cli_ure_CCNUMVER) '=' 0013)
 
 include $(SRCDIR)/cli_ure/version/version.txt
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - cli_ure/CustomTarget_cli_ure_assemblies.mk

2012-08-06 Thread David Tardon
 cli_ure/CustomTarget_cli_ure_assemblies.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6dcb6be1f7b8e0902e8a5b60dc91c1525d5fc3a4
Author: David Tardon dtar...@redhat.com
Date:   Mon Aug 6 19:57:55 2012 +0200

use the same compiler invocation as dmake does

Change-Id: I98b44d40f95c65ca52e7701ea45f78a647f944d2

diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk 
b/cli_ure/CustomTarget_cli_ure_assemblies.mk
index b68a5bd..6773848 100644
--- a/cli_ure/CustomTarget_cli_ure_assemblies.mk
+++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk
@@ -10,7 +10,7 @@
 cli_ure_source_MAKEFILE := $(lastword $(MAKEFILE_LIST))
 
 # FIXME move this to configure.in ?
-cli_ure_CCNUMVER = $(shell $(CC) -V | $(gb_AWK) -v num=true -f 
$(SOLARENV)/bin/getcompver.awk)
+cli_ure_CCNUMVER = $(shell $(CXX) | $(gb_AWK) -v num=true -f 
$(SOLARENV)/bin/getcompver.awk)
 cli_ure_CCNUMVER_GOOD = $(shell expr $(cli_ure_CCNUMVER) '=' 0013)
 
 include $(SRCDIR)/cli_ure/version/version.txt
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Need help to locate HSQLDB in Base

2012-08-06 Thread Muhammad Waqas Iftikhar
We have been looking on different kind of databses to embed under
libreoffice base.
Some few ones we like are:

Friebird (but has some issues with embedding it under linux it doesnt work
easily. Not only this you will have to embed Classic under linux and its
architecture is not suitable for an application like base and it wont be
'pure' embedded server)

MySQL/ libmysqld (GPL issue. What i have derived from difference between
LGPL and GPL licenses i have come to conclusion that if we use libmysqld
and as .DLL / .SO there wont be any license issue as Base being FOSS free
open source software has the right to use it libmysld in it if we mention
that this particular library is under GPL license and no commercial
organisation can use it without permission of Oracle without changing our
license.
But we cannot amend any code part of libmysqld if we do this then we will
be owner of of that amended library and according to LGPL commercial
organisation will be able to use it. So to do that libre will have to come
to GPL license. What we derived to make mysql as embedded in base it would
had to be amended a little run .ODB files and store databases in .ODB
files. If we are wrong or we can avoid this amendment then i think best
choice is mysqld. Its footprint is not huge and provides nearly every thing
one can need. High performance SQL standards etc.)

We can also embed PostgreSQL. An embedded version is not available but we
can pack the binaries of postgresql with it. Run it when application starts
in a new thread and bind it listen to to only local host. Then kill
the process and wait the thread to join before exiting the application. It
can also resolve many major f*unctionalities and platform issues.)*
- Note: if we embed MySQL or PostgreSQL the work would be very less also.
As their drivers are already written.

Oracle's berkley db is also very good option for embedded as it is open
source. Its an SQL dbms but is not relational dbms.)

SQLite already voted out. Rest all DBMS that can be embedded i saw are
under commercial license or only runs in Windows based applications).

On Mon, Jul 23, 2012 at 11:50 PM, Muhammad Waqas Iftikhar 
coldheart...@gmail.com wrote:

 Me and my friends are trying to work on to embedd SQLite under base
 instead of hsqldb. For that we are trying to understand how BASE works with
 HSQLDB for now. We've been debugging Libreoffice for a while now. In our
 search for code relating to HSQLDB, we've gone through the code in the
 load function of dbloader2.cxx found in the source/filter/xml
 directory under the dbaccess module as well as the code in
 connection.cxx file found in the source/code/dataaccess folder, also
 under the dbaccess module. We've seen how the wizards and the windows for
 Base are initialized and then displayed and how the connection is
 established when the tables are to be accessed. However, we haven't been
 able to locate the portion of code that actually initializes HSQLDB. Please
 give us an idea of how to proceed further.

 --
 Regards Waqas




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


Re: Need help to locate HSQLDB in Base

2012-08-06 Thread Muhammad Waqas Iftikhar
But again if we embed PostgreSQL the issue will come again on running .ODB
files.

On Mon, Aug 6, 2012 at 11:01 PM, Muhammad Waqas Iftikhar 
coldheart...@gmail.com wrote:

 We have been looking on different kind of databses to embed under
 libreoffice base.
 Some few ones we like are:

 Friebird (but has some issues with embedding it under linux it doesnt work
 easily. Not only this you will have to embed Classic under linux and its
 architecture is not suitable for an application like base and it wont be
 'pure' embedded server)

 MySQL/ libmysqld (GPL issue. What i have derived from difference between
 LGPL and GPL licenses i have come to conclusion that if we use libmysqld
 and as .DLL / .SO there wont be any license issue as Base being FOSS free
 open source software has the right to use it libmysld in it if we mention
 that this particular library is under GPL license and no commercial
 organisation can use it without permission of Oracle without changing our
 license.
 But we cannot amend any code part of libmysqld if we do this then we will
 be owner of of that amended library and according to LGPL commercial
 organisation will be able to use it. So to do that libre will have to come
 to GPL license. What we derived to make mysql as embedded in base it would
 had to be amended a little run .ODB files and store databases in .ODB
 files. If we are wrong or we can avoid this amendment then i think best
 choice is mysqld. Its footprint is not huge and provides nearly every thing
 one can need. High performance SQL standards etc.)

 We can also embed PostgreSQL. An embedded version is not available but we
 can pack the binaries of postgresql with it. Run it when application starts
 in a new thread and bind it listen to to only local host. Then kill
 the process and wait the thread to join before exiting the application. It
 can also resolve many major f*unctionalities and platform issues.)*
 - Note: if we embed MySQL or PostgreSQL the work would be very less also.
 As their drivers are already written.

 Oracle's berkley db is also very good option for embedded as it is open
 source. Its an SQL dbms but is not relational dbms.)

 SQLite already voted out. Rest all DBMS that can be embedded i saw are
 under commercial license or only runs in Windows based applications).

 On Mon, Jul 23, 2012 at 11:50 PM, Muhammad Waqas Iftikhar 
 coldheart...@gmail.com wrote:

 Me and my friends are trying to work on to embedd SQLite under base
 instead of hsqldb. For that we are trying to understand how BASE works with
 HSQLDB for now. We've been debugging Libreoffice for a while now. In our
 search for code relating to HSQLDB, we've gone through the code in the
 load function of dbloader2.cxx found in the source/filter/xml
 directory under the dbaccess module as well as the code in
 connection.cxx file found in the source/code/dataaccess folder, also
 under the dbaccess module. We've seen how the wizards and the windows for
 Base are initialized and then displayed and how the connection is
 established when the tables are to be accessed. However, we haven't been
 able to locate the portion of code that actually initializes HSQLDB. Please
 give us an idea of how to proceed further.

 --
 Regards Waqas




 --
 Regards Waqas




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


Unconfirmed Bugs

2012-08-06 Thread Joel Madero
Hi All,

Well, we attempted to do a triaging event Sunday and ...it didn't work out
well. Hardly anyone showed, and I understand, it was the weekend ;)

So I'm attempting something new. What I've done is made a google doc (yes I
know, boo, lame, whatever), for now, it was the easiest and fastest way to
organize. I have organized based on the component and then grouped in
approximately 50 or less groupings. If you have the time (even if it takes
a couple months to get through them) PLEASE take a group. I am convinced
that it reflects poorly on us that we allow bugs to stay unconfirmed with
no comment or anything for months and months and months - I would actually
say that alone should be a critical bug ;) So, if you could take a grouping
please rename the sheet to your name (or IRC name or some other way you
call yourself) and just go through them at your leisure, that would be
fantastic. If we could get 10-15 people to commit to a group we could halve
the unconfims over the next few months which would be nice for the UA team,
for the dev team and for our user base.

I know I sound like I'm preaching.thanks all who participate.

LINK:
https://docs.google.com/spreadsheet/ccc?key=0ApS-XtOUGGH5dDIwaXN1YnNsM0h4RXFKdVhvb2RRb0E#gid=0
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [PATCH]fdo#52636:VIEWING: unintuitive Heading for 'Enable experimental Features

2012-08-06 Thread Ivan Timofeev

Hi Joel,

On 02.08.2012 21:57, Joel Madero wrote:

Here is an updated patch.


not that it is essential, but it is good if the commit message is 
wrapped so that it does not exceed a reasonable width (say 70-80 
characters). (Yes, my e-mail client seems unable to do that, ugh.)



 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.


Something wrong with your editor? These lines should start with '#' and 
be ignored, why they are in the commit message again?



Text [ en-US ] = Optional features ;


uhm, IMHO optional means not necessary in most cases, but sometimes 
might be helpful. So a user would think Ok, let's enable all these, 
won't hurt anyway. But this features aren't stable and somewhat 
dangerous to enable, and



-Text [ en-US ] = Enable experimental (unstable) features;
+Text [ en-US ] = Enable experimental features;


makes it sound even more safe. Maybe Unstable features as a header then?

Another nit-picking:
you placed two labels in one row, not good IMHO: consider long 
translations. But then the last row could go out of the visible area, it 
would be great to check that - play with #define ROW.. constants in

optgdlg.hrc, remove my ugly +6 in ROW14 etc... :)

Thanks!

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


[Libreoffice-commits] .: sd/source

2012-08-06 Thread Ivan Timofeev
 sd/source/ui/remotecontrol/ImagePreparer.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 770f581623ed0c7d31b9751ee789a72272b07c6c
Author: Ivan Timofeev timofeev@gmail.com
Date:   Mon Aug 6 22:31:16 2012 +0400

-Werror=format-security

Change-Id: Idb1267108a9eb8d08e1a14685a2f5c9a6263b46d

diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx 
b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 3555aee..06a8c6d 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -229,7 +229,7 @@ OString ImagePreparer::notesToHtml( sal_uInt32 aSlideNumber 
)
 
 OUString aFileURL;
 FileBase::createTempFile( 0, 0, aFileURL );
-fprintf( stderr, OUStringToOString( aFileURL, 
RTL_TEXTENCODING_UTF8).getStr() );
+fprintf( stderr, %s, OUStringToOString( aFileURL, 
RTL_TEXTENCODING_UTF8).getStr() );
 
 if ( !xController-isRunning() )
 return ;
@@ -460,4 +460,4 @@ sal_Bool ExportTo( uno::Reference drawing::XDrawPage 
aNotesPage, String aUrl
 return sal_False;
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Static src analysis of LibreOffice

2012-08-06 Thread John Smith
On Mon, Aug 6, 2012 at 9:57 AM, John Smith lbalba...@gmail.com wrote:
 On Mon, Aug 6, 2012 at 9:08 AM, Stephan Bergmann sberg...@redhat.com wrote:

 That smells like On recent Fedora 17, the included Clang (3.0) is unusable
 due to clang++ chokes on complex. However, a home-built Clang 3.1 works
 fine.
 (https://wiki.documentfoundation.org/Development/Building_LibreOffice_with_Clang#Setup)


 Stephan

 Hrm. I did some googling, and I doubt that it's the same bug. This one
 occurs with something like this :

 # cat test.cpp
 #include iostream

 int main() {
 std::cout  Hello, world!  std::endl;
 }

 # clang++ test.cpp -o test -std=gnu++11
 In file included from test.cpp:1:
 In file included from
 /usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/iostream:39:
 In file included from
 /usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/ostream:39:
 In file included from
 /usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/ios:40:
 In file included from
 /usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/bits/char_traits.h:40:
 In file included from
 /usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/bits/stl_algobase.h:65:
 In file included from
 /usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/bits/stl_pair.h:61:
 In file included from
 /usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/bits/move.h:57:
 /usr/lib/gcc/i686-redhat-linux/4.7.0/../../../../include/c++/4.7.0/type_traits:256:39:
 error: use of undeclared identifier '__float128'
 struct __is_floating_point_helper__float128
   ^
 1 error generated.



 I submitted a bug report : http://llvm.org/bugs/show_bug.cgi?id=13530



 John Smith.

Well it turns out that Clang (or any backends) doesn't support the
__float128 type (yet). Some possible workarounds are suggested in the
bug report.


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


[Libreoffice-commits] .: l10ntools/source

2012-08-06 Thread Andras Timar
 l10ntools/source/help/HelpCompiler.cxx |  219 +++--
 l10ntools/source/help/HelpCompiler.hxx |2 
 2 files changed, 77 insertions(+), 144 deletions(-)

New commits:
commit aba13e8a4a91c715a2a2b13792c2f7d48654e009
Author: Andras Bartek bartek...@gmail.com
Date:   Mon Aug 6 16:25:37 2012 +0200

fixing conditional text in ahelp tags fdo#49268

Change-Id: Ife25790d2ef3ffbacc05a97ac682757b841a1eb8

diff --git a/l10ntools/source/help/HelpCompiler.cxx 
b/l10ntools/source/help/HelpCompiler.cxx
index fb92e5b..e28ac92 100644
--- a/l10ntools/source/help/HelpCompiler.cxx
+++ b/l10ntools/source/help/HelpCompiler.cxx
@@ -54,6 +54,10 @@ HelpCompiler::HelpCompiler(StreamTable in_streamTable, 
const fs::path in_input
 bExtensionMode( in_bExtensionMode )
 {
 xmlKeepBlanksDefaultValue = 0;
+char* guitmp = getenv(GUI);
+gui = (strcmp(guitmp, UNX) ? gui : UNIX);
+gui = (strcmp(guitmp, MAC) ? gui : MAC);
+gui = (strcmp(guitmp, WNT) ? gui : WIN);
 }
 
 xmlDocPtr HelpCompiler::getSourceDocument(const fs::path filePath)
@@ -103,125 +107,79 @@ xmlDocPtr HelpCompiler::getSourceDocument(const fs::path 
filePath)
 return res;
 }
 
-HashSet HelpCompiler::switchFind(xmlDocPtr doc)
-{
-HashSet hs;
-xmlChar *xpath = (xmlChar*)//switchinline;
-
-xmlXPathContextPtr context = xmlXPathNewContext(doc);
-xmlXPathObjectPtr result = xmlXPathEvalExpression(xpath, context);
-xmlXPathFreeContext(context);
-if (result)
-{
-xmlNodeSetPtr nodeset = result-nodesetval;
-for (int i = 0; i  nodeset-nodeNr; i++)
-{
-xmlNodePtr el = nodeset-nodeTab[i];
-xmlChar *select = xmlGetProp(el, (xmlChar*)select);
-if (select)
-{
-if (!strcmp((const char*)select, appl))
-{
-xmlNodePtr n1 = el-xmlChildrenNode;
-while (n1)
-{
-if ((!xmlStrcmp(n1-name, (const 
xmlChar*)caseinline)))
-{
-xmlChar *appl = xmlGetProp(n1, (xmlChar*)select);
-hs.push_back(std::string((const char*)appl));
-xmlFree(appl);
-}
-else if ((!xmlStrcmp(n1-name, (const 
xmlChar*)defaultinline)))
-hs.push_back(std::string(DEFAULT));
-n1 = n1-next;
-}
-}
-xmlFree(select);
-}
-}
-xmlXPathFreeObject(result);
-}
-hs.push_back(std::string(DEFAULT));
-return hs;
-}
-
 // returns a node representing the whole stuff compiled for the current
 // application.
 xmlNodePtr HelpCompiler::clone(xmlNodePtr node, const std::string appl)
 {
-xmlNodePtr parent = xmlCopyNode(node, 2);
-xmlNodePtr n = node-xmlChildrenNode;
-while (n != NULL)
+xmlNodePtr root = xmlCopyNode(node, 2);
+if (node-xmlChildrenNode)
 {
-bool isappl = false;
-if ( (!strcmp((const char*)n-name, switchinline)) ||
- (!strcmp((const char*)n-name, switch)) )
-{
-xmlChar *select = xmlGetProp(n, (xmlChar*)select);
-if (select)
-{
-if (!strcmp((const char*)select, appl))
-isappl = true;
-xmlFree(select);
-}
-}
-if (isappl)
+xmlNodePtr list = node-xmlChildrenNode;
+while (list)
 {
-xmlNodePtr caseNode = n-xmlChildrenNode;
-if (appl == DEFAULT)
+if (strcmp((const char*)list-name, switchinline) == 0 || 
strcmp((const char*)list-name, switch) == 0)
 {
-while (caseNode)
+std::string tmp=;
+if (strcmp((const char*)xmlGetProp(list, (xmlChar*)select), 
sys))
 {
-if (!strcmp((const char*)caseNode-name, defaultinline))
-{
-xmlNodePtr cnl = caseNode-xmlChildrenNode;
-while (cnl)
-{
-xmlAddChild(parent, clone(cnl, appl));
-cnl = cnl-next;
-}
-break;
-}
-caseNode = caseNode-next;
+tmp = gui;
 }
-}
-else
-{
-while (caseNode)
+if (strcmp((const char*)xmlGetProp(list, (xmlChar*)select), 
appl))
+{
+tmp = appl;
+}
+if (tmp.compare() != 0)
 {
-isappl=false;
-if (!strcmp((const char*)caseNode-name, caseinline))
+bool isCase=false;
+xmlNodePtr caseList=list-xmlChildrenNode;
+ 

[Libreoffice-commits] .: tail_build/prj

2012-08-06 Thread Eike Rathke
 tail_build/prj/build.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a9041ae008128aff5cdcc715786c4d77482151a8
Author: Eike Rathke er...@redhat.com
Date:   Mon Aug 6 21:30:43 2012 +0200

added glib

Change-Id: Iabae193ce1fd580c4d40e58cd78a90570b290de3

diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index fd5e342..9461730 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb  tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker 
CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite 
HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools 
JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis 
LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub 
LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps 
LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes 
NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql 
PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations VIGRA:vigra 
XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt 
jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino 
ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlr
 eader xsltml NULL
+tb  tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker 
CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib 
GRAPHITE:graphite HSQLDB:hsqldb HUNSPELL:hunspell HYPHEN:hyphen ICU:icu 
DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr 
LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag 
LIBMSPUB:libmspub LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt 
LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve 
MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap 
OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon 
TRANSLATIONS:translations VIGRA:vigra XPDF:xpdf ZLIB:zlib bridges cli_ure 
comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg 
DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv 
soltools stoc ucbhelper ucpp u
 dkapi xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[GSOC-UPDATE](06.08) Impress Remote

2012-08-06 Thread Andrzej J. R. Hunt

Hi everyone,

Today's latest:
- Merged into master (thanks to Michael Meeks who did the final merging).
- Fixed to compile and link on Windows (thanks to Michael Stahl who did 
this) -- please note the code is untested and may not work under windows.*
- Some tidy up of various code, including refactoring of code previously 
requring c++0x.
- Started setting up a build environment on windows for testing there 
(will be especially important once I get to writing bluetooth code since 
that will require platform specific implementations).


Michael Stahl has discovered that a unit test deadlocks on Windows -- 
I'm currently looking into why that occurs.


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


Re: [ Patch ] fdo#46193: Made MessageBox copyable

2012-08-06 Thread zolniatamas

Hi,

  Oh, I forgot the text, which is copyable now in all MessageBox,  
(WarningBox, ErrorBox, etc.), with this patch. I hope it will be  
usefull.



Regards,
Zolnai Tamás

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


[Libreoffice-commits] .: configure.in

2012-08-06 Thread Eike Rathke
 configure.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 732a75a54f02c3ad16210fa2d62b893cf37a5a5f
Author: Eike Rathke er...@redhat.com
Date:   Mon Aug 6 22:45:27 2012 +0200

added GLIB to BUILD_TYPE

Change-Id: Iad491070b5a199aab4652d955cdbc7839c07c70b

diff --git a/configure.in b/configure.in
index 657bd0f..9aacac7 100644
--- a/configure.in
+++ b/configure.in
@@ -10967,6 +10967,7 @@ else
 esac
 fi
 AC_SUBST(SYSTEM_GLIB)
+BUILD_TYPE=$BUILD_TYPE GLIB
 
 dnl Get system's glib flags and libs.
 dnl The i18npool LanguageTag wrapper uses it for liblangtag.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [PATCH]fdo#52636:VIEWING: unintuitive Heading for 'Enable experimental Features

2012-08-06 Thread Joel Madero
I'll take care of these issues. I put 2 in one row because there is a limit
as to how many rows can be in the general tab and we've hit that limit :-/
I'm not sure how that is being handled or if we want to increase the # but
if I increase the row by one it shoots out an error for me. Let me know how
to proceed, I'll deal with the other two issues as soon as possible. Thanks
for the comments

Joel

On Mon, Aug 6, 2012 at 11:28 AM, Ivan Timofeev timofeev@gmail.comwrote:

 Hi Joel,


 On 02.08.2012 21:57, Joel Madero wrote:

 Here is an updated patch.


 not that it is essential, but it is good if the commit message is wrapped
 so that it does not exceed a reasonable width (say 70-80 characters). (Yes,
 my e-mail client seems unable to do that, ugh.)

   Please enter the commit message for your changes. Lines starting
  with '#' will be ignored, and an empty message aborts the commit.


 Something wrong with your editor? These lines should start with '#' and be
 ignored, why they are in the commit message again?

  Text [ en-US ] = Optional features ;


 uhm, IMHO optional means not necessary in most cases, but sometimes
 might be helpful. So a user would think Ok, let's enable all these, won't
 hurt anyway. But this features aren't stable and somewhat dangerous to
 enable, and

  -Text [ en-US ] = Enable experimental (unstable) features;
 +Text [ en-US ] = Enable experimental features;


 makes it sound even more safe. Maybe Unstable features as a header then?

 Another nit-picking:
 you placed two labels in one row, not good IMHO: consider long
 translations. But then the last row could go out of the visible area, it
 would be great to check that - play with #define ROW.. constants in
 optgdlg.hrc, remove my ugly +6 in ROW14 etc... :)

 Thanks!

 Ivan

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


[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - cli_ure/CustomTarget_cli_ure_assemblies.mk cli_ure/source solenv/gbuild

2012-08-06 Thread Matus Kukan
 cli_ure/CustomTarget_cli_ure_assemblies.mk |6 +++---
 cli_ure/source/native/path.cxx |2 +-
 solenv/gbuild/CliLibrary.mk|1 -
 solenv/gbuild/platform/WNT_INTEL_MSC.mk|2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit d8fc82680dd530ed201cfa0eb4491c093469e191
Author: Matúš Kukan matus.ku...@gmail.com
Date:   Mon Aug 6 23:21:49 2012 +0200

force cli_ure to build

- there is still missing dependency on cliuno.snk
- remove -warnaserror+ causing weird problem
- export random symbol so that we get icli_cppuhelper_native.lib file
  created

Change-Id: Ifd3b4785f83496d2c9bff6b1ea2fd39b6978725c

diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk 
b/cli_ure/CustomTarget_cli_ure_assemblies.mk
index 6773848..da66178 100644
--- a/cli_ure/CustomTarget_cli_ure_assemblies.mk
+++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk
@@ -43,20 +43,20 @@ $(call 
gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs :
$(GNUCOPY) $ $@.tmp  \
echo '[assembly:System.Reflection.AssemblyVersion( 
$(CLI_BASETYPES_NEW_VERSION) )]'  $@.tmp  \
-   $(if $(cli_ure_CCNUMVER_GOOD),echo 
'[assembly:System.Reflection.AssemblyKeyFile( @$(OUTDIR)/bin/cliuno.snk )]' 
 $@.tmp ) \
+   $(if $(cli_ure_CCNUMVER_GOOD),echo 
'[assembly:System.Reflection.AssemblyKeyFile( @$(call 
gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk) )]'  $@.tmp ) \
mv $@.tmp $@
 
 # TODO use macros for this
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx :
$(GNUCOPY) $ $@.tmp  \
echo '[assembly:System::Reflection::AssemblyVersion( 
$(CLI_CPPUHELPER_NEW_VERSION) )];'  $@.tmp  \
-   echo '[assembly:System::Reflection::AssemblyKeyFile( 
$(OUTDIR)/bin/cliuno.snk )];'  $@.tmp  \
+   echo '[assembly:System::Reflection::AssemblyKeyFile( $(call 
gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk) )];'  $@.tmp  \
mv $@.tmp $@
 
 $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs :
$(GNUCOPY) $ $@.tmp  \
echo '[assembly:System.Reflection.AssemblyVersion( 
$(CLI_URE_NEW_VERSION) )]'  $@.tmp  \
-   $(if $(cli_ure_CCNUMVER_GOOD),echo 
'[assembly:System.Reflection.AssemblyKeyFile( @$(OUTDIR)/bin/cliuno.snk )]' 
 $@.tmp ) \
+   $(if $(cli_ure_CCNUMVER_GOOD),echo 
'[assembly:System.Reflection.AssemblyKeyFile( @$(call 
gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk) )]'  $@.tmp ) \
mv $@.tmp $@
 
 # vim: set noet sw=4 ts=4:
diff --git a/cli_ure/source/native/path.cxx b/cli_ure/source/native/path.cxx
index 087e0cf..97c7f36 100644
--- a/cli_ure/source/native/path.cxx
+++ b/cli_ure/source/native/path.cxx
@@ -30,7 +30,7 @@
 
 namespace cli_ure {
 
-WCHAR * filename(WCHAR * path) {
+SAL_DLLPUBLIC_EXPORT WCHAR * filename(WCHAR * path) {
 WCHAR * f = path;
 for (WCHAR * p = path;;) {
 switch (*p++) {
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index bf2c88c..9cf6bd5 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -13,7 +13,6 @@ gb_CliLibraryTarget_EXT := $(gb_CliAssembly_POLICYEXT)
 
 gb_CliLibraryTarget_CSCFLAGS := \
-noconfig \
-   -warnaserror+
 
 gb_CliLibraryTarget_CSCFLAGS_DEBUG := \
-checked+ \
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index bf44b79..8b03099 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -738,7 +738,7 @@ gb_InstallScript_EXT := .inf
 # CliAssemblyTarget class
 
 gb_CliAssemblyTarget_POLICYEXT := $(gb_Library_DLLEXT)
-gb_CliAssemblyTarget_get_dll = 
$(gb_Library_OUTDIRLOCATION)/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
+gb_CliAssemblyTarget_get_dll = 
$(OUTDIR)/bin/$(1)$(gb_CliAssemblyTarget_POLICYEXT)
 
 # Python
 gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) 
PYTHONHOME=$(OUTDIR_FOR_BUILD)/lib/python 
PYTHONPATH=$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: feature/gbuild_ure needs testing

2012-08-06 Thread Matúš Kukan
On 2 August 2012 12:00, David Tardon dtar...@redhat.com wrote:
This only builds on windows. I do expect some problems, because
I only smoketested the code (replacing all commands by touch $@).

There were few problems ;-)
After 
http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/gbuild_ureid=d8fc82680dd530ed201cfa0eb4491c093469e191
It is possible to build cli_ure but..

with make -k  make or similar because
the CliLibrary things are missing dependency on cliuno.snk, something
like f7f593dd299d11edbb85ba66b10ca1c47cf26ca4
I thought you will find a best place for that dep :-)

I've removed -warnaserror+ . It should not be bad ?

What's worse is that I made random symbol exported from
cli_cppuhelper_native library.
I tried to build it with dmake and find out what symbols should be
exported from there but found nothing.
So that library is proly useless ? Anyway, who cares, it's windows..
but with rules in gbuild in such cases you are missing .lib file and get error.
I've found out this some time ago when I was converting some windows module.
So, the exported symbol is workaround for this.

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


[Libreoffice-commits] .: configure.in

2012-08-06 Thread Eike Rathke
 configure.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0c6bd06035ee773ec792f2cb0048254957a6f7e9
Author: Eike Rathke er...@redhat.com
Date:   Mon Aug 6 23:49:31 2012 +0200

maybe I'll get this right one time ... BUILD_TYPE GLIB only if not system

Change-Id: I94cea4d8ea33d89a5a2883e6434a97a2692bc505

diff --git a/configure.in b/configure.in
index 9aacac7..c9e625d 100644
--- a/configure.in
+++ b/configure.in
@@ -10967,7 +10967,6 @@ else
 esac
 fi
 AC_SUBST(SYSTEM_GLIB)
-BUILD_TYPE=$BUILD_TYPE GLIB
 
 dnl Get system's glib flags and libs.
 dnl The i18npool LanguageTag wrapper uses it for liblangtag.
@@ -10976,6 +10975,8 @@ GLIB_CFLAGS=''
 GLIB_LIBS=''
 if test $SYSTEM_GLIB = YES; then
 PKG_CHECK_MODULES( GLIB, glib-2.0 )
+else
+BUILD_TYPE=$BUILD_TYPE GLIB
 fi
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: liblangtag/prj

2012-08-06 Thread Eike Rathke
 liblangtag/prj/d.lst |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 26a6205c542f1122d824f86c68a30aff2d44ac4c
Author: Eike Rathke er...@redhat.com
Date:   Mon Aug 6 23:56:31 2012 +0200

deliver .dylib

Change-Id: I30b6b2e782197c918704efccea4af8a0b94926a2

diff --git a/liblangtag/prj/d.lst b/liblangtag/prj/d.lst
index c4c9a23..a5f5dfe 100644
--- a/liblangtag/prj/d.lst
+++ b/liblangtag/prj/d.lst
@@ -2,6 +2,7 @@ mkdir: %_DEST%\inc\liblangtag
 
 ..\%__SRC%\misc\install\include\liblangtag\*%_DEST%\inc\liblangtag\
 ..\%__SRC%\misc\install\lib\liblangtag.so*  %_DEST%\lib\
+..\%__SRC%\misc\install\lib\liblangtag*.dylib   %_DEST%\lib\
 ..\%__SRC%\misc\install\lib\langtag.lib*%_DEST%\lib\
 ..\%__SRC%\misc\liblangtag_data.zip %_DEST%\pck\
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [Libreoffice-commits] .: Branch 'feature/gbuild_ure' - cli_ure/CustomTarget_cli_ure_assemblies.mk cli_ure/source solenv/gbuild

2012-08-06 Thread David Tardon
Hi,

On Mon, Aug 06, 2012 at 02:26:57PM -0700, Matus Kukan wrote:
  cli_ure/CustomTarget_cli_ure_assemblies.mk |6 +++---
  cli_ure/source/native/path.cxx |2 +-
  solenv/gbuild/CliLibrary.mk|1 -
  solenv/gbuild/platform/WNT_INTEL_MSC.mk|2 +-
  4 files changed, 5 insertions(+), 6 deletions(-)
 
 - export random symbol so that we get icli_cppuhelper_native.lib file
   created
 
 diff --git a/cli_ure/source/native/path.cxx b/cli_ure/source/native/path.cxx
 index 087e0cf..97c7f36 100644
 --- a/cli_ure/source/native/path.cxx
 +++ b/cli_ure/source/native/path.cxx
 @@ -30,7 +30,7 @@
  
  namespace cli_ure {
  
 -WCHAR * filename(WCHAR * path) {
 +SAL_DLLPUBLIC_EXPORT WCHAR * filename(WCHAR * path) {
  WCHAR * f = path;
  for (WCHAR * p = path;;) {
  switch (*p++) {

There is something fishy going on there. filename is only used in the
same compilation unit (and not mentioned in any header, either), so it
ought not to be exported. If you send me the error message, maybe I can
find the problem. Also, marking it static instead of SAL_DLLPUBLIC_EXPORT
could help.

D.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Today

2012-08-06 Thread Tor Lillqvist
 I ran an android update sdk but it made no difference but there must be
 something I'm missing

Try running it just interactively android and see if it offers an
update then.  (I have Android SDK Tools Rev 20, Android SDK
Platform-tools Rev 12. I guess the xml files are part of either of
those?

(Are these build.xml etc files used by Ant, and Eclipse runs Ant then
to do the actual build? Or are the same files used by both? Or do you
don't use Eclipse for building, just coding and debugging? I
definitely could do with some hands-on tutoring on how to use Eclipse,
I find it quite confusing and hard to use...)

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


[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-08-06 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #70 from Tor Lillqvist tlillqv...@suse.com 2012-08-07 05:00:50 
UTC ---
must be quite annoying for those? So you don't find it annoying yourself, and
haven't heard explicitly from anybody finding it very annoying? I am not sure
if it is a good idea to start guessing here. Surely one could say that *all*
bugs are annoying for somebody if they bothered to report a bug? If a bug in
some non-default user interface configuration behaviour is very old, surely
people have learned to live with it by now, and/or not even bother trying to
use that configuration? Just shows once more that too any options is bad.

-- 
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


Re: [GSOC-UPDATE](06.08) Impress Remote

2012-08-06 Thread Tor Lillqvist
 Michael Stahl has discovered that a unit test deadlocks on Windows -- I'm
 currently looking into why that occurs.

Dunno about deadlocks, but in my Windows build during the night the
sd_filters_test apparently got stuck in a loop, filling my disk by
writing an endless stream of

DiscoveryService received a packet.
DiscoveryService waiting for packet

to the sd_filters_test.test.log file...

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


[Libreoffice-commits] .: sd/source

2012-08-06 Thread David Tardon
 sd/source/ui/remotecontrol/ImagePreparer.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit caac7011d259a6a7a22e617b27291e5c4fcbf09f
Author: David Tardon dtar...@redhat.com
Date:   Tue Aug 7 07:42:24 2012 +0200

drop leftover #include

Change-Id: Ib5afc4b5f77bb800eb3ab089b4dbb7a03c2f9f56

diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx 
b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 06a8c6d..4ce1e3f 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -29,7 +29,6 @@
 
 #include comphelper/processfactory.hxx
 #include osl/file.hxx
-#include xmlsec/base64.h
 #include rtl/ustrbuf.hxx
 #include sax/tools/converter.hxx
 #include rtl/strbuf.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [Libreoffice-qa] minutes of ESC call ...

2012-08-06 Thread Jochen

Hi David,

On Sat, Aug 04, 2012 at 10:02:14AM +0200, Jochen wrote:

can you please put the TOP problems/bgus with LO in LO3.6.0 on the
agenda for the next call (see e.g. [1]).
Am 06.08.2012 08:01, schrieb David Tardon:.

Sorry, but I do not uderstand your question. What purpose would that
serve? What should be the outcome of it?


Indeed the text I wrote is misleading. I mean particularly base, i.e. 
the right text is:
Can you please put the TOP problems/bgus with Base in LO3.6.0 on the 
agenda for the next call (see e.g. [1]).


I would suggest the following discussion:
1) Note that there are more or less big problems with Base - especially 
for Linux users.

2) Reminder that Base must not be forgotten.
3) Call a temporary focus to the development of base.
4) Clarification, how important is Base for the LO-project.

[1] https://bugs.freedesktop.org/show_bug.cgi?id=53115

Regards

Jochen
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/


Re: [Libreoffice-qa] minutes of ESC call ...

2012-08-06 Thread Rainer Bielefeld

David Tardon schrieb:


Sorry, but I do not understand your question. What purpose would that
serve? What should be the outcome of it?


Hi David,

currently there is some big excitement concerning Database bugs [1], 
mostly Report Builder  on disc...@de.libreoffice.org


Reports are mostly lousy bad, it will take some work (and so time) to 
figure out what exactly will have to be fixed.


Discussion in Mailing list shows nothing what  might need urgent action 
except Bug 52639, where currently much research is going on, because 
it's difficult to reproduce that problem.


I can report shortly in next Call, but I doubt that there can be done a 
lot. We simply need complete reports and manpower to fix known bugs.


There simply is a lot of ignorance  and misunderstanding on 
disc...@de.libreoffice.org, it seems they believe all developers are 
sitting around bored and need some pushing of German users so that they 
start working. I increasingly get into a bad mood seeing all that noise 
for nothing.


Best Regards

Rainer


Hyperlinks:
[1] 
https://bugs.freedesktop.org/buglist.cgi?bug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=CLOSEDbug_status=PLEASETESTcomponent=Databaselist_id=101774product=LibreOfficequery_format=advancedresolution=---short_desc=Report%20Buildershort_desc_type=allwordssubstrquery_based_on=columnlist=bug_status%2Cshort_desc%2Cversion%2Creporter%2Cassigned_to

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/


  1   2   3   >