date:20140923

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

Commit Notification libreoffice-comm...@lists.freedesktop.org changed:

   What|Removed |Added

 Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner
   |SkillCpp TopicCleanup   |SkillCpp TopicCleanup
   ||target:4.4.0

--- Comment #5 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
David Ostrovsky committed a patch related to this issue.
It has been pushed to master:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=0ea9722f72c1bece218013cce4c5d9097994408f

fdo#84090: Remove maUniName from oox::TokenMap



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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: bridges/Library_cpp_uno.mk bridges/source configure.ac solenv/gbuild

 bridges/Library_cpp_uno.mk |6 
 bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx |  732 -
 bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx  |  273 --
 bridges/source/cpp_uno/gcc3_macosx_powerpc/share.hxx   |   86 -
 bridges/source/cpp_uno/gcc3_macosx_powerpc/uno2cpp.cxx |  647 ---
 configure.ac   |6 
 solenv/gbuild/platform/MACOSX_POWERPC_GCC.mk   |   17 
 7 files changed, 1767 deletions(-)

New commits:
commit e29862bcc509916e7fe3e9b2f43b0672c49b7f6e
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Sep 22 20:16:33 2014 +0300

PPC Mac support can go away now (again)

Change-Id: Ie1b2ab13eda584c48aaa0a4a0941f1be451697c1

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index c2e303d..5991021 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -154,12 +154,6 @@ bridge_noncallexception_noopt_objects := callvirtualmethod
 bridge_exception_objects := abi cpp2uno except uno2cpp
 endif
 
