date:20130624

 configure.ac |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 265cc578b0a27c44fda115407d841aa821384b71
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Sun Jun 23 22:45:54 2013 +0200

Add another fallback-path for wilangid.vbs

on Windows Server 2012, it ends up in
c:/Program Files (x86)/Windows Kits/8.0/bin/x86/wilangid.vbs and
c:/Program Files (x86)/Windows Kits/8.0/bin/x64/wilangid.vbs
(files are identical)
No full-blown configure check is needed IMHO, since that stuff is part
of a bigger install, and not installed separately.
AFAICT it is only used when building the translated installsets

Change-Id: I1238717bb08635848bb4c54bf4f6b4049e0bc777
Reviewed-on: https://gerrit.libreoffice.org/4468
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com

diff --git a/configure.ac b/configure.ac
index 765bf72..ba3a316 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9133,6 +9133,13 @@ the  Windows SDK are installed.])
 dnl msiglobal.pm:
 if test -z $WINDOWS_SDK_WILANGID -a -n $WINDOWS_SDK_HOME; then
 
WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/Samples/sysmgmt/msi/scripts/WiLangId.vbs
+if ! test -e $WINDOWS_SDK_WILANGID ; then
+WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/bin/$vsarch/WiLangId.vbs
+fi
+if ! test -e $WINDOWS_SDK_WILANGID ; then
+AC_MSG_WARN([WiLangId.vbs not found - building translated packages 
will fail])
+add_warning WiLangId.vbs not found - building translated packages 
will fail
+fi
 fi
 fi
 AC_SUBST(WINDOWS_SDK_HOME)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Question on Java JDK build environments impacting JRE use


On 2013-06-23 17:24, V Stuart Foote wrote:

Thanks!  The zip'd packaging is fine for testing, have grabbed a copy.

Will run with it and a JRE 1.7u25 and JAB 2.0.3, but noticed for starters
that the build target for the Java bytecode is still set to major/minor
49.0, or J2SE 5.  Is that a javac compatibility mode setting of some sort?

Useful none the less, but might not see interesting changes until able to
assess java compiled to Java 7 bytecode, i.e. major/minor 51.0.  Just hope
there is not a lot of code refactoring to get to that point.


Changing the version number of the Java bytecode will have absolutely no 
impact on your problem because the Java-VM happily loads bytecode 
versions all the way back to Java1.0 i.e. it has pretty much perfect 
backwards compatibility in that respect.


You are more likely to be seeing some kind of subtle change in timing, 
or a small but significant change in how some part of the Java runtime 
behaves.


You could try doing a manual binary search through the Java runtime 
versions, that might help narrow it down.




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


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

Re: Question on Java JDK build environments impacting JRE use


On 2013-06-23 19:25, V Stuart Foote wrote:

Issue of bytecode target interaction with JRE becomes more troubling if you
consider that the default Java JRE update settings on Windows systems
replace all JRE  6 installations with current JRE 7 builds.  In other words
the percentage of total LibreOffice ussers with JRE 1.5 or JRE 1.6
installations even installed is rapidly shrinking.



There is no bytecode interaction problem. You are seeing some kind of 
bug brought on by a newer version of Java interacting slightly 
differently with LO.


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


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

Re: Question on Java JDK build environments impacting JRE use

2013-06-24 Thread V Stuart Foote

David,

David Ostrovsky-3 wrote
But anyway i can conduct a new and shiny 51 byte code version of LO if
you would like to try it and see if we have any improvements with JAB
with it?

I would still very much like to explore this further if you are able to
generate viable Java 1.7 bytecode of master without having to refactor the
entire project to meet stricter code requirements of Java SE 7.

In any case, I hope you've convinced yourself that there really is an issue
with the JRE 1.7u25 JAB v2.0.3 bridge of UNO Accessability API -- Java
Accessibility API serviced by JRE 7 on Windows OS and tht fdo#58995 remains
a valid accessibility issue for LibreOffice. Let me know if you still have
doubts.

Also, apologies for that rather confusing set of postings to the fdo#58995
bug. I really should just start editing outside BZ and then paste into the
dialog.

Setting up just a 32-bit JRE and the associated JavaFerret-32.exe (from the
Java SE 6 Java Access Bridge package) functions as a Graphical accessibility
explorer. It is comparable in function to tools provided in Python based
*Accerciser* for GNOME AT-SPI, or the *AccProbe* Eclipse Rich-Client
Product for evaluating IAccessible2 on Windows, or even Microsoft's
Inspect.exe for UIAutomation and MAA accessibility events and roles.

Along with JavaFerret-32, Oracle (via Sun) also provides the JavaMonkey-32
which compliments javaferret with a GUI tree representation of a documents
accessible objects. While JavaFerret will show the attributes of any single
accessible object--the tree representation of JavaMonkey shows hierarchical
relationships of parent and child so they complement each other but
JavaFerret is really the tool of choice when assessing how well AT tools can
be interfaced.

They've not repackaged them as JRE 7 utilities, but the packaging in JAB
v2.0.2 build still functions well enough.

In a perfect world attributes (annotations hard coded into the source) for
both the Ferret and the Monkey representations would be fully populated--as
Oracle has done with the SwingSet2.jar demo. Reality is, we are doing well
if we have correct AccessibleRole assigned along with parent and child
relationships.

At some point we will gain access to the Apache OpenOffice work being done
on their IA2 port from IBM Symphony and have the start of an UAA --
IAccessible2 bridge for Windows. That will reduce dependence on the Java
Accessibility API and JRE using the Java AccessibilityBridge, but as Oracle
support for J2SE 1.5 and Java SE 6 is retracting--we have to do something to
improve function of Java 7 JREs for Windows based users.

Stuart

--
View this message in context:
http://nabble.documentfoundation.org/Question-on-Java-JDK-build-environments-impacting-JRE-use-tp4062592p4062800.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] translations.git: Branch 'libreoffice-4-1' - source/mn

 source/mn/sysui/desktop/share.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ad5ed8525c1f41a9ee8dd9183ac7f6ae045625f7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jun 13 10:15:01 2013 +0100

parser error : EntityRef: expecting

Change-Id: Id087f03e24e0153a95d554eee61f73049b59ff63

diff --git a/source/mn/sysui/desktop/share.po b/source/mn/sysui/desktop/share.po
index 66f7f84..8ea79ae 100644
--- a/source/mn/sysui/desktop/share.po
+++ b/source/mn/sysui/desktop/share.po
@@ -253,7 +253,7 @@ msgctxt 
 ms-word-document\n
 LngText.text
 msgid Microsoft Word Document
-msgstr Microsoft Word ÐÐ°ÑÐ¸Ð¼ÑÑÑÐ´
+msgstr Microsoft Word ÐÐ°ÑÐ¸Ð¼ÑÑÑÐ´
 
 #: documents.ulf
 msgctxt 
@@ -261,7 +261,7 @@ msgctxt 
 ms-word-document2\n
 LngText.text
 msgid Microsoft Word Document
-msgstr Microsoft Word ÐÐ°ÑÐ¸Ð¼ÑÑÑÐ´
+msgstr Microsoft Word ÐÐ°ÑÐ¸Ð¼ÑÑÑÐ´
 
 #: documents.ulf
 msgctxt 
@@ -301,7 +301,7 @@ msgctxt 
 ms-word-document-12\n
 LngText.text
 msgid Microsoft Word Document
-msgstr Microsoft Word ÐÐ°ÑÐ¸Ð¼ÑÑÑÐ´
+msgstr Microsoft Word ÐÐ°ÑÐ¸Ð¼ÑÑÑÐ´
 
 #: documents.ulf
 msgctxt 
@@ -349,7 +349,7 @@ msgctxt 
 openxmlformats-officedocument-wordprocessingml-document\n
 LngText.text
 msgid Microsoft Word Document
-msgstr Microsoft Word ÐÐ°ÑÐ¸Ð¼ÑÑÑÐ´
+msgstr Microsoft Word ÐÐ°ÑÐ¸Ð¼ÑÑÑÐ´
 
 #: documents.ulf
 msgctxt 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit e34c72113363e942920e4f6d1557fe36656b208f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Jun 13 10:15:01 2013 +0100

Updated core
Project: translations  ad5ed8525c1f41a9ee8dd9183ac7f6ae045625f7

diff --git a/translations b/translations
index 7d19cf5..ad5ed85 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 7d19cf5e544f7bd14f07ae0f6c10a190f0ebff4a
+Subproject commit ad5ed8525c1f41a9ee8dd9183ac7f6ae045625f7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source

2013-06-24 Thread Minh Ngo

 avmedia/source/vlc/vlccommon.hxx |2 ++
 avmedia/source/vlc/vlcplayer.cxx |   12 
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 0bb9fd58fb0f5e851ae9a32fe574df9c367080d5
Author: Minh Ngo nlmin...@gmail.com
Date:   Mon Jun 24 09:53:22 2013 +0300

get/set methods implementations

Change-Id: Ia60d54def159b2ffc18d63315d23fc195ecece94

diff --git a/avmedia/source/vlc/vlccommon.hxx b/avmedia/source/vlc/vlccommon.hxx
index e9cc864..62551d0 100644
--- a/avmedia/source/vlc/vlccommon.hxx
+++ b/avmedia/source/vlc/vlccommon.hxx
@@ -19,6 +19,8 @@
 
 #ifndef _VLCCOMMON_HXX
 #define _VLCCOMMON_HXX
+//TODO: Remove it before committing
+#define SAL_CALL
 
 #include vlc/libvlc.h
 
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index c48b1f3..b308636 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -36,16 +36,18 @@ void SAL_CALL VLCPlayer::stop()
 
 double SAL_CALL VLCPlayer::getDuration()
 {
-return 0.f;
+libvlc_media_t* media = libvlc_media_player_get_media( mPlayer.get() );
+return libvlc_media_get_duration( media );
 }
 
 void SAL_CALL VLCPlayer::setMediaTime( double fTime )
 {
+libvlc_media_player_set_time( mPlayer.get(), fTime );
 }
 
 double SAL_CALL VLCPlayer::getMediaTime()
 {
-return 0.f;
+return libvlc_media_player_get_time( mPlayer.get() );
 }
 
 double SAL_CALL VLCPlayer::getRate()
@@ -64,20 +66,22 @@ void SAL_CALL VLCPlayer::setPlaybackLoop( ::sal_Bool bSet )
 
 void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB )
 {
+libvlc_audio_set_volume( mPlayer.get(), nDB );
 }
 
 ::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB()
 {
-return 1;
+return libvlc_audio_get_volume( mPlayer.get() );
 }
 
 void SAL_CALL VLCPlayer::setMute( ::sal_Bool bSet )
 {
+libvlc_audio_set_mute( mPlayer.get(), bSet );
 }
 
 ::sal_Bool SAL_CALL VLCPlayer::isMute()
 {
-return false;
+return libvlc_audio_get_mute( mPlayer.get() );
 }
 
 css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svx/inc/pch/precompiled_svxcore.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9191f3a7f1d266711f518758549b27a1a51a0d1d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 08:13:14 2013 +0100

remove XPopupMenuExtended from pch

Change-Id: Id36e374baa1e90cfb5aff9841cf3a1894385a47e

diff --git a/svx/inc/pch/precompiled_svxcore.hxx 
b/svx/inc/pch/precompiled_svxcore.hxx
index 1cf9262..9b48bb7 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -103,7 +103,6 @@
 #include com/sun/star/awt/XControlContainer.hpp
 #include com/sun/star/awt/XControlModel.hpp
 #include com/sun/star/awt/XLayoutConstrains.hpp
-#include com/sun/star/awt/XPopupMenuExtended.hpp
 #include com/sun/star/awt/XView.hpp
 #include com/sun/star/awt/XWindow.hpp
 #include com/sun/star/awt/XWindow2.hpp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Weekly report about character border

Hi Tamas,

On Sun, Jun 23, 2013 at 06:33:01PM +0200, Zolnai Tamás 
zolnaitamas2...@gmail.com wrote:
 Up to now I just make some cleanup commits in the code belonging to these
 questions:
 http://cgit.freedesktop.org/libreoffice/core/log/?h=feature/gsoc-writer-char-borders

Nice, great to see your progress!

A nitpick: in new code, please use SAL_WARN_IF instead of OSL_ENSURE:

http://docs.libreoffice.org/sal/html/sal_log.html

Thanks,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Question on Java JDK build environments impacting JRE use

2013-06-24 Thread V Stuart Foote

Noel,

You have continued to say that simply changing the byte code does nothing.

Even if we accept that, the issue remains that there are functional
differences between the current feature set represented by J2SE 5.0 targeted
bytecode and the current feature set that JDK SE 7 is configured to produce
and JRE 7 framework is designed to consume.

This is a problem for us because a prominent functional change introduced by
Oracle at the JRE 1.7u6 build was inclusion of the Java AccessBridge code
into all builds of the JRE for Windows--it can be toggled on or off, but
Oracle has not published the API for the Java Access Bridge and the source
code was removed from OpenJDK.

In other words, we are working blind against the java access bridge's
interface to Java Accessibility API, and still blindly continue to build
J2SE 5.0 target bytecode. And as a result Accessibility and AT tool
support on Windows OS builds are broken!

There is no Accessibily for Windows OS users when JRE 1.7 is in use and
workarounds are becoming increasingly hard to maintain. All the more
insidious because Oracle's automated Java update mechanism for Windows OS
replaces functional JREs with new non-functional JREs and more
dissatisfaction with LibreOffice quality results.

For a project that has moved Python3.3 integration to the forefront, it
seems a little misguided to allow the JRE framework to languish with code
features designed at the J2SE 1.4.2 branch.

If some minor refactoring to generate viable Java SE 7 bytecode results in
regained Accessibility and AT tools support with Java SE 7 that would be
wonderful. Might be that simple, or might not, but it still needs to be
fixed.

Stuart

--
View this message in context:
http://nabble.documentfoundation.org/Question-on-Java-JDK-build-environments-impacting-JRE-use-tp4062592p4062806.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: Question on Java JDK build environments impacting JRE use


Hi

I am quite happy for us for produce Java7 bytecode, if producing Java7 
bytecode will actually make something work better.

But so far I have seen no signs of that.

And I'm speaking here, not as some random hacker, but as a person with 
10+ years experience of writing 1Mloc+ Java applications, who has had 
the mispleasure of actually writing bytecode by hand.



For a project that has moved Python3.3  integration to the forefront, it
seems a little misguided to allow the JRE framework to languish with code
features designed at the J2SE 1.4.2 branch.

There is no languishing going on here, simply good software engineering.
Changing the constants in the bytecode header has no effect at runtime 
UNLESS YOU ARE ALSO USING THE NEW BYTECODE FEATURES.

Which we are not.

There is nothing in our current codebase which could make use of newer 
bytecode features.
As soon as such a thing appears, I will be very happy to lend my support 
to upgrading our bytecode version.



Regards, Noel Grandin

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


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

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

2013-06-24 Thread abdulmajeed ahmed

 i18npool/source/transliteration/ignoreDiacritics_CTL.cxx |   18 ---
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 64245c108aec557f62c254486aa354382bd445ce
Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa
Date:   Mon Jun 24 10:08:36 2013 +0200

fdo#52204 add more diacritics for Arabic

Change-Id: I916eb34b127699ea3251e92f4d7b705347ae5cba

