[Libreoffice-commits] core.git: 4 commits - offapi/com offapi/UnoApi_offapi.mk package/inc vcl/source

[Noel Grandin]

 offapi/UnoApi_offapi.mk  |9 +-
 offapi/com/sun/star/graphic/SvgTools.idl |   11 ---
 offapi/com/sun/star/packages/zip/XZipFileAccess.idl  |4 -
 offapi/com/sun/star/packages/zip/XZipFileAccess2.idl |   45 
 offapi/com/sun/star/packages/zip/ZipFileAccess.idl   |   14 +--
 offapi/com/sun/star/rendering/MtfRenderer.idl|7 +
 package/inc/zipfileaccess.hxx|9 +-
 vcl/source/control/field2.cxx|2 
 vcl/source/filter/FilterConfigItem.cxx   |1 
 vcl/source/filter/graphicfilter.cxx  |   69 +--
 vcl/source/gdi/gdimtf.cxx|   67 --
 vcl/source/gdi/impimagetree.cxx  |9 +-
 vcl/source/gdi/svgdata.cxx   |   12 +--
 13 files changed, 141 insertions(+), 118 deletions(-)

New commits:
commit ae0cb395d8e2b887054e5cfd4fc5525a94fab240
Author: Noel Grandin n...@peralex.com
Date:   Tue May 7 08:07:01 2013 +0200

fdo#46808, Convert ZipFileAccess service to new style

Dropped XComponent from merged interface because noone is using it.

Change-Id: Id22c49e63679f42d86f617a919fdfd7cea4d5381

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index de96093..8022e5e 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -243,6 +243,9 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/packages/m
ManifestReader \
ManifestWriter \
 ))
+$(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/packages/zip,\
+   ZipFileAccess \
+))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/plugin,\
PluginManager \
 ))
@@ -969,9 +972,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/package
PackageFolderEnumeration \
PackageStream \
 ))
-$(eval $(call 
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages/zip,\
-   ZipFileAccess \
-))
 $(eval $(call 
gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\
ChartShape \
CustomPresentation \
@@ -2879,6 +2879,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/manifes
 ))
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/packages/zip,\
XZipFileAccess \
+   XZipFileAccess2 \
ZipConstants \
ZipEntry \
ZipException \
diff --git a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl 
b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
index b80417c..24cc313 100644
--- a/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
+++ b/offapi/com/sun/star/packages/zip/XZipFileAccess.idl
@@ -19,10 +19,10 @@
 #ifndef __com_sun_star_packages_zip_XZipFileAccess_idl__
 #define __com_sun_star_packages_zip_XZipFileAccess_idl__
 
-#include com/sun/star/uno/XInterface.idl
-#include com/sun/star/packages/zip/ZipEntry.idl
 #include com/sun/star/container/NoSuchElementException.idl
+#include com/sun/star/io/XInputStream.idl
 #include com/sun/star/io/IOException.idl
+#include com/sun/star/uno/XInterface.idl
 
 
 
diff --git a/offapi/com/sun/star/packages/zip/XZipFileAccess2.idl 
b/offapi/com/sun/star/packages/zip/XZipFileAccess2.idl
new file mode 100644
index 000..796ecf4
--- /dev/null
+++ b/offapi/com/sun/star/packages/zip/XZipFileAccess2.idl
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_packages_zip_XZipFileAccess2_idl__
+#define __com_sun_star_packages_zip_XZipFileAccess2_idl__
+
+#include com/sun/star/packages/zip/XZipFileAccess.idl
+#include com/sun/star/container/XNameAccess.idl
+
+
+module com {  module sun {  module star {   module packages {  module zip {
+
+
+/**
+Merged interface for ZipFileAccess service.
+@since LibreOffice 4.1
+ */
+interface XZipFileAccess2
+{
+interface XZipFileAccess;
+interface com::sun::star::container::XNameAccess;
+
+};
+
+
+}; }; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git 

[Libreoffice-commits] core.git: scp2/source

[Stephan Bergmann]

 scp2/source/python/file_python.scp |8 
 1 file changed, 8 insertions(+)

New commits:
commit b1e88b0dd52e01076ec833c998b90f8cb733b896
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 8 08:44:50 2013 +0200

Force create the symlinks-only dirs

Change-Id: I4610a2ff5bebd50dd2ee0020b575490c6c490968

diff --git a/scp2/source/python/file_python.scp 
b/scp2/source/python/file_python.scp
index 1c75490..761b5f6 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -134,41 +134,49 @@ End
 Directory gid_Dir_PythonFramework
 ParentID = gid_Brand_Dir_Program;
 HostName = LibreOfficePython.framework;
+Styles = (CREATE);
 End
 
 Directory gid_Dir_PythonFramework_Versions
 ParentID = gid_Dir_PythonFramework;
 HostName = Versions;
+Styles = (CREATE);
 End
 
 Directory gid_Dir_PythonFramework_Versions_ver
 ParentID = gid_Dir_PythonFramework_Versions;
 HostName = STRING(PYMAJMIN);
+Styles = (CREATE);
 End
 
 Directory gid_Dir_PythonFramework_Versions_ver_bin
 ParentID = gid_Dir_PythonFramework_Versions_ver;
 HostName = bin;
+Styles = (CREATE);
 End
 
 Directory gid_Dir_PythonFramework_Versions_ver_lib
 ParentID = gid_Dir_PythonFramework_Versions_ver;
 HostName = lib;
+Styles = (CREATE);
 End
 
 Directory gid_Dir_PythonFramework_Versions_ver_lib_pkgconfig
 ParentID = gid_Dir_PythonFramework_Versions_ver_lib;
 HostName = pkgconfig;
+Styles = (CREATE);
 End
 
 Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver
 ParentID = gid_Dir_PythonFramework_Versions_ver_lib;
 HostName = STRING(CONCAT2(python,PYMAJMIN));
+Styles = (CREATE);
 End
 
 Directory gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config
 ParentID = gid_Dir_PythonFramework_Versions_ver_lib_pythonver;
 HostName = STRING(CONCAT3(config-,PYMAJMIN,m));
+Styles = (CREATE);
 End
 
 Unixlink gid_Unixlink_Python_Headers
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/Jar.mk |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c7b423d0fd69fbbd6fc5febc55463e28e8bb4546
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 8 09:06:47 2013 +0200

Do not add unoil.jar to manifest Class-Path

...it must implicitly be loaded by the UNO type manager classloader anyway 
(via
URE_MORE_JAVA_TYPES), so not explicitly mentioning it can help find problems
early should it /not/ already be loaded by the type manager classloader.

Change-Id: I35b4f2804b68a35682e93699840101a15317a096

diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 17dfd3d..9e9c83f 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -217,8 +217,9 @@ $$(call gb_Output_error,\
  gb_Jar_add_jar: use gb_Jar_use_jar instead.)
 endef
 
-# URE jars are not added to manifest classpath
-gb_Jar_default_jars := $(gb_Jar_URE)
+# URE jars are not added to manifest classpath; and neither is unoil.jar, which
+# is available at runtime via URE_MORE_JAVA_TYPES:
+gb_Jar_default_jars := $(gb_Jar_URE) unoil
 
 # remember: classpath is inherited to ClassSet
 define gb_Jar_use_jar
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sfx2/source

[Andras Timar]

 sfx2/source/appl/sfxhelp.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b8dd48c73c0d6978913e93af8ea8e0fae0b2c190
Author: Andras Timar ati...@suse.com
Date:   Tue May 7 21:01:30 2013 +0200

fdo#64211 replace %2F to / in online (wiki) help URLs

It is not possible to create wiki pages with URLs that have %2F in
them. Help URLs contain %2F, when invoked from dialogs that are
based on .ui files, it seems this is the new HID syntax.

For example for Zoom dialog LibreOffice used to call
http://help.libreoffice.org/simpress/cui%2Fui%2Fzoomdialog%2Fzoomsb
and it did not work. Now it calls
http://help.libreoffice.org/simpress/cui/ui/zoomdialog/zoomsb
and it works.

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

Conflicts:

sfx2/source/appl/sfxhelp.cxx

Change-Id: I163cf8ec3b69f31eadbbd9085d2180839fe91e07

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index b2be3e3..4e7837c 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -660,6 +660,7 @@ static bool impl_showOnlineHelp( const String rURL )
 
 OUString aHelpLink( http://help.libreoffice.org/;  );
 aHelpLink += rURL.Copy( aInternal.Len() );
+aHelpLink = aHelpLink.replaceAll(%2F,/);
 try
 {
 Reference XSystemShellExecute  xSystemShell(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#64211 replace %2F to / in online (wiki) help URLs

[Miklos Vajna (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3817


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I163cf8ec3b69f31eadbbd9085d2180839fe91e07
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

[Libreoffice-commits] core.git: vcl/unx

[Stephan Bergmann]

 vcl/unx/gtk/app/gtkdata.cxx |1 -
 vcl/unx/gtk/app/gtkinst.cxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 98ba9ca066fcf8f1e576eac4bbd5731b4f810c74
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 8 09:53:33 2013 +0200

Revert avoid warnings about deprecated decls. from glib2

This reverts commit a206bc22623caba30c0285fda0fe0da8879efea3.  While 
removing
the GLIB_DISABLE_DEPRECATION_WARNINGS defines does not lead to problems at 
least
with my current Fedora 18 environment (and, according to dtardon, guessing 
by
the date, it was on f16 or f17 where that fix was relevant), having the 
defines
does cause -Werror=unused-macros at least in one RHEL 6 environment.

So I'm reverting for now, in the hope that should any warnings re-appear, 
they
can be addressed by applying the recent s/-I/$IFLAGS/ approach to 
GTK_CFLAGS in
configure.ac.

Change-Id: I5a3e4efabb88eb06304dd8b9eee6d8867fd77be5

diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 59eb593..af7043a 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -30,7 +30,6 @@
 #include sys/types.h
 #include sys/time.h
 #endif
-#define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include unx/gtk/gtkdata.hxx
 #include unx/gtk/gtkinst.hxx
 #include unx/gtk/gtkframe.hxx
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 2172a9e..b8afc3b 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -21,7 +21,6 @@
 #include stack
 #include string.h
 #include osl/module.h
-#define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include unx/gtk/gtkdata.hxx
 #include unx/gtk/gtkinst.hxx
 #include unx/salobj.h
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/inc

[Stephan Bergmann]

 vcl/inc/unx/gtk/gtkdata.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 59f96e1736c14575aee7575e73b50e96cf467bb0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 8 10:04:51 2013 +0200

While I could swear that it worked yesterday

...to revert a206bc22623caba30c0285fda0fe0da8879efea3 avoid warnings about
deprecated decls. from glib2 in my Fedora 18 environment, it /does/ fail 
now
post 98ba9ca066fcf8f1e576eac4bbd5731b4f810c74 Revert 'avoid warnings about
deprecated decls. from glib2.'

Change-Id: I42d118c06665c976a26a2dbfedc31ca4c8bcf0cc

diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index d306a3c..702c764 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -21,6 +21,7 @@
 #define _VCL_GTKDATA_HXX
 
 #include prex.h
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include gdk/gdk.h
 #include gdk/gdkx.h
 #include gtk/gtk.h
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/sidebar' - icon-themes/galaxy icon-themes/hicontrast officecfg/registry svx/sdi sw/inc sw/sdi sw/source sw/uiconfig

[Oliver-Rainer Wittmann]

 icon-themes/galaxy/cmd/lc_fliphorizontal.png |binary
 icon-themes/galaxy/cmd/lc_flipvertical.png   |binary
 icon-themes/galaxy/cmd/sc_fliphorizontal.png |binary
 icon-themes/galaxy/cmd/sc_flipvertical.png   |binary
 icon-themes/hicontrast/cmd/lc_fliphorizontal.png |binary
 icon-themes/hicontrast/cmd/lc_flipvertical.png   |binary
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|   10 -
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   18 ++-
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |   26 
-
 svx/sdi/svx.sdi  |   28 
++---
 sw/inc/cmdid.h   |3 
 sw/sdi/_grfsh.sdi|   12 --
 sw/sdi/drawsh.sdi|   12 --
 sw/sdi/swriter.sdi   |   52 
--
 sw/source/ui/shells/drawsh.cxx   |   28 
+++--
 sw/source/ui/shells/grfsh.cxx|   11 --
 sw/uiconfig/sglobal/menubar/menubar.xml  |2 
 sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml |2 
 sw/uiconfig/sweb/menubar/menubar.xml |2 
 sw/uiconfig/swform/menubar/menubar.xml   |2 
 sw/uiconfig/swform/toolbar/graphicobjectbar.xml  |2 
 sw/uiconfig/swreport/menubar/menubar.xml |4 
 sw/uiconfig/swreport/toolbar/graphicobjectbar.xml|2 
 sw/uiconfig/swriter/menubar/menubar.xml  |2 
 sw/uiconfig/swriter/toolbar/graphicobjectbar.xml |2 
 sw/uiconfig/swxform/menubar/menubar.xml  |2 
 sw/uiconfig/swxform/toolbar/graphicobjectbar.xml |2 
 27 files changed, 73 insertions(+), 151 deletions(-)

New commits:
commit fdd548bb9acac6e5cab94533c7ea3a561801b09d
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Thu Apr 18 11:16:00 2013 +

Resolves: #i122026# adjust names of newly introduced UNO commands

correct uno:FlipHorizontal and uno:FlipVertical

(cherry picked from commit 1ea8067f70bb806aa501ea72686a950f1e5ee591)

Conflicts:
default_images/res/commandimagelist/lc_fliphorizontal.png
default_images/res/commandimagelist/lc_flipvertical.png
default_images/res/commandimagelist/lch_fliphorizontal.png
default_images/res/commandimagelist/lch_flipvertical.png
default_images/res/commandimagelist/sc_fliphorizontal.png
default_images/res/commandimagelist/sc_flipvertical.png
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
svx/sdi/svx.sdi
sw/inc/cmdid.h
sw/source/ui/shells/drawsh.cxx
sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml
sw/uiconfig/swform/toolbar/graphicobjectbar.xml
sw/uiconfig/swreport/toolbar/graphicobjectbar.xml
sw/uiconfig/swriter/toolbar/graphicobjectbar.xml
sw/uiconfig/swxform/toolbar/graphicobjectbar.xml

Change-Id: I2c646586d592eb1d703c6db07e4c913d858fdc47

diff --git a/icon-themes/galaxy/cmd/lc_fliphorizontal.png 
b/icon-themes/galaxy/cmd/lc_fliphorizontal.png
index cb30e42..67c5743 100644
Binary files a/icon-themes/galaxy/cmd/lc_fliphorizontal.png and 
b/icon-themes/galaxy/cmd/lc_fliphorizontal.png differ
diff --git a/icon-themes/galaxy/cmd/lc_flipvertical.png 
b/icon-themes/galaxy/cmd/lc_flipvertical.png
index 1657948..fd582af 100644
Binary files a/icon-themes/galaxy/cmd/lc_flipvertical.png and 
b/icon-themes/galaxy/cmd/lc_flipvertical.png differ
diff --git a/icon-themes/galaxy/cmd/sc_fliphorizontal.png 
b/icon-themes/galaxy/cmd/sc_fliphorizontal.png
index 294ab45..5487379 100644
Binary files a/icon-themes/galaxy/cmd/sc_fliphorizontal.png and 
b/icon-themes/galaxy/cmd/sc_fliphorizontal.png differ
diff --git a/icon-themes/galaxy/cmd/sc_flipvertical.png 
b/icon-themes/galaxy/cmd/sc_flipvertical.png
index c66e5a9..5fc16dc 100644
Binary files a/icon-themes/galaxy/cmd/sc_flipvertical.png and 
b/icon-themes/galaxy/cmd/sc_flipvertical.png differ
diff --git a/icon-themes/hicontrast/cmd/lc_fliphorizontal.png 
b/icon-themes/hicontrast/cmd/lc_fliphorizontal.png
index e6e1de0..7e36441 100644
Binary files a/icon-themes/hicontrast/cmd/lc_fliphorizontal.png and 
b/icon-themes/hicontrast/cmd/lc_fliphorizontal.png differ
diff --git a/icon-themes/hicontrast/cmd/lc_flipvertical.png 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1e/a8067f70bb806aa501ea72686a950f1e5ee591

[Caolán McNamara]

 1e/a8067f70bb806aa501ea72686a950f1e5ee591 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 07761ce1961aa30ecf16fb0ac0197ac00104e7fe
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 09:22:51 2013 +0100

Notes added by 'git notes add'

diff --git a/1e/a8067f70bb806aa501ea72686a950f1e5ee591 
b/1e/a8067f70bb806aa501ea72686a950f1e5ee591
new file mode 100644
index 000..29b6a33
--- /dev/null
+++ b/1e/a8067f70bb806aa501ea72686a950f1e5ee591
@@ -0,0 +1 @@
+merged as: fdd548bb9acac6e5cab94533c7ea3a561801b09d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4a/1dc6ee938563e4455a60cda8f4d7afdff550fd

[Caolán McNamara]

 4a/1dc6ee938563e4455a60cda8f4d7afdff550fd |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0d2b263a3c64f7d35e7ad22e72783fb8dc87f68f
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 09:25:00 2013 +0100

Notes added by 'git notes add'

diff --git a/4a/1dc6ee938563e4455a60cda8f4d7afdff550fd 
b/4a/1dc6ee938563e4455a60cda8f4d7afdff550fd
new file mode 100644
index 000..8140773
--- /dev/null
+++ b/4a/1dc6ee938563e4455a60cda8f4d7afdff550fd
@@ -0,0 +1 @@
+prefer: 0ece7f368b499a010e3ecf2ffa193c242f9a78db
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: rsc/source

[Julien Nabet]

 rsc/source/rscpp/cpp3.c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 039bfd3e517f75cf99eb8eb105d3b83692f6e484
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed May 8 00:22:55 2013 +0200

coverity#983096: Resource leak

Change-Id: I91c1d505ef0b0eb442bf76e4da66c95fa0e1bb2d
Reviewed-on: https://gerrit.libreoffice.org/3818
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
index df5a2c7..7dbdef9 100644
--- a/rsc/source/rscpp/cpp3.c
+++ b/rsc/source/rscpp/cpp3.c
@@ -194,6 +194,7 @@ int AddInclude( char* pIncStr )
 *incend++ = pIncPos;
 pIncPos   = strtok( NULL, ; );
 }
+free(pIncEnv);
 return( 1 );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 40/b65cda94f45a87e31006b4947eeff4a1818dc0

[Caolán McNamara]

 40/b65cda94f45a87e31006b4947eeff4a1818dc0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8a3000848b9d004710373d1b4d826d85f309a64f
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 09:27:37 2013 +0100

Notes added by 'git notes add'

diff --git a/40/b65cda94f45a87e31006b4947eeff4a1818dc0 
b/40/b65cda94f45a87e31006b4947eeff4a1818dc0
new file mode 100644
index 000..cc1db27
--- /dev/null
+++ b/40/b65cda94f45a87e31006b4947eeff4a1818dc0
@@ -0,0 +1 @@
+prefer: 0dc532bffcda35d15a4719c05bb258e470355b98
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Wizard Integration

[Stephan Bergmann]

On 05/02/2013 05:49 PM, Jorge Luis Roque Alvarez wrote:

Sorry, to bother you again, once i run make dev-install i get this

cannot process 
/mnt/Work/LOGIT/core/solver/unxlngi6.pro/xml/component/wizards/com/sun/star/wizards/calendar/calendar.component
make[1]: *** [/mnt/Work/LOGIT/core/workdir/unxlngi6.pro/Rdb/services.rdb] Error 
10
make[1]: *** Se borra el archivo 
«/mnt/Work/LOGIT/core/workdir/unxlngi6.pro/Rdb/services.rdb»
make[1]: *** Se espera a que terminen otras tareas
make: *** [build] Error 2


In your new wizards/Jar_calendar.mk (or whatever you called it), do you 
have a gb_Jar_set_componentfile line (similar to the one in 
wizards/Jar_web.mk)?  That should cause the generation of the 
presumably-missing-above 
/mnt/Work/LOGIT/core/solver/unxlngi6.pro/xml/component/wizards/com/sun/star/wizards/calendar/calendar.component 
from your new calendar.component file.


Stephan


Here is a description of the steps i follow before running make dev-install

1- Edit the file officecfg/registry/data/org/openoffice/Office/Common.xcu, here 
i include my code within the Wizard space:

node oor:name=m15 oor:op=replace install:module=writer
 prop oor:name=URL  oor:type=xs:string
   value 
service:com.sun.star.wizards.calendar.CallWizard?insert/value
 /prop
 prop oor:name=Title
   value xml:lang=en-US~Calendar.../value
 /prop
 prop oor:name=TargetName  oor:type=xs:string
   value _self/value
 /prop
 prop oor:name=ImageIdentifier  oor:type=xs:string
   value private:image/3216/value
 /prop
   /node

2- Then on wizards/com/sun/star/wizards/ put the source of my wizard wich is 
call calendar and rewrite the my component calendar.component:

component loader=com.sun.star.loader.Java2
 xmlns=http://openoffice.org/2010/uno-components;
   implementation
   name=com.sun.star.wizards.calendar.CallWizard$WizardImplementation
 service name=com.sun.star.wizards.calendar.CallWizard/
   /implementation
/component

3- Include it in postprocess/Rdb_services.mk, right below this line 
wizards/com/sun/star/wizards/web/web \ i put mine 
wizards/com/sun/star/wizards/calendar/calendar \

4- In wizards/com/sun/star/wizards/calendar/CallWizard.java i call my wizard.


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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 01/32cc18f59a802e2dfb986af9180ee3769cefb3

[Caolán McNamara]

 01/32cc18f59a802e2dfb986af9180ee3769cefb3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7ef67b7338d9fee8c77d85be942acf49b49d8dbb
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 09:26:02 2013 +0100

Notes added by 'git notes add'

diff --git a/01/32cc18f59a802e2dfb986af9180ee3769cefb3 
b/01/32cc18f59a802e2dfb986af9180ee3769cefb3
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/01/32cc18f59a802e2dfb986af9180ee3769cefb3
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: fpicker/source

[Tor Lillqvist]

 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 4d52f70467eadd09f61efa59a85a267dab0aa580
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Tue May 7 17:54:46 2013 +0300

Different fix for bnc#88

Use the same GUID in the file dialog for the FILESAVE_AUTOEXTENSION
case as for the FILESAVE_AUTOEXTENSION_SELECTION case. The former is
used when exporting to PDF. Exactly why using one GUID for the dialog
causes it to use the default folder as set by SetFolder(), and the
other not, I have no idea. Are the GUIDs we use arbitrary (and unique
to the OOo/LO codebase), or does either of them, or both, have some
magic meaning to Windows?

FILESAVE_AUTOEXTENSION is also used in other cases than exporting to
PDF. It remains to be seen whether this change will cause noticeable
behaviour change interpreted as a harmful regression. Or whether the
change of default folder for PDF export will do that, for that matter.

Change-Id: I135e4b2b2bc4dc70670919fb478196e27b55ac79

diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 0ebea7c..b6def5b 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -68,7 +68,6 @@ typedef ::comphelper::SequenceAsVector OUString  
TStringList;
 // Guids used for IFileDialog::SetClientGuid
 static const GUID CLIENTID_FILEDIALOG_SIMPLE= {0xB8628FD3, 0xA3F5, 
0x4845, 0x9B, 0x62, 0xD5, 0x1E, 0xDF, 0x97, 0xC4, 0x83};
 static const GUID CLIENTID_FILEDIALOG_OPTIONS   = {0x93ED486F, 0x0D04, 
0x4807, 0x8C, 0x44, 0xAC, 0x26, 0xCB, 0x6C, 0x5D, 0x36};
-static const GUID CLIENTID_FILESAVE = {0x3B2E2261, 0x402D, 
0x4049, 0xB0, 0xC0, 0x91, 0x13, 0xF8, 0x6E, 0x84, 0x7C};
 static const GUID CLIENTID_FILESAVE_PASSWORD= {0xC12D4F4C, 0x4D41, 
0x4D4F, 0x97, 0xEF, 0x87, 0xF9, 0x8D, 0xB6, 0x1E, 0xA6};
 static const GUID CLIENTID_FILESAVE_SELECTION   = {0x5B2482B3, 0x0358, 
0x4E09, 0xAA, 0x64, 0x2B, 0x76, 0xB2, 0xA0, 0xDD, 0xFE};
 static const GUID CLIENTID_FILESAVE_TEMPLATE= {0x9996D877, 0x20D5, 
0x424B, 0x9C, 0x2E, 0xD3, 0xB6, 0x31, 0xEC, 0xF7, 0xCE};
@@ -500,14 +499,11 @@ void 
VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I
 aGUID = CLIENTID_FILEDIALOG_OPTIONS;
 break;
 
-case css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION :
-aGUID = CLIENTID_FILESAVE;
-break;
-
 case 
css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD :
 aGUID = CLIENTID_FILESAVE_PASSWORD;
 break;
 
+case css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION :
 case 
css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION_SELECTION :
 aGUID = CLIENTID_FILESAVE_SELECTION;
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: o3tl/qa

[Julien Nabet]

 o3tl/qa/test-sorted_vector.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit dc5bb7dfa70967e3445e5427168e4103e86b129c
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed May 8 00:37:04 2013 +0200

coverity#983036/37/38: Resource leak

Change-Id: I8a2c079a60cc06ca82d9f516cf009359a0c083a7
Reviewed-on: https://gerrit.libreoffice.org/3819
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/o3tl/qa/test-sorted_vector.cxx b/o3tl/qa/test-sorted_vector.cxx
index 8e9e719..ee2e818 100644
--- a/o3tl/qa/test-sorted_vector.cxx
+++ b/o3tl/qa/test-sorted_vector.cxx
@@ -98,6 +98,7 @@ public:
 aVec.insert(p3);
 aVec.DeleteAndDestroyAll();
 CPPUNIT_ASSERT( aVec.size() == 0 );
+delete p4;
 }
 
 void testInsertRange()
@@ -131,6 +132,7 @@ public:
 
 CPPUNIT_ASSERT( aVec.lower_bound(p1) == aVec.begin() );
 CPPUNIT_ASSERT( aVec.lower_bound(p4) == aVec.end() );
+delete p4;
 }
 
 void testBasics_FindPtr()
@@ -239,6 +241,7 @@ public:
 
 aVec.DeleteAndDestroyAll();
 CPPUNIT_ASSERT( aVec.size() == 0 );
+delete p4;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] coverity#983096: Resource leak

[Noel Power (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3818

Approvals:
  Noel Power: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91c1d505ef0b0eb442bf76e4da66c95fa0e1bb2d
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[PUSHED] coverity#983036/37/38: Resource leak

[Noel Power (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3819

Approvals:
  Noel Power: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8a2c079a60cc06ca82d9f516cf009359a0c083a7
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[Libreoffice-commits] core.git: l10ntools/source

[Julien Nabet]

 l10ntools/source/xrmmerge.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 02beb614750eadc2de8ffc4bcd67ae286f9f0856
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed May 8 01:46:40 2013 +0200

coverity#982460: Explicit null dereferenced

Change-Id: I64d559603bff0d618dce72927566531296984d3c
Reviewed-on: https://gerrit.libreoffice.org/3823
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 8a8b856..8265b4a 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -381,11 +381,10 @@ XRMResMerge::XRMResMerge(
 sFilename( rFilename ) ,
 pResData( NULL )
 {
-if (!rMergeSource.isEmpty())
+if (!rMergeSource.isEmpty()  sLanguage.equalsIgnoreAsciiCase(ALL))
+{
 pMergeDataFile = new MergeDataFile(
 rMergeSource, sInputFileName, false);
-if( sLanguage.equalsIgnoreAsciiCase(ALL) )
-{
 aLanguages = pMergeDataFile-GetLanguages();
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] coverity#982460: Explicit null dereferenced

[Noel Power (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3823

Approvals:
  Noel Power: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I64d559603bff0d618dce72927566531296984d3c
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[Libreoffice-commits] core.git: extensions/source

[Julien Nabet]

 extensions/source/nsplugin/source/so_env.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9d85fe82bc26e19abdbfd516bad55f2453f3b5e8
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed May 8 01:10:29 2013 +0200

coverity#982973: Resource leak

Change-Id: I1ea51b29c3ad05016f42c215b71877cd8c3f92f4
Reviewed-on: https://gerrit.libreoffice.org/3821
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/extensions/source/nsplugin/source/so_env.cxx 
b/extensions/source/nsplugin/source/so_env.cxx
index 0e8b5f1..b275ad4 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -132,6 +132,7 @@ int nspluginOOoModuleHook (void** aResult)
 fprintf (stderr, Can't open myself '%s'\n, dlerror());
 return 1;
 }
+dlclose(dl_handle);
 
 Dl_info dl_info = { 0,0,0,0 };
 if(!dladdr((void *)nspluginOOoModuleHook, dl_info))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] coverity#982973: Resource leak

[Noel Power (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3821

Approvals:
  Noel Power: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ea51b29c3ad05016f42c215b71877cd8c3f92f4
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr
Gerrit-Reviewer: Noel Power noel.po...@suse.com

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

[PATCH] Remove code associated with psprint::CompatMetricOverride se...

[Noel Grandin (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3824

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/3824/1

Remove code associated with psprint::CompatMetricOverride service

We don't actually have any implementations of this service.

This service was introduced by
   commit 01cf48436df2cc3f01d1c57cc4348fc037ef
   Author: Kurt Zenker k...@openoffice.org
   Date:   Wed Jun 20 09:07:44 2007 +
   INTEGRATION: CWS compmetric (1.77.2); FILE MERGED
   2007/05/09 16:27:46 pl 1.77.2.2: #146890# algorithm is needed
   2007/05/09 12:13:59 pl 1.77.2.1: #146890# backwards compatibility 
service for metrics

Michael Stahl seems to think it was a Sun-internal hack introduced
for a specific customer.

Change-Id: I1b27778f827504c2adb0e27e8d7c0f0dedcaf940
---
M include/vcl/fontmanager.hxx
M include/vcl/print.hxx
M padmin/source/prtsetup.cxx
M sw/inc/IDocumentSettingAccess.hxx
M sw/source/core/doc/doc.cxx
M sw/source/filter/xml/xmlimp.cxx
M sw/source/ui/uno/SwXDocumentSettings.cxx
M vcl/generic/fontmanager/fontmanager.cxx
M vcl/generic/print/genpspgraphics.cxx
M vcl/inc/salprn.hxx
M vcl/source/gdi/print.cxx
11 files changed, 17 insertions(+), 265 deletions(-)



diff --git a/include/vcl/fontmanager.hxx b/include/vcl/fontmanager.hxx
index 05955f9..41cf2e2 100644
--- a/include/vcl/fontmanager.hxx
+++ b/include/vcl/fontmanager.hxx
@@ -284,8 +284,6 @@
 
 mutable FontCache*
m_pFontCache;
 
-mutable std::vector fontIDm_aOverrideFonts;
-
 OString getAfmFile( PrintFont* pFont ) const;
 OString getFontFile( PrintFont* pFont ) const;
 
@@ -343,8 +341,6 @@
 */
 bool addFontconfigDir(const OString rDirectory);
 
-bool readOverrideMetrics();
-
 std::setOString m_aPreviousLangSupportRequests;
 std::vectorOString m_aCurrentRequests;
 Timer m_aFontInstallerTimer;
@@ -371,9 +367,9 @@
 // returns the ids of all managed fonts. on pParser != NULL
 // all fonttype::Builtin type fonts are not listed
 // which do not occur in the PPD of pParser
-void getFontList( std::list fontID  rFontIDs, const PPDParser* pParser 
= NULL, bool bUseOverrideMetrics = false );
+void getFontList( std::list fontID  rFontIDs, const PPDParser* pParser 
= NULL );
 // get the font list and fast font info. see getFontList for pParser
-void getFontListWithFastInfo( std::list FastPrintFontInfo  rFonts, 
const PPDParser* pParser = NULL, bool bUseOverrideMetrics = false );
+void getFontListWithFastInfo( std::list FastPrintFontInfo  rFonts, 
const PPDParser* pParser = NULL );
 
 // get font info for a specific font
 bool getFontInfo( fontID nFontID, PrintFontInfo rInfo ) const;
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index c40e8bc..c0cb364 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -357,8 +357,6 @@
 voidSetErrorHdl( const Link rLink ) { maErrorHdl 
= rLink; }
 const Link GetErrorHdl() const { return maErrorHdl; }
 
-voidCompat_OldPrinterMetrics( bool bSet );
-
 /** checks the printer list and updates it necessary
 *
 *   sends a DataChanged event of type DATACHANGED_PRINTER
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 53d09ce..15c5fc5 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -650,7 +650,7 @@
 // fill to box
 PrintFontManager rFontManager = PrintFontManager::get();
 ::std::list FastPrintFontInfo  aFonts;
-rFontManager.getFontListWithFastInfo( aFonts, 
m_pParent-m_aJobData.m_pParser, false );
+rFontManager.getFontListWithFastInfo( aFonts, 
m_pParent-m_aJobData.m_pParser );
 ::std::list FastPrintFontInfo ::const_iterator it;
 ::boost::unordered_map OUString, int, OUStringHash  aToMap, aFromMap;
 for( it = aFonts.begin(); it != aFonts.end(); ++it )
diff --git a/sw/inc/IDocumentSettingAccess.hxx 
b/sw/inc/IDocumentSettingAccess.hxx
index 8214f1a..1203915 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -65,7 +65,6 @@
  CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME,
 
  UNIX_FORCE_ZERO_EXT_LEADING,
- USE_OLD_PRINTER_METRICS,
  TABS_RELATIVE_TO_INDENT,
  PROTECT_FORM,
  // #i89181#
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index c8e6c90..db23e35 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -181,7 +181,6 @@
 // #i68949#
 case CLIP_AS_CHARACTER_ANCHORED_WRITER_FLY_FRAME: return 
mbClipAsCharacterAnchoredWriterFlyFrames;
 case UNIX_FORCE_ZERO_EXT_LEADING: return mbUnixForceZeroExtLeading;
-case USE_OLD_PRINTER_METRICS: return mbOldPrinterMetrics;
 case TABS_RELATIVE_TO_INDENT : return mbTabRelativeToIndent;
 case PROTECT_FORM: 

Re: MAKE_RESTARTS interference with trap SIGINT

[Stephan Bergmann]

On 05/06/2013 07:03 AM, Norbert Thiebaud wrote:

I have a wrapper script around a make fo LO (tinderbox scripting)... I
have added soem refinement so that it handle gracefully a Ctrl-C while
it is running
to that effect I've installed a signal handler in bash using 'trap'
on, among other SIGINT
That was the shell script can detect that a build was aborted in the
middle of thing, and can take prophylactic actions... like notifying
gerrot or the tindebox server that that build has been 'aborted'

The gotcha is that the regular Makefile try first to make sure that
Makefile is up-to-date, and then re-start itself... it dies that
whether or not the Makefile is out-of-date...
but apparently make use SIGINT to do its restart... and that is
apparently picked-up by bash... so the result is that make make sure
that Makefile is up-to-date, and then... stop.
Not exactly a great thing for a tinderbox script :-)


But why should make use SIGINT to restart itself (for me, it just does 
an exec), and, more importantly, how should the parent shell process be 
able to pick that up?


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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5e/32abe48b0833e4e370507a1e74fbb1ba98b5e3

[Caolán McNamara]

 5e/32abe48b0833e4e370507a1e74fbb1ba98b5e3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3144a878461c96fc226dfd4673d86767aab4c24a
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 10:20:35 2013 +0100

Notes added by 'git notes add'

diff --git a/5e/32abe48b0833e4e370507a1e74fbb1ba98b5e3 
b/5e/32abe48b0833e4e370507a1e74fbb1ba98b5e3
new file mode 100644
index 000..b0a9b3b
--- /dev/null
+++ b/5e/32abe48b0833e4e370507a1e74fbb1ba98b5e3
@@ -0,0 +1 @@
+merged as: 46330e54bdbb103688b696fdacef1ea71db3a80f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: master start a JRE 7 even if the default JRE is 6

[Stephan Bergmann]

On 05/06/2013 07:25 AM, Jean-Baptiste Faure wrote:

What is weird, is that my default Java is Java 6 and LO is configured to
use Java 6. I have both OpenJDK 6 and OpenJDK 7 on my PC.


LO is configured to use Java 6:  for building (i.e., as a switch in 
your autogen.input) or at runtime (i.e., at Tools - Options... - 
LibreOffice - Advanced - Java options)?  The latter is preset via some 
code that tries to find the best JRE on your machine, so could easily 
pick a JRE 7 if you have installed both 6 and 7, even if you configured 
your LO build to compile against a JDK 6.



It seems that official builds (LO 4.0.3.3) does not start a JVM at
launch time.


Can depend on what (bundled) extensions are included, for example.

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

[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sfx2/source

[Andre Fischer]

 sfx2/source/sidebar/SidebarController.cxx |   22 +++---
 1 file changed, 7 insertions(+), 15 deletions(-)

New commits:
commit e3860a6db8d11da357932b393fe7cc8a7f0684b3
Author: Andre Fischer a...@apache.org
Date:   Fri Apr 19 14:27:16 2013 +

Resolves: #i122104# Fixed selection of sidebar button.

(cherry picked from commit 8d956f9ec332f818fbe49286ba8eec28179486f2)

Change-Id: If87b0dd13d1d333212d41f0a1e1122e4ef6c5ab2

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 55a384e..887e245 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -59,6 +59,7 @@ using namespace cssu;
 using ::rtl::OUString;
 
 
+#undef VERBOSE
 
 namespace sfx2 { namespace sidebar {
 
@@ -149,7 +150,6 @@ void SAL_CALL SidebarController::disposing (void)
 if (mpCurrentDeck)
 {
 mpCurrentDeck-Dispose();
-OSL_TRACE(deleting deck window subtree);
 mpCurrentDeck-PrintWindowTree();
 mpCurrentDeck.reset();
 }
@@ -256,7 +256,7 @@ void SidebarController::NotifyResize (void)
 mnSavedSidebarWidth = nWidth;
 
 RestrictWidth();
-#ifdef DEBUG
+#ifdef VERBOSE
 if (mpCurrentDeck)
 {
 mpCurrentDeck-PrintWindowTree();
@@ -315,6 +315,10 @@ void SidebarController::UpdateConfigurations (const 
Context rContext)
 {
 msCurrentDeckId = pDeckDescriptor-msId;
 SwitchToDeck(*pDeckDescriptor, rContext);
+
+// Tell the tab bar to highlight the button associated
+// with the deck.
+mpTabBar-HighlightDeck(msCurrentDeckId);
 }
 
 #ifdef DEBUG
@@ -439,7 +443,6 @@ void SidebarController::SwitchToDeck (
 {
 // Panel already exists in current deck.  Reuse it.
 aNewPanels[nWriteIndex] = *iPanel;
-OSL_TRACE(reusing panel %s, 
S2A(rPanelContexDescriptor.msId));
 }
 else
 {
@@ -448,7 +451,6 @@ void SidebarController::SwitchToDeck (
 rPanelContexDescriptor.msId,
 mpCurrentDeck-GetPanelParentWindow(),
 rPanelContexDescriptor.msMenuCommand);
-OSL_TRACE(creating panel %s, 
S2A(rPanelContexDescriptor.msId));
 bHasPanelSetChanged = true;
 }
 if (aNewPanels[nWriteIndex] != NULL)
@@ -471,10 +473,6 @@ void SidebarController::SwitchToDeck (
 mpCurrentDeck-SetPanels(aNewPanels);
 mpCurrentDeck-Show();
 
-// Tell the tab bar to highlight the button associated with the
-// deck.
-mpTabBar-HighlightDeck(rDeckDescriptor.msId);
-
 mpParentWindow-SetText(rDeckDescriptor.msTitle);
 
 if (bHasPanelSetChanged)
@@ -493,7 +491,7 @@ bool SidebarController::ArePanelSetsEqual (
 const SharedPanelContainer rCurrentPanels,
 const ResourceManager::PanelContextDescriptorContainer rRequestedPanels)
 {
-#ifdef DEBUG
+#ifdef VERBOSE
 OSL_TRACE(current panel list:);
 for (SharedPanelContainer::const_iterator
  iPanel(rCurrentPanels.begin()),
@@ -539,12 +537,6 @@ SharedPanel SidebarController::CreatePanel (
 if (pPanelDescriptor == NULL)
 return SharedPanel();
 
-#ifdef DEBUG
-// Prevent the panel not being created in the same memory of an old panel.
-::boost::scoped_arraychar pUnused (new char[sizeof(Panel)]);
-OSL_TRACE(allocated memory at %x, pUnused.get());
-#endif
-
 // Create the panel which is the parent window of the UIElement.
 SharedPanel pPanel (new Panel(
 *pPanelDescriptor,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8d/956f9ec332f818fbe49286ba8eec28179486f2

[Caolán McNamara]

 8d/956f9ec332f818fbe49286ba8eec28179486f2 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a13687702cf89ad2f0f01a69e36600bf92be09d7
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 10:27:14 2013 +0100

Notes added by 'git notes add'

diff --git a/8d/956f9ec332f818fbe49286ba8eec28179486f2 
b/8d/956f9ec332f818fbe49286ba8eec28179486f2
new file mode 100644
index 000..96f6d7e
--- /dev/null
+++ b/8d/956f9ec332f818fbe49286ba8eec28179486f2
@@ -0,0 +1 @@
+merged as: e3860a6db8d11da357932b393fe7cc8a7f0684b3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/sidebar' - officecfg/registry

[Jürgen Schmidt]

 officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit bc95e32c38d79a654e75ac167b0b70f6e7e89b8d
Author: Jürgen Schmidt j...@apache.org
Date:   Fri Apr 19 16:35:12 2013 +

minor change in syntax to make localize happy

(cherry picked from commit e271ee33bd29cb8e5a7bbecdcdac71596ee2442f)

Change-Id: I2079c019575c32bca0323515e51ec166c36ef94e

diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs 
b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
index dc76c59..a5b9ee3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
@@ -17,13 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  --
 !DOCTYPE oor:component-schema SYSTEM ../../../../../component-schema.dtd
-oor:component-schema
-xmlns:oor=http://openoffice.org/2001/registry;
-xmlns:xs=http://www.w3.org/2001/XMLSchema;
-xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
-oor:name=Sidebar
-oor:package=org.openoffice.Office.UI
-xml:lang=en-US
+oor:component-schema xmlns:oor=http://openoffice.org/2001/registry; 
xmlns:xs=http://www.w3.org/2001/XMLSchema; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; oor:name=Sidebar 
oor:package=org.openoffice.Office.UI xml:lang=en-US
   info
 authorAndre Fischer/author
 descSpecification of decks and content panels of the sidebar./desc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e2/71ee33bd29cb8e5a7bbecdcdac71596ee2442f

[Caolán McNamara]

 e2/71ee33bd29cb8e5a7bbecdcdac71596ee2442f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cf0139371b85a0e5624a202d46a1746841eb3e93
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 10:28:18 2013 +0100

Notes added by 'git notes add'

diff --git a/e2/71ee33bd29cb8e5a7bbecdcdac71596ee2442f 
b/e2/71ee33bd29cb8e5a7bbecdcdac71596ee2442f
new file mode 100644
index 000..ac76376
--- /dev/null
+++ b/e2/71ee33bd29cb8e5a7bbecdcdac71596ee2442f
@@ -0,0 +1 @@
+merged as: bc95e32c38d79a654e75ac167b0b70f6e7e89b8d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 31/9bb8945e90f064d59813f2c9c64015bc993da6

[Caolán McNamara]

 31/9bb8945e90f064d59813f2c9c64015bc993da6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e66dede9bee82187088af4f799496451884c0a40
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 10:28:47 2013 +0100

Notes added by 'git notes add'

diff --git a/31/9bb8945e90f064d59813f2c9c64015bc993da6 
b/31/9bb8945e90f064d59813f2c9c64015bc993da6
new file mode 100644
index 000..fb061a6
--- /dev/null
+++ b/31/9bb8945e90f064d59813f2c9c64015bc993da6
@@ -0,0 +1 @@
+prefer: e3860a6db8d11da357932b393fe7cc8a7f0684b3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sfx2/source

[Andre Fischer]

 sfx2/source/sidebar/SidebarController.cxx |   28 
 sfx2/source/sidebar/SidebarController.hxx |6 +-
 2 files changed, 21 insertions(+), 13 deletions(-)

New commits:
commit c07c242be32d61d991522cd59e87e0922854614a
Author: Andre Fischer a...@apache.org
Date:   Mon Apr 22 15:01:51 2013 +

Resolves: #i122095# React asynchronously to context changes

In order to avoid problems in SFX2

(cherry picked from commit 61ed9eac0583e34a9b69f0a1adcc208509e336a1)

Change-Id: I375603a28e788ce9257be308dc09a589240d0e58

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 887e245..969cc04 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -91,6 +91,7 @@ SidebarController::SidebarController (
   maCurrentContext(OUString(), OUString()),
   msCurrentDeckId(A2S(PropertyDeck)),
   
maPropertyChangeForwarder(::boost::bind(SidebarController::BroadcastPropertyChange,
 this)),
+  
maContextChangeUpdate(::boost::bind(SidebarController::UpdateConfigurations, 
this)),
   mbIsDeckClosed(false),
   mnSavedSidebarWidth(pParentWindow-GetSizePixel().Width())
 {
@@ -167,10 +168,14 @@ void SAL_CALL SidebarController::disposing (void)
 void SAL_CALL SidebarController::notifyContextChangeEvent (const 
css::ui::ContextChangeEventObject rEvent)
 throw(cssu::RuntimeException)
 {
-UpdateConfigurations(
-Context(
-rEvent.ApplicationName,
-rEvent.ContextName));
+// Update to the requested new context asynchronously to avoid
+// subtle errors caused by SFX2 which in rare cases can not
+// properly handle a synchronous update.
+maRequestedContext = Context(
+rEvent.ApplicationName,
+rEvent.ContextName);
+if (maRequestedContext != maCurrentContext)
+maContextChangeUpdate.RequestCall();
 }
 
 
@@ -277,17 +282,17 @@ void SidebarController::NotifyResize (void)
 
 
 
-void SidebarController::UpdateConfigurations (const Context rContext)
+void SidebarController::UpdateConfigurations (void)
 {
-if (maCurrentContext != rContext)
+if (maCurrentContext != maRequestedContext)
 {
-maCurrentContext = rContext;
+maCurrentContext = maRequestedContext;
 
 // Notify the tab bar about the updated set of decks.
 ResourceManager::IdContainer aDeckIds;
 ResourceManager::Instance().GetMatchingDecks (
 aDeckIds,
-rContext,
+maCurrentContext,
 mxFrame);
 mpTabBar-SetDecks(aDeckIds);
 
@@ -308,13 +313,13 @@ void SidebarController::UpdateConfigurations (const 
Context rContext)
 
 DeckDescriptor const* pDeckDescriptor = NULL;
 if ( ! bCurrentDeckMatches)
-pDeckDescriptor = 
ResourceManager::Instance().GetBestMatchingDeck(rContext, mxFrame);
+pDeckDescriptor = 
ResourceManager::Instance().GetBestMatchingDeck(maCurrentContext, mxFrame);
 else
 pDeckDescriptor = 
ResourceManager::Instance().GetDeckDescriptor(msCurrentDeckId);
 if (pDeckDescriptor != NULL)
 {
 msCurrentDeckId = pDeckDescriptor-msId;
-SwitchToDeck(*pDeckDescriptor, rContext);
+SwitchToDeck(*pDeckDescriptor, maCurrentContext);
 
 // Tell the tab bar to highlight the button associated
 // with the deck.
@@ -327,7 +332,7 @@ void SidebarController::UpdateConfigurations (const 
Context rContext)
 {
 DeckTitleBar* pTitleBar = mpCurrentDeck-GetTitleBar();
 if (pTitleBar != NULL)
-pTitleBar-SetTitle(msCurrentDeckTitle+A2S( 
()+rContext.msContext+A2S()));
+pTitleBar-SetTitle(msCurrentDeckTitle+A2S( 
()+maCurrentContext.msContext+A2S()));
 }
 #endif
 }
@@ -861,7 +866,6 @@ bool SidebarController::CanModifyChildWindowWidth (void) 
const
 SfxSplitWindow* pSplitWindow = 
dynamic_castSfxSplitWindow*(mpParentWindow-GetParent());
 if (pSplitWindow == NULL)
 {
-OSL_ASSERT(pSplitWindow!=NULL);
 return 0;
 }
 
diff --git a/sfx2/source/sidebar/SidebarController.hxx 
b/sfx2/source/sidebar/SidebarController.hxx
index 38ce50b..4ae0f7d 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -107,9 +107,11 @@ private:
 ::boost::scoped_ptrTabBar mpTabBar;
 cssu::Referencecss::frame::XFrame mxFrame;
 Context maCurrentContext;
+Context maRequestedContext;
 ::rtl::OUString msCurrentDeckId;
 ::rtl::OUString msCurrentDeckTitle;
 AsynchronousCall maPropertyChangeForwarder;
+AsynchronousCall maContextChangeUpdate;
 bool mbIsDeckClosed;
 /** Before the deck is closed the sidebar width is saved into this 
variable,
 so that it can be restored when the deck is reopended.
@@ -118,7 +120,9 @@ private:
 FocusManager 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 61/ed9eac0583e34a9b69f0a1adcc208509e336a1

[Caolán McNamara]

 61/ed9eac0583e34a9b69f0a1adcc208509e336a1 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 775c82105214ec16064ec34f4f8da822e1686981
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 10:38:16 2013 +0100

Notes added by 'git notes add'

diff --git a/61/ed9eac0583e34a9b69f0a1adcc208509e336a1 
b/61/ed9eac0583e34a9b69f0a1adcc208509e336a1
new file mode 100644
index 000..4d7f2fd
--- /dev/null
+++ b/61/ed9eac0583e34a9b69f0a1adcc208509e336a1
@@ -0,0 +1 @@
+merged as: c07c242be32d61d991522cd59e87e0922854614a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: rsc/source

[Noel Power]

 rsc/source/rscpp/cpp3.c |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 56fa2d1bed5b19af79e31db9065f1a05e6202764
Author: Noel Power noel.po...@suse.com
Date:   Wed May 8 10:48:10 2013 +0100

Revert coverity#983096: Resource leak

This reverts commit 039bfd3e517f75cf99eb8eb105d3b83692f6e484.

diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
index 7dbdef9..df5a2c7 100644
--- a/rsc/source/rscpp/cpp3.c
+++ b/rsc/source/rscpp/cpp3.c
@@ -194,7 +194,6 @@ int AddInclude( char* pIncStr )
 *incend++ = pIncPos;
 pIncPos   = strtok( NULL, ; );
 }
-free(pIncEnv);
 return( 1 );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cppuhelper/source

[Stephan Bergmann]

 cppuhelper/source/defaultbootstrap.cxx |9 -
 cppuhelper/source/servicemanager.hxx   |6 +++---
 cppuhelper/source/typemanager.cxx  |6 --
 cppuhelper/source/typemanager.hxx  |4 +++-
 4 files changed, 14 insertions(+), 11 deletions(-)

New commits:
commit 4e42ce3271154904b7478b9ed5e6e6856b9235c2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 8 12:29:53 2013 +0200

Don't call code in UNO object ctor that throws UNO exceptions

...with Context set to this, that leads to refcounting bugs.

Change-Id: I4875dbe4ccb5a7bcfaa8370b14d4eab83c21d0e5

diff --git a/cppuhelper/source/defaultbootstrap.cxx 
b/cppuhelper/source/defaultbootstrap.cxx
index fc790ba..ff833896 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -56,11 +56,10 @@ 
cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const  iniUri)
 css::uno::Reference css::uno::XInterface ());
 }
 rtl::Reference cppuhelper::ServiceManager  smgr(
-new cppuhelper::ServiceManager(
-getBootstrapVariable(bs, UNO_SERVICES)));
-rtl::Reference cppuhelper::TypeManager  tmgr(
-new cppuhelper::TypeManager(
-getBootstrapVariable(bs, UNO_TYPES)));
+new cppuhelper::ServiceManager);
+smgr-init(getBootstrapVariable(bs, UNO_SERVICES));
+rtl::Reference cppuhelper::TypeManager  tmgr(new 
cppuhelper::TypeManager);
+tmgr-init(getBootstrapVariable(bs, UNO_TYPES));
 cppu::ContextEntry_Init entry;
 std::vector cppu::ContextEntry_Init  context_values;
 context_values.push_back(
diff --git a/cppuhelper/source/servicemanager.hxx 
b/cppuhelper/source/servicemanager.hxx
index b57891e..78359a2 100644
--- a/cppuhelper/source/servicemanager.hxx
+++ b/cppuhelper/source/servicemanager.hxx
@@ -129,13 +129,13 @@ public:
 ImplementationMap singletons;
 };
 
-explicit ServiceManager(rtl::OUString const  rdbUris):
-ServiceManagerBase(*static_cast osl::Mutex * (this))
-{ readRdbs(rdbUris); }
+ServiceManager(): ServiceManagerBase(*static_cast osl::Mutex * (this)) {}
 
 using ServiceManagerBase::acquire;
 using ServiceManagerBase::release;
 
+void init(rtl::OUString const  rdbUris) { readRdbs(rdbUris); }
+
 void setContext(
 css::uno::Reference css::uno::XComponentContext  const  context)
 {
diff --git a/cppuhelper/source/typemanager.cxx 
b/cppuhelper/source/typemanager.cxx
index c4f4cbc..6f7cd89 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -1863,10 +1863,12 @@ void Enumeration::findNextMatch() {
 
 }
 
-cppuhelper::TypeManager::TypeManager(rtl::OUString const  rdbUris):
+cppuhelper::TypeManager::TypeManager():
 TypeManager_Base(*static_cast osl::Mutex * (this)),
 manager_(new unoidl::Manager)
-{
+{}
+
+void cppuhelper::TypeManager::init(rtl::OUString const  rdbUris) {
 readRdbs(rdbUris);
 }
 
diff --git a/cppuhelper/source/typemanager.hxx 
b/cppuhelper/source/typemanager.hxx
index 5488aea..a1a2108 100644
--- a/cppuhelper/source/typemanager.hxx
+++ b/cppuhelper/source/typemanager.hxx
@@ -51,11 +51,13 @@ TypeManager_Base;
 
 class TypeManager: private osl::Mutex, public TypeManager_Base {
 public:
-explicit TypeManager(rtl::OUString const  rdbUris);
+TypeManager();
 
 using TypeManager_Base::acquire;
 using TypeManager_Base::release;
 
+void init(rtl::OUString const  rdbUris);
+
 css::uno::Any find(rtl::OUString const  name);
 
 css::uno::Reference css::reflection::XTypeDescription  resolve(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: autogen.sh

[Tor Lillqvist]

 autogen.sh |1 +
 1 file changed, 1 insertion(+)

New commits:
commit df4fd344b7b5d5dfb7cbf2f7a91ed6e86a2aaef8
Author: Tor Lillqvist t...@iki.fi
Date:   Wed May 8 13:35:04 2013 +0300

Make it a fatal error to pass unrecognized options to the configury

It might hurt a bit in the beginning if you have been careless with keeping
your autogen.input up-to-date, but I think this is a good idea.

Change-Id: I6b89c887c94755ac6ef50f63e0438ecec7157516

diff --git a/autogen.sh b/autogen.sh
index 0e61ee5..7b1b726 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -201,6 +201,7 @@ if (defined $ENV{NOCONFIGURE}) {
 }
 }
 push @args, --srcdir=$src_path;
+push @args, --enable-option-checking=fatal;
 
 print Running ./configure with ' . join (' ', @args), '\n;
 system (./configure, @args)  die Error running configure;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOffice-SDK for MinGW

[Helmar Spangenberg]

Hi Joachim!

Am Montag, 6. Mai 2013, 14:50:45 schrieb Joachim Langenbach:
 Dear Helmar and Kendy,
 
 I'm also trying to build the LibreOffice SDK with MinGW. Goal is to connect 
 an 
 application compiled with MinGW to LibreOffice on Windows, Linux and may be 
 other platforms. Since my attampts to cross compile LibreOffice are not very 
 successfully, I have two questions, before investing more time in that.

In case youare interested I can submit my MinGW development environment for LO 
--- the office
as stand-alone beast seems to work pretty well with some adjustments in the 
code (at
least as far I was able to test it...). Please contact me directly on my e-mail 
account, I think
there is too much code to be transferred via the list...

Difficulties arise as soon as the UNO-environment contacts the office and tries 
to get information
with regards to services and interfaces. To be very cautious: I have the 
feeling that the information
submitted by the office is correct, but somehow allocated memory in the UNO 
bridge seems to get
corrupted (under very special circumstances I was able to remote control the 
office to create a
new document...). Since the UNO-bridge is based on several threads my guess is 
that there is a
problem with thread-safe use of shared memory. Unfortunately, at the moment I 
am bound with a
money earning project, so my time for this issue is rather limited. However, I 
definitely will help in
any possible way to solve this problem.

 
  So far the MinGW build is still a very experimental thing; I mostly use
  that when I develop something Windows-only because I can still keep my
  workflow, but as the binaries built with the MinGW SDK will be
  incompatible with the LibreOffice release builds, I am not sure it makes
  much sense to invest effort in that at this stage.
 
 Does it mean, that an application linked against the MinGW SDK, could not 
 connect to a MSVC standard libreoffice installation?

Well, I use a 2 years old SDK (MinGW) which is able to connect to an 
off-the-shelf MS-LibreOffice.
Sure, there are some shortcomings (not all event listeners work properly), but 
for my application
it is sufficient.
 
 And second, what are the alternatives of using the SDK to connect to 
 LibreOffce 
 (if an compiler switch to MSVC is not wanted)? Ole connection may be used, 
 but 
 ole is not platform independent (or is it available under linux or MacOS?).

SDK and Linux is a dream - it simply works.
SDK and Windows is not so easy (I have problems to compile the SDK stuff under 
MSVC - however
my MSVC knowledge is rather small; I definitely would prefer MinGW).
A (Mac-addicted) colleague told me that the SDK for MacOS available half a year 
ago only contained
code for 32-Bit Macs, which does not work with recent 64-Bit machines/os'es. I 
don't know the actual
situation with regards to that issue, but I would expect that using the correct 
wordlength the MacOS-SDK
should be comparable to the Linux version.

Best wishes,
Helmar

 
 Are there any other possiblities or have the SDK or OLE connection some other 
 advantages and disadvantages?
 
 Kind regards,
 
 Joachim Langenbach
 ___
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/libreoffice
 
 

signature.asc
Description: This is a digitally signed message part.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

on extensions for LibreOffice

[Yamilka Leyva Coss]

-- 
I need to send the general structure of an extension, that is what I need to 
create an extension to any of LibreOffcie aplicacones.
¨´Caminante no hay Camino, se hace camino al andar ¨¨ 
http://www.uci.cu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: unoidl/README unoidl/source

[Stephan Bergmann]

 unoidl/README|  192 +++
 unoidl/source/unoidlprovider.cxx |  173 ---
 2 files changed, 192 insertions(+), 173 deletions(-)

New commits:
commit 959fb9287dba87e4326532fd9093ced319734e4b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 8 12:52:59 2013 +0200

unoidl/README

Change-Id: Ied31816571842118eb00de96df82ecb06465a65d

diff --git a/unoidl/README b/unoidl/README
new file mode 100644
index 000..ed9ee25
--- /dev/null
+++ b/unoidl/README
@@ -0,0 +1,192 @@
+Support for the new UNOIDL types.rdb format
+
+...that replaces the old types.rdb format based on modules [[store]] and
+[[registry]].
+
+Library_unoidl contains the unoidl::Manager and unoidl::Provider 
implementations
+for both the new and the old types.rdb formats (unoidl::loadProvider tries both
+implementations in turn for a given file, so the old format is still supported
+transparently for now).
+
+Executable_reg2unoidl is a helper tool to convert from the old to the new
+types.rdb format.  It is currently used at build-time.  idlc still generates 
the
+old format, and any new-format files (used at build-time only, or included in
+installation sets in URE or program/types/ or as part of bundled extensions 
that
+are created during the build and not merely included as pre-built .oxt files)
+are explicitly generated via reg2unoidl.  The SDK is still designed to generate
+old-format files exclusively (especially, any non-bundled extensions will only
+contain old-format files for now; that allows to modify the new format further
+without having to worry about compatibility with multiple versions of that
+format).
+
+== Specification of the new UNOIDL types.rdb format ==
+
+Uses the following definitions:
+
+* UInt16: 2-byte value, LSB first
+* UInt32: 4-byte value, LSB first
+* UInt64: 8-byte value, LSB first
+* Offset: UInt32 value, counting bytes from start of file
+* NUL-Name: zero or more non-NUL US-ASCII bytes followed by a NUL byte
+* Len-Name: UInt32 number of characters, with 0x8000 bit 1, followed by 
that
+   many (- 0x8000) US-ASCII bytes
+* Idx-Name: either an Offset (with 0x8000 bit 0) of a Len-Name, or a
+   Len-Name
+* Entry: Offset of NUL-Name followed by Offset of payload
+* Map: zero or more Entries
+
+Layout of per-entry payload in the root or a module Map:
+
+* kind byte:
+** 0: module
+*** followed by:
+ UInt32 number N1 of entries of Map
+ N1 * Entry
+** otherwise:
+*** 0x80 bit: 1 if published
+*** 0x40 bit: 1 if deprecated
+*** 0x20 bit: flag (may only be 1 for certain kinds, see below)
+*** remaining bits:
+ 1: enum type
+* followed by:
+** UInt32 number N1 of members
+** N1 * tuple of:
+*** Offset of Idx-Name
+*** UInt32
+ 2: plain struct type (with base if flag is 1)
+* followed by:
+** if with base: Offset of Idx-Name
+** UInt32 number N1 of direct members
+** N1 * tuple of:
+*** Offset of Idx-Name name
+*** Offset of Idx-Name type
+ 3: polymorphic struct type template
+* followed by:
+** UInt32 number N1 of type parameters
+** N1 * Offset of Idx-Name
+** UInt32 number N2 of members
+** N2 * tuple of:
+*** kind byte: 0x01 bit is 1 if parameterized type
+*** Offset of Idx-Name name
+*** Offset of Idx-Name type
+ 4: exception type (with base if flag is 1)
+* followed by:
+** if with base: Offset of Idx-Name
+** UInt32 number N1 of direct members
+** N1 * tuple of:
+*** Offset of Idx-Name name
+*** Offset of Idx-Name type
+ 5: interface type
+* followed by:
+** UInt32 number N1 of direct mandatory bases
+** N1 * Offset of Idx-Name
+** UInt32 number N2 of direct optional bases
+** N2 * Offset of Idx-Name
+** UInt32 number N3 of direct attributes
+** N3 * tuple of:
+*** kind byte:
+ 0x02 bit: 1 if read-only
+ 0x01 bit: 1 if bound
+*** Offset of Idx-Name name
+*** Offset of Idx-Name type
+*** UInt32 number N4 of get exceptions
+*** N4 * Offset of Idx-Name
+*** UInt32 number N5 of set exceptions
+*** N5 * Offset of Idx-Name
+** UInt32 number N6 of direct methods
+** N6 * tuple of:
+*** Offset of Idx-Name name
+*** Offset of Idx-Name return type
+*** UInt32 number N7 of parameters
+*** N7 * tuple of:
+ direction byte: 0 for in, 1 for out, 2 for in-out
+ Offset of Idx-Name name
+ Offset of Idx-Name type
+*** UInt32 number N8 of exceptions
+*** N8 * Offset of Idx-Name
+ 6: typedef
+* followed by:
+** Offset of Idx-Name
+ 7: constant group
+* followed by:
+** UInt32 number N1 of entries of Map
+** N1 * Entry
+ 8: single-interface--based service (with default constructor if flag is 1)
+* followed by:
+** Offset of Idx-Name
+** if not with default constructor:
+*** UInt32 number N1 of constructors
+*** N1 

[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/window/layout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cb283d8f0766b3069aa20c8c825eefca29537d6f
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 12:12:19 2013 +0100

consider borderline outliers as outliers

Change-Id: I138cdcb29b4e38211feb9e2d6a81a6ecb1688084

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index c3935d9..4714f1e 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -351,7 +351,7 @@ static long getMaxNonOutlier(const std::vectorlong rG, 
long nAvgDimension)
 aEnd = rG.end(); aI != aEnd; ++aI)
 {
 long nPrimaryChildDimension = *aI;
-if (nPrimaryChildDimension = nAvgDimension * 1.5)
+if (nPrimaryChildDimension  nAvgDimension * 1.5)
 {
 nMaxDimensionNonOutlier = std::max(nPrimaryChildDimension,
 nMaxDimensionNonOutlier);
@@ -370,7 +370,7 @@ static std::vectorlong setButtonSizes(const 
std::vectorlong rG,
 aI != aEnd; ++aI)
 {
 long nPrimaryChildDimension = *aI;
-if (nPrimaryChildDimension = nAvgDimension * 1.5)
+if (nPrimaryChildDimension  nAvgDimension * 1.5)
 aVec.push_back(nMaxNonOutlier);
 else
 aVec.push_back(nPrimaryChildDimension);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: scp2/source wizards/Module_wizards.mk

[Javier Fernandez]

 scp2/source/ooo/file_ooo.scp |1 -
 wizards/Module_wizards.mk|1 -
 2 files changed, 2 deletions(-)

New commits:
commit 41f89d2236e20c9c92c9e1267d5841e7dfd92d5b
Author: Javier Fernandez jfernan...@igalia.com
Date:   Wed May 8 10:21:27 2013 +

PyWebWizard: Removed the Jar_web, relaced by the python version.

Change-Id: Ia76a2d4ce93bf338c6ca22fd2cd991b42c195ae4

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index dffee3e..d3f596fe 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -315,7 +315,6 @@ STD_JAR_FILE( gid_File_Jar_Smoketest, smoketest )
 STD_JAR_FILE( gid_File_Jar_Table, table )
 STD_JAR_FILE( gid_File_Jar_Form, form )
 STD_JAR_FILE( gid_File_Jar_Query, query )
-STD_JAR_FILE( gid_File_Jar_Web, web )
 STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge )
 STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge )
 #endif
diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index 5d6c594..1e88f9a 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_Module_add_targets,wizards,\
Jar_report \
Jar_reportbuilder \
Jar_table \
-   Jar_web \
 ))
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa

[Caolán McNamara]

 sw/qa/core/data/ww8/pass/CVE-2012-4886-1.doc |binary
 1 file changed

New commits:
commit ec1bfc3f381fdec71810c800436b24ea5030023d
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 12:33:43 2013 +0100

test case for WPS Office CVE-2012-4886/EDB-25140

Change-Id: Ia4d6a4a2b6277fee6f59fa9407f9cf868ad0f1ce

diff --git a/sw/qa/core/data/ww8/pass/CVE-2012-4886-1.doc 
b/sw/qa/core/data/ww8/pass/CVE-2012-4886-1.doc
new file mode 100644
index 000..609e8f6
Binary files /dev/null and b/sw/qa/core/data/ww8/pass/CVE-2012-4886-1.doc differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: master start a JRE 7 even if the default JRE is 6

[Jonathan Aquilina]

Is it a good idea to support java 6 both jre and jdk as those have been end
of lifed, in terms of security patches etc?


On Wed, May 8, 2013 at 11:22 AM, Stephan Bergmann sberg...@redhat.comwrote:

 On 05/06/2013 07:25 AM, Jean-Baptiste Faure wrote:

 What is weird, is that my default Java is Java 6 and LO is configured to
 use Java 6. I have both OpenJDK 6 and OpenJDK 7 on my PC.


 LO is configured to use Java 6:  for building (i.e., as a switch in your
 autogen.input) or at runtime (i.e., at Tools - Options... - LibreOffice -
 Advanced - Java options)?  The latter is preset via some code that tries
 to find the best JRE on your machine, so could easily pick a JRE 7 if you
 have installed both 6 and 7, even if you configured your LO build to
 compile against a JDK 6.

  It seems that official builds (LO 4.0.3.3) does not start a JVM at
 launch time.


 Can depend on what (bundled) extensions are included, for example.

 Stephan
 __**_
 LibreOffice mailing list
 LibreOffice@lists.freedesktop.**org LibreOffice@lists.freedesktop.org
 http://lists.freedesktop.org/**mailman/listinfo/libreofficehttp://lists.freedesktop.org/mailman/listinfo/libreoffice




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

[Libreoffice-commits] core.git: download.lst libmwaw/libmwaw-0.1.7-misc.patch libmwaw/UnpackedTarball_libmwaw.mk

[Fridrich Štrba]

 download.lst   |4 -
 libmwaw/UnpackedTarball_libmwaw.mk |1 
 libmwaw/libmwaw-0.1.7-misc.patch   |  141 -
 3 files changed, 2 insertions(+), 144 deletions(-)

New commits:
commit 64afe19c704cb8e5c404d2e1692dc7274b36d635
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed May 8 14:18:10 2013 +0200

Uploading libmwaw 0.1.8

Change-Id: Id5e9ab64924ddc48921d0c028ede712b8cb3477d

diff --git a/download.lst b/download.lst
index 06da5ad..4ba7b08 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ CDR_MD5SUM := 75700c61b3a8e7d49a1f04c62048ff00
 export CDR_TARBALL := libcdr-0.0.13.tar.bz2
 MSPUB_MD5SUM := 881c4628ec5f54d47f35d5d19e335662
 export MSPUB_TARBALL := libmspub-0.0.5.tar.bz2
-MWAW_MD5SUM := 7c08542921466eee797e0be23e9535b3
-export MWAW_TARBALL := libmwaw-0.1.7.tar.bz2
+MWAW_MD5SUM := 7515f94bce7d8685561132ef858828b3
+export MWAW_TARBALL := libmwaw-0.1.8.tar.bz2
 VISIO_MD5SUM := 2f638cf6f92cec59c9205ac3cbf1702e
 export VISIO_TARBALL := libvisio-0.0.26.tar.bz2
 
diff --git a/libmwaw/UnpackedTarball_libmwaw.mk 
b/libmwaw/UnpackedTarball_libmwaw.mk
index 08a1d61..c9c149e 100644
--- a/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/libmwaw/UnpackedTarball_libmwaw.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
libmwaw/libmwaw-0.1.7-autotools.patch \
-   libmwaw/libmwaw-0.1.7-misc.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libmwaw/libmwaw-0.1.7-misc.patch b/libmwaw/libmwaw-0.1.7-misc.patch
deleted file mode 100644
index b40166b..000
--- a/libmwaw/libmwaw-0.1.7-misc.patch
+++ /dev/null
@@ -1,141 +0,0 @@
 a/src/lib/CWGraph.cxx
-+++ b/src/lib/CWGraph.cxx
-@@ -55,6 +55,8 @@
- 
- #include CWGraph.hxx
- 
-+#include libmwaw_internal.hxx
-+
- /** Internal: the structures of a CWGraph */
- namespace CWGraphInternal
- {
 a/src/lib/EDParser.cxx
-+++ b/src/lib/EDParser.cxx
-@@ -51,6 +51,8 @@
- #include MWAWRSRCParser.hxx
- #include MWAWSubDocument.hxx
- 
-+#include libmwaw_internal.hxx
-+
- #include EDParser.hxx
- 
- /** Internal: the structures of a EDParser */
-@@ -756,7 +758,7 @@ private:
- 
- bool DeflateStruct::sendDuplicated(int num, int depl)
- {
--  ssize_t readPos=ssize_t(m_circQueuePos)+ssize_t(depl);
-+  int64_t readPos=m_circQueuePos+depl;
-   while (readPos  0) readPos+=0x2000;
-   while (readPos = 0x2000) readPos-=0x2000;
- 
 a/src/lib/HMWKGraph.cxx
-+++ b/src/lib/HMWKGraph.cxx
-@@ -53,6 +53,8 @@
- 
- #include HMWKGraph.hxx
- 
-+#include libmwaw_internal.hxx
-+
- /** Internal: the structures of a HMWKGraph */
- namespace HMWKGraphInternal
- {
 a/src/lib/MSW1Parser.cxx
-+++ b/src/lib/MSW1Parser.cxx
-@@ -527,7 +527,7 @@ bool MSW1Parser::prepareTextZones()
- return false;
-   }
- 
--  std::maplong,MSW1ParserInternal::PLC::iterator plcIt = 
m_state-m_plcMap.begin();
-+  std::multimaplong,MSW1ParserInternal::PLC::iterator plcIt = 
m_state-m_plcMap.begin();
-   long pos = 0x80, prevMainPos=pos;
-   int actPage = 1;
-   int actType = 0;
-@@ -1216,7 +1216,7 @@ bool MSW1Parser::sendText(MWAWEntry const textEntry, 
bool isMain)
-   libmwaw::DebugStream f;
-   f  TextContent:;
-   int actFId=-1, actRId = -1, actPage=0;
--  std::maplong,MSW1ParserInternal::PLC::iterator plcIt = 
m_state-m_plcMap.begin();
-+  std::multimaplong,MSW1ParserInternal::PLC::iterator plcIt = 
m_state-m_plcMap.begin();
-   while (plcIt != m_state-m_plcMap.end()  plcIt-first  pos) {
- MSW1ParserInternal::PLC const plc = plcIt++-second;
- if (plc.m_type == MSW1ParserInternal::FONT)
 a/src/lib/MSWStruct.cxx
-+++ b/src/lib/MSWStruct.cxx
-@@ -1027,7 +1027,7 @@ void Paragraph::insert(Paragraph const para, bool 
insertModif)
-   for (size_t j = 0; j  m_tabs-size(); j++) {
- if (m_tabs.get()[j].m_position  val-1e-4 || 
m_tabs.get()[j].m_position  val+1e-4)
-   continue;
--m_tabs-erase (m_tabs-begin()+ssize_t(j));
-+m_tabs-erase (m_tabs-begin()+j);
- done = true;
- break;
-   }
 a/src/lib/MWAWPageSpan.cxx
-+++ b/src/lib/MWAWPageSpan.cxx
-@@ -236,7 +236,7 @@ void MWAWPageSpan::getPageProperty(WPXPropertyList 
propList) const
- 
-   propList.insert(fo:page-height, getFormLength());
-   propList.insert(fo:page-width, getFormWidth());
--  if (getFormOrientation() == MWAWPageSpan::MWAWPageSpan::LANDSCAPE)
-+  if (getFormOrientation() == LANDSCAPE)
- propList.insert(style:print-orientation, landscape);
-   else
- propList.insert(style:print-orientation, portrait);
 a/src/lib/WNParser.cxx
-+++ b/src/lib/WNParser.cxx
-@@ -336,7 +336,7 @@ bool WNParser::createZones()
-   } else if (!readDocEntries())
- return false;
- 
--  std::mapstd::string, WNEntry const *::const_iterator iter;
-+  std::multimapstd::string, WNEntry const *::const_iterator iter;
- 
-   // the Color map zone
-   iter = m_entryManager-m_typeMap.find(ColMap);
 a/src/lib/WNText.cxx
-+++ 

Re: Wizard Integration

[Jorge Luis Roque Alvarez]

Stephan,

first thanks for the replay, i already notice that, and inlude my 
Jar_calendar.mk and check it in Repository.mk after that my LO build ok. I 
already has the point of entrance in Writer(wizards/Calendar...) but when i 
click on it, it does nothing.. so it seems that my CallWizard class its not 
declared somewhere. What should i do to declare it?

best regards
jorge luis

- Mensaje original -
De: Stephan Bergmann sberg...@redhat.com
Para: Jorge Luis Roque Alvarez jlalva...@uci.cu
CC: libreoffice@lists.freedesktop.org
Enviados: Miércoles, 8 de Mayo 2013 4:32:46
Asunto: Re: Wizard Integration

On 05/02/2013 05:49 PM, Jorge Luis Roque Alvarez wrote:
 Sorry, to bother you again, once i run make dev-install i get this

 cannot process 
 /mnt/Work/LOGIT/core/solver/unxlngi6.pro/xml/component/wizards/com/sun/star/wizards/calendar/calendar.component
 make[1]: *** [/mnt/Work/LOGIT/core/workdir/unxlngi6.pro/Rdb/services.rdb] 
 Error 10
 make[1]: *** Se borra el archivo 
 «/mnt/Work/LOGIT/core/workdir/unxlngi6.pro/Rdb/services.rdb»
 make[1]: *** Se espera a que terminen otras tareas
 make: *** [build] Error 2

In your new wizards/Jar_calendar.mk (or whatever you called it), do you 
have a gb_Jar_set_componentfile line (similar to the one in 
wizards/Jar_web.mk)?  That should cause the generation of the 
presumably-missing-above 
/mnt/Work/LOGIT/core/solver/unxlngi6.pro/xml/component/wizards/com/sun/star/wizards/calendar/calendar.component
 
from your new calendar.component file.

Stephan

 Here is a description of the steps i follow before running make dev-install

 1- Edit the file officecfg/registry/data/org/openoffice/Office/Common.xcu, 
 here i include my code within the Wizard space:

 node oor:name=m15 oor:op=replace install:module=writer
  prop oor:name=URL  oor:type=xs:string
value 
 service:com.sun.star.wizards.calendar.CallWizard?insert/value
  /prop
  prop oor:name=Title
value xml:lang=en-US~Calendar.../value
  /prop
  prop oor:name=TargetName  oor:type=xs:string
value _self/value
  /prop
  prop oor:name=ImageIdentifier  oor:type=xs:string
value private:image/3216/value
  /prop
/node

 2- Then on wizards/com/sun/star/wizards/ put the source of my wizard wich is 
 call calendar and rewrite the my component calendar.component:

 component loader=com.sun.star.loader.Java2
  xmlns=http://openoffice.org/2010/uno-components;
implementation
name=com.sun.star.wizards.calendar.CallWizard$WizardImplementation
  service name=com.sun.star.wizards.calendar.CallWizard/
/implementation
 /component

 3- Include it in postprocess/Rdb_services.mk, right below this line 
 wizards/com/sun/star/wizards/web/web \ i put mine 
 wizards/com/sun/star/wizards/calendar/calendar \

 4- In wizards/com/sun/star/wizards/calendar/CallWizard.java i call my wizard.

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

[Libreoffice-commits] core.git: postprocess/Rdb_services.mk

[Stephan Bergmann]

 postprocess/Rdb_services.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit aec4128cccb1c16f793df065a31a98f3b112d256
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 8 14:30:11 2013 +0200

web.component was still duplicated

Change-Id: I72eb5abef7dd5f6eba251dafe344567d9ff0ef76

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 375a7c4..56a341d 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -240,7 +240,6 @@ $(eval $(call gb_Rdb_add_components,services,\
wizards/com/sun/star/wizards/query/query \
wizards/com/sun/star/wizards/report/report \
wizards/com/sun/star/wizards/table/table \
-   wizards/com/sun/star/wizards/web/web \
) \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Wizard Integration

[Stephan Bergmann]

On 05/08/2013 02:29 PM, Jorge Luis Roque Alvarez wrote:

first thanks for the replay, i already notice that, and inlude my 
Jar_calendar.mk and check it in Repository.mk after that my LO build ok. I 
already has the point of entrance in Writer(wizards/Calendar...) but when i 
click on it, it does nothing.. so it seems that my CallWizard class its not 
declared somewhere. What should i do to declare it?


Please make available your code, so we don't need to guess what's going 
wrong.


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

[Libreoffice-commits] core.git: Branch 'feature/gengal' - 2 commits - extras/Gallery_test.mk RepositoryExternal.mk solenv/gbuild

[David Tardon]

 RepositoryExternal.mk  |   14 +
 extras/Gallery_test.mk |   11 -
 solenv/gbuild/Gallery.mk   |  225 +
 solenv/gbuild/TargetLocations.mk   |2 
 solenv/gbuild/extensions/pre_BuildTools.mk |1 
 5 files changed, 159 insertions(+), 94 deletions(-)

New commits:
commit 8b9e4257782d5bfeac247f4baa4cb6d9ebfd6ae7
Author: David Tardon dtar...@redhat.com
Date:   Tue May 7 20:41:41 2013 +0200

gbuild: make Gallery work

Change-Id: Ia2914e24f03cdb3f24df30bf203a09d18f4a8fd4

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9a22c69..68aa4fb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2863,6 +2863,20 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\
 )
 endef
 
+define gb_Executable__register_gengal.bin
+$(call gb_Executable_add_runtime_dependencies,gengal.bin,\
+   $(call gb_AllLangResTarget_get_target,ofa) \
+   $(call gb_Configuration_get_target,registry) \
+   $(call gb_Configuration_get_target,fcfg_langpack) \
+   $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
+   $(call gb_Library_get_target,vclplug_svp) \
+   $(call gb_Package_get_target_for_build,cppuhelper_unorc) \
+   $(call gb_Rdb_get_outdir_target_for_build,ure/services) \
+   $(call gb_UnoApi_get_target,offapi) \
+   $(call gb_UnoApi_get_target,udkapi) \
+)
+endef
+
 ifneq ($(SYSTEM_ICU),YES)
 
 define gb_Executable__register_gendict
diff --git a/extras/Gallery_test.mk b/extras/Gallery_test.mk
index c82d03c..67c8e91 100644
--- a/extras/Gallery_test.mk
+++ b/extras/Gallery_test.mk
@@ -7,12 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Gallery_Gallery,extras/source/gallery,gallery,Fun Gallery))
+$(eval $(call gb_Gallery_Gallery,test,extras/source/gallery,Fun Gallery))
 
-$(eval $(call gb_Gallery_add_files,extras/source/gallery, \
+$(eval $(call gb_Gallery_add_files,test,\
+   extras/source/gallery/apples.gif \
extras/source/gallery/bigapple.gif \
-   extras/source/gallery/sky.gif  \
-   extras/source/gallery/flower.gif   \
-   extras/source/gallery/apples.gif ))
+   extras/source/gallery/flower.gif \
+   extras/source/gallery/sky.gif \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 8508622..eae9b68 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -7,116 +7,152 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-.PHONY : $(call gb_Gallery_get_clean_target,%)
-$(call gb_Gallery_get_clean_target,%) :
-   $(call gb_Helper_abbreviate_dirs,\
-   rm -f $(call gb_Gallery_get_target,$*) $(call 
gb_Gallery_get_target,$*).log)
+# class Gallery
+
+# Handles creation of image galleries.
+
+gb_Gallery__UNO_COMPONENTS := \
+   comphelper/util/comphelp \
+   configmgr/source/configmgr \
+   fileaccess/source/fileacc \
+   framework/util/fwk \
+   i18npool/util/i18npool \
+   package/source/xstor/xstor \
+   package/util/package2 \
+   sfx2/util/sfx \
+   svx/util/svx \
+   svx/util/svxcore \
+   ucb/source/core/ucb1 \
+   ucb/source/ucp/file/ucpfile1 \
+   unoxml/source/service/unoxml
+
+gb_Gallery__UNO_TYPES := \
+   offapi \
+   udkapi
+
+# TODO: this should be in RepositoryExternal.mk, but it would lead to
+# duplication. Fix.
+gb_Gallery_EXTRA_DEPENCENCIES := \
+   $(foreach component,$(gb_Gallery__UNO_COMPONENTS),$(call 
gb_ComponentTarget_get_outdir_target_for_build,$(component))) \
+   $(foreach api,$(gb_Gallery__UNO_TYPES),$(call 
gb_UnoApi_get_target,$(api)))
+
+gb_Gallery_INSTDIR := share/gallery
+
+# BRAND_BASE_DIR is for resource files
+define gb_Gallery__make_env_args
+-env:BRAND_BASE_DIR=$(call 
gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/unittest/install) \
+-env:CONFIGURATION_LAYERS=xcsxcu:$(call 
gb_Helper_make_url,$(gb_Configuration_registry)) \
+   module:$(call gb_Helper_make_url,$(gb_Configuration_registry)/spool) \
+-env:UNO_SERVICES=$(call gb_Helper_make_url,$(call 
gb_Rdb_get_outdir_target_for_build,ure/services)) \
+   $(foreach item,$(gb_Gallery__UNO_COMPONENTS),\
+   $(call gb_Helper_make_url,$(call 
gb_ComponentTarget_get_outdir_target_for_build,$(item \
+-env:UNO_TYPES=$(foreach item,$(gb_Gallery__UNO_TYPES),\
+   $(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item \
+$(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\
+   -env:$(dir)=$(call gb_Helper_make_url,$(gb_Helper_OUTDIRLIBDIR)))
+endef
 
-.PHONY : $(call gb_Gallery_get_target,%)
-$(call gb_Gallery_get_target,%) :| $(call gb_Gallery_get_target,$(1))/$(2).thm
-   @echo foo
+define gb_Gallery__command
+$(call gb_Output_announce,$(2),$(true),GAL,1)
+$(call gb_Helper_abbreviate_dirs,\
+   rm -f $(call gb_Gallery_get_workdir,$(2))/*  \
+   SAL_USE_VCLPLUGIN=svp \
+   $(call 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 7 commits - sfx2/source solenv/unxmacxp svx/source

[Andre Fischer]

 sfx2/source/sidebar/ContextList.cxx   |   12 +
 sfx2/source/sidebar/ContextList.hxx   |5 
 sfx2/source/sidebar/Deck.cxx  |   52 +++-
 sfx2/source/sidebar/Deck.hxx  |1 
 sfx2/source/sidebar/Panel.cxx |   16 ++
 sfx2/source/sidebar/Panel.hxx |7 -
 sfx2/source/sidebar/ResourceManager.cxx   |   24 +++
 sfx2/source/sidebar/ResourceManager.hxx   |8 +
 sfx2/source/sidebar/SidebarController.cxx |   31 +++-
 sfx2/source/sidebar/SidebarController.hxx |5 
 sfx2/source/sidebar/TabBar.cxx|8 +
 sfx2/source/sidebar/TabBar.hxx|1 
 solenv/unxmacxp/inc/poll.h|  193 --
 svx/source/svdraw/svdfmtf.cxx |   98 +++
 14 files changed, 222 insertions(+), 239 deletions(-)

New commits:
commit f44ca372a2a88f996366e5cb44842ef79dd9df6e
Author: Andre Fischer a...@apache.org
Date:   Wed May 8 12:35:53 2013 +

122082: Show correct deck title and tab bar highlight after switching 
sidebar decks.

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 2552c88..6d6250d 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -390,7 +390,6 @@ void SidebarController::UpdateConfigurations (void)
 maCurrentContext,
 mbIsDocumentReadOnly,
 mxFrame);
-mpTabBar-SetDecks(aDecks);
 
 // Notify the tab bar about the updated set of decks.
 mpTabBar-SetDecks(aDecks);
@@ -422,13 +421,12 @@ void SidebarController::UpdateConfigurations (void)
 // We did not find a valid deck.
 RequestCloseDeck();
 return;
-
-// Tell the tab bar to highlight the button associated
-// with the deck.
-mpTabBar-HighlightDeck(sNewDeckId);
 }
 
-msCurrentDeckId = sNewDeckId;
+// Tell the tab bar to highlight the button associated
+// with the deck.
+mpTabBar-HighlightDeck(sNewDeckId);
+
 SwitchToDeck(
 *ResourceManager::Instance().GetDeckDescriptor(sNewDeckId),
 maCurrentContext);
commit 4a84ca3c6515bddb02a789d9386b6c6e74b037dc
Author: Andre Fischer a...@apache.org
Date:   Wed May 8 12:01:43 2013 +

122251: Avoid compiler warning.

diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 30f04a5..0521c7a 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -270,7 +270,7 @@ void TabBar::DataChanged (const DataChangedEvent 
rDataChangedEvent)
 
 
 
-long TabBar::Notify (NotifyEvent rEvent)
+long TabBar::Notify (NotifyEvent)
 {
 return sal_False;
 }
commit 2abab958f237c62abbd59b46b36354db60f23009
Author: Andre Fischer a...@apache.org
Date:   Wed May 8 11:57:24 2013 +

122251: Prevent key events from being forwarded from sidebar tab bar to 
Calc.

diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 0fcbb14..30f04a5 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -270,6 +270,14 @@ void TabBar::DataChanged (const DataChangedEvent 
rDataChangedEvent)
 
 
 
+long TabBar::Notify (NotifyEvent rEvent)
+{
+return sal_False;
+}
+
+
+
+
 RadioButton* TabBar::CreateTabItem (const DeckDescriptor rDeckDescriptor)
 {
 RadioButton* pItem = ControlFactory::CreateTabItem(this);
diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx
index 28684ac..6f18545 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -70,6 +70,7 @@ public:
 
 virtual void Paint (const Rectangle rUpdateArea);
 virtual void DataChanged (const DataChangedEvent rDataChangedEvent);
+virtual long Notify (NotifyEvent rEvent);
 
 static sal_Int32 GetDefaultWidth (void);
 
commit 945f56f22d6b0f3a30e179b7b853a2e2de751fb1
Author: Herbert Dürr h...@apache.org
Date:   Wed May 8 11:40:40 2013 +

poll.h has been available in OSX SDKs=10.3

even the macosxp target has a higher baseline than that

diff --git a/solenv/unxmacxp/inc/poll.h b/solenv/unxmacxp/inc/poll.h
deleted file mode 100644
index a978163..000
--- a/solenv/unxmacxp/inc/poll.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is 

Re: fdo#41572 Making it possible to add custom animation to master slides

[Janit Anjaria]

Hey Miklos!

I suppose i have used the correct header now ,and regarding the identation
i dont think there is any need of it here as the header file just declares
the functions used.I have made all the changes to the way the comments have
to be used and i am sure this learning process is going to help me on the
time to come working on this cool project.

And i am sure any kind of further suggestion will surely polish my skills
even on the formal part of the code.
( and yeah i have also started to work on the .cxx file that will
complement this header , and i will email it sometime over this week  :D )


Hope this finds you in good health.
Regards,
Janit


On Tue, May 7, 2013 at 3:01 PM, Miklos Vajna vmik...@suse.cz wrote:

 Hi Janit,

 On Tue, May 07, 2013 at 10:55:53AM +0530, Janit Anjaria jani...@gmail.com
 wrote:
  +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset:
 4 -*- */
  +/*
  + * This file is part of the LibreOffice project.
  + *
  + * This Source Code Form is subject to the terms of the Mozilla Public
  + * License, v. 2.0. If a copy of the MPL was not distributed with this
  + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  + *
  + * This file incorporates work covered by the following license notice:
  + *
  + *   Licensed to the Apache Software Foundation (ASF) under one or more
  + *   contributor license agreements. See the NOTICE file distributed
  + *   with this work for additional information regarding copyright
  + *   ownership. The ASF licenses this file to you under the Apache
  + *   License, Version 2.0 (the License); you may not use this file
  + *   except in compliance with the License. You may obtain a copy of
  + *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  + */

 Wrong header, for new code, the MPL2 header should be used, see
 TEMPLATE.SOURCECODE.HEADER (the license part of that header is only 4
 lines).

  +//This header basically will be complemented by a .cxx file which will
 be dealing with usage of the declared functions which can be extended so as
 to use the defined animation object(which we have declared).
  +namespace sd
  +{
  +class View;

 See https://wiki.documentfoundation.org/Development/Doxygen, you should
 use /// to make doxygen pick up documentation. Also: no indentation?

  +namespace tools
  +{
  +//adding a value to the STLPropertySet.
  +void addValue(STL Property Ser *pSet,Int32 nHandle,const Any rValue);

 Did you compile-test this STL Property Ser?

 Miklos

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




0001-fdo-41572-Making-it-possible-to-add-Custom-Animation.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

fdo#63311: Unable to delete text from Shape

[Muthu Subramanian K]

Hi,

I have attached a patch for fdo#63311 with this mail.

Basically, the patch makes sure there is no NULL text, but instead uses 
empty_text.


[empty_text seems to be the initialization text for the shape while NULL 
seems to be applied when the user removes the text]


I am not sure if this is the right fix - or should we be fixing the code 
which assumes text to be not null, please?


[I remember vaguely David removing the null places - not sure if this is 
related or if it was for something else]


Thanks a lot!
Muthu Subramanian


shape-text.diff
Description: application/mbox
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Wizard Integration

[Stephan Bergmann]

On 05/08/2013 03:48 PM, Jorge Luis Roque Alvarez wrote:

Here it goes ...


Sorry, that's not in a usable form.  From your previous mails, I 
understand that you add your calendar wizard code to the LO sources, and 
try to build it as part of LO.  So please provide your code as a git patch.


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

[Libreoffice-commits] core.git: 2 commits - solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/CppunitTest.mk |2 +-
 solenv/gbuild/PythonTest.mk  |2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6b6f51dceefc70f09e7ce8f34649b53591064723
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 8 16:02:45 2013 +0200

Set Valgrind-related env vars in PythonTest, too

Change-Id: Ic0eddb6f332bcf139a5de8b1bf4084cb111cd040

diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 9b450e7..eaa8757 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -38,6 +38,8 @@ $(call gb_PythonTest_get_target,%) :
$(if $(value gb_CppunitTest_postprocess), \
rm -fr $@.core  mkdir $@.core  cd $@.core 
)) \
($(gb_PythonTest_PRECOMMAND) \
+   $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
+   $(if 
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \

URE_BOOTSTRAP=vnd.sun.star.pathname:$(gb_DEVINSTALLROOT)/program/fundamentalrc \
PYTHONPATH=$(PYPATH) \
UserInstallation=$(call 
gb_Helper_make_url,$(OUTDIR)/unittest) \
commit 5f54e19ea489428e21b668fb390b82e7ed73e21a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 8 15:59:43 2013 +0200

valgrind --trace-children=yes

...at least needed for PythonTest on Linux with internal python, where the
valgrind'ed gb_Python_INSTALLED_EXECUTABLE is /bin/sh
$(gb_DEVINSTALLROOT)/program/python.  Also, remove --quiet again to avoid
frustration (when valgrind /is/ run, why doesn't it output any == lines 
at
all?).

Change-Id: Id83e53f2b472b5af92e4aaec0c173ecdec45bc48

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 3daa202..07dacbf 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -43,7 +43,7 @@ gb_CppunitTest__interactive := $(true)
 endif
 
 ifneq ($(strip $(VALGRIND)),)
-gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50 
--error-exitcode=1 --quiet --leak-check=no
+gb_CppunitTest_VALGRINDTOOL := valgrind --tool=$(VALGRIND) --num-callers=50 
--error-exitcode=1 --trace-children=yes --leak-check=no
 ifeq ($(strip $(VALGRIND)),memcheck)
 G_SLICE := always-malloc
 GLIBCXX_FORCE_NEW := 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Wizard Integration

[Jorge Luis Roque Alvarez]

Sorry, iam new on git, what command should i run on the core directory to 
generate the patch.
The attachment patch was generate with the below command

git git-patch -1

is it correct?

best regards
jorge luis

- Mensaje original -
De: Stephan Bergmann sberg...@redhat.com
Para: Jorge Luis Roque Alvarez jlalva...@uci.cu
CC: libreoffice@lists.freedesktop.org
Enviados: Miércoles, 8 de Mayo 2013 9:57:10
Asunto: Re: Wizard Integration

On 05/08/2013 03:48 PM, Jorge Luis Roque Alvarez wrote:
 Here it goes ...

Sorry, that's not in a usable form.  From your previous mails, I
understand that you add your calendar wizard code to the LO sources, and
try to build it as part of LO.  So please provide your code as a git patch.

Stephan
http://www.uci.cu

http://www.uci.cu

From 7885f9820d5d1ca80381bf88ea2be537874e5ad5 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens tbehr...@suse.com
Date: Wed, 3 Apr 2013 13:36:47 +0200
Subject: [PATCH] Make 10.6 sdk in XCode 4 setup work in configury.

Change-Id: Ia7393d177a24ec6d5e3c25e487a8d5ae96e3c02a
---
 configure.ac |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index f096cb3..cc24bf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2558,11 +2558,15 @@ if test $_os = Darwin; then
 CXX=${gccprefix}g++-4.0 $arch -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH
 ;;
 10.6)
-# Is similar logic as above needed? Is it likely somebody
-# has both an older Xcode with the 10.6 SDK and a current
-# Xcode?
-CC=gcc-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH
-CXX=g++-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH
+# did someone copy her 10.6 sdk into xcode 4 (needed on Mountain Lion)?
+if test $(echo $MACOSX_SDK_PATH | cut -c1-23) = /Applications/Xcode.app; then
+CC=`xcrun -find gcc` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH
+CXX=`xcrun -find g++` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH
+XCRUN=xcrun
+else
+CC=gcc-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH
+CXX=g++-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH
+fi
 ;;
 10.7|10.8)
 CC=`xcrun -find clang` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH
-- 
1.7.10.4

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

[PATCH] Solve fdo#64359 Duplicate template in list when overwriting ...

[Joren De Cuyper (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3825

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/3825/1

Solve fdo#64359 Duplicate template in list when overwriting existing template

This patch just ensures an updates/refreshed view when a duplicate template
is saved.

Change-Id: Iebe301216f3131db72ff97d2b81003eefc0b0dbf
---
M sfx2/source/doc/templatedlg.cxx
1 file changed, 4 insertions(+), 3 deletions(-)



diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index b7c4582..b06c706 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1056,11 +1056,10 @@
 OUString aTemplateList;
 INetURLObject aPathObj(xFolderPicker-getDirectory());
 aPathObj.setFinalSlash();
+sal_uInt16 i = 1;
 
 if (mpSearchView-IsVisible())
 {
-sal_uInt16 i = 1;
-
 std::setconst 
ThumbnailViewItem*,selection_cmp_fn::const_iterator pIter = 
maSelTemplates.begin();
 for (pIter = maSelTemplates.begin(); pIter != 
maSelTemplates.end(); ++pIter, ++i)
 {
@@ -1090,7 +1089,6 @@
 {
 // export templates from the current view
 
-sal_uInt16 i = 1;
 sal_uInt16 nRegionItemId = maView-getCurRegionItemId();
 
 std::setconst 
ThumbnailViewItem*,selection_cmp_fn::const_iterator pIter = 
maSelTemplates.begin();
@@ -1400,6 +1398,9 @@
 if (!aFolderList.isEmpty())
 {
 }
+
+//refresh view
+mpCurView-reload();
 }
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebe301216f3131db72ff97d2b81003eefc0b0dbf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a2/a4a6aac169fcf32884b3118efaf3336562bb8b

[Caolán McNamara]

 a2/a4a6aac169fcf32884b3118efaf3336562bb8b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit be81cb748e10e2701cfad7d5fac4bf9ae6928003
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 15:49:27 2013 +0100

Notes added by 'git notes add'

diff --git a/a2/a4a6aac169fcf32884b3118efaf3336562bb8b 
b/a2/a4a6aac169fcf32884b3118efaf3336562bb8b
new file mode 100644
index 000..483bbde
--- /dev/null
+++ b/a2/a4a6aac169fcf32884b3118efaf3336562bb8b
@@ -0,0 +1 @@
+merged as: cec37835ae6e67bfd571f09cc1ab579a9195e798
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/cppuhelper

[Herbert Dürr]

 include/cppuhelper/propertysetmixin.hxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 7725dddf05a9cbd3eb91d3bde45b22e4182b86dc
Author: Herbert Dürr h...@apache.org
Date:   Tue May 7 16:15:53 2013 +

fix signatures for copy-ctor and assignment for the propertysetmixin classes

the canonic way to disallow copy construction and assignment of an object
is to declare unimplemented methods for them taking const references.

(cherry picked from commit 0fabc9a7be629ca150e83b5b69dc5e44b4b2a476)

Conflicts:
cppuhelper/inc/cppuhelper/propertysetmixin.hxx

Change-Id: I7332d6eedaaf208f64cfe421983171ba436a4050

diff --git a/include/cppuhelper/propertysetmixin.hxx 
b/include/cppuhelper/propertysetmixin.hxx
index bbca3ac..83f8531 100644
--- a/include/cppuhelper/propertysetmixin.hxx
+++ b/include/cppuhelper/propertysetmixin.hxx
@@ -156,8 +156,8 @@ protected:
 void notify() const;
 
 private:
-BoundListeners(BoundListeners ); // not defined
-void operator =(BoundListeners); // not defined
+BoundListeners( const BoundListeners); // not defined
+void operator=( const BoundListeners); // not defined
 
 class Impl;
 Impl * m_impl;
@@ -378,8 +378,8 @@ protected:
 com::sun::star::uno::RuntimeException);
 
 private:
-PropertySetMixinImpl(PropertySetMixinImpl ); // not defined
-void operator =(PropertySetMixinImpl ); // not defined
+PropertySetMixinImpl( const PropertySetMixinImpl); // not defined
+void operator=( const PropertySetMixinImpl); // not defined
 
 PropertySetMixinImpl(
 com::sun::star::uno::Reference com::sun::star::uno::XComponentContext 

@@ -474,8 +474,8 @@ protected:
 ~PropertySetMixin() {}
 
 private:
-PropertySetMixin(PropertySetMixin ); // not defined
-void operator =(PropertySetMixin ); // not defined
+PropertySetMixin( const PropertySetMixin); // not defined
+void operator=( const PropertySetMixin); // not defined
 };
 
 #if defined _MSC_VER
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0f/abc9a7be629ca150e83b5b69dc5e44b4b2a476

[Caolán McNamara]

 0f/abc9a7be629ca150e83b5b69dc5e44b4b2a476 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ae5832076445fb7a642d5f226b12c8810c16b0b0
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 15:59:00 2013 +0100

Notes added by 'git notes add'

diff --git a/0f/abc9a7be629ca150e83b5b69dc5e44b4b2a476 
b/0f/abc9a7be629ca150e83b5b69dc5e44b4b2a476
new file mode 100644
index 000..d6e4374
--- /dev/null
+++ b/0f/abc9a7be629ca150e83b5b69dc5e44b4b2a476
@@ -0,0 +1 @@
+merged as: 7725dddf05a9cbd3eb91d3bde45b22e4182b86dc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 94/5f56f22d6b0f3a30e179b7b853a2e2de751fb1

[Caolán McNamara]

 94/5f56f22d6b0f3a30e179b7b853a2e2de751fb1 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5cbc6cb06eefcc342505b93a6da48cf9d2b1e7f1
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 16:00:34 2013 +0100

Notes added by 'git notes add'

diff --git a/94/5f56f22d6b0f3a30e179b7b853a2e2de751fb1 
b/94/5f56f22d6b0f3a30e179b7b853a2e2de751fb1
new file mode 100644
index 000..7bc3893
--- /dev/null
+++ b/94/5f56f22d6b0f3a30e179b7b853a2e2de751fb1
@@ -0,0 +1 @@
+prefer: 0a2286a7244ca80f8109765f0ff78a7c36e7cd68
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 80/f62d986be5d32935280c0db3fd522a5fda099e

[Caolán McNamara]

 80/f62d986be5d32935280c0db3fd522a5fda099e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3c8356dbe84900912b683fd77b7c9ff9631ed8aa
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 16:03:26 2013 +0100

Notes added by 'git notes add'

diff --git a/80/f62d986be5d32935280c0db3fd522a5fda099e 
b/80/f62d986be5d32935280c0db3fd522a5fda099e
new file mode 100644
index 000..a44a4ee
--- /dev/null
+++ b/80/f62d986be5d32935280c0db3fd522a5fda099e
@@ -0,0 +1 @@
+prefer: a1fbebff263f65bc25c0c955da2e68e90cd2bb03
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a0/1c392ef8fa564ce58579632dd41ec3a085327b

[Caolán McNamara]

 a0/1c392ef8fa564ce58579632dd41ec3a085327b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d39aa9d2082e5017c485101d13d996fd0cec9b07
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 16:04:56 2013 +0100

Notes added by 'git notes add'

diff --git a/a0/1c392ef8fa564ce58579632dd41ec3a085327b 
b/a0/1c392ef8fa564ce58579632dd41ec3a085327b
new file mode 100644
index 000..e98ba0a
--- /dev/null
+++ b/a0/1c392ef8fa564ce58579632dd41ec3a085327b
@@ -0,0 +1 @@
+prefer: 021a3772323092a03b5f24000b35ed6a6daf481b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Herbert Dürr]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 436be3ca0bc5d78fbd2b897515a087bbf1fda68a
Author: Herbert Dürr h...@apache.org
Date:   Fri May 3 07:44:49 2013 +

update links for EPM

easysw.com closed its doors after 14years of business.
Thanks for providing EPM.

(cherry picked from commit 73a1f473b72f86d84f3ae542b6c2750911d6c876)

Conflicts:
configure.in

Change-Id: I14244a7802055b5137c6cd10de2cad4b8628f799

diff --git a/configure.ac b/configure.ac
index 8ec5b84..b8e0961 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6841,7 +6841,7 @@ if test $enable_epm = yes; then
 if $EPM | grep ESP Package Manager /dev/null 2/dev/null; then
 AC_MSG_RESULT([yes])
 else
-AC_MSG_ERROR([no. Install ESP Package Manager 
(www.easysw.com/epm) and/or specify the path to the right epm])
+AC_MSG_ERROR([no. Install ESP Package Manager 
(http://www.msweet.org/projects.php?Z2) and/or specify the path to the right 
epm])
 fi
 AC_MSG_CHECKING([epm version])
 EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | 
$SED -e s/v//`
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 73/a1f473b72f86d84f3ae542b6c2750911d6c876

[Caolán McNamara]

 73/a1f473b72f86d84f3ae542b6c2750911d6c876 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3c706e0e7d99e6255beed56c8573355607cb25df
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 16:12:13 2013 +0100

Notes added by 'git notes add'

diff --git a/73/a1f473b72f86d84f3ae542b6c2750911d6c876 
b/73/a1f473b72f86d84f3ae542b6c2750911d6c876
new file mode 100644
index 000..1c28352
--- /dev/null
+++ b/73/a1f473b72f86d84f3ae542b6c2750911d6c876
@@ -0,0 +1 @@
+merged as: 436be3ca0bc5d78fbd2b897515a087bbf1fda68a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0a/210d567254d7e72c1f5f7950ae9cc5fc3d0bd9

[Caolán McNamara]

 0a/210d567254d7e72c1f5f7950ae9cc5fc3d0bd9 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ff2fbb358f12b18924f8857c81727da061966941
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 16:16:50 2013 +0100

Notes added by 'git notes add'

diff --git a/0a/210d567254d7e72c1f5f7950ae9cc5fc3d0bd9 
b/0a/210d567254d7e72c1f5f7950ae9cc5fc3d0bd9
new file mode 100644
index 000..38671be
--- /dev/null
+++ b/0a/210d567254d7e72c1f5f7950ae9cc5fc3d0bd9
@@ -0,0 +1 @@
+prefer: 8a6c5b2fcbf2b6d87529e91f58aa41c02d0fc990
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: MAKE_RESTARTS interference with trap SIGINT

[Norbert Thiebaud]

On Wed, May 8, 2013 at 4:14 AM, Stephan Bergmann sberg...@redhat.com wrote:


 But why should make use SIGINT to restart itself (for me, it just does an
 exec), and, more importantly, how should the parent shell process be able to
 pick that up?

all I know is: with a trap SIGINT in the calling shell, when I call
make -sr it verify than Makfile is up-to-date and then ... stop
without the trap it works as intended.
Since my odd of getting a patch even reviewed by the gnu make
maintainer is apparently 0, I have not bothered digging further. I was
glad to finally figuring out why my script was not building anything
and a work-around to that...

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c5/3b8b322b1ebf083b11d9b019b9c2fc70f900e4

[Caolán McNamara]

 c5/3b8b322b1ebf083b11d9b019b9c2fc70f900e4 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a17a16327f94bf2a7960e543631b8f27ce8dc378
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 16:18:53 2013 +0100

Notes added by 'git notes add'

diff --git a/c5/3b8b322b1ebf083b11d9b019b9c2fc70f900e4 
b/c5/3b8b322b1ebf083b11d9b019b9c2fc70f900e4
new file mode 100644
index 000..f313a5f
--- /dev/null
+++ b/c5/3b8b322b1ebf083b11d9b019b9c2fc70f900e4
@@ -0,0 +1 @@
+prefer: ef2942e54df89b73626558b76229b2ccadd54936
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - db/0938620ed3e5586dace262711f0741a7ac2484

[Caolán McNamara]

 db/0938620ed3e5586dace262711f0741a7ac2484 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bd39ea1c3868a128ab0e62ab841962cb7b524646
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 16:21:06 2013 +0100

Notes added by 'git notes add'

diff --git a/db/0938620ed3e5586dace262711f0741a7ac2484 
b/db/0938620ed3e5586dace262711f0741a7ac2484
new file mode 100644
index 000..f313a5f
--- /dev/null
+++ b/db/0938620ed3e5586dace262711f0741a7ac2484
@@ -0,0 +1 @@
+prefer: ef2942e54df89b73626558b76229b2ccadd54936
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 97/5de6a7a05c0961cb1445a680df6cffb720d9ed

[Caolán McNamara]

 97/5de6a7a05c0961cb1445a680df6cffb720d9ed |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e16b29db0245aa5073a137c23cbb1ef0809d42b0
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 16:25:55 2013 +0100

Notes added by 'git notes add'

diff --git a/97/5de6a7a05c0961cb1445a680df6cffb720d9ed 
b/97/5de6a7a05c0961cb1445a680df6cffb720d9ed
new file mode 100644
index 000..e1bb9be
--- /dev/null
+++ b/97/5de6a7a05c0961cb1445a680df6cffb720d9ed
@@ -0,0 +1 @@
+prefer: b92a0d9208e1b1a33818a3c451e9952963295f6c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - Makefile.in scp2/source solenv/bin

[David Tardon]

 Makefile.in   |2 +-
 scp2/source/ooo/directory_ooo.scp |   10 ++
 scp2/source/ooo/file_extra_ooo.scp|3 ---
 solenv/bin/modules/installer.pm   |3 ++-
 solenv/bin/modules/installer/simplepackage.pm |3 +--
 5 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 6e1deb99e80a5618f071cbd95529a23d9d80c7e3
Author: David Tardon dtar...@redhat.com
Date:   Wed May 8 17:14:34 2013 +0200

fix the internal structure of MacOS X dmg

Because of commit e70ea92b3632c376975dd85dbcb26e7ca6b95498 scp: remove
unused macros, which removed the top-level Applications symlink, the
dmg contained an extra dir, e.g.,
LibreOfficeDev_4.1.0.0.alpha0_MacOS_x86/LibreOfficeDev.app instead of
just LibreOfficeDev.app . This symlink used by the installer to
determine the dir to use as top-level for the installation
(solenv/bin/modules/installer/simplepackage.pm:274).

Also revert Eek, it is hard to get the right path to the .app that is
being built, which was only needed because of the other problem.

This reverts commit 1c25b01fce27c85affee920441b9b09a7bfe0501.

Change-Id: Ib5792c7710decd021a62cd33fd841ebe26613fbc

diff --git a/scp2/source/ooo/directory_ooo.scp 
b/scp2/source/ooo/directory_ooo.scp
index 5b946f5..08ea22d 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -69,6 +69,16 @@ Directory 
gid_Dir_Bundle_Contents_Library_Spotlight_Bundle_Contents
 End
 #endif
 
+#if defined MACOSX
+Unixlink gid_Unixlink_Applications
+BIN_FILE_BODY;
+Styles = ();
+Dir = PD_PROGDIR;
+Name = Applications;
+Target = /Applications;
+End
+#endif
+
 Directory gid_Dir_Wizards
 Styles = (CREATE);
 ParentID = gid_Brand_Dir_Program;
diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index f1f5403..e49a93c 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -433,7 +433,7 @@ sub create_package
 # participate in the signing and their validity can be
 # guaranteed.
 
-$systemcall = codesign --sign 
$ENV{'MACOSX_CODESIGNING_IDENTITY'} --force -v -v -v 
$localtempdir/$folder/*/$volume_name_classic_app.app;
+$systemcall = codesign --sign 
$ENV{'MACOSX_CODESIGNING_IDENTITY'} --force -v -v -v 
$localtempdir/$folder/$volume_name_classic_app.app;
 print ... $systemcall ...\n;
 my $returnvalue = system($systemcall);
 $infoline = Systemcall: $systemcall\n;
commit a71b30f6c20197eb07249aa91a85c83eb3d4fb2d
Author: David Tardon dtar...@redhat.com
Date:   Wed May 8 17:25:43 2013 +0200

drop pointless self-assignment

Well, it is possible that it is special perl syntax for something, but
somehow I doubt that .-)

Change-Id: I213f56c9c2b32919b7bd0c53a4639c59418345c1

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 3b8c8a3..f1f5403 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -280,7 +280,6 @@ sub create_package
 my $volume_name = $allvariables-{'PRODUCTNAME'};
 my $volume_name_classic = $allvariables-{'PRODUCTNAME'} . ' ' . 
$allvariables-{'PRODUCTVERSION'};
 my $volume_name_classic_app = $volume_name;  # app should not 
contain version number
-$volume_name_classic = $volume_name_classic;
 if ( $allvariables-{'DMG_VOLUMEEXTENSION'} ) {
 $volume_name = $volume_name . ' ' . 
$allvariables-{'DMG_VOLUMEEXTENSION'};
 $volume_name_classic = $volume_name_classic . ' ' . 
$allvariables-{'DMG_VOLUMEEXTENSION'};
commit e559c20c033e8c714857d0813973602a703e711f
Author: David Tardon dtar...@redhat.com
Date:   Wed May 8 16:39:46 2013 +0200

fix after rename of the packages

This might have caused problems with the MacOS X daily builds. Dunno. I
have no idea what is the difference between .DS_Store and .DS_Store_Dev
(they are binary) and how essential that file is.

Change-Id: Id09e6f85c101cd5b60d20b6cc9960050f8cdbac4

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 762c412..9c47bd6 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -331,7 +331,8 @@ sub run {
 
 if ( $installer::globals::languagepack ) { 
installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref);
 }
 if ( $installer::globals::helppack ) { 
installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref);
 }
-if ( $allvariableshashref-{'PRODUCTNAME'} eq LibO-dev ) { 
installer::scriptitems::use_devversion_copy_scpaction($scpactionsinproductarrayref);
 }
+# TODO: why is this not done in scp2 based 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - aa/472da82a35c9643319f0af69d856a38c1cca4d

[Caolán McNamara]

 aa/472da82a35c9643319f0af69d856a38c1cca4d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6e5cfdc2f3f0ae905e93cf2cfb3c87b969dad0c1
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 16:27:10 2013 +0100

Notes added by 'git notes add'

diff --git a/aa/472da82a35c9643319f0af69d856a38c1cca4d 
b/aa/472da82a35c9643319f0af69d856a38c1cca4d
new file mode 100644
index 000..f0d9e08
--- /dev/null
+++ b/aa/472da82a35c9643319f0af69d856a38c1cca4d
@@ -0,0 +1 @@
+prefer: 583551810609804b225ab33456f0a2ae04ad16c1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0f/fb1b476b0b2188aa0a3286bb5e377252f6eedd

[Caolán McNamara]

 0f/fb1b476b0b2188aa0a3286bb5e377252f6eedd |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 474c49e8a5d1d54da220f492512665afbeea08e1
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 16:28:39 2013 +0100

Notes added by 'git notes add'

diff --git a/0f/fb1b476b0b2188aa0a3286bb5e377252f6eedd 
b/0f/fb1b476b0b2188aa0a3286bb5e377252f6eedd
new file mode 100644
index 000..f0d9e08
--- /dev/null
+++ b/0f/fb1b476b0b2188aa0a3286bb5e377252f6eedd
@@ -0,0 +1 @@
+prefer: 583551810609804b225ab33456f0a2ae04ad16c1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - config_host/config_version.h.in unoidl/README unoidl/source

[Stephan Bergmann]

 config_host/config_version.h.in  |8 ++---
 unoidl/README|   54 +--
 unoidl/source/reg2unoidl.cxx |9 +-
 unoidl/source/unoidlprovider.cxx |5 ++-
 4 files changed, 61 insertions(+), 15 deletions(-)

New commits:
commit 1ad700f5a449aeee1dfbbb5ae37b3bf43638d394
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 8 17:29:37 2013 +0200

Minor improvements to UNOIDL binary format

Change-Id: Ia215b34842ce85bfbd1ad90a286abcbae0884bd5

diff --git a/config_host/config_version.h.in b/config_host/config_version.h.in
index 0d78882..cc9cd98 100644
--- a/config_host/config_version.h.in
+++ b/config_host/config_version.h.in
@@ -16,10 +16,10 @@ Version settings
 #undef LIBO_THIS_YEAR
 
 #define LIBO_VERSION_DOTTED \
-(LIBO_VERSION_STRINGIFY(LIBO_VERSION_MAJOR) . \
- LIBO_VERSION_STRINGIFY(LIBO_VERSION_MINOR) . \
- LIBO_VERSION_STRINGIFY(LIBO_VERSION_MICRO) . \
- LIBO_VERSION_STRINGIFY(LIBO_VERSION_PATCH))
+LIBO_VERSION_STRINGIFY(LIBO_VERSION_MAJOR) . \
+LIBO_VERSION_STRINGIFY(LIBO_VERSION_MINOR) . \
+LIBO_VERSION_STRINGIFY(LIBO_VERSION_MICRO) . \
+LIBO_VERSION_STRINGIFY(LIBO_VERSION_PATCH)
 
 #define LIBO_VERSION_ENCODED_IN_32BITS \
 ((LIBO_VERSION_MAJOR  24) | (LIBO_VERSION_MINOR  16) | 
(LIBO_VERSION_MICRO  8) | LIBO_VERSION_PATCH)
diff --git a/unoidl/README b/unoidl/README
index 2e159c6..5daff7a 100644
--- a/unoidl/README
+++ b/unoidl/README
@@ -45,11 +45,18 @@ The file starts with an 8 byte header, followed by 
information about the root
 map (reg2unoidl generates files in a single depth-first pass, so the root map
 itself is at the end of the file):
 
-* 8 byte header UNOIDL\0\xFF
+* 7 byte magic header UNOIDL\xFF
+* version byte 0
 * Offset of root Map
 * UInt32 number of entries of root Map
 ...
 
+Files generated by reg2unoidl follow that by a
+
+  \0** Created by LibreOffice  LIBO_VERSION_DOTTED  reg2unoidl **\0
+
+banner (cf. config_host/config_version.h.in), as a debugging aid.
+
 Layout of per-entry payload in the root or a module Map:
 
 * kind byte:
diff --git a/unoidl/source/reg2unoidl.cxx b/unoidl/source/reg2unoidl.cxx
index a311147..2bd9e56 100644
--- a/unoidl/source/reg2unoidl.cxx
+++ b/unoidl/source/reg2unoidl.cxx
@@ -17,11 +17,13 @@
 #include utility
 #include vector
 
+#include config_version.h
 #include osl/endian.h
 #include osl/file.h
 #include osl/file.hxx
 #include osl/process.h
 #include rtl/process.h
+#include rtl/string.h
 #include rtl/string.hxx
 #include rtl/textenc.h
 #include rtl/textcvt.h
@@ -746,9 +748,14 @@ SAL_IMPLEMENT_MAIN() {
  +e  std::endl;
 std::exit(EXIT_FAILURE);
 }
-write(f, UNOIDL\0\xFF, 8);
+write(f, UNOIDL\xFF\0, 8);
 write32(f, 0); // root map offset
 write32(f, 0); // root map size
+write(
+f,
+RTL_CONSTASCII_STRINGPARAM(
+\0** Created by LibreOffice  LIBO_VERSION_DOTTED
+ reg2unoidl **\0));
 sal_uInt64 off;
 std::size_t size;
 try {
diff --git a/unoidl/source/unoidlprovider.cxx b/unoidl/source/unoidlprovider.cxx
index 6ead9cf..33848a1 100644
--- a/unoidl/source/unoidlprovider.cxx
+++ b/unoidl/source/unoidlprovider.cxx
@@ -1058,11 +1058,12 @@ rtl::Reference Entity  readEntity(
 UnoidlProvider::UnoidlProvider(OUString const  uri):
 file_(new detail::MappedFile(uri))
 {
-if (file_-size  8 || std::memcmp(file_-address, UNOIDL\0\xFF, 8) != 0)
+if (file_-size  8 || std::memcmp(file_-address, UNOIDL\xFF\0, 8) != 0)
 {
 throw FileFormatException(
 file_-uri,
-UNOIDL format: does not begin with magic UNOIDL\\0\\xFF);
+UNOIDL format: does not begin with magic UNOIDL\\xFF and version
+ 0);
 }
 sal_uInt32 off = file_-read32(8);
 mapSize_ = file_-read32(12);
commit 79774d961644ea81b4e790114c9b785d38bcd8a4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 8 16:20:12 2013 +0200

unoidl/README improvements

Change-Id: I5123d984f8f9bf49f5d1ad8e8decebfaaa6e7769

diff --git a/unoidl/README b/unoidl/README
index ed9ee25..2e159c6 100644
--- a/unoidl/README
+++ b/unoidl/README
@@ -21,7 +21,13 @@ format).
 
 == Specification of the new UNOIDL types.rdb format ==
 
-Uses the following definitions:
+The format uses byte-oriented, platform-independent, binary files.  Larger
+quantities are stored LSB first, without alignment requirements.  Offsets are
+32 bit, effectively limiting the overall file size to 4GB, but that is not
+considered a limitation in practice (and avoids unnecessary bloat compared to
+64 bit offsets).
+
+The following definitions are used throughout:
 
 * UInt16: 2-byte value, LSB first
 * UInt32: 4-byte value, LSB first
@@ -35,24 +41,37 @@ Uses the following definitions:
 * Entry: Offset of NUL-Name followed by Offset of payload
 * Map: zero or more Entries
 
+The file starts with an 8 byte header, followed by information about the root
+map 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 19/811155689c7878e8118c8d1e4e0640df25de2b

[Caolán McNamara]

 19/811155689c7878e8118c8d1e4e0640df25de2b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 558d216f2fd229e5b489f93b7e16055b94f67403
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 16:35:14 2013 +0100

Notes added by 'git notes add'

diff --git a/19/811155689c7878e8118c8d1e4e0640df25de2b 
b/19/811155689c7878e8118c8d1e4e0640df25de2b
new file mode 100644
index 000..d2b55cd
--- /dev/null
+++ b/19/811155689c7878e8118c8d1e4e0640df25de2b
@@ -0,0 +1 @@
+prefer: 396d679b60fe2c996ff040218814f54684703313
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 71/7fa750b3f4c07bff2327fa5f5aeead0e3a2ee1

[Caolán McNamara]

 71/7fa750b3f4c07bff2327fa5f5aeead0e3a2ee1 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit daf8552d3dbb968c9fd145bf467fb44dbebf83ae
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 16:37:52 2013 +0100

Notes added by 'git notes add'

diff --git a/71/7fa750b3f4c07bff2327fa5f5aeead0e3a2ee1 
b/71/7fa750b3f4c07bff2327fa5f5aeead0e3a2ee1
new file mode 100644
index 000..a94e1cd
--- /dev/null
+++ b/71/7fa750b3f4c07bff2327fa5f5aeead0e3a2ee1
@@ -0,0 +1 @@
+prefer: eaf8e0939a3d8b724dec7ff48d4ada48bbfe3ebc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 72/67a4b856d9fb37c3f4855c1be0f35219743923

[Caolán McNamara]

 72/67a4b856d9fb37c3f4855c1be0f35219743923 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fa17631086c3a66ae4f30d9d29a3223d4f2240cf
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 16:48:47 2013 +0100

Notes added by 'git notes add'

diff --git a/72/67a4b856d9fb37c3f4855c1be0f35219743923 
b/72/67a4b856d9fb37c3f4855c1be0f35219743923
new file mode 100644
index 000..46d9148
--- /dev/null
+++ b/72/67a4b856d9fb37c3f4855c1be0f35219743923
@@ -0,0 +1 @@
+merged as: 06803677ef3b91ebaaa1d1338a403c578cebba99
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 29/820acab361a10585e16563a42cb2db1f79b48f

[Caolán McNamara]

 29/820acab361a10585e16563a42cb2db1f79b48f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3aefcecdfecd2b56a605666903b11bec17899e45
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 16:51:43 2013 +0100

Notes added by 'git notes add'

diff --git a/29/820acab361a10585e16563a42cb2db1f79b48f 
b/29/820acab361a10585e16563a42cb2db1f79b48f
new file mode 100644
index 000..14a5a9b
--- /dev/null
+++ b/29/820acab361a10585e16563a42cb2db1f79b48f
@@ -0,0 +1 @@
+prefer: 782c243045a1c7ee95b2d7ea6bca64812a9049e1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source

[Oliver-Rainer Wittmann]

 sfx2/source/control/ctrlitem.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 06803677ef3b91ebaaa1d1338a403c578cebba99
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue Apr 30 11:21:46 2013 +

invalidate used slot to avoid inconsistent state information

Invalid state information may cause crashes due to not updated slot data

(cherry picked from commit 7267a4b856d9fb37c3f4855c1be0f35219743923)

Change-Id: I3bc3f934c5144fb0873e7a9694c3c012ddb0b367

diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 2b241c6..7a0d16d 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -384,6 +384,11 @@ SfxMapUnit SfxControllerItem::GetCoreMetric() const
 SfxShell *pSh = pDispat-GetShell( pServer-GetShellLevel() );
 SfxItemPool rPool = pSh-GetPool();
 sal_uInt16 nWhich = rPool.GetWhich( nId );
+
+// invalidate slot and its message|slot server as 'global' 
information
+// about the validated message|slot server is not made available
+pCache-Invalidate( sal_True );
+
 return rPool.GetMetric( nWhich );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] zlib: remove ExternalPackage_zlib

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3826

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/3826/1

zlib: remove ExternalPackage_zlib

Change-Id: I5bce88b2044279a6563fd68c35f9c1ac824c8850
---
M RepositoryExternal.mk
M cairo/ExternalProject_cairo.mk
M cairo/cairo/cairo-1.10.2.patch
M clucene/UnpackedTarball_clucene.mk
D clucene/patches/clucene-internal-zlib.patch
M configure.ac
M filter/source/flash/swfwriter1.cxx
M hwpfilter/source/hgzip.h
M hwpfilter/source/hiodev.cxx
M liborcus/ExternalProject_liborcus.mk
M package/source/zipapi/Deflater.cxx
M package/source/zipapi/Inflater.cxx
M postgresql/ExternalProject_postgresql.mk
M sdext/source/pdfimport/pdfparse/pdfentries.cxx
M sdext/source/pdfimport/test/tests.cxx
M sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
M tools/source/zcodec/zcodec.cxx
D zlib/ExternalPackage_zlib.mk
M zlib/Module_zlib.mk
19 files changed, 18 insertions(+), 95 deletions(-)



diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f636d7b..2a58722 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -343,12 +343,8 @@
 define gb_LinkTarget__use_zlib_multiarch
 $(if $(2),,$(call gb_Output_error,gb_LinkTarget__use_zlib_multiarch needs two 
arguments))
 
-$(call gb_LinkTarget_use_packages,$(1),\
-   zlib_inc \
-)
-
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(OUTDIR)/inc/external/zlib \
+   $(ZLIB_CFLAGS) \
$$(INCLUDE) \
 )
 
@@ -369,7 +365,6 @@
 endef
 
 define gb_ExternalProject__use_zlib
-$(call gb_ExternalProject_use_package,$(1),zlib_inc)
 $(call gb_ExternalProject_use_static_libraries,$(1),zlib)
 
 endef
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk
index 0326b5c..4ba9023 100644
--- a/cairo/ExternalProject_cairo.mk
+++ b/cairo/ExternalProject_cairo.mk
@@ -32,7 +32,7 @@
$(call gb_ExternalProject_run,build,\
./configure \
$(if $(debug),STRIP= ) \
-   CFLAGS=$(if $(debug),-g) $(SOLARINC) \
+   CFLAGS=$(if $(debug),-g) $(ZLIB_CFLAGS) \
LDFLAGS='-L$(OUTDIR)/lib' \
$(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) 
\
pixman_CFLAGS=-I$(call 
gb_UnpackedTarball_get_dir,pixman)/pixman \
diff --git a/cairo/cairo/cairo-1.10.2.patch b/cairo/cairo/cairo-1.10.2.patch
index fce1149..9557ada 100644
--- a/cairo/cairo/cairo-1.10.2.patch
+++ b/cairo/cairo/cairo-1.10.2.patch
@@ -38,7 +38,7 @@
  DEFAULT_CFLAGS += -I. -I$(top_srcdir)
  DEFAULT_CFLAGS += $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS) $(ZLIB_CFLAGS)
 +DEFAULT_CFLAGS += $(SOLARINC)
-+DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/zlib 
-I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX 
-DDISABLE_SOME_FLOATING_POINT=1
++DEFAULT_CFLAGS += -I$(SOLARVER)/$(INPATH)/inc/external/libpng -DZLIB_FIX 
-DDISABLE_SOME_FLOATING_POINT=1
  
  CAIRO_CFLAGS = $(DEFAULT_CFLAGS) $(CFLAGS)
  
diff --git a/clucene/UnpackedTarball_clucene.mk 
b/clucene/UnpackedTarball_clucene.mk
index 6a32698..ed3c900 100644
--- a/clucene/UnpackedTarball_clucene.mk
+++ b/clucene/UnpackedTarball_clucene.mk
@@ -24,7 +24,6 @@
 # http://sourceforge.net/mailarchive/message.php?msg_id=29143260
 $(eval $(call gb_UnpackedTarball_add_patches,clucene,\
clucene/patches/clucene-debug.patch \
-   clucene/patches/clucene-internal-zlib.patch \
clucene/patches/clucene-multimap-put.patch \
clucene/patches/clucene-narrowing-conversions.patch \
clucene/patches/clucene-nullptr.patch \
diff --git a/clucene/patches/clucene-internal-zlib.patch 
b/clucene/patches/clucene-internal-zlib.patch
deleted file mode 100644
index 6667926..000
--- a/clucene/patches/clucene-internal-zlib.patch
+++ /dev/null
@@ -1,15 +0,0 @@
 src/shared/CLucene/util/Misc.cpp   2012-02-17 15:33:09.217891100 +
-+++ src/shared/CLucene/util/Misc.cpp   2012-02-17 15:38:10.836597500 +
-@@ -34,7 +34,11 @@
- #include CLucene/util/dirent.h //if we have dirent, then the native one 
will be used
- 
- //for zlib...
--#include zlib.h
-+#ifdef SYSTEM_ZLIB
-+#include zlib.h
-+#else
-+#include external/zlib/zlib.h
-+#endif
- #if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
- #  include fcntl.h
- #  include io.h
diff --git a/configure.ac b/configure.ac
index ec0a4a6..b16ba33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7128,7 +7128,7 @@
 AC_MSG_RESULT([internal])
 SYSTEM_ZLIB=NO
 BUILD_TYPE=$BUILD_TYPE ZLIB
-ZLIB_CFLAGS=-I${OUTDIR}/inc/external/zlib
+ZLIB_CFLAGS=-I${WORKDIR}/UnpackedTarball/zlib
 ZLIB_LIBS=-L${OUTDIR}/lib -lzlib
 fi
 AC_SUBST(ZLIB_CFLAGS)
diff --git a/filter/source/flash/swfwriter1.cxx 
b/filter/source/flash/swfwriter1.cxx
index abfb3d39..52c29b9 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -31,13 +31,7 @@
 #include vcl/graphicfilter.hxx
 #include vcl/graphictools.hxx
 
-#ifndef _ZLIB_H
-#ifdef SYSTEM_ZLIB
 

[Libreoffice-commits] core.git: sw/source

[Oliver-Rainer Wittmann]

 sw/source/core/layout/flylay.cxx  |   19 ++-
 sw/source/core/layout/frmtool.cxx |6 +++---
 2 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit d2b11ab8cb7f3fba07ad76fdcaff340d4184ec4f
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri Jun 22 06:27:59 2012 +

Resolves: #119945# improve setting of OrdNums for nesting of objects

- instead of adjusting the OrdNum of the nested object the OrdNum of the 
parent is adjusted.

Found by: Yan Ji yanji.yj at gmail dot com
Patch by: yuanlin yuanlin.ibm at gmail dot com
Review by: Oliver orw at apache dot org
(cherry picked from commit 73f462e2162847262093c3984dc6c98919e1b3cd)

Conflicts:
sw/source/core/layout/flylay.cxx

Change-Id: I0541dc3775f81efd60a6f4baa172c5297ee9d829

diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index fece114..5308a95 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -603,14 +603,15 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew )
 
 SdrObject* pObj = pNew-GetVirtDrawObj();
 OSL_ENSURE( pNew-GetAnchorFrm(), Fly without Anchor );
-const SwFlyFrm* pFly = pNew-GetAnchorFrm()-FindFlyFrm();
+SwFlyFrm* pFly = (SwFlyFrm*)pNew-GetAnchorFrm()-FindFlyFrm();
 if ( pFly  pObj-GetOrdNum()  pFly-GetVirtDrawObj()-GetOrdNum() )
 {
-sal_uInt32 nNewNum = pFly-GetVirtDrawObj()-GetOrdNumDirect();
+//#i119945# set pFly's OrdNum to _rNewObj's. So when pFly is removed 
by Undo, the original OrdNum will not be changed.
+sal_uInt32 nNewNum = pObj-GetOrdNumDirect();
 if ( pObj-GetPage() )
-pObj-GetPage()-SetObjectOrdNum( pObj-GetOrdNumDirect(), 
nNewNum);
+pObj-GetPage()-SetObjectOrdNum( 
pFly-GetVirtDrawObj()-GetOrdNumDirect(), nNewNum );
 else
-pObj-SetOrdNum( nNewNum );
+pFly-GetVirtDrawObj()-SetOrdNum( nNewNum );
 }
 
 // Don't look further at Flys that sit inside the Cntnt.
@@ -857,16 +858,16 @@ void SwPageFrm::AppendDrawObjToPage( SwAnchoredObject 
_rNewObj )
 }
 
 OSL_ENSURE( _rNewObj.GetAnchorFrm(), anchored draw object without anchor 
);
-const SwFlyFrm* pFlyFrm = _rNewObj.GetAnchorFrm()-FindFlyFrm();
+SwFlyFrm* pFlyFrm = (SwFlyFrm*)_rNewObj.GetAnchorFrm()-FindFlyFrm();
 if ( pFlyFrm 
  _rNewObj.GetDrawObj()-GetOrdNum()  
pFlyFrm-GetVirtDrawObj()-GetOrdNum() )
 {
-sal_uInt32 nNewNum = pFlyFrm-GetVirtDrawObj()-GetOrdNumDirect();
+//#i119945# set pFly's OrdNum to _rNewObj's. So when pFly is removed 
by Undo, the original OrdNum will not be changed.
+sal_uInt32 nNewNum = _rNewObj.GetDrawObj()-GetOrdNumDirect();
 if ( _rNewObj.GetDrawObj()-GetPage() )
-_rNewObj.DrawObj()-GetPage()-SetObjectOrdNum(
-_rNewObj.GetDrawObj()-GetOrdNumDirect(), nNewNum);
+_rNewObj.DrawObj()-GetPage()-SetObjectOrdNum( 
pFlyFrm-GetVirtDrawObj()-GetOrdNumDirect(), nNewNum );
 else
-_rNewObj.DrawObj()-SetOrdNum( nNewNum );
+pFlyFrm-GetVirtDrawObj()-SetOrdNum( nNewNum );
 }
 
 if ( FLY_AS_CHAR == _rNewObj.GetFrmFmt().GetAnchor().GetAnchorId() )
diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index aee7e44..f9337b1 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -2807,9 +2807,9 @@ static void lcl_Regist( SwPageFrm *pPage, const SwFrm 
*pAnch )
  pObj-GetDrawObj()-GetOrdNum()  
pFly-GetVirtDrawObj()-GetOrdNum() 
  pObj-GetDrawObj()-GetPage() )
 {
-pObj-DrawObj()-GetPage()-SetObjectOrdNum(
-pObj-GetDrawObj()-GetOrdNumDirect(),
-pFly-GetVirtDrawObj()-GetOrdNumDirect() + 1 
);
+//#i119945# set pFly's OrdNum to pObj's. So when pFly is removed 
by Undo, the original OrdNum will not be changed.
+pObj-DrawObj()-GetPage()-SetObjectOrdNum( 
pFly-GetVirtDrawObj()-GetOrdNumDirect(),
+ 
pObj-GetDrawObj()-GetOrdNumDirect() );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 73/f462e2162847262093c3984dc6c98919e1b3cd

[Caolán McNamara]

 73/f462e2162847262093c3984dc6c98919e1b3cd |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b3ff26e64b91f3a9db171886d2c59abe12938534
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 8 17:05:11 2013 +0100

Notes added by 'git notes add'

diff --git a/73/f462e2162847262093c3984dc6c98919e1b3cd 
b/73/f462e2162847262093c3984dc6c98919e1b3cd
new file mode 100644
index 000..cc87d60
--- /dev/null
+++ b/73/f462e2162847262093c3984dc6c98919e1b3cd
@@ -0,0 +1 @@
+merged as: d2b11ab8cb7f3fba07ad76fdcaff340d4184ec4f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libmwaw/libmwaw-0.1.8-cctype.patch libmwaw/UnpackedTarball_libmwaw.mk

[Tor Lillqvist]

 libmwaw/UnpackedTarball_libmwaw.mk |1 +
 libmwaw/libmwaw-0.1.8-cctype.patch |   10 ++
 2 files changed, 11 insertions(+)

New commits:
commit 8b1bd600cd112d97ea77b155db94a1f56f2e11aa
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed May 8 18:56:08 2013 +0300

Include cctype for std::tolower() to fix MSVC build

Change-Id: I777bcf9d80ad579347bd26147cb8801cc61222e6

diff --git a/libmwaw/UnpackedTarball_libmwaw.mk 
b/libmwaw/UnpackedTarball_libmwaw.mk
index c9c149e..a5d9c01 100644
--- a/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/libmwaw/UnpackedTarball_libmwaw.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
libmwaw/libmwaw-0.1.7-autotools.patch \
+   libmwaw/libmwaw-0.1.8-cctype.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libmwaw/libmwaw-0.1.8-cctype.patch 
b/libmwaw/libmwaw-0.1.8-cctype.patch
new file mode 100644
index 000..de515d6
--- /dev/null
+++ b/libmwaw/libmwaw-0.1.8-cctype.patch
@@ -0,0 +1,10 @@
+--- libmwaw-0.1.8/src/lib/MWAWOLEStream.cxx
 libmwaw-0.1.8/src/lib/MWAWOLEStream.cxx
+@@ -43,6 +43,7 @@
+ #endif
+ 
+ #include cstring
++#include cctype
+ #include iostream
+ #include list
+ #include set
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: python3/python-3.3.0-zlib.patch.1 python3/UnpackedTarball_python3.mk

[Michael Stahl]

 python3/UnpackedTarball_python3.mk |8 --
 python3/python-3.3.0-zlib.patch.1  |   43 -
 2 files changed, 51 deletions(-)

New commits:
commit 97b4c3d27bbad67f21993647c20df342691af9be
Author: Michael Stahl mst...@redhat.com
Date:   Wed May 8 18:19:47 2013 +0200

Revert python3: build against internal zlib when that is requested

Internal zlib is not really supported anyway on any platform that uses
setup.py.

This reverts commit 6afe0e5804f2a23f9fc9842d372fff77fd1023f1.

Change-Id: Icf94a85c4baf00df54ee5dcca5fe3ca4a63a54a8

diff --git a/python3/UnpackedTarball_python3.mk 
b/python3/UnpackedTarball_python3.mk
index 37cf3aa..0d5fce5 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -34,14 +34,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
python3/python-3.3.0-pythreadstate.patch.1 \
 ))
 
-ifneq ($(COM),MSC)
-ifeq ($(SYSTEM_ZLIB),NO)
-$(eval $(call gb_UnpackedTarball_add_patches,python3,\
-   python3/python-3.3.0-zlib.patch.1 \
-))
-endif
-endif
-
 ifneq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,python3,\
python3/python-3.3.0-15833.patch.1 \
diff --git a/python3/python-3.3.0-zlib.patch.1 
b/python3/python-3.3.0-zlib.patch.1
deleted file mode 100644
index a3091ff..000
--- a/python3/python-3.3.0-zlib.patch.1
+++ /dev/null
@@ -1,43 +0,0 @@
-sadly python's build system is so awful it needs patching to find internal zlib
-
 python3/setup.py   2013-05-08 13:42:03.826304937 +0200
-+++ python3/setup.py   2013-05-08 13:57:53.027231320 +0200
-@@ -1332,7 +1332,11 @@
- #
- # You can upgrade zlib to version 1.1.4 yourself by going to
- # http://www.gzip.org/zlib/
--zlib_inc = find_file('zlib.h', [], inc_dirs)
-+if os.environ.get('SYSTEM_ZLIB') == 'NO':
-+zlib_incdir = os.environ.get('WORKDIR') + '/' + 
'/UnpackedTarball/zlib/'
-+zlib_inc = find_file('zlib.h', inc_dirs, [zlib_incdir])
-+else:
-+zlib_inc = find_file('zlib.h', [], inc_dirs)
- have_zlib = False
- if zlib_inc is not None:
- zlib_h = zlib_inc[0] + '/zlib.h'
-@@ -1347,13 +1351,23 @@
- version = line.split()[2]
- break
- if version = version_req:
--if (self.compiler.find_library_file(lib_dirs, 'z')):
-+if os.environ.get('SYSTEM_ZLIB') == 'NO':
-+zlib_lib = 'zlib'
-+zlib_libdir = os.environ.get('OUTDIR') + '/' + 'lib'
-+#zlib_found = find_library_file(self.compiler, zlib_lib, 
lib_dirs, [zlib_libdir])
-+zlib_found = [zlib_libdir]
-+else:
-+zlib_lib = 'z'
-+zlib_found = self.compiler.find_library_file(lib_dirs, 
zlib_lib)
-+if zlib_found:
- if host_platform == darwin:
- zlib_extra_link_args = ('-Wl,-search_paths_first',)
- else:
- zlib_extra_link_args = ()
- exts.append( Extension('zlib', ['zlibmodule.c'],
--   libraries = ['z'],
-+   libraries = [zlib_lib],
-+   include_dirs = zlib_inc,
-+   library_dirs = zlib_found,
-extra_link_args = 
zlib_extra_link_args))
- have_zlib = True
- else:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: pyuno/Library_pyuno_wrapper.mk

[Stephan Bergmann]

 pyuno/Library_pyuno_wrapper.mk |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 5589c72b88e502bfca045ae38af16c854afdd401
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 8 18:37:05 2013 +0200

Make sure again pyuno_wrapper does not link against libstdc++

...which got broken with gbuild'ification.

Change-Id: Ice2b3ffb81a646c9e542344ca348eb6a16eb4ce2

diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk
index 9fb2e72..eb5c7c3 100644
--- a/pyuno/Library_pyuno_wrapper.mk
+++ b/pyuno/Library_pyuno_wrapper.mk
@@ -20,6 +20,18 @@ $(eval $(call gb_Library_use_externals,pyuno_wrapper,\
 python_headers \
 ))
 
+# python import pyuno dlopens pyuno.so as RTLD_LOCAL, so g++ exception
+# handling used to not work, so pyuno.so (pyuno_wrapper) is just a thin wrapper
+# that dlopens libpyuno.so as RTLD_GLOBAL; but when pyuno.so wrapper links
+# against libstdc++ (which has not previously been loaded into python process),
+# that resolves its _ZNSs4_Rep20_S_empty_rep_storageE to itself, but later LO
+# libs (loaded though RTLD_GLOBAL libpyuno.so) may resolve that symbol to e.g.
+# cppu, because they happen to see that before libstdc++; so the requirement 
has
+# always been that RTLD_LOCAL-loaded pyuno.so wrapper implicitly load into the
+# process as little as possible:
+$(eval $(call gb_Library_add_ldflags,pyuno_wrapper,-nostdlib))
+$(eval $(call gb_Library_add_libs,pyuno_wrapper,-lc))
+
 ifneq ($(OS)$(COM),WNTMSC)
 ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/CustomTarget_generated.mk

[Michael Stahl]

 oox/CustomTarget_generated.mk |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit ed8f9ec2caa8485691999e5565a79e451e1dcb92
Author: Michael Stahl mst...@redhat.com
Date:   Wed May 8 18:48:38 2013 +0200

oox: fix dependencies in CustomTarget

This breaks on incremental build after files have been renamed like in
38f5717b1d488b866d55a603eea1260c6203fd69, hope Windows tinderboxes are
happy now.

Change-Id: I292508c242f7e6da1db3693cf54ba11876ac8997

diff --git a/oox/CustomTarget_generated.mk b/oox/CustomTarget_generated.mk
index aca38ab..92c8bf8 100644
--- a/oox/CustomTarget_generated.mk
+++ b/oox/CustomTarget_generated.mk
@@ -26,14 +26,12 @@ $(oox_INC)/tokenhash.inc : $(oox_MISC)/tokenhash.gperf
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1)
$(GPERF) --compare-strncmp $ | sed -e 's/(char\*)0/(char\*)0, 0/g' | 
grep -v '^#line'  $@
 
-oox_GenTarget_get_target = $(oox_MISC)/$(1)
-
 define oox_GenTarget
-$(oox_GENHEADERPATH)/$(1).hxx $(oox_MISC)/$(2)ids.inc $(oox_INC)/$(2)names.inc 
\
-   $(if $(3),$(oox_MISC)/$(3)) : $(call 
oox_GenTarget_get_target,$(1))
+$(oox_MISC)/$(2)ids.inc $(oox_INC)/$(2)names.inc $(if $(3),$(oox_MISC)/$(3)) : 
\
+   $(oox_GENHEADERPATH)/$(1).hxx
@touch $$@
 
-$(call oox_GenTarget_get_target,$(1)) : $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt 
\
+$(oox_GENHEADERPATH)/$(1).hxx : $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt \
$(oox_SRC)/$(1).hxx.head $(oox_SRC)/$(1).hxx.tail
$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,PRL,1)
mkdir -p $(oox_MISC) $(oox_INC) $(oox_GENHEADERPATH)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gengal' - Makefile.in

[David Tardon]

 Makefile.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e28d9d16c431bc665fda1ffdc0fb78efd7e14b95
Author: David Tardon dtar...@redhat.com
Date:   Wed May 8 19:29:10 2013 +0200

allow to make Gallery targets from top-level

diff --git a/Makefile.in b/Makefile.in
index 74b53aa..731aa04 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -108,6 +108,7 @@ gbuild_TARGETS := AllLangHelp \
Extension \
ExternalPackage \
ExternalProject \
+   Gallery \
GeneratedPackage \
InstallModule \
InstallScript \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] fdo#60924 autoinstall - gbuild/scp2: add graphicfilter modul...

[Marcos Souza (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3827

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/3827/1

fdo#60924 autoinstall - gbuild/scp2: add graphicfilter module

Change-Id: I7823b4f0d8b7ab99ef549361a89f12036bf63270
---
M Repository.mk
A scp2/AutoInstallLibs_graphicfilter.mk
M scp2/InstallModule_graphicfilter.mk
M scp2/Module_scp2.mk
M scp2/source/graphicfilter/module_graphicfilter.scp
M solenv/gbuild/Helper.mk
6 files changed, 22 insertions(+), 2 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index 7e6c051..fc6e737 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -221,6 +221,9 @@
 
 endif
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \
 $(if $(ENABLE_TDE),tdebe1) \
 ))
diff --git a/scp2/AutoInstallLibs_graphicfilter.mk 
b/scp2/AutoInstallLibs_graphicfilter.mk
new file mode 100644
index 000..08efa78
--- /dev/null
+++ b/scp2/AutoInstallLibs_graphicfilter.mk
@@ -0,0 +1,12 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call 
gb_AutoInstallLibs_AutoInstallLibs,graphicfilter,GRAPHICFILTER,LIBO_LIB_FILE,auto_Graphicfilter_Lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_graphicfilter.mk 
b/scp2/InstallModule_graphicfilter.mk
index b7f2a8c..1858d93 100644
--- a/scp2/InstallModule_graphicfilter.mk
+++ b/scp2/InstallModule_graphicfilter.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/graphicfilter))
 
+$(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/graphicfilter,graphicfilter))
+
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\
 scp2/source/graphicfilter/file_graphicfilter \
 ))
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 67e8a81..5bccae0 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_Module_Module,scp2))
 
 $(eval $(call gb_Module_add_targets,scp2,\
+   AutoInstallLibs_graphicfilter \
AutoInstallLibs_tde \
AutoInstallLibs_gnome \
AutoInstallLibs_kde \
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp 
b/scp2/source/graphicfilter/module_graphicfilter.scp
index cd7e4a6..bd148a8 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -27,13 +27,15 @@
 
 #include macros.inc
 
+#include AutoInstallLibs/graphicfilter
+
 Module gid_Module_Optional_Grfflt
 PackageInfo = packinfo_office.txt;
 MOD_NAME_DESC ( MODULE_OPTIONAL_GRFFLT );
 Sortkey = 600;
 ParentID = gid_Module_Optional;
 Default = YES;
-Files = (
+Files = (auto_Graphicfilter_Lib_ALL
 gid_File_Lib_Svg,
 gid_File_Lib_Flash,
 gid_File_Lib_WpftDraw,
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 168cdf7..aa87379 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -118,7 +118,7 @@
 define gb_Helper_init_registries
 gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
 gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO 
RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
-gb_Library_VALIDINSTALLMODULES := GNOME TDE KDE OOO URE WRITER
+gb_Library_VALIDINSTALLMODULES := GRAPHICFILTER GNOME TDE KDE OOO URE WRITER
 gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
 gb_Jar_VALIDGROUPS := URE OOO OXT NONE
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7823b4f0d8b7ab99ef549361a89f12036bf63270
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com

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

[PATCH] gbuild: unxgcc: link with C compiler if no C++ files

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3828

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/3828/1

gbuild: unxgcc: link with C compiler if no C++ files

In 5589c72b88e502bfca045ae38af16c854afdd401 a problem due to linking
pyuno_wrapper with g++ was fixed: the library should not have a
dependency on libstdc++.  It's possible to implement this in gbuild
directly by checking whether there are any C++ input files.

(apparently g++ implicitly links in libm too...)

Change-Id: I04dce06f796e20047ce7f5eab65e6110c025
---
M desktop/Executable_oosplash.mk
M solenv/gbuild/platform/unxgcc.mk
2 files changed, 8 insertions(+), 1 deletion(-)



diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index 51657fe..1e75f64 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -55,6 +55,12 @@
 
 endif
 
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_libs,oosplash,\
+-lm \
+))
+endif
+
 ifeq ($(OS),SOLARIS)
 
 $(eval $(call gb_Executable_add_libs,oosplash,\
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index bbfe168..57a078d 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -182,10 +182,11 @@
 
 # note that `cat $(extraobjectlist)` is needed to build with older gcc 
versions, e.g. 4.1.2 on SLED10
 # we want to use @$(extraobjectlist) in the long run
+# link with C compiler if there are no C++ files (pyuno_wrapper depends on 
this)
 define gb_LinkTarget__command_dynamiclink
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1))  \
-   $(gb_CXX) \
+   $(if 
$(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS),$(gb_CXX),$(gb_CC)) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter-out $(foreach lib,frm scfilt wpftdraw,$(call 
gb_Library_get_linktargetname,$(lib))),$*),$(gb_LTOFLAGS)) \
$(if $(SOVERSION),-Wl$(COMMA)--soname=$(notdir 
$(1)).$(SOVERSION)) \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04dce06f796e20047ce7f5eab65e6110c025
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Michael Stahl mst...@redhat.com

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

[Libreoffice-commits] core.git: 2 commits - pyuno/Library_pyuno_wrapper.mk pyuno/source

[Stephan Bergmann]

 pyuno/Library_pyuno_wrapper.mk|2 --
 pyuno/source/module/pyuno_dlopenwrapper.c |2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 094978d48db63b61f62f9b82c0af275769e2519e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 8 20:13:23 2013 +0200

No need for RTLD_NOW here

...it was like that since the beginning, but for no apparent reason.

Change-Id: Ic293739b5cd5de0bfe9e2580a0755af64202e582

diff --git a/pyuno/source/module/pyuno_dlopenwrapper.c 
b/pyuno/source/module/pyuno_dlopenwrapper.c
index 2f9d4fc..8f3f53b 100644
--- a/pyuno/source/module/pyuno_dlopenwrapper.c
+++ b/pyuno/source/module/pyuno_dlopenwrapper.c
@@ -61,7 +61,7 @@ static void * load(void * address, char const * symbol) {
 }
 strncpy(libname, dl_info.dli_fname, len);
 strcpy(libname + len, SAL_DLLPREFIX pyuno SAL_DLLEXTENSION);
-h = dlopen(libname, RTLD_NOW | RTLD_GLOBAL);
+h = dlopen(libname, RTLD_LAZY | RTLD_GLOBAL);
 free(libname);
 if (h == NULL) {
 fprintf(stderr, failed to load pyuno: '%s'\n, dlerror());
commit cf49e8b816ee3391b5deba487d1abf77b7dfeaab
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 8 18:50:04 2013 +0200

Library_puyuno_wrapper is not built on WNT anyway

Change-Id: Ia4e2f9d5f3475b0a7af8b6db80ba4b2cd5f6bfce

diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk
index eb5c7c3..66e75fb 100644
--- a/pyuno/Library_pyuno_wrapper.mk
+++ b/pyuno/Library_pyuno_wrapper.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_externals,pyuno_wrapper,\
 $(eval $(call gb_Library_add_ldflags,pyuno_wrapper,-nostdlib))
 $(eval $(call gb_Library_add_libs,pyuno_wrapper,-lc))
 
-ifneq ($(OS)$(COM),WNTMSC)
 ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
 
 $(eval $(call gb_Library_add_libs,pyuno_wrapper,\
@@ -40,7 +39,6 @@ $(eval $(call gb_Library_add_libs,pyuno_wrapper,\
 ))
 
 endif
-endif
 
 $(eval $(call gb_Library_add_cobjects,pyuno_wrapper,\
 pyuno/source/module/pyuno_dlopenwrapper \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source

[Julien Nabet]

 svtools/source/brwbox/datwin.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 5630b301689f2ccb459b42c4503b95bc61891dce
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed May 8 20:17:02 2013 +0200

cppcheck: variables reassigned before using old value

Change-Id: I5108253859eac682ab423843f8812c8c8c6ce9fa

diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 2f2543c..29ae1b5 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -365,8 +365,7 @@ BrowseEvent BrowserDataWin::CreateBrowseEvent( const Point 
rPosPixel )
 sal_Int8 BrowserDataWin::AcceptDrop( const AcceptDropEvent _rEvt )
 {
 bCallingDropCallback = sal_True;
-sal_Int8 nReturn = DND_ACTION_NONE;
-nReturn = GetParent()-AcceptDrop( BrowserAcceptDropEvent( this, _rEvt ) );
+sal_Int8 nReturn = GetParent()-AcceptDrop( BrowserAcceptDropEvent( this, 
_rEvt ) );
 bCallingDropCallback = sal_False;
 return nReturn;
 }
@@ -375,8 +374,7 @@ sal_Int8 BrowserDataWin::AcceptDrop( const AcceptDropEvent 
_rEvt )
 sal_Int8 BrowserDataWin::ExecuteDrop( const ExecuteDropEvent _rEvt )
 {
 bCallingDropCallback = sal_True;
-sal_Int8 nReturn = DND_ACTION_NONE;
-nReturn = GetParent()-ExecuteDrop( BrowserExecuteDropEvent( this, _rEvt ) 
);
+sal_Int8 nReturn = GetParent()-ExecuteDrop( BrowserExecuteDropEvent( 
this, _rEvt ) );
 bCallingDropCallback = sal_False;
 return nReturn;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 45019, which changed state.

Bug 45019 Summary: FILEOPEN Password protected file opens in background 
(visible on task bar / invisible in Unity)
https://bugs.freedesktop.org/show_bug.cgi?id=45019

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution|--- |NOTOURBUG

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

[PATCH] fdo#60924: autoinstall graphicfilter libraries

[Marcos Souza (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3829

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/3829/1

fdo#60924: autoinstall graphicfilter libraries

Change-Id: I406ecef9bc1865d0cd17e3428bff137d972f
---
M Repository.mk
M scp2/InstallModule_graphicfilter.mk
D scp2/source/graphicfilter/file_graphicfilter.scp
M scp2/source/graphicfilter/module_graphicfilter.scp
4 files changed, 4 insertions(+), 56 deletions(-)



diff --git a/Repository.mk b/Repository.mk
index fc6e737..3cbed03 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -222,6 +222,10 @@
 endif
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \
+svgfilter \
+flash \
+wpftdraw \
+graphicfilter \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,TDE, \
@@ -388,8 +392,6 @@
 dbu \
 evoab \
filtertracer \
-   flash \
-graphicfilter \
 log \
MacOSXSpell \
 mork \
@@ -413,7 +415,6 @@
 spa \
 spell \
 sts \
-svgfilter \
 textfd \
 updatecheckui \
 $(if $(DISABLE_SCRIPTING),,vbahelper) \
@@ -423,7 +424,6 @@
 vclplug_kde \
 vclplug_kde4 \
 vclplug_svp \
-wpftdraw \
 ))
 
 ifneq (,$(filter ANDROID IOS,$(OS)))
diff --git a/scp2/InstallModule_graphicfilter.mk 
b/scp2/InstallModule_graphicfilter.mk
index 1858d93..f166e25 100644
--- a/scp2/InstallModule_graphicfilter.mk
+++ b/scp2/InstallModule_graphicfilter.mk
@@ -11,10 +11,6 @@
 
 $(eval $(call 
gb_InstallModule_use_auto_install_libs,scp2/graphicfilter,graphicfilter))
 
-$(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\
-scp2/source/graphicfilter/file_graphicfilter \
-))
-
 $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/graphicfilter,\
 scp2/source/graphicfilter/module_graphicfilter \
 ))
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp 
b/scp2/source/graphicfilter/file_graphicfilter.scp
deleted file mode 100644
index 535688d..000
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include macros.inc
-
-File gid_File_Share_Registry_Graphicfilter_Xcd
-TXT_FILE_BODY;
-Styles = (PACKED);
-Dir = gid_Brand_Dir_Share_Registry;
-Name = graphicfilter.xcd;
-End
-
-STD_LIB_FILE( gid_File_Lib_Flash, flash )
-STD_RES_FILE( gid_File_Res_Flash, flash )
-
-STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
-
-STD_LIB_FILE( gid_File_Lib_Graphic, graphicfilter )
-
-STD_LIB_FILE( gid_File_Lib_WpftDraw, wpftdraw )
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp 
b/scp2/source/graphicfilter/module_graphicfilter.scp
index bd148a8..9ebfcc2 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -36,9 +36,5 @@
 ParentID = gid_Module_Optional;
 Default = YES;
 Files = (auto_Graphicfilter_Lib_ALL
-gid_File_Lib_Svg,
-gid_File_Lib_Flash,
-gid_File_Lib_WpftDraw,
-gid_File_Lib_Graphic,
 gid_File_Share_Registry_Graphicfilter_Xcd);
 End

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I406ecef9bc1865d0cd17e3428bff137d972f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com

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

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 2 commits - sc/source

[Kohei Yoshida]

 sc/source/filter/oox/pagesettings.cxx |   65 --
 1 file changed, 31 insertions(+), 34 deletions(-)

New commits:
commit 7425efdfcc09e9d41d6f3ab026b6e96ebd94d3f1
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed May 8 14:31:54 2013 -0400

Set page style name to the sheet directly via ScDocument, not UNO API.

This alone saves about 20 or more seconds during import of large xlsx
document.

Change-Id: I267236afbd0284f56d4fd079042a71936db0c3e3

diff --git a/sc/source/filter/oox/pagesettings.cxx 
b/sc/source/filter/oox/pagesettings.cxx
index 2123056..00b5d5a 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -31,6 +31,7 @@
 #include com/sun/star/text/XTextCursor.hpp
 #include rtl/strbuf.hxx
 #include rtl/ustrbuf.hxx
+#include sax/tools/converter.hxx
 #include oox/core/xmlfilterbase.hxx
 #include oox/helper/attributelist.hxx
 #include oox/helper/graphichelper.hxx
@@ -40,7 +41,7 @@
 #include excelhandlers.hxx
 #include stylesbuffer.hxx
 #include unitconverter.hxx
-#include sax/tools/converter.hxx
+#include document.hxx
 
 namespace oox {
 namespace xls {
@@ -329,8 +330,9 @@ void PageSettings::finalizeImport()
 PropertySet aStyleProps( xStyle );
 getPageSettingsConverter().writePageSettingsProperties( aStyleProps, 
maModel, getSheetType() );
 
-PropertySet aSheetProps( getSheet() );
-aSheetProps.setProperty( PROP_PageStyle, aStyleName );
+// Set page style name to the sheet.
+SCTAB nTab = getSheetIndex();
+getScDocument().SetPageStyle(nTab, aStyleName);
 }
 
 void PageSettings::importPictureData( const Relations rRelations, const 
OUString rRelId )
commit 1ff4298cd2a79b0082b68ac855588e4d47834982
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed May 8 14:26:32 2013 -0400

Remove using namespace statements that may cause naming clashes.

Change-Id: Ibf695f7ddaac8fa44e1d6d4ed69aea37743d1c9b

diff --git a/sc/source/filter/oox/pagesettings.cxx 
b/sc/source/filter/oox/pagesettings.cxx
index 5cf3172..2123056 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -48,12 +48,7 @@ namespace xls {
 // 
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::awt;
-using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::sheet;
-using namespace ::com::sun::star::style;
-using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::uno;
 
 using ::oox::core::Relations;
@@ -323,14 +318,14 @@ void PageSettings::setFitToPagesMode( bool bFitToPages )
 void PageSettings::finalizeImport()
 {
 OUStringBuffer aStyleNameBuffer( PageStyle_ );
-Reference XNamed  xSheetName( getSheet(), UNO_QUERY );
+Referencecontainer::XNamed xSheetName(getSheet(), UNO_QUERY);
 if( xSheetName.is() )
 aStyleNameBuffer.append( xSheetName-getName() );
 else
 aStyleNameBuffer.append( static_cast sal_Int32 ( getSheetIndex() + 1 
) );
 OUString aStyleName = aStyleNameBuffer.makeStringAndClear();
 
-Reference XStyle  xStyle = createStyleObject( aStyleName, true );
+Referencestyle::XStyle xStyle = createStyleObject(aStyleName, true);
 PropertySet aStyleProps( xStyle );
 getPageSettingsConverter().writePageSettingsProperties( aStyleProps, 
maModel, getSheetType() );
 
@@ -360,16 +355,16 @@ enum HFPortionId
 
 struct HFPortionInfo
 {
-Reference XText   mxText; /// XText interface of this 
portion.
-Reference XTextCursor  mxStart;   /// Start position of current 
text range for formatting.
-Reference XTextCursor  mxEnd; /// End position of current 
text range for formatting.
+Referencetext::XText  mxText; /// XText interface of 
this portion.
+Referencetext::XTextCursor mxStart;   /// Start position of 
current text range for formatting.
+Referencetext::XTextCursor mxEnd; /// End position of 
current text range for formatting.
 double  mfTotalHeight;  /// Sum of heights of previous 
lines in points.
 double  mfCurrHeight;   /// Height of the current text 
line in points.
 
-boolinitialize( const Reference XText  rxText );
+boolinitialize( const Referencetext::XText rxText );
 };
 
-bool HFPortionInfo::initialize( const Reference XText  rxText )
+bool HFPortionInfo::initialize( const Referencetext::XText rxText )
 {
 mfTotalHeight = mfCurrHeight = 0.0;
 mxText = rxText;
@@ -393,16 +388,16 @@ public:
 /** Parses the passed string and creates the header/footer contents.
 @returns  The total height of the converted header or footer in 
points. */
 double  parse(
-const Reference XHeaderFooterContent  

[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl]

 solenv/gbuild/PrecompiledHeaders.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0f0b250a481b674824b4258bbe44bc1521b0d680
Author: Michael Stahl mst...@redhat.com
Date:   Wed May 8 20:35:03 2013 +0200

gbuild: PrecompiledHeaders: fix badly quoted gb_Helper_PHONY

(regression from 45a420b2f5ea1765ca3da3f31a4b357e292e0423)

Change-Id: Iec3e5f1d9b26fc093377a8e0cb61f7943c610611

diff --git a/solenv/gbuild/PrecompiledHeaders.mk 
b/solenv/gbuild/PrecompiledHeaders.mk
index 8aefc1b3..6bc13dc 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -43,12 +43,12 @@ endif
 $(call gb_PrecompiledHeader_get_dep_target,%) :
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@)  \
-   echo $(call gb_PrecompiledHeader_get_target,$*) : 
$$(gb_Helper_PHONY)  $@)
+   echo $(call gb_PrecompiledHeader_get_target,$*) : 
$(gb_Helper_PHONY)  $@)
 
 $(call gb_NoexPrecompiledHeader_get_dep_target,%) :
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@)  \
-   echo $(call gb_NoexPrecompiledHeader_get_target,$*) : 
$$(gb_Helper_PHONY)  $@)
+   echo $(call gb_NoexPrecompiledHeader_get_target,$*) : 
$(gb_Helper_PHONY)  $@)
 
 $(call gb_PrecompiledHeader_get_target,%) :
$(call 
gb_PrecompiledHeader__command,$@,$*,$,$(PCH_DEFS),$(PCH_CXXFLAGS) 
$(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

[Kohei Yoshida]

 sc/source/core/data/documentimport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c9890aa1b1a588ff0cc5727137ecd249343694d8
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed May 8 14:51:16 2013 -0400

Script types are unsigned char now.

Change-Id: I744d66da3abd18753550692b931c6a1a52b83401

diff --git a/sc/source/core/data/documentimport.cxx 
b/sc/source/core/data/documentimport.cxx
index e0df2a2..bb638af 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -115,7 +115,7 @@ void ScDocumentImport::finalize()
 for (; itCell != itCellEnd; ++itCell)
 {
 itWidthPos = rCol.maTextWidths.setunsigned short(itWidthPos, 
itCell-nRow, TEXTWIDTH_DIRTY);
-itScriptPos = rCol.maScriptTypes.setunsigned 
short(itScriptPos, itCell-nRow, SC_SCRIPTTYPE_UNKNOWN);
+itScriptPos = rCol.maScriptTypes.setunsigned 
char(itScriptPos, itCell-nRow, SC_SCRIPTTYPE_UNKNOWN);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/source

[Julien Nabet]

 l10ntools/source/treemerge.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6bd878b29f43179c396bcb1ee7c0b1038e90007c
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed May 8 20:49:29 2013 +0200

coverity#1019374: Resource leak

Change-Id: If558758e3315879adf3034038f7ebe7315baf7a6

diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx
index 8f65ece..6f4bf6a 100644
--- a/l10ntools/source/treemerge.cxx
+++ b/l10ntools/source/treemerge.cxx
@@ -266,6 +266,7 @@ void TreeParser::Merge(
  language of Mergedata file: 
  m_sLang.getStr()   - 
  vLanguages[0].getStr()  std::endl;
+delete pMergeDataFile;
 return;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cppcanvas/source

[Thorsten Behrens]

 cppcanvas/source/inc/implrenderer.hxx |6 +-
 cppcanvas/source/mtfrenderer/emfplus.cxx  |5 -
 cppcanvas/source/mtfrenderer/implrenderer.cxx |3 +++
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 569f6b41c6d7dcdcc65a2d6a75018a3266936532
Author: Thorsten Behrens tbehr...@suse.com
Date:   Wed May 8 20:37:45 2013 +0200

Don't leak all of the EMF+ graphic objects.

Change-Id: I7951a9d25da5feec997dd0643f8579f5bcd0ee0f

diff --git a/cppcanvas/source/inc/implrenderer.hxx 
b/cppcanvas/source/inc/implrenderer.hxx
index addcdc2..79a2967 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -54,9 +54,13 @@ namespace cppcanvas
 {
 struct OutDevState;
 struct ActionFactoryParameters;
-struct EMFPObject;
 struct XForm;
 
+struct EMFPObject
+{
+virtual ~EMFPObject() {}
+};
+
 // state stack of OutputDevice, to correctly handle
 // push/pop actions
 class VectorOfOutDevStates
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 693a57c..c17c38e 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -110,11 +110,6 @@ namespace cppcanvas
 }
 #endif
 
-struct EMFPObject
-{
-virtual ~EMFPObject() {}
-};
-
 struct EMFPPath : public EMFPObject
 {
 ::basegfx::B2DPolyPolygonaPolygon;
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx 
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 635a5fb..5bc99a5 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -3038,6 +3038,9 @@ namespace cppcanvas
 
 ImplRenderer::~ImplRenderer()
 {
+// don't leak EMFPObjects
+for(unsigned int i=0; iSAL_N_ELEMENTS(aObjects); ++i)
+delete aObjects[i];
 }
 
 bool ImplRenderer::drawSubset( sal_Int32nStartIndex,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/source

[Julien Nabet]

 l10ntools/source/propmerge.cxx   |1 +
 l10ntools/source/stringmerge.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 9210f1a50a374b824f02fb43a57cd714d26c
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed May 8 20:53:42 2013 +0200

coverity#1019372/373: Resource leaks

Change-Id: I8d1facfa027701a4f249f14392f9b204e92180be

diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index cdbe9d2..ee715f7 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -179,6 +179,7 @@ void PropParser::Merge( const OString rMergeSrc, const 
OString rDestinationFil
  language of Mergedata file: 
  m_sLang.getStr()   - 
  vLanguages[0].getStr()  std::endl;
+delete pMergeDataFile;
 return;
 }
 }
diff --git a/l10ntools/source/stringmerge.cxx b/l10ntools/source/stringmerge.cxx
index 6ceb4b7..34c978b 100644
--- a/l10ntools/source/stringmerge.cxx
+++ b/l10ntools/source/stringmerge.cxx
@@ -107,6 +107,7 @@ void StringParser::Merge(
  language of Mergedata file: 
  m_sLang.getStr()   - 
  vLanguages[0].getStr()  std::endl;
+delete pMergeDataFile;
 return;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sd/source unotools/source

[Markus Mohrhard]

 sd/source/ui/controller/slidelayoutcontroller.cxx |2 +-
 unotools/source/i18n/localedatawrapper.cxx|6 --
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit a7adcf0ed0515357d8eaccab4562054b334ca59b
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed May 8 20:57:35 2013 +0200

make clear that this is a false positive report

diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx 
b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 922b17f..a2e83d3 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -205,7 +205,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( 
SlideLayoutController rController, const
 case DrawViewMode_DRAW: pInfo = standard[0]; break;
 case DrawViewMode_HANDOUT: pInfo = handout[0]; nColCount = 2; break;
 case DrawViewMode_NOTES: pInfo = notes[0]; nColCount = 1; break;
-default: break;
+default: assert(false); // can't happen, will crash later otherwise
 }
 
 mpLayoutSet1-SetColCount( nColCount );
commit 228659f0a60839e7a9de320509c60fa97d44cab6
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed May 8 20:48:14 2013 +0200

coverity#1019431: use of freed memory

diff --git a/unotools/source/i18n/localedatawrapper.cxx 
b/unotools/source/i18n/localedatawrapper.cxx
index 4934854..82b55c1 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -20,6 +20,7 @@
 
 #include string.h  // memcpy()
 #include stdio.h   // fprintf(), stderr
+#include string
 
 #include unotools/localedatawrapper.hxx
 #include unotools/numberformatcodewrapper.hxx
@@ -1168,7 +1169,7 @@ static sal_Unicode* ImplAdd2UNum( sal_Unicode* pBuf, 
sal_uInt16 nNumber, bool bL
 
 static sal_Unicode* ImplAdd9UNum( sal_Unicode* pBuf, sal_uInt32 nNumber, bool 
bLeading )
 {
-DBG_ASSERT( nNumber  10, ImplAdd2UNum() - Number = 10 
);
+DBG_ASSERT( nNumber  10, ImplAdd9UNum() - Number = 10 
);
 
 std::ostringstream ostr;
 if (bLeading)
@@ -1177,7 +1178,8 @@ static sal_Unicode* ImplAdd9UNum( sal_Unicode* pBuf, 
sal_uInt32 nNumber, bool bL
 ostr.width(9);
 }
 ostr  nNumber;
-for(const char *pAB=ostr.str().c_str(); *pAB != '\0'; ++pAB, ++pBuf)
+std::string aStr = ostr.str();
+for(const char *pAB= aStr.c_str(); *pAB != '\0'; ++pAB, ++pBuf)
 {
 *pBuf = *pAB;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source

[Kohei Yoshida]

 sc/source/core/data/column3.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit ee6c86684bdc672fe1e493b901f6bea1bc7c1e1f
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed May 8 15:15:15 2013 -0400

No need to check for broadcaster's presence here.

The old code did because it would then have to create a ScNoteCell to
optionally store the broadcaster. That's no longer the case.

Change-Id: I5e031270e0ed77425b2be192a1705c64c6fa8f45

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index e9ecd31..e36312b 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -328,10 +328,9 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE 
nEndIndex, sal_uInt16 nDe
 
 for ( SCSIZE nIdx = nStartIndex; nIdx = nEndIndex; ++nIdx )
 {
-SCROW nRow = maItems[nIdx].nRow;
-if (((nDelFlag  IDF_CONTENTS) == IDF_CONTENTS)  
maBroadcasters.is_empty(nRow))
+if (((nDelFlag  IDF_CONTENTS) == IDF_CONTENTS))
 {
-// all content is deleted and cell does not contain broadcaster
+// all content is to be deleted.
 
 ScBaseCell* pOldCell = maItems[ nIdx ].pCell;
 if (pOldCell-GetCellType() == CELLTYPE_FORMULA)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl]

 solenv/gbuild/platform/com_MSC_class.mk |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit fdf799585149aa872e1ef74adf2e73d5d056cf50
Author: Michael Stahl mst...@redhat.com
Date:   Wed May 8 21:07:42 2013 +0200

gbuild: MSVC avoid a warning from pyuno...

... which is caused by CPython's crazy naming convention that python
module DLLs need to have .pyd suffix, so substitute that too when
generating .pdb and .ilk filenames.

Change-Id: Iaba9bdfb4c67d5fca016a0552e5ce9b0bdeb12ea

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index d101c65..107e6e5 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -313,15 +313,16 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
 $(if $(filter $(gb_MERGEDLIBS),$(1)),,\
 $(call gb_Library_add_auxtarget,$(1),$(OUTDIR)/bin/$(notdir $(3
 
+# substitute .pyd here because pyuno has to follow python's crazy conventions
 ifneq ($(ENABLE_CRASHDUMP),)
 $(call gb_Library_add_auxtargets,$(1),\
-   $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
-   $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
+   $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(patsubst 
%.pyd,%.dll,$(3 \
+   $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(patsubst 
%.pyd,%.dll,$(3 \
 )
 else
 $(call gb_LinkTarget_add_auxtargets,$(2),\
-   $(patsubst %.dll,%.pdb,$(3)) \
-   $(patsubst %.dll,%.ilk,$(3)) \
+   $(patsubst %.dll,%.pdb,$(patsubst %.pyd,%.dll,$(3))) \
+   $(patsubst %.dll,%.ilk,$(patsubst %.pyd,%.dll,$(3))) \
 )
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits