LibreOffice Gerrit News 2013-08-30
Moin! * Open changes on master for project core changed in the last 25 hours: + fdo#32059: Fix this once and for all in https://gerrit.libreoffice.org/5688 from Marcos Souza + fdo#44689: fix for specific case restart value 0 in https://gerrit.libreoffice.org/5681 from Adam CloudOn + ENABLE_CORETEXT: Harmonize ENABLE_* variable to TRUE/nothing in https://gerrit.libreoffice.org/5685 from Norbert Thiebaud + ENABLE_NPAPI_* Harmonize ENABLE_* variable to TRUE/nothing in https://gerrit.libreoffice.org/5684 from Norbert Thiebaud + Cross-platform libvlc loading. in https://gerrit.libreoffice.org/5627 from Minh Ngo + liblangtag: harmonize ENABLE_* variable to use TRUE/nothing in https://gerrit.libreoffice.org/5682 from Norbert Thiebaud + docx export: simplify pgBorders handling, and fix pgSz bug in https://gerrit.libreoffice.org/5664 from Pierre-Eric Pelloux-Prayer + Set FIREBIRD_TMP and FIREBIRD_LOCK with sane values. (firebird-sdbc) in https://gerrit.libreoffice.org/5678 from Andrzej J.R. Hunt + XubString-OUString in https://gerrit.libreoffice.org/5668 from Julien Nabet + fix for IsPlausibleSingleWordSection checking wrong condition in https://gerrit.libreoffice.org/5548 from Adam CloudOn * Merged changes on master for project core changed in the last 25 hours: + clean obsolete parts of ScMyCell in https://gerrit.libreoffice.org/5674 from Laurent Godard + Simplify and fix the embedded Firebird on OS X in https://gerrit.libreoffice.org/5675 from Tor Lillqvist + Convert Hyphenation dialogs to .ui in https://gerrit.libreoffice.org/5672 from Faisal al-otaibi * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + Don't use osl_createSuspendedThread anymore in https://gerrit.libreoffice.org/5565 from Arnaud Versini + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + Change oslThreadIdentifier to uintptr_t and use THREAD_VALUE on Unix. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn + fdo#66577: non-fractional widths with Core Text in https://gerrit.libreoffice.org/5023 from Khaled Hosny Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx | 166 ++--
1 file changed, 83 insertions(+), 83 deletions(-)
New commits:
commit 5272f275d02344922b22a43b7c5cd2bb72a47e63
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 30 07:56:27 2013 +0200
Make RTTI creation work for libc++
Unlike libstdc++.dylib, libc++abi.dylib no longer exports the type info for
std::type_info, but the layout of the __cxxabiv1::__*_type_info classes is
controlled by the Generic C++ ABI anyway, so consolidate to a single
approach
that works across all versions.
Change-Id: Ic68f2386261bae4a4349ad646590cc15c768f04e
diff --git a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
index f51cb75..0c31eed 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx
@@ -17,92 +17,105 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include sal/config.h
+#include cassert
+#include new
#include stdio.h
+#include string.h
+#include typeinfo
+
#include dlfcn.h
+
+// MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h defined
+// __cxxabiv1::__class_type_info and __cxxabiv1::__si_class_type_info but
+// MacOSX10.7.sdk/usr/include/cxxabi.h no longer does:
#if MACOSX_SDK_VERSION 1070
#include cxxabi.h
-#else
-#include typeinfo
#endif
-#include boost/unordered_map.hpp
-
-#include rtl/strbuf.hxx
-#include rtl/ustrbuf.hxx
-#include osl/diagnose.h
-#include osl/mutex.hxx
-#include com/sun/star/uno/genfunc.hxx
+#include boost/static_assert.hpp
+#include boost/unordered_map.hpp
#include com/sun/star/uno/RuntimeException.hpp
-#include typelib/typedescription.hxx
-#include uno/any2.h
+#include com/sun/star/uno/genfunc.hxx
+#include osl/diagnose.h
+#include osl/mutex.hxx
+#include rtl/strbuf.hxx
+#include rtl/ustrbuf.hxx
+#include typelib/typedescription.h
+#include uno/any2.h
#include share.hxx
-
-using namespace ::std;
using namespace ::osl;
-using namespace ::rtl;
using namespace ::com::sun::star::uno;
-#if MACOSX_SDK_VERSION 1070
-using namespace ::__cxxabiv1;
-#endif
-
-namespace CPPU_CURRENT_NAMESPACE
-{
-#ifndef _LIBCPP_VERSION
+namespace CPPU_CURRENT_NAMESPACE {
-#if MACOSX_SDK_VERSION = 1070
-
-// MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h defined
-// __cxxabiv1::__class_type_info and __cxxabiv1::__si_class_type_info but
-// MacOSX10.7.sdk/usr/include/cxxabi.h no longer does, so instances of those
-// classes need to be created manually:
+namespace {
-// std::type_info defined in typeinfo offers a protected ctor:
-struct FAKE_type_info: public std::type_info {
-FAKE_type_info(char const * name): type_info(name) {}
+struct Fake_type_info {
+virtual ~Fake_type_info() {}
+char const * name;
};
-// Modeled after __cxxabiv1::__si_class_type_info defined in
-// MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h (i.e.,
-// abi::__si_class_type_info documented at
-// http://www.codesourcery.com/public/cxx-abi/abi.html#rtti):
-struct FAKE_si_class_type_info: public FAKE_type_info {
-FAKE_si_class_type_info(char const * name, std::type_info const * theBase):
-FAKE_type_info(name), base(theBase) {}
+struct Fake_class_type_info: Fake_type_info {};
-std::type_info const * base;
-// actually a __cxxabiv1::__class_type_info pointer
+#if MACOSX_SDK_VERSION 1070
+BOOST_STATIC_ASSERT(
+sizeof (Fake_class_type_info) == sizeof (__cxxabiv1::__class_type_info));
+#endif
+
+struct Fake_si_class_type_info: Fake_class_type_info {
+void const * base;
};
+#if MACOSX_SDK_VERSION 1070
+BOOST_STATIC_ASSERT(
+sizeof (Fake_si_class_type_info)
+== sizeof (__cxxabiv1::__si_class_type_info));
+#endif
+
struct Base {};
struct Derived: Base {};
-std::type_info * create_FAKE_class_type_info(char const * name) {
-std::type_info * p = new FAKE_type_info(name);
-// cxxabiv1::__class_type_info has no data members in addition to
-// std::type_info
-*reinterpret_cast void ** (p) = *reinterpret_cast void * const * (
+std::type_info * createFake_class_type_info(char const * name) {
+char * buf = new char[sizeof (Fake_class_type_info)];
+#if MACOSX_SDK_VERSION 1070
+assert(
+dynamic_cast__cxxabiv1::__class_type_info const *(typeid(Base))
+!= 0);
+#endif
+*reinterpret_castvoid **(buf) = *reinterpret_castvoid * const *(
typeid(Base));
-// copy correct __cxxabiv1::__class_type_info vtable into place
-return p;
+// copy __cxxabiv1::__class_type_info vtable into place
+Fake_class_type_info * fake = reinterpret_castFake_class_type_info
*(buf);
+fake-name = name;
+return reinterpret_caststd::type_info *(
+static_castFake_type_info *(fake));
}
-std::type_info * create_FAKE_si_class_type_info(
+std::type_info * createFake_si_class_type_info(
char const * name, std::type_info const * base)
{
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - jvmfwk/distributions Repository.mk sal/textenc solenv/gbuild ure/source
Repository.mk | 18 +- jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml |8 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml| 12 - jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml |6 jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml |2 jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml |4 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml |6 sal/textenc/textenc.cxx |3 solenv/gbuild/Helper.mk |2 solenv/gbuild/platform/IOS_ARM_GCC.mk |2 solenv/gbuild/platform/WNT_INTEL_GCC.mk |3 solenv/gbuild/platform/android.mk |2 solenv/gbuild/platform/com_MSC_class.mk |2 solenv/gbuild/platform/macosx.mk|2 solenv/gbuild/platform/solaris.mk |2 solenv/gbuild/platform/unxgcc.mk|2 ure/source/README | 101 +--- 17 files changed, 96 insertions(+), 81 deletions(-) New commits: commit 6c4caf52724629d15a1d73c51c4f66e4f6011f7a Author: Stephan Bergmann sberg...@redhat.com Date: Tue Aug 27 13:58:52 2013 +0200 fdo#67313: Use lo suffix for private URE libs ...(like is done for most of LO's non-URE libs already) to reduce likelihood of name clashes, esp. on Windows where URE libs are found via PATH. This introduces PRIVATELIBS_URE, and [does not remove not-yet]-unused UNOLIBS_URE. (cherry picked from commit 644c33a857c46d540202189228f519946dc33833) Conflicts: Repository.mk solenv/gbuild/Helper.mk solenv/gbuild/platform/IOS_ARM_GCC.mk solenv/gbuild/platform/WNT_INTEL_GCC.mk solenv/gbuild/platform/android.mk solenv/gbuild/platform/com_MSC_class.mk solenv/gbuild/platform/macosx.mk solenv/gbuild/platform/mingw.mk solenv/gbuild/platform/solaris.mk solenv/gbuild/platform/unxgcc.mk Change-Id: Ib95dd45f18de140a54e62d632dbf2239f83c232e Reviewed-on: https://gerrit.libreoffice.org/5667 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/Repository.mk b/Repository.mk index d0de1d8..e0d4d7c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -451,21 +451,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \ $(if $(SOLAR_JAVA),java_uno) \ $(if $(SOLAR_JAVA),juh) \ $(if $(SOLAR_JAVA),juhx) \ - $(if $(SOLAR_JAVA),jvmaccess) \ - $(if $(SOLAR_JAVA),jvmfwk) \ log_uno \ - reg \ - sal_textenc \ - store \ - $(if $(SOLAR_JAVA),sunjavaplugin) \ - unoidl \ unsafe_uno \ $(if $(URELIBS),urelibs) \ - xmlreader \ $(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \ )) -$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,URE, \ +$(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,URE, \ acceptor \ binaryurp \ bootstrap \ @@ -475,14 +467,22 @@ $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,URE, \ invocation \ $(if $(SOLAR_JAVA),javaloader) \ $(if $(SOLAR_JAVA),javavm) \ + $(if $(SOLAR_JAVA),jvmaccess) \ + $(if $(SOLAR_JAVA),jvmfwk) \ namingservice \ proxyfac \ reflection \ + reg \ + sal_textenc \ stocservices \ + store \ streams \ + $(if $(SOLAR_JAVA),sunjavaplugin) \ textinstream \ textoutstream \ + unoidl \ uuresolver \ + xmlreader \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml index 2453492..bfd80e0 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml @@ -38,9 +38,9 @@ /vendorInfos plugins - library vendor=Oracle Corporationvnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so/library - library vendor=Sun Microsystems Inc.vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so/library - library vendor=The FreeBSD Foundationvnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so/library - library vendor=Free Software Foundation, Inc.vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so/library + library vendor=Oracle Corporationvnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so/library + library vendor=Sun Microsystems Inc.vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so/library + library vendor=The FreeBSD
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67815, which changed state. Bug 67815 Summary: DATALOSS: Some cells with hyperlinks in XLS loose content on IMPORT https://bugs.freedesktop.org/show_bug.cgi?id=67815 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] core.git: 3 commits - configure.ac
configure.ac | 32 1 file changed, 16 insertions(+), 16 deletions(-) New commits: commit ffaad89e05fdb889d2b18d5914894acb91e1248e Author: Tor Lillqvist t...@iki.fi Date: Fri Aug 30 09:56:57 2013 +0300 Untabify Change-Id: Ib03ac597e920c3d09b56a78f41f10ea0e19e311e diff --git a/configure.ac b/configure.ac index 79f8aa1..75ffd04 100644 --- a/configure.ac +++ b/configure.ac @@ -1705,10 +1705,10 @@ AC_ARG_WITH(help, can be used to bundle only the common part, .e.g help-specific icons. This is useful when you build the helpcontent separately.]) [ - Usage: --with-help build the entire local help ---without-help no local help (default) ---with-help=common bundle common files for the local - help but do not build the whole help + Usage: --with-helpbuild the entire local help + --without-help no local help (default) + --with-help=common bundle common files for the local +help but do not build the whole help ], ,) @@ -4643,11 +4643,11 @@ if test -n $with_help -a $with_help != no -a $_os != iOS -a $_os != Androi BUILD_TYPE=$BUILD_TYPE HELP GIT_NEEDED_SUBMODULES=helpcontent2 $GIT_NEEDED_SUBMODULES if test $with_help = common ; then - HELP_COMMON_ONLY=TRUE - AC_MSG_RESULT([common only]) +HELP_COMMON_ONLY=TRUE +AC_MSG_RESULT([common only]) else - SCPDEFS=$SCPDEFS -DWITH_HELP - AC_MSG_RESULT([yes]) +SCPDEFS=$SCPDEFS -DWITH_HELP +AC_MSG_RESULT([yes]) fi else AC_MSG_RESULT([no]) @@ -9142,7 +9142,7 @@ if test $enable_openssl = yes; then AC_MSG_CHECKING([whether openssl supports SHA512]) AC_LANG_PUSH([C]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include openssl/sha.h]],[[ - SHA512_CTX context; +SHA512_CTX context; ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([no, openssl too old. Need = 0.9.8.])]) AC_LANG_POP(C) fi commit c805a7107198350374420a83f57603d99da493f3 Author: Tor Lillqvist t...@iki.fi Date: Fri Aug 30 09:55:30 2013 +0300 Surely we want only a 1.7 or 1.6 JDK Change-Id: I3fa71d19789d9cbdc44db172e0a63f5e5ed85f43 diff --git a/configure.ac b/configure.ac index fe91557..79f8aa1 100644 --- a/configure.ac +++ b/configure.ac @@ -6528,7 +6528,7 @@ if test $ENABLE_JAVA != ; then if test -z $with_jdk_home; then # Currently only auto-detects 32-bit JDK -for ver in 1.7 1.6 1.5 1.4 1.3; do +for ver in 1.7 1.6; do reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java Development Kit/$ver/JavaHome if test -n $regvalue; then _jdk_home=$regvalue commit ada60644ca7010b7a93688e7c937ac03f891f1d9 Author: Tor Lillqvist t...@iki.fi Date: Fri Aug 30 09:53:31 2013 +0300 Fix weird indentation Change-Id: I291856b9f37ea967c1f8d44cce05f53b52ed8b75 diff --git a/configure.ac b/configure.ac index ef10c70..fe91557 100644 --- a/configure.ac +++ b/configure.ac @@ -6528,13 +6528,13 @@ if test $ENABLE_JAVA != ; then if test -z $with_jdk_home; then # Currently only auto-detects 32-bit JDK -for ver in 1.7 1.6 1.5 1.4 1.3; do -reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java Development Kit/$ver/JavaHome -if test -n $regvalue; then -_jdk_home=$regvalue -break -fi -done +for ver in 1.7 1.6 1.5 1.4 1.3; do + reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/JavaSoft/Java Development Kit/$ver/JavaHome + if test -n $regvalue; then + _jdk_home=$regvalue + break + fi +done if test -f $_jdk_home/lib/jvm.lib -a -f $_jdk_home/bin/java.exe; then with_jdk_home=$_jdk_home howfound=found automatically ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - connectivity/source
connectivity/source/commontools/ConnectionWrapper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e127266b1c54586f2df14ee0a1578f823e9c3ca2
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 29 16:05:01 2013 +0200
TPropertyValueLessFunctor must actually compare for
Change-Id: I584a410d90531a0f7b784e62f94c39e715713cf1
(cherry picked from commit 2410b3c3ddc6fea02dadd56b39bb1181312c383a)
Reviewed-on: https://gerrit.libreoffice.org/5686
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx
b/connectivity/source/commontools/ConnectionWrapper.cxx
index fbf4082..cd6d774 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -187,7 +187,7 @@ namespace
{}
bool operator() (const ::com::sun::star::beans::PropertyValue lhs,
const ::com::sun::star::beans::PropertyValue rhs) const
{
-return !!(lhs.Name.equalsIgnoreAsciiCase( rhs.Name ));
+return lhs.Name.compareToIgnoreAsciiCase(rhs.Name) 0;
}
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source
connectivity/source/commontools/ConnectionWrapper.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 89706a7549ca494cd4f70f6210f53ddab923169e
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Aug 29 16:05:01 2013 +0200
TPropertyValueLessFunctor must actually compare for
Change-Id: I584a410d90531a0f7b784e62f94c39e715713cf1
(cherry picked from commit 2410b3c3ddc6fea02dadd56b39bb1181312c383a)
Reviewed-on: https://gerrit.libreoffice.org/5683
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx
b/connectivity/source/commontools/ConnectionWrapper.cxx
index 8506fef..2fc5a97 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -187,7 +187,7 @@ namespace
{}
bool operator() (const ::com::sun::star::beans::PropertyValue lhs,
const ::com::sun::star::beans::PropertyValue rhs) const
{
-return !!(lhs.Name.equalsIgnoreAsciiCase( rhs.Name ));
+return lhs.Name.compareToIgnoreAsciiCase(rhs.Name) 0;
}
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk i18nlangtag/Library_i18nlangtag.mk liblangtag/Module_liblangtag.mk RepositoryExternal.mk
RepositoryExternal.mk |2 +- configure.ac|3 +-- i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk |2 +- i18nlangtag/Library_i18nlangtag.mk |2 +- liblangtag/Module_liblangtag.mk |2 +- 5 files changed, 5 insertions(+), 6 deletions(-) New commits: commit 587d9693bdea45b90331da1c577c017db38f3f39 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Aug 29 10:38:00 2013 -0500 liblangtag: harmonize ENABLE_* variable to use TRUE/nothing Change-Id: I6e231516476f3b9512e239ccf678048c87d25aa5 Reviewed-on: https://gerrit.libreoffice.org/5682 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5962dc4..e96e812 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -825,7 +825,7 @@ define gb_LinkTarget__use_glib $(error gb_LinkTarget__use_glib should not be called any more) endef -ifeq ($(ENABLE_LIBLANGTAG),YES) +ifeq ($(ENABLE_LIBLANGTAG),TRUE) ifeq ($(SYSTEM_LIBLANGTAG),YES) diff --git a/configure.ac b/configure.ac index 75ffd04..cc8721f 100644 --- a/configure.ac +++ b/configure.ac @@ -11621,7 +11621,7 @@ ENABLE_LIBLANGTAG= SYSTEM_LIBLANGTAG= AC_MSG_CHECKING([whether to use liblangtag]) if test $enable_liblangtag = yes -o \( $enable_liblangtag = -a $_os != Android -a $_os != iOS \); then -ENABLE_LIBLANGTAG=YES +ENABLE_LIBLANGTAG=TRUE AC_MSG_RESULT([yes]) AC_MSG_CHECKING([whether to use system liblangtag]) if test $with_system_liblangtag = yes; then @@ -11636,7 +11636,6 @@ if test $enable_liblangtag = yes -o \( $enable_liblangtag = -a $_os != BUILD_TYPE=$BUILD_TYPE LIBLANGTAG fi else -ENABLE_LIBLANGTAG=NO AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_LIBLANGTAG) diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk index f001717..2eec5a9 100644 --- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk +++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk @@ -22,7 +22,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18nlangtag_test_languagetag,\ $(gb_UWINAPI) \ )) -ifeq ($(ENABLE_LIBLANGTAG),YES) +ifeq ($(ENABLE_LIBLANGTAG),TRUE) $(eval $(call gb_CppunitTest_use_externals,i18nlangtag_test_languagetag,\ liblangtag \ libxml2 \ diff --git a/i18nlangtag/Library_i18nlangtag.mk b/i18nlangtag/Library_i18nlangtag.mk index 4b6acb1..fd1548b 100644 --- a/i18nlangtag/Library_i18nlangtag.mk +++ b/i18nlangtag/Library_i18nlangtag.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_add_exception_objects,i18nlangtag,\ )) -ifeq ($(ENABLE_LIBLANGTAG),YES) +ifeq ($(ENABLE_LIBLANGTAG),TRUE) $(eval $(call gb_Library_add_defs,i18nlangtag,-DENABLE_LIBLANGTAG)) $(eval $(call gb_Library_use_external,i18nlangtag,liblangtag)) $(eval $(call gb_Library_use_external,i18nlangtag,libxml2)) diff --git a/liblangtag/Module_liblangtag.mk b/liblangtag/Module_liblangtag.mk index 36201f8..3d68c54 100644 --- a/liblangtag/Module_liblangtag.mk +++ b/liblangtag/Module_liblangtag.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,liblangtag)) -ifeq ($(ENABLE_LIBLANGTAG),YES) +ifeq ($(ENABLE_LIBLANGTAG),TRUE) ifeq ($(SYSTEM_LIBLANGTAG),NO) $(eval $(call gb_Module_add_targets,liblangtag,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac vcl/Library_vcl.mk
configure.ac |4 ++-- vcl/Library_vcl.mk |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit e57a14a6dae8a38ccd81dcebd36050aec98c3756 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Aug 29 11:29:19 2013 -0500 ENABLE_CORETEXT: Harmonize ENABLE_* variable to TRUE/nothing Change-Id: I39153ee042b171f7cd1ffa6b50c490d2c9fa33cb Reviewed-on: https://gerrit.libreoffice.org/5685 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/configure.ac b/configure.ac index cc8721f..fc46d55 100644 --- a/configure.ac +++ b/configure.ac @@ -11234,12 +11234,12 @@ AC_SUBST(WITH_HELPPACK_INTEGRATION) dnl === dnl Test whether to use CoreText framework dnl === -ENABLE_CORETEXT=NO +ENABLE_CORETEXT= if test $_os = Darwin; then AC_MSG_CHECKING([whether to use CoreText framework]) if test $enable_coretext != no -o $BITNESS_OVERRIDE = 64; then AC_MSG_RESULT([yes]) -ENABLE_CORETEXT=YES +ENABLE_CORETEXT=TRUE else AC_MSG_RESULT([no]) fi diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index cc1a21d..e37ec15 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -356,7 +356,7 @@ $(eval $(call gb_Library_add_defs,vcl,\ -DMACOSX_BUNDLE_IDENTIFIER=\$(MACOSX_BUNDLE_IDENTIFIER)\ \ )) -ifeq ($(ENABLE_CORETEXT),YES) +ifeq ($(ENABLE_CORETEXT),TRUE) $(eval $(call gb_Library_add_defs,vcl,\ -DENABLE_CORETEXT \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac extensions/Module_extensions.mk np_sdk/Module_np_sdk.mk postprocess/Rdb_services.mk Repository.mk
Repository.mk |8 configure.ac| 12 ++-- extensions/Module_extensions.mk |8 np_sdk/Module_np_sdk.mk |4 ++-- postprocess/Rdb_services.mk |2 +- 5 files changed, 17 insertions(+), 17 deletions(-) New commits: commit 1376af9a727c8cbde8eae0c40a8206bffd021451 Author: Norbert Thiebaud nthieb...@gmail.com Date: Thu Aug 29 11:14:34 2013 -0500 ENABLE_NPAPI_* Harmonize ENABLE_* variable to TRUE/nothing Change-Id: Ia7575f0f51bc3ba355ec01d937bd155adb287572 Reviewed-on: https://gerrit.libreoffice.org/5684 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/Repository.mk b/Repository.mk index 3c52399..00e29b5 100644 --- a/Repository.mk +++ b/Repository.mk @@ -81,9 +81,9 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ $(eval $(call gb_Helper_register_executables,OOO, \ $(call gb_Helper_optional,CRASHREP,crashrep) \ gnome-open-url.bin \ - $(if $(filter YES,$(ENABLE_NPAPI_INTO_BROWSER)),nsplugin) \ + $(if $(ENABLE_NPAPI_INTO_BROWSER),nsplugin) \ $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \ - $(if $(filter YES,$(ENABLE_NPAPI_FROM_BROWSER)),pluginapp.bin) \ + $(if $(ENABLE_NPAPI_FROM_BROWSER),pluginapp.bin) \ $(if $(filter-out WNT,$(OS)),soffice.bin) \ spadmin.bin \ $(if $(filter $(GUIBASE)$(ENABLE_TDE),unxTRUE), \ @@ -125,7 +125,7 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) -ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES) +ifeq ($(ENABLE_NPAPI_INTO_BROWSER),TRUE) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ npsoplugin \ )) @@ -300,7 +300,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ offacc \ passwordcontainer \ pcr \ - $(if $(filter YES,$(ENABLE_NPAPI_FROM_BROWSER)),pl) \ + $(if $(ENABLE_NPAPI_FROM_BROWSER),pl) \ pdffilter \ $(if $(DISABLE_SCRIPTING),,protocolhandler) \ res \ diff --git a/configure.ac b/configure.ac index fc46d55..66dbf4f 100644 --- a/configure.ac +++ b/configure.ac @@ -1678,8 +1678,8 @@ AC_ARG_WITH(system-liblangtag, AC_ARG_WITH(system-npapi-headers, AS_HELP_STRING([--with-system-npapi-headers], [Use NPAPI headers provided by system instead of bundled ones. Used in - extensions/source/nsplugin (ENABLE_NPAPI_INTO_BROWSER=YES) and - extensions/source/plugin (ENABLE_NPAPI_FROM_BROWSER=YES)]),, + extensions/source/nsplugin (ENABLE_NPAPI_INTO_BROWSER=TRUE) and + extensions/source/plugin (ENABLE_NPAPI_FROM_BROWSER=TRUE)]),, [with_system_npapi_headers=$with_system_headers] ) @@ -8952,10 +8952,10 @@ if test $_os != Android -a $_os != iOS -a \( $_os != Darwin -o $BITNESS_OVE $enable_headless != yes then AC_MSG_RESULT([yes]) -ENABLE_NPAPI_FROM_BROWSER=YES +ENABLE_NPAPI_FROM_BROWSER=TRUE else AC_MSG_RESULT([no]) -ENABLE_NPAPI_FROM_BROWSER=NO +ENABLE_NPAPI_FROM_BROWSER= fi AC_SUBST(ENABLE_NPAPI_FROM_BROWSER) @@ -8967,10 +8967,10 @@ if test $_os == WINNT -o $_os != Android -a $_os != Darwin -a $_os != iO $enable_headless != yes -a $enable_gtk != no then AC_MSG_RESULT([yes]) -ENABLE_NPAPI_INTO_BROWSER=YES +ENABLE_NPAPI_INTO_BROWSER=TRUE else AC_MSG_RESULT([no]) -ENABLE_NPAPI_INTO_BROWSER=NO +ENABLE_NPAPI_INTO_BROWSER= fi AC_SUBST(ENABLE_NPAPI_INTO_BROWSER) diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 3ab07ab..0f7857e 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -84,7 +84,7 @@ endif # DISABLE_ATL endif # WNT -ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES) +ifeq ($(ENABLE_NPAPI_FROM_BROWSER),TRUE) $(eval $(call gb_Module_add_targets,extensions,\ Library_pl \ @@ -99,9 +99,9 @@ $(eval $(call gb_Module_add_targets,extensions,\ endif endif -endif # ENABLE_NPAPI_FROM_BROWSER=YES +endif # ENABLE_NPAPI_FROM_BROWSER=TRUE -ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES) +ifeq ($(ENABLE_NPAPI_INTO_BROWSER),TRUE) $(eval $(call gb_Module_add_targets,extensions,\ Executable_nsplugin \ @@ -115,7 +115,7 @@ $(eval $(call gb_Module_add_targets,extensions,\ )) endif -endif # ENABLE_NPAPI_INTO_BROWSER=YES +endif # ENABLE_NPAPI_INTO_BROWSER=TRUE ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,extensions,\ diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk index 5d82712..58b7404 100644 --- a/np_sdk/Module_np_sdk.mk +++ b/np_sdk/Module_np_sdk.mk @@ -10,9 +10,9 @@ $(eval $(call gb_Module_Module,np_sdk)) -ifneq (,$(filter YES,$(ENABLE_NPAPI_FROM_BROWSER) $(ENABLE_NPAPI_INTO_BROWSER))) +ifneq ($(ENABLE_NPAPI_FROM_BROWSER)$(ENABLE_NPAPI_INTO_BROWSER),) -ifeq
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - librelogo/source
librelogo/source/ChangeLog | 15 ++
librelogo/source/LibreLogo/LibreLogo.py | 69 +---
2 files changed, 69 insertions(+), 15 deletions(-)
New commits:
commit 1a03ecaf22843345849db7ba3e25ac9cbdd10dbf
Author: László Németh nem...@numbertext.org
Date: Thu Aug 29 18:36:16 2013 +0200
LibreLogo fixes (eg. fdo#68713 fix SVG cropping), see ChangeLog
Conflicts:
helpcontent2
Change-Id: Ibb1cb41f526b4117e2d7ef39a2101286511bf48f
Reviewed-on: https://gerrit.libreoffice.org/5687
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/librelogo/source/ChangeLog b/librelogo/source/ChangeLog
index e056c19..6391760 100644
--- a/librelogo/source/ChangeLog
+++ b/librelogo/source/ChangeLog
@@ -1,3 +1,18 @@
+2013-08-29 László Németh:
+* fix bad selection of invisible turtle after HIDETURTLE CLEARSCREEN
+* fix SVG cropping in LibreOffice 4.1
+* fix vertical positions of labels in SVG export using RectangleShape
+* fix double stroke-width attributes in SVG export
+* LABEL supports relative positioning vector [X, Y, 'text'], where X, Y
+ 0: center, eg. as the default positioning: LABEL [0, 0, 'text']
+ 1: left or bottom aligned to the turtle position and angle
+ -1: right or top aligned to the turtle position and angle
+ n: n * text_width/2 or text_height/2
+* simple SVG SMIL (animation) support using SLEEP, for example:
+ PICTURE 'animation.svg' [ CIRCLE 5 SLEEP 1000 CIRCLE 20 ]
+* relative FORWARD (heading = y axis) with vector arg.: FORWARD [20, 10]
+* rounded linejoint of turtle shape
+
2013-07-15 László Németh:
* optional named PICTURE blocks: PICTURE name [ CIRCLE 5 ]
* save PICTURE as cropped SVG file using path names, for example:
diff --git a/librelogo/source/LibreLogo/LibreLogo.py
b/librelogo/source/LibreLogo/LibreLogo.py
index b4e5936..84e7a2b 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -72,6 +72,8 @@ class __Doc__:
except:
self.drawpage = doc.DrawPages.getByIndex(0) # Draw, Impress
self.shapecache = {}
+self.shapecount = itertools.count()
+self.time = 0
self.zoomvalue = 0
self.initialize()
@@ -461,7 +463,7 @@ def __initialize__():
_.pencolor = shape.LineColor + (int(255.0 *
shape.LineTransparence/100) 24)
if shape.LineWidth != round((1 + _.pen * 2) * __PT_TO_TWIP__ /
__MM10_TO_TWIP__) and shape.LineWidth != round(__LINEWIDTH__ /
__MM10_TO_TWIP__):
_.pensize = shape.LineWidth * __MM10_TO_TWIP__
-shape.LineJoint = __MITER__
+shape.LineJoint = __ROUNDED__
shape.Shadow = True
shape.FillColor, transparence = __splitcolor__(_.areacolor)
shape.FillTransparence = min(95, transparence)
@@ -684,12 +686,14 @@ def __checkhalt__():
def __cs__(select = True):
turtle = __getshape__(__TURTLE__)
-if turtle:
+visible = False
+if turtle and turtle.Visible:
__visible__(turtle, False)
+visible = True
if _.doc.CurrentController.select(_.drawpage) and \
_.doc.CurrentController.getSelection().ImplementationName ==
com.sun.star.drawing.SvxShapeCollection:
__dispatcher__(.uno:Delete)
-if turtle:
+if turtle and visible:
__visible__(turtle, True)
if select:
_.doc.CurrentController.select(_.drawpage)
@@ -752,7 +756,10 @@ def rotate(shapename, deg):
def forward(n):
if type(n) == list:
pos = position()
-position([pos[0] + n[0], pos[1] + n[1]])
+angle = heading()
+dx = n[1] * sin((pi/180) * angle) + n[0] * sin((pi/180)*(angle + 90))
+dy = n[1] * cos((pi/180) * angle) + n[0] * cos((pi/180)*(angle + 90))
+position([pos[0] + dx, pos[1] - dy])
else:
__go__(__TURTLE__, -n * __PT_TO_TWIP__)
@@ -789,6 +796,7 @@ def __draw__(d):
_.drawpage.add(shape)
if __group__:
__group__.add(shape)
+_.shapecache[next(_.shapecount)] = str(_.time)
return shape
def __zoom__():
@@ -1013,18 +1021,31 @@ def rectangle(l):
__boxshape__(Rectangle, l)
def label(st):
-turtle = __getshape__(__TURTLE__)
-shape = __draw__(TextShape)
-shape.RotateAngle = turtle.RotateAngle
-pos = turtle.getPosition()
-pos.X = pos.X + turtle.BoundRect.Width / 2.0
-pos.Y = pos.Y + turtle.BoundRect.Height / 2.0
-shape.setSize(__Size__(1, 1))
+if type(st) != type([]):
+st = [0, 0, st]
+# get text size
+shape = _.doc.createInstance( com.sun.star.drawing.TextShape)
shape.TextAutoGrowWidth = True
-text(shape, st)
-shape.setPosition(__Point__(pos.X - shape.BoundRect.Width/2, pos.Y -
shape.BoundRect.Height/2))
-__visible__(shape, True)
-__lefthang__(shape)
+actual = __getshape__(__ACTUAL__)
[Libreoffice-commits] core.git: configure.ac
configure.ac | 45 +++--
1 file changed, 27 insertions(+), 18 deletions(-)
New commits:
commit bfb0b2ae4e931a130a1d9830c1a58afb1a3a3b71
Author: Tor Lillqvist t...@iki.fi
Date: Fri Aug 30 10:12:32 2013 +0300
Find also a 64-bit JDK on Windows
Change-Id: I2364d4e4e2b2d032bdf03316ee9523cb085112c8
diff --git a/configure.ac b/configure.ac
index 66dbf4f..5b7b2647 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2973,7 +2973,8 @@ dnl
===
dnl Windows specific tests and stuff
dnl ===
-reg_get_value()
+# Get a value from the 32-bit side of the Registry
+reg_get_value_32()
{
# Return value: $regvalue
unset regvalue
@@ -2984,6 +2985,17 @@ reg_get_value()
fi
}
+# Get a value from the 64-bit side of the Registry
+reg_get_value_64()
+{
+# Return value: $regvalue
+unset regvalue
+_regvalue=`cat /proc/registry64/$1 2 /dev/null`
+
+if test $? -eq 0; then
+regvalue=$_regvalue
+fi
+}
if test $_os = WINNT; then
AC_MSG_CHECKING([whether to build a 64-bit LibreOffice])
@@ -3250,12 +3262,12 @@ find_msvs()
vs_versions_to_check $1
for ver in $vsversions; do
-reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/ProductDir
+reg_get_value_32
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/ProductDir
if test -n $regvalue; then
vstest=$regvalue
break
fi
-reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VCExpress/$ver/Setup/VS/ProductDir
+reg_get_value_32
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VCExpress/$ver/Setup/VS/ProductDir
if test -n $regvalue; then
vstest=$regvalue
break
@@ -3274,12 +3286,12 @@ find_msvc()
vs_versions_to_check $1
for ver in $vsversions; do
-reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VC/ProductDir
+reg_get_value_32
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VC/ProductDir
if test -n $regvalue; then
vctest=$regvalue
break
fi
-reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VCExpress/$ver/Setup/VC/ProductDir
+reg_get_value_32
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VCExpress/$ver/Setup/VC/ProductDir
if test -n $regvalue; then
vctest=$regvalue
break
@@ -4999,7 +5011,7 @@ find_csc()
unset csctest
-reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework
Setup/NDP/v4/Client/InstallPath
+reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/NET Framework
Setup/NDP/v4/Client/InstallPath
if test -n $regvalue; then
csctest=$regvalue
return
@@ -5013,7 +5025,7 @@ find_al()
unset altest
for x in `ls
/proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft\ SDKs/Windows`;
do
-reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/$x/WinSDK-NetFx40Tools/InstallationFolder
+reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/$x/WinSDK-NetFx40Tools/InstallationFolder
if test -n $regvalue -a \( -f $regvalue/al.exe -o -f
$regvalue/bin/al.exe \); then
altest=$regvalue
return
@@ -5028,7 +5040,7 @@ find_dotnetsdk()
unset frametest
for ver in 1.1 2.0; do
-reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv$ver
+reg_get_value_32
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv$ver
if test -n $regvalue; then
frametest=$regvalue
return
@@ -5046,14 +5058,14 @@ find_winsdk_version()
# Why we look for them in this particular order I don't know. But OTOH I
case $1 in
6.0*|7.*)
-reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v${1}/InstallationFolder
+reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/v${1}/InstallationFolder
if test -n $regvalue; then
winsdktest=$regvalue
return
fi
;;
8.*)
-reg_get_value HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows
Kits/Installed Roots/KitsRoot
+reg_get_value_32 HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Windows
Kits/Installed Roots/KitsRoot
if test -n $regvalue; then
winsdktest=$regvalue
return
@@ -5086,7 +5098,7 @@ find_winsdk()
find_msms()
{
for ver in 10.0 11.0; do
-reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir
+reg_get_value_32
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir
if test -n $regvalue; then
if test -e
Re: build difficulty
Sometimes my question is why on the earth one does not make something non-copyable by declaring and not defining private copy constructor and operator= and bothers with the complexity of boost for just this little thing. Get me right, I love boost, since it simplifies many things, but then noncopyable is not one of those things that were difficult without it. Cheers Fridrich On 29/08/13 21:30, Kohei Yoshida wrote: On 08/29/2013 03:27 PM, Stephan van den Akker wrote: Kohei: Can you explain what your change does? I might try that too. No idea exactly, other than that it avoids the lines that cause error in my build. I got the idea by reading the offending boost header file boost/boost/noncopyable.hpp. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/concat-deps.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b5fd1341cd5f7585dc3b81d669b43750c3fc71b6 Author: Tor Lillqvist t...@iki.fi Date: Fri Aug 30 10:18:32 2013 +0300 WaE: size_t to int conversion: possible loss of data Change-Id: Ica626a5ebe8e3c022e5398b50253904d269ba0ce diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index f0147c8..5c4d123 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -98,7 +98,7 @@ int internal_boost = 0; static char* base_dir; static char* work_dir; -int work_dir_len; +size_t work_dir_len; #ifdef __GNUC__ #define clz __builtin_clz ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: udkapi/com
udkapi/com/sun/star/beans/PropertyState.idl |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 13ac0631d3bba56220e75f3c416d753201fd09a8 Author: Miklos Vajna vmik...@suse.cz Date: Fri Aug 30 09:24:53 2013 +0200 udkapi: fix warnings in beans::PropertyState These are links without the leading hashmark in the output anyway, and that avoids the warning. Change-Id: Ie94d65b5bd2e869a9b5ad12b5d545fe32c834eec diff --git a/udkapi/com/sun/star/beans/PropertyState.idl b/udkapi/com/sun/star/beans/PropertyState.idl index 3a8d177..ffda698 100644 --- a/udkapi/com/sun/star/beans/PropertyState.idl +++ b/udkapi/com/sun/star/beans/PropertyState.idl @@ -42,7 +42,7 @@ published enum PropertyState /** The value of the property is stored in the PropertySet itself. pThe property value must be available and of the specified type. -If the #PropertyAttribute field in the struct +If the PropertyAttribute field in the struct Property contains PropertyAttribute::MAYBEVOID, then the value may be void. /p */ @@ -51,11 +51,11 @@ published enum PropertyState /** The value of the property is available from a master (e.g., template). -pThe #PropertyAttribute field in the struct +pThe PropertyAttribute field in the struct Property must contain the PropertyAttribute::MAYBEDEFAULT flag. The property value must be available and of the specified type. If the -#PropertyAttribute field in the struct Property +PropertyAttribute field in the struct Property contains PropertyAttribute::MAYBEVOID, then the value may be void. /p */ @@ -65,7 +65,7 @@ published enum PropertyState /** The value of the property is only a recommendation because there are multiple values for this property (e.g., from a multi selection). -pThe #PropertyAttribute field in the struct +pThe PropertyAttribute field in the struct Property must contain the PropertyAttribute::MAYBEAMBIGUOUS flag. The property value must be available and of the specified type. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: soltools/mkdepend
soltools/mkdepend/main.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 803b669ec4c1a1052c0ea129fc7e689005e0dddf
Author: Tor Lillqvist t...@iki.fi
Date: Fri Aug 30 10:29:16 2013 +0300
WaE: size_t/unsigned int: possible loss of data
With MSVC, the third parameter to read() is unsigned int.
Change-Id: I607089fb2a9e6bf794293187be48e910ac40158f
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index 149bae1..b636498 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -482,7 +482,7 @@ struct filepointer *getfile(file)
struct stat st;
off_t size_backup;
ssize_t bytes_read;
-size_t malloc_size;
+unsignedmalloc_size;
content = (struct filepointer *)malloc(sizeof(struct filepointer));
if ((fd = open(file, O_RDONLY)) 0) {
@@ -495,13 +495,13 @@ struct filepointer *getfile(file)
size_backup = st.st_size;
malloc_size = size_backup;
-/* Since off_t is larger than size_t, need to test for
+/* Since off_t usually is larger than unsigned, need to test for
* truncation.
*/
if ( (off_t)malloc_size != size_backup )
{
close( fd );
-warning(makedepend: File \%s\ size larger than can fit in size_t.
Cannot allocate memory for contents.\n, file);
+warning(makedepend: File \%s\ is too large.\n, file);
content-f_p = content-f_base = content-f_end = (char *)malloc(1);
*content-f_p = '\0';
return(content);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: build difficulty
On Fri, Aug 30, 2013 at 09:16:26AM +0200, Fridrich Strba wrote: Sometimes my question is why on the earth one does not make something non-copyable by declaring and not defining private copy constructor and operator= and bothers with the complexity of boost for just this little thing. Get me right, I love boost, since it simplifies many things, but then noncopyable is not one of those things that were difficult without it. https://en.wikipedia.org/wiki/Inner-platform_effect (and yes, a point could be made that this applies to gbuild too) Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: registry/tools
registry/tools/fileurl.cxx |2 +-
registry/tools/fileurl.hxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a0d3aa1f50ed158fc0a4d57666f8f9840a81153e
Author: Tor Lillqvist t...@iki.fi
Date: Fri Aug 30 11:10:49 2013 +0300
WaE: size_t/sal_Int32: possible loss of data
Change-Id: I96849e94196291bd387737aae537139ff4fefeb3
diff --git a/registry/tools/fileurl.cxx b/registry/tools/fileurl.cxx
index 2813ef3..94a2488c 100644
--- a/registry/tools/fileurl.cxx
+++ b/registry/tools/fileurl.cxx
@@ -40,7 +40,7 @@ namespace registry
namespace tools
{
-OUString convertToFileUrl(char const * filename, size_t length)
+OUString convertToFileUrl(char const * filename, sal_Int32 length)
{
OUString const uFileName(filename, length, osl_getThreadTextEncoding());
if (strncmp(filename, file://, 7) == 0)
diff --git a/registry/tools/fileurl.hxx b/registry/tools/fileurl.hxx
index cec3724..0e7de69 100644
--- a/registry/tools/fileurl.hxx
+++ b/registry/tools/fileurl.hxx
@@ -27,7 +27,7 @@ namespace registry
namespace tools
{
-OUString convertToFileUrl(char const * filename, size_t length);
+OUString convertToFileUrl(char const * filename, sal_Int32 length);
} // namespace tools
} // namespace registry
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: How to add extra templates to 4.1 windows build
I guys, any help from someone? I just need to know were to put my templates to create a costumized build with those templates included... Cheers *Flávio Moringa* Project Leader Caixa Mágica Software Energia Open Source Rua Soeiro Pereira Gomes, Lote 1 - 4.º B, Edifício Espanha, 1600-196 Lisboa - Portugal Tel.: +351 217 921 260 Fax: +351 217 921 261 http://www.caixamagica.pt https://twitter.com/flaviomoringa https://www.facebook.com/flaviomoringahttps://www.facebook.com/flavio.moringa http://pt.linkedin.com/in/flaviomoringa http://people.caixamagica.pt/flaviomoringa 2013/8/27 Flavio Moringa flavio.mori...@caixamagica.pt I guys, I'm trying to add a few extra templates to a 4.1 windows build, but I don't know where to put them on the source dir so that they are caught in the final MSI In 3.x I used to put them in extras/source/premium/templates/lang/en-US/ but that dir does not exist anymore Any help? Thanks *Flávio Moringa* Project Leader Caixa Mágica Software Energia Open Source Rua Soeiro Pereira Gomes, Lote 1 - 4.º B, Edifício Espanha, 1600-196 Lisboa - Portugal Tel.: +351 217 921 260 Fax: +351 217 921 261 http://www.caixamagica.pt https://twitter.com/flaviomoringa https://www.facebook.com/flaviomoringahttps://www.facebook.com/flavio.moringa http://pt.linkedin.com/in/flaviomoringa http://people.caixamagica.pt/flaviomoringa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/win32
desktop/win32/source/guistdio/guistdio.inc |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 52d35df0e61019e722675a27fbb01101a96bff75 Author: Tor Lillqvist t...@iki.fi Date: Fri Aug 30 11:29:46 2013 +0300 WaE: size/t/DWORD/int: possible loss of data Change-Id: I4fa005a8ddb3efd3dc624110215b938ee20a67a6 diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc index 17d986e..5918ccc 100644 --- a/desktop/win32/source/guistdio/guistdio.inc +++ b/desktop/win32/source/guistdio/guistdio.inc @@ -172,10 +172,10 @@ DWORD WINAPI InputThread( LPVOID pParam ) WideCharToMultiByte( GetConsoleCP(), 0, L\r\n, 2, mbBuff, cNewLine, NULL, NULL); -const size_t dwBufferSize = 256; +const DWORD dwBufferSize = 256; char* readBuf = (char*) malloc(dwBufferSize); int readAll = 0; -size_t curBufSize = dwBufferSize; +DWORD curBufSize = dwBufferSize; while ( ReadFile( GetStdHandle( STD_INPUT_HANDLE ), readBuf + readAll, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/Driver.cxx | 17 +
connectivity/source/drivers/firebird/Driver.hxx |4
2 files changed, 21 insertions(+)
New commits:
commit 295759c05395099e564e263b98e5e4a38a9a9bc4
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Aug 29 12:59:50 2013 +0100
Set FIREBIRD_TMP and FIREBIRD_LOCK with sane values. (firebird-sdbc)
Currently firebird uses /tmp and C://temp/ as default temporary directories,
both of which can be incorrect. Instead we now pass the correct temp
directories to firebird.
Change-Id: I807a47475e76600365e7a2ccfa78d755621dedb7
Reviewed-on: https://gerrit.libreoffice.org/5678
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/connectivity/source/drivers/firebird/Driver.cxx
b/connectivity/source/drivers/firebird/Driver.cxx
index 2b9e656..89c9cfd 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -26,6 +26,8 @@
#include resource/sharedresources.hxx
#include comphelper/processfactory.hxx
+#include osl/process.h
+#include osl/file.hxx
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -52,9 +54,21 @@ namespace connectivity
}
}
+// Static const member variables
+const OUString FirebirdDriver::our_sFirebirdTmpVar(FIREBIRD_TMP);
+const OUString FirebirdDriver::our_sFirebirdLockVar(FIREBIRD_LOCK);
+
FirebirdDriver::FirebirdDriver()
: ODriver_BASE(m_aMutex)
{
+OUString sTmpDir;
+::osl::FileBase::getTempDirURL(sTmpDir);
+
+// Overrides firebird's default of /tmp or c:\temp
+osl_setEnvironment(our_sFirebirdTmpVar.pData, sTmpDir.pData);
+// Overrides firebird's default of /tmp/firebird or c:\temp\firebird
+sTmpDir += /firebird;
+osl_setEnvironment(our_sFirebirdLockVar.pData, sTmpDir.pData);
}
void FirebirdDriver::disposing()
@@ -70,6 +84,9 @@ void FirebirdDriver::disposing()
}
m_xConnections.clear();
+osl_clearEnvironment(our_sFirebirdTmpVar.pData);
+osl_clearEnvironment(our_sFirebirdLockVar.pData);
+
ODriver_BASE::disposing();
}
diff --git a/connectivity/source/drivers/firebird/Driver.hxx
b/connectivity/source/drivers/firebird/Driver.hxx
index 545d98a..0963468 100644
--- a/connectivity/source/drivers/firebird/Driver.hxx
+++ b/connectivity/source/drivers/firebird/Driver.hxx
@@ -44,6 +44,10 @@ namespace connectivity
class FirebirdDriver : public ODriver_BASE
{
+private:
+static const ::rtl::OUString our_sFirebirdTmpVar;
+static const ::rtl::OUString our_sFirebirdLockVar;
+
protected:
::osl::Mutexm_aMutex; // mutex is need to
control member access
OWeakRefArray m_xConnections; // vector containing
a list
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
On 08/29/2013 04:35 PM, Michael Meeks wrote:
* Heads up for 4.1.2 change (Stephan)
+ changes some URE library names, not completely private, but
used around the place. Adding 'lo' suffix to avoid name conflict
with windows / system libraries
+ https://gerrit.libreoffice.org/#/c/5667/
+ couple of tricky bits: sal_textenc / sunjavaplugin libs dlopen'ed by
name, but it works
and needs someone to review / ack it.
To clarify: There are some URE libraries that, while they are not part
of the stable client interface, are nevertheless used semi-privately
from non-URE parts of LO. As this fix changes the names of those
semi-private URE libraries
jvmaccess, jvmfwk, xmlreader
any (Linux) distros that split LO into multiple packages must take care
that any non-URE LO packages depending on those libraries must require
matching URE packages, both for packages of LO versions 4.1.2 and for
packages of LO versions = 4.1.2. (On Fedora, e.g., this is guaranteed
by always having exact
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
dependencies of non-URE LO RPMs on the URE RPM. And note how this
exact-version requirement is typically already there for dependencies
among other LO packages.)
If there are any (Linux) distros for which this poses a problem, we
should revert that part of the fix, changing the names of the jvmaccess,
jvmfwk, and xmlreader libraries back to their original forms.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On 08/30/2013 10:54 AM, Stephan Bergmann wrote:
On 08/29/2013 04:35 PM, Michael Meeks wrote:
* Heads up for 4.1.2 change (Stephan)
+ changes some URE library names, not completely private, but
used around the place. Adding 'lo' suffix to avoid name conflict
with windows / system libraries
+ https://gerrit.libreoffice.org/#/c/5667/
+ couple of tricky bits: sal_textenc / sunjavaplugin libs
dlopen'ed by name, but it works
and needs someone to review / ack it.
To clarify: There are some URE libraries that, while they are not part
of the stable client interface, are nevertheless used semi-privately
from non-URE parts of LO. As this fix changes the names of those
semi-private URE libraries
jvmaccess, jvmfwk, xmlreader
any (Linux) distros that split LO into multiple packages must take care
that any non-URE LO packages depending on those libraries must require
matching URE packages, both for packages of LO versions 4.1.2 and for
packages of LO versions = 4.1.2. (On Fedora, e.g., this is guaranteed
by always having exact
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
dependencies of non-URE LO RPMs on the URE RPM. And note how this
exact-version requirement is typically already there for dependencies
among other LO packages.)
...and the relevant dependencies from non-URE to semi-private URE
libraries, at least on my recent local Linux x86_64 master build, are:
cd solver/unxlngx6/installation/opt/ure/lib for j in lib*lo.so; do for i in ../../program/*.so*; do readelf -d
$i 2/dev/null | grep $j echo ^^^ $i; done; done
0x0001 (NEEDED) Shared library: [libjvmaccesslo.so]
^^^ ../../program/libdbtoolslo.so
0x0001 (NEEDED) Shared library: [libjvmaccesslo.so]
^^^ ../../program/libdesktop_detectorlo.so
0x0001 (NEEDED) Shared library: [libjvmaccesslo.so]
^^^ ../../program/libjdbclo.so
0x0001 (NEEDED) Shared library: [libjvmaccesslo.so]
^^^ ../../program/libvcllo.so
0x0001 (NEEDED) Shared library: [libjvmaccesslo.so]
^^^ ../../program/libvclplug_genlo.so
0x0001 (NEEDED) Shared library: [libjvmaccesslo.so]
^^^ ../../program/libvclplug_gtk3lo.so
0x0001 (NEEDED) Shared library: [libjvmaccesslo.so]
^^^ ../../program/libvclplug_gtklo.so
0x0001 (NEEDED) Shared library: [libjvmaccesslo.so]
^^^ ../../program/libvclplug_kde4lo.so
0x0001 (NEEDED) Shared library: [libjvmaccesslo.so]
^^^ ../../program/libvclplug_kdelo.so
0x0001 (NEEDED) Shared library: [libjvmaccesslo.so]
^^^ ../../program/libvclplug_svplo.so
0x0001 (NEEDED) Shared library: [libjvmfwklo.so]
^^^ ../../program/libcuilo.so
0x0001 (NEEDED) Shared library: [libjvmfwklo.so]
^^^ ../../program/libhsqldb.so
0x0001 (NEEDED) Shared library: [libjvmfwklo.so]
^^^ ../../program/libjdbclo.so
0x0001 (NEEDED) Shared library: [libjvmfwklo.so]
^^^ ../../program/libmigrationoo2lo.so
0x0001 (NEEDED) Shared library: [libjvmfwklo.so]
^^^ ../../program/libsvllo.so
0x0001 (NEEDED) Shared library: [libjvmfwklo.so]
^^^ ../../program/libsvtlo.so
0x0001 (NEEDED) Shared library: [libxmlreaderlo.so]
^^^ ../../program/libconfigmgrlo.so
0x0001 (NEEDED) Shared library: [libxmlreaderlo.so]
^^^ ../../program/libswlo.so
0x0001 (NEEDED) Shared library: [libxmlreaderlo.so]
^^^ ../../program/libvcllo.so
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: build difficulty
On 08/30/2013 09:16 AM, Fridrich Strba wrote: Sometimes my question is why on the earth one does not make something non-copyable by declaring and not defining private copy constructor and operator= and bothers with the complexity of boost for just this little thing. ...because boost::noncopyable has become the de-facto standard idiom for this, at least for pre-C++11 code that depends on Boost anyway. [citation missing] Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - include/osl sal/osl sal/rtl solenv/gbuild
include/osl/profile.hxx| 12 ++--
sal/osl/w32/security.c |4 ++--
sal/rtl/alloc_arena.cxx|8
sal/rtl/alloc_cache.cxx|6 +++---
solenv/gbuild/platform/com_MSC_defs.mk |9 +
5 files changed, 24 insertions(+), 15 deletions(-)
New commits:
commit 3a8f35042594fe0d91c6e41565437727cf5ee896
Author: Tor Lillqvist t...@iki.fi
Date: Fri Aug 30 12:07:24 2013 +0300
Er, I meant gb_CXXFLAGS
Change-Id: Ia68105056fb483b30a985da3b53f85c8a0b5d869
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index f5fa7e7..2cca886 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -151,13 +151,6 @@ gb_CFLAGS := \
-Zc:wchar_t- \
-Zm500 \
-ifeq ($(CPUNAME),X86_64)
-
-gb_CFLAGS += \
- -wd4267 \
-
-endif
-
gb_CXXFLAGS := \
-Gd \
-GR \
@@ -203,6 +196,13 @@ ifeq ($(VCVER),100)
endif
+ifeq ($(CPUNAME),X86_64)
+
+gb_CXXFLAGS += \
+ -wd4267 \
+
+endif
+
ifneq ($(VCVER),100)
# rc.exe does not support -nologo in 6.1.6723.1 that is in the Windows SDK 6.0A
gb_RCFLAGS += -nologo
commit 16a4b7ad733f179498e39eac3d4092c55e6c0a07
Author: Tor Lillqvist t...@iki.fi
Date: Fri Aug 30 12:04:15 2013 +0300
WaE: C4334: '' : result of 32-bit shift implicitly converted to 64 bits
1UL is not a portable way to get a size_t -sized one.
Change-Id: I8fac16b7e1f1b8bbccb4bd11eacc9449fc3f8c33
diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx
index 9017a5a..f37d512 100644
--- a/sal/rtl/alloc_arena.cxx
+++ b/sal/rtl/alloc_arena.cxx
@@ -452,7 +452,7 @@ rtl_arena_segment_alloc (
}
/* roundup to next power of 2 */
-size = (1UL msb);
+size = (((sal_Size)1) msb);
}
index = lowbit(RTL_MEMORY_P2ALIGN(arena-m_freelist_bitmap, size));
@@ -619,7 +619,7 @@ rtl_arena_constructor (void * obj)
head = (arena-m_freelist_head[i]);
rtl_arena_segment_constructor (head);
-head-m_size = (1UL i);
+head-m_size = (((sal_Size)1) i);
head-m_type = RTL_ARENA_SEGMENT_TYPE_HEAD;
}
@@ -658,7 +658,7 @@ rtl_arena_destructor (void * obj)
{
head = (arena-m_freelist_head[i]);
-assert(head-m_size == (1UL i));
+assert(head-m_size == (((sal_Size)1) i));
assert(head-m_type == RTL_ARENA_SEGMENT_TYPE_HEAD);
rtl_arena_segment_destructor (head);
@@ -694,7 +694,7 @@ rtl_arena_activate (
if (!RTL_MEMORY_ISP2(quantum))
{
/* roundup to next power of 2 */
-quantum = (1UL highbit(quantum));
+quantum = (((sal_Size)1) highbit(quantum));
}
quantum_cache_max = RTL_MEMORY_P2ROUNDUP(quantum_cache_max, quantum);
diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx
index d514cfc..1383155 100644
--- a/sal/rtl/alloc_cache.cxx
+++ b/sal/rtl/alloc_cache.cxx
@@ -859,9 +859,9 @@ rtl_cache_activate (
if (flags RTL_CACHE_FLAG_QUANTUMCACHE)
{
/* next power of 2 above 3 * qcache_max */
-if(slabsize (1UL highbit(3 * source-m_qcache_max)))
+if(slabsize (((sal_Size)1) highbit(3 * source-m_qcache_max)))
{
-slabsize = (1UL highbit(3 * source-m_qcache_max));
+slabsize = (((sal_Size)1) highbit(3 *
source-m_qcache_max));
}
}
else
@@ -875,7 +875,7 @@ rtl_cache_activate (
slabsize = RTL_MEMORY_P2ROUNDUP(slabsize, source-m_quantum);
if (!RTL_MEMORY_ISP2(slabsize))
-slabsize = 1UL highbit(slabsize);
+slabsize = (((sal_Size)1) highbit(slabsize));
cache-m_slab_size = slabsize;
if (cache-m_slab_size source-m_quantum)
commit fb30ed471eb88870c53c882d623c4f9a7cb0a938
Author: Tor Lillqvist t...@iki.fi
Date: Fri Aug 30 11:55:41 2013 +0300
Ignore C4267: possible loss of data, there are too many of them
Change-Id: I4b01c9398c9c697cff63226269e7c7a3f5a5c9dd
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index 81f20da..f5fa7e7 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -87,6 +87,8 @@ gb_AFLAGS := $(AFLAGS)
# C4251: 'identifier' : class 'type' needs to have dll-interface to be
# used by clients of class 'type2'
+# C4267: conversion from 'size_t' to 'type', possible loss of data
+
# C4275: non-DLL-interface classkey 'identifier' used as base for
# DLL-interface classkey 'identifier'
@@ -149,6 +151,13 @@ gb_CFLAGS := \
-Zc:wchar_t- \
-Zm500 \
+ifeq ($(CPUNAME),X86_64)
+
+gb_CFLAGS += \
+ -wd4267 \
+
+endif
+
gb_CXXFLAGS := \
-Gd \
-GR \
commit 9c1be36c41a7006760ddcd73eec96a82a87316f2
Author: Tor Lillqvist t...@iki.fi
Date: Fri Aug 30 11:54:42
Re: build difficulty
On 30/08/13 11:11, Stephan Bergmann wrote: ...because boost::noncopyable has become the de-facto standard idiom for this, at least for pre-C++11 code that depends on Boost anyway. [citation missing] Sure, nice to have standard idiom that causes us to have to work-around implementation bugs. Where two private declarations could be enough. But then maybe I am too low-level for the modern C++ developers. I even know how to manage my memory myself :) F. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: build difficulty
Stephan Bergmann wrote: ...because boost::noncopyable has become the de-facto standard idiom for this, at least for pre-C++11 code that depends on Boost anyway. And it's just one line to parse, ~impossible to screw up subtly, and declarative rather than implicit. It wins hands-down against any other option there. -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
packaging issues - file_lists
While packaging 4.1.1 for Arch Linux we've run into a file
conflict: /usr/lib/libreoffice/share/wordbook/en-{GB,US}.dic is part of
libreoffice common_list.txt and also in
LibreOffice_4.1.1.2_Linux_x86_rpm_langpack_en-{GB,ZA} RPMs but not in
internal lang_en_US_list.txt and lead to file conflicts for many users
when installing en-GB i18n pkg. I suggest to move en-{GB,US}.dic from
common_list.txt also to lang_en_US_list.txt.
Something different - since a few versions (4.0?) we have to
move /usr/lib/libreoffice/share/registry/writer.xcd from Writer
package - it's part of writer_list.txt - to the -common package. When
this file is not installed LibreOffice refuses to start with:
[andyrtr@workstation64 trunk]$ libreoffice
terminate called after throwing an instance of
'com::sun::star::uno::RuntimeException'
I'm not sure if this is a bug and should not crash LO or a feature and
should be fixed in the file lists.
-Andy
Arch Linux
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18nlangtag/source
i18nlangtag/source/isolang/isolang.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 93e9f05c26e23cf99f80ebd55dc7c22335cad979
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 30 11:56:25 2013 +0200
microoptimization
Change-Id: I773262f018519f5816c029df3da92a9903e53165
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index e4ab25c..50c154b 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -828,13 +828,13 @@ void MsLangId::Conversion::convertLanguageToLocaleImpl(
LanguageType nLang,
{
// Check for country only if there is more than lll-Ssss-CC in tag
// string, else we would had matched it already.
-if (!rLocale.Country.isEmpty() rLocale.Variant.getLength() 11)
+if (!aUpperCountry.isEmpty() rLocale.Variant.getLength() 11)
{
for (const IsoLanguageScriptCountryEntry* pScriptEntry =
pFirstScript;
pScriptEntry-mnLang != LANGUAGE_DONTKNOW;
++pScriptEntry)
{
-if (pScriptEntry-startsInIgnoreAsciiCase(
rLocale.Variant)
-rLocale.Country.equalsIgnoreAsciiCaseAscii(
pScriptEntry-maCountry))
+if (aUpperCountry.equalsAscii( pScriptEntry-maCountry)
+pScriptEntry-startsInIgnoreAsciiCase(
rLocale.Variant))
return pScriptEntry-getLocale();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: build difficulty
On Fri, Aug 30, 2013 at 11:39:22AM +0200, Fridrich Strba wrote: I even know how to manage my memory myself :) There are two kinds of people making this statement: Those that have been wrong and those that will be. ;) Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 6 commits - connectivity/source
connectivity/source/drivers/firebird/DatabaseMetaData.cxx |2
connectivity/source/drivers/firebird/PreparedStatement.cxx | 34 +
connectivity/source/drivers/firebird/ResultSet.cxx | 49 +
connectivity/source/drivers/firebird/Util.cxx | 14 +--
4 files changed, 61 insertions(+), 38 deletions(-)
New commits:
commit fc7e7b683112e9ccd23104f38d4acc3417e9d5b8
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Fri Aug 30 11:29:51 2013 +0100
Improve TIMESTAMP display. (firebird-sdbc)
Change-Id: Ief7ec180e3787a3354e2034693052ebf05a30e81
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index c35e03d..ef817b7 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -966,7 +966,7 @@ uno::Reference XResultSet SAL_CALL
ODatabaseMetaData::getTypeInfo()
// SQL_TIMESTAMP
// TODO: precision?
-aRow[1] = new ORowSetValueDecorator(OUString(timestamp));
+aRow[1] = new ORowSetValueDecorator(OUString(TIMESTAMP));
aRow[2] = new
ORowSetValueDecorator(getColumnTypeFromFBType(SQL_TIMESTAMP));
aRow[3] = new ORowSetValueDecorator(sal_Int32(8)); // Prevision = max
length
aRow[6] = new ORowSetValueDecorator(); // Create Params
commit 026fe9c53bc97729cd506376dd966c9e66d34a8c
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Fri Aug 30 11:27:30 2013 +0100
Implement setTimeStamp. (firebird-sdbc)
Change-Id: I58907d42ec9e1b4098e2947fdb89b1ab264358a6
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx
b/connectivity/source/drivers/firebird/ResultSet.cxx
index 7b106c3..aec90bf 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -363,7 +363,7 @@ T OResultSet::retrieveValue(sal_Int32 columnIndex)
{
// TODO: check we have the right type.
if ((m_bWasNull = isNull(columnIndex)))
-return 0;
+return T();
return *((T*) m_pSqlda-sqlvar[columnIndex-1].sqldata);
}
@@ -401,6 +401,7 @@ OUString OResultSet::retrieveValue(sal_Int32 columnIndex)
template
ISC_QUAD* OResultSet::retrieveValue(sal_Int32 columnIndex)
{
+// TODO: this is probably wrong
if ((m_bWasNull = isNull(columnIndex)))
return 0;
return (ISC_QUAD*) m_pSqlda-sqlvar[columnIndex-1].sqldata;
@@ -505,11 +506,18 @@ Time SAL_CALL OResultSet::getTime(sal_Int32 nIndex)
return Time(0, aCTime.tm_sec, aCTime.tm_min, aCTime.tm_hour, false);
}
-DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex )
throw(SQLException, RuntimeException)
+DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 nIndex)
+throw(SQLException, RuntimeException)
{
-(void) columnIndex;
-return DateTime(); // TODO: implement
-// return safelyRetrieveValue(columnIndex);
+ISC_TIMESTAMP aISCTimestamp = safelyRetrieveValue ISC_TIMESTAMP (nIndex);
+
+struct tm aCTime;
+isc_decode_timestamp(aISCTimestamp, aCTime);
+
+// first field is nanoseconds -- not supported in firebird or struct tm.
+// last field denotes UTC (true) or unknown (false)
+return DateTime(0, aCTime.tm_sec, aCTime.tm_min, aCTime.tm_hour,
aCTime.tm_mday,
+aCTime.tm_mon, aCTime.tm_year, false);
}
// -
commit 437dd0369a759e32ef8788b1829bc3b355952518
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Fri Aug 30 11:14:59 2013 +0100
Cast pointer before dereferencing. (firebird-sdbc)
We have a char* pointing to arbitrary data hence we need to cast
to the right type, othwerwise we retrieve the first byte only.
Change-Id: I6d3d08d15105a506c140044008c5255a8a8e4c39
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx
b/connectivity/source/drivers/firebird/ResultSet.cxx
index 21d4152..7b106c3 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -361,10 +361,11 @@ bool OResultSet::isNull(sal_Int32 columnIndex)
template typename T
T OResultSet::retrieveValue(sal_Int32 columnIndex)
{
+// TODO: check we have the right type.
if ((m_bWasNull = isNull(columnIndex)))
return 0;
-return *m_pSqlda-sqlvar[columnIndex-1].sqldata;
+return *((T*) m_pSqlda-sqlvar[columnIndex-1].sqldata);
}
template
commit 3f56234ecb4b8b07becfdcbbc3d7facbd95e6f60
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Fri Aug 30 09:05:57 2013 +0100
Implement set[Date|Time]. (firebird-sdbc)
Change-Id: Ibf3bc34f316c0a299afc2e015ff4c49ad57099a5
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx
b/connectivity/source/drivers/firebird/ResultSet.cxx
index a0a4f58..21d4152 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 99/8ae48895f8aa3e8a8893235baee83d2fe2e1de
99/8ae48895f8aa3e8a8893235baee83d2fe2e1de |1 + 1 file changed, 1 insertion(+) New commits: commit b553a35ab45d1f359cf169273dc209819219c55f Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 30 11:39:46 2013 +0100 Notes added by 'git notes add' diff --git a/99/8ae48895f8aa3e8a8893235baee83d2fe2e1de b/99/8ae48895f8aa3e8a8893235baee83d2fe2e1de new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/99/8ae48895f8aa3e8a8893235baee83d2fe2e1de @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 54/70169b8f17cd83ec4db7ad0432437ccc3b3d7c
54/70169b8f17cd83ec4db7ad0432437ccc3b3d7c |1 + 1 file changed, 1 insertion(+) New commits: commit 4feeef1f1157dc1eb8e08e2f9f81fa5fce53fb3b Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 30 11:40:54 2013 +0100 Notes added by 'git notes add' diff --git a/54/70169b8f17cd83ec4db7ad0432437ccc3b3d7c b/54/70169b8f17cd83ec4db7ad0432437ccc3b3d7c new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/54/70169b8f17cd83ec4db7ad0432437ccc3b3d7c @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source
shell/source/tools/lngconvex/lngconvex.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9f1d47f8246b5513fa3a54ff16de4b1f4dd647ab
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 30 13:23:32 2013 +0200
attempt to roughly fix fdo#68740
Actually that map wants a resolved fallback locale, not just a language
to ID mapping, which light fallback was a side effect of
MsLangId::convertIsoNamesToLanguage() and eliminated with the latest
changes to LanguageTag conversion.
Change-Id: I32f632c6b198383dd3eda8538ccb801c9275baca
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx
b/shell/source/tools/lngconvex/lngconvex.cxx
index ea326c7..8c95f2a 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -330,7 +330,7 @@ void add_group_entries(
iso_lang_identifier myiso_lang( iso_lang );
LanguageType ltype = LanguageTag(
OStringToOUString( myiso_lang.language(),
RTL_TEXTENCODING_UTF8),
-OStringToOUString( myiso_lang.country(),
RTL_TEXTENCODING_UTF8)).getLanguageType();
+OStringToOUString( myiso_lang.country(),
RTL_TEXTENCODING_UTF8)).makeFallback().getLanguageType();
if( ( ltype 0x0200 ) == 0 map[ ltype ].empty() )
{
Substitutor.set_language(iso_lang_identifier(iso_lang));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: build difficulty
On 08/30/2013 11:39 AM, Fridrich Strba wrote: On 30/08/13 11:11, Stephan Bergmann wrote: ...because boost::noncopyable has become the de-facto standard idiom for this, at least for pre-C++11 code that depends on Boost anyway. [citation missing] Sure, nice to have standard idiom that causes us to have to work-around implementation bugs. Where two private declarations could be enough. But then maybe I am too low-level for the modern C++ developers. I even know how to manage my memory myself :) The working hypothesis is that if a configuration fails to process uses of boost::noncopyable, it is sufficiently broken to fail on more elaborate uses of Boost further down the LO build, too, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: packaging issues - file_lists
On 08/30/2013 12:02 PM, Andreas Radke wrote: Something different - since a few versions (4.0?) we have to move /usr/lib/libreoffice/share/registry/writer.xcd from Writer package - it's part of writer_list.txt - to the -common package. When this file is not installed LibreOffice refuses to start with: [andyrtr@workstation64 trunk]$ libreoffice terminate called after throwing an instance of 'com::sun::star::uno::RuntimeException' I'm not sure if this is a bug and should not crash LO or a feature and should be fixed in the file lists. See https://bugs.freedesktop.org/show_bug.cgi?id=59025 Add-On 1 toolbar is displayed unexpectedly, share/registry/librelogo.xcd has a dependency on share/registry/writer.xcd, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: shell/source
shell/source/tools/lngconvex/lngconvex.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 40ff64b93fc4c4c2e2710853e9f71e35811b9362 Author: Eike Rathke er...@redhat.com Date: Fri Aug 30 13:54:02 2013 +0200 and another one for fdo#68740 Change-Id: If07cffd30fe5fdfbe8fcb749b7682d1b8a3dcbb8 diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx index 8c95f2a..d40f4b8 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -459,7 +459,7 @@ void start_language_section( LanguageType ltype = LanguageTag( OStringToOUString( iso_lang.language(), RTL_TEXTENCODING_UTF8), -OStringToOUString( iso_lang.country(), RTL_TEXTENCODING_UTF8)).getLanguageType(); +OStringToOUString( iso_lang.country(), RTL_TEXTENCODING_UTF8)).makeFallback().getLanguageType(); char buff[10]; int primLangID = PRIMARYLANGID(ltype); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cmis' - libcmis/libcmis-0.4.1.patch libcmis/UnpackedTarball_cmis.mk ucb/source
libcmis/UnpackedTarball_cmis.mk |2
libcmis/libcmis-0.4.1.patch | 95 +++
ucb/source/ucp/cmis/cmis_content.cxx |2
3 files changed, 98 insertions(+), 1 deletion(-)
New commits:
commit a6fcdfbeaa925695a440ff7fc4be5eff16aacc78
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Fri Aug 30 14:06:09 2013 +0200
libcmis: add a mandatory patch for GDrive feature to properly work
Change-Id: I1bd183508b7f481feed641f8658c0baea6f743bd
diff --git a/libcmis/UnpackedTarball_cmis.mk b/libcmis/UnpackedTarball_cmis.mk
index 5786474..0b2a9fb 100644
--- a/libcmis/UnpackedTarball_cmis.mk
+++ b/libcmis/UnpackedTarball_cmis.mk
@@ -13,6 +13,8 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,cmis,$(CMIS_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0))
+$(eval $(call gb_UnpackedTarball_add_patches,cmis,libcmis/libcmis-0.4.1.patch))
+
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_UnpackedTarball_add_patches,cmis,libcmis/boost-win.patch))
endif
diff --git a/libcmis/libcmis-0.4.1.patch b/libcmis/libcmis-0.4.1.patch
new file mode 100644
index 000..214475f
--- /dev/null
+++ b/libcmis/libcmis-0.4.1.patch
@@ -0,0 +1,95 @@
+diff --git src/libcmis/json-utils.cxx src/libcmis/json-utils.cxx
+index b537a09..b4e037d 100644
+--- src/libcmis/json-utils.cxx
src/libcmis/json-utils.cxx
+@@ -213,48 +213,54 @@ Json::Type Json::parseType( )
+ {
+ Type type = json_string;
+ string str = toString( );
+-boost::posix_time::ptime time = libcmis::parseDateTime( str );
+-if ( !time.is_not_a_date_time( ) )
+-type = json_datetime;
+-else
++if ( str.empty( ) )
++return type;
++try
+ {
+-Type backupType = type;
+-type = json_bool;
+-try
+-{
+-parseBool( str );
+-}
+-catch (...)
++boost::posix_time::ptime time = libcmis::parseDateTime( str );
++if ( !time.is_not_a_date_time( ) )
++return json_datetime;
++}
++catch (...)
++{
++// Try other types
++}
++Type backupType = type;
++type = json_bool;
++try
++{
++parseBool( str );
++}
++catch (...)
++{
++type = backupType;
++}
++if ( type != json_bool )
++{
++if ( str.find('.') == string::npos )
+ {
+-type = backupType;
++backupType = type;
++type = json_int;
++try
++{
++parseInteger( str );
++}
++catch(...)
++{
++type = backupType;
++}
+ }
+-if ( type != json_bool )
++else
+ {
+-if ( str.find('.') == string::npos )
++backupType = type;
++type = json_double;
++try
+ {
+-backupType = type;
+-type = json_int;
+-try
+-{
+-parseInteger( str );
+-}
+-catch(...)
+-{
+-type = backupType;
+-}
++parseDouble( str );
+ }
+-else
+-{
+-backupType = type;
+-type = json_double;
+-try
+-{
+-parseDouble( str );
+-}
+-catch(...)
+-{
+-type = backupType;
+-}
++catch(...)
++{
++type = backupType;
+ }
+ }
+ }
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index 5b8451c..76d23b9 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -174,7 +174,7 @@ namespace
bool bMultiValued = prop.MultiValued;
bool bOpenChoice = prop.OpenChoice;
uno::Any value = prop.Value;
-libcmis::PropertyType::Type type;
+libcmis::PropertyType::Type type = libcmis::PropertyType::String;
if ( prop.Type == CMIS_TYPE_STRING )
type = libcmis::PropertyType::String;
else if ( prop.Type == CMIS_TYPE_BOOL )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/ui/docvw/AnchorOverlayObject.cxx | 26 --
1 file changed, 12 insertions(+), 14 deletions(-)
New commits:
commit 7ed3f859004e0763598a7d6edc7e4dec2b69813c
Author: Armin Le Grand a...@apache.org
Date: Fri Aug 30 11:35:57 2013 +
i213129 Corrected LineWidth for text commens in SW
diff --git a/sw/source/ui/docvw/AnchorOverlayObject.cxx
b/sw/source/ui/docvw/AnchorOverlayObject.cxx
index 2d97e1d..e1b418a 100644
--- a/sw/source/ui/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/ui/docvw/AnchorOverlayObject.cxx
@@ -54,7 +54,7 @@ private:
basegfx::BColor maColor;
// discrete line width
-double mfLogicLineWidth;
+double mfDiscreteLineWidth;
// bitfield
boolmbShadow : 1;
@@ -70,7 +70,7 @@ public:
const basegfx::B2DPolygon rLineTop,
AnchorState aAnchorState,
const basegfx::BColor rColor,
- double fLogicLineWidth,
+ double fDiscreteLineWidth,
bool bShadow,
bool bLineSolid )
: drawinglayer::primitive2d::DiscreteMetricDependentPrimitive2D(),
@@ -79,7 +79,7 @@ public:
maLineTop(rLineTop),
maAnchorState(aAnchorState),
maColor(rColor),
-mfLogicLineWidth(fLogicLineWidth),
+mfDiscreteLineWidth(fDiscreteLineWidth),
mbShadow(bShadow),
mbLineSolid(bLineSolid)
{}
@@ -90,7 +90,7 @@ public:
const basegfx::B2DPolygon getLineTop() const { return maLineTop; }
AnchorState getAnchorState() const { return maAnchorState; }
const basegfx::BColor getColor() const { return maColor; }
-double getLogicLineWidth() const { return mfLogicLineWidth; }
+double getDiscreteLineWidth() const { return mfDiscreteLineWidth; }
bool getShadow() const { return mbShadow; }
bool getLineSolid() const { return mbLineSolid; }
@@ -117,14 +117,15 @@ drawinglayer::primitive2d::Primitive2DSequence
AnchorPrimitive::create2DDecompos
drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
aTriangle);
}
+// prepare view-independent LineWidth and color
+const drawinglayer::attribute::LineAttribute aLineAttribute(
+getColor(),
+getDiscreteLineWidth() * getDiscreteUnit());
+
if ( AS_ALL == maAnchorState ||
AS_START == maAnchorState )
{
// create line start
-const drawinglayer::attribute::LineAttribute aLineAttribute(
-getColor(),
-getLogicLineWidth() /
(basegfx::fTools::equalZero(getDiscreteUnit()) ? 1.0 : getDiscreteUnit()));
-
if(getLineSolid())
{
const drawinglayer::primitive2d::Primitive2DReference aSolidLine(
@@ -203,10 +204,6 @@ drawinglayer::primitive2d::Primitive2DSequence
AnchorPrimitive::create2DDecompos
{
// LineTop has to be created, too, but uses no shadow, so add after
// the other parts are created
-const drawinglayer::attribute::LineAttribute aLineAttribute(
-getColor(),
-getLogicLineWidth() /
(basegfx::fTools::equalZero(getDiscreteUnit()) ? 1.0 : getDiscreteUnit()));
-
const drawinglayer::primitive2d::Primitive2DReference aLineTop(
new drawinglayer::primitive2d::PolygonStrokePrimitive2D(
getLineTop(),
@@ -229,7 +226,7 @@ bool AnchorPrimitive::operator==( const
drawinglayer::primitive2d::BasePrimitive
getLineTop() == rCompare.getLineTop()
getAnchorState() == rCompare.getAnchorState()
getColor() == rCompare.getColor()
- getLogicLineWidth() == rCompare.getLogicLineWidth()
+ getDiscreteLineWidth() == rCompare.getDiscreteLineWidth()
getShadow() == rCompare.getShadow()
getLineSolid() == rCompare.getLineSolid());
}
@@ -356,13 +353,14 @@ drawinglayer::primitive2d::Primitive2DSequence
AnchorOverlayObject::createOverla
{
implEnsureGeometry();
+static double aDiscreteLineWidth(1.6);
const drawinglayer::primitive2d::Primitive2DReference aReference(
new AnchorPrimitive( maTriangle,
maLine,
maLineTop,
GetAnchorState(),
getBaseColor().getBColor(),
- ANCHORLINE_WIDTH * 15.0,
+ ANCHORLINE_WIDTH * aDiscreteLineWidth,
getShadowedEffect(),
getLineSolid()) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: build difficulty
On 30/08/13 12:15, bjoern wrote: There are two kinds of people making this statement: Those that have been wrong and those that will be. ;) Sure, don't worry, I'll shut up :) F. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Conference - Registration is now open
Dear community, in less than four weeks, the LibreOffice Conference 2013 will take place in Milan, Italy. LibOCon is the global and annual event for the whole LibreOffice community and ecosystem, with creators, adopters and users meeting and gathering, exchanging ideas and thoughts. After the Call for Papers has been finished, we are currently working hard to prepare the schedule out of those many great proposals we have received. In order to help the organizers with their plannings, we today ask you to register if you want to take part in this year's conference. This helps us in estimating the amount of attendants and ensuring that enough capacities are available for everyone. We also need this information to send you last-minute updates via e-mail. Registering is easy - just send an e-mail to confere...@libreoffice.org and state: 1. your first and last name 2. your e-mail address 3. your organization/affiliation, if applicable 4. your IRC nickname, if you want Participation at the conference will cost 10 € per person, payable directly at the venue, which helps the local organizers in producing required material. Looking forward to seeing you in Milan! On behalf of the community Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extras/source include/sfx2 sfx2/source sfx2/uiconfig
extras/source/glade/libreoffice-catalog.xml.in |3
include/sfx2/templateabstractview.hxx |2
include/sfx2/templatelocalview.hxx |1
sfx2/source/control/templateabstractview.cxx | 12
sfx2/source/control/templatelocalview.cxx | 12
sfx2/source/dialog/backingwindow.cxx | 156 ++
sfx2/source/dialog/backingwindow.hxx | 22 +
sfx2/uiconfig/ui/startcenter.ui| 382 +
8 files changed, 535 insertions(+), 55 deletions(-)
New commits:
commit f8426f505316d08f35d8a7cf8dbfd6a3c60db3db
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Wed Aug 14 15:53:13 2013 +0200
startcenter: Add toggle to view templates in Start Center
Change-Id: I17aa3bfbb7f4b0eca525dd15d6866c6951d5d20f
Reviewed-on: https://gerrit.libreoffice.org/5543
Reviewed-by: Jan Holesovsky ke...@suse.cz
Tested-by: Jan Holesovsky ke...@suse.cz
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 951445b..dcbd8a1 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -482,6 +482,9 @@
glade-widget-class title=Recent Documents View
name=sfxlo-RecentDocsView
generic-name=Icon View parent=GtkIconView
icon-name=widget-gtk-iconview/
+glade-widget-class title=Template Thumbnail View
name=sfxlo-TemplateLocalView
+generic-name=Template Icon View parent=GtkIconView
+icon-name=widget-gtk-iconview/
/glade-widget-classes
/glade-catalog
diff --git a/include/sfx2/templateabstractview.hxx
b/include/sfx2/templateabstractview.hxx
index 8dd6027..8648205 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -81,8 +81,8 @@ class SFX2_DLLPUBLIC TemplateAbstractView : public
ThumbnailView
public:
TemplateAbstractView (Window *pParent, WinBits nWinStyle, bool
bDisableTransientChildren);
-
TemplateAbstractView ( Window* pParent, const ResId rResId, bool
bDisableTransientChildren = false );
+TemplateAbstractView ( Window* pParent );
virtual ~TemplateAbstractView ();
diff --git a/include/sfx2/templatelocalview.hxx
b/include/sfx2/templatelocalview.hxx
index 3a53fcb..139fa70 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -30,6 +30,7 @@ class SFX2_DLLPUBLIC TemplateLocalView : public
TemplateAbstractView
public:
TemplateLocalView ( Window* pParent, const ResId rResId, bool
bDisableTransientChildren = false );
+TemplateLocalView ( Window* pParent );
virtual ~TemplateLocalView ();
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index d911917..9eb0a01 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -142,6 +142,18 @@ TemplateAbstractView::TemplateAbstractView(Window
*pParent, const ResId rResId,
maFTName.Hide();
}
+TemplateAbstractView::TemplateAbstractView(Window *pParent)
+: ThumbnailView(pParent),
+ mnCurRegionId(0),
+ maAllButton(this, SfxResId(BTN_ALL_TEMPLATES)),
+ maFTName(this, SfxResId(FT_NAME))
+{
+maAllButton.Hide();
+maAllButton.SetStyle(maAllButton.GetStyle() | WB_FLATBUTTON);
+maAllButton.SetClickHdl(LINK(this,TemplateAbstractView,ShowRootRegionHdl));
+maFTName.Hide();
+}
+
TemplateAbstractView::~TemplateAbstractView ()
{
}
diff --git a/sfx2/source/control/templatelocalview.cxx
b/sfx2/source/control/templatelocalview.cxx
index 8dcbd32..bcc0d7d 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -16,6 +16,7 @@
#include svl/inettype.hxx
#include tools/urlobj.hxx
#include unotools/ucbstreamhelper.hxx
+#include vcl/builder.hxx
#include vcl/pngread.hxx
#include com/sun/star/embed/ElementModes.hpp
@@ -37,6 +38,17 @@ TemplateLocalView::TemplateLocalView ( Window* pParent,
const ResId rResId, boo
{
}
+TemplateLocalView::TemplateLocalView ( Window* pParent)
+: TemplateAbstractView(pParent),
+ mpDocTemplates(new SfxDocumentTemplates)
+{
+}
+
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTemplateLocalView(Window
*pParent, VclBuilder::stringmap )
+{
+return new TemplateLocalView(pParent);
+}
+
TemplateLocalView::~TemplateLocalView()
{
for (size_t i = 0; i maRegions.size(); ++i)
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index d69b2fb..4cedf1b 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -31,6 +31,8 @@
#include toolkit/awt/vclxmenu.hxx
+#include com/sun/star/document/MacroExecMode.hpp
+#include com/sun/star/document/UpdateDocMode.hpp
#include com/sun/star/frame/Desktop.hpp
#include
[Libreoffice-commits] core.git: cppcanvas/source vcl/source
cppcanvas/source/inc/implrenderer.hxx |5 +
cppcanvas/source/mtfrenderer/emfplus.cxx | 15 +++
cppcanvas/source/mtfrenderer/implrenderer.cxx |5 +++--
vcl/source/filter/wmf/winmtf.cxx | 16 +---
4 files changed, 28 insertions(+), 13 deletions(-)
New commits:
commit 21ee132af1b888f50a9d916337011879570ca357
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Fri Aug 30 14:31:29 2013 +0200
Revert some random work-in-progress that is most probably bitrotten
Revert EMF+: aBaseTransform is a hardcoded identity matrix, don't bother
with it
This reverts commit 2b700a710e44d2d09f45793f5f2448268e66d4fe.
Revert Pass also the bounding box in device units to the EMF+ part
This reverts commit f387c5da5a824df6cf2874155c13445a86804475.
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 63cce82f..79a2967 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -286,6 +286,7 @@ static float GetSwapFloat( SvStream rSt )
ActionVector maActions;
/* EMF+ */
+XForm aBaseTransform;
XForm aWorldTransform;
EMFPObject* aObjects [256];
float fPageScale;
@@ -294,10 +295,6 @@ static float GetSwapFloat( SvStream rSt )
sal_Int32 nHDPI;
sal_Int32 nVDPI;
/* EMF+ emf header info */
-sal_Int32 nBoundsLeft;
-sal_Int32 nBoundsTop;
-sal_Int32 nBoundsRight;
-sal_Int32 nBoundsBottom;
sal_Int32 nFrameLeft;
sal_Int32 nFrameTop;
sal_Int32 nFrameRight;
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 384dd2c..a88ae12 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -865,6 +865,9 @@ namespace cppcanvas
x -= nFrameLeft;
y -= nFrameTop;
+x *= aBaseTransform.eM11;
+y *= aBaseTransform.eM22;
+
return ::basegfx::B2DPoint (x, y);
}
@@ -877,6 +880,9 @@ namespace cppcanvas
MapToDevice (w, h);
+w *= aBaseTransform.eM11;
+h *= aBaseTransform.eM22;
+
return ::basegfx::B2DSize (w, h);
}
@@ -927,6 +933,7 @@ namespace cppcanvas
::basegfx::B2DHomMatrix aTextureTransformation;
::basegfx::B2DHomMatrix aWorldTransformation;
+::basegfx::B2DHomMatrix aBaseTransformation;
rendering::Texture aTexture;
aWorldTransformation.set (0, 0, aWorldTransform.eM11);
@@ -936,6 +943,13 @@ namespace cppcanvas
aWorldTransformation.set (1, 1, aWorldTransform.eM22);
aWorldTransformation.set (1, 2, aWorldTransform.eDy);
+aBaseTransformation.set (0, 0, aBaseTransform.eM11);
+aBaseTransformation.set (0, 1, aBaseTransform.eM21);
+aBaseTransformation.set (0, 2, aBaseTransform.eDx);
+aBaseTransformation.set (1, 0, aBaseTransform.eM12);
+aBaseTransformation.set (1, 1, aBaseTransform.eM22);
+aBaseTransformation.set (1, 2, aBaseTransform.eDy);
+
if (brush-type == 4) {
aTextureTransformation.scale (brush-areaWidth,
brush-areaHeight);
aTextureTransformation.translate (brush-areaX,
brush-areaY);
@@ -962,6 +976,7 @@ namespace cppcanvas
aTextureTransformation.scale (100.0*nMmX/nPixX,
100.0*nMmY/nPixY);
aTextureTransformation.translate (-nFrameLeft, -nFrameTop);
aTextureTransformation *= rState.mapModeTransform;
+aTextureTransformation *= aBaseTransformation;
aTexture.RepeatModeX = rendering::TexturingMode::CLAMP;
aTexture.RepeatModeY = rendering::TexturingMode::CLAMP;
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 17c68c4..c9489afd 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1787,12 +1787,13 @@ namespace cppcanvas
SvMemoryStream rMF ((void*) pAct-GetData (),
pAct-GetDataSize (), STREAM_READ);
-rMF nBoundsLeft nBoundsTop nBoundsRight
nBoundsBottom;
-SAL_INFO (cppcanvas.emf, EMF+ picture bounds:
nBoundsLeft , nBoundsTop - nBoundsRight ,
nBoundsBottom);
rMF nFrameLeft nFrameTop nFrameRight
nFrameBottom;
[Libreoffice-commits] core.git: shell/source
shell/source/tools/lngconvex/lngconvex.cxx | 45 +++--
1 file changed, 11 insertions(+), 34 deletions(-)
New commits:
commit 7113e2310b2a1eeb9d9e89bf5e7ed3a10f3640dd
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 30 14:41:30 2013 +0200
eliminated yet another language-country parser
Change-Id: I2aebe058a6d60431b7073aca641910dc365ead09
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx
b/shell/source/tools/lngconvex/lngconvex.cxx
index d40f4b8..34cf3c8 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -162,43 +162,24 @@ public:
iso_lang_identifier() {};
iso_lang_identifier(const OString str) :
-lang_(str)
-{ init(); }
+maBcp47(str)
+{ }
iso_lang_identifier(const std::string str) :
-lang_(str.c_str())
-{ init(); }
+maBcp47(str.c_str())
+{ }
-OString language() const
-{ return lang_; }
-
-OString country() const
-{ return country_; }
+OUString make_OUString() const
+{ return OStringToOUString( maBcp47, RTL_TEXTENCODING_ASCII_US); }
OString make_OString() const
-{ return lang_ + - + country_; }
+{ return maBcp47; }
std::string make_std_string() const
-{
-OString tmp(lang_ + - + country_);
-return tmp.getStr();
-}
-
-private:
-void init()
-{
-sal_Int32 idx = lang_.indexOf('-');
-
-if (idx -1)
-{
-country_ = lang_.copy(idx + 1);
-lang_ = lang_.copy(0, idx);
-}
-}
+{ return maBcp47.getStr(); }
private:
-OString lang_;
-OString country_;
+OString maBcp47;
};
/** Convert a OUString to the MS resource
@@ -328,9 +309,7 @@ void add_group_entries(
OString iso_lang =
aConfig.GetKeyName(sal::static_int_castsal_uInt16(i));
OString key_value_utf8 =
aConfig.ReadKey(sal::static_int_castsal_uInt16(i));
iso_lang_identifier myiso_lang( iso_lang );
-LanguageType ltype = LanguageTag(
-OStringToOUString( myiso_lang.language(),
RTL_TEXTENCODING_UTF8),
-OStringToOUString( myiso_lang.country(),
RTL_TEXTENCODING_UTF8)).makeFallback().getLanguageType();
+LanguageType ltype = LanguageTag(
myiso_lang.make_OUString()).makeFallback().getLanguageType();
if( ( ltype 0x0200 ) == 0 map[ ltype ].empty() )
{
Substitutor.set_language(iso_lang_identifier(iso_lang));
@@ -457,9 +436,7 @@ void start_language_section(
std::string lang_section(LANGUAGE );
-LanguageType ltype = LanguageTag(
-OStringToOUString( iso_lang.language(), RTL_TEXTENCODING_UTF8),
-OStringToOUString( iso_lang.country(),
RTL_TEXTENCODING_UTF8)).makeFallback().getLanguageType();
+LanguageType ltype = LanguageTag(
iso_lang.make_OUString()).makeFallback().getLanguageType();
char buff[10];
int primLangID = PRIMARYLANGID(ltype);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/dialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fe1cbda3b7513e0d3686d347aa991e7231067384
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 30 14:18:40 2013 +0100
Resolves: fdo#68396 Yield allowed layout timer to run during init layout
There are multiple pages getting generated in the styles dialog because the
dropcaps preview window calls Yield sometimes and sometimes the layout
timer
gets a chance to activate *during* the creation of the dialog so there ends
up
with two consecutive activations of some tabpages which has wonderful
eventual
know on effects resulting in that crash later on.
Easiest thing is to disable the layout timer during the initial size
calculation
Change-Id: I7fb0a7ff89aa2c6013c5d8014deface10761
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index eeb70a3..ef14a79 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1256,7 +1256,7 @@ IMPL_LINK( Dialog, ImplHandleLayoutTimerHdl, void*,
EMPTYARG )
void Dialog::queue_layout()
{
-if (hasPendingLayout())
+if (hasPendingLayout() || isCalculatingInitialLayoutSize())
return;
if (IsInClose())
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/docvw/AnchorOverlayObject.cxx | 26 --
1 file changed, 12 insertions(+), 14 deletions(-)
New commits:
commit 5dce602d31bfc3ab57653b5922459fec46a1e1be
Author: Armin Le Grand a...@apache.org
Date: Fri Aug 30 11:35:57 2013 +
Resolves: #i123129# Corrected LineWidth for text comments in SW
(cherry picked from commit 7ed3f859004e0763598a7d6edc7e4dec2b69813c)
Change-Id: Ife132b66a13208193d897e98cdaea17bce33c310
diff --git a/sw/source/ui/docvw/AnchorOverlayObject.cxx
b/sw/source/ui/docvw/AnchorOverlayObject.cxx
index 1cd43528..5ea13c2 100644
--- a/sw/source/ui/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/ui/docvw/AnchorOverlayObject.cxx
@@ -45,7 +45,7 @@ private:
basegfx::BColor maColor;
// discrete line width
-double mfLogicLineWidth;
+double mfDiscreteLineWidth;
// bitfield
boolmbShadow : 1;
@@ -61,7 +61,7 @@ public:
const basegfx::B2DPolygon rLineTop,
AnchorState aAnchorState,
const basegfx::BColor rColor,
- double fLogicLineWidth,
+ double fDiscreteLineWidth,
bool bShadow,
bool bLineSolid )
: drawinglayer::primitive2d::DiscreteMetricDependentPrimitive2D(),
@@ -70,7 +70,7 @@ public:
maLineTop(rLineTop),
maAnchorState(aAnchorState),
maColor(rColor),
-mfLogicLineWidth(fLogicLineWidth),
+mfDiscreteLineWidth(fDiscreteLineWidth),
mbShadow(bShadow),
mbLineSolid(bLineSolid)
{}
@@ -81,7 +81,7 @@ public:
const basegfx::B2DPolygon getLineTop() const { return maLineTop; }
AnchorState getAnchorState() const { return maAnchorState; }
const basegfx::BColor getColor() const { return maColor; }
-double getLogicLineWidth() const { return mfLogicLineWidth; }
+double getDiscreteLineWidth() const { return mfDiscreteLineWidth; }
bool getShadow() const { return mbShadow; }
bool getLineSolid() const { return mbLineSolid; }
@@ -108,14 +108,15 @@ drawinglayer::primitive2d::Primitive2DSequence
AnchorPrimitive::create2DDecompos
drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval,
aTriangle);
}
+// prepare view-independent LineWidth and color
+const drawinglayer::attribute::LineAttribute aLineAttribute(
+getColor(),
+getDiscreteLineWidth() * getDiscreteUnit());
+
if ( AS_ALL == maAnchorState ||
AS_START == maAnchorState )
{
// create line start
-const drawinglayer::attribute::LineAttribute aLineAttribute(
-getColor(),
-getLogicLineWidth() /
(basegfx::fTools::equalZero(getDiscreteUnit()) ? 1.0 : getDiscreteUnit()));
-
if(getLineSolid())
{
const drawinglayer::primitive2d::Primitive2DReference aSolidLine(
@@ -194,10 +195,6 @@ drawinglayer::primitive2d::Primitive2DSequence
AnchorPrimitive::create2DDecompos
{
// LineTop has to be created, too, but uses no shadow, so add after
// the other parts are created
-const drawinglayer::attribute::LineAttribute aLineAttribute(
-getColor(),
-getLogicLineWidth() /
(basegfx::fTools::equalZero(getDiscreteUnit()) ? 1.0 : getDiscreteUnit()));
-
const drawinglayer::primitive2d::Primitive2DReference aLineTop(
new drawinglayer::primitive2d::PolygonStrokePrimitive2D(
getLineTop(),
@@ -220,7 +217,7 @@ bool AnchorPrimitive::operator==( const
drawinglayer::primitive2d::BasePrimitive
getLineTop() == rCompare.getLineTop()
getAnchorState() == rCompare.getAnchorState()
getColor() == rCompare.getColor()
- getLogicLineWidth() == rCompare.getLogicLineWidth()
+ getDiscreteLineWidth() == rCompare.getDiscreteLineWidth()
getShadow() == rCompare.getShadow()
getLineSolid() == rCompare.getLineSolid());
}
@@ -346,13 +343,14 @@ drawinglayer::primitive2d::Primitive2DSequence
AnchorOverlayObject::createOverla
{
implEnsureGeometry();
+static double aDiscreteLineWidth(1.6);
const drawinglayer::primitive2d::Primitive2DReference aReference(
new AnchorPrimitive( maTriangle,
maLine,
maLineTop,
GetAnchorState(),
getBaseColor().getBColor(),
- ANCHORLINE_WIDTH * 15.0,
+ ANCHORLINE_WIDTH * aDiscreteLineWidth,
getShadowedEffect(),
getLineSolid()) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7e/d3f859004e0763598a7d6edc7e4dec2b69813c
7e/d3f859004e0763598a7d6edc7e4dec2b69813c |1 + 1 file changed, 1 insertion(+) New commits: commit 19579b3262ebf96a53ae6c120214af78bb71 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 30 14:49:40 2013 +0100 Notes added by 'git notes add' diff --git a/7e/d3f859004e0763598a7d6edc7e4dec2b69813c b/7e/d3f859004e0763598a7d6edc7e4dec2b69813c new file mode 100644 index 000..2347623 --- /dev/null +++ b/7e/d3f859004e0763598a7d6edc7e4dec2b69813c @@ -0,0 +1 @@ +merged as: 5dce602d31bfc3ab57653b5922459fec46a1e1be ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/source
svtools/source/misc/transfer.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit a77275c610f1543dcc8b38dc5ec50f1195965f27
Author: Armin Le Grand a...@apache.org
Date: Fri Aug 30 13:27:36 2013 +
i122982 Fallback to bitmap reader when no PNG even when claimed
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 62cab33..0dae8ae 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -1808,6 +1808,7 @@ sal_Bool TransferableDataHelper::GetBitmapEx( const
DataFlavor rFlavor, BitmapE
SotStorageStreamRef xStm;
DataFlavor aSubstFlavor;
bool bRet(GetSotStorageStream(rFlavor, xStm));
+bool bSuppressPNG(false); // #122982# If PNG stream not accessed, but BMP
one, suppress trying to load PNG
if(!bRet HasFormat(SOT_FORMATSTR_ID_PNG)
SotExchange::GetFormatDataFlavor(SOT_FORMATSTR_ID_PNG, aSubstFlavor))
{
@@ -1819,18 +1820,20 @@ sal_Bool TransferableDataHelper::GetBitmapEx( const
DataFlavor rFlavor, BitmapE
{
// when no direct success, try if BMP is available
bRet = GetSotStorageStream(aSubstFlavor, xStm);
+bSuppressPNG = bRet;
}
if(bRet)
{
-
if(rFlavor.MimeType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii(image/png)))
+if(!bSuppressPNG
rFlavor.MimeType.equalsIgnoreAsciiCase(::rtl::OUString::createFromAscii(image/png)))
{
// it's a PNG, import to BitmapEx
::vcl::PNGReader aPNGReader(*xStm);
rBmpEx = aPNGReader.Read();
}
-else
+
+if(rBmpEx.IsEmpty())
{
Bitmap aBitmap;
Bitmap aMask;
@@ -1848,7 +1851,7 @@ sal_Bool TransferableDataHelper::GetBitmapEx( const
DataFlavor rFlavor, BitmapE
}
}
-bRet = (ERRCODE_NONE == xStm-GetError());
+bRet = (ERRCODE_NONE == xStm-GetError() !rBmpEx.IsEmpty());
/* SJ: #110748# At the moment we are having problems with DDB inserted
as DIB. The
problem is, that some graphics are inserted much too big because
the nXPelsPerMeter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - ios/iosremote
dev/null |binary
ios/iosremote/.DS_Store |binary
ios/iosremote/fr.lproj/iPad_autosize_old.storyboard |4 ++--
ios/iosremote/iosremote.xcodeproj/project.pbxproj| 12
ios/iosremote/iosremote/WTcontrol~ipad.png |binary
ios/iosremote/iosremote/WTcontrol~iphone.png |binary
ios/iosremote/iosremote/WalkThroughPageViewController.m |5 -
ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard |4 ++--
8 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit 756b6040ca24702cca2482086e358080e20eb6d2
Author: Siqi LIU m...@siqi.fr
Date: Fri Aug 30 16:16:51 2013 +0200
remove old WalkthroughControl image
Change-Id: Id5680fde392a731da15889d3869e234fbf072068
diff --git a/ios/iosremote/.DS_Store b/ios/iosremote/.DS_Store
index a75cbd5..85b6552 100644
Binary files a/ios/iosremote/.DS_Store and b/ios/iosremote/.DS_Store differ
diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
index d5cf0ab..c5770a0 100644
--- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj
+++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj
@@ -105,6 +105,8 @@
8CAD659C17A3EFE700CFB661 /* arrow_right.png in Resources */ =
{isa = PBXBuildFile; fileRef = 8CAD659817A3EFE700CFB661 /* arrow_right.png */;
};
8CAD659D17A3EFE700CFB661 /* arrow_ri...@2x.png in Resources */
= {isa = PBXBuildFile; fileRef = 8CAD659917A3EFE700CFB661 /* arrow_ri...@2x.png
*/; };
8CAD65A017A3F76300CFB661 /* slideShowSwipeInList_ipad.m in
Sources */ = {isa = PBXBuildFile; fileRef = 8CAD659F17A3F76300CFB661 /*
slideShowSwipeInList_ipad.m */; };
+ 8CAF3DDF17D0DFFD00F931E5 /* WTcontrol~ipad.png in Resources */
= {isa = PBXBuildFile; fileRef = 8CAF3DDD17D0DFFD00F931E5 /* WTcontrol~ipad.png
*/; };
+ 8CAF3DE017D0DFFD00F931E5 /* WTcontrol~iphone.png in Resources
*/ = {isa = PBXBuildFile; fileRef = 8CAF3DDE17D0DFFD00F931E5 /*
WTcontrol~iphone.png */; };
8CD6EC6817CBBAF40071827A /* WalkThroughPageViewController.m in
Sources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6617CBBAF40071827A /*
WalkThroughPageViewController.m */; };
8CD6EC6917CBBAF40071827A /* WalkThroughPageViewController.xib
in Resources */ = {isa = PBXBuildFile; fileRef = 8CD6EC6717CBBAF40071827A /*
WalkThroughPageViewController.xib */; };
8CD6EC7017CC3FA00071827A /*
WalkThroughContainerViewController.m in Sources */ = {isa = PBXBuildFile;
fileRef = 8CD6EC6F17CC3FA00071827A /* WalkThroughContainerViewController.m */;
};
@@ -117,7 +119,6 @@
8CD6EC8217CF40200071827A /* WTconnecting.png in Resources */ =
{isa = PBXBuildFile; fileRef = 8CD6EC8117CF40200071827A /* WTconnecting.png */;
};
8CD6EC8417CF46930071827A /* WTPairing.png in Resources */ =
{isa = PBXBuildFile; fileRef = 8CD6EC8317CF46930071827A /* WTPairing.png */; };
8CD6EC8817CF4ABA0071827A /*
WalkThroughPageViewMainImageController.xib in Resources */ = {isa =
PBXBuildFile; fileRef = 8CD6EC8717CF4ABA0071827A /*
WalkThroughPageViewMainImageController.xib */; };
- 8CD6EC8A17CF67300071827A /* WTcontrol.png in Resources */ =
{isa = PBXBuildFile; fileRef = 8CD6EC8917CF67300071827A /* WTcontrol.png */; };
BE9EBD071765BF0800283FD2 /* CoreImage.framework in Frameworks
*/ = {isa = PBXBuildFile; fileRef = BE9EBD061765BF0800283FD2 /*
CoreImage.framework */; };
/* End PBXBuildFile section */
@@ -272,6 +273,8 @@
8CAD659917A3EFE700CFB661 /* arrow_ri...@2x.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; name = arrow_ri...@2x.png;
path = iosremote/arrow_ri...@2x.png; sourceTree = group; };
8CAD659E17A3F76300CFB661 /* slideShowSwipeInList_ipad.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
name = slideShowSwipeInList_ipad.h; path =
iosremote/slideShowSwipeInList_ipad.h; sourceTree = group; };
8CAD659F17A3F76300CFB661 /* slideShowSwipeInList_ipad.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; name = slideShowSwipeInList_ipad.m; path =
iosremote/slideShowSwipeInList_ipad.m; sourceTree = group; };
+ 8CAF3DDD17D0DFFD00F931E5 /* WTcontrol~ipad.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; name = WTcontrol~ipad.png;
path = iosremote/WTcontrol~ipad.png; sourceTree = group; };
+ 8CAF3DDE17D0DFFD00F931E5 /* WTcontrol~iphone.png */ = {isa =
PBXFileReference; lastKnownFileType = image.png; name = WTcontrol~iphone.png;
path = iosremote/WTcontrol~iphone.png; sourceTree = group; };
8CD6EC6517CBBAF40071827A /* WalkThroughPageViewController.h */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 194 ---
1 file changed, 91 insertions(+), 103 deletions(-)
New commits:
commit ff050190aa9bc362501bc1ecadfbf2a8cb5ecf70
Author: Tor Lillqvist t...@iki.fi
Date: Fri Aug 30 17:28:51 2013 +0300
The except.cxx for gcc3_macosx_x86-64 can be the same as for
gcc3_macosx_intel
Change-Id: I567a20dc70b2b9e13965550333f4ed89205c4333
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 62b0cb1..0c31eed 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -17,95 +17,109 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include sal/config.h
+#include cassert
+#include new
#include stdio.h
#include string.h
+#include typeinfo
+
#include dlfcn.h
+// MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h defined
+// __cxxabiv1::__class_type_info and __cxxabiv1::__si_class_type_info but
+// MacOSX10.7.sdk/usr/include/cxxabi.h no longer does:
+#if MACOSX_SDK_VERSION 1070
#include cxxabi.h
-#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h
-#define _GLIBCXX_CDTOR_CALLABI
#endif
-#include boost/unordered_map.hpp
-
-#include sal/log.hxx
-#include rtl/instance.hxx
-#include rtl/strbuf.hxx
-#include rtl/ustrbuf.hxx
-#include osl/diagnose.h
-#include osl/mutex.hxx
-
-#include com/sun/star/uno/genfunc.hxx
+#include boost/static_assert.hpp
+#include boost/unordered_map.hpp
#include com/sun/star/uno/RuntimeException.hpp
-#include typelib/typedescription.hxx
-#include uno/any2.h
+#include com/sun/star/uno/genfunc.hxx
+#include osl/diagnose.h
+#include osl/mutex.hxx
+#include rtl/strbuf.hxx
+#include rtl/ustrbuf.hxx
+#include typelib/typedescription.h
+#include uno/any2.h
#include share.hxx
-
-using namespace ::std;
using namespace ::osl;
-using namespace ::rtl;
using namespace ::com::sun::star::uno;
-using namespace ::__cxxabiv1;
+namespace CPPU_CURRENT_NAMESPACE {
-namespace CPPU_CURRENT_NAMESPACE
-{
+namespace {
-#ifndef _LIBCPP_VERSION
+struct Fake_type_info {
+virtual ~Fake_type_info() {}
+char const * name;
+};
-#if MACOSX_SDK_VERSION = 1070
+struct Fake_class_type_info: Fake_type_info {};
-// MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h defined
-// __cxxabiv1::__class_type_info and __cxxabiv1::__si_class_type_info but
-// MacOSX10.7.sdk/usr/include/cxxabi.h no longer does, so instances of those
-// classes need to be created manually:
+#if MACOSX_SDK_VERSION 1070
+BOOST_STATIC_ASSERT(
+sizeof (Fake_class_type_info) == sizeof (__cxxabiv1::__class_type_info));
+#endif
-// std::type_info defined in typeinfo offers a protected ctor:
-struct FAKE_type_info: public std::type_info {
-FAKE_type_info(char const * name): type_info(name) {}
+struct Fake_si_class_type_info: Fake_class_type_info {
+void const * base;
};
-// Modeled after __cxxabiv1::__si_class_type_info defined in
-// MacOSX10.4u.sdk/usr/include/c++/4.0.0/cxxabi.h (i.e.,
-// abi::__si_class_type_info documented at
-// http://www.codesourcery.com/public/cxx-abi/abi.html#rtti):
-struct FAKE_si_class_type_info: public FAKE_type_info {
-FAKE_si_class_type_info(char const * name, std::type_info const * theBase):
-FAKE_type_info(name), base(theBase) {}
-
-std::type_info const * base;
-// actually a __cxxabiv1::__class_type_info pointer
-};
+#if MACOSX_SDK_VERSION 1070
+BOOST_STATIC_ASSERT(
+sizeof (Fake_si_class_type_info)
+== sizeof (__cxxabiv1::__si_class_type_info));
+#endif
struct Base {};
struct Derived: Base {};
-std::type_info * create_FAKE_class_type_info(char const * name) {
-std::type_info * p = new FAKE_type_info(name);
-// cxxabiv1::__class_type_info has no data members in addition to
-// std::type_info
-*reinterpret_cast void ** (p) = *reinterpret_cast void * const * (
+std::type_info * createFake_class_type_info(char const * name) {
+char * buf = new char[sizeof (Fake_class_type_info)];
+#if MACOSX_SDK_VERSION 1070
+assert(
+dynamic_cast__cxxabiv1::__class_type_info const *(typeid(Base))
+!= 0);
+#endif
+*reinterpret_castvoid **(buf) = *reinterpret_castvoid * const *(
typeid(Base));
-// copy correct __cxxabiv1::__class_type_info vtable into place
-return p;
+// copy __cxxabiv1::__class_type_info vtable into place
+Fake_class_type_info * fake = reinterpret_castFake_class_type_info
*(buf);
+fake-name = name;
+return reinterpret_caststd::type_info *(
+static_castFake_type_info *(fake));
}
-std::type_info * create_FAKE_si_class_type_info(
+std::type_info * createFake_si_class_type_info(
char const * name, std::type_info const * base)
{
-std::type_info * p = new FAKE_si_class_type_info(name, base);
-*reinterpret_cast void ** (p) = *reinterpret_cast void * const * (
+char * buf = new
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/appserv.cxx | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit dd0f6c737b6af659389e473296e939ec6cfa5f4e
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 30 16:06:44 2013 +0100
Resolves: fdo#66700 don't crash on querying zoom state with no
SfxObjectShell
Change-Id: Id2943c92ce6deaae3e4d507a35c08466db21cece
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index d84fb82..e4c77c1 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -602,6 +602,10 @@ void SfxApplication::MiscExec_Impl( SfxRequest rReq )
case SID_ZOOM_ENTIRE_PAGE:
case SID_ZOOM_PAGE_WIDTH:
{
+SfxObjectShell* pCurrentShell = SfxObjectShell::Current();
+if (!pCurrentShell)
+return;
+
// make sure aZoom is initialized with a proper value if SetType
// doesn't work
SvxZoomItem aZoom( SVX_ZOOM_PERCENT, 100 );
@@ -634,7 +638,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest rReq )
break;
}
-SfxViewFrame::Current()-GetDispatcher()-Execute(SID_ATTR_ZOOM,
SFX_CALLMODE_ASYNCHRON, aZoom, 0L);
+pCurrentShell-GetDispatcher()-Execute(SID_ATTR_ZOOM,
SFX_CALLMODE_ASYNCHRON, aZoom, 0L);
break;
}
@@ -818,8 +822,11 @@ void SfxApplication::MiscState_Impl(SfxItemSet rSet)
case SID_ZOOM_ENTIRE_PAGE:
case SID_ZOOM_PAGE_WIDTH:
{
+SfxObjectShell* pCurrentShell =
SfxObjectShell::Current();
+
const SfxPoolItem *pItem;
-SfxItemState aState =
SfxViewFrame::Current()-GetDispatcher()-QueryState(SID_ATTR_ZOOM, pItem);
+SfxItemState aState = pCurrentShell ?
+
pCurrentShell-GetDispatcher()-QueryState(SID_ATTR_ZOOM, pItem) :
SFX_ITEM_DISABLED;
if ( aState == SFX_ITEM_DISABLED )
rSet.DisableItem( nWhich );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: build difficulty
Quoting Kohei Yoshida kohei.yosh...@suse.de: [snip] + -DBOOST_NO_DEFAULTED_FUNCTIONS \ [snip] I'm having the same issue on my machine running a slightly antiquated version of openSUSE (11.4), and this change fixes it for me. Kohei Thank you, Kohei. My build is making progress. Terry. -- View this message in context: http://nabble.documentfoundation.org/build-difficulty-tp4072217p4072343.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig
sfx2/source/dialog/backingwindow.cxx | 48 +++--
sfx2/source/dialog/backingwindow.hxx |3
sfx2/uiconfig/ui/startcenter.ui | 304 ++-
3 files changed, 158 insertions(+), 197 deletions(-)
New commits:
commit 729bc005ec12cdb1c8cb319a60bdccc3b0964c85
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Fri Aug 30 16:55:53 2013 +0200
startcenter: Tweak button layout in Start Center
Change-Id: I7a02b5c831b268f326d30c331065c57deceeb6ee
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 4cedf1b..1ce82d8 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -277,25 +277,14 @@ void BackingWindow::initControls()
setupExternalLink( mpInfoButton );
setupExternalLink( mpTplRepButton );
-mpShowWriterTemplateButton -SetClickHdl( LINK( this, BackingWindow,
RecentTemplateToggleHdl ) );
-mpShowCalcTemplateButton-SetClickHdl( LINK( this, BackingWindow,
RecentTemplateToggleHdl ) );
-mpShowImpressTemplateButton -SetClickHdl( LINK( this, BackingWindow,
RecentTemplateToggleHdl ) );
-mpShowDrawTemplateButton-SetClickHdl( LINK( this, BackingWindow,
RecentTemplateToggleHdl ) );
-
-mpShowWriterRecentButton-SetClickHdl( LINK( this, BackingWindow,
RecentTemplateToggleHdl ) );
-mpShowCalcRecentButton -SetClickHdl( LINK( this, BackingWindow,
RecentTemplateToggleHdl ) );
-mpShowImpressRecentButton -SetClickHdl( LINK( this, BackingWindow,
RecentTemplateToggleHdl ) );
-mpShowDrawRecentButton -SetClickHdl( LINK( this, BackingWindow,
RecentTemplateToggleHdl ) );
-
-mpShowWriterRecentButton-Hide();
-mpShowCalcRecentButton -Hide();
-mpShowImpressRecentButton -Hide();
-mpShowDrawRecentButton -Hide();
-
-setupTemplateView( mpWriterTemplateThumbnails, FILTER_APP_WRITER );
-setupTemplateView( mpCalcTemplateThumbnails,FILTER_APP_CALC );
-setupTemplateView( mpImpressTemplateThumbnails, FILTER_APP_IMPRESS );
-setupTemplateView( mpDrawTemplateThumbnails,FILTER_APP_DRAW );
+setupTemplateView( mpWriterTemplateThumbnails, FILTER_APP_WRITER,
+ mpShowWriterRecentButton,mpShowWriterTemplateButton
);
+setupTemplateView( mpCalcTemplateThumbnails,FILTER_APP_CALC,
+ mpShowCalcRecentButton, mpShowCalcTemplateButton );
+setupTemplateView( mpImpressTemplateThumbnails, FILTER_APP_IMPRESS,
+ mpShowImpressRecentButton,
mpShowImpressTemplateButton );
+setupTemplateView( mpDrawTemplateThumbnails,FILTER_APP_DRAW,
+ mpShowDrawRecentButton, mpShowDrawTemplateButton );
Resize();
}
@@ -331,8 +320,10 @@ void BackingWindow::setupButton( PushButton* pButton )
pButton-SetControlFont( aFont );
}
-void BackingWindow::setupTemplateView( TemplateLocalView* pView,
FILTER_APPLICATION eFilter )
+void BackingWindow::setupTemplateView( TemplateLocalView* pView,
FILTER_APPLICATION eFilter,
+ PushButton* pRecentButton, PushButton*
pTemplateButton )
{
+// setup view
pView-SetStyle(pView-GetStyle() | WB_VSCROLL);
pView-setItemMaxTextLength(nTemplateItemMaxTextLength);
@@ -343,6 +334,23 @@ void BackingWindow::setupTemplateView( TemplateLocalView*
pView, FILTER_APPLICAT
pView-Hide(); // hidden by default
pView-showRootRegion();
pView-setOpenTemplateHdl( LINK( this, BackingWindow, OpenTemplateHdl ) );
+
+// setup buttons
+pRecentButton-SetClickHdl( LINK( this, BackingWindow,
RecentTemplateToggleHdl ) );
+pTemplateButton-SetClickHdl( LINK( this, BackingWindow,
RecentTemplateToggleHdl ) );
+
+// button text - slighly larger font than normal labels on the texts
+Font aFont;
+aFont.SetSize( Size( 0, 11 ) );
+aFont.SetWeight( WEIGHT_NORMAL );
+
+pRecentButton-SetFont( aFont );
+pRecentButton-SetControlFont( aFont );
+
+pTemplateButton-SetFont( aFont );
+pTemplateButton-SetControlFont( aFont );
+
+pRecentButton-Hide(); // hidden by default
}
void BackingWindow::setupExternalLink( PushButton* pButton )
diff --git a/sfx2/source/dialog/backingwindow.hxx
b/sfx2/source/dialog/backingwindow.hxx
index 5009df8..1da5a9a 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -107,7 +107,8 @@ class BackingWindow
const OUString rURL, const std::setOUString rURLS,
SvtModuleOptions rOpt,
SvtModuleOptions::EModule eMod );
void setupButton( PushButton* pButton );
-void setupTemplateView( TemplateLocalView* pView, FILTER_APPLICATION
eFilter );
+void setupTemplateView( TemplateLocalView* pView, FILTER_APPLICATION
eFilter,
+PushButton* pRecentButton, PushButton*
pTemplateButton );
void setupExternalLink( PushButton* pButton );
void dispatchURL( const
[Libreoffice-commits] core.git: configure.ac
configure.ac | 39 ---
1 file changed, 16 insertions(+), 23 deletions(-)
New commits:
commit 0f3895a78ecf1f9730f41a41f3c2f2fecd0d8b83
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 30 16:58:41 2013 +0200
Decouple setting -std=gnu++11/c++11 from setting -stdlib=libc++
Forcing -stdlib=c++11 into CXX upon --enable-libc++ instead of only into
CXXFLAGS_CXX11 as done normally caused external projects to unexpectedly
pick it
up, causing build failures in firebird.
Change-Id: I588d75ccbde6b9fd4f38e10a0c67c2f6086f8977
diff --git a/configure.ac b/configure.ac
index 5b7b2647..329350a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2690,8 +2690,7 @@ if test $_os = Darwin; then
AC_MSG_ERROR([--enable-libc++ requires
--with-macosx-version-min-required = 10.7])
fi
# Use libc++ instead of libstdc++ when possible
-# and also compile as C++11
-stdlib=-std=c++11 -stdlib=libc++
+stdlib=-stdlib=libc++
CPP_LIBRARY=LIBCPP
fi
if test $ENABLE_LTO = TRUE; then
@@ -5956,28 +5955,22 @@ if test $COM = MSC; then
elif test $GCC = yes; then
CXXFLAGS_CXX11=
AC_MSG_CHECKING([whether $CXX supports C++11])
-if test $CPP_LIBRARY = LIBCPP -a $_os = Darwin; then
-: Already set CXX to contain -std=c++11
-HAVE_CXX11=TRUE
-AC_MSG_RESULT(yes)
-else
-for flag in -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x ; do
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS=$CXXFLAGS $flag -Werror
-AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[void f()
{}]])],[CXXFLAGS_CXX11=$flag])
-AC_LANG_POP([C++])
-CXXFLAGS=$save_CXXFLAGS
-if test -n $CXXFLAGS_CXX11; then
-HAVE_CXX11=TRUE
-break
-fi
-done
-if test $HAVE_CXX11 = TRUE; then
-AC_MSG_RESULT([yes ($CXXFLAGS_CXX11)])
-else
-AC_MSG_RESULT(no)
+for flag in -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x ; do
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS=$CXXFLAGS $flag -Werror
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[void f()
{}]])],[CXXFLAGS_CXX11=$flag])
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+if test -n $CXXFLAGS_CXX11; then
+HAVE_CXX11=TRUE
+break
fi
+done
+if test $HAVE_CXX11 = TRUE; then
+AC_MSG_RESULT([yes ($CXXFLAGS_CXX11)])
+else
+AC_MSG_RESULT(no)
fi
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/misc/transfer.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 1156d1b29af15c0d7f1d185f8ce1dc8668940286
Author: Armin Le Grand a...@apache.org
Date: Fri Aug 30 13:27:36 2013 +
Resolves: #i122982# Fallback to bitmap reader when no PNG even when claimed
(cherry picked from commit a77275c610f1543dcc8b38dc5ec50f1195965f27)
Conflicts:
svtools/source/misc/transfer.cxx
Change-Id: I213496c53558cd3b78e40866bdc8e89d08079033
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index a86e5cf..296d54d 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -1694,6 +1694,7 @@ sal_Bool TransferableDataHelper::GetBitmapEx( const
DataFlavor rFlavor, BitmapE
SotStorageStreamRef xStm;
DataFlavor aSubstFlavor;
bool bRet(GetSotStorageStream(rFlavor, xStm));
+bool bSuppressPNG(false); // #122982# If PNG stream not accessed, but BMP
one, suppress trying to load PNG
if(!bRet HasFormat(SOT_FORMATSTR_ID_PNG)
SotExchange::GetFormatDataFlavor(SOT_FORMATSTR_ID_PNG, aSubstFlavor))
{
@@ -1705,18 +1706,20 @@ sal_Bool TransferableDataHelper::GetBitmapEx( const
DataFlavor rFlavor, BitmapE
{
// when no direct success, try if BMP is available
bRet = GetSotStorageStream(aSubstFlavor, xStm);
+bSuppressPNG = bRet;
}
if(bRet)
{
-if(rFlavor.MimeType.equalsIgnoreAsciiCase(image/png))
+if(!bSuppressPNG
rFlavor.MimeType.equalsIgnoreAsciiCase(image/png))
{
// it's a PNG, import to BitmapEx
::vcl::PNGReader aPNGReader(*xStm);
rBmpEx = aPNGReader.Read();
}
-else
+
+if(rBmpEx.IsEmpty())
{
Bitmap aBitmap;
Bitmap aMask;
@@ -1734,7 +1737,7 @@ sal_Bool TransferableDataHelper::GetBitmapEx( const
DataFlavor rFlavor, BitmapE
}
}
-bRet = (ERRCODE_NONE == xStm-GetError());
+bRet = (ERRCODE_NONE == xStm-GetError() !rBmpEx.IsEmpty());
/* SJ: #110748# At the moment we are having problems with DDB inserted
as DIB. The
problem is, that some graphics are inserted much too big because
the nXPelsPerMeter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a7/7275c610f1543dcc8b38dc5ec50f1195965f27
a7/7275c610f1543dcc8b38dc5ec50f1195965f27 |1 + 1 file changed, 1 insertion(+) New commits: commit 465ade576d1543aae465c9db2af6c54ea18cbd69 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 30 16:16:35 2013 +0100 Notes added by 'git notes add' diff --git a/a7/7275c610f1543dcc8b38dc5ec50f1195965f27 b/a7/7275c610f1543dcc8b38dc5ec50f1195965f27 new file mode 100644 index 000..21a0170 --- /dev/null +++ b/a7/7275c610f1543dcc8b38dc5ec50f1195965f27 @@ -0,0 +1 @@ +merged as: 1156d1b29af15c0d7f1d185f8ce1dc8668940286 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LO master OSX 64bit - SIGTRAP in __dyld_dyld_start()
Hi all, I'm seeing this in my master builds of LO on startup : Program received signal SIGTRAP, Trace/breakpoint trap. 0x7fff5fc01028 in __dyld__dyld_start () (gdb) bt full #0 0x7fff5fc01028 in __dyld__dyld_start () No symbol table info available. #1 0x0001 in ?? () No symbol table info available.(gdb) c The application will continue to load in gdb if I continue, but I was wondering whether it was of any significance, and if so whether this (which precedes the trap message) : warn:legacy.osl:25772:1:desktop/source/deployment/misc/dp_platform.cxx:180: Extension Manager: The extension supports an unknown platform. Check the platform element in the description.xml warn:legacy.osl:25772:1:desktop/source/deployment/misc/dp_platform.cxx:180: Extension Manager: The extension supports an unknown platform. Check the platform element in the description.xml is potentially the cause of that trap ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO master OSX 64bit - SIGTRAP in __dyld_dyld_start()
I'm seeing this in my master builds of LO on startup : Program received signal SIGTRAP, Trace/breakpoint trap. 0x7fff5fc01028 in __dyld__dyld_start () The application will continue to load in gdb if I continue, I think this is perfectly normal, I see it all the time, too, if I gdb soffice right after a fresh build. soffice re-execs itself when starting for the first time after an upgrade to a new version (including just a build after a fresh pull, I guess), and this is how it shows up in gdb. As you noticed, just continue. warn:legacy.osl:25772:1:desktop/source/deployment/misc/dp_platform.cxx:180: Extension Manager: The extension supports an unknown platform. Check the platform element in the description.xml Those are not related. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 66700, which changed state. Bug 66700 Summary: REPORTBUILDER - CRASH when deleting field added in Report Design mode https://bugs.freedesktop.org/show_bug.cgi?id=66700 What|Removed |Added Status|ASSIGNED|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
Build with jemalloc
Does anyone tried to build LibreOffice with jemallc?
I tried to use LibreOffice on Windows environment, and it required too much
memory rather than Microsoft Office.
So I tryied to inspect memory usage with Microsoft Performance Analyzer.
http://msdn.microsoft.com/en-us/library/windows/desktop/hh448170.aspx
I can find many malloc/free and new/delete pair, so I suspect possibility of
heap memory fragmantation.
Then I tried to build with jemalloc, a famous memory allocator.
I modified desktop/Executable_soffice_bin.mk like the following:
$(eval $(call gb_Executable_add_ldflags,soffice_bin,\
/STACK:1000 \
/NODEFAULTLIB:msvcrt /NODEFAULTLIB:libcmt \
'c:\cygwin\libo\jemalloc\jemalloc_s.lib' \
'c:\cygwin\libo\jemalloc\libgcc.a' \
'C:\Program Files\Microsoft Visual Studio 11.0\VC\lib\msvcrt.lib' \
'C:\Program Files\Microsoft Visual Studio 11.0\VC\lib\libcmt.lib' \
))
(it’s a dirty hack)
So gbuild invoked the following command (a little bit long):
S=C:/cygwin/libo O=C:/cygwin/opt/lo/build2/solver/wntmsci14.pro
W=C:/cygwin/opt/lo/build2/workdir/wntmsci14.pro
mkdir -p $W/LinkTarget/Executable/
rm -f $W/LinkTarget/Executable/soffice_bin.exe
RESPONSEFILE=C:/cygwin/tmp/gbuild.ThJJlZ
unset INCLUDE
link -release -opt:noref -incremental:no -debug -nxcompat -dynamicbase
-manifest -SUBSYSTEM:WINDOWS,5.01-LIBPATH:$O/lib
-LIBPATH:C:/PROGRA~1/Java/JDK17~1.0_2/lib
-LIBPATH:C:/PROGRA~1/MICROS~1.0/VC/lib -LIBPATH:C:/PROGRA~1/WI3CF2~1/8.0/lib
-LIBPATH:C:/PROGRA~1/WI3CF2~1/8.0/lib/win8/um/x86
-LIBPATH:C:/PROGRA~1/MICROS~1.NET/SDK/v2.0//lib
-LIBPATH:C:/PROGRA~1/MI5E29~1/lib/x86/STACK:1000
/NODEFAULTLIB:msvcrt
/NODEFAULTLIB:libcmt
'c:\cygwin\libo\jemalloc\jemalloc_s.lib' 'c:\cygwin\libo\jemalloc\libgcc.a'
'C:\Program Files\Microsoft Visual Studio 11.0\VC\lib\msvcrt.lib'
'C:\Program Files\Microsoft Visual Studio 11.0\VC\lib\libcmt.lib'
@${RESPONSEFILE} isal.lib isofficeapp.lib iuwinapi.lib ooopathutils.lib
winextendloaderenv.lib advapi32.lib user32.lib
-out:$W/LinkTarget/Executable/soffice_bin.exe; RC=$?; rm ${RESPONSEFILE}
if [ -f $W/LinkTarget/Executable/soffice_bin.exe.manifest ]; then mt.exe
-nologo -manifest $W/LinkTarget/Executable/soffice_bin.exe.manifest
outputresource:$W/LinkTarget/Executable/soffice_bin.exe\;1
touch -r $W/LinkTarget/Executable/soffice_bin.exe
W/LinkTarget/Executable/soffice_bin.exe.manifest; fi
if [ -f $S/solenv/inc/DeclareDPIAware.manifest ]; then
mt.exe -nologo -manifest $S/solenv/inc/DeclareDPIAware.manifest
-updateresource:$W/LinkTarget/Executable/soffice_bin.exe\;1 ;
fi ; exit $RC
I thknk it seems fine, but the output binary hadn’t have static jemalloc code.
Does anyone tried same thing?
Or how can I build LibreOffice with jemalloc static library?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - chart2/source dbaccess/source reportdesign/source xmloff/source
chart2/source/controller/dialogs/tp_RangeChooser.cxx|2
dbaccess/source/core/misc/DatabaseDataProvider.cxx |2
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 28 +++-
xmloff/source/chart/SchXMLTableContext.cxx | 10
4 files changed, 29 insertions(+), 13 deletions(-)
New commits:
commit b090cbdf82e0827234caf5969124f6631311ef35
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Fri Aug 30 18:00:21 2013 +0200
fdo#68663 don't blindly force categories when there are none
Change-Id: If52ea471ee3ca10e2f69d2fcd7b3ae0d5772bfc3
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx
b/xmloff/source/chart/SchXMLTableContext.cxx
index c5377e3..18cd73c 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -979,16 +979,6 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
}
}
-// there exist files with own data without a categories element but with
row
-// descriptions. The row descriptions were used as categories even without
-// the categories element
-if( ! bCategoriesApplied )
-{
-SchXMLTools::CreateCategories(
-xDataProv, xChartDoc, OUString(categories),
-0 /* nCooSysIndex */, 0 /* nDimension */ );
-}
-
//i91578 display of hidden values (copy paste scenario; use hidden flag
during migration to locale table upon paste )
//remove series that consist only of hidden columns
Reference chart2::XInternalDataProvider xInternalDataProvider(
xDataProv, uno::UNO_QUERY );
commit 2a0b2d9371b47689d34fc238c73ebc1126cba5b1
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Fri Aug 30 17:59:33 2013 +0200
fdo#68663 open chart-in-report: actually test for categories presence
Change-Id: Icf8c8c1f3b1443bf051b3834f6407996e4ef2bfb
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index e75591f..65cbca5 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -21,6 +21,7 @@
#include com/sun/star/sdb/CommandType.hpp
#include com/sun/star/chart2/data/DatabaseDataProvider.hpp
#include com/sun/star/chart2/data/XDataReceiver.hpp
+#include com/sun/star/chart2/data/XDataSource.hpp
#include com/sun/star/chart/XComplexDescriptionAccess.hpp
#include com/sun/star/chart/ChartDataRowSource.hpp
#include com/sun/star/reflection/ProxyFactory.hpp
@@ -118,10 +119,35 @@ void SAL_CALL ImportDocumentHandler::endDocument() throw
(uno::RuntimeException,
// this fills the chart again
::comphelper::NamedValueCollection aArgs;
aArgs.put( CellRangeRepresentation, OUString(all) );
-aArgs.put( HasCategories, uno::makeAny( sal_True ) );
aArgs.put( FirstCellAsLabel, uno::makeAny( sal_True ) );
aArgs.put( DataRowSource, uno::makeAny(
chart::ChartDataRowSource_COLUMNS ) );
+sal_Bool bHasCategories = sal_False;
+
+uno::Reference chart2::data::XDataSource xDataSource(m_xModel,
uno::UNO_QUERY);
+if( xDataSource.is())
+{
+uno::Sequence uno::Reference chart2::data::XLabeledDataSequence
aSequences(xDataSource-getDataSequences());
+const sal_Int32 nCount( aSequences.getLength());
+for( sal_Int32 nIdx=0; nIdxnCount; ++nIdx )
+{
+if( aSequences[nIdx].is() )
+{
+uno::Reference beans::XPropertySet xSeqProp(
aSequences[nIdx]-getValues(), uno::UNO_QUERY );
+OUString aRole;
+if ( xSeqProp.is()
+ ( xSeqProp-getPropertyValue( Role ) = aRole )
+ aRole == categories
+)
+{
+bHasCategories = sal_True;
+break;
+}
+}
+}
+}
+aArgs.put( HasCategories, uno::makeAny( bHasCategories ) );
+
uno::Reference chart::XComplexDescriptionAccess
xDataProvider(m_xModel-getDataProvider(),uno::UNO_QUERY);
if ( xDataProvider.is() )
{
commit 6d4c69ff8446184ac725713b8b53a66f0ee56701
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Fri Aug 30 17:57:22 2013 +0200
that comment is patently wrong
categories presence used to be hardcoded to sal_True,
but now it is tested a few lines below.
Change-Id: I413bbac3069e49a56c74637b75b8d8990f6111b4
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 79056db..ec94426 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -245,7 +245,7 @@ uno::Sequence beans::PropertyValue SAL_CALL
[Libreoffice-commits] core.git: vcl/generic
vcl/generic/glyphs/gcach_ftyp.cxx | 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) New commits: commit 00a81233d9c2ae6b3996b744982715137fd6a626 Author: Khaled Hosny khaledho...@eglug.org Date: Fri Aug 30 18:36:18 2013 +0200 Remove hacks for ancient FreeType We don't support FreeType = 2.0.9, since configure already checks for = 2.1.5 (which is pretty ancient and was put there arbitrarily as the first FreeType version to ship a .pc file, but that is a different story). Change-Id: Iae7c950ff7b48eae22fbe98bdda726318e9dea9a diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 979be11..3dbb5cd 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -496,14 +496,6 @@ FreetypeManager::FreetypeManager() #else #ifdef RTLD_DEFAULT // true if a good dlfcn.h header was included // Get version of freetype library to enable workarounds. -// Freetype = 2.0.9 does not have FT_Library_Version(). -// Using dl_sym() instead of osl_getSymbol() because latter -// isn't designed to work with oslModule=NULL -void (*pFTLibraryVersion)(FT_Library library, -FT_Int *amajor, FT_Int *aminor, FT_Int *apatch); -pFTLibraryVersion = (void (*)(FT_Library library, -FT_Int *amajor, FT_Int *aminor, FT_Int *apatch))(sal_IntPtr)dlsym( RTLD_DEFAULT, FT_Library_Version ); - pFTNewSize = (FT_Error(*)(FT_Face,FT_Size*))(sal_IntPtr)dlsym( RTLD_DEFAULT, FT_New_Size ); pFTActivateSize = (FT_Error(*)(FT_Size))(sal_IntPtr)dlsym( RTLD_DEFAULT, FT_Activate_Size ); pFTDoneSize = (FT_Error(*)(FT_Size))(sal_IntPtr)dlsym( RTLD_DEFAULT, FT_Done_Size ); @@ -513,8 +505,7 @@ FreetypeManager::FreetypeManager() bEnableSizeFT = (pFTNewSize!=NULL) (pFTActivateSize!=NULL) (pFTDoneSize!=NULL); FT_Int nMajor = 0, nMinor = 0, nPatch = 0; -if( pFTLibraryVersion ) -pFTLibraryVersion( aLibFT, nMajor, nMinor, nPatch ); +FT_Library_Version(aLibFT, nMajor, nMinor, nPatch); nFTVERSION = nMajor * 1000 + nMinor * 100 + nPatch; // disable artificial emboldening with the Freetype API for older versions ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source vcl/unx
vcl/inc/salinst.hxx |3 +
vcl/inc/unx/gtk/gtkinst.hxx |4 +-
vcl/source/app/svmain.cxx|2 +
vcl/unx/gtk/app/gtkinst.cxx | 59 ---
vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 18 --
vcl/unx/gtk/fpicker/SalGtkPicker.hxx |2 -
6 files changed, 56 insertions(+), 32 deletions(-)
New commits:
commit d07e7d692ddd2a9ab956a59bcc0f676c7d76bc10
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 29 17:06:16 2013 +0100
wait until we know the UI language before initializing gtk
so that we can set LANGUAGE to get RTL mirroring for RTL
UI languages even under a LTR system locale
Change-Id: I31fce6f1620d7fb35a489c771285b15ba05773df
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index ba9a9b5..6fcb1e2 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -65,6 +65,9 @@ public:
SalInstance() {}
virtual ~SalInstance();
+//called directly after Application::Init
+virtual voidAfterAppInit() {}
+
// Frame
// DisplayName for Unix ???
virtual SalFrame* CreateChildFrame( SystemParentData* pParent,
sal_uLong nStyle ) = 0;
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index cf901cc..4787b21 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -66,7 +66,8 @@ class GtkInstance : public X11SalInstance
public:
GtkInstance( SalYieldMutex* pMutex );
virtual ~GtkInstance();
-voidInit();
+voidEnsureInit();
+virtual void AfterAppInit();
virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong
nStyle );
virtual SalFrame* CreateChildFrame( SystemParentData* pParent,
sal_uLong nStyle );
@@ -110,6 +111,7 @@ public:
private:
std::vectorGtkSalTimer * m_aTimers;
boolIsTimerExpired();
+boolbNeedsInit;
mutable boost::shared_ptrvcl::unx::GtkPrintWrapper m_pPrintWrapper;
};
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index f9d571f..fdfe580 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -282,6 +282,8 @@ bool InitVCL()
// soffice/sfx implementation creates the global service manager
pSVData-mpApp-Init();
+pSVData-mpDefInst-AfterAppInit();
+
// Fetch AppFileName and make it absolute before the workdir changes...
OUString aExeFileName;
osl_getExecutableFile( aExeFileName.pData );
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index caca819..115550b 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -21,6 +21,7 @@
#include stack
#include string.h
#include osl/module.h
+#include osl/process.h
#include unx/gtk/gtkdata.hxx
#include unx/gtk/gtkinst.hxx
#include unx/salobj.h
@@ -122,14 +123,8 @@ extern C
fprintf( stderr, creating GtkSalInstance 0x%p\n, pInstance );
#endif
-// initialize SalData
-GtkData *pSalData = new GtkData( pInstance );
-pSalData-Init();
-pSalData-initNWF();
-
-pInstance-Init();
-
-InitAtkBridge();
+//Create SalData, this does not leak
+/*GtkData *pSalData =*/ new GtkData( pInstance );
return pInstance;
}
@@ -172,13 +167,37 @@ GtkInstance::GtkInstance( SalYieldMutex* pMutex )
#else
: X11SalInstance( pMutex )
#endif
+, bNeedsInit(true)
{
}
-// This has to happen after gtk_init has been called by saldata.cxx's
-// Init or our handlers just get clobbered.
-void GtkInstance::Init()
+//We want to defer initializing gtk until we are after uno has been
+//bootstrapped so we can ask the config what the UI language is so that we can
+//force that in as $LANGUAGE to get gtk to render widgets RTL if we have a RTL
+//UI in a LTR locale
+void GtkInstance::AfterAppInit()
{
+OUString
aLocaleString(Application::GetSettings().GetUILanguageTag().getGlibcLocaleString(.UTF-8));
+if (!aLocaleString.isEmpty())
+{
+OUString envVar(LANGUAGE);
+osl_setEnvironment(envVar.pData, aLocaleString.pData);
+}
+EnsureInit();
+}
+
+void GtkInstance::EnsureInit()
+{
+if (!bNeedsInit)
+return;
+// initialize SalData
+GtkData *pSalData = GetGtkSalData();
+pSalData-Init();
+pSalData-initNWF();
+
+InitAtkBridge();
+
+bNeedsInit = false;
}
GtkInstance::~GtkInstance()
@@ -190,16 +209,19 @@ GtkInstance::~GtkInstance()
SalFrame* GtkInstance::CreateFrame( SalFrame* pParent, sal_uLong nStyle )
{
+EnsureInit();
return new GtkSalFrame( pParent, nStyle );
}
SalFrame* GtkInstance::CreateChildFrame( SystemParentData* pParentData,
sal_uLong )
{
+EnsureInit();
return new GtkSalFrame( pParentData );
}
SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData*
pWindowData, sal_Bool bShow )
{
+EnsureInit();
#if
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xml/xmlexprt.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 89c2136fa093c9d8e21ecaad56329711c8c25079 Author: Laurent Godard lgodard.li...@laposte.net Date: Fri Aug 30 15:12:13 2013 +0200 clean no more used header declaration Change-Id: Id4253c51d43c788310c93acd91ed49fa2fe68c4b Reviewed-on: https://gerrit.libreoffice.org/5695 Reviewed-by: Kohei Yoshida kohei.yosh...@suse.de Tested-by: Kohei Yoshida kohei.yosh...@suse.de diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 6c93827..ad5e2b9 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -176,8 +176,6 @@ class ScXMLExport : public SvXMLExport bool GetMerged (const com::sun::star::table::CellRangeAddress* pCellRange, const com::sun::star::uno::Reference com::sun::star::sheet::XSpreadsheet xTable); -void GetCellText (ScMyCell rMyCell, const ScAddress aPos) const; - void WriteTable(sal_Int32 nTable, const ::com::sun::star::uno::Reference ::com::sun::star::sheet::XSpreadsheet xTable); void WriteCell(ScMyCell aCell, sal_Int32 nEqualCellCount); void WriteEditCell(const EditTextObject* pText); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/deployment/misc/dp_platform.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 0e40013d909c5b28f9d37cf7370fceed1a6ae891 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Aug 30 19:18:26 2013 +0200 Add macosx_x86_64 extension platform identifier Change-Id: Ie7b6e8dee54ae240ff1ca7e7cac89b914dcce9ff diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index de8ea66..830f865 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -56,6 +56,7 @@ #define PLATFORM_NETBSD_X86 netbsd_x86 #define PLATFORM_NETBSD_X86_64 netbsd_x86_64 #define PLATFORM_MACOSX_X86 macosx_x86 +#define PLATFORM_MACOSX_X86_64 macosx_x86_64 #define PLATFORM_OPENBSD_X86openbsd_x86 #define PLATFORM_OPENBSD_X86_64 openbsd_x86_64 #define PLATFORM_DRAGONFLY_X86 dragonfly_x86 @@ -164,6 +165,8 @@ namespace ret = checkOSandCPU(NetBSD, X86_64); else if (token == PLATFORM_MACOSX_X86) ret = checkOSandCPU(MacOSX, x86); +else if (token == PLATFORM_MACOSX_X86_64) +ret = checkOSandCPU(MacOSX, X86_64); else if (token == PLATFORM_AIX_POWERPC) ret = checkOSandCPU(AIX, PowerPC); else if (token == PLATFORM_OPENBSD_X86) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/qa
i18npool/qa/cppunit/test_breakiterator.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 76e735b26aa834bd9fba83b60905ee870f82dac3
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 30 17:30:01 2013 +0100
enable building against RHEL-6 system icu
Change-Id: I56f08d58d8d8a0e397412580451c90f9605bcb46
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx
b/i18npool/qa/cppunit/test_breakiterator.cxx
index b121f6d..6e8b288 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -233,14 +233,18 @@ void TestBreakIterator::testWordBoundaries()
}
//See https://bugs.freedesktop.org/show_bug.cgi?id=49629
-//Note that the breakiterator test will fail on older icu versions
-//(4.2.1) for the 200B (ZWSP) Zero Width Space testcase.
sal_Unicode aBreakTests[] = { ' ', 1, 2, 3, 4, 5, 6, 7, 0x91, 0x92,
0x200B, 0xE8FF, 0xF8FF };
for (int mode = i18n::WordType::ANY_WORD; mode =
i18n::WordType::WORD_COUNT; ++mode)
{
//make sure that in all cases isBeginWord and isEndWord matches
getWordBoundary
for (size_t i = 0; i SAL_N_ELEMENTS(aBreakTests); ++i)
{
+#if (U_ICU_VERSION_MAJOR_NUM == 4) (U_ICU_VERSION_MINOR_NUM = 2)
+//Note the breakiterator test is known to fail on older icu
+//versions (4.2.1) for the 200B (ZWSP) Zero Width Space testcase.
+if (aBreakTests[i] == 0x200B)
+continue;
+#endif
OUString aTest(Word);
aTest += OUString(aBreakTests[i]) + OUString(Word);
aBounds = m_xBreak-getWordBoundary(aTest, 0, aLocale, mode, true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac vcl/source
configure.ac | 11 ---
vcl/source/filter/jpeg/transupp.c |4 ++--
2 files changed, 2 insertions(+), 13 deletions(-)
New commits:
commit 9554853ad7c80e1edf853859dbb65d419e16ea66
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 30 17:24:49 2013 +0100
allow building with older libjpeg again
we don't really care what the error number is, so long as its an error of
some
kind so just sed JERR_BAD_CROP_SPEC to JERR_CONVERSION_NOTIMPL
Change-Id: Iae41de7b720ce2e60c7092d15983aa1c4ba14c89
diff --git a/configure.ac b/configure.ac
index 329350a..5e396a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7553,17 +7553,6 @@ if test $with_system_jpeg = yes; then
[AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
[AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
-AC_MSG_CHECKING([[libjpeg supports JERR_BAD_CROP_SPEC (jpeg-7 API)]])
-AC_COMPILE_IFELSE([ AC_LANG_SOURCE(
- [[
-#include stdio.h
-#include jerror.h
-int main(int c, char**v) { printf(%d\n, JERR_BAD_CROP_SPEC); return 0; }
- ]]) ],
- [AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)
- AC_MSG_ERROR(jpeg library version = 7 or
jpeg-turbo version = 1.1 required)
- ])
libo_MINGW_CHECK_DLL([libjpeg])
else
AC_MSG_RESULT([internal])
diff --git a/vcl/source/filter/jpeg/transupp.c
b/vcl/source/filter/jpeg/transupp.c
index 33da623..4cae59e 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -1006,7 +1006,7 @@ jtransform_request_workspace (j_decompress_ptr srcinfo,
info-crop_yoffset = 0; /* default to +0 */
if (info-crop_xoffset = info-output_width ||
info-crop_yoffset = info-output_height)
- ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);
+ ERREXIT(srcinfo, JERR_CONVERSION_NOTIMPL);
if (info-crop_width_set == JCROP_UNSET)
info-crop_width = info-output_width - info-crop_xoffset;
if (info-crop_height_set == JCROP_UNSET)
@@ -1016,7 +1016,7 @@ jtransform_request_workspace (j_decompress_ptr srcinfo,
info-crop_height = 0 || info-crop_height info-output_height ||
info-crop_xoffset info-output_width - info-crop_width ||
info-crop_yoffset info-output_height - info-crop_height)
- ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);
+ ERREXIT(srcinfo, JERR_CONVERSION_NOTIMPL);
/* Convert negative crop offsets into regular offsets */
if (info-crop_xoffset_set == JCROP_NEG)
xoffset = info-output_width - info-crop_width - info-crop_xoffset;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/WrapPolygonHandler.hxx |4 ++--
writerfilter/source/resourcemodel/Fraction.cxx |4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit f8307e5ae11e8235fa1fb88ed52625bf9c650dc2
Author: Michael Stahl mst...@redhat.com
Date: Fri Aug 30 19:13:40 2013 +0200
fdo#41068: writerfilter: fix image wrap polygon import
Mainly the problem seems to be that Stein's GCD algorithm requires
non-negative input parameters, and the document has this:
wp:lineTo x=-480 y=6104/
(regression from 86898639d4144a078ed295d0a8bef406868802cb)
Change-Id: I8da1272c3caae84f43472aa4acb65ed66dfbd8ae
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index 52cdf5e..dca767f 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -70,8 +70,8 @@ public:
private:
WrapPolygon::Pointer_t mpPolygon;
-sal_uInt32 mnX;
-sal_uInt32 mnY;
+sal_Int32 mnX;
+sal_Int32 mnY;
// Properties
virtual void lcl_attribute(Id Name, Value val);
diff --git a/writerfilter/source/resourcemodel/Fraction.cxx
b/writerfilter/source/resourcemodel/Fraction.cxx
index 9d8a48f..762b9af 100644
--- a/writerfilter/source/resourcemodel/Fraction.cxx
+++ b/writerfilter/source/resourcemodel/Fraction.cxx
@@ -22,6 +22,8 @@
namespace writerfilter {
namespace resourcemodel {
+// Stein's binary GCD for non-negative integers
+// https://en.wikipedia.org/wiki/Binary_GCD_algorithm
sal_uInt32 gcd(sal_uInt32 a, sal_uInt32 b)
{
if (a == 0 || b == 0)
@@ -77,7 +79,7 @@ Fraction::~Fraction()
void Fraction::init(sal_Int32 nNumerator, sal_Int32 nDenominator)
{
-sal_uInt32 nGCD = gcd(nNumerator, nDenominator);
+sal_uInt32 nGCD = gcd(abs(nNumerator), abs(nDenominator));
mnNumerator = nNumerator/ nGCD;
mnDenominator = nDenominator / nGCD;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/control/ruler.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fdd102a6daee854d987926bec1af55a17cfc8aee
Author: Tomaž Vajngerl qui...@gmail.com
Date: Fri Aug 30 19:38:53 2013 +0200
fdo#68689 Sub-divide ruler ticks into 1/8 insted of 1/10 for inch
Change-Id: Ied2a6982d5564228b0ce7fecb89723f3742b6d0d
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index f9eea51..a75571a 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -113,7 +113,7 @@ static const RulerUnitData
aImplRulerUnitTab[RULER_UNIT_COUNT] =
{ MAP_100TH_MM, 1000, 250,500, 1000,1000, 3, cm}, //
CM
{ MAP_MM, 1000, 250,500, 1000, 1, 4, m }, // M
{ MAP_CM, 10, 25000, 5, 10, 10, 6, km}, //
KM
-{ MAP_100TH_INCH, 100,10, 50,100,2540, 3, \ }, //
INCH
+{ MAP_1000TH_INCH,1000, 125,500, 1000, 25400, 3, \ }, //
INCH
{ MAP_100TH_INCH, 1200, 120,600, 1200, 30480, 3, ' }, //
FOOT
{ MAP_10TH_INCH,633600, 63360, 316800, 633600, 1609344, 4, miles }, //
MILE
{ MAP_POINT, 1,12, 12, 36, 353, 2, pt}, //
POINT
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: How to add extra templates to 4.1 windows build
Hi Flavio, On Tuesday, 2013-08-27 10:19:35 +0100, Flavio Moringa wrote: I'm trying to add a few extra templates to a 4.1 windows build, but I don't know where to put them on the source dir so that they are caught in the final MSI In 3.x I used to put them in extras/source/premium/templates/lang/en-US/ but that dir does not exist anymore extras/source/templates/dirname/ looks like the place to go (of course another new path under extras/source/... would do as well) and then create an extras/Package_dirname.mk file similar to extras/Package_tpllayoutimpr.mk and add that to extras/Module_extras.mk and also add an entry to scp2/source/ooo/file_extra_ooo.scp (look for gid_File_Extra_Tpllayoutimpr) and scp2/source/ooo/module_hidden_ooo.scp (dito, look for gid_File_Extra_Tpllayoutimpr) Or simply publish the templates on http://templates.libreoffice.org/ Or if they could be of general interest as default templates, contribute them to the project? Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpBZCA1J0FD2.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag
i18nlangtag/source/languagetag/languagetag.cxx | 21 -
include/i18nlangtag/languagetag.hxx|8
2 files changed, 29 deletions(-)
New commits:
commit 5f860df7fef263d3260e8074841fffcfdf4717fc
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 30 18:26:14 2013 +0200
removed LanguageTag(OUString,OUString) ctor
Change-Id: I8450b7d76e8efac302a9d6005eb3ecc72ad195f4
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx
b/i18nlangtag/source/languagetag/languagetag.cxx
index 887a58e..b5c24ee 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -241,27 +241,6 @@ LanguageTag::LanguageTag( const OUString rBcp47, const
OUString rLanguage,
}
-LanguageTag::LanguageTag( const OUString rLanguage, const OUString rCountry )
-:
-maLocale( rLanguage, rCountry, ),
-mpImplLangtag( NULL),
-mnLangID( LANGUAGE_DONTKNOW),
-meIsValid( DECISION_DONTKNOW),
-meIsIsoLocale( DECISION_DONTKNOW),
-meIsIsoODF( DECISION_DONTKNOW),
-meIsLiblangtagNeeded( DECISION_DONTKNOW),
-mbSystemLocale( rLanguage.isEmpty()),
-mbInitializedBcp47( false),
-mbInitializedLocale( !mbSystemLocale),
-mbInitializedLangID( false),
-mbCachedLanguage( false),
-mbCachedScript( false),
-mbCachedCountry( false),
-mbIsFallback( false)
-{
-}
-
-
LanguageTag::LanguageTag( const rtl_Locale rLocale )
:
maLocale( rLocale.Language, rLocale.Country, rLocale.Variant),
diff --git a/include/i18nlangtag/languagetag.hxx
b/include/i18nlangtag/languagetag.hxx
index 3843493..403221f 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -79,14 +79,6 @@ public:
explicit LanguageTag( const OUString rBcp47, const OUString rLanguage,
const OUString rScript, const OUString rCountry );
-/** Init LanguageTag with language and country strings.
-
-This is a convenience ctor for places that so far use only language and
-country to replace the MsLangId::convert...IsoNames...() calls. Avoid
-use in new code.
- */
-explicit LanguageTag( const OUString rLanguage, const OUString rCountry
);
-
/** Init LanguageTag with rtl_Locale.
This is a convenience ctor.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLTableContext.cxx |9 +
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit ccf7b15c0a5776c6431fdcb0c0e2b0f3935ae3dc
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Aug 30 21:02:26 2013 +0200
-Werror=unused-but-set-variable second try
Change-Id: Ia8a9f60831d089ec04127213bb9ded31aa754bf7
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx
b/xmloff/source/chart/SchXMLTableContext.cxx
index 18cd73c..b3189a5 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -885,7 +885,6 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
const OUString lcl_aCategoriesRange(aCategoriesRange);
-bool bCategoriesApplied = false;
// translate ranges (using the map created before)
for( tSchXMLLSequencesPerIndex::const_iterator aLSeqIt(
rLSequencesPerIndex.begin());
aLSeqIt != rLSequencesPerIndex.end(); ++aLSeqIt )
@@ -914,12 +913,7 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
}
else
{
-if( lcl_tableOfRangeMatches( aRange,
rTable.aTableNameOfFile ))
-{
-if( aLSeqIt-first.first == SCH_XML_CATEGORIES_INDEX )
-bCategoriesApplied = true;
-}
-else
+if( !lcl_tableOfRangeMatches( aRange,
rTable.aTableNameOfFile ))
{
if( aLSeqIt-first.first == SCH_XML_CATEGORIES_INDEX )
{
@@ -930,7 +924,6 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
SchXMLTools::copyProperties(
xOldSequenceProp, Reference
beans::XPropertySet ( xNewSequence, uno::UNO_QUERY ));
aLSeqIt-second-setValues( xNewSequence );
-bCategoriesApplied = true;
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] Mirroring gtk buttons
On Fri, 2013-08-30 at 05:41 +0200, Khaled Hosny wrote: Seems to work fine :), even file a print dialogs now have the proper direction Ah yes, I forgot the old hack that this new hack was based on, so I pushed this stuff now and removed the old file dialog hack which shouldn't be needed anymore. Keep an eye out for any crashes in edge-case startup scenarios with this stuff in place. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO master OSX 64bit - SIGTRAP in __dyld_dyld_start()
Le 30/08/13 17:20, Tor Lillqvist a écrit : Hi Tor, I think this is perfectly normal, I see it all the time, too, if I gdb soffice right after a fresh build. soffice re-execs itself when starting for the first time after an upgrade to a new version (including just a build after a fresh pull, I guess), and this is how it shows up in gdb. As you noticed, just continue. Ah, ok, thanks for this. warn:legacy.osl:25772:1:desktop/source/deployment/misc/dp_platform.cxx:180: Extension Manager: The extension supports an unknown platform. Check the platform element in the description.xml Those are not related. OK, cheers. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLTableContext.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 72e019c4e301ef93bd1be985edd037d1e2b10e28
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Aug 30 20:47:12 2013 +0200
-Werror=unused-but-set-variable bCategoriesApplied
Change-Id: I43c1f866847e2029bc1547dff3be3c1ed454d281
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx
b/xmloff/source/chart/SchXMLTableContext.cxx
index 18cd73c..7d79bc2 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -885,7 +885,6 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
const OUString lcl_aCategoriesRange(aCategoriesRange);
-bool bCategoriesApplied = false;
// translate ranges (using the map created before)
for( tSchXMLLSequencesPerIndex::const_iterator aLSeqIt(
rLSequencesPerIndex.begin());
aLSeqIt != rLSequencesPerIndex.end(); ++aLSeqIt )
@@ -917,7 +916,6 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
if( lcl_tableOfRangeMatches( aRange,
rTable.aTableNameOfFile ))
{
if( aLSeqIt-first.first == SCH_XML_CATEGORIES_INDEX )
-bCategoriesApplied = true;
}
else
{
@@ -930,7 +928,6 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
SchXMLTools::copyProperties(
xOldSequenceProp, Reference
beans::XPropertySet ( xNewSequence, uno::UNO_QUERY ));
aLSeqIt-second-setValues( xNewSequence );
-bCategoriesApplied = true;
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLTableContext.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 47924a46566352dd99a14163d98bd2b51cca6b0e
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Aug 30 20:58:07 2013 +0200
Revert -Werror=unused-but-set-variable bCategoriesApplied
This reverts commit 72e019c4e301ef93bd1be985edd037d1e2b10e28.
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx
b/xmloff/source/chart/SchXMLTableContext.cxx
index 7d79bc2..18cd73c 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -885,6 +885,7 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
const OUString lcl_aCategoriesRange(aCategoriesRange);
+bool bCategoriesApplied = false;
// translate ranges (using the map created before)
for( tSchXMLLSequencesPerIndex::const_iterator aLSeqIt(
rLSequencesPerIndex.begin());
aLSeqIt != rLSequencesPerIndex.end(); ++aLSeqIt )
@@ -916,6 +917,7 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
if( lcl_tableOfRangeMatches( aRange,
rTable.aTableNameOfFile ))
{
if( aLSeqIt-first.first == SCH_XML_CATEGORIES_INDEX )
+bCategoriesApplied = true;
}
else
{
@@ -928,6 +930,7 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
SchXMLTools::copyProperties(
xOldSequenceProp, Reference
beans::XPropertySet ( xNewSequence, uno::UNO_QUERY ));
aLSeqIt-second-setValues( xNewSequence );
+bCategoriesApplied = true;
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/edit.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 6c5ee38b09fd59d415850ad7d5e85ee791b18b91 Author: Marcos Paulo de Souza marcos.souza@gmail.com Date: Thu Aug 29 19:06:48 2013 -0300 fdo#32059: Fix this once and for all Fix a regression from 356b2f0edfd5a01ed05976c1bdb74948ff84b5fd. This regression was about the setSelection function. We inserted the command with a space in the right side of the string, but our selection was not counting the character. So, reasign the variable with the space solve this issue. Change-Id: Ic48f1afaec89c6eefe73d051d3b0eba7edbf557e Reviewed-on: https://gerrit.libreoffice.org/5688 Reviewed-by: Ricardo Montania rica...@linuxafundo.com.br Reviewed-by: Marcos Souza marcos.souza@gmail.com Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 0459866..313614a 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -790,9 +790,9 @@ void SmEditWindow::InsertCommand(sal_uInt16 nCommand) // put a space before a new command if not in the beginning of a line if (aSelection.nStartPos 0 aCurrentFormula[nStartIndex - 1] != ' ') -pEditView-InsertText( + aText); -else -pEditView-InsertText(aText); +aText = + aText; + +pEditView-InsertText(aText); // Remember start of the selection and move the cursor there afterwards. aSelection.nEndPara = aSelection.nStartPara; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source
vcl/source/window/dialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8e71befa4756de72675569649684fb4c34773e9b
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 30 14:18:40 2013 +0100
Resolves: fdo#68396 Yield allowed layout timer to run during init layout
There are multiple pages getting generated in the styles dialog because the
dropcaps preview window calls Yield sometimes and sometimes the layout
timer
gets a chance to activate *during* the creation of the dialog so there ends
up
with two consecutive activations of some tabpages which has wonderful
eventual
know on effects resulting in that crash later on.
Easiest thing is to disable the layout timer during the initial size
calculation
Change-Id: I7fb0a7ff89aa2c6013c5d8014deface10761
(cherry picked from commit fe1cbda3b7513e0d3686d347aa991e7231067384)
Reviewed-on: https://gerrit.libreoffice.org/5696
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 909b638..b0bc71b 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1247,7 +1247,7 @@ IMPL_LINK( Dialog, ImplHandleLayoutTimerHdl, void*,
EMPTYARG )
void Dialog::queue_layout()
{
-if (hasPendingLayout())
+if (hasPendingLayout() || isCalculatingInitialLayoutSize())
return;
if (IsInClose())
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sfx2/source
sfx2/source/appl/appserv.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 47134ddc12e130ff65848cb8faa72fa3a4a61c77
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 30 16:06:44 2013 +0100
Related: fdo#66700 don't crash on setting zoom state with no SfxObjectShell
(cherry picked from commit dd0f6c737b6af659389e473296e939ec6cfa5f4e)
Conflicts:
sfx2/source/appl/appserv.cxx
Change-Id: Id2943c92ce6deaae3e4d507a35c08466db21cece
Reviewed-on: https://gerrit.libreoffice.org/5697
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 92ac7af..d4d8fff 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -601,6 +601,10 @@ void SfxApplication::MiscExec_Impl( SfxRequest rReq )
case SID_ZOOM_ENTIRE_PAGE:
case SID_ZOOM_PAGE_WIDTH:
{
+SfxObjectShell* pCurrentShell = SfxObjectShell::Current();
+if (!pCurrentShell)
+return;
+
// make sure aZoom is initialized with a proper value if SetType
// doesn't work
SvxZoomItem aZoom( SVX_ZOOM_PERCENT, 100 );
@@ -633,7 +637,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest rReq )
break;
}
-SfxViewFrame::Current()-GetDispatcher()-Execute(SID_ATTR_ZOOM,
SFX_CALLMODE_ASYNCHRON, aZoom, 0L);
+pCurrentShell-GetDispatcher()-Execute(SID_ATTR_ZOOM,
SFX_CALLMODE_ASYNCHRON, aZoom, 0L);
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - configure.ac desktop/Package_branding.mk instsetoo_native/CustomTarget_install.mk swext/Module_swext.mk xsltml/Module_xsltml.mk
configure.ac | 26 +- desktop/Package_branding.mk |2 +- instsetoo_native/CustomTarget_install.mk |6 +++--- swext/Module_swext.mk|2 +- xsltml/Module_xsltml.mk |2 +- 5 files changed, 19 insertions(+), 19 deletions(-) New commits: commit c871c0695cd4683327188d9c7e4daeba7d55d795 Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Aug 30 13:28:48 2013 -0500 ENABLE_MEDIAWIKI Harmonize ENABLE_* variable to TRUE/nothing Change-Id: I4561c2cd3b937cbd0085d1e94930d5f458281d11 Reviewed-on: https://gerrit.libreoffice.org/5704 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/configure.ac b/configure.ac index b2ab0ef1..eecd4d4 100644 --- a/configure.ac +++ b/configure.ac @@ -10281,19 +10281,19 @@ AC_SUBST(POPPLER_LIBS) AC_MSG_CHECKING([whether to build the Wiki Publisher extension]) if test x$enable_ext_wiki_publisher = xyes -a x$enable_extension_integration != xno -a $with_java != no; then AC_MSG_RESULT([yes]) -ENABLE_MEDIAWIKI=YES +ENABLE_MEDIAWIKI=TRUE BUILD_TYPE=$BUILD_TYPE XSLTML if test x$with_java = xno; then AC_MSG_ERROR([Wiki Publisher requires Java! Enable Java if you want to build it.]) fi else AC_MSG_RESULT([no]) -ENABLE_MEDIAWIKI=NO +ENABLE_MEDIAWIKI= SCPDEFS=$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI fi AC_SUBST(ENABLE_MEDIAWIKI) -if test $ENABLE_MEDIAWIKI = YES; then +if test $ENABLE_MEDIAWIKI = TRUE; then AC_MSG_CHECKING([which Servlet API Jar to use]) if test $with_system_servlet_api = yes; then AC_MSG_RESULT([external]) @@ -10506,12 +10506,12 @@ AC_SUBST(LIBSERIALIZER_JAR) # this has to be here because both the Wiki Publisher and the SRB use # commons-logging -if test $ENABLE_MEDIAWIKI = YES -o $ENABLE_REPORTBUILDER = TRUE; then +if test $ENABLE_MEDIAWIKI = TRUE -o $ENABLE_REPORTBUILDER = TRUE; then AC_MSG_CHECKING([which Apache commons-* libs to use]) if test $with_system_apache_commons = yes; then SYSTEM_APACHE_COMMONS=YES AC_MSG_RESULT([external]) -if test $ENABLE_MEDIAWIKI = YES; then +if test $ENABLE_MEDIAWIKI = TRUE; then if test -z $COMMONS_CODEC_JAR; then AC_CHECK_FILE(/usr/share/java/commons-codec-1.6.jar, [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.6.jar ], @@ -10557,7 +10557,7 @@ if test $ENABLE_MEDIAWIKI = YES -o $ENABLE_REPORTBUILDER = TRUE; then [AC_MSG_ERROR(commons-httpclient.jar not found.)], []) fi fi -if test $ENABLE_MEDIAWIKI = YES -o $ENABLE_REPORTBUILDER = TRUE; then +if test $ENABLE_MEDIAWIKI = TRUE -o $ENABLE_REPORTBUILDER = TRUE; then if test -z $COMMONS_LOGGING_JAR; then AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar, [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ], @@ -11800,7 +11800,7 @@ EOF AC_MSG_ERROR([no, you need at least Ant = $ant_minver]) fi -if test $ENABLE_MEDIAWIKI = YES; then +if test $ENABLE_MEDIAWIKI = TRUE; then AC_MSG_CHECKING([whether Ant supports mapper type=regexp]) rm -rf confdir mkdir confdir diff --git a/swext/Module_swext.mk b/swext/Module_swext.mk index 0d48229..0a5462c 100644 --- a/swext/Module_swext.mk +++ b/swext/Module_swext.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,swext)) -ifeq ($(ENABLE_MEDIAWIKI),YES) +ifeq ($(ENABLE_MEDIAWIKI),TRUE) $(eval $(call gb_Module_add_targets,swext,\ Jar_mediawiki \ Configuration_mediawiki \ diff --git a/xsltml/Module_xsltml.mk b/xsltml/Module_xsltml.mk index 68de9f2..2f2bd12 100644 --- a/xsltml/Module_xsltml.mk +++ b/xsltml/Module_xsltml.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,xsltml)) -ifeq ($(ENABLE_MEDIAWIKI),YES) +ifeq ($(ENABLE_MEDIAWIKI),TRUE) $(eval $(call gb_Module_add_targets,xsltml,\ ExternalPackage_xsltml \ commit ac5f2f3481a318cadd7c59e7ea89401f81e9a259 Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Aug 30 13:18:04 2013 -0500 ENABLE_RELEASE_BUILD Harmonize ENABLE_* variable to TRUE/nothing Change-Id: I7387ff3d3adf9a4e7c15466076e9d84d4892bb3e Reviewed-on: https://gerrit.libreoffice.org/5703 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/configure.ac b/configure.ac index be7ddd7..b2ab0ef1 100644 --- a/configure.ac +++ b/configure.ac @@ -1983,10 +1983,10 @@ dnl === AC_MSG_CHECKING([whether build target is Release Build]) if test $enable_release_build = -o $enable_release_build = no; then AC_MSG_RESULT([no]) -ENABLE_RELEASE_BUILD=FALSE +ENABLE_RELEASE_BUILD= else
[Libreoffice-commits] core.git: 2 commits - apple_remote/Module_apple_remote.mk configure.ac scp2/source sdext/Module_sdext.mk smoketest/CppunitTest_smoketest.mk smoketest/Module_smoketest.mk solenv/b
apple_remote/Module_apple_remote.mk |2 +- configure.ac| 10 +- scp2/source/extensions/directory_extensions.scp |2 +- scp2/source/extensions/file_extensions.scp |2 +- scp2/source/extensions/module_extensions.scp|2 +- sdext/Module_sdext.mk |2 +- smoketest/CppunitTest_smoketest.mk |2 +- smoketest/Module_smoketest.mk |2 +- solenv/bin/macosx-codesign-app-bundle |2 +- vcl/Library_vcl.mk |2 +- 10 files changed, 14 insertions(+), 14 deletions(-) New commits: commit 5b7dff553cf51ecc3d21a2231861390d16ccf0eb Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Aug 30 14:29:14 2013 -0500 ENABLE_MACOSX_SANDBOX Harmonize ENABLE_* variable to TRUE/nothing Change-Id: Ice05796a9887c4ff311b78fcddd9820e0f06e7f1 Reviewed-on: https://gerrit.libreoffice.org/5708 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/apple_remote/Module_apple_remote.mk b/apple_remote/Module_apple_remote.mk index 5313df3..d534ad2 100644 --- a/apple_remote/Module_apple_remote.mk +++ b/apple_remote/Module_apple_remote.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,apple_remote)) ifeq ($(OS),MACOSX) -ifneq ($(ENABLE_MACOSX_SANDBOX),YES) +ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) $(eval $(call gb_Module_add_targets,apple_remote,\ Library_AppleRemote \ )) diff --git a/configure.ac b/configure.ac index d828288..f613f9f 100644 --- a/configure.ac +++ b/configure.ac @@ -2781,7 +2781,7 @@ if test $_os = Darwin; then elif test -n $ENABLE_JAVA -a $enable_macosx_sandbox = yes; then AC_MSG_ERROR([OS X sandboxing (actually App Store rules) disallows use of Java]) elif test -n $MACOSX_CODESIGNING_IDENTITY -a $enable_macosx_sandbox = yes; then -ENABLE_MACOSX_SANDBOX=YES +ENABLE_MACOSX_SANDBOX=TRUE AC_DEFINE(HAVE_FEATURE_MACOSX_SANDBOX) AC_MSG_RESULT([yes]) else @@ -2853,7 +2853,7 @@ fi AC_MSG_CHECKING([whether to treat the installation as read-only]) -if test \( -z $enable_readonly_installset -a $ENABLE_MACOSX_SANDBOX = YES \) -o \ +if test \( -z $enable_readonly_installset -a $ENABLE_MACOSX_SANDBOX = TRUE \) -o \ $enable_extensions != yes; then enable_readonly_installset=yes fi diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index 3ab4ce5..1bc9dae 100644 --- a/smoketest/CppunitTest_smoketest.mk +++ b/smoketest/CppunitTest_smoketest.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\ $(eval $(call gb_CppunitTest_use_ure,smoketest)) -ifeq ($(ENABLE_MACOSX_SANDBOX),YES) +ifeq ($(ENABLE_MACOSX_SANDBOX),TRUE) userinstallation=$(shell $(gb_DEVINSTALLROOT)/MacOS/soffice --nstemporarydirectory) else userinstallation=$(WORKDIR)/CustomTarget/smoketest diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk index 52962a2..ab06c82 100644 --- a/smoketest/Module_smoketest.mk +++ b/smoketest/Module_smoketest.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_check_targets,smoketest,\ )) endif -ifneq (MACOSX/YES,$(OS)/$(ENABLE_MACOSX_SANDBOX)) +ifneq (MACOSX/TRUE,$(OS)/$(ENABLE_MACOSX_SANDBOX)) $(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\ CppunitTest_smoketest \ )) diff --git a/solenv/bin/macosx-codesign-app-bundle b/solenv/bin/macosx-codesign-app-bundle index cbe9fa0..e00b1b5 100755 --- a/solenv/bin/macosx-codesign-app-bundle +++ b/solenv/bin/macosx-codesign-app-bundle @@ -68,7 +68,7 @@ done # # At this stage we also attach the entitlements in the sandboxing case -if test $ENABLE_MACOSX_SANDBOX = YES; then +if test $ENABLE_MACOSX_SANDBOX = TRUE; then entitlements=--entitlements $BUILDDIR/lo.xcent fi diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index e37ec15..f82fd87 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -450,7 +450,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\ CoreFoundation \ )) -ifneq ($(ENABLE_MACOSX_SANDBOX),YES) +ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) $(eval $(call gb_Library_use_libraries,vcl,\ AppleRemote \ )) commit aa05e128de6a8dd0382d0c324676c728dc347ac0 Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Aug 30 13:40:33 2013 -0500 ENABLE_MINIMIZER Harmonize ENABLE_* variable to TRUE/nothing Change-Id: I10c52844c6e83f6b88cf736c03d93e710a69432a Reviewed-on: https://gerrit.libreoffice.org/5705 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/configure.ac b/configure.ac index eecd4d4..d828288 100644 --- a/configure.ac +++ b/configure.ac @@ -10230,11 +10230,11 @@ AC_SUBST(ENABLE_OPENCL) AC_MSG_CHECKING([whether to build the Presentation Minimizer extension]) if test x$enable_ext_presenter_minimizer
[Libreoffice-commits] core.git: 2 commits - configure.ac instsetoo_native/Package_rdb.mk scripting/Module_scripting.mk sd/Library_sd.mk sd/Library_sdui.mk
configure.ac| 20 ++--
instsetoo_native/Package_rdb.mk |4 ++--
scripting/Module_scripting.mk |4 ++--
sd/Library_sd.mk| 20 ++--
sd/Library_sdui.mk |4 ++--
5 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit d5d721a130df631f1cf46ac636ba22314f539f6b
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Fri Aug 30 12:54:37 2013 -0500
ENABLE_SCRIPTING_* Harmonize ENABLE_* variable to TRUE/nothing
Change-Id: I937967889da75062c792cf377ce4e13c67526162
Reviewed-on: https://gerrit.libreoffice.org/5702
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/configure.ac b/configure.ac
index c22e296..be7ddd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10589,7 +10589,7 @@ AC_SUBST(COMMONS_LOGGING_JAR)
AC_MSG_CHECKING([whether to build support for scripts in BeanShell])
if test ${enable_scripting_beanshell} != no -a x$with_java != xno; then
AC_MSG_RESULT([yes])
- ENABLE_SCRIPTING_BEANSHELL=YES
+ ENABLE_SCRIPTING_BEANSHELL=TRUE
dnl ===
dnl Check for system beanshell
@@ -10610,7 +10610,7 @@ if test ${enable_scripting_beanshell} != no -a
x$with_java != xno; then
fi
else
AC_MSG_RESULT([no])
- ENABLE_SCRIPTING_BEANSHELL=NO
+ ENABLE_SCRIPTING_BEANSHELL=
SCPDEFS=$SCPDEFS -DWITHOUT_SCRIPTING_BEANSHELL
fi
AC_SUBST(ENABLE_SCRIPTING_BEANSHELL)
@@ -10621,7 +10621,7 @@ AC_SUBST(BSH_JAR)
AC_MSG_CHECKING([whether to build support for scripts in JavaScript])
if test ${enable_scripting_javascript} != no -a x$with_java != xno;
then
AC_MSG_RESULT([yes])
- ENABLE_SCRIPTING_JAVASCRIPT=YES
+ ENABLE_SCRIPTING_JAVASCRIPT=TRUE
dnl ===
dnl Check for system rhino
@@ -10642,7 +10642,7 @@ if test ${enable_scripting_javascript} != no -a
x$with_java != xno; then
fi
else
AC_MSG_RESULT([no])
- ENABLE_SCRIPTING_JAVASCRIPT=NO
+ ENABLE_SCRIPTING_JAVASCRIPT=
SCPDEFS=$SCPDEFS -DWITHOUT_SCRIPTING_JAVASCRIPT
fi
AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT)
diff --git a/instsetoo_native/Package_rdb.mk b/instsetoo_native/Package_rdb.mk
index 44c7bdd..308bb46 100644
--- a/instsetoo_native/Package_rdb.mk
+++ b/instsetoo_native/Package_rdb.mk
@@ -16,8 +16,8 @@ $(eval $(call
gb_Package_add_files,instsetoo_native_rdb,$(gb_PROGRAMDIRNAME)/ser
$(call gb_Helper_optional,POSTGRESQL,$(if $(filter
YES,$(BUILD_POSTGRESQL_SDBC)),xml/postgresql-sdbc.rdb)) \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),,\
$(if $(ENABLE_JAVA),\
- $(if $(filter
$(ENABLE_SCRIPTING_BEANSHELL),YES),xml/scriptproviderforbeanshell.rdb) \
- $(if $(filter
$(ENABLE_SCRIPTING_JAVASCRIPT),YES),xml/scriptproviderforjavascript.rdb) \
+ $(if
$(ENABLE_SCRIPTING_BEANSHELL),xml/scriptproviderforbeanshell.rdb) \
+ $(if
$(ENABLE_SCRIPTING_JAVASCRIPT),xml/scriptproviderforjavascript.rdb) \
) \
) \
))
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index c08b9cf..4829c53 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -17,12 +17,12 @@ $(eval $(call gb_Module_add_targets,scripting,\
Jar_Highlight \
Jar_MemoryUsage \
Jar_ScriptFramework \
- $(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\
+ $(if $(ENABLE_SCRIPTING_BEANSHELL),\
Jar_ScriptProviderForBeanShell \
Rdb_scriptproviderforbeanshell \
) \
Jar_ScriptProviderForJava \
- $(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),\
+ $(if $(ENABLE_SCRIPTING_JAVASCRIPT),\
Jar_ScriptProviderForJavaScript \
Rdb_scriptproviderforjavascript \
) \
commit f0b94ad3e74afca55016ee1e15b0848ede51a016
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Fri Aug 30 11:35:02 2013 -0500
ENABLE_BLUETOOTH* Harmonize ENABLE_* variable to TRUE/nothing
Change-Id: Ia27882faa9c85c439bc1f77987d766f65f1d8cef
Reviewed-on: https://gerrit.libreoffice.org/5699
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/configure.ac b/configure.ac
index 997cc82..c22e296 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9887,7 +9887,7 @@ AC_SUBST(ENABLE_PACKAGEKIT)
AC_MSG_CHECKING([whether to enable Impress remote control])
if test -n $enable_sdremote -a $enable_sdremote != no; then
AC_MSG_RESULT([yes])
-ENABLE_SDREMOTE=YES
+ENABLE_SDREMOTE=TRUE
AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote
control])
# If not explicitly
Re: New bug, looking for source location for setting Calc formulas
Thanks for looking Eike! Good to know for sure that it is a bug rather than intended behavior. I will contact a few others that are not on this list and update them. On 08/30/2013 03:27 PM, Eike Rathke wrote: Hi Andrew, On Friday, 2013-08-30 01:27:05 -0400, Andrew Douglas Pitonyak wrote: On 08/29/2013 10:44 PM, Andrew Douglas Pitonyak wrote: Setting the Formula property on a Calc cell has always expected English formulas. Use the FormulaLocal property otherwise. The new behavior is that the Formula property acts the same as FormulaLocal Plus .Formula is influenced by the current work locale (not UI language), which it should not. https://bugs.freedesktop.org/show_bug.cgi?id=67836 I'll take a look. I became aware of this based on a post on the mailing list. Turns out there was already an open and not verified bug. I have verified the behavior but would like to chat with the responsible developer before changing to confirmed and asking the responsible party to consider backing out their change (as well as can be done after a release). Better fix it.. Finding the range of commits btw that introduced a change in behavior can be done with bibisect, see https://wiki.documentfoundation.org/Bibisect Alternatively, I can at least document the new behavior that the two properties are identical so you might as well deprecate one. No, it's a bug. Looks like setting the FormulaLocal property is probably handled in sc/source/ui/unoobj/cellsuno.cxx ScCellObj::SetOnePropertyValue this calls SetString_Impl With (should be) bEnglish=true for .Formula and bEnglish=false for .FormulaLocal My head hurts now. Understandably ;-) Eike -- Andrew Pitonyak My Macro Document: http://www.pitonyak.org/AndrewMacro.odt Info: http://www.pitonyak.org/oo.php ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/docfunc.cxx | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
New commits:
commit a6fdfb960ad0f5b019adff700d0046f20a740996
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 30 22:23:01 2013 +0200
resolved fdo#67836 do not overwrite already interpreted English cell
... with a not matching locale dependent interpretation
Change-Id: I66553627cab282ed333443ee8bf687596a616a28
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index a150f62..d0b0e50 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1106,6 +1106,7 @@ bool ScDocFunc::SetCellText(
const ScAddress rPos, const OUString rText, bool bInterpret, bool
bEnglish, bool bApi,
const formula::FormulaGrammar::Grammar eGrammar )
{
+bool bSet = false;
if ( bInterpret )
{
if ( bEnglish )
@@ -1122,13 +1123,13 @@ bool ScDocFunc::SetCellText(
switch (aRes.meType)
{
case ScInputStringType::Formula:
-SetFormulaCell(rPos, new ScFormulaCell(pDoc, rPos,
aRes.maText, eGrammar), !bApi);
+bSet = SetFormulaCell(rPos, new ScFormulaCell(pDoc, rPos,
aRes.maText, eGrammar), !bApi);
break;
case ScInputStringType::Number:
-SetValueCell(rPos, aRes.mfValue, !bApi);
+bSet = SetValueCell(rPos, aRes.mfValue, !bApi);
break;
case ScInputStringType::Text:
-SetStringOrEditCell(rPos, aRes.maText, !bApi);
+bSet = SetStringOrEditCell(rPos, aRes.maText, !bApi);
break;
default:
;
@@ -1138,11 +1139,15 @@ bool ScDocFunc::SetCellText(
}
else if (!rText.isEmpty())
{
-SetStringOrEditCell(rPos, rText, !bApi);
+bSet = SetStringOrEditCell(rPos, rText, !bApi);
}
-bool bNumFmtSet = false;
-return SetNormalString( bNumFmtSet, rPos, rText, bApi );
+if (!bSet)
+{
+bool bNumFmtSet = false;
+bSet = SetNormalString( bNumFmtSet, rPos, rText, bApi );
+}
+return bSet;
}
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo68418.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 18 ++
sw/source/filter/ww8/writerwordglue.cxx | 26 +-
sw/source/filter/ww8/writerwordglue.hxx | 16
4 files changed, 59 insertions(+), 1 deletion(-)
New commits:
commit 196328c91ee889a0a1cbc39ce2549c7405afbef5
Author: Adam Co rattles2...@gmail.com
Date: Tue Aug 20 18:27:41 2013 +0300
fix for IsPlausibleSingleWordSection checking wrong condition
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I503e5944079b6c03413caea27ef940efbd44ced5
Reviewed-on: https://gerrit.libreoffice.org/5548
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/ooxmlexport/data/fdo68418.docx
b/sw/qa/extras/ooxmlexport/data/fdo68418.docx
new file mode 100644
index 000..10b7c00
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo68418.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 0f1e500..b9c5ba7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -113,6 +113,7 @@ public:
void testFdo67737();
void testTransparentShadow();
void testBnc834035();
+void testFdo68418();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -202,6 +203,7 @@ void Test::run()
{fdo67737.docx, Test::testFdo67737},
{transparent-shadow.docx, Test::testTransparentShadow},
{bnc834035.odt, Test::testBnc834035},
+{fdo68418.docx, Test::testFdo68418},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -1232,6 +1234,22 @@ void Test::testBnc834035()
assertXPath(pXmlDoc, /w:document/w:body/w:p/w:hyperlink, anchor,
_Toc363553908);
}
+void Test::testFdo68418()
+{
+// The problem was that in 'MSWordExportBase::SectionProperties' function
in 'wrt8sty.cxx'
+// it checked if it 'IsPlausableSingleWordSection'.
+// The 'IsPlausableSingleWordSection' compared different aspects of 2
'SwFrmFmt' objects.
+// One of the checks was 'do both formats have the same distance from the
top and bottom ?'
+// This check is correct if both have headers or both don't have headers.
+// However - if one has a header, and the other one has an empty header
(no header) - it is not correct to compare
+// between them (same goes for 'footer').
+uno::Referencetext::XText xFooterText = getProperty
uno::Referencetext::XText
(getStyles(PageStyles)-getByName(DEFAULT_STYLE), FooterText);
+uno::Reference text::XTextRange xFooterParagraph = getParagraphOfText(
1, xFooterText );
+
+// First page footer is empty, second page footer is ''
+CPPUNIT_ASSERT_EQUAL(OUString(), xFooterParagraph-getString());
// I get an error that it expects ''
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/writerwordglue.cxx
b/sw/source/filter/ww8/writerwordglue.cxx
index 5e3215e..18968d0 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -371,7 +371,7 @@ namespace sw
HdFtDistanceGlue aOne(rTitleFmt.GetAttrSet());
HdFtDistanceGlue aTwo(rFollowFmt.GetAttrSet());
//e.g. #i14509#
-if (!aOne.EqualTopBottom(aTwo))
+if (!aOne.StrictEqualTopBottom(aTwo))
bPlausableSingleWordSection = false;
}
return bPlausableSingleWordSection;
@@ -424,6 +424,30 @@ namespace sw
return (dyaTop == rOther.dyaTop dyaBottom == rOther.dyaBottom);
}
+bool HdFtDistanceGlue::StrictEqualTopBottom(const HdFtDistanceGlue
rOther)
+const
+{
+// Check top only if both object have a header or if
+// both object don't have a header
+if ( ( HasHeader() rOther.HasHeader() ) ||
+ ( !HasHeader() !rOther.HasHeader() ) )
+{
+if (dyaTop != rOther.dyaTop)
+return false;
+}
+
+// Check bottom only if both object have a footer or if
+// both object don't have a footer
+if ( ( HasFooter() rOther.HasFooter() ) ||
+ ( !HasFooter() !rOther.HasFooter() ) )
+{
+if (dyaBottom != rOther.dyaBottom)
+return false;
+}
+
+return true;
+}
+
ParaStyleMapper::ParaStyleMapper(SwDoc rDoc)
: mpImpl(new myImplHelpers::StyleMapperImplSwTxtFmtColl(rDoc))
{
diff --git a/sw/source/filter/ww8/writerwordglue.hxx
b/sw/source/filter/ww8/writerwordglue.hxx
index 423eddb..263a13e 100644
---
Re: New bug, looking for source location for setting Calc formulas
Hi Andrew, On Friday, 2013-08-30 15:50:09 -0400, Andrew Douglas Pitonyak wrote: Good to know for sure that it is a bug rather than intended behavior. I will contact a few others that are not on this list and update them. Cause identified, easy fix ... pending review for 4-1 as https://gerrit.libreoffice.org/5712 Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpImfelUGiaJ.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/ui/docshell/docfunc.cxx | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 2ea6f5e741bb21649fb438bf7b8b4ac523d0085e
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 30 22:23:01 2013 +0200
resolved fdo#67836 do not overwrite already interpreted English cell
... with a not matching locale dependent interpretation
Change-Id: I66553627cab282ed333443ee8bf687596a616a28
(cherry picked from commit a6fdfb960ad0f5b019adff700d0046f20a740996)
Reviewed-on: https://gerrit.libreoffice.org/5712
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index 1144c0e..61786e2 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1106,6 +1106,7 @@ bool ScDocFunc::SetCellText(
const ScAddress rPos, const OUString rText, bool bInterpret, bool
bEnglish, bool bApi,
const formula::FormulaGrammar::Grammar eGrammar )
{
+bool bSet = false;
if ( bInterpret )
{
if ( bEnglish )
@@ -1122,13 +1123,13 @@ bool ScDocFunc::SetCellText(
switch (aRes.meType)
{
case ScInputStringType::Formula:
-SetFormulaCell(rPos, new ScFormulaCell(pDoc, rPos,
aRes.maText, eGrammar), !bApi);
+bSet = SetFormulaCell(rPos, new ScFormulaCell(pDoc, rPos,
aRes.maText, eGrammar), !bApi);
break;
case ScInputStringType::Number:
-SetValueCell(rPos, aRes.mfValue, !bApi);
+bSet = SetValueCell(rPos, aRes.mfValue, !bApi);
break;
case ScInputStringType::Text:
-SetStringOrEditCell(rPos, aRes.maText, !bApi);
+bSet = SetStringOrEditCell(rPos, aRes.maText, !bApi);
break;
default:
;
@@ -1138,11 +1139,15 @@ bool ScDocFunc::SetCellText(
}
else if (!rText.isEmpty())
{
-SetStringOrEditCell(rPos, rText, !bApi);
+bSet = SetStringOrEditCell(rPos, rText, !bApi);
}
-bool bNumFmtSet = false;
-return SetNormalString( bNumFmtSet, rPos, rText, bApi );
+if (!bSet)
+{
+bool bNumFmtSet = false;
+bSet = SetNormalString( bNumFmtSet, rPos, rText, bApi );
+}
+return bSet;
}
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/pfiltdlg.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 380c557f38d3646b40d713e4ed42bea2c0553056
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 30 23:35:22 2013 +0200
-Werror,-Wunused-variable 'theAreaStr'
Change-Id: I61ad7c9825e1bcf0641e6c2326037668215f5d2f
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 3adaf16..8fab570 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -167,8 +167,6 @@ void ScPivotFilterDlg::Init( const SfxItemSet rArgSet )
* Bereich um einen Datenbankbereich handelt:
*/
-OUString theAreaStr(theCurArea.Format(SCR_ABS_3D, pDoc,
pDoc-GetAddressConvention()));
-
if ( pDBColl )
{
ScAddress rStart = theCurArea.aStart;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/formulagroupcl.cxx | 29 +++--
1 file changed, 11 insertions(+), 18 deletions(-)
New commits:
commit d835c0ffc69bc29a18681e938dd71b988109a139
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 30 23:41:56 2013 +0200
-Werror,-Wswitch
Change-Id: I4fec831898b65737fe4b81b576891b28a3fb6cba
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index a835c46..c082391 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -218,13 +218,9 @@ bool FormulaGroupInterpreterOpenCL::getPosition(const
ScTokenArray rCode,const
bool isAllocFormulaOclBuf = true;
for ( const formula::FormulaToken* p = rCodePos-First(); p; p =
rCodePos-Next() )
{
-switch ( p-GetType() )
+if ( p-GetType() == formula::svDoubleVectorRef )
{
-case formula::svDoubleVectorRef:
-{
-nColPosition++;
-break;
-}
+nColPosition++;
}
}
int nPositionSize = nColPosition * nRowSize;
@@ -241,19 +237,16 @@ bool FormulaGroupInterpreterOpenCL::getPosition(const
ScTokenArray rCode,const
int j = 0;
for ( const formula::FormulaToken* p = rCodeTemp-First(); p; p =
rCodeTemp-Next() )
{
-switch (p-GetType())
+if (p-GetType() == formula::svDoubleVectorRef)
{
-case formula::svDoubleVectorRef:
-{
-const formula::DoubleVectorRefToken* p2 =
static_castconst formula::DoubleVectorRefToken*(p);
-size_t nRowStart = p2-IsStartFixed() ? 0 : i;
-size_t nRowEnd = p2-GetRefRowSize() - 1;
-if (!p2-IsEndFixed())
-nRowEnd += i;
-npOclStartPos[j*nRowSize+i] = nRowStart;//record the
start position
-npOclEndPos[j*nRowSize+i] = nRowEnd;//record the end
position
-j++;
-}
+const formula::DoubleVectorRefToken* p2 =
static_castconst formula::DoubleVectorRefToken*(p);
+size_t nRowStart = p2-IsStartFixed() ? 0 : i;
+size_t nRowEnd = p2-GetRefRowSize() - 1;
+if (!p2-IsEndFixed())
+nRowEnd += i;
+npOclStartPos[j*nRowSize+i] = nRowStart;//record the start
position
+npOclEndPos[j*nRowSize+i] = nRowEnd;//record the end
position
+j++;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc_sharedformula.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 352f84188a95da34724ebc3fa0826acbc7277f61 Author: Eike Rathke er...@redhat.com Date: Fri Aug 30 23:44:56 2013 +0200 -Werror,-Wunused-variable 'aRS' Change-Id: I4d8f93c0def25c65bd84871d62f6838f3faa08ef diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx index 169c576..1ecff32 100644 --- a/sc/qa/unit/ucalc_sharedformula.cxx +++ b/sc/qa/unit/ucalc_sharedformula.cxx @@ -419,7 +419,6 @@ void Test::testSharedFormulasCopyPaste() // Paste them to C2:C10. ScRange aDestRange(2,1,0,2,9,0); -OUString aRS(aDestRange.Format(SCR_ABS)); pasteFromClip(m_pDoc, aDestRange, aClipDoc); aPos.SetCol(2); aPos.SetRow(1); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - comphelper/source include/comphelper include/sal sfx2/source tools/source
comphelper/source/misc/mediadescriptor.cxx | 56 +
include/comphelper/mediadescriptor.hxx | 12 --
include/sal/log-areas.dox |1
sfx2/source/doc/SfxDocumentMetaData.cxx|6 +--
tools/source/fsys/urlobj.cxx | 12 +-
5 files changed, 32 insertions(+), 55 deletions(-)
New commits:
commit 1bdc9d4380abccfbb095a76000a75dec8f10defb
Author: Stephan Bergmann sberg...@redhat.com
Date: Sat Aug 31 00:10:11 2013 +0200
Some trivial string clean up
Change-Id: I68c738152250e0cbd317e903cb088c60e9b40566
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx
b/sfx2/source/doc/SfxDocumentMetaData.cxx
index f1fe123..6697fda 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -651,15 +651,13 @@ SfxDocumentMetaData::getURLProperties(
{
css::uno::Reference css::beans::XPropertyBag xPropArg =
css::beans::PropertyBag::createDefault( m_xContext );
try {
-OUString dburl(DocumentBaseURL);
-OUString hdn(HierarchicalDocumentName);
for (sal_Int32 i = 0; i i_rMedium.getLength(); ++i) {
-if (i_rMedium[i].Name.equals(dburl)) {
+if (i_rMedium[i].Name == DocumentBaseURL) {
xPropArg-addProperty(
OUString(BaseURI),
css::beans::PropertyAttribute::MAYBEVOID,
i_rMedium[i].Value);
-} else if (i_rMedium[i].Name.equals(hdn)) {
+} else if (i_rMedium[i].Name == HierarchicalDocumentName) {
xPropArg-addProperty(
OUString(StreamRelPath),
css::beans::PropertyAttribute::MAYBEVOID,
commit 11d743af1056b7f48debe2e98900065bb03833c9
Author: Stephan Bergmann sberg...@redhat.com
Date: Sat Aug 31 00:09:48 2013 +0200
Some OSL_WARN - SAL_WARN_IF
Change-Id: I076adcd2f94c38a74f2dce618bc16efec577ed91
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 83b3ac0..99ceb69 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -272,6 +272,7 @@ certain functionality.
@li @c tools.memtools
@li @c tools.rc - resource manager
@li @c tools.stream - SvStream class
+@li @c tools.urlobj - INetURLObject class
@section ucb
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 136bfb1..fee81b7 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -1732,7 +1732,11 @@ bool INetURLObject::convertRelToAbs(OUString const
rTheRelURIRef,
// Detect cases where a relative input could not be made absolute
// because the given base URL is broken (most probably because it
is
// empty):
-OSL_ASSERT(!HasError());
+SAL_WARN_IF(
+HasError(), tools.urlobj,
+cannot make rTheRelURIRef
+ absolute against broken base
+ GetMainURL(NO_DECODE) );
rWasAbsolute = false;
return false;
}
@@ -1859,7 +1863,11 @@ bool INetURLObject::convertRelToAbs(OUString const
rTheRelURIRef,
// Detect cases where a relative input could not be made absolute
// because the given base URL is broken (most probably because it is
// empty):
-OSL_ASSERT(!HasError());
+SAL_WARN_IF(
+HasError(), tools.urlobj,
+cannot make rTheRelURIRef
+ absolute against broken base GetMainURL(NO_DECODE)
+ );
rWasAbsolute = false;
return false;
}
commit 2c6363eb16f50a8cfd81bc8511554af4f9e06478
Author: Stephan Bergmann sberg...@redhat.com
Date: Sat Aug 31 00:08:53 2013 +0200
Be less pathetic
Change-Id: Ifeadfa9f95f85514f7d01ea777e2563803e0898c
diff --git a/comphelper/source/misc/mediadescriptor.cxx
b/comphelper/source/misc/mediadescriptor.cxx
index 8fefd7d..fd2ff28 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -47,6 +47,24 @@
namespace comphelper{
+namespace {
+
+OUString removeFragment(OUString const uri) {
+css::uno::Reference css::uri::XUriReference ref(
+css::uri::UriReferenceFactory::create(
+comphelper::getProcessComponentContext())-
+parse(uri));
+if (ref.is()) {
+ref-clearFragment();
+return ref-getUriReference();
+} else {
+SAL_WARN(comphelper, cannot parse uri );
+return uri;
+}
+}
+
+}
+
const OUString MediaDescriptor::PROP_ABORTED()
{
static const OUString sProp(Aborted);
@@ -466,9 +484,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool
bLockFile )
throw css::uno::Exception(Found no URL.,
css::uno::Reference css::uno::XInterface ());
-// Parse URL! Only the main part has to be used further. E.g. a
jumpmark can make trouble
-
[Libreoffice-commits] core.git: configure.ac mysqlc/Module_mysqlc.mk
configure.ac|6 +++--- mysqlc/Module_mysqlc.mk |2 +- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 94730f359023a3e90fd6d5239a12a150f41f4dd2 Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Aug 30 22:25:51 2013 -0500 ENABLE_MARIADBC Harmonize ENABLE_* variable to TRUE/nothing Change-Id: Icd6f385a8c9fcb67d2e448580e66ab97f63a99a6 diff --git a/configure.ac b/configure.ac index f613f9f..0cd3093 100644 --- a/configure.ac +++ b/configure.ac @@ -8035,21 +8035,21 @@ AC_SUBST(PYTHON_VERSION_MINOR) AC_MSG_CHECKING([whether to build the MariaDB/MySQL Connector extension]) if test x$enable_ext_mariadb_connector = xyes -a x$enable_extension_integration != xno; then AC_MSG_RESULT([yes]) -ENABLE_MARIADBC=YES +ENABLE_MARIADBC=TRUE MARIADBC_MAJOR=1 MARIADBC_MINOR=0 MARIADBC_MICRO=2 BUILD_TYPE=$BUILD_TYPE MARIADBC else AC_MSG_RESULT([no]) -ENABLE_MARIADBC=NO +ENABLE_MARIADBC= fi AC_SUBST(ENABLE_MARIADBC) AC_SUBST(MARIADBC_MAJOR) AC_SUBST(MARIADBC_MINOR) AC_SUBST(MARIADBC_MICRO) -if test $ENABLE_MARIADBC = YES; then +if test $ENABLE_MARIADBC = TRUE; then SCPDEFS=$SCPDEFS -DWITH_EXTENSION_MARIADBC diff --git a/mysqlc/Module_mysqlc.mk b/mysqlc/Module_mysqlc.mk index 70629a1..8274b0d 100644 --- a/mysqlc/Module_mysqlc.mk +++ b/mysqlc/Module_mysqlc.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,mysqlc)) -ifeq ($(ENABLE_MARIADBC),YES) +ifeq ($(ENABLE_MARIADBC),TRUE) $(eval $(call gb_Module_add_targets,mysqlc,\ Configuration_mysql \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac pyuno/CustomTarget_python_shell.mk solenv/bin
configure.ac |2 +-
pyuno/CustomTarget_python_shell.mk|2 +-
solenv/bin/macosx-change-install-names.pl |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e4aac6daea258aaf6b0ff9ea75b1bfb2f903e45a
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Fri Aug 30 23:02:44 2013 -0500
ENABLE_MACOSX_MACLIKE* Harmonize ENABLE_* variable to TRUE/nothing
Change-Id: I0c51975c1c13dbd100bbd8e6103835ce8a8c3691
diff --git a/configure.ac b/configure.ac
index 0cd3093..cada74d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2885,7 +2885,7 @@ if test $_os = Darwin -a
$enable_canonical_installation_tree_structure = yes;
LIBO_URE_LIB_FOLDER=Frameworks
LIBO_URE_SHARE_FOLDER=Resources/ure
LIBO_URE_SHARE_JAVA_FOLDER=Resources/java
-ENABLE_MACOSX_MACLIKE_APP_STRUCTURE=YES
+ENABLE_MACOSX_MACLIKE_APP_STRUCTURE=TRUE
AC_DEFINE(HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE)
elif test $_os = Darwin; then
LIBO_BIN_FOLDER=MacOS
diff --git a/pyuno/CustomTarget_python_shell.mk
b/pyuno/CustomTarget_python_shell.mk
index a7b48d5..6e53993 100644
--- a/pyuno/CustomTarget_python_shell.mk
+++ b/pyuno/CustomTarget_python_shell.mk
@@ -30,7 +30,7 @@ $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh
: \
$(SRCDIR)/pyuno/zipcore/$(if $(filter
MACOSX,$(OS)),mac,nonmac).sh
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
sed -e s/%%PYVERSION%%/$(pyuno_PYTHON_SHELL_VERSION)/g \
--e s,%%PYTHON_FRAMEWORK_RELATIVE_PATH%%,$(if $(filter
YES,$(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE)),../Frameworks/),g \
+-e s,%%PYTHON_FRAMEWORK_RELATIVE_PATH%%,$(if
$(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),../Frameworks/),g \
$ $@
# vim: set noet sw=4 ts=4:
diff --git a/solenv/bin/macosx-change-install-names.pl
b/solenv/bin/macosx-change-install-names.pl
index 7e5645c..cbfd06f 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -38,7 +38,7 @@
# That latter case is useful for libraries from external modules, where the
# external build process locates them in some sub-directory.
-my $OLD = $ENV{ENABLE_MACOSX_MACLIKE_APP_STRUCTURE} ne 'YES';
+my $OLD = $ENV{ENABLE_MACOSX_MACLIKE_APP_STRUCTURE} ne 'TRUE';
sub action($$$)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: New bug, looking for source location for setting Calc formulas
On 08/30/2013 04:53 PM, Eike Rathke wrote: Hi Andrew, On Friday, 2013-08-30 15:50:09 -0400, Andrew Douglas Pitonyak wrote: Good to know for sure that it is a bug rather than intended behavior. I will contact a few others that are not on this list and update them. Cause identified, easy fix ... pending review for 4-1 as https://gerrit.libreoffice.org/5712 Ahhh, so the fix is in sc/source/ui/docshell/docfunc.css Thanks Eike, This is actually very useful for me to see as I attempt to understand the code base. -- Andrew Pitonyak My Macro Document: http://www.pitonyak.org/AndrewMacro.odt Info: http://www.pitonyak.org/oo.php ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - configure.ac postprocess/CustomTarget_registry.mk RepositoryExternal.mk shell/Library_gconfbe.mk
RepositoryExternal.mk|2 +- configure.ac | 20 ++-- postprocess/CustomTarget_registry.mk |4 ++-- shell/Library_gconfbe.mk |2 +- 4 files changed, 14 insertions(+), 14 deletions(-) New commits: commit 4ef149ba72c0a4b4f38905106a1acb8d21b023be Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Aug 30 23:20:24 2013 -0500 misc unnecessary FALSE: Harmonize ENABLE_* variable to TRUE/nothing Change-Id: I96cadd25f1c26fd620701a377ca20702ea969460 diff --git a/configure.ac b/configure.ac index e61ef1e..820b6ab 100644 --- a/configure.ac +++ b/configure.ac @@ -8756,7 +8756,7 @@ if test $with_system_npapi_headers = yes; then else AC_MSG_RESULT([internal]) dnl ...but will not be built/used unless ENABLE_NPAPI_FROM_BROWSER or -dnl ENABLE_NPAPI_INTO_BROWSER is YES +dnl ENABLE_NPAPI_INTO_BROWSER is TRUE SYSTEM_NPAPI_HEADERS=NO fi AC_SUBST(NPAPI_HEADERS_CFLAGS) @@ -10487,7 +10487,7 @@ if test $enable_report_builder != no -a $with_java != no; then fi else AC_MSG_RESULT([no]) -ENABLE_REPORTBUILDER=FALSE +ENABLE_REPORTBUILDER= SYSTEM_JFREEREPORT=NO fi AC_SUBST(ENABLE_REPORTBUILDER) @@ -11463,10 +11463,10 @@ dnl === AC_MSG_CHECKING([whether to create MSI with LIMITUI=1 (silent install)]) if test $enable_silent_msi = -o $enable_silent_msi = no; then AC_MSG_RESULT([no]) -ENABLE_SILENT_MSI=FALSE +ENABLE_SILENT_MSI= else AC_MSG_RESULT([yes]) -ENABLE_SILENT_MSI=TRUE +ENABLE_SILENT_MSI=TRUE SCPDEFS=$SCPDEFS -DENABLE_SILENT_MSI fi AC_SUBST(ENABLE_SILENT_MSI) @@ -12370,7 +12370,7 @@ if test $enable_mpl_subset = yes; then warn_report=false if test $enable_report_builder != no -a $with_java != no; then warn_report=true - elif test x$ENABLE_REPORTBUILDER = xTRUE; then + elif test $ENABLE_REPORTBUILDER = TRUE; then warn_report=true fi if test $warn_report = true; then commit 81510ee8a59636d9cbc2c3172361685e3573b415 Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Aug 30 23:12:19 2013 -0500 ENABLE_LOCKDOWN Harmonize ENABLE_* variable to TRUE/nothing Change-Id: I47b2d7a59bbf1f5a96523d451c8b6f4fa12c8e90 diff --git a/configure.ac b/configure.ac index abbc940..e61ef1e 100644 --- a/configure.ac +++ b/configure.ac @@ -9812,7 +9812,7 @@ dnl === dnl GCONF check dnl === -ENABLE_GCONF= +ENABLE_GCONF= AC_MSG_CHECKING([whether to enable GConf support]) if test $_os != WINNT -a $_os != Darwin -a $_os != iOS -a $enable_gconf = yes; then ENABLE_GCONF=TRUE @@ -11104,9 +11104,9 @@ dnl === dnl Test for the enabling the lockdown pieces dnl === AC_MSG_CHECKING([whether to enable the lockdown pieces]) -ENABLE_LOCKDOWN= +ENABLE_LOCKDOWN= if test -n $enable_lockdown -a $enable_lockdown != no; then -ENABLE_LOCKDOWN=YES +ENABLE_LOCKDOWN=TRUE AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 8b9dd00..cab1be8 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -434,10 +434,10 @@ postprocess_DRIVERS += postgresql endif ifeq (unx,$(GUIBASE)) -ifneq (,$(or $(filter TRUEYES,$(ENABLE_GCONF)$(ENABLE_LOCKDOWN))$(filter TRUE,$(ENABLE_GIO +ifneq (,$(or $(filter TRUETRUE,$(ENABLE_GCONF)$(ENABLE_LOCKDOWN))$(filter TRUE,$(ENABLE_GIO postprocess_XCDS += gnome.xcd postprocess_DEPS_gnome := main -ifeq ($(ENABLE_GCONF)$(ENABLE_LOCKDOWN),TRUEYES) +ifeq ($(ENABLE_GCONF)$(ENABLE_LOCKDOWN),TRUETRUE) postprocess_FILES_gnome += \ $(postprocess_MOD)/org/openoffice/Office/Common-gconflockdown.xcu \ $(postprocess_MOD)/org/openoffice/Office/Recovery-gconflockdown.xcu \ diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk index f034589..78e184e 100644 --- a/shell/Library_gconfbe.mk +++ b/shell/Library_gconfbe.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Library_Library,gconfbe1)) -ifeq ($(ENABLE_LOCKDOWN),YES) +ifeq ($(ENABLE_LOCKDOWN),TRUE) $(eval $(call gb_Library_add_defs,gconfbe1,\ -DENABLE_LOCKDOWN \ )) commit 7c88b25b9eac22f5f926df22e0fa359276090c0b Author: Norbert Thiebaud nthieb...@gmail.com Date: Fri Aug 30 23:05:04 2013 -0500 ENABLE_PACKAGEKIT Harmonize ENABLE_* variable to TRUE/nothing Change-Id: I966f70b17ce9be2c0db015db88dd09ed01dd6387 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index e96e812..0217196 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1812,7 +1812,7 @@ $(call gb_LinkTarget_add_defs,$(1),\ -DENABLE_DBUS \ )
Re: Project ...
Hi, On Tue, Aug 27, 2013 at 12:11:15PM +0200, Jakub Kościelak wrote: - Using mail merge in Draw. Just out of curiosity: what is the intended use of this feature? D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRParser.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fed51f29956c96cfe9cfcb3e132f8b2ba0e1b10b
Author: Dave McKellar dmckel...@gmail.com
Date: Fri Aug 30 17:47:17 2013 -0400
Changed the Corel Draw versions for udta
Change-Id: I56858984c6ce67d732294020669687053b7b8b50
Reviewed-on: https://gerrit.libreoffice.org/5716
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 9308ff3..06280b7 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -3285,7 +3285,7 @@ void libcdr::CDRParser::readTxsm5(WPXInputStream *input)
void libcdr::CDRParser::readUdta(WPXInputStream *input)
{
CDR_DEBUG_MSG((libcdr::CDRParser::readUdta\n));
- if (m_version == 1400)
+ if (m_version = 1300 m_version = 1500)
{
input-seek(6, WPX_SEEK_CUR); // Not sure what these bytes are for. Field
id?
std::vectorunsigned char name;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRParser.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c3115d938be36481225d09cc2946c01df195
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Sat Aug 31 07:30:58 2013 +0200
Little tiny nit
Change-Id: Ib4fed604412afdaeb3ec0b03c1c8328eae554842
Reviewed-on: https://gerrit.libreoffice.org/5717
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 06280b7..1b1dcc9 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -3285,7 +3285,7 @@ void libcdr::CDRParser::readTxsm5(WPXInputStream *input)
void libcdr::CDRParser::readUdta(WPXInputStream *input)
{
CDR_DEBUG_MSG((libcdr::CDRParser::readUdta\n));
- if (m_version = 1300 m_version = 1500)
+ if (m_version = 1300 m_version 1600)
{
input-seek(6, WPX_SEEK_CUR); // Not sure what these bytes are for. Field
id?
std::vectorunsigned char name;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Changed the Corel Draw versions for udta
Hi,
I would like you to review the following patch:
https://gerrit.libreoffice.org/5716
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/libcdr refs/changes/16/5716/1
Changed the Corel Draw versions for udta
Change-Id: I56858984c6ce67d732294020669687053b7b8b50
---
M src/lib/CDRParser.cpp
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 9308ff3..06280b7 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -3285,7 +3285,7 @@
void libcdr::CDRParser::readUdta(WPXInputStream *input)
{
CDR_DEBUG_MSG((libcdr::CDRParser::readUdta\n));
- if (m_version == 1400)
+ if (m_version = 1300 m_version = 1500)
{
input-seek(6, WPX_SEEK_CUR); // Not sure what these bytes are for. Field
id?
std::vectorunsigned char name;
--
To view, visit https://gerrit.libreoffice.org/5716
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56858984c6ce67d732294020669687053b7b8b50
Gerrit-PatchSet: 1
Gerrit-Project: libcdr
Gerrit-Branch: master
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Little tiny nit
Hi,
I would like you to review the following patch:
https://gerrit.libreoffice.org/5717
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/libcdr refs/changes/17/5717/1
Little tiny nit
Change-Id: Ib4fed604412afdaeb3ec0b03c1c8328eae554842
---
M src/lib/CDRParser.cpp
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 06280b7..1b1dcc9 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -3285,7 +3285,7 @@
void libcdr::CDRParser::readUdta(WPXInputStream *input)
{
CDR_DEBUG_MSG((libcdr::CDRParser::readUdta\n));
- if (m_version = 1300 m_version = 1500)
+ if (m_version = 1300 m_version 1600)
{
input-seek(6, WPX_SEEK_CUR); // Not sure what these bytes are for. Field
id?
std::vectorunsigned char name;
--
To view, visit https://gerrit.libreoffice.org/5717
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4fed604412afdaeb3ec0b03c1c8328eae554842
Gerrit-PatchSet: 1
Gerrit-Project: libcdr
Gerrit-Branch: master
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