diff --git a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx 
b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
index f4de2c5..4486d45 100644
--- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
+++ b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
@@ -17,14 +17,16 @@ ignoreDiacritics_CTL_translator (const sal_Unicode c)
 {
 switch (c) {
 //Arabic Diacritics
-case 0x064B:
-case 0x064C:
-case 0x064D:
-case 0x064E:
-case 0x064F:
-case 0x0650:
-case 0x0651:
-case 0x0652:
+case 0x064B: // Fathahtan
+case 0x064C: // Dammahtan
+case 0x064D: // Kasrahtan
+case 0x064E: // Fathah
+case 0x064F: // Dammah
+case 0x0650: // Kasrah
+case 0x0651: // Shaddah
+case 0x0652: // Sukun
+case 0x0653: // Maddah
+case 0x0670: // Dagger alif
 // no break;
 return 0x; // Skip this character
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-06-24 Thread bugzilla-daemon

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

Bug 60270 depends on bug 65501, which changed state.

Bug 65501 Summary: FILESAVE Can not save a modified document with backups 
enabled
https://bugs.freedesktop.org/show_bug.cgi?id=65501

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

gdb - setting breakpoint takes a really long time


Hi

In the vein of asking for GDB improvements, I'm chasing exceptions again:

I ran LO using:
   make debugrun
and then once LO is running, I stopped it using CTRL-C and did:
   br 
com::sun::star::lang::IllegalArgumentException::IllegalArgumentException

which ended up taking approx 10 mins to complete (on a pretty beefy machine)

Is this normal?

This is on a 64-bit fedora-18 box, gdb says:
   GNU gdb (GDB) Fedora (7.5.1-38.fc18)


Thanks, Noel Grandin

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


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

Gerrit downtime on Thursday

2013-06-24 Thread Florian Effenberger


Hello,

this is just a short reminder that the Thursday, June 27th, Robert, Alex 
and I will try to migrate Gerrit from the current LXC instance to a KVM 
host.


We expect to start at around 1600 UTC (1800 German time). While we try 
to keep the downtime as short as possible, we cannot estimate the 
efforts required yet, so it's hard to predict how long it will take.


If you have done modifications to the Gerrit machine, please ensure that 
it is in the documentation repository of TDF infra, as we have to 
rebuild the base system from scratch, and only can use what we have on file.


During the migration, admins are available via the hostmaster@ alias or 
on #tdf-infra at FreeNode.


Happy hacking,
Florian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/source

2013-06-24 Thread Cédric Bosdonnat

 oox/source/vml/vmlformatting.cxx |   20 ++--
 oox/source/vml/vmlshape.cxx  |2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 442ad6eef9d6e1588e4985e97ec3eafd6289f9ae
Author: CÃ©dric Bosdonnat cedric.bosdon...@free.fr
Date:   Mon Jun 24 10:37:05 2013 +0200

n#820504: VML path import fixes: get back missing points

nParamsCount was set to the double of the expected value, but the code
handling the command only took the first set of parameters. Removing
this 2* in nParamsCount.

Change-Id: I2a4bb07fc9167e056a52c7adfbee9e1ef8e2636c

diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 02559d4..d59ff6a 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -319,7 +319,7 @@ bool lclExtractDouble( double orfValue, sal_Int32 
ornEndPos, const OUString r
 rPointLists.back().push_back( Point( aCoordList[ 0 ], 
aCoordList[ 1 ] ) );
 rFlagLists.back().push_back( PolygonFlags_NORMAL );
 aCurrentPoint = rPointLists.back().back();
-nParamCount = 2 * 2;
+nParamCount = 2;
 break;
 
 case MOVE_ABS: // 2 params - no param count reset
@@ -350,7 +350,7 @@ bool lclExtractDouble( double orfValue, sal_Int32 
ornEndPos, const OUString r
 rFlagLists.back().push_back( PolygonFlags_CONTROL );
 rFlagLists.back().push_back( PolygonFlags_NORMAL );
 aCurrentPoint = rPointLists.back().back();
-nParamCount = 2 * 6;
+nParamCount = 6;
 break;
 
 case LINE_REL: // 2* params - param count reset
@@ -358,14 +358,14 @@ bool lclExtractDouble( double orfValue, sal_Int32 
ornEndPos, const OUString r
 aCurrentPoint.Y + aCoordList[ 1 ] 
) );
 rFlagLists.back().push_back( PolygonFlags_NORMAL );
 aCurrentPoint = rPointLists.back().back();
-nParamCount = 2 * 2;
+nParamCount = 2;
 break;
 
 case LINE_ABS: // 2* params - param count reset
 rPointLists.back().push_back( Point( aCoordList[ 0 ], 
aCoordList[ 1 ] ) );
 rFlagLists.back().push_back( PolygonFlags_NORMAL );
 aCurrentPoint = rPointLists.back().back();
-nParamCount = 2 * 2;
+nParamCount = 2;
 break;
 
 case CLOSE: // 0 param
@@ -389,12 +389,12 @@ bool lclExtractDouble( double orfValue, sal_Int32 
ornEndPos, const OUString r
 // Move on to current command state
 switch ( rPath[ i ] )
 {
-case 't': state = MOVE_REL; nTokenLen = 0; nParamCount = 2 * 2; 
break;
-case 'm': state = MOVE_ABS; nTokenLen = 0; nParamCount = 2 * 2; 
break;
-case 'v': state = BEZIER_REL; nTokenLen = 0; nParamCount = 2 * 6; 
break;
-case 'c': state = BEZIER_ABS; nTokenLen = 0; nParamCount = 2 * 6; 
break;
-case 'r': state = LINE_REL; nTokenLen = 0; nParamCount = 2 * 2; 
break;
-case 'l': state = LINE_ABS; nTokenLen = 0; nParamCount = 2 * 2; 
break;
+case 't': state = MOVE_REL; nTokenLen = 0; nParamCount = 2; break;
+case 'm': state = MOVE_ABS; nTokenLen = 0; nParamCount =  2; break;
+case 'v': state = BEZIER_REL; nTokenLen = 0; nParamCount = 6; 
break;
+case 'c': state = BEZIER_ABS; nTokenLen = 0; nParamCount = 6; 
break;
+case 'r': state = LINE_REL; nTokenLen = 0; nParamCount = 2; break;
+case 'l': state = LINE_ABS; nTokenLen = 0; nParamCount = 2; break;
 case 'x': state = CLOSE; nTokenLen = 0; break;
 case 'e': state = END; break;
 }
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index d34bf33..44910b5 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -683,7 +683,7 @@ awt::Rectangle LineShape::getRelRectangle() const
 // 
 
 BezierShape::BezierShape(Drawing rDrawing)
-: SimpleShape(rDrawing, com.sun.star.drawing.OpenBezierShape) // TODO 
Could we need both Open and Closed?
+: SimpleShape(rDrawing, com.sun.star.drawing.OpenBezierShape)
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LO 4.0.4 release for OSX not signed

2013-06-24 Thread Alexander Thurgood

Hi all,

Apparently, the LO 4.0.4 production release is not signed, is this an
oversight ? After LO 4.0.3, people on OSX 10.8 are having problems
installing again.


Alex

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

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

2013-06-24 Thread Tomaž Vajngerl

 starmath/source/ElementsDockingWindow.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 2a442f19faa52aef87e56d6bd3f8e38f7dec9572
Author: TomaÅ¾ Vajngerl qui...@gmail.com
Date:   Sat Jun 22 20:22:59 2013 +0200

fdo#65370 Dock ElementsDockingWindow to left at initial use and redraw

Change-Id: I0a7648569541667bba80cffde978558a9206c089
Reviewed-on: https://gerrit.libreoffice.org/4449
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 1ad05fc..34427ab 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -517,7 +517,11 @@ 
SmElementsDockingWindowWrapper::SmElementsDockingWindowWrapper(
 {
 pWindow = new SmElementsDockingWindow(pBindings, this, pParentWindow);
 SmElementsDockingWindow* pDialog = (SmElementsDockingWindow*) pWindow;
-eChildAlignment = SFX_ALIGN_NOALIGNMENT;
+pDialog-SetPosSizePixel(Point(0, 0), Size(300, 0));
+pDialog-Show();
+
+eChildAlignment = SFX_ALIGN_LEFT;
+
 pDialog-Initialize( pInfo );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-24 Thread Jelle van der Waa

 shell/source/unix/exec/shellexec.cxx |2 +-
 vcl/generic/fontmanager/helper.cxx   |4 ++--
 xmlreader/source/pad.cxx |4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 34f50399f1bc896849a0e3fc3598ab1225d760c5
Author: Jelle van der Waa je...@vdwaa.nl
Date:   Sat Jun 22 12:53:29 2013 +0200

fdo#43460 shell,vcl,xmlreader: use isEmpty()

Change-Id: Ie3d16da6c246b79c4c304b21476f84b2788f0d6e
Reviewed-on: https://gerrit.libreoffice.org/
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/shell/source/unix/exec/shellexec.cxx 
b/shell/source/unix/exec/shellexec.cxx
index 6fe1c1e..b962f8a 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -236,7 +236,7 @@ void SAL_CALL ShellExec::execute( const OUString aCommand, 
const OUString aPar
 }
 
 // Prefer DESKTOP_LAUNCH when available
-if ( aLaunchBuffer.getLength()  0 )
+if ( !aLaunchBuffer.isEmpty() )
 {
 FILE *pLaunch = popen( aLaunchBuffer.makeStringAndClear().getStr(), 
w );
 if ( pLaunch != NULL )
diff --git a/vcl/generic/fontmanager/helper.cxx 
b/vcl/generic/fontmanager/helper.cxx
index 33db298..fc582bd 100644
--- a/vcl/generic/fontmanager/helper.cxx
+++ b/vcl/generic/fontmanager/helper.cxx
@@ -115,7 +115,7 @@ void psp::getPrinterPathList( std::list OUString  
rPathList, const char* pSub
 
 // append net path
 aPathBuffer.append( getOfficePath( psp::InstallationRootPath ) );
-if( aPathBuffer.getLength() )
+if( !aPathBuffer.isEmpty() )
 {
 aPathBuffer.appendAscii( /share/psprint );
 if( pSubDir )
@@ -127,7 +127,7 @@ void psp::getPrinterPathList( std::list OUString  
rPathList, const char* pSub
 }
 // append user path
 aPathBuffer.append( getOfficePath( psp::UserPath ) );
-if( aPathBuffer.getLength() )
+if( !aPathBuffer.isEmpty() )
 {
 aPathBuffer.appendAscii( /user/psprint );
 if( pSubDir )
diff --git a/xmlreader/source/pad.cxx b/xmlreader/source/pad.cxx
index d489157..c7d9b4d 100644
--- a/xmlreader/source/pad.cxx
+++ b/xmlreader/source/pad.cxx
@@ -32,7 +32,7 @@ void Pad::add(char const * begin, sal_Int32 length) {
 begin != 0  length = 0  !(span_.is()  buffer_.getLength() != 
0));
 if (length != 0) {
 flushSpan();
-if (buffer_.getLength() == 0) {
+if (buffer_.isEmpty()) {
 span_ = Span(begin, length);
 } else {
 buffer_.append(begin, length);
@@ -59,7 +59,7 @@ Span Pad::get() const {
 assert(!(span_.is()  buffer_.getLength() != 0));
 if (span_.is()) {
 return span_;
-} else if (buffer_.getLength() == 0) {
+} else if (buffer_.isEmpty()) {
 return Span();
 } else {
 return Span(buffer_.getStr(), buffer_.getLength());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#43460 shell,vcl,xmlreader: use isEmpty()

2013-06-24 Thread Thomas Arnhold (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/

Approvals:
  LibreOffice gerrit bot: Verified
  Thomas Arnhold: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3d16da6c246b79c4c304b21476f84b2788f0d6e
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Jelle van der Waa je...@vdwaa.nl
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org

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

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

 svx/source/form/fmtools.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 44b2fb6164aeffcc0c5bfbf53dac12f7b53fb0d4
Author: Noel Grandin n...@peralex.com
Date:   Mon Jun 24 11:04:14 2013 +0200

fix exception in DbGridColumn::impl_toggleScriptManager_nothrow

The messages would look like this:
  warn:legacy.osl:28639:1:svx/source/fmcomp/gridcell.cxx:255: caught an 
exception!

I introduced this bug in commit 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37
Use the new type-checking Reference constructor to reduce code noise

Change-Id: I922d46f7c7eefbc12892a2525b30dcb798619a8b

diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index da7f05f..716d550 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -177,8 +177,9 @@ sal_Int32 getElementPos(const Reference 
::com::sun::star::container::XIndexAcce
 return nIndex;
 
 
+Reference XInterface  xNormalized( xElement, UNO_QUERY );
 DBG_ASSERT( xElement.is(), getElementPos: invalid element! );
-if ( xElement.is() )
+if ( xNormalized.is() )
 {
 // Feststellen an welcher Position sich das Kind befindet
 nIndex = xCont-getCount();
@@ -189,7 +190,7 @@ sal_Int32 getElementPos(const Reference 
::com::sun::star::container::XIndexAcce
 Reference XInterface  xCurrent(xCont-getByIndex( nIndex 
),UNO_QUERY);
 DBG_ASSERT( xCurrent.get() == Reference XInterface ( 
xCurrent, UNO_QUERY ).get(),
 getElementPos: container element not normalized! );
-if ( xElement.get() == xCurrent.get() )
+if ( xNormalized.get() == xCurrent.get() )
 break;
 }
 catch(Exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: framework/inc framework/Library_fwk.mk framework/Library_fwl.mk framework/source framework/util officecfg/registry

2013-06-24 Thread Ariel Constenla-Haile

 framework/Library_fwk.mk|5 
 framework/Library_fwl.mk|1 
 framework/inc/uielement/popupmenucontroller.hxx |   74 -
 framework/inc/uielement/popuptoolbarcontroller.hxx  |   96 ++
 framework/source/register/registerservices.cxx  |6 
 framework/source/register/registertemp.cxx  |4 
 framework/source/uielement/popupmenucontroller.cxx  |  235 -
 framework/source/uielement/popuptoolbarcontroller.cxx   |  406 
++
 framework/util/fwk.component|9 
 framework/util/fwl.component|3 
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |   33 
 11 files changed, 553 insertions(+), 319 deletions(-)

New commits:
commit a659ac906aa2d0dfd6d10e40d8a5a6d2d70cc8fc
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Sat May 25 22:11:08 2013 +

framework::PopupMenuController clean-up

Changed the name, it is not a PopupMenuController, but a ToolbarController 
that
shows a PopupMenu filled at runtime by a PopupMenuController

Make it a base class for other ToolbarController components, there is no 
sense
to make it a component by itself

Use this base class for three new pure UNO ToolbarController's

(cherry picked from commit 9d1015051c92900def3d465d2eb8bf179f19a398)

Conflicts:
framework/Library_fwk.mk
framework/inc/uielement/popupmenucontroller.hxx
framework/source/uielement/popupmenucontroller.cxx
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu

Change-Id: I2f5ec06df098d65ffaa17a8f7f6f3ea8774b43c3

diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index bc9b711..0e36505 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -104,11 +104,11 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/loadenv/loadenv \
 framework/source/loadenv/targethelper \
 framework/source/register/registerservices \
+framework/source/services/ContextChangeEventMultiplexer \
 framework/source/services/autorecovery \
 framework/source/services/backingcomp \
 framework/source/services/backingwindow \
 framework/source/services/desktop \
-framework/source/services/ContextChangeEventMultiplexer \
 framework/source/services/frame \
 framework/source/services/modulemanager \
 framework/source/services/pathsettings \
@@ -143,6 +143,7 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/uielement/menubarmerger \
 framework/source/uielement/menubarwrapper \
 framework/source/uielement/objectmenucontroller \
+framework/source/uielement/popuptoolbarcontroller \
 framework/source/uielement/progressbarwrapper \
 framework/source/uielement/recentfilesmenucontroller \
 framework/source/uielement/spinfieldtoolbarcontroller \
@@ -161,8 +162,8 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/uifactory/factoryconfiguration \
 framework/source/uifactory/menubarfactory \
 framework/source/uifactory/statusbarfactory \
-framework/source/uifactory/uicontrollerfactory \
 framework/source/uifactory/toolboxfactory \
+framework/source/uifactory/uicontrollerfactory \
 framework/source/uifactory/uielementfactorymanager \
 framework/source/uifactory/windowcontentfactorymanager \
 framework/source/xml/acceleratorconfigurationreader \
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index afcb77c..fe87449 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -68,7 +68,6 @@ $(eval $(call gb_Library_add_exception_objects,fwl,\
 framework/source/uielement/langselectionmenucontroller \
 framework/source/uielement/macrosmenucontroller \
 framework/source/uielement/newmenucontroller \
-framework/source/uielement/popupmenucontroller \
 framework/source/uielement/toolbarsmenucontroller \
 ))
 
diff --git a/framework/inc/uielement/popupmenucontroller.hxx 
b/framework/inc/uielement/popupmenucontroller.hxx
deleted file mode 100644
index 7511af00..000
--- a/framework/inc/uielement/popupmenucontroller.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9d/1015051c92900def3d465d2eb8bf179f19a398

 9d/1015051c92900def3d465d2eb8bf179f19a398 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d5c34f1b9a7388421aecc52b08f9e7f00cc37357
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 10:09:11 2013 +0100

Notes added by 'git notes add'

diff --git a/9d/1015051c92900def3d465d2eb8bf179f19a398 
b/9d/1015051c92900def3d465d2eb8bf179f19a398
new file mode 100644
index 000..2887acb
--- /dev/null
+++ b/9d/1015051c92900def3d465d2eb8bf179f19a398
@@ -0,0 +1 @@
+merged as: a659ac906aa2d0dfd6d10e40d8a5a6d2d70cc8fc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO / Firebird DB Integration

2013-06-24 Thread Andres Gomez

Hi,

On Thu, 2013-06-20 at 20:20 +0200, Michael Stahl wrote:
...
  The firebird specific libraries (fb builds its own versions
  libicuuc/libicudata/etc.) are currently in install/program/firebird/lib
 
 really?  it bundles its own ICU?  argh... can you teach it to use the
 LO's ICU instead?  no reason why we'd need to ship 2 sets of ICU libraries.
...

As I was writing in the wiki:
https://wiki.documentfoundation.org/index.php?title=Development/Base/FirebirdSQL#Compilation

We may hit some problems if we use LO's or systems ICU with the table
indexes.

I think the safest would actually be to use always FB's internal ICU
copy but other possible approaches are possible in order to face this
problem.

Br.
-- 
Andres Gomez
Computer Science Engineer
mailto:ago...@igalia.com
http://blogs.igalia.com/agomez/category/igaliacom/
IGALIA, S.L. http://www.igalia.com


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

Re: LO / Firebird DB Integration

2013-06-24 Thread Andres Gomez

Hi,

On Thu, 2013-06-20 at 21:10 +0200, Javier Fernandez wrote:
...
  I've finally managed to figure out how to get the install working -- the
  driver now loads fine. For the moment however the following is needed
  for things to work:
  
  FIREBIRD=./install/program/firebird
  LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):./install/program/firebird/lib
  ./install/program/soffice.bin --base
  
  I'm not entirely sure how to provide these paths within LO to avoid
  having to prepend them yet.
...

Is this one of the reasons why the firebird.conf file is needed? Not
sure though, we may need that env variables, but also the config file.

Please, check:
http://firebird.1100200.n4.nabble.com/Firebird-as-backend-in-LibreOffice-td460.html

...
  I'm also not entirely certain everything will work as expected yet
  either -- I haven't found a definitive list of files which Firebird 2.5
  requires in embedded mode -- if anything is missing it can be however
  easily be added to the bottom of firebird/ExternalPackage_firebird.mk.
 
 Firebird embedded only requires the libfbembed.so library, just that.
...

That's not correct. The driver may work just with that file but others
are needed in order to have, for example, support for international
charsets.

Please, check:
http://firebird.1100200.n4.nabble.com/Firebird-as-backend-in-LibreOffice-td460.html


Br.
-- 
Andres Gomez
Computer Science Engineer
mailto:ago...@igalia.com
http://blogs.igalia.com/agomez/category/igaliacom/
IGALIA, S.L. http://www.igalia.com


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

Re: LO / Firebird DB Integration

2013-06-24 Thread Rene Engelhard

Hi,

On Mon, Jun 24, 2013 at 12:18:06PM +0300, Andres Gomez wrote:
 On Thu, 2013-06-20 at 20:20 +0200, Michael Stahl wrote:
 ...
   The firebird specific libraries (fb builds its own versions
   libicuuc/libicudata/etc.) are currently in install/program/firebird/lib
  
  really?  it bundles its own ICU?  argh... can you teach it to use the
  LO's ICU instead?  no reason why we'd need to ship 2 sets of ICU libraries.
 ...
 
 As I was writing in the wiki:
 https://wiki.documentfoundation.org/index.php?title=Development/Base/FirebirdSQL#Compilation
 
 We may hit some problems if we use LO's or systems ICU with the table
 indexes.
 
 I think the safest would actually be to use always FB's internal ICU
 copy but other possible approaches are possible in order to face this
 problem.

I think you are thinking too short.

Nnote that most distros will simply build with
system-firebird. (and whatever THAT one is built against - looks
like that it's *external* ICU here:
http://packages.debian.org/sid/libfbembed2.5)

Regards,

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

Firebird ICU/binary compatibility

On Tue, May 28, 2013 at 07:48:36PM +0100, Andrzej J. R. Hunt wrote:

I've create a wiki page where I'm putting down some notes on whats
happening here (...):
https://wiki.documentfoundation.org/Development/Base/FirebirdSQL

Wrt to section 3.2 Compilation:

In indices on text-based columns (CHAR/VARCHAR), Firebird uses ICU to
get binary-comparable sequences (collations). These collations may be
different in different ICU versions.

(...) this may lead to incompatibilities in the binary index
representation (on disk) between databases created by Debian-packaged
Firebird, and upstream.

This can also lead to incompatibilities when the Firebird packages
are re-built using different version of (...) ICU or when (...) ICU
(...) is upgraded.

One way to fix this (...) Another is to re-generate all indices that
contain a text-based columns. (...) a script is provided (...) named
reindex-db (...)

(...) the best solution seems to not allow firebird as an external
dependency. This is, compile always internally and using the bundled
libicu provided by firebird. In any case, this problem may even
appear just with FB upgrades (...)

I disagree. This seems like a recipe for disaster to me. Our
downstream distributors *will*, it at all possible, force system
firebird and system ICU (e.g. Debian has a very strong policy on that
kind of things, embedded copies of libraries are actively chased down
and killed), and then we'll have the incompatibility problems anyway,
but in an uncontrolled way. I'd much rather we face the problem and
manage it. Especially since we will have the problem one day anyway,
for upgrades of firebird versions and what not.

How about this:

When opening an embedded-firebird .odb file, detect whether the
indices are built with an incompatible / other ICU version, and then
just automatically (silently?) rebuild them. I hope we can detect the
situation automatically.

In this way, we don't only get compatibility between e.g. a
Debian-built LibreOffice and a TDF-built LibreOffice, but *also*
seamless compatibility between putative TDF-built LibreOffice 5.3 with
FireBird 3.18 and ICU 4.12.3 and TDF-built LibreOffice 4.7 with
FireBird 3.12 and ICU 4.10.1.

Actually, this kind of automatic conversion could be upstreamed in
FireBird itself, in one of these ways:

- Do it automatically (in background?) / eagerly when opening a
database (on all tables).

- Do it automatically (in background?) / eagerly when opening a
table (on all indices of that table).

- Do it automatically / lazily when a query tries to use the index.
What happens while the index is being rebuilt?

* The query blocks?

* The query falls back to another index / full table scan?

For doing it in LibreOffice (as opposed to in FireBird): Debian's
reindex-db script basically runs
ALTER INDEX $i ACTIVE
up to twice on each possibly affected index.

1) Why twice? Why not once, or thrice?

2) Could we just blindly do that, even if the ICU version did not
change? The command looks like it would be a quick no-op if the
index is already OK (that is, not forcing a rebuild of the index).

3) I don't see that command documented at

http://www.firebirdsql.org/file/documentation/reference_manuals/reference_material/html/langrefupd25-ddl-index.html
Is it 3.0-only? So what should we do in 2.5? DROP INDEX and then
ADD INDEX? DROP INDEX is also not documented, but OTOH, DROP
TABLE seems to also not be documented as such (only mentioned in
passing), and I would find it hard to believe that DROP INDEX is
not supported :)

Ah no, this documents only what's new since InterBase 6, and
http://www.ibphoenix.com/files/60sqlref.html#RSf39848 documents
ALTER INDEX... So OK for FireBird 2.5.

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

Re: LO / Firebird DB Integration

2013-06-24 Thread Andres Gomez

On Mon, 2013-06-24 at 11:25 +0200, Rene Engelhard wrote:
Hi,

On Mon, Jun 24, 2013 at 12:18:06PM +0300, Andres Gomez wrote:
On Thu, 2013-06-20 at 20:20 +0200, Michael Stahl wrote:
...
The firebird specific libraries (fb builds its own versions
libicuuc/libicudata/etc.) are currently in install/program/firebird/lib

really? it bundles its own ICU? argh... can you teach it to use the
LO's ICU instead? no reason why we'd need to ship 2 sets of ICU
libraries.
...

As I was writing in the wiki:
https://wiki.documentfoundation.org/index.php?title=Development/Base/FirebirdSQL#Compilation

We may hit some problems if we use LO's or systems ICU with the table
indexes.

I think the safest would actually be to use always FB's internal ICU
copy but other possible approaches are possible in order to face this
problem.

I think you are thinking too short.

Nnote that most distros will simply build with
system-firebird. (and whatever THAT one is built against - looks
like that it's *external* ICU here:
http://packages.debian.org/sid/libfbembed2.5)
...

That's why in the initial discussions we were already talking about
removing the possibility of system-firebird and always using an
internal compilation:
https://wiki.documentfoundation.org/index.php?title=Development/Base/FirebirdSQL#Compilation
http://firebird.1100200.n4.nabble.com/Firebird-as-backend-in-LibreOffice-td460.html

Of course, maybe other options that I've not taken into account are
better.

Br.
--
Andres Gomez
Computer Science Engineer
mailto:ago...@igalia.com
http://blogs.igalia.com/agomez/category/igaliacom/
IGALIA, S.L. http://www.igalia.com

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

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

2013-06-24 Thread Adam Co

 sw/qa/extras/ooxmlexport/data/fdo56679.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   13 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |   52 +--
 writerfilter/source/ooxml/model.xml  |8 +++-
 4 files changed, 52 insertions(+), 21 deletions(-)

New commits:
commit 6edcfde748604863dba40e982effab38d0cb0589
Author: Adam Co rattles2...@gmail.com
Date:   Sun Jun 23 18:17:49 2013 +0300

fdo#56679, fdo#65710 : fix for import and export of underline color

Change-Id: Ifc45900d73802ef99c55d7af4ee04314dd04f1c5
Reviewed-on: https://gerrit.libreoffice.org/4459
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/sw/qa/extras/ooxmlexport/data/fdo56679.docx 
b/sw/qa/extras/ooxmlexport/data/fdo56679.docx
new file mode 100644
index 000..8ea689c
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo56679.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 133cf6e..b4d855a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -83,6 +83,7 @@ public:
 void testFdo43093();
 void testFdo64238_a();
 void testFdo64238_b();
+void testFdo56679();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -140,6 +141,7 @@ void Test::run()
 {fdo43093.docx, Test::testFdo43093},
 {fdo64238_a.docx, Test::testFdo64238_a},
 {fdo64238_b.docx, Test::testFdo64238_b},
+{fdo56679.docx, Test::testFdo56679},
 };
 // Don't test the first import of these, for some reason those tests fail
 const char* aBlacklist[] = {
@@ -852,6 +854,17 @@ void Test::testFdo64238_b()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(5), numOfRuns);
 }
 
+void Test::testFdo56679()
+{
+// The problem was that the DOCX importer and exporter did not handle the 
'color' of an underline
+// (not the color of the text, the color of the underline itself)
+uno::Reference text::XTextRange  xParagraph = getParagraph( 1 );
+uno::Reference text::XTextRange  xText = getRun( xParagraph, 2, This is 
a simple sentence.);
+
+CPPUNIT_ASSERT_EQUAL(true, bool(getPropertysal_Bool(xText, 
CharUnderlineHasColor)));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xFF), getPropertysal_Int32(xText, 
CharUnderlineColor));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 254b0bf..ddda9dd 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3651,31 +3651,45 @@ void DocxAttributeOutput::CharShadow( const 
SvxShadowedItem rShadow )
 
 void DocxAttributeOutput::CharUnderline( const SvxUnderlineItem rUnderline )
 {
-const char *pUnderline;
+const char *pUnderlineValue;
 
 switch ( rUnderline.GetLineStyle() )
 {
-case UNDERLINE_SINGLE: pUnderline = single;  break;
-case UNDERLINE_BOLD:   pUnderline = thick;   break;
-case UNDERLINE_DOUBLE: pUnderline = double;  break;
-case UNDERLINE_DOTTED: pUnderline = dotted;  break;
-case UNDERLINE_DASH:   pUnderline = dash;break;
-case UNDERLINE_DASHDOT:pUnderline = dotDash; break;
-case UNDERLINE_DASHDOTDOT: pUnderline = dotDotDash;  break;
-case UNDERLINE_WAVE:   pUnderline = wave;break;
-case UNDERLINE_BOLDDOTTED: pUnderline = dottedHeavy; break;
-case UNDERLINE_BOLDDASH:   pUnderline = dashedHeavy; break;
-case UNDERLINE_LONGDASH:   pUnderline = dashLongHeavy;   break;
-case UNDERLINE_BOLDLONGDASH:   pUnderline = dashLongHeavy;   break;
-case UNDERLINE_BOLDDASHDOT:pUnderline = dashDotHeavy;break;
-case UNDERLINE_BOLDDASHDOTDOT: pUnderline = dashDotDotHeavy; break;
-case UNDERLINE_BOLDWAVE:   pUnderline = wavyHeavy;   break;
-case UNDERLINE_DOUBLEWAVE: pUnderline = wavyDouble;  break;
+case UNDERLINE_SINGLE: pUnderlineValue = single;  
break;
+case UNDERLINE_BOLD:   pUnderlineValue = thick;   
break;
+case UNDERLINE_DOUBLE: pUnderlineValue = double;  
break;
+case UNDERLINE_DOTTED: pUnderlineValue = dotted;  
break;
+case UNDERLINE_DASH:   pUnderlineValue = dash;
break;
+case UNDERLINE_DASHDOT:pUnderlineValue = dotDash; 
break;
+case UNDERLINE_DASHDOTDOT: pUnderlineValue = dotDotDash;  
break;
+case UNDERLINE_WAVE:   pUnderlineValue = wave;
break;
+case UNDERLINE_BOLDDOTTED: pUnderlineValue = dottedHeavy; 
break;
+case

[PATCH] add french QA list to CC

2013-06-24 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4471

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/dev-tools refs/changes/71/4471/1

add french QA list to CC

Change-Id: I43e6e804024125f17822a993f587a8422b69c1e8
---
M gerritbot/send-daily-digest
1 file changed, 2 insertions(+), 0 deletions(-)



diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest
index 8d92c84..93652d4 100755
--- a/gerritbot/send-daily-digest
+++ b/gerritbot/send-daily-digest
@@ -54,6 +54,7 @@
 msg = email.mime.text.MIMEText(body, 'plain', 'UTF-8')
 msg['From'] = 'ger...@libreoffice.org'
 msg['To'] = 'libreoffice@lists.freedesktop.org'
+msg['Cc'] = 'q...@fr.libreoffice.org'
 msg['Date'] = email.utils.formatdate(time.mktime((now.timetuple(
 msg['Subject'] = 'LibreOffice Gerrit News %s' % now.date().isoformat()
 msg['Reply-To'] = 'ibreoff...@lists.freedesktop.org'
@@ -66,5 +67,6 @@
 args=vars(parser.parse_args())
 server = smtplib.SMTP('localhost')
 server.sendmail('ger...@libreoffice.org', 
'libreoffice@lists.freedesktop.org', str(create_message(args['gerrit'], 25)))
+server.sendmail('ger...@libreoffice.org', 'q...@fr.libreoffice.org', 
str(create_message(args['gerrit'], 25)))
 server.quit()
 # vim: set et sw=4 ts=4:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43e6e804024125f17822a993f587a8422b69c1e8
Gerrit-PatchSet: 1
Gerrit-Project: dev-tools
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com

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

Re: Gerrit news sent to fr-qa list

2013-06-24 Thread Bjoern Michaelsen

Hi Sophie,

On Sat, Jun 22, 2013 at 09:15:59AM +0200, Sophie Gautier wrote:
 Would it be possible to also send the daily gerrit news mail to the
 fr-qa list? 

Here is a trivial proposal for that:

 https://gerrit.libreoffice.org/#/c/4471/

It would be great for someone from the french community taking it on from there
(that is: reviewing and pushing it), so that there is no single point of
failure (me) and the local community can update and adjust to their needs.

If reviewed, Ill will deploy it (although I might do so after the gerrit
update/outtime on Thursday). Note also you might need to whitelist/unblock
ger...@libreoffice.org for the french QA list for the messages to come through
then.

Best,

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

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

2013-06-24 Thread abdulmajeed ahmed

 i18npool/source/transliteration/ignoreDiacritics_CTL.cxx |   17 ++-
 1 file changed, 3 insertions(+), 14 deletions(-)

New commits:
commit a089ed2bf90fdb293c8502e4ab47cbbe027234f8
Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa
Date:   Mon Jun 24 11:59:44 2013 +0200

Better approach for solving fdo#52204

Change-Id: Iada36661abaef0363688a186f0542f62dfb1455c

diff --git a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx 
b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
index 4486d45..7f0b0ce 100644
--- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
+++ b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
@@ -9,27 +9,16 @@
 
 #define TRANSLITERATION_Diacritics_CTL
 #include transliteration_Ignore.hxx
+#include unicode/uchar.h
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
 sal_Unicode
 ignoreDiacritics_CTL_translator (const sal_Unicode c)
 {
-switch (c) {
-//Arabic Diacritics
-case 0x064B: // Fathahtan
-case 0x064C: // Dammahtan
-case 0x064D: // Kasrahtan
-case 0x064E: // Fathah
-case 0x064F: // Dammah
-case 0x0650: // Kasrah
-case 0x0651: // Shaddah
-case 0x0652: // Sukun
-case 0x0653: // Maddah
-case 0x0670: // Dagger alif
-// no break;
+if(u_getIntPropertyValue(c, UCHAR_GENERAL_CATEGORY) == U_NON_SPACING_MARK)
 return 0x; // Skip this character
-}
+
 return c;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - dbaccess/Library_dbu.mk dbaccess/source dbaccess/util framework/inc framework/source include/sfx2 include/svtools officecfg/registry sfx2/source svtools/sou

2013-06-24 Thread Ariel Constenla-Haile

 dbaccess/Library_dbu.mk |1 
 dbaccess/source/ui/control/statusbarontroller.cxx   |   40 -
 dbaccess/source/ui/inc/statusbarontroller.hxx   |   45 -
 dbaccess/source/ui/misc/uiservices.cxx  |2 
 dbaccess/util/dbu.component |3 
 framework/inc/uielement/popuptoolbarcontroller.hxx  |4 
 framework/source/uielement/popuptoolbarcontroller.cxx   |   71 +
 include/sfx2/mnuitem.hxx|   28 
 include/sfx2/tbxctrl.hxx|   38 -
 include/svtools/toolboxcontroller.hxx   |   24 
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |   44 -
 sfx2/source/appl/appreg.cxx |2 
 sfx2/source/menu/mnuitem.cxx|  149 
 sfx2/source/toolbox/tbxitem.cxx |  357 
--
 svtools/source/uno/toolboxcontroller.cxx|   19 
 svx/source/tbxctrls/extrusioncontrols.cxx   |2 
 svx/util/svxcore.component  |2 
 17 files changed, 260 insertions(+), 571 deletions(-)

New commits:
commit 2f3e79ee907f6e483d8886984f262fd1763adccc
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Tue May 28 22:09:27 2013 +

Resolves: #i122401# framework::NewToolbarController needs...

early initialization of its PopupMenu

(cherry picked from commit 5149ad822bb66cca9561b7c181c6c2279affc29a)

Conflicts:
framework/inc/uielement/popuptoolbarcontroller.hxx
framework/source/uielement/popuptoolbarcontroller.cxx

Change-Id: I619fe7b86a19b146079792a73a50d23682d04a3c

diff --git a/framework/inc/uielement/popuptoolbarcontroller.hxx 
b/framework/inc/uielement/popuptoolbarcontroller.hxx
index f8e8bf9..56f3251 100644
--- a/framework/inc/uielement/popuptoolbarcontroller.hxx
+++ b/framework/inc/uielement/popuptoolbarcontroller.hxx
@@ -77,6 +77,7 @@ namespace framework
 DECLARE_XSERVICEINFO
 private:
 void functionExecuted( const OUString rCommand );
+void SAL_CALL initialize( const ::com::sun::star::uno::Sequence 
::com::sun::star::uno::Any  aArguments ) throw 
(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 void SAL_CALL statusChanged( const 
::com::sun::star::frame::FeatureStateEvent rEvent ) throw ( 
::com::sun::star::uno::RuntimeException );
 void SAL_CALL execute( sal_Int16 KeyModifier ) throw 
(::com::sun::star::uno::RuntimeException);
 void setItemImage( const OUString rCommand );
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx 
b/framework/source/uielement/popuptoolbarcontroller.cxx
index b38c617..26ac39c 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -257,6 +257,17 @@ NewToolbarController::NewToolbarController(
 }
 
 void SAL_CALL
+NewToolbarController::initialize(
+const css::uno::Sequence css::uno::Any  aArguments )
+throw ( css::uno::Exception, css::uno::RuntimeException )
+{
+PopupMenuToolbarController::initialize( aArguments );
+
+osl::MutexGuard aGuard( m_aMutex );
+createPopupMenuController();
+}
+
+void SAL_CALL
 NewToolbarController::statusChanged(
 const css::frame::FeatureStateEvent rEvent )
 throw ( css::uno::RuntimeException )
@@ -401,10 +412,7 @@ void NewToolbarController::setItemImage( const OUString 
rCommand )
 Image aMenuImage;
 
 sal_Bool bValid( Impl_ExistURLInMenu( m_xPopupMenu, aURL, sFallback, 
aMenuImage ) );
-// do not change aURL if Impl_ExistURLInMenu returned sal_False
-// this allows later initialization of the PopupMenuController on 
createPopupWindow()
-// and works even if SvFileInformationManager does not know the module
-if ( !aURL.getLength() )
+if ( !bValid )
 aURL = sFallback;
 
 sal_Bool bBig = SvtMiscOptions().AreCurrentSymbolsLarge();
@@ -412,16 +420,9 @@ void NewToolbarController::setItemImage( const OUString 
rCommand )
 INetURLObject aURLObj( aURL );
 Image aImage = SvFileInformationManager::GetImageNoDefault( aURLObj, bBig 
);
 if ( !aImage )
-{
-if ( !!aMenuImage )
-aImage =  aMenuImage;
-else if ( !bValid )
-// If SvFileInformationManager didn't know the module, try with 
the default
-aImage = SvFileInformationManager::GetImageNoDefault( 
INetURLObject( sFallback ), bBig );
-
-if ( !aImage )
-aImage = SvFileInformationManager::GetImage( aURLObj, bBig );
-}
+aImage = !!aMenuImage ?
+aMenuImage :
+SvFileInformationManager::GetImage( aURLObj, bBig );
 
 // if everything failed, just use the image associated with the toolbar 
item

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 51/49ad822bb66cca9561b7c181c6c2279affc29a

 51/49ad822bb66cca9561b7c181c6c2279affc29a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4c82fb186bdff93e8a54ce34a5c2a66f41d69a65
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 11:26:06 2013 +0100

Notes added by 'git notes add'

diff --git a/51/49ad822bb66cca9561b7c181c6c2279affc29a 
b/51/49ad822bb66cca9561b7c181c6c2279affc29a
new file mode 100644
index 000..8b05653
--- /dev/null
+++ b/51/49ad822bb66cca9561b7c181c6c2279affc29a
@@ -0,0 +1 @@
+merged as: 2f3e79ee907f6e483d8886984f262fd1763adccc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e0/f9eb4cc5d2ea676a899c4cbecb97264a31fef3

 e0/f9eb4cc5d2ea676a899c4cbecb97264a31fef3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 33583ba04101a5dcd2bd76090a5245ce2fa395d9
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 11:26:18 2013 +0100

Notes added by 'git notes add'

diff --git a/e0/f9eb4cc5d2ea676a899c4cbecb97264a31fef3 
b/e0/f9eb4cc5d2ea676a899c4cbecb97264a31fef3
new file mode 100644
index 000..5589af3
--- /dev/null
+++ b/e0/f9eb4cc5d2ea676a899c4cbecb97264a31fef3
@@ -0,0 +1 @@
+merged as: 6b6ebeeaf94e1db3c90cfe3921ea6c956570a0c5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 83/bf5a7b85a0e3430cc807415e081a10a1775f9f

 83/bf5a7b85a0e3430cc807415e081a10a1775f9f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6c2ea95e61fdc9f883a421873e18b51e61878a30
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 11:26:59 2013 +0100

Notes added by 'git notes add'

diff --git a/83/bf5a7b85a0e3430cc807415e081a10a1775f9f 
b/83/bf5a7b85a0e3430cc807415e081a10a1775f9f
new file mode 100644
index 000..3f47380
--- /dev/null
+++ b/83/bf5a7b85a0e3430cc807415e081a10a1775f9f
@@ -0,0 +1 @@
+merged as: 53ef9fa167cc68969cdc953b4c0b9ad339f2d27e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 47/204c74d9e52f54f6983af19b66af2a96b42e61

 47/204c74d9e52f54f6983af19b66af2a96b42e61 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c75870a0746c6f4150f81041dd95641a3574d4c4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 11:27:31 2013 +0100

Notes added by 'git notes add'

diff --git a/47/204c74d9e52f54f6983af19b66af2a96b42e61 
b/47/204c74d9e52f54f6983af19b66af2a96b42e61
new file mode 100644
index 000..14718e2
--- /dev/null
+++ b/47/204c74d9e52f54f6983af19b66af2a96b42e61
@@ -0,0 +1 @@
+merged as: 57207cab004cb78c3fa6d9ed43cc4bf81f4e6981
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 0b/373b3e4c45d09c40a8949e9366adb9b991de4b 27/3121f8d7e277e35c8e5a8aad46ef0c103ebc03

 0b/373b3e4c45d09c40a8949e9366adb9b991de4b |1 +
 27/3121f8d7e277e35c8e5a8aad46ef0c103ebc03 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit bac094506f2f55bbfb48062aeba17eaca2d0764a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 11:28:11 2013 +0100

Notes added by 'git notes add'

diff --git a/0b/373b3e4c45d09c40a8949e9366adb9b991de4b 
b/0b/373b3e4c45d09c40a8949e9366adb9b991de4b
new file mode 100644
index 000..5c76888
--- /dev/null
+++ b/0b/373b3e4c45d09c40a8949e9366adb9b991de4b
@@ -0,0 +1 @@
+merged as: a1748501d81425d26d09509eec2fd141f2f28f05
commit f3473957274f1033b48abd7e3d310f2ec0060bf7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 11:28:03 2013 +0100

Notes added by 'git notes add'

diff --git a/27/3121f8d7e277e35c8e5a8aad46ef0c103ebc03 
b/27/3121f8d7e277e35c8e5a8aad46ef0c103ebc03
new file mode 100644
index 000..5c76888
--- /dev/null
+++ b/27/3121f8d7e277e35c8e5a8aad46ef0c103ebc03
@@ -0,0 +1 @@
+merged as: a1748501d81425d26d09509eec2fd141f2f28f05
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Firebird ICU/binary compatibility

2013-06-24 Thread Michael Meeks


On Mon, 2013-06-24 at 11:30 +0200, Lionel Elie Mamane wrote:
 Wrt to section 3.2 Compilation:
 
  In indices on text-based columns (CHAR/VARCHAR), Firebird uses ICU to
  get binary-comparable sequences (collations). These collations may be
  different in different ICU versions.

Fun :-)

 This seems like a recipe for disaster to me. Our
 downstream distributors *will*, it at all possible, force system
 firebird and system ICU (e.g. Debian has a very strong policy on that

Sure sure - all sorts of distros will force that 'optimisation'
regardless of the consequences and without understanding the issue, and
we collectively will get to hold the can  field the horrible user
complaints :-)

 When opening an embedded-firebird .odb file, detect whether the
 indices are built with an incompatible / other ICU version, and then
 just automatically (silently?) rebuild them. I hope we can detect the
 situation automatically.

I love that solution. Sure we take a performance hit left  right 
center, but - we save hassle for everyone in the long run I think. I
guess it's a matter of using unicode/uversion.h's slightly odd binary
version foo.

I imagine we have a similar issue around the 2.5 - 3.0 version upgrade
where we will want to prompt the user (?) presumably not silently -
upgrade the database format, or mark it read-only. Of course, prompting
the user is some last-refuge of desperation, but - at least having some
strong versioning in the .odb from day one, such that we can at least
warn users with old software: this database is incompatible and was
written by a newer version, please upgrade or whatever would be rather
nice.

HTH,

Michael.

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

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

Re: Want to get started with libreoffice development

2013-06-24 Thread Simos Xenitellis

On Sat, Jun 22, 2013 at 10:11 AM, Sonakshi Nathani 
sonakshinath...@gmail.com wrote:

 I really want to contribute for libreoffice. For that I went through
 https://wiki.documentfoundation.org/Development/Easy_Hacks ,but i m
 really confused from where to begin and how to begin. If anyone can help ?


The page https://wiki.documentfoundation.org/Development has the building
(source code compilation) instructions for Linux, OS/X or Windows.
Your first step is to setup your computer in order to build LibreOffice
from source code. The first compilation may take a few hours, depending on
the computer. You must go through this, and verify that the
freshly-compiled LibreOffice works. When you then make small changes to the
source code, the new compilation will be much faster, such as a few minutes
or less.

Then, if you are not already familiar with the source code management tool
called 'git', try for example http://try.github.io/
'Git' is very important, because you can change a bit of code, compile
again, and if it does not work, you can easily go back to the working state
you had in the beginning. If the change works, 'Git' will help you to
generate the changes/patch to send here.

There are many bug reports that require just a few lines of code, but they
are still pending because it takes some effort to set up the build
environment and compile for each case. If you go through the general
Bugzilla list or the EasyHacks list, you can find several of them.

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 96/cd87ec89e5ebe9d174c90b0f2cab96b3772732

 96/cd87ec89e5ebe9d174c90b0f2cab96b3772732 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e74de5dfb32da981d6e0437a4c6cd2009361a54c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 11:58:32 2013 +0100

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 37/894067213a63c51c7a73083d7b0ace5f5c40da ff/f79c8807c5b174507888a8e393f2605b28ea29

 37/894067213a63c51c7a73083d7b0ace5f5c40da |1 +
 ff/f79c8807c5b174507888a8e393f2605b28ea29 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit f0f21eef93738f08b3b70cb7573592db0676cbab
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 11:58:59 2013 +0100

Notes added by 'git notes add'

diff --git a/ff/f79c8807c5b174507888a8e393f2605b28ea29 
b/ff/f79c8807c5b174507888a8e393f2605b28ea29
new file mode 100644
index 000..07af283
--- /dev/null
+++ b/ff/f79c8807c5b174507888a8e393f2605b28ea29
@@ -0,0 +1 @@
+merged as: f97ca6f65182efc6542c53ac5e973b3ff398a5d1
commit 5b1237630c08f66bc51d78a342ecad4d118a79fb
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 11:58:45 2013 +0100

Notes added by 'git notes add'

diff --git a/37/894067213a63c51c7a73083d7b0ace5f5c40da 
b/37/894067213a63c51c7a73083d7b0ace5f5c40da
new file mode 100644
index 000..5e3ade1
--- /dev/null
+++ b/37/894067213a63c51c7a73083d7b0ace5f5c40da
@@ -0,0 +1 @@
+merged as: 85f072ef33ef47b5e3e0bcd51acb5c4179cde2c2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/Package_examples.mk

 odk/Package_examples.mk |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit f13f9b5cc5267a7a5606b1a89db91b6d7aef5f9c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 12:00:49 2013 +0100

various .xcus are gone now

Change-Id: Ia9596b15b45ae16bab7f1904f6b1cb31ba3d87a8

diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk
index 0c8a705..eac7f2d 100644
--- a/odk/Package_examples.mk
+++ b/odk/Package_examples.mk
@@ -397,7 +397,6 @@ $(eval $(call 
gb_Package_add_files_with_dir,odk_examples,$(gb_Package_SDKDIRNAME
 cpp/DocumentLoader/test.odt \
 cpp/complextoolbarcontrols/Addons.xcu \
 cpp/complextoolbarcontrols/CalcListener.cxx \
-cpp/complextoolbarcontrols/CalcWindowState.xcu \
 cpp/complextoolbarcontrols/Jobs.xcu \
 cpp/complextoolbarcontrols/ListenerHelper.cxx \
 cpp/complextoolbarcontrols/ListenerHelper.h \
@@ -410,7 +409,6 @@ $(eval $(call 
gb_Package_add_files_with_dir,odk_examples,$(gb_Package_SDKDIRNAME
 cpp/complextoolbarcontrols/MyProtocolHandler.h \
 cpp/complextoolbarcontrols/ProtocolHandler.xcu \
 cpp/complextoolbarcontrols/WriterListener.cxx \
-cpp/complextoolbarcontrols/WriterWindowState.xcu \
 cpp/complextoolbarcontrols/exports.cxx \
 cpp/complextoolbarcontrols/logo_big.png \
 cpp/complextoolbarcontrols/logo_small.png \
@@ -516,7 +514,6 @@ $(eval $(call 
gb_Package_add_files_with_dir,odk_examples,$(gb_Package_SDKDIRNAME
 java/ToDo/ToDo.java \
 java/ToDo/ToDo.ods \
 java/ToDo/XToDo.idl \
-python/toolpanel/CalcWindowState.xcu \
 python/toolpanel/Factory.xcu \
 python/toolpanel/META-INF/manifest.xml \
 python/toolpanel/Makefile \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO / Firebird DB Integration

Hi,

On Mon, Jun 24, 2013 at 12:31:22PM +0300, Andres Gomez wrote:
On Mon, 2013-06-24 at 11:25 +0200, Rene Engelhard wrote:
Hi,

really? it bundles its own ICU? argh... can you teach it to use the
LO's ICU instead? no reason why we'd need to ship 2 sets of ICU
libraries.
...

As I was writing in the wiki:
https://wiki.documentfoundation.org/index.php?title=Development/Base/FirebirdSQL#Compilation

We may hit some problems if we use LO's or systems ICU with the table
indexes.

I think the safest would actually be to use always FB's internal ICU
copy but other possible approaches are possible in order to face this
problem.

I think you are thinking too short.

Nnote that most distros will simply build with
system-firebird. (and whatever THAT one is built against - looks
like that it's *external* ICU here:
http://packages.debian.org/sid/libfbembed2.5)
...

If this is the current option, could we please consider the possibility
to drop the whole idea and just stay with hsqldb? With my distro hat on,
I do not see any improvement with having to bundle hsqldb vs. having to
bundle firebird.

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

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

 include/oox/helper/binaryoutputstream.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e3a8e4f221fca5f67f4d6caf17f3bec39b13e3d5
Author: David Tardon dtar...@redhat.com
Date:   Mon Jun 24 13:31:27 2013 +0200

convert the right number of elements

Change-Id: I375d03ad880d348be64a04613e612e19bf2f4e1c

diff --git a/include/oox/helper/binaryoutputstream.hxx 
b/include/oox/helper/binaryoutputstream.hxx
index 0882821..56d8065 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -84,7 +84,7 @@ template typename Type 
 void BinaryOutputStream::writeArray( Type* opnArray, sal_Int32 nElemCount )
 {
 sal_Int32 nWriteSize = getLimitedValue sal_Int32, sal_Int32 ( 
nElemCount, 0, SAL_MAX_INT32 / sizeof( Type ) ) * sizeof( Type );
-ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast 
size_t ( nWriteSize ) );
+ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast 
size_t ( nElemCount ) );
 writeMemory( opnArray, nWriteSize, sizeof( Type ) );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - oox/inc

 oox/inc/oox/helper/binaryoutputstream.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ac4a743dd901aed6e83b00cd7f8a99eb6618bd3a
Author: David Tardon dtar...@redhat.com
Date:   Mon Jun 24 13:31:27 2013 +0200

convert the right number of elements

(cherry picked from commit e3a8e4f221fca5f67f4d6caf17f3bec39b13e3d5)

Signed-off-by: David Tardon dtar...@redhat.com

Conflicts:
include/oox/helper/binaryoutputstream.hxx

Change-Id: I375d03ad880d348be64a04613e612e19bf2f4e1c
Reviewed-on: https://gerrit.libreoffice.org/4478
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/oox/inc/oox/helper/binaryoutputstream.hxx 
b/oox/inc/oox/helper/binaryoutputstream.hxx
index 773f0d0..15d1de4 100644
--- a/oox/inc/oox/helper/binaryoutputstream.hxx
+++ b/oox/inc/oox/helper/binaryoutputstream.hxx
@@ -93,7 +93,7 @@ template typename Type 
 void BinaryOutputStream::writeArray( Type* opnArray, sal_Int32 nElemCount )
 {
 sal_Int32 nWriteSize = getLimitedValue sal_Int32, sal_Int32 ( 
nElemCount, 0, SAL_MAX_INT32 / sizeof( Type ) ) * sizeof( Type );
-ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast 
size_t ( nWriteSize ) );
+ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast 
size_t ( nElemCount ) );
 writeMemory( opnArray, nWriteSize, sizeof( Type ) );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/oox

 include/oox/helper/binaryoutputstream.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f4ba6e35085ced7fcf29276590ffd631280d112f
Author: David Tardon dtar...@redhat.com
Date:   Mon Jun 24 13:31:27 2013 +0200

convert the right number of elements

(cherry picked from commit e3a8e4f221fca5f67f4d6caf17f3bec39b13e3d5)

Change-Id: I375d03ad880d348be64a04613e612e19bf2f4e1c
Signed-off-by: David Tardon dtar...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/4476
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/include/oox/helper/binaryoutputstream.hxx 
b/include/oox/helper/binaryoutputstream.hxx
index 0882821..56d8065 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -84,7 +84,7 @@ template typename Type 
 void BinaryOutputStream::writeArray( Type* opnArray, sal_Int32 nElemCount )
 {
 sal_Int32 nWriteSize = getLimitedValue sal_Int32, sal_Int32 ( 
nElemCount, 0, SAL_MAX_INT32 / sizeof( Type ) ) * sizeof( Type );
-ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast 
size_t ( nWriteSize ) );
+ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast 
size_t ( nElemCount ) );
 writeMemory( opnArray, nWriteSize, sizeof( Type ) );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - oox/inc

 oox/inc/oox/helper/binaryoutputstream.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea7fa83f4cacec8d2306ebdd495b091a210c2b1e
Author: David Tardon dtar...@redhat.com
Date:   Mon Jun 24 13:31:27 2013 +0200

convert the right number of elements

(cherry picked from commit e3a8e4f221fca5f67f4d6caf17f3bec39b13e3d5)

Signed-off-by: David Tardon dtar...@redhat.com

Conflicts:
include/oox/helper/binaryoutputstream.hxx

Change-Id: I375d03ad880d348be64a04613e612e19bf2f4e1c
Reviewed-on: https://gerrit.libreoffice.org/4477
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/oox/inc/oox/helper/binaryoutputstream.hxx 
b/oox/inc/oox/helper/binaryoutputstream.hxx
index 687008a..82f0eb2 100644
--- a/oox/inc/oox/helper/binaryoutputstream.hxx
+++ b/oox/inc/oox/helper/binaryoutputstream.hxx
@@ -84,7 +84,7 @@ template typename Type 
 void BinaryOutputStream::writeArray( Type* opnArray, sal_Int32 nElemCount )
 {
 sal_Int32 nWriteSize = getLimitedValue sal_Int32, sal_Int32 ( 
nElemCount, 0, SAL_MAX_INT32 / sizeof( Type ) ) * sizeof( Type );
-ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast 
size_t ( nWriteSize ) );
+ByteOrderConverter::convertLittleEndianArray( opnArray, static_cast 
size_t ( nElemCount ) );
 writeMemory( opnArray, nWriteSize, sizeof( Type ) );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - sc/source

2013-06-24 Thread Noel Power

 sc/source/filter/excel/xecontent.cxx |   14 --
 sc/source/filter/inc/xecontent.hxx   |3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 8e33e95500c2f5edc91e853024a5c0fff285fcce
Author: Noel Power noel.po...@suse.com
Date:   Mon Jun 24 11:47:55 2013 +0100

fix for bnc#823935

Change-Id: Id62e1f4845bfbc610f73499881dc33d3d955923b

diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index 36cd383..ce22d55 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -395,6 +395,12 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot rRoot, 
const SvxURLField rU
 mxRepr.reset( new String( aFileName ) );
 
 msTarget = XclXmlUtils::ToOUString( aLink );
+if( eProtocol == INET_PROT_SMB )
+{
+// ooxml expects the file:/// part appended ( or at least
+// ms2007 does, ms2010 is more tolerant )
+msTarget = file:/// + msTarget;
+}
 }
 else if( eProtocol != INET_PROT_NOT_VALID )
 {
commit b8b4f455ef20929a0c5838772d120ed86f10e259
Author: Noel Power noel.po...@suse.com
Date:   Fri Jun 21 15:46:08 2013 +0100

write display attr of hyperlink only if value is different from stringtable

Change-Id: Iff6f16d6cdb539ad80ef01e91db51613e95053d1

diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index 5a46ad5..36cd383 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -335,7 +335,8 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot rRoot, 
const SvxURLField rU
 XclExpRecord( EXC_ID_HLINK ),
 maScPos( rScPos ),
 mxVarData( new SvMemoryStream ),
-mnFlags( 0 )
+mnFlags( 0 ),
+mbSetDisplay( true )
 {
 const String rUrl = rUrlField.GetURL();
 const String rRepr = rUrlField.GetRepresentation();
@@ -498,6 +499,7 @@ void XclExpHyperlink::WriteEmbeddedData( XclExpStream 
rStrm )
 
 void XclExpHyperlink::SaveXml( XclExpXmlStream rStrm )
 {
+OString sTmp = XclXmlUtils::ToOString( maScPos );
 OUString sId = !msTarget.isEmpty() ? rStrm.addRelation( 
rStrm.GetCurrentStream()-getOutputStream(),
 XclXmlUtils::ToOUString( 
http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink; 
),
 msTarget, true ) : OUString();
@@ -510,7 +512,9 @@ void XclExpHyperlink::SaveXml( XclExpXmlStream rStrm )
 ? XclXmlUtils::ToOString( *mxTextMark 
).getStr()
 : NULL,
 // OOXTODO: XML_tooltip,from record HLinkTooltip 800h wzTooltip
-XML_display,XclXmlUtils::ToOString( *mxRepr ).getStr(),
+XML_display,mbSetDisplay
+   ? XclXmlUtils::ToOString( *mxRepr 
).getStr()
+   : NULL,
 FSEND );
 }
 
diff --git a/sc/source/filter/inc/xecontent.hxx 
b/sc/source/filter/inc/xecontent.hxx
index 1328a40..cf746de 100644
--- a/sc/source/filter/inc/xecontent.hxx
+++ b/sc/source/filter/inc/xecontent.hxx
@@ -109,6 +109,7 @@ public:
 virtual voidSaveXml( XclExpXmlStream rStrm );
 
 virtual voidWriteEmbeddedData( XclExpStream rStrm );
+voidSetDisplay( bool bDisplay ) { mbSetDisplay = bDisplay; 
}
 private:
 /** Builds file name from the passed file URL. Tries to convert to 
relative file name.
 @param rnLevel  (out-param) The parent directory level.
@@ -119,7 +120,6 @@ private:
 
 /** Writes the body of the HLINK record. */
 virtual voidWriteBody( XclExpStream rStrm );
-
 private:
 typedef boost::scoped_ptr StringStringPtr;
 typedef boost::scoped_ptr SvStream  SvStreamPtr;
@@ -130,6 +130,7 @@ private:
 sal_uInt32  mnFlags;/// Option flags.
 XclExpStringRef mxTextMark; /// Location within mxRepr
 ::rtl::OUString msTarget;   /// Target URL
+boolmbSetDisplay;   /// True if display attribute it 
written
 };
 
 typedef XclExpRecordList XclExpHyperlink  XclExpHyperlinkList;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-24 Thread Mark Wielaard

 sw/source/core/doc/doctxm.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e4e9768e43b9c435036a0f0f3446688c9a5b8375
Author: Mark Wielaard m...@klomp.org
Date:   Sun Jun 23 22:48:39 2013 +0200

Fix memory leak in SwTOXBaseSection::GenerateText.

Delete LinkStruct created in TOKEN_LINK_END case after copying contents.

Change-Id: I294009ad62756996cf840ebf56b28d79dfd6e2f3
Reviewed-on: https://gerrit.libreoffice.org/4470
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 02bc7de..e0157ff 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1837,6 +1837,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
 {
 pTOXNd-InsertItem((*i)-aINetFmt, (*i)-nStartTextPos,
(*i)-nEndTextPos);
+delete (*i);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - configmgr/source officecfg/registry

2013-06-24 Thread Oliver-Rainer Wittmann

 configmgr/source/partial.cxx |   10 -
 officecfg/registry/data/org/openoffice/Setup.xcu |  151 ---
 2 files changed, 63 insertions(+), 98 deletions(-)

New commits:
commit af7166782e8c7ecd0b44aa184d7228a405c1ff46
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Mon Jun 24 11:08:34 2013 +

122397: - XCU file parsing: correct node containment check in case the node 
is not contained in root

- simplify AOO 3.4.x/OOo 3.x migration configuration

diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx
index c436902..722603f 100644
--- a/configmgr/source/partial.cxx
+++ b/configmgr/source/partial.cxx
@@ -119,15 +119,17 @@ Partial::Containment Partial::contains(Path const  path) 
const {
 bool includes = false;
 for (Path::const_iterator i(path.begin()); i != path.end(); ++i) {
 Node::Children::const_iterator j(p-children.find(*i));
-if (j == p-children.end()) {
+if ( j == p-children.end() )
+{
 break;
 }
 p = j-second;
 includes |= p-startInclude;
 }
-return p-children.empty()  !p-startInclude
-? CONTAINS_NOT
-: includes ? CONTAINS_NODE : CONTAINS_SUBNODES;
+return ( ( p-children.empty() || p == root_ )
+  !p-startInclude )
+   ? CONTAINS_NOT
+   : ( includes ? CONTAINS_NODE : CONTAINS_SUBNODES );
 }
 
 }
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu 
b/officecfg/registry/data/org/openoffice/Setup.xcu
index a3ba344..0bdf600 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -952,55 +952,12 @@
 value oor:separator=,OpenOffice.org 
3=openoffice.org/3/value
 /prop
 node oor:name=MigrationSteps
-node oor:name=Datasources oor:op=replace
-prop oor:name=IncludedFiles
-value.*/database/biblio/biblio\.dbf/value
-/prop
-prop oor:name=ExcludedFiles
-/prop
-prop oor:name=IncludedNodes
-value/org.openoffice.Office.DataAccess/value
-/prop
-prop oor:name=ExcludedNodes
-value
-
it/org.openoffice.Office.DataAccess/Bibliography/it
-
it/org.openoffice.Office.DataAccess/ConnectionPool/it
-
it/org.openoffice.Office.DataAccess/DataSources/it
-
it/org.openoffice.Office.DataAccess/DriverManager/it
-/value
-/prop
-/node
-node oor:name=Deployment oor:op=replace
-prop oor:name=MigrationService
-valuecom.sun.star.migration.Extensions/value
-/prop
-prop oor:name=ExcludedExtensions
-value
-!-- presentation minimizer is integrated since 
AOO 4.0 --
-itcom.sun.star.PresentationMinimizer-*/it
-!-- presentation screen is integrated since AOO 
4.0 --
-itcom.sun.PresenterScreen-*/it
-/value
-/prop
-/node
-node oor:name=Inet oor:op=replace
-prop oor:name=IncludedNodes
-value/org.openoffice.Inet/value
-/prop
-/node
-node oor:name=Basic oor:op=replace
-prop oor:name=MigrationService
-valuecom.sun.star.migration.Basic/value
-/prop
-/node
-node oor:name=UserProfile oor:op=replace
-prop oor:name=IncludedNodes
-value/org.openoffice.UserProfile/value
-/prop
-/node
-node oor:name=Common oor:op=replace
+node oor:name=Files oor:op=replace
 prop oor:name=IncludedFiles
 value
+!--Datasources--
+it.*/database/biblio/biblio\.dbf/it
+!--Common--
 it.*/autotext/.*/it
 it.*/autocorr/.*/it
 it.*/config/.*\.so[bcdegh]/it
@@ -1010,8 +967,19 @@
 it.*/template/.*/it
 /value
 /prop
+prop oor:name=ExcludedFiles
+/prop
+/node
+node oor:name=Configuration oor:op=replace
 prop oor:name=IncludedNodes
 value
+!--Datasources--
+

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

2013-06-24 Thread Noel Power

 sc/source/filter/excel/xecontent.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 732640c353b39cff7a9d5b5906f8975102cbed11
Author: Noel Power noel.po...@suse.com
Date:   Mon Jun 24 11:47:55 2013 +0100

fix for bnc#823935

window network drive urls on import get internall converted to SMB
(so it appears anyway) when exported the file:/// that was on
the target ( in the relId ) for the hyperlink is dropped. Apparently
the scheme isn't necessary for the binary import. If one of these
strange 'detected as smb' window shares are exported make sure we
add the file:///
(cherry picked from commit 8e33e95500c2f5edc91e853024a5c0fff285fcce)

Change-Id: Id62e1f4845bfbc610f73499881dc33d3d955923b

diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index aa007b8..8fdb35b 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -391,6 +391,12 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot rRoot, 
const SvxURLField rU
 mxRepr.reset( new String( aFileName ) );
 
 msTarget = XclXmlUtils::ToOUString( aLink );
+if( eProtocol == INET_PROT_SMB )
+{
+// ooxml expects the file:/// part appended ( or at least
+// ms2007 does, ms2010 is more tolerant )
+msTarget = file:/// + msTarget;
+}
 }
 else if( eProtocol != INET_PROT_NOT_VALID )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: SVX ID collision

On Sun, 2013-06-23 at 14:21 +0200, Tomaž Vajngerl wrote:
 Hi,
 
 I noticed we renumbered the ID's in include/svx/svxids.hrc but this
 is causing problems for the toolbar/popup menu icon (it is not drawn)
 and functionality for left graphic rotation (SID_ROTATE_GRAPHIC_LEFT
 which is defined as [1]). I noticed that the same ID (SID_SVX_START
 +1121) is added to [2] which is in include/editeng/editids.hrc. I
 think that this two IDs are colliding in some way because if I change
 the number to something else, rotate left icon is drawn again
 correctly. Now the question is what to do about this.. I could just
 relocate the ID for SID_ROTATE_GRAPHIC_LEFT and be done, but we might
 have more problems because of this. Can someone take a look at this? 
 
 I also noticed that SID_SVX_START offset is also used by
 include/sfx2/sfxsids.hrc and some more files, which could also cause
 collisions and problems. 

Yeah, its an awesome mess, the SID_SVX_START block got split up over
three hrc files and it's now super easy to collide ids. I'll add some
comments to the three to suggest only adding new SID_SVX_START entries
to the svx one and when adding a new one to svx check that it's not
already taken by the other two. And then move the three post-svx-split
new editeng entries out of the SID_SVX_START block to the new
post-svx-split SID_EDIT_START block instead. That should presumably fix
the problem.

C.

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

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

2013-06-24 Thread Mark Wielaard

 vcl/source/filter/graphicfilter2.cxx |  182 ++-
 1 file changed, 98 insertions(+), 84 deletions(-)

New commits:
commit cf003b228efc9d95d85fafceb7095e85c882277c
Author: Mark Wielaard m...@klomp.org
Date:   Sun Jun 23 23:07:51 2013 +0200

Robustify GraphicDescriptor::ImpDetect* reading SvStream.

The operator of SvStream doesn't initialize a variable if the stream
is faulty. So initialize the variables before usage to prevent accidental
matches. Also explicitly check stream status in while loop to prevent
looping on eof or error.

Change-Id: I21c0acc1c9217b4523c593cbcef5718f4cdc7597
Reviewed-on: https://gerrit.libreoffice.org/4469
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/vcl/source/filter/graphicfilter2.cxx 
b/vcl/source/filter/graphicfilter2.cxx
index a9a4813..4f8e8fc 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -105,7 +105,7 @@ void GraphicDescriptor::ImpConstruct()
 
 sal_Bool GraphicDescriptor::ImpDetectBMP( SvStream rStm, sal_Bool 
bExtendedInfo )
 {
-sal_uInt16  nTemp16;
+sal_uInt16  nTemp16 = 0;
 sal_BoolbRet = sal_False;
 sal_Int32 nStmPos = rStm.Tell();
 
@@ -178,10 +178,10 @@ sal_Bool GraphicDescriptor::ImpDetectBMP( SvStream rStm, 
sal_Bool bExtendedInfo
 
 sal_Bool GraphicDescriptor::ImpDetectGIF( SvStream rStm, sal_Bool 
bExtendedInfo )
 {
-sal_uInt32  n32;
-sal_uInt16  n16;
+sal_uInt32  n32 = 0;
+sal_uInt16  n16 = 0;
 sal_BoolbRet = sal_False;
-sal_uInt8   cByte;
+sal_uInt8   cByte = 0;
 
 sal_Int32 nStmPos = rStm.Tell();
 rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
@@ -197,7 +197,7 @@ sal_Bool GraphicDescriptor::ImpDetectGIF( SvStream rStm, 
sal_Bool bExtendedInfo
 
 if ( bExtendedInfo )
 {
-sal_uInt16 nTemp16;
+sal_uInt16 nTemp16 = 0;
 
 // Pixel width
 rStm  nTemp16;
@@ -245,7 +245,7 @@ sal_uInt8 ImpDetectJPG_GetNextMarker( SvStream rStm )
 
 sal_Bool GraphicDescriptor::ImpDetectJPG( SvStream rStm,  sal_Bool 
bExtendedInfo )
 {
-sal_uInt32  nTemp32;
+sal_uInt32  nTemp32 = 0;
 sal_BoolbRet = sal_False;
 
 sal_Int32 nStmPos = rStm.Tell();
@@ -297,7 +297,7 @@ sal_Bool GraphicDescriptor::ImpDetectJPG( SvStream rStm,  
sal_Bool bExtendedInf
 // per default we assume marker segments conaining a 
length parameter
 default :
 {
-sal_uInt16 nLength;
+sal_uInt16 nLength = 0;
 rStm  nLength;
 
 if ( nLength  2 )
@@ -311,18 +311,18 @@ sal_Bool GraphicDescriptor::ImpDetectJPG( SvStream rStm, 
 sal_Bool bExtendedInf
 {
 if ( nLength == 16 )
 {
-sal_Int32 nIdentifier;
+sal_Int32 nIdentifier = 0;
 rStm  nIdentifier;
 if ( nIdentifier == 0x4a464946 )// 
JFIF Identifier
 {
-sal_uInt8   nStringTerminator;
-sal_uInt8   nMajorRevision;
-sal_uInt8   nMinorRevision;
-sal_uInt8   nUnits;
-sal_uInt16  nHorizontalResolution;
-sal_uInt16  nVerticalResolution;
-sal_uInt8   
nHorzThumbnailPixelCount;
-sal_uInt8   
nVertThumbnailPixelCount;
+sal_uInt8   nStringTerminator = 0;
+sal_uInt8   nMajorRevision = 0;
+sal_uInt8   nMinorRevision = 0;
+sal_uInt8   nUnits = 0;
+sal_uInt16  nHorizontalResolution 
= 0;
+sal_uInt16  nVerticalResolution = 
0;
+sal_uInt8   
nHorzThumbnailPixelCount = 0;
+sal_uInt8   
nVertThumbnailPixelCount = 0;
 
 rStm  nStringTerminator
   nMajorRevision
@@ -362,13 +362,13 @@ sal_Bool GraphicDescriptor::ImpDetectJPG( SvStream rStm, 
 sal_Bool bExtendedInf
 case 0xce : // SOF14
 case 0xcf : // SOF15
 {
-

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

2013-06-24 Thread Norbert Thiebaud

 sw/source/ui/shells/textsh.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 37e1d7a0df85530f6a67adfda76d2c06e05b569e
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Thu Jun 20 13:55:33 2013 -0500

coverity#705765: Resource leak

Change-Id: Ibf9d4716e5c5929fe47c836812879f815aa78d6c
Reviewed-on: https://gerrit.libreoffice.org/4408
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index 62907a4..2b5c607 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -221,10 +221,10 @@ void SwTextShell::ExecInsert(SfxRequest rReq)
 aStrURL = URIHelper::SmartRel2Abs(
 INetURLObject(), aStrURL, URIHelper::GetMaybeFileHdl() );
 
-INetURLObject* pURL = new INetURLObject();
-pURL-SetSmartProtocol( INET_PROT_FILE );
+INetURLObject url;
+url.SetSmartProtocol( INET_PROT_FILE );
 
-if ( pURL-SetURL( aStrURL, INetURLObject::WAS_ENCODED ) )
+if ( url.SetURL( aStrURL, INetURLObject::WAS_ENCODED ) )
 {
 OUString aName;
 comphelper::EmbeddedObjectContainer aCnt;
@@ -238,7 +238,7 @@ void SwTextShell::ExecInsert(SfxRequest rReq)
 if ( xSet.is() )
 {
 xSet-setPropertyValue( OUString(PluginURL),
-uno::makeAny( OUString( pURL-GetMainURL( 
INetURLObject::NO_DECODE ) ) ) );
+uno::makeAny( OUString( url.GetMainURL( 
INetURLObject::NO_DECODE ) ) ) );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Thoughts on LibreOffice Math

2013-06-24 Thread Regina Henschel


Hi Frédéric,

find comments inside.

Frédéric WANG schrieb:

Hi all,

My name is Frédéric Wang and as some you may have noticed, I've recently
contributed some patches for the LibreOffice Formula Editor. For those
who don't know me: I work for the MathJax project, I've been
contributing to the Mozilla MathML project for several years and I
recently started to do some developments on MathML in WebKit too.

Some people on the MathJax user list reported issues with the
mathematical formulas generated with LibreOffice and it turned out that
the exported MathML code is currently quite bad.


Can you please describe in more details what is wrong with the exported 
MathML? LibreOffice uses Presentation Markup and not Content Markup. 
But besides that, what is bad?


 Hence I looked into the

LibreOffice Math a few days ago, reported bugs and submitted a few
patches. I'd like to share my thoughts on the situation and future of
LibreOffice Math. Thomas Lange a message a long time ago about how Math
could evolved:
http://www.mail-archive.com/dev@sw.openoffice.org/msg00200.html. First,
I note the following requirements:

1) Some people like the current Math semi-WYSIWYG interface and are
familiar with the StarMath syntax. So this interface should be preserved
anyway.
2) Some people would like a complete WYSIWYG editor.
3) Some people would like a LaTeX input mode to enter mathematical
formulas (like in Abiword)
4) Some people (at least the MathML  MathJax communities) would like
MathML import/export


MathML import and export is already available. What is needed in addition?

 and copy and paste, like in Microsoft Word. It is

also a requirement of the ODT format.
5) Some people would like a high quality rendering (e.g. for printing,
to export to SVG etc). This is subjective but that would mean at least
the quality level of documents generated by Microsoft Word or LaTeX.

Currently, LibreOffice Math is centered around its StarMath syntax and
internal tree structure, which make 1) possible and there is already an
experimental visual editor to do 2). As I read the code, the MathML
export is not very good but that can be improved. However, importing
from more expressive language like LaTeX or MathML seems very hard and
makes 3) and 4) unlikely. I didn't look at the rendering code, but
Khaled Hosny mentioned on bug 32362 that it would have to be rewritten
from scratch and I suspect one issue is the StarMath internal tree.

I'd like to propose to center LibreOffice Math around the MathML syntax
(and corresponding DOM structure) instead:

* I hope I can improve the code to get a decent MathML export and thus
1) and 2) could be preserved.


Do you want an export to Content Markup?

 It would still be possible to keep the UI

to work directly on the MathML DOM.
* For 3), there are many LaTeX to MathML converters like itex2MML (used
in Abiword), BlahTeX, MathJax etc that could be integrated in LibreOffice.
* This would obviously make 4) easy. MathML has a semantics element
which is currently used to store the StarMath syntax


The StarMath code is stored in the annotation element.

 and could be used

to store LaTeX too. Davide Carlisle also has an XSLT stylesheet to
convert MathML code to LaTeX.
* Microsoft Word uses an XML language for mathematics similar to MathML
so it should be possible to get 5). Khaled Hosny mentioned a fork of
GtkMathView that has support for Open Type MATH and can produce a good
rendering. It takes MathML as input and can export PNG or SVG images.



Export to PNG already exists but needs improvement.

There are not only the large goals you have outlined, but a lot of 
enhancement request, which are open for many years, like arbitrary 
colors, storing in Gallery, better integral sign.


The Math module has got very small enhancements in the last years. It 
would be really good, if you can help in that area.


Kind regards
Regina


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

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

2013-06-24 Thread Norbert Thiebaud

 sw/source/ui/uiview/view0.cxx |  260 +-
 1 file changed, 132 insertions(+), 128 deletions(-)

New commits:
commit 5ac84ff884b491df4631d78b3c4ba74eddb0b1a5
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Thu Jun 20 14:03:38 2013 -0500

coverity#705766 Resource leak

Change-Id: I14ca19f33dd57ed1a4a52a8a02f213bada79c20c
Reviewed-on: https://gerrit.libreoffice.org/4409
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 891680d..bcb06f6 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -360,177 +360,181 @@ void SwView::ExecViewOptions(SfxRequest rReq)
 
 switch ( nSlot )
 {
-case FN_VIEW_GRAPHIC:
-
-if( STATE_TOGGLE == eState )
-bFlag = !pOpt-IsGraphic();
-pOpt-SetGraphic( bFlag );
-break;
+case FN_VIEW_GRAPHIC:
+if( STATE_TOGGLE == eState )
+bFlag = !pOpt-IsGraphic();
+pOpt-SetGraphic( bFlag );
+break;
 
-case FN_VIEW_FIELDS:
-if( STATE_TOGGLE == eState )
-bFlag = !SwViewOption::IsFieldShadings() ;
-SwViewOption::SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bFlag, 
sal_True );
-break;
+case FN_VIEW_FIELDS:
+if( STATE_TOGGLE == eState )
+bFlag = !SwViewOption::IsFieldShadings() ;
+SwViewOption::SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bFlag, 
sal_True );
+break;
 
-case FN_VIEW_BOUNDS:
-if( STATE_TOGGLE == eState )
-bFlag = !SwViewOption::IsDocBoundaries();
-SwViewOption::SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bFlag, 
sal_True );
-break;
+case FN_VIEW_BOUNDS:
+if( STATE_TOGGLE == eState )
+bFlag = !SwViewOption::IsDocBoundaries();
+SwViewOption::SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bFlag, 
sal_True );
+break;
 
-case SID_GRID_VISIBLE:
-if( STATE_TOGGLE == eState )
-bFlag = !pOpt-IsGridVisible();
+case SID_GRID_VISIBLE:
+if( STATE_TOGGLE == eState )
+bFlag = !pOpt-IsGridVisible();
 
-pOpt-SetGridVisible( bFlag );
-break;
+pOpt-SetGridVisible( bFlag );
+break;
 
-case SID_GRID_USE:
-if( STATE_TOGGLE == eState )
-bFlag = !pOpt-IsSnap();
+case SID_GRID_USE:
+if( STATE_TOGGLE == eState )
+bFlag = !pOpt-IsSnap();
 
-pOpt-SetSnap( bFlag );
-break;
+pOpt-SetSnap( bFlag );
+break;
 
-case SID_HELPLINES_MOVE:
-if( STATE_TOGGLE == eState )
-bFlag = !pOpt-IsCrossHair();
+case SID_HELPLINES_MOVE:
+if( STATE_TOGGLE == eState )
+bFlag = !pOpt-IsCrossHair();
 
-pOpt-SetCrossHair( bFlag );
-break;
+pOpt-SetCrossHair( bFlag );
+break;
 
-case SID_BROWSER_MODE:
-case FN_PRINT_LAYOUT:
-if( STATE_TOGGLE == eState )
-bFlag = !pOpt-getBrowseMode();
-else if( nSlot == FN_PRINT_LAYOUT )
-bFlag = !bFlag;
-bBrowseModeChanged = bFlag != pOpt-getBrowseMode();
-// Disable multiple layout
-GetDocShell()-ToggleBrowserMode( bFlag, this );
-
-pOpt-setBrowseMode( bFlag );
-break;
+case SID_BROWSER_MODE:
+case FN_PRINT_LAYOUT:
+if( STATE_TOGGLE == eState )
+bFlag = !pOpt-getBrowseMode();
+else if( nSlot == FN_PRINT_LAYOUT )
+bFlag = !bFlag;
+bBrowseModeChanged = bFlag != pOpt-getBrowseMode();
+// Disable multiple layout
+GetDocShell()-ToggleBrowserMode( bFlag, this );
+pOpt-setBrowseMode( bFlag );
+break;
 
 case FN_VIEW_NOTES:
-if ( STATE_TOGGLE == eState )
-bFlag = !pOpt-IsPostIts();
+if ( STATE_TOGGLE == eState )
+bFlag = !pOpt-IsPostIts();
 
-GetPostItMgr()-SetLayout();
-pOpt-SetPostIts( bFlag );
-   if (pOpt-IsPostIts())
+GetPostItMgr()-SetLayout();
+pOpt-SetPostIts( bFlag );
+if (pOpt-IsPostIts())
 GetPostItMgr()-CheckMetaText();
- break;
+break;
 
-case FN_VIEW_HIDDEN_PARA:
-if ( STATE_TOGGLE == eState )
-bFlag = !pOpt-IsShowHiddenPara();
+case FN_VIEW_HIDDEN_PARA:
+if ( STATE_TOGGLE == eState )
+bFlag = !pOpt-IsShowHiddenPara();
 
-pOpt-SetShowHiddenPara( bFlag );
-break;
+pOpt-SetShowHiddenPara( bFlag );
+

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - officecfg/Configuration_officecfg.mk

2013-06-24 Thread Andras Timar

 officecfg/Configuration_officecfg.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit df051cddbcc24b5db62f202e8c01f01473bd9fab
Author: Andras Timar ati...@suse.com
Date:   Sun Jun 23 22:31:36 2013 +0200

ExtendedColorScheme.xcu is localizable

Change-Id: I566f50761478b9e18a47a460834258902a905b82
Reviewed-on: https://gerrit.libreoffice.org/4467
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/officecfg/Configuration_officecfg.mk 
b/officecfg/Configuration_officecfg.mk
index dc8a77c..8957977 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -34,7 +34,6 @@ $(eval $(call 
gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/Office/Calc.xcu \
org/openoffice/Office/Canvas.xcu \
org/openoffice/Office/Compatibility.xcu \
-   org/openoffice/Office/ExtendedColorScheme.xcu \
org/openoffice/Office/ExtensionDependencies.xcu \
org/openoffice/Office/ExtensionManager.xcu \
org/openoffice/Office/Impress.xcu \
@@ -143,6 +142,7 @@ $(eval $(call 
gb_Configuration_add_localized_datas,registry,officecfg/registry/d
org/openoffice/Office/TableWizard.xcu \
org/openoffice/Office/UI.xcu \
org/openoffice/Office/Embedding.xcu \
+   org/openoffice/Office/ExtendedColorScheme.xcu \
org/openoffice/Office/WebWizard.xcu \
org/openoffice/Office/FormWizard.xcu \
org/openoffice/Office/Writer.xcu \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-24 Thread Julien Nabet

 sc/source/ui/inc/formula.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a078353850bc6934a46ad8e0249fbadf35dfe0b2
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sun Jun 2 22:29:24 2013 +0200

clang, -Wunused-private-field

Change-Id: I8aa3d67c50a7b248cfdefb9a3152afd259b8ebbd
(cherry picked from commit ac1cb18b82bbee3a2a54ce73480fdb3e2cbf4ab4)
Reviewed-on: https://gerrit.libreoffice.org/4475
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 997e198..2082bc9 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -48,7 +48,6 @@ class ScFormulaDlg : public formula::FormulaDlg,
  public IAnyRefDialog
 {
 ScFormulaReferenceHelper m_aHelper;
-ScFormulaCell*  pCell;
 ::com::sun::star::uno::Reference ::com::sun::star::sheet::XFormulaParser 
 m_xParser;
 ::com::sun::star::uno::Reference 
::com::sun::star::sheet::XFormulaOpCodeMapperm_xOpCodeMapper;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 xmloff/source/draw/sdxmlexp.cxx |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 411bd0b8a7184720c2bcbcf468c98fd7158481b3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Sun Jun 23 20:46:07 2013 +0100

Resolves: rhbz#976304 gallery elements may not support document.Settings

so the createInstance throws, so the element doesn't get inserted into
the documents.

regression since f0cd6fe9075cd0aa00162474784ad804a07ed138

Change-Id: Ie6cef7a4f0d5ac8a34d41139c3439fc04e9c7f20
(cherry picked from commit fd240ba81b317a54fc4512aaec33650cd7a30e29)
Reviewed-on: https://gerrit.libreoffice.org/4466
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 6e86da3..c9149b9 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2915,15 +2915,16 @@ XMLFontAutoStylePool* 
SdXMLExport::CreateFontAutoStylePool()
 Reference lang::XMultiServiceFactory  xFac( GetModel(), UNO_QUERY );
 if( xFac.is() )
 {
-Referencebeans::XPropertySet const xProps( xFac-createInstance(
- com.sun.star.document.Settings), UNO_QUERY );
-if (xProps.is())
+try
 {
-try // clipboard document doesn't have shell so throws here
-{
-xProps-getPropertyValue(EmbedFonts) = bEmbedFonts;
-}
-catch (uno::Exception const) { }
+Referencebeans::XPropertySet const xProps( 
xFac-createInstance(
+ com.sun.star.document.Settings), 
UNO_QUERY_THROW );
+xProps-getPropertyValue(EmbedFonts) = bEmbedFonts;
+}
+catch (...)
+{
+// clipboard document doesn't have shell so throws from 
getPropertyValue
+// gallery elements may not support 
com.sun.star.document.Settings so throws from createInstance
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svx/source/fmcomp/fmgridcl.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit e58f2c9ffa627df299cdc5cbddaeaf2f173736c2
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jun 20 15:02:37 2013 +0200

FmGridControl:  handle non-existing properties

Fix crash with unhandled exception requesting Description.

Change-Id: I6b6cb61273fb042532ab63620729f4129239fe81
(cherry picked from commit 32e2c6456fb3bf3bf75f9b11c90193c537b4ef26)
Reviewed-on: https://gerrit.libreoffice.org/4399
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 26eacd9..ab8334a 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1908,7 +1908,14 @@ namespace
 ReferenceXPropertySet xProp;
 xIndex-getByIndex( _nPosition ) = xProp;
 if ( xProp.is() )
-xProp-getPropertyValue( _sPropName ) = sRetText;
+{
+try {
+xProp-getPropertyValue( _sPropName ) = sRetText;
+} catch (UnknownPropertyException const e) {
+SAL_WARN(svx.form,
+exception caught:   e.Message);
+}
+}
 }
 }
 return sRetText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 accessibility/source/standard/vclxaccessibletabpagewindow.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit d4f3a3dc266ec299153058fa002857e4c242763b
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jun 20 16:29:14 2013 +0200

VCLXAccessibleTabPageWindow: unhandled IndexOutOfBoundsException

... due to GetPagePos returning -1, work around that (can be easily
triggered in template manager).

Change-Id: Ic1334b224730d79e533539a24f115dc9aa2e9570
(cherry picked from commit 35b45e6915eecfea0e21525249eabe3afd39d09e)
Reviewed-on: https://gerrit.libreoffice.org/4400
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx 
b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index 03aac5a..28383f3 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -112,7 +112,15 @@ Reference XAccessible  
VCLXAccessibleTabPageWindow::getAccessibleParent(  ) th
 {
 Reference XAccessibleContext  xCont( 
xAcc-getAccessibleContext() );
 if ( xCont.is() )
-xParent = xCont-getAccessibleChild( 
m_pTabControl-GetPagePos( m_nPageId ) );
+{
+sal_uInt16 const 
nPagePos(m_pTabControl-GetPagePos(m_nPageId));
+SAL_WARN_IF(TAB_PAGE_NOTFOUND == nPagePos, accessibility,
+getAccessibleParent(): no tab page);
+if (TAB_PAGE_NOTFOUND != nPagePos)
+{
+xParent = xCont-getAccessibleChild(nPagePos);
+}
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svx/source/fmcomp/fmgridcl.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 748a011c3c1bdcc7b2f45ed64342c3e299ca61a9
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jun 20 15:02:37 2013 +0200

FmGridControl:  handle non-existing properties

Fix crash with unhandled exception requesting Description.

Change-Id: I6b6cb61273fb042532ab63620729f4129239fe81
(cherry picked from commit 32e2c6456fb3bf3bf75f9b11c90193c537b4ef26)
Reviewed-on: https://gerrit.libreoffice.org/4397
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index a864db3..374af64 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1908,7 +1908,14 @@ namespace
 ReferenceXPropertySet xProp;
 xIndex-getByIndex( _nPosition ) = xProp;
 if ( xProp.is() )
-xProp-getPropertyValue( _sPropName ) = sRetText;
+{
+try {
+xProp-getPropertyValue( _sPropName ) = sRetText;
+} catch (UnknownPropertyException const e) {
+SAL_WARN(svx.form,
+exception caught:   e.Message);
+}
+}
 }
 }
 return sRetText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Converting Tab Stops paragraph tab page

On Sat, 2013-06-22 at 18:02 -0300, Olivier Hallot wrote:
 Hi Caolán, all,
 
 1)On converting Paragraph Tab Stop page (Format - Paragraph - Tabs) I
 get a MetricBox to display the tab position inserted by user.
 
  MetricBox ED_TABPOS
  {
  HelpID = cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS;
  Pos = MAP_APPFONT ( 12 , 14 ) ;
  Size = MAP_APPFONT ( 39 , 165 ) ;
  Minimum = -5600 ;
  Maximum = 5600 ;
  DecimalDigits = 2 ;
  Unit = FUNIT_CM ;
  };
 
 Based on the wiki widget conversion page I tried a GtkComboBox as
 indicated. Is there a specific setting for the GtkComboBox to mimick the
 MetricBox (e.g. permanently open) as displayed in the old way?
 Otherwise, what widget should I use? Source files at


I wonder if we could just use a MetricField (rather than a MetricBox)
here instead. That was we already have the option of putting -nospin
at the end of the name to hide the up/down spin buttons. You would have
to change the code from MetricBox to MetricField in that case.

 
 cui/source/tabpages/tabstpge.*
 
 2) The tab symbols on the right of the Types radiobuttons seems to be
 static. Is that true? (I can't check in CJK or RTL languages). If
 affirmative, what about replacing the class that draws them by a static
 image?

Well, they are fairly static. The current code uses Ruler::DrawTab to
draw the image, the advantage of keeping things as they are is that the
code could be taught to scale them to fit whatever size fairly easily.

C.

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

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

 accessibility/source/standard/vclxaccessibletabpagewindow.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit c95f654ed26a8b640fd678b9bd1514384ad27c80
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jun 20 16:29:14 2013 +0200

VCLXAccessibleTabPageWindow: unhandled IndexOutOfBoundsException

... due to GetPagePos returning -1, work around that (can be easily
triggered in template manager).

Change-Id: Ic1334b224730d79e533539a24f115dc9aa2e9570
(cherry picked from commit 35b45e6915eecfea0e21525249eabe3afd39d09e)
Reviewed-on: https://gerrit.libreoffice.org/4398
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx 
b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
index 3865832..f63e266 100644
--- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx
@@ -114,7 +114,15 @@ Reference XAccessible  
VCLXAccessibleTabPageWindow::getAccessibleParent(  ) th
 {
 Reference XAccessibleContext  xCont( 
xAcc-getAccessibleContext() );
 if ( xCont.is() )
-xParent = xCont-getAccessibleChild( 
m_pTabControl-GetPagePos( m_nPageId ) );
+{
+sal_uInt16 const 
nPagePos(m_pTabControl-GetPagePos(m_nPageId));
+SAL_WARN_IF(TAB_PAGE_NOTFOUND == nPagePos, accessibility,
+getAccessibleParent(): no tab page);
+if (TAB_PAGE_NOTFOUND != nPagePos)
+{
+xParent = xCont-getAccessibleChild(nPagePos);
+}
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 forms/source/component/ListBox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9cca4617c4e020e5562b5023030da7418af67f55
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Sun Jun 23 17:28:58 2013 +0200

Use unsigned values in m_a(Converted)BoundValues

Values that come from the database are always signed
(we inherit that from sdbc that inherits that from jdbc
 that inherits that from Java's type system that does not have unsigned 
values)
So when using unsigned values, they always operator==-compare false!

Change-Id: I604b04afa23ede835c1f3db1f8c1bdeafbfba7ea
Reviewed-on: https://gerrit.libreoffice.org/4460
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/forms/source/component/ListBox.cxx 
b/forms/source/component/ListBox.cxx
index ee7c327..68ca37e 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -913,7 +913,7 @@ namespace frm
 aBoundValue.fill( *aBoundColumn + 1, 
m_nBoundColumnType, xCursorRow );
 else
 // -1 because getRow() is 1-indexed, but ListBox 
positions are 0-indexed
-aBoundValue = 
static_castsal_uInt16(xListCursor-getRow()-1);
+aBoundValue = 
static_castsal_Int16(xListCursor-getRow()-1);
 aValueList.push_back( aBoundValue );
 
 if ( bUseNULL  ( m_nNULLPos == -1 )  
aStr.isEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

License statement

2013-06-24 Thread Tamás Csikós

All of my past and future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 forms/source/component/ListBox.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 51c833591bc0959b537199abd174a7dfa7e6e601
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Sun Jun 23 17:32:20 2013 +0200

Data-aware ListBox: use entry for NULL if the *bound* value is NULL

as opposed to when the display string is empty.

Change-Id: I802955404d2d8d5c91b3fd1633e34be7ef4f0b82
Reviewed-on: https://gerrit.libreoffice.org/4461
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/forms/source/component/ListBox.cxx 
b/forms/source/component/ListBox.cxx
index 68ca37e..14a67b9 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -916,8 +916,13 @@ namespace frm
 aBoundValue = 
static_castsal_Int16(xListCursor-getRow()-1);
 aValueList.push_back( aBoundValue );
 
-if ( bUseNULL  ( m_nNULLPos == -1 )  
aStr.isEmpty() )
+if ( bUseNULL  ( m_nNULLPos == -1 )  
aBoundValue.isNull() )
 m_nNULLPos = sal_Int16( aDisplayList.size() - 1 );
+if ( bUseNULL  ( m_nNULLPos == -1 )  
aStr.isEmpty() )
+// There is already a non-NULL entry with empty 
display string;
+// adding another one for NULL would make things 
confusing,
+// so back off.
+bUseNULL = false;
 }
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/qa/extras/rtfimport/data/n823655.rtf |   48 
 sw/qa/extras/rtfimport/rtfimport.cxx|   26 +++
 writerfilter/source/rtftok/rtfsdrimport.cxx |   14 
 3 files changed, 81 insertions(+), 7 deletions(-)

New commits:
commit fe8d6ffa05c467bddb3480e43d7043a3d3c9
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Jun 24 14:13:39 2013 +0200

bnc#823655 fix RTF import of freeform shape coordinates

E.g. 0,1 was imported as 1,0, as we did not differentiate between not
having the coordinate yet and having it as zero.

Change-Id: Ia5fbbcc791dc9c6866ffd4c146793690661d81b4

diff --git a/sw/qa/extras/rtfimport/data/n823655.rtf 
b/sw/qa/extras/rtfimport/data/n823655.rtf
new file mode 100644
index 000..94e73ed
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/n823655.rtf
@@ -0,0 +1,48 @@
+{\rtf1
+foo
+{\shp
+{\*\shpinst\shpleft450\shptop1904\shpright11595\shpbottom2190\shpfhdr0\shpbxpage\shpbxignore\shpbypage\shpbyignore\shpwr3\shpwrk0\shpfblwtxt1\shpz0\shplid1026
+{\sp
+{\sn shapeType}
+{\sv 0}
+}
+{\sp
+{\sn fFlipH}
+{\sv 0}
+}
+{\sp
+{\sn fFlipV}
+{\sv 0}
+}
+{\sp
+{\sn geoRight}
+{\sv 11145}
+}
+{\sp
+{\sn geoBottom}
+{\sv 286}
+}
+{\sp
+{\sn pVerticies}
+{\sv 8;4;(0,286);(11145,286);(11145,1);(0,1)}
+}
+{\sp
+{\sn pSegmentInfo}
+{\sv 2;5;16384;1;1;1;32768}
+}
+{\sp
+{\sn fFillOK}
+{\sv 1}
+}
+{\sp
+{\sn fillColor}
+{\sv 15000804}
+}
+{\sp
+{\sn fFilled}
+{\sv 1}
+}
+}
+}
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index c84cb81..53be3b2 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -8,6 +8,7 @@
 
 #include com/sun/star/document/XFilter.hpp
 #include com/sun/star/document/XImporter.hpp
+#include com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp
 #include com/sun/star/drawing/EnhancedCustomShapeSegment.hpp
 #include com/sun/star/drawing/LineStyle.hpp
 #include com/sun/star/drawing/XDrawPageSupplier.hpp
@@ -144,6 +145,7 @@ public:
 void testPoshPosv();
 void testN825305();
 void testParaBottomMargin();
+void testN823655();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -275,6 +277,7 @@ void Test::run()
 {posh-posv.rtf, Test::testPoshPosv},
 {n825305.rtf, Test::testN825305},
 {para-bottom-margin.rtf, Test::testParaBottomMargin},
+{n823655.rtf, Test::testN823655},
 };
 header();
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
@@ -1306,6 +1309,29 @@ void Test::testParaBottomMargin()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getPropertysal_Int32(getParagraph(1), 
ParaBottomMargin));
 }
 
+void Test::testN823655()
+{
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+uno::Sequencebeans::PropertyValue aProps = getProperty 
uno::Sequencebeans::PropertyValue (xDraws-getByIndex(0), 
CustomShapeGeometry);
+uno::Sequencebeans::PropertyValue aPathProps;
+for (int i = 0; i  aProps.getLength(); ++i)
+{
+const beans::PropertyValue rProp = aProps[i];
+if (rProp.Name == Path)
+aPathProps = rProp.Value.get uno::Sequencebeans::PropertyValue 
();
+}
+uno::Sequencedrawing::EnhancedCustomShapeParameterPair aCoordinates;
+for (int i = 0; i  aPathProps.getLength(); ++i)
+{
+const beans::PropertyValue rProp = aPathProps[i];
+if (rProp.Name == Coordinates)
+aCoordinates = rProp.Value.get 
uno::Sequencedrawing::EnhancedCustomShapeParameterPair ();
+}
+// The first coordinate pair of this freeform shape was 286,0 instead of 
0,286.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(286), 
aCoordinates[0].Second.Value.getsal_Int32());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 1b62df3..6cac9c1 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -317,19 +317,19 @@ void RTFSdrImport::resolve(RTFShape rShape, bool bClose)
 // The coordinates are in an (x,y) form.
 aToken = aToken.copy(1, aToken.getLength() - 2);
 sal_Int32 nI = 0;
-sal_Int32 nX = 0;
-sal_Int32 nY = 0;
+boost::optionalsal_Int32 oX;
+boost::optionalsal_Int32 oY;
 do
 {
 OUString aPoint = aToken.getToken(0, ',', nI);
-if (!nX)
-nX = aPoint.toInt32();
+if (!oX)
+oX.reset(aPoint.toInt32());
 else
-nY = aPoint.toInt32();
+

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

 forms/source/component/ListBox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6fd7c667db057571ce1fa9c2fbc4a78161227f5a
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Sun Jun 23 17:56:09 2013 +0200

Don't second-guess the database

If it gives us a NULL as bound value,
use it, even if the underlying column
has constraint NOT NULL.

This can happen e.g. in OUTER JOIN,
with UNION, ...

Change-Id: I1fc0d9366764b90e0cdb443cd34c32b52f059e0b
Reviewed-on: https://gerrit.libreoffice.org/4462
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/forms/source/component/ListBox.cxx 
b/forms/source/component/ListBox.cxx
index 14a67b9..d4e46eb 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -916,7 +916,7 @@ namespace frm
 aBoundValue = 
static_castsal_Int16(xListCursor-getRow()-1);
 aValueList.push_back( aBoundValue );
 
-if ( bUseNULL  ( m_nNULLPos == -1 )  
aBoundValue.isNull() )
+if ( m_nNULLPos == -1  aBoundValue.isNull() )
 m_nNULLPos = sal_Int16( aDisplayList.size() - 1 );
 if ( bUseNULL  ( m_nNULLPos == -1 )  
aStr.isEmpty() )
 // There is already a non-NULL entry with empty 
display string;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/vcl/vclmedit.hxx |2 ++
 vcl/source/edit/vclmedit.cxx |   12 
 vcl/source/window/layout.cxx |2 ++
 3 files changed, 16 insertions(+)

New commits:
commit bf69b76ee8e16069ca6d6a1782e7610ef784aa4b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Jun 4 16:13:06 2013 +0100

Related: fdo#66105 clip message box dialogs to some reasonable widths

(cherry picked from commit 19a2685ec04bd6ce882d4dd08d24c7248cf99a84)

Change-Id: I7fc179865306ba5b593b090b1fdb8971ba6bd508
Reviewed-on: https://gerrit.libreoffice.org/4480
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 63caa3b..e3fdfc5 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -81,6 +81,8 @@ public:
 virtual voidSetMaxTextLen( xub_StrLen nMaxLen = 0 );
 virtual xub_StrLen GetMaxTextLen() const;
 
+voidSetMaxTextWidth( sal_uLong nMaxWidth );
+
 virtual voidSetSelection( const Selection rSelection );
 virtual const Selection GetSelection() const;
 
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index b83be1d..79d8399 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -115,6 +115,8 @@ public:
 voidSetMaxTextLen( xub_StrLen nLen );
 xub_StrLen  GetMaxTextLen() const;
 
+voidSetMaxTextWidth( sal_uLong nMaxWidth );
+
 sal_BoolIsInsertMode() const;
 
 voidInsertText( const String rStr );
@@ -400,6 +402,11 @@ String ImpVclMEdit::GetSelected( LineEnd aSeparator ) const
 return mpTextWindow-GetTextView()-GetSelected( aSeparator );
 }
 
+void ImpVclMEdit::SetMaxTextWidth( sal_uLong nMaxWidth )
+{
+mpTextWindow-GetTextEngine()-SetMaxTextWidth( nMaxWidth );
+}
+
 void ImpVclMEdit::Resize()
 {
 size_t nIteration = 1;
@@ -1113,6 +1120,11 @@ void VclMultiLineEdit::SetMaxTextLen( xub_StrLen nMaxLen 
)
 pImpVclMEdit-SetMaxTextLen( nMaxLen );
 }
 
+void VclMultiLineEdit::SetMaxTextWidth( sal_uLong nMaxWidth )
+{
+pImpVclMEdit-SetMaxTextWidth(nMaxWidth );
+}
+
 xub_StrLen VclMultiLineEdit::GetMaxTextLen() const
 {
 return pImpVclMEdit-GetMaxTextLen();
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 4714f1e..33977c2 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1783,6 +1783,7 @@ short MessageDialog::Execute()
 m_pPrimaryMessage-set_hexpand(true);
 m_pPrimaryMessage-SetText(m_sPrimaryString);
 m_pPrimaryMessage-Show(!m_sPrimaryString.isEmpty());
+
m_pPrimaryMessage-SetMaxTextWidth(m_pPrimaryMessage-approximate_char_width() 
* 60);
 
 m_pSecondaryMessage = new VclMultiLineEdit(m_pGrid, nWinStyle);
 m_pSecondaryMessage-SetPaintTransparent(true);
@@ -1792,6 +1793,7 @@ short MessageDialog::Execute()
 m_pSecondaryMessage-set_hexpand(true);
 m_pSecondaryMessage-SetText(m_sSecondaryString);
 m_pSecondaryMessage-Show(!m_sSecondaryString.isEmpty());
+
m_pSecondaryMessage-SetMaxTextWidth(m_pPrimaryMessage-approximate_char_width()
 * 80);
 
 m_pGrid-Show();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 connectivity/source/commontools/TTableHelper.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 002c79346c69c0b7f4953daec7377e71660ae306
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Jun 21 15:24:15 2013 +0200

fdo#49708 when there is no Primary Key, there is no Primay Key

As opposed to a primary key with empty name and no columns (!)

Change-Id: I78ca185947a0e8d37bac64bd50add155afaeed47
Reviewed-on: https://gerrit.libreoffice.org/4431
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/connectivity/source/commontools/TTableHelper.cxx 
b/connectivity/source/commontools/TTableHelper.cxx
index 8442a26..3e29b7b 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -339,12 +339,19 @@ void OTableHelper::refreshPrimaryKeys(TStringVector 
_rNames)
 if ( !bAlreadyFetched )
 {
 aPkName = xRow-getString(6);
+SAL_WARN_IF(xRow-wasNull(),connectivity.commontools, NULL 
Primary Key name);
+SAL_WARN_IF(aPkName.isEmpty(),connectivity.commontools, 
empty Primary Key name);
 bAlreadyFetched = true;
 }
 }
 
-m_pImpl-m_aKeys.insert(TKeyMap::value_type(aPkName,pKeyProps));
-_rNames.push_back(aPkName);
+if(bAlreadyFetched)
+{
+SAL_WARN_IF(aPkName.isEmpty(),connectivity.commontools, empty 
Primary Key name);
+SAL_WARN_IF(pKeyProps-m_aKeyColumnNames.size() == 
0,connectivity.commontools, Primary Key has no columns);
+m_pImpl-m_aKeys.insert(TKeyMap::value_type(aPkName,pKeyProps));
+_rNames.push_back(aPkName);
+}
 } // if ( xResult.is()  xResult-next() )
 ::comphelper::disposeComponent(xResult);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-24 Thread Jelle van der Waa

 svl/source/misc/urihelper.cxx   |2 +-
 svl/source/numbers/zforlist.cxx |6 +++---
 svl/source/numbers/zformat.cxx  |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 97f71c5f8be85f47d7978259a2d82708412043fd
Author: Jelle van der Waa je...@vdwaa.nl
Date:   Sat Jun 22 12:51:51 2013 +0200

fdo#43460 svl: use isEmpty()

Change-Id: I441842c7514a27baea8ce5c0e7381dcf81892d6a
Reviewed-on: https://gerrit.libreoffice.org/4441
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 6642cd1..61b3a02 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -235,7 +235,7 @@ OUString normalize(
 if (preCount != i) {
 if (preCount == i - 1) {
 buf.append(static_cast sal_Unicode ('/'));
-} else if (preCount - 1 == i  buf.getLength()  0
+} else if (preCount - 1 == i  !buf.isEmpty()
 buf[buf.getLength() - 1] == '/')
 {
 buf.setLength(buf.getLength() - 1);
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 99c3da2..abfe9c9 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -997,7 +997,7 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType 
eLnge, bool bNoAdditio
 aDupes.append( ) );
 }
 }
-if ( aDupes.getLength()  0 )
+if ( !aDupes.isEmpty() )
 {
 OUStringBuffer aMsg(aDupes.getLength() + 
xSeq[j].formatKey.getLength() + 100);
 aMsg.append(XML locale data FormatElement formatindex 
dupe: );
@@ -2158,7 +2158,7 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault(
 break;
 }
 }
-if (aMsg.getLength())
+if (!aMsg.isEmpty())
 {
 aMsg.insert(0, SvNumberFormatter::ImpAdjustFormatCodeDefault: 
);
 aMsg.append(\nXML locale data FormatElement formatindex: );
@@ -2174,7 +2174,7 @@ sal_Int32 SvNumberFormatter::ImpAdjustFormatCodeDefault(
 aMsg.append(no medium type default  );
 if ( nLong != -1  nLongDef == -1 )
 aMsg.append(no long type default  );
-if (aMsg.getLength())
+if (!aMsg.isEmpty())
 {
 aMsg.insert(0, SvNumberFormatter::ImpAdjustFormatCodeDefault: );
 aMsg.append(\nXML locale data FormatElement group of: );
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 4ffa3ce..720ea87 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1356,7 +1356,7 @@ OUString SvNumberformat::LocaleType::generateCode() const
 {
 sal_uInt8 n = static_castsal_uInt8((n16  0xF000)  12);
 // Omit leading zeros for consistency.
-if (n || aBuf.getLength() || i == 3)
+if (n || !aBuf.isEmpty() || i == 3)
 {
 aBuf.append(toUniChar(n));
 }
@@ -4306,7 +4306,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
 }
 sStr.remove( nPoint, 1 ); //  Remove .
 }
-if (bSign  (sStr.getLength() == 0 ||
+if (bSign  (sStr.isEmpty() ||
   comphelper::string::getTokenCount(sStr.toString(), '0') 
== sStr.getLength()+1))   // Only 0
 {
 bSign = false;  // Not -0.00
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Compilation problem, pnglibconf.h exists but not detected ?

2013-06-24 Thread Dag Wieers


Hi,

When building LibreOffice on my RHEL6 system, it successfully passed 
configure, however after lots of compiling I still get:



  CC cairo-png.lo
In file included from cairo-png.c:46:
/home/dag/home-made/libreoffice/workdir/unxlngx6.pro/UnpackedTarball/png/png.h:434:27: 
error: pnglibconf.h: No such file or directory

cairo-png.c: In function ‘write_png’:
cairo-png.c:248: error: implicit declaration of function 
‘png_set_packswap’

cairo-png.c:248: warning: nested extern declaration of ‘png_set_packswap’
cairo-png.c:268: error: implicit declaration of function ‘png_set_bKGD’
cairo-png.c:268: warning: nested extern declaration of ‘png_set_bKGD’
cairo-png.c:273: error: implicit declaration of function 
‘png_convert_from_time_t’
cairo-png.c:273: warning: nested extern declaration of 
‘png_convert_from_time_t’

cairo-png.c:274: error: implicit declaration of function ‘png_set_tIME’
cairo-png.c:274: warning: nested extern declaration of ‘png_set_tIME’
cairo-png.c:284: error: implicit declaration of function 
‘png_set_write_user_transform_fn’
cairo-png.c:284: warning: nested extern declaration of 
‘png_set_write_user_transform_fn’

cairo-png.c:287: error: implicit declaration of function ‘png_set_filler’
cairo-png.c:287: warning: nested extern declaration of ‘png_set_filler’
cairo-png.c:287: error: ‘PNG_FILLER_AFTER’ undeclared (first use in this 
function)

cairo-png.c:287: error: (Each undeclared identifier is reported only once
cairo-png.c:287: error: for each function it appears in.)
cairo-png.c: In function ‘stdio_write_func’:
cairo-png.c:319: error: implicit declaration of function ‘png_error’
cairo-png.c:319: warning: nested extern declaration of ‘png_error’
cairo-png.c: In function ‘read_png’:
cairo-png.c:562: error: implicit declaration of function ‘png_read_info’
cairo-png.c:562: warning: nested extern declaration of ‘png_read_info’
cairo-png.c:574: error: implicit declaration of function 
‘png_set_palette_to_rgb’
cairo-png.c:574: warning: nested extern declaration of 
‘png_set_palette_to_rgb’
cairo-png.c:579: error: implicit declaration of function 
‘png_set_expand_gray_1_2_4_to_8’
cairo-png.c:579: warning: nested extern declaration of 
‘png_set_expand_gray_1_2_4_to_8’
cairo-png.c:587: error: implicit declaration of function 
‘png_set_tRNS_to_alpha’
cairo-png.c:587: warning: nested extern declaration of 
‘png_set_tRNS_to_alpha’cairo-png.c:590: error: implicit declaration of 
function ‘png_set_strip_16’

cairo-png.c:590: warning: nested extern declaration of ‘png_set_strip_16’
cairo-png.c:593: error: implicit declaration of function ‘png_set_packing’
cairo-png.c:593: warning: nested extern declaration of ‘png_set_packing’
cairo-png.c:599: error: implicit declaration of function 
‘png_set_gray_to_rgb’
cairo-png.c:599: warning: nested extern declaration of 
‘png_set_gray_to_rgb’
cairo-png.c:603: error: implicit declaration of function 
‘png_set_interlace_handling’
cairo-png.c:603: warning: nested extern declaration of 
‘png_set_interlace_handling’
cairo-png.c:605: error: ‘PNG_FILLER_AFTER’ undeclared (first use in this 
function)
cairo-png.c:627: error: implicit declaration of function 
‘png_set_read_user_transform_fn’
cairo-png.c:627: warning: nested extern declaration of 
‘png_set_read_user_transform_fn’

cairo-png.c:657: error: implicit declaration of function ‘png_read_image’
cairo-png.c:657: warning: nested extern declaration of ‘png_read_image’
cairo-png.c:658: error: implicit declaration of function ‘png_read_end’
cairo-png.c:658: warning: nested extern declaration of ‘png_read_end’
make[3]: *** [cairo-png.lo] Error 1
make[2]: *** [all] Error 2
make[1]: *** 
[/home/dag/home-made/libreoffice/workdir/unxlngx6.pro/ExternalProject/cairo/build] 
Error 1

make: *** [build] Error 2


Even when pnglibconf.h exists in the tree:


[dag@moria libreoffice]$ find . -name pnglibconf.h
./libpng/configs/pnglibconf.h


Known problem ?
--
-- dag wieers, d...@wieers.com, http://dag.wieers.com/
-- dagit linux solutions, cont...@dagit.net, http://dagit.net/

[Any errors in spelling, tact or fact are transmission errors]___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - cui/uiconfig include/editeng include/sfx2 include/svx include/vcl sfx2/uiconfig vcl/source

 cui/uiconfig/ui/pastespecial.ui  |1 +
 include/editeng/editids.hrc  |   15 ++-
 include/sfx2/sfxsids.hrc |4 
 include/svx/svxids.hrc   |3 +++
 include/vcl/edit.hxx |3 +++
 sfx2/uiconfig/ui/documentinfopage.ui |2 ++
 vcl/source/control/edit.cxx  |   21 -
 7 files changed, 43 insertions(+), 6 deletions(-)

New commits:
commit 669ad519902e21e0cb3537fb7e203987f75a4077
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 14:40:07 2013 +0100

colliding SID_SVX_START based ids

Change-Id: I6eba0b0c2291a71ebe683b23a0af400010d5b5d8

diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index 7dbaae8..e6c67c6 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -21,6 +21,12 @@
 
 #include svl/solar.hrc
 
+/*
+  These SID_SVX_START entries came from include/svx/svxids.hrc, avoid
+  accidentally colliding entries with include/svx/svxids.hrc and
+  include/sfx2/sfxsids.hrc. Only add new SID_SVX_START entries to
+  include/svx/svxids.hrc
+*/
 #define SID_ATTR_BRUSH  ( SID_SVX_START + 1 )
 #define SID_ATTR_TABSTOP( SID_SVX_START + 2 )
 #define SID_ATTR_TABSTOP_DEFAULTS   ( SID_SVX_START + 3 )
@@ -112,17 +118,16 @@
 #define SID_ATTR_CHAR_LATIN_LANGUAGE( SID_SVX_START + 996 )
 #define SID_ATTR_CHAR_LATIN_POSTURE ( SID_SVX_START + 997 )
 #define SID_ATTR_CHAR_LATIN_WEIGHT  ( SID_SVX_START + 998 )
-#define SID_ATTR_PARA_OUTLINE_LEVEL ( SID_SVX_START + 1121 
)
-#define SID_ATTR_CHAR_PREVIEW_FONT  ( SID_SVX_START + 1122 
)
-#define SID_ATTR_CHAR_ENDPREVIEW_FONT   ( SID_SVX_START + 1123 
)
-
 
-// this ID didn't exist prior to the svx split
+// these ID didn't exist prior to the svx split, add new ids here
 #define SID_ATTR_CHAR_OVERLINE  ( SID_EDIT_START + 68 )
 #define SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD   ( SID_EDIT_START + 69 )
 #define SID_ATTR_ALIGN_VER_JUSTIFY_METHOD   ( SID_EDIT_START + 70 )
 #define SID_ATTR_ALIGN_HOR_JUSTIFY  ( SID_EDIT_START + 71 )
 #define SID_ATTR_ALIGN_VER_JUSTIFY  ( SID_EDIT_START + 72 )
+#define SID_ATTR_PARA_OUTLINE_LEVEL ( SID_EDIT_START + 73 )
+#define SID_ATTR_CHAR_PREVIEW_FONT  ( SID_EDIT_START + 74 )
+#define SID_ATTR_CHAR_ENDPREVIEW_FONT   ( SID_EDIT_START + 75 )
 
 /*
 // planned, but not doable: changing value of SIDs will break code that uses 
them for WhichRanges
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index fcfe4dd..d1227e3 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -583,6 +583,10 @@
 #define SID_HELP_STYLESHEET (SID_OPTIONS_START + 99)
 
 // slot IDs from SVX (svxids.hrc) -
+// These SID_SVX_START entries came from include/svx/svxids.hrc, avoid
+// accidentally colliding entries with include/svx/svxids.hrc and
+// include/editeng/editids.hrc. Only add new SID_SVX_START entries
+// to include/svx/svxids.hrc
 
 #define SID_ZOOM_TOOLBOX(SID_SVX_START +  96)
 #define SID_ZOOM_OUT(SID_SVX_START +  97)
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 7a62e63..8aa8807 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -269,6 +269,9 @@
 
 // --
 // Svx-Id's
+// When adding new entries here, note that other SID_SVX_START entries exist in
+// include/editeng/editids.hrc and include/sfx2/sfxsids.hrc so don't use the
+// same id for two different attributes
 // --
 
 #define SID_ATTR_BORDER_INNER   ( SID_SVX_START + 23 )
commit 9495e912797f67897a4a658d20137bb94f39e9ab
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 12:42:39 2013 +0100

Resolves: fdo#66105 set max growth width for labels/edits which take paths

Change-Id: I12220821f76550baacdc8ce604f2e612d260c1a1

diff --git a/cui/uiconfig/ui/pastespecial.ui b/cui/uiconfig/ui/pastespecial.ui
index fb08b9e..3eb4e7d 100644
--- a/cui/uiconfig/ui/pastespecial.ui
+++ b/cui/uiconfig/ui/pastespecial.ui
@@ -97,6 +97,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=wrapTrue/property
+property name=max_width_chars72/property
   /object
   packing
 property name=expandFalse/property
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 11c1ae8..6df1f7b 100644
---

Re: LO / Firebird DB Integration

2013-06-24 Thread Andrzej J. R. Hunt

On 24/06/13 12:25, David Tardon wrote:
 If this is the current option, could we please consider the possibility
 to drop the whole idea and just stay with hsqldb? With my distro hat on,
 I do not see any improvement with having to bundle hsqldb vs. having to
 bundle firebird.
The main motivation for the switch was (another step in) getting rid of
java (at least for me personally it is, and AFAICS for most other people
too), and not the bundling of a db. And there appear to be solutions to
allow reliable use of external firebird with various ICUs (see mails
from Lionel/Michael) -- so either way firebird still makes the most
sense to me.

Cheers,

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

[Libreoffice-commits] core.git: sc/inc sc/source

2013-06-24 Thread Akash Shetye

 sc/inc/globstr.hrc |5 +++-
 sc/source/core/data/global.cxx |   20 -
 sc/source/ui/src/globstr.src   |8 ++
 sc/source/ui/view/gridwin5.cxx |   48 +
 4 files changed, 66 insertions(+), 15 deletions(-)

New commits:
commit c13daee32de1be4b96d6a948cfca4aa0bdf8c4db
Author: Akash Shetye shetyeak...@gmail.com
Date:   Mon May 27 17:37:54 2013 +0530

fdo#51296 Helptext added for hyperlinks, hlinks behave as in writer

Added prefixed of ctrl+click to open hyperlink to hlinks depending on the 
security setting. Now clicking links behave as in writer.

Change-Id: I87d0fecb6268463cd99478b70eb081ed958976be
Reviewed-on: https://gerrit.libreoffice.org/4051
Signed-off-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index f9fda26..314f29a 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -678,7 +678,10 @@
 #define STR_COPYFROM549
 #define STR_COPYERR 550
 
-#define STR_COUNT   551
+#define STR_CTRLCLICKHYPERLINK  551
+#define STR_CLICKHYPERLINK  552
+
+#define STR_COUNT   553
 
 #endif
 
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 95084a9..a34b1de 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -925,20 +925,20 @@ void ScGlobal::OpenURL( const String rURL, const String 
rTarget )
 //  aufgerufen, darum stimmen pScActiveViewShell und nScClickMouseModifier.
 //SvtSecurityOptions to access Libreoffice global security parameters
 SvtSecurityOptions aSecOpt;
-bool bProceedHyperlink = false;
-if ( (nScClickMouseModifier  KEY_MOD1)  aSecOpt.IsOptionSet( 
SvtSecurityOptions::E_CTRLCLICK_HYPERLINK )) // control-click - into new 
window
+bool bCtrlClickHappened = (nScClickMouseModifier  KEY_MOD1);
+bool bCtrlClickSecOption = aSecOpt.IsOptionSet( 
SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
+if( bCtrlClickHappened  !( bCtrlClickSecOption ) )
 {
-//Ctrl key is pressed and ctrl+click hyperlink security control is set
-bProceedHyperlink = true;
+//return since ctrl+click happened when the
+//ctrl+click security option was disabled, link should not open
+return;
 }
-else if( !aSecOpt.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK ) 
)
+else if( !( bCtrlClickHappened )  bCtrlClickSecOption )
 {
-//ctrl+click hyperlink security control is disabled just click will do
-bProceedHyperlink = true;
-}
-if ( !bProceedHyperlink )
+//ctrl+click did not happen; only click happened maybe with some
+//other key combo. and security option is set, so return
 return;
-
+}
 SfxStringItem aUrl( SID_FILE_NAME, rURL );
 SfxStringItem aTarget( SID_TARGETNAME, rTarget );
 aTarget.SetValue(OUString(_blank));
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index af236f9..bd9579c 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -2081,6 +2081,14 @@ Resource RID_GLOBSTR
 {
 Text [ en-US ] = Cells without text have been ignored. ;
 };
+String STR_CTRLCLICKHYPERLINK
+{
+Text [ en-US ] = ctrl+click to open hyperlink:;
+};
+String STR_CLICKHYPERLINK
+{
+Text [ en-US ] = click to open hyperlink:;
+};
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index 756f75c..ee357f6 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -31,6 +31,7 @@
 #include sfx2/viewfrm.hxx
 
 #include unotools/localedatawrapper.hxx
+#include unotools/securityoptions.hxx
 
 #include viewuno.hxx
 #include AccessibleDocument.hxx
@@ -49,7 +50,8 @@
 #include tabvwsh.hxx
 #include userdat.hxx
 #include postit.hxx
-
+#include global.hxx
+#include globstr.hrc
 // ---
 
 bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard )
@@ -241,16 +243,21 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW 
nPosY, bool bKeyboard )
 
 void ScGridWindow::RequestHelp(const HelpEvent rHEvt)
 {
+//To know whether to prefix STR_CTRLCLICKHYERLINK or STR_CLICKHYPERLINK
+//to hyperlink tooltips/help text
+SvtSecurityOptions aSecOpt;
+bool bCtrlClickHlink = aSecOpt.IsOptionSet( 
SvtSecurityOptions::E_CTRLCLICK_HYPERLINK );
+//Global string STR_CTRLCLICKHYPERLINK i.e, ctrl+click to open hyperlink:
+OUString aCtrlClickHlinkStr = ScGlobal::GetRscString( 
STR_CTRLCLICKHYPERLINK );
+//Global string STR_CLICKHYPERLINK i.e, click to open hyperlink
+OUString aClickHlinkStr = ScGlobal::GetRscString( STR_CLICKHYPERLINK );
 sal_Bool bDone = false;
 sal_Bool bHelpEnabled = ( rHEvt.GetMode()  (

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

2013-06-24 Thread Tor Lillqvist

 oox/source/drawingml/effectproperties.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7552edf94052784962de58229c9c844bf345b55a
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Jun 24 17:42:39 2013 +0300

Fix typo in Emacs mode line

Change-Id: I882a24a665a721420c8ec99288f399abf4fdbca1

diff --git a/oox/source/drawingml/effectproperties.cxx 
b/oox/source/drawingml/effectproperties.cxx
index 799169b..caaf61f 100644
--- a/oox/source/drawingml/effectproperties.cxx
+++ b/oox/source/drawingml/effectproperties.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-baosic-offset: 4 -*- 
*/
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - sw/qa writerfilter/source

 sw/qa/extras/rtfimport/data/n823655.rtf|   48 +
 sw/qa/extras/rtfimport/data/para-bottom-margin.rtf |   14 ++
 sw/qa/extras/rtfimport/rtfimport.cxx   |   34 ++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 +
 writerfilter/source/rtftok/rtfsdrimport.cxx|   14 +++---
 5 files changed, 106 insertions(+), 7 deletions(-)

New commits:
commit 48a25944a8bc00f4cac90c602c01f9f1ecd63256
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Jun 24 14:13:39 2013 +0200

bnc#823655 fix RTF import of freeform shape coordinates

E.g. 0,1 was imported as 1,0, as we did not differentiate between not
having the coordinate yet and having it as zero.

Change-Id: Ia5fbbcc791dc9c6866ffd4c146793690661d81b4
(cherry picked from commit fe8d6ffa05c467bddb3480e43d7043a3d3c9)

diff --git a/sw/qa/extras/rtfimport/data/n823655.rtf 
b/sw/qa/extras/rtfimport/data/n823655.rtf
new file mode 100644
index 000..94e73ed
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/n823655.rtf
@@ -0,0 +1,48 @@
+{\rtf1
+foo
+{\shp
+{\*\shpinst\shpleft450\shptop1904\shpright11595\shpbottom2190\shpfhdr0\shpbxpage\shpbxignore\shpbypage\shpbyignore\shpwr3\shpwrk0\shpfblwtxt1\shpz0\shplid1026
+{\sp
+{\sn shapeType}
+{\sv 0}
+}
+{\sp
+{\sn fFlipH}
+{\sv 0}
+}
+{\sp
+{\sn fFlipV}
+{\sv 0}
+}
+{\sp
+{\sn geoRight}
+{\sv 11145}
+}
+{\sp
+{\sn geoBottom}
+{\sv 286}
+}
+{\sp
+{\sn pVerticies}
+{\sv 8;4;(0,286);(11145,286);(11145,1);(0,1)}
+}
+{\sp
+{\sn pSegmentInfo}
+{\sv 2;5;16384;1;1;1;32768}
+}
+{\sp
+{\sn fFillOK}
+{\sv 1}
+}
+{\sp
+{\sn fillColor}
+{\sv 15000804}
+}
+{\sp
+{\sn fFilled}
+{\sv 1}
+}
+}
+}
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index d3362da..84d59c0 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -27,6 +27,7 @@
 
 #include com/sun/star/document/XFilter.hpp
 #include com/sun/star/document/XImporter.hpp
+#include com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp
 #include com/sun/star/drawing/EnhancedCustomShapeSegment.hpp
 #include com/sun/star/drawing/LineStyle.hpp
 #include com/sun/star/drawing/XDrawPageSupplier.hpp
@@ -151,6 +152,7 @@ public:
 void testFdo64671();
 void testN825305();
 void testParaBottomMargin();
+void testN823655();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -272,6 +274,7 @@ void Test::run()
 {fdo64671.rtf, Test::testFdo64671},
 {n825305.rtf, Test::testN825305},
 {para-bottom-margin.rtf, Test::testParaBottomMargin},
+{n823655.rtf, Test::testN823655},
 };
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -1252,6 +1255,29 @@ void Test::testParaBottomMargin()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getPropertysal_Int32(getParagraph(1), 
ParaBottomMargin));
 }
 
+void Test::testN823655()
+{
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+uno::Sequencebeans::PropertyValue aProps = getProperty 
uno::Sequencebeans::PropertyValue (xDraws-getByIndex(0), 
CustomShapeGeometry);
+uno::Sequencebeans::PropertyValue aPathProps;
+for (int i = 0; i  aProps.getLength(); ++i)
+{
+const beans::PropertyValue rProp = aProps[i];
+if (rProp.Name == Path)
+aPathProps = rProp.Value.get uno::Sequencebeans::PropertyValue 
();
+}
+uno::Sequencedrawing::EnhancedCustomShapeParameterPair aCoordinates;
+for (int i = 0; i  aPathProps.getLength(); ++i)
+{
+const beans::PropertyValue rProp = aPathProps[i];
+if (rProp.Name == Coordinates)
+aCoordinates = rProp.Value.get 
uno::Sequencedrawing::EnhancedCustomShapeParameterPair ();
+}
+// The first coordinate pair of this freeform shape was 286,0 instead of 
0,286.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(286), 
aCoordinates[0].Second.Value.getsal_Int32());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 3bb7af9..62a6cb5 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -192,19 +192,19 @@ void RTFSdrImport::resolve(RTFShape rShape)
 // The coordinates are in an (x,y) form.
 aToken = aToken.copy(1, aToken.getLength() - 2);
 sal_Int32 nI = 0;
-sal_Int32 nX = 0;
-sal_Int32 nY = 0;
+boost::optionalsal_Int32 oX;
+boost::optionalsal_Int32 oY;
 do
 {
 OUString aPoint = aToken.getToken(0, ',', nI);
-if (!nX)
-nX =

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

2013-06-24 Thread Tor Lillqvist

 vcl/source/control/edit.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b139f6fedfcf3cbed0eadeb007e2155b576413d2
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Jun 24 18:04:09 2013 +0300

Remove leftover debugging printf

Besides, it caused a WaE: format '%d' expects argument of type 'int', but
argument 3 has type 'sal_Int32 {aka long int}'

Change-Id: Ib0360816e7d0a4829aff4267aa922269950d520c

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 70f19f9..513047c 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -219,7 +219,6 @@ void Edit::setMaxWidthChars(sal_Int32 nWidth)
 if (nWidth != mnMaxWidthChars)
 {
 mnMaxWidthChars = nWidth;
-fprintf(stderr, setMaxWidthChars of %d\n, nWidth);
 queue_resize();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source include/svl sc/source sd/source svl/source

2013-06-24 Thread Armin Le Grand

 editeng/source/editeng/impedit2.cxx |   44 +---
 include/svl/undo.hxx|   13 ++-
 sc/source/ui/inc/undobase.hxx   |4 -
 sc/source/ui/inc/undodraw.hxx   |4 -
 sc/source/ui/undo/undobase.cxx  |   12 ---
 sc/source/ui/undo/undodraw.cxx  |   12 ---
 sd/source/ui/slidesorter/controller/SlsPageSelector.cxx |6 +
 svl/source/undo/undo.cxx|   57 +++-
 8 files changed, 88 insertions(+), 64 deletions(-)

New commits:
commit 91b8728108193706e142c25903c0dcd4ea8b0b21
Author: Armin Le Grand a...@apache.org
Date:   Sun Jun 23 11:25:32 2013 +

Resolves: #i120020# corrected paragraph merge...

corresponding undo and ownership of linked undo actions

(cherry picked from commit e58fe7afee5163833479b76a474416a77d95f075)

Conflicts:
editeng/source/editeng/impedit2.cxx
sc/source/ui/undo/undobase.cxx
sc/source/ui/undo/undodraw.cxx
svl/inc/svl/undo.hxx

Change-Id: I6672990558a496dfc692554437897d013e258f40

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 4bc6d70..d6e1de5 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2185,6 +2185,16 @@ EditPaM ImpEditEngine::ImpConnectParagraphs( 
ContentNode* pLeft, ContentNode* pR
 OSL_ENSURE( aEditDoc.GetPos( pLeft ) != EE_PARA_NOT_FOUND, Inserted node 
not found (1) );
 OSL_ENSURE( aEditDoc.GetPos( pRight ) != EE_PARA_NOT_FOUND, Inserted node 
not found (2) );
 
+// #i120020# it is possible that left and right are *not* in the desired 
order (left/right)
+// so correct it. This correction is needed, else an invalid 
SfxLinkUndoAction will be
+// created from ConnectParagraphs below. Assert this situation, it should 
be corrected by the
+// caller.
+if(aEditDoc.GetPos( pLeft )  aEditDoc.GetPos( pRight ))
+{
+OSL_ENSURE(false, ImpConnectParagraphs wit wrong order of 
pLeft/pRight nodes (!));
+std::swap(pLeft, pRight);
+}
+
 sal_Int32 nParagraphTobeDeleted = aEditDoc.GetPos( pRight );
 DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uIntPtr)pRight, 
nParagraphTobeDeleted );
 aDeletedNodes.push_back(pInf);
@@ -2301,18 +2311,34 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const 
EditSelection rSel, sal_uInt8 n
 else if ( nDelMode == DELMODE_RESTOFWORD )
 {
 aDelEnd = EndOfWord( aCurPos );
+
 if (aDelEnd.GetIndex() == aCurPos.GetIndex())
 {
-xub_StrLen nLen = aCurPos.GetNode()-Len();
-// end of para?
-if (aDelEnd.GetIndex() == nLen)
-aDelEnd = WordLeft( aCurPos );
-else // there's still sth to delete on the right
+const xub_StrLen nLen(aCurPos.GetNode()-Len());
+
+// #i120020# when 0 == nLen, aDelStart needs to be adapted, not
+// aDelEnd. This would (and did) lead to a wrong order in the
+// ImpConnectParagraphs call later.
+if(nLen)
+{
+// end of para?
+if (aDelEnd.GetIndex() == nLen)
+{
+aDelEnd = WordLeft( aCurPos );
+}
+else // there's still sth to delete on the right
+{
+aDelEnd = EndOfWord( WordRight( aCurPos ) );
+// if there'n no next word...
+if (aDelEnd.GetIndex() == nLen )
+{
+aDelEnd.SetIndex( nLen );
+}
+}
+}
+else
 {
-aDelEnd = EndOfWord( WordRight( aCurPos ) );
-// if there'n no next word...
-if (aDelEnd.GetIndex() == nLen )
-aDelEnd.SetIndex( nLen );
+aDelStart = WordLeft(aCurPos);
 }
 }
 }
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index f36cd81..c1054a6 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -46,17 +46,20 @@ public:
 };
 
 //
+class SfxLinkUndoAction;
 
 class SVL_DLLPUBLIC SfxUndoAction
 {
-sal_Bool bLinked;
+private:
+SfxLinkUndoAction*  mpSfxLinkUndoAction;
+
 public:
 TYPEINFO();
 SfxUndoAction();
 virtual ~SfxUndoAction();
 
-virtual sal_BoolIsLinked();
-virtual voidSetLinked( sal_Bool bIsLinked = sal_True );
+virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* 
pSfxLinkUndoAction);
+

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e5/8fe7afee5163833479b76a474416a77d95f075

 e5/8fe7afee5163833479b76a474416a77d95f075 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a1e37ab69a3b81cfcf94a02524de3ab3affabcc3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 16:08:33 2013 +0100

Notes added by 'git notes add'

diff --git a/e5/8fe7afee5163833479b76a474416a77d95f075 
b/e5/8fe7afee5163833479b76a474416a77d95f075
new file mode 100644
index 000..911ba83
--- /dev/null
+++ b/e5/8fe7afee5163833479b76a474416a77d95f075
@@ -0,0 +1 @@
+merged as: 91b8728108193706e142c25903c0dcd4ea8b0b21
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 2 commits - writerfilter/source

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   22 --
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |1 +
 writerfilter/source/rtftok/rtfsdrimport.cxx|   17 ++---
 3 files changed, 31 insertions(+), 9 deletions(-)

New commits:
commit 90aaecc1b4c62afcd41d988e4561c615403121a5
Author: Miklos Vajna vmik...@suse.cz
Date:   Mon Jun 24 14:13:39 2013 +0200

bnc#823655 fix RTF import of freeform shape coordinates

E.g. 0,1 was imported as 1,0, as we did not differentiate between not
having the coordinate yet and having it as zero.

(cherry picked from commit fe8d6ffa05c467bddb3480e43d7043a3d3c9)

Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx

Change-Id: Ia5fbbcc791dc9c6866ffd4c146793690661d81b4

diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 0258fe3..ebcd21f 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -40,6 +40,7 @@
 #include dmapper/DomainMapper.hxx
 #include ../dmapper/GraphicHelpers.hxx
 #include rtfsdrimport.hxx
+#include boost/optional.hpp
 
 using rtl::OString;
 using rtl::OStringBuffer;
@@ -173,19 +174,19 @@ void RTFSdrImport::resolve(RTFShape rShape)
 // The coordinates are in an (x,y) form.
 aToken = aToken.copy(1, aToken.getLength() - 2);
 sal_Int32 nI = 0;
-sal_Int32 nX = 0;
-sal_Int32 nY = 0;
+boost::optionalsal_Int32 oX;
+boost::optionalsal_Int32 oY;
 do
 {
 OUString aPoint = aToken.getToken(0, ',', nI);
-if (!nX)
-nX = aPoint.toInt32();
+if (!oX)
+oX.reset(aPoint.toInt32());
 else
-nY = aPoint.toInt32();
+oY.reset(aPoint.toInt32());
 }
 while (nI = 0);
-aCoordinates[nIndex].First.Value = nX;
-aCoordinates[nIndex].Second.Value = nY;
+aCoordinates[nIndex].First.Value = *oX;
+aCoordinates[nIndex].Second.Value = *oY;
 nIndex++;
 }
 }
commit 4869de23a6cc8d1f21041f856bac6822bbe963b1
Author: Eilidh McAdam eil...@lanedo.com
Date:   Wed Sep 19 09:45:49 2012 +0100

bnc#823655 Import RTF shape wrap property.

Property \shpwrN, where N can be
1: Wrap at top and bottom (no wrap at sides)
2: Wrap around shape
3: None (wrap as though shape isn't there)
4: Wrap tightly around shape
5: Wrap text through shape

Reviewed-on: https://gerrit.libreoffice.org/647
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
(cherry picked from commit d56e7c9011e662b39f0e9775e654f62cea8765c2)

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

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a89b3c0..67a26e3 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -35,6 +35,7 @@
 #include com/sun/star/text/HoriOrientation.hpp
 #include com/sun/star/text/VertOrientation.hpp
 #include com/sun/star/text/RelOrientation.hpp
+#include com/sun/star/text/WrapTextMode.hpp
 #include rtl/tencinfo.h
 #include svl/lngmisc.hxx
 #include unotools/ucbstreamhelper.hxx
@@ -617,7 +618,6 @@ int RTFDocumentImpl::resolvePict(bool bInline)
 {
 SvMemoryStream aStream;
 SvStream *pStream = 0;
-
 if (!m_pBinaryData.get())
 {
 pStream = aStream;
@@ -2692,6 +2692,23 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 
m_aStates.top().aCharacterAttributes.set(NS_ooxml::LN_CT_WrapSquare_wrapText, 
pValue);
 }
 break;
+case RTF_SHPWR:
+{
+switch (nParam)
+{
+case 1:
+m_aStates.top().aShape.nWrap = 
com::sun::star::text::WrapTextMode_NONE; break;
+case 2:
+m_aStates.top().aShape.nWrap = 
com::sun::star::text::WrapTextMode_PARALLEL; break;
+case 3:
+m_aStates.top().aShape.nWrap = 
com::sun::star::text::WrapTextMode_THROUGHT; break;
+case 4:
+m_aStates.top().aShape.nWrap = 
com::sun::star::text::WrapTextMode_PARALLEL; break;
+case 5:
+m_aStates.top().aShape.nWrap = 
com::sun::star::text::WrapTextMode_THROUGHT; break;
+}
+}
+break;
 case RTF_CELLX:
 {

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

 vcl/generic/glyphs/gcach_layout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ec6baba68aba6a66d161e545f0f7808f57ff011
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 16:20:51 2013 +0100

Resolves: fdo#66042 get the bounds of the current grapheme

Change-Id: I5b1808d74f0a1dd0d8b6ea22136e574c0a6e8e2a

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index 4826936..0f69e59 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -111,7 +111,7 @@ void ServerFontLayout::setNeedFallback(ImplLayoutArgs 
rArgs, sal_Int32 nCharPos
 OUString aRun(rArgs.mpStr);
 sal_Int32 nDone;
 sal_Int32 nGraphemeStartPos =
-mxBreak-previousCharacters(aRun, nCharPos, aLocale,
+mxBreak-previousCharacters(aRun, nCharPos+1, aLocale,
 i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
 sal_Int32 nGraphemeEndPos =
 mxBreak-nextCharacters(aRun, nCharPos, aLocale,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - i18npool/source

2013-06-24 Thread Herbert Dürr

 i18npool/source/search/textsearch.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8d5b2edaba1347c040b4fa12ad8e67cfda2832a4
Author: Herbert DÃ¼rr h...@apache.org
Date:   Mon Jun 24 14:55:16 2013 +

#i121880# fix case-sensitive non-regexp text search

Patch by: Tsutomu Uchino hanya.r...@gmail.com
Review by: Herbert Duerr h...@apache.org

diff --git a/i18npool/source/search/textsearch.cxx 
b/i18npool/source/search/textsearch.cxx
index f1c19c7..5c8dac6 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -64,7 +64,8 @@ static sal_Int32 COMPLEX_TRANS_MASK_TMP =
 TransliterationModules_ignoreKiKuFollowedBySa_ja_JP |
 TransliterationModules_ignoreProlongedSoundMark_ja_JP;
 static const sal_Int32 COMPLEX_TRANS_MASK = COMPLEX_TRANS_MASK_TMP | 
TransliterationModules_IGNORE_KANA | TransliterationModules_FULLWIDTH_HALFWIDTH;
-static const sal_Int32 SIMPLE_TRANS_MASK = ~(COMPLEX_TRANS_MASK | 
TransliterationModules_IGNORE_CASE | TransliterationModules_UPPERCASE_LOWERCASE 
| TransliterationModules_LOWERCASE_UPPERCASE);
+static const sal_Int32 SIMPLE_TRANS_MASK = ~COMPLEX_TRANS_MASK;
+static const sal_Int32 REGEX_TRANS_MASK = ~(COMPLEX_TRANS_MASK | 
TransliterationModules_IGNORE_CASE | TransliterationModules_UPPERCASE_LOWERCASE 
| TransliterationModules_LOWERCASE_UPPERCASE);
 // Above 2 transliteration is simple but need to take effect in
 // complex transliteration
 
@@ -705,7 +706,7 @@ void TextSearch::RESrchPrepare( const 
::com::sun::star::util::SearchOptions rOp
 {
 // select the transliterated pattern string
 const OUString rPatternStr =
-(rOptions.transliterateFlags  SIMPLE_TRANS_MASK) ? sSrchStr
+(rOptions.transliterateFlags  REGEX_TRANS_MASK) ? sSrchStr
 : ((rOptions.transliterateFlags  COMPLEX_TRANS_MASK) ? sSrchStr2 : 
rOptions.searchString);
 
 sal_uInt32 nIcuSearchFlags = UREGEX_UWORD; // request UAX#29 unicode 
capability
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Updates about Enhanced Database Ranges.

2013-06-24 Thread Akash Shetye

Hello all,

The progress so far is:
+Reading OOXML data from /styles.xml for Table styles.
+Imports Table Style Elements successfully, for first-second column
and first-second row data.
+Imports the Table styles as a whole represented by the
ScDBDataFormatting class in calc, also imports the table style name
+Nearing completion of associating ScDBData ranges with related
ScDBDataFormatting objects. This means processing the /table/*.xml
files' tableStyleInfo tag.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH]fdo#55846 Comboboxes werent displayed in vertical toolbars

2013-06-24 Thread Janit Anjaria

Hey !

Its been a little while i havent been on code due to bad health :( .
I just talked to Eike regarding this bug which i  have been working on
since late. i think it is a long time this bug has been pending. I am
done with the code , but yeah definitely i agree to the fact that
there might be UI problems ( though it works on my machine) i think
there can be made some change other than the hard coded values i have
used.

It would be great if someone can guide me on this so that i dont use
the hard coded values and have some other way to solve this bug.

Regards,
Janit

On 5/19/13, Janit Anjaria jani...@gmail.com wrote:
 Hey!
 I have taken a look into all the mentioned effects , but i still have a
 doubt regarding the constant value i have subtracted/added for the UI
 matter.
 As Eike mentiones i have removed the direct use of the value , rather
 replaced it with a variable holding that value .

 -- The question that arises is that the UI will surely depend on the
 screen size and also on the Operating System and hence the screen
 resolution.So how to overcome this issue of UI such that i can write some
 generalised code for the same.

 Any help would be appreciated.

 Regards,
 Janit


 On Sat, May 18, 2013 at 2:03 AM, Eike Rathke er...@redhat.com wrote:

 Hi Janit,

 On Wednesday, 2013-04-24 00:51:59 +0530, Janit Anjaria wrote:

  I am hereby submitting my patch.

 Sorry, that was lingering on the list too long. I'd also suggest that
 you don't explicitly Cc a developer when submitting a patch on the
 mailing list if s/he didn't ask for it. It leaves the impression to
 others reading the list that the dev on Cc would be responsible. Which
 I am not ;-)


  diff --git a/vcl/source/window/toolbox.cxx
 b/vcl/source/window/toolbox.cxx
  @@ -239,16 +239,16 @@ void ToolBox::ImplCalcBorder( WindowAlign eAlign,
 long rLeft, long rTop,
 
   if ( eAlign == WINDOWALIGN_TOP )
   {
  -rLeft   = borderwidth+dragwidth;
  +rLeft   = borderwidth+dragwidth-150;

 How did you derive the hardcoded value 150, where does it originate? To
 me it seems to be a value that by chance matches your screen,
 resolution, window size, current width of pane, and maybe more. It does
 not seem to be a generally applicable value. On the other hand, if it
 really was, a named constant value would be much better suited than
 repeating the hard coded value in several places throughout the code.

   else if ( eAlign == WINDOWALIGN_LEFT )
   {
  -rLeft   = borderwidth;
  +rLeft   = borderwidth-120;

 Same here, 120 what and why?

  -rRight  = 0;
  +rRight  = 15;

 And this 15?


  @@ -730,7 +730,7 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis,
 sal_uInt16 nCalcLines, sal_uIn
   else if ( nCalcMode == TB_CALCMODE_VERT )
   {
   pThis-mpData-mbAssumeDocked = sal_True;   // force
 non-floating mode during calculation
  -ImplCalcBorder( WINDOWALIGN_LEFT, nLeft, nTop, nRight,
 nBottom, pThis );
  + ImplCalcBorder( WINDOWALIGN_LEFT, nLeft, nTop, nRight,
 nBottom, pThis );

 Please don't screw up existing indentation if it is reasonable.

  -aSize.Width() = nCalcLines * pThis-mnMaxItemWidth;
  +aSize.Width() = ((nCalcLines) *
  ((pThis-mnMaxItemWidth)));

 The extra parentheses here only make the code harder to read and are not
 needed.


  @@ -1919,7 +1919,8 @@ sal_Bool ToolBox::ImplCalcItem()
   if( it-mbVisibleText  !mbHorz )
   {
   long tmp = it-maItemSize.Width();
  -it-maItemSize.Width() = it-maItemSize.Height();
  + //fdo#55846 The UI for the same is managed by changing
  the
 snippet here.
  +it-maItemSize.Width() = it-maItemSize.Height() +
 150;

 The 150 again.
 And please align comments with the code.
 The wording of the comment is not really helpful. It only states that
 something is done but does not explain. the UI is managed by changing
 the snippet doesn't mean anything to me. Comments, if necessary, should
 explain why something is done in the code, or clarify the non-obvious.


  @@ -1967,13 +1968,15 @@ sal_Bool ToolBox::ImplCalcItem()
   // it is only required for docked toolbars
 
   long nFixedWidth = nDefWidth+nDropDownArrowWidth;
  -long nFixedHeight = nDefHeight;
  +
  + long nFixedHeight = nDefHeight;

 Again, please don't screw up existing indentation if it is reasonable.

   else
  -nMaxWidth = nFixedWidth;
  + //fdo#55846(for maintaining and checking the UI the constant is
 added)
  +nMaxWidth = nFixedWidth + 250;

 Why is it the value 250?
 And please align comments with the code.
 Again, for maintaining and checking the UI the constant is added is
 not meaningful. Maintain and check? What? Where? How?


  @@ -2355,7 +2358,7 @@ void ToolBox::ImplFormat( sal_Bool bResize )
   if ( mnWinStyle  WB_BORDER )

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

 cui/uiconfig/ui/pastespecial.ui  |1 +
 include/vcl/edit.hxx |3 +++
 sfx2/uiconfig/ui/documentinfopage.ui |2 ++
 vcl/source/control/edit.cxx  |   20 +++-
 4 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 112ce9b1dc1cbf34bb6378ff2e61dba6144782c9
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jun 24 12:42:39 2013 +0100

Resolves: fdo#66105 set max growth width for labels/edits which take paths

Change-Id: I12220821f76550baacdc8ce604f2e612d260c1a1
(cherry picked from commit 9495e912797f67897a4a658d20137bb94f39e9ab)
Reviewed-on: https://gerrit.libreoffice.org/4481
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/cui/uiconfig/ui/pastespecial.ui b/cui/uiconfig/ui/pastespecial.ui
index fb08b9e..3eb4e7d 100644
--- a/cui/uiconfig/ui/pastespecial.ui
+++ b/cui/uiconfig/ui/pastespecial.ui
@@ -97,6 +97,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=wrapTrue/property
+property name=max_width_chars72/property
   /object
   packing
 property name=expandFalse/property
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 11c1ae8..6df1f7b 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -71,6 +71,7 @@ private:
 sal_uInt16  mnAlign;
 xub_StrLen  mnMaxTextLen;
 sal_Int32   mnWidthInChars;
+sal_Int32   mnMaxWidthChars;
 AutocompleteAction  meAutocompleteAction;
 sal_Unicode mcEchoChar;
 sal_BoolmbModified:1,
@@ -193,6 +194,8 @@ public:
 voidSetWidthInChars(sal_Int32 nWidthInChars);
 sal_Int32   GetWidthInChars() const { return mnWidthInChars; }
 
+voidsetMaxWidthChars(sal_Int32 nWidth);
+
 virtual voidSetSelection( const Selection rSelection );
 virtual const SelectionGetSelection() const;
 
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui 
b/sfx2/uiconfig/ui/documentinfopage.ui
index eeccbd0..f25a95a 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -275,6 +275,7 @@
 property name=can_focusFalse/property
 property name=xalign0/property
 property name=selectableTrue/property
+property name=max_width_chars56/property
   /object
   packing
 property name=left_attach1/property
@@ -336,6 +337,7 @@
 property name=can_focusFalse/property
 property name=xalign0/property
 property name=selectableTrue/property
+property name=max_width_chars56/property
   /object
   packing
 property name=left_attach1/property
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 20323b3..e8798a2 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -214,10 +214,21 @@ void Edit::SetWidthInChars(sal_Int32 nWidthInChars)
 }
 }
 
+void Edit::setMaxWidthChars(sal_Int32 nWidth)
+{
+if (nWidth != mnMaxWidthChars)
+{
+mnMaxWidthChars = nWidth;
+queue_resize();
+}
+}
+
 bool Edit::set_property(const OString rKey, const OString rValue)
 {
 if (rKey == width-chars)
 SetWidthInChars(rValue.toInt32());
+else if (rKey == max-width-chars)
+setMaxWidthChars(rValue.toInt32());
 else if (rKey == max-length)
 {
 sal_Int32 nTextLen = rValue.toInt32();
@@ -295,6 +306,7 @@ void Edit::ImplInitEditData()
 mnAlign = EDIT_ALIGN_LEFT;
 mnMaxTextLen= EDIT_NOLIMIT;
 mnWidthInChars  = -1;
+mnMaxWidthChars = -1;
 meAutocompleteAction= AUTOCOMPLETE_KEYINPUT;
 mbModified  = sal_False;
 mbInternModified= sal_False;
@@ -2886,8 +2898,14 @@ Size Edit::CalcMinimumSizeForText(const OUString 
rString) const
 }
 else
 {
+OUString aString;
+if (mnMaxWidthChars != -1  mnMaxWidthChars  rString.getLength())
+aString = rString.copy(0, mnMaxWidthChars);
+else
+aString = rString;
+
 aSize.Height() = GetTextHeight();
-aSize.Width() = GetTextWidth(rString);
+aSize.Width() = GetTextWidth(aString);
 aSize.Width() += ImplGetExtraOffset() * 2;
 // do not create edit fields in which one cannot enter anything
 // a default minimum width should exist for at least 3 characters
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.6.7.1'

2013-06-24 Thread Libreoffice Gerrit user

Tag 'libreoffice-3.6.7.1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-06-24 18:09 -0700

Tag libreoffice-3.6.7.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRyH1VAAoJEPQ0oe+v7q6jtRUQAI0yQ4bG5ir/VAV84xswDyDv
1uNLN1yzsnFvZY3mAwfszl0rwSMStOJkdf4ksWyz+A8FV1Co5GVJEEWhVCtcoen0
L6UY+TXPDBxnh9a3Q3E2qpeU5JysEewcS6eQYd0zzzfcyMEfRq/acviXQbZ/X82n
2YI0uWz1S0T3cGzm/31xvgMmmgATmXgstQs7rEUzztWH5See2WVIHtU2nGXZvdSw
Ocg1DBoHRDE0L/s3QiW5zDOa5RroupTIv9HjnD7XD7JTXwRF/FUBRW59T6wtRjFi
fo//IMVDNcVs29yffwSx1J8J7Y/yxLgaoFRcThJKTUCN+xRLY8ctN2frDaTBg8id
6Urxlv+58QCHeZZ9tW4fxf85jq4jqMwvXcHOYfeZ4+oppa6hizOb7RMIv2LepLz/
vgvmk9jWKM17zJ6j3KEkq63E54+XlNnkGmbjaY/OHBEhLqS66ST5iDVQjFS42ORc
l1t3d7h9JTMO318QR+6K9elieKV7/yW4+wJ6sU2BFgX+2om1S/vCkzCUNFF7TAaG
WijL5JHTuJI46W6EJW9D2yErP8H7al37OKE17IV54GQyW505uqhWuvNgM4jBmvzP
aCgZN2WGhEE3jiRBvsqdXrsWm0W1HfzhheEgw5gKjhb7FKFINHvTV5LlR26yjw7k
Eo+pkrtj/Miu6frlnvj5
=3hKV
-END PGP SIGNATURE-

Changes since libreoffice-3-6-branch-point-7:
---
 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-3.6.7.1'

Tag 'libreoffice-3.6.7.1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-06-24 18:09 -0700

Tag libreoffice-3.6.7.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRyH1XAAoJEPQ0oe+v7q6jt60P/3hjGZW4vWeOpM/Kj3CD62m2
6aLGxcc+oi30UZqREw4VIsqs/MreOVg0yi6UQg3Wv2TXHDWgV1e52u03uG5a7riP
upG3sfArc13yj/Jaegm4z84hSXrSPpBTMSoD503aqCXZ23SUdm/DjvbHuzyI5knJ
+0xzH0AsTSmKLU75rzMICHXlhLks7sjh7h5TT1YrqoxVzuXMTfVOM2Y5Wn/Dc4mt
1XrliaSsd8XYDARwdtmB1t8e2d/IVdwRr07x+iGjOKES8qpl3/sJDW1uEcYodne+
Bd/v9fsZH5WRw8KxPgcjjo9iiBn12/zOnDBn8JIO4p4suSPJS9zcTpcZRwZ9KKyo
xPO3JHihL6w7RT2ri0aSgZiqhtX3yqP8clugZExPaDk2aMh2m+pvZcZ8W+6D3scW
9NE2pQm3Io0gAH/eACOI2hE9v7W9Fop/m0XGJW/TNKtVWuw9HizD4GYsiJ9hfVMP
SxjGgCIbxrQMD7j/yJJuinxSFYALZMitO4Z7hm7QmflJZaBJQf6G/hzoZ8maq7fB
tCEsRpZk2p1wKTpQtwwt1qVac2aZwbhlAhStsKBXpfouwCrm0cvpt6Hu2FZM0C1z
OgBYY0xZOBUVv//pHlYalFnMRwUdBLJWjQdJYOpW1FvBwSX6Met1qWhAVd4wuysC
Yxx8THUVaY04J0PoVh62
=4uhF
-END PGP SIGNATURE-

Changes since libreoffice-3-6-branch-point-29:
---
 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-3.6.7.1'

Tag 'libreoffice-3.6.7.1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-06-24 18:09 -0700

Tag libreoffice-3.6.7.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRyH1TAAoJEPQ0oe+v7q6j5yEP/3zkj6IYYQ7Vldz9pw/O+8I3
hWi7J/BK37hyFf6BdOLZqPqVBZ3T/F2B2IEdldXEy6Kw83sE6JYmCWYn+iiPnhAv
LuQp85QhMiVPh2hknrZsd3qJHMZyR88BiHWbV/li9RluUJc0wZlvvynQBmLAgfg/
ASpBilvTjTdH0YhiZXtsRk8rkWMu2J2gDs3gm8q8N2UhWcSyjoQmsZxMDSyu67q9
ShCj4vzwqSmP/rg6x2a3+IgBYXXQUhOuf1qJzFqHiGxxjY/PMF8uuqtKZyhg2Qkn
co3uJ2kPdqzOOMnxOlOMt8UKCNdievn+8AZ2ny40xL8XcwmRh2NFnX3xQxw2QJ3Q
HAOeafM3qQ0Z3GjqYqZjGtFp/YdoSf5kZw8QEkkjvnJtT4ZWAPkKCTQao7HK6Poq
1E7IJJpKWzSTGSGGBKV1LmA0ohOiQixjsfS0pDu68m8VeROdKybnq/kt6K/Pydw8
xyI++kM6BaxRZB92vsZXHxx04iIvVavxCPRtK6pLIkDQE7maHUeeQwcbkYbINSYO
jEwyHfr1nGpuXDL9A9YzsHhcdjEdgxNG/OXRieP/Id3VBPPTq4MqfQRsgbXejBCg
AEkOCg+39aM4VgJFnLKYhHDk5kQOiyWYKKIgry528SIQMUFGIW/UdhFx7oxqDkaS
i0yZrLb2sbcmPWniwv3J
=b9s9
-END PGP SIGNATURE-

Changes since libreoffice-3-6-branch-point-1142:
---
 0 files changed
---
___
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-3.6.7.1'

Tag 'libreoffice-3.6.7.1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-06-24 18:09 -0700

Tag libreoffice-3.6.7.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRyH1WAAoJEPQ0oe+v7q6jTj8P/0n2Q/llrfUSFUfw2MJpvEap
R/cPYYGUcW4ttEV6pDsemVsReap74Bq9BxaLsserhQgpNVolOpodq0aA/A7eNxGQ
Lfm1Fq23+PROrEZNhR16cJ5PsmeYUk383dxPKWXX9xfOWucvzLrjqTduEyymxXMA
4fG+CXRQVYRLkrALm5poM59oIbhKZt55pn5h7vl3YMmwX/7aUPM2b+JUKTU/xmLP
topa6qwjQfmgS/qw6qywS17M+8zsF8P0pA7qe7x7dsS/VGTe/dKQbX1iYHhyBCkr
p5EszdkTWPgb4HSDtH439SqhQrKLbgH+nVl/GKKOiDek5S2c81I0/VUFGmyvyOCg
Z2/8m24qGSadW3X8Errur7lXgUKlHWj4rbDQKWFSzx2Do9st9gNsmJXO5RAzz1SR
FaiR+5bfgdloMjLtlmbOJTi41SSiwr77kKXgrZoLPSPFyDlgdMVW7L7woQU2t5uZ
Q141PiRWR0ixTbzUJtS5RtIQ+a/j9O9B9xDYN+3wX5kCKJ6tsREqa9ofItUV/7pc
IuAtgL+0+e6Lu3J+E12340kpMsGI21a+OO/cdnADULV1sqDIYpj9HE/sK8mU8lUe
yVgrwl5Tcei0X5XynPIN6TDNaz4AiiwZm2g4ZZuzCjvCHbdlZnwmiBkzbmhjCdFb
irKLoC5VTBQrAXq9d2tw
=UMLJ
-END PGP SIGNATURE-

Changes since libreoffice-3-6-branch-point-19:
---
 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 'libreoffice-3-6-7'

New branch 'libreoffice-3-6-7' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'libreoffice-3-6-7'

2013-06-24 Thread Libreoffice Gerrit user

New branch 'libreoffice-3-6-7' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

Tag 'libreoffice-3.6.7.1' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-06-24 18:09 -0700

Tag libreoffice-3.6.7.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAABAgAGBQJRyH1YAAoJEPQ0oe+v7q6jPe8P/0U9dqYLAnMMs9XI0Ry0rXc4
iyKDeH9N46I90lnKHhtIBVMuUy1CSgYr9jjVo9ZfsQSYT4KYRx36DWXM9p2njkM5
xBQOHgf9+QBIp9Utm3GsAZsFbpQ1Denqn+yN6Mnu5cwcNP5dPab1ajFfqy95RXGR
hiORvvdE5FLiGn50ZQWlVG5ZRbtKGrfaPUB8SLQ85I/uOUMJUFWj2c6lhRd0HzgR
QK8YaQQ0+bEmzFFEEOA88GWW/gkJVi9lNpS6IMO272k3On9r6cxNq8EXax1IZTeq
RPcHmqfP5sWKuVEmsQvhG4rgn/GqL+qRCDD4PYOp5Mwedbyu/8lT0BFcC2ntt9Rg
xpOwsAF4m/cTWxPekfUk3mgfi/gHz0a4tGMN7O4rdShQ96XbZ8Qs3XVjf6jvbU3p
O4HFbJVraOQVy1vPJRP1GQ9rENPntScgGPvzsHgz5g36wV+lztHxdlv2RDfJl+Ku
x8pnkvBHb3/kIs6wZYPDBX8fWZ7PWr3Yeu4CanMkHdd318pKC5bqvFQHouaSwZyt
gQ0nqmGXNmkCgMUs8vdfov7K3FKnRQG36d94krGvO/8Yap/uu3i6Piruh6+/1GSc
F494N/R+Ow7rl/yY44Wh5/Fe69HHgmozqNmHmlGH/erxcdutG622IcYG0LiU+a78
A6BWmRg+JOd/wAYPx8En
=tdaa
-END PGP SIGNATURE-

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

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-3-6-7'

New branch 'libreoffice-3-6-7' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'libreoffice-3-6-7'

New branch 'libreoffice-3-6-7' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-3-6-7'

New branch 'libreoffice-3-6-7' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6-7' - instsetoo_native/util