broken windows build

[Norbert Thiebaud]

since most likely
http://ci.libreoffice.org/job/lo_tb_master_win/506/

one of the four patches involved there seems to cause the windows
build to break and enter a cpu-loop in make, which cause a timeout...
which does not apparently properly kill make, and therefore the
tcp-server is hung too and can't serve other build.

isn't Windaube wonderful ?

That was 6 days ago.. that broke the window tb and every gerrit build
attempt since then

I regularly try to restart the windows slave.. which is not that easy
to do remote, when one can only use lowercase without modifier (not
Ctrl-C not | for instance)

did I mentionned Windaube is wonderful ?

But if no one care about build breakage... whats the point ?

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

LibreOffice Gerrit News for dev-tools on 2015-02-10

[gerrit]

Moin!

* Open changes on master for project dev-tools changed in the last 25 hours:

None

* Merged changes on master for project dev-tools changed in the last 25 hours:

+ Fix small typo in email message.
  in https://gerrit.libreoffice.org/14386 from Maarten Hoes
+ Improve note in email to include git location.
  in https://gerrit.libreoffice.org/14364 from Maarten Hoes


* Abandoned changes on master for project dev-tools changed in the last 25 
hours:

None

* Open changes needing tweaks, but being untouched for more than a week:

None

Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

LibreOffice Gerrit News for core on 2015-02-10

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ fdo#39468 translated german comments
  in https://gerrit.libreoffice.org/14384 from Michael Jaumann
  about module sc
+ fix tdf#81073 :Addition of text zoom levels to print preview zoom
  in https://gerrit.libreoffice.org/14385 from Rishabh Kumar
  about module sw
+ Remove duplicate L10n icons.
  in https://gerrit.libreoffice.org/14378 from Andrew Dent
  about module icon-themes
+ fix tdf#81073 :Addition of text zoom levels to print preview zoom
  in https://gerrit.libreoffice.org/14376 from Rishabh Kumar
  about module sw
 End of freshness 

+ Werror: C4324 structure was padded due to __declspec(align())
  in https://gerrit.libreoffice.org/14391 from David Ostrovsky
  about module vcl
+ Fix bold, regular font spacing bug for Graphite fonts
  in https://gerrit.libreoffice.org/14380 from Martin Hosken
  about module build, cui, vcl


* Merged changes on master for project core changed in the last 25 hours:

+ svtool/GraphicManager: properly decrease mnUsedSize on unregister ops
  in https://gerrit.libreoffice.org/14389 from Pierre-Eric Pelloux-Prayer
+ sw: avoid temporary object creation to build GraphicPrimitive2D
  in https://gerrit.libreoffice.org/14390 from Pierre-Eric Pelloux-Prayer
+ EMF clip regions should be ignored sometimes.
  in https://gerrit.libreoffice.org/13444 from Eilidh McAdam
+ Werror: data lost during conversion from size_t to int
  in https://gerrit.libreoffice.org/14374 from David Ostrovsky
+ Fix of a few typos
  in https://gerrit.libreoffice.org/14373 from Andrea Gelmini
+ fdo#39468 translated german comments
  in https://gerrit.libreoffice.org/14382 from Daniel Sikeler
+ tdf#47577  Zoom slider should only react to full click
  in https://gerrit.libreoffice.org/14265 from Rodolfo Ribeiro Gomes
+ Basic : Partially rewrite hex and octal constant reading.
  in https://gerrit.libreoffice.org/14369 from Arnaud Versini


* Abandoned changes on master for project core changed in the last 25 hours:

None

* Open changes needing tweaks, but being untouched for more than a week:

+ vcl: Reduce OpenGLX11CairoTextRender surface area to size of text bounds
  in https://gerrit.libreoffice.org/14148 from Chris Sherlock
+ wip: get rid of svx dbtoolsclient
  in https://gerrit.libreoffice.org/11737 from Lionel Elie Mamane
+ fdo#86606 removal of direct formatting options from the context menu
  in https://gerrit.libreoffice.org/13196 from Yousuf Philips
+ Fix typo code Persistant
  in https://gerrit.libreoffice.org/14030 from Andrea Gelmini
+ fdo#88309: Standardize, cleanup, and improve Assertions
  in https://gerrit.libreoffice.org/13945 from Ashod Nakashian
+ --with-macosx-app-name= is unused, so bin it from AC_ARG_WITH list
  in https://gerrit.libreoffice.org/13658 from Douglas Mencken
+ fdo#30541: Default icon set on Windows should be Galaxy, not Tango.
  in https://gerrit.libreoffice.org/13859 from Rimas Kudelis
+ fdo#63905: fix regression by using paper size set in printer properties
  in https://gerrit.libreoffice.org/13763 from Clément Lassieur
+ fdo#75825-"Send Document as E-Mail" not working
  in https://gerrit.libreoffice.org/13786 from Charu Tyagi
+ solenv-filelists.pm: fix "can't call method `mode' on an undefined value"
  in https://gerrit.libreoffice.org/13669 from Douglas Mencken
+ gbuild-to-ide fixes
  in https://gerrit.libreoffice.org/11754 from Peter Foley
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ fdo#39625 Make existing CppUnittests work
  in https://gerrit.libreoffice.org/11605 from Tobias Madl
+ fdo#86784 make soffice commandline in juh Bootstrap.bootstrap() configura
  in https://gerrit.libreoffice.org/13290 from Christoph Lutz
+ start detection of kf5 stuff in configure.ac
  in https://gerrit.libreoffice.org/13079 from Jonathan Riddell
+ more breeze icons
  in https://gerrit.libreoffice.org/13058 from Jonathan Riddell
+ Perftest for loading autocorrect dictionaries, related fdo#79761
  in https://gerrit.libreoffice.org/11296 from Matúš Kukan


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Discussion about highlighting (MS compatibility issue)

[V Stuart Foote]

Zolnai, *

Did not realize there were actually two OOXML/MSO attributes that had to be
manipulated to handle highlighting in MS Office formats.  And that we'd been
fudging it with just one--your patch with just one
attribute--RES_CHRATR_HIGHLIGHT manipulated as background fill in LO.  

This recently came up in a new twist, over how we've been handled it--since
your work 2013-09--needing to turn highlighting on or off by selection and
removing direct formatting background fill.  (tdf#88990).  That has been a
bit cumbersome but works to clear the direct formatting in an imported
docx/doc document that either shading or highlighting receives as an ODF
document.

Should we care about this from an ODF 1.2  standards  perspective?  Since we
apply direct formatting to give background fill "highlighting" to ODF
documents--is there any way in ODF to differentiate  formatting that is
"highlighting" vs. what is "background fill"?I don't know...  anyone?

If there is a specification for it in ODF ,  then certainly creating an .uno
action and GUI button to apply a "highlighting" style, or direct formatting
of text, would be correct.  But if we are just pursuing this for
"interoperability" seems like we are chasing our tails over it.

If  there is not, then why should we care that OOXML/MSO and ODF diverge on
this handling?  Seems like in that case, we should continue to make do with
only background fill mapping of DOCX/MSO highlighting on import. And on
export we don't differentiate--it  all remains background fill in the
DOCX/MSO formats.

Key is what ODF 1.2 supports, or maybe what is proposed in 1.3 that might
also be implemented.


=-refs-=
https://bugs.documentfoundation.org/show_bug.cgi?id=64490#c14
http://cgit.freedesktop.org/libreoffice/core/commit/?id=8b949134441056a1455d67ddfdd7e0bc5f2ee682
http://cgit.freedesktop.org/libreoffice/core/commit/?id=b5e60724ac73bb0e62b249145a8931fd6166bb69
https://bugs.documentfoundation.org/show_bug.cgi?id=88990








--
View this message in context: 
http://nabble.documentfoundation.org/Discussion-about-highlighting-MS-compatibility-issue-tp4139399p4139552.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Pierre-Eric Pelloux-Prayer]

 svtools/source/graphic/grfmgr2.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f262e1b1356488515972916c3e11ec210d22cdd9
Author: Pierre-Eric Pelloux-Prayer 
Date:   Sun Feb 8 18:31:28 2015 +0100

svtool/GraphicManager: properly decrease mnUsedSize on unregister ops

mnUsedSize was never decreased causing the cache to pretending to be full,
which caused lots of needless work (image loading, id creation (which are
basically a crc of all bytes of an image, ...))

Change-Id: I1e0a6a07631435346c3509822fae43a067d33303
Reviewed-on: https://gerrit.libreoffice.org/14389
Reviewed-by: Michael Stahl 
Reviewed-by: Zolnai Tamás 
Tested-by: Zolnai Tamás 
(cherry picked from commit c7e907f58f8d0791ee304b42de769f43102522e9)

diff --git a/svtools/source/graphic/grfmgr2.cxx 
b/svtools/source/graphic/grfmgr2.cxx
index f469623..3aabb52 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -167,12 +167,13 @@ void GraphicManager::ImplUnregisterObj( const 
GraphicObject& rObj )
 {
 if ( *it == &rObj ) {
 maObjList.erase( it );
+
+if( !rObj.IsSwappedOut() )
+mnUsedSize -= rObj.GetSizeBytes();
 return;
 }
 }
 assert(false); // surely it should have been registered?
-if( !rObj.IsSwappedOut() )
-mnUsedSize -= rObj.GetSizeBytes();
 }
 
 void GraphicManager::ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj 
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liborcus

[David Tardon]

 external/liborcus/UnpackedTarball_liborcus.mk   |2 
 external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0 | 1799 
 2 files changed, 1801 insertions(+)

New commits:
commit 8b68841c1482d98bee98de0a60910b93feb8f8b6
Author: David Tardon 
Date:   Mon Feb 9 23:50:03 2015 +0100

fix liborcus build with gcc 5

Change-Id: I38b2ecf86d4334d0179362079a216df4301bf184

diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 696c34a..66022d5 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -29,6 +29,8 @@ endif
 # f60d6eecee72349993a392a9a63ddf3383d3b8c8-
 # f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
 
+liborcus_patches += liborcus_0.7.0-configure.gcc5.patch.0
+
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
$(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \
 ))
diff --git a/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0 
b/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
new file mode 100644
index 000..a029a27
--- /dev/null
+++ b/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
@@ -0,0 +1,1799 @@
+--- configure.old  2013-10-15 04:17:59.0 +0200
 configure  2015-02-09 23:41:48.525767041 +0100
+@@ -1471,7 +1471,7 @@ Optional Features:
+   --disable-libtool-lock  avoid locking (might break parallel builds)
+   --enable-static-boost   Prefer the static boost libraries over the shared
+   ones [no]
+-  --disable-werrorTreat all warnings as errors, useful for development
++  --enable-werror Treat all warnings as errors, useful for development
+   --enable-debug  Build with debug features in mind.]
+   --disable-spreadsheet-model
+   Disable the spreadsheet model implementation in
+@@ -2592,7 +2592,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ ac_config_headers="$ac_config_headers config.h"
+ 
+-am__api_version='1.12'
++am__api_version='1.14'
+ 
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+@@ -2805,8 +2805,8 @@ if test x"${MISSING+set}" != xset; then
+   esac
+ fi
+ # Use eval to expand $SHELL
+-if eval "$MISSING --run true"; then
+-  am_missing_run="$MISSING --run "
++if eval "$MISSING --is-lightweight"; then
++  am_missing_run="$MISSING "
+ else
+   am_missing_run=
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too 
old or missing" >&5
+@@ -3046,6 +3046,45 @@ else
+ fi
+ rmdir .tst 2>/dev/null
+ 
++# Check whether --enable-silent-rules was given.
++if test "${enable_silent_rules+set}" = set; then :
++  enableval=$enable_silent_rules;
++fi
++
++case $enable_silent_rules in # (((
++  yes) AM_DEFAULT_VERBOSITY=0;;
++   no) AM_DEFAULT_VERBOSITY=1;;
++*) AM_DEFAULT_VERBOSITY=1;;
++esac
++am_make=${MAKE-make}
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports 
nested variables" >&5
++$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
++if ${am_cv_make_support_nested_variables+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if $as_echo 'TRUE=$(BAR$(V))
++BAR0=false
++BAR1=true
++V=1
++am__doit:
++  @$(TRUE)
++.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
++  am_cv_make_support_nested_variables=yes
++else
++  am_cv_make_support_nested_variables=no
++fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
$am_cv_make_support_nested_variables" >&5
++$as_echo "$am_cv_make_support_nested_variables" >&6; }
++if test $am_cv_make_support_nested_variables = yes; then
++AM_V='$(V)'
++  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
++else
++  AM_V=$AM_DEFAULT_VERBOSITY
++  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
++fi
++AM_BACKSLASH='\'
++
+ if test "`cd $srcdir && pwd`" != "`pwd`"; then
+   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+   # is not polluted with repeated "-I."
+@@ -3096,19 +3135,70 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+-mkdir_p="$MKDIR_P"
++# For better backward compatibility.  To be removed once Automake 1.9.x
++# dies out for good.  For more background, see:
++# 
++# 
++mkdir_p='$(MKDIR_P)'
++
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.  Yes, it's still used
+ # in the wild :-(  We should find a proper way to deprecate it ...
+ AMTAR='$${TAR-tar}'
+ 
++
++# We'll loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar  pax cpio none'
++
+ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+ 
+ 
+ 
+ 
+ 
++
++# POSIX will say in a future version that running "rm -f" with no argument
++# is OK; and we want to be able to make th

Re: Invalid iterator in RelationTableView.cxx? (dbaccess module)

[Lionel Elie Mamane]

On Mon, Feb 09, 2015 at 02:22:04PM -0700, julien2412 [via Document Foundation 
Mail Archive] wrote:

> On RelationTableView.cxx file, I noticed this:
>  99 for(;aIter != rTabWinDataList.rend();++aIter)
> 100 {
> 101 TTableWindowData::value_type pData = *aIter;
> 102 OTableWindow* pTabWin = createWindow(pData);
> 103 
> 104 if (!pTabWin->Init())
> 105 {
> ... 
> 112 rTabWinDataList.erase(
> ::std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), *aIter),
> rTabWinDataList.end());
> 113 continue;
> 114 }
> 
> idem block 139-143
> 
> See
> http://opengrok.libreoffice.org/xref/core/dbaccess/source/ui/relationdesign/RelationTableView.cxx#99
> 
> Shouldn't the "continue" be replaced by "break" to avoid invalid iterator or
> "aIter" isn't invalid for "for loops" at all even after "erase"
> lines?

Note that aIter is a *reverse* iterator, that goes backwards.

After erase(A, B), the iterators pointing to positions A or after are
invalid, but iterators pointing to positions BEFORE A are valid.

The std::remove will move elements inside rTabWinDataList, moving all
elements that are equal to *aIter to the end. The erase then actually
removes these elements (the ones equal to aIter). It seems to me that:

1) the return value of std::remove is guaranteed to be at aIter or
   after.

2) thus the erase can only invalidate positions at and after aIter.

3) then we do ++aIter (moving it LEFT, backwards), which thus then
   guaranteed to be a valid position (or rend, that is one-before-the
   first position).

4) However, this algorithm means that (unless rTabWinDataList is
   sorted or something like that), the for loop might traverse the
   same *elements* SEVERAL TIMES, since they are moved around, it may
   encounter the same element several times at different positions.

5) It will, however, not miss any element equivalence class,
   traversing each element OR AN ELEMENT EQUAL TO IT at least once.

-- 
Lionel




--
View this message in context: 
http://nabble.documentfoundation.org/Invalid-iterator-in-RelationTableView-cxx-dbaccess-module-tp4139541p4139547.html
Sent from the Dev mailing list archive at Nabble.com.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Invalid iterator in RelationTableView.cxx? (dbaccess module)

[Michael Stahl]

On 09.02.2015 22:22, julien2412 wrote:
> Hello,
> 
> On RelationTableView.cxx file, I noticed this:
>  99 for(;aIter != rTabWinDataList.rend();++aIter)
> 100 {
> 101 TTableWindowData::value_type pData = *aIter;
> 102 OTableWindow* pTabWin = createWindow(pData);
> 103 
> 104 if (!pTabWin->Init())
> 105 {
> ... 
> 112 rTabWinDataList.erase(
> ::std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), *aIter),
> rTabWinDataList.end());
> 113 continue;
> 114 }
> 
> idem block 139-143
> 
> See
> http://opengrok.libreoffice.org/xref/core/dbaccess/source/ui/relationdesign/RelationTableView.cxx#99
> 
> Shouldn't the "continue" be replaced by "break" to avoid invalid iterator or
> "aIter" isn't invalid for "for loops" at all even after "erase" lines?

good question... the aIter is a "reverse_iterator", so it starts at the
end and goes backwards...

http://www.cplusplus.com/reference/vector/vector/erase/

> Iterator validity
> Iterators, pointers and references pointing to position (or first) and beyond 
> are invalidated,
> with all iterators, pointers and references to elements before
position (or first) are
> guaranteed to keep referring to the same elements they were referring
to before the call.

... so since the element that aIter points to will be deleted, aIter is
invalid.

if it is somehow guaranteed that there are no duplicate elements, then
the code could be fixed by incrementing aIter before doing the erase.

but wait!  a reverse_iterator actually contains an ordinary iterator
that points not to the same element, but to the *next* element following
it...

i guess that means that aIter would need to be incremented *twice* to be
safe?

hmm perhaps you could replace the erase(remove...) with an erase
that takes the reverse_iterator's base iterator (aIter.base()) to erase
just one element and then create a new reverse_iterator from the return
value of erase, which should be valid?  (i think you need to skip the
++aIter in this case, but better double-check that).

... why doesn't the loop use integer indexes, those are much less
confusing  :)


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

Invalid iterator in RelationTableView.cxx? (dbaccess module)

[julien2412]

Hello,

On RelationTableView.cxx file, I noticed this:
 99 for(;aIter != rTabWinDataList.rend();++aIter)
100 {
101 TTableWindowData::value_type pData = *aIter;
102 OTableWindow* pTabWin = createWindow(pData);
103 
104 if (!pTabWin->Init())
105 {
... 
112 rTabWinDataList.erase(
::std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), *aIter),
rTabWinDataList.end());
113 continue;
114 }

idem block 139-143

See
http://opengrok.libreoffice.org/xref/core/dbaccess/source/ui/relationdesign/RelationTableView.cxx#99

Shouldn't the "continue" be replaced by "break" to avoid invalid iterator or
"aIter" isn't invalid for "for loops" at all even after "erase" lines?

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Invalid-iterator-in-RelationTableView-cxx-dbaccess-module-tp4139541.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Pierre-Eric Pelloux-Prayer]

 svtools/source/graphic/grfmgr2.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c7e907f58f8d0791ee304b42de769f43102522e9
Author: Pierre-Eric Pelloux-Prayer 
Date:   Sun Feb 8 18:31:28 2015 +0100

svtool/GraphicManager: properly decrease mnUsedSize on unregister ops

mnUsedSize was never decreased causing the cache to pretending to be full,
which caused lots of needless work (image loading, id creation (which are
basically a crc of all bytes of an image, ...))

Change-Id: I1e0a6a07631435346c3509822fae43a067d33303
Reviewed-on: https://gerrit.libreoffice.org/14389
Reviewed-by: Michael Stahl 
Reviewed-by: Zolnai Tamás 
Tested-by: Zolnai Tamás 

diff --git a/svtools/source/graphic/grfmgr2.cxx 
b/svtools/source/graphic/grfmgr2.cxx
index f469623..3aabb52 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -167,12 +167,13 @@ void GraphicManager::ImplUnregisterObj( const 
GraphicObject& rObj )
 {
 if ( *it == &rObj ) {
 maObjList.erase( it );
+
+if( !rObj.IsSwappedOut() )
+mnUsedSize -= rObj.GetSizeBytes();
 return;
 }
 }
 assert(false); // surely it should have been registered?
-if( !rObj.IsSwappedOut() )
-mnUsedSize -= rObj.GetSizeBytes();
 }
 
 void GraphicManager::ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj 
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.4.1.1'

[Christian Lohmaier]

Tag 'libreoffice-4.4.1.1' created by Christian Lohmaier 
 at 2015-02-09 20:22 -0800

Tag libreoffice-4.4.1.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJU2RbwAAoJEPQ0oe+v7q6jiFkP/0+2PEiHJYtXJqxYoCsqCuPj
bh0fjIhJaeAA710mq+UbV7yN5t0xnz4NRD1sNiUobDgvsqy8T6TlwcpMBbYmPGih
n33LMRgE7+E6gDHxt865U2z3FyVvEv1aD03xod1fQWdZcHUg1dO3EzcPCDNN+wnL
sK18uLqmDfhHEswuEwZVPwmX42ECQuH3M0tuf+3aeGO1IyZmWikMT5Z55z7v7rEg
usbaGHbny767uPnNLsGvi7bwyWeVzEnvKz4wyTeqqvjLf5vptEsDLandS1dtqgsK
19dK2A9XalaLIrgrQAZd5IK4YYLCHPtMKAuUdKpnj9ulWnAeiM1TRErDmTmNfuLu
wlbMtq+HFDS6c6zU4WlMxlaFiUYkYfcbND3wktcMw0oGaFx7XrOgNlRn2hKu5aAN
qiQ8HXfNmMQ25xkoDRG3jBOk2x+pkXKe08nyXEDOwiR+IpuqVUd5fe0cEFFxlKzi
SIttsT7qKqwS1W/I60Q+VlKEx5oL/LrtDFGEmMsuxwTRI3LJTe1ohlxxsksXBkAH
SH3O11a2p+4uztz18IbbtYGGI/jMmu/geuDOyqWVjJ67/zUjg//w4yx/8hkZFt47
YoIX81khIIoVeSxnhEpfDEnaY29Lh7FwtfVFHoT0fEdcJFLI5kM3xCxpFpD6Cy1m
zVzZcaYWRtJT+viK2dUA
=+PS7
-END PGP SIGNATURE-

Changes since libreoffice-4-4-branch-point-12:
---
 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/libreoffice-4.4.1.1'

[Christian Lohmaier]

Tag 'libreoffice-4.4.1.1' created by Christian Lohmaier 
 at 2015-02-09 20:22 -0800

