Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options
On 11/07/2012 10:02 PM, David Ostrovsky wrote: On 07.11.2012 17:16, Tor Lillqvist wrote: If no one has any opinion on it, I'm going to name it --enable-symbols-only. I don't like that, as it strongly suggests that this option would cause some kind of lighter, symbol/address mapping only kind of data to be emitted, as opposed to full debug information. Which is doesn't, at least not for all platforms. Or am I missing something? no, you are right, it's the same symbol information as with full debug information (on all platforms). The difference between the two is only optimization: O | S | D | T -- production-code| x | - | - | - -- enable-symbols | x | x | - | - -- enable-debug | - | x | - | - -- enable-dbgutil | - | x | x | x where O: optimization S: symbols D: debug STL T: trace facility (If by T: trace facility you mean sal/log.hxx functionality compiled in, then that is x for enable-debug, too.) One problem with S: symbols is that symbols is a vague term here. Quoting http://lists.freedesktop.org/archives/libreoffice/2012-September/037977.html [Libreoffice-qa] minutes of ESC call ...: First of all, note that --enable-symbols is a misnomer. It is not per-se about any kind of symbols (like not stripping internal symbols on ELF, etc.), but rather about debugging information. (With GCC it enables -g 'Produce debugging information' [http://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/Debugging-Options.html#Debugging-Options] (or -g2, -ggdb2), with MSVC it enables /Zi 'enable debugging information' ['cl /?' output].) So to reflect what these options mean exactly one should name it as follows: enable-symbols: --enable-symbols-and-preserve-optimization enable-debug: --enable-symbols-and-disable-optimization enable-dbgutil: --enable-symbols-and-disable-optimization-and-enable-debugstl-and-enable-trace-facility Given that we don't want to rename two last options, we are trying to find a new (less confusing and not so long) name for the first one: --enable-symbols-and-preserve-optimization In light of the above, --enable-debugging-information or some shortening like --enable-debug-info? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/Configuration.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit bae23b5f78bca8c5c7e798d7a18e322d45d3cc33 Author: David Tardon dtar...@redhat.com Date: Thu Nov 8 09:04:07 2012 +0100 propagate dep on schemas from another configuration Change-Id: I1861fabd097249123688b22cded6e4a1b7557586 diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 1655e44..3315a62 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -393,6 +393,7 @@ $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_XcuDataTarget_get_clean_target,$(2)/$(3)) $(call gb_XcuDataTarget_get_target,$(2)/$(3)) : \ $(call gb_Configuration__get_source,$(1),$(2)/$(3)) \ + $(call gb_Configuration_get_preparation_target,$(1)) \ $(call gb_XcsTarget_for_XcuTarget,$(3)) $(call gb_XcuDataTarget_get_target,$(2)/$(3)) : XCUFILE := $(3) $(call gb_XcuDataTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3) @@ -425,6 +426,7 @@ $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_XcuModuleTarget_get_clean_target,$(2)/$(3)) $(call gb_XcuModuleTarget_get_target,$(2)/$(3)) : \ $(call gb_XcuDataSource_for_XcuModuleTarget,$(1),$(2)/$(3)) \ + $(call gb_Configuration_get_preparation_target,$(1)) \ $(call gb_XcsTarget_for_XcuModuleTarget,$(3)) $(call gb_XcuModuleTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3) ifeq ($(strip $(gb_Configuration_NODELIVER_$(1))),) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lpsolve/ccc.static
lpsolve/ccc.static | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) New commits: commit 77eb292dbaea0ec54563781a5df15a58868f4534 Author: Tor Lillqvist t...@iki.fi Date: Thu Nov 8 09:58:14 2012 +0200 Remove accidentally leftover plus signs Change-Id: I231f5ddc5809033acad1c6284c37fd54796ce1e4 diff --git a/lpsolve/ccc.static b/lpsolve/ccc.static index 3f9bba8..6911c4b 100644 --- a/lpsolve/ccc.static +++ b/lpsolve/ccc.static @@ -1,11 +1,11 @@ -+src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' -+obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'` -+ -+opts='-O3' -+ -+def= -+ -+$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src -+ls -l -+$AR -r liblpsolve55.a $obj -+rm $obj +src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' +obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'` + +opts='-O3' + +def= + +$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src + +$AR -r liblpsolve55.a $obj +rm $obj ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: librelogo/Module_librelogo.mk
librelogo/Module_librelogo.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit 2904b3a921a429f612e736c5c8f766daabe0e491 Author: Tor Lillqvist t...@iki.fi Date: Thu Nov 8 10:27:05 2012 +0200 Check DISABLE_SCRIPTING and DISABLE_PYTHON Change-Id: I31125a47e552b136bba8ff9253824bfa1de51cdf diff --git a/librelogo/Module_librelogo.mk b/librelogo/Module_librelogo.mk index cd0245d..6db9719 100644 --- a/librelogo/Module_librelogo.mk +++ b/librelogo/Module_librelogo.mk @@ -9,9 +9,15 @@ $(eval $(call gb_Module_Module,librelogo)) +ifneq ($(DISABLE_SCRIPTING),TRUE) +ifneq ($(DISABLE_PYTHON),TRUE) + $(eval $(call gb_Module_add_targets,librelogo,\ Configuration_librelogo \ Extension_librelogo \ )) +endif +endif + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: src/docrecord.py
src/docrecord.py | 21 ++--- 1 file changed, 10 insertions(+), 11 deletions(-) New commits: commit c9c82bb99e2e35202bba93dcaeeaaa92c2e3211a Author: Miklos Vajna vmik...@suse.cz Date: Thu Nov 8 09:33:16 2012 +0100 PlcPcd: clean up and make output a bit more readable diff --git a/src/docrecord.py b/src/docrecord.py index df79c24..733c4ca 100755 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -57,22 +57,21 @@ class PlcPcd(DOCDirStream): print 'plcPcd type=PlcPcd offset=%d size=%d bytes' % (self.pos, self.size) elements = (self.size - 4) / (4 + 8) # 8 is defined by 2.8.35, the rest is defined by 2.2.2 pos = self.pos -self.ranges = [] -self.aPcds = [] for i in range(elements): +# aCp start = struct.unpack(I, self.bytes[pos:pos+4])[0] end = struct.unpack(I, self.bytes[pos+4:pos+8])[0] -print 'aCP index=%d start=%d end=%d/' % (i, start, end) -self.ranges.append((start, end)) +print 'aCP index=%d start=%d end=%d' % (i, start, end) pos += 4 -for i in range(elements): + +# aPcd offset = self.pos + ( 4 * ( elements + 1 ) ) + ( 8 * i ) # 8 as defined by 2.8.35 -self.aPcds.append(Pcd(self.bytes, self.mainStream, offset, 8)) -self.aPcds[-1].dump() -for i, item in enumerate(self.ranges): -start, end = item -offset = self.aPcds[i].fc.getTransformedAddress() -print 'aCPTransformed index=%d value=%s/' % (i, globals.encodeName(self.mainStream.bytes[offset:offset+end-start])) +aPcd = Pcd(self.bytes, self.mainStream, offset, 8) +aPcd.dump() + +offset = aPcd.fc.getTransformedAddress() +print 'transformed value=%s/' % globals.encodeName(self.mainStream.bytes[offset:offset+end-start]) +print '/aCP' print '/plcPcd' class Pcdt(DOCDirStream): ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: inital build problem (master) SOLVED
Am 2012-11-07 13:26, schrieb Michael Meeks: Hi there, On Wed, 2012-11-07 at 13:12 +0100, oger000 wrote: Trying a build on a new machine I end up with attatched build_error.log (looks like lpsolve is the problem). It looks like downloading the source for those has silently failed The download did not fail and it was not silent [1] - but you are right anyway ;-) I think, that the directory-prefix in .wgetrc iterfered. So maybe its a good idea to ignore the existing wget config file by providing a custom (maybe empty) one? Build now succeed. Thanks gerhard [1] The make fetch (and ./download too) has a lot of following messages No filelist provided, using the default ooo.lst. 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz --2012-11-07 16:52:30-- http://dev-www.libreoffice.org/src/51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70 Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 3782207 (3.6M) [application/x-gzip] Server file no newer than local file `/home/gerhard/pool/wget/dev-www.libreoffice.org/src/51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz' -- not retrieving. Converted 0 files in 0 seconds. mv: cannot stat `51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz': No such file or directory c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 --2012-11-07 16:52:30-- http://dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70 Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 468395 (457K) [application/x-bzip] Server file no newer than local file `/home/gerhard/pool/wget/dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2' -- not retrieving. Converted 0 files in 0 seconds. mv: cannot stat `c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2': No such file or directory A ls -l ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: connectivity/CppunitTest_connectivity_ado.mk
connectivity/CppunitTest_connectivity_ado.mk |1 + 1 file changed, 1 insertion(+) New commits: commit b5cb48fa32bb55af0a9bcc630271c2cece0a3ece Author: David Ostrovsky da...@ostrovsky.org Date: Thu Nov 8 09:44:16 2012 +0100 add mkdir command Change-Id: I7a337ed15b86417faa5ac03089e8c315be95b717 diff --git a/connectivity/CppunitTest_connectivity_ado.mk b/connectivity/CppunitTest_connectivity_ado.mk index f837f99..7ce0941 100644 --- a/connectivity/CppunitTest_connectivity_ado.mk +++ b/connectivity/CppunitTest_connectivity_ado.mk @@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_configuration,connectivity_ado)) $(call gb_CppunitTest_get_target,connectivity_ado) : $(WORKDIR)/CppunitTest/TS001018407.mdb $(WORKDIR)/CppunitTest/TS001018407.mdb : $(SRCDIR)/connectivity/qa/connectivity/ado/TS001018407.mdb + mkdir -p $(WORKDIR)/CppunitTest $(call gb_Deliver_deliver,$,$@) # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: librelogo/source
librelogo/source/registry/data/org/openoffice/Office/Addons.xcu | 38 +- 1 file changed, 19 insertions(+), 19 deletions(-) New commits: commit 3be8c2274f6c7e19ce252711be13639bec2c74b8 Author: Andras Timar ati...@suse.com Date: Thu Nov 8 09:46:45 2012 +0100 librelogo: remove hardcoded version number Change-Id: Ida88fd3226eb1a1aafac6068268e18d5052dc601 diff --git a/librelogo/source/registry/data/org/openoffice/Office/Addons.xcu b/librelogo/source/registry/data/org/openoffice/Office/Addons.xcu index 3ad52bb..279395f 100644 --- a/librelogo/source/registry/data/org/openoffice/Office/Addons.xcu +++ b/librelogo/source/registry/data/org/openoffice/Office/Addons.xcu @@ -8,7 +8,7 @@ valuecom.sun.star.text.TextDocument/value /prop prop oor:name=URL oor:type=xs:string - valuevnd.sun.star.script:librelogo-0.2.oxt|LibreLogo|LibreLogo.py$goforward?language=Pythonamp;location=user:uno_packages/value + valuevnd.sun.star.script:librelogo.oxt|LibreLogo|LibreLogo.py$goforward?language=Pythonamp;location=user:uno_packages/value /prop prop oor:name=Title oor:type=xs:string value xml:lang=en-USForward/value @@ -22,7 +22,7 @@ valuecom.sun.star.text.TextDocument/value /prop prop oor:name=URL oor:type=xs:string - valuevnd.sun.star.script:librelogo-0.2.oxt|LibreLogo|LibreLogo.py$gobackward?language=Pythonamp;location=user:uno_packages/value + valuevnd.sun.star.script:librelogo.oxt|LibreLogo|LibreLogo.py$gobackward?language=Pythonamp;location=user:uno_packages/value /prop prop oor:name=Title oor:type=xs:string value xml:lang=en-USBack/value @@ -36,7 +36,7 @@ valuecom.sun.star.text.TextDocument/value /prop prop oor:name=URL oor:type=xs:string - valuevnd.sun.star.script:librelogo-0.2.oxt|LibreLogo|LibreLogo.py$left?language=Pythonamp;location=user:uno_packages/value + valuevnd.sun.star.script:librelogo.oxt|LibreLogo|LibreLogo.py$left?language=Pythonamp;location=user:uno_packages/value /prop prop oor:name=Title oor:type=xs:string value xml:lang=en-USLeft/value @@ -50,7 +50,7 @@ valuecom.sun.star.text.TextDocument/value /prop prop oor:name=URL oor:type=xs:string - valuevnd.sun.star.script:librelogo-0.2.oxt|LibreLogo|LibreLogo.py$right?language=Pythonamp;location=user:uno_packages/value + valuevnd.sun.star.script:librelogo.oxt|LibreLogo|LibreLogo.py$right?language=Pythonamp;location=user:uno_packages/value /prop prop oor:name=Title oor:type=xs:string value xml:lang=en-USRight/value @@ -64,7 +64,7 @@ valuecom.sun.star.text.TextDocument/value /prop prop oor:name=URL oor:type=xs:string - valuevnd.sun.star.script:librelogo-0.2.oxt|LibreLogo|LibreLogo.py$run?language=Pythonamp;location=user:uno_packages/value + valuevnd.sun.star.script:librelogo.oxt|LibreLogo|LibreLogo.py$run?language=Pythonamp;location=user:uno_packages/value /prop prop oor:name=Title oor:type=xs:string value xml:lang=en-USStart (the program in the Writer document)/value @@ -78,7 +78,7 @@ valuecom.sun.star.text.TextDocument/value /prop prop oor:name=URL oor:type=xs:string - valuevnd.sun.star.script:librelogo-0.2.oxt|LibreLogo|LibreLogo.py$stop?language=Pythonamp;location=user:uno_packages/value + valuevnd.sun.star.script:librelogo.oxt|LibreLogo|LibreLogo.py$stop?language=Pythonamp;location=user:uno_packages/value /prop prop oor:name=Title oor:type=xs:string value xml:lang=en-USStop/value @@ -92,7 +92,7 @@ valuecom.sun.star.text.TextDocument/value /prop prop oor:name=URL oor:type=xs:string - valuevnd.sun.star.script:librelogo-0.2.oxt|LibreLogo|LibreLogo.py$home?language=Pythonamp;location=user:uno_packages/value + valuevnd.sun.star.script:librelogo.oxt|LibreLogo|LibreLogo.py$home?language=Pythonamp;location=user:uno_packages/value /prop prop oor:name=Title oor:type=xs:string value
Re: inital build problem (master) SOLVED
Hi Gerhard, oger000 píše v Čt 08. 11. 2012 v 09:39 +0100: I think, that the directory-prefix in .wgetrc iterfered. So maybe its a good idea to ignore the existing wget config file by providing a custom (maybe empty) one? Would be great to send a patch, if you can :-) - hopefully might be enough to add --directory-prefix=. (or something) to the wget invocation command line for now? All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - configure.ac
configure.ac | 54 --
1 file changed, 28 insertions(+), 26 deletions(-)
New commits:
commit cb59a80743f9fc268828124707aca131a9b84b9c
Author: Tor Lillqvist t...@iki.fi
Date: Thu Nov 8 10:54:42 2012 +0200
Untabify where appropriate
Some TABs had sneaked in again. The intent is that no TABs are used in
this file, except in the couple of makefiles embedded as here
documents where TABs must be used because that is what Make requires.
Change-Id: Ia72968ae69aafd7c484cf8d47f6a9b1cfb12d24d
diff --git a/configure.ac b/configure.ac
index 38a3f28..200092a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7789,7 +7789,7 @@ if test x$enable_postgresql_sdbc != xno; then
POSTGRESQL_LIB=
POSTGRESQL_INC=%OVERRIDE_ME%
BUILD_TYPE=$BUILD_TYPE POSTGRESQL
-
POSTGRESQL_TARBALL=061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2
+
POSTGRESQL_TARBALL=061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2
fi
fi
if test ${SYSTEM_POSTGRESQL} = YES; then
@@ -9509,8 +9509,8 @@ if test -n $enable_sdremote -a $enable_sdremote !=
no; then
if test -n $enable_bluetooth -a $enable_bluetooth != no; then
if test $OS = LINUX; then
if test $ENABLE_DBUS = TRUE; then
- AC_MSG_RESULT([yes])
- ENABLE_BLUETOOTH=YES
+AC_MSG_RESULT([yes])
+ENABLE_BLUETOOTH=YES
dnl
===
dnl Check for system bluez
dnl
===
@@ -9523,15 +9523,15 @@ if test -n $enable_sdremote -a $enable_sdremote !=
no; then
AC_MSG_RESULT([internal])
BUILD_TYPE=$BUILD_TYPE BLUEZ
fi
- else
- AC_MSG_RESULT([no, dbus disabled])
- ENABLE_BLUETOOTH=NO
- fi
- else
- AC_MSG_RESULT([no])
- ENABLE_BLUETOOTH=NO
- fi
- fi
+else
+AC_MSG_RESULT([no, dbus disabled])
+ENABLE_BLUETOOTH=NO
+fi
+else
+AC_MSG_RESULT([no])
+ENABLE_BLUETOOTH=NO
+fi
+fi
else
ENABLE_SDREMOTE=NO
AC_MSG_RESULT([no])
@@ -9553,14 +9553,14 @@ if test $test_gtk = yes; then
PKG_CHECK_MODULES(GTHREAD, gthread-2.0,,AC_MSG_ERROR([requirements to
build the gtk-plugin not met. Use --disable-gtk or install the missing
packages]))
BUILD_TYPE=$BUILD_TYPE GTK
- AC_MSG_CHECKING([whether to enable the systray quickstarter])
+AC_MSG_CHECKING([whether to enable the systray quickstarter])
if test x$enable_systray = xyes; then
- AC_MSG_RESULT([yes])
+AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( GTK210, gtk+-2.0 = 2.10.0,
[ ENABLE_SYSTRAY_GTK=TRUE ],
[ ENABLE_SYSTRAY_GTK= ])
else
- AC_MSG_RESULT([no])
+AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([whether to enable Gtk print dialog support])
commit 386d7762aee953f052c945bd1039bb01ead66182
Author: Tor Lillqvist t...@iki.fi
Date: Thu Nov 8 10:53:14 2012 +0200
Avoid pointless warning when building experimental code anyway
Change-Id: Ied9a4fb4eed0a7fda8e6b1bd03a3dbc476797587
diff --git a/configure.ac b/configure.ac
index e2e9d67..38a3f28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2732,22 +2732,24 @@ if test $_os = Darwin; then
esac
fi
-case $with_macosx_version_min_required in
-10.4)
-case $with_macosx_sdk in
+if test $BITNESS_OVERRIDE == ; then
+case $with_macosx_version_min_required in
10.4)
+case $with_macosx_sdk in
+10.4)
+;;
+*)
+AC_MSG_WARN([Building with a SDK 10.4 possibly breaks 10.4
compatibility. Do not use for deliverable build until verified that it really
works])
+add_warning Building with a SDK 10.4 possibly breaks 10.4
compatibility. Do not use for deliverable build until verified that it really
works
+;;
+esac
;;
*)
-AC_MSG_WARN([Building with a SDK 10.4 possibly breaks 10.4
compatibility. Do not use for deliverable build until verified that it really
works])
-add_warning Building with a SDK 10.4 possibly breaks 10.4
compatibility. Do not use for deliverable build until verified that it really
works
+AC_MSG_WARN([Building with a minimum version requirement 10.4
breaks 10.4 compatibility. Do not use for deliverable build])
+add_warning Building with
[Libreoffice-commits] .: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7f26dac751473045b894e97ca4090957bbb865cd Author: Tor Lillqvist t...@iki.fi Date: Thu Nov 8 11:01:26 2012 +0200 Fix thinko Change-Id: I84f023a906671a5dfc99e1c6c0a74ae317258dde diff --git a/configure.ac b/configure.ac index 200092a..b018638 100644 --- a/configure.ac +++ b/configure.ac @@ -2732,7 +2732,7 @@ if test $_os = Darwin; then esac fi -if test $BITNESS_OVERRIDE == ; then +if test $BITNESS_OVERRIDE = ; then case $with_macosx_version_min_required in 10.4) case $with_macosx_sdk in ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/app/swmodul1.cxx|8
sw/source/ui/inc/pview.hxx |5 -
sw/source/ui/inc/view.hxx|6 ++
sw/source/ui/uiview/pview.cxx| 27 +++
sw/source/ui/uiview/view.cxx |4 ++--
sw/source/ui/uiview/viewmdi.cxx | 19 +--
sw/source/ui/uiview/viewport.cxx |9 +
7 files changed, 69 insertions(+), 9 deletions(-)
New commits:
commit 28f2c6b826f1693dc5136d552e5446d3d52aa329
Author: Ivan Timofeev timofeev@gmail.com
Date: Thu Nov 8 12:47:21 2012 +0400
fdo#35427: repair Tools Options Writer View - Show Scroll Slider
options
Change-Id: I2bacd52a182a2dba3dbe6c6d63861470e87b6066
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 0e5027a..b0621bd 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -84,11 +84,11 @@ static void lcl_SetUIPrefs(const SwViewOption rPref,
SwView* pView, ViewShell*
// Scrollbars on / off
if(bVScrollChanged)
{
-pView-ShowVScrollbar(pNewPref-IsViewVScrollBar());
+pView-EnableVScrollbar(pNewPref-IsViewVScrollBar());
}
if(bHScrollChanged)
{
-pView-ShowHScrollbar( pNewPref-IsViewHScrollBar() ||
pNewPref-getBrowseMode() );
+pView-EnableHScrollbar( pNewPref-IsViewHScrollBar() ||
pNewPref-getBrowseMode() );
}
//if only the position of the vertical ruler has been changed initiate an
update
if(bVAlignChanged !bHScrollChanged !bVScrollChanged)
@@ -163,8 +163,8 @@ void SwModule::ApplyUsrPref(const SwViewOption rUsrPref,
SwView* pActView,
{
if(!bViewOnly)
pPref-SetUIOptions( rUsrPref );
-pPPView-ShowVScrollbar(pPref-IsViewVScrollBar());
-pPPView-ShowHScrollbar(pPref-IsViewHScrollBar());
+pPPView-EnableVScrollbar(pPref-IsViewVScrollBar());
+pPPView-EnableHScrollbar(pPref-IsViewHScrollBar());
if(!bViewOnly)
{
pPref-SetPagePrevRow(rUsrPref.GetPagePrevRow());
diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx
index 9cd0870..0ccf301 100644
--- a/sw/source/ui/inc/pview.hxx
+++ b/sw/source/ui/inc/pview.hxx
@@ -193,6 +193,8 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell
// MDI control elements
SwScrollbar *pHScrollbar;
SwScrollbar *pVScrollbar;
+boolmbHScrollbarEnabled;
+boolmbVScrollbarEnabled;
ImageButton *pPageUpBtn,
*pPageDownBtn;
// dummy window for filling the lower right edge when both scrollbars are
active
@@ -269,8 +271,9 @@ public:
voidScrollViewSzChg();
voidScrollDocSzChg();
voidShowHScrollbar(sal_Bool bShow);
-
voidShowVScrollbar(sal_Bool bShow);
+voidEnableHScrollbar(bool bEnable);
+voidEnableVScrollbar(bool bEnable);
sal_uInt16 GetPageCount() const{ return mnPageCount; }
sal_uInt16 GetSelectedPage() const {return aViewWin.SelectedPage();}
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 3494ed9..f32fcd9 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -210,6 +210,9 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SwScrollbar *pHScrollbar, // MDI control elements
*pVScrollbar;
+boolmbHScrollbarEnabled;
+boolmbVScrollbarEnabled;
+
Window *pScrollFill; // dummy window for filling the lower
right edge
// when both scrollbars are active
@@ -506,6 +509,9 @@ public:
voidShowVScrollbar(sal_Bool bShow);
sal_BoolIsVScrollbarVisible()const;
+voidEnableHScrollbar(bool bEnable);
+voidEnableVScrollbar(bool bEnable);
+
int CreateVLineal();
int KillVLineal();
int CreateTab();
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index f91e676..b06fc44 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1142,6 +1142,9 @@ void SwPagePreView::Init(const SwViewOption * pPrefs)
if( !pPrefs )
pPrefs = SW_MOD()-GetUsrPref(sal_False);
+mbHScrollbarEnabled = pPrefs-IsViewHScrollBar();
+mbVScrollbarEnabled = pPrefs-IsViewVScrollBar();
+
// die Felder aktualisieren
// ACHTUNG: hochcasten auf die EditShell, um die SS zu nutzen.
// In den Methoden wird auf die akt. Shell abgefragt!
@@ -1661,6 +1664,9 @@ void SwPagePreView::ScrollViewSzChg()
bShowVScrollbar = true;
}
+if (!mbVScrollbarEnabled)
+bShowVScrollbar = false;
+
ShowVScrollbar(bShowVScrollbar);
pPageUpBtn-Show(bShowVScrollbar);
[Libreoffice-commits] .: 3 commits - configure.ac solenv/gbuild tools/Library_tl.mk
configure.ac|6 +- solenv/gbuild/platform/WNT_INTEL_GCC.mk |5 +++-- tools/Library_tl.mk |8 3 files changed, 8 insertions(+), 11 deletions(-) New commits: commit 3d4c9f20c2e468e28f4d217d66862de2cb1cb365 Author: Jan Holesovsky ke...@suse.cz Date: Thu Nov 8 10:16:36 2012 +0100 MinGW: Silence [build LNK]. ie. don't show Creating library file: message. Change-Id: Ic6e40ac8955e4b8677cec57c51e2346901133e0a diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index c54a710..f1e7d28 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -161,7 +161,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(LIBS) \ -Wl$(COMMA)-Map$(COMMA)$(dir $(1))$(notdir $(basename $(DLLTARGET)).map) \ -Wl$(COMMA)--out-implib$(COMMA)$(1) \ - -o $(dir $(1))/$(notdir $(DLLTARGET + -o $(dir $(1))/$(notdir $(DLLTARGET))) \ + $(if $(findstring s,$(MAKEFLAGS)), /dev/null)) endef define gb_LinkTarget__command_staticlinklibrary @@ -174,7 +175,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ - $(if $(findstring s,$(MAKEFLAGS)),2 /dev/null)) + $(if $(findstring s,$(MAKEFLAGS)), /dev/null)) endef define gb_LinkTarget__command commit 02084b175fd3cbaa77889b102e4e0ed41b0cae45 Author: Jan Holesovsky ke...@suse.cz Date: Thu Nov 8 09:43:13 2012 +0100 Revert Don't export zlib symbols Not needed after having fixed the MinGW visibility checks. This reverts commit 2f0b0e54f45cd9694d07d9e0399cd39bc465c09e. diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 98ee848..cd8afec 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -106,14 +106,6 @@ $(eval $(call gb_Library_use_external,tl,zlib)) ifeq ($(OS),WNT) -ifeq ($(COM),GCC) - -$(eval $(call gb_Library_add_libs,tl,\ --Wl$(COMMA)--exclude-libs=libzlib.a \ -)) - -endif - $(eval $(call gb_Library_set_include,tl,\ -I$(SRCDIR)/tools/win/inc \ $$(INCLUDE) \ commit f102d993270fbb7b429cec5c34cfd73acfe213b1 Author: Jan Holesovsky ke...@suse.cz Date: Thu Nov 8 09:41:32 2012 +0100 MinGW: Fix visibility checks. Change-Id: I7f2718a60d55f5d99275646875a64e53c805b210 diff --git a/configure.ac b/configure.ac index b018638..09d4722 100644 --- a/configure.ac +++ b/configure.ac @@ -342,6 +342,10 @@ cygwin*|interix*|mingw32*) _os=WINNT use_shl_version=TRUE DYNAMIC_CRT=TRUE + +DLLPOST=.dll +LINKFLAGSNOUNDEFS= + # If the host OS matches mingw32*, that means we are using the # MinGW cross-compiler, because we don't see the point in building # LibreOffice using MinGW on Windows. If you want to build on @@ -5572,7 +5576,7 @@ _ACEOF else case $host_cpu in i?86|x86_64) -if test $_os = Darwin; then +if test $_os = Darwin -o $WITH_MINGW = yes; then gccvisbroken=no else if $EGREP -q '@PLT|@GOT' visibility.s; then ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options
On 07/11/12 22:02, David Ostrovsky wrote: On 07.11.2012 17:16, Tor Lillqvist wrote: If no one has any opinion on it, I'm going to name it --enable-symbols-only. I don't like that, as it strongly suggests that this option would cause some kind of lighter, symbol/address mapping only kind of data to be emitted, as opposed to full debug information. Which is doesn't, at least not for all platforms. Or am I missing something? no, you are right, it's the same symbol information as with full debug information (on all platforms). The difference between the two is only optimization: O | S | D | T -- production-code| x | - | - | - -- enable-symbols | x | x | - | - -- enable-debug | - | x | - | - -- enable-dbgutil| - | x | x | x where O: optimization S: symbols D: debug STL T: trace facility actually --enable-debug also sets OSL_DEBUG_LEVEL (enables tracing). also --enable-dbgutil defines DBG_UTIL which causes some extra debugging/checking code to be enabled. (and it used to be the case that --enable-dbgutil by itself left optimization enabled but apparently nowadays it disables that.) So to reflect what these options mean exactly one should name it as follows: enable-symbols: --enable-symbols-and-preserve-optimization enable-debug: --enable-symbols-and-disable-optimization enable-dbgutil: --enable-symbols-and-disable-optimization-and-enable-debugstl-and-enable-trace-facility Given that we don't want to rename two last options, we are trying to find a new (less confusing and not so long) name for the first one: --enable-symbols-and-preserve-optimization Ideas? hmm.. actually i don't like --enable-symbols much because symbols could refer to linker symbols when what is really meant is symbolic debugging information. but then again --enable-symbols has been used for many years in this project so people are already used to it :) how about --enable-release-debuginfo ? --enable-product-debuginfo ? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: liblangtag/prj
liblangtag/prj/d.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c26d253eaffcffcecfe91bc7d210ccbe47c1786e Author: Jan Holesovsky ke...@suse.cz Date: Thu Nov 8 10:45:15 2012 +0100 MinGW: Deliver liblangtag-1.dll correctly. Change-Id: Icea86ae6f6c07d43c212bc02defb860759ff65d6 diff --git a/liblangtag/prj/d.lst b/liblangtag/prj/d.lst index ace7299..eb9b32c 100644 --- a/liblangtag/prj/d.lst +++ b/liblangtag/prj/d.lst @@ -1,7 +1,7 @@ mkdir: %_DEST%\inc\liblangtag ..\%__SRC%\inc\*%_DEST%\inc\liblangtag\ -..\%__SRC%\bin\liblangtag-0.dll %_DEST%\bin\ +..\%__SRC%\bin\liblangtag-*.dll %_DEST%\bin\ ..\%__SRC%\lib\liblangtag.so* %_DEST%\lib\ ..\%__SRC%\lib\langtag.lib* %_DEST%\lib\ ..\%__SRC%\lib\liblangtag*.dylib%_DEST%\lib\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salnativewidgets-luna.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit c02d3ac6a49533108d7649cd9edc37f4bafb90f5 Author: Jan Holesovsky ke...@suse.cz Date: Thu Nov 8 10:50:51 2012 +0100 Windows: Enable nicer toolbars even for XP, not only Vista and higher. Change-Id: I26837290d1416637032d2dfcfa45b4003c874309 diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 5ba45ab..abb6f48 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -1466,6 +1466,9 @@ void WinSalGraphics::updateSettingsNative( AllSettings rSettings ) StyleSettings aStyleSettings = rSettings.GetStyleSettings(); ImplSVData* pSVData = ImplGetSVData(); +// don't draw frame around each and every toolbar +pSVData-maNWFData.mbDockingAreaAvoidTBFrames = true; + // check if vista or newer runs // in Aero theme (and similar ?) the menu text color does not change // for selected items; also on WinXP and earlier menus are not themed @@ -1478,9 +1481,6 @@ void WinSalGraphics::updateSettingsNative( AllSettings rSettings ) pSVData-maNWFData.mnMenuFormatBorderY = 2; pSVData-maNWFData.maMenuBarHighlightTextColor = aStyleSettings.GetMenuTextColor(); GetSalData()-mbThemeMenuSupport = TRUE; - -// don't draw frame around each and every toolbar -pSVData-maNWFData.mbDockingAreaAvoidTBFrames = true; } rSettings.SetStyleSettings( aStyleSettings ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options
On Thu, Nov 8, 2012 at 2:01 AM, Stephan Bergmann sberg...@redhat.com wrote: One problem with S: symbols is that symbols is a vague term here. http://www.network-theory.co.uk/docs/gccintro/gccintro_37.html The debug compilation option works by storing the names and source code line-numbers of functions and variables in a 'symbol' table in the object file or executable. My understanding of --enable-symbol is that it provide additional info so that a backtrace contain human-friendly info even for 'local function' (i.e the one that are resolved at compile time not at link time). How that is implemented is platform specific, and the fact that on some platform it is indistinguishable from --enable-debug-info is irrelevant. for me --enable-debug-info add enough to allow me to step through the code using a debugger, having all the variables name, line number etc, which is _not_ what --enable-symbol is aiming at. It is not per-se about any kind of symbols (like not stripping internal symbols on ELF, etc.), but yes it is very much about symbols and not stripping them and making sure that there is enough of them (more than strictly necessary for the linker and kept in after link) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: src/docrecord.py src/docstream.py
src/docrecord.py | 65 +++ src/docstream.py |8 +- 2 files changed, 72 insertions(+), 1 deletion(-) New commits: commit c0510ac30c70de86d60a84a1c3f6d27f46c90ccb Author: Miklos Vajna vmik...@suse.cz Date: Thu Nov 8 11:11:56 2012 +0100 doc: show paragraph boundaries diff --git a/src/docrecord.py b/src/docrecord.py index 733c4ca..90fc1d2 100755 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -74,6 +74,71 @@ class PlcPcd(DOCDirStream): print '/aCP' print '/plcPcd' +class PapxFkp(DOCDirStream): +The PapxFkp structure maps paragraphs, table rows, and table cells to their properties. +def __init__(self, bytes, mainStream, offset, size): +DOCDirStream.__init__(self, mainStream.bytes) +self.pos = offset +self.size = size + +def dump(self): +print 'papxFkp type=PapxFkp offset=%d size=%d bytes' % (self.pos, self.size) +self.cpara = ord(struct.unpack(c, self.bytes[self.pos+self.size-1:self.pos+self.size-1+1])[0]) +pos = self.pos +for i in range(self.cpara): +# aFC +start = struct.unpack(I, self.bytes[pos:pos+4])[0] +end = struct.unpack(I, self.bytes[pos+4:pos+8])[0] +print 'rgfc index=%d start=%d end=%d' % (i, start, end) +print 'transformed value=%s/' % globals.encodeName(self.bytes[start:end]) +print '/rgfc' +pos += 4 + +self.printAndSet(cpara, self.cpara) +print '/papxFkp' + +class PnFkpPapx(DOCDirStream): +The PnFkpPapx structure specifies the offset of a PapxFkp in the WordDocument Stream. +def __init__(self, bytes, mainStream, offset, size, name): +DOCDirStream.__init__(self, bytes, mainStream=mainStream) +self.pos = offset +self.size = size +self.name = name + +def dump(self): +print '%s type=PnFkpPapx offset=%d size=%d bytes' % (self.name, self.pos, self.size) +buf = struct.unpack(I, self.bytes[self.pos:self.pos+4])[0] +self.pos += 4 +self.printAndSet(pn, buf (2**22-1)) +papxFkp = PapxFkp(self.bytes, self.mainStream, self.pn*512, 512) +papxFkp.dump() +print '/%s' % self.name + +class PlcBtePapx(DOCDirStream): +The PlcBtePapx structure is a PLC that specifies paragraph, table row, or table cell properties. +def __init__(self, bytes, mainStream, offset, size): +DOCDirStream.__init__(self, bytes, mainStream=mainStream) +self.pos = offset +self.size = size + +def dump(self): +print 'plcBtePapx type=PlcBtePapx offset=%d size=%d bytes' % (self.pos, self.size) +elements = (self.size - 4) / (4 + 4) # TODO dedicated PLC class +pos = self.pos +for i in range(elements): +# aFC +start = struct.unpack(I, self.bytes[pos:pos+4])[0] +end = struct.unpack(I, self.bytes[pos+4:pos+8])[0] +print 'aFC index=%d start=%d end=%d' % (i, start, end) +pos += 4 + +# aPnBtePapx +offset = self.pos + ( 4 * ( elements + 1 ) ) + ( 4 * i ) +aPnBtePapx = PnFkpPapx(self.bytes, self.mainStream, offset, 4, aPnBtePapx) +aPnBtePapx.dump() +print '/aFC' +print '/plcBtePapx' + class Pcdt(DOCDirStream): The Pcdt structure contains a PlcPcd structure and specifies its size. def __init__(self, bytes, mainStream, offset, size): diff --git a/src/docstream.py b/src/docstream.py index f14dba5..338232d 100755 --- a/src/docstream.py +++ b/src/docstream.py @@ -214,7 +214,7 @@ class WordDocumentStream(DOCDirStream): [fcPlcfBteChpx], [lcbPlcfBteChpx], [fcPlcfBtePapx], -[lcbPlcfBtePapx], +[lcbPlcfBtePapx, self.handleLcbPlcfBtePapx], [fcPlcfSea], [lcbPlcfSea], [fcSttbfFfn], @@ -387,6 +387,12 @@ class WordDocumentStream(DOCDirStream): clx = docrecord.Clx(self.doc.getDirectoryStreamByName(1Table).bytes, self, offset, size) clx.dump() +def handleLcbPlcfBtePapx(self): +offset = self.fcPlcfBtePapx +size = self.lcbPlcfBtePapx +plcBtePapx = docrecord.PlcBtePapx(self.doc.getDirectoryStreamByName(1Table).bytes, self, offset, size) +plcBtePapx.dump() + def dumpFibRgFcLcb97(self, name): print '%s type=FibRgFcLcb97 size=744 bytes' % name self.__dumpFibRgFcLcb97() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options
On 08/11/12 11:05, Norbert Thiebaud wrote: On Thu, Nov 8, 2012 at 2:01 AM, Stephan Bergmann sberg...@redhat.com wrote: One problem with S: symbols is that symbols is a vague term here. http://www.network-theory.co.uk/docs/gccintro/gccintro_37.html The debug compilation option works by storing the names and source code line-numbers of functions and variables in a 'symbol' table in the object file or executable. My understanding of --enable-symbol is that it provide additional info so that a backtrace contain human-friendly info even for 'local function' (i.e the one that are resolved at compile time not at link time). How that is implemented is platform specific, and the fact that on some platform it is indistinguishable from --enable-debug-info is irrelevant. for me --enable-debug-info add enough to allow me to step through the code using a debugger, having all the variables name, line number etc, which is _not_ what --enable-symbol is aiming at. yes, it is! you need accurate per-line debuginfo both to get line numbers in crash backtrace (which is really necessary in our codebase with functions that may have 1000 lines) (also the extra stuff printed by our gdb python helpers is quite useful to have in backtrace) and also for profiling, because you want to know which of the 5 loops in some function eats all the time. that is why --enable-symbols adds -g to compiler commands. It is not per-se about any kind of symbols (like not stripping internal symbols on ELF, etc.), but yes it is very much about symbols and not stripping them and making sure that there is enough of them (more than strictly necessary for the linker and kept in after link) --enable-symbols also used to disable some stripping somewhere but that is nowadays ~irrelevant because gbuild (AFAIK) doesn't strip anything anyway. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: librelogo/source
librelogo/source/help/en-US/LibreLogo.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e549e16f581e4589b96128ec30180c418164ab93 Author: Andras Timar ati...@suse.com Date: Thu Nov 8 11:47:36 2012 +0100 set context sensitive help for LibreLogo toolbar Change-Id: I0bf59fb14fb7257c1e51572c8f8fa2a3b1fb2fa7 diff --git a/librelogo/source/help/en-US/LibreLogo.xhp b/librelogo/source/help/en-US/LibreLogo.xhp index 7d6539d..a148f20 100644 --- a/librelogo/source/help/en-US/LibreLogo.xhp +++ b/librelogo/source/help/en-US/LibreLogo.xhp @@ -14,7 +14,7 @@ bookmark_valueLogo/bookmark_value bookmark_valueTurtle graphics/bookmark_value /bookmark - +bookmark xml-lang=en-US branch=hid/.HelpId:addon_LibreLogo.OfficeToolBar id=bm2 localize=false/ paragraph role=heading level=1 xml-lang=en-US id=hd_170LibreLogo/paragraph paragraph role=paragraph xml-lang=en-US id=par_180LibreLogo is a simple, native, Logo-like programming environment with turtle vector graphics for teaching of computing (programming and word processing), DTP and graphic design. See http://www.numbertext.org/logo/librelogo.pdf./paragraph paragraph role=heading level=2 xml-lang=en-US id=hd_220LibreLogo toolbar/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |9 librelogo/source/LibreLogoDummy.py | 10 + librelogo/source/help/en-US/LibreLogo.xhp | 11 +- librelogo/source/pythonpath/librelogodummy_path.py | 10 + librelogo/source/registry/data/org/openoffice/Office/Addons.xcu | 10 + librelogo/source/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu | 10 + librelogo/source/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu | 10 + 7 files changed, 69 insertions(+), 1 deletion(-) New commits: commit 639c1043260c7737e46eb0bead2f5bbe1e758edf Author: Andras Timar ati...@suse.com Date: Thu Nov 8 12:01:03 2012 +0100 missing license headers (librelogo) Change-Id: I9712e9b2910ae3aa44e93958067433d00d23b824 diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index 9a45b2b..acea6dc 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1,5 +1,12 @@ # -*- encoding: UTF-8 -*- # -*- 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/. +# import sys, os, uno, unohelper import re, random, traceback, itertools import threading, time as __time__ @@ -1405,3 +1412,5 @@ g_ImplementationHelper = unohelper.ImplementationHelper() g_ImplementationHelper.addImplementation( \ None,org.openoffice.script.LibreLogo, \ (org.openoffice.script.ServiceLibreLogo,),) + +# vim: set noet sw=4 ts=4: diff --git a/librelogo/source/LibreLogoDummy.py b/librelogo/source/LibreLogoDummy.py index 1d65ff4..fc3ef12 100644 --- a/librelogo/source/LibreLogoDummy.py +++ b/librelogo/source/LibreLogoDummy.py @@ -1,3 +1,11 @@ +# -*- 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/. +# # dummy UNO component to get the path of the localizations import uno, unohelper, os, sys from com.sun.star.lang import XMain @@ -12,3 +20,5 @@ class LibreLogoDummyComponent(XMain, unohelper.Base): g_ImplementationHelper = unohelper.ImplementationHelper() g_ImplementationHelper.addImplementation( \ LibreLogoDummyComponent,org.openoffice.comp.pyuno.LibreLogoDummy,(org.openoffice.LibreLogo.LibreLogoDummy,),) + +# vim: set noet sw=4 ts=4: diff --git a/librelogo/source/help/en-US/LibreLogo.xhp b/librelogo/source/help/en-US/LibreLogo.xhp index a148f20..0d21a86 100644 --- a/librelogo/source/help/en-US/LibreLogo.xhp +++ b/librelogo/source/help/en-US/LibreLogo.xhp @@ -1,6 +1,15 @@ ?xml version=1.0 encoding=UTF-8? - helpdocument version=1.0 + +!-- + * 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/. + * +-- + meta topic id=LibreLogo indexer=include status=PUBLISH title id=titleLibreLogo/title diff --git a/librelogo/source/pythonpath/librelogodummy_path.py b/librelogo/source/pythonpath/librelogodummy_path.py index f600a16..3ab8495 100644 --- a/librelogo/source/pythonpath/librelogodummy_path.py +++ b/librelogo/source/pythonpath/librelogodummy_path.py @@ -1,3 +1,13 @@ +# -*- 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/. +# import uno, re, sys, os, traceback def get_path(): return os.path.join(os.path.dirname(sys.modules[__name__].__file__), __name__ + .py) + +# vim: set noet sw=4 ts=4: diff --git a/librelogo/source/registry/data/org/openoffice/Office/Addons.xcu b/librelogo/source/registry/data/org/openoffice/Office/Addons.xcu index 279395f..0220f78 100644 --- a/librelogo/source/registry/data/org/openoffice/Office/Addons.xcu +++ b/librelogo/source/registry/data/org/openoffice/Office/Addons.xcu @@ -1,4 +1,14 @@ ?xml version='1.0' encoding='UTF-8'? + +!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at
Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options
On 07.11.2012 22:02, David Ostrovsky wrote: So to reflect what these options mean exactly one should name it as follows: enable-symbols: --enable-symbols-and-preserve-optimization enable-debug: --enable-symbols-and-disable-optimization enable-dbgutil: --enable-symbols-and-disable-optimization-and-enable-debugstl-and-enable-trace-facility Given that we don't want to rename two last options, we are trying to find a new (less confusing and not so long) name for the first one: --enable-symbols-and-preserve-optimization Ideas? After some discussion the candidates are: --enable-symbols (just leave the old name in place) --enable-symbols-and-preserve-optimization --enable-debug-info --enable-debugging-information --enable-release-debuginfo --enable-product-debuginfo Decision? Regards David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
default CUPS printing format Re: [PATCH] fdo#44664: printer truncates Landscape orientation pages to ...
replying on list because there are some wider issues with this... this patch appears to change the default format for printing via CUPS from PDF to PostScript. this was changed from PostScript to PDF in OOo 3.3. apparently there are some printers or CUPS setups that don't work well with PDF as a default, the bug appears to have a long CC: list: https://bugs.freedesktop.org/show_bug.cgi?id=44664 but i don't think that changing the default format back to PS is the solution here, because PDF is the designated default print format for Linux systems: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat it appears to me that there are good reasons for that; also we do not know how many systems happen to work better with PDF as default than with PS because we never shipped a LO version with PS as default. i find it quite likely that we would get many regression reports with this change. but it should probably be possible to somehow change the format from PDF to PS via the configuration for those users that are affected by current problems. the real fix for this is most likely to file bugs against CUPS and/or specific printer drivers that exhibit these problems, so that we can get to reliably working PDF printing on Linux systems in time. On 07/11/12 23:10, Lior Kaplan (via Code Review) wrote: Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1003 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/1003/1 fdo#44664: printer truncates Landscape orientation pages to Portrait dimensions Change-Id: I0554d38367a0b00fdc1e3b7fb72d4ad5d537a254 --- M vcl/unx/generic/printer/cupsmgr.cxx 1 file changed, 2 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1003 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0554d38367a0b00fdc1e3b7fb72d4ad5d537a254 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Lior Kaplan kaplanl...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options
On Thu, Nov 8, 2012 at 5:15 AM, David Ostrovsky david.ostrov...@gmx.de wrote: Decision? the ones who wanted it removed surely don't care since they do not use it. the ones who used it have done so for quite a while under the current name... Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options
the ones who used it have done so for quite a while under the current name... But surely what we strive for with all of this is not to make things easier for people who already know what something means, and know that they want it, or know that they don't want it? We want to make the meaning of these configure options as self-documenting as possible to total newbies, right? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: download
download |8
1 file changed, 8 insertions(+)
New commits:
commit 6a0ba09f19f2be35ce33a4aef197b0d3e1915388
Author: Michael Stahl mst...@redhat.com
Date: Thu Nov 8 12:53:30 2012 +0100
download: check that mv succeeds too
As reported on list, may fail with weird wget config files...
Change-Id: I258809c3488181dcc7584f5349930287dfacb7b8
diff --git a/download b/download
index 4ceb866..637642d 100755
--- a/download
+++ b/download
@@ -150,9 +150,17 @@ downloaditem()
mv $2 ${i}_broken
else
mv $2 ..
+if [ $? -ne 0 ]; then
+echo cannot mv $2 to destination 21 | tee -a $logfile
+failed=$failed $2
+fi
fi
else
mv $2 ..
+if [ $? -ne 0 ]; then
+echo cannot mv $2 to destination 21 | tee -a $logfile
+failed=$failed $2
+fi
fi
fi
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options
On Thu, 2012-11-08 at 09:01 +0100, Stephan Bergmann wrote: In light of the above, --enable-debugging-information or some shortening like --enable-debug-info? Ooh - I like it :-) Indeed the double meaning of symbols is rather annoying there; debuginfo is a cleaner concept at least for Linux users. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 56460, which changed state. Bug 56460 Summary: CRASH when closing specific .odg files https://bugs.freedesktop.org/show_bug.cgi?id=56460 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/inc svx/source
svx/inc/svx/svdoashp.hxx |4 +++-
svx/source/svdraw/svdoashp.cxx | 40 +++-
2 files changed, 14 insertions(+), 30 deletions(-)
New commits:
commit 67f899e1d2db0dccde4b9587a52b7157fe1fb0be
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 7 21:26:26 2012 +
Resolves: fdo#56460 don't crash on close of files with custom shapes
Change-Id: Ib9e7cdae3c7facb59c4630ca21c252698170379e
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 8b91894..efbfac2 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -101,10 +101,12 @@ public:
com::sun::star::uno::Reference com::sun::star::drawing::XShape
mXRenderedCustomShape;
+mutable com::sun::star::uno::Reference
com::sun::star::drawing::XCustomShapeEngine mxCustomShapeEngine;
+
// #i37011# render geometry shadow
SdrObject* mpLastShadowGeometry;
-static com::sun::star::uno::Reference
com::sun::star::drawing::XCustomShapeEngine GetCustomShapeEngine( const
SdrObjCustomShape* pCustomShape );
+com::sun::star::uno::Reference
com::sun::star::drawing::XCustomShapeEngine GetCustomShapeEngine() const;
// SVX_DLLPRIVATE com::sun::star::uno::Sequence
com::sun::star::uno::Reference com::sun::star::drawing::XCustomShapeHandle
// SdrObjCustomShape::GetInteraction( const SdrObjCustomShape*
pCustomShape ) const;
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index e3b69ad..0a07979 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -96,13 +96,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::drawing;
-
-// A simple one item cache really helps here ...
-namespace {
-static const SdrObjCustomShape *g_pLastCacheShape;
-static Reference XCustomShapeEngine g_xLastCacheShapeEngine;
-}
-
static void lcl_ShapeSegmentFromBinary( EnhancedCustomShapeSegment rSegInfo,
sal_uInt16 nSDat )
{
switch( nSDat 8 )
@@ -405,21 +398,18 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject
rOriginal, const SfxItemS
-Reference XCustomShapeEngine SdrObjCustomShape::GetCustomShapeEngine( const
SdrObjCustomShape* pCustomShape )
+Reference XCustomShapeEngine SdrObjCustomShape::GetCustomShapeEngine() const
{
-Reference XCustomShapeEngine xCustomShapeEngine;
-
-// We get dozens of back-to-back calls for the same shape
-if( pCustomShape == g_pLastCacheShape )
-return g_xLastCacheShapeEngine;
+if (mxCustomShapeEngine.is())
+return mxCustomShapeEngine;
-String aEngine(((SdrCustomShapeEngineItem)pCustomShape-GetMergedItem(
SDRATTR_CUSTOMSHAPE_ENGINE )).GetValue());
+String aEngine(((SdrCustomShapeEngineItem)GetMergedItem(
SDRATTR_CUSTOMSHAPE_ENGINE )).GetValue());
if ( !aEngine.Len() )
aEngine = String( RTL_CONSTASCII_USTRINGPARAM (
com.sun.star.drawing.EnhancedCustomShapeEngine ) );
Reference XMultiServiceFactory xFactory(
::comphelper::getProcessServiceFactory() );
-Reference XShape aXShape = GetXShapeForSdrObject(
(SdrObjCustomShape*)pCustomShape );
+Reference XShape aXShape =
GetXShapeForSdrObject(const_castSdrObjCustomShape*(this));
if ( aXShape.is() )
{
if ( aEngine.Len() xFactory.is() )
@@ -431,21 +421,18 @@ Reference XCustomShapeEngine
SdrObjCustomShape::GetCustomShapeEngine( const S
aArgument[ 0 ] = aPropValues;
Reference XInterface xInterface(
xFactory-createInstanceWithArguments( aEngine, aArgument ) );
if ( xInterface.is() )
-xCustomShapeEngine = Reference XCustomShapeEngine (
xInterface, UNO_QUERY );
+mxCustomShapeEngine = Reference XCustomShapeEngine (
xInterface, UNO_QUERY );
}
}
-g_pLastCacheShape = pCustomShape;
-g_xLastCacheShapeEngine = xCustomShapeEngine;
-
-return xCustomShapeEngine;
+return mxCustomShapeEngine;
}
const SdrObject* SdrObjCustomShape::GetSdrObjectFromCustomShape() const
{
if ( !mXRenderedCustomShape.is() )
{
-Reference XCustomShapeEngine xCustomShapeEngine(
GetCustomShapeEngine( this ) );
+Reference XCustomShapeEngine xCustomShapeEngine(
GetCustomShapeEngine() );
if ( xCustomShapeEngine.is() )
((SdrObjCustomShape*)this)-mXRenderedCustomShape =
xCustomShapeEngine-render();
}
@@ -577,7 +564,7 @@ sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle
rTextBound ) const
{
sal_Bool bRet = sal_False;
-Reference XCustomShapeEngine xCustomShapeEngine( GetCustomShapeEngine(
this ) );
+Reference XCustomShapeEngine xCustomShapeEngine( GetCustomShapeEngine()
);
if ( xCustomShapeEngine.is() )
{
awt::Rectangle aR(
[Libreoffice-commits] .: src/docrecord.py
src/docrecord.py | 127 +--
1 file changed, 124 insertions(+), 3 deletions(-)
New commits:
commit 06c86aabd78af0d22f4a9a84b7e2728f51acb696
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Nov 8 12:53:21 2012 +0100
dump Sprm records
diff --git a/src/docrecord.py b/src/docrecord.py
index 90fc1d2..a448c15 100755
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -74,6 +74,122 @@ class PlcPcd(DOCDirStream):
print '/aCP'
print '/plcPcd'
+class Sprm(DOCDirStream):
+The Sprm structure specifies a modification to a property of a
character, paragraph, table, or section.
+def __init__(self, bytes, offset):
+DOCDirStream.__init__(self, bytes)
+self.pos = offset
+self.operandSizeMap = {
+0: 1,
+1: 1,
+2: 2,
+3: 4,
+4: 2,
+5: 2,
+# 6: variable,
+7: 3,
+}
+
+self.sprm = struct.unpack(H, self.bytes[self.pos:self.pos+2])[0]
+self.pos += 2
+
+self.ispmd = (self.sprm 0x1ff)# 1-9th bits
+self.fSpec = (self.sprm 0x200) 9 # 10th bit
+self.sgc = (self.sprm 0x1c00) 10 # 11-13th bits
+self.spra = (self.sprm 0xe000) 13 # 14-16th bits
+
+if self.operandSizeMap[self.spra] == 1:
+self.operand = ord(struct.unpack(c,
self.bytes[self.pos:self.pos+1])[0])
+elif self.operandSizeMap[self.spra] == 2:
+self.operand = struct.unpack(H,
self.bytes[self.pos:self.pos+2])[0]
+elif self.operandSizeMap[self.spra] == 4:
+self.operand = struct.unpack(I,
self.bytes[self.pos:self.pos+4])[0] # TODO generalize this
+else:
+self.operand = todo
+
+def dump(self):
+sgcmap = {
+1: 'paragraph',
+2: 'character',
+3: 'picture',
+4: 'section',
+5: 'table'
+}
+print 'sprm value=%s ispmd=%s fSpec=%s sgc=%s spra=%s
operandSize=%s operand=%s/' % (
+hex(self.sprm), hex(self.ispmd), hex(self.fSpec),
sgcmap[self.sgc], hex(self.spra), self.getOperandSize(), hex(self.operand)
+)
+
+def getOperandSize(self):
+return self.operandSizeMap[self.spra]
+
+class Prl(DOCDirStream):
+The Prl structure is a Sprm that is followed by an operand.
+def __init__(self, bytes, offset):
+DOCDirStream.__init__(self, bytes)
+self.pos = offset
+
+def dump(self):
+print 'prl type=Prl offset=%d' % self.pos
+self.sprm = Sprm(self.bytes, self.pos)
+self.pos += 2
+self.sprm.dump()
+print '/prl'
+
+def getSize(self):
+return 2 + self.sprm.getOperandSize()
+
+class GrpPrlAndIstd(DOCDirStream):
+The GrpPrlAndIstd structure specifies the style and properties that are
applied to a paragraph, a table row, or a table cell.
+def __init__(self, bytes, offset, size):
+DOCDirStream.__init__(self, bytes)
+self.pos = offset
+self.size = size
+
+def dump(self):
+print 'grpPrlAndIstd type=GrpPrlAndIstd offset=%d size=%d
bytes' % (self.pos, self.size)
+pos = self.pos
+self.printAndSet(istd, struct.unpack(H,
self.bytes[self.pos:self.pos+2])[0])
+pos += 2
+while (self.size - (pos - self.pos)) 0:
+prl = Prl(self.bytes, pos)
+prl.dump()
+pos += prl.getSize()
+print '/grpPrlAndIstd'
+
+class PapxInFkp(DOCDirStream):
+The PapxInFkp structure specifies a set of text properties.
+def __init__(self, bytes, mainStream, offset):
+DOCDirStream.__init__(self, bytes)
+self.pos = offset
+
+def dump(self):
+print 'papxInFkp type=PapxInFkp offset=%d' % self.pos
+self.printAndSet(cb, ord(struct.unpack(c,
self.bytes[self.pos:self.pos+1])[0]))
+self.pos += 1
+if self.cb == 0:
+self.printAndSet(cb_, ord(struct.unpack(c,
self.bytes[self.pos:self.pos+1])[0]))
+self.pos += 1
+grpPrlAndIstd = GrpPrlAndIstd(self.bytes, self.pos, 2 * self.cb_)
+grpPrlAndIstd.dump()
+else:
+print 'todo what=PapxInFkp::dump() first byte is not 0/'
+print '/papxInFkp'
+
+class BxPap(DOCDirStream):
+The BxPap structure specifies the offset of a PapxInFkp in PapxFkp.
+def __init__(self, bytes, mainStream, offset, size, parentoffset):
+DOCDirStream.__init__(self, bytes)
+self.pos = offset
+self.size = size
+self.parentpos = parentoffset
+
+def dump(self):
+print 'bxPap type=BxPap offset=%d size=%d bytes' % (self.pos,
self.size)
+self.printAndSet(bOffset, ord(struct.unpack(c,
self.bytes[self.pos:self.pos+1])[0]))
+papxInFkp = PapxInFkp(self.bytes, self.mainStream, self.parentpos +
[Libreoffice-commits] .: librelogo/source
librelogo/source/LibreLogo/LibreLogo.py |2 - librelogo/source/help/en-US/LibreLogo.xhp |6 ++--- librelogo/source/registry/data/org/openoffice/Office/Addons.xcu | 12 -- 3 files changed, 5 insertions(+), 15 deletions(-) New commits: commit cdea8177d1053543e285c4a382edb9099792078a Author: László Németh nem...@numbertext.org Date: Thu Nov 8 12:46:21 2012 +0100 LibreLogo fixes (default properties file, help, tooltip) Change-Id: Id9f878c0cf59e75fbd5e2f056e48f0d6a7da108c diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index acea6dc..fd33a53 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -1262,7 +1262,7 @@ def __compil__(s): __loadlang__(_.lng, __l12n__(_.lng)) except: __trace__() -_.lng = 'en' +_.lng = 'en_US' if not _.lng in __comp__: __loadlang__(_.lng, __l12n__(_.lng)) diff --git a/librelogo/source/help/en-US/LibreLogo.xhp b/librelogo/source/help/en-US/LibreLogo.xhp index 0d21a86..2a4bd87 100644 --- a/librelogo/source/help/en-US/LibreLogo.xhp +++ b/librelogo/source/help/en-US/LibreLogo.xhp @@ -74,12 +74,12 @@ paragraph role=heading level=2 xml-lang=en-US id=hd_530Other features of LibreLogo/paragraph list type=unordered listitem -paragraph role=listitem xml-lang=en-US id=par_540The colon is optional before the variables (like in the Berkeley Logo)/paragraph +paragraph role=listitem xml-lang=en-US id=par_540The colon is optional before the variable names./paragraph paragraph role=code xml-lang=en-US id=par_550#160;TO#160;triangle#160;sizebr/#160;#160;#160;REPEAT#160;3#160;[#160;FORWARD#160;size#160;LEFT#160;120#160;]br/#160;ENDbr//paragraph /listitem listitem -paragraph role=paragraph xml-lang=en-US id=par_560String notation supports also orthographical and Python syntax:/paragraph -paragraph role=code xml-lang=en-US id=par_570#160;PRINT#160;word ;#160;original#160;Logo#160;syntaxbr/#160;PRINT#160;âArbitrary#160;text.â ;#160;orthography,#160;Writerbr/#160;PRINT#160;'Arbitrary#160;text.' ;#160;Python#160;syntaxbr//paragraph +paragraph role=paragraph xml-lang=en-US id=par_560String notation supports also orthographical and Python syntax./paragraph +paragraph role=code xml-lang=en-US id=par_570#160;PRINT#160;word ;#160;original#160;Logo#160;syntaxbr/#160;PRINT#160;âArbitrary#160;text.â ;#160;orthography,#160;Writerbr/#160;PRINT#160;'Arbitrary#160;text.' ;#160;Python#160;syntaxbr//paragraph /listitem listitem paragraph role=paragraph xml-lang=en-US id=par_580Python list and string handling/paragraph diff --git a/librelogo/source/registry/data/org/openoffice/Office/Addons.xcu b/librelogo/source/registry/data/org/openoffice/Office/Addons.xcu index 0220f78..3f608d7 100644 --- a/librelogo/source/registry/data/org/openoffice/Office/Addons.xcu +++ b/librelogo/source/registry/data/org/openoffice/Office/Addons.xcu @@ -130,17 +130,7 @@ valuevnd.sun.star.script:librelogo.oxt|LibreLogo|LibreLogo.py$commandline?language=Pythonamp;location=user:uno_packages/value /prop prop oor:name=Title oor:type=xs:string -value xml:lang=en-USFORWARD (fd), BACK (bk), LEFT (lt), RIGHT (rt) ⢠fd 72, bk 1cm + 1in + 1, lt 90, rt 1.5h -REPEAT num [ commands ], REPCOUNT ⢠repeat 100 [ fd repcount lt 91 ] -PENUP (pu), PENDOWN (pd), FILL, CLOSE, HOME, CLEARSCREEN (cs), PENSIZE (ps 5) -PENCOLOR (pc), FILLCOLOR (fc) ⢠pc âredâ, pc 0xff, fc [255, 0, 0], fc any -POSITION (pos), HEADING (seth) ⢠pos [0, 0], pos pagesize, seth 60, seth [0, 0] -CIRCLE, ELLIPSE, BOX, RECTANGLE ⢠circle 10 ellipse [5, 9] box 10 rectangle [5, 2] -LABEL, TEXT, PRINT ⢠label âSome textâ, circle 200 text âcenter of the actual shapeâ -FONTFAMILY âFontâ FONTSIZE 9 FONTCOLOR âredâ FONTWEIGHT âboldâ -TO name arguments ... END, TO name arguments, OUTPUT return_value, END -RANDOM, SQRT, INT, COUNT, ABS, SIN, COS, INPUT ⢠ps random 100, print count âstringâ -PICTURE (pic) [ ... ] ⢠group different shapes: pic [ fd 100 circle 50 ]/value +value xml:lang=en-USLogo command line (press F1 here for help)/value /prop prop oor:name=Target oor:type=xs:string value_self/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sfx2/source
sfx2/source/bastyp/fltfnc.cxx |1 -
sfx2/source/control/dispatch.cxx|2 --
sfx2/source/dialog/dinfdlg.cxx |5 -
sfx2/source/dialog/securitypage.cxx |5 -
4 files changed, 13 deletions(-)
New commits:
commit a599f5b4b51848e3b397d471c9d12b373caadcef
Author: jailletc36 christophe.jail...@wanadoo.fr
Date: Thu Nov 8 07:25:02 2012 +0100
cppCheck: Unused variable and Redundant assignment
Change-Id: I67084c1cb9dc23eb77787d2a6d57a5b70126873c
Signed-off-by: jailletc36 christophe.jail...@wanadoo.fr
Reviewed-on: https://gerrit.libreoffice.org/1005
Reviewed-by: Radek DoulÃk r...@novell.com
Tested-by: Radek DoulÃk r...@novell.com
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 14df8c4..60de316 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -1147,7 +1147,6 @@ void SfxFilterContainer::ReadFilters_Impl( sal_Bool
bUpdate )
SfxFilter* pFilter;
for ( size_t i = 0, n = rList.size(); i n; ++i )
{
-pFilter = NULL;
pFilter = rList[ i ];
pFilter-nFormatType |= SFX_FILTER_NOTINSTALLED;
}
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 069273e..935077c 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2073,7 +2073,6 @@ SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16
nConfigId,Window *pWin, co
SfxDispatcher rDisp = *SFX_APP()-GetDispatcher_Impl();
sal_uInt16 nShLevel = 0;
SfxShell *pSh;
-nShLevel=0;
if ( rDisp.pImp-bQuiet )
{
@@ -2101,7 +2100,6 @@ void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId,
Window *pWin, const Poin
sal_uInt16 nShLevel = 0;
SfxShell *pSh;
-nShLevel=0;
if ( rDisp.pImp-bQuiet )
{
nConfigId = 0;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index ee59b5e..99d7dbf 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2321,11 +2321,6 @@ CustomPropertiesControl::CustomPropertiesControl(
Window* pParent, const ResId
m_aVertScroll.SetPageSize( nVisibleEntries - 1 );
m_aVertScroll.SetVisibleSize( nVisibleEntries );
-Point aPos = m_aHeaderBar.GetPosPixel();
-Size aSize = m_aHeaderBar.GetSizePixel();
-aPos = m_aVertScroll.GetPosPixel();
-aSize = m_aVertScroll.GetSizePixel();
-
Link aScrollLink = LINK( this, CustomPropertiesControl, ScrollHdl );
m_aVertScroll.SetScrollHdl( aScrollLink );
}
diff --git a/sfx2/source/dialog/securitypage.cxx
b/sfx2/source/dialog/securitypage.cxx
index ffa3a7a..b4de6af 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -200,11 +200,6 @@ SfxSecurityPage_Impl::SfxSecurityPage_Impl(
SfxSecurityPage rTabPage, const Sfx
m_bEndRedliningWarningDone ( false )
{
m_aChangeProtectionPB.SetText( m_aProtectSTR );
-// adjust button width if necessary
-long nBtnTextWidth = 0;
-long nTemp = m_aChangeProtectionPB.GetCtrlTextWidth(
m_aChangeProtectionPB.GetText() );
-if (nTemp nBtnTextWidth)
-nBtnTextWidth = nTemp;
// force toggle hdl called before visual change of checkbox
m_aRecordChangesCB.SetStyle( m_aRecordChangesCB.GetStyle() |
WB_EARLYTOGGLE );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] cppCheck: Unused variable and Redundant assignment
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1005 Approvals: Radek Doulík: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1005 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I67084c1cb9dc23eb77787d2a6d57a5b70126873c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christophe JAILLET christophe.jail...@wanadoo.fr Gerrit-Reviewer: Radek Doulík r...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.ac ooo.lst.in
config_host.mk.in | 20 configure.ac | 50 +- ooo.lst.in| 46 +- 3 files changed, 90 insertions(+), 26 deletions(-) New commits: commit bc5cff54c3965e526657a4a4b4637e68a36f5e52 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Nov 8 12:17:17 2012 +0100 ooo.lst: these appear to be unused Change-Id: I8f237a4ff438d8b57a458c17f3d13934fd4b5407 diff --git a/ooo.lst.in b/ooo.lst.in index 44f71db..5f7420f 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -3,10 +3,6 @@ http://dev-www.libreoffice.org/src 7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz -bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 -d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip -e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt -0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz @AFMS_TARBALL@ @APACHE_COMMONS_CODEC_TARBALL@ @APACHE_COMMONS_HTTPCLIENT_TARBALL@ commit f6abeab070c861689b10961a6134a0c550d5d568 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Nov 8 12:16:19 2012 +0100 move more tarball names to configure Change-Id: I10e3a1f9d375ded2087b7bbd9c3d98b35e7868be diff --git a/config_host.mk.in b/config_host.mk.in index 9f44d80..59e6f47 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -31,6 +31,7 @@ export ATL_INCLUDE=@ATL_INCLUDE@ export ATL_LIB=@ATL_LIB@ export AWTLIB=@AWTLIB@ export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@ +export BERKELEYDB_TARBALL=@BERKELEYDB_TARBALL@ export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@ export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@ export BOOST_LDFLAGS=@BOOST_LDFLAGS@ @@ -47,6 +48,7 @@ export BUILD_VER_STRING=@BUILD_VER_STRING@ export BUILD_X64=@BUILD_X64@ export CAIRO_CFLAGS=@CAIRO_CFLAGS@ export CAIRO_LIBS=@CAIRO_LIBS@ +export CAIRO_TARBALL=@CAIRO_TARBALL@ export CC=@CC@ export CC_FOR_BUILD=@CC_FOR_BUILD@ export CDR_CFLAGS=@CDR_CFLAGS@ @@ -76,6 +78,7 @@ export COMP_ENV=@OUTPATH@ export COM_FOR_BUILD=@COM_FOR_BUILD@ export CPPUNIT_CFLAGS=@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=@CPPUNIT_LIBS@ +export CPPUNIT_TARBALL=@CPPUNIT_TARBALL@ export CPU=@CPU@ export CPUNAME=@CPUNAME@ export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@ @@ -273,6 +276,7 @@ export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@ export ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=@ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER@ export ICU_RECLASSIFIED_HEBREW_LETTER=@ICU_RECLASSIFIED_HEBREW_LETTER@ export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@ +export ICU_TARBALL=@ICU_TARBALL@ export ILIB=@ILIB@ export INPATH=@INPATH@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@ @@ -308,6 +312,7 @@ export LANGUAGETOOL_TARBALL=@LANGUAGETOOL_TARBALL@ export L10N_MODULE=@L10N_MODULE@ export LCMS2_CFLAGS=@LCMS2_CFLAGS@ export LCMS2_LIBS=@LCMS2_LIBS@ +export LCMS2_TARBALL==@LCMS2_TARBALL@ ifneq ($(strip @LDFLAGS@),) export LDFLAGS=@LDFLAGS@ endif @@ -318,11 +323,13 @@ export LIBEXSLT_CFLAGS=@LIBEXSLT_CFLAGS@ export LIBEXSLT_LIBS=@LIBEXSLT_LIBS@ export LIBEXTTEXTCAT_CFLAGS=@LIBEXTTEXTCAT_CFLAGS@ export LIBEXTTEXTCAT_LIBS=@LIBEXTTEXTCAT_LIBS@ +export LIBEXTTEXTCAT_TARBALL=@LIBEXTTEXTCAT_TARBALL@ export LIBFONTS_JAR=@LIBFONTS_JAR@ export LIBFORMULA_JAR=@LIBFORMULA_JAR@ export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@ export LIBLANGTAG_CFLAGS=@LIBLANGTAG_CFLAGS@ export LIBLANGTAG_LIBS=@LIBLANGTAG_LIBS@ +export LIBLANGTAG_TARBALL=@LIBLANGTAG_TARBALL@ export LIBLOADER_JAR=@LIBLOADER_JAR@ export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@ export LIBMYSQL_PATH=@LIBMYSQL_PATH@ @@ -333,8 +340,11 @@ export LIBSERIALIZER_JAR=@LIBSERIALIZER_JAR@ export LIBXML_CFLAGS=@LIBXML_CFLAGS@ export LIBXML_JAR=@LIBXML_JAR@ export LIBXML_LIBS=@LIBXML_LIBS@ +export LIBXML_TARBALL=@LIBXML_TARBALL@ +export LIBXMLSEC_TARBALL=@LIBXMLSEC_TARBALL@ export LIBXSLT_CFLAGS=@LIBXSLT_CFLAGS@ export LIBXSLT_LIBS=@LIBXSLT_LIBS@ +export LIBXSLT_TARBALL=@LIBXSLT_TARBALL@ export LINK_X64_BINARY=@LINK_X64_BINARY@ export LPSOLVE_TARBALL=@LPSOLVE_TARBALL@ @x_Cygwin@ export LS=@WIN_LS@ @@ -427,6 +437,7 @@ export MSPUB_TARBALL=@MSPUB_TARBALL@ export MYSQL_DEFINES=@MYSQL_DEFINES@ export MYSQL_INC=@MYSQL_INC@ export MYSQL_LIB=@MYSQL_LIB@ +export MYSQLCPPCONN_TARBALL=@MYSQLCPPCONN_TARBALL@ export MYTHES_CFLAGS=@MYTHES_CFLAGS@ export MYTHES_LIBS=@MYTHES_LIBS@ export MYTHES_TARBALL=@MYTHES_TARBALL@ @@ -438,6 +449,7 @@ export NM=@NM@ export nodep=@nodep@ export NSS_CFLAGS=@NSS_CFLAGS@ export NSS_LIBS=@NSS_LIBS@ +export NSS_TARBALL=@NSS_TARBALL@ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@ ifneq ($(strip @OBJCFLAGS@),) export OBJCFLAGS=@OBJCFLAGS@ @@ -458,6 +470,7 @@ export OOO_VENDOR=@OOO_VENDOR@ export OPENLDAP_TARBALL=@OPENLDAP_TARBALL@ export OPENSSL_CFLAGS=@OPENSSL_CFLAGS@ export
[Libreoffice-commits] .: configure.ac
configure.ac |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0ab6421028ba715dfc7c152d0185333e0a5f79f9
Author: Tor Lillqvist t...@iki.fi
Date: Thu Nov 8 14:38:57 2012 +0200
Use -ffunction-sections for Android
Part of work towards making the linker more eager to drop unused
functions from the output file.
Change-Id: Id4edb50ef4048f02277a13885b5f81707cb9c8a3
diff --git a/configure.ac b/configure.ac
index ef6a3d8..0829514 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,6 +194,7 @@ if test -n $with_android_ndk; then
ANDROID_APP_ABI=x86
ANDROIDCFLAGS=-march=atom
fi
+ANDROIDCFLAGS=$ANDROIDCFLAGS -ffunction-sections
ANDROIDCFLAGS=$ANDROIDCFLAGS -Wno-psabi --sysroot
$ANDROID_NDK_HOME/platforms/android-9/arch-$android_cpu
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/$ANDROID_APP_ABI
# When using the 4.6 or newer toolchain, use the gold linker
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - android/experimental
android/experimental/DocumentLoader/Makefile |2 +- android/experimental/LibreOffice4Android/Makefile |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 62b4827f238acabd970a98272967d7c2b0545ea2 Author: Tor Lillqvist t...@iki.fi Date: Thu Nov 8 15:10:38 2012 +0200 Use --gc-sections Change-Id: I6694f1820dc8c2cdae2522357932ab0065754a75 diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 4123a21..15c6a0a 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -49,7 +49,7 @@ properties: link-so: # Build the single .so for this app mkdir -p $(OBJLOCAL) - $(CXX) -Wl,-Map,liblo-native-code.map -Wl,--stats -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz + $(CXX) -Wl,-Map,liblo-native-code.map -Wl,--gc-sections -Wl,--stats -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz mkdir -p $(SODEST) cp $(OBJLOCAL)/liblo-native-code.so $(SODEST) $(STRIP) --strip-debug $(SODEST)/liblo-native-code.so diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 6798e40..c823ebf 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -24,7 +24,7 @@ APP_PACKAGE=org.libreoffice link-so: # Build the single .so for this app mkdir -p $(OBJLOCAL) - $(CXX) -Wl,-Map,liblo-native-code.map -Wl,--stats -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz + $(CXX) -Wl,-Map,liblo-native-code.map -Wl,--gc-sections -Wl,--stats -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz mkdir -p $(SODEST) cp $(OBJLOCAL)/liblo-native-code.so $(SODEST) $(STRIP) --strip-debug $(SODEST)/liblo-native-code.so commit 8d32dc82e6336ab71e35599d42f058e4c23a44f8 Author: Tor Lillqvist t...@iki.fi Date: Thu Nov 8 15:09:40 2012 +0200 Produce a linker map Change-Id: Iff4f7be61310884dea1c29f6fe931dd35cadc552 diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index d9e7c88..4123a21 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -49,7 +49,7 @@ properties: link-so: # Build the single .so for this app mkdir -p $(OBJLOCAL) - $(CXX) -Wl,--stats -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz + $(CXX) -Wl,-Map,liblo-native-code.map -Wl,--stats -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz mkdir -p $(SODEST) cp $(OBJLOCAL)/liblo-native-code.so $(SODEST) $(STRIP) --strip-debug $(SODEST)/liblo-native-code.so diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index f81e814..6798e40 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -24,7 +24,7 @@ APP_PACKAGE=org.libreoffice link-so: # Build the single .so for this app mkdir -p $(OBJLOCAL) - $(CXX) -Wl,--stats -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz + $(CXX) -Wl,-Map,liblo-native-code.map -Wl,--stats -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz mkdir -p $(SODEST) cp $(OBJLOCAL)/liblo-native-code.so $(SODEST) $(STRIP) --strip-debug $(SODEST)/liblo-native-code.so ___ Libreoffice-commits mailing list
[Libreoffice-commits] .: src/docrecord.py
src/docrecord.py | 32 +--- 1 file changed, 21 insertions(+), 11 deletions(-) New commits: commit fd62984a7b2b8a44184a5674e7bbfeb7e97d7f8c Author: Miklos Vajna vmik...@suse.cz Date: Thu Nov 8 14:51:24 2012 +0100 avoid code duplication by adding a PLC class diff --git a/src/docrecord.py b/src/docrecord.py index a448c15..884dc10 100755 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -24,7 +24,7 @@ class FcCompressed(DOCDirStream): if self.fCompressed: return self.fc/2 else: -print TODO FcCompressed: fCompressed = 0 not supported +print 'todo what=FcCompressed: fCompressed = 0 not supported/' class Pcd(DOCDirStream): The Pcd structure specifies the location of text in the WordDocument Stream and additional properties for this text. @@ -46,18 +46,30 @@ class Pcd(DOCDirStream): self.pos += 4 print '/pcd' -class PlcPcd(DOCDirStream): +class PLC: +The PLC structure is an array of character positions followed by an array of data elements. +def __init__(self, totalSize, structSize): +self.totalSize = totalSize +self.structSize = structSize + +def getElements(self): +return (self.totalSize - 4) / (4 + self.structSize) # defined by 2.2.2 + +def getOffset(self, pos, i): +return pos + (4 * (self.getElements() + 1)) + (self.structSize * i) + +class PlcPcd(DOCDirStream, PLC): The PlcPcd structure is a PLC whose data elements are Pcds (8 bytes each). def __init__(self, bytes, mainStream, offset, size): DOCDirStream.__init__(self, bytes, mainStream=mainStream) +PLC.__init__(self, size, 8) # 8 is defined by 2.8.35 self.pos = offset self.size = size def dump(self): print 'plcPcd type=PlcPcd offset=%d size=%d bytes' % (self.pos, self.size) -elements = (self.size - 4) / (4 + 8) # 8 is defined by 2.8.35, the rest is defined by 2.2.2 pos = self.pos -for i in range(elements): +for i in range(self.getElements()): # aCp start = struct.unpack(I, self.bytes[pos:pos+4])[0] end = struct.unpack(I, self.bytes[pos+4:pos+8])[0] @@ -65,8 +77,7 @@ class PlcPcd(DOCDirStream): pos += 4 # aPcd -offset = self.pos + ( 4 * ( elements + 1 ) ) + ( 8 * i ) # 8 as defined by 2.8.35 -aPcd = Pcd(self.bytes, self.mainStream, offset, 8) +aPcd = Pcd(self.bytes, self.mainStream, self.getOffset(self.pos, i), 8) aPcd.dump() offset = aPcd.fc.getTransformedAddress() @@ -235,18 +246,18 @@ class PnFkpPapx(DOCDirStream): papxFkp.dump() print '/%s' % self.name -class PlcBtePapx(DOCDirStream): +class PlcBtePapx(DOCDirStream, PLC): The PlcBtePapx structure is a PLC that specifies paragraph, table row, or table cell properties. def __init__(self, bytes, mainStream, offset, size): DOCDirStream.__init__(self, bytes, mainStream=mainStream) +PLC.__init__(self, size, 4) self.pos = offset self.size = size def dump(self): print 'plcBtePapx type=PlcBtePapx offset=%d size=%d bytes' % (self.pos, self.size) -elements = (self.size - 4) / (4 + 4) # TODO dedicated PLC class pos = self.pos -for i in range(elements): +for i in range(self.getElements()): # aFC start = struct.unpack(I, self.bytes[pos:pos+4])[0] end = struct.unpack(I, self.bytes[pos+4:pos+8])[0] @@ -254,8 +265,7 @@ class PlcBtePapx(DOCDirStream): pos += 4 # aPnBtePapx -offset = self.pos + ( 4 * ( elements + 1 ) ) + ( 4 * i ) # TODO, the last 4 is the size of PnFkpPapx -aPnBtePapx = PnFkpPapx(self.bytes, self.mainStream, offset, 4, aPnBtePapx) +aPnBtePapx = PnFkpPapx(self.bytes, self.mainStream, self.getOffset(self.pos, i), 4, aPnBtePapx) aPnBtePapx.dump() print '/aFC' print '/plcBtePapx' ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] add indexOf family of function to OUStringBuffer
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1006 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/1006/1 add indexOf family of function to OUStringBuffer it is fairly common when converting String to OUString to find code that search for thing and replace/delete these things... the later need OUStringBuffer, the former OUString. This add the search feature provided by the indexOf family of function found in OUString, into OUStringBuffer Change-Id: I2de818e6317a94ed520f338ebc9ed08d5f17765c --- M sal/inc/rtl/ustrbuf.hxx 1 file changed, 224 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1006 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2de818e6317a94ed520f338ebc9ed08d5f17765c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: fontconfig/ExternalProject_fontconfig.mk
fontconfig/ExternalProject_fontconfig.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6063fd0402e0b63aec4a6740e94e4f76fcc312c1 Author: Tor Lillqvist tlillqv...@suse.com Date: Thu Nov 8 16:05:15 2012 +0200 fontconfig's configure looks for expat.h So we need to use the expat subdir too in --with-expat-includes. Apparently until now it did not find expat.h, so it fell back to libxml2 instead then, which was sometimes found OK, sometimes (on tinderboxes) not. (It even went looking in the *build* platform /usr/include, eek!) Change-Id: If0595b810d531b5aa7110f375d4d0dfb0b01617b diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk index 296db71..c0b1878 100644 --- a/fontconfig/ExternalProject_fontconfig.mk +++ b/fontconfig/ExternalProject_fontconfig.mk @@ -24,7 +24,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) : $(if $(debug),CFLAGS=-g) $(if $(filter ANDROID,$(OS)),LIBS=-lm) ./configure \ --disable-shared \ --with-arch=arm \ - --with-expat-includes=$(OUTDIR)/inc/external \ + --with-expat-includes=$(OUTDIR)/inc/external/expat \ --with-expat-lib=$(OUTDIR)/lib \ --with-freetype-config=$(OUTDIR)/bin/freetype-config \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - oox/inc oox/source sw/qa
oox/inc/oox/vml/vmlshape.hxx |2 ++
oox/inc/oox/vml/vmltextbox.hxx |4
oox/inc/oox/vml/vmltextboxcontext.hxx |3 ++-
oox/source/token/properties.txt|4
oox/source/vml/vmlshape.cxx|7 +++
oox/source/vml/vmlshapecontext.cxx |4 +++-
oox/source/vml/vmltextbox.cxx |1 +
oox/source/vml/vmltextboxcontext.cxx | 22 +-
sw/qa/extras/ooxmlimport/data/n773061.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 13 +
10 files changed, 57 insertions(+), 3 deletions(-)
New commits:
commit 5c87553432058f5241eda1dbfbfa1ec840fe3890
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Nov 8 15:17:36 2012 +0100
testcase for a recent bnc#773061 fix
Change-Id: I60874c6ad8ccb9767961ed0064b9a15bfc1b07d5
diff --git a/sw/qa/extras/ooxmlimport/data/n773061.docx
b/sw/qa/extras/ooxmlimport/data/n773061.docx
new file mode 100644
index 000..e0d6001
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n773061.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 33112d4..0da4feb 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -107,6 +107,7 @@ public:
void testN783638();
void testFdo52208();
void testN785767();
+void testN773061();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -166,6 +167,7 @@ void Test::run()
{n783638.docx, Test::testN783638},
{fdo52208.docx, Test::testFdo52208},
{n785767.docx, Test::testN785767},
+{n773061.docx, Test::testN773061},
};
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
{
@@ -1015,6 +1017,17 @@ void Test::testN785767()
// Check the A1 and B1 cells, the width of both of them was the default
value (1 / 9, as there were 9 cells in the row).
CPPUNIT_ASSERT_MESSAGE(A1 must not have default width, sal_Int16(1 /
9) != getProperty uno::Sequencetext::TableColumnSeparator
(xTableRows-getByIndex(0), TableColumnSeparators)[0].Position);
CPPUNIT_ASSERT_MESSAGE(B1 must not have default width, sal_Int16(1 /
9) != getProperty uno::Sequencetext::TableColumnSeparator
(xTableRows-getByIndex(1), TableColumnSeparators)[0].Position);
+
+void Test::testN773061()
+{
+// xray ThisComponent.TextFrames(0).LeftBorderDistance
+uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL( getProperty sal_Int32 ( xFrame,
LeftBorderDistance ), sal_Int32( 0 ));
+CPPUNIT_ASSERT_EQUAL( getProperty sal_Int32 ( xFrame,
TopBorderDistance ), sal_Int32( 0 ));
+CPPUNIT_ASSERT_EQUAL( getProperty sal_Int32 ( xFrame,
RightBorderDistance ), sal_Int32( 0 ));
+CPPUNIT_ASSERT_EQUAL( getProperty sal_Int32 ( xFrame,
BottomBorderDistance ), sal_Int32( 0 ));
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
commit f2c55815128fde9f760c5cbf81e3ab18402c5b3d
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Nov 8 14:24:29 2012 +0100
implement inset attribute of v:textbox (part of bnc#773061)
Change-Id: I1ec9b5d9fed86c44dc0a412c2323033ea67985c9
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index c7f288d..87b51d1 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -120,6 +120,8 @@ public:
/** Returns the fragment path to the embedded graphic used by this shape.
*/
::rtl::OUString getGraphicPath() const;
+const Drawing getDrawing() const { return mrDrawing; }
+
protected:
/** Returns the coordinate system of this shape. */
::com::sun::star::awt::Rectangle getCoordSystem() const;
diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx
index d540937..af69e77 100644
--- a/oox/inc/oox/vml/vmltextbox.hxx
+++ b/oox/inc/oox/vml/vmltextbox.hxx
@@ -74,6 +74,10 @@ public:
/** Returns the entire text of all text portions. */
::rtl::OUString getText() const;
+/// Text distance from the border (inset attribute of v:textbox), valid
only if set.
+bool borderDistanceSet;
+int borderDistanceLeft, borderDistanceTop, borderDistanceRight,
borderDistanceBottom;
+
private:
typedef ::std::vector TextPortionModel PortionVector;
diff --git a/oox/inc/oox/vml/vmltextboxcontext.hxx
b/oox/inc/oox/vml/vmltextboxcontext.hxx
index 9325414..4fd35d1 100644
--- a/oox/inc/oox/vml/vmltextboxcontext.hxx
+++ b/oox/inc/oox/vml/vmltextboxcontext.hxx
@@ -57,7 +57,8 @@ public:
explicitTextBoxContext(
::oox::core::ContextHandler2Helper rParent,
TextBox
Re: inital build problem (master) SOLVED
Am 2012-11-07 13:26, schrieb Michael Meeks: Hi there, On Wed, 2012-11-07 at 13:12 +0100, oger000 wrote: Trying a build on a new machine I end up with attatched build_error.log (looks like lpsolve is the problem). It looks like downloading the source for those has silently failed The download did not fail and it was not silent [1] - but you are right anyway ;-) I think, that the directory-prefix in .wgetrc iterfered. So maybe its a good idea to ignore the existing wget config file by providing a custom (maybe empty) one? Build now succeed. Thanks gerhard [1] The make fetch (and ./download too) has a lot of following messages No filelist provided, using the default ooo.lst. 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz --2012-11-07 16:52:30-- http://dev-www.libreoffice.org/src/51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70 Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 3782207 (3.6M) [application/x-gzip] Server file no newer than local file `/home/gerhard/pool/wget/dev-www.libreoffice.org/src/51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz' -- not retrieving. Converted 0 files in 0 seconds. mv: cannot stat `51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz': No such file or directory c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 --2012-11-07 16:52:30-- http://dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 195.135.221.70 Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|195.135.221.70|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 468395 (457K) [application/x-bzip] Server file no newer than local file `/home/gerhard/pool/wget/dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2' -- not retrieving. Converted 0 files in 0 seconds. mv: cannot stat `c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2': No such file or directory A ls -l ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/qa
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit aa783547ba3c944d191688f2d4dc88c680c3e997
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 8 14:37:38 2012 +
missing brace
Change-Id: Ib54dd8fe55f7c527e4f163e7ae559e9c3483407b
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0da4feb..a36bdb7 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1017,6 +1017,7 @@ void Test::testN785767()
// Check the A1 and B1 cells, the width of both of them was the default
value (1 / 9, as there were 9 cells in the row).
CPPUNIT_ASSERT_MESSAGE(A1 must not have default width, sal_Int16(1 /
9) != getProperty uno::Sequencetext::TableColumnSeparator
(xTableRows-getByIndex(0), TableColumnSeparators)[0].Position);
CPPUNIT_ASSERT_MESSAGE(B1 must not have default width, sal_Int16(1 /
9) != getProperty uno::Sequencetext::TableColumnSeparator
(xTableRows-getByIndex(1), TableColumnSeparators)[0].Position);
+}
void Test::testN773061()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Submit patch, be patient
http://wiki.documentfoundation.org/Development/Patch_Handling_Guidelines#Be_patient_while_waiting_for_review Reading the wiki page on submitting patches, it says that after submitting patches, we should be patient. Be patient while waiting for review. While many core developers are paid to work on this project full-time or nearly so, our increasing number of committers and patch reviewers do this in their precious spare time. So, please be patient when your patch does not get reviewed right away. I am wondering if you have been submitting patches for a long time could give an average timeline of how long it usually takes for a patch to be reviewed, and how long it is good to be patient for before wondering if something went wrong or your patch was missed, e.g. 1 week, 1 month, 3 months, ... Part of being patient is having reasonable expectations. Jeremy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oox/source
oox/source/vml/vmlshape.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 2fd5586337fc7b1048160582abff4aafc6a33902
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Nov 8 15:59:32 2012 +0100
I hate sal_Int32, episode #1326.
Change-Id: Ibfda2b553bae1ad040f722dde46a352a313218fc
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 3d5eb1f..a70f51f 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -451,10 +451,10 @@ Reference XShape SimpleShape::implConvertAndInsert(
const Reference XShapes
PropertySet( xShape ).setAnyProperty( PROP_SizeType, makeAny(
maTypeModel.mbAutoHeight ? SizeType::MIN : SizeType::FIX ) );
if( getTextBox()-borderDistanceSet )
{
-PropertySet( xShape ).setAnyProperty( PROP_LeftBorderDistance,
makeAny( getTextBox()-borderDistanceLeft ));
-PropertySet( xShape ).setAnyProperty( PROP_TopBorderDistance,
makeAny( getTextBox()-borderDistanceTop ));
-PropertySet( xShape ).setAnyProperty( PROP_RightBorderDistance,
makeAny( getTextBox()-borderDistanceRight ));
-PropertySet( xShape ).setAnyProperty( PROP_BottomBorderDistance,
makeAny( getTextBox()-borderDistanceBottom ));
+PropertySet( xShape ).setAnyProperty( PROP_LeftBorderDistance,
makeAny( sal_Int32( getTextBox()-borderDistanceLeft )));
+PropertySet( xShape ).setAnyProperty( PROP_TopBorderDistance,
makeAny( sal_Int32( getTextBox()-borderDistanceTop )));
+PropertySet( xShape ).setAnyProperty( PROP_RightBorderDistance,
makeAny( sal_Int32( getTextBox()-borderDistanceRight )));
+PropertySet( xShape ).setAnyProperty( PROP_BottomBorderDistance,
makeAny( sal_Int32( getTextBox()-borderDistanceBottom )));
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreLogo
Hi, LibreLogo is a new experimental module of LibreOffice for a simple, Logo-like programming environment in Writer: a lightweight wrapper – 1400 lines in Python/PyUNO – to the embedded Python of LibreOffice and a Writer toolbar extension. My LibreOffice conference presentation: http://www.numbertext.org/logo/librelogo.pdf Feedback from Cor Nouws: http://cor4office.blogspot.nl/2012/11/what-arabic-turtle-and-google-have-to.html Goals of LibreLogo: Teaching of computing • Programming (free, portable and modern native Logo alternative with Python data structures) • Word processors (text editing, image handling) • Migration to free software (LibreOffice) LibreOffice • Simple programming interface for graphic design and DTP (for example, see this B2 chess poster created in LibreOffice Writer for the upcoming conference of Hungarian IT teachers: http://www.numbertext.org/logo/hu/poszterek/sakk.pdf) LibreOffice development • Test bed for graphical features and PyUNO • Attract more future GSoC etc. developers for LibreOffice (in Hungary, the Logo programming contest has got 2500–3000 participants/year: http://logo.inf.elte.hu/diagramlogo2.png). Thanks to András Tímár, now it's possible to localize the English manual and the commands/warning messages of the LibreLogo environment, too. I will post a longer article about LibreLogo soon. Best regards, László ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cui/uiconfig
cui/uiconfig/ui/thesaurus.ui |3 +++ 1 file changed, 3 insertions(+) New commits: commit c315a001d84070705a52121e36a626d138fab012 Author: Caolán McNamara caol...@redhat.com Date: Thu Nov 8 15:08:51 2012 + center vertical items in first row Change-Id: I08415c11d2e923ae0be005f019cfe6996d8d71a4 diff --git a/cui/uiconfig/ui/thesaurus.ui b/cui/uiconfig/ui/thesaurus.ui index 8df35d0..b294ab1 100644 --- a/cui/uiconfig/ui/thesaurus.ui +++ b/cui/uiconfig/ui/thesaurus.ui @@ -139,6 +139,7 @@ property name=hexpandTrue/property property name=entry_text_column0/property property name=id_column1/property +property name=valigncenter/property /object packing property name=left_attach1/property @@ -154,6 +155,7 @@ property name=can_focusTrue/property property name=receives_defaultTrue/property property name=halignstart/property +property name=valigncenter/property property name=use_action_appearanceFalse/property property name=imageimage1/property /object @@ -168,6 +170,7 @@ object class=GtkComboBoxText id=langcb property name=visibleTrue/property property name=can_focusFalse/property +property name=valigncenter/property /object packing property name=left_attach2/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - oox/inc oox/source
oox/inc/oox/vml/vmlshape.hxx |2 ++
oox/inc/oox/vml/vmltextbox.hxx|4
oox/inc/oox/vml/vmltextboxcontext.hxx |3 ++-
oox/source/token/properties.txt |4
oox/source/vml/vmlshape.cxx |7 +++
oox/source/vml/vmlshapecontext.cxx|4 +++-
oox/source/vml/vmltextbox.cxx |1 +
oox/source/vml/vmltextboxcontext.cxx | 22 +-
8 files changed, 44 insertions(+), 3 deletions(-)
New commits:
commit 1679aca6f61f1d28b06649a55010f72eabc0
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Nov 8 14:24:29 2012 +0100
implement inset attribute of v:textbox (part of bnc#773061)
Change-Id: I1ec9b5d9fed86c44dc0a412c2323033ea67985c9
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index cf71006..2bdf16e 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -129,6 +129,8 @@ public:
/** Returns the fragment path to the embedded graphic used by this shape.
*/
::rtl::OUString getGraphicPath() const;
+const Drawing getDrawing() const { return mrDrawing; }
+
protected:
/** Returns the coordinate system of this shape. */
::com::sun::star::awt::Rectangle getCoordSystem() const;
diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx
index cc2e41b..ed716de 100644
--- a/oox/inc/oox/vml/vmltextbox.hxx
+++ b/oox/inc/oox/vml/vmltextbox.hxx
@@ -83,6 +83,10 @@ public:
/** Returns the entire text of all text portions. */
::rtl::OUString getText() const;
+/// Text distance from the border (inset attribute of v:textbox), valid
only if set.
+bool borderDistanceSet;
+int borderDistanceLeft, borderDistanceTop, borderDistanceRight,
borderDistanceBottom;
+
private:
typedef ::std::vector TextPortionModel PortionVector;
diff --git a/oox/inc/oox/vml/vmltextboxcontext.hxx
b/oox/inc/oox/vml/vmltextboxcontext.hxx
index 64c1c97..abe6395 100644
--- a/oox/inc/oox/vml/vmltextboxcontext.hxx
+++ b/oox/inc/oox/vml/vmltextboxcontext.hxx
@@ -66,7 +66,8 @@ public:
explicitTextBoxContext(
::oox::core::ContextHandler2Helper rParent,
TextBox rTextBox,
-const AttributeList rAttribs );
+const AttributeList rAttribs,
+const GraphicHelper graphicHelper );
virtual ::oox::core::ContextHandlerRef
onCreateContext( sal_Int32 nElement, const
AttributeList rAttribs );
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 4710f14..8835c2c 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -34,6 +34,7 @@ BorderStyle
BorderTransparency
BorderWidth
BottomBorder
+BottomBorderDistance
BottomMargin
BulletChar
BulletColor
@@ -263,6 +264,7 @@ LabelPosition
LabelSeparator
LayoutInfo
LeftBorder
+LeftBorderDistance
LeftMargin
LeftPageFooterContent
LeftPageHeaderContent
@@ -383,6 +385,7 @@ RepeatDelay
Representation
RightAngledAxes
RightBorder
+RightBorderDistance
RightMargin
RightPageFooterContent
RightPageHeaderContent
@@ -485,6 +488,7 @@ Title
Toggle
TokenIndex
TopBorder
+TopBorderDistance
TopMargin
Transformation
TransitionDirection
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index e68bfab..5b6b6c5 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -443,6 +443,13 @@ Reference XShape SimpleShape::implConvertAndInsert(
const Reference XShapes
{
PropertySet( xShape ).setAnyProperty( PROP_FrameIsAutomaticHeight,
makeAny( maTypeModel.mbAutoHeight ) );
PropertySet( xShape ).setAnyProperty( PROP_SizeType, makeAny(
maTypeModel.mbAutoHeight ? SizeType::MIN : SizeType::FIX ) );
+if( getTextBox()-borderDistanceSet )
+{
+PropertySet( xShape ).setAnyProperty( PROP_LeftBorderDistance,
makeAny( getTextBox()-borderDistanceLeft ));
+PropertySet( xShape ).setAnyProperty( PROP_TopBorderDistance,
makeAny( getTextBox()-borderDistanceTop ));
+PropertySet( xShape ).setAnyProperty( PROP_RightBorderDistance,
makeAny( getTextBox()-borderDistanceRight ));
+PropertySet( xShape ).setAnyProperty( PROP_BottomBorderDistance,
makeAny( getTextBox()-borderDistanceBottom ));
+}
}
else
{
diff --git a/oox/source/vml/vmlshapecontext.cxx
b/oox/source/vml/vmlshapecontext.cxx
index 0ed4d8b..ae00af2 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -28,6 +28,7 @@
#include oox/vml/vmlshapecontext.hxx
+#include oox/core/xmlfilterbase.hxx
#include oox/vml/vmldrawing.hxx
#include oox/vml/vmlshape.hxx
#include oox/vml/vmlshapecontainer.hxx
@@ -409,7 +410,8 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32
nElement, const Attri
// Custom shape in Writer
Re: Submit patch, be patient
how long it is good to be patient for before wondering if something went wrong or your patch was missed, I'd say if you hear nothing at all after two working days, gently ask in this mailing list, or on IRC... --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - src/docdirstream.py src/docrecord.py src/docstream.py
src/docdirstream.py | 22 ++ src/docrecord.py| 61 src/docstream.py| 48 3 files changed, 80 insertions(+), 51 deletions(-) New commits: commit e72cda1d059a30b5fa2e1a1e52568f011399dfc7 Author: Miklos Vajna vmik...@suse.cz Date: Thu Nov 8 16:23:44 2012 +0100 add DOCDirStream.getInt*() methods diff --git a/src/docdirstream.py b/src/docdirstream.py index 9f1ccd5..6fa4c17 100755 --- a/src/docdirstream.py +++ b/src/docdirstream.py @@ -1,6 +1,7 @@ #!/usr/bin/env python import globals +import struct class DOCDirStream: Represents one single word file subdirectory, like e.g. 'WordDocument'. @@ -23,6 +24,27 @@ class DOCDirStream: else: print '%s value=%s' % (key, value) +def getInt8(self, bytes = None, pos = None): +if not bytes: +bytes = self.bytes +if not pos: +pos = self.pos +return ord(struct.unpack(c, bytes[pos:pos+1])[0]) + +def getInt16(self, bytes = None, pos = None): +if not bytes: +bytes = self.bytes +if not pos: +pos = self.pos +return struct.unpack(H, bytes[pos:pos+2])[0] + +def getInt32(self, bytes = None, pos = None): +if not bytes: +bytes = self.bytes +if not pos: +pos = self.pos +return struct.unpack(I, bytes[pos:pos+4])[0] + def getBit(self, byte, bitNumber): return (byte (1 bitNumber)) bitNumber diff --git a/src/docrecord.py b/src/docrecord.py index 2141c75..44552bb 100755 --- a/src/docrecord.py +++ b/src/docrecord.py @@ -13,7 +13,7 @@ class FcCompressed(DOCDirStream): def dump(self): print 'fcCompressed type=FcCompressed offset=%d size=%d bytes' % (self.pos, self.size) -buf = struct.unpack(I, self.bytes[self.pos:self.pos+4])[0] +buf = self.getInt32() self.pos += 4 self.printAndSet(fc, buf ((2**32-1) 2)) # bits 0..29 self.printAndSet(fCompressed, self.getBit(buf, 30)) @@ -35,7 +35,7 @@ class Pcd(DOCDirStream): def dump(self): print 'pcd type=Pcd offset=%d size=%d bytes' % (self.pos, self.size) -buf = struct.unpack(H, self.bytes[self.pos:self.pos+2])[0] +buf = self.getInt16() self.pos += 2 self.printAndSet(fNoParaLast, self.getBit(buf, 0)) self.printAndSet(fR1, self.getBit(buf, 1)) @@ -75,8 +75,8 @@ class PlcPcd(DOCDirStream, PLC): pos = self.pos for i in range(self.getElements()): # aCp -start = struct.unpack(I, self.bytes[pos:pos+4])[0] -end = struct.unpack(I, self.bytes[pos+4:pos+8])[0] +start = self.getInt32(pos = pos) +end = self.getInt32(pos = pos + 4) print 'aCP index=%d start=%d end=%d' % (i, start, end) pos += 4 @@ -105,7 +105,7 @@ class Sprm(DOCDirStream): 7: 3, } -self.sprm = struct.unpack(H, self.bytes[self.pos:self.pos+2])[0] +self.sprm = self.getInt16() self.pos += 2 self.ispmd = (self.sprm 0x1ff)# 1-9th bits @@ -114,11 +114,11 @@ class Sprm(DOCDirStream): self.spra = (self.sprm 0xe000) 13 # 14-16th bits if self.operandSizeMap[self.spra] == 1: -self.operand = ord(struct.unpack(c, self.bytes[self.pos:self.pos+1])[0]) +self.operand = self.getInt8() elif self.operandSizeMap[self.spra] == 2: -self.operand = struct.unpack(H, self.bytes[self.pos:self.pos+2])[0] +self.operand = self.getInt16() elif self.operandSizeMap[self.spra] == 4: -self.operand = struct.unpack(I, self.bytes[self.pos:self.pos+4])[0] # TODO generalize this +self.operand = self.getInt32() else: self.operand = todo @@ -163,7 +163,7 @@ class GrpPrlAndIstd(DOCDirStream): def dump(self): print 'grpPrlAndIstd type=GrpPrlAndIstd offset=%d size=%d bytes' % (self.pos, self.size) pos = self.pos -self.printAndSet(istd, struct.unpack(H, self.bytes[self.pos:self.pos+2])[0]) +self.printAndSet(istd, self.getInt16()) pos += 2 while (self.size - (pos - self.pos)) 0: prl = Prl(self.bytes, pos) @@ -179,10 +179,10 @@ class PapxInFkp(DOCDirStream): def dump(self): print 'papxInFkp type=PapxInFkp offset=%d' % self.pos -self.printAndSet(cb, ord(struct.unpack(c, self.bytes[self.pos:self.pos+1])[0])) +self.printAndSet(cb, self.getInt8()) self.pos += 1 if self.cb == 0: -self.printAndSet(cb_, ord(struct.unpack(c, self.bytes[self.pos:self.pos+1])[0])) +self.printAndSet(cb_, self.getInt8()) self.pos += 1 grpPrlAndIstd = GrpPrlAndIstd(self.bytes, self.pos, 2 * self.cb_)
[Libreoffice-commits] .: vcl/inc vcl/source
vcl/inc/svids.hrc |1 +
vcl/source/src/images.src |5 +
vcl/source/window/builder.cxx |2 ++
3 files changed, 8 insertions(+)
New commits:
commit a084c6edd402fc65a87088bf88c7e4f134beba1b
Author: Caolán McNamara caol...@redhat.com
Date: Thu Nov 8 15:49:32 2012 +
add a SV_RESID_BITMAP_REFRESH id and map to gtk-refresh
Change-Id: If860b33ab86b195952cd7879de16c65221a21ab5
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 5abe5bd..19e13a4 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -42,6 +42,7 @@
#define SV_RESID_BITMAP_SCROLLBMP 1051
#define SV_RESID_BITMAP_CLOSEDOC1052
#define SV_RESID_BITMAP_INDEX 1053
+#define SV_RESID_BITMAP_REFRESH 1054
#define SV_DISCLOSURE_PLUS 1060
#define SV_DISCLOSURE_MINUS 1061
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index eb3bb50..7576528 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -73,6 +73,11 @@ Bitmap SV_RESID_BITMAP_INDEX
File = index.png;
};
+Bitmap SV_RESID_BITMAP_REFRESH
+{
+File = reload.png;
+};
+
Bitmap SV_RESID_BITMAP_SPLITHPIN
{
File = splhpin.png;
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 328d904..ffe728f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -39,6 +39,8 @@ namespace
sal_uInt16 nRet = 0;
if (sType == gtk-index)
nRet = SV_RESID_BITMAP_INDEX;
+else if (sType == gtk-refresh)
+nRet = SV_RESID_BITMAP_REFRESH;
return nRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Add more fonts
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1007 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/1007/1 Add more fonts (PT Serif, Source Code Pro and Souce Sans Pro under OFL, OPen Sans under ALv2) Change-Id: Ic783f0d5841cafce6dba60213b0a658978ff2cfd --- M config_host.mk.in M configure.ac A more_fonts/ExternalPackage_conf.mk A more_fonts/ExternalPackage_opensans.mk A more_fonts/ExternalPackage_ptserif.mk A more_fonts/ExternalPackage_sourcecode.mk A more_fonts/ExternalPackage_sourcesans.mk M more_fonts/Module_more_fonts.mk A more_fonts/UnpackedTarball_opensans.mk A more_fonts/UnpackedTarball_ptserif.mk A more_fonts/UnpackedTarball_sourcecode.mk A more_fonts/UnpackedTarball_sourcesans.mk M ooo.lst.in M scp2/source/ooo/file_font_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 15 files changed, 231 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1007 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic783f0d5841cafce6dba60213b0a658978ff2cfd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stefan Knorr heinzless...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Add more fonts
Stefan Knorr has abandoned this change. Change subject: Add more fonts .. Patch Set 1: Abandoned Will fix typo in commit message and remove superfluous (?) External_Package.conf. -- To view, visit https://gerrit.libreoffice.org/1007 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ic783f0d5841cafce6dba60213b0a658978ff2cfd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stefan Knorr heinzless...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options
On Wednesday 07 of November 2012, David Ostrovsky wrote: If no one has any opinion on it, I'm going to name it --enable-symbols-only. Just call it whatever reasonably makes sense. There will be always somebody disliking some detail. May be after restoring that old --enable-symbols way, we could refactor it and merge these two different systems for setting -g like you suggested? At upcoming LO Hackfest? Well, cleanup of this stuff was supposed to be what happened at the LO conference. Seeing how it turned out (and given that apparently everybody else has a different view of how this all should work, I'm still waiting for somebody else to suddenly realize something else should be changed), I feel like passing on that, sorry. But feel free to ask, I now know a lot more about that part of code than the plan ever was. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oox/inc
oox/inc/oox/dump/dumperbase.hxx | 44
1 file changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 16d8a8c3389059b4597dbf98733bdd37a43c4d09
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Nov 8 17:24:52 2012 +0100
oox: fix doxygen comments in dump
Change-Id: Iab40d3d9778fffb7bbb076a9c2716d3fd11fc937
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 8949fc5..16562e5 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -162,17 +162,17 @@ public:
/** Specifiers for atomic data types. */
enum DataType
{
-DATATYPE_VOID, /// No data type.
-DATATYPE_INT8, /// Signed 8-bit integer.
-DATATYPE_UINT8, /// Unsigned 8-bit integer.
-DATATYPE_INT16, /// Signed 16-bit integer.
-DATATYPE_UINT16,/// Unsigned 16-bit integer.
-DATATYPE_INT32, /// Signed 32-bit integer.
-DATATYPE_UINT32,/// Unsigned 32-bit integer.
-DATATYPE_INT64, /// Signed 64-bit integer.
-DATATYPE_UINT64,/// Unsigned 64-bit integer.
-DATATYPE_FLOAT, /// Floating-point, single precision.
-DATATYPE_DOUBLE /// Floating-point, double precision.
+DATATYPE_VOID, /// No data type.
+DATATYPE_INT8, /// Signed 8-bit integer.
+DATATYPE_UINT8, /// Unsigned 8-bit integer.
+DATATYPE_INT16, /// Signed 16-bit integer.
+DATATYPE_UINT16,/// Unsigned 16-bit integer.
+DATATYPE_INT32, /// Signed 32-bit integer.
+DATATYPE_UINT32,/// Unsigned 32-bit integer.
+DATATYPE_INT64, /// Signed 64-bit integer.
+DATATYPE_UINT64,/// Unsigned 64-bit integer.
+DATATYPE_FLOAT, /// Floating-point, single precision.
+DATATYPE_DOUBLE /// Floating-point, double precision.
};
//
@@ -180,13 +180,13 @@ enum DataType
/** Specifiers for the output format of values. */
enum FormatType
{
-FORMATTYPE_NONE,/// No numeric format (e.g. show name only).
-FORMATTYPE_DEC, /// Decimal.
-FORMATTYPE_HEX, /// Hexadecimal.
-FORMATTYPE_SHORTHEX,/// Hexadecimal, as short as possible (no
leading zeros).
-FORMATTYPE_BIN, /// Binary.
-FORMATTYPE_FIX, /// Fixed-point.
-FORMATTYPE_BOOL /// Boolean ('true' or 'false').
+FORMATTYPE_NONE,/// No numeric format (e.g. show name only).
+FORMATTYPE_DEC, /// Decimal.
+FORMATTYPE_HEX, /// Hexadecimal.
+FORMATTYPE_SHORTHEX,/// Hexadecimal, as short as possible (no
leading zeros).
+FORMATTYPE_BIN, /// Binary.
+FORMATTYPE_FIX, /// Fixed-point.
+FORMATTYPE_BOOL /// Boolean ('true' or 'false').
};
//
@@ -213,10 +213,10 @@ enum FormatType
*/
struct ItemFormat
{
-DataTypemeDataType; /// Data type of the item.
-FormatType meFmtType; /// Output format for the value.
-::rtl::OUString maItemName; /// Name of the item.
-::rtl::OUString maListName; /// Name of a name list to be used
for this item.
+DataTypemeDataType; /// Data type of the item.
+FormatType meFmtType; /// Output format for the value.
+::rtl::OUString maItemName; /// Name of the item.
+::rtl::OUString maListName; /// Name of a name list to be
used for this item.
explicitItemFormat();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sd/source
sd/source/ui/view/Outliner.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 2874f7c25f252a900276a671caf52d0f6812
Author: Radek Doulik r...@novell.com
Date: Tue Jun 26 12:25:03 2012 +0200
remember spell check/findreplace start position only 1st time
- use mnStartPageIndex as indicator, -1 means it wasn't set yet
otherwise it is set. reset it to -1 at the end of spell check
and findreplace
Change-Id: Ic45106b019d3c1a0232fe3d766aab07bbcd24d2c
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index e7100e7..43aa502 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -381,6 +381,7 @@ void Outliner::EndSpelling (void)
mpWeakViewShell.reset();
mpView = NULL;
mpWindow = NULL;
+mnStartPageIndex = (sal_uInt16) -1;
}
@@ -531,8 +532,7 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem*
pSearchItem)
// restore start position if nothing was found
if(!mbStringFound)
RestoreStartPosition ();
-else
-mnStartPageIndex = (sal_uInt16)-1;
+mnStartPageIndex = (sal_uInt16)-1;
}
}
else
@@ -657,6 +657,7 @@ bool Outliner::SearchAndReplaceAll (void)
}
RestoreStartPosition ();
+mnStartPageIndex = (sal_uInt16)-1;
return true;
}
@@ -870,6 +871,9 @@ void Outliner::RememberStartPosition (void)
return;
}
+if ( mnStartPageIndex != (sal_uInt16) -1 )
+return;
+
if (pViewShell-ISA(DrawViewShell))
{
::boost::shared_ptrDrawViewShell pDrawViewShell (
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 49610, which changed state. Bug 49610 Summary: EDITING: Terminating 'Find' when reached end of document second time brings up Master View, deletes slides https://bugs.freedesktop.org/show_bug.cgi?id=49610 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Submit patch, be patient
On Thu, 2012-11-08 at 15:50 +0100, Jeremy Brown wrote: http://wiki.documentfoundation.org/Development/Patch_Handling_Guidelines#Be_patient_while_waiting_for_review Reading the wiki page on submitting patches, it says that after submitting patches, we should be patient. You speak as one who may have a patch pending that dropped between the cracks ? :-) if so - I agree with Tor, we'd want to get back to the submitter ASAP - 2 working days seems like a good upper bound for pinging again :-) [ of course some patches take a lot of reviewing and thought but ... ] ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'feature/rb9'
New branch 'feature/rb9' available with the following commits: commit 52bfed26311af4d365c79d013bbef12855d7f79e Author: Michael Meeks michael.me...@suse.com Date: Tue Nov 6 12:12:33 2012 + re-base on ALv2 code. Includes: Patches contributed by Pedro Giffuni: Avoid some uses of non portable #!/bin/bash in shell scripts. http://svn.apache.org/viewvc?view=revisionrevision=1235297 Reduce the dependencies on non standard GNU copy. http://svn.apache.org/viewvc?view=revisionrevision=1238684 Complex Toolbar Controls Extension from the SDK Patches contributed by Ariel Constenla-Haile http://svn.apache.org/viewvc?view=revisionrevision=1190390 Patches contributed by Mathias Bauer (and others) gnumake4 work variously http://svn.apache.org/viewvc?view=revisionrevision=1394707 http://svn.apache.org/viewvc?view=revisionrevision=1394326 Patches contributed by Juergen Schmidt: jsc341: i117327: take care if no dependency node in current description exists, create one http://svn.apache.org/viewvc?view=revisionrevision=1172101 jsc341: i117327: add extra extension dependency check http://svn.apache.org/viewvc?view=revisionrevision=1172098 make initial branding changes http://svn.apache.org/viewvc?view=revisionrevision=1231878 fix for neon webdav, remove coinmp bits cleanup remove OS/2 conditionals, system ucpp fixes commit 51f57c3ddb600880e71933c1921fd7d8c8ed2a45 Author: Michael Meeks michael.me...@suse.com Date: Wed Nov 7 13:30:10 2012 + add native XTextSearch / cppunit test framework. ported from the broken java ver. adds a native ICU regex sanity test. commit c781079f0f1f053af8f677e0b6d8238ebb4644b3 Author: Michael Meeks michael.me...@suse.com Date: Wed Nov 7 13:05:12 2012 + remove obsolete regexp pieces. commit ef3c99c678dd692c45449533fe491994a3f23f6f Author: Michael Meeks michael.me...@suse.com Date: Wed Nov 7 12:37:21 2012 + re-base on ALv2 code. Includes: Patches from Herbert Duerr: #i118925# fix old word-boundary emulation http://svn.apache.org/viewvc?view=revisionrevision=1301596 #i119031# preserving ASCII in ignore-* transliterations allows full SIMPLE_TRANS_MASK http://svn.apache.org/viewvc?view=revisionrevision=1301104 #i118887# ignore zero-length matches in regexp search http://svn.apache.org/viewvc?view=revisionrevision=1242235 fix transliteration flags for search pattern preprocessing http://svn.apache.org/viewvc?view=revisionrevision=1236199 fix minor typo in comment http://svn.apache.org/viewvc?view=revisionrevision=1234799 improve standard conformance regarding unicode UAX#29 word boundaries http://svn.apache.org/viewvc?view=revisionrevision=1234786 emulate word boundary matching of old regex engine The new ICU regex engine has much improved unicode capabilities. The old regex engine had the extensions \ and \ for matching word boundaries. For the convenience of a smooth upgrade experience these artifacts now get mapped to \b which is supported by almost all regex engines. http://svn.apache.org/viewvc?view=revisionrevision=1234777 #i118723# fill in regexp matcher group details http://svn.apache.org/viewvc?view=revisionrevision=1228084 use ICU regexp instead of LGPL i18nregexp http://svn.apache.org/viewvc?view=revisionrevision=1177610 #i119031# default to preserve ASCII in ignore-width transliteration http://svn.apache.org/viewvc?view=revisionrevision=1301101 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scripting/source
scripting/source/vbaevents/eventhelper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e06575d46c6f3b24faf912018baea0eec9c82e4d
Author: Michael Stahl mst...@redhat.com
Date: Thu Nov 8 18:38:04 2012 +0100
scripting: warning C4804 usafe use of type bool
Change-Id: I2db644a3c18658b07834fe6653b17713fd8201a7
diff --git a/scripting/source/vbaevents/eventhelper.cxx
b/scripting/source/vbaevents/eventhelper.cxx
index ac9d302..575fe2f 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -915,7 +915,7 @@ EventListener::firing_Impl(const ScriptEvent evt, Any*
pRet ) throw(RuntimeExce
//rtl::OUString sMacroLoc(Project);
sProject = Standard;
-if ( !pBasicManager-GetName().isEmpty() 0 )
+if (!pBasicManager-GetName().isEmpty())
{
sProject = pBasicManager-GetName();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-3-6]: fdo#35427: repair Tools Options Writer View - Show Scr...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1008 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/1008/1 fdo#35427: repair Tools Options Writer View - Show Scroll Slider options Change-Id: I2bacd52a182a2dba3dbe6c6d63861470e87b6066 --- M sw/source/ui/app/swmodul1.cxx M sw/source/ui/inc/pview.hxx M sw/source/ui/inc/view.hxx M sw/source/ui/uiview/pview.cxx M sw/source/ui/uiview/view.cxx M sw/source/ui/uiview/viewmdi.cxx M sw/source/ui/uiview/viewport.cxx 7 files changed, 69 insertions(+), 9 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1008 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2bacd52a182a2dba3dbe6c6d63861470e87b6066 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Ivan Timofeev timofeev@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/core/data/documen2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cab7e3037c200a9d621d7ede015c9426556194dc
Author: Michael Stahl mst...@redhat.com
Date: Thu Nov 8 18:46:10 2012 +0100
VBA_InsertModule: warning C4804 usafe use of type bool
Change-Id: I30ccda99df845a0c088fb8e3c3dae8a7be9775f7
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 0c54df3..b623afd 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1006,7 +1006,7 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc,
SCTAB nSrcPos,
{
rtl::OUString aLibName(Standard);
const BasicManager *pBasicManager = pSrcShell-GetBasicManager();
-if (pBasicManager !pBasicManager-GetName().isEmpty() 0)
+if (pBasicManager !pBasicManager-GetName().isEmpty())
{
aLibName = pSrcShell-GetBasicManager()-GetName();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basic/source sc/source
basic/source/basmgr/basmgr.cxx |2 +-
sc/source/filter/xml/xmlcondformat.cxx |4 ++--
sc/source/ui/docshell/macromgr.cxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 7093444335d70db33bd798d72c6d64bb708713cd
Author: Michael Stahl mst...@redhat.com
Date: Thu Nov 8 18:57:30 2012 +0100
xmlcondformat: warning C4701 pot. uninitialized variable pEntry used
Change-Id: Ic7edfe9c919cc2c0e3cd8b68d130919c4054686c
diff --git a/sc/source/filter/xml/xmlcondformat.cxx
b/sc/source/filter/xml/xmlcondformat.cxx
index 788d5b3..5c9bbe4 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -273,7 +273,7 @@ SvXMLImportContext*
ScXMLDataBarFormatContext::CreateChildContext( sal_uInt16 nP
case XML_TOK_FORMATTING_ENTRY:
case XML_TOK_DATABAR_DATABARENTRY:
{
-ScColorScaleEntry* pEntry;
+ScColorScaleEntry* pEntry(0);
pContext = new ScXMLFormattingEntryContext( GetScImport(),
nPrefix, rLocalName, xAttrList, pEntry );
if(mpFormatData-mpLowerLimit)
{
@@ -353,7 +353,7 @@ SvXMLImportContext*
ScXMLIconSetFormatContext::CreateChildContext( sal_uInt16 nP
{
case XML_TOK_FORMATTING_ENTRY:
{
-ScColorScaleEntry* pEntry;
+ScColorScaleEntry* pEntry(0);
pContext = new ScXMLFormattingEntryContext( GetScImport(),
nPrefix, rLocalName, xAttrList, pEntry );
mpFormatData-maEntries.push_back(pEntry);
}
commit af452fda333da53132a4301c372c321798be9cae
Author: Michael Stahl mst...@redhat.com
Date: Thu Nov 8 18:54:01 2012 +0100
fix more warning C4804 unsafe use of type bool
... from commit bbf1bcd9ad9cc0368aef4a4de41e9538f6ad91b0
Change-Id: Ic8e52f6848e09a274133f2d8fd1c4044cae4b039
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index d177d73..14ffe09 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -1243,7 +1243,7 @@ StarBASIC* BasicManager::AddLib( SotStorage rStorage,
const OUString rLibName,
DBG_ASSERT( !aStorName.isEmpty(), No Storage Name! );
OUString aStorageName = INetURLObject(aStorName,
INET_PROT_FILE).GetMainURL( INetURLObject::NO_DECODE );
-DBG_ASSERT(!aStorageName.isEmpty() != 0, Bad storage name);
+DBG_ASSERT(!aStorageName.isEmpty(), Bad storage name);
OUString aNewLibName( rLibName );
while ( HasLib( aNewLibName ) )
diff --git a/sc/source/ui/docshell/macromgr.cxx
b/sc/source/ui/docshell/macromgr.cxx
index 66890f2..40bdb2e 100644
--- a/sc/source/ui/docshell/macromgr.cxx
+++ b/sc/source/ui/docshell/macromgr.cxx
@@ -147,7 +147,7 @@ void ScMacroManager::InitUserFuncData()
Reference container::XContainer xModuleContainer;
SfxObjectShell* pShell = mpDoc-GetDocumentShell();
-if ( pShell ! pShell-GetBasicManager()-GetName().isEmpty() 0 )
+if (pShell !pShell-GetBasicManager()-GetName().isEmpty())
{
sProjectName = pShell-GetBasicManager()-GetName();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] #fdo36324 #fdo42929 - option to ignore system input language changes
Hi, I wanted to check if anyone had seen this and had a chance to look it over. Thanks, Jeremy On 11/2/12, Jeremy Brown jeremy.r.br...@gmail.com wrote: Hi, This is an enhancement to deal with the following issues: https://bugs.freedesktop.org/show_bug.cgi?id=36324 https://bugs.freedesktop.org/show_bug.cgi?id=42929 Files modified: cui\source\options\optgdlg.cxx cui\source\options\optgdlg.hrc cui\source\options\optgdlg.hxx cui\source\options\optgdlg.src officecfg\registry\schema\org\openoffice\Setup.xcs sw\source\ui\docvw\edtwin.cxx unotools\source\config\syslocaleoptions.cxx unotools\inc\unotools\syslocaleoptions.hxx Changes made: Created a new checkbox on the Languages options page: [] Ignore system input language This is unchecked by default so that the current behavior is the default - i.e. newly entered text will be flagged as the whatever the current system input language is. When checked however, this instructs LibreOffice to ignore the system language (on Windows for example, the language from the Language Bar) when determining the language for newly entered text. This is handled in the lcl_isNonDefaultLanguage method of sw\source\ui\docvw\edtwin.cxx. The option is also saved in registrymodifications.xcu There are two main use cases: 1. This allows someone to use a single international keyboard on Windows to type in multiple languages, (e.g. English, French, and Spanish) without changing the system keyboard. The person is then responsible for setting the language of each word or run of text themselves using the Tools-Lanuage-For Selection/For Paragraph/For all Text menu items. This seems to be the preferred workflow for some translators and some educators developing language materials. 2. This allows someone writing in a minority language that is not represented in one of Windows' locale options to still be able to type in their language using a keyboard in another language. Once they set the language in LibreOffice (to Teke-Eboo [ebo_CG] for example), they can type with a keyboard tagged as being for English or French, but still succeed in entering new text in their language. This allows spell-checking to work properly, without them having to select each new word they enter and reset the language of that word to Teke-Eboo, as is currently the case. I tried to follow the code for the DecimalSeparatorAsLocale checkbox on the language page as I made this patch. Hopefully I've done all right. It's been tested on Windows 7. I think there is no expected behavior change on most Linux distros because if I understand right, those systems don't report a language to LibreOffice. Thanks, Jeremy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
modules removal surprises
Hi, with recent surprise-commit e10124b20efb8cb7caf0f02fc537147a6505aa1d Goodbye gettext, glib, gdk-pixbuf, pango, libcroco, libgsf and librsvg we are getting closer to removing dmake. In wiki page dedicated to gbuild conversions [1] there are only two 'please-don't-convert-this' modules: binfilter moz - in the end, this one needs to be gbuildified because we use it for Windows ? But maybe more modules are going to be removed ? possible candidates: berkeleydb migrationanalysis stlport ?? Could someone check dmake_modules in Makefile.top or wiki page directly and add comments if there is a chance some of them will be removed, please ? And btw, any chance someone is pondering instsetoo_native gbuildification ? Thanks, Matus [1] http://wiki.documentfoundation.org/Development/Build_System/Module_status ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: postprocess/packconfig
postprocess/packconfig/packconfig.pl |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a7a2fe051069f6da49faff06fda96eba13912524
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Thu Nov 8 13:20:05 2012 -0600
fix 89e47b8bf1ba3f86204ae3ab997432c26b0eea6b, dereference hash object-ref
Change-Id: I3354f1c6b1eb5b1a78c25ff6ac23218336fd8bea
diff --git a/postprocess/packconfig/packconfig.pl
b/postprocess/packconfig/packconfig.pl
index ec59dce..88b8486 100644
--- a/postprocess/packconfig/packconfig.pl
+++ b/postprocess/packconfig/packconfig.pl
@@ -123,7 +123,7 @@ sub get_core_files
my $files_hash_ref = shift;
find_core_files($files_hash_ref);
-if ( !keys $files_hash_ref ) {
+if ( !keys %$files_hash_ref ) {
print_error(can't find any config files in '$files_path', 3);
}
@@ -148,7 +148,7 @@ sub get_lang_files
my $lang = shift;
find_lang_files($files_hash_ref, $lang);
-if ( !keys $files_hash_ref ) {
+if ( !keys %$files_hash_ref ) {
print_error(can't find any config files in '$files_path', 3);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: modules removal surprises
On 08/11/12 19:58, Matúš Kukan wrote: Hi, with recent surprise-commit e10124b20efb8cb7caf0f02fc537147a6505aa1d Goodbye gettext, glib, gdk-pixbuf, pango, libcroco, libgsf and librsvg we are getting closer to removing dmake. yay! In wiki page dedicated to gbuild conversions [1] there are only two 'please-don't-convert-this' modules: binfilter will be removed soon. moz - in the end, this one needs to be gbuildified because we use it for Windows ? AFAIK it is currently used for Outlook Express and Outlook address book access. Fridrich has some idea how to reimplement that without moz and then it will be removed. if you want to get your hands dirty with win32 programming you can help getting it removed faster :) But maybe more modules are going to be removed ? possible candidates: berkeleydb migrationanalysis stlport ?? berkeleydb will be removed with Apache rebase. migrationanalysis... don't know what that is, there is no dependency on this module. stlport is only necessary for compatibility of existing extensions that may be linked against it; it is no longer used by LO code. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: modules removal surprises
Hi, On 2012.11.08. 19:58, Matúš Kukan wrote: But maybe more modules are going to be removed ? possible candidates: berkeleydb migrationanalysis stlport ?? I used migrationanalysis (Professional Analysis Wizard) a few years ago. It created nice spreadsheets and charts about potential document migration problems: OpenOffice.org does not support this or that feature. The problem is that even some years ago, it looked outdated. Now it must be completely obsoleted. Document compatibility is getting better release by release. The unmaintaned Professional Analysis Wizard is useless and produces misleading reports. It is a good candidate for removal. Best regards, Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: modules removal surprises
Hi all, On 08/11/2012 20:51, Andras Timar wrote: Hi, On 2012.11.08. 19:58, Matúš Kukan wrote: But maybe more modules are going to be removed ? possible candidates: berkeleydb migrationanalysis stlport ?? I used migrationanalysis (Professional Analysis Wizard) a few years ago. It created nice spreadsheets and charts about potential document migration problems: OpenOffice.org does not support this or that feature. The problem is that even some years ago, it looked outdated. Now it must be completely obsoleted. Document compatibility is getting better release by release. The unmaintaned Professional Analysis Wizard is useless and produces misleading reports. It is a good candidate for removal. From what I remember of a discussion with Sun, it was an error to add it because it was not supposed to be open sourced and had been removed from the translation repository (I remember it because of its so poor translation in French ;) Kind regards Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Membership Certification Committee Member - Co-founder The Document Foundation ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Add more fonts
Stefan Knorr has restored this change. Change subject: Add more fonts .. Patch Set 1: Restored ?? -- To view, visit https://gerrit.libreoffice.org/1007 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: restore Gerrit-Change-Id: Ic783f0d5841cafce6dba60213b0a658978ff2cfd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stefan Knorr heinzless...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Cut and paste typo ?
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1009 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/1009/1 Cut and paste typo ? Corrected according to surrounding code. I don't know if or when this code is called. Change-Id: I4ed63439e47a89cc982d792c619c4c58335daf93 Signed-off-by: jailletc36 christophe.jail...@wanadoo.fr --- M xmloff/source/style/backhdl.cxx 1 file changed, 0 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1009 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ed63439e47a89cc982d792c619c4c58335daf93 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christophe JAILLET christophe.jail...@wanadoo.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sccomp/Library_solver.mk
sccomp/Library_solver.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit f66e86f302a4ab0d0862079bdab3b506733c897f Author: Rene Engelhard r...@debian.org Date: Thu Nov 8 21:45:36 2012 +0100 readd SYSTEM_LPSOLVE define in sccomp after gbuildification Change-Id: I3c6f160b7d19531df317d39723d1633ce58cccf9 diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 52f99cc..a0db0d3 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -41,6 +41,12 @@ $(eval $(call gb_Library_use_libraries,solver,\ $(gb_UWINAPI) \ )) +ifeq ($(SYSTEM_LPSOLVE),YES) +$(eval $(call gb_Library_add_defs,solver, \ + -DSYSTEM_LPSOLVE \ +)) +endif + $(eval $(call gb_Library_use_external,solver,lpsolve)) $(eval $(call gb_Library_add_exception_objects,solver,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 --- Comment #21 from tommy27 ba...@quipo.it --- are we going to rename this meta-issue as LibO 4.0 MAB? http://wiki.documentfoundation.org/ReleasePlan/4.0#4.0.0_release -- 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] connectivity: fix re-introduced bug fdo 35023
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1011 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/11/1011/1 connectivity: fix re-introduced bug fdo 35023 regression from f42a9309760565d24619bad9ee1f5561ce89c14b which forgot to adapt getImplementationEnvironment to new prefix Change-Id: If5a6f804b8f9f91e22f093a76f6b81a2b62991ab --- M connectivity/source/drivers/jdbc/jservices.cxx 1 file changed, 1 insertion(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1011 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5a6f804b8f9f91e22f093a76f6b81a2b62991ab 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
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Andras Timar tima...@gmail.com changed: What|Removed |Added Summary|LibreOffice 3.7 most|LibreOffice 4.0 most |annoying bugs |annoying bugs -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options
Le Thu, 08 Nov 2012 12:40:03 +0100, Tor Lillqvist t...@iki.fi a écrit: the ones who used it have done so for quite a while under the current name... But surely what we strive for with all of this is not to make things easier for people who already know what something means, and know that they want it, or know that they don't want it? We want to make the meaning of these configure options as self-documenting as possible to total newbies, right? I totally agree --enable-debuginfo is fine, but IMHO maybe too similar to --enable-debug. --enable-backtrace seems sensible, and quite clearly states we are not in a real debug session here. HTH My 2 cents. -- Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Adding the browser to Libreoffice
Dear all, after some talks with some board members, the request rised to include more members and developers in the idea of adding a browser to Libreoffice. We know this needs time and work, but would not be impossible to add it to the installer and create a place to be for it, and see, how the community reacts to it and requests more interaction. This security orientated webkit browser would be a good codebasis for that: http://sourceforge.net/projects/dooble/ Any pro or cons from anyone? No person in the office works today without the internet, the consequence is, an office suite needs or could provide an open source browser. Anyone interested to test or join the idea or recommendations for the steps to plan? Regards Randolph ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: config_host.mk.in configure.ac more_fonts/ExternalPackage_opensans.mk more_fonts/ExternalPackage_ptserif.mk more_fonts/ExternalPackage_sourcecode.mk more_fonts/ExternalPackage
config_host.mk.in|4 +++ configure.ac | 12 ++ more_fonts/ExternalPackage_opensans.mk | 21 ++ more_fonts/ExternalPackage_ptserif.mk| 21 ++ more_fonts/ExternalPackage_sourcecode.mk | 19 more_fonts/ExternalPackage_sourcesans.mk | 21 ++ more_fonts/Module_more_fonts.mk |8 ++ more_fonts/UnpackedTarball_opensans.mk | 14 more_fonts/UnpackedTarball_ptserif.mk| 14 more_fonts/UnpackedTarball_sourcecode.mk | 14 more_fonts/UnpackedTarball_sourcesans.mk | 14 ooo.lst.in |4 +++ scp2/source/ooo/file_font_ooo.scp| 36 +++ scp2/source/ooo/module_hidden_ooo.scp| 16 - 14 files changed, 217 insertions(+), 1 deletion(-) New commits: commit 84ba49c55dccdd619d46e588162fb62dc31b287f Author: Stefan Knorr heinzless...@gmail.com Date: Fri Nov 2 14:58:41 2012 +0100 Add more fonts (PT Serif, Source Code Pro and Souce Sans Pro under OFL; Open Sans under ALv2) Change-Id: Ic783f0d5841cafce6dba60213b0a658978ff2cfd Reviewed-on: https://gerrit.libreoffice.org/1007 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com diff --git a/config_host.mk.in b/config_host.mk.in index 59e6f47..3fb9489 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -191,6 +191,10 @@ export FONT_LIBERATION_NARROW_TARBALL=@FONT_LIBERATION_NARROW_TARBALL@ export FONT_LIBERATION_TARBALL=@FONT_LIBERATION_TARBALL@ export FONT_GENTIUM_TARBALL=@FONT_GENTIUM_TARBALL@ export FONT_DEJAVU_TARBALL=@FONT_DEJAVU_TARBALL@ +export FONT_PTSERIF_TARBALL=@FONT_PTSERIF_TARBALL@ +export FONT_OPENSANS_TARBALL=@FONT_OPENSANS_TARBALL@ +export FONT_SOURCESANS_TARBALL=@FONT_SOURCESANS_TARBALL@ +export FONT_SOURCECODE_TARBALL=@FONT_SOURCECODE_TARBALL@ export FONTCONFIG_CFLAGS=@FONTCONFIG_CFLAGS@ export FONTCONFIG_LIBS=@FONTCONFIG_LIBS@ export FONTCONFIG_TARBALL=@FONTCONFIG_TARBALL@ diff --git a/configure.ac b/configure.ac index 0829514..2443131 100644 --- a/configure.ac +++ b/configure.ac @@ -11137,6 +11137,10 @@ if test $with_fonts != no; then FONT_LIBERATION_NARROW_TARBALL=0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz FONT_LIBERATION_TARBALL=5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz FONT_LINLIBERTINEG_TARBALL=e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip + FONT_OPENSANS_TARBALL=7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz + FONT_PTSERIF_TARBALL=c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz + FONT_SOURCECODE_TARBALL=0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz + FONT_SOURCESANS_TARBALL=1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz else AC_MSG_RESULT([no]) WITH_FONTS=NO @@ -11146,12 +11150,20 @@ else FONT_LIBERATION_NARROW_TARBALL= FONT_LIBERATION_TARBALL= FONT_LINLIBERTINEG_TARBALL= +FONT_OPENSANS_TARBALL= +FONT_PTSERIF_TARBALL= +FONT_SOURCECODE_TARBALL= +FONT_SOURCESANS_TARBALL= fi AC_SUBST(FONT_DEJAVU_TARBALL) AC_SUBST(FONT_GENTIUM_TARBALL) AC_SUBST(FONT_LIBERATION_TARBALL) AC_SUBST(FONT_LINLIBERTINEG_TARBALL) AC_SUBST(FONT_LIBERATION_NARROW_TARBALL) +AC_SUBST(FONT_OPENSANS_TARBALL) +AC_SUBST(FONT_PTSERIF_TARBALL) +AC_SUBST(FONT_SOURCECODE_TARBALL) +AC_SUBST(FONT_SOURCESANS_TARBALL) AC_SUBST(WITH_FONTS) diff --git a/more_fonts/ExternalPackage_opensans.mk b/more_fonts/ExternalPackage_opensans.mk new file mode 100644 index 000..52c2090 --- /dev/null +++ b/more_fonts/ExternalPackage_opensans.mk @@ -0,0 +1,21 @@ +# -*- 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_ExternalPackage_ExternalPackage,font_opensans_inc,font_opensans)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,font_opensans_inc,pck,\ + OpenSans-BoldItalic.ttf \ + OpenSans-Bold.ttf \ + OpenSans-Italic.ttf \ + OpenSans-Regular.ttf \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_file,font_opensans_inc,pck/License_opensans.txt,LICENSE.txt)) + +# vim: set noet sw=4 ts=4: diff --git a/more_fonts/ExternalPackage_ptserif.mk b/more_fonts/ExternalPackage_ptserif.mk new file mode 100644 index 000..6dd15b9 --- /dev/null +++ b/more_fonts/ExternalPackage_ptserif.mk @@ -0,0 +1,21 @@ +# -*- 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,
[PUSHED] Add more fonts
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1007 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1007 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic783f0d5841cafce6dba60213b0a658978ff2cfd Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stefan Knorr heinzless...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Remove unused methods
Marcos Souza has abandoned this change. Change subject: Remove unused methods .. Patch Set 1: Abandoned Caolan already changed and comitted -- To view, visit https://gerrit.libreoffice.org/937 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Icf07223023f518a9a54fcf94fd9698bbd2890668 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Remove a unused method from sd
Marcos Souza has abandoned this change. Change subject: Remove a unused method from sd .. Patch Set 1: Abandoned Ow... just remove it :) -- To view, visit https://gerrit.libreoffice.org/948 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Iae918397a61f1b08983b666248075feeded8d99b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] framework: Remove code inside a ifdef without define
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1012 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/12/1012/1 framework: Remove code inside a ifdef without define I didn't find in any place a #define ENABLE_COMPONENT_SELF_CHECK, so I belive all this is junk. Change-Id: Ieb6e92b78782f7cb7520ffd050be1654678ef866 Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- M framework/inc/classes/filtercache.hxx M framework/inc/jobs/joburl.hxx M framework/source/jobs/joburl.cxx M helpcontent2 4 files changed, 0 insertions(+), 385 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1012 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb6e92b78782f7cb7520ffd050be1654678ef866 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] .: 4 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx| 112
sc/source/core/data/dpcache.cxx | 35 ++--
2 files changed, 140 insertions(+), 7 deletions(-)
New commits:
commit 87003581c0cf1068172259c8b9949349fe7ff6b5
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Nov 8 16:09:11 2012 -0500
fdo#54898: Test equality by order index (integer) which is more stable.
At the point where std::unique is called, we can use order indices to
determine whether the two items are equal. This should be more stable
than using CaseInsEqual() to assess equality.
Change-Id: I88310fc7beede19fb1c629b9b7e3cb9a069b2b23
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index d5c5d5f..b5f7424 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -207,11 +207,11 @@ struct LessByDataIndex : std::binary_functionBucket,
Bucket, bool
}
};
-struct EqualByValue : std::binary_functionBucket, Bucket, bool
+struct EqualByOrderIndex : std::binary_functionBucket, Bucket, bool
{
bool operator() (const Bucket left, const Bucket right) const
{
-return left.maValue.IsCaseInsEqual(right.maValue);
+return left.mnOrderIndex == right.mnOrderIndex;
}
};
@@ -287,7 +287,7 @@ void processBuckets(std::vectorBucket aBuckets,
ScDPCache::Field rField)
// Unique by value.
std::vectorBucket::iterator itUniqueEnd =
-std::unique(aBuckets.begin(), aBuckets.end(), EqualByValue());
+std::unique(aBuckets.begin(), aBuckets.end(), EqualByOrderIndex());
// Copy the unique values into items.
std::vectorBucket::iterator itBeg = aBuckets.begin();
commit 4ca546deacda936763b372a202123ce5234086a3
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Nov 8 16:04:39 2012 -0500
New unit test for pivot table's handling of double-precision values.
Note: This test passes just fine on master. On the 3-6 branch the test
itself also passes fine, *but* when re-creating the same scenario from
the UI, it fails only with the 3.6 build. I have no idea why.
This test is modeled after fdo#54898.
Change-Id: I32eb9b2f2bdc12ef801daf0ccb9a3db2d5efd8d6
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index ce8ea86..5b48f25 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -178,6 +178,12 @@ public:
*/
void testPivotTableCaseInsensitiveStrings();
+/**
+ * Test for pivot table's handling of double-precision numbers that are
+ * very close together.
+ */
+void testPivotTableNumStability();
+
void testSheetCopy();
void testSheetMove();
void testExternalRef();
@@ -257,6 +263,7 @@ public:
CPPUNIT_TEST(testPivotTableEmptyRows);
CPPUNIT_TEST(testPivotTableTextNumber);
CPPUNIT_TEST(testPivotTableCaseInsensitiveStrings);
+CPPUNIT_TEST(testPivotTableNumStability);
CPPUNIT_TEST(testSheetCopy);
CPPUNIT_TEST(testSheetMove);
CPPUNIT_TEST(testExternalRef);
@@ -3186,6 +3193,111 @@ void Test::testPivotTableCaseInsensitiveStrings()
m_pDoc-DeleteTab(0);
}
+void Test::testPivotTableNumStability()
+{
+FormulaGrammarSwitch aFGSwitch(m_pDoc,
formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1);
+
+// Raw Data
+const char* aData[][4] = {
+{ Name, Time Start, Time End, Total },
+{ Sam,07:48 AM, 09:00 AM, =RC[-1]-RC[-2] },
+{ Sam,09:00 AM, 10:30 AM, =RC[-1]-RC[-2] },
+{ Sam,10:30 AM, 12:30 PM, =RC[-1]-RC[-2] },
+{ Sam,12:30 PM, 01:00 PM, =RC[-1]-RC[-2] },
+{ Sam,01:00 PM, 01:30 PM, =RC[-1]-RC[-2] },
+{ Sam,01:30 PM, 02:00 PM, =RC[-1]-RC[-2] },
+{ Sam,02:00 PM, 07:15 PM, =RC[-1]-RC[-2] },
+{ Sam,07:47 AM, 09:00 AM, =RC[-1]-RC[-2] },
+{ Sam,09:00 AM, 10:00 AM, =RC[-1]-RC[-2] },
+{ Sam,10:00 AM, 11:00 AM, =RC[-1]-RC[-2] },
+{ Sam,11:00 AM, 11:30 AM, =RC[-1]-RC[-2] },
+{ Sam,11:30 AM, 12:45 PM, =RC[-1]-RC[-2] },
+{ Sam,12:45 PM, 01:15 PM, =RC[-1]-RC[-2] },
+{ Sam,01:15 PM, 02:30 PM, =RC[-1]-RC[-2] },
+{ Sam,02:30 PM, 02:45 PM, =RC[-1]-RC[-2] },
+{ Sam,02:45 PM, 04:30 PM, =RC[-1]-RC[-2] },
+{ Sam,04:30 PM, 06:00 PM, =RC[-1]-RC[-2] },
+{ Sam,06:00 PM, 07:15 PM, =RC[-1]-RC[-2] },
+{ Mike, 06:15 AM, 08:30 AM, =RC[-1]-RC[-2] },
+{ Mike, 08:30 AM, 10:03 AM, =RC[-1]-RC[-2] },
+{ Mike, 10:03 AM, 12:00 PM, =RC[-1]-RC[-2] },
+{ Dennis, 11:00 AM, 01:00 PM, =RC[-1]-RC[-2] },
+{ Dennis, 01:00 PM, 02:00 PM, =RC[-1]-RC[-2] }
+};
+
+// Dimension definition
+DPFieldDef aFields[] = {
+{ Name, sheet::DataPilotFieldOrientation_ROW, 0 },
+{ Total, sheet::DataPilotFieldOrientation_DATA,
sheet::GeneralFunction_SUM },
+
[PATCH] Change in core[libreoffice-3-6]: fdo#54898: Test equality by order index (integer) which is m...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1013 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/1013/1 fdo#54898: Test equality by order index (integer) which is more stable. At the point where std::unique is called, we can use order indices to determine whether the two items are equal. This should be more stable than using CaseInsEqual() to assess equality. Change-Id: I88310fc7beede19fb1c629b9b7e3cb9a069b2b23 --- M sc/source/core/data/dpcache.cxx 1 file changed, 3 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1013 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88310fc7beede19fb1c629b9b7e3cb9a069b2b23 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/jdbc/jservices.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 732e9ff2bada3f8f9db5f39da832e6f98182978e
Author: Michael Stahl mst...@redhat.com
Date: Thu Nov 8 21:42:46 2012 +0100
connectivity: fix re-introduced bug fdo 35023
regression from f42a9309760565d24619bad9ee1f5561ce89c14b
which forgot to adapt getImplementationEnvironment to new prefix
Change-Id: If5a6f804b8f9f91e22f093a76f6b81a2b62991ab
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx
b/connectivity/source/drivers/jdbc/jservices.cxx
index 8ad3d81..2d29006 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -75,7 +75,7 @@ struct ProviderRequest
};
extern C SAL_DLLPUBLIC_EXPORT void SAL_CALL
-component_getImplementationEnvironment(
+jdbc_component_getImplementationEnvironment(
char const ** ppEnvTypeName, uno_Environment **)
{
// Recent Java 6 VMs make calls to JNI Attach/DetachCurrentThread (which
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [tdf-discuss] Adding the browser to Libreoffice
I'm a common and simple user, no more, no less, so perhaps there's a part of the picture i'm missing, but there are some questions that arise: - What would be the befenit of adding a browser to the current office suite ? - What different features would keep you from reinventing the wheel / allow you to do a better job than other communities that are dedicated to mantaining and creating a browser ? - Is this really the best place to put dev effort at the moment for libreoffice ? My implicit response is that I don't like the idea, and I think the community will react negatively to it. To me, it is a bit far fetched. Regards Claudio On Thu, Nov 8, 2012 at 6:04 PM, Randolph D. rdohm...@gmail.com wrote: Dear all, after some talks with some board members, the request rised to include more members and developers in the idea of adding a browser to Libreoffice. We know this needs time and work, but would not be impossible to add it to the installer and create a place to be for it, and see, how the community reacts to it and requests more interaction. This security orientated webkit browser would be a good codebasis for that: http://sourceforge.net/projects/dooble/ Any pro or cons from anyone? No person in the office works today without the internet, the consequence is, an office suite needs or could provide an open source browser. Anyone interested to test or join the idea or recommendations for the steps to plan? Regards Randolph -- Unsubscribe instructions: E-mail to discuss+h...@documentfoundation.org Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://listarchives.documentfoundation.org/www/discuss/ All messages sent to this list will be publicly archived and cannot be deleted ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] connectivity: fix re-introduced bug fdo 35023
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1011 -- To view, visit https://gerrit.libreoffice.org/1011 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If5a6f804b8f9f91e22f093a76f6b81a2b62991ab Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sccomp/Library_solver.mk
sccomp/Library_solver.mk |6 -- 1 file changed, 6 deletions(-) New commits: commit b0050ee6da42d0ce02d58d8dc901f9ab11536906 Author: Peter Foley pefol...@verizon.net Date: Thu Nov 8 16:53:54 2012 -0500 Revert readd SYSTEM_LPSOLVE define in sccomp after gbuildification Should be handled by lpsolve external This reverts commit f66e86f302a4ab0d0862079bdab3b506733c897f. diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index a0db0d3..52f99cc 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -41,12 +41,6 @@ $(eval $(call gb_Library_use_libraries,solver,\ $(gb_UWINAPI) \ )) -ifeq ($(SYSTEM_LPSOLVE),YES) -$(eval $(call gb_Library_add_defs,solver, \ - -DSYSTEM_LPSOLVE \ -)) -endif - $(eval $(call gb_Library_use_external,solver,lpsolve)) $(eval $(call gb_Library_add_exception_objects,solver,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: liblangtag/liblangtag-0.4.0-windows.patch
liblangtag/liblangtag-0.4.0-windows.patch |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 45d196c0cc74a8c1ae702514d67ca09b3afb3d5d
Author: Eike Rathke er...@redhat.com
Date: Thu Nov 8 23:11:44 2012 +0100
corrected Windows lt_atomic_int_dec_and_test()
check pre-decremented value for zero
Change-Id: Ib2289cb6064941db2072b2dfbd6ad5f03bcff7aa
diff --git a/liblangtag/liblangtag-0.4.0-windows.patch
b/liblangtag/liblangtag-0.4.0-windows.patch
index 1f07bd0..270f280 100644
--- a/liblangtag/liblangtag-0.4.0-windows.patch
+++ b/liblangtag/liblangtag-0.4.0-windows.patch
@@ -74,7 +74,7 @@
+{
+ lt_return_val_if_fail (v != NULL, FALSE);
+
-+ return 1 == InterlockedExchangeAdd((LONG*)v, -1) - 1;
++ return 0 == (InterlockedExchangeAdd((LONG*)v, -1) - 1);
+}
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] binfilter.die.die.die
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1014 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/1014/1 binfilter.die.die.die Change-Id: Ia3c103e4343d309b997ed37e33a382ffdfbddac3 --- M .gitmodules M bin/distro-install-desktop-integration M bin/distro-install-file-lists M bin/lo-commit-stat M bin/lo-pack-sources M config_host.mk.in M configure.ac M distro-configs/LibreOfficeLinux.conf M distro-configs/LibreOfficeMacOSX.conf M distro-configs/LibreOfficeMinGW.conf M distro-configs/LibreOfficeOpenBSD.conf M distro-configs/LibreOfficeWin32.conf M distro-configs/OxygenOfficeLinux.conf M distro-configs/OxygenOfficeWin32.conf M filter/Configuration_filter.mk M g M postprocess/packcomponents/makefile.mk M postprocess/packregistry/makefile.mk M postprocess/prj/build.lst D scp2/InstallModule_binfilter.mk M scp2/InstallScript_setup_osl.mk M scp2/Module_scp2.mk M scp2/inc/macros.inc D scp2/source/binfilter/file_binfilter.scp D scp2/source/binfilter/module_binfilter.scp D scp2/source/binfilter/module_binfilter.ulf D scp2/source/binfilter/registryitem_binfilter.scp D scp2/source/binfilter/registryitem_binfilter.ulf M scp2/source/ooo/common_brand.scp M solenv/bin/create-tags M solenv/inc/libs.mk M solenv/inc/wntmsc.mk M sot/inc/sot/storage.hxx M sysui/desktop/freedesktop/freedesktop-menus.spec D sysui/desktop/menus/binfilter.desktop M sysui/desktop/share/launcher_genericname.ulf M sysui/desktop/share/makefile.mk M sysui/desktop/suse/suse-menus.spec M tools/inc/tools/debug.hxx M unusedcode.easy 40 files changed, 14 insertions(+), 1,591 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1014 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3c103e4343d309b997ed37e33a382ffdfbddac3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx | 27 +++
sc/source/core/tool/interpr5.cxx |6 +++---
2 files changed, 30 insertions(+), 3 deletions(-)
New commits:
commit 70ec826eeb8f0b311095869e23be1db95fc9d109
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Nov 8 19:50:02 2012 -0500
New unit test to ensure correct matrix creation.
See fdo#56829 for what inspired this test case.
Change-Id: Iee15d85a35ae96769d21ce7061b352860a5b587b
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 5b48f25..0606562 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -125,6 +125,7 @@ public:
void testNamedRange();
void testCSV();
void testMatrix();
+void testEnterMixedMatrix();
/**
* Basic test for pivot tables.
@@ -250,6 +251,7 @@ public:
CPPUNIT_TEST(testNamedRange);
CPPUNIT_TEST(testCSV);
CPPUNIT_TEST(testMatrix);
+CPPUNIT_TEST(testEnterMixedMatrix);
CPPUNIT_TEST(testPivotTable);
CPPUNIT_TEST(testPivotTableLabels);
CPPUNIT_TEST(testPivotTableDateLabels);
@@ -1513,6 +1515,31 @@ void Test::testMatrix()
checkMatrixElementsPartiallyFilledEmptyMatrix(*pMat);
}
+void Test::testEnterMixedMatrix()
+{
+m_pDoc-InsertTab(0, foo);
+
+// Insert the source values in A1:B2.
+m_pDoc-SetString(0, 0, 0, A);
+m_pDoc-SetString(1, 0, 0, B);
+double val = 1.0;
+m_pDoc-SetValue(0, 1, 0, val);
+val = 2.0;
+m_pDoc-SetValue(1, 1, 0, val);
+
+// Create a matrix range in A4:B5 referencing A1:B2.
+ScMarkData aMark;
+aMark.SelectOneTable(0);
+m_pDoc-InsertMatrixFormula(0, 3, 1, 4, aMark, =A1:B2, NULL);
+
+CPPUNIT_ASSERT_EQUAL(m_pDoc-GetString(0,0,0), m_pDoc-GetString(0,3,0));
+CPPUNIT_ASSERT_EQUAL(m_pDoc-GetString(1,0,0), m_pDoc-GetString(1,3,0));
+CPPUNIT_ASSERT_EQUAL(m_pDoc-GetValue(0,1,0), m_pDoc-GetValue(0,4,0));
+CPPUNIT_ASSERT_EQUAL(m_pDoc-GetValue(1,1,0), m_pDoc-GetValue(1,4,0));
+
+m_pDoc-DeleteTab(0);
+}
+
namespace {
struct DPFieldDef
commit 78bf3c9abd4a8cd939e7ba4399ae4aab9f3b2982
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Nov 8 19:49:10 2012 -0500
fdo#56829: Correctly pass element values to matrix.
Change-Id: I20045ae0ddcec228b153c4005855dca9c4ddbfca
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 46fd6fc..faa0db5 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -453,7 +453,7 @@ ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const
FormulaToken* pToken
nGlobalError = 0;
}
-if (nThisRow == nPrevRow + 1)
+if (!aBucket.maNumVals.empty() nThisRow == nPrevRow + 1)
{
// Secondary numbers.
aBucket.maNumVals.push_back(fVal);
@@ -475,7 +475,7 @@ ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const
FormulaToken* pToken
double fVal = CreateDoubleError( nGlobalError);
nGlobalError = 0;
-if (nThisRow == nPrevRow + 1)
+if (!aBucket.maNumVals.empty() nThisRow == nPrevRow + 1)
{
// Secondary numbers.
aBucket.maNumVals.push_back(fVal);
@@ -490,7 +490,7 @@ ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const
FormulaToken* pToken
}
else
{
-if (nThisRow == nPrevRow + 1)
+if (!aBucket.maStrVals.empty() nThisRow == nPrevRow + 1)
{
// Secondary numbers.
aBucket.maStrVals.push_back(aStr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in configure.ac lcms2/ExternalPackage_lcms2.mk lcms2/ExternalProject_lcms2.mk lcms2/Makefile lcms2/makefile.mk lcms2/Module_lcms2.mk lcms2/prj lcms2/UnpackedTar
Makefile.top |2
Module_tail_build.mk |1
RepositoryExternal.mk| 16 +++--
RepositoryModule_ooo.mk |1
config_host.mk.in|2
configure.ac |6 --
lcms2/ExternalPackage_lcms2.mk | 30 ++
lcms2/ExternalProject_lcms2.mk | 43 ++
lcms2/Makefile |7 ++
lcms2/Module_lcms2.mk| 20 ++
lcms2/UnpackedTarball_lcms2.mk | 20 ++
lcms2/makefile.mk| 115 ---
lcms2/prj/build.lst |3 -
lcms2/prj/d.lst | 11 ---
libcdr/ExternalProject_libcdr.mk | 15 +++--
tail_build/prj/build.lst |2
16 files changed, 148 insertions(+), 146 deletions(-)
New commits:
commit f745212f9650b481dc546c04ae26f3f58bfedd01
Author: Peter Foley pefol...@verizon.net
Date: Sun Nov 4 08:46:44 2012 -0500
convert lcms2 to gbuild
Change-Id: I96de6b20b2a68f0982a30d33359e9e9cda9e642c
diff --git a/Makefile.top b/Makefile.top
index a31df13..9e67a71 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -105,6 +105,7 @@ jvmaccess\
jvmfwk\
l10ntools\
languagetool\
+lcms2\
libcdr\
libcmis\
libmspub\
@@ -228,7 +229,6 @@ liblangtag\
libxml2\
libxmlsec\
libxslt\
-lcms2\
migrationanalysis\
moz\
mysqlc\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 06abdb9..f1a43f9 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -92,6 +92,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
jvmaccess \
jvmfwk \
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
+ $(call gb_Helper_optional,LCMS2,lcms2) \
libcdr \
libcmis \
libmspub \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 7688e42..007f7a4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -840,7 +840,6 @@ gb_LinkTarget__use_graphite :=
endif # SYSTEM_GRAPHITE
-
ifeq ($(SYSTEM_ICU),YES)
define gb_LinkTarget__use_icudata
@@ -872,7 +871,7 @@ else
gb_ICU_suffix:=
endif
-# icudata and icui18n is called icudt and icuin when built with MSVC :-(
+# icudata and icui18n is called icudt and icuin when built with MSVC :-/
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
icudt \
@@ -1184,7 +1183,7 @@ ifeq ($(SYSTEM_LCMS2),YES)
define gb_LinkTarget__use_lcms2
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
-$(LCMS2_CFLAGS) \
+ $(LCMS2_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS))
@@ -1199,8 +1198,9 @@ $(eval $(call
gb_Helper_register_static_libraries,PLAINLIBS, \
))
define gb_LinkTarget__use_lcms2
+$(call gb_LinkTarget_use_external_project,$(1),lcms2)
$(call gb_LinkTarget_set_include,$(1),\
- -I$(OUTDIR)/inc/lcms2 \
+ -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
$$(INCLUDE) \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
@@ -1216,8 +1216,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,
\
))
define gb_LinkTarget__use_lcms2
+$(call gb_LinkTarget_use_external_project,$(1),lcms2)
$(call gb_LinkTarget_set_include,$(1),\
- -I$(OUTDIR)/inc/lcms2 \
+ -I$(call gb_UnpackedTarball_get_dir,lcms2/include) \
$$(INCLUDE) \
)
$(call gb_LinkTarget_use_libraries,$(1),\
@@ -1226,6 +1227,11 @@ $(call gb_LinkTarget_use_libraries,$(1),\
endef
+define gb_ExternalProject__use_lcms2
+$(call gb_ExternalProject_use_package,$(1),lcms2)
+
+endef
+
endif # ANDROID
endif # SYSTEM_LCMS2
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 3b8cf28..e77c1c8 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -102,6 +102,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
jvmfwk \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
+ $(call gb_Helper_optional,LCMS2,lcms2) \
libcdr \
libcmis \
libmspub \
diff --git a/config_host.mk.in b/config_host.mk.in
index 3fb9489..3ffaee0 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -316,7 +316,7 @@ export LANGUAGETOOL_TARBALL=@LANGUAGETOOL_TARBALL@
export L10N_MODULE=@L10N_MODULE@
export LCMS2_CFLAGS=@LCMS2_CFLAGS@
export LCMS2_LIBS=@LCMS2_LIBS@
-export LCMS2_TARBALL==@LCMS2_TARBALL@
+export LCMS2_TARBALL=@LCMS2_TARBALL@
ifneq ($(strip @LDFLAGS@),)
export LDFLAGS=@LDFLAGS@
endif
diff --git a/configure.ac b/configure.ac
index 2443131..e305444 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7037,14 +7037,10 @@ else
SYSTEM_LCMS2=NO
LCMS2_TARBALL=861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
BUILD_TYPE=$BUILD_TYPE LCMS2
-LCMS2_CFLAGS=-I${OUTDIR}/inc/lcms2
-if test $_os = Darwin; then
-LCMS2_CFLAGS=$LCMS2_CFLAGS -Wno-long-long
-fi
-LCMS2_LIBS=-L${OUTDIR}/lib -llcms2
fi
AC_SUBST(SYSTEM_LCMS2)
AC_SUBST(LCMS2_CFLAGS)
[Libreoffice-commits] .: lcms2/ExternalPackage_lcms2.mk
lcms2/ExternalPackage_lcms2.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d035b3fb1f4bc904488b015b332d252b2a544fbf Author: Peter Foley pefol...@verizon.net Date: Thu Nov 8 20:35:34 2012 -0500 fix gbuildified lcms2 on mac Change-Id: I8359e1d441cf7bd8fb01233fe0303dbd6b35895b diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk index a053b18..1d62736 100644 --- a/lcms2/ExternalPackage_lcms2.mk +++ b/lcms2/ExternalPackage_lcms2.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,lcms2,lcms2)) $(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2)) ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib)) +$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dylib,src/.libs/liblcms2.2.dylib)) else ifeq ($(filter-out IOS ANDROID,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.a,src/.libs/liblcms2.a)) else ifeq ($(OS),WNT) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lcms2/ExternalProject_lcms2.mk
lcms2/ExternalProject_lcms2.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 7816667a62cc4144320c1554f8dbb8b4011e37b7 Author: Peter Foley pefol...@verizon.net Date: Thu Nov 8 20:45:47 2012 -0500 blind fix for mingw Change-Id: I10433beb4c2cea508760083812bc63f4eab02ed0 diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk index a7cc3f1..4a7a8eb 100644 --- a/lcms2/ExternalProject_lcms2.mk +++ b/lcms2/ExternalProject_lcms2.mk @@ -34,6 +34,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build): cd $(EXTERNAL_WORKDIR) \ ./configure --without-jpeg --without-tiff --with-pic \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter WNTGCC,$(OS)$(COM)),LDFLAGS=-Wl,--export-all-symbols -Wl,--enable-stdcall-fixup -Wl,--enable-runtime-pseudo-reloc-v2) \ CPPFLAGS= $(SOLARINC) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared, --enable-shared --disable-static) \ cd src \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) New commits: commit 8905c0e4b0a01297875359282ba4bdd748be0cf1 Author: Peter Foley pefol...@verizon.net Date: Thu Nov 8 21:00:30 2012 -0500 fix system lcms2 Change-Id: I1dfb345d3047b59c79454d60747d192a761071ef diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 007f7a4..3c0dc3a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1189,8 +1189,15 @@ $(call gb_LinkTarget_add_libs,$(1),$(LCMS2_LIBS)) endef +gb_ExternalProject__use_lcms2 := + else # !SYSTEM_LCMS2 +define gb_ExternalProject__use_lcms2 +$(call gb_ExternalProject_use_package,$(1),lcms2) + +endef + ifeq ($(OS),ANDROID) $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ @@ -1227,11 +1234,6 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef -define gb_ExternalProject__use_lcms2 -$(call gb_ExternalProject_use_package,$(1),lcms2) - -endef - endif # ANDROID endif # SYSTEM_LCMS2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lcms2/ExternalProject_lcms2.mk
lcms2/ExternalProject_lcms2.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a8251cfed18a33a7f2e33e64060ec616d8d21fcc Author: Peter Foley pefol...@verizon.net Date: Thu Nov 8 21:45:59 2012 -0500 make does not like commas Change-Id: Icc1e7f5be1a4c06242793948a07de20cf3e03b61 diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk index 4a7a8eb..5b1eeea 100644 --- a/lcms2/ExternalProject_lcms2.mk +++ b/lcms2/ExternalProject_lcms2.mk @@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build): cd $(EXTERNAL_WORKDIR) \ ./configure --without-jpeg --without-tiff --with-pic \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter WNTGCC,$(OS)$(COM)),LDFLAGS=-Wl,--export-all-symbols -Wl,--enable-stdcall-fixup -Wl,--enable-runtime-pseudo-reloc-v2) \ + $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS=-Wl,--export-all-symbols -Wl,--enable-stdcall-fixup -Wl,--enable-runtime-pseudo-reloc-v2) \ CPPFLAGS= $(SOLARINC) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared, --enable-shared --disable-static) \ cd src \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - sc/inc sc/qa
sc/inc/conditio.hxx |6 --
sc/qa/unit/subsequent_export-test.cxx | 81 ++
2 files changed, 72 insertions(+), 15 deletions(-)
New commits:
commit fa4b644b67c7547b94b1e1d2749cf6ccb6e718ab
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Nov 8 01:05:09 2012 +0100
remove unused methods in ScConditionalFormat
Change-Id: I36e57f8eac028e72fedd81a5fb05698ff1c57fe0
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 89b451f..afcfd01 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -335,7 +335,6 @@ class SC_DLLPUBLIC ScConditionalFormat
typedef boost::ptr_vectorScFormatEntry CondFormatContainer;
CondFormatContainer maEntries;
-boolbIsUsed;// temporary at Save
ScRangeList maRanges;// Ranges for conditional format
public:
@@ -378,9 +377,6 @@ public:
sal_uInt32 GetKey() const { return nKey; }
voidSetKey(sal_uInt32 nNew) { nKey = nNew; }// only if not
inserted!
-voidSetUsed(bool bSet) { bIsUsed = bSet; }
-boolIsUsed() const { return bIsUsed; }
-
boolMarkUsedExternalReferences() const;
#if DUMP_FORMAT_INFO
commit b710bef572cff000f61a9df6a691fec5d5af857e
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Nov 7 22:58:05 2012 +0100
add initial xlsx cond format export test
Change-Id: Ie2c55af903ef0fdf21444ee1f59d25382648d9fa
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 6ef97c1..d67224f 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -76,12 +76,14 @@ public:
void test();
void testPasswordExport();
+void testConditionalFormatExportXLSX();
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
#if !defined(MACOSX) !defined(DRAGONFLY) !defined(WNT)
CPPUNIT_TEST(testPasswordExport);
#endif
+CPPUNIT_TEST(testConditionalFormatExportXLSX);
CPPUNIT_TEST_SUITE_END();
private:
@@ -89,18 +91,27 @@ private:
uno::Referenceuno::XInterface m_xCalcComponent;
ScDocShellRef saveAndReload( ScDocShell* pShell, sal_Int32 nFormat );
+ScDocShellRef loadDocument( const rtl::OUString rFileNameBase, sal_Int32
nFormat );
+void createFileURL( const rtl::OUString aFileBase, const rtl::OUString
rFileExtension, rtl::OUString rFilePath);
+void createCSVPath(const rtl::OUString rFileBase, rtl::OUString
rCSVPath);
};
-/*
-void ScFiltersTest::createFileURL(const rtl::OUString aFileBase, const
rtl::OUString aFileExtension, rtl::OUString rFilePath)
+void ScExportTest::createFileURL(const rtl::OUString aFileBase, const
rtl::OUString aFileExtension, rtl::OUString rFilePath)
{
-rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM(/));
+rtl::OUString aSep(/);
rtl::OUStringBuffer aBuffer( getSrcRootURL() );
aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension);
aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
rFilePath = aBuffer.makeStringAndClear();
}
-*/
+
+void ScExportTest::createCSVPath(const rtl::OUString aFileBase,
rtl::OUString rCSVPath)
+{
+rtl::OUStringBuffer aBuffer(getSrcRootPath());
+aBuffer.append(m_aBaseString).append(rtl::OUString(/contentCSV/));
+aBuffer.append(aFileBase).append(rtl::OUString(csv));
+rCSVPath = aBuffer.makeStringAndClear();
+}
ScDocShellRef ScExportTest::saveAndReloadPassword(ScDocShell* pShell, const
rtl::OUString rFilter,
const rtl::OUString rUserData, const rtl::OUString rTypeName, sal_uLong
nFormatType)
@@ -210,6 +221,35 @@ ScDocShellRef ScExportTest::saveAndReload( ScDocShell*
pShell, sal_Int32 nFormat
return xDocSh;
}
+ScDocShellRef ScExportTest::loadDocument(const rtl::OUString rFileName,
sal_Int32 nFormat)
+{
+rtl::OUString aFileExtension(aFileFormats[nFormat].pName,
strlen(aFileFormats[nFormat].pName), RTL_TEXTENCODING_UTF8 );
+rtl::OUString aFilterName(aFileFormats[nFormat].pFilterName,
strlen(aFileFormats[nFormat].pFilterName), RTL_TEXTENCODING_UTF8) ;
+rtl::OUString aFileName;
+createFileURL( rFileName, aFileExtension, aFileName );
+rtl::OUString aFilterType(aFileFormats[nFormat].pTypeName,
strlen(aFileFormats[nFormat].pTypeName), RTL_TEXTENCODING_UTF8);
+unsigned int nFormatType = aFileFormats[nFormat].nFormatType;
+unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
+
+SfxFilter* pFilter = new SfxFilter(
+aFilterName,
+rtl::OUString(), nFormatType, nClipboardId, aFilterType, 0,
rtl::OUString(),
+rtl::OUString(), rtl::OUString(private:factory/scalc*) );
+pFilter-SetVersion(SOFFICE_FILEFORMAT_CURRENT);
+
+ScDocShellRef xDocShRef = new ScDocShell;
+SfxMedium* pSrcMed = new SfxMedium(aFileName, STREAM_STD_READ);
+
Re: minutes of ESC call ...
On Thu, Nov 08, 2012 at 04:39:22PM +, Michael Meeks wrote: * 4.0 pending tasks + should we drop Rhino, Beanshell javascript in 4.0 ? (Michael) + could be turned into an extension + was in the past was turned off (Stephan) AA: + disable Rhino / Beanshell unless in experimental mode (Michael) + for future deprecation / removal. *Why*? Is there some problem with these scripting languages, are they hard to maintain, ...? -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Depends on||56278 --- Comment #163 from Cor Nouws c...@nouenoff.nl --- adding bug 56278 EDITING: Calculate formula: DEl or BS to empty a cell with a formula, does not result in updating a formula referencing that cell maybe should have done that earlier. sorry -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding the browser to Libreoffice
No. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Change in core[master]: restore --enable-symbols option again -- was FYI: Cleanup of debug options
Argh, I hate myself for continuing this thread, but isn't there a risk that people will think --enable-backtrace is related to the code we have (but have disabled for some reason?), or used to have, to display backtraces in the application itself, when it notices some fatal signal/exception (but still is alive enough to be able to display a backtrace)? --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