-else ifeq ($(OS)-$(CPUNAME),MACOSX-POWERPC)
-
-bridges_SELECTED_BRIDGE := gcc3_macosx_powerpc
-bridge_noopt_objects := uno2cpp
-bridge_exception_objects := cpp2uno except
-
 else ifeq ($(OS)-$(CPUNAME),SOLARIS-SPARC)
 
 bridges_SELECTED_BRIDGE := gcc3_solaris_sparc
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
deleted file mode 100644
index 0cba20d..000
--- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/cpp2uno.cxx
+++ /dev/null
@@ -1,732 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include com/sun/star/uno/genfunc.hxx
-#include uno/data.h
-#include typelib/typedescription.hxx
-
-#include bridges/cpp_uno/shared/bridge.hxx
-#include bridges/cpp_uno/shared/cppinterfaceproxy.hxx
-#include bridges/cpp_uno/shared/types.hxx
-#include bridges/cpp_uno/shared/vtablefactory.hxx
-
-#include share.hxx
-
-using namespace ::com::sun::star::uno;
-
-namespace
-{
-
-static typelib_TypeClass cpp2uno_call(
-bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
-const typelib_TypeDescription * pMemberTypeDescr,
-typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void 
return
-sal_Int32 nParams, typelib_MethodParameter * pParams,
-void ** gpreg, void ** fpreg, void ** ovrflw,
-sal_Int64 * pRegisterReturn /* space for register return */ )
-{
-int ng = 0; //number of gpr registers used
-int nf = 0; //number of fpr regsiters used
-
-void ** pCppStack; //temporary stack pointer
-
-// gpreg:  [ret *], this, [gpr params]
-// fpreg:  [fpr params]
-// ovrflw: [gpr or fpr params (properly aligned)]
-
-// return
-typelib_TypeDescription * pReturnTypeDescr = 0;
-if (pReturnTypeRef)
-TYPELIB_DANGER_GET( pReturnTypeDescr, pReturnTypeRef );
-
-void * pUnoReturn = 0;
-void * pCppReturn = 0; // complex return ptr: if != 0  != pUnoReturn, 
reconversion need
-
-// handle optional return pointer
-if (pReturnTypeDescr)
-{
-if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
-{
-pUnoReturn = pRegisterReturn; // direct way for simple types
-}
-else // complex return via ptr (pCppReturn)
-{
-pCppReturn = *gpreg;
-gpreg++; //ovrflw++;
-ng++;
-
-pUnoReturn = (bridges::cpp_uno::shared::relatesToInterfaceType( 
pReturnTypeDescr )
-  ? alloca( pReturnTypeDescr-nSize )
-  : pCppReturn); // direct way
-}
-}
-// pop this
-gpreg++; //ovrflw++;
-ng++;
-
-// stack space
-OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), ### unexpected size! );
-// parameters
-void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
-void ** pCppArgs = pUnoArgs + nParams;
-// indices of values this have to be converted (interface conversion 
cpp=uno)
-sal_Int32 * pTempIndices = (sal_Int32 *)(pUnoArgs

[Bug 66754] Remove own implementations of various Perl functions in installer

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

--- Comment #3 from bavincen bavincen...@gmail.com ---
(In reply to comment #0)
 Some Perl knowledge is needed for this Easy Hack.
 
 solenv/bin/modules/installer/systemactions.pm implements for example
 create_directory() that can be exchanged with standard Perl's make_path()
 [http://perldoc.perl.org/File/Path.html].  Similarly other functions there,
 for which standard (or widely used) implementations exist.
 
 What needs to be done (in the create_directory case; but similarly for more
 functions there):
 
 Find all Perl scripts that use create_directory:
 
 git grep '\create_directory\'
 
 Edit all those that are Perl (end with .pl or .pm) so that you add use
 File::Path qw(make_path); at the top and then instead of create_directory()
 calls, you use make_path().
 
 Then, remove the create_directory and create_directory_with_privileges
 declarations / definitions.
 
 As the last step, make sure that everything builds  packages still :-)

Hi jan
can we keep that  create_directory and implement make path in it.
and remove  create_directory_with_privileges ,

need a breif explanation :) thanks

-- 
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: Branch 'distro/collabora/cp-4.3' - 21 commits - configure.ac desktop/source extensions/Package_mdibundle.mk .gitignore instsetoo_native/CustomTarget_setup.mk jurt/com o

 .gitignore |1 
 Repository.mk  |1 
 RepositoryFixes.mk |2 
 configure.ac   |6 +
 desktop/source/app/check_ext_deps.cxx  |3 
 desktop/source/deployment/misc/dp_misc.cxx |4 -
 extensions/Package_mdibundle.mk|4 -
 instsetoo_native/CustomTarget_setup.mk |4 -
 jurt/com/sun/star/lib/util/NativeLibraryLoader.java|   10 ++
 officecfg/registry/data/org/openoffice/Office/Paths.xcu|2 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |4 -
 officecfg/util/alllang.xsl |   52 +++--
 officecfg/util/schema_trim.xsl |   44 ++-
 sal/Library_sal.mk |2 
 sal/osl/unx/uunxapi.cxx|   39 -
 scp2/inc/macros.inc|2 
 scp2/source/ooo/common_brand.scp   |   18 
 scp2/source/ooo/ure.scp|   32 
 scp2/source/python/file_python.scp |3 
 solenv/bin/macosx-codesign-app-bundle  |9 +-
 solenv/gbuild/Configuration.mk |4 +
 solenv/gbuild/CppunitTest.mk   |2 
 solenv/gbuild/Dictionary.mk|2 
 solenv/gbuild/Extension.mk |2 
 solenv/gbuild/HelpTarget.mk|2 
 ure/Module_ure.mk  |1 
 ure/Package_builddir_install.mk|   16 
 ure/Package_install.mk |6 -
 ure/source/unorc   |   23 -
 ure/source/unorc.in|   23 +
 vcl/quartz/salbmp.cxx  |2 
 31 files changed, 248 insertions(+), 77 deletions(-)

New commits:
commit 969f969a7567f8ae6d95144ca75e110d5fd44bfa
Author: Tor Lillqvist t...@collabora.com
Date:   Sat Sep 13 07:36:33 2014 +0300

Fix issues with the URE unorc in the MACLIKE_APP_STRUCTURE case

Not sure it it is cleaner to use relative paths from ${ORIGIN}, or
paths below ${BRAND_BASE_DIR}. Now I use the former in the URE unorc
constructed in scp2, and the latter in the one expanded from
ure/source/unorc.in. (Whether these two really need to be separate or
not, no idea. Historical reasons? Different use cases, unit tests and
actual end-user install tree?)

Change-Id: Ib5f11176de1d5d983cac8358d67788ebc20f2b13
(cherry picked from commit c8177f0fafe80d343e2cd48053fdadba641a08f8)

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 935238e..12645ee 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -45,6 +45,7 @@ Module gid_Module_Root_Brand
 gid_Brand_Dir_Share_Uno_Packages,
 gid_Brand_Dir_Share_Uno_Packages_Cache,
 gid_Brand_Dir_Share_Ure,
+gid_Brand_Dir_Share_Ure_Etc,
 gid_Brand_Dir_Share_Ure_Share,
 gid_Brand_Dir_Share_Glade,
 gid_Brand_Dir_Share_Labels,
@@ -453,6 +454,11 @@ Directory gid_Brand_Dir_Share_Ure
 DosName = ure;
 End
 
+Directory gid_Brand_Dir_Share_Ure_Etc
+ParentID = gid_Brand_Dir_Share_Ure;
+DosName = etc;
+End
+
 Directory gid_Brand_Dir_Share_Ure_Share
 ParentID = gid_Brand_Dir_Share_Ure;
 DosName = share;
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 26d7dba..9a501a2 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -164,7 +164,7 @@ End
 Profile gid_Profile_Dl_Uno_Ini
 ModuleID = gid_Module_Root_Ure_Hidden;
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Dir = gid_Brand_Dir_Share_Ure;
+Dir = gid_Brand_Dir_Share_Ure_Etc;
 #else
 Dir = SCP2_URE_DL_DIR;
 #endif
@@ -177,7 +177,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Lib_Dir
 Section = Bootstrap;
 Key = URE_INTERNAL_LIB_DIR;
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Value = ${ORIGIN}/../../Frameworks;
+Value = ${ORIGIN}/../../../Frameworks;
 #else
 Value = ${ORIGIN};
 #endif
@@ -189,7 +189,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Dir
 Section = Bootstrap;
 Key = URE_INTERNAL_JAVA_DIR;
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Value = ${ORIGIN}/../java;
+Value = ${ORIGIN}/../../java;
 #elif defined WNT
 Value = ${ORIGIN}/../java;
 #else
@@ -210,9 +210,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Types
 ProfileID = gid_Profile_Dl_Uno_Ini;
 Section = Bootstrap;
 Key =

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 14 commits - chart2/CppunitTest_chart2_xshape.mk connectivity/source dictionaries filter/source i18nlangtag/source include/com oox/so

 chart2/CppunitTest_chart2_xshape.mk  |1 
 connectivity/source/drivers/file/FPreparedStatement.cxx  |2 
 dictionaries |2 
 filter/source/graphicfilter/ieps/ieps.cxx|2 
 i18nlangtag/source/isolang/isolang.cxx   |4 +
 include/com/sun/star/uno/Reference.h |4 -
 oox/source/drawingml/graphicshapecontext.cxx |   40 +++
 oox/source/ppt/timenode.cxx  |2 
 sc/qa/unit/ucalc_pivottable.cxx  |   52 +++
 sc/source/core/data/dpoutput.cxx |9 ++
 sd/source/filter/ppt/pptinanimations.cxx |2 
 sd/source/ui/unoidl/unosrch.cxx  |2 
 sd/source/ui/view/DocumentRenderer.cxx   |5 -
 shell/source/win32/zipfile/zipfile.cxx   |2 
 solenv/gbuild/UnpackedTarball.mk |2 
 svtools/source/uno/treecontrolpeer.cxx   |1 
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |2 
 17 files changed, 81 insertions(+), 53 deletions(-)

New commits:
commit 4b64885379a0250dccd646cad626425873f2765a
Author: Olivier R olivier.nore...@gmail.com
Date:   Sat Sep 20 10:39:06 2014 +0200

Updated core
Project: dictionaries  263a052f82c085b480a1518ab4e6ef0c4c566044

diff --git a/dictionaries b/dictionaries
index 3d394a9..263a052 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 3d394a9aee8a882f9a002a83495104ba52c96a49
+Subproject commit 263a052f82c085b480a1518ab4e6ef0c4c566044
commit f25e416ad2461293c413f0aa5c08374fc918ed91
Author: Eike Rathke er...@redhat.com
Date:   Tue Sep 16 13:50:27 2014 +0200

fdo#81357 no fallback for special codes without country

Thanks to Justin Luth for the hint.

Change-Id: I97bde18814368e589e2a1c275457489a0d7392d4
(cherry picked from commit 3ff2e4dc1d0ba922e06f0d5c90c85fee33623784)
Reviewed-on: https://gerrit.libreoffice.org/11471
Reviewed-by: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Tested-by: MatÃºÅ¡ Kukan matus.ku...@collabora.com

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 141d913..e91b09e 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -1105,6 +1105,10 @@ com::sun::star::lang::Locale 
MsLangId::Conversion::getLocale( const IsoLanguageS
 case LANGUAGE_USER_LOJBAN:
 case LANGUAGE_KASHMIRI:
 case LANGUAGE_USER_KEYID:
+// And the special codes without country.
+case LANGUAGE_MULTIPLE:
+case LANGUAGE_UNDETERMINED:
+case LANGUAGE_NONE:
 return getLocale( pEntry);  // may override
 default:
 ;   // nothing
commit 0c65e3460fc15ab368c30608da464ac8dcd9ee00
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Thu Aug 7 13:09:20 2014 +0200

Fix tarball.rebuild on windows

Change-Id: I0a649548088428bd1a1fcedab76325fffa6b72a0
(cherry picked from commit 91bfacea9058b0a00feb58879c14666d31089c21)
Reviewed-on: https://gerrit.libreoffice.org/11475
Reviewed-by: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Tested-by: MatÃºÅ¡ Kukan matus.ku...@collabora.com

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 6021acb..a91ce57 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -412,7 +412,7 @@ endef
 %.rebuild :
if [ -f $(call gb_UnpackedTarball_get_target,$*) ] ; then \
touch $(call gb_UnpackedTarball_get_target,$*) ; \
-   make ;\
+   $(MAKE) ;\
fi
 
 %.genpatch :
commit 485ea37bc98e276b7f7286799704fae4adafaca8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Sep 18 11:40:26 2014 +0100

IsDraw doesn't mean the app/page is Draw

it means a slide in impress.

commit 7b31e45ec7106d2cfbdbb7915d97667ba710f81c
Date:   Mon Jun 23 20:55:21 2014 +0100
Make Draw use paper size when printing - fdo#63905

Previously, Draw/Impress use the default size from the printer.
Now Draw uses the paper size (specified in page formatting).
Impress still uses the old method - not sure if this is correct
but printing handouts etc probably complicate print/paper size.

suggests the intent is for this to not affect Impress and to only
affect Draw, so this does that

(cherry picked from commit f1f89f0202232635e7fbbd7ca47de51755b2bce0)

Conflicts:
sd/source/ui/view/DocumentRenderer.cxx

Change-Id: I481a824ef244fd837992c893f6de0c051af0a26b
Reviewed-on: https://gerrit.libreoffice.org/11510
Reviewed-by: MatÃºÅ¡ Kukan

[Bug 39631] add optimisation helpers

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

--- Comment #6 from Stephan Bergmann sberg...@redhat.com ---
also note that GCC __builtin_expect (with its first parameter being of type
long) is plain, simple, and generally does not work as one would naively hope:

 class C {
 private:
 struct S;
 typedef void (S::* B)();
 public:
 operator B();
 };
 int f(C c) {
 if (c) {
 if (__builtin_expect(c, 1)) {
 return 1;
 } else {
 return 2;
 }
 } else {
 return 3;
 }
 }

will cause a compilation error cannot convert ‘C’ to ‘long int’ for argument
‘1’ to ‘long int __builtin_expect(long int, long int)’

-- 
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] help.git: Changes to 'distro/collabora/lof-4.3'

New branch 'distro/collabora/lof-4.3' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'distro/collabora/lof-4.3'

New branch 'distro/collabora/lof-4.3' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'distro/collabora/lof-4.3'

New branch 'distro/collabora/lof-4.3' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'distro/collabora/lof-4.3'

New branch 'distro/collabora/lof-4.3' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 extensions/source/plugin/inc/plugin/unx/plugcon.hxx |   17 +++--
 extensions/source/plugin/unx/npwrap.cxx |2 +-
 2 files changed, 4 insertions(+), 15 deletions(-)

New commits:
commit 15c609f33da44c24e1d0cf19670b0da43738ce0c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Sep 23 09:29:35 2014 +0200

Use prex.h/postx.h

Change-Id: I055ae0426df86a1ea49385bc8c0b176cc4b9d940

diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx 
b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 14ed547..b505bda 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -39,13 +39,8 @@
 #define USE_MOTIF
 #endif
 
-#define Window  XLIB_Window
-#define FontXLIB_Font
-#define TimeXLIB_Time
-#define Region  XLIB_Region
-#define String  XLIB_String
-#define Boolean XLIB_Boolean
-#define XPointerXLIB_XPointer
+#include prex.h
+
 #include X11/Xlib.h
 extern C {
 #include X11/Intrinsic.h
@@ -100,13 +95,7 @@ extern C {
 #define GtkWidget void
 #endif
 
-#undef Window
-#undef Font
-#undef Time
-#undef String
-#undef Region
-#undef Boolean
-#undef XPointer
+#include postx.h
 
 class ConnectorInstance
 {
diff --git a/extensions/source/plugin/unx/npwrap.cxx 
b/extensions/source/plugin/unx/npwrap.cxx
index 196d913..d5d5fdc 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -154,7 +154,7 @@ Widget createSubWidget( char* /*pPluginText*/, Widget 
shell, XLIB_Window aParent
 
 void* CreateNewShell( void** pShellReturn, XLIB_Window aParentWindow )
 {
-XLIB_String n, c;
+String n, c;
 XtGetApplicationNameAndClass(pXtAppDisplay, n, c);
 
 Widget newShell =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Performance samples for LibreOffice ...


On 09/22/2014 08:32 PM, Jan Hubicka wrote:

On 09/20/2014 04:39 AM, Jan Hubicka wrote:

/usr/include/X11/Xlib.h:948:3: warning: type ‘struct XAnyEvent’ violates one 
definition rule [-Wodr]
  } XAnyEvent;
^
/usr/include/X11/Xlib.h:948:3: note: a different type is defined in another 
translation unit
  } XAnyEvent;
^
/usr/include/X11/Xlib.h:947:9: note: the first difference of corresponding 
definitions is field ‘window’
   Window window; /* window on which event was requested in event mask */
  ^
/usr/include/X11/Xlib.h:947:9: note: a field of same name but different type is 
defined in another translation unit
   Window window; /* window on which event was requested in event mask */
  ^
/usr/include/X11/X.h:96:13: note: type ‘XLIB_Window’ should match type ‘Window’
  typedef XID Window;
  ^
/usr/include/X11/X.h:96:13: note: the incompatible type is defined here
  typedef XID Window;
  ^


...so unwinding of typedefs (a la, note: type 'XID' is defined
here) could be helpful in tracking this down.


Typedefs are transparent for type mangling, so I do not thing you get warnings
on those at all.  Here I think the problem is that someone gets idea to #define
Window ZLIB_Window perhaps here
http://dev-builds.libreoffice.org/lcov_reports/master~2014-04-11_00.55.10/extensions/source/plugin/inc/plugin/unx/plugcon.hxx.gcov.html


Ah, right, good catch.  Our XLIB_* trick from include/{pre,post}x.h 
(which had been duplicated in 
extensions/source/plugin/inc/plugin/unx/plugcon.hxx prior to 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=15c609f33da44c24e1d0cf19670b0da43738ce0c 
Use prex.h/postx.h).  Should go away once 
https://bugs.freedesktop.org/show_bug.cgi?id=82577 get rid of prex.h 
/ postx.h wrapper headers is fully fixed.


Stephan

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

[Bug 82577] get rid of prex.h / postx.h wrapper headers

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

Stephan Bergmann sberg...@redhat.com changed:

   What|Removed |Added

 CC||sberg...@redhat.com

--- Comment #9 from Stephan Bergmann sberg...@redhat.com ---
see
http://lists.freedesktop.org/archives/libreoffice/2014-September/063545.html
Re: Performance samples for LibreOffice ... for another benefit of fixing
this fully

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

stack-allocated Window subclasses


Hi

I ran my clang plugin over master last night. This is the output.

There is lots of duplication in the warnings, so running:
  $ grep not heap allocated stack-alloc.txt  | sort -u | wc -l
gives
  569
fields that need to be changed.

so there is a fair amount of work involved :-)

But looking for unique file names
 $ grep not heap allocated stack-alloc.txt  | sort --key=1,1 
--field-separator=':' -u | wc -l
gives
 129
unique files involved.

So the work is restricted to a reasonable number of files.

Regards, Noel.

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


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

[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - 22 commits - configure.ac desktop/source extensions/Package_mdibundle.mk .gitignore instsetoo_native/CustomTarget_setup.mk jurt/com

 .gitignore |1 
 Repository.mk  |1 
 RepositoryFixes.mk |2 
 configure.ac   |8 +-
 desktop/source/app/check_ext_deps.cxx  |3 
 desktop/source/deployment/misc/dp_misc.cxx |4 -
 extensions/Package_mdibundle.mk|4 -
 instsetoo_native/CustomTarget_setup.mk |4 -
 jurt/com/sun/star/lib/util/NativeLibraryLoader.java|   10 ++
 officecfg/registry/data/org/openoffice/Office/Paths.xcu|2 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |4 -
 officecfg/util/alllang.xsl |   52 +++--
 officecfg/util/schema_trim.xsl |   44 ++-
 sal/Library_sal.mk |2 
 sal/osl/unx/uunxapi.cxx|   39 -
 scp2/inc/macros.inc|2 
 scp2/source/ooo/common_brand.scp   |   18 
 scp2/source/ooo/ure.scp|   32 
 scp2/source/python/file_python.scp |3 
 solenv/bin/macosx-codesign-app-bundle  |9 +-
 solenv/gbuild/Configuration.mk |4 +
 solenv/gbuild/CppunitTest.mk   |2 
 solenv/gbuild/Dictionary.mk|2 
 solenv/gbuild/Extension.mk |2 
 solenv/gbuild/HelpTarget.mk|2 
 ure/Module_ure.mk  |1 
 ure/Package_builddir_install.mk|   16 
 ure/Package_install.mk |6 -
 ure/source/unorc   |   23 -
 ure/source/unorc.in|   23 +
 vcl/quartz/salbmp.cxx  |2 
 31 files changed, 249 insertions(+), 78 deletions(-)

New commits:
commit ec25e3089269c7a26526924f0ad8909ec5febca2
Author: Tor Lillqvist t...@collabora.com
Date:   Sat Sep 13 07:36:33 2014 +0300

Fix issues with the URE unorc in the MACLIKE_APP_STRUCTURE case

Not sure it it is cleaner to use relative paths from ${ORIGIN}, or
paths below ${BRAND_BASE_DIR}. Now I use the former in the URE unorc
constructed in scp2, and the latter in the one expanded from
ure/source/unorc.in. (Whether these two really need to be separate or
not, no idea. Historical reasons? Different use cases, unit tests and
actual end-user install tree?)

Change-Id: Ib5f11176de1d5d983cac8358d67788ebc20f2b13
(cherry picked from commit c8177f0fafe80d343e2cd48053fdadba641a08f8)

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 935238e..12645ee 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -45,6 +45,7 @@ Module gid_Module_Root_Brand
 gid_Brand_Dir_Share_Uno_Packages,
 gid_Brand_Dir_Share_Uno_Packages_Cache,
 gid_Brand_Dir_Share_Ure,
+gid_Brand_Dir_Share_Ure_Etc,
 gid_Brand_Dir_Share_Ure_Share,
 gid_Brand_Dir_Share_Glade,
 gid_Brand_Dir_Share_Labels,
@@ -453,6 +454,11 @@ Directory gid_Brand_Dir_Share_Ure
 DosName = ure;
 End
 
+Directory gid_Brand_Dir_Share_Ure_Etc
+ParentID = gid_Brand_Dir_Share_Ure;
+DosName = etc;
+End
+
 Directory gid_Brand_Dir_Share_Ure_Share
 ParentID = gid_Brand_Dir_Share_Ure;
 DosName = share;
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 26d7dba..9a501a2 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -164,7 +164,7 @@ End
 Profile gid_Profile_Dl_Uno_Ini
 ModuleID = gid_Module_Root_Ure_Hidden;
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Dir = gid_Brand_Dir_Share_Ure;
+Dir = gid_Brand_Dir_Share_Ure_Etc;
 #else
 Dir = SCP2_URE_DL_DIR;
 #endif
@@ -177,7 +177,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Lib_Dir
 Section = Bootstrap;
 Key = URE_INTERNAL_LIB_DIR;
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Value = ${ORIGIN}/../../Frameworks;
+Value = ${ORIGIN}/../../../Frameworks;
 #else
 Value = ${ORIGIN};
 #endif
@@ -189,7 +189,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Dir
 Section = Bootstrap;
 Key = URE_INTERNAL_JAVA_DIR;
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
-Value = ${ORIGIN}/../java;
+Value = ${ORIGIN}/../../java;
 #elif defined WNT
 Value = ${ORIGIN}/../java;
 #else
@@ -210,9 +210,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Types
 ProfileID = gid_Profile_Dl_Uno_Ini;
 Section = Bootstrap;
 Key =

[Libreoffice-commits] core.git: javaunohelper/com

2014-09-23 Thread Robert Antoni Buj i Gelonch

 javaunohelper/com/sun/star/comp/helper/ComponentContext.java   
|1 -
 
javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
   |2 +-
 
javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
 |2 +-
 
javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
   |2 +-
 
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java 
   |2 +-
 
javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
 |2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 6ee1a5438061712d05e5a8a6b9820e27c3ab21f6
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Mon Sep 22 11:14:39 2014 +0200

javaunohelper: Using final modifier whenever applicable in java

All classes that belongs to the com.sun.star.lib.uno.adapter package are 
not part of the stable URE interface.
(cf. http://api.libreoffice.org/docs/java/ref/index.html), for that 
reason those classes may be final.

Remove unused import in com.sun.star.comp.helper.ComponentContext class.

Change-Id: I68be8da4324f5163505e65365bf49a6a9cd00672
Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java 
b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
index 563c0a9..0326ffa 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java
@@ -29,7 +29,6 @@ import com.sun.star.lang.XEventListener;
 import com.sun.star.lang.EventObject;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
 
diff --git 
a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
 
b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
index 4999463..b802520 100644
--- 
a/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
+++ 
b/javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java
@@ -27,7 +27,7 @@ import java.io.InputStream;
 This allows users to access an codeInputStream/code
 as if it were an codeXInputStream/code.
  */
-public class InputStreamToXInputStreamAdapter implements XInputStream {
+public final class InputStreamToXInputStreamAdapter implements XInputStream {
 
 /**
  *  Internal store to the InputStream
diff --git 
a/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
 
b/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
index 4991e86..954888c 100644
--- 
a/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
+++ 
b/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
@@ -27,7 +27,7 @@ import java.io.OutputStream;
object in a Java.  This allows users to access an codeOutputStream/code
as if it were an codeXOutputStream/code.
  */
-public class OutputStreamToXOutputStreamAdapter implements XOutputStream {
+public final class OutputStreamToXOutputStreamAdapter implements XOutputStream 
{
 
 /**
  *  Internal handle to the OutputStream
diff --git 
a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
 
b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
index 1a96828..2d9652e 100644
--- 
a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
+++ 
b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java
@@ -28,7 +28,7 @@ import java.io.InputStream;
  * an codeXInputStream/code as if it were an
  * codeInputStream/code.
  */
-public class XInputStreamToInputStreamAdapter extends InputStream {
+public final class XInputStreamToInputStreamAdapter extends InputStream {
 
 /**
  *  Internal handle to the XInputStream
diff --git 
a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
 
b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
index ad60793..9ebcb06 100644
--- 
a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
+++ 
b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java
@@ -27,7 +27,7 @@ package com.sun.star.lib.uno.adapter;
 import com.sun.star.io.*;
 import  com.sun.star.lib.uno.helper.ComponentBase;
 
-public class XOutputStreamToByteArrayAdapter
+public final class XOutputStreamToByteArrayAdapter
 extends ComponentBase
 implements XOutputStream
 {
diff --git 
a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
 
b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java
index ecfee86..478dfc4 100644
---

[Libreoffice-commits] core.git: extensions/Package_mdibundle.mk

 extensions/Package_mdibundle.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit cb466794aff56cc9cf2c83d26f5cda9dacdd6c81
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Sep 12 23:50:11 2014 +0300

Put schema.xml in the correct place, and drop the empty English strings file

Change-Id: Ic9d3894611eedcffa9ce79ae8b2745de72eb9117
(cherry picked from commit 0b6555f594095ddc082d555852f7d8e9f7d7f266)

diff --git a/extensions/Package_mdibundle.mk b/extensions/Package_mdibundle.mk
index 3677116..88f70f2 100644
--- a/extensions/Package_mdibundle.mk
+++ b/extensions/Package_mdibundle.mk
@@ -11,7 +11,9 @@ $(eval $(call 
gb_Package_Package,extensions_mdibundle,$(SRCDIR)/extensions/sourc
 
 $(eval $(call 
gb_Package_add_files,extensions_mdibundle,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents,\
 Info.plist \
-en.lproj/schema.strings \
+))
+
+$(eval $(call 
gb_Package_add_files,extensions_mdibundle,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents/Resources,\
 schema.xml \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

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

Nicolas R nico2...@yopmail.com changed:

   What|Removed |Added

 Depends on||83141

--- Comment #67 from Nicolas R nico2...@yopmail.com ---
Added bug 83141 : unable to do global find / replace on large spreadsheet.
Regression regarding version 4.1.x and first 4.2.x

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

[Bug 39631] add optimisation helpers

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

--- Comment #7 from Michael Meeks michael.me...@collabora.com ---
I guess it might be worth talking to the glib developers; gmacros.h has a
reasonably workable version - however the _G_BOOLEAN_EXPR stuff is not the
ultimate in beauty =) The implementation in glib is all written by:

Matthias Clasen matthi...@src.gnome.org

I just dug throught he commit log for glib =) I'd be inclined to simply re-use
G_LIKELY and G_UNLIKELY with a SAL prefix myself.

-- 
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: sw/qa sw/source writerfilter/source

2014-09-23 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/sdt-run-picture.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |   12 +
 sw/source/filter/ww8/docxattributeoutput.cxx   |9 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |   26 +++--
 4 files changed, 40 insertions(+), 7 deletions(-)

New commits:
commit 56b647b3a384db53bc55c56b2ae70e08c20e148b
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Sep 23 10:27:10 2014 +0200

DOCX filter: roundtrip SDT properties on Frame TextPortions

Change-Id: Icb3dc9595a025c4386577d858c8ca96e2f9bbef7

diff --git a/sw/qa/extras/ooxmlexport/data/sdt-run-picture.docx 
b/sw/qa/extras/ooxmlexport/data/sdt-run-picture.docx
new file mode 100644
index 000..fa2d57c
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/sdt-run-picture.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 0bb68e8..dd458e9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -251,6 +251,18 @@ DECLARE_OOXMLEXPORT_TEST(testSdtIgnoredFooter, 
sdt-ignored-footer.docx)
 }
 }
 
+DECLARE_OOXMLEXPORT_TEST(testSdtRunPicture, sdt-run-picture.docx)
+{
+// SDT around run was exported as SDT around paragraph
+if (xmlDocPtr pXmlDoc = parseExport(word/document.xml))
+{
+// This was 1: there was an SDT around w:p.
+assertXPath(pXmlDoc, //w:body/w:sdt, 0);
+// This was 0: there were no SDT around w:r.
+assertXPath(pXmlDoc, //w:body/w:p/w:sdt, 1);
+}
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index a4b11f4..4bdb9db 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4132,6 +4132,15 @@ void DocxAttributeOutput::FlyFrameGraphic( const 
SwGrfNode* pGrfNode, const Size
 nImageType = XML_embed;
 }
 
+// In case there are any grab-bag items on the graphic frame, emit them 
now.
+// These are always character grab-bags, as graphics are at-char or 
as-char in Word.
+const SfxPoolItem* pItem = 0;
+if (pFrmFmt-GetAttrSet().HasItem(RES_FRMATR_GRABBAG, pItem))
+{
+const SfxGrabBagItem* pGrabBag = static_castconst 
SfxGrabBagItem*(pItem);
+CharGrabBag(*pGrabBag);
+}
+
 m_rExport.SdrExporter().startDMLAnchorInline(pFrmFmt, rSize);
 
 // picture description (used for pic:cNvPr later too)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 7e68473..bf5a748 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4455,6 +4455,22 @@ void  
DomainMapper_Impl::ImportGraphic(writerfilter::Reference Properties ::Po
 uno::Referencetext::XTextContent xTextContent
 (m_pGraphicImport-GetGraphicObject());
 
+// In case the SDT starts with the text portion of the graphic, then set 
the SDT properties here.
+bool bHasGrabBag = false;
+uno::Referencebeans::XPropertySet xPropertySet(xTextContent, 
uno::UNO_QUERY);
+if (xPropertySet.is())
+{
+uno::Referencebeans::XPropertySetInfo xPropertySetInfo = 
xPropertySet-getPropertySetInfo();
+bHasGrabBag = 
xPropertySetInfo-hasPropertyByName(FrameInteropGrabBag);
+// In case we're outside a paragraph, then the SDT properties are 
stored in the paragraph grab-bag, not the frame one.
+if (!m_pSdtHelper-isInteropGrabBagEmpty()  bHasGrabBag  
!m_pSdtHelper-isOutsideAParagraph())
+{
+comphelper::SequenceAsHashMap 
aFrameGrabBag(xPropertySet-getPropertyValue(FrameInteropGrabBag));
+aFrameGrabBag[SdtPr] = 
uno::makeAny(m_pSdtHelper-getInteropGrabBagAndClear());
+xPropertySet-setPropertyValue(FrameInteropGrabBag, 
uno::makeAny(aFrameGrabBag.getAsConstPropertyValueList()));
+}
+}
+
 /* Set SdtEndBefore property on Drawing.
  * It is required in a case when Drawing appears immediately after first 
run i.e.
  * there is no text/space/tab in between two runs.
@@ -4462,20 +4478,16 @@ void  
DomainMapper_Impl::ImportGraphic(writerfilter::Reference Properties ::Po
  */
 if(IsSdtEndBefore())
 {
-uno::Reference beans::XPropertySet  
xGraphicObjectProperties(xTextContent,
-uno::UNO_QUERY_THROW);
-uno::Reference beans::XPropertySetInfo  xPropSetInfo;
-if(xGraphicObjectProperties.is())
+if(xPropertySet.is())
 {
-xPropSetInfo = xGraphicObjectProperties-getPropertySetInfo();
-if (xPropSetInfo.is()  
xPropSetInfo-hasPropertyByName(FrameInteropGrabBag))
+if (bHasGrabBag)
 {
 uno::Sequencebeans::PropertyValue aFrameGrabBag(1);

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

 sw/qa/extras/inc/swmodeltestbase.hxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit b7f2df2165a7b708cc64fe709edac0e385be52fd
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Sep 23 11:18:24 2014 +0200

Keep files of failing tests around

(Arguably, such files should be stored in a workdir/CppunitTest/... 
directory
removed and freshly created before every test run, instead of in TMPDIR.)

Change-Id: I1e5928db399e6ed39143ebfd3844c7dd46820537

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index c3628df..e283bc3 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -209,12 +209,14 @@ protected:
 // If the testcase is stored in some other format, it's pointless to 
test.
 if (mustTestImportOf(filename))
 {
+maTempFile.EnableKillingFile(false);
 header();
 preTest(filename);
 load(mpTestDocumentPath, filename);
 postTest(filename);
 verify();
 finish();
+maTempFile.EnableKillingFile();
 }
 }
 
@@ -225,6 +227,7 @@ protected:
  */
 void executeImportExportImportTest(const char* filename)
 {
+maTempFile.EnableKillingFile(false);
 header();
 preTest(filename);
 load(mpTestDocumentPath, filename);
@@ -232,6 +235,7 @@ protected:
 postTest(filename);
 verify();
 finish();
+maTempFile.EnableKillingFile();
 }
 
 /**
@@ -242,13 +246,16 @@ protected:
  */
 void executeImportExport(const char* filename)
 {
+maTempFile.EnableKillingFile(false);
 header();
 preTest(filename);
 load(mpTestDocumentPath, filename);
 save(OUString::createFromAscii(mpFilter), maTempFile);
+maTempFile.EnableKillingFile(false);
 postTest(filename);
 verify();
 finish();
+maTempFile.EnableKillingFile();
 }
 
 /**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 test/source/htmltesttools.cxx |9 -
 test/source/xmltesttools.cxx  |   16 
 2 files changed, 16 insertions(+), 9 deletions(-)

New commits:
commit 1da676eb86adc0fb3bb07bffbfc8b6704fdf0518
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Sep 23 11:19:23 2014 +0200

Include name of document in CPPUNIT_ASSERT msgs

Change-Id: Ia0d06d1e0951bcc3930d5e059658209a2916405f

diff --git a/test/source/htmltesttools.cxx b/test/source/htmltesttools.cxx
index ba48aae..6907366 100644
--- a/test/source/htmltesttools.cxx
+++ b/test/source/htmltesttools.cxx
@@ -14,7 +14,14 @@
 htmlDocPtr HtmlTestTools::parseHtml(utl::TempFile aTempFile)
 {
 SvFileStream aFileStream(aTempFile.GetURL(), STREAM_READ);
-return parseHtmlStream(aFileStream);
+htmlDocPtr doc = parseHtmlStream(aFileStream);
+xmlFree(doc-name);
+doc-name = reinterpret_castchar *(
+xmlStrdup(
+reinterpret_castxmlChar const *(
+OUStringToOString(
+aTempFile.GetURL(), RTL_TEXTENCODING_UTF8).getStr(;
+return doc;
 }
 
 htmlDocPtr HtmlTestTools::parseHtmlStream(SvStream* pStream)
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index d70ee86..5ba9162 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -49,7 +49,7 @@ OUString XmlTestTools::getXPath(xmlDocPtr pXmlDoc, const 
OString rXPath, const
 {
 xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, rXPath);
 xmlNodeSetPtr pXmlNodes = pXmlObj-nodesetval;
-CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(XPath ' + rXPath + ' number of 
nodes is incorrect).getStr(),
+CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(In  + OString(pXmlDoc-name) + , 
XPath ' + rXPath + ' number of nodes is incorrect).getStr(),
  1, xmlXPathNodeSetGetLength(pXmlNodes));
 if (rAttribute.isEmpty())
 return OUString();
@@ -66,7 +66,7 @@ OUString XmlTestTools::getXPathContent(xmlDocPtr pXmlDoc, 
const OString rXPath)
 xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, rXPath);
 xmlNodeSetPtr pXmlNodes = pXmlObj-nodesetval;
 
-CPPUNIT_ASSERT_MESSAGE(OString(XPath ' + rXPath + ' not 
found).getStr(),
+CPPUNIT_ASSERT_MESSAGE(OString(In  + OString(pXmlDoc-name) + , XPath 
' + rXPath + ' not found).getStr(),
 xmlXPathNodeSetGetLength(pXmlNodes)  0);
 
 xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
@@ -78,7 +78,7 @@ OUString XmlTestTools::getXPathContent(xmlDocPtr pXmlDoc, 
const OString rXPath)
 void XmlTestTools::assertXPath(xmlDocPtr pXmlDoc, const OString rXPath, const 
OString rAttribute, const OUString rExpectedValue)
 {
 OUString aValue = getXPath(pXmlDoc, rXPath, rAttribute);
-CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(Attribute ' + rAttribute + ' of ' 
+ rXPath + ' incorrect value.).getStr(),
+CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(In  + OString(pXmlDoc-name) + , 
attribute ' + rAttribute + ' of ' + rXPath + ' incorrect value.).getStr(),
  rExpectedValue, aValue);
 }
 
@@ -86,14 +86,14 @@ void XmlTestTools::assertXPath(xmlDocPtr pXmlDoc, const 
OString rXPath, int nNu
 {
 xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, rXPath);
 xmlNodeSetPtr pXmlNodes = pXmlObj-nodesetval;
-CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(XPath ' + rXPath + ' number of 
nodes is incorrect).getStr(),
+CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(In  + OString(pXmlDoc-name) + , 
XPath ' + rXPath + ' number of nodes is incorrect).getStr(),
  nNumberOfNodes, 
xmlXPathNodeSetGetLength(pXmlNodes));
 xmlXPathFreeObject(pXmlObj);
 }
 
 void XmlTestTools::assertXPathContent(xmlDocPtr pXmlDoc, const OString 
rXPath, const OUString rContent)
 {
-CPPUNIT_ASSERT_EQUAL_MESSAGE(XPath contents of child does not match, 
rContent, getXPathContent(pXmlDoc, rXPath));
+CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(In  + OString(pXmlDoc-name) + , 
XPath contents of child does not match).getStr(), rContent, 
getXPathContent(pXmlDoc, rXPath));
 }
 
 void XmlTestTools::assertXPathChildren(xmlDocPtr pXmlDoc, const OString 
rXPath, int nNumberOfChildNodes)
@@ -101,10 +101,10 @@ void XmlTestTools::assertXPathChildren(xmlDocPtr pXmlDoc, 
const OString rXPath,
 #if LIBXML_VERSION = 20703 /* xmlChildElementCount is only available in 
libxml2 = 2.7.3 */
 xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, rXPath);
 xmlNodeSetPtr pXmlNodes = pXmlObj-nodesetval;
-CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(XPath ' + rXPath + ' number of 
nodes is incorrect).getStr(),
+CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(In  + OString(pXmlDoc-name) + , 
XPath ' + rXPath + ' number of nodes is incorrect).getStr(),
  1, xmlXPathNodeSetGetLength(pXmlNodes));
 xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
-CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(XPath ' + rXPath + ' number of 
child-nodes is incorrect).getStr(),
+CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(In  +

[Libreoffice-commits] translations.git: Changes to 'refs/tags/lof-4.3-branch-point'

Tag 'lof-4.3-branch-point' created by Andras Timar andras.ti...@collabora.com 
at 2014-09-23 10:25 -0700

lof-4.3-branch-point

Changes since cp-4.3-branch-point:
Andras Timar (1):
  Updated Slovenian translation

---
 source/sl/filter/source/config/fragments/filters.po |   54 ++--
 source/sl/helpcontent2/source/text/shared/guide.po  |   10 ---
 source/sl/sd/source/ui/app.po   |4 -
 source/sl/starmath/uiconfig/smath/ui.po |4 -
 source/sl/sw/uiconfig/swriter/ui.po |4 -
 5 files changed, 34 insertions(+), 42 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/lof-4.3-branch-point'

Tag 'lof-4.3-branch-point' created by Andras Timar andras.ti...@collabora.com 
at 2014-09-23 10:25 -0700

lof-4.3-branch-point

Changes since cp-4.3-branch-point:
Olivier R (1):
  French dictionary update: v5.2

---
 fr_FR/README_fr.txt   |   13 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |14658 +++---
 fr_FR/fr.dic  |15695 ++
 4 files changed, 15644 insertions(+), 14724 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/lof-4.3-branch-point'

Tag 'lof-4.3-branch-point' created by Andras Timar andras.ti...@collabora.com 
at 2014-09-23 10:25 -0700

lof-4.3-branch-point

Changes since libreoffice-4.3.0.0.beta1-9:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/lof-4.3-branch-point'

Tag 'lof-4.3-branch-point' created by Andras Timar andras.ti...@collabora.com 
at 2014-09-23 10:25 -0700

lof-4.3-branch-point

Changes since cp-4.3-branch-point-14:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sd/source/ui/view/DocumentRenderer.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit a3b099837cb3d39d9623e5054294d7f42b0257f6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Sep 23 10:20:06 2014 +0100

n-up printing done by vcl, brochures by draw/impress

Change-Id: If38365d949ad91d50138798a0a386f9543eb4f22

diff --git a/sd/source/ui/view/DocumentRenderer.cxx 
b/sd/source/ui/view/DocumentRenderer.cxx
index 723aa02e..1a903f7 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1362,7 +1362,7 @@ private:
 SdDrawDocument* pDocument = mrBase.GetMainViewShell()-GetDoc();
 bool bIsDraw = pDocument-GetDocumentType() == DOCUMENT_TYPE_DRAW;
 rInfo.meOrientation = ORIENTATION_PORTRAIT;
-bool bDoDodgyHeightWidthFit = !bIsDraw  !mpOptions-IsNotes();
+bool bDoDodgyHeightWidthFit = mpOptions-IsBooklet() || (!bIsDraw  
!mpOptions-IsNotes());
 
 if( ! mpOptions-IsBooklet())
 {
@@ -1371,7 +1371,8 @@ private:
 else if (rInfo.maPageSize.Width()  rInfo.maPageSize.Height())
 rInfo.meOrientation = ORIENTATION_LANDSCAPE;
 
-// Draw and Notes should abide by their specified paper size
+// Draw and Notes should abide by their specified paper size, except
+// for booklets
 Size aPaperSize;
 if (!bDoDodgyHeightWidthFit)
 {
@@ -1448,8 +1449,8 @@ private:
 if (mpOptions-IsTime())
 aInfo.msTimeDate += 
GetSdrGlobalData().GetLocaleData()-getTime( Time( Time::SYSTEM ), false, false 
);
 
-// Draw should use specified paper size when printing
-if (mrBase.GetDocShell()-GetDocumentType() == DOCUMENT_TYPE_DRAW)
+// Draw should use specified paper size when printing, except for 
booklets
+if (!mpOptions-IsBooklet()  
mrBase.GetDocShell()-GetDocumentType() == DOCUMENT_TYPE_DRAW)
 {
 aInfo.maPrintSize = mrBase.GetDocument()-GetSdPage(0, 
PK_STANDARD)-GetSize();
 maPrintSize = awt::Size(aInfo.maPrintSize.Width(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/uiconfig

2014-09-23 Thread Adolfo Jayme Barrientos

 cui/uiconfig/ui/aboutdialog.ui |   22 ++
 1 file changed, 6 insertions(+), 16 deletions(-)

New commits:
commit 333c5c1b8b3283d5f5ebe77f16532a84b6d07d70
Author: Adolfo Jayme Barrientos fit...@ubuntu.com
Date:   Tue Sep 23 04:07:56 2014 -0500

fdo#62281 Add a title to the About dialog

Change-Id: Idc9d9631dbb4990f878ee2f64b0f6fa36973307b
Reviewed-on: https://gerrit.libreoffice.org/11598
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com

diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index 67a07d2..7449b62 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -1,9 +1,14 @@
 ?xml version=1.0 encoding=UTF-8?
+!-- Generated with glade 3.18.3 --
 interface
-  !-- interface-requires gtk+ 3.0 --
+  requires lib=gtk+ version=3.0/
+  object class=GtkTextBuffer id=textbuffer1
+property name=text translatable=yesVersion: 
%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX/property
+  /object
   object class=GtkDialog id=AboutDialog
 property name=can_focusFalse/property
 property name=border_width6/property
+property name=title translatable=yesAbout %PRODUCTNAME/property
 property name=resizableFalse/property
 property name=type_hintdialog/property
 child internal-child=vbox
@@ -126,8 +131,6 @@
   packing
 property name=left_attach0/property
 property name=top_attach1/property
-property name=width1/property
-property name=height1/property
   /packing
 /child
 child
@@ -144,8 +147,6 @@
   packing
 property name=left_attach0/property
 property name=top_attach0/property
-property name=width1/property
-property name=height1/property
   /packing
 /child
   /object
@@ -190,8 +191,6 @@
   packing
 property name=left_attach0/property
 property name=top_attach1/property
-property name=width1/property
-property name=height1/property
   /packing
 /child
 child
@@ -206,8 +205,6 @@
   packing
 property name=left_attach0/property
 property name=top_attach2/property
-property name=width1/property
-property name=height1/property
   /packing
 /child
 child
@@ -222,8 +219,6 @@
   packing
 property name=left_attach0/property
 property name=top_attach3/property
-property name=width1/property
-property name=height1/property
   /packing
 /child
 child
@@ -238,8 +233,6 @@
   packing
 property name=left_attach0/property
 property name=top_attach0/property
-property name=width1/property
-property name=height1/property
   /packing
 /child
   /object
@@ -283,9 +276,6 @@
   action-widget response=0close/action-widget
 /action-widgets
   /object
-  object class=GtkTextBuffer id=textbuffer1
-property name=text translatable=yesVersion: 
%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX/property
-  /object
   object class=GtkSizeGroup id=sizegroup1
 widgets
   widget name=copyright/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

CppunitTest_sw_htmlexport failures on Mac (was: Tinderbox failure, MacOSX-10.8@21-10.7SDK, MASTER, last success: 2014-09-21 21:55:50)


On 09/23/2014 10:22 AM, nthieb...@gmail.com wrote:

  Box name: MacOSX-10.8@21-10.7SDK
  Branch: master
  starttime: 1411460403
  Machine: Darwin Norberts-Mac-mini.local 12.5.0 Darwin Kernel Version 12.5.0: 
Sun Sep 29 13:33:47 PDT 2013; root:xnu-2050.48.12~1/RELEASE_X86_64 x86_64
  Configured with: --with-external-tar=/lo/lo_external_tar
--with-macosx-sdk=10.8
--with-macosx-version-min-required=10.8
--enable-64-bit

  Commits since the last success:

   core 

[...]

   6b894d1  Test HTML export of images  image properties.

[...]


  The error is:

[...]

HTMLImage.odt,/lo/master_tb/test/source/xmltesttools.cxx:82:testExportImageProperties::Import_Export
equality assertion failed
- Expected: 38
- Actual  : 28
- Attribute 'hspace' of '/html/body/p/a/font/img' incorrect value.

/lo/master_tb/test/source/xmltesttools.cxx:82: Assertion
Test name: testExportImageProperties::Import_Export
equality assertion failed
- Expected: 38
- Actual  : 28
- Attribute 'hspace' of '/html/body/p/a/font/img' incorrect value.


My local Mac builds produce a temp HTML file containing (splitting long 
line for readability)



img 
src=data:image/png;base64,iVBORw0KGgoNSUhEUgQECAImkwkpNUlEQVR4nGP5z8DACMZAggVENjTUMzQw1jeyHHH1LHij0/BfVYohjWVRaMuZWenpJj3GDDMB6XsTR5MjLpgASUVORK5CYII=
  name=Text alt=Four colors align=middle hspace=43 vspace=22
  width=254 height=254 border=3 usemap=#map1/


where none of the hspace, vspace, width, and height attributes' values 
match the expected values from sw/qa/extras/htmlexport/htmlexport.cxx.


Tomaž, can you have a look what's going on there, whether the test code 
or the code under test needs to be adapted?


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

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

2014-09-23 Thread Tomaž Vajngerl

 sw/qa/extras/htmlexport/htmlexport.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7cbbefae224ab85343accb42b03f9431ec693a83
Author: TomaÅ¾ Vajngerl tomaz.vajng...@collabora.com
Date:   Tue Sep 23 11:31:44 2014 +0200

Disable HTML export hspace and vspace check on OSX

Change-Id: I3c15d51f390bd7bed1d8738befda2a7476b3495a

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 5c655bf..39ceb2b 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -184,8 +184,10 @@ DECLARE_HTMLEXPORT_TEST(testExportImageProperties, 
HTMLImage.odt)
 assertXPath(pDoc, /html/body/p/a/font/img, name, Text);
 assertXPath(pDoc, /html/body/p/a/font/img, alt, Four colors);
 assertXPath(pDoc, /html/body/p/a/font/img, align, middle);
+#ifndef MACOSX // For some reason the hspace is 28 on OSX - disable this 
check for now
 assertXPath(pDoc, /html/body/p/a/font/img, hspace, 38);
 assertXPath(pDoc, /html/body/p/a/font/img, vspace, 19);
+#endif
 assertXPath(pDoc, /html/body/p/a/font/img, width, 222);
 assertXPath(pDoc, /html/body/p/a/font/img, height, 222);
 assertXPath(pDoc, /html/body/p/a/font/img, border, 3);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: #4 can someone spot problem with simplebootstrap_cpp.cxx

2014-09-23 Thread Wols Lists

On 23/09/14 06:13, khagaroth wrote:
 Don't change subject on every reply. It breaks threading and creates a
 mess on the list.
 
Email client : Outlook 12

It's probably not his fault, any proper mailer should be able to keep
threads together through a subject change. I've noticed webmail tends to
bugger this up, too.

But yes, it is a pain :-( Does anyone know how to force Outlook to
honour threading?

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

[Bug 39625] Make existing cppunittests work

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

Tobias Madl tobias.madl@gmail.com changed:

   What|Removed |Added

 Depends on||84237

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

[Bug 82577] get rid of prex.h / postx.h wrapper headers

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

--- Comment #10 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Noel Grandin committed a patch related to this issue.
It has been pushed to master:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=827c46e7d75000cb03b0ce21759f9d0825f0c096

fdo#82577: Handle Window



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Performance samples for LibreOffice ...



Our Window class has now been moved into the vcl namespace, so that should resolve the conflict with the Window type in 
the X11 headers.



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


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

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

 vcl/osx/salframeview.mm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6f8b4c068ec4c26ec26f6c95589b0d7d6901d627
Author: Noel Grandin n...@peralex.com
Date:   Tue Sep 23 13:24:11 2014 +0200

fix OSX build

after my commit 827c46e fdo#82577: Handle Window

Change-Id: I945849d7b95988162785eea6831da0f761514bb4

diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 57d251f..bd937db 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1782,7 +1782,7 @@ private:
 {
 if ( mpReferenceWrapper == nil ) {
 // some frames never become visible ..
-Window *pWindow = mpFrame - GetWindow();
+::vcl::Window *pWindow = mpFrame - GetWindow();
 if ( ! pWindow )
 return nil;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

 compilerplugins/clang/checkconfigmacros.cxx |3 ++-
 compilerplugins/clang/compat.hxx|   12 
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 0f5756e2e4065072aa7bc58f6202bd6c2405ff80
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Sep 23 13:46:24 2014 +0200

Adapt compilerplugins to Clang trunk towards 3.6

Change-Id: If6ee343bb4d4004e7a95fe1c5adc97210fc0abd0

diff --git a/compilerplugins/clang/checkconfigmacros.cxx 
b/compilerplugins/clang/checkconfigmacros.cxx
index 608800d..fff7967 100644
--- a/compilerplugins/clang/checkconfigmacros.cxx
+++ b/compilerplugins/clang/checkconfigmacros.cxx
@@ -9,6 +9,7 @@
  *
  */
 
+#include compat.hxx
 #include plugin.hxx
 
 #include clang/Lex/Preprocessor.h
@@ -59,7 +60,7 @@ class CheckConfigMacros
 CheckConfigMacros::CheckConfigMacros( const InstantiationData data )
 : Plugin( data )
 {
-compiler.getPreprocessor().addPPCallbacks( this );
+compat::addPPCallbacks(compiler.getPreprocessor(), this);
 }
 
 void CheckConfigMacros::run()
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index e6ce98e..e0e3cbb 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -23,6 +23,8 @@
 #include clang/Basic/Linkage.h
 #include clang/Basic/SourceManager.h
 #include clang/Basic/Visibility.h
+#include clang/Lex/PPCallbacks.h
+#include clang/Lex/Preprocessor.h
 #include llvm/ADT/StringRef.h
 #include llvm/Support/FileSystem.h
 #include llvm/Support/raw_ostream.h
@@ -186,6 +188,16 @@ inline clang::NamedDecl * const * end(
 #endif
 }
 
+inline void addPPCallbacks(
+clang::Preprocessor  preprocessor, clang::PPCallbacks * C)
+{
+#if (__clang_major__ == 3  __clang_minor__ = 6) || __clang_major__  3
+preprocessor.addPPCallbacks(std::unique_ptrclang::PPCallbacks(C));
+#else
+preprocessor.addPPCallbacks(C);
+#endif
+}
+
 }
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 extensions/source/plugin/base/xplugin.cxx   |2 +-
 extensions/source/plugin/inc/plugin/unx/sysplug.hxx |2 +-
 extensions/source/plugin/unx/npnapi.cxx |2 +-
 extensions/source/plugin/unx/npwrap.cxx |4 ++--
 extensions/source/plugin/unx/npwrap.hxx |2 +-
 extensions/source/plugin/unx/sysplug.cxx|2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d66b757083ddbb14c7bc58f4c34512185abbc60a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Sep 23 14:19:31 2014 +0200

Leftover XLIB_Window - Window

Change-Id: I51aa3e3fbf440bbd16d43ab8113cd69937060bf3

diff --git a/extensions/source/plugin/base/xplugin.cxx 
b/extensions/source/plugin/base/xplugin.cxx
index f2e4427..bf201a6 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -536,7 +536,7 @@ void XPlugin_Impl::loadPlugin()
 if( !socketpair( AF_UNIX, SOCK_STREAM, 0, sv ) )
 pComm = new UnxPluginComm( m_aDescription.Mimetype,
m_aDescription.PluginName,
-   (XLIB_Window)pEnvData-aWindow,
+   (Window)pEnvData-aWindow,
sv[0],
sv[1]
);
diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx 
b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
index 982c8ee..b12675f 100644
--- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
@@ -41,7 +41,7 @@ private:
 public:
 UnxPluginComm( const OUString mimetype,
const OUString library,
-   XLIB_Window aParent,
+   Window aParent,
int nDescriptor1,
int nDescriptor2
);
diff --git a/extensions/source/plugin/unx/npnapi.cxx 
b/extensions/source/plugin/unx/npnapi.cxx
index 8567b56..69b39b2 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -764,7 +764,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, 
/*pMediator*/ )
 {
 if( ! pInst-pWidget )
 {
-pInst-pWidget = CreateNewShell( (pInst-pShell), 
(XLIB_Window)pWindow-window );
+pInst-pWidget = CreateNewShell( (pInst-pShell), 
(Window)pWindow-window );
 }
 
 // fill in NPWindow and NPCallbackStruct
diff --git a/extensions/source/plugin/unx/npwrap.cxx 
b/extensions/source/plugin/unx/npwrap.cxx
index d5d5fdc..7c7fe66 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -119,7 +119,7 @@ IMPL_LINK( PluginConnector, NewMessageHdl, Mediator*, 
/*pMediator*/ )
 
 }
 
-Widget createSubWidget( char* /*pPluginText*/, Widget shell, XLIB_Window 
aParentWindow )
+Widget createSubWidget( char* /*pPluginText*/, Widget shell, Window 
aParentWindow )
 {
 Widget newWidget = XtVaCreateManagedWidget(
 #if defined USE_MOTIF
@@ -152,7 +152,7 @@ Widget createSubWidget( char* /*pPluginText*/, Widget 
shell, XLIB_Window aParent
 return newWidget;
 }
 
-void* CreateNewShell( void** pShellReturn, XLIB_Window aParentWindow )
+void* CreateNewShell( void** pShellReturn, Window aParentWindow )
 {
 String n, c;
 XtGetApplicationNameAndClass(pXtAppDisplay, n, c);
diff --git a/extensions/source/plugin/unx/npwrap.hxx 
b/extensions/source/plugin/unx/npwrap.hxx
index d2b6c96..ffadf00 100644
--- a/extensions/source/plugin/unx/npwrap.hxx
+++ b/extensions/source/plugin/unx/npwrap.hxx
@@ -22,7 +22,7 @@
 
 #include sal/config.h
 
-void* CreateNewShell( void** pShellReturn, XLIB_Window aParentWindow );
+void* CreateNewShell( void** pShellReturn, Window aParentWindow );
 
 void LoadAdditionalLibs(const char*);
 
diff --git a/extensions/source/plugin/unx/sysplug.cxx 
b/extensions/source/plugin/unx/sysplug.cxx
index 6289ff8..b19c017 100644
--- a/extensions/source/plugin/unx/sysplug.cxx
+++ b/extensions/source/plugin/unx/sysplug.cxx
@@ -52,7 +52,7 @@
 UnxPluginComm::UnxPluginComm(
  const OUString /*mimetype*/,
  const OUString library,
- XLIB_Window aParent,
+ Window aParent,
  int nDescriptor1,
  int nDescriptor2
  ) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build bison warning

2014-09-23 Thread Lionel Elie Mamane

On Mon, Sep 22, 2014 at 08:38:48AM -0500, Norbert Thiebaud wrote:
 On Mon, Sep 22, 2014 at 3:07 AM, Stephan Bergmann sberg...@redhat.com wrote:
 On 09/21/2014 08:29 AM, julien2412 wrote:

 /home/julien/compile-libreoffice/libreoffice/connectivity/source/parse/sqlbison.y:
 warning: 13 shift/reduce conflicts [-Wconflicts-sr]

 /home/julien/compile-libreoffice/libreoffice/connectivity/source/parse/sqlbison.y:
 warning: 15 reduce/reduce conflicts [-Wconflicts-rr]

 [...]

 What about reduce and shift conflicts, any bison expert here?

 Shift/reduce and (for GLR parsers, which that sqlbison.y is) reduce/reduce
 conflicts are somewhat common and expected, so there's even %expect and
 %expect-rr declarations that specify the number of expected sift/reduce and
 reduce/reduce conflicts, respectively, and Bison will then only warn if the
 numbers are wrong.  Though, of course, somebody familiar with that
 sqlbison.y should probably have a look before blindly adding such
 declarations to silence the warnings.

 yeah.. I advise _not_ hiding these. at this point it is highly
 unlikely that these be all 'legitimate'

Indeed; our SQL parser is not in the best of states.

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

Re: stack-allocated Window subclasses

2014-09-23 Thread Michael Meeks

Hi Noel,

On Tue, 2014-09-23 at 10:01 +0200, Noel Grandin wrote:
 I ran my clang plugin over master last night. This is the output.

Awesome - I've up-loaded a log here:

http://users.freedesktop.org/~michael/non-heap-windows.txt

 so there is a fair amount of work involved :-)

Heh =) sure, it doesn't look -terribly- bad though, I think each
call-site is a reasonably small change.

 So the work is restricted to a reasonable number of files.

The question is; what should we replace it with. Personally I'm more of
a fan of intrusive reference counting for VCL - we don't want lots of
atomics, so that the optimizer can rid us of size inefficiency - and at
least for now we can't ref-count those guys anyway I think.

Then again rtl::ReferenceFoo lost its nasty virtual methods recently
(IIRC), so - perhaps we could use that - but for the fact that it's
unpleasantly long to type. I'd also love to avoid 'orrible casts
everywhere when converting to references to parent types [ perhaps I
just do this wrong myself ;-] 

So - possibly having a ButtonRef xFoo; type class that is (underneath)
an rtl::ReferenceButton - and yet can easily be implicitly co-erced to
a WindowRef etc. might fly ?

I guess we need to have a plan in-place there before shunting all those
widgets off onto the heap where we can lifecycle manage them sensibly =)

Thoughts ?

Michael.

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

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

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

 sw/qa/extras/htmlimport/data/picture.html |7 ++-
 sw/qa/extras/htmlimport/htmlimport.cxx|   13 ++---
 sw/source/filter/html/htmlgrin.cxx|3 ++-
 3 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 38faee21e0b874359246e513b0a8c0af399a864d
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Tue Sep 23 14:40:01 2014 +0200

Do not link html images only when pasting from clipboard (bnc#580834)

Change-Id: I020c4e6ed6d468e553dedd7c91979b081d6b4725

diff --git a/sw/qa/extras/htmlimport/data/picture.html 
b/sw/qa/extras/htmlimport/data/picture.html
index c0b2e6c..53f0c64 100644
--- a/sw/qa/extras/htmlimport/data/picture.html
+++ b/sw/qa/extras/htmlimport/data/picture.html
@@ -3,17 +3,14 @@
   body
 div
   p
-This document should contain only one link. (Edit - Links...)
+This document should contain two links. (Edit - Links...)
   /p
   p
-The picture below is supposed to be fully inserted into the document, 
not just as a link.
-br/
 a style=display:inline-block; href=http://www.libreoffice.org/; 
title=Go to the Home of LibreOffice and the LibreOffice Community page
   img src=../../../../../odk/docs/images/sdk_head-1.png width=377 
height=120px/
 /a
   /p
-This one is supposed to be inserted as a link, since the source is 
http://...; URL.
-br/
+  p
 a style=display:inline-block; href=http://www.libreoffice.org/; 
title=Go to the Home of LibreOffice and the LibreOffice Community page
   img src=http://www.libreoffice.org/themes/libo/images/logo.png; 
width=218px height=45px/
 /a
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx 
b/sw/qa/extras/htmlimport/htmlimport.cxx
index 592aa53..1b1459f 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -29,9 +29,16 @@ DECLARE_HTMLIMPORT_TEST(testPictureImport, picture.html)
 {
 SwXTextDocument* pTxtDoc = dynamic_castSwXTextDocument 
*(mxComponent.get());
 CPPUNIT_ASSERT(pTxtDoc);
-// The document contains one embeded picture and one stored as a link.
-const sfx2::LinkManager rLinkManager = 
pTxtDoc-GetDocShell()-GetDoc()-GetEditShell()-GetLinkManager();
-CPPUNIT_ASSERT_EQUAL(size_t(1), rLinkManager.GetLinks().size());
+// The document contains two pictures stored as a link.
+sfx2::LinkManager rLinkManager = 
pTxtDoc-GetDocShell()-GetDoc()-GetEditShell()-GetLinkManager();
+CPPUNIT_ASSERT_EQUAL(size_t(2), rLinkManager.GetLinks().size());
+rLinkManager.Remove(0,2);
+CPPUNIT_ASSERT_EQUAL(size_t(0), rLinkManager.GetLinks().size());
+
+// TODO: Get the data into clipboard in html format and paste
+
+// But when pasting we don't want images to be linked.
+CPPUNIT_ASSERT_EQUAL(size_t(0), rLinkManager.GetLinks().size());
 }
 
 DECLARE_HTMLIMPORT_TEST(testInlinedImage, inlined_image.html)
diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index f4e1e44..4e136a4 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -706,7 +706,8 @@ IMAGE_SETEVENT:
 free( aStream );
 }
 }
-else if (aGraphicURL.GetProtocol() == INET_PROT_FILE)
+// sBaseURL is empty if the source is clipboard
+else if (sBaseURL.isEmpty())
 {
 if (GRFILTER_OK == 
GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, aGraphicURL))
 sGrfNm = ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-09-23 Thread Matthew J . Francis

 vcl/unx/gtk/window/gtksalmenu.cxx |   18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit d150dac1c32e89df4176d417d12a03fbbf1972d4
Author: Matthew J. Francis mjay.fran...@gmail.com
Date:   Tue Sep 23 20:26:38 2014 +0800

Fix memory leaks

Change-Id: I7cd727657a9e426a43f72d1c5b843e581cfe8c5d
Reviewed-on: https://gerrit.libreoffice.org/11608
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx 
b/vcl/unx/gtk/window/gtksalmenu.cxx
index 6622545..7a56ad6 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -215,7 +215,11 @@ gint CompareStr( gpointer str1, gpointer str2 )
 void RemoveUnusedCommands( GLOActionGroup* pActionGroup, GList* 
pOldCommandList, GList* pNewCommandList )
 {
 if ( pActionGroup == NULL || pOldCommandList == NULL )
+{
+g_list_free_full( pOldCommandList, g_free );
+g_list_free_full( pNewCommandList, g_free );
 return;
+}
 
 while ( pNewCommandList != NULL )
 {
@@ -570,8 +574,17 @@ void GtkSalMenu::NativeCheckItem( unsigned nSection, 
unsigned nItemPos, MenuItem
 pCheckValue = g_variant_new_boolean( bCheck );
 }
 
-if ( pCheckValue != NULL  ( pCurrentState == NULL || 
g_variant_equal( pCurrentState, pCheckValue ) == FALSE ) )
-g_action_group_change_action_state( mpActionGroup, aCommand, 
pCheckValue );
+if ( pCheckValue != NULL )
+{
+if ( pCurrentState == NULL || g_variant_equal( pCurrentState, 
pCheckValue ) == FALSE )
+{
+g_action_group_change_action_state( mpActionGroup, aCommand, 
pCheckValue );
+}
+else
+{
+g_variant_unref (pCheckValue);
+}
+}
 
 if ( pCurrentState != NULL )
 g_variant_unref( pCurrentState );
@@ -629,6 +642,7 @@ void GtkSalMenu::NativeSetAccelerator( unsigned nSection, 
unsigned nItemPos, con
 g_lo_menu_set_accelerator_to_item_in_section ( G_LO_MENU( mpMenuModel 
), nSection, nItemPos, aAccelerator );
 
 g_free( aAccelerator );
+g_free( aCurrentAccel );
 }
 
 void GtkSalMenu::NativeSetItemCommand( unsigned nSection,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: stack-allocated Window subclasses

On 2014-09-23 02:40 PM, Michael Meeks wrote:
The question is; what should we replace it with. Personally I'm more of a fan of intrusive reference counting for VCL
- we don't want lots of atomics, so that the optimizer can rid us of size inefficiency - and at least for now we can't
ref-count those guys anyway I think. Then again rtl::ReferenceFoo lost its nasty virtual methods recently (IIRC), so
- perhaps we could use that - but for the fact that it's unpleasantly long to type.

SvRef (include/tools/ref.hxx) is the rough equivalent of boost::intrusive_ptr,
so that would be my suggestion.
It use no atomics and has only one extra virtual call(other than the actual destructor) but removing that is
straightforward, I just haven't got around to it.

Otherwise we should just standardise on boost::intrusive_ptr and remove SvRef.

I'd also love to avoid 'orrible casts everywhere when converting to references to parent types [ perhaps I just do
this wrong myself ;-]

This should be fixable if it doesn't already work - myself and sberg already
did this for rtl::Reference.

I guess we need to have a plan in-place there before shunting all those widgets off onto the heap where we can
lifecycle manage them sensibly =) Thoughts ? Michael.

Mostly I guess we need to figure out where and when to destroy them - is it in the destructor, or in some other method
specific to this task?

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

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

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

2014-09-23 Thread Jan Holesovsky

 chart2/source/view/charttypes/GL3DBarChart.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b71204f67f91f50fd3806920e139742e56b3db78
Author: Jan Holesovsky ke...@collabora.com
Date:   Tue Sep 23 14:57:23 2014 +0200

fdo#84001: Renamed the env. variable to fit better.

Change-Id: Ie3e3a1871bfd0db22726206cf634debebcf4ef63

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 739e062..6581392 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -474,7 +474,7 @@ GL3DBarChart::GL3DBarChart(
 maDataUpdateStartTime.Seconds = maDataUpdateStartTime.Nanosec = 0;
 maDataUpdateEndTime.Seconds = maDataUpdateEndTime.Nanosec = 0;
 
-static const char *aBenchMark = getenv(BENCHMARK_MODE);
+static const char *aBenchMark = getenv(UNLOCKED_FRAMERATE);
 if (aBenchMark)
 {
 mbBenchMarkMode = atoi(aBenchMark);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - framework/source

 framework/source/services/substitutepathvars.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 095107f266fa376ea1b8fe4cf263277230f8da52
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Sep 22 13:08:21 2014 +0200

Related fdo#77813: $(workdirurl) was always empty

Regression introduced with cb021fcafba06ccf973f2abe229a4761c0a002de 
fdo#46037:
remove 1 comphelper/configurationhelper in framework.

Change-Id: I07727d93315e0d3d87004ce71708271e90a173a3
(cherry picked from commit 3c6da8e49a96513eda73656f3f6212f980a74b51)
Reviewed-on: https://gerrit.libreoffice.org/11592
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/framework/source/services/substitutepathvars.cxx 
b/framework/source/services/substitutepathvars.cxx
index 7e98436..dc5f97a 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -680,8 +680,7 @@ OUString SubstitutePathVariables::GetWorkPath() const
 {
 OUString aWorkPath;
 css::uno::Reference css::container::XHierarchicalNameAccess  
xPaths(officecfg::Office::Paths::Paths::get(m_xContext), 
css::uno::UNO_QUERY_THROW);
-OUString xWork;
-if (!(xPaths-getByHierarchicalName(['Work']/WritePath) = xWork))
+if (!(xPaths-getByHierarchicalName(['Work']/WritePath) = aWorkPath))
 // fallback in case config layer does not return an useable work dir 
value.
 aWorkPath = GetWorkVariableValue();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - framework/source

 framework/source/services/substitutepathvars.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit fa15216b2ffc70304d6bbc0f37e9c5b8cf4cff56
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Sep 22 13:08:21 2014 +0200

Related fdo#77813: $(workdirurl) was always empty

Regression introduced with cb021fcafba06ccf973f2abe229a4761c0a002de 
fdo#46037:
remove 1 comphelper/configurationhelper in framework.

Change-Id: I07727d93315e0d3d87004ce71708271e90a173a3
(cherry picked from commit 3c6da8e49a96513eda73656f3f6212f980a74b51)
Reviewed-on: https://gerrit.libreoffice.org/11591
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/framework/source/services/substitutepathvars.cxx 
b/framework/source/services/substitutepathvars.cxx
index deed622..0a02705 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -821,8 +821,7 @@ OUString SubstitutePathVariables::GetWorkPath() const
 {
 OUString aWorkPath;
 css::uno::Reference css::container::XHierarchicalNameAccess  
xPaths(officecfg::Office::Paths::Paths::get(m_xContext), 
css::uno::UNO_QUERY_THROW);
-OUString xWork;
-if (!(xPaths-getByHierarchicalName(['Work']/WritePath) = xWork))
+if (!(xPaths-getByHierarchicalName(['Work']/WritePath) = aWorkPath))
 // fallback in case config layer does not return an useable work dir 
value.
 aWorkPath = GetWorkVariableValue();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source

2014-09-23 Thread Björgvin Ragnarsson

 filter/source/graphicfilter/ieps/ieps.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bdefc56961919499cc6fda5a39c791ac6c67ca5f
Author: BjÃ¶rgvin Ragnarsson nifgr...@gmail.com
Date:   Thu Sep 4 00:43:04 2014 +0300

fdo#81592 Use 24-bit color depth, not 256 colors when converting an 
EPS-file.

This regression was introduced in f5c3f5601a3739dead635f9abc446951b385018f.

Change-Id: Ica48732398cd5d225b433b177ff6e6fff649e732
(cherry picked from commit 0791335cf007e04de25e03c0a6e0aa53fa66016a)
Reviewed-on: https://gerrit.libreoffice.org/11464
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/filter/source/graphicfilter/ieps/ieps.cxx 
b/filter/source/graphicfilter/ieps/ieps.cxx
index 94bf6ac..c0bf43c 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -327,7 +327,7 @@ static bool RenderAsBMPThroughGS(const sal_uInt8* pBuf, 
sal_uInt32 nBytesRead,
 OUString arg6(-dTextAlphaBits=4);
 OUString arg7(-dGraphicsAlphaBits=4);
 OUString arg8(-r300x300);
-OUString arg9(-sDEVICE=bmp256);
+OUString arg9(-sDEVICE=bmp16m);
 OUString arg10(-sOutputFile=-);
 OUString arg11(-);
 rtl_uString *args[] =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa writerfilter/source

2014-09-23 Thread Luboš Luňák

 sw/qa/extras/ooxmlimport/data/bnc891663.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |9 +
 writerfilter/source/dmapper/GraphicImport.cxx |7 +++
 writerfilter/source/dmapper/PropertyIds.cxx   |1 +
 writerfilter/source/dmapper/PropertyIds.hxx   |1 +
 5 files changed, 18 insertions(+)

New commits:
commit b6dae49f3913464dc76992fbb2d1ee8ca9c98f07
Author: LuboÅ¡ LuÅÃ¡k l.lu...@collabora.com
Date:   Sun Sep 21 17:52:58 2014 +0200

handle docx's w:anchor layoutInCell attribute (bnc#891663)

(cherry picked from commit 3891ba42a886fa85eb43da24d1badf44e765d54c)

Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/PropertyIds.cxx
writerfilter/source/dmapper/PropertyIds.hxx

Change-Id: I8268567b84aa0f6e42624bfd0f79c8c49c153edd
Reviewed-on: https://gerrit.libreoffice.org/11569
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/sw/qa/extras/ooxmlimport/data/bnc891663.docx 
b/sw/qa/extras/ooxmlimport/data/bnc891663.docx
new file mode 100644
index 000..d5f057e
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/bnc891663.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0035e7b..2a7ab9a 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1723,6 +1723,15 @@ DECLARE_OOXMLIMPORT_TEST(testTableBtlrCenter, 
table-btlr-center.docx)
 CPPUNIT_ASSERT_EQUAL(text::VertOrientation::CENTER, 
getPropertysal_Int16(xTable-getCellByName(A2), VertOrient));
 }
 
+DECLARE_OOXMLIMPORT_TEST(testBnc891663, bnc891663.docx)
+{
+// The image should be inside a cell, so the text in the following cell 
should be below it.
+int imageTop = 
parseDump(/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds,
 top).toInt32();
+int imageHeight = 
parseDump(/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds,
 height).toInt32();
+int textNextRowTop = 
parseDump(/root/page/body/tab/row[2]/cell[1]/txt[1]/infos/bounds, 
top).toInt32();
+CPPUNIT_ASSERT( textNextRowTop = imageTop + imageHeight );
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 607d92b..2c57337 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -210,6 +210,7 @@ public:
 sal_Int16 nVertOrient;
 sal_Int16 nVertRelation;
 sal_Int32 nWrap;
+bool  bLayoutInCell;
 bool  bOpaque;
 bool  bContour;
 bool  bContourOutside;
@@ -282,6 +283,7 @@ public:
 ,nVertOrient(  text::VertOrientation::NONE )
 ,nVertRelation( text::RelOrientation::FRAME )
 ,nWrap(0)
+,bLayoutInCell(false)
 ,bOpaque( true )
 ,bContour(false)
 ,bContourOutside(true)
@@ -856,6 +858,8 @@ void GraphicImport::lcl_attribute(Id nName, Value  val)
 break;
 case NS_ooxml::LN_CT_Anchor_locked: // 90990; - ignored
 case NS_ooxml::LN_CT_Anchor_layoutInCell: // 90991; - ignored
+m_pImpl-bLayoutInCell = nIntValue != 0;
+break;
 case NS_ooxml::LN_CT_Anchor_hidden: // 90992; - ignored
 break;
 case NS_ooxml::LN_CT_Anchor_allowOverlap: // 90993;
@@ -1508,6 +1512,9 @@ uno::Reference text::XTextContent  
GraphicImport::createGraphicObject( const b
 }
 
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_SURROUND ),
 uno::makeAny(m_pImpl-nWrap));
+if( m_pImpl-bLayoutInCell  m_pImpl-nWrap != 
text::WrapTextMode_THROUGHT )
+
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_FOLLOW_TEXT_FLOW ),
+uno::makeAny(true));
 
 
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_SURROUND_CONTOUR ),
 uno::makeAny(m_pImpl-bContour));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index d693ddb..14dbc25 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -347,6 +347,7 @@ const OUString PropertyNameSupplier::GetName( PropertyIds 
eId ) const
 case PROP_HORIZONTAL_MERGE: sName = HorizontalMerge; break;
 case PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING : sName = 
ApplyParagraphMarkFormatToNumbering; break;
 case PROP_CELL_DIRECTION: sName = CellDirection; break;
+case PROP_FOLLOW_TEXT_FLOW: sName = IsFollowingTextFlow; break;
 }
 ::std::pairPropertyNameMap_t::iterator,bool aInsertIt =
 m_pImpl-aNameMap.insert( PropertyNameMap_t::value_type(

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

 sw/qa/extras/htmlexport/htmlexport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 26967802e6f4912c5e004b9b223bfbd54d2d9b68
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Sep 23 15:49:05 2014 +0200

Not only hspace, vspace but also width, height

cf.

http://lists.freedesktop.org/archives/libreoffice/2014-September/063550.html
CppunitTest_sw_htmlexport failures on Mac (was: Tinderbox failure, 
MacOSX-10.8
at 21-10.7SDK, MASTER, last success: 2014-09-21 21:55:50)

Change-Id: Iab5123a6b0b91d23c5caf4083279de55d1148cfc

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 39ceb2b..d04e34c 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -187,9 +187,9 @@ DECLARE_HTMLEXPORT_TEST(testExportImageProperties, 
HTMLImage.odt)
 #ifndef MACOSX // For some reason the hspace is 28 on OSX - disable this 
check for now
 assertXPath(pDoc, /html/body/p/a/font/img, hspace, 38);
 assertXPath(pDoc, /html/body/p/a/font/img, vspace, 19);
-#endif
 assertXPath(pDoc, /html/body/p/a/font/img, width, 222);
 assertXPath(pDoc, /html/body/p/a/font/img, height, 222);
+#endif
 assertXPath(pDoc, /html/body/p/a/font/img, border, 3);
 assertXPath(pDoc, /html/body/p/a/font/img, usemap, #map1);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: #4 can someone spot problem with simplebootstrap_cpp.cxx

2014-09-23 Thread Norbert Thiebaud

On Tue, Sep 23, 2014 at 4:43 AM, Wols Lists antli...@youngman.org.uk wrote:
 On 23/09/14 06:13, khagaroth wrote:
 Don't change subject on every reply. It breaks threading and creates a
 mess on the list.

 Email client : Outlook 12

 It's probably not his fault, any proper mailer should be able to keep
 threads together through a subject change. I've noticed webmail tends to
 bugger this up, too.

Gmail does not handle that either.. and does not magically deal with
top posting or the lack of trimming
then again, why on earth number the reply (and keep in each reply the
entire thread history) ?
who need n.(n+1)/2 messages instead of n ?

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 11 commits - connectivity/source download.lst filter/source framework/source sc/qa sc/source sw/qa sw/source vcl/source writerfilter/

 connectivity/source/drivers/file/FPreparedStatement.cxx |2 
 download.lst|2 
 filter/source/graphicfilter/ieps/ieps.cxx   |2 
 framework/source/services/substitutepathvars.cxx|3 
 sc/qa/unit/ucalc_pivottable.cxx |   52 
 sc/source/core/data/column4.cxx |7 +-
 sc/source/core/data/dpoutput.cxx|9 ++
 sc/source/core/data/table3.cxx  |7 +-
 sc/source/ui/docshell/dbdocfun.cxx  |1 
 sw/qa/extras/ooxmlimport/data/bnc891663.docx|binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx|9 ++
 sw/source/filter/html/htmlgrin.cxx  |   23 ---
 vcl/source/gdi/regionband.cxx   |1 
 writerfilter/source/dmapper/GraphicImport.cxx   |7 ++
 writerfilter/source/dmapper/PropertyIds.cxx |1 
 writerfilter/source/dmapper/PropertyIds.hxx |1 
 16 files changed, 86 insertions(+), 41 deletions(-)

New commits:
commit 535a62150bf9d2e12be033ddf7bdd8f761b72f60
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Tue Sep 23 14:40:01 2014 +0200

Do not link html images only when pasting from clipboard (bnc#580834)

Conflicts:

sw/qa/extras/htmlimport/data/picture.html
sw/qa/extras/htmlimport/htmlimport.cxx

Change-Id: I020c4e6ed6d468e553dedd7c91979b081d6b4725

diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index 4052027..5f7ca14 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -711,7 +711,8 @@ IMAGE_SETEVENT:
 sGrfNm = ;
 }
 }
-else if (aGraphicURL.GetProtocol() == INET_PROT_FILE)
+// sBaseURL is empty if the source is clipboard
+else if (sBaseURL.isEmpty())
 {
 if (GRFILTER_OK == 
GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, aGraphicURL))
 sGrfNm = ;
commit 9af79c2fbec31611305bfab99fbac30988a97230
Author: Michael Stahl mst...@redhat.com
Date:   Fri Sep 12 17:59:49 2014 +0200

STL assert in 
connectivity::file::OPreparedStatement::checkAndResizeParameters

Change-Id: I48f4ceaf1d01d449eba169534f6512f9aadca886
(cherry picked from commit 7ce8ba33f38671d7cae8b0e759c38b4a8668488a)

diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx 
b/connectivity/source/drivers/file/FPreparedStatement.cxx
index d34c526..586de72 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -445,7 +445,7 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 
parameterIndex)
 {
 sal_Int32 i = m_aParameterRow-get().size();
 (m_aParameterRow-get()).resize(parameterIndex+1);
-for ( ;i = parameterIndex+1; ++i )
+for ( ; i = parameterIndex; ++i)
 {
 if ( !(m_aParameterRow-get())[i].is() )
 (m_aParameterRow-get())[i] = new ORowSetValueDecorator;
commit 9ccde22fcf8efe0007ec243df7ee85af8ef795b0
Author: BjÃ¶rgvin Ragnarsson nifgr...@gmail.com
Date:   Thu Sep 4 00:43:04 2014 +0300

fdo#81592 Use 24-bit color depth, not 256 colors when converting an 
EPS-file.

This regression was introduced in f5c3f5601a3739dead635f9abc446951b385018f.

Change-Id: Ica48732398cd5d225b433b177ff6e6fff649e732
(cherry picked from commit 0791335cf007e04de25e03c0a6e0aa53fa66016a)

diff --git a/filter/source/graphicfilter/ieps/ieps.cxx 
b/filter/source/graphicfilter/ieps/ieps.cxx
index 94bf6ac..c0bf43c 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -327,7 +327,7 @@ static bool RenderAsBMPThroughGS(const sal_uInt8* pBuf, 
sal_uInt32 nBytesRead,
 OUString arg6(-dTextAlphaBits=4);
 OUString arg7(-dGraphicsAlphaBits=4);
 OUString arg8(-r300x300);
-OUString arg9(-sDEVICE=bmp256);
+OUString arg9(-sDEVICE=bmp16m);
 OUString arg10(-sOutputFile=-);
 OUString arg11(-);
 rtl_uString *args[] =
commit d192533c4ce32cb1a9e5eb011bbe29e14acad9d5
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Sep 17 11:24:56 2014 -0400

bnc#592918: Display data description in pivot table.

When there are no column fields and exactly one data field.

Change-Id: I10d2af7e626f98a4d8a981e078e99e7da9207d1c
(cherry picked from commit 902564bfe52e7699cefc80b3334c2eb0a8cacdcf)

diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index 00e83b9..65ed2fd 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -1107,7 +1107,7 @@ void Test::testPivotTableNormalGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source

 sw/source/filter/html/htmlgrin.cxx |   23 ---
 1 file changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 64bed43ef763f6e4435ae31f705f9639671f14d9
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Wed Sep 17 11:57:24 2014 +0200

bnc#580834: HTML import: Embed images if source URL is a local file.

Use also INET_PROT_FILE to determine whether to import images as links.

(cherry picked from commits 3914a711060341345f15b83656457f90095f32d6
and 72703173066a2db5c977d422ace59d60b998bbfc and
38faee21e0b874359246e513b0a8c0af399a864d)

Conflicts:
sw/source/filter/html/htmlgrin.cxx

Change-Id: I22a5ded92d9aac4220c0c4fa8bb8a9490f5c61a6
Reviewed-on: https://gerrit.libreoffice.org/11542
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index 231555e..d32c473 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -696,8 +696,9 @@ IMAGE_SETEVENT:
 aFrmSize.SetHeightPercent( nPrcHeight );
 aFrmSet.Put( aFrmSize );
 
-Graphic aEmptyGrf;
-if( sGrfNm.startsWith(data:) )
+Graphic aGraphic;
+INetURLObject aGraphicURL( sGrfNm );
+if( aGraphicURL.GetProtocol() == INET_PROT_DATA )
 {
 // use embedded base64 encoded data
 ::com::sun::star::uno::Sequence sal_Int8  aPass;
@@ -705,15 +706,23 @@ IMAGE_SETEVENT:
 ::sax::Converter::decodeBase64(aPass, sBase64Data);
 if( aPass.hasElements() )
 {
-SvMemoryStream aStream(aPass.getArray(), aPass.getLength(), 
STREAM_READ);
-GraphicFilter::GetGraphicFilter().ImportGraphic( aEmptyGrf, 
OUString(), aStream );
+SvMemoryStream aStream(aPass.getArray(), aPass.getLength(), 
STREAM_READ);
+if (GRFILTER_OK == 
GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, , aStream))
+sGrfNm = ;
 }
 }
-else
+// sBaseURL is empty if the source is clipboard
+else if (sBaseURL.isEmpty())
+{
+if (GRFILTER_OK == 
GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, aGraphicURL))
+sGrfNm = ;
+}
+if (!sGrfNm.isEmpty())
 {
-aEmptyGrf.SetDefaultType();
+aGraphic.SetDefaultType();
 }
-SwFrmFmt *pFlyFmt = pDoc-Insert( *pPam, sGrfNm, aEmptyOUStr, aEmptyGrf,
+// passing empty sGrfNm here, means we don't want the graphic to be linked
+SwFrmFmt *pFlyFmt = pDoc-Insert( *pPam, sGrfNm, aEmptyOUStr, aGraphic,
   aFrmSet, NULL, NULL );
 SwGrfNode *pGrfNd = pDoc-GetNodes()[ pFlyFmt-GetCntnt().GetCntntIdx()
   -GetIndex()+1 ]-GetGrfNode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source

 vcl/source/gdi/regionband.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit efe052be8f2a1ba7c3fbc4fcdf2a0f913c05cd8e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Sun Sep 21 17:37:05 2014 +0100

set mpFirstBand back to 0 after deleting it

bff + valgrind

==30470== Invalid read of size 8
==30470==at 0xA02103F: RegionBand::isSingleRectangle() const 
(regionband.cxx:294)
==30470==by 0xA01F562: WriteRegion(SvStream, Region const) 
(region.cxx:1640)
==30470==by 0x9F01FD4: MetaClipRegionAction::Write(SvStream, 
ImplMetaWriteData*) (metaact.cxx:2487)
...
==30470==  Address 0x1d175980 is 0 bytes inside a block of size 56 free'd
==30470==at 0x4A07991: operator delete(void*) (in 
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==30470==by 0xA020BB1: RegionBand::implReset() (regionband.cxx:87)
==30470==by 0xA020EF2: RegionBand::load(SvStream) (regionband.cxx:249)

(cherry picked from commit 1ca892488a7a6a9c35fc99c41cd4af788fe0df6e)

Conflicts:
vcl/source/gdi/regionband.cxx

Change-Id: I2468d43c7e73b3390f355358990f8af30b5f026e
Reviewed-on: https://gerrit.libreoffice.org/11571
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx
index 4268e0f..3097f37 100644
--- a/vcl/source/gdi/regionband.cxx
+++ b/vcl/source/gdi/regionband.cxx
@@ -103,6 +103,7 @@ void RegionBand::implReset()
 }
 
 mpLastCheckedBand = 0;
+mpFirstBand = 0;
 
 DBG_CHKTHIS(RegionBand, ImplDbgTestRegionBand);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - connectivity/source

2014-09-23 Thread Michael Stahl

 connectivity/source/drivers/file/FPreparedStatement.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d2cb01bc6902e654f076cb8e8b408becd6314af7
Author: Michael Stahl mst...@redhat.com
Date:   Fri Sep 12 17:59:49 2014 +0200

STL assert in 
connectivity::file::OPreparedStatement::checkAndResizeParameters

Change-Id: I48f4ceaf1d01d449eba169534f6512f9aadca886
(cherry picked from commit 7ce8ba33f38671d7cae8b0e759c38b4a8668488a)
Reviewed-on: https://gerrit.libreoffice.org/11425
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx 
b/connectivity/source/drivers/file/FPreparedStatement.cxx
index d34c526..586de72 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -445,7 +445,7 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 
parameterIndex)
 {
 sal_Int32 i = m_aParameterRow-get().size();
 (m_aParameterRow-get()).resize(parameterIndex+1);
-for ( ;i = parameterIndex+1; ++i )
+for ( ; i = parameterIndex; ++i)
 {
 if ( !(m_aParameterRow-get())[i].is() )
 (m_aParameterRow-get())[i] = new ORowSetValueDecorator;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/qa sc/source

 sc/qa/unit/ucalc_pivottable.cxx  |   52 +++
 sc/source/core/data/dpoutput.cxx |9 ++
 2 files changed, 35 insertions(+), 26 deletions(-)

New commits:
commit 358fdd8ef44fbddbb24dc603a6c0c6037885f1b0
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Sep 17 11:24:56 2014 -0400

bnc#592918: Display data description in pivot table.

When there are no column fields and exactly one data field.

Change-Id: I10d2af7e626f98a4d8a981e078e99e7da9207d1c
(cherry picked from commit 902564bfe52e7699cefc80b3334c2eb0a8cacdcf)
Reviewed-on: https://gerrit.libreoffice.org/11493
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index 00e83b9..65ed2fd 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -1107,7 +1107,7 @@ void Test::testPivotTableNormalGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { A, 1 },
 { B, 2 },
 { C, 3 },
@@ -1155,7 +1155,7 @@ void Test::testPivotTableNormalGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][3] = {
-{ Name2, Name, 0 },
+{ Name2, Name, Sum - Value },
 { D, D, 4 },
 { E, E, 5 },
 { F, F, 6 },
@@ -1192,7 +1192,7 @@ void Test::testPivotTableNormalGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][3] = {
-{ Name2, Name, 0 },
+{ Name2, Name, Sum - Value },
 { G, G, 7 },
 { Group1, A, 1 },
 { 0,B, 2 },
@@ -1289,7 +1289,7 @@ void Test::testPivotTableNumberGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Order, 0 },
+{ Order, Sum - Score },
 { 30,   423 },
 { 30-39, 87  },
 { 40-49, 241 },
@@ -1404,7 +1404,7 @@ void Test::testPivotTableDateGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][4] = {
-{ Years, Quarters, Date, 0 },
+{ Years, Quarters, Date, Sum - Value },
 { 2011, Q1, Jan, 1 },
 { 0, 0, Mar, 2 },
 { 0,  Q3, Sep, 7 },
@@ -1436,7 +1436,7 @@ void Test::testPivotTableDateGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][4] = {
-{ Years, Quarters, Date, 0 },
+{ Years, Quarters, Date, Sum - Value },
 { 2011, Q1, Jan, 1 },
 { 0, 0, Mar, 2 },
 { 0,  Q3, Sep, 7 },
@@ -1460,7 +1460,7 @@ void Test::testPivotTableDateGrouping()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Date, 0 },
+{ Date, Sum - Value },
 { 2011-01-01, 1 },
 { 2011-03-02, 2 },
 { 2011-09-03, 7 },
@@ -1528,7 +1528,7 @@ void Test::testPivotTableEmptyRows()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { A, 1 },
 { B, 2 },
 { C, 3 },
@@ -1551,7 +1551,7 @@ void Test::testPivotTableEmptyRows()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { A, 1 },
 { B, 2 },
 { C, 3 },
@@ -1578,7 +1578,7 @@ void Test::testPivotTableEmptyRows()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { B, 3 },
 { C, 3 },
 { D, 4 },
@@ -1656,7 +1656,7 @@ void Test::testPivotTableTextNumber()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { 0001, 1 },
 { 0002, 2 },
 { 0003, 3 },
@@ -1715,7 +1715,7 @@ void Test::testPivotTableCaseInsensitiveStrings()
 {
 // Expected output table content.  0 = empty cell
 const char* aOutputCheck[][2] = {
-{ Name, 0 },
+{ Name, Sum - Value },
 { A, 3 },
 { Total Result, 3 },
 };
@@ -1878,7 +1878,7 @@ void Test::testPivotTableFieldReference()
 {
 // Expected output table content.  0 = empty cell
 const char*

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

 sc/source/core/data/column4.cxx |7 ++-
 sc/source/core/data/table3.cxx  |7 +--
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 086ed7e59f5ec74dfdf046c3d5b4f28ede8dd8be
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Sep 18 12:13:13 2014 -0400

fdo#83764: Ensure that the row position is below MAXROW.

When attempting to split formula groups, else multi_type_vector would
try to locate a block outside its logical range.

Change-Id: I424ede112138de459b5ba3bff5e021c4407ccf3d
(cherry picked from commit 0ef6263ed2b31b8f9e431971e6c5e8928996c1c8)
Reviewed-on: https://gerrit.libreoffice.org/11519
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index d1aacdd..8b46e74 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -499,11 +499,16 @@ public:
 
 void ScColumn::SplitFormulaGroupByRelativeRef( const ScRange rBoundRange )
 {
+if (rBoundRange.aStart.Row() = MAXROW)
+// Nothing to split.
+return;
+
 std::vectorSCROW aBounds;
 
 // Cut at row boundaries first.
 aBounds.push_back(rBoundRange.aStart.Row());
-aBounds.push_back(rBoundRange.aEnd.Row()+1);
+if (rBoundRange.aEnd.Row()  MAXROW)
+aBounds.push_back(rBoundRange.aEnd.Row()+1);
 sc::SharedFormulaUtil::splitFormulaCellGroups(maCells, aBounds);
 
 RelativeRefBoundChecker aFunc(rBoundRange);
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index c1a81e6..946416d 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -771,8 +771,11 @@ void ScTable::SortReorderByColumn(
 sc::CellStoreType rCells = aCol[nCol].maCells;
 sc::CellStoreType::position_type aPos = rCells.position(nRow1);
 sc::SharedFormulaUtil::joinFormulaCellAbove(aPos);
-aPos = rCells.position(aPos.first, nRow2+1);
-sc::SharedFormulaUtil::joinFormulaCellAbove(aPos);
+if (nRow2  MAXROW)
+{
+aPos = rCells.position(aPos.first, nRow2+1);
+sc::SharedFormulaUtil::joinFormulaCellAbove(aPos);
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

 sc/source/ui/docshell/dbdocfun.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8066367bbe0adebae515862ebd260560657ace02
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Sep 19 09:11:09 2014 -0400

fdo#84009: Be sure to update the sheet index when moving the sort range.

Change-Id: Ic9ad51b33f6dfb6f90e76439c27eeff25ec4c7da
(cherry picked from commit 5fd4679e7b92f344ea867e0dca1fc4c9363ae2cd)
Reviewed-on: https://gerrit.libreoffice.org/11550
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/sc/source/ui/docshell/dbdocfun.cxx 
b/sc/source/ui/docshell/dbdocfun.cxx
index 29d2da1..aa1e322 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -462,6 +462,7 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam 
rSortParam,
 return false;
 
 aLocalParam.MoveToDest();
+nTab = aLocalParam.nDestTab;
 }
 
 ScEditableTester aTester( pDoc, nTab, aLocalParam.nCol1,aLocalParam.nRow1,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst

 download.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6645cd6fdf4aceb212db02676069506638e0946e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Sep 18 14:22:27 2014 -0400

Update mdds to 0.11.0.

(cherry picked from commit 3f3b404b643f907f9feff893324174c00c3c4e4a)

Conflicts:
download.lst

Change-Id: Ia4c413d313aafc1ba46d3d856145c0eb51a7d6ec
Reviewed-on: https://gerrit.libreoffice.org/11521
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/download.lst b/download.lst
index 1bc9341..54904cc 100644
--- a/download.lst
+++ b/download.lst
@@ -84,7 +84,7 @@ export LIBXML_TARBALL := 
9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
-export MDDS_TARBALL := aa5ca9d1ed1082890835afab26400a39-mdds_0.10.3.tar.bz2
+export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2
 export MYSQLCPPCONN_TARBALL := 
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
___
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/core/bastyp/breakit.cxx |2 +-
 sw/source/core/txtnode/txtedt.cxx |6 --
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 93e7ae6f5719c56c90679e46a6e817dedf5c54c6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Sep 23 15:03:38 2014 +0100

with show changes on we can have negative offsets

for counting words in a range of text which has redline deleted
text at the start

Change-Id: I34149822d43f8ee3fbde58a166dad408fb588fce

diff --git a/sw/source/core/bastyp/breakit.cxx 
b/sw/source/core/bastyp/breakit.cxx
index b4caeb3..8a4c40e 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -175,7 +175,7 @@ sal_Int32 SwBreakIt::getGraphemeCount(const OUString rText,
 {
 sal_Int32 nGraphemeCount = 0;
 
-sal_Int32 nCurPos = nStart;
+sal_Int32 nCurPos = std::max(0, nStart);
 while (nCurPos  nEnd)
 {
 // fdo#49208 cheat and assume that nothing can combine with a space
diff --git a/sw/source/core/txtnode/txtedt.cxx 
b/sw/source/core/txtnode/txtedt.cxx
index c083245..a4616ba 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -730,6 +730,8 @@ SwScanner::SwScanner( const SwTxtNode rNd, const OUString 
rTxt,
 OUStringBuffer aBuf(aPreDashReplacementText);
 for (sal_Int32 i = nStartPos; i  nEndPos; ++i)
 {
+if (i  0)
+continue;
 sal_Unicode cChar = aBuf[i];
 if (sDashes.indexOf(cChar) != -1)
 {
@@ -805,9 +807,9 @@ bool SwScanner::NextWord()
 while ( true )
 {
 // skip non-letter characters:
-while ( nBegin  aText.getLength() )
+while (nBegin  aText.getLength())
 {
-if ( !u_isspace( aText[nBegin] ) )
+if (nBegin = 0  !u_isspace(aText[nBegin]))
 {
 if ( !pLanguage )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/uiconfig

 sc/uiconfig/scalc/ui/optformula.ui |  732 ++---
 1 file changed, 374 insertions(+), 358 deletions(-)

New commits:
commit 446a0a0c9e77bc891e4011747e9255701c494509
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Sep 22 12:37:07 2014 +0100

Resolves: fdo#84057 Localized string is truncated

use grids which are better at compressing than boxes and
other tweaks

Change-Id: I687c64089e9ac882631d500e493cf21f43b58d69
Reviewed-on: https://gerrit.libreoffice.org/11587
Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/sc/uiconfig/scalc/ui/optformula.ui 
b/sc/uiconfig/scalc/ui/optformula.ui
index dfefcc0..94ed677 100644
--- a/sc/uiconfig/scalc/ui/optformula.ui
+++ b/sc/uiconfig/scalc/ui/optformula.ui
@@ -1,408 +1,328 @@
 ?xml version=1.0 encoding=UTF-8?
-!-- Generated with glade 3.16.0 on Wed Jan  8 17:04:17 2014 --
+!-- Generated with glade 3.16.1 --
 interface
-  !-- interface-requires gtk+ 3.0 --
-  object class=GtkBox id=OptFormula
+  requires lib=gtk+ version=3.0/
+  object class=GtkGrid id=OptFormula
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=hexpandTrue/property
 property name=border_width6/property
-property name=orientationvertical/property
+property name=row_spacing12/property
 child
-  object class=GtkBox id=box1
+  object class=GtkFrame id=frame4
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=orientationvertical/property
-property name=spacing12/property
+property name=hexpandTrue/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
 child
-  object class=GtkFrame id=frame1
+  object class=GtkAlignment id=alignment4
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=top_padding6/property
+property name=left_padding12/property
+child
+  object class=GtkGrid id=grid5
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=row_spacing6/property
+property name=column_spacing12/property
+child
+  object class=GtkLabel id=label9
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=xalign0/property
+property name=label translatable=yesExcel 2007 and 
newer/property
+property name=use_underlineTrue/property
+property name=mnemonic_widgetooxmlrecalc/property
+  /object
+  packing
+property name=left_attach0/property
+property name=top_attach0/property
+property name=width1/property
+property name=height1/property
+  /packing
+/child
+child
+  object class=GtkLabel id=label10
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=xalign0/property
+property name=label translatable=yesODF Spreadsheet 
(not saved by %PRODUCTNAME)/property
+property name=use_underlineTrue/property
+property name=mnemonic_widgetodfrecalc/property
+  /object
+  packing
+property name=left_attach0/property
+property name=top_attach1/property
+property name=width1/property
+property name=height1/property
+  /packing
+/child
+child
+  object class=GtkComboBoxText id=ooxmlrecalc
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=hexpandTrue/property
+items
+  item translatable=yesAlways recalculate/item
+  item translatable=yesNever recalculate/item
+  item translatable=yesPrompt user/item
+/items
+  /object
+  packing
+property name=left_attach1/property
+property name=top_attach0/property
+property name=width1/property
+property name=height1/property
+  /packing
+/child
+child
+  object class=GtkComboBoxText id=odfrecalc
+

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

 sw/source/filter/html/htmlgrin.cxx |   23 ---
 1 file changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 0a5c40c9426fd20d463bc0c52b85b139f212e681
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Wed Sep 17 11:57:24 2014 +0200

bnc#580834: HTML import: Embed images if source URL is a local file.

Use also INET_PROT_FILE to determine whether to import images as links.

(cherry picked from commits 3914a711060341345f15b83656457f90095f32d6
and 72703173066a2db5c977d422ace59d60b998bbfc and
38faee21e0b874359246e513b0a8c0af399a864d)

Conflicts:
sw/source/filter/html/htmlgrin.cxx

Change-Id: I22a5ded92d9aac4220c0c4fa8bb8a9490f5c61a6
Reviewed-on: https://gerrit.libreoffice.org/11513
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index be1ac1c..9e95fa8 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -694,8 +694,9 @@ IMAGE_SETEVENT:
 aFrmSize.SetHeightPercent( nPrcHeight );
 aFrmSet.Put( aFrmSize );
 
-Graphic aEmptyGrf;
-if( sGrfNm.startsWith(data:) )
+Graphic aGraphic;
+INetURLObject aGraphicURL( sGrfNm );
+if( aGraphicURL.GetProtocol() == INET_PROT_DATA )
 {
 // use embedded base64 encoded data
 ::com::sun::star::uno::Sequence sal_Int8  aPass;
@@ -703,15 +704,23 @@ IMAGE_SETEVENT:
 ::sax::Converter::decodeBase64(aPass, sBase64Data);
 if( aPass.hasElements() )
 {
-SvMemoryStream aStream(aPass.getArray(), aPass.getLength(), 
STREAM_READ);
-GraphicFilter::GetGraphicFilter().ImportGraphic( aEmptyGrf, 
OUString(), aStream );
+SvMemoryStream aStream(aPass.getArray(), aPass.getLength(), 
STREAM_READ);
+if (GRFILTER_OK == 
GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, , aStream))
+sGrfNm = ;
 }
 }
-else
+// sBaseURL is empty if the source is clipboard
+else if (sBaseURL.isEmpty())
+{
+if (GRFILTER_OK == 
GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, aGraphicURL))
+sGrfNm = ;
+}
+if (!sGrfNm.isEmpty())
 {
-aEmptyGrf.SetDefaultType();
+aGraphic.SetDefaultType();
 }
-SwFrmFmt *pFlyFmt = pDoc-Insert( *pPam, sGrfNm, aEmptyOUStr, aEmptyGrf,
+// passing empty sGrfNm here, means we don't want the graphic to be linked
+SwFrmFmt *pFlyFmt = pDoc-Insert( *pPam, sGrfNm, aEmptyOUStr, aGraphic,
   aFrmSet, NULL, NULL );
 SwGrfNode *pGrfNd = pDoc-GetNodes()[ pFlyFmt-GetCntnt().GetCntntIdx()
   -GetIndex()+1 ]-GetGrfNode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/source

 vcl/source/gdi/regionband.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f7abe28ec99733f80a6c6f249ef5dbddeb31ad7f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Sun Sep 21 17:37:05 2014 +0100

set mpFirstBand back to 0 after deleting it

bff + valgrind

==30470== Invalid read of size 8
==30470==at 0xA02103F: RegionBand::isSingleRectangle() const 
(regionband.cxx:294)
==30470==by 0xA01F562: WriteRegion(SvStream, Region const) 
(region.cxx:1640)
==30470==by 0x9F01FD4: MetaClipRegionAction::Write(SvStream, 
ImplMetaWriteData*) (metaact.cxx:2487)
...
==30470==  Address 0x1d175980 is 0 bytes inside a block of size 56 free'd
==30470==at 0x4A07991: operator delete(void*) (in 
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==30470==by 0xA020BB1: RegionBand::implReset() (regionband.cxx:87)
==30470==by 0xA020EF2: RegionBand::load(SvStream) (regionband.cxx:249)

Change-Id: I2468d43c7e73b3390f355358990f8af30b5f026e
(cherry picked from commit 1ca892488a7a6a9c35fc99c41cd4af788fe0df6e)
Reviewed-on: https://gerrit.libreoffice.org/11570
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx
index fa76743..adaa4b0 100644
--- a/vcl/source/gdi/regionband.cxx
+++ b/vcl/source/gdi/regionband.cxx
@@ -89,7 +89,7 @@ void RegionBand::implReset()
 }
 
 mpLastCheckedBand = 0;
-
+mpFirstBand = 0;
 }
 
 RegionBand::~RegionBand()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source

2014-09-23 Thread Luboš Luňák

 sw/qa/extras/ooxmlimport/data/bnc891663.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |9 +
 writerfilter/source/dmapper/GraphicImport.cxx |7 +++
 writerfilter/source/dmapper/PropertyIds.cxx   |1 +
 writerfilter/source/dmapper/PropertyIds.hxx   |1 +
 5 files changed, 18 insertions(+)

New commits:
commit 2a632bb30f78f02042ce333d426468087639305b
Author: LuboÅ¡ LuÅÃ¡k l.lu...@collabora.com
Date:   Sun Sep 21 17:52:58 2014 +0200

handle docx's w:anchor layoutInCell attribute (bnc#891663)

Change-Id: I8268567b84aa0f6e42624bfd0f79c8c49c153edd
Reviewed-on: https://gerrit.libreoffice.org/11568
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/sw/qa/extras/ooxmlimport/data/bnc891663.docx 
b/sw/qa/extras/ooxmlimport/data/bnc891663.docx
new file mode 100644
index 000..d5f057e
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/bnc891663.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 305b6ed..07761dd 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2275,6 +2275,15 @@ DECLARE_OOXMLIMPORT_TEST(testBnc519228OddBreaks, 
bnc519228_odd-breaks.docx)
 getParagraphOfText( 1, getProperty uno::Referencetext::XText 
(page5Style, HeaderText), This is the header for odd pages);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testBnc891663, bnc891663.docx)
+{
+// The image should be inside a cell, so the text in the following cell 
should be below it.
+int imageTop = 
parseDump(/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds,
 top).toInt32();
+int imageHeight = 
parseDump(/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds,
 height).toInt32();
+int textNextRowTop = 
parseDump(/root/page/body/tab/row[2]/cell[1]/txt[1]/infos/bounds, 
top).toInt32();
+CPPUNIT_ASSERT( textNextRowTop = imageTop + imageHeight );
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 6cd88a5..e2d3fa3 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -210,6 +210,7 @@ public:
 sal_Int16 nVertOrient;
 sal_Int16 nVertRelation;
 sal_Int32 nWrap;
+bool  bLayoutInCell;
 bool  bOpaque;
 bool  bContour;
 bool  bContourOutside;
@@ -283,6 +284,7 @@ public:
 ,nVertOrient(  text::VertOrientation::NONE )
 ,nVertRelation( text::RelOrientation::FRAME )
 ,nWrap(0)
+,bLayoutInCell(false)
 ,bOpaque( true )
 ,bContour(false)
 ,bContourOutside(true)
@@ -581,6 +583,8 @@ void GraphicImport::lcl_attribute(Id nName, Value rValue)
 break;
 case NS_ooxml::LN_CT_Anchor_locked: // 90990; - ignored
 case NS_ooxml::LN_CT_Anchor_layoutInCell: // 90991; - ignored
+m_pImpl-bLayoutInCell = nIntValue != 0;
+break;
 case NS_ooxml::LN_CT_Anchor_hidden: // 90992; - ignored
 break;
 case NS_ooxml::LN_CT_Anchor_allowOverlap: // 90993;
@@ -1230,6 +1234,9 @@ uno::Reference text::XTextContent  
GraphicImport::createGraphicObject( const b
 }
 
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_SURROUND ),
 uno::makeAny(m_pImpl-nWrap));
+if( m_pImpl-bLayoutInCell  m_pImpl-nWrap != 
text::WrapTextMode_THROUGHT )
+
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_FOLLOW_TEXT_FLOW ),
+uno::makeAny(true));
 
 
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_SURROUND_CONTOUR ),
 uno::makeAny(m_pImpl-bContour));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index 3f5fa05..fc81dae 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -394,6 +394,7 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) 
const
 case PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING : sName = 
ApplyParagraphMarkFormatToNumbering; break;
 case PROP_CELL_DIRECTION: sName = CellDirection; break;
 case PROP_CELL_HIDE_MARK: sName = CellHideMark; break;
+case PROP_FOLLOW_TEXT_FLOW: sName = IsFollowingTextFlow; break;
 }
 ::std::pairPropertyNameMap_t::iterator,bool aInsertIt =
 m_pImpl-aNameMap.insert( PropertyNameMap_t::value_type( eId, 
sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx 
b/writerfilter/source/dmapper/PropertyIds.hxx
index 3510e62..7394a50 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++

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

 chart2/source/view/charttypes/GL3DBarChart.cxx |   45 -
 chart2/source/view/inc/GL3DBarChart.hxx|2 -
 2 files changed, 31 insertions(+), 16 deletions(-)

New commits:
commit b8c442f2b924b03533c7029af3ad10b79e8a89c3
Author: xukai xu...@multicorewareinc.com
Date:   Mon Sep 22 16:38:41 2014 +0800

add 50 histories for histroy rendering

Change-Id: I26ff4655d682960ef397be27d5a9fc894502cf8a
Reviewed-on: https://gerrit.libreoffice.org/11579
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 6581392..8215158 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -29,7 +29,8 @@
 #define DATA_UPDATE_TIME 15
 #define FPS_TIME 500
 #define DATAUPDATE_FPS_TIME 1000
-#define HISTORY_NUM 5
+#define HISTORY_NUM 51
+#define COLUMNSIZE 25
 #define SHOW_VALUE_COUNT 15
 #define SHOW_SCROLL_TEXT_DISTANCE 1000
 #define FLY_THRESHOLD 20
@@ -1067,7 +1068,7 @@ void GL3DBarChart::updateRenderFPS()
 osl_getSystemTime(maFPSRenderStartTime);
 }
 osl_getSystemTime(maFPSRenderEndTime);
-addScreenTextShape(maFPS, glm::vec2(-0.99f, 0.99f), 0.06f, true,
+addScreenTextShape(maFPS, glm::vec2(-0.99f, 0.99f), 0.07f, true,
glm::vec3(0.0f, 0.0f, 0.0f), glm::vec4(1.0f, 0.0f, 
0.0f, 1.0f));
 }
 
@@ -1113,8 +1114,7 @@ void GL3DBarChart::updateDataUpdateFPS()
 osl_getSystemTime(maDataUpdateStartTime);
 }
 osl_getSystemTime(maDataUpdateEndTime);
-addScreenTextShape(maDataUpdateFPS, glm::vec2(-0.99f, 0.93f), 0.06f, true,
-glm::vec3(0.0f, 0.0f, 0.0f), glm::vec4(0.0f, 1.0f, 
1.0f, 1.0f));
+addScreenTextShape(maDataUpdateFPS, glm::vec2(-0.99f, 0.92f), 0.07f);
 }
 
 void GL3DBarChart::recordBarHistory(sal_uInt32 nBarID, float nVal)
@@ -1130,20 +1130,29 @@ void GL3DBarChart::updateClickEvent()
 if (maRenderEvent == EVENT_CLICK || maRenderEvent == EVENT_AUTO_FLY || 
maRenderEvent == EVENT_SHOW_SELECT)
 {
 std::listfloat aList = maBarHistory[mnSelectBarId];
-sal_uInt32 aIdex = 0;
+sal_uInt32 nIdex = 0;
 OUString aTitle;
 OUString aBarValue;
+float nXCoordStart;
+float nYCoordStart;
 //write title
 if (aList.size()  1)
 {
 aTitle = OUString(Time  );
-addScreenTextShape(aTitle, glm::vec2(0.8f, 0.99f), 0.1f, false);
+addScreenTextShape(aTitle, glm::vec2(0.875f, 0.99f), 0.07f, false);
 aTitle = OUString(   Value);
-addScreenTextShape(aTitle, glm::vec2(0.8f, 0.99f), 0.1f);
+addScreenTextShape(aTitle, glm::vec2(0.875f, 0.99f), 0.07f);
+}
+if (aList.size()  COLUMNSIZE)
+{
+aTitle = OUString(Time  );
+addScreenTextShape(aTitle, glm::vec2(0.55f, 0.99f), 0.07f, false);
+aTitle = OUString(   Value);
+addScreenTextShape(aTitle, glm::vec2(0.55f, 0.99f), 0.07f);
 }
 for (std::listfloat::iterator it = aList.begin();it != 
aList.end();++it)
 {
-if (aIdex + 1 == aList.size())
+if (nIdex + 1 == aList.size())
 {
 aBarValue = OUString(Value: ) + OUString::number(*it);
 maScreenTextShapes.push_back(new 
opengl3D::ScreenText(mpRenderer.get(), *mpTextCache, aBarValue, glm::vec4(0.0f, 
0.0f, 1.0f, 1.0f), CALC_POS_EVENT_ID));
@@ -1159,20 +1168,26 @@ void GL3DBarChart::updateClickEvent()
 }
 else
 {
-aTitle = OUString([Time:) + 
OUString::number((maHistoryCounter - aList.size() + aIdex)) + ]: ;
-if (aIdex == 0)
+aTitle = OUString([Time:) + 
OUString::number((maHistoryCounter - aList.size() + nIdex)) + ]: ;
+if (nIdex == 0)
 {
 aTitle = OUString(Most Recent) + aTitle;
 }
-else if ((aIdex + 2) == aList.size())
+if (aList.size()  COLUMNSIZE)
+{
+nXCoordStart = 0.875f;
+nYCoordStart = (nIdex + 1) * 0.07f;
+}
+else
 {
-aTitle = OUString(Least Recent) + aTitle;
+nXCoordStart = nIdex  COLUMNSIZE ? 0.55f : 0.875f;
+nYCoordStart = nIdex  COLUMNSIZE ? (nIdex + 1) * 0.07f : 
(nIdex - 24) * 0.07f;
 }
-addScreenTextShape(aTitle, glm::vec2(0.8f, 0.99f - ((aIdex + 
1) * 0.1f)), 0.1f, false);
+addScreenTextShape(aTitle, glm::vec2(nXCoordStart, 0.99f - 
nYCoordStart), 0.07f, false);
 aBarValue = OUString::number(*it);
-addScreenTextShape(aBarValue, glm::vec2(0.8f, 0.99f - ((aIdex 
+

[Libreoffice-commits] core.git: chart2/opengl chart2/source

 chart2/opengl/screenTextFragmentShader.glsl|6 +--
 chart2/source/view/charttypes/GL3DBarChart.cxx |   49 -
 chart2/source/view/inc/GL3DBarChart.hxx|4 +-
 chart2/source/view/main/GL3DRenderer.cxx   |6 ++-
 4 files changed, 41 insertions(+), 24 deletions(-)

New commits:
commit 7d833aa8a7e572dd266c1e9f52826cbdbfc95185
Author: xukai xu...@multicorewareinc.com
Date:   Mon Sep 22 17:40:30 2014 +0800

add translucent balck background for history rendering

Change-Id: I9da69bdb29bb780776355e79fab61d5d9bb844a4
Reviewed-on: https://gerrit.libreoffice.org/11583
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/opengl/screenTextFragmentShader.glsl 
b/chart2/opengl/screenTextFragmentShader.glsl
index f76abee..f60b54fd 100644
--- a/chart2/opengl/screenTextFragmentShader.glsl
+++ b/chart2/opengl/screenTextFragmentShader.glsl
@@ -13,11 +13,11 @@ in vec2 vTexCoord;
 uniform sampler2D TextTex;
 uniform vec4 textColor;
 out vec4 actualColor;
-
 void main()
 {
-vec3 color = texture(TextTex, vTexCoord).rgb;
-actualColor = vec4(textColor.rgb, 1.0 - color.r);
+vec3 color = texture2D(TextTex, vTexCoord).rgb;
+actualColor = ((1.0 - color.r) == 0.0) ? vec4(0.0, 0.0, 0.0, textColor.a) :
+vec4(textColor.rgb, 1.0);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 8215158..5241aa8 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -360,6 +360,9 @@ void RenderBenchMarkThread::MoveToCorner()
 void RenderBenchMarkThread::ProcessScroll()
 {
 //will add other process later
+mpChart-mpRenderer-EndClick();
+mnStep = 0;
+mnStepsTotal = STEPS;
 mpChart-maRenderEvent = EVENT_SHOW_SCROLL;
 }
 
@@ -1019,7 +1022,7 @@ void GL3DBarChart::scroll(long nDelta)
 SharedResourceAccess(maCond1, maCond2);
 osl::MutexGuard aGuard(maMutex);
 if ((maRenderEvent != EVENT_NONE)  (maRenderEvent != 
EVENT_SHOW_SCROLL) 
-(maRenderEvent != EVENT_AUTO_FLY)  (maRenderEvent == 
EVENT_SHOW_SELECT))
+(maRenderEvent != EVENT_AUTO_FLY)  (maRenderEvent != 
EVENT_SHOW_SELECT))
 return;
 glm::vec3 maDir = glm::normalize(maCameraPosition - maCameraDirection);
 maCameraPosition -= (float((nDelta/10)) * maDir);
@@ -1042,17 +1045,18 @@ void GL3DBarChart::contextDestroyed()
 mbValidContext = false;
 }
 
-void GL3DBarChart::addScreenTextShape(OUString nStr, glm::vec2 
rLeftOrRightTop, float nTextHeight, bool bLeftTopFlag,
-const glm::vec3 rPos, const 
glm::vec4 rColor, sal_uInt32 nEvent)
+float GL3DBarChart::addScreenTextShape(OUString nStr, glm::vec2 
aLeftOrRightTop, float nTextHeight, bool bLeftTopFlag,
+const glm::vec4 rColor, const 
glm::vec3 rPos, sal_uInt32 nEvent)
 {
 maScreenTextShapes.push_back(new opengl3D::ScreenText(mpRenderer.get(), 
*mpTextCache, nStr, rColor, nEvent));
 const opengl3D::TextCacheItem rTextCache = mpTextCache-getText(nStr);
 float nRectWidth = (float)rTextCache.maSize.Width() / 
(float)rTextCache.maSize.Height() * nTextHeight / 2.0f;
 opengl3D::ScreenText* pScreenText = 
static_castopengl3D::ScreenText*(maScreenTextShapes.back());
 if (bLeftTopFlag)
-pScreenText-setPosition(rLeftOrRightTop, glm::vec2(rLeftOrRightTop.x 
+ nRectWidth, rLeftOrRightTop.y - nTextHeight), rPos);
+pScreenText-setPosition(aLeftOrRightTop, glm::vec2(aLeftOrRightTop.x 
+ nRectWidth, aLeftOrRightTop.y - nTextHeight), rPos);
 else
-pScreenText-setPosition(glm::vec2(rLeftOrRightTop.x - nRectWidth, 
rLeftOrRightTop.y), glm::vec2(rLeftOrRightTop.x, rLeftOrRightTop.y - 
nTextHeight), rPos);
+pScreenText-setPosition(glm::vec2(aLeftOrRightTop.x - nRectWidth, 
aLeftOrRightTop.y), glm::vec2(aLeftOrRightTop.x, aLeftOrRightTop.y - 
nTextHeight), rPos);
+return nRectWidth;
 }
 
 void GL3DBarChart::updateRenderFPS()
@@ -1069,7 +1073,7 @@ void GL3DBarChart::updateRenderFPS()
 }
 osl_getSystemTime(maFPSRenderEndTime);
 addScreenTextShape(maFPS, glm::vec2(-0.99f, 0.99f), 0.07f, true,
-   glm::vec3(0.0f, 0.0f, 0.0f), glm::vec4(1.0f, 0.0f, 
0.0f, 1.0f));
+   glm::vec4(1.0f, 0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 
0.0f, 0.0f));
 }
 
 int GL3DBarChart::calcTimeInterval(TimeValue startTime, TimeValue endTime)
@@ -1133,29 +1137,32 @@ void GL3DBarChart::updateClickEvent()
 sal_uInt32 nIdex = 0;
 OUString aTitle;
 OUString aBarValue;
-float nXCoordStart;
-float nYCoordStart;
+float nXCoordStart, nYCoordStart, nTextWidth, nMaxXCoord = 0.0f, 
nMinXCoord = 1.0f, nMaxHight = 0.0f;
 //write title

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

 chart2/source/view/charttypes/GL3DBarChart.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit cc2bc03eb619e4016f6dd0e255726cda32a8dee6
Author: xukai xu...@multicorewareinc.com
Date:   Thu Aug 28 23:22:13 2014 +0800

fix the fly back bug

Change-Id: Ie866d02ab2ca3a5372dbeec6805eee42c8e10312
Reviewed-on: https://gerrit.libreoffice.org/11505
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 5241aa8..96f1019 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -310,6 +310,7 @@ void RenderBenchMarkThread::MoveToBar()
 maStepDirection = (maTargetDirection - 
mpChart-maCameraDirection)/((float)mnStepsTotal);
 mpChart-maClickCond.set();
 mbExecuting = true;
+mbNeedFlyBack = false;
 mpChart-mpRenderer-StartClick(mpChart-mnSelectBarId);
 }
 MoveCamera();
@@ -339,6 +340,7 @@ void RenderBenchMarkThread::AutoMoveToBar()
 maStepDirection = (maTargetDirection - 
mpChart-maCameraDirection)/((float)mnStepsTotal);
 mpChart-mpRenderer-StartClick(mpChart-mnSelectBarId);
 mbAutoFlyExecuting = true;
+mbNeedFlyBack = false;
 }
 MoveCamera();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 chart2/source/view/charttypes/GL3DBarChart.cxx |   64 +
 chart2/source/view/inc/GL3DBarChart.hxx|5 +
 2 files changed, 50 insertions(+), 19 deletions(-)

New commits:
commit 221c2eb24b5eeeadb265cfd010fd6851715b24b5
Author: xukai xu...@multicorewareinc.com
Date:   Mon Sep 22 18:18:35 2014 +0800

Show values of bars in selected row

Change-Id: I18fbdcb05e3c95c20c96b426bf93e85657209f34
Reviewed-on: https://gerrit.libreoffice.org/11584
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 96f1019..d244c6f 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -34,6 +34,7 @@
 #define SHOW_VALUE_COUNT 15
 #define SHOW_SCROLL_TEXT_DISTANCE 1000
 #define FLY_THRESHOLD 20
+#define DISPLAY_BARS_NUM 3
 
 
 using namespace com::sun::star;
@@ -473,7 +474,8 @@ GL3DBarChart::GL3DBarChart(
 miDataUpdateCounter(0),
 mnColorRate(0),
 mbBenchMarkMode(false),
-maHistoryCounter(0)
+mnHistoryCounter(0),
+mnBarsInRow(0)
 {
 maFPSRenderStartTime.Seconds = maFPSRenderStartTime.Nanosec = 0;
 maFPSRenderEndTime.Seconds = maFPSRenderEndTime.Nanosec = 0;
@@ -573,6 +575,8 @@ void GL3DBarChart::create3DShapes(const 
boost::ptr_vectorVDataSeries rDataSer
 sal_Int32 nSeriesIndex = 0;
 sal_Int32 nMaxPointCount = 0;
 double nMaxVal = findMaxValue(rDataSeriesContainer)/100;
+const VDataSeries rFirstRow = *(rDataSeriesContainer.begin());
+mnBarsInRow = rFirstRow.getTotalPointCount();
 for (boost::ptr_vectorVDataSeries::const_iterator itr = 
rDataSeriesContainer.begin(),
 itrEnd = rDataSeriesContainer.end(); itr != itrEnd; ++itr)
 {
@@ -767,7 +771,7 @@ void GL3DBarChart::create3DShapes(const 
boost::ptr_vectorVDataSeries rDataSer
 spawnRenderThread(new RenderBenchMarkThread(this));
 }
 miDataUpdateCounter++;
-maHistoryCounter++;
+mnHistoryCounter++;
 mbNeedsNewRender = true;
 }
 
@@ -1131,12 +1135,45 @@ void GL3DBarChart::recordBarHistory(sal_uInt32 nBarID, 
float nVal)
 aList.push_back(nVal);
 }
 
+void GL3DBarChart::getNeighborBarID(sal_uInt32 nSelectBarId, sal_uInt32 
*pNeighborBarId)
+{
+sal_uInt32 nSelectRow = (nSelectBarId - SHAPE_START_ID) / ID_STEP / 
(mnBarsInRow + 1);
+for (sal_Int32 i = 0; i  DISPLAY_BARS_NUM; i++)
+{
+pNeighborBarId[i] = nSelectBarId + (i - DISPLAY_BARS_NUM / 2) * 
ID_STEP;
+if (pNeighborBarId[i] == nSelectBarId)
+continue;
+if ((pNeighborBarId[i] - SHAPE_START_ID) / ID_STEP / (mnBarsInRow + 1) 
!= nSelectRow)
+pNeighborBarId[i] = 0;
+}
+}
+
+void GL3DBarChart::addMovementScreenText(sal_uInt32 nBarId)
+{
+if (nBarId == 0)
+return;
+std::mapsal_uInt32, const BarInformation::const_iterator itr = 
maBarMap.find(nBarId);
+if (itr == maBarMap.end())
+return;
+const BarInformation rBarInfo = itr-second;
+glm::vec3 aTextPos = glm::vec3(rBarInfo.maPos.x + BAR_SIZE_X / 2.0f,
+  rBarInfo.maPos.y + BAR_SIZE_Y / 2.0f,
+  rBarInfo.maPos.z);
+OUString aBarValue = OUString(Value: ) + 
OUString::number(rBarInfo.mnVal);
+maScreenTextShapes.push_back(new opengl3D::ScreenText(mpRenderer.get(), 
*mpTextCache, aBarValue, glm::vec4(0.0f, 0.0f, 1.0f, 0.0f), CALC_POS_EVENT_ID));
+const opengl3D::TextCacheItem rTextCache = 
mpTextCache-getText(aBarValue);
+float nRectWidth = (float)rTextCache.maSize.Width() / 
(float)rTextCache.maSize.Height() * 0.03;
+opengl3D::ScreenText* pScreenText = 
static_castopengl3D::ScreenText*(maScreenTextShapes.back());
+pScreenText-setPosition(glm::vec2(-nRectWidth / 2, 0.03f), 
glm::vec2(nRectWidth / 2, -0.03f), aTextPos);
+}
+
 void GL3DBarChart::updateClickEvent()
 {
 if (maRenderEvent == EVENT_CLICK || maRenderEvent == EVENT_AUTO_FLY || 
maRenderEvent == EVENT_SHOW_SELECT)
 {
 std::listfloat aList = maBarHistory[mnSelectBarId];
 sal_uInt32 nIdex = 0;
+sal_uInt32 nBarIdArray[DISPLAY_BARS_NUM] = {0};
 OUString aTitle;
 OUString aBarValue;
 float nXCoordStart, nYCoordStart, nTextWidth, nMaxXCoord = 0.0f, 
nMinXCoord = 1.0f, nMaxHight = 0.0f;
@@ -1159,25 +1196,12 @@ void GL3DBarChart::updateClickEvent()
 nTextWidth = addScreenTextShape(aTitle, glm::vec2(0.55f, 0.99f), 
0.07f, true, glm::vec4(0.0f, 1.0f, 1.0f, 0.5f));
 nMaxXCoord = std::max(nMaxXCoord, 0.55f + nTextWidth);
 }
+getNeighborBarID(mnSelectBarId, nBarIdArray);
 for (std::listfloat::iterator it = aList.begin();it != 
aList.end();++it)
 {
-if (nIdex + 1 == aList.size())
+if (nIdex + 1  aList.size())
 {
-aBarValue =

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

 chart2/source/view/charttypes/GL3DBarChart.cxx |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 35d4c21bf0faaffb87c5197f6d0b3d798aca33bd
Author: xukai xu...@multicorewareinc.com
Date:   Tue Sep 2 16:04:36 2014 +0800

Update the color of FPS text

Change-Id: Ic6f5889e24f98101426fc215c0313122797400b7
Reviewed-on: https://gerrit.libreoffice.org/11507
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index d244c6f..0604f0e 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -1073,12 +1073,14 @@ void GL3DBarChart::updateRenderFPS()
 osl_getSystemTime(maFPSRenderEndTime);
 nDeltaMs = calcTimeInterval(maFPSRenderStartTime, maFPSRenderEndTime);
 int iFPS = miFrameCount * 1000 / nDeltaMs;
-maFPS = OUString(Render FPS: ) + OUString::number(iFPS);
+maFPS =  OUString::number(iFPS);
 miFrameCount = 0;
 osl_getSystemTime(maFPSRenderStartTime);
 }
 osl_getSystemTime(maFPSRenderEndTime);
-addScreenTextShape(maFPS, glm::vec2(-0.99f, 0.99f), 0.07f, true,
+OUString aFPS = OUString(Render FPS: );
+addScreenTextShape(aFPS, glm::vec2(-0.77f, 0.99f), 0.07f, false, 
glm::vec4(0.0f, 1.0f, 1.0f, 0.0f));
+addScreenTextShape(maFPS, glm::vec2(-0.77f, 0.99f), 0.07f, true,
glm::vec4(1.0f, 0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 
0.0f, 0.0f));
 }
 
@@ -1113,18 +1115,20 @@ void GL3DBarChart::updateDataUpdateFPS()
 int iFPS = miDataUpdateCounter * 1000 / nDeltaMs;
 if (iFPS)
 {
-maDataUpdateFPS = OUString(Data Update Rate: ) + 
OUString::number(iFPS);
+maDataUpdateFPS = OUString::number(iFPS);
 }
 else
 {
 float fFPS = (float)miDataUpdateCounter * 1000 / (float)nDeltaMs;
-maDataUpdateFPS = OUString(Data Update Rate: ) + 
OUString::number(fFPS);
+maDataUpdateFPS = OUString::number(fFPS);
 }
 miDataUpdateCounter = 0;
 osl_getSystemTime(maDataUpdateStartTime);
 }
 osl_getSystemTime(maDataUpdateEndTime);
-addScreenTextShape(maDataUpdateFPS, glm::vec2(-0.99f, 0.92f), 0.07f);
+OUString aDataUpdateFPS = OUString(Data Update Rate: );
+addScreenTextShape(aDataUpdateFPS, glm::vec2(-0.77, 0.92f), 0.07f, false, 
glm::vec4(0.0f, 1.0f, 1.0f, 0.0f));
+addScreenTextShape(maDataUpdateFPS, glm::vec2(-0.77f, 0.92f), 0.07f, true, 
glm::vec4(1.0f, 0.0f, 0.0f, 0.0f));
 }
 
 void GL3DBarChart::recordBarHistory(sal_uInt32 nBarID, float nVal)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 chart2/source/view/inc/3DChartObjects.hxx  |6 +++---
 chart2/source/view/main/3DChartObjects.cxx |   12 
 2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 98cb400d08a35d26e211fffda24e5b7c6e6672bf
Author: xukai xu...@multicorewareinc.com
Date:   Mon Sep 22 19:01:31 2014 +0800

3D fonts suport

Change-Id: Id8142586e8ace4ba91a30b2f78d1216f89f22148
Reviewed-on: https://gerrit.libreoffice.org/11585
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/view/inc/3DChartObjects.hxx 
b/chart2/source/view/inc/3DChartObjects.hxx
old mode 100644
new mode 100755
index 49b21a3..39d09b4
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -37,7 +37,7 @@ struct TextCacheItem
 class TextCache
 {
 public:
-const TextCacheItem getText(OUString const  rText);
+const TextCacheItem getText(OUString const  rText, bool bIs3dText = 
false);
 private:
 typedef boost::ptr_mapOUString const, TextCacheItem TextCacheType;
 
@@ -108,8 +108,8 @@ private:
 class ScreenText : public Renderable3DObject
 {
 public:
-ScreenText(OpenGL3DRenderer* pRenderer, TextCache rTextCache, const 
OUString rStr,
-const glm::vec4 rColor, sal_uInt32 nId);
+ScreenText(OpenGL3DRenderer* pRenderer, TextCache rTextCache,
+const OUString rStr, glm::vec4 rColor, sal_uInt32 nId, bool bIs3dText 
= false);
 
 virtual void render() SAL_OVERRIDE;
 void setPosition(const glm::vec2 rTopLeft, const glm::vec2 rBottomRight,
diff --git a/chart2/source/view/main/3DChartObjects.cxx 
b/chart2/source/view/main/3DChartObjects.cxx
old mode 100644
new mode 100755
index c0992e4..13d1fb3
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -70,14 +70,18 @@ void Line::setLineColor(const Color rColor)
 maLineColor = rColor;
 }
 
-const TextCacheItem TextCache::getText(OUString const  rText)
+const TextCacheItem TextCache::getText(OUString const  rText, bool bIs3dText)
 {
 TextCacheType::const_iterator itr = maTextCache.find(rText);
 if(itr != maTextCache.end())
 return *itr-second;
 
 VirtualDevice aDevice(*Application::GetDefaultDevice(), 0, 0);
-vcl::Font aFont = aDevice.GetFont();
+vcl::Font aFont;
+if(bIs3dText)
+aFont = vcl::Font(postoffice Bold,Size(0,0));
+else
+aFont = aDevice.GetFont();
 aFont.SetSize(Size(0, 96));
 static bool bOldRender = getenv(OLDRENDER);
 if (bOldRender)
@@ -129,9 +133,9 @@ void Text::setPosition(const glm::vec3 rTopLeft, const 
glm::vec3 rTopRight, co
 }
 
 ScreenText::ScreenText(OpenGL3DRenderer* pRenderer, TextCache rTextCache,
-const OUString rStr, const glm::vec4 rColor, sal_uInt32 nId):
+const OUString rStr, glm::vec4 rColor, sal_uInt32 nId, bool 
bIs3dText):
 Renderable3DObject(pRenderer, nId),
-maText(rTextCache.getText(rStr)),
+maText(rTextCache.getText(rStr,bIs3dText)),
 maColor(rColor)
 {
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 chart2/source/view/charttypes/GL3DBarChart.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 57cc338ddfd2fcca35641ef9f49f13caac932754
Author: xukai xu...@multicorewareinc.com
Date:   Fri Sep 19 13:10:57 2014 +0800

Using 3D fonts

Change-Id: If6cdece9f100f51b7a69ac4be4e316fb9c9928d5
Reviewed-on: https://gerrit.libreoffice.org/11535
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 0604f0e..b863dee 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -1164,9 +1164,9 @@ void GL3DBarChart::addMovementScreenText(sal_uInt32 
nBarId)
   rBarInfo.maPos.y + BAR_SIZE_Y / 2.0f,
   rBarInfo.maPos.z);
 OUString aBarValue = OUString(Value: ) + 
OUString::number(rBarInfo.mnVal);
-maScreenTextShapes.push_back(new opengl3D::ScreenText(mpRenderer.get(), 
*mpTextCache, aBarValue, glm::vec4(0.0f, 0.0f, 1.0f, 0.0f), CALC_POS_EVENT_ID));
+maScreenTextShapes.push_back(new opengl3D::ScreenText(mpRenderer.get(), 
*mpTextCache, aBarValue, glm::vec4(0.0f, 0.0f, 1.0f, 0.0f), CALC_POS_EVENT_ID, 
true));
 const opengl3D::TextCacheItem rTextCache = 
mpTextCache-getText(aBarValue);
-float nRectWidth = (float)rTextCache.maSize.Width() / 
(float)rTextCache.maSize.Height() * 0.03;
+float nRectWidth = (float)rTextCache.maSize.Width() / 
(float)rTextCache.maSize.Height() * 0.015;
 opengl3D::ScreenText* pScreenText = 
static_castopengl3D::ScreenText*(maScreenTextShapes.back());
 pScreenText-setPosition(glm::vec2(-nRectWidth / 2, 0.03f), 
glm::vec2(nRectWidth / 2, -0.03f), aTextPos);
 }
@@ -1361,9 +1361,9 @@ void GL3DBarChart::updateScroll()
 for(size_t i = 0; i  aBarInfoList.size(); i++)
 {
 OUString aBarValue = OUString(Value: ) + 
OUString::number(aBarInfoList[i].mnVal);
-maScreenTextShapes.push_back(new 
opengl3D::ScreenText(mpRenderer.get(), *mpTextCache, aBarValue, glm::vec4(0.0f, 
0.0f, 1.0f, 0.0f), CALC_POS_EVENT_ID));
+maScreenTextShapes.push_back(new 
opengl3D::ScreenText(mpRenderer.get(), *mpTextCache, aBarValue, glm::vec4(0.0f, 
0.0f, 1.0f, 0.0f), CALC_POS_EVENT_ID, true));
 const opengl3D::TextCacheItem rTextCache = 
mpTextCache-getText(aBarValue);
-float nRectWidth = (float)rTextCache.maSize.Width() / 
(float)rTextCache.maSize.Height() * 0.03;
+float nRectWidth = (float)rTextCache.maSize.Width() / 
(float)rTextCache.maSize.Height() * 0.015;
 glm::vec3 aTextPos = glm::vec3(aBarInfoList[i].maPos.x + 
BAR_SIZE_X / 2.0f,
   aBarInfoList[i].maPos.y + BAR_SIZE_Y / 
2.0f,
   aBarInfoList[i].maPos.z);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 chart2/source/view/charttypes/GL3DBarChart.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e975f78a306df35663319d03c882cb679c12e20c
Author: xukai xu...@multicorewareinc.com
Date:   Sat Sep 13 10:31:42 2014 +0800

instead of a top view a 45 degree view

Change-Id: Iaf922b998552778c527440c4b3a83cb8c05d2a6e
Reviewed-on: https://gerrit.libreoffice.org/11536
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index b863dee..3474de3 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -304,10 +304,11 @@ void RenderBenchMarkThread::MoveToBar()
 glm::vec3 maTargetPosition = rBarInfo.maPos;
 maTargetPosition.z += 240;
 maTargetPosition.x += BAR_SIZE_X / 2.0f;
-maStep = (maTargetPosition - 
mpChart-maCameraPosition)/((float)mnStepsTotal);
 glm::vec3 maTargetDirection = rBarInfo.maPos;
 maTargetDirection.x += BAR_SIZE_X / 2.0f;
 maTargetDirection.y += BAR_SIZE_Y / 2.0f;
+maTargetPosition.y = maTargetDirection.y - 240;
+maStep = (maTargetPosition - 
mpChart-maCameraPosition)/((float)mnStepsTotal);
 maStepDirection = (maTargetDirection - 
mpChart-maCameraDirection)/((float)mnStepsTotal);
 mpChart-maClickCond.set();
 mbExecuting = true;
@@ -334,10 +335,11 @@ void RenderBenchMarkThread::AutoMoveToBar()
 glm::vec3 maTargetPosition = rBarInfo.maPos;
 maTargetPosition.z += 240;
 maTargetPosition.x += BAR_SIZE_X / 2.0f;
-maStep = (maTargetPosition - 
mpChart-maCameraPosition)/((float)mnStepsTotal);
 glm::vec3 maTargetDirection = rBarInfo.maPos;
 maTargetDirection.x += BAR_SIZE_X / 2.0f;
 maTargetDirection.y += BAR_SIZE_Y / 2.0f;
+maTargetPosition.y = maTargetDirection.y - 240;
+maStep = (maTargetPosition - 
mpChart-maCameraPosition)/((float)mnStepsTotal);
 maStepDirection = (maTargetDirection - 
mpChart-maCameraDirection)/((float)mnStepsTotal);
 mpChart-mpRenderer-StartClick(mpChart-mnSelectBarId);
 mbAutoFlyExecuting = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 chart2/source/view/inc/GL3DRenderer.hxx  |4 
 chart2/source/view/main/GL3DRenderer.cxx |   23 +++
 2 files changed, 27 insertions(+)

New commits:
commit 080bab41b64d9531c9d2ae9e5125fd4876bca0bb
Author: xukai xu...@multicorewareinc.com
Date:   Mon Sep 22 19:50:26 2014 +0800

Add function:GetDiffOfTwoCameras

Change-Id: I3b3f4e8e18d5970d408adcf0457bfdd4e064e37c
Reviewed-on: https://gerrit.libreoffice.org/11588
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/view/inc/GL3DRenderer.hxx 
b/chart2/source/view/inc/GL3DRenderer.hxx
index fe3e96d..655120c 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -282,6 +282,9 @@ private:
 void SetHighLightBar(BatchBarInfo barInfo);
 void DisableHighLightBar(BatchBarInfo barInfo);
 void CalcScrollMoveMatrix(bool bNewScene);
+glm::mat4 GetDiffOfTwoCameras(const glm::vec3 rBeginPos, const glm::vec3 
rEndPos, const glm::vec3 rBeginDirection, const glm::vec3 rEndDirection);
+void AddMatrixDiff(const glm::mat4 aMat);
+void ResetMatrixDiff();
 private:
 
 struct ShaderResources
@@ -478,6 +481,7 @@ private:
 float m_fCurDistance;
 glm::mat4 m_ScrollMoveMatrix;
 bool m_bUndrawFlag;
+glm::mat4 m_matDiff;
 };
 
 }
diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index 5991a3f..c3397a4 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -96,6 +96,7 @@ OpenGL3DRenderer::OpenGL3DRenderer():
 , m_fCurDistance(0.0f)
 , m_ScrollMoveMatrix(glm::mat4(1.0))
 , m_bUndrawFlag(false)
+, m_matDiff(glm::mat4(0.0))
 {
 m_Polygon3DInfo.lineOnly = false;
 m_Polygon3DInfo.twoSidesLighting = false;
@@ -2138,6 +2139,17 @@ void OpenGL3DRenderer::CreateSceneBoxView()
 m_3DView = glm::lookAt(m_CameraInfo.cameraPos,
m_CameraInfo.cameraOrg,
m_CameraInfo.cameraUp);
+m_3DView = m_3DView + m_matDiff;
+}
+
+void OpenGL3DRenderer::AddMatrixDiff(const glm::mat4 aMat)
+{
+m_matDiff = m_matDiff + aMat;
+}
+
+void OpenGL3DRenderer::ResetMatrixDiff()
+{
+m_matDiff = glm::mat4(0.0);
 }
 
 void OpenGL3DRenderer::ClearBuffer()
@@ -2440,6 +2452,17 @@ void OpenGL3DRenderer::CalcScrollMoveMatrix(bool 
bNewScene)
 m_bUndrawFlag = m_fCurDistance = m_fScrollDistance ? true : false;
 }
 
+glm::mat4 OpenGL3DRenderer::GetDiffOfTwoCameras(const glm::vec3 rBeginPos, 
const glm::vec3 rEndPos, const glm::vec3 rBeginDirection, const glm::vec3 
rEndDirection)
+{
+glm::mat4 aBegin = glm::lookAt(glm::vec3(m_GlobalScaleMatrix * 
glm::vec4(rBeginPos, 1.0)),
+  glm::vec3(m_GlobalScaleMatrix * glm::vec4(rBeginDirection, 1.0)),
+  glm::vec3(0, 0, 1));
+glm::mat4 aEnd = glm::lookAt(glm::vec3(m_GlobalScaleMatrix * 
glm::vec4(rEndPos, 1.0)),
+  glm::vec3(m_GlobalScaleMatrix * glm::vec4(rEndDirection, 1.0)),
+  glm::vec3(0, 0, 1));
+return aEnd - aBegin;
+}
+
 glm::mat4 OpenGL3DRenderer::GetProjectionMatrix()
 {
 return m_3DProjection;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 chart2/source/view/inc/GL3DRenderer.hxx  |7 ---
 chart2/source/view/main/GL3DRenderer.cxx |7 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 192b360cfb1bf422f282f4c93e7d0fc0fe83f7db
Author: xukai xu...@multicorewareinc.com
Date:   Mon Sep 22 20:06:32 2014 +0800

overloaded function GetDiffOfTwoCameras

Change-Id: Ic195c846364ddf9c798d019eed23c27200713017
Reviewed-on: https://gerrit.libreoffice.org/11589
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/view/inc/GL3DRenderer.hxx 
b/chart2/source/view/inc/GL3DRenderer.hxx
old mode 100644
new mode 100755
index 655120c..b4597a1
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -220,6 +220,10 @@ public:
 glm::mat4 GetProjectionMatrix();
 glm::mat4 GetViewMatrix();
 glm::mat4 GetGlobalScaleMatrix();
+glm::mat4 GetDiffOfTwoCameras(const glm::vec3 rBeginPos, const glm::vec3 
rEndPos, const glm::vec3 rBeginDirection, const glm::vec3 rEndDirection);
+glm::mat4 GetDiffOfTwoCameras(const glm::vec3 rEndPos, const glm::vec3 
rEndDirection);
+void AddMatrixDiff(const glm::mat4 aMat);
+void ResetMatrixDiff();
 private:
 void MoveModelf( const PosVecf3 trans, const PosVecf3 angle, const 
PosVecf3 scale);
 
@@ -282,9 +286,6 @@ private:
 void SetHighLightBar(BatchBarInfo barInfo);
 void DisableHighLightBar(BatchBarInfo barInfo);
 void CalcScrollMoveMatrix(bool bNewScene);
-glm::mat4 GetDiffOfTwoCameras(const glm::vec3 rBeginPos, const glm::vec3 
rEndPos, const glm::vec3 rBeginDirection, const glm::vec3 rEndDirection);
-void AddMatrixDiff(const glm::mat4 aMat);
-void ResetMatrixDiff();
 private:
 
 struct ShaderResources
diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
old mode 100644
new mode 100755
index c3397a4..6b0004f
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -2463,6 +2463,13 @@ glm::mat4 OpenGL3DRenderer::GetDiffOfTwoCameras(const 
glm::vec3 rBeginPos, cons
 return aEnd - aBegin;
 }
 
+glm::mat4 OpenGL3DRenderer::GetDiffOfTwoCameras(const glm::vec3 rEndPos, 
const glm::vec3 rEndDirection)
+{
+glm::mat4 aEnd = glm::lookAt(glm::vec3(m_GlobalScaleMatrix * 
glm::vec4(rEndPos, 1.0)),
+ glm::vec3(m_GlobalScaleMatrix * glm::vec4(rEndDirection, 
1.0)),glm::vec3(0, 0, 1));
+return aEnd - m_3DView;
+}
+
 glm::mat4 OpenGL3DRenderer::GetProjectionMatrix()
 {
 return m_3DProjection;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 chart2/source/view/charttypes/GL3DBarChart.cxx |   74 +
 1 file changed, 52 insertions(+), 22 deletions(-)

New commits:
commit 5c9ca2fb863e84ae2328f6b0186e137cd5f02ed6
Author: xukai xu...@multicorewareinc.com
Date:   Fri Sep 19 15:18:41 2014 +0800

update effect of bar click

Change-Id: Ibb09537d418e78c7fc9b6760988abd56505268b3
Reviewed-on: https://gerrit.libreoffice.org/11539
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index d07653f..9b44421 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -567,6 +567,19 @@ void GL3DBarChart::create3DShapes(const 
boost::ptr_vectorVDataSeries rDataSer
 {
 SharedResourceAccess(maCond1, maCond2);
 osl::MutexGuard aGuard(maMutex);
+mnPreSelectBarId = mnSelectBarId;
+mnSelectBarId -= 10;
+sal_uInt32 nSelectRow = (mnSelectBarId - SHAPE_START_ID) / ID_STEP / 
(mnBarsInRow + 1);
+sal_uInt32 nPreSelectRow = (mnPreSelectBarId - SHAPE_START_ID) / ID_STEP / 
(mnBarsInRow + 1);
+if(nSelectRow != nPreSelectRow)
+{
+mnSelectBarId = mnPreSelectBarId;
+}
+else
+{
+mpRenderer-EndClick();
+mpRenderer-StartClick(mnSelectBarId);
+}
 mpRenderer-ReleaseShapes();
 // Each series of data flows from left to right, and multiple series are
 // stacked vertically along y axis.
commit 32d267f556634d3bbceba4978efc4d8cb62b148c
Author: xukai xu...@multicorewareinc.com
Date:   Mon Sep 22 20:08:26 2014 +0800

make Camera flythrough looks more smooth

Change-Id: I46f79bb6ede2da133fe8971319fc4b7257848382
Reviewed-on: https://gerrit.libreoffice.org/11590
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 3474de3..d07653f 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -209,6 +209,7 @@ protected:
 private:
 void ProcessMouseEvent();
 void MoveCamera();
+void MoveCameraToBar();
 void MoveToBar();
 void MoveToDefault();
 void MoveToCorner();
@@ -224,11 +225,14 @@ private:
 bool mbNeedFlyBack;
 glm::vec3 maStep;
 glm::vec3 maStepDirection;
+glm::mat4 maMatrixStep;
 size_t mnStep;
 size_t mnStepsTotal;
 TimeValue maClickFlyBackStartTime;
 TimeValue maClickFlyBackEndTime;
 OUString maFPS;
+glm::vec3 maTargetPosition;
+glm::vec3 maTargetDirection;
 };
 
 void RenderBenchMarkThread::MoveCamera()
@@ -246,21 +250,36 @@ void RenderBenchMarkThread::MoveCamera()
 mnStep = 0;
 mbExecuting = false;
 mbAutoFlyExecuting = false;
-if ((mpChart-maRenderEvent == EVENT_CLICK) || (mpChart-maRenderEvent 
== EVENT_AUTO_FLY))
-{
-mbNeedFlyBack = true;
-osl_getSystemTime(maClickFlyBackStartTime);
-osl_getSystemTime(maClickFlyBackEndTime);
-mpChart-maRenderEvent = EVENT_SHOW_SELECT;
-}
-else
-{
-mbNeedFlyBack = false;
-mpChart-maRenderEvent = EVENT_NONE;
-}
+mbNeedFlyBack = false;
+mpChart-maRenderEvent = EVENT_NONE;
+}
+}
+
+void RenderBenchMarkThread::MoveCameraToBar()
+{
+if(mnStep  mnStepsTotal)
+{
+++mnStep;
+mpChart-mpRenderer-AddMatrixDiff(maMatrixStep);
+}
+else
+{
+mpChart-maCameraPosition = maTargetPosition;
+mpChart-maCameraDirection = maTargetDirection;
+mpChart-mpCamera-setPosition(maTargetPosition);
+mpChart-mpCamera-setDirection(maTargetDirection);
+mpChart-mpRenderer-ResetMatrixDiff();
+mnStep = 0;
+mbExecuting = false;
+mbAutoFlyExecuting = false;
+mbNeedFlyBack = true;
+osl_getSystemTime(maClickFlyBackStartTime);
+osl_getSystemTime(maClickFlyBackEndTime);
+mpChart-maRenderEvent = EVENT_SHOW_SELECT;
 }
 }
 
+
 void RenderBenchMarkThread::MoveToDefault()
 {
 if ((mpChart-maCameraPosition == mpChart-maDefaultCameraDirection) 
@@ -301,21 +320,20 @@ void RenderBenchMarkThread::MoveToBar()
 const GL3DBarChart::BarInformation rBarInfo = itr-second;
 mnStep = 0;
 mnStepsTotal = STEPS;
-glm::vec3 maTargetPosition = rBarInfo.maPos;
+maTargetPosition = rBarInfo.maPos;
 maTargetPosition.z += 240;
 maTargetPosition.x += BAR_SIZE_X / 2.0f;
-glm::vec3 maTargetDirection = rBarInfo.maPos;
+maTargetDirection = rBarInfo.maPos;
 maTargetDirection.x += BAR_SIZE_X / 2.0f;
 maTargetDirection.y += BAR_SIZE_Y / 2.0f;
 maTargetPosition.y = maTargetDirection.y - 240;
-

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

 chart2/source/view/charttypes/GL3DBarChart.cxx |   11 +--
 chart2/source/view/inc/GL3DBarChart.hxx|1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit bc1b8dd63e74c255a989ac51a92d7db0bba75bc3
Author: xukai xu...@multicorewareinc.com
Date:   Fri Sep 19 15:26:34 2014 +0800

use environment AUTO_FLY to control if autofly

Change-Id: Ie47dfdc5f3b07f6e1a6336fc235ac6ccd5d53cab
Reviewed-on: https://gerrit.libreoffice.org/11540
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 9b44421..7eefac6 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -494,7 +494,8 @@ GL3DBarChart::GL3DBarChart(
 mnColorRate(0),
 mbBenchMarkMode(false),
 mnHistoryCounter(0),
-mnBarsInRow(0)
+mnBarsInRow(0),
+mbAutoFly(false)
 {
 maFPSRenderStartTime.Seconds = maFPSRenderStartTime.Nanosec = 0;
 maFPSRenderEndTime.Seconds = maFPSRenderEndTime.Nanosec = 0;
@@ -518,6 +519,11 @@ GL3DBarChart::GL3DBarChart(
 mpRenderer-SetScroll();
 }
 }
+char *aAutoFly = getenv(AUTO_FLY);
+if (aAutoFly)
+{
+mbAutoFly = atoi(aAutoFly);
+}
 maTimer.SetTimeout(DATA_UPDATE_TIME);
 maTimer.SetTimeoutHdl(LINK(this, GL3DBarChart, updateTimer));
 maTimer.Start();
@@ -676,7 +682,8 @@ void GL3DBarChart::create3DShapes(const 
boost::ptr_vectorVDataSeries rDataSer
 }
 else
 {
-processAutoFly(nId, nColor);
+if(mbAutoFly)
+processAutoFly(nId, nColor);
 }
 }
 maShapes.push_back(new opengl3D::Bar(mpRenderer.get(), 
aBarPosition, nColor, nId));
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx 
b/chart2/source/view/inc/GL3DBarChart.hxx
index bebca58..4ae2385 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -192,6 +192,7 @@ private:
 bool mbBenchMarkMode;
 sal_uInt32 mnHistoryCounter;
 sal_uInt32 mnBarsInRow;
+bool mbAutoFly;
 
 
 // these form a pair:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 chart2/source/view/charttypes/GL3DBarChart.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9d97b1a7b1c7f3258335513518c762bd16745f17
Author: xukai xu...@multicorewareinc.com
Date:   Fri Sep 19 15:53:20 2014 +0800

fdo#84001: update environment name BENCHMARK_MODE to UNLOCK_FPS_MODE

Change-Id: I7837b2b2639cd003931227f3eb957ef90b905fd0

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 7eefac6..cf05724 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -502,7 +502,7 @@ GL3DBarChart::GL3DBarChart(
 maDataUpdateStartTime.Seconds = maDataUpdateStartTime.Nanosec = 0;
 maDataUpdateEndTime.Seconds = maDataUpdateEndTime.Nanosec = 0;
 
-static const char *aBenchMark = getenv(UNLOCKED_FRAMERATE);
+static const char *aBenchMark = getenv(UNLOCK_FPS_MODE);
 if (aBenchMark)
 {
 mbBenchMarkMode = atoi(aBenchMark);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 chart2/source/view/charttypes/GL3DBarChart.cxx |   68 +++--
 chart2/source/view/inc/GL3DBarChart.hxx|5 +
 2 files changed, 57 insertions(+), 16 deletions(-)

New commits:
commit 7f895dfbf5fb084d747e52db678d75e3273cd825
Author: xukai xu...@multicorewareinc.com
Date:   Fri Sep 19 15:38:19 2014 +0800

update camera when bar is clicked

Change-Id: Icf397070d1b17a282a07e166d1387881b854b337
Reviewed-on: https://gerrit.libreoffice.org/11541
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index cf05724..5a05323 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -42,7 +42,7 @@ using namespace com::sun::star;
 namespace chart {
 
 const size_t STEPS = 200;
-
+const size_t STEPS_UPDATE = 100;
 namespace {
 
 const float TEXT_HEIGHT = 10.0f;
@@ -211,6 +211,7 @@ private:
 void MoveCamera();
 void MoveCameraToBar();
 void MoveToBar();
+void MoveToSelectedBar();
 void MoveToDefault();
 void MoveToCorner();
 void ProcessScroll();
@@ -336,6 +337,36 @@ void RenderBenchMarkThread::MoveToBar()
 MoveCameraToBar();
 }
 
+void RenderBenchMarkThread::MoveToSelectedBar()
+{
+mpChart-mnSelectBarId = mpChart-mnUpdateBarId;
+std::mapsal_uInt32, const GL3DBarChart::BarInformation::const_iterator 
itr = mpChart-maBarMap.find(mpChart-mnSelectBarId);
+if(itr == mpChart-maBarMap.end())
+{
+mpChart-mnSelectBarId = mpChart-mnPreSelectBarId;
+mpChart-maRenderEvent = mpChart-maPreRenderEvent;
+mpChart-maClickCond.set();
+return;
+}
+mpChart-mpRenderer-EndClick();
+const GL3DBarChart::BarInformation rBarInfo = itr-second;
+mnStep = 0;
+mnStepsTotal = STEPS_UPDATE;
+maTargetPosition = rBarInfo.maPos;
+maTargetPosition.z += 240;
+maTargetPosition.x += BAR_SIZE_X / 2.0f;
+maTargetDirection = rBarInfo.maPos;
+maTargetDirection.x += BAR_SIZE_X / 2.0f;
+maTargetDirection.y += BAR_SIZE_Y / 2.0f;
+maTargetPosition.y = maTargetDirection.y - 240;
+maMatrixStep = mpChart-mpRenderer-GetDiffOfTwoCameras( maTargetPosition, 
 maTargetDirection)/((float)mnStepsTotal);
+mpChart-maClickCond.set();
+mbExecuting = true;
+mbNeedFlyBack = false;
+mpChart-mpRenderer-StartClick(mpChart-mnSelectBarId);
+mpChart-maRenderEvent = EVENT_CLICK;
+}
+
 void RenderBenchMarkThread::AutoMoveToBar()
 {
 if (!mbAutoFlyExecuting)
@@ -403,7 +434,11 @@ void RenderBenchMarkThread::ProcessClickFlyBack()
 void RenderBenchMarkThread::ProcessMouseEvent()
 {
 ProcessClickFlyBack();
-if (mpChart-maRenderEvent == EVENT_CLICK)
+if (mpChart-maRenderEvent == EVENT_SELECTBAR_UPDEDATE)
+{
+MoveToSelectedBar();
+}
+else if (mpChart-maRenderEvent == EVENT_CLICK)
 {
 MoveToBar();
 }
@@ -495,7 +530,8 @@ GL3DBarChart::GL3DBarChart(
 mbBenchMarkMode(false),
 mnHistoryCounter(0),
 mnBarsInRow(0),
-mbAutoFly(false)
+mbAutoFly(false),
+mnUpdateBarId(0)
 {
 maFPSRenderStartTime.Seconds = maFPSRenderStartTime.Nanosec = 0;
 maFPSRenderEndTime.Seconds = maFPSRenderEndTime.Nanosec = 0;
@@ -573,18 +609,22 @@ void GL3DBarChart::create3DShapes(const 
boost::ptr_vectorVDataSeries rDataSer
 {
 SharedResourceAccess(maCond1, maCond2);
 osl::MutexGuard aGuard(maMutex);
-mnPreSelectBarId = mnSelectBarId;
-mnSelectBarId -= 10;
-sal_uInt32 nSelectRow = (mnSelectBarId - SHAPE_START_ID) / ID_STEP / 
(mnBarsInRow + 1);
-sal_uInt32 nPreSelectRow = (mnPreSelectBarId - SHAPE_START_ID) / ID_STEP / 
(mnBarsInRow + 1);
-if(nSelectRow != nPreSelectRow)
-{
-mnSelectBarId = mnPreSelectBarId;
-}
-else
+if(mnSelectBarId)
 {
-mpRenderer-EndClick();
-mpRenderer-StartClick(mnSelectBarId);
+int nSelectBarId = mnSelectBarId;
+int nPreSelectBarId = nSelectBarId;
+nSelectBarId -= 10;
+sal_uInt32 nSelectRow = (nSelectBarId - SHAPE_START_ID) / ID_STEP / 
(mnBarsInRow + 1);
+sal_uInt32 nPreSelectRow = (nPreSelectBarId - SHAPE_START_ID) / 
ID_STEP / (mnBarsInRow + 1);
+if(nSelectRow == nPreSelectRow)
+{
+std::mapsal_uInt32, const 
GL3DBarChart::BarInformation::const_iterator itr = maBarMap.find(nSelectBarId);
+if((maRenderEvent == EVENT_CLICK || maRenderEvent == 
EVENT_SHOW_SELECT || maRenderEvent == EVENT_AUTO_FLY)(itr != maBarMap.end()))
+{
+mnUpdateBarId = nSelectBarId;
+maRenderEvent = EVENT_SELECTBAR_UPDEDATE;
+}
+}
 }
 mpRenderer-ReleaseShapes();
 // Each series of data flows from left to right, and multiple series are
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx

[Libreoffice-commits] core.git: dbaccess/source include/tools reportdesign/source sc/source sd/source sfx2/source svtools/source svx/source sw/inc sw/source tools/source xmloff/source

 dbaccess/source/filter/xml/xmlColumn.cxx  |6 +++---
 dbaccess/source/filter/xml/xmlStyleImport.cxx |8 
 dbaccess/source/filter/xml/xmlTable.cxx   |2 +-
 dbaccess/source/ui/dlg/ConnectionHelper.cxx   |2 +-
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |4 ++--
 dbaccess/source/ui/dlg/DbAdminImpl.cxx|2 +-
 dbaccess/source/ui/dlg/dbadmin.cxx|4 ++--
 dbaccess/source/ui/dlg/dbwiz.cxx  |2 +-
 dbaccess/source/ui/dlg/dbwizsetup.cxx |2 +-
 dbaccess/source/ui/dlg/generalpage.cxx|2 +-
 include/tools/debug.hxx   |2 +-
 include/tools/inetstrm.hxx|4 ++--
 include/tools/link.hxx|2 +-
 include/tools/rtti.hxx|   13 +++--
 reportdesign/source/filter/xml/xmlCell.cxx|2 +-
 reportdesign/source/filter/xml/xmlColumn.cxx  |4 ++--
 reportdesign/source/filter/xml/xmlHelper.cxx  |2 +-
 reportdesign/source/filter/xml/xmlStyleImport.cxx |4 ++--
 reportdesign/source/filter/xml/xmlTable.cxx   |2 +-
 reportdesign/source/filter/xml/xmlfilter.cxx  |2 +-
 sc/source/ui/view/viewutil.cxx|2 +-
 sd/source/filter/html/htmlex.cxx  |2 +-
 sd/source/ui/app/tbxww.cxx|2 +-
 sd/source/ui/docshell/docshell.cxx|   12 ++--
 sfx2/source/appl/appopen.cxx  |2 +-
 sfx2/source/appl/appserv.cxx  |2 +-
 sfx2/source/dialog/templdlg.cxx   |2 +-
 sfx2/source/doc/objitem.cxx   |2 +-
 sfx2/source/doc/objmisc.cxx   |4 ++--
 sfx2/source/view/frmload.cxx  |2 +-
 svtools/source/misc/ehdl.cxx  |6 +++---
 svx/source/svdraw/svdedtv2.cxx|2 +-
 svx/source/svdraw/svdomeas.cxx|2 +-
 svx/source/svdraw/svdpage.cxx |2 +-
 svx/source/tbxctrls/tbcontrl.cxx  |2 +-
 sw/inc/calbck.hxx |1 +
 sw/inc/section.hxx|2 +-
 sw/inc/unoframe.hxx   |6 +-
 sw/source/core/access/accpara.cxx |4 ++--
 sw/source/core/fields/docufld.cxx |2 +-
 sw/source/core/layout/ssfrm.cxx   |2 +-
 sw/source/core/text/txtfrm.cxx|2 +-
 sw/source/core/unocore/unocrsrhelper.cxx  |2 +-
 sw/source/core/unocore/unoframe.cxx   |2 +-
 sw/source/filter/html/htmlform.cxx|2 +-
 sw/source/filter/html/htmlforw.cxx|8 
 sw/source/filter/ww8/docxattributeoutput.cxx  |2 +-
 sw/source/filter/ww8/rtfattributeoutput.cxx   |2 +-
 sw/source/filter/ww8/wrtw8esh.cxx |4 ++--
 sw/source/filter/xml/xmlexpit.cxx |   12 ++--
 sw/source/filter/xml/xmlfmt.cxx   |4 ++--
 tools/source/debug/debug.cxx  |2 +-
 tools/source/generic/poly.cxx |   18 +-
 tools/source/rc/resmgr.cxx|6 +++---
 xmloff/source/draw/ximpshap.cxx   |4 ++--
 xmloff/source/draw/ximpstyl.cxx   |2 +-
 xmloff/source/text/XMLTextFrameContext.cxx|2 +-
 xmloff/source/text/txtimp.cxx |   16 
 58 files changed, 119 insertions(+), 105 deletions(-)

New commits:
commit 23e1fc277d5651babce17bb74408ef6505f101d2
Author: Noel Grandin n...@peralex.com
Date:   Thu Sep 18 15:10:54 2014 +0200

loplugin: cstylecast, update PTR_CAST macro to use static_cast

I introduce a template method into the PTR_CAST machinery
to maintain constness.
There is now a FIXME in sd/../docshell.cxx because I needed
to use a dynamic_cast there to work around the games it appears
to be playing with OLE in-place activation.

Signed-off-by: Stephan Bergmann sberg...@redhat.com,
dropping the GCC-extension, unnecessary use of typeof from tools/rtti.hxx

Change-Id: Iba5ace1aa27e02b34fcc91af1e658c43371afd03

diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx 
b/dbaccess/source/filter/xml/xmlColumn.cxx
index d055cda..247dc75 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -130,7 +130,7 @@ void OXMLColumn::EndElement()
 const SvXMLStylesContext* pAutoStyles = 
GetOwnImport().GetAutoStyles();
 if ( pAutoStyles )
 {
-OTableStyleContext* pAutoStyle = 
PTR_CAST(OTableStyleContext,pAutoStyles-FindStyleChildContext(XML_STYLE_FAMILY_TABLE_COLUMN,m_sStyleName));
+

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - configure.ac lo.xcent.in

 configure.ac |2 +-
 lo.xcent.in  |2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 38d2a133567d82bfb22e0f2c1373288c57ba9cae
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Sep 23 15:00:50 2014 +0300

Bump patch level for yet another Mac App Store submission attempt

Change-Id: Id13c6f8cbff2badf533044dc7ba5a191c689a83b

diff --git a/configure.ac b/configure.ac
index 3e254d6..f4cfa3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.10.14],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.2.10.15],[],[],[https://libreoffice-from-collabora.com/])
 
 AC_PREREQ([2.59])
 
commit f5748b1ee1910e59255ce96c59c686a448226679
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Sep 23 14:57:52 2014 +0300

Seems that we don't ned the com.apple.application-identifier after all

Change-Id: I3bc499b15c31724dca2d49123dcdbec8dfd934f6

diff --git a/lo.xcent.in b/lo.xcent.in
index f804daf..02d8929 100644
--- a/lo.xcent.in
+++ b/lo.xcent.in
@@ -2,8 +2,6 @@
 !DOCTYPE plist PUBLIC -//Apple//DTD PLIST 1.0//EN 
http://www.apple.com/DTDs/PropertyList-1.0.dtd;
 plist version=1.0
 dict
-   keycom.apple.application-identifier/key
-   string@MACOSX_TEAMID@.@MACOSX_BUNDLE_IDENTIFIER@/string
keycom.apple.security.app-sandbox/key
true/
keycom.apple.security.files.bookmarks.app-scope/key
___
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

2014-09-23 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/data/chart-dupe.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |9 +
 sw/source/filter/ww8/wrtw8nds.cxx |3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit eae5d8de6dde0ea4dd1494b0e1f036789b7c6220
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Sep 23 17:48:40 2014 +0200

DOCX export: fix duplicated OLE objects

Change-Id: I5b73fcbdbad26505e3ddd66d246354110c0f2e88

diff --git a/sw/qa/extras/ooxmlexport/data/chart-dupe.docx 
b/sw/qa/extras/ooxmlexport/data/chart-dupe.docx
new file mode 100644
index 000..545f966
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/chart-dupe.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index dd458e9..d45db67 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -263,6 +263,15 @@ DECLARE_OOXMLEXPORT_TEST(testSdtRunPicture, 
sdt-run-picture.docx)
 }
 }
 
+DECLARE_OOXMLEXPORT_TEST(testChartDupe, chart-dupe.docx)
+{
+// Single chart was exported back as two charts.
+uno::Referencetext::XTextEmbeddedObjectsSupplier 
xTextEmbeddedObjectsSupplier(mxComponent, uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xEmbeddedObjects(xTextEmbeddedObjectsSupplier-getEmbeddedObjects(), 
uno::UNO_QUERY);
+// This was 2, on second import we got a duplicated chart copy.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xEmbeddedObjects-getCount());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index c17e3af..540ed19 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2236,7 +2236,8 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode 
rNode )
 if ( aAttrIter.IsDropCap( nNextAttr ) )
 AttrOutput().FormatDrop( rNode, aAttrIter.GetSwFmtDrop(), nStyle, 
pTextNodeInfo, pTextNodeInfoInner );
 
-if (0 != nEnd)
+// Only output character attributes if this is not a postponed text 
run.
+if (0 != nEnd  !(bPostponeWritingText  FLY_PROCESSED == 
nStateOfFlyFrame))
 {
 // Output the character attributes
 // #i51277# do this before writing flys at end of paragraph
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: stack-allocated Window subclasses

2014-09-23 Thread Michael Meeks

Hi Noel,

On Tue, 2014-09-23 at 14:52 +0200, Noel Grandin wrote:
 Otherwise we should just standardise on boost::intrusive_ptr and remove SvRef.

Yep - my concern is only that boost::intrusive_ptr Window  - is some
horribly long horror =) and that having some semi-standard means of
having widget refs that are not so grim might be nicer:

WindowRef xRef;
vs. boost::intrusive_ptr Window  xRef;
vs. vcl::ref Window  xRef;

etc. but would love to hear other people's views; in general, I think
fewer tokens for the mind to swallow when reading the bulk of the code
is a good thing.

 This should be fixable if it doesn't already work - myself and sberg
 already did this for rtl::Reference.

Nice =)

 Mostly I guess we need to figure out where and when to destroy them -
 is it in the destructor, or in some other method specific to this task?

Of course, the ideal is to migrate these stuff incrementally. To do
that, I'd suggest we use the new intrusive_ptr and destroy the Window in
the normal way at the end; but that we slowly migrate all explicit
'delete' calls to be virtual dispose calls, and split out reference
releasing / cyclic references later.

My hope is that all these non-heap Window's are leafs in the hierarchy
anyhow and/or that we can clean them up without worrying about a proper
'dispose' mechanism just now.

Does that make sense ?

ATB,

Michael.

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

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

Compile error

2014-09-23 Thread Mihály Palenik

Hello,

I use Linux and I pulled LibreOffice from master now but I got compile
error:

workdir/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.a(liblangtag_la-lt-utils.o):
In function `lt_getenv':
workdir/UnpackedTarball/langtag/liblangtag/lt-utils.c:57: undefined
reference to `__secure_getenv'

I don't know what it is wrong.

Thanks
Mihály
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - 20 commits - configure.ac external/python3 instsetoo_native/CustomTarget_setup.mk lo.xcent.in Makefile.in pyuno/source registry/Modu

 Makefile.in|   
28 
 Repository.mk  |   
 6 
 configure.ac   |   
15 
 external/python3/python-3.3.0-darwin.patch.1   |   
22 
 instsetoo_native/CustomTarget_setup.mk |   
 2 
 lo.xcent.in|   
 9 
 pyuno/source/loader/pyuno_loader.cxx   |   
 6 
 registry/Module_registry.mk|   
 6 
 scp2/source/ooo/common_brand.scp   |   
 6 
 scp2/source/ooo/file_ooo.scp   |   
 2 
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java |   
 2 
 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java  |   
 8 
 scripting/source/pyprov/pythonscript.py|   
 2 
 sfx2/source/view/viewsh.cxx|   
12 
 solenv/bin/macosx-codesign-app-bundle  |  
108 -
 solenv/gbuild/platform/macosx.mk   |   
 9 
 sysui/desktop/macosx/Info.plist.in |  
872 --
 17 files changed, 539 insertions(+), 576 deletions(-)

New commits:
commit cbc0f3c220670dad1c3348545d16d869168c8e47
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Sep 23 20:21:47 2014 +0300

Drop ui-previewer and unopkg.bin in the sandboxed (Mac App Store) case

Change-Id: I99b7d0d53a2774ccbf0a0c353322e677c4fe43f4

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index ffc0729..0d7e383 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -612,12 +612,14 @@ Unixlink gid_Brand_Unixlink_Unopkg
 End
 #endif
 
+#if !defined ENABLE_MACOSX_SANDBOX
 File gid_Brand_File_Bin_Unopkg
 BIN_FILE_BODY;
 Dir = gid_Brand_Dir_Program;
 Styles = (PACKED);
 Name = unopkg.bin;
 End
+#endif
 
 #if defined ENABLE_NPAPI_INTO_BROWSER
 File gid_Brand_File_Lib_Npsoplugin
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 9b11d66..1cb2317 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -135,6 +135,7 @@ File gid_File_Exe_Nsplugin
 End
 #endif
 
+#if !defined ENABLE_MACOSX_SANDBOX
 File gid_File_Bin_UIPreviewer
 BIN_FILE_BODY;
 Dir = gid_Brand_Dir_Program;
@@ -145,6 +146,7 @@ File gid_File_Bin_UIPreviewer
 Name = ui-previewer.exe;
   #endif
 End
+#endif
 
 #if defined UNX  !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 
commit 3a0cb9e31977c8462b4e6627f0f3b170a3544318
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Sep 23 14:57:52 2014 +0300

Seems that we don't need the com.apple.application-identifier after all

Change-Id: I3bc499b15c31724dca2d49123dcdbec8dfd934f6

diff --git a/lo.xcent.in b/lo.xcent.in
index f804daf..02d8929 100644
--- a/lo.xcent.in
+++ b/lo.xcent.in
@@ -2,8 +2,6 @@
 !DOCTYPE plist PUBLIC -//Apple//DTD PLIST 1.0//EN 
http://www.apple.com/DTDs/PropertyList-1.0.dtd;
 plist version=1.0
 dict
-   keycom.apple.application-identifier/key
-   string@MACOSX_TEAMID@.@MACOSX_BUNDLE_IDENTIFIER@/string
keycom.apple.security.app-sandbox/key
true/
keycom.apple.security.files.bookmarks.app-scope/key
commit 935030bd4387171c797d74c0389788f3fc28dae8
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Sep 23 12:52:53 2014 +0300

Make the patch apply

Change-Id: Ib4d7bc4e703a1c67380d6afaa6ab5fc22c43aed9

diff --git a/external/python3/python-3.3.0-darwin.patch.1 
b/external/python3/python-3.3.0-darwin.patch.1
index 78a2e7a..0049305 100644
--- a/external/python3/python-3.3.0-darwin.patch.1
+++ b/external/python3/python-3.3.0-darwin.patch.1
@@ -81,5 +81,5 @@ no /usr/include.
 -  stringPython/string
 +  stringLibreOfficePython/string
keyCFBundleGetInfoString/key
-   string%version%, (c) 2004-2013 Python Software Foundation./string
+   string%version%, (c) 2004-2014 Python Software Foundation./string
keyCFBundleHelpBookFolder/key
commit ff31f1c7e36d4dcdb5e691b5e1b7aa102ee36d2a
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Sep 23 00:27:58 2014 +0300

We need the gengal program at build time

But don't bother shipping it on OS X, at least not in the sandboxed
(App Store) case.

Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24
(cherry picked from commit 11b4f4bfbee257d63f6a52808fb02b903ddea0d5)

diff --git a/Makefile.in b/Makefile.in
index c8ab64b..ec2a9b6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -314,6 +314,11 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
 # And with it removed, presumably the other stuff in the

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

 chart2/source/view/charttypes/GL3DBarChart.cxx |7 ++-
 chart2/source/view/inc/GL3DBarChart.hxx|2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 7c1686a6e493cec75e77fa6647c33b537e493457
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Sep 23 13:52:24 2014 -0400

Some cleanup on Timer.

Use a different name for handler as 'updateTimer' is also used as
a method name within the same class.  Also no need to set the interval
repeatedly  no need to stop the timer when it times out.

Change-Id: I430bc26b945d179c87310eaefd9d94986192841c

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 625ee69..05738d7 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -561,7 +561,7 @@ GL3DBarChart::GL3DBarChart(
 mbAutoFly = atoi(aAutoFly);
 }
 maTimer.SetTimeout(DATA_UPDATE_TIME);
-maTimer.SetTimeoutHdl(LINK(this, GL3DBarChart, updateTimer));
+maTimer.SetTimeoutHdl(LINK(this, GL3DBarChart, UpdateTimerHdl));
 maTimer.Start();
 osl_getSystemTime(maFPSRenderStartTime);
 osl_getSystemTime(maFPSRenderEndTime);
@@ -1474,11 +1474,9 @@ void GL3DBarChart::processAutoFly(sal_uInt32 nId, 
sal_uInt32 nColor)
 }
 }
 
-IMPL_LINK_NOARG(GL3DBarChart, updateTimer)
+IMPL_LINK_NOARG(GL3DBarChart, UpdateTimerHdl)
 {
-maTimer.Stop();
 updateScreenText();
-maTimer.SetTimeout(DATA_UPDATE_TIME);
 maTimer.Start();
 return 0;
 }
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx 
b/chart2/source/view/inc/GL3DBarChart.hxx
index 30607e6..79d816d 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -101,7 +101,7 @@ private:
 void updateScreenText();
 void updateRenderFPS();
 void updateDataUpdateFPS();
-DECL_LINK(updateTimer, void*);
+DECL_LINK(UpdateTimerHdl, void*);
 int calcTimeInterval(TimeValue startTime, TimeValue endTime);
 float addScreenTextShape(OUString nStr, glm::vec2 aLeftOrRightTop, float 
nTextHeight, bool bLeftTopFlag = true,
   const glm::vec4 rColor = glm::vec4(0.0f, 
1.0f, 1.0f, 0.0f),
commit 3a4f5b47222a399d0745c4ae5eb000f4e75a7041
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Sep 23 13:46:23 2014 -0400

This guard blocks main loop.

And I've been told that by design the main thread doesn't need to be
aware of the rendering threads, so no need to take mutex here.

Change-Id: I78ec348ccc28dd67284ecdfccebb915cc1942fa8

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 5a05323..625ee69 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -1176,7 +1176,6 @@ int GL3DBarChart::calcTimeInterval(TimeValue startTime, 
TimeValue endTime)
 void GL3DBarChart::updateScreenText()
 {
 SharedResourceAccess(maCond1, maCond2);
-osl::MutexGuard aGuard(maMutex);
 maScreenTextShapes.clear();
 mpRenderer-ReleaseScreenTextShapes();
 updateRenderFPS();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-09-23 Thread Samuel Mehrbrodt

 svx/source/tbxctrls/tbunosearchcontrollers.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit ed01da53ff04b1cfd6708e12f26d06cb9288a61f
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Tue Sep 23 21:05:38 2014 +0200

fdo#84256 Prepopulate findbar with last search term

Change-Id: I6a6fa994e3e90ade206ffea73b8047ac8b2af90e

diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx 
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index c23a2cb..d595b3c 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -179,9 +179,15 @@ void FindTextFieldControl::SetTextToSelected_Impl()
 
 if ( !aString.isEmpty() )
 {
+// If something is selected in the document, prepopulate with this
 SetText( aString );
 GetModifyHdl().Call(this); // FIXME why SetText doesn't trigger this?
 }
+else if (GetEntryCount()  0)
+{
+// Else, prepopulate with last search word (fdo#84256)
+SetText(GetEntry(0));
+}
 }
 
 bool FindTextFieldControl::PreNotify( NotifyEvent rNEvt )
@@ -222,7 +228,7 @@ bool FindTextFieldControl::PreNotify( NotifyEvent rNEvt )
 if ( bMod1  nCode == KEY_F )
 SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
 
-// Execute the search when Enter, Ctrl-G or F3 pressed
+// Execute the search when Return, Ctrl-G or F3 pressed
 if ( KEY_RETURN == nCode || (bMod1  (KEY_G == nCode)) || (KEY_F3 
== nCode) )
 {
 Remember_Impl(GetText());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: javaunohelper/JunitTest_juh_ComponentContext.mk javaunohelper/JunitTest_juh.mk javaunohelper/Module_javaunohelper.mk javaunohelper/test

2014-09-23 Thread Robert Antoni Buj i Gelonch

 javaunohelper/JunitTest_juh.mk |   45 
+
 javaunohelper/JunitTest_juh_ComponentContext.mk|   31 
---
 javaunohelper/Module_javaunohelper.mk  |2 
 javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java |   84 
+++---
 4 files changed, 74 insertions(+), 88 deletions(-)

New commits:
commit 2d8348d298185cad7d2b6aec40e8e44f95be1b7a
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date:   Mon Sep 22 16:31:56 2014 +0200

javaunohelper: migrate ComponentBase_Test to JUnit

Use -XX:MaxGCPauseMillis=50 in conjunction with Thread.sleep(51) to wait 
51ms
after a GC call, instead of waiting 10s.

http://docs.oracle.com/javase/1.5.0/docs/guide/vm/gc-ergonomics.html

$ make JunitTest_juh

Change-Id: Id2cdada0e493fd450aab5dbec164502e0173857f
Reviewed-on: https://gerrit.libreoffice.org/11593
Reviewed-by: David Ostrovsky david.ostrov...@gmx.de
Tested-by: David Ostrovsky david.ostrov...@gmx.de

diff --git a/javaunohelper/JunitTest_juh.mk b/javaunohelper/JunitTest_juh.mk
new file mode 100644
index 000..4bbd3f8
--- /dev/null
+++ b/javaunohelper/JunitTest_juh.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_JunitTest_JunitTest,juh))
+
+$(eval $(call gb_JunitTest_set_defs,juh,\
+$$(DEFS) \
+-XX:MaxGCPauseMillis=50 \
+))
+
+$(eval $(call gb_JunitTest_use_jars,juh,\
+ridl \
+jurt \
+))
+
+$(eval $(call gb_JunitTest_use_jar_classset,juh,ridljar))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,juh,\
+javaunohelper/com/sun/star/comp/helper/Bootstrap \
+javaunohelper/com/sun/star/comp/helper/BootstrapException \
+javaunohelper/com/sun/star/comp/helper/ComponentContext \
+javaunohelper/com/sun/star/comp/helper/ComponentContextEntry \
+javaunohelper/com/sun/star/lib/uno/helper/ComponentBase \
+javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer \
+javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer \
+javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter \
+javaunohelper/com/sun/star/lib/uno/helper/WeakBase \
+javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test \
+javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase \
+javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test \
+javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider \
+))
+
+$(eval $(call gb_JunitTest_add_classes,juh,\
+com.sun.star.comp.helper.ComponentContext_Test \
+com.sun.star.lib.uno.helper.ComponentBase_Test \
+))
+
+# vim:set noet sw=4 ts=4:
diff --git a/javaunohelper/JunitTest_juh_ComponentContext.mk 
b/javaunohelper/JunitTest_juh_ComponentContext.mk
deleted file mode 100644
index 11355e3..000
--- a/javaunohelper/JunitTest_juh_ComponentContext.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_JunitTest_JunitTest,juh_ComponentContext))
-
-$(eval $(call gb_JunitTest_use_jars,juh_ComponentContext,\
-ridl \
-jurt \
-))
-
-$(eval $(call gb_JunitTest_use_jar_classset,juh_ComponentContext,ridljar))
-
-$(eval $(call gb_JunitTest_add_sourcefiles,juh_ComponentContext,\
-javaunohelper/com/sun/star/comp/helper/Bootstrap \
-javaunohelper/com/sun/star/comp/helper/BootstrapException \
-javaunohelper/com/sun/star/comp/helper/ComponentContext \
-javaunohelper/com/sun/star/comp/helper/ComponentContextEntry \
-javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test \
-))
-
-$(eval $(call gb_JunitTest_add_classes,juh_ComponentContext,\
-com.sun.star.comp.helper.ComponentContext_Test \
-))
-
-# vim:set noet sw=4 ts=4:
diff --git a/javaunohelper/Module_javaunohelper.mk 
b/javaunohelper/Module_javaunohelper.mk
index 8a2e653..daafeda 100644
--- a/javaunohelper/Module_javaunohelper.mk
+++ b/javaunohelper/Module_javaunohelper.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Module_add_targets,javaunohelper,\
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,javaunohelper,\
-JunitTest_juh_ComponentContext \
+JunitTest_juh \
 ))
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
diff --git 
a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java 
b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
index 7bf0484..89ab9dd 100644
---

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

2014-09-23 Thread Miklos Vajna

 sw/source/core/bastyp/breakit.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02e0bac73be8d11abf539130f3d3541fa72af93a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Tue Sep 23 17:06:58 2014 +0200

error C2782: template parameter '_Ty' is ambiguous

Change-Id: Ieb8f91a629b9e14480c0372e747fea326c549833

diff --git a/sw/source/core/bastyp/breakit.cxx 
b/sw/source/core/bastyp/breakit.cxx
index 8a4c40e..0e3aeea 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -175,7 +175,7 @@ sal_Int32 SwBreakIt::getGraphemeCount(const OUString rText,
 {
 sal_Int32 nGraphemeCount = 0;
 
-sal_Int32 nCurPos = std::max(0, nStart);
+sal_Int32 nCurPos = std::max(static_castsal_Int32(0), nStart);
 while (nCurPos  nEnd)
 {
 // fdo#49208 cheat and assume that nothing can combine with a space
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - Makefile.in

 Makefile.in |   20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

New commits:
commit f110377c005e5c01eba59274fe3ae6b68f810b9b
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Sep 23 21:45:32 2014 +0300

Add targets 'patch' and 'unpatch' to assist in handling of temporary patches

'make patch' applies any patch file in the uncommitted-patches
directory, if it exists. These files should be as produced by git
format-patch. 'make unpatch' correspondingly undos what 'make patch'
did. None of this is done using git, that is the very point.

Change-Id: I348d96be54bc8e544e833206c922cb4bdcbabc4c

diff --git a/Makefile.in b/Makefile.in
index ec2a9b6..b458400 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check 
clean clean-build clean-host test-install distclean distro-pack-install docs 
download fetch findunusedcode get-submodules id install install-strip 
subsequentcheck tags debugrun help slowcheck translations unitcheck packageinfo
+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check 
clean clean-build clean-host test-install distclean distro-pack-install docs 
download fetch findunusedcode get-submodules id install install-strip 
subsequentcheck tags debugrun help slowcheck translations unitcheck packageinfo 
patch unpatch
 
 MAKECMDGOALS?=all
 build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
@@ -382,4 +382,22 @@ $(eval $(call gb_Top_GbuildToIdeIntegration,$(ide
 
 endif # MAKE_RESTARTS
 
+patch:
+   test -d uncommitted-patches || exit 0
+   for F in uncommitted-patches/*.patch; do \
+   patch --dry-run -p1 $$F || exit 1; \
+   done
+   mkdir -p uncommitted-patches.applied
+   for F in uncommitted-patches/*.patch; do \
+   patch -p1 $$F || exit 1; \
+   cp $$F uncommitted-patches.applied; \
+   done
+
+unpatch:
+   test -d uncommitted-patches.applied || exit 0
+   for F in uncommitted-patches.applied/*.patch; do \
+   patch -R -p1 $$F || exit 1; \
+   rm $$F; \
+   done
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - 5 commits - framework/source sc/uiconfig sw/qa sw/source vcl/source writerfilter/source

2014-09-23 Thread Luboš Luňák

 framework/source/services/substitutepathvars.cxx |3 
 sc/uiconfig/scalc/ui/optformula.ui   |  732 +++
 sw/qa/extras/ooxmlimport/data/bnc891663.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 
 sw/source/filter/html/htmlgrin.cxx   |   23 
 vcl/source/gdi/regionband.cxx|2 
 writerfilter/source/dmapper/GraphicImport.cxx|7 
 writerfilter/source/dmapper/PropertyIds.cxx  |1 
 writerfilter/source/dmapper/PropertyIds.hxx  |1 
 9 files changed, 410 insertions(+), 368 deletions(-)

New commits:
commit f7e9541663fd2788d4ae3e56233e4d73642744bf
Author: LuboÅ¡ LuÅÃ¡k l.lu...@collabora.com
Date:   Sun Sep 21 17:52:58 2014 +0200

handle docx's w:anchor layoutInCell attribute (bnc#891663)

Change-Id: I8268567b84aa0f6e42624bfd0f79c8c49c153edd
Reviewed-on: https://gerrit.libreoffice.org/11568
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/sw/qa/extras/ooxmlimport/data/bnc891663.docx 
b/sw/qa/extras/ooxmlimport/data/bnc891663.docx
new file mode 100644
index 000..d5f057e
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/bnc891663.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 305b6ed..07761dd 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2275,6 +2275,15 @@ DECLARE_OOXMLIMPORT_TEST(testBnc519228OddBreaks, 
bnc519228_odd-breaks.docx)
 getParagraphOfText( 1, getProperty uno::Referencetext::XText 
(page5Style, HeaderText), This is the header for odd pages);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testBnc891663, bnc891663.docx)
+{
+// The image should be inside a cell, so the text in the following cell 
should be below it.
+int imageTop = 
parseDump(/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds,
 top).toInt32();
+int imageHeight = 
parseDump(/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds,
 height).toInt32();
+int textNextRowTop = 
parseDump(/root/page/body/tab/row[2]/cell[1]/txt[1]/infos/bounds, 
top).toInt32();
+CPPUNIT_ASSERT( textNextRowTop = imageTop + imageHeight );
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 6cd88a5..e2d3fa3 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -210,6 +210,7 @@ public:
 sal_Int16 nVertOrient;
 sal_Int16 nVertRelation;
 sal_Int32 nWrap;
+bool  bLayoutInCell;
 bool  bOpaque;
 bool  bContour;
 bool  bContourOutside;
@@ -283,6 +284,7 @@ public:
 ,nVertOrient(  text::VertOrientation::NONE )
 ,nVertRelation( text::RelOrientation::FRAME )
 ,nWrap(0)
+,bLayoutInCell(false)
 ,bOpaque( true )
 ,bContour(false)
 ,bContourOutside(true)
@@ -581,6 +583,8 @@ void GraphicImport::lcl_attribute(Id nName, Value rValue)
 break;
 case NS_ooxml::LN_CT_Anchor_locked: // 90990; - ignored
 case NS_ooxml::LN_CT_Anchor_layoutInCell: // 90991; - ignored
+m_pImpl-bLayoutInCell = nIntValue != 0;
+break;
 case NS_ooxml::LN_CT_Anchor_hidden: // 90992; - ignored
 break;
 case NS_ooxml::LN_CT_Anchor_allowOverlap: // 90993;
@@ -1230,6 +1234,9 @@ uno::Reference text::XTextContent  
GraphicImport::createGraphicObject( const b
 }
 
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_SURROUND ),
 uno::makeAny(m_pImpl-nWrap));
+if( m_pImpl-bLayoutInCell  m_pImpl-nWrap != 
text::WrapTextMode_THROUGHT )
+
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_FOLLOW_TEXT_FLOW ),
+uno::makeAny(true));
 
 
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_SURROUND_CONTOUR ),
 uno::makeAny(m_pImpl-bContour));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index 3f5fa05..fc81dae 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -394,6 +394,7 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) 
const
 case PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING : sName = 
ApplyParagraphMarkFormatToNumbering; break;
 case PROP_CELL_DIRECTION: sName = CellDirection; break;
 case PROP_CELL_HIDE_MARK: sName = CellHideMark; break;
+case PROP_FOLLOW_TEXT_FLOW: sName = IsFollowingTextFlow; break;
 }
 ::std::pairPropertyNameMap_t::iterator,bool aInsertIt =
 m_pImpl-aNameMap.insert(

LO 4.3 build broken (related to bnc#891663)

2014-09-23 Thread Jean-Baptiste Faure

Hi,

The build of 4.3 branch fails on the following unit test :

[build CUT] sw_ooxmlimport
File tested,Execution Time (ms)
bnc891663.docx,[...]/LibO/lo43/sw/qa/extras/ooxmlimport/ooxmlimport.cxx:2284:testBnc891663::Import
assertion failed
- Expression: textNextRowTop = imageTop + imageHeight

(all other test files in the unit test pass)

Reverting the commit 2a632bb30f78f02042ce333d426468087639305b (handle
docx's w:anchor layoutInCell attribute (bnc#891663)) fixes the problem
for me on Ubuntu 14.04 x86-64.

I did only an incremental build from commit
5454eb2c9acc5404333ede541f9c431e1a99694e (five commits ago). I will try
a complete rebuild this night.

Best regards.
JBF
-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango officecfg/registry

2014-09-23 Thread Yousuf Philips

 icon-themes/galaxy/cmd/lc_deletepage.png 
|binary
 icon-themes/galaxy/cmd/lc_slidemasterpage.png
|binary
 icon-themes/galaxy/cmd/sc_deletepage.png 
|binary
 icon-themes/galaxy/cmd/sc_slidemasterpage.png
|binary
 icon-themes/tango/cmd/lc_insertpage.png  
|binary
 icon-themes/tango/cmd/lc_insertpage.xcf.bz2  
|binary
 icon-themes/tango/cmd/sc_insertpage.png  
|binary
 icon-themes/tango/cmd/sc_insertpage.xcf.bz2  
|binary
 icon-themes/tango/links.txt  |
2 ++
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
9 +
 10 files changed, 11 insertions(+)

New commits:
commit d6aaff5d56c3273595218e7fba803c52e3ba9c46
Author: Yousuf Philips philip...@hotmail.com
Date:   Tue Sep 23 22:10:09 2014 +0200

Add/Improve some icons for Impress actions

Change-Id: I195bbb2816b729278254b72b7465086aa8faf70c

diff --git a/icon-themes/galaxy/cmd/lc_deletepage.png 
b/icon-themes/galaxy/cmd/lc_deletepage.png
new file mode 100644
index 000..c08c7cf
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_deletepage.png differ
diff --git a/icon-themes/galaxy/cmd/lc_slidemasterpage.png 
b/icon-themes/galaxy/cmd/lc_slidemasterpage.png
new file mode 100644
index 000..93a0a4b
Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_slidemasterpage.png 
differ
diff --git a/icon-themes/galaxy/cmd/sc_deletepage.png 
b/icon-themes/galaxy/cmd/sc_deletepage.png
new file mode 100644
index 000..f398a76
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_deletepage.png differ
diff --git a/icon-themes/galaxy/cmd/sc_slidemasterpage.png 
b/icon-themes/galaxy/cmd/sc_slidemasterpage.png
new file mode 100644
index 000..0630daf
Binary files /dev/null and b/icon-themes/galaxy/cmd/sc_slidemasterpage.png 
differ
diff --git a/icon-themes/tango/cmd/lc_insertpage.png 
b/icon-themes/tango/cmd/lc_insertpage.png
index 807036b..d955253 100644
Binary files a/icon-themes/tango/cmd/lc_insertpage.png and 
b/icon-themes/tango/cmd/lc_insertpage.png differ
diff --git a/icon-themes/tango/cmd/lc_insertpage.xcf.bz2 
b/icon-themes/tango/cmd/lc_insertpage.xcf.bz2
index 0553a70..933f297 100644
Binary files a/icon-themes/tango/cmd/lc_insertpage.xcf.bz2 and 
b/icon-themes/tango/cmd/lc_insertpage.xcf.bz2 differ
diff --git a/icon-themes/tango/cmd/sc_insertpage.png 
b/icon-themes/tango/cmd/sc_insertpage.png
index 59c4263..d7036d8 100644
Binary files a/icon-themes/tango/cmd/sc_insertpage.png and 
b/icon-themes/tango/cmd/sc_insertpage.png differ
diff --git a/icon-themes/tango/cmd/sc_insertpage.xcf.bz2 
b/icon-themes/tango/cmd/sc_insertpage.xcf.bz2
index 83033c4..54c102f 100644
Binary files a/icon-themes/tango/cmd/sc_insertpage.xcf.bz2 and 
b/icon-themes/tango/cmd/sc_insertpage.xcf.bz2 differ
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 2f06158..9bfda77 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -129,6 +129,8 @@ sw/imglst/sc20558.png cmd/sc_ok.png
 avmedia/res/avl02048.png cmd/lc_open.png
 avmedia/res/av02048.png cmd/sc_open.png
 svx/res/id02.png cmd/sc_open.png
+cmd/lc_pagesetup.png cmd/lc_setdocumentproperties.png
+cmd/sc_pagesetup.png cmd/sc_setdocumentproperties.png
 
 # Duplicates
 cmd/lc_thesaurusdialog.png cmd/lc_thesaurus.png
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 8819d85..4e2f83f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -439,6 +439,9 @@
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-US~Slide Master/value
 /prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
   /node
   node oor:name=.uno:HandoutMasterPage oor:op=replace
 prop oor:name=Label oor:type=xs:string
@@ -598,6 +601,9 @@
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-US~Page.../value
 /prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
   /node
   node oor:name=.uno:PasteSpecial oor:op=replace
 prop oor:name=Label oor:type=xs:string
@@ -894,6 +900,9 @@
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USD~elete Slide/value
 /prop
+prop oor:name=Properties oor:type=xs:int
+  value1/value
+/prop
   /node
   node oor:name=.uno:DeleteLayer oor:op=replace
 prop oor:name=Label oor:type=xs:string
___
Libreoffice-commits mailing list

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

 sd/source/ui/accessibility/AccessibleViewForwarder.cxx  |4 ++--
 sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx   |2 +-
 sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx |4 +++-
 sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx  |2 +-
 sd/source/ui/slidesorter/inc/view/SlsTheme.hxx  |2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 08a990fd27f5a416c2a73902792e93df7499d703
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Tue Sep 23 16:11:48 2014 -0400

Fix build breakages with gcc 4.7.  It doesn't like '::'.

:: -  ::

Change-Id: Ie83b0e6c09972b175ce72e37d20b5122a16e922b

diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx 
b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 929c92d..ea1fb77 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -84,7 +84,7 @@ Point AccessibleViewForwarder::LogicToPixel (const Point 
rPoint) const
 {
 SdrPaintWindow* pPaintWindow = 
mpView-GetPaintWindow((sal_uInt32)mnWindowId);
 OutputDevice rOutDev = pPaintWindow-GetOutputDevice();
-Rectangle 
aBBox(static_cast::vcl::Window(rOutDev).GetWindowExtentsRelative(0L));
+Rectangle 
aBBox(static_castvcl::Window(rOutDev).GetWindowExtentsRelative(0L));
 return rOutDev.LogicToPixel (rPoint) + aBBox.TopLeft();
 }
 else
@@ -114,7 +114,7 @@ Point AccessibleViewForwarder::PixelToLogic (const Point 
rPoint) const
 {
 SdrPaintWindow* pPaintWindow = 
mpView-GetPaintWindow((sal_uInt32)mnWindowId);
 OutputDevice rOutDev = pPaintWindow-GetOutputDevice();
-Rectangle aBBox 
(static_cast::vcl::Window(rOutDev).GetWindowExtentsRelative(0L));
+Rectangle aBBox 
(static_castvcl::Window(rOutDev).GetWindowExtentsRelative(0L));
 return rOutDev.PixelToLogic (rPoint - aBBox.TopLeft());
 }
 else
diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx 
b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
index b054324..23459c7 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx
@@ -36,7 +36,7 @@ class FontProvider
 : public SdGlobalResource
 {
 public:
-typedef ::boost::shared_ptr::vcl::Font SharedFontPointer;
+typedef boost::shared_ptr ::vcl::Font SharedFontPointer;
 
 /** Return the single instance of this class.  Throws a RuntimeException
 when no instance can be created.
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx 
b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index 7391e458..56d3803 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -25,6 +25,8 @@
 #include tools/gen.hxx
 #include vcl/image.hxx
 
+namespace vcl { class Font; }
+
 namespace sd { namespace slidesorter { namespace view {
 
 /** In contrast to the Layouter that places page objects in the view, the
@@ -133,7 +135,7 @@ private:
 Rectangle maCustomAnimationEffectBoundingBox;
 const Image maTransitionEffectIcon;
 const Image maCustomAnimationEffectIcon;
-const ::boost::shared_ptr::vcl::Font mpPageNumberFont;
+const boost::shared_ptr ::vcl::Font mpPageNumberFont;
 
 Size GetPageNumberAreaSize (const int nPageCount);
 Rectangle CalculatePreviewBoundingBox (
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx 
b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index 32b91b9..054dbbd 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -73,7 +73,7 @@ private:
 ::boost::shared_ptrcache::PageCache mpCache;
 ::boost::shared_ptrcontroller::Properties mpProperties;
 ::boost::shared_ptrview::Theme mpTheme;
-::boost::shared_ptr::vcl::Font mpPageNumberFont;
+::boost::shared_ptr ::vcl::Font mpPageNumberFont;
 ::boost::scoped_ptrFramePainter mpShadowPainter;
 ::boost::scoped_ptrFramePainter mpFocusBorderPainter;
 Bitmap maNormalBackground;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx 
b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index 33b6bee..58666fb 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -58,7 +58,7 @@ public:
 Font_PageNumber,
 Font_PageCount
 };
-static ::boost::shared_ptr::vcl::Font GetFont (
+static boost::shared_ptr ::vcl::Font GetFont (
 const FontType eType,
 const OutputDevice rDevice);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - tools/source vcl/inc vcl/source vcl/win

2014-09-23 Thread Michael Meeks

 tools/source/datetime/ttime.cxx |   14 +
 vcl/inc/win/saldata.hxx |   12 ++--
 vcl/source/app/timer.cxx|1 
 vcl/win/source/app/salinst.cxx  |5 +
 vcl/win/source/app/saltimer.cxx |  102 +++-
 5 files changed, 86 insertions(+), 48 deletions(-)

New commits:
commit da21f7da44dc577a08ea3bc210083dc8decf18bc
Author: Michael Meeks michael.me...@collabora.com
Date:   Tue Sep 23 21:27:46 2014 +0100

fdo#84000 - unwind recursive timer issues.

Seemingly timers were not being issued or re-queued. Handle recursion
issues in the main thread, not in the timer thread.

Change-Id: I4f49341115bb7c7b1613e61f77a467154818a8aa

diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index f83f55c..1f9870b 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -70,6 +70,7 @@ static void ImplStartTimer( ImplSVData* pSVData, sal_uLong 
nMS )
 if ( !nMS )
 nMS = 1;
 
+// Assume underlying timers are recurring timers, if same period - just 
wait.
 if ( nMS != pSVData-mnTimerPeriod )
 {
 pSVData-mnTimerPeriod = nMS;
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index 779c691..fdfa5c0 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -54,11 +54,9 @@ void ImplSalStartTimer( sal_uLong nMS, bool bMutex )
 if (nMS  MAX_SYSPERIOD)
 nMS = MAX_SYSPERIOD;
 
-// change if it exists, create if not
-if (pSalData-mnTimerId)
-ChangeTimerQueueTimer(NULL, pSalData-mnTimerId, nMS, nMS);
-else
-CreateTimerQueueTimer(pSalData-mnTimerId, NULL, SalTimerProc, NULL, 
nMS, nMS, WT_EXECUTEDEFAULT);
+// can't change a one-shot timer if it has fired already (odd) so delete  
re-create
+ImplSalStopTimer(pSalData);
+CreateTimerQueueTimer(pSalData-mnTimerId, NULL, SalTimerProc, NULL, nMS, 
nMS, WT_EXECUTEDEFAULT);
 
 pSalData-mnNextTimerTime = pSalData-mnLastEventTime + nMS;
 }
@@ -111,15 +109,10 @@ void CALLBACK SalTimerProc(PVOID, BOOLEAN)
 __try
 {
 #endif
+
 SalData* pSalData = GetSalData();
-ImplSVData* pSVData = ImplGetSVData();
-
-// don't allow recursive calls (mbInTimerProc is set when the callback
-// is being processed)
-if (pSVData-mpSalTimer  !pSalData-mbInTimerProc)
-{
-ImplPostMessage(pSalData-mpFirstInstance-mhComWnd, 
SAL_MSG_TIMER_CALLBACK, 0, 0);
-}
+ImplPostMessage(pSalData-mpFirstInstance-mhComWnd, 
SAL_MSG_TIMER_CALLBACK, 0, 0);
+
 #if defined ( __MINGW32__ )  !defined ( _WIN64 )
 }
 han.Reset();
@@ -149,23 +142,18 @@ void EmitTimerCallback(bool bAllowRecursive)
 
 // Try to acquire the mutex. If we don't get the mutex then we
 // try this a short time later again.
-if (ImplSalYieldMutexTryToAcquire())
+if (ImplSalYieldMutexTryToAcquire() 
+(pSVData-mpSalTimer  (!pSalData-mbInTimerProc || bAllowRecursive)))
 {
-if (pSVData-mpSalTimer  (!pSalData-mbInTimerProc || 
bAllowRecursive))
-{
-pSalData-mbInTimerProc = true;
-pSVData-mpSalTimer-CallCallback();
-pSalData-mbInTimerProc = false;
-ImplSalYieldMutexRelease();
-
-// Run the timer in the correct time, if we start this
-// with a small timeout, because we don't get the mutex
-if (pSalData-mnTimerId  (pSalData-mnTimerMS != 
pSalData-mnTimerOrgMS))
-ImplSalStartTimer(pSalData-mnTimerOrgMS, false);
-}
+pSalData-mbInTimerProc = true;
+pSVData-mpSalTimer-CallCallback();
+pSalData-mbInTimerProc = false;
+ImplSalYieldMutexRelease();
 }
 else
+{
 ImplSalStartTimer(10, true);
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 211b3192f05c4120fa2dd0e23988e74bdd310830
Author: Jan Holesovsky ke...@collabora.com
Date:   Fri Sep 19 15:48:24 2014 +0200

fdo#84000: Reimplement the Windows WinSalTimer using Timer Queues.

Timer Queues


http://msdn.microsoft.com/en-us/library/windows/desktop/ms686796%28v=vs.85%29.aspx

allow creating  maintaing high-precision timers.  This commit switches the
WinSalTimer implementation from using the Timers:


http://msdn.microsoft.com/en-us/library/windows/desktop/ms644900%28v=vs.85%29.aspx

to Timer Queue Timers.

The 'classic' Timers do not have better precision than some 15.6ms (the
documentation mentions 10ms, but some measuring seems to confirm that it is
more than that).

With the Timer Queue Timers, we now have 1ms precision.

Incorporates some cleanup from Michael Meeks michael.me...@collabora.com.

Change-Id: I0312a0c9fdc2779258698b24389b24c39e643473

diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index 0b147b4..71836e7 100644
--- a/tools/source/datetime/ttime.cxx
+++

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa writerfilter/source

 dev/null  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |9 -
 writerfilter/source/dmapper/GraphicImport.cxx |7 ---
 writerfilter/source/dmapper/PropertyIds.cxx   |1 -
 writerfilter/source/dmapper/PropertyIds.hxx   |1 -
 5 files changed, 18 deletions(-)

New commits:
commit acf7af3535753f8acb89595acca07db415234d6b
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Sep 23 23:40:13 2014 +0200

Revert handle docx's w:anchor layoutInCell attribute (bnc#891663)

This reverts commit b6dae49f3913464dc76992fbb2d1ee8ca9c98f07.

diff --git a/sw/qa/extras/ooxmlimport/data/bnc891663.docx 
b/sw/qa/extras/ooxmlimport/data/bnc891663.docx
deleted file mode 100644
index d5f057e..000
Binary files a/sw/qa/extras/ooxmlimport/data/bnc891663.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 2a7ab9a..0035e7b 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1723,15 +1723,6 @@ DECLARE_OOXMLIMPORT_TEST(testTableBtlrCenter, 
table-btlr-center.docx)
 CPPUNIT_ASSERT_EQUAL(text::VertOrientation::CENTER, 
getPropertysal_Int16(xTable-getCellByName(A2), VertOrient));
 }
 
-DECLARE_OOXMLIMPORT_TEST(testBnc891663, bnc891663.docx)
-{
-// The image should be inside a cell, so the text in the following cell 
should be below it.
-int imageTop = 
parseDump(/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds,
 top).toInt32();
-int imageHeight = 
parseDump(/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds,
 height).toInt32();
-int textNextRowTop = 
parseDump(/root/page/body/tab/row[2]/cell[1]/txt[1]/infos/bounds, 
top).toInt32();
-CPPUNIT_ASSERT( textNextRowTop = imageTop + imageHeight );
-}
-
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index 2c57337..607d92b 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -210,7 +210,6 @@ public:
 sal_Int16 nVertOrient;
 sal_Int16 nVertRelation;
 sal_Int32 nWrap;
-bool  bLayoutInCell;
 bool  bOpaque;
 bool  bContour;
 bool  bContourOutside;
@@ -283,7 +282,6 @@ public:
 ,nVertOrient(  text::VertOrientation::NONE )
 ,nVertRelation( text::RelOrientation::FRAME )
 ,nWrap(0)
-,bLayoutInCell(false)
 ,bOpaque( true )
 ,bContour(false)
 ,bContourOutside(true)
@@ -858,8 +856,6 @@ void GraphicImport::lcl_attribute(Id nName, Value  val)
 break;
 case NS_ooxml::LN_CT_Anchor_locked: // 90990; - ignored
 case NS_ooxml::LN_CT_Anchor_layoutInCell: // 90991; - ignored
-m_pImpl-bLayoutInCell = nIntValue != 0;
-break;
 case NS_ooxml::LN_CT_Anchor_hidden: // 90992; - ignored
 break;
 case NS_ooxml::LN_CT_Anchor_allowOverlap: // 90993;
@@ -1512,9 +1508,6 @@ uno::Reference text::XTextContent  
GraphicImport::createGraphicObject( const b
 }
 
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_SURROUND ),
 uno::makeAny(m_pImpl-nWrap));
-if( m_pImpl-bLayoutInCell  m_pImpl-nWrap != 
text::WrapTextMode_THROUGHT )
-
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_FOLLOW_TEXT_FLOW ),
-uno::makeAny(true));
 
 
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_SURROUND_CONTOUR ),
 uno::makeAny(m_pImpl-bContour));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index 14dbc25..d693ddb 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -347,7 +347,6 @@ const OUString PropertyNameSupplier::GetName( PropertyIds 
eId ) const
 case PROP_HORIZONTAL_MERGE: sName = HorizontalMerge; break;
 case PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING : sName = 
ApplyParagraphMarkFormatToNumbering; break;
 case PROP_CELL_DIRECTION: sName = CellDirection; break;
-case PROP_FOLLOW_TEXT_FLOW: sName = IsFollowingTextFlow; break;
 }
 ::std::pairPropertyNameMap_t::iterator,bool aInsertIt =
 m_pImpl-aNameMap.insert( PropertyNameMap_t::value_type( eId, 
sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx 
b/writerfilter/source/dmapper/PropertyIds.hxx
index 3c03ed3..1f63179 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -318,7 +318,6 @@ enum PropertyIds
 ,PROP_HORIZONTAL_MERGE
 ,PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source

 dev/null  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |9 -
 writerfilter/source/dmapper/GraphicImport.cxx |7 ---
 writerfilter/source/dmapper/PropertyIds.cxx   |1 -
 writerfilter/source/dmapper/PropertyIds.hxx   |1 -
 5 files changed, 18 deletions(-)

New commits:
commit b3db68f6d26b5eee54c3f636a71ad22ff207965e
Author: Andras Timar andras.ti...@collabora.com
Date:   Tue Sep 23 23:40:56 2014 +0200

Revert handle docx's w:anchor layoutInCell attribute (bnc#891663)

This reverts commit 2a632bb30f78f02042ce333d426468087639305b.

diff --git a/sw/qa/extras/ooxmlimport/data/bnc891663.docx 
b/sw/qa/extras/ooxmlimport/data/bnc891663.docx
deleted file mode 100644
index d5f057e..000
Binary files a/sw/qa/extras/ooxmlimport/data/bnc891663.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 07761dd..305b6ed 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2275,15 +2275,6 @@ DECLARE_OOXMLIMPORT_TEST(testBnc519228OddBreaks, 
bnc519228_odd-breaks.docx)
 getParagraphOfText( 1, getProperty uno::Referencetext::XText 
(page5Style, HeaderText), This is the header for odd pages);
 }
 
-DECLARE_OOXMLIMPORT_TEST(testBnc891663, bnc891663.docx)
-{
-// The image should be inside a cell, so the text in the following cell 
should be below it.
-int imageTop = 
parseDump(/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds,
 top).toInt32();
-int imageHeight = 
parseDump(/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds,
 height).toInt32();
-int textNextRowTop = 
parseDump(/root/page/body/tab/row[2]/cell[1]/txt[1]/infos/bounds, 
top).toInt32();
-CPPUNIT_ASSERT( textNextRowTop = imageTop + imageHeight );
-}
-
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index e2d3fa3..6cd88a5 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -210,7 +210,6 @@ public:
 sal_Int16 nVertOrient;
 sal_Int16 nVertRelation;
 sal_Int32 nWrap;
-bool  bLayoutInCell;
 bool  bOpaque;
 bool  bContour;
 bool  bContourOutside;
@@ -284,7 +283,6 @@ public:
 ,nVertOrient(  text::VertOrientation::NONE )
 ,nVertRelation( text::RelOrientation::FRAME )
 ,nWrap(0)
-,bLayoutInCell(false)
 ,bOpaque( true )
 ,bContour(false)
 ,bContourOutside(true)
@@ -583,8 +581,6 @@ void GraphicImport::lcl_attribute(Id nName, Value rValue)
 break;
 case NS_ooxml::LN_CT_Anchor_locked: // 90990; - ignored
 case NS_ooxml::LN_CT_Anchor_layoutInCell: // 90991; - ignored
-m_pImpl-bLayoutInCell = nIntValue != 0;
-break;
 case NS_ooxml::LN_CT_Anchor_hidden: // 90992; - ignored
 break;
 case NS_ooxml::LN_CT_Anchor_allowOverlap: // 90993;
@@ -1234,9 +1230,6 @@ uno::Reference text::XTextContent  
GraphicImport::createGraphicObject( const b
 }
 
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_SURROUND ),
 uno::makeAny(m_pImpl-nWrap));
-if( m_pImpl-bLayoutInCell  m_pImpl-nWrap != 
text::WrapTextMode_THROUGHT )
-
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_FOLLOW_TEXT_FLOW ),
-uno::makeAny(true));
 
 
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName( 
PROP_SURROUND_CONTOUR ),
 uno::makeAny(m_pImpl-bContour));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index fc81dae..3f5fa05 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -394,7 +394,6 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) 
const
 case PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING : sName = 
ApplyParagraphMarkFormatToNumbering; break;
 case PROP_CELL_DIRECTION: sName = CellDirection; break;
 case PROP_CELL_HIDE_MARK: sName = CellHideMark; break;
-case PROP_FOLLOW_TEXT_FLOW: sName = IsFollowingTextFlow; break;
 }
 ::std::pairPropertyNameMap_t::iterator,bool aInsertIt =
 m_pImpl-aNameMap.insert( PropertyNameMap_t::value_type( eId, 
sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx 
b/writerfilter/source/dmapper/PropertyIds.hxx
index 7394a50..3510e62 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -366,7 +366,6 @@ enum PropertyIds
 ,PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING
 ,PROP_CELL_DIRECTION

Re: LO 4.3 build broken (related to bnc#891663)