Tag libreoffice-4.4.1.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJU2RbzAAoJEPQ0oe+v7q6jrO4P/3ARuPj1wmNT9r+CoifRF1YF
hO5swRGWBL/vZ17lpSAUKDKpJkwPK3Ot/A251aEEc2oP8GJztPJG8RHLs0AN9N2W
FoFBkfMf/CurvFEqyX95HcTMddEeQwU45+AwepT5Yahr0FcQ+KRpSWngaBpD2uXc
o9V0vnEMCwAwz043ZPmzKzQx0c8VVY4xCr0+DpiN66huLqjnxSdbTM0LBkNXBowf
vWqy34nq3QNYsfKJZfYszjm/sAXYZJMd2KOfqQohWFbh58HaCqJeYiJneglRbaFg
8ZJNhJitH2DVE+3eRYtUPDmL8JsHIdTHQWFWCrd4U/KqU8MZGyH9SayudhlPnMfE
MXP/Bc9GDxoAX7WAgAVFRsbuOeGoodHd5RqElZjZTx1soDJqZQZF+l6/jsjGSBj6
DPrvkYgK4QSODHKcO/zoJQXYHUjJe47od+6EhHZcSP/+cqnwfyY/rQT5/22loW9X
uzea2A3g35wXaqg/tqaHFDv3a2HdmVkvMJEBoHFqJ5TrNiAE9ZsSbFJBTMCVPsgS
7pW2uDgSWeOQOp5HlPoRZJeeW3Tf9vPX5aYV2EdHR1SHy2eqst642lw3yk4aRTOf
qdwo2vwRulLG48ehZQRFmTA/jQkoaTZkaUkxg8WbUPrrE3A2sdBydXUe8A1Nfw0F
E2qCjaQs/bFLmUoNP0yW
=9TBa
-END PGP SIGNATURE-

Changes since libreoffice-4-4-branch-point-858:
---
 0 files changed
---
___
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/libreoffice-4.4.1.1'

[Christian Lohmaier]

Tag 'libreoffice-4.4.1.1' created by Christian Lohmaier 
 at 2015-02-09 20:22 -0800

Tag libreoffice-4.4.1.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJU2RbsAAoJEPQ0oe+v7q6jyCEP/jnK1hL7woBA7Bxo4z0HJqSO
gv8GEfgjm6o3ti6AcJ6dNn8O+xkVBtMZS/BYZ9IL6qUodIgBjXEyDDLX5lWsKcfg
/laI10V0jEqyVmysPaqPkHwc3VboTkvqNTUmR2SxvQkZ/2HTHDkJ1pucoYvfYKvr
8BSGBsAKc/HqxbI16UTPMKHLasT6vWHVit84rUGY70HxZJnJcfyhCH7Qk0W+ADIC
vjFBkFaUas33QTAxgA6UmX48LwPf1lZBiKE7+xA2v0+LOHuEfPzjrEUPWo5DHMe7
aRB0iHTRWMcsbjwnDP9qZTz/79FyN5ZmqJCmWbioONFn24/+7XKPan7MM/uLQ+yg
BPs60OcBaganFCDpQ7qfsLRBVPp4pUMQgsV3XjF/H9z7npWaMapr5GoqAKo7UkM5
JLj2jEmg9pcg3xehzR/ak+Jt204nogkO4+/RYJ9/+99wNnIrfEqMYjaC4P10xRhC
yN1d7w6maTDeYiiUf/vH1ilRXUK4Y6Msaa9iX4My8xyH2Za6MVGE2f+Q+Nwmomqm
Jtj1q+n9Zgx6MHY6I2FrvX5TYDIilXXKXiOpu4PCz0lxEnWyD+0TBKBJ4cy2wVNa
DwsOsnNwwXHTov2fhSSN4/YiMh/aUFRVzwbzoK4yWhAUGsoDy5QSs3j3aAGDDENY
YVi7lGw1klu9nUUDfKOA
=MyC0
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-1' - configure.ac

[Christian Lohmaier]

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

New commits:
commit cf1ec49a3b0991a8b14aec2e6e1add048854e4d5
Author: Christian Lohmaier 
Date:   Mon Feb 9 21:22:50 2015 +0100

bump product version to 4.4.1.1.0+

Change-Id: Ieba2778ee6023e47ccd940ad66f3c091144041f0

diff --git a/configure.ac b/configure.ac
index 42dc3b4..5968d94 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.4.1.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.4.1.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
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/libreoffice-4.4.1.1'

[Christian Lohmaier]

Tag 'libreoffice-4.4.1.1' created by Christian Lohmaier 
 at 2015-02-09 20:22 -0800

Tag libreoffice-4.4.1.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJU2RboAAoJEPQ0oe+v7q6jOJ0QAKYLR37SHcaHZZh4tFyI+yG3
NzmCWjq2nFWn+fwYA+qP2iUbEkUfL/2kDTNSKezY7nEKZeDVcQv2+IJOCEBcFdg6
n1xbaVWeTRzvoOuROdqVPuePZtGulNW+lb656ritFKg4UfHrSgiOHgDea3nrcUL0
rI8CjrlRJ4v3E+Pryk4wVrIpcy6pluClDljnaBPbb6WiOg1Wn3XBwG+lHYEOpS0e
t+qS1FbHsNISku2GWADfJItykWvgYujupo/fcf12sSUUtU9uKfudL8uCyOdWrAjO
eJUZLmAAr9nV7/hnoOEWVopgVy5q6LNvV2LOFI02oUvdiDb0aGmv0heaub7/OAO9
kiYLqYMOKRjlk8TfMH2RvALfXEOfJpRiAP1OTluv25EtpgTD2looXscEtgGJS4pK
fO6YIa142RRt4kxwu8wK+o5pqlaTOhTuAZwgkiht1N9EvF5TKZZzIIWmMGyXuSzC
eENVI/qKQNJWD+SnSyhJbXzaPkWx5jqxGXAose4VlxPQF/WiIWJmikSmd5+7myNv
lWVN922fpg628x3RjyiY3QJ+LYk7EJ1h4JcUHke48eXHw17mt4L5j6Yt6+b4zbPS
jw011piAQ3oDQUdmGugLTJ/Cyk/l6qgFw9mJ++6m/sy46Uc2A/RsMEDkp3U3uYkU
uC5WnDgETlKFkvUMFSBS
=rp4x
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - configure.ac

[Christian Lohmaier]

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

New commits:
commit 21f65ba8e3f30b12a0cddda01f89e7bbe7e7850c
Author: Christian Lohmaier 
Date:   Mon Feb 9 21:19:43 2015 +0100

bump product version to 4.4.2.0.0+

Change-Id: Icfb523b90b731edda7e3b5e6f2e4a94647aadc4e

diff --git a/configure.ac b/configure.ac
index 42dc3b4..f1acf06 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.4.1.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.4.2.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-4-4-1'

[Christian Lohmaier]

New branch 'libreoffice-4-4-1' available with the following commits:
commit 71cbb250dde6e1792cc369d3bf7a71b1ba10
Author: Christian Lohmaier 
Date:   Mon Feb 9 21:16:45 2015 +0100

Branch libreoffice-4-4-1

This is 'libreoffice-4-4-1' - the stable branch for the 4.4.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I35f83d0c7a34e50bf87201f5b53602676733ee85

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

[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-4-1'

[Christian Lohmaier]

New branch 'libreoffice-4-4-1' available with the following commits:
commit 49df5499e80f69726a36769e8a2171876cd48a48
Author: Christian Lohmaier 
Date:   Mon Feb 9 21:16:12 2015 +0100

Branch libreoffice-4-4-1

This is 'libreoffice-4-4-1' - the stable branch for the 4.4.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I97cc06be31972880e73abd910d3314e2d1b9bc71

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

[Libreoffice-commits] help.git: Changes to 'libreoffice-4-4-1'

[Christian Lohmaier]

New branch 'libreoffice-4-4-1' available with the following commits:
commit 98d2f02af203585336aa6b4df10fbbfb0dfe7293
Author: Christian Lohmaier 
Date:   Mon Feb 9 21:16:11 2015 +0100

Branch libreoffice-4-4-1

This is 'libreoffice-4-4-1' - the stable branch for the 4.4.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Icae8bcfad546623d89cc845c9456169965be50a3

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-4-1'

[Christian Lohmaier]

New branch 'libreoffice-4-4-1' available with the following commits:
commit b2bd04aee3a7e3ec995b744645244acad9c4c2eb
Author: Christian Lohmaier 
Date:   Mon Feb 9 21:16:11 2015 +0100

Branch libreoffice-4-4-1

This is 'libreoffice-4-4-1' - the stable branch for the 4.4.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.4.x release,
please use the 'libreoffice-4-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: If192b1cc3e31d2a90c90b55de37d81b626863c74

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

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

[Pierre-Eric Pelloux-Prayer]

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

New commits:
commit ad14ed0bbf80dd95dca6e0dea6edbe5fb68f9f26
Author: Pierre-Eric Pelloux-Prayer 
Date:   Sun Feb 8 18:34:04 2015 +0100

sw: avoid temporary object creation to build GraphicPrimitive2D

As drawinglayer::primitive2d::GraphicPrimitive2D constructor expects a
GraphicObject ref, we can simply pass in rGrfObj instead of building a
(implicit) temp GraphicObjet using the GetGraphic() result.

Change-Id: I8c54f20804390c773fdf9406f534787ce7143e84
Reviewed-on: https://gerrit.libreoffice.org/14390
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 4c50dcd..3b86993 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -808,7 +808,7 @@ void paintGraphicUsingPrimitivesHelper(OutputDevice & 
rOutputDevice,
 {
 aContent[0] = new drawinglayer::primitive2d::GraphicPrimitive2D(
 aTargetTransform,
-rGrfObj.GetGraphic(),
+rGrfObj,
 rGraphicAttr);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 formula/source/core/api/token.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 5d3f89c0264b0bb8fbe750051ccc1c57c199f6ad
Author: Eike Rathke 
Date:   Mon Feb 9 20:54:33 2015 +0100

this FDIST has 3 parameters also in Excel, revert tdf#40835

The UI FDIST is LEGACY.FDIST in ODFF and is the same in Excel. Only the
"real" FDIST has 4 parameters, which is F.DIST in Excel.

Change-Id: I0b926b51a3cc7282a54cce448e46fed6be3c61fa

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index e033835..f81b9e7 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1036,7 +1036,6 @@ inline bool MissingConventionOOXML::isRewriteNeeded( 
OpCode eOp ) const
 case ocPoissonDist:
 case ocNormDist:
 case ocLogNormDist:
-case ocFDist:
 return true;
 default:
 return false;
@@ -1146,7 +1145,6 @@ void FormulaMissingContext::AddMoreArgs( 
FormulaTokenArray *pNewArr, const Missi
 
 case ocGammaDist:
 case ocNormDist:
-case ocFDist:
 if (mnCurArg == 2)
 {
 pNewArr->AddOpCode( ocSep );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: help asked for Calc jump function with empty arguments

[Eike Rathke]

Hi Winfried,

On Thursday, 2015-02-05 12:44:56 +0100, Winfried Donkers wrote:

> >> and =IFERROR(1/0;) returns an empty cell, not an error message.
> 
> >This is correct and voids my earlier proposal to propagate the ocMissing 
> >token through in the final result. Actually we need to pop an ocMissing and 
> >push an ScEmptyCellToken in such case.
> 
> (To make it clear for me, =IFERROR(1/0,) results in an empty cell in Excel 
> and an error in Calc.)
> Popping ocMissing seems a bit of a problem - for me ;-) - as 
> ScInterpreter::Interpret calls ScIfError() first and then changes opcode. So, 
> when I detect ocMissing, I don't know from which function.
> In the case of IFERROR I could use a boolean to return an empty cell, but in 
> the case of IF I need to know the result of the expression in the first 
> argument or whether the ocMissing refers to the ifTrue argument or the 
> ifFalse argument.
> I hope you understand my problem.

Yup.. actually the pop/push approach would only work as final result,
not in between on the fly.. So, I tried things in Excel and all these
yield TRUE, meaning that the "empty cell" is preserved as code path:
=IFERROR(1/0,)=""
=IFERROR(1/0,)=0
=IF(1,,)=""
=IF(1,,)=0

We have something similar with formula::svEmptyCell, my rough guess now
is it should be enough to treat svMissing the same as svEmptyCell in
comparisons (ScInterpreter::Compare() and ScInterpreter::CompareMat()),
instead of forcing it into a context of svDouble at that stage, and when
preparing the final result check for an ocMissing (interpr4.cxx line
4371 in Interpret() at "obtain result" before the current if(
pCur->GetOpCode() == ocPush )) and if so pop it and push an empty cell,
i.e. Pop(), PushTempToken( new ScEmptyCellToken( false, false))

Does that clarify?

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - translations

[Christian Lohmaier]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ca73bc17462bca78a833e05d538d75aa6301200
Author: Christian Lohmaier 
Date:   Mon Feb 9 18:51:07 2015 +0100

Updated core
Project: translations  03885753ab69e3a883fa8c9d2bd658bffc728d3b

diff --git a/translations b/translations
index 7242268..0388575 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 724226857e74c149cbefbcb2dfa1ea0bc50884cf
+Subproject commit 03885753ab69e3a883fa8c9d2bd658bffc728d3b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eilidh McAdam]

 vcl/qa/cppunit/wmf/wmfimporttest.cxx |   10 +-
 vcl/source/filter/wmf/enhwmf.cxx |   18 ++
 vcl/source/filter/wmf/winmtf.cxx |   12 
 vcl/source/filter/wmf/winmtf.hxx |2 ++
 4 files changed, 29 insertions(+), 13 deletions(-)

New commits:
commit 0ca943155c04ee6272bba7ce957b8d87ae9442de
Author: Eilidh McAdam 
Date:   Fri Dec 12 00:45:11 2014 +

EMF clip regions should be ignored sometimes.

Specifically, the record EMR_EXTSELECTCLIPRGN specifies the default
clip region if the RegionMode field is set to RGN_COPY.
See EMF specification section 2.3.2.2 available from
http://msdn.microsoft.com/en-us/library/cc230624.aspx

A unit test had to be changed for this - instead of checking for
a specific clip region, it now checks that no clip region is
specified. This is under the assumption that the default clip
region for our device context is "show everything" - i.e. no clip.

Note also that RGN_COPY seems to be a common mode value for this
record type.

Change-Id: I7bd4fe305dda184d121465005fe09d3c113e3063

diff --git a/vcl/qa/cppunit/wmf/wmfimporttest.cxx 
b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
index f0d192c..6b1cec4 100644
--- a/vcl/qa/cppunit/wmf/wmfimporttest.cxx
+++ b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
@@ -96,15 +96,7 @@ void WmfTest::testSine()
 
 CPPUNIT_ASSERT (pDoc);
 
-assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "top", "0");
-assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "left", "0");
-assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "bottom", "1155947");
-assertXPath(pDoc, "/metafile/sectrectclipregion[1]", "right", "1155378");
-
-assertXPath(pDoc, "/metafile/sectrectclipregion[2]", "top", "1411");
-assertXPath(pDoc, "/metafile/sectrectclipregion[2]", "left", "2962");
-assertXPath(pDoc, "/metafile/sectrectclipregion[2]", "bottom", "16651");
-assertXPath(pDoc, "/metafile/sectrectclipregion[2]", "right", "20698");
+assertXPath(pDoc, "/metafile/sectrectclipregion", 0);
 }
 
 void WmfTest::testEmfProblem()
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 606a9f3..c314ef6 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1149,10 +1149,20 @@ bool EnhWMFReader::ReadEnhWMF()
 pWMF->ReadInt32(cbRgnData);
 pWMF->ReadInt32(nClippingMode);
 
-tools::PolyPolygon aPolyPoly;
-if (cbRgnData)
-ImplReadRegion(aPolyPoly, *pWMF, nRecSize);
-pOut->SetClipPath(aPolyPoly, nClippingMode, false);
+// This record's region data should be ignored if mode
+// is RGN_COPY - see EMF spec section 2.3.2.2
+if (nClippingMode == RGN_COPY)
+{
+pOut->SetDefaultClipPath();
+}
+else
+{
+tools::PolyPolygon aPolyPoly;
+if (cbRgnData)
+ImplReadRegion(aPolyPoly, *pWMF, nRecSize);
+pOut->SetClipPath(aPolyPoly, nClippingMode, false);
+}
+
 }
 break;
 
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index e15f2e0..8d40354 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -83,6 +83,12 @@ void WinMtfClipPath::moveClipRegion( const Size& rSize )
 maClip = basegfx::tools::B2DClipState( aCurrClip );
 }
 
+void WinMtfClipPath::setDefaultClipPath()
+{
+// Empty clip region - everything visible
+maClip = basegfx::tools::B2DClipState();
+}
+
 basegfx::B2DPolyPolygon WinMtfClipPath::getClipPath() const
 {
 return maClip.getClipPoly();
@@ -797,6 +803,12 @@ void WinMtfOutput::SetClipPath( const tools::PolyPolygon& 
rPolyPolygon, sal_Int3
 aClipPath.setClipPath(aPolyPolygon, nClippingMode);
 }
 
+void WinMtfOutput::SetDefaultClipPath()
+{
+mbClipNeedsUpdate = true;
+aClipPath.setDefaultClipPath();
+}
+
 WinMtfOutput::WinMtfOutput( GDIMetaFile& rGDIMetaFile ) :
 mnLatestTextAlign   ( 0 ),
 mnTextAlign ( TA_LEFT | TA_TOP | TA_NOUPDATECP ),
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index 7d96353..7f7e781 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -249,6 +249,7 @@ public :
 voidintersectClipRect( const Rectangle& rRect );
 voidexcludeClipRect( const Rectangle& rRect );
 voidmoveClipRegion( const Size& rSize );
+voidsetDefaultClipPath();
 
 boolisEmpty() const { return maClip.isCleared(); }
 
@@ -711,6 +712,7 @@ public:
 sal_Int32 nClippingMode,
 bool bIsMapped
  

[Bug 64573] Photo Album: Add Captions feature

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=64573

Rishabh  changed:

   What|Removed |Added

   Assignee|kunalarora@gmail.com|libreoffice-b...@lists.free
   ||desktop.org

-- 
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: sc/source

[Tor Lillqvist]

 sc/source/core/opencl/formulagroupcl.cxx |   56 ++-
 1 file changed, 47 insertions(+), 9 deletions(-)

New commits:
commit f5e7207053b857b6903a0ab9c161bed9ad7bcee9
Author: Tor Lillqvist 
Date:   Mon Feb 9 16:44:45 2015 +0200

Handle zero and empty cells (which also means zero) in OpenCL for division

Not sure if it makes sense to keep having OpDiv a subclass of Reduction. 
There
is no DIV() function that would take a range of cells, so it isn't really
comparable to the other Reducion subclasses. But let's keep that as it is 
for
now.

We need to handle three cases specially in the OpenCL: Dividing by an empty
cell which should produce an #DIV/0! error, dividing an empty cell by zero
which also should produce #DIV/0!, and dividing an empty cell with anything
else number which should produce 0.

Change-Id: I86d86f652047d6f9e3c095c3ef135a8f5396b000

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index df56591..b1fb0b1 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1661,6 +1661,11 @@ public:
 typedef DynamicKernelSlidingArgument 
StringRange;
 typedef ParallelReductionVectorRef ParallelNumericRange;
 
+virtual bool HandleNaNArgument( std::stringstream&, unsigned, 
SubArguments& ) const
+{
+return false;
+}
+
 virtual void GenSlidingWindowFunction( std::stringstream& ss,
 const std::string& sSymName, SubArguments& vSubArguments ) SAL_OVERRIDE
 {
@@ -1724,18 +1729,25 @@ public:
 }
 if (ocPush == vSubArguments[i]->GetFormulaToken()->GetOpCode())
 {
+bool bNanHandled = HandleNaNArgument(ss, i, vSubArguments);
+
 ss << "tmpBottom = " << GetBottom() << ";\n";
-ss << "if (isNan(";
-ss << vSubArguments[i]->GenSlidingWindowDeclRef();
-ss << "))\n";
-if (ZeroReturnZero())
-ss << "return 0;\n";
-else
+
+if (!bNanHandled)
 {
-ss << "tmp = ";
-ss << Gen2("tmpBottom", "tmp") << ";\n";
+ss << "if (isNan(";
+ss << vSubArguments[i]->GenSlidingWindowDeclRef();
+ss << "))\n";
+if (ZeroReturnZero())
+ss << "return 0;\n";
+else
+{
+ss << "tmp = ";
+ss << Gen2("tmpBottom", "tmp") << ";\n";
+}
+ss << "else\n";
 }
-ss << "else{\n";
+ss << "{";
 ss << "tmp = ";
 ss << Gen2(vSubArguments[i]->GenSlidingWindowDeclRef(), "tmp");
 ss << ";\n";
@@ -2147,6 +2159,32 @@ public:
 return "(" + rhs + "==0 ? CreateDoubleError(errDivisionByZero) : (" + 
lhs + "/" + rhs + ") )";
 }
 virtual std::string BinFuncName() const SAL_OVERRIDE { return "fdiv"; }
+
+virtual bool HandleNaNArgument( std::stringstream& ss, unsigned argno, 
SubArguments& vSubArguments ) const SAL_OVERRIDE
+{
+if (argno == 1)
+{
+ss <<
+"if (isnan(" << vSubArguments[argno]->GetName() << "[gid0])) 
{\n"
+"if (GetDoubleErrorValue(" << 
vSubArguments[argno]->GetName() << "[gid0]) == errNoValue)\n"
+"return CreateDoubleError(errDivisionByZero);\n"
+"}\n";
+return true;
+}
+else if (argno == 0)
+{
+ss <<
+"if (isnan(" << vSubArguments[argno]->GetName() << "[gid0])) 
{\n"
+"if (GetDoubleErrorValue(" << 
vSubArguments[argno]->GetName() << "[gid0]) == errNoValue) {\n"
+"if (" << vSubArguments[1]->GetName() << "[gid0] == 
0)\n"
+"return CreateDoubleError(errDivisionByZero);\n"
+"return 0;\n"
+"}\n"
+"}\n";
+}
+return false;
+}
+
 };
 
 class OpMin : public Reduction
___
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' - dbaccess/source

[Lionel Elie Mamane]

 dbaccess/source/ui/browser/sbagrid.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 605c8d7f4c7b5b431747ced10243e01529b31777
Author: Lionel Elie Mamane 
Date:   Sun Jan 25 19:01:00 2015 +0100

tdf#73059 isDBReadOnly ensure connection before trying to retrieve it

Change-Id: I03f9b8ea72bd6906df61ccf05ead3670d7f90eb7
Reviewed-on: https://gerrit.libreoffice.org/14345
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/dbaccess/source/ui/browser/sbagrid.cxx 
b/dbaccess/source/ui/browser/sbagrid.cxx
index 889e94a..ee7065d 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -991,6 +991,7 @@ bool SbaGridControl::IsReadOnlyDB() const
 if (xColumns.is())
 {
 Reference< XRowSet >  xDataSource(xColumns->getParent(), 
UNO_QUERY);
+::dbtools::ensureRowSetConnection( xDataSource, getContext(), 
false ); // NOT SURE ABOUT FALSE
 Reference< XChild >  
xConn(::dbtools::getConnection(xDataSource),UNO_QUERY);
 if (xConn.is())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39593] copy/paste code detector / fixing

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=39593

--- Comment #20 from Tor Lillqvist  ---
See bug #89267 for a specific, easy, already found case of copy-paste orgy.

-- 
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 39593] copy/paste code detector / fixing

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=39593

Tor Lillqvist  changed:

   What|Removed |Added

   Assignee|gandhish...@gmail.com   |libreoffice-b...@lists.free
   ||desktop.org

-- 
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: oox/source

[Stephan Bergmann]

 oox/source/export/shapes.cxx |  114 +--
 1 file changed, 57 insertions(+), 57 deletions(-)

New commits:
commit 052fa9bc383f6dd0b6ca705984d03d4ec8d11824
Author: Stephan Bergmann 
Date:   Mon Feb 9 18:16:36 2015 +0100

Some old Clang appear unhappy with the initializer_list 
code

...so try whether initializer_list would keep them happy

Change-Id: I009eb601057066030addb409aa7996679d5d5922

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index e008262..ae70a21 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -283,60 +283,60 @@ ShapeExport& 
ShapeExport::WriteGroupShape(uno::Reference xShape
 
 static bool lcl_IsOnBlacklist(OUString& rShapeType)
 {
-static const std::initializer_list vBlacklist = {
-OUStringLiteral("ring"),
-OUStringLiteral("can"),
-OUStringLiteral("cube"),
-OUStringLiteral("paper"),
-OUStringLiteral("frame"),
-OUStringLiteral("smiley"),
-OUStringLiteral("sun"),
-OUStringLiteral("flower"),
-OUStringLiteral("forbidden"),
-OUStringLiteral("bracket-pair"),
-OUStringLiteral("brace-pair"),
-OUStringLiteral("col-60da8460"),
-OUStringLiteral("col-502ad400"),
-OUStringLiteral("quad-bevel"),
-OUStringLiteral("cloud-callout"),
-OUStringLiteral("line-callout-1"),
-OUStringLiteral("line-callout-2"),
-OUStringLiteral("line-callout-3"),
-OUStringLiteral("paper"),
-OUStringLiteral("vertical-scroll"),
-OUStringLiteral("horizontal-scroll"),
-OUStringLiteral("mso-spt34"),
-OUStringLiteral("mso-spt75"),
-OUStringLiteral("mso-spt164"),
-OUStringLiteral("mso-spt180"),
-OUStringLiteral("flowchart-process"),
-OUStringLiteral("flowchart-alternate-process"),
-OUStringLiteral("flowchart-decision"),
-OUStringLiteral("flowchart-data"),
-OUStringLiteral("flowchart-predefined-process"),
-OUStringLiteral("flowchart-internal-storage"),
-OUStringLiteral("flowchart-document"),
-OUStringLiteral("flowchart-multidocument"),
-OUStringLiteral("flowchart-terminator"),
-OUStringLiteral("flowchart-preparation"),
-OUStringLiteral("flowchart-manual-input"),
-OUStringLiteral("flowchart-manual-operation"),
-OUStringLiteral("flowchart-connector"),
-OUStringLiteral("flowchart-off-page-connector"),
-OUStringLiteral("flowchart-card"),
-OUStringLiteral("flowchart-punched-tape"),
-OUStringLiteral("flowchart-summing-junction"),
-OUStringLiteral("flowchart-or"),
-OUStringLiteral("flowchart-collate"),
-OUStringLiteral("flowchart-sort"),
-OUStringLiteral("flowchart-extract"),
-OUStringLiteral("flowchart-merge"),
-OUStringLiteral("flowchart-stored-data"),
-OUStringLiteral("flowchart-delay"),
-OUStringLiteral("flowchart-sequential-access"),
-OUStringLiteral("flowchart-magnetic-disk"),
-OUStringLiteral("flowchart-direct-access-storage"),
-OUStringLiteral("flowchart-display")
+static const std::initializer_list vBlacklist = {
+"ring",
+"can",
+"cube",
+"paper",
+"frame",
+"smiley",
+"sun",
+"flower",
+"forbidden",
+"bracket-pair",
+"brace-pair",
+"col-60da8460",
+"col-502ad400",
+"quad-bevel",
+"cloud-callout",
+"line-callout-1",
+"line-callout-2",
+"line-callout-3",
+"paper",
+"vertical-scroll",
+"horizontal-scroll",
+"mso-spt34",
+"mso-spt75",
+"mso-spt164",
+"mso-spt180",
+"flowchart-process",
+"flowchart-alternate-process",
+"flowchart-decision",
+"flowchart-data",
+"flowchart-predefined-process",
+"flowchart-internal-storage",
+"flowchart-document",
+"flowchart-multidocument",
+"flowchart-terminator",
+"flowchart-preparation",
+"flowchart-manual-input",
+"flowchart-manual-operation",
+"flowchart-connector",
+"flowchart-off-page-connector",
+"flowchart-card",
+"flowchart-punched-tape",
+"flowchart-summing-junction",
+"flowchart-or",
+"flowchart-collate",
+"flowchart-sort",
+"flowchart-extract",
+"flowchart-merge",
+"flowchart-stored-data",
+"flowchart-delay",
+"flowchart-sequential-access",
+"flowchart-magnetic-disk",
+"flowchart-direct-access-storage",
+"flowchart-display"
 };
 
 return std::find(vBlacklist.begin(), vBlacklist.end(), rShapeType) != 
vBlacklist.end();
@@ -344,9 +344,9 @@ static bool lcl_IsOnBlacklist(OUString& rShapeType)
 
 static bool lcl_IsOnWhitelist(OUString& rSh

[Libreoffice-commits] core.git: 3 commits - include/sal oox/source xmloff/source

[Michael Stahl]

 include/sal/log-areas.dox  |5 -
 oox/source/export/chartexport.cxx  |6 +++---
 xmloff/source/style/DashStyle.cxx  |2 +-
 xmloff/source/style/GradientStyle.cxx  |3 +--
 xmloff/source/style/HatchStyle.cxx |3 +--
 xmloff/source/style/ImageStyle.cxx |3 +--
 xmloff/source/style/TransGradientStyle.cxx |3 +--
 xmloff/source/text/txtflde.cxx |6 +++---
 xmloff/source/text/txtfldi.cxx |2 +-
 9 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit 3a6c04eef54129bdcb836785e7ffeff40fe0ef72
Author: Michael Stahl 
Date:   Mon Feb 9 18:08:39 2015 +0100

xmloff: replace legacy DBG_WARNINGs

Change-Id: I79f20f67e623b8d9607374e8be9a78fa10dc9af6

diff --git a/xmloff/source/style/DashStyle.cxx 
b/xmloff/source/style/DashStyle.cxx
index a4e26b2..d1aafde 100644
--- a/xmloff/source/style/DashStyle.cxx
+++ b/xmloff/source/style/DashStyle.cxx
@@ -188,7 +188,7 @@ void XMLDashStyleImport::importXML(
 }
 break;
 default:
-DBG_WARNING( "Unknown token at import gradient style" );
+SAL_INFO("xmloff.style", "Unknown token at import dash style");
 }
 }
 
diff --git a/xmloff/source/style/GradientStyle.cxx 
b/xmloff/source/style/GradientStyle.cxx
index 6a3b749..0ef830b 100644
--- a/xmloff/source/style/GradientStyle.cxx
+++ b/xmloff/source/style/GradientStyle.cxx
@@ -189,8 +189,7 @@ bool XMLGradientStyleImport::importXML(
 break;
 
 default:
-DBG_WARNING( "Unknown token at import gradient style" )
-;
+SAL_INFO("xmloff.style", "Unknown token at import gradient style");
 }
 }
 
diff --git a/xmloff/source/style/HatchStyle.cxx 
b/xmloff/source/style/HatchStyle.cxx
index f3d3244..3dbbb45 100644
--- a/xmloff/source/style/HatchStyle.cxx
+++ b/xmloff/source/style/HatchStyle.cxx
@@ -146,8 +146,7 @@ bool XMLHatchStyleImport::importXML(
 break;
 
 default:
-DBG_WARNING( "Unknown token at import hatch style" )
-;
+SAL_INFO("xmloff.style", "Unknown token at import hatch 
style");
 }
 }
 
diff --git a/xmloff/source/style/ImageStyle.cxx 
b/xmloff/source/style/ImageStyle.cxx
index 64958bd..ec0a53e 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -163,8 +163,7 @@ bool XMLImageStyle::ImpImportXML( const uno::Reference< 
xml::sax::XAttributeList
 // ignore
 break;
 default:
-DBG_WARNING( "Unknown token at import fill bitmap style" )
-;
+SAL_INFO("xmloff.style", "Unknown token at import fill bitmap 
style");
 }
 }
 
diff --git a/xmloff/source/style/TransGradientStyle.cxx 
b/xmloff/source/style/TransGradientStyle.cxx
index 1442e5a..85c66ec 100644
--- a/xmloff/source/style/TransGradientStyle.cxx
+++ b/xmloff/source/style/TransGradientStyle.cxx
@@ -189,8 +189,7 @@ bool XMLTransGradientStyleImport::importXML(
 break;
 
 default:
-DBG_WARNING( "Unknown token at import transparency gradient style" 
)
-;
+SAL_INFO("xmloff.style", "Unknown token at import transparency 
gradient style");
 }
 }
 
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 837ebe6..aabd4be 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -2887,7 +2887,7 @@ bool XMLTextFieldExport::ExplodeFieldMasterName(
 // '.' found?
 if (nSeparator <= nLength) {
 nSeparator = sMasterName.getLength();
-DBG_WARNING("no field var name!");
+SAL_WARN("xmloff.text", "no field var name!");
 bReturn = false;
 }
 else
@@ -3278,7 +3278,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapSenderFieldName(
 eName = XML_SENDER_STATE_OR_PROVINCE;
 break;
 default:
-DBG_WARNING("unknown sender type");
+SAL_WARN("xmloff.text", "unknown sender type");
 eName = XML_TOKEN_INVALID;
 break;
 }
@@ -3339,7 +3339,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapDocInfoFieldName(
 eElement = XML_CREATOR;
 break;
 default:
-DBG_WARNING("unknown docinfo field type!");
+SAL_WARN("xmloff.text", "unknown docinfo field type!");
 eElement = XML_TOKEN_INVALID;
 break;
 }
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 90d1be3..bdba18f 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -959,7 +959,7 @@ void XMLPageNumberImportContext::PrepareField(
 nPageAdjust++;
 break;
 default:
-DBG_WARNING("unknown page number type");
+SAL_WARN("xmloff.text", "unknown page nu

[Libreoffice-commits] core.git: desktop/Package_scripts.mk RepositoryFixes.mk scp2/source

[Stephan Bergmann]

 RepositoryFixes.mk   |2 +-
 desktop/Package_scripts.mk   |2 +-
 scp2/source/ooo/common_brand.scp |   13 -
 3 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 57e6d742a9e2aeb11b179122991e7d35ca54543c
Author: Stephan Bergmann 
Date:   Mon Feb 9 18:06:48 2015 +0100

On Mac OS X, directly name the executable "unopkg"

Change-Id: I5f846d7f7c5ed54179504f551e19227f7283bda2

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index bbffb96..19a5732 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -25,7 +25,7 @@ gb_Executable_FILENAMES := $(foreach 
group,$(gb_Executable_VALIDGROUPS),\
 ifneq (,$(filter-out MACOSX WNT,$(OS)))
 gb_Executable_FILENAMES := $(patsubst 
uno:uno,uno:uno.bin,$(gb_Executable_FILENAMES))
 endif
-gb_Executable_FILENAMES := $(patsubst 
unopkg_bin:unopkg_bin%,unopkg_bin:unopkg.bin,$(gb_Executable_FILENAMES))
+gb_Executable_FILENAMES := $(patsubst 
unopkg_bin:unopkg_bin%,unopkg_bin:unopkg$(if $(filter-out 
MACOSX,$(OS)),.bin),$(gb_Executable_FILENAMES))
 gb_Executable_FILENAMES := $(patsubst 
unopkg_com:unopkg_com%,unopkg_com:unopkg.com,$(gb_Executable_FILENAMES))
 gb_Executable_FILENAMES := $(patsubst 
gengal:gengal,gengal:gengal.bin,$(gb_Executable_FILENAMES))
 
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index 3c86abe..a806c72 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -12,13 +12,13 @@ $(eval $(call 
gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scrip
 ifeq (,$(filter MACOSX WNT,$(OS)))
 
 $(eval $(call 
gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace))
+$(eval $(call 
gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
 
 endif
 
 ifneq ($(OS),WNT)
 
 $(eval $(call 
gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unoinfo,$(if 
$(filter MACOSX,$(OS)),unoinfo-mac.sh,unoinfo.sh)))
-$(eval $(call 
gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
 
 endif
 
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7a4e5b1..9650c18 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -86,9 +86,6 @@ Module gid_Module_Root_Brand
 git_License_Odt,
 gid_Credits_Odt,
 gid_Apache_Notice);
-#if defined MACOSX
-Unixlinks = (gid_Brand_Unixlink_Unopkg);
-#endif
 End
 
 // Language specific brand module
@@ -532,16 +529,6 @@ File gid_Brand_File_Script_Unopkg
 End
 #endif
 
-#if defined MACOSX
-Unixlink gid_Brand_Unixlink_Unopkg
-BIN_FILE_BODY;
-Dir = gid_Brand_Dir_Program;
-Name = "unopkg";
-Target = "unopkg.bin";
-Styles = ();
-End
-#endif
-
 File gid_Brand_File_Bmp_IntroAboutShell
 TXT_FILE_BODY;
 Dir = FILELIST_DIR;
___
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

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/fdo82114.rtf|   14 ++
 sw/qa/extras/rtfimport/rtfimport.cxx|9 +
 writerfilter/source/dmapper/PropertyMap.cxx |   13 +
 3 files changed, 32 insertions(+), 4 deletions(-)

New commits:
commit d522ecb71ed1c5cb8472eee0b3bbd6a5fe6fed3e
Author: Miklos Vajna 
Date:   Thu Sep 11 12:23:18 2014 +0200

Resolves: fdo#88784 crash on loading certain docx

was/also:

fdo#82114 RTF import: fix handling of first page in non-first section

(cherry picked from commit 04fe5e6a31c9701177a744bbc8a53b2f664fe71c)

Change-Id: If06c6bcdda97447e6014223d997c7ff8abd64b48
Reviewed-on: https://gerrit.libreoffice.org/14377
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/rtfimport/data/fdo82114.rtf 
b/sw/qa/extras/rtfimport/data/fdo82114.rtf
new file mode 100644
index 000..073d281
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo82114.rtf
@@ -0,0 +1,14 @@
+{\rtf1
+\paperw11906\paperh16838\margl1134\margr567\margt1418\margb851\gutter0\ltrsect
+\viewkind1\viewscale110\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nojkernpunct\rsidroot13516616\utinl
 \fet0
+\titlepg
+{\headerr Right page header, section 1\par
+}
+{\headerf First page header, section 1\par
+}
+\pard\plain First page, section 1.\par\sect
+\sectd\titlepg
+{\headerf First page header, section 2\par
+}
+\pard\plain First page, section 2.\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 2cdbcbc..db67a12 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2086,6 +2086,15 @@ DECLARE_RTFIMPORT_TEST(testFdo86750, "fdo86750.rtf")
 CPPUNIT_ASSERT_EQUAL(OUString("#anchor"), 
getProperty(getRun(getParagraph(1), 1), "HyperLinkURL"));
 }
 
+DECLARE_RTFIMPORT_TEST(testFdo82114, "fdo82114.rtf")
+{
+uno::Reference xHeaderText = getProperty< 
uno::Reference >(getStyles("PageStyles")->getByName("Converted1"), 
"HeaderText");
+OUString aActual = xHeaderText->getString();
+OUString aExpected("First page header, section 2");
+// This was 'Right page header, section 1'.
+CPPUNIT_ASSERT_EQUAL(aExpected, aActual);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 5014d63..1ae318d 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -428,14 +428,18 @@ uno::Reference< beans::XPropertySet > 
SectionPropertyMap::GetPageStyle(
 m_aFirstPageStyle = uno::Reference< beans::XPropertySet > (
 
xTextFactory->createInstance("com.sun.star.style.PageStyle"),
 uno::UNO_QUERY);
+
+// Call insertByName() before GetPageStyle(), otherwise the
+// first and the follow page style will have the same name, and
+// insertByName() will fail.
+if (xPageStyles.is())
+xPageStyles->insertByName( m_sFirstPageStyleName, 
uno::makeAny(m_aFirstPageStyle) );
+
 // Ensure that m_aFollowPageStyle has been created
 GetPageStyle( xPageStyles, xTextFactory, false );
 // Chain m_aFollowPageStyle to be after m_aFirstPageStyle
 m_aFirstPageStyle->setPropertyValue("FollowStyle",
 uno::makeAny(m_sFollowPageStyleName));
-
-if (xPageStyles.is())
-xPageStyles->insertByName( m_sFirstPageStyleName, 
uno::makeAny(m_aFirstPageStyle) );
 }
 else if( !m_aFirstPageStyle.is() && xPageStyles.is() )
 {
@@ -462,8 +466,9 @@ uno::Reference< beans::XPropertySet > 
SectionPropertyMap::GetPageStyle(
 }
 
 }
-catch( const uno::Exception& )
+catch( const uno::Exception& rException )
 {
+SAL_WARN("writerfilter", "SectionPropertyMap::GetPageStyle() failed: " 
<< rException.Message);
 }
 
 return xRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 dev/null |binary
 1 file changed

New commits:
commit d51502c654ddc3ff6ef8ca7b8f190807bb0a8010
Author: Stephan Bergmann 
Date:   Mon Feb 9 17:39:13 2015 +0100

Fuck that left-behind .lck file

Change-Id: I6ceab61500397cae687fb4356e5dcb48f8090a48

diff --git a/dbaccess/qa/extras/testdocuments/fdo84315.odb.lck 
b/dbaccess/qa/extras/testdocuments/fdo84315.odb.lck
deleted file mode 100644
index 16c4bcc..000
Binary files a/dbaccess/qa/extras/testdocuments/fdo84315.odb.lck and /dev/null 
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/ui/frmdlg/cption.cxx  |7 +--
 sw/source/uibase/inc/cption.hxx |8 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit d7947489a5d624adab6add560429235e357ac92d
Author: Caolán McNamara 
Date:   Mon Feb 9 10:43:28 2015 +

Resolves: tdf#88933 Labeling of images impossible without category

(cherry picked from commit 1fac71668ac8a32633a7ee31698c0f4fe78e4d31)

Change-Id: I8b618d5cd6b3e9d5e42e04e215592a7b748dbb9f
Reviewed-on: https://gerrit.libreoffice.org/14383
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 93424cf..dbd3543 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -85,7 +85,7 @@ OUString SwCaptionDialog::our_aSepTextSave(": "); // Caption 
separator text
 //Resolves: fdo#47427 disallow typing *or* pasting content into the category 
box
 OUString TextFilterAutoConvert::filter(const OUString &rText)
 {
-if (!SwCalc::IsValidVarName(rText))
+if (rText != m_sNone && !SwCalc::IsValidVarName(rText))
 return m_sLastGoodText;
 m_sLastGoodText = rText;
 return rText;
@@ -94,6 +94,7 @@ OUString TextFilterAutoConvert::filter(const OUString &rText)
 SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
 SvxStandardDialog( pParent, "InsertCaptionDialog", 
"modules/swriter/ui/insertcaption.ui" ),
 m_sNone( SW_RESSTR(SW_STR_NONE) ),
+m_aTextFilter(m_sNone),
 rView( rV ),
 pMgr( new SwFldMgr(rView.GetWrtShellPtr()) ),
 bCopyAttributes( false ),
@@ -283,7 +284,7 @@ IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, 
Button*, pButton )
 {
 OUString sFldTypeName = m_pCategoryBox->GetText();
 if(sFldTypeName == m_sNone)
-sFldTypeName.clear();
+sFldTypeName = OUString();
 SwSequenceOptionDialog  aDlg( pButton, rView, sFldTypeName );
 aDlg.SetApplyBorderAndShadow(bCopyAttributes);
 aDlg.SetCharacterStyle( sCharacterStyle );
@@ -319,6 +320,8 @@ IMPL_LINK_NOARG(SwCaptionDialog, ModifyHdl)
 SwFieldType* pType = (bCorrectFldName && !bNone)
 ? rSh.GetFldType( RES_SETEXPFLD, sFldTypeName )
 : 0;
+fprintf(stderr, "pType is %p\n", pType);
+fprintf(stderr, "bCorrectFldName is %d\n", bCorrectFldName);
 m_pOKButton->Enable( bCorrectFldName &&
 (!pType ||
 ((SwSetExpFieldType*)pType)->GetType() == 
nsSwGetSetExpType::GSE_SEQ) );
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index 08f31a4..98ed59d 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -52,7 +52,12 @@ class TextFilterAutoConvert : public TextFilter
 {
 private:
 OUString m_sLastGoodText;
+OUString m_sNone;
 public:
+TextFilterAutoConvert(const OUString &rNone)
+: m_sNone(rNone)
+{
+}
 virtual OUString filter(const OUString &rText) SAL_OVERRIDE;
 };
 
@@ -60,6 +65,7 @@ class SwCaptionDialog : public SvxStandardDialog
 {
 Edit*m_pTextEdit;
 ComboBox*m_pCategoryBox;
+OUString m_sNone;
 TextFilterAutoConvert m_aTextFilter;
 FixedText*   m_pFormatText;
 ListBox* m_pFormatBox;
@@ -76,8 +82,6 @@ class SwCaptionDialog : public SvxStandardDialog
 
 SwCaptionPreview* m_pPreview;
 
-OUString m_sNone;
-
 SwView   &rView; // search per active, avoid View
 SwFldMgr *pMgr;  // pointer to save the include
 SelectionType eType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 dbaccess/qa/extras/testdocuments/fdo84315.odb.lck |binary
 dbaccess/qa/python/fdo84315.py|2 +-
 unotest/source/python/org/libreoffice/unotest.py  |5 -
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 49df6e0d8c9d0ef885b0230e53d6296ce0975078
Author: Stephan Bergmann 
Date:   Mon Feb 9 17:33:26 2015 +0100

Adapt file URL hackery to Windows

Change-Id: Icee10aae97e9bcef7a3db7e966c1c4ef6780fc1d

diff --git a/dbaccess/qa/extras/testdocuments/fdo84315.odb.lck 
b/dbaccess/qa/extras/testdocuments/fdo84315.odb.lck
new file mode 100644
index 000..16c4bcc
Binary files /dev/null and b/dbaccess/qa/extras/testdocuments/fdo84315.odb.lck 
differ
diff --git a/dbaccess/qa/python/fdo84315.py b/dbaccess/qa/python/fdo84315.py
index e3e2fa3..a4bbc1b 100644
--- a/dbaccess/qa/python/fdo84315.py
+++ b/dbaccess/qa/python/fdo84315.py
@@ -22,7 +22,7 @@ class Fdo84315(unittest.TestCase):
 cls._uno = UnoInProcess()
 cls._uno.setUp()
 workdir = os.environ[ "WORKDIR_FOR_BUILD" ]
-cls._xDoc = cls._uno.openDoc(os.path.join(workdir, 
"CppunitTest/fdo84315.odb"))
+cls._xDoc = cls._uno.openDoc(workdir + "/CppunitTest/fdo84315.odb")
 
 @classmethod
 def tearDownClass(cls):
diff --git a/unotest/source/python/org/libreoffice/unotest.py 
b/unotest/source/python/org/libreoffice/unotest.py
index 0acf05a..28f5eca 100644
--- a/unotest/source/python/org/libreoffice/unotest.py
+++ b/unotest/source/python/org/libreoffice/unotest.py
@@ -224,7 +224,10 @@ class UnoInProcess:
 desktop = smgr.createInstanceWithContext("com.sun.star.frame.Desktop", 
self.getContext())
 props = [("Hidden", True), ("ReadOnly", False), ("AsTemplate", False)]
 loadProps = tuple([mkPropertyValue(name, value) for (name, value) in 
props])
-url = "file://" + file
+if os.name == "nt":
+url = "file:///" + file
+else:
+url = "file://" + file
 self.xDoc = desktop.loadComponentFromURL(url, "_blank", 0, loadProps)
 assert(self.xDoc)
 return self.xDoc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: framework/inc framework/source include/svx qadevOOo/runner qadevOOo/tests UnoControls/source

[Andrea Gelmini]

 UnoControls/source/controls/progressmonitor.cxx  |4 ++--
 framework/inc/classes/wildcard.hxx   |2 +-
 framework/source/services/frame.cxx  |4 ++--
 include/svx/svdmrkv.hxx  |2 +-
 qadevOOo/runner/base/java_complex.java   |2 +-
 qadevOOo/tests/java/ifc/container/_XNameReplace.java |4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 81cb993127d0e399b1c9888fe4f4655b831593d9
Author: Andrea Gelmini 
Date:   Mon Feb 9 10:45:13 2015 +0100

Fix of a few typos

Change-Id: Ib2a311f0341d165a8f9d3f7a11ec36378fd69519
Reviewed-on: https://gerrit.libreoffice.org/14373
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/UnoControls/source/controls/progressmonitor.cxx 
b/UnoControls/source/controls/progressmonitor.cxx
index df93a69..a2f19c3 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -862,12 +862,12 @@ IMPL_TextlistItem* ProgressMonitor::impl_searchTopic ( 
const OUString& rTopic, b
 
 if ( pSearchItem->sTopic == rTopic )
 {
-// We have found this topic ... return a valid pointer.
+// We have found this topic... return a valid pointer.
 return pSearchItem;
 }
 }
 
-// We have'nt found this topic ... return a nonvalid pointer.
+// We haven't found this topic... return a nonvalid pointer.
 return NULL;
 }
 
diff --git a/framework/inc/classes/wildcard.hxx 
b/framework/inc/classes/wildcard.hxx
index 758fcae..c2bef27 100644
--- a/framework/inc/classes/wildcard.hxx
+++ b/framework/inc/classes/wildcard.hxx
@@ -28,7 +28,7 @@ namespace framework{
 @short  implement wildcard-mechanism for unicode
 @descr  This class can be used to get information about the 
matching of a pattern to a given text.
 It's suitable for 8-Bit- AND 16-Bit-strings!
-@ATTENTION  This class is'nt threadsafe!
+@ATTENTION  This class isn't threadsafe!
 
 @devstatus  deprecated
 
*//*-*/
diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index 5cdb57e..587a058 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -680,7 +680,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL 
Frame::getActiveFrame() throw
 @seealsomethod getActiveFrame()
 
 @param  "xFrame", reference to new active child. It must be an already 
existing child!
-@onerrorAn assertion is thrown and element is ignored, if given frame 
is'nt already a child of us.
+@onerrorAn assertion is thrown and element is ignored, if given frame 
isn't already a child of us.
 
*//*-*/
 void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< 
css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, 
std::exception )
 {
@@ -702,7 +702,7 @@ void SAL_CALL Frame::setActiveFrame( const 
css::uno::Reference< css::frame::XFra
 aWriteLock.clear();
 /* UNSAFE AREA 
-
 */
 
-// Don't work, if "new" active frame is'nt different from current one!
+// Don't work, if "new" active frame isn't different from current one!
 // (xFrame==NULL is allowed to UNSET it!)
 if( xActiveChild != xFrame )
 {
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index e723a37..78d7e84 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -463,7 +463,7 @@ public:
 
 
 // - Hit tolarances:
-//   It have to be declared in logical coordinates. So please translate the
+//   It has to be declared in logical coordinates. So please translate the
 //   wanted pixel value with PixelToLogic in Logical values.
 //   Taking as example a logical value of 100:
 //   - For a horizontal hairline (Object with height 0), the generated data is 
+/-100, i.e.
diff --git a/qadevOOo/runner/base/java_complex.java 
b/qadevOOo/runner/base/java_complex.java
index b5cafa1..f1f6698 100644
--- a/qadevOOo/runner/base/java_complex.java
+++ b/qadevOOo/runner/base/java_complex.java
@@ -68,7 +68,7 @@ public class java_complex implements TestBase
 //the concept of the TimeOut depends on runner logs. If the runner log,
 //for example to start a test method, the timeout was reset. This is 
not
 //while the test itself log something like "open document...".
-//An property of complex test could be that it have only one test 
method
+//A property of complex test could be that it has only one test method
 //which works for several minutes. In this case the TimeOut get not 
trigger
 //

[Bug 39468] translate German comments, removing redundant ones

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=39468

--- Comment #164 from Commit Notification 
 ---
Daniel Sikeler committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=3a70ae03fee12e6b8ed87afba1095bc78f9a9812

fdo#39468 translated german comments

It will be available in 4.5.0.

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: rsc/source

[David Ostrovsky]

 rsc/source/rscpp/cpp.h  |4 ++--
 rsc/source/rscpp/cpp4.c |4 ++--
 rsc/source/rscpp/cpp6.c |9 +
 3 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 4bcfde41e7b854769f7db7412749d7f0f9ad977e
Author: David Ostrovsky 
Date:   Sun Feb 8 04:27:11 2015 +0100

Werror: data lost during conversion from size_t to int

Change-Id: Iee080b89cf0588c8076ef4c0334d36a7aefce44d
Reviewed-on: https://gerrit.libreoffice.org/14374
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h
old mode 100644
new mode 100755
index af579fe..c942141
--- a/rsc/source/rscpp/cpp.h
+++ b/rsc/source/rscpp/cpp.h
@@ -336,8 +336,8 @@ int scanstring( int c, void (*outfun)( int c ) );
 void scannumber( int c, void (*outfun)( int c ) );
 void save( int c );
 char* savestring( char* text );
-FILEINFO* getfile( int bufsize, char* name );
-char *getmem( int size );
+FILEINFO* getfile( size_t bufsize, char* name );
+char *getmem( size_t size );
 DEFBUF* lookid( int c );
 DEFBUF* defendel( char* name, int delete );
 void dunpdef( char* why );
diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c
old mode 100644
new mode 100755
index 034c012..03f3560
--- a/rsc/source/rscpp/cpp4.c
+++ b/rsc/source/rscpp/cpp4.c
@@ -320,7 +320,7 @@ void doundef()
  */
 void textput(char* text)
 {
-int size;
+size_t size;
 
 size = strlen(text) + 1;
 if ((parmp + size) >= &parm[NPARMWORK])
@@ -531,7 +531,7 @@ FILE_LOCAL void expstuff(DEFBUF* tokenp)
 int c;  /* Current character*/
 char* inp;  /* -> repl string   */
 char* defp; /* -> macro output buff */
-int size;   /* Actual parm. size*/
+size_t size;   /* Actual parm. size*/
 char* defend;   /* -> output buff end   */
 int string_magic;   /* String formal hack   */
 FILEINFO* file; /* Funny #include   */
diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c
old mode 100644
new mode 100755
index 6905612..9444b72
--- a/rsc/source/rscpp/cpp6.c
+++ b/rsc/source/rscpp/cpp6.c
@@ -485,7 +485,8 @@ char* savestring(char* text)
 {
 char* result;
 
-result = getmem(strlen(text) + 1);
+size_t size = strlen(text) + 1;
+result = getmem(size);
 strcpy(result, text);
 return (result);
 }
@@ -493,10 +494,10 @@ char* savestring(char* text)
 /*
  * Common FILEINFO buffer initialization for a new file or macro.
  */
-FILEINFO* getfile(int bufsize, char* name)
+FILEINFO* getfile(size_t bufsize, char* name)
 {
 FILEINFO* file;
-int size;
+size_t size;
 
 size = strlen(name);/* File/macro name  */
 file = (FILEINFO*) getmem(sizeof (FILEINFO) + bufsize + size);
@@ -518,7 +519,7 @@ FILEINFO* getfile(int bufsize, char* name)
 /*
  * Get a block of free memory.
  */
-char* getmem(int size)
+char* getmem(size_t size)
 {
 char* result;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Daniel Sikeler]

 svx/source/dialog/docrecovery.cxx |6 +++---
 svx/source/form/fmtools.cxx   |2 +-
 svx/source/inc/filtnav.hxx|2 +-
 svx/source/items/numfmtsh.cxx |   31 +++
 svx/source/items/numinf.cxx   |2 +-
 svx/source/items/pageitem.cxx |   11 +--
 svx/source/items/rotmodit.cxx |4 ++--
 7 files changed, 28 insertions(+), 30 deletions(-)

New commits:
commit 3a70ae03fee12e6b8ed87afba1095bc78f9a9812
Author: Daniel Sikeler 
Date:   Mon Feb 9 09:32:35 2015 +0100

fdo#39468 translated german comments

also tranlated some error messages

Change-Id: Ia5035c7c2f5379a0b419fc5514a288368e687c83
Reviewed-on: https://gerrit.libreoffice.org/14382
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/svx/source/dialog/docrecovery.cxx 
b/svx/source/dialog/docrecovery.cxx
index 9a0a025..d96a352 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -711,9 +711,9 @@ void SaveProgressDialog::stepNext(TURLInfo* )
 {
 /* TODO
 
-wenn die m_pCore noch ein Member m_nCurrentItem haette
-koennte man dort erkennen, wer gerade drann war, wer demnaechst
-dran ist ... Diese Info kann man dann in unserem Progress FixText 
anzeigen ...
+   if m_pCore would have a member m_mCurrentItem, you could see,
+   who is current, who is next ... You can show this information
+   in progress report FixText
 */
 }
 
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index f4cde2a..4b7bfadd 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -179,7 +179,7 @@ sal_Int32 getElementPos(const Reference< 
::com::sun::star::container::XIndexAcce
 DBG_ASSERT( xNormalized.is(), "getElementPos: invalid element!" );
 if ( xNormalized.is() )
 {
-// Feststellen an welcher Position sich das Kind befindet
+// find child position
 nIndex = xCont->getCount();
 while (nIndex--)
 {
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 3bde69e..6e050a0 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -248,7 +248,7 @@ class FmFilterNavigator : public SvTreeListBox, public 
SfxListener
 
 AutoTimer   m_aDropActionTimer;
 unsigned short  m_aTimerCounter;
-Point   m_aTimerTriggered;  // die Position, an der der 
DropTimer angeschaltet wurde
+Point   m_aTimerTriggered;  // position, where DropTimer 
was started
 DROP_ACTION m_aDropActionType;
 
 public:
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index a3fabc6..dda14b3 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -145,8 +145,7 @@ SvxNumberFormatShell::~SvxNumberFormatShell()
 
 if ( bUndoAddList )
 {
-// Hinzugefuegte Formate sind nicht gueltig:
-// => wieder entfernen:
+// Added formats are invalid => remove them
 
 for ( std::vector::const_iterator it(aAddList.begin()); it 
!= aAddList.end(); ++it )
 pFormatter->DeleteEntry( *it );
@@ -166,7 +165,7 @@ void SvxNumberFormatShell::GetUpdateData( sal_uInt32* 
pDelArray, const sal_uInt3
 {
 const size_t nListSize = aDelList.size();
 
-DBG_ASSERT( pDelArray && ( nSize == nListSize ), "Array nicht 
initialisiert!" );
+DBG_ASSERT( pDelArray && ( nSize == nListSize ), "Array not initialised!" 
);
 
 if ( pDelArray && ( nSize == nListSize ) )
 for (std::vector::const_iterator it(aDelList.begin()); it 
!= aDelList.end(); ++it )
@@ -236,7 +235,7 @@ bool SvxNumberFormatShell::AddFormat( OUString& rFormat, 
sal_Int32& rErrPos,
 boolbInserted   = false;
 sal_uInt32  nAddKey = pFormatter->GetEntryKey( rFormat, eCurLanguage );
 
-if ( nAddKey != NUMBERFORMAT_ENTRY_NOT_FOUND ) // bereits vorhanden?
+if ( nAddKey != NUMBERFORMAT_ENTRY_NOT_FOUND ) // exists already?
 {
 ::std::vector::iterator nAt = GetRemoved_Impl( nAddKey );
 if ( nAt != aDelList.end() )
@@ -246,10 +245,10 @@ bool SvxNumberFormatShell::AddFormat( OUString& rFormat, 
sal_Int32& rErrPos,
 }
 else
 {
-OSL_FAIL( "Doppeltes Format!" );
+OSL_FAIL( "duplicate format!" );
 }
 }
-else // neues Format
+else // new format
 {
 sal_Int32 nPos;
 bInserted = pFormatter->PutEntry( rFormat, nPos,
@@ -273,27 +272,27 @@ bool SvxNumberFormatShell::AddFormat( OUString& rFormat, 
sal_Int32& rErrPos,
 }
 }
 
-if ( bInserted ) // eingefuegt
+if ( bInserted )
 {
 nCurFormatKey = nAddKey;
-DBG_ASSERT( !IsAdded_Impl( nCurFormatKey ), "Doppeltes Format!" );
+DBG_ASSERT( !IsAdded_Impl( nCurFormatKey ), "duplicate format!" );
 aAddList.push_back( nCurFormatKey );
 
-// aktuelle Tabelle holen
+// get 

Re: LibreOffice / Mozilla rendering ...

[Chris Lord]

Hi Michael,

Was good to see you too, as always! I'll reply in-line for convenience;

On 6 February 2015 at 13:34, Michael Meeks 
wrote:

> Of course, it's fantastic to have been able to re-use the mozilla
> fennec Java tiled-rendering code; but as we want to make this work
> cross-platform as well (as you do in Mozilla) - I suspect that we really
> want to be switching from Java to use your C++ compositing code. My hope
> is that lets us target Android, iOS, UbuntuTouch, etc. - but also Mac,
> Windows etc. =)
>

I expect our layers code could well help with those targets - immediately,
I think it'd be easiest to deploy on desktops though (Mac, Linux, Windows).
We have our full-native compositing/panning/zooming stack running on
FirefoxOS (so, kind of Android), but not on Fennec (though it's not far
off, and could certainly be made to work with a less complex host app. It
currently uses some Java code to handle asynchronous panning/zooming on the
root layer). This is all given you've already deployed on Android, I'd have
considered that the hardest target (bar maybe iOS because we don't
regularly build there, though it has been done in the past).


> As I understand it the thing we should be doing is re-using this
> goodness:
>
> https://wiki.mozilla.org/Platform/GFX/OffMainThreadCompositing
>
> So - some questions:
>
> a) did I find the right URL =)
>

Yup :) This may also be of interest:
https://wiki.mozilla.org/Embedding/IPCLiteAPI


> b) how does that map to source code directories inside
>mozilla-central to blatantly steal / re-factor =)
>

Basically, everything you want is in gfx/layers. There will be some
dependencies outside of that directory, as a quick guess: most of the other
directories in gfx, depending on platform, layout/base/Unit*, mfbt and
maybe nsprpub? This is total guess-work, I've never tried to make any of
this work outside of Gecko, but the aforementioned IPCLite may be
illuminating.


> c) you mentioned other people who would be interested in that ?
>it'd be great to contact / CC them on this =)
>

I would have thought that a major user of our layers/compositor
infrastructure would be of interest to the gfx/rendering team (even if just
out of pure curiosity), so with that thought I've cc'd Milan Sreckovic, who
manages the gfx team and Jet Villegas, who manages the layout team - I hope
I'm not taking liberties here :) They may be more interested in knowing how
you've been using the code, and maybe they could point things out that
could help.


Cheers!

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

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 +++---
 sw/source/core/unocore/unocrsrhelper.cxx |   10 +++---
 writerfilter/source/dmapper/CellColorHandler.cxx |   12 +---
 writerfilter/source/dmapper/PropertyIds.cxx  |2 ++
 writerfilter/source/dmapper/PropertyIds.hxx  |2 ++
 5 files changed, 23 insertions(+), 9 deletions(-)

New commits:
commit 5b48d5e25c8e7918f4669195144afb1fae049d41
Author: Miklos Vajna 
Date:   Sun Feb 1 00:11:21 2015 +0100

Related: tdf#88583 writerfilter: import paragraph color as fill attributes

In theory this is to be in sync with the ODF import. In practice the old
UNO property seems not to have a proper fallback to populate the doc
model with the fillattributes, so without this even if the import result
is visible, it would be lost on ODF export.

Additionally, this detected a bug in SwUnoCursorHelper::makeRedline(),
where paragraph format redline tried to use the map of a text portion
instead of a paragraph.

(cherry picked from commit 24077b2d52ab3d0fd0db5afb25d8b94b62386e3e)

Change-Id: I026e38e1990ed2a460624a8d967a16ae3fb6c512
Reviewed-on: https://gerrit.libreoffice.org/14353
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 64dcfd7..5e05f6a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -10,6 +10,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -608,9 +609,8 @@ DECLARE_OOXMLEXPORT_TEST(testNumOverrideStart, 
"num-override-start.docx")
 
 DECLARE_OOXMLEXPORT_TEST(testTdf88583, "tdf88583.odt")
 {
-if (xmlDocPtr pXmlDoc = parseExport())
-//  had no  child element, paragraph background was lost.
-assertXPath(pXmlDoc, "//w:pPr/w:shd", "fill", "00CC00");
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, 
getProperty(getParagraph(1), "FillStyle"));
+CPPUNIT_ASSERT_EQUAL(static_cast(0x00cc00), 
getProperty(getParagraph(1), "FillColor"));
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx 
b/sw/source/core/unocore/unocrsrhelper.cxx
index efe476a..faa268c 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1219,9 +1219,13 @@ void makeRedline( SwPaM& rPaM,
 // Check if the value exists
 if ( aRevertPropertiesValue >>= aRevertProperties )
 {
-// sw/source/core/unocore/unoport.cxx#83 is where it's decided what 
map gets used for a text portion
-// so it's PROPERTY_MAP_TEXTPORTION_EXTENSIONS, unless it's a redline 
portion
-SfxItemPropertySet const& rPropSet = 
(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXTPORTION_EXTENSIONS));
+int nMap = 0;
+// Make sure that paragraph format gets its own map, otherwise e.g. 
fill attributes are not preserved.
+if (eType == nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT)
+nMap = PROPERTY_MAP_PARAGRAPH;
+else
+nMap = PROPERTY_MAP_TEXTPORTION_EXTENSIONS;
+SfxItemPropertySet const& rPropSet = 
(*aSwMapProvider.GetPropertySet(nMap));
 
 // Check if there are any properties
 if (aRevertProperties.getLength())
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx 
b/writerfilter/source/dmapper/CellColorHandler.cxx
index 632bc07..dc2bda9 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -268,9 +269,14 @@ TablePropertyMapPtr  CellColorHandler::getProperties()
 pPropertyMap->Insert(PROP_CHAR_SHADING_VALUE, uno::makeAny( 
nShadingPattern ));
 }
 
-pPropertyMap->Insert( m_OutputFormat == Form ? PROP_BACK_COLOR
-: m_OutputFormat == Paragraph ? PROP_PARA_BACK_COLOR
-: PROP_CHAR_BACK_COLOR, uno::makeAny( nApplyColor ));
+if (m_OutputFormat == Paragraph)
+{
+pPropertyMap->Insert(PROP_FILL_STYLE, 
uno::makeAny(drawing::FillStyle_SOLID));
+pPropertyMap->Insert(PROP_FILL_COLOR, uno::makeAny(nApplyColor));
+}
+else
+pPropertyMap->Insert( m_OutputFormat == Form ? PROP_BACK_COLOR
+: PROP_CHAR_BACK_COLOR, uno::makeAny( nApplyColor 
));
 
 createGrabBag("originalColor", 
uno::makeAny(OUString::fromUtf8(msfilter::util::ConvertColor(nApplyColor, 
true;
 
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index 8d21989..f380c45 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -401,6 +401,8 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) 
const
 case PROP_ROW_CNF_STYLE: sName = "RowCnfStyle"; break;
 

[Libreoffice-commits] dev-tools.git: cppcheck/cppcheck-report.sh

[Maarten Hoes]

 cppcheck/cppcheck-report.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3f1216fdaf3557521809df744a765d57900b2682
Author: Maarten Hoes 
Date:   Mon Feb 9 16:50:57 2015 +0100

Fix small typo in email message.

Change-Id: I1a9cc413bdf37384e62149928f77824e8a765c5d
Reviewed-on: https://gerrit.libreoffice.org/14386
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/cppcheck/cppcheck-report.sh b/cppcheck/cppcheck-report.sh
index 4e2a1ed..f164895 100755
--- a/cppcheck/cppcheck-report.sh
+++ b/cppcheck/cppcheck-report.sh
@@ -139,7 +139,7 @@ Note:
 The script generating this report was run at :
 `date +%Y-%d-%m_%H:%M:%S` with user `whoami` at host `cat 
/etc/hostname` as $MY_NAME $MY_ARGS
 
-It be found and improved here:
+It can be found and improved here:
 
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh
 
 EOF
@@ -169,7 +169,7 @@ Note:
 The script generating this report was run at :
 `date +%Y-%d-%m_%H:%M:%S` with user `whoami` at host `cat 
/etc/hostname` as $MY_NAME $MY_ARGS
 
-It be found and improved here:
+It can be found and improved here:
 
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh
 
 EOF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/inc/ring.hxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit c6d645780e96613a6f60b6896702335a0c205944
Author: Stephan Bergmann 
Date:   Mon Feb 9 16:24:03 2015 +0100

Also fix other Ring ctor

...after 8b12e63b60530a2ad3769bc4983cc09bedd34c79 "Don't downcast from 
Ring
base class ctor/dtor to derived class T"

Change-Id: I734841a78e272e985d784bd756412e1af90b2df5

diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index bfc9318..8083e95 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -127,8 +127,7 @@ namespace sw
 {
 if( pObj )
 {
-value_type* pThis = static_cast< value_type* >(this);
-algo::link_before(pObj, pThis);
+algo::link_before(pObj, this);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - include/svx svx/source

[Rodolfo Ribeiro Gomes]

 include/svx/zoomsliderctrl.hxx |1 +
 svx/source/stbctrls/zoomsliderctrl.cxx |   15 +--
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 0bc37cf20044fe8fee0cc7dd5af3ee58304a3a0f
Author: Rodolfo Ribeiro Gomes 
Date:   Sat Jan 31 19:08:05 2015 -0200

tdf#47577  Zoom slider should only react to full click

Change-Id: If859754c956a634a96066ac407b70d6dd2759d53
Signed-off-by: Rodolfo Ribeiro Gomes 
Reviewed-on: https://gerrit.libreoffice.org/14265
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit 53740bd71a0ae569da36b9293ef22842a0b53f1e)
Signed-off-by: Michael Stahl 

diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx
index 7af69db..f35f825 100644
--- a/include/svx/zoomsliderctrl.hxx
+++ b/include/svx/zoomsliderctrl.hxx
@@ -49,6 +49,7 @@ public:
 virtual void  StateChanged( sal_uInt16 nSID, SfxItemState eState, const 
SfxPoolItem* pState ) SAL_OVERRIDE;
 virtual void  Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE;
 virtual bool  MouseButtonDown( const MouseEvent & ) SAL_OVERRIDE;
+virtual bool  MouseButtonUp( const MouseEvent & ) SAL_OVERRIDE;
 virtual bool  MouseMove( const MouseEvent & rEvt ) SAL_OVERRIDE;
 };
 
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx 
b/svx/source/stbctrls/zoomsliderctrl.cxx
index 8ea241b..1379321 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -45,6 +45,7 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
 ImagemaDecreaseButton;
 bool mbValuesSet;
 bool mbOmitPaint;
+bool mbDraggingStarted;
 
 SvxZoomSliderControl_Impl() :
 mnCurrentZoom( 0 ),
@@ -57,7 +58,8 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
 maIncreaseButton(),
 maDecreaseButton(),
 mbValuesSet( false ),
-mbOmitPaint( false ) {}
+mbOmitPaint( false ),
+mbDraggingStarted( false ) {}
 };
 
 const long nSliderXOffset = 20;
@@ -330,7 +332,10 @@ bool SvxZoomSliderControl::MouseButtonDown( const 
MouseEvent & rEvt )
 mpImpl->mnCurrentZoom = basegfx::zoomtools::zoomIn( 
static_cast(mpImpl->mnCurrentZoom) );
 // click to slider
 else if( nXDiff >= nSliderXOffset && nXDiff <= aControlRect.GetWidth() - 
nSliderXOffset )
+{
 mpImpl->mnCurrentZoom = Offset2Zoom( nXDiff );
+mpImpl->mbDraggingStarted = true;
+}
 
 if ( mpImpl->mnCurrentZoom < mpImpl->mnMinZoom )
 mpImpl->mnCurrentZoom = mpImpl->mnMinZoom;
@@ -345,6 +350,12 @@ bool SvxZoomSliderControl::MouseButtonDown( const 
MouseEvent & rEvt )
 return true;
 }
 
+bool SvxZoomSliderControl::MouseButtonUp( const MouseEvent & )
+{
+mpImpl->mbDraggingStarted = false;
+return true;
+}
+
 bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
 {
 if ( !mpImpl->mbValuesSet )
@@ -356,7 +367,7 @@ bool SvxZoomSliderControl::MouseMove( const MouseEvent & 
rEvt )
 const sal_Int32 nXDiff = aPoint.X() - aControlRect.Left();
 
 // check mouse move with button pressed
-if ( 1 == nButtons )
+if ( 1 == nButtons && mpImpl->mbDraggingStarted )
 {
 if ( nXDiff >= nSliderXOffset && nXDiff <= aControlRect.GetWidth() - 
nSliderXOffset )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

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

New commits:
commit da1c96d4cd98876cde8a0ab3ddf3d387646a0ba7
Author: Michael Stahl 
Date:   Mon Feb 9 15:43:41 2015 +0100

sw: another LONG_MAX fed into LogicToPixel

Can be reproduced by dragging the zoom slider.

Change-Id: I4d32543370eccbda23d0a1ea449ee124148143d6

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index a893424..7739c92 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1055,7 +1055,7 @@ void SwViewShell::VisPortChgd( const SwRect &rRect)
 SwRect aBoth( VisArea() );
 aBoth.Union( aPrevArea );
 const SwTwips nBottom = aBoth.Bottom();
-SwTwips nMinLeft = LONG_MAX;
+SwTwips nMinLeft = SAL_MAX_INT32;
 SwTwips nMaxRight= 0;
 
 const bool bBookMode = GetViewOptions()->IsViewLayoutBookMode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rodolfo Ribeiro Gomes]

 include/sfx2/stbitem.hxx   |2 +-
 include/svx/zoomsliderctrl.hxx |1 +
 svx/source/stbctrls/zoomsliderctrl.cxx |   15 +--
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 53740bd71a0ae569da36b9293ef22842a0b53f1e
Author: Rodolfo Ribeiro Gomes 
Date:   Sat Jan 31 19:08:05 2015 -0200

tdf#47577  Zoom slider should only react to full click

Change-Id: If859754c956a634a96066ac407b70d6dd2759d53
Signed-off-by: Rodolfo Ribeiro Gomes 
Reviewed-on: https://gerrit.libreoffice.org/14265
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index 07121f8..f5e146c 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -102,7 +102,7 @@ protected:
 virtual voidCommand( const CommandEvent& rCEvt );
 virtual boolMouseButtonDown( const MouseEvent & );
 virtual boolMouseMove( const MouseEvent & );
-boolMouseButtonUp( const MouseEvent & );
+virtual boolMouseButtonUp( const MouseEvent & );
 virtual voidPaint( const UserDrawEvent &rUDEvt );
 
 static sal_uInt16   convertAwtToVCLMouseButtons( sal_Int16 
nAwtMouseButtons );
diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx
index 7af69db..f35f825 100644
--- a/include/svx/zoomsliderctrl.hxx
+++ b/include/svx/zoomsliderctrl.hxx
@@ -49,6 +49,7 @@ public:
 virtual void  StateChanged( sal_uInt16 nSID, SfxItemState eState, const 
SfxPoolItem* pState ) SAL_OVERRIDE;
 virtual void  Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE;
 virtual bool  MouseButtonDown( const MouseEvent & ) SAL_OVERRIDE;
+virtual bool  MouseButtonUp( const MouseEvent & ) SAL_OVERRIDE;
 virtual bool  MouseMove( const MouseEvent & rEvt ) SAL_OVERRIDE;
 };
 
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx 
b/svx/source/stbctrls/zoomsliderctrl.cxx
index dcb0c55..c2e0f21 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -45,6 +45,7 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
 ImagemaDecreaseButton;
 bool mbValuesSet;
 bool mbOmitPaint;
+bool mbDraggingStarted;
 
 SvxZoomSliderControl_Impl() :
 mnCurrentZoom( 0 ),
@@ -57,7 +58,8 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
 maIncreaseButton(),
 maDecreaseButton(),
 mbValuesSet( false ),
-mbOmitPaint( false ) {}
+mbOmitPaint( false ),
+mbDraggingStarted( false ) {}
 };
 
 const long nSliderXOffset = 20;
@@ -331,7 +333,10 @@ bool SvxZoomSliderControl::MouseButtonDown( const 
MouseEvent & rEvt )
 mpImpl->mnCurrentZoom = basegfx::zoomtools::zoomIn( 
static_cast(mpImpl->mnCurrentZoom) );
 // click to slider
 else if( nXDiff >= nSliderXOffset && nXDiff <= aControlRect.GetWidth() - 
nSliderXOffset )
+{
 mpImpl->mnCurrentZoom = Offset2Zoom( nXDiff );
+mpImpl->mbDraggingStarted = true;
+}
 
 if ( mpImpl->mnCurrentZoom < mpImpl->mnMinZoom )
 mpImpl->mnCurrentZoom = mpImpl->mnMinZoom;
@@ -346,6 +351,12 @@ bool SvxZoomSliderControl::MouseButtonDown( const 
MouseEvent & rEvt )
 return true;
 }
 
+bool SvxZoomSliderControl::MouseButtonUp( const MouseEvent & )
+{
+mpImpl->mbDraggingStarted = false;
+return true;
+}
+
 bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
 {
 if ( !mpImpl->mbValuesSet )
@@ -357,7 +368,7 @@ bool SvxZoomSliderControl::MouseMove( const MouseEvent & 
rEvt )
 const sal_Int32 nXDiff = aPoint.X() - aControlRect.Left();
 
 // check mouse move with button pressed
-if ( 1 == nButtons )
+if ( 1 == nButtons && mpImpl->mbDraggingStarted )
 {
 if ( nXDiff >= nSliderXOffset && nXDiff <= aControlRect.GetWidth() - 
nSliderXOffset )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/source/options/optgdlg.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3d106972014ba9e00126a077ed62b351518c2afa
Author: Caolán McNamara 
Date:   Mon Feb 9 14:28:24 2015 +

fix build

Change-Id: I797e2a4feb240c463bd34c9699c945d6df72bb55

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index d1ac603..5d28c51 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -665,8 +665,8 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const 
SfxItemSet& rSet)
 get(m_pForceOpenGL, "forceopengl");
 //fdo#87876 , we need height-for-width support here, but for now we can
 //bodge it
-Size aPrefSize(m_pForceOpenGL->get_preferred_size());
-Size aSize(m_pForceOpenGL->CalcMinimumSize(40*approximate_char_width()));
+aPrefSize = m_pForceOpenGL->get_preferred_size();
+aSize = m_pForceOpenGL->CalcMinimumSize(40*approximate_char_width());
 if (aPrefSize.Width() > aSize.Width())
 {
 m_pForceOpenGL->set_width_request(aSize.Width());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti]

 chart2/source/view/charttypes/PieChart.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit fab828d1a144b70a75e90e2bac484bc409b1e4e4
Author: Marco Cecchetti 
Date:   Mon Feb 9 14:41:32 2015 +0100

Fixed a too long comment line.

diff --git a/chart2/source/view/charttypes/PieChart.cxx 
b/chart2/source/view/charttypes/PieChart.cxx
index c674456..de54a0c 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -297,7 +297,9 @@ void PieChart::createTextLabelShape(
 //anchor point. This is required in order to ensure that the label is
 //completely outside (inside) the related slice. Indeed this value should
 //depend on the font height.
-//Pay attention: 150 is not a big offset, in fact the screen position 
coordinates for label anchor points are in the 1-2 range, hence these 
are coordinates of a virtual screen and 150 is a small value.
+//Pay attention: 150 is not a big offset, in fact the screen position
+//coordinates for label anchor points are in the 1-2 range, hence
+//these are coordinates of a virtual screen and 150 is a small value.
 LabelAlignment eAlignment(LABEL_ALIGN_CENTER);
 sal_Int32 nScreenValueOffsetInRadiusDirection = 0 ;
 if( nLabelPlacement == 
::com::sun::star::chart::DataLabelPlacement::OUTSIDE )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: cppcheck/cppcheck-report.sh

[Maarten Hoes]

 cppcheck/cppcheck-report.sh |   16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 9163b649f8b6b9262f84c7c098c0cf850770d0c5
Author: Maarten Hoes 
Date:   Sun Feb 8 07:52:52 2015 +0100

Improve note in email to include git location.

Change-Id: I8f4adc61df52073c3c5b6e0abcec9e33f83829e9
Reviewed-on: https://gerrit.libreoffice.org/14364
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cppcheck/cppcheck-report.sh b/cppcheck/cppcheck-report.sh
index 3aa242f..4e2a1ed 100755
--- a/cppcheck/cppcheck-report.sh
+++ b/cppcheck/cppcheck-report.sh
@@ -134,7 +134,13 @@ cat > "$EMAIL_BODY"  "$EMAIL_BODY" 

[Libreoffice-commits] core.git: setup_native/Package_scripts.mk

[Stephan Bergmann]

 setup_native/Package_scripts.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e69253f35ec73fc269580e2f6735e0d2d953d0fb
Author: Stephan Bergmann 
Date:   Mon Feb 9 15:09:09 2015 +0100

unpack_update is LINUX, SOLARIS only

cf. a1d2774e1aae2537fb843085135ddfdbd6ae207b "INTEGRATION: CWS
onlineupdate6: #i82283# added unpack and update script"

Change-Id: Id4f8180fb189f06f5a463fe852c8a51a20680cf5

diff --git a/setup_native/Package_scripts.mk b/setup_native/Package_scripts.mk
index 53ddd96..da754e1 100644
--- a/setup_native/Package_scripts.mk
+++ b/setup_native/Package_scripts.mk
@@ -10,7 +10,9 @@
 $(eval $(call 
gb_Package_Package,setup_native_scripts,$(SRCDIR)/setup_native/scripts))
 
 ifeq ($(ENABLE_ONLINE_UPDATE),TRUE)
+ifneq ($(filter LINUX SOLARIS,$(OS)),)
 $(eval $(call 
gb_Package_add_file,setup_native_scripts,$(LIBO_BIN_FOLDER)/unpack_update,unpack_update.sh))
 endif
+endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - libreofficekit/source

[Miklos Vajna]

 libreofficekit/source/gtk/lokdocview.c |   29 +
 1 file changed, 29 insertions(+)

New commits:
commit ff7920181f0c3466a2a417818ab9c9a5affc7651
Author: Miklos Vajna 
Date:   Mon Feb 9 14:22:01 2015 +0100

lokdocview: when have a cursor but no selection, show the middle handle

Change-Id: I1497bd73303a0445f06f3302aa5b8a537243bfeb

diff --git a/libreofficekit/source/gtk/lokdocview.c 
b/libreofficekit/source/gtk/lokdocview.c
index a7cf3ec..351c7cc 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -24,6 +24,9 @@
 #define g_info(...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, __VA_ARGS__)
 #endif
 
+// Cursor bitmaps from the Android app.
+#define CURSOR_HANDLE_DIR "android/experimental/LOAndroid3/res/drawable/"
+
 static void lok_docview_class_init( LOKDocViewClass* pClass );
 static void lok_docview_init( LOKDocView* pDocView );
 static float pixelToTwip(float nInput);
@@ -204,6 +207,32 @@ static gboolean renderOverlay(GtkWidget* pWidget, 
GdkEventExpose* pEvent, gpoint
 twipToPixel(pDocView->m_aVisibleCursor.width),
 twipToPixel(pDocView->m_aVisibleCursor.height));
 cairo_fill(pCairo);
+
+}
+
+if (!lcl_isEmptyRectangle(&pDocView->m_aVisibleCursor) && 
!pDocView->m_pTextSelectionRectangles)
+{
+// Have a cursor, but no selection: we need the middle handle.
+GdkPoint aCursorBottom;
+cairo_surface_t* pSurface;
+int nHandleWidth, nHandleHeight;
+double fHandleScale;
+
+pSurface = cairo_image_surface_create_from_png(CURSOR_HANDLE_DIR 
"handle_middle.png");
+nHandleWidth = cairo_image_surface_get_width(pSurface);
+nHandleHeight = cairo_image_surface_get_height(pSurface);
+// We want to scale down the handle, so that its height is the same as 
the cursor caret.
+fHandleScale = twipToPixel(pDocView->m_aVisibleCursor.height) / 
nHandleHeight;
+// We want the top center of the handle bitmap to be at the bottom 
center of the cursor rectangle.
+aCursorBottom.x = twipToPixel(pDocView->m_aVisibleCursor.x) + 
twipToPixel(pDocView->m_aVisibleCursor.width) / 2 - (nHandleWidth * 
fHandleScale) / 2;
+aCursorBottom.y = twipToPixel(pDocView->m_aVisibleCursor.y) + 
twipToPixel(pDocView->m_aVisibleCursor.height);
+cairo_save(pCairo);
+cairo_translate(pCairo, aCursorBottom.x, aCursorBottom.y);
+cairo_scale(pCairo, fHandleScale, fHandleScale);
+cairo_set_source_surface(pCairo, pSurface, 0, 0);
+cairo_paint(pCairo);
+cairo_surface_destroy(pSurface);
+cairo_restore(pCairo);
 }
 
 if (pDocView->m_pTextSelectionRectangles)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

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

New commits:
commit e56c495ffaa242fc00347d859badf43ec3f27546
Author: Michael Stahl 
Date:   Mon Feb 9 14:27:41 2015 +0100

chart2: fix build

Change-Id: I25a960bfdcd9938f68bf4f1535c7822959d95b71

diff --git a/chart2/source/view/charttypes/PieChart.cxx 
b/chart2/source/view/charttypes/PieChart.cxx
index 5c29b36..c674456 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -297,7 +297,7 @@ void PieChart::createTextLabelShape(
 //anchor point. This is required in order to ensure that the label is
 //completely outside (inside) the related slice. Indeed this value should
 //depend on the font height.
-Pay attention: 150 is not a big offset, in fact the screen position 
coordinates for label anchor points are in the 1-2 range, hence these 
are coordinates of a virtual screen and 150 is a small value.
+//Pay attention: 150 is not a big offset, in fact the screen position 
coordinates for label anchor points are in the 1-2 range, hence these 
are coordinates of a virtual screen and 150 is a small value.
 LabelAlignment eAlignment(LABEL_ALIGN_CENTER);
 sal_Int32 nScreenValueOffsetInRadiusDirection = 0 ;
 if( nLabelPlacement == 
::com::sun::star::chart::DataLabelPlacement::OUTSIDE )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 dbaccess/source/ui/browser/sbagrid.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6d82d8b51776b349ff58fc15d269840755859d02
Author: Lionel Elie Mamane 
Date:   Sun Jan 25 19:01:00 2015 +0100

tdf#73059 isDBReadOnly ensure connection before trying to retrieve it

Change-Id: I03f9b8ea72bd6906df61ccf05ead3670d7f90eb7
Reviewed-on: https://gerrit.libreoffice.org/14178
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/dbaccess/source/ui/browser/sbagrid.cxx 
b/dbaccess/source/ui/browser/sbagrid.cxx
index c765512..ba1206d 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -991,6 +991,7 @@ bool SbaGridControl::IsReadOnlyDB() const
 if (xColumns.is())
 {
 Reference< XRowSet >  xDataSource(xColumns->getParent(), 
UNO_QUERY);
+::dbtools::ensureRowSetConnection( xDataSource, getContext(), 
false ); // NOT SURE ABOUT FALSE
 Reference< XChild >  
xConn(::dbtools::getConnection(xDataSource),UNO_QUERY);
 if (xConn.is())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti]

 chart2/source/view/charttypes/PieChart.cxx  |   58 +++
 chart2/source/view/charttypes/PieChart.hxx  |   12 +++
 chart2/source/view/charttypes/VSeriesPlotter.cxx|   21 +
 chart2/source/view/inc/PlotterBase.hxx  |4 +
 chart2/source/view/inc/PlottingPositionHelper.hxx   |   35 -
 chart2/source/view/inc/PolarLabelPositionHelper.hxx |   11 +++
 chart2/source/view/inc/VSeriesPlotter.hxx   |   35 +
 chart2/source/view/main/PlottingPositionHelper.cxx  |   73 
 8 files changed, 245 insertions(+), 4 deletions(-)

New commits:
commit 1a595052b205f8505776699f61c1a0b89bc42380
Author: Marco Cecchetti 
Date:   Mon Feb 9 13:36:49 2015 +0100

Added doc notes for classes and methods used for pie charts.

diff --git a/chart2/source/view/charttypes/PieChart.cxx 
b/chart2/source/view/charttypes/PieChart.cxx
index 3edf2af..5c29b36 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -41,13 +41,38 @@ namespace chart {
 
 struct PieChart::ShapeParam
 {
+// the start angle of the slice
 double mfUnitCircleStartAngleDegree;
+
+// the angle width of the slice
 double mfUnitCircleWidthAngleDegree;
+
+// the normalized outer radius of the ring the slice belongs to.
 double mfUnitCircleOuterRadius;
+
+// the normalized inner radius of the ring the slice belongs to
 double mfUnitCircleInnerRadius;
+
+// relative distance offset of a slice from the pie center;
+// this parameter is used for instance when the user performs manual
+// dragging of a slice (the drag operation is possible only for slices that
+// belong to the outer ring and only along the ray bisecting the slice);
+// the value for the given entry in the data series is obtained by the
+// `Offset` property attached to each entry; note that the value
+// provided by the `Offset` property is used both as a logical value in
+// `PiePositionHelper::getInnerAndOuterRadius` and as a percentage value in
+// the `PieChart::createDataPoint` and `PieChart::createTextLabelShape`
+// methods; since the logical height of a ring is always 1, this duality
+// does not cause any incorrect behavior.
 double mfExplodePercentage;
-double mfLogicYSum; // sum of all Y values in a single series.
+
+// sum of all Y values in a single series.
+double mfLogicYSum;
+
+// for 3D pie chart: label z coordinate
 double mfLogicZ;
+
+// for 3D pie chart: height
 double mfDepth;
 
 ShapeParam() :
@@ -86,6 +111,18 @@ PiePositionHelper::~PiePositionHelper()
 {
 }
 
+/* Compute the outer and the inner radius for the current ring (not for the
+ * whole donut!), in general it is:
+ * inner_radius = (ring_index + 1) - 0.5 + max_offset,
+ * outer_radius = (ring_index + 1) + 0.5 + max_offset.
+ * When orientation for the radius axis is reversed these values are swapped.
+ * (Indeed the the orientation for the radius axis is always reversed!
+ * See `PieChartTypeTemplate::adaptScales`.)
+ * The maximum relative offset (see notes for P`ieChart::getMaxOffset`) is
+ * added to both the inner and the outer radius.
+ * It returns true if the ring is visible (that is not out of the radius
+ * axis scale range).
+ */
 bool PiePositionHelper::getInnerAndOuterRadius( double fCategoryX
, double& fLogicInnerRadius, 
double& fLogicOuterRadius
, bool bUseRings, double 
fMaxOffset ) const
@@ -230,6 +267,10 @@ void PieChart::createTextLabelShape(
 // There is no text label for this data point.  Nothing to do.
 return;
 
+//by using the `mfExplodePercentage` parameter a normalized offset is added
+// to both normalized radii. (See notes for
+// `PolarPlottingPositionHelper::transformToRadius`, especially example 3,
+// and related comments).
 if (!rtl::math::approxEqual(rParam.mfExplodePercentage, 0.0))
 {
 double fExplodeOffset = 
(rParam.mfUnitCircleOuterRadius-rParam.mfUnitCircleInnerRadius)*rParam.mfExplodePercentage;
@@ -237,6 +278,8 @@ void PieChart::createTextLabelShape(
 rParam.mfUnitCircleOuterRadius += fExplodeOffset;
 }
 
+//get the required label placement type. Available placements are
+//`AVOID_OVERLAP`, `CENTER`, `OUTSIDE` and `INSIDE`.
 sal_Int32 nLabelPlacement = rSeries.getLabelPlacement(
 nPointIndex, m_xChartTypeModel, m_nDimension, 
m_pPosHelper->isSwapXAndY());
 
@@ -249,6 +292,12 @@ void PieChart::createTextLabelShape(
 // does.
 nLabelPlacement = ::com::sun::star::chart::DataLabelPlacement::CENTER;
 
+//for `OUTSIDE` (`INSIDE`) label placements an offset of 150 (-150), in the
+//radius direction, is added to the final screen position of the label
+//anchor point. This is required in order to ensure that the label is
+//completely out

[Libreoffice-commits] help.git: source/text

[Caolán McNamara]

 source/text/swriter/01/04020100.xhp |   33 +++--
 1 file changed, 15 insertions(+), 18 deletions(-)

New commits:
commit 1ff0bd652428824fdbd3a1650c8ec0c8ead4af4a
Author: Caolán McNamara 
Date:   Mon Feb 9 09:56:40 2015 +

Resolves: fdo#88970 restore section page extended tips

if an extended tip targets multiple widgets then the hid needs to be "." to
flag that it refers to the multiple preceding bookmarks in the current 
context
that start with hid/

insert an additional empty ahelp to capture the "SectionPage" container 
widget
bookmark and assign it an empty extended tip in order to separate it from 
the
group of following widgets

Change-Id: I2ac41435121c05d9a27291062056572613c30a9b

diff --git a/source/text/swriter/01/04020100.xhp 
b/source/text/swriter/01/04020100.xhp
index 89a3af8..b4f6a56 100644
--- a/source/text/swriter/01/04020100.xhp
+++ b/source/text/swriter/01/04020100.xhp
@@ -36,69 +36,66 @@
 DDE; command for inserting sections
 
 
-Section
+
+Section
 Sets the properties of the section.
 
 
   
 
-
+
 
 New Section
-Type a name 
for the new section. By default, $[officename] automatically assigns 
the name "Section X" to new sections, where X is a consecutive 
number.
+Type a name for the new section. By default, 
$[officename] automatically assigns the name "Section X" to new sections, where 
X is a consecutive number.
 Link
 
 
 Link
-Inserts the 
contents of another document or section from another document in the current 
section.
+Inserts the contents of another document or section 
from another document in the current section.
 
 
-
-
 DDEUFI: WIN only, while fixing 
#109638#
-Creates a 
DDE link. Select this check box, and then enter the DDE 
command that you want to use. The DDE option is only 
available if the Link check box is selected.
+Creates a DDE link. Select this check 
box, and then enter the DDE command that you want to use. The 
DDE option is only available if the Link check box is 
selected.
 The general syntax for a DDE command is: " 
 ", where server is the DDE name for the application 
that contains the data. Topic refers to the location of the Item (usually the 
file name), and Item represents the actual object.
 For example, to insert a section named "Section1" from a 
$[officename] text document abc.sxw as a DDE link, use the command: "soffice 
x:\abc.sxw Section1". To insert the contents of the first cell from a MS Excel 
spreadsheet file called "abc.xls", use the command: "excel x:\[abc.xls]Sheet1 
z1s1". You can also copy the elements that you want to insert as a DDE link, 
and then Edit - Paste Special. You can then view the DDE command 
for the link, by selecting the contents and choosing Edit - 
Fields.
-
-
 
 
-File name / DDE command 
+File name / DDE command
 
-Enter 
the path and the filename for the file that you want to insert, or click the 
browse button (...) to locate the file.If the DDE check box is 
selected, enter the DDE command that you want to use. 
+Enter the path and the filename for the file that 
you want to insert, or click the browse button (...) to locate the 
file.If the 
DDE check box is selected, enter the DDE command that you want to 
use.
 
 
 
 ...
-Locate the 
file that you want to insert as a link, and then click 
Insert.
+Locate the file that you want to insert as a link, 
and then click Insert.
 
 
 Section
-Select 
the section in the file that you want to insert as a link.
+Select the section in the file that you want to 
insert as a link.
 When you open a document that contains linked sections, you are 
prompted to update the links.
 Write Protection
 
 
 Protected
-Prevents 
the selected section from being edited.
+Prevents the selected section from being 
edited.
 
 
 With password
-Protects the selected 
section with a password. The password must have a minimum of 5 
characters.
+Protects the selected section with a password. The 
password must have a minimum of 5 characters.
 
 
 ...
-Opens a 
dialog where you can change the current password.
+Opens a dialog where you can change the current 
password.
 Hide
 
 
 Hide
-Hides and 
prevents the selected section from being printed. The components of a 
hidden sections appear gray in the Navigator. When you rest your mouse pointer 
over a hidden component in the Navigator, the Help tip "hidden" is 
displayed.
+Hides and prevents the selected section from being 
printed. The components of a hidden sections appear gray in the 
Navigator. When you rest your mouse pointer over a hidden component in the 
Navigator, the Help tip "hidden" is displayed.
 You cannot hide a section if it is the only content on a page, or 
in a header, footer, footnote, frame, or table cell.
 
 
 With condition
-Enter 
the condition that must be met to hide the section. A condition is a 
logical 
expression, such as "SALUTATION EQ Mr.". For example, if you use the 
mail 
merge form letter feature to define a

[Libreoffice-commits] core.git: 2 commits - basic/source helpcontent2 include/rtl

[Caolán McNamara]

 basic/source/comp/scanner.cxx |   49 +-
 helpcontent2  |2 -
 include/rtl/character.hxx |   15 
 3 files changed, 36 insertions(+), 30 deletions(-)

New commits:
commit ab50e4f8e5b34b15e4f6a338fb7326035b7d3180
Author: Caolán McNamara 
Date:   Mon Feb 9 09:56:40 2015 +

Updated core
Project: help  1ff0bd652428824fdbd3a1650c8ec0c8ead4af4a

diff --git a/helpcontent2 b/helpcontent2
index 8cc178e..1ff0bd6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8cc178e568781e3f4fe9a79579074532ccc00ec4
+Subproject commit 1ff0bd652428824fdbd3a1650c8ec0c8ead4af4a
commit 78f25d565e1b04be257100023ad84c5259cfd9e1
Author: Arnaud Versini 
Date:   Sun Feb 8 15:55:28 2015 +0100

Basic : Partially rewrite hex and octal constant reading.

Change-Id: I42f72e7b1ca897aba71950841f90b501cf3b6dc2
Signed-off-by: Stephan Bergmann 

diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 41e6171..0afd5f2 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -417,17 +417,14 @@ bool SbiScanner::NextSym()
 else if(nCol < aLine.getLength() && aLine[nCol] == '&')
 {
 ++pLine; ++nCol;
-sal_Unicode cmp1[] = { 
'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F', 0 };
-sal_Unicode cmp2[] = { '0', '1', '2', '3', '4', '5', '6', '7', 0 };
-sal_Unicode *cmp = cmp1;
 sal_Unicode base = 16;
-sal_Unicode ndig = 8;
-sal_Unicode xch  = aLine[nCol] & 0xFF;
+sal_Unicode xch  = aLine[nCol];
 ++pLine; ++nCol;
-switch( toupper( xch ) )
+switch( rtl::toAsciiUpperCase( xch ) )
 {
 case 'O':
-cmp = cmp2; base = 8; ndig = 11; break;
+base = 8;
+break;
 case 'H':
 break;
 default :
@@ -439,40 +436,34 @@ bool SbiScanner::NextSym()
 bNumber = true;
 // Hex literals are signed Integers ( as defined by basic
 // e.g. -2,147,483,648 through 2,147,483,647 (signed)
-sal_uInt32 lu = 0;
-bool bBufOverflow = false;
-while(nCol < aLine.getLength() &&  
theBasicCharClass::get().isAlphaNumeric(aLine[nCol] & 0xFF, bCompatible))
+sal_uInt64 lu = 0;
+bool bOverflow = false;
+while(nCol < aLine.getLength() &&  
theBasicCharClass::get().isAlphaNumeric(aLine[nCol], bCompatible))
 {
-sal_Unicode ch = sal::static_int_cast< sal_Unicode >(
-toupper(aLine[nCol] & 0xFF));
+sal_Unicode ch = rtl::toAsciiUpperCase(aLine[nCol]);
 ++pLine; ++nCol;
-// from 4.1.1996: buffer full, go on scanning empty
-if( (p-buf) == (BUF_SIZE-1) )
-bBufOverflow = true;
-else if( OUString( cmp ).indexOf( ch ) != -1 )
-*p++ = ch;
+if( ((base == 16 ) && rtl::isAsciiHexDigit( ch ) ) ||
+ ((base == 8) && rtl::isAsciiOctalDigit( ch )))
+{
+int i = ch  - '0';
+if( i > 9 ) i -= 7;
+lu = ( lu * base ) + i;
+if( lu > SAL_MAX_UINT32 )
+{
+bOverflow = true;
+}
+}
 else
 {
 aError = OUString(ch);
 GenError( SbERR_BAD_CHAR_IN_NUMBER );
 }
 }
-*p = 0;
-for( p = buf; *p; ++p )
-{
-int i = (*p & 0xFF) - '0';
-if( i > 9 ) i -= 7;
-lu = ( lu * base ) + i;
-if( !ndig-- )
-{
-GenError( SbERR_MATH_OVERFLOW ); break;
-}
-}
 if(nCol < aLine.getLength() && aLine[nCol] == '&') ++pLine, ++nCol;
 sal_Int32 ls = static_cast(lu);
 nVal = (double) ls;
 eScanType = ( ls >= SbxMININT && ls <= SbxMAXINT ) ? SbxINTEGER : 
SbxLONG;
-if( bBufOverflow )
+if( bOverflow )
 GenError( SbERR_MATH_OVERFLOW );
 }
 
diff --git a/include/rtl/character.hxx b/include/rtl/character.hxx
index 87a20c2..b62f6d1 100644
--- a/include/rtl/character.hxx
+++ b/include/rtl/character.hxx
@@ -148,6 +148,21 @@ inline bool isAsciiHexDigit(sal_uInt32 code)
 return isAsciiCanonicHexDigit(code) || (code >= 'a' && code <= 'f');
 }
 
+/** Check for ASCII octal digit character.
+
+@param code  A Unicode code point.
+
+@return  True if code is an ASCII octal digit character (ASCII '0'--'7').
+
+@since LibreOffice 4.5
+ */
+inline bool isAsciiOctalDigit(sal_uInt32 code)
+{
+assert(code <= 0x10);
+return code >= '0' && code <= '7';
+}
+
+
 /** Convert a character, if ASCII, to upper case.
 
 @param code  A Unicode code point.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesk

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

[Caolán McNamara]

 sw/source/ui/frmdlg/cption.cxx  |7 +--
 sw/source/uibase/inc/cption.hxx |8 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 1fac71668ac8a32633a7ee31698c0f4fe78e4d31
Author: Caolán McNamara 
Date:   Mon Feb 9 10:43:28 2015 +

Resolves: fdo#88933 Labeling of images impossible without category

Change-Id: I8b618d5cd6b3e9d5e42e04e215592a7b748dbb9f

diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 2f9bac8..ff754b6 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -85,7 +85,7 @@ OUString SwCaptionDialog::our_aSepTextSave(": "); // Caption 
separator text
 //Resolves: fdo#47427 disallow typing *or* pasting content into the category 
box
 OUString TextFilterAutoConvert::filter(const OUString &rText)
 {
-if (!SwCalc::IsValidVarName(rText))
+if (rText != m_sNone && !SwCalc::IsValidVarName(rText))
 return m_sLastGoodText;
 m_sLastGoodText = rText;
 return rText;
@@ -94,6 +94,7 @@ OUString TextFilterAutoConvert::filter(const OUString &rText)
 SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
 SvxStandardDialog( pParent, "InsertCaptionDialog", 
"modules/swriter/ui/insertcaption.ui" ),
 m_sNone( SW_RESSTR(SW_STR_NONE) ),
+m_aTextFilter(m_sNone),
 rView( rV ),
 pMgr( new SwFldMgr(rView.GetWrtShellPtr()) ),
 bCopyAttributes( false ),
@@ -282,7 +283,7 @@ IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, 
Button*, pButton )
 {
 OUString sFldTypeName = m_pCategoryBox->GetText();
 if(sFldTypeName == m_sNone)
-sFldTypeName.clear();
+sFldTypeName = OUString();
 SwSequenceOptionDialog  aDlg( pButton, rView, sFldTypeName );
 aDlg.SetApplyBorderAndShadow(bCopyAttributes);
 aDlg.SetCharacterStyle( sCharacterStyle );
@@ -318,6 +319,8 @@ IMPL_LINK_NOARG(SwCaptionDialog, ModifyHdl)
 SwFieldType* pType = (bCorrectFldName && !bNone)
 ? rSh.GetFldType( RES_SETEXPFLD, sFldTypeName )
 : 0;
+fprintf(stderr, "pType is %p\n", pType);
+fprintf(stderr, "bCorrectFldName is %d\n", bCorrectFldName);
 m_pOKButton->Enable( bCorrectFldName &&
 (!pType ||
 static_cast(pType)->GetType() 
== nsSwGetSetExpType::GSE_SEQ) );
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index 08f31a4..98ed59d 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -52,7 +52,12 @@ class TextFilterAutoConvert : public TextFilter
 {
 private:
 OUString m_sLastGoodText;
+OUString m_sNone;
 public:
+TextFilterAutoConvert(const OUString &rNone)
+: m_sNone(rNone)
+{
+}
 virtual OUString filter(const OUString &rText) SAL_OVERRIDE;
 };
 
@@ -60,6 +65,7 @@ class SwCaptionDialog : public SvxStandardDialog
 {
 Edit*m_pTextEdit;
 ComboBox*m_pCategoryBox;
+OUString m_sNone;
 TextFilterAutoConvert m_aTextFilter;
 FixedText*   m_pFormatText;
 ListBox* m_pFormatBox;
@@ -76,8 +82,6 @@ class SwCaptionDialog : public SvxStandardDialog
 
 SwCaptionPreview* m_pPreview;
 
-OUString m_sNone;
-
 SwView   &rView; // search per active, avoid View
 SwFldMgr *pMgr;  // pointer to save the include
 SelectionType eType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - cui/source cui/uiconfig

[Caolán McNamara]

 cui/source/options/optgdlg.cxx |   11 +++
 cui/uiconfig/ui/optviewpage.ui |2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 27b5c708938167e7516407db7d22bf48aac796b2
Author: Caolán McNamara 
Date:   Mon Feb 9 09:36:16 2015 +

Resolves: fdo#87876 full text of war and peace used as checkbox label

Change-Id: I016975123c0f277b4e4c8c8097e89fd84d93530a
(cherry picked from commit 081f3c0f70a9aa4d9f1f72bfbdb838bbd2dc993e)
Reviewed-on: https://gerrit.libreoffice.org/14379
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 842e453..d1ac603 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -661,7 +661,18 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const 
SfxItemSet& rSet)
 get(m_pUseHardwareAccell, "useaccel");
 get(m_pUseAntiAliase, "useaa");
 get(m_pUseOpenGL, "useopengl");
+
 get(m_pForceOpenGL, "forceopengl");
+//fdo#87876 , we need height-for-width support here, but for now we can
+//bodge it
+Size aPrefSize(m_pForceOpenGL->get_preferred_size());
+Size aSize(m_pForceOpenGL->CalcMinimumSize(40*approximate_char_width()));
+if (aPrefSize.Width() > aSize.Width())
+{
+m_pForceOpenGL->set_width_request(aSize.Width());
+m_pForceOpenGL->set_height_request(aSize.Height());
+}
+
 get(m_pMousePosLB, "mousepos");
 get(m_pMouseMiddleLB, "mousemiddle");
 // #i97672#
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 9536667..4ff3d61 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -97,7 +97,7 @@
   
 
 
-  
+  
 Force OpenGL 
even if blacklisted (might expose driver bugs)
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 sd/qa/unit/data/xml/fdo64586_0.xml|4 ++--
 sd/qa/unit/data/xml/n758621_0.xml |4 ++--
 sd/qa/unit/data/xml/n758621_1.xml |4 ++--
 sd/qa/unit/data/xml/n819614_0.xml |2 +-
 svtools/qa/unit/GraphicObjectTest.cxx |   11 +++
 vcl/source/gdi/impgraph.cxx   |4 ++--
 6 files changed, 20 insertions(+), 9 deletions(-)

New commits:
commit 3c1c50281acce8a7471ba456d514e2584e6d22d1
Author: Zolnai Tamás 
Date:   Sat Feb 7 11:44:20 2015 +0100

tdf#88836: UI: in-form navigation bar icons gone

Regression from:
6419c745e5e9802da264250d5e131fb9a3b6e4de

Revert it and use IsEmpty() instead of operator!().

(cherry picked from commit 905d4db48a0b98f540c8abc3e12fb80be4826029)

Conflicts:
vcl/source/gdi/impgraph.cxx

Change-Id: Icc4f5dbba848a1d4ef807e598f0aa3b940459c82
Reviewed-on: https://gerrit.libreoffice.org/14357
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/sd/qa/unit/data/xml/fdo64586_0.xml 
b/sd/qa/unit/data/xml/fdo64586_0.xml
index 7bbf719..a248783 100644
--- a/sd/qa/unit/data/xml/fdo64586_0.xml
+++ b/sd/qa/unit/data/xml/fdo64586_0.xml
@@ -4,7 +4,7 @@
   
   
   
-  
+  
   
   
   
@@ -18,7 +18,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/sd/qa/unit/data/xml/n758621_0.xml 
b/sd/qa/unit/data/xml/n758621_0.xml
index 288bf98..754be1d 100644
--- a/sd/qa/unit/data/xml/n758621_0.xml
+++ b/sd/qa/unit/data/xml/n758621_0.xml
@@ -4,7 +4,7 @@
   
   
   
-  
+  
   
   
   
@@ -18,7 +18,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/sd/qa/unit/data/xml/n758621_1.xml 
b/sd/qa/unit/data/xml/n758621_1.xml
index a124211..0f71931 100644
--- a/sd/qa/unit/data/xml/n758621_1.xml
+++ b/sd/qa/unit/data/xml/n758621_1.xml
@@ -4,7 +4,7 @@
   
   
   
-  
+  
   
   
   
@@ -18,7 +18,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/sd/qa/unit/data/xml/n819614_0.xml 
b/sd/qa/unit/data/xml/n819614_0.xml
index b7005be..aff9c32 100644
--- a/sd/qa/unit/data/xml/n819614_0.xml
+++ b/sd/qa/unit/data/xml/n819614_0.xml
@@ -4,7 +4,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/svtools/qa/unit/GraphicObjectTest.cxx 
b/svtools/qa/unit/GraphicObjectTest.cxx
index 0c96f15..c004604 100644
--- a/svtools/qa/unit/GraphicObjectTest.cxx
+++ b/svtools/qa/unit/GraphicObjectTest.cxx
@@ -40,6 +40,7 @@ class GraphicObjectTest: public test::BootstrapFixture, 
public unotest::MacrosTe
 public:
 void testSwap();
 void testSizeBasedAutoSwap();
+void testTdf88836();
 
 
 virtual void setUp() SAL_OVERRIDE
@@ -56,6 +57,7 @@ private:
 CPPUNIT_TEST_SUITE(GraphicObjectTest);
 CPPUNIT_TEST(testSwap);
 CPPUNIT_TEST(testSizeBasedAutoSwap);
+CPPUNIT_TEST(testTdf88836);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -227,6 +229,15 @@ void GraphicObjectTest::testSizeBasedAutoSwap()
 xComponent->dispose();
 }
 
+void GraphicObjectTest::testTdf88836()
+{
+// Construction with empty bitmap -> type should be GRAPHIC_NONE
+Graphic aGraphic = Bitmap();
+CPPUNIT_ASSERT_EQUAL(GRAPHIC_NONE, aGraphic.GetType());
+aGraphic = Graphic(BitmapEx());
+CPPUNIT_ASSERT_EQUAL(GRAPHIC_NONE, aGraphic.GetType());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(GraphicObjectTest);
 
 }
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 27bd0b9..f24dca1 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -141,7 +141,7 @@ ImpGraphic::ImpGraphic( const Bitmap& rBitmap ) :
 mpContext   ( NULL ),
 mpSwapFile  ( NULL ),
 mpGfxLink   ( NULL ),
-meType  ( GRAPHIC_BITMAP ),
+meType  ( !rBitmap.IsEmpty() ? GRAPHIC_BITMAP : GRAPHIC_NONE ),
 mnDocFilePos( 0UL ),
 mnSizeBytes ( 0UL ),
 mnRefCount  ( 1UL ),
@@ -156,7 +156,7 @@ ImpGraphic::ImpGraphic( const BitmapEx& rBitmapEx ) :
 mpContext   ( NULL ),
 mpSwapFile  ( NULL ),
 mpGfxLink   ( NULL ),
-meType  ( GRAPHIC_BITMAP ),
+meType  ( !rBitmapEx.IsEmpty() ? GRAPHIC_BITMAP : GRAPHIC_NONE 
),
 mnDocFilePos( 0UL ),
 mnSizeBytes ( 0UL ),
 mnRefCount  ( 1UL ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

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

New commits:
commit 5236e24afddeba986802dea10f988f0559365ff8
Author: Eike Rathke 
Date:   Fri Feb 6 23:32:54 2015 +0100

Resolves: tdf#83461 do not override MatColsRows if already set

ScMatrixFormulaCellToken::SetMatColsRows() via
ScFormulaCell::SetMatColsRows() is used during document import and
preselected cell area input of an array formula. Do not override
existing values with subsequent result matrix dimensions.

Change-Id: I9e844b5064ea276f3cbcb680eb1127c344328e00
(cherry picked from commit e32eff2bb4c12fdc33e476b9f12bb4bb71d22ebc)
Reviewed-on: https://gerrit.libreoffice.org/14354
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/sc/source/core/tool/formularesult.cxx 
b/sc/source/core/tool/formularesult.cxx
index cf790c8..61b56f5 100644
--- a/sc/source/core/tool/formularesult.cxx
+++ b/sc/source/core/tool/formularesult.cxx
@@ -167,7 +167,7 @@ void ScFormulaResult::SetToken( const 
formula::FormulaToken* p )
 {
 const ScMatrixFormulaCellToken* pNewMatFormula =
 dynamic_cast(pMatResult);
-if (pNewMatFormula)
+if (pNewMatFormula && (pMatFormula->GetMatCols() <= 0 || 
pMatFormula->GetMatRows() <= 0))
 {
 SAL_WARN( "sc", "ScFormulaResult::SetToken: pNewMatFormula and 
pMatFormula, overriding matrix formula dimension; intended?");
 pMatFormula->SetMatColsRows( pNewMatFormula->GetMatCols(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 dbaccess/source/ui/dlg/tablespage.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1876ec092382beb8b3d6a9b9fb4dfe3148d758a6
Author: Lionel Elie Mamane 
Date:   Thu Feb 5 21:29:29 2015 +0100

tdf#89070 Table filter dialog: properly initialise OTableTreeListBox

regression from .ui conversion:

commit 5c72a213c7c4b588d0c1e0884ff2c46c22425faf
Author: Caolán McNamara 
Date:   Tue Jan 21 14:41:16 2014 +

convert table filter page to .ui

Change-Id: I7bfb7698e2a5303b492766fba564c7b9033bcc52

Change-Id: Ic7d41d64d4c15eabf7b7f83a17482c473154434a
Reviewed-on: https://gerrit.libreoffice.org/14342
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/dbaccess/source/ui/dlg/tablespage.cxx 
b/dbaccess/source/ui/dlg/tablespage.cxx
index 9b8104c..f14098d 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -79,6 +79,7 @@ namespace dbaui
 get(m_pTables, "TablesFilterPage");
 
 get(m_pTablesList, "treeview");
+m_pTablesList->init(true);
 m_pTablesList->set_width_request(56 * 
m_pTablesList->approximate_char_width());
 m_pTablesList->set_height_request(12 * m_pTablesList->GetTextHeight());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a9cbae63a43cbdafd245eb67c09832d554f51c93
Author: Lionel Elie Mamane 
Date:   Wed Jan 28 21:09:42 2015 +0100

not all OrCriteria have three children

and some contain a column in the second child

Change-Id: I60aca574815251902aa7dd1056903bdade9e21a1
Reviewed-on: https://gerrit.libreoffice.org/14340
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx 
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 312395d..b2efec0 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -1304,9 +1304,11 @@ namespace
 {
 bool bRet = true;
 ::connectivity::OSQLParseNode* pFirstColumnRef = _pFirstColumnRef;
-for (int i = 0; i < 3 && bRet; i+=2)
+for (size_t i = 0; i < _pCondition->count() && bRet; ++i)
 {
 const  ::connectivity::OSQLParseNode* pChild = 
_pCondition->getChild(i);
+if ( pChild->isToken() )
+continue;
 if ( SQL_ISRULE(pChild,search_condition) )
 bRet = CheckOrCriteria(pChild,pFirstColumnRef);
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/uibase/inc/workctrl.hxx|   13 ++---
 sw/source/uibase/ribbar/workctrl.cxx |6 +++---
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit e33e78a6fce0faf86f944cfc13726d4f132ef4e5
Author: Caolán McNamara 
Date:   Wed Feb 4 21:04:44 2015 +

Resolves: tdf#85004 Crash when clicking the Reminder icon...

on the Navigation toolbar

the Parent window isn't a SwScrollNaviPopup anymore

(cherry picked from commit 535f34bba60e06d390a6f3802072b16a9841bc4e)

Conflicts:
sw/source/uibase/ribbar/workctrl.cxx

Change-Id: I5c539d125aac28bfee0beb842ff2df001e19c945
Reviewed-on: https://gerrit.libreoffice.org/14326
Tested-by: Christian Lohmaier 
Reviewed-by: Christian Lohmaier 

diff --git a/sw/source/uibase/inc/workctrl.hxx 
b/sw/source/uibase/inc/workctrl.hxx
index 493b164..6bb9c1f 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -110,14 +110,21 @@ public:
 DECL_LINK(PopupHdl, PopupMenu*);
 };
 
+class SwScrollNaviPopup;
+
 class SwScrollNaviToolBox : public ToolBox
 {
+SwScrollNaviPopup *m_pNaviPopup;
+
 virtual voidMouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
 virtual voidRequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
 
-public:
-SwScrollNaviToolBox(vcl::Window* pParent, WinBits nWinStyle ) :
-ToolBox(pParent, nWinStyle ) {}
+public:
+SwScrollNaviToolBox(vcl::Window* pParent, SwScrollNaviPopup* pNaviPopup, 
WinBits nWinStyle)
+: ToolBox(pParent, nWinStyle)
+, m_pNaviPopup(pNaviPopup)
+{
+}
 };
 
 class SwScrollNaviPopup : public SfxPopupWindow
diff --git a/sw/source/uibase/ribbar/workctrl.cxx 
b/sw/source/uibase/ribbar/workctrl.cxx
index d191cfd..56eb31f 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -394,7 +394,7 @@ SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const 
Reference< XFrame >&
 "modules/swriter/ui/floatingnavigation.ui", rFrame),
 aIList(SW_RES(IL_VALUES))
 {
-m_pToolBox = new SwScrollNaviToolBox(get("box"), 0);
+m_pToolBox = new SwScrollNaviToolBox(get("box"), this, 0);
 get(m_pInfoField, "label");
 
 sal_uInt16 i;
@@ -502,8 +502,8 @@ IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
 void SwScrollNaviToolBox::MouseButtonUp( const MouseEvent& rMEvt )
 {
 ToolBox::MouseButtonUp(rMEvt);
-if ( ((SwScrollNaviPopup*)GetParent())->IsInPopupMode() )
-((SwScrollNaviPopup*)GetParent())->EndPopupMode( 
FLOATWIN_POPUPMODEEND_CLOSEALL );
+if (m_pNaviPopup->IsInPopupMode())
+m_pNaviPopup->EndPopupMode(FLOATWIN_POPUPMODEEND_CLOSEALL);
 }
 
 void  SwScrollNaviToolBox::RequestHelp( const HelpEvent& rHEvt )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 connectivity/source/drivers/mork/MConnection.cxx  |6 +-
 connectivity/source/drivers/mork/MQueryHelper.cxx |8 +--
 connectivity/source/drivers/mork/MorkParser.cxx   |   46 +++---
 connectivity/source/drivers/mork/MorkParser.hxx   |8 +--
 connectivity/source/drivers/mork/mork_helper.cxx  |4 -
 5 files changed, 36 insertions(+), 36 deletions(-)

New commits:
commit 110f77c52186aaf5539759292a8bfcadccdd9e47
Author: Stephan Bergmann 
Date:   Mon Feb 9 11:33:44 2015 +0100

Try work around MSVC warning C4503 (decorated name length exceeded)

Change-Id: I8ae5a7b5fd3d07b7beb16374f6bb4251ffdb3610

diff --git a/connectivity/source/drivers/mork/MConnection.cxx 
b/connectivity/source/drivers/mork/MConnection.cxx
index 7225fc9..8112a16 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -159,11 +159,11 @@ void OConnection::construct(const OUString& url,const 
Sequence< PropertyValue >&
 
 // check that we can retrieve the tables:
 MorkTableMap *Tables = m_pBook->getTables( defaultScope );
-MorkTableMap::iterator tableIter;
+MorkTableMap::Map::iterator tableIter;
 if (Tables)
 {
 // Iterate all tables
-for ( tableIter = Tables->begin(); tableIter != Tables->end(); 
++tableIter )
+for ( tableIter = Tables->map.begin(); tableIter != Tables->map.end(); 
++tableIter )
 {
 if ( 0 == tableIter->first ) continue;
 SAL_INFO("connectivity.mork", "table->first : " << 
tableIter->first);
@@ -174,7 +174,7 @@ void OConnection::construct(const OUString& url,const 
Sequence< PropertyValue >&
 if (Tables_hist)
 {
 // Iterate all tables
-for ( tableIter = Tables_hist->begin(); tableIter != 
Tables_hist->end(); ++tableIter )
+for ( tableIter = Tables_hist->map.begin(); tableIter != 
Tables_hist->map.end(); ++tableIter )
 {
 if ( 0 == tableIter->first ) continue;
 SAL_INFO("connectivity.mork", "table->first : " << 
tableIter->first);
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx 
b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 6139d5e..610ef54 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -213,22 +213,22 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* 
xConnection, MQueryExpression
 std::string listTable = oStringTable.getStr();
 xMork->getRecordKeysForListTable(listTable, listRecords);
 }
-MorkTableMap::iterator tableIter;
+MorkTableMap::Map::iterator tableIter;
 MorkTableMap *Tables = xMork->getTables( 0x80 );
 if (!Tables)
 return -1;
 MorkRowMap *Rows = 0;
-MorkRowMap::iterator rowIter;
+MorkRowMap::Map::iterator rowIter;
 
 // Iterate all tables
-for ( tableIter = Tables->begin(); tableIter != Tables->end(); ++tableIter 
)
+for ( tableIter = Tables->map.begin(); tableIter != Tables->map.end(); 
++tableIter )
 {
 if (tableIter->first != 1) break;
 Rows = xMork->getRows( 0x80, &tableIter->second );
 if ( Rows )
 {
 // Iterate all rows
-for ( rowIter = Rows->begin(); rowIter != Rows->end(); ++rowIter )
+for ( rowIter = Rows->map.begin(); rowIter != Rows->map.end(); 
++rowIter )
 {
 // list specific table
 // only retrieve rowIds that belong to that list table.
diff --git a/connectivity/source/drivers/mork/MorkParser.cxx 
b/connectivity/source/drivers/mork/MorkParser.cxx
index 2cfde00..040ad95 100644
--- a/connectivity/source/drivers/mork/MorkParser.cxx
+++ b/connectivity/source/drivers/mork/MorkParser.cxx
@@ -486,7 +486,7 @@ inline void MorkParser::setCurrentRow( int TableScope, int 
TableId, int RowScope
 TableId = defaultTableId_;
 }
 
-currentCells_ = &( mork_[ abs( TableScope ) ][ abs( TableId ) ][ abs( 
RowScope ) ][ abs( RowId ) ] );
+currentCells_ = &( mork_.map[ abs( TableScope ) ].map[ abs( TableId ) 
].map[ abs( RowScope ) ].map[ abs( RowId ) ] );
 }
 
 bool MorkParser::parseRow( int TableId, int TableScope )
@@ -556,10 +556,10 @@ bool MorkParser::parseMeta( char c )
 
 MorkTableMap *MorkParser::getTables( int TableScope )
 {
-TableScopeMap::iterator iter;
-iter = mork_.find( TableScope );
+TableScopeMap::Map::iterator iter;
+iter = mork_.map.find( TableScope );
 
-if ( iter == mork_.end() )
+if ( iter == mork_.map.end() )
 {
 return 0;
 }
@@ -569,10 +569,10 @@ MorkTableMap *MorkParser::getTables( int TableScope )
 
 MorkRowMap *MorkParser::getRows( int RowScope, RowScopeMap *table )
 {
-RowScopeMap::iterator iter;
-iter = table->find( RowScope );
+RowScopeMap::Map::iterator iter;
+iter = table->map.find( RowScope );
 
-if ( iter == table->end() )
+if ( iter == table->map.end() )
 {
 return 0;
 

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-4' - source/sl

[Andras Timar]

 source/sl/cui/uiconfig/ui.po  |4 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |   10 
 source/sl/sd/uiconfig/simpress/ui.po  |  465 +-
 source/sl/sfx2/uiconfig/ui.po |4 
 source/sl/starmath/uiconfig/smath/ui.po   |   15 
 source/sl/svx/uiconfig/ui.po  |4 
 source/sl/sw/source/ui/app.po |4 
 7 files changed, 487 insertions(+), 19 deletions(-)

New commits:
commit 724226857e74c149cbefbcb2dfa1ea0bc50884cf
Author: Andras Timar 
Date:   Mon Feb 9 11:27:26 2015 +0100

Updated Slovenian translation

Change-Id: I571264d86fca29a51479eeec9b5ad4e3f46ec08a

diff --git a/source/sl/cui/uiconfig/ui.po b/source/sl/cui/uiconfig/ui.po
index 162a0c5..4b80e39 100644
--- a/source/sl/cui/uiconfig/ui.po
+++ b/source/sl/cui/uiconfig/ui.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-01-17 22:24+0100\n"
+"POT-Creation-Date: 2015-02-08 23:36+0100\n"
 "PO-Revision-Date: 2015-01-18 00:31+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po 
b/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po
index 1a92c4f..e9e68b9 100644
--- a/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/sl/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2015-01-06 07:41+0100\n"
-"PO-Revision-Date: 2014-12-23 00:31+0200\n"
+"POT-Creation-Date: 2015-02-08 23:37+0100\n"
+"PO-Revision-Date: 2015-02-09 01:15+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -13955,8 +13955,8 @@ msgctxt ""
 "..GenericCommands.UserInterface.Commands..uno:CenterPara\n"
 "Label\n"
 "value.text"
-msgid "Center Vertically"
-msgstr "Navpično na sredino"
+msgid "Center Horizontally"
+msgstr "Vodoravno na sredino"
 
 #: GenericCommands.xcu
 msgctxt ""
diff --git a/source/sl/sd/uiconfig/simpress/ui.po 
b/source/sl/sd/uiconfig/simpress/ui.po
index db24bf3..dc17297 100644
--- a/source/sl/sd/uiconfig/simpress/ui.po
+++ b/source/sl/sd/uiconfig/simpress/ui.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.4\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2014-11-21 22:01+0100\n"
-"PO-Revision-Date: 2014-11-19 12:04+0200\n"
+"POT-Creation-Date: 2015-02-08 23:36+0100\n"
+"PO-Revision-Date: 2015-02-09 01:23+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -1061,6 +1061,465 @@ msgctxt ""
 msgid "F_ormat"
 msgstr "_Oblika"
 
+#: dockinganimation.ui
+msgctxt ""
+"dockinganimation.ui\n"
+"DockingAnimation\n"
+"title\n"
+"string.text"
+msgid "Animation"
+msgstr "Animacija"
+
+#: dockinganimation.ui
+msgctxt ""
+"dockinganimation.ui\n"
+"box\n"
+"tooltip_text\n"
+"string.text"
+msgid "Preview"
+msgstr "Predogled"
+
+#: dockinganimation.ui
+msgctxt ""
+"dockinganimation.ui\n"
+"loopcount\n"
+"tooltip_text\n"
+"string.text"
+msgid "Loop Count"
+msgstr "Å tevec zanke"
+
+#: dockinganimation.ui
+msgctxt ""
+"dockinganimation.ui\n"
+"loopcount\n"
+"0\n"
+"stringlist.text"
+msgid "1"
+msgstr "1"
+
+#: dockinganimation.ui
+msgctxt ""
+"dockinganimation.ui\n"
+"loopcount\n"
+"1\n"
+"stringlist.text"
+msgid "2"
+msgstr "2"
+
+#: dockinganimation.ui
+msgctxt ""
+"dockinganimation.ui\n"
+"loopcount\n"
+"2\n"
+"stringlist.text"
+msgid "3"
+msgstr "3"
+
+#: dockinganimation.ui
+msgctxt ""
+"dockinganimation.ui\n"
+"loopcount\n"
+"3\n"
+"

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - translations

[Andras Timar]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c7f53a3eb1912cd5681632a230b40225397077d5
Author: Andras Timar 
Date:   Mon Feb 9 11:27:26 2015 +0100

Updated core
Project: translations  724226857e74c149cbefbcb2dfa1ea0bc50884cf

diff --git a/translations b/translations
index 1fbe29c..7242268 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 1fbe29c113fd7dac567682e1284c2ce2725e1a50
+Subproject commit 724226857e74c149cbefbcb2dfa1ea0bc50884cf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 starmath/source/node.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f4017e1ddd483e7f5ab14cf68aa754fd7c468d06
Author: Takeshi Abe 
Date:   Mon Feb 9 18:59:24 2015 +0900

Mark it as static

Change-Id: I3193c5b7181f61a9047985f115d2ea49c683cb73

diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 083e3dc..c55b691 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -1283,7 +1283,7 @@ void SmBinDiagonalNode::GetOperPosSize(Point &rPos, Size 
&rSize,
 const Point &rDiagPoint, double fAngleDeg) const
 
 {
-const double  fPi   = 3.1415926535897932384626433;
+static const double  fPi   = 3.1415926535897932384626433;
 double  fAngleRad   = fAngleDeg / 180.0 * fPi;
 longnRectLeft   = GetItalicLeft(),
 nRectRight  = GetItalicRight(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/source/options/optgdlg.cxx |   11 ---
 cui/uiconfig/ui/optviewpage.ui |5 +++--
 2 files changed, 3 insertions(+), 13 deletions(-)

New commits:
commit 110751e5415cda9ba9488a0673e956a443c836fd
Author: Caolán McNamara 
Date:   Mon Feb 9 09:42:18 2015 +

Related: fdo#87876 make checkbox label shorter, move warning into tooltip

Change-Id: I5f24703db70b53306d618d8fb89ad4a468d1a5f9

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index eedf11a..512e8ad 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -627,18 +627,7 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const 
SfxItemSet& rSet)
 get(m_pUseHardwareAccell, "useaccel");
 get(m_pUseAntiAliase, "useaa");
 get(m_pUseOpenGL, "useopengl");
-
 get(m_pForceOpenGL, "forceopengl");
-//fdo#87876 , we need height-for-width support here, but for now we can
-//bodge it
-Size aPrefSize(m_pForceOpenGL->get_preferred_size());
-Size aSize(m_pForceOpenGL->CalcMinimumSize(40*approximate_char_width()));
-if (aPrefSize.Width() > aSize.Width())
-{
-m_pForceOpenGL->set_width_request(aSize.Width());
-m_pForceOpenGL->set_height_request(aSize.Height());
-}
-
 get(m_pMousePosLB, "mousepos");
 get(m_pMouseMiddleLB, "mousemiddle");
 // #i97672#
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 1a6d95d..d120228 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -97,11 +97,12 @@
   
 
 
-  
-Force OpenGL 
even if blacklisted (might expose driver bugs)
+  
+Force OpenGL 
even if blacklisted
 True
 True
 False
+Enabling this may expose driver bugs
 0
 True
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=79641
Bug 79641 depends on bug 87876, which changed state.

Bug 87876 Summary: Tools -> Options -> View tab crushed by new OpenGL Graphics 
Output strings
https://bugs.documentfoundation.org/show_bug.cgi?id=87876

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

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

[Tor Lillqvist]

 sc/source/core/opencl/formulagroupcl.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 87dc0ee13feb8f1d6031ac77465141b9636c18d6
Author: Tor Lillqvist 
Date:   Sun Feb 8 11:04:13 2015 +0200

Avoid OpenCL compilation error when multiple RAND() calls in a formula

Simply surround the Random123 code snippet with an ifdef guard.

Change-Id: I370a3c37226d31bfbe703e5b7936b2180aee1784
Reviewed-on: https://gerrit.libreoffice.org/14366
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 948b4ab..1348876 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -336,6 +336,10 @@ public:
 // of course. Only the code that calculates the counter-based
 // random number and what it needs is left.
 ss << "\
+\n\
+#ifndef DEFINED_RANDOM123_STUFF\n\
+#define DEFINED_RANDOM123_STUFF\n\
+\n\
 /*\n\
 Copyright 2010-2011, D. E. Shaw Research.\n\
 All rights reserved.\n\
@@ -633,6 +637,7 @@ threefry2x32 (threefry2x32_ctr_t in, threefry2x32_key_t 
k)\n\
 {\n\
   return threefry2x32_R (threefry2x32_rounds, in, k);\n\
 }\n\
+#endif\n\
 \n\
 ";
 ss << "double " << mSymName << "_Random (int seed)\n\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 6 commits - android/experimental configure.ac desktop/source README.Android sal/osl solenv/bin

[Jan Holesovsky]

 README.Android 
 |   30 --
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java 
|4 -
 configure.ac   
 |2 
 desktop/source/lib/init.cxx
 |2 
 sal/osl/unx/file.cxx   
 |3 -
 solenv/bin/native-code.py  
 |5 +
 6 files changed, 21 insertions(+), 25 deletions(-)

New commits:
commit cdd31d3424aa52796ec04fe39fb1735c12f67c98
Author: Jan Holesovsky 
Date:   Mon Feb 9 10:28:54 2015 +0100

It is not necessary to be _that_ verbose.

Change-Id: Ie7685beae20df8b3798070135fad529cde3604a9

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 564784f..dff8579 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -281,7 +281,6 @@ sal_uInt64 FileHandle_Impl::getPos() const
 
 oslFileError FileHandle_Impl::setPos (sal_uInt64 uPos)
 {
-SAL_INFO("sal.file", "FileHandle_Impl::setPos(" << m_fd << ", " << 
getPos() << ") => " << uPos);
 m_fileptr = sal::static_int_cast< off_t >(uPos);
 return osl_File_E_None;
 }
@@ -377,7 +376,6 @@ oslFileError FileHandle_Impl::readAt (
 if (-1 == nBytes)
 return oslTranslateFileError (OSL_FET_ERROR, errno);
 
-SAL_INFO("sal.file", "FileHandle_Impl::readAt(" << m_fd << ", " << nOffset 
<< ", " << nBytes << ")");
 *pBytesRead = nBytes;
 return osl_File_E_None;
 }
@@ -400,7 +398,6 @@ oslFileError FileHandle_Impl::writeAt (
 if (-1 == nBytes)
 return oslTranslateFileError (OSL_FET_ERROR, errno);
 
-SAL_INFO("sal.file", "FileHandle_Impl::writeAt(" << m_fd << ", " << 
nOffset << ", " << nBytes << ")");
 m_size = std::max (m_size, sal::static_int_cast< sal_uInt64 >(nOffset + 
nBytes));
 
 *pBytesWritten = nBytes;
commit d484256a3063c8ef252dfb45241f3372e8466b49
Author: Jan Holesovsky 
Date:   Mon Feb 9 10:12:57 2015 +0100

native-code.py: Add libevtattlo.a + some forms related services.

Fixes part of fields.doc loading, but unfortunately not completely, as in 
the
end it needs "com_sun_star_comp_dba_ORowSet_get_implementation" - and we 
avoid
the database stuff for now still.

Change-Id: I9035e80fb1326357dbecf7994419d909e1f25373

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index c6d52b3..4b0b309 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -22,6 +22,7 @@ import xml.etree.ElementTree as ET
 
 core_factory_list = [
 ("libembobj.a", "embobj_component_getFactory"),
+("libevtattlo.a", "evtatt_component_getFactory"),
 ("libreflectionlo.a", "reflection_component_getFactory"),
 ("libstocserviceslo.a", "stocservices_component_getFactory"),
 ("libchartcorelo.a", "chartcore_component_getFactory"),
@@ -64,6 +65,9 @@ core_factory_list = [
 core_constructor_list = [
 # chart2/source/controller/chartcontroller.component
 "com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation",
+# forms/util/frm.component
+"com_sun_star_comp_forms_ODatabaseForm_get_implementation",
+"com_sun_star_form_OFormsCollection_get_implementation",
 # framework/util/fwk.component
 "com_sun_star_comp_framework_AutoRecovery_get_implementation",
 "com_sun_star_comp_framework_Desktop_get_implementation",
@@ -120,6 +124,7 @@ core_constructor_list = [
 "com_sun_star_comp_stoc_Introspection_get_implementation",
 # toolkit/util/tk.component
 "stardiv_Toolkit_UnoComboBoxControl_get_implementation",
+"stardiv_Toolkit_UnoControlCheckBoxModel_get_implementation",
 "stardiv_Toolkit_UnoControlComboBoxModel_get_implementation",
 "stardiv_Toolkit_UnoControlContainer_get_implementation",
 "stardiv_Toolkit_UnoControlContainerModel_get_implementation",
commit 3d082577493460f242f66b3522843a31f8eba27a
Author: Jan Holesovsky 
Date:   Sun Feb 8 00:28:12 2015 +0100

android: Update README.Android with the recent ndk-gdb info.

Change-Id: I23d76562c85ff458bdc539a8ba0681a847e647c5

diff --git a/README.Android b/README.Android
index 98a109d..19f54f9 100644
--- a/README.Android
+++ b/README.Android
@@ -46,7 +46,19 @@ know. But don't seem to be necessary on a real device anyway?
 
 * Debugging
 
-   Install the .apk to the device, and:
+   First of all, you need to configure the build with --enable-debug or
+--enable-dbgutil.  You may want to provide --enable-selective-debuginfo too,
+like --enable-selective-debuginfo="sw/" or so, in order to fit into the memory
+during linking.
+
+   You also want to avoid --with-android-package-name (or when you use
+that, you must set it to "org.libreoffice"), otherwise ndk-gdb will complain
+that
+
+ERROR: Could not extract package's data directory. Are you sure that
+   your installed application is debuggable?
+
+   Wh

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

[Stephan Bergmann]

 compilerplugins/clang/passstuffbyref.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 92db2f17b37660fd4edd8267a107d5491787dfad
Author: Stephan Bergmann 
Date:   Mon Feb 9 10:40:07 2015 +0100

Adapt loplugin:passstuffbyref to Clang 3.2

Change-Id: I24d0b7531feba32f86f761daf18170397cfe5d2f

diff --git a/compilerplugins/clang/passstuffbyref.cxx 
b/compilerplugins/clang/passstuffbyref.cxx
index 5617650..9eb0768 100644
--- a/compilerplugins/clang/passstuffbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -77,16 +77,16 @@ bool PassStuffByRef::VisitLambdaExpr(const LambdaExpr * 
expr) {
 if (ignoreLocation(expr)) {
 return true;
 }
-for (auto const & i: expr->captures()) {
-if (i.getCaptureKind() == LambdaCaptureKind::LCK_ByCopy) {
+for (auto i(expr->capture_begin()); i != expr->capture_end(); ++i) {
+if (i->getCaptureKind() == LambdaCaptureKind::LCK_ByCopy) {
 std::string name;
-if (isFat(i.getCapturedVar()->getType(), &name)) {
+if (isFat(i->getCapturedVar()->getType(), &name)) {
 report(
 DiagnosticsEngine::Warning,
 ("%0 capture of '%1' variable by copy, rather use capture"
  " by reference---UNLESS THE LAMBDA OUTLIVES THE 
VARIABLE"),
-i.getLocation())
-<< (i.isImplicit() ? "implicit" : "explicit") << name
+i->getLocation())
+<< (i->isImplicit() ? "implicit" : "explicit") << name
 << expr->getSourceRange();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/viewer' - 6 commits - android/experimental configure.ac desktop/source README.Android sal/osl solenv/bin

[Jan Holesovsky]

 README.Android 
 |   30 --
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java 
|4 -
 configure.ac   
 |2 
 desktop/source/lib/init.cxx
 |2 
 sal/osl/unx/file.cxx   
 |3 -
 solenv/bin/native-code.py  
 |5 +
 6 files changed, 21 insertions(+), 25 deletions(-)

New commits:
commit 5fff33ff40f2b36060bcb635ec7b908ec59e3d73
Author: Jan Holesovsky 
Date:   Mon Feb 9 10:28:54 2015 +0100

It is not necessary to be _that_ verbose.

Change-Id: Ie7685beae20df8b3798070135fad529cde3604a9

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 659526b..85d75c9 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -281,7 +281,6 @@ sal_uInt64 FileHandle_Impl::getPos() const
 
 oslFileError FileHandle_Impl::setPos (sal_uInt64 uPos)
 {
-SAL_INFO("sal.file", "FileHandle_Impl::setPos(" << m_fd << ", " << 
getPos() << ") => " << uPos);
 m_fileptr = sal::static_int_cast< off_t >(uPos);
 return osl_File_E_None;
 }
@@ -377,7 +376,6 @@ oslFileError FileHandle_Impl::readAt (
 if (-1 == nBytes)
 return oslTranslateFileError (OSL_FET_ERROR, errno);
 
-SAL_INFO("sal.file", "FileHandle_Impl::readAt(" << m_fd << ", " << nOffset 
<< ", " << nBytes << ")");
 *pBytesRead = nBytes;
 return osl_File_E_None;
 }
@@ -400,7 +398,6 @@ oslFileError FileHandle_Impl::writeAt (
 if (-1 == nBytes)
 return oslTranslateFileError (OSL_FET_ERROR, errno);
 
-SAL_INFO("sal.file", "FileHandle_Impl::writeAt(" << m_fd << ", " << 
nOffset << ", " << nBytes << ")");
 m_size = std::max (m_size, sal::static_int_cast< sal_uInt64 >(nOffset + 
nBytes));
 
 *pBytesWritten = nBytes;
commit 06ab144fdbbb51b22eba706b3a75bef2ab2a3a32
Author: Jan Holesovsky 
Date:   Mon Feb 9 10:12:57 2015 +0100

native-code.py: Add libevtattlo.a + some forms related services.

Fixes part of fields.doc loading, but unfortunately not completely, as in 
the
end it needs "com_sun_star_comp_dba_ORowSet_get_implementation" - and we 
avoid
the database stuff for now still.

Change-Id: I9035e80fb1326357dbecf7994419d909e1f25373

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 4f20e89..07c06e6 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -22,6 +22,7 @@ import xml.etree.ElementTree as ET
 
 core_factory_list = [
 ("libembobj.a", "embobj_component_getFactory"),
+("libevtattlo.a", "evtatt_component_getFactory"),
 ("libreflectionlo.a", "reflection_component_getFactory"),
 ("libstocserviceslo.a", "stocservices_component_getFactory"),
 ("libchartcorelo.a", "chartcore_component_getFactory"),
@@ -64,6 +65,9 @@ core_factory_list = [
 core_constructor_list = [
 # chart2/source/controller/chartcontroller.component
 "com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation",
+# forms/util/frm.component
+"com_sun_star_comp_forms_ODatabaseForm_get_implementation",
+"com_sun_star_form_OFormsCollection_get_implementation",
 # framework/util/fwk.component
 "com_sun_star_comp_framework_AutoRecovery_get_implementation",
 "com_sun_star_comp_framework_Desktop_get_implementation",
@@ -119,6 +123,7 @@ core_constructor_list = [
 "com_sun_star_comp_stoc_Introspection_get_implementation",
 # toolkit/util/tk.component
 "stardiv_Toolkit_UnoComboBoxControl_get_implementation",
+"stardiv_Toolkit_UnoControlCheckBoxModel_get_implementation",
 "stardiv_Toolkit_UnoControlComboBoxModel_get_implementation",
 "stardiv_Toolkit_UnoControlContainer_get_implementation",
 "stardiv_Toolkit_UnoControlContainerModel_get_implementation",
commit 63e944a878e07213abd76a37d195951e7d017999
Author: Jan Holesovsky 
Date:   Sun Feb 8 00:28:12 2015 +0100

android: Update README.Android with the recent ndk-gdb info.

Change-Id: I23d76562c85ff458bdc539a8ba0681a847e647c5

diff --git a/README.Android b/README.Android
index 98a109d..19f54f9 100644
--- a/README.Android
+++ b/README.Android
@@ -46,7 +46,19 @@ know. But don't seem to be necessary on a real device anyway?
 
 * Debugging
 
-   Install the .apk to the device, and:
+   First of all, you need to configure the build with --enable-debug or
+--enable-dbgutil.  You may want to provide --enable-selective-debuginfo too,
+like --enable-selective-debuginfo="sw/" or so, in order to fit into the memory
+during linking.
+
+   You also want to avoid --with-android-package-name (or when you use
+that, you must set it to "org.libreoffice"), otherwise ndk-gdb will complain
+that
+
+ERROR: Could not extract package's data directory. Are you sure that
+   your installed application is debuggable?
+
+   Wh

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

[Caolán McNamara]

 cui/source/options/optgdlg.cxx |   11 +++
 cui/uiconfig/ui/optviewpage.ui |2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 081f3c0f70a9aa4d9f1f72bfbdb838bbd2dc993e
Author: Caolán McNamara 
Date:   Mon Feb 9 09:36:16 2015 +

Resolves: fdo#87876 full text of war and peace used as checkbox label

Change-Id: I016975123c0f277b4e4c8c8097e89fd84d93530a

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 512e8ad..eedf11a 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -627,7 +627,18 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const 
SfxItemSet& rSet)
 get(m_pUseHardwareAccell, "useaccel");
 get(m_pUseAntiAliase, "useaa");
 get(m_pUseOpenGL, "useopengl");
+
 get(m_pForceOpenGL, "forceopengl");
+//fdo#87876 , we need height-for-width support here, but for now we can
+//bodge it
+Size aPrefSize(m_pForceOpenGL->get_preferred_size());
+Size aSize(m_pForceOpenGL->CalcMinimumSize(40*approximate_char_width()));
+if (aPrefSize.Width() > aSize.Width())
+{
+m_pForceOpenGL->set_width_request(aSize.Width());
+m_pForceOpenGL->set_height_request(aSize.Height());
+}
+
 get(m_pMousePosLB, "mousepos");
 get(m_pMouseMiddleLB, "mousemiddle");
 // #i97672#
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index d433c6f..1a6d95d 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -97,7 +97,7 @@
   
 
 
-  
+  
 Force OpenGL 
even if blacklisted (might expose driver bugs)
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: What is the reason for gb_Helper_abbreviate_dirs?

[Stephan Bergmann]

On 02/07/2015 11:37 AM, Bjoern Michaelsen wrote:

On Wed, Feb 04, 2015 at 03:22:04PM +0100, Stephan Bergmann wrote:

For another, it makes it more tedious to copy/modify/paste "make"
(w/o -s) output for some little one-off things like asking the
compiler to produce -S instead of -c output for some .cxx.


How so exactly? I remember from when I started playing with the build system
doing that more that likely anybody else did, and both having shorter
commandlines and not having to type a full path to e.g. $W all the time was
more of a feature than a bug for me.


Unless you deliberately want to "poison" your shell with S, W, etc. 
variables, it makes it harder to just copy part of a recipe line.  (I 
kind of get around that by including the setting of the variables in 
what I copy, and including the whole command line in parentheses.)



Anyways, YMMV -- so no opposing this, as having less magic is generally good.
Lets see if without abbreviated dirs, the verbose build logs of release package
builds will break my or somebody elses build infra by being ten times(?) as
big. ;)


I'll give it a try on a "fat" Windows build when I find time.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: What is the reason for gb_Helper_abbreviate_dirs?

[Stephan Bergmann]

On 02/06/2015 12:58 PM, Christian Lohmaier wrote:

On Wed, Feb 4, 2015 at 3:22 PM, Stephan Bergmann  wrote:

Asking because I see no good reason for it and it repeatedly gets in my way
with its two major drawbacks:


I think the goal was to avoid hitting commandline limits on windows -
where the build indeed did hit those multiple times, both in make
itself as well as in cygwin. But those cases are with lang=all
usually, and are much better avoided by using temporary files with the
lists of files to process, instead of listing hundreds of paths in the
invocation line.


Right, gb_Helper_abbreviate_dirs can shorten the command line of the 
bash process spawned from make (though not the command lines of the 
actual commands in turn spawned from bash).  So if there are individual 
gbuild recipe lines composed from multiple shell commands, this could 
indeed be an issue.

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

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

[Stephan Bergmann]

 desktop/source/app/app.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 810824d10df45944d223db1efab4b3cb99161e33
Author: Stephan Bergmann 
Date:   Mon Feb 9 09:49:17 2015 +0100

vcl/settings.hxx "drag full options API" uses sal_uLong

...for better or worse

Change-Id: I8069da4a544cb6a69cbcd7243469bc6ea7b112a4

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 59d984d..145c0c1 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1866,7 +1866,7 @@ void Desktop::OverrideSystemSettings( AllSettings& 
rSettings )
 StyleSettings hStyleSettings   = rSettings.GetStyleSettings();
 MouseSettings hMouseSettings = rSettings.GetMouseSettings();
 
-sal_uInt32 nDragFullOptions = hStyleSettings.GetDragFullOptions();
+sal_uLong nDragFullOptions = hStyleSettings.GetDragFullOptions();
 
 SvtTabAppearanceCfg aAppearanceCfg;
 sal_uInt16 nDragMode = aAppearanceCfg.GetDragMode();
@@ -1876,7 +1876,7 @@ void Desktop::OverrideSystemSettings( AllSettings& 
rSettings )
 nDragFullOptions |= DRAGFULL_OPTION_ALL;
 break;
 case DragFrame:
-nDragFullOptions &= ((sal_uInt32)~DRAGFULL_OPTION_ALL);
+nDragFullOptions &= ~DRAGFULL_OPTION_ALL;
 break;
 case DragSystemDep:
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 656 commits - accessibility/inc accessibility/source android/Bootstrap android/CustomTarget_lo_android.mk android/experimental basctl/i

[Miklos Vajna]

Rebased ref, commits from common ancestor:
commit e8fe1582372983c6e3ca5b9cbead097ed670f504
Author: Miklos Vajna 
Date:   Mon Feb 9 08:02:46 2015 +0100

lokdocview: fix Linux baseline build

Baseline is only used for releases, while lokdocview is a tool to
helpdevelopment for now, so don't bother with full compatiblity, just add
enough to not break the build.

Change-Id: I52e312d3c3ae80636448bf42d5f277184fb9ca7b

diff --git a/libreofficekit/source/gtk/lokdocview.c 
b/libreofficekit/source/gtk/lokdocview.c
index 03d6448..a7cf3ec 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -184,6 +184,7 @@ static gboolean lcl_handleTimeout(gpointer pData)
 
 static gboolean renderOverlay(GtkWidget* pWidget, GdkEventExpose* pEvent, 
gpointer pData)
 {
+#if GTK_CHECK_VERSION(2,14,0) // we need gtk_widget_get_window()
 LOKDocView* pDocView = pData;
 cairo_t* pCairo;
 
@@ -220,6 +221,7 @@ static gboolean renderOverlay(GtkWidget* pWidget, 
GdkEventExpose* pEvent, gpoint
 }
 
 cairo_destroy(pCairo);
+#endif
 return FALSE;
 }
 
@@ -390,6 +392,7 @@ static GList* lcl_payloadToRectangles(const char* pPayload)
 /// Invoked on the main thread if lok_docview_callback_worker() requests so.
 static gboolean lok_docview_callback(gpointer pData)
 {
+#if GLIB_CHECK_VERSION(2,28,0) // we need g_list_free_full()
 LOKDocViewCallbackData* pCallback = pData;
 
 switch (pCallback->m_nType)
@@ -427,6 +430,7 @@ static gboolean lok_docview_callback(gpointer pData)
 
 g_free(pCallback->m_pPayload);
 g_free(pCallback);
+#endif
 return G_SOURCE_REMOVE;
 }
 
commit c0a185ed1d535b49e20b6ed7ca52bacdb7a457aa
Author: Miklos Vajna 
Date:   Fri Feb 6 12:12:44 2015 +0100

lokdocview: implement selection overlay using LOK_CALLBACK_TEXT_SELECTION

Change-Id: I59cb870973ea4e2fda816b15ae7d9a53a4624e8d

diff --git a/include/LibreOfficeKit/LibreOfficeKitGtk.h 
b/include/LibreOfficeKit/LibreOfficeKitGtk.h
index 934d55a..def92f9 100644
--- a/include/LibreOfficeKit/LibreOfficeKitGtk.h
+++ b/include/LibreOfficeKit/LibreOfficeKitGtk.h
@@ -50,6 +50,8 @@ struct _LOKDocView
 guint32 m_nLastButtonPressTime;
 /// Time of the last button release.
 guint32 m_nLastButtonReleaseTime;
+/// Rectangles of the current text selection.
+GList* m_pTextSelectionRectangles;
 };
 
 struct _LOKDocViewClass
diff --git a/libreofficekit/source/gtk/lokdocview.c 
b/libreofficekit/source/gtk/lokdocview.c
index c5f8dab..03d6448 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -130,6 +130,7 @@ static void lok_docview_init( LOKDocView* pDocView )
 pDocView->m_bCursorVisible = FALSE;
 pDocView->m_nLastButtonPressTime = 0;
 pDocView->m_nLastButtonReleaseTime = 0;
+pDocView->m_pTextSelectionRectangles = NULL;
 
 gtk_signal_connect( GTK_OBJECT(pDocView), "destroy",
 GTK_SIGNAL_FUNC(lcl_onDestroy), NULL );
@@ -204,6 +205,20 @@ static gboolean renderOverlay(GtkWidget* pWidget, 
GdkEventExpose* pEvent, gpoint
 cairo_fill(pCairo);
 }
 
+if (pDocView->m_pTextSelectionRectangles)
+{
+GList* i;
+
+for (i = pDocView->m_pTextSelectionRectangles; i != NULL; i = i->next)
+{
+GdkRectangle* pRectangle = i->data;
+// Blue with 75% transparency.
+cairo_set_source_rgba(pCairo, ((double)0x43)/255, 
((double)0xac)/255, ((double)0xe8)/255, 0.25);
+cairo_rectangle(pCairo, twipToPixel(pRectangle->x), 
twipToPixel(pRectangle->y), twipToPixel(pRectangle->width), 
twipToPixel(pRectangle->height));
+cairo_fill(pCairo);
+}
+}
+
 cairo_destroy(pCairo);
 return FALSE;
 }
@@ -354,6 +369,24 @@ static GdkRectangle lcl_payloadToRectangle(const char* 
pPayload)
 return aRet;
 }
 
+/// Returns the GdkRectangle list of a w,h,x,y;w2,h2,x2,y2;... string.
+static GList* lcl_payloadToRectangles(const char* pPayload)
+{
+GList* pRet = NULL;
+gchar** ppRectangles;
+gchar** ppRectangle;
+
+ppRectangles = g_strsplit(pPayload, "; ", 0);
+for (ppRectangle = ppRectangles; *ppRectangle; ++ppRectangle)
+{
+GdkRectangle aRect = lcl_payloadToRectangle(*ppRectangle);
+GdkRectangle* pRect = g_new0(GdkRectangle, 1);
+*pRect = aRect;
+pRet = g_list_prepend(pRet, pRect);
+}
+g_strfreev(ppRectangles);
+return pRet;
+}
 /// Invoked on the main thread if lok_docview_callback_worker() requests so.
 static gboolean lok_docview_callback(gpointer pData)
 {
@@ -379,6 +412,15 @@ static gboolean lok_docview_callback(gpointer pData)
 gtk_widget_queue_draw(GTK_WIDGET(pCallback->m_pDocView->pEventBox));
 }
 break;
+case LOK_CALLBACK_TEXT_SELECTION:
+{
+GList* pRectangles = lcl_payloadToRectangles(pCallback->m_pPayload);
+if (pCallback->m_pDocView->m_pTextSelectionRectangles)
+
g_list

[Libreoffice-commits] core.git: 49 commits - android/Bootstrap android/experimental dbaccess/source dbaccess/util desktop/source forms/source forms/util include/LibreOfficeKit include/vcl libreofficek

[Miklos Vajna]

 android/Bootstrap/Makefile.shared  
   |2 
 android/Bootstrap/src/org/libreoffice/kit/Document.java
   |   12 
 android/experimental/LOAndroid3/AndroidManifest.xml.in 
   |9 
 android/experimental/LOAndroid3/res/drawable-hdpi/handle_end.png   
   |binary
 android/experimental/LOAndroid3/res/drawable-hdpi/handle_middle.png
   |binary
 android/experimental/LOAndroid3/res/drawable-hdpi/handle_start.png 
   |binary
 android/experimental/LOAndroid3/res/drawable-xhdpi/handle_end.png  
   |binary
 android/experimental/LOAndroid3/res/drawable-xhdpi/handle_middle.png   
   |binary
 android/experimental/LOAndroid3/res/drawable-xhdpi/handle_start.png
   |binary
 android/experimental/LOAndroid3/res/drawable/handle_end.png
   |binary
 android/experimental/LOAndroid3/res/drawable/handle_end_level.xml  
   |   14 
 android/experimental/LOAndroid3/res/drawable/handle_middle.png 
   |binary
 android/experimental/LOAndroid3/res/drawable/handle_start.png  
   |binary
 android/experimental/LOAndroid3/res/drawable/handle_start_level.xml
   |   14 
 android/experimental/LOAndroid3/res/drawable/text_cursor.xml   
   |6 
 android/experimental/LOAndroid3/res/layout/activity_main.xml   
   |3 
 android/experimental/LOAndroid3/res/layout/text_selection_handles.xml  
   |   36 +
 android/experimental/LOAndroid3/res/values/attrs.xml   
   |   17 
 android/experimental/LOAndroid3/res/values/dimens.xml  
   |3 
 android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java  
   |7 
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitInputConnectionHandler.java
 |   41 +
 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java   
   |   15 
 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java  
   |   78 +-
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java 
  |  116 ++--
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
 |   82 ++
 android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java 
   |   10 
 android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorLayer.java  
   |   82 ++
 android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorView.java   
   |   89 +++
 android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java 
   |   13 
 android/experimental/LOAndroid3/src/java/org/libreoffice/ViewFactory.java  
   |   32 -
 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelection.java  
   |  117 
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/TextSelectionHandle.java
   |  175 ++
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
  |  114 
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
 |  274 +-
 android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java  
   |   90 +++
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PanZoomController.java
 |   10 
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/PanZoomTarget.java
 |2 
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java
 |   55 --
 dbaccess/source/core/api/RowSet.cxx
   |6 
 dbaccess/source/core/inc/services.hxx  
   |1 
 dbaccess/source/core/misc/services.cxx 
   |1 
 dbaccess/util/dba.component
   |3 
 desktop/source/lib/init.cxx
   |7 
 desktop/source/lib/lokandroid.cxx  
   |4 
 forms/source/component/DatabaseForm.cxx
   |6 
 forms/source/component/FormsCollection.cxx 
   |6 
 forms/source/misc/services.cxx 
   |4 
 forms/util/frm.component   
   |6 
 include/LibreOfficeKit/LibreOfficeKit.h
   |   22 
 include/LibreOfficeKit/LibreOfficeKit.hxx