date:20140120

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

Cédric Bosdonnat cedric.bosdonnat@free.fr changed:

   What|Removed |Added

 CC|cedric.bosdonnat.ooo@free.f |
   |r   |

--- Comment #21 from Cédric Bosdonnat cedric.bosdonnat@free.fr ---
Restricted my LibreOffice hacking area

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

[Bug 32531] Incorrect cursor key movement between table cells of different directionality

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

Cédric Bosdonnat cedric.bosdonnat@free.fr changed:

   What|Removed |Added

 CC|cedric.bosdonnat.ooo@free.f |
   |r   |

--- Comment #13 from Cédric Bosdonnat cedric.bosdonnat@free.fr ---
Restricted my LibreOffice hacking area

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

[Bug 60739] cut/paste coding redux

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

Cédric Bosdonnat cedric.bosdonnat@free.fr changed:

   What|Removed |Added

 CC|cedric.bosdonnat.ooo@free.f |
   |r   |

--- Comment #6 from Cédric Bosdonnat cedric.bosdonnat@free.fr ---
Restricted my LibreOffice hacking area

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

[Bug 50763] HTML Import doesnt parse inline base64 images correctly

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

Cédric Bosdonnat cedric.bosdonnat@free.fr changed:

   What|Removed |Added

 CC|cedric.bosdonnat.ooo@free.f |
   |r   |

--- Comment #5 from Cédric Bosdonnat cedric.bosdonnat@free.fr ---
Restricted my LibreOffice hacking area

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

[Libreoffice-commits] core.git: solenv/bin

 solenv/bin/make-raspbian-root-tarball |   79 ++
 1 file changed, 79 insertions(+)

New commits:
commit 1c49746b4b96d25bf7609c607390b81492a9e3b8
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Jan 20 10:55:22 2014 +0200

Add script to extract a hackish sysroot tarball from a Raspbian system

To be used when cross-compiling to Raspbian without proper cross-compilation
packages that would contain the necessary headers and libraries.

Change-Id: I342771e6ea9baaa2500c8c7ad7b3b42d12924461

diff --git a/solenv/bin/make-raspbian-root-tarball 
b/solenv/bin/make-raspbian-root-tarball
new file mode 100755
index 000..38a64e2
--- /dev/null
+++ b/solenv/bin/make-raspbian-root-tarball
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+# When lacking a proper cross-compilation package system from Linux
+# (or some other Unix) to Raspbian, instead create a tarball of
+# headers, libraries and pkg-config files on a Raspbian system and
+# unpack that then on the build system, and pass in a -sysroot switch
+# to the cross-compiler.
+
+cd /
+
+# Exclude irrelevant stuff, like shared libraries that actually are
+# modules loaded at run-time by some software.
+
+EXCLUDE='lib/ld-linux \
+lib/klibc- \
+lib/arm-linux-gnueabihf/security/ \
+usr/lib/arm-linux-gnueabihf/ImageMagick- \
+usr/lib/arm-linux-gnueabihf/autofs/ \
+usr/lib/arm-linux-gnueabihf/directfb- \
+usr/lib/arm-linux-gnueabihf/gconv/ \
+usr/lib/arm-linux-gnueabihf/gdbus- \
+usr/lib/arm-linux-gnueabihf/gdk-pixbuf- \
+usr/lib/arm-linux-gnueabihf/gio/ \
+usr/lib/arm-linux-gnueabihf/gvfs/ \
+usr/lib/arm-linux-gnueabihf/jack/ \
+usr/lib/arm-linux-gnueabihf/libgphoto2/ \
+usr/lib/arm-linux-gnueabihf/libgphoto2_port/ \
+usr/lib/arm-linux-gnueabihf/libgtk-2.0/ \
+usr/lib/arm-linux-gnueabihf/libgtk-3.0/ \
+usr/lib/arm-linux-gnueabihf/libproxy/ \
+usr/lib/arm-linux-gnueabihf/odbc/ \
+usr/lib/arm-linux-gnueabihf/pango/ \
+usr/lib/arm-linux-gnueabihf/plymouth/ \
+usr/lib/arm-linux-gnueabihf/qt4/ \
+usr/lib/arm-linux-gnueabihf/sane \
+usr/lib/libblas.so \
+usr/lib/liblapack.so'
+
+EXCLUDE=`echo $EXCLUDE | tr -d '
+' | sed -e 's/ /|/g'`
+
+FILELIST=`mktemp`
+STAGINGDIR=`mktemp -d`
+
+find lib/*.so* \
+ lib/arm-linux-gnueabihf \
+ usr/include \
+ usr/lib/liblpsolve*.a \
+ usr/lib/*.so* \
+ usr/lib/arm-linux-gnueabihf \
+ usr/lib/pkgconfig \
+ usr/share/pkgconfig \
+-type f -o -type l |
+grep -v -E ^($EXCLUDE) $FILELIST
+
+tar -c --files-from=$FILELIST -f - | (cd $STAGINGDIR  tar xf -)
+
+rm $FILELIST
+
+cd $STAGINGDIR
+# Change absolute symlinks to relative
+find . -type l | xargs ls -ld | grep -- '- /' | 
+while read mode links user group size month day yearortime link arrow 
target; do
+   target=`echo $target | sed -e 's,/,..;,'`
+   while test `expr index $target /` -gt 0; do
+   target=`echo $target | sed -e 's,/,;,'`
+   target=..;$target
+   done
+   target=`echo $target | sed -e 's,;,/,g'`
+   ln -f -s $target $link
+done
+
+RESULT=/tmp/raspbian-root-`date +%Y%m%d`.tar.gz
+tar czf $RESULT .
+
+cd /
+rm -rf $STAGINGDIR
+
+echo === Result in $RESULT ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 43514] UI: Need an easy way to get from current position in a document to the corresponding position in the Navigatior dialog's header tree

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

Cédric Bosdonnat cedric.bosdonnat@free.fr changed:

   What|Removed |Added

 CC|cedric.bosdonnat.ooo@free.f |
   |r   |

--- Comment #8 from Cédric Bosdonnat cedric.bosdonnat@free.fr ---
Restricted my LibreOffice hacking area

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

[Bug 46583] borders tabpage UI doesn't display border properties nicely when lines are different

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

Cédric Bosdonnat cedric.bosdonnat@free.fr changed:

   What|Removed |Added

 CC|cedric.bosdonnat.ooo@free.f |
   |r   |

--- Comment #6 from Cédric Bosdonnat cedric.bosdonnat@free.fr ---
Restricted my LibreOffice hacking area

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

[Bug 30873] Field variables break with additional formats

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

Cédric Bosdonnat cedric.bosdonnat@free.fr changed:

   What|Removed |Added

 CC|cedric.bosdonnat.ooo@free.f |
   |r   |

--- Comment #12 from Cédric Bosdonnat cedric.bosdonnat@free.fr ---
Restricted my LibreOffice hacking area

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

[Bug 42982] improve UNO API error reporting

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

Cédric Bosdonnat cedric.bosdonnat@free.fr changed:

   What|Removed |Added

 CC|cedric.bosdonnat.ooo@free.f |
   |r   |

--- Comment #12 from Cédric Bosdonnat cedric.bosdonnat@free.fr ---
Restricted my LibreOffice hacking area

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

[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications

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

Cédric Bosdonnat cedric.bosdonnat@free.fr changed:

   What|Removed |Added

 CC|cedric.bosdonnat.ooo@free.f |
   |r   |

--- Comment #34 from Cédric Bosdonnat cedric.bosdonnat@free.fr ---
Restricted my LibreOffice hacking area

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

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

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

New commits:
commit bcd9a318dc524c31c3a5544b2181efdb305045f6
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Dec 13 09:50:52 2013 +0200

WaE: variable 'itResEnd' set but not used

Change-Id: I6594472b1e93c083fdc52133a6b120c031dff64a
(cherry picked from commit 49ce8c126c962d75e2fefd5b4a578c213ff6a9bf)
Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 2a048ae..b5510f6 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5630,7 +5630,7 @@ double ScInterpreter::IterateParametersIfs( ScIterFuncIfs 
eFunc )
 }
 else
 {
-std::vectorsal_uInt8::const_iterator itRes = 
aResArray.begin(), itResEnd = aResArray.end();
+std::vectorsal_uInt8::const_iterator itRes = 
aResArray.begin();
 for (size_t nCol = 0; nCol  nColSize; ++nCol)
 {
 for (size_t nRow = 0; nRow  nRowSize; ++nRow, ++itRes)
___
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' - 3e/878f6ea157ec0aaa47c1f4dbaf039b9de1a103

 3e/878f6ea157ec0aaa47c1f4dbaf039b9de1a103 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b762756010baeca0b46b8fb2c0dd37c862e5b725
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 09:36:05 2014 +

Notes added by 'git notes add'

diff --git a/3e/878f6ea157ec0aaa47c1f4dbaf039b9de1a103 
b/3e/878f6ea157ec0aaa47c1f4dbaf039b9de1a103
new file mode 100644
index 000..b8e2273
--- /dev/null
+++ b/3e/878f6ea157ec0aaa47c1f4dbaf039b9de1a103
@@ -0,0 +1 @@
+prefer: 2963474ff151f75738606f7826fa9c9b8403a9cb
___
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' - 5c/c9cb9c52617bab6eb6d84331dde8f3d580ee31

 5c/c9cb9c52617bab6eb6d84331dde8f3d580ee31 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 191645e4ed713511d5bf187f2cd7286016a3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 09:41:10 2014 +

Notes added by 'git notes add'

diff --git a/5c/c9cb9c52617bab6eb6d84331dde8f3d580ee31 
b/5c/c9cb9c52617bab6eb6d84331dde8f3d580ee31
new file mode 100644
index 000..8a2345e
--- /dev/null
+++ b/5c/c9cb9c52617bab6eb6d84331dde8f3d580ee31
@@ -0,0 +1 @@
+ignore: fixed
___
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' - 1f/9d7c4c63b90ddffa2bb975efb61c4ae3221e56

 1f/9d7c4c63b90ddffa2bb975efb61c4ae3221e56 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bf7cbb37bdac28bf6d17a97e8d821ad9900dace9
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 09:42:23 2014 +

Notes added by 'git notes add'

diff --git a/1f/9d7c4c63b90ddffa2bb975efb61c4ae3221e56 
b/1f/9d7c4c63b90ddffa2bb975efb61c4ae3221e56
new file mode 100644
index 000..53b06c0
--- /dev/null
+++ b/1f/9d7c4c63b90ddffa2bb975efb61c4ae3221e56
@@ -0,0 +1 @@
+prefer: 296cd762c9730ead75767cf7bbc5f5845f18168b
___
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' - 26/4a2a318aa9e26eb37b07d6676f96045e88ea3d

 26/4a2a318aa9e26eb37b07d6676f96045e88ea3d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dbceab581b8860614071f509609ba60b73a24e33
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 09:44:16 2014 +

Notes added by 'git notes add'

diff --git a/26/4a2a318aa9e26eb37b07d6676f96045e88ea3d 
b/26/4a2a318aa9e26eb37b07d6676f96045e88ea3d
new file mode 100644
index 000..1597a61
--- /dev/null
+++ b/26/4a2a318aa9e26eb37b07d6676f96045e88ea3d
@@ -0,0 +1 @@
+prefer: 14953fa09a6047313fc970e11ecbf1f7b0cb08b0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/qa/extras/rtfimport/rtfimport.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit be88ec3d9695df49409980fde20e8a428be61ce0
Author: Tor Lillqvist t...@collabora.com
Date:   Sat Nov 23 09:33:00 2013 +0200

WaE: macro is not used

Change-Id: I7748517d2298c20e4fd6c6ebf403a2ccc8228054
(cherry picked from commit 3e7b69ae3504a32e142cbf538b751ade38fbfdba)
Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 19c80f7..2c2e486 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -49,8 +49,6 @@
 
 #include bordertest.hxx
 
-#define TWIP_TO_MM100(TWIP) ((TWIP) = 0 ? (((TWIP)*127L+36L)/72L) : 
(((TWIP)*127L-36L)/72L))
-
 class Test : public SwModelTestBase
 {
 public:
___
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' - b3/63d736060a8ebe2117a37e0dfbd2e164f31db7

 b3/63d736060a8ebe2117a37e0dfbd2e164f31db7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bbc41f115b4146758f813c1a28cd2bd17be1356f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 09:50:31 2014 +

Notes added by 'git notes add'

diff --git a/b3/63d736060a8ebe2117a37e0dfbd2e164f31db7 
b/b3/63d736060a8ebe2117a37e0dfbd2e164f31db7
new file mode 100644
index 000..b0ae7e3
--- /dev/null
+++ b/b3/63d736060a8ebe2117a37e0dfbd2e164f31db7
@@ -0,0 +1 @@
+merged as: 6874e5e291e9c643eaf06a84a6e5a32be496a37a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/dbgui/validate.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6874e5e291e9c643eaf06a84a6e5a32be496a37a
Author: Tsutomu Uchino ha...@apache.org
Date:   Sat Jan 18 14:34:06 2014 +

Resolves: #i92785# fix label from Allow blank cells to...

Allow empty cells on Criteria tab of Validity dialog

Suggest By: joropojor...@pioneerwireless.net
(cherry picked from commit b363d736060a8ebe2117a37e0dfbd2e164f31db7)

Change-Id: I76eb3bb567bb24498f987d62dd970731faff4b83

diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src
index b832d30..aa24552 100644
--- a/sc/source/ui/dbgui/validate.src
+++ b/sc/source/ui/dbgui/validate.src
@@ -125,7 +125,7 @@ TabPage TP_VALIDATION_VALUES
 Pos = MAP_APPFONT ( 80 - OFFSET_X , 30 ) ;
 Size = MAP_APPFONT ( 174 , 10 ) ;
 TabStop = TRUE ;
-Text [ en-US ] = Allow ~blank cells ;
+Text [ en-US ] = Allow ~empty cells ;
 };
 CheckBox CB_SHOWLIST
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/source/window/printdlg.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1cf4fd9f55b950991672428257d7242b234edc30
Author: Tsutomu Uchino ha...@apache.org
Date:   Sat Jan 18 08:49:15 2014 +

Related: #i56998# add space separator between value and unit...

in fixed line around the preview on print dialog

(cherry picked from commit 99d599a9ff636dc16b42889ca5d2d7323f45cae4)

Conflicts:
vcl/source/window/printdlg.cxx

Change-Id: I632766cfbc89be32f5991890df0c5cc918263f00

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index bff8cf5..b19a53c 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -231,7 +231,8 @@ void PrintDialog::PrintPreviewWindow::setPreview( const 
GDIMetaFile i_rNewPrevi
 }
 Size aLogicPaperSize( LogicToLogic( i_rOrigSize, MapMode( MAP_100TH_MM ), 
MapMode( eUnit ) ) );
 OUString aNumText( rLocWrap.getNum( aLogicPaperSize.Width(), nDigits ) );
-aBuf.append( aNumText );
+aBuf.append( aNumText )
+.append( sal_Unicode( ' ' ) );
 aBuf.appendAscii( eUnit == MAP_MM ? mm : in );
 if( !i_rPaperName.isEmpty() )
 {
@@ -242,7 +243,8 @@ void PrintDialog::PrintPreviewWindow::setPreview( const 
GDIMetaFile i_rNewPrevi
 maHorzDim.SetText( aBuf.makeStringAndClear() );
 
 aNumText = rLocWrap.getNum( aLogicPaperSize.Height(), nDigits );
-aBuf.append( aNumText );
+aBuf.append( aNumText )
+.append( sal_Unicode( ' ' ) );
 aBuf.appendAscii( eUnit == MAP_MM ? mm : in );
 maVertDim.SetText( aBuf.makeStringAndClear() );
 
___
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' - 99/d599a9ff636dc16b42889ca5d2d7323f45cae4

 99/d599a9ff636dc16b42889ca5d2d7323f45cae4 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 717d037bdd454b825eafdd97c0ea7c8f9dfa4839
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 10:01:47 2014 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sc/source solenv/bin svx/source

 sc/source/ui/src/scfuncs.src  |2 -
 solenv/bin/modules/installer/download.pm  |   15 +---
 solenv/bin/modules/installer/windows/component.pm |   37 +++---
 solenv/bin/modules/installer/windows/directory.pm |3 +
 solenv/bin/modules/installer/windows/feature.pm   |3 +
 solenv/bin/modules/installer/windows/msiglobal.pm |3 +
 solenv/bin/modules/installer/windows/registry.pm  |6 ++-
 svx/source/sidebar/area/AreaPropertyPanel.src |2 -
 8 files changed, 41 insertions(+), 30 deletions(-)

New commits:
commit 6e2c0fef5906a0b48384b21fda6f63e7485ce00d
Author: Tsutomu Uchino ha...@apache.org
Date:   Mon Jan 20 09:55:08 2014 +

#i56998# add space before percent character in text and quick help

diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index d54afd6..f4116f8 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -5448,7 +5448,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
 };
 String 5 // Description of Parameter 2
 {
-Text [ en-US ] = The type of the quartile (0 = MIN, 1 = 25%, 2 = 
50 %, 3 = 75 %, 4 =MAX). ;
+Text [ en-US ] = The type of the quartile (0 = MIN, 1 = 25 %, 2 = 
50 %, 3 = 75 %, 4 = MAX). ;
 };
 };
  // -=*# Resource for function KGRÃSSTE #*=-
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src 
b/svx/source/sidebar/area/AreaPropertyPanel.src
index dba3cfe..5d31457 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -285,7 +285,7 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR
 Border = TRUE ;
 Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
 HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_SVALUE ;
-QuickHelpText [ en-US ] = Enter a transparency value for the 
beginning point of the gradient, where 0% is fully opaque and 100 % is fully 
transparent. ;
+QuickHelpText [ en-US ] = Enter a transparency value for the 
beginning point of the gradient, where 0 % is fully opaque and 100 % is fully 
transparent. ;
 TabStop = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
commit 9d2066ac820a3b4ecf84d591d19c8b8d2bdecdd8
Author: Andre Fischer a...@apache.org
Date:   Mon Jan 20 09:00:29 2014 +

Fixed build breaker: Perl operator // not defined on all systems.

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index de73339..5cf45c2 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -829,13 +829,16 @@ sub resolve_variables_in_downloadname
 
 # Typical name: soa-{productversion}-{extension}-bin-{os}-{languages}
 
-my $productversion = $allvariables-{'PRODUCTVERSION'} // ;
+my $productversion = $allvariables-{'PRODUCTVERSION'};
+$productversion =  unless defined $productversion;
 $downloadname =~ s/\{productversion\}/$productversion/;
 
-my $packageversion = $allvariables-{'PACKAGEVERSION'} // ;
+my $packageversion = $allvariables-{'PACKAGEVERSION'};
+$packageversion =  unless defined $packageversion;
 $downloadname =~ s/\{packageversion\}/$packageversion/;
 
-my $extension = $allvariables-{'SHORT_PRODUCTEXTENSION'} // ;
+my $extension = $allvariables-{'SHORT_PRODUCTEXTENSION'};
+$extension =  unless defined $extension;
 $extension = lc($extension);
 $downloadname =~ s/\{extension\}/$extension/;
 
@@ -1049,7 +1052,8 @@ sub put_publisher_into_template ($$)
 {
 my ($templatefile, $variables) = @_;
 
-my $publisher = $variables-{'OOOVENDOR'} // ;
+my $publisher = $variables-{'OOOVENDOR'};
+$publisher =  unless defined $publisher;
 
 replace_one_variable($templatefile, PUBLISHERPLACEHOLDER, $publisher);
 }
@@ -1062,7 +1066,8 @@ sub put_website_into_template ($$)
 {
 my ($templatefile, $variables) = @_;
 
-my $website = $variables-{'STARTCENTER_INFO_URL'} // ;
+my $website = $variables-{'STARTCENTER_INFO_URL'};
+$website =  unless defined $website;
 
 replace_one_variable($templatefile, WEBSITEPLACEHOLDER, $website);
 }
diff --git a/solenv/bin/modules/installer/windows/component.pm 
b/solenv/bin/modules/installer/windows/component.pm
index 0383852..4f75fac 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -104,11 +104,12 @@ sub get_file_component_directory_for_file ($$)
 {
 my ($onefile, $dirref) = @_;
 
-my $localstyles = $onefile-{'Styles'} // ;
+my $localstyles = $onefile-{'Styles'};
+$localstyles =  unless defined $localstyles;
 
 if ( $localstyles =~ /\bFONT\b/ )   # special handling for font files
 {
-return $installer::globals::fontsfolder;
+return $installer::globals::fontsfolder;
 }
 
 my $destdir = ;
@@ -117,7 +118,7 @@ sub get_file_component_directory_for_file ($$)
 
 if ( $destdir

New Developer

2014-01-20 Thread Manohar Kh

Hello , I am a new developer with some experience in c++ as well as android
. I want to be a contributer and start developing for Libre-Office . I
wanted to know from where I could start developing or if I could get some
bug assigned to me , anything would be helpful .
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 writerfilter/source/dmapper/FontTable.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 01fc6acdf2aa836bdb54cae48fd5b89a7313c094
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Jan 20 12:12:11 2014 +0200

WaE: comparison between signed and unsigned integer expressions

Change-Id: I64c869fbc89ca18a4cc0f7f2a7a8f9d729c7a66d

diff --git a/writerfilter/source/dmapper/FontTable.cxx 
b/writerfilter/source/dmapper/FontTable.cxx
index 89ef2f5..f40c478 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -64,11 +64,11 @@ void FontTable::lcl_attribute(Id Name, Value  val)
 switch(Name)
 {
 case NS_ooxml::LN_CT_Pitch_val:
-if (nIntValue == NS_ooxml::LN_Value_ST_Pitch_fixed)
+if (static_castId(nIntValue) == 
NS_ooxml::LN_Value_ST_Pitch_fixed)
 m_pImpl-pCurrentEntry-nPitchRequest = awt::FontPitch::FIXED;
-else if (nIntValue == NS_ooxml::LN_Value_ST_Pitch_variable)
+else if (static_castId(nIntValue) == 
NS_ooxml::LN_Value_ST_Pitch_variable)
 m_pImpl-pCurrentEntry-nPitchRequest = 
awt::FontPitch::VARIABLE;
-else if (nIntValue == NS_ooxml::LN_Value_ST_Pitch_default)
+else if (static_castId(nIntValue) == 
NS_ooxml::LN_Value_ST_Pitch_default)
 m_pImpl-pCurrentEntry-nPitchRequest = 
awt::FontPitch::DONTKNOW;
 else
 SAL_WARN(writerfilter, FontTable::lcl_attribute: unhandled 
NS_ooxml::CT_Pitch_val:   nIntValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svtools/source/control/ctrlbox.cxx |3 +--
 svx/source/dialog/relfld.cxx   |3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 66ff6924d50fc77e7a3e80c74a12a088a874df8b
Author: Tsutomu Uchino ha...@apache.org
Date:   Sun Jan 19 14:16:45 2014 +

Related: #i56998# use FUNIT_PERCENT on fields that allow relative value

(cherry picked from commit fc6fc5b576b972a8ea0551091cc57aa1cfe1334d)

Conflicts:
svtools/source/control/ctrlbox.cxx
svx/source/dialog/relfld.cxx

Change-Id: Ic8f0f550dbbcab0678fbeb9bf45a478b0cea642d

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index 80de8e5..b77b737 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1896,8 +1896,7 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative )
 SetDecimalDigits( 0 );
 SetMin( nRelMin );
 SetMax( nRelMax );
-SetCustomUnitText(OUString('%'));
-SetUnit( FUNIT_CUSTOM );
+SetUnit( FUNIT_PERCENT );
 
 Clear();
 sal_uInt16 i = nRelMin;
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 67a4a59..4d5a505 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -102,8 +102,7 @@ void SvxRelativeField::SetRelative( sal_Bool bNewRelative )
 SetDecimalDigits( 0 );
 SetMin( nRelMin );
 SetMax( nRelMax );
-SetCustomUnitText( OUString('%') );
-SetUnit( FUNIT_CUSTOM );
+SetUnit( FUNIT_PERCENT );
 }
 else
 {
___
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' - fc/6fc5b576b972a8ea0551091cc57aa1cfe1334d

 fc/6fc5b576b972a8ea0551091cc57aa1cfe1334d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2d3dba7092172bc9f01cbfb97334ea276eae2d80
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 10:15:17 2014 +

Notes added by 'git notes add'

diff --git a/fc/6fc5b576b972a8ea0551091cc57aa1cfe1334d 
b/fc/6fc5b576b972a8ea0551091cc57aa1cfe1334d
new file mode 100644
index 000..e4ad634
--- /dev/null
+++ b/fc/6fc5b576b972a8ea0551091cc57aa1cfe1334d
@@ -0,0 +1 @@
+merged as: 66ff6924d50fc77e7a3e80c74a12a088a874df8b
___
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' - 9d/2066ac820a3b4ecf84d591d19c8b8d2bdecdd8

 9d/2066ac820a3b4ecf84d591d19c8b8d2bdecdd8 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fff88723c765284d526ff02067751e8140da2bc3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 10:16:06 2014 +

Notes added by 'git notes add'

diff --git a/9d/2066ac820a3b4ecf84d591d19c8b8d2bdecdd8 
b/9d/2066ac820a3b4ecf84d591d19c8b8d2bdecdd8
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/9d/2066ac820a3b4ecf84d591d19c8b8d2bdecdd8
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6e/2c0fef5906a0b48384b21fda6f63e7485ce00d

 6e/2c0fef5906a0b48384b21fda6f63e7485ce00d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bd83b9577c1fcbe6a42d5a80b087a867220e79fb
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 10:18:17 2014 +

Notes added by 'git notes add'

diff --git a/6e/2c0fef5906a0b48384b21fda6f63e7485ce00d 
b/6e/2c0fef5906a0b48384b21fda6f63e7485ce00d
new file mode 100644
index 000..51fa88c
--- /dev/null
+++ b/6e/2c0fef5906a0b48384b21fda6f63e7485ce00d
@@ -0,0 +1 @@
+reject: despite ISO 31-0, English formatting rules dont approve a space 
between % and the number
___
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' - f1/7513bf90f3ad1dd0cd991f6569a38d9c8c0782

 f1/7513bf90f3ad1dd0cd991f6569a38d9c8c0782 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4a7b4a43e66c017072a5c6b0369b7ec7cffdbbe7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 10:19:19 2014 +

Notes added by 'git notes add'

diff --git a/f1/7513bf90f3ad1dd0cd991f6569a38d9c8c0782 
b/f1/7513bf90f3ad1dd0cd991f6569a38d9c8c0782
new file mode 100644
index 000..51fa88c
--- /dev/null
+++ b/f1/7513bf90f3ad1dd0cd991f6569a38d9c8c0782
@@ -0,0 +1 @@
+reject: despite ISO 31-0, English formatting rules dont approve a space 
between % and the number
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Mac OS X 64-bit, libstdc++ vs. libc++


On 01/19/2014 05:27 PM, Norbert Thiebaud wrote:

sadly 4.2 does not build at this point with --enable-libc++

for instance:
n file included from /lo/rel42/unoidl/source/unoidl-write.cxx:16:
In file included from
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/map:371:
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/__tree:820:16:
error: static_cast from 'pointer' (aka
'std::__1::__tree_end_nodestd::__1::__tree_node_basevoid * * *')
to '__node_pointer' (aka
'std::__1::__tree_nodestd::__1::pairrtl::OUString,
anonymous::Item, void * *') is not allowed
 return static_cast__node_pointer
^~~


Current libreoffice-4-2 does build fine for me against Xcode 5.0.2 (on 
OS X 10.9.1), with --enable-64-bit --enable-libc++ (among various other 
configuration switches).  (The underlying Clang of that Xcode version is 
reported as Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 
3.3.svn).)


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

RE: New Developer

2014-01-20 Thread Alexandre Vicenzi

Hi Mahohar,

You can start here: https://wiki.documentfoundation.org/Development/Easy_Hacks

Date: Mon, 20 Jan 2014 15:42:20 +0530
Subject: New Developer
From: khmanoh...@gmail.com
To: libreoffice@lists.freedesktop.org

Hello , I am a new developer with some experience in c++ as well as android . I 
want to be a contributer and start developing for Libre-Office . I wanted to 
know from where I could start developing or if I could get some bug assigned to 
me , anything would be helpful .

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

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

2014-01-20 Thread Noel Grandin

 sc/inc/cellsuno.hxx  |   10 ++--
 sc/inc/chart2uno.hxx |4 -
 sc/inc/chartpos.hxx  |4 -
 sc/inc/chgviset.hxx  |   58 +--
 sc/inc/consoli.hxx   |   14 +++---
 sc/inc/convuno.hxx   |8 +--
 sc/inc/dapiuno.hxx   |   12 ++---
 sc/inc/dbdata.hxx|4 -
 sc/source/core/tool/chartpos.cxx |2 
 sc/source/core/tool/chgviset.cxx |2 
 sc/source/core/tool/consoli.cxx  |   23 --
 sc/source/core/tool/dbdata.cxx   |4 -
 sc/source/filter/xcl97/XclImpChangeTrack.cxx |2 
 sc/source/ui/dbgui/dbnamdlg.cxx  |2 
 sc/source/ui/docshell/docsh.cxx  |6 +-
 sc/source/ui/docshell/docsh3.cxx |   10 ++--
 sc/source/ui/docshell/docsh4.cxx |8 +--
 sc/source/ui/unoobj/cellsuno.cxx |   16 +++
 sc/source/ui/unoobj/chart2uno.cxx|4 -
 sc/source/ui/unoobj/dapiuno.cxx  |   14 +++---
 20 files changed, 102 insertions(+), 105 deletions(-)

New commits:
commit 6fd75d6a34e1a696a766776326f589b471b84d82
Author: Noel Grandin n...@peralex.com
Date:   Fri Jan 17 17:02:10 2014 +0200

sal_Bool-bool

Change-Id: Iba99495f93edc1bbd8b4fbdbf25c6c6f8b8986be

diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index c9ecdfb..78525b7 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -225,8 +225,8 @@ public:
 AnonDBs getAnonDBs();
 const AnonDBs getAnonDBs() const;
 
-const ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool 
bStartOnly) const;
-ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool 
bStartOnly);
+const ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool 
bStartOnly) const;
+ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool 
bStartOnly);
 const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2) const;
 ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2);
 ScDBData* GetDBNearCursor(SCCOL nCol, SCROW nRow, SCTAB nTab );
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 5eb88b3..e8f171f 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -822,7 +822,7 @@ const ScDBCollection::AnonDBs ScDBCollection::getAnonDBs() 
const
 return maAnonDBs;
 }
 
-const ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB 
nTab, sal_Bool bStartOnly) const
+const ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB 
nTab, bool bStartOnly) const
 {
 // First, search the global named db ranges.
 NamedDBs::DBsType::const_iterator itr = find_if(
@@ -844,7 +844,7 @@ const ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, 
SCROW nRow, SCTAB nTab
 return NULL;
 }
 
-ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, 
sal_Bool bStartOnly)
+ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, 
bool bStartOnly)
 {
 // First, search the global named db ranges.
 NamedDBs::DBsType::iterator itr = find_if(
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 796ede7..76625d0 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -213,7 +213,7 @@ void ScDbNameDlg::Init()
 if ( pDBColl )
 {
 // Feststellen, ob definierter DB-Bereich markiert wurde:
-pDBData = pDBColl-GetDBAtCursor( nStartCol, nStartRow, nStartTab, 
sal_True );
+pDBData = pDBColl-GetDBAtCursor( nStartCol, nStartRow, nStartTab, 
true );
 if ( pDBData )
 {
 ScAddress  rStart = theCurArea.aStart;
commit b132bf92ccdbcd81f25fdb11b9f2a6e9297092f1
Author: Noel Grandin n...@peralex.com
Date:   Fri Jan 17 16:39:30 2014 +0200

sal_Bool-bool

Change-Id: Ibc8696d41afead254c832afb7b4aeed73f52cab9

diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 8edab4c..8fd2a23 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -568,8 +568,8 @@ public:
 void setSubtotals(const com::sun::star::uno::Sequence 
com::sun::star::sheet::GeneralFunction  rFunctions);
 OUString getCurrentPage() const;
 void setCurrentPage(const OUString sPage);
-sal_Bool getUseCurrentPage() const;
-void setUseCurrentPage(sal_Bool bUse);
+bool getUseCurrentPage() const;
+void setUseCurrentPage(bool bUse);
 const com::sun::star::sheet::DataPilotFieldAutoShowInfo* getAutoShowInfo();
 void setAutoShowInfo(const 
com::sun::star::sheet::DataPilotFieldAutoShowInfo* pInfo);
 const com::sun::star::sheet::DataPilotFieldLayoutInfo* getLayoutInfo();
@@ -578,15 +578,15 @@ public:
 void setReference(const

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

2014-01-20 Thread Miklos Vajna

 oox/source/export/drawingml.cxx  |   14 +-
 oox/source/export/shapes.cxx |5 -
 sw/qa/extras/ooxmlexport/data/dml-textshape.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   16 
 4 files changed, 33 insertions(+), 2 deletions(-)

New commits:
commit 106c82706edc1adc2df8d39d332fd3a3452c5d78
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Jan 20 11:19:01 2014 +0100

drawingML export: write TextShape outline properties

Change-Id: I3742c960016bbe1d82b58a16d464b329d2612c10

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 37faad5..e55c2f3 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -936,6 +936,7 @@ ShapeExport ShapeExport::WriteTextShape( Reference XShape 
 xShape )
 WritePresetShape( rect );
 uno::Referencebeans::XPropertySet xPropertySet(xShape, UNO_QUERY);
 WriteFill(xPropertySet);
+WriteOutline(xPropertySet);
 WriteBlipFill(xPropertySet, GraphicURL);
 pFS-endElementNS( mnXmlNamespace, XML_spPr );
 
diff --git a/sw/qa/extras/ooxmlexport/data/dml-textshape.docx 
b/sw/qa/extras/ooxmlexport/data/dml-textshape.docx
new file mode 100644
index 000..e5be42c
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/dml-textshape.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 56d6acb..8d01930 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2469,6 +2469,22 @@ DECLARE_OOXMLEXPORT_TEST(testMsoSpt180, 
mso-spt180.docx)
 CPPUNIT_ASSERT_EQUAL(OUString(ooxml-borderCallout1), aType);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testDmlTextshape, dml-textshape.docx)
+{
+uno::Referencecontainer::XIndexAccess xGroup(getShape(1), 
uno::UNO_QUERY);
+uno::Referencedrawing::XShape xShape(xGroup-getByIndex(1), 
uno::UNO_QUERY);
+// This was drawing::FillStyle_NONE.
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, 
getPropertydrawing::FillStyle(xShape, FillStyle));
+// This was drawing::LineStyle_NONE.
+CPPUNIT_ASSERT_EQUAL(drawing::LineStyle_SOLID, 
getPropertydrawing::LineStyle(xShape, LineStyle));
+
+xmlDocPtr pXmlDocument = parseExport(word/document.xml);
+if (!pXmlDocument)
+return;
+// This was wrap=none.
+assertXPath(pXmlDocument, 
/w:document/w:body/w:p[2]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:inline/a:graphic/a:graphicData/wpg:wgp/wps:wsp[2]/wps:bodyPr,
 wrap, square);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testShapeThemePreservation, 
shape-theme-preservation.docx)
 {
 xmlDocPtr pXmlDocument = parseExport(word/document.xml);
commit 2d4f0a7d0dd3da34d054ff444e69b10ef015e260
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Jan 20 11:16:24 2014 +0100

drawingML export: fix TextShape width for DOCX

Change-Id: Ibaf29ed746076fa6ec0bad013cac26debdb2b165

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 6c03b22..2a7d11a 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1396,8 +1396,19 @@ void DrawingML::WriteText( Reference XInterface  
rXIface, bool bBodyPr, bool b
 }
 
 if (bBodyPr)
+{
+const char* pWrap = bHasWrap  !bWrap ? none : NULL;
+if (GetDocumentType() == DOCUMENT_DOCX)
+{
+// In case of DOCX, if we want to have the same effect as
+// TextShape's automatic word wrapping, then we need to set
+// wrapping to square.
+uno::Referencelang::XServiceInfo xServiceInfo(rXIface, 
uno::UNO_QUERY);
+if (xServiceInfo.is()  
xServiceInfo-supportsService(com.sun.star.drawing.TextShape))
+pWrap = square;
+}
 mpFS-singleElementNS( (nXmlNamespace ? nXmlNamespace : XML_a), 
XML_bodyPr,
-   XML_wrap, bHasWrap  !bWrap ? none : NULL,
+   XML_wrap, pWrap,
XML_lIns, (nLeft != DEFLRINS) ? IS( MM100toEMU( 
nLeft ) ) : NULL,
XML_rIns, (nRight != DEFLRINS) ? IS( 
MM100toEMU( nRight ) ) : NULL,
XML_tIns, (nTop != DEFTBINS) ? IS( MM100toEMU( 
nTop ) ) : NULL,
@@ -1406,6 +1417,7 @@ void DrawingML::WriteText( Reference XInterface  
rXIface, bool bBodyPr, bool b
XML_anchorCtr, bHorizontalCenter ? 1 : NULL,
XML_vert, sWritingMode,
FSEND );
+}
 
 Reference XEnumerationAccess  access( xXText, UNO_QUERY );
 if( !access.is() || !bText )
commit 243ce7d73acc070194ecf5bb9f97b8a7cbf87ecd
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Jan 20 10:23:29 2014 +0100

drawingML export: write TextShape fill properties

Change-Id: Ibe89e86b19d7633e9a0669ff0574173ac4b633c5

diff --git

[Libreoffice-commits] core.git: 7 commits - scaddins/source

2014-01-20 Thread Noel Grandin

 scaddins/source/analysis/analysis.cxx   |   48 ++
 scaddins/source/analysis/analysishelper.cxx |   88 ++--
 scaddins/source/analysis/analysishelper.hxx |  202 
 scaddins/source/analysis/financial.cxx  |   12 -
 4 files changed, 74 insertions(+), 276 deletions(-)

New commits:
commit a506352ecb17623feadc09b3edd6a108d64fb740
Author: Noel Grandin n...@peralex.com
Date:   Fri Jan 10 11:09:15 2014 +0200

remove now dead MyList class

Change-Id: I96411ecb072e5135e7d0e6bb276ff782dcb0270c

diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index a122abc..0c91ab8 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1391,56 +1391,6 @@ double GetCoupnum( sal_Int32 nNullDate, sal_Int32 
nSettle, sal_Int32 nMat, sal_I
 
 
 
-const sal_uInt32 MyList::nStartSize = 16;
-const sal_uInt32 MyList::nIncrSize = 16;
-
-
-void MyList::_Grow( void )
-{
-nSize += nIncrSize;
-
-void**  pNewData = new void*[ nSize ];
-memcpy( pNewData, pData, nNew * sizeof( void* ) );
-
-delete[] pData;
-pData = pNewData;
-}
-
-
-MyList::MyList( void )
-{
-nSize = nStartSize;
-pData = new void*[ nSize ];
-nNew = nAct = 0;
-}
-
-
-MyList::~MyList()
-{
-delete[] pData;
-}
-
-
-void MyList::Insert( void* p, sal_uInt32 n )
-{
-if( n = nNew )
-Append( p );
-else
-{
-Grow();
-
-void**  pIns = pData + n;
-memmove( pIns + 1, pIns, ( nNew - n ) * sizeof( void* ) );
-
-*pIns = p;
-
-nNew++;
-}
-}
-
-
-
-
 class AnalysisRscStrArrLoader : public Resource
 {
 private:
diff --git a/scaddins/source/analysis/analysishelper.hxx 
b/scaddins/source/analysis/analysishelper.hxx
index f2c74a3..f565820 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -148,35 +148,6 @@ double  GetCoupdays( sal_Int32 nNullDate, 
sal_Int32 nSettle, sal_Int
 
 
 
-class MyList
-{
-private:
-static const sal_uInt32 nStartSize;
-static const sal_uInt32 nIncrSize;
-
-void**  pData;  // pointer array
-sal_uInt32  nSize;  // array size
-sal_uInt32  nNew;   // next index to be inserted at
-sal_uInt32  nAct;   // actual for iterations
-
-void_Grow( void );
-inline void Grow( void );
-protected:
-public:
-MyList( void );
-virtual ~MyList();
-
-inline const void*  GetObject( sal_uInt32 nIndex ) const;
-inline const void*  First( void );
-inline const void*  Next( void );
-
-inline void Append( void* pNewElement );
-voidInsert( void* pNewLement, sal_uInt32 nPlace );
-
-inline sal_uInt32   Count( void ) const;
-};
-
-
 enum FDCategory
 {
 FDCat_AddIn,
@@ -616,61 +587,6 @@ inline void AlignDate( sal_uInt16 rD, sal_uInt16 nM, 
sal_uInt16 nY )
 }
 
 
-inline void MyList::Grow( void )
-{
-if( nNew = nSize )
-_Grow();
-}
-
-
-inline const void* MyList::GetObject( sal_uInt32 n ) const
-{
-if( n  nNew )
-return pData[ n ];
-else
-return NULL;
-}
-
-
-inline const void* MyList::First( void )
-{
-nAct = 0;
-if( nNew )
-return pData[ 0 ];
-else
-return NULL;
-}
-
-
-inline const void* MyList::Next( void )
-{
-nAct++;
-if( nAct  nNew )
-return pData[ nAct ];
-else
-{
-nAct--;
-return NULL;
-}
-}
-
-
-inline void MyList::Append( void* p )
-{
-Grow();
-pData[ nNew ] = p;
-nNew++;
-}
-
-
-inline sal_uInt32 MyList::Count( void ) const
-{
-return nNew;
-}
-
-
-
-
 inline sal_uInt16 FuncData::GetUINameID( void ) const
 {
 return nUINameID;
commit 1f3eed97de1c3dcbf532cd63023239a4543ae1dc
Author: Noel Grandin n...@peralex.com
Date:   Fri Jan 10 11:07:59 2014 +0200

convert custom list implementation ScaDoubleList to std::vector

Change-Id: I98865a54f675ebdb7724327305f9f9a5eeccfeb4

diff --git a/scaddins/source/analysis/analysis.cxx 
b/scaddins/source/analysis/analysis.cxx
index f2fa49f..8e9590b 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -683,9 +683,10 @@ AnalysisAddIn::getMultinomial( const uno::Reference 
beans::XPropertySet  xOpt
 double nZ = 0;
 double fRet = 1.0;
 
-for( const double *p = aValList.First(); p; p = aValList.Next() )
+for( sal_uInt32 i = 0; i  aValList.Count(); ++i )
 {
-double n = (*p = 0.0) ? rtl::math::approxFloor( *p ) : 
rtl::math::approxCeil( *p );
+const double d = aValList.Get(i);
+double n = (d = 0.0) ? rtl::math::approxFloor( d ) : 
rtl::math::approxCeil( d );
 if ( n  0.0 )
 throw lang::IllegalArgumentException();
 
@@

[Libreoffice-commits] core.git: solenv/gbuild

 solenv/gbuild/Gallery.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit daaa6425ba689e69227751d4f4a719c01977ff1e
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Jan 20 13:15:41 2014 +0200

Make gallery stuff work also for cross-compilation

Galleries are needed in a cross-compilation only when targeting DESKTOP
platforms, which people don't do very often, so the problem had not been
noticed for a while.

Change-Id: Ieb0f010505af230db0661f02345ac6ace3b52957

diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index a4319fd..82c5e78 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -23,8 +23,8 @@ define gb_Gallery__make_env_args
$(call gb_Helper_make_url,$(call 
gb_ComponentTarget_get_target_for_build,$(item \
 -env:UNO_TYPES=$(foreach item,offapi udkapi,\
$(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item \
--env:URE_INTERNAL_LIB_DIR=$(call 
gb_Helper_make_url,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \
--env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_LIB_FOLDER))
+-env:URE_INTERNAL_LIB_DIR=$(call 
gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD)) \
+-env:LO_LIB_DIR=$(call 
gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD))
 endef
 
 define gb_Gallery__command
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/Library_cui.mk cui/source i18nutil/Library_i18nutil.mk i18nutil/source include/i18nutil

 cui/Library_cui.mk  |1 +
 cui/source/tabpages/autocdlg.cxx|7 +--
 i18nutil/Library_i18nutil.mk|3 +++
 i18nutil/source/utility/unicode.cxx |   26 ++
 include/i18nutil/unicode.hxx|7 +++
 5 files changed, 42 insertions(+), 2 deletions(-)

New commits:
commit 4706cecf542b08c6af24bdddf61ccf912f515e13
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 11:18:11 2014 +

Related: #i56998# use locale rules to format percentage...

in Combine single line paragraphs option in AutoCorrect dialog

Change-Id: I5af78ff31031a92a4f772d9c26bee05c3695cad1

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 19d2345..cc80cf4 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,cui,\
 drawinglayer \
 editeng \
 i18nlangtag \
+i18nutil \
 $(if $(ENABLE_JAVA), \
 jvmfwk) \
 lng \
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 0fb4c17..67a2181 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include i18nutil/unicode.hxx
 #include vcl/builder.hxx
 #include vcl/msgbox.hxx
 #include vcl/field.hxx
@@ -659,7 +660,8 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet )
 m_pCheckLB-SetUserData(  REPLACE_BULLETS, pUserData );
 
 nPercent = pOpt-nRightMargin;
-sMargin =   + OUString::number( nPercent ) + %;
+sMargin =   +
+unicode::formatPercent(nPercent, 
Application::GetSettings().GetUILanguageTag());
 pUserData = new ImpUserData(sMargin, 0);
 m_pCheckLB-SetUserData( MERGE_SINGLE_LINE_PARA, pUserData );
 
@@ -713,7 +715,8 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl)
 if(RET_OK == aDlg.Execute())
 {
 nPercent = (sal_uInt16)aDlg.GetPrcntFld().GetValue();
-sMargin =   + OUString::number( nPercent ) + %;
+sMargin =   +
+unicode::formatPercent(nPercent, 
Application::GetSettings().GetUILanguageTag());
 }
 }
 m_pCheckLB-Invalidate();
commit c2866a9da4822fe886683efabe223db97d0296cb
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 10:41:32 2014 +

Related: #i56998# provide a way to format % per-locale rules

Change-Id: Ic27b230cc9dce366f281ff720ded5873e94f6191

diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk
index 8c0aaf0..1c5837c 100644
--- a/i18nutil/Library_i18nutil.mk
+++ b/i18nutil/Library_i18nutil.mk
@@ -21,6 +21,8 @@ $(eval $(call gb_Library_Library,i18nutil))
 $(eval $(call gb_Library_use_externals,i18nutil,\
boost_headers \
icu_headers \
+   icui18n \
+   icuuc \
 ))
 
 $(eval $(call gb_Library_use_custom_headers,i18nutil,\
@@ -34,6 +36,7 @@ $(eval $(call gb_Library_add_defs,i18nutil,\
 ))
 
 $(eval $(call gb_Library_use_libraries,i18nutil,\
+   i18nlangtag \
comphelper \
cppu \
sal \
diff --git a/i18nutil/source/utility/unicode.cxx 
b/i18nutil/source/utility/unicode.cxx
index 0098969..56daacd 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -17,10 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include boost/scoped_ptr.hpp
 #include com/sun/star/i18n/UnicodeType.hpp
 #include com/sun/star/i18n/KCharacterType.hpp
 #include com/sun/star/i18n/ScriptType.hpp
+#include i18nlangtag/languagetag.hxx
+#include i18nlangtag/languagetagicu.hxx
 #include i18nutil/unicode.hxx
+#include unicode/numfmt.h
 #include unicode_data.h
 
 // Workaround for glibc braindamage:
@@ -934,4 +938,26 @@ OString SAL_CALL 
unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
 return sRet;
 }
 
+//Format a number as a percentage according to the rules of the given
+//language, e.g. 100 - 100% for en-US vs 100 % for de-DE
+OUString SAL_CALL unicode::formatPercent(double dNumber,
+const LanguageTag rLangTag)
+{
+// get a currency formatter for this locale ID
+UErrorCode errorCode=U_ZERO_ERROR;
+icu::Locale aLocale = LanguageTagIcu::getIcuLocale(rLangTag);
+boost::scoped_ptrNumberFormat xF(
+NumberFormat::createPercentInstance(aLocale, errorCode));
+if(U_FAILURE(errorCode))
+{
+SAL_WARN(i18n, NumberFormat::createPercentInstance failed);
+return OUString::number(dNumber) + %;
+}
+
+UnicodeString output;
+xF-format(dNumber, output);
+return OUString(reinterpret_castconst sal_Unicode *(output.getBuffer()),
+output.length());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx
index ae1ad06..e321039 100644
--- a/include/i18nutil/unicode.hxx
+++ b/include/i18nutil/unicode.hxx
@@ -24,6 +24,8 @@
 #include

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8f/97a74f843edebca2b64cc3649c7a45a6ef3df0

 8f/97a74f843edebca2b64cc3649c7a45a6ef3df0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 312c90f8d3b6aaed1f6507a0afc17e74c38891d7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 11:19:36 2014 +

Notes added by 'git notes add'

diff --git a/8f/97a74f843edebca2b64cc3649c7a45a6ef3df0 
b/8f/97a74f843edebca2b64cc3649c7a45a6ef3df0
new file mode 100644
index 000..ec63da2
--- /dev/null
+++ b/8f/97a74f843edebca2b64cc3649c7a45a6ef3df0
@@ -0,0 +1 @@
+prefer: 4706cecf542b08c6af24bdddf61ccf912f515e13
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-20 Thread Thomas Arnhold

 sc/source/ui/src/scfuncs.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9df2b09e0a51b070604bde17ff3b03f72ed2786f
Author: Thomas Arnhold tho...@arnhold.org
Date:   Mon Jan 20 12:17:24 2014 +0100

add missing space in help text

from 6e2c0fef5906a

diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index e59f8e7..e413b09 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -5676,7 +5676,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
 };
 String 5 // Description of Parameter 2
 {
-Text [ en-US ] = The type of the quartile (0 = MIN, 1 = 25%, 2 = 
50 %, 3 = 75 %, 4 =MAX). ;
+Text [ en-US ] = The type of the quartile (0 = MIN, 1 = 25%, 2 = 
50 %, 3 = 75 %, 4 = MAX). ;
 };
 };
  // -=*# Resource for function KGRÃSSTE #*=-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 svx/Library_svx.mk   |1 +
 svx/source/stbctrls/zoomctrl.cxx |9 +
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 4d1b8459f7ed8ba46dfaff00420fc1a698028d3e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 11:23:37 2014 +

Related: #i56998# use locale rules to format percentage...

in zoom value and percent on zoom statusbar item.

Change-Id: I0b863ab43399772fb52c4e03e0552fcb933e2832

diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index df2aab6..70cf3ef 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Library_use_libraries,svx,\
 fwe \
 fwk \
 i18nlangtag \
+i18nutil \
 sal \
 sfx \
 sot \
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index b5be076..6e6cf44 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include i18nutil/unicode.hxx
 #include tools/shl.hxx
+#include vcl/svapp.hxx
 #include vcl/status.hxx
 #include vcl/menu.hxx
 #include sfx2/dispatch.hxx
@@ -120,8 +122,8 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16, 
SfxItemState eState,
 {
 const SfxUInt16Item* pItem = (const SfxUInt16Item*)pState;
 nZoom = pItem-GetValue();
-OUString aStr( OUString::number(nZoom) );
-aStr += %;
+
+OUString aStr(unicode::formatPercent(nZoom, 
Application::GetSettings().GetUILanguageTag()));
 GetStatusBar().SetItemText( GetId(), aStr );
 
 if ( pState-ISA(SvxZoomItem) )
@@ -140,8 +142,7 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16, 
SfxItemState eState,
 
 void SvxZoomStatusBarControl::Paint( const UserDrawEvent )
 {
-OUString aStr( OUString::number( nZoom ));
-aStr += %;
+OUString aStr(unicode::formatPercent(nZoom, 
Application::GetSettings().GetUILanguageTag()));
 GetStatusBar().SetItemText( GetId(), aStr );
 }
 
___
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' - c0/7254878c8728e76e1a7b34e9e32cf5c31d191b

 c0/7254878c8728e76e1a7b34e9e32cf5c31d191b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bca4961e2707aa7d49e9113ade4ccd5401e3da40
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 11:25:45 2014 +

Notes added by 'git notes add'

diff --git a/c0/7254878c8728e76e1a7b34e9e32cf5c31d191b 
b/c0/7254878c8728e76e1a7b34e9e32cf5c31d191b
new file mode 100644
index 000..7310dd0
--- /dev/null
+++ b/c0/7254878c8728e76e1a7b34e9e32cf5c31d191b
@@ -0,0 +1 @@
+prefer: 4d1b8459f7ed8ba46dfaff00420fc1a698028d3e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New Developer

2014-01-20 Thread Michael Meeks


On Mon, 2014-01-20 at 11:13 +, Alexandre Vicenzi wrote:
 You can start here:
 https://wiki.documentfoundation.org/Development/Easy_Hacks

And welcome ! :-) looking forward to seeing your work. I'd suggest
getting a build on Linux first, doing a few easy hacks; and then asking
again. There are plenty of larger tasks that need an experienced
developer to help out with them.

All the best,

Michael.

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

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

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

 cui/source/dialogs/colorpicker.src |   18 +---
 cui/source/dialogs/grfflt.src  |6 +
 cui/source/tabpages/tplnedef.cxx   |9 +++-
 starmath/source/dialog.cxx |3 --
 starmath/source/smres.src  |6 ++---
 svx/source/dialog/bmpmask.src  |   12 +++---
 svx/source/dialog/contdlg.src  |3 --
 svx/source/dialog/fontwork.cxx |2 -
 svx/source/dialog/fontwork.src |1 
 svx/source/engine3d/float3d.src|9 ++--
 svx/source/sidebar/area/AreaPropertyPanel.src  |   23 -
 svx/source/sidebar/paragraph/ParaPropertyPanel.src |3 --
 12 files changed, 35 insertions(+), 60 deletions(-)

New commits:
commit 260df50ae67e0d9f9d80e0686e6a12903c53c130
Author: Tsutomu Uchino ha...@apache.org
Date:   Sun Jan 19 13:40:29 2014 +

Related: #i56998# use FUNIT_PERCENT instead of FUNIT_CUSTOM...

with percent CustomUnitText on metric fields

(cherry picked from commit 4f5b26a97dbaef964af1fe323f24109b987cb952)

Conflicts:
chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
chart2/source/controller/dialogs/tp_SeriesToAxis.src
cui/source/dialogs/zoom.src
cui/source/options/optgdlg.src
cui/source/tabpages/autocdlg.src
cui/source/tabpages/backgrnd.src
cui/source/tabpages/chardlg.src
cui/source/tabpages/grfpage.src
cui/source/tabpages/numpages.src
cui/source/tabpages/paragrph.src
cui/source/tabpages/tabarea.src
cui/source/tabpages/tabline.src
cui/source/tabpages/tparea.cxx
cui/source/tabpages/tplnedef.cxx
sc/source/ui/pagedlg/pagedlg.src
sd/source/ui/animations/CustomAnimationDialog.src
starmath/source/dialog.cxx
starmath/source/smres.src
svx/source/dialog/fontwork.cxx
svx/source/sidebar/area/AreaPropertyPanel.src
svx/source/sidebar/graphic/GraphicPropertyPanel.src
svx/source/sidebar/line/LinePropertyPanel.src
svx/source/tbxctrls/fontworkgallery.src
sw/source/ui/frmdlg/column.src
sw/source/ui/misc/pgfnote.src

Change-Id: I8acc5f7fc80d4366750ad38fabbf49b02f013f7c

diff --git a/cui/source/dialogs/colorpicker.src 
b/cui/source/dialogs/colorpicker.src
index 7f9c6af..63ab634 100644
--- a/cui/source/dialogs/colorpicker.src
+++ b/cui/source/dialogs/colorpicker.src
@@ -321,8 +321,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Spin = TRUE ;
 Maximum = 100 ;
 Last = 100 ;
-Unit = FUNIT_CUSTOM ;
-CustomUnitText = % ;
+Unit = FUNIT_PERCENT ;
 };
 
 FixedText CT_BRIGHTNESS
@@ -343,8 +342,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Spin = TRUE ;
 Maximum = 100 ;
 Last = 100 ;
-Unit = FUNIT_CUSTOM ;
-CustomUnitText = % ;
+Unit = FUNIT_PERCENT ;
 };
 
 // -
@@ -376,8 +374,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Spin = TRUE ;
 Maximum = 100 ;
 Last = 100 ;
-Unit = FUNIT_CUSTOM ;
-CustomUnitText = % ;
+Unit = FUNIT_PERCENT ;
 };
 
 FixedText CT_MAGENTA
@@ -398,8 +395,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Spin = TRUE ;
 Maximum = 100 ;
 Last = 100 ;
-Unit = FUNIT_CUSTOM ;
-CustomUnitText = % ;
+Unit = FUNIT_PERCENT ;
 };
 
 FixedText CT_YELLOW
@@ -420,8 +416,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Spin = TRUE ;
 Maximum = 100 ;
 Last = 100 ;
-Unit = FUNIT_CUSTOM ;
-CustomUnitText = % ;
+Unit = FUNIT_PERCENT ;
 };
 
 FixedText CT_KEY
@@ -442,8 +437,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Spin = TRUE ;
 Maximum = 100 ;
 Last = 100 ;
-Unit = FUNIT_CUSTOM ;
-CustomUnitText = % ;
+Unit = FUNIT_PERCENT ;
 };
 
 // --
diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src
index 73b1094..ff1cfb2 100644
--- a/cui/source/dialogs/grfflt.src
+++ b/cui/source/dialogs/grfflt.src
@@ -174,8 +174,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SOLARIZE
 Spin = TRUE ;
 Maximum = 100 ;
 StrictFormat = TRUE ;
-Unit = FUNIT_CUSTOM ;
-CustomUnitText = % ;
+Unit = FUNIT_PERCENT ;
 Last = 100 ;
 SpinSize = 1 ;
 };
@@ -255,8 +254,7 @@ ModalDialog RID_SVX_GRFFILTER_DLG_SEPIA
 Minimum = 1 ;
 Maximum = 100 ;
 StrictFormat = TRUE ;
-Unit = FUNIT_CUSTOM ;
-CustomUnitText = % ;
+Unit = FUNIT_PERCENT ;
 First = 1 ;
 Last = 100 ;
 SpinSize = 1 ;
diff --git

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4f/5b26a97dbaef964af1fe323f24109b987cb952

 4f/5b26a97dbaef964af1fe323f24109b987cb952 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 19f4fe1af6be933cdce1a68b8731188f44d51c96
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 11:42:27 2014 +

Notes added by 'git notes add'

diff --git a/4f/5b26a97dbaef964af1fe323f24109b987cb952 
b/4f/5b26a97dbaef964af1fe323f24109b987cb952
new file mode 100644
index 000..3610af2
--- /dev/null
+++ b/4f/5b26a97dbaef964af1fe323f24109b987cb952
@@ -0,0 +1 @@
+merged as: 260df50ae67e0d9f9d80e0686e6a12903c53c130
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/src/scfuncs.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d98d35b3293b3b4b27db4d578348f43a86201cfc
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 11:45:08 2014 +

Related: #i56998# english doesn't put a space between numbers and percent

Change-Id: I9c9579e8e1b8009fef169b434e2d839e36da8984

diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index e413b09..3f2e710 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -5676,7 +5676,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
 };
 String 5 // Description of Parameter 2
 {
-Text [ en-US ] = The type of the quartile (0 = MIN, 1 = 25%, 2 = 
50 %, 3 = 75 %, 4 = MAX). ;
+Text [ en-US ] = The type of the quartile (0 = MIN, 1 = 25%, 2 = 
50%, 3 = 75%, 4 = MAX). ;
 };
 };
  // -=*# Resource for function KGRÃSSTE #*=-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sd/source sw/source

 sd/source/ui/slidesorter/controller/SlsListener.cxx |5 -
 sw/source/core/text/inftxt.hxx  |1 -
 sw/source/core/text/portxt.cxx  |   10 ++
 3 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit eacf6ec741dcc66f07e0b7b2a3a402d2f3c670fa
Author: Tsutomu Uchino ha...@apache.org
Date:   Mon Jan 20 12:03:42 2014 +

#i11# fix slide selected in Slide Pane with Page Up

The comment in the removed part says to call SelectPage to make
the slide visible. But the following NotifyCurrentSlideChange method
calls SelectPage for the page makes it visible if the pane is not updated 
yet.

diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx 
b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 64965d4..dfe9ccf 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -501,11 +501,6 @@ void SAL_CALL Listener::propertyChange (
 String(RTL_CONSTASCII_USTRINGPARAM(Number)));
 sal_Int32 nCurrentPage = 0;
 aPageNumber = nCurrentPage;
-// The selection is already set but we call SelectPage()
-// nevertheless in order to make the new current page the
-// last recently selected page of the PageSelector.  This is
-// used when making the selection visible.
-mrController.GetPageSelector().SelectPage(nCurrentPage-1);
 
mrController.GetCurrentSlideManager()-NotifyCurrentSlideChange(nCurrentPage-1);
 }
 catch (beans::UnknownPropertyException aEvent)
commit 14e0270c3ebad9a1fb817fcfced2aa8ee2f3e3f0
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Mon Jan 20 10:57:12 2014 +

124039: SwTxtInputFldPortion::Format(..) - assure correct line break for 
multi-lined Input Fields

diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 3594f3d..11f3a21 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -608,7 +608,6 @@ public:
 inline void Right( const SwTwips nNew ) { nRight = nNew; }
 inline SwTwips First() const { return nFirst; }
 inline void First( const SwTwips nNew ) { nFirst = nNew; }
-inline SwTwips CurrLeft() const { return (nLineStart ? nLeft : nFirst); }
 inline KSHORT RealWidth() const { return nRealWidth; }
 inline void RealWidth( const KSHORT nNew ) { nRealWidth = nNew; }
 inline KSHORT ForcedLeftMargin() const { return nForcedLeftMargin; }
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 487ebf3..f881fe3 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -747,6 +747,12 @@ sal_Bool SwTxtInputFldPortion::Format( SwTxtFormatInfo 
rInf )
 }
 else
 {
+const xub_StrLen nFormerLineStart = rInf.GetLineStart();
+if ( !mbContainsInputFieldStart )
+{
+rInf.SetLineStart( 0 );
+}
+
 bRet = SwTxtPortion::Format( rInf );
 
 if ( mbContainsInputFieldEnd )
@@ -763,6 +769,10 @@ sal_Bool SwTxtInputFldPortion::Format( SwTxtFormatInfo 
rInf )
 // adjust portion length accordingly
 SetLen( GetLen() + 1 );
 }
+else
+{
+rInf.SetLineStart( nFormerLineStart );
+}
 }
 }
 
___
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' - 0c/ea884e3f417e4b58d2fdcfc7b0111f3bfc6f30

 0c/ea884e3f417e4b58d2fdcfc7b0111f3bfc6f30 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a5a687dc4ba66948f261a282b65ab8104210c0ac
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 12:21:10 2014 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: 2 commits - editeng/source sc/source svx/source sw/source vcl/source

 editeng/source/items/frmitems.cxx   |   26 
 editeng/source/items/paraitem.cxx   |4 +-
 editeng/source/items/textitem.cxx   |   10 +++---
 sc/source/core/data/docpool.cxx |4 +-
 svx/source/items/algitem.cxx|8 ++--
 svx/source/sidebar/text/TextCharacterSpacingControl.cxx |4 +-
 svx/source/sidebar/text/TextPropertyPanel.src   |8 ++--
 svx/source/svdraw/svdattr.cxx   |2 -
 svx/source/svdraw/svdomeas.cxx  |5 +--
 svx/source/xoutdev/xattr.cxx|6 +--
 sw/source/ui/utlui/attrdesc.cxx |9 +++--
 sw/source/ui/utlui/uiitems.cxx  |2 -
 vcl/source/control/field.cxx|5 ++-
 vcl/source/src/units.src|4 +-
 14 files changed, 52 insertions(+), 45 deletions(-)

New commits:
commit 269af0448130df8b816cf868a1fe4490252cb713
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 12:20:06 2014 +

Related: #i56998# no space for degree symbol

and now space between number and pages is explicitly added by code

Change-Id: Ic4e73d2f30b93bd4a34b98f480f1ba111c9a285d

diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 885b35d..8df9c0e 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1429,7 +1429,7 @@ OUString MetricFormatter::CreateFieldText( sal_Int64 
nValue ) const
 aStr += maCustomUnitText;
 else
 {
-if ( meUnit != FUNIT_NONE || meUnit != FUNIT_PERCENT )
+if (meUnit != FUNIT_NONE || meUnit != FUNIT_PERCENT || meUnit != 
FUNIT_DEGREE)
 aStr +=  ;
 aStr += ImplMetricToString( meUnit );
 }
diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src
index 3445e921..2e40585 100644
--- a/vcl/source/src/units.src
+++ b/vcl/source/src/units.src
@@ -43,8 +43,8 @@ StringArray SV_FUNIT_STRINGS
  ch ; FUNIT_CHAR ;  ;
  line ; FUNIT_LINE ;  ;
  % ; FUNIT_PERCENT ;  ;
-  pixels ; FUNIT_PIXEL ;  ;
-  pixel ; FUNIT_PIXEL ;  ;
+ pixels ; FUNIT_PIXEL ;  ;
+ pixel ; FUNIT_PIXEL ;  ;
  Â° ; FUNIT_DEGREE ;  ;
  sec ; FUNIT_SECOND ;  ;
  ms ; FUNIT_MILLISECOND ;  ;
commit ab50bc9d4a72193c1fefcbf0652938995094bc41
Author: Tsutomu Uchino ha...@apache.org
Date:   Sat Jan 18 08:14:47 2014 +

Resolves: #i56998# add a space separater between value and unit...

and remove separator between value and percent to match with ISO 31-0

(cherry picked from commit 0cea884e3f417e4b58d2fdcfc7b0111f3bfc6f30)

Conflicts:
chart2/source/controller/dialogs/tp_SeriesToAxis.src
cui/source/dialogs/colorpicker.cxx
cui/source/dialogs/colorpicker.src
cui/source/dialogs/grfflt.src
cui/source/dialogs/zoom.src
cui/source/tabpages/tabline.src
editeng/source/items/frmitems.cxx
editeng/source/items/textitem.cxx
sd/source/ui/animations/CustomAnimationDialog.src
sd/source/ui/animations/SlideTransitionPane.src
svx/source/dialog/bmpmask.src
svx/source/engine3d/float3d.src
svx/source/items/algitem.cxx
svx/source/sidebar/text/TextCharacterSpacingControl.cxx
svx/source/xoutdev/xattr.cxx
sw/source/ui/utlui/attrdesc.cxx
sw/source/ui/utlui/uiitems.cxx

Change-Id: I554309cb72dd8956077c5ca6866a982cdd6529aa

diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index bd88e97..6fd9113 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -352,11 +352,11 @@ SfxItemPresentation SvxSizeItem::GetPresentation
 case SFX_ITEM_PRESENTATION_COMPLETE:
 rText = EE_RESSTR(RID_SVXITEMS_SIZE_WIDTH) +
 GetMetricText( aSize.Width(), eCoreUnit, ePresUnit, pIntl 
) +
-EE_RESSTR(GetMetricId(ePresUnit)) +
+  + EE_RESSTR(GetMetricId(ePresUnit)) +
 cpDelimTmp +
 EE_RESSTR(RID_SVXITEMS_SIZE_HEIGHT) +
 GetMetricText( aSize.Height(), eCoreUnit, ePresUnit, pIntl 
) +
-EE_RESSTR(GetMetricId(ePresUnit));
+  + EE_RESSTR(GetMetricId(ePresUnit));
 return SFX_ITEM_PRESENTATION_COMPLETE;
 //no break necessary
 default: ;//prevent warning
@@ -627,7 +627,7 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
 {
 rText = rText +
 GetMetricText( (long)nLeftMargin, eCoreUnit, 
ePresUnit, pIntl ) +
-EE_RESSTR(GetMetricId(ePresUnit));
+  + EE_RESSTR(GetMetricId(ePresUnit));
 }
 rText +=

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

2014-01-20 Thread Khaled Hosny

 starmath/source/smres.src |6 +++---
 svx/source/sidebar/area/AreaPropertyPanel.src |8 
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 224da771d3736a021df15e32c23d2fa585c433ed
Author: Khaled Hosny khaledho...@eglug.org
Date:   Mon Jan 20 14:19:29 2014 +0200

Remove space before percent sign

Seems to be merge artifacts in 260df50ae67e0d9f9d80e0686e6a12903c53c130.

Otherwise, I really like how CaolÃ¡n implemented this in a proper,
per-locale way. CaolÃ¡n, you rock!

Change-Id: I42e70b240fdf013316ad282e70b8e42eec8225a8

diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 0bebaca..0907229 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -303,19 +303,19 @@ Menu RID_VIEWMENU
 {
 Identifier = SID_ZOOM_50_PERCENT;
 HelpId = CMD_SID_VIEW050 ;
-Text [ en-US ] = ~View 50 % ;
+Text [ en-US ] = ~View 50% ;
 };
 MenuItem
 {
 Identifier = SID_ZOOM_100_PERCENT ;
 HelpId = CMD_SID_VIEW100 ;
-Text [ en-US ] = View ~100 % ;
+Text [ en-US ] = View ~100% ;
 };
 MenuItem
 {
 Identifier = SID_ZOOM_200_PERCENT ;
 HelpId = CMD_SID_VIEW200 ;
-Text [ en-US ] = View ~200 % ;
+Text [ en-US ] = View ~200% ;
 };
 MenuItem
 {
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.src 
b/svx/source/sidebar/area/AreaPropertyPanel.src
index 812acfe..77bb6cb 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -78,7 +78,7 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR
 Border = TRUE ;
 Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
 HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_CENTER_X ;
-QuickHelpText [ en-US ] = Specify the horizontal offset percentage 
from the center for the gradient shading style. 50 % is the horizontal center. 
;
+QuickHelpText [ en-US ] = Specify the horizontal offset percentage 
from the center for the gradient shading style. 50% is the horizontal center. ;
 TabStop = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
@@ -98,7 +98,7 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR
 Border = TRUE ;
 Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
 HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_CENTER_Y ;
-QuickHelpText [ en-US ] = Specify the vertical offset percentage from 
the center for the gradient shading style.  50 % is the vertical center. ;
+QuickHelpText [ en-US ] = Specify the vertical offset percentage from 
the center for the gradient shading style.  50% is the vertical center. ;
 TabStop = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
@@ -138,7 +138,7 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR
 Border = TRUE ;
 Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
 HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_SVALUE ;
-QuickHelpText [ en-US ] = Enter a transparency value for the 
beginning point of the gradient, where 0% is fully opaque and 100 % is fully 
transparent. ;
+QuickHelpText [ en-US ] = Enter a transparency value for the 
beginning point of the gradient, where 0% is fully opaque and 100% is fully 
transparent. ;
 TabStop = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
@@ -158,7 +158,7 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR
 Border = TRUE ;
 Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
 HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_EVALUE ;
-QuickHelpText [ en-US ] = Enter a transparency value for the endpoint 
of the gradient, where 0 % is fully opaque and 100 % is fully transparent. ;
+QuickHelpText [ en-US ] = Enter a transparency value for the endpoint 
of the gradient, where 0% is fully opaque and 100% is fully transparent. ;
 TabStop = TRUE ;
 Repeat = TRUE ;
 Spin = TRUE ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 extensions/source/update/feed/updatefeed.cxx |4 ++--
 include/comphelper/logging.hxx   |2 +-
 sw/source/ui/utlui/attrdesc.cxx  |8 
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit fdf9406792905a4bbd49b4ad88c40e6af9c17da3
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 12:31:44 2014 +

misuse of OUString::boolean on sal_uInt8 values

regression since 64b993e046f23baaacaff1572b7d2a816588b5ef

Change-Id: Ifc907a34430c36a64318fc42342e630e2b84ad13

diff --git a/extensions/source/update/feed/updatefeed.cxx 
b/extensions/source/update/feed/updatefeed.cxx
index 86a8d93..2c8afbb 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -300,14 +300,14 @@ public:
 uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, 
lang::WrappedTargetException, uno::RuntimeException)
 {
 if( m_nCount  0 )
-throw 
container::NoSuchElementException(OUString::boolean(m_nCount), *this);
+throw 
container::NoSuchElementException(OUString::number(m_nCount), *this);
 
 ++m_nCount;
 return uno::makeAny(m_aEntry);
 };
 
 private:
-sal_uInt8 m_nCount;
+sal_Int32 m_nCount;
 deployment::UpdateInformationEntry m_aEntry;
 };
 
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index 0f53a04..a9ebc86 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -57,7 +57,7 @@ namespace comphelper
 inline OUString convertLogArgToString( sal_Int32   _nValue ) { return 
OUString::number( _nValue ); }
 inline OUString convertLogArgToString( sal_Int16   _nValue ) { return 
OUString::number( _nValue ); }
 inline OUString convertLogArgToString( sal_Unicode _nValue ) { return 
OUString( _nValue ); }
-inline OUString convertLogArgToString( sal_Bool_nValue ) { return 
OUString::boolean( _nValue ); }
+inline OUString convertLogArgToString( sal_Bool_bValue ) { return 
OUString::boolean( _bValue ); }
 
 } } // namespace log::convert
 
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index cf8f4c0..65278f5 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -213,12 +213,12 @@ SfxItemPresentation SwFmtDrop::GetPresentation
 {
 if ( GetChars()  1 )
 {
-rText = OUString::boolean( GetChars() ) +  ;
+rText = OUString::number( GetChars() ) +  ;
 }
 rText = rText +
 OUString( SW_RESSTR( STR_DROP_OVER ) ) +
   +
-OUString::boolean( GetLines() ) +
+OUString::number( GetLines() ) +
   +
 OUString( SW_RESSTR( STR_DROP_LINES ) );
 }
@@ -336,7 +336,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation
 rText = SW_RESSTR( STR_FRM_WIDTH ) +  ;
 if ( GetWidthPercent() )
 {
-rText = rText + OUString::boolean(GetWidthPercent()) + %;
+rText = rText + OUString::number(GetWidthPercent()) + %;
 }
 else
 {
@@ -350,7 +350,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation
 rText = rText + ,  + SW_RESSTR( nId ) +  ;
 if ( GetHeightPercent() )
 {
-rText = rText + OUString::boolean(GetHeightPercent()) + 
%;
+rText = rText + OUString::number(GetHeightPercent()) + %;
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/ui/utlui/attrdesc.cxx |   22 +++---
 1 file changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 96c0f5b1c712e72e4a5ad6b69e744d6187afdc83
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 12:36:32 2014 +

Related: #i56998# use locale rules to format percentage

Change-Id: I26af0abee94c911fd0d2b84e829f4489e625c0b2

diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index 65278f5..48e2e13 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include i18nutil/unicode.hxx
 #include svl/itemiter.hxx
 #include vcl/svapp.hxx
 #include editeng/itemtype.hxx
@@ -336,7 +337,8 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation
 rText = SW_RESSTR( STR_FRM_WIDTH ) +  ;
 if ( GetWidthPercent() )
 {
-rText = rText + OUString::number(GetWidthPercent()) + %;
+rText = rText + unicode::formatPercent(GetWidthPercent(),
+Application::GetSettings().GetUILanguageTag());
 }
 else
 {
@@ -350,7 +352,8 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation
 rText = rText + ,  + SW_RESSTR( nId ) +  ;
 if ( GetHeightPercent() )
 {
-rText = rText + OUString::number(GetHeightPercent()) + %;
+rText = rText + unicode::formatPercent(GetHeightPercent(),
+Application::GetSettings().GetUILanguageTag());
 }
 else
 {
@@ -1042,7 +1045,8 @@ SfxItemPresentation SwLuminanceGrf::GetPresentation(
 rText = SW_RESSTR( STR_LUMINANCE );
 else if( rText.getLength() )
 rText = OUString();
-rText = rText + OUString::number( GetValue() ) + %;
+rText = rText + unicode::formatPercent(GetValue(),
+Application::GetSettings().GetUILanguageTag());
 break;
 
 default:
@@ -1065,7 +1069,8 @@ SfxItemPresentation SwContrastGrf::GetPresentation(
 rText = SW_RESSTR( STR_CONTRAST );
 else if( rText.getLength() )
 rText = OUString();
-rText = rText + OUString::number( GetValue() ) + %;
+rText = rText + unicode::formatPercent(GetValue(),
+Application::GetSettings().GetUILanguageTag());
 break;
 
 default:
@@ -1101,7 +1106,8 @@ SfxItemPresentation SwChannelGrf::GetPresentation(
 }
 else if( rText.getLength() )
 rText = OUString();
-rText = rText + OUString::number( GetValue() ) + %;
+rText = rText + unicode::formatPercent(GetValue(),
+Application::GetSettings().GetUILanguageTag());
 break;
 
 default:
@@ -1123,7 +1129,8 @@ SfxItemPresentation SwGammaGrf::GetPresentation(
 case SFX_ITEM_PRESENTATION_COMPLETE:
 if( SFX_ITEM_PRESENTATION_COMPLETE == ePres )
 aText.append(SW_RESSTR(STR_GAMMA));
-aText.append(GetValue()).append('%');
+aText.append(unicode::formatPercent(GetValue(),
+Application::GetSettings().GetUILanguageTag()));
 break;
 
 default:
@@ -1169,7 +1176,8 @@ SfxItemPresentation SwTransparencyGrf::GetPresentation(
 rText = SW_RESSTR( STR_TRANSPARENCY );
 else if( rText.getLength() )
 rText = OUString();
-rText = rText + OUString::number( GetValue() ) + %;
+rText = rText + unicode::formatPercent(GetValue(),
+Application::GetSettings().GetUILanguageTag());
 break;
 
 default:
___
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' - 20/f2a4b272f9fa879b8c30495fed3c462ea78a2f

 20/f2a4b272f9fa879b8c30495fed3c462ea78a2f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c3744599213eef2034a27dce2c51c4e42b12efae
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 12:39:59 2014 +

Notes added by 'git notes add'

diff --git a/20/f2a4b272f9fa879b8c30495fed3c462ea78a2f 
b/20/f2a4b272f9fa879b8c30495fed3c462ea78a2f
new file mode 100644
index 000..51fa88c
--- /dev/null
+++ b/20/f2a4b272f9fa879b8c30495fed3c462ea78a2f
@@ -0,0 +1 @@
+reject: despite ISO 31-0, English formatting rules dont approve a space 
between % and the number
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit aab6645595dc4210cc61a97aa9c137ecea5adace
Author: Tsutomu Uchino ha...@apache.org
Date:   Sat Jan 18 09:52:44 2014 +

Related: #i56998# percent value should not takes space separator...

before the character

(cherry picked from commit acac627b8aed3353e542ce41fa9a7064e4d1790b)

Conflicts:
vcl/source/control/field.cxx

Change-Id: Ia9c5496e1e2345f6249dc03efaf2c60f4231aecd

diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 8df9c0e..9a0e569 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1429,7 +1429,7 @@ OUString MetricFormatter::CreateFieldText( sal_Int64 
nValue ) const
 aStr += maCustomUnitText;
 else
 {
-if (meUnit != FUNIT_NONE || meUnit != FUNIT_PERCENT || meUnit != 
FUNIT_DEGREE)
+if (meUnit != FUNIT_NONE  meUnit != FUNIT_PERCENT  meUnit != 
FUNIT_DEGREE)
 aStr +=  ;
 aStr += ImplMetricToString( meUnit );
 }
___
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' - ac/ac627b8aed3353e542ce41fa9a7064e4d1790b

 ac/ac627b8aed3353e542ce41fa9a7064e4d1790b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f92024e04595fb9c8f7a10c15e0a528d44712ea5
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 12:47:08 2014 +

Notes added by 'git notes add'

diff --git a/ac/ac627b8aed3353e542ce41fa9a7064e4d1790b 
b/ac/ac627b8aed3353e542ce41fa9a7064e4d1790b
new file mode 100644
index 000..071d734
--- /dev/null
+++ b/ac/ac627b8aed3353e542ce41fa9a7064e4d1790b
@@ -0,0 +1 @@
+merged as: aab6645595dc4210cc61a97aa9c137ecea5adace
___
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

2014-01-20 Thread Zolnai Tamás

 sw/qa/extras/ooxmlimport/data/fdo73389.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   10 ++
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   23 +--
 3 files changed, 18 insertions(+), 15 deletions(-)

New commits:
commit d0c383256ef72d5212d8e2db77582d0ebe417209
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Mon Jan 20 13:44:46 2014 +0100

fdo#73389 Writer does not show a docx-document with nested table correctly

The table manager can work with more table simultaneously
and so m_aCellWidths contains more table's properties.Only one
item of it belongs to the current table (getCurrentCellwidths).
Regression from 74c5ed19f430327988194cdcd6bdff09591a93fa

Change-Id: I93efac0c004af1b2524c955ffb20c3ecd74a2920

diff --git a/sw/qa/extras/ooxmlimport/data/fdo73389.docx 
b/sw/qa/extras/ooxmlimport/data/fdo73389.docx
new file mode 100644
index 000..02b55f7
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo73389.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0f5de74..cde673b 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1704,8 +1704,18 @@ DECLARE_OOXMLIMPORT_TEST(testFdo69649, fdo69649.docx)
 xTocString = xTocString.copy(256);
 CPPUNIT_ASSERT(xTocString.startsWithIgnoreAsciiCase( Heading 15.1:\t15 ) 
);
 }
+
+DECLARE_OOXMLIMPORT_TEST(testFdo73389,fdo73389.docx)
+{
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xTables(xTablesSupplier-getTextTables(), uno::UNO_QUERY);
+// This was 9340, i.e. the width of the inner table was too large.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2842), 
getPropertysal_Int32(xTables-getByIndex(0), Width));
+}
 #endif
 
+
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 9625a1f..6969fe3 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -142,24 +142,17 @@ bool DomainMapperTableManager::sprm(Sprm  rSprm)
 */
 bool bFixed = true;
 sal_Int32 nRowFixedWidth = 0;
-if (!m_aCellWidths.empty())
+IntVectorPtr pCellWidths = getCurrentCellWidths();
+// Step 1. Check whether all cells have fixed 
widths in the given row of table.
+for (std::vectorsal_Int32::const_iterator 
aValIter = pCellWidths-begin(); aValIter != pCellWidths-end(); ++aValIter)
 {
-// Step 1. Check whether all cells have fixed 
widths in the given row of table.
-::std::vector IntVectorPtr ::iterator itr;
-for (itr = m_aCellWidths.begin(); itr != 
m_aCellWidths.end(); ++itr )
+if (*aValIter == -1)
 {
-IntVectorPtr itrVal = (*itr);
-for 
(std::vectorsal_Int32::const_iterator aValIter = itrVal-begin(); aValIter != 
itrVal-end(); ++aValIter)
-{
-if (*aValIter == -1)
-{
-bFixed = false;
-break;
-}
-// Sum the width of cells to find the 
total width of given row
-nRowFixedWidth += (*aValIter);
-}
+bFixed = false;
+break;
 }
+// Sum the width of cells to find the total 
width of given row
+nRowFixedWidth += (*aValIter);
 }
 
 // Check whether the total width of given row is 
compared with the maximum value of rows (m_nMaxFixedWidth).
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - README.cross solenv/bin

 README.cross  |   26 +-
 solenv/bin/make-raspbian-root-tarball |2 ++
 2 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit 78a61583c266a1fd222cd78c912e35e93f7010d3
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Jan 20 15:01:25 2014 +0200

Minor update for Raspbian

Change-Id: I5208aa7e6f40acc6d18a0617dc104474e1e87870

diff --git a/README.cross b/README.cross
index 2d133eb..6cbea22 100644
--- a/README.cross
+++ b/README.cross
@@ -386,28 +386,36 @@ Raspbian
 In theory, this should work also for another Linux, it does not need to be 
Raspbian.
 But this cross-compilation work is tested from Debian based system to Raspbian.
 
-You will need Raspbian's pkg-config files and system libraries to build 
against.
-Available at http://dev-www.libreoffice.org/extern/raspbian_rootfs.tar.bz2
-$ wget http://dev-www.libreoffice.org/extern/raspbian_rootfs.tar.bz2
-$ tar -xf raspbian_rootfs.tar.bz2
+You will need headers, pkg-config files and libraries from a Raspbian
+system to build against. Available at
+http://dev-www.libreoffice.org/extern/ . Look for the latest
+raspbian-root-*.tar.gz . For instance:
+
+$ wget http://dev-www.libreoffice.org/extern/raspbian-root-20140120.tar.gz
+$ mkdir raspbian-root
+$ cd raspbian-root
+$ tar -xf raspbian-root-20140120.tar.gz
 
 You can build cross-compiler yourself or get the executables here:
 $ git clone git://github.com/raspberrypi/tools
+
 tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian is known to work.
 
 Then create pkg-config wrapper, something like:
 $ cat  pkg-config-wrapper-host  _EOF
 #!/bin/sh
 
-SYSROOT=path-to-raspbian_rootfs
-
-export PKG_CONFIG_DIR=
-export 
PKG_CONFIG_LIBDIR=\${SYSROOT}/usr/lib/pkgconfig:\${SYSROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig:\${SYSROOT}/usr/share/pkgconfig
-export PKG_CONFIG_SYSROOT_DIR=\${SYSROOT}
+if [ $CROSS_COMPILING = YES ]; then
+   SYSROOT=$HOME/lo/raspbian-root
+   export 
PKG_CONFIG_PATH=${SYSROOT}/usr/lib/arm-linux-gnueabihf/pkgconfig:${SYSROOT}/usr/share/pkgconfig
+   export PKG_CONFIG_LIBDIR=${SYSROOT}/usr/lib/pkgconfig
+   export PKG_CONFIG_SYSROOT_DIR=${SYSROOT}
+fi
 
 exec pkg-config \$@
 _EOF
 $ chmod +x pkg-config-wrapper-host
+
 This does not work with pkg-config 0.23. 0.26 is known to work.
 
 And you are ready to build with autogen.input similar to:
commit 6e08873d98add4375d9d72057b9226d3bbc272fe
Author: Tor Lillqvist t...@collabora.com
Date:   Mon Jan 20 15:00:11 2014 +0200

Add JVM headers and libs

Change-Id: If5524c6c23bcd2500d029a33df141a0a1c611502

diff --git a/solenv/bin/make-raspbian-root-tarball 
b/solenv/bin/make-raspbian-root-tarball
index 38a64e2..a6540e9 100755
--- a/solenv/bin/make-raspbian-root-tarball
+++ b/solenv/bin/make-raspbian-root-tarball
@@ -48,6 +48,8 @@ find lib/*.so* \
  usr/lib/liblpsolve*.a \
  usr/lib/*.so* \
  usr/lib/arm-linux-gnueabihf \
+ usr/lib/jvm/java-6-openjdk-armhf/include \
+ usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm \
  usr/lib/pkgconfig \
  usr/share/pkgconfig \
 -type f -o -type l |
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/core/data/formulacell.cxx |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit 946394352aafa791819768d0e7215b482f4c1082
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Jan 16 12:49:14 2014 -0500

fdo#73655: Don't adjust formula tokens on non-top shared formula cells.

Only adjust tokens for non-shared formula cells and shared formuls cells
that are the top of their respective shared groups.

Change-Id: I9cd57653602c97504a802001947a28c4d03368a5
(cherry picked from commit 982a03d4e2baf4ca7e78c79014389d9b23e200d1)
Reviewed-on: https://gerrit.libreoffice.org/7482
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 721f268..66ef732 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2799,6 +2799,8 @@ bool ScFormulaCell::UpdateReference(
 
 void ScFormulaCell::UpdateInsertTab( sc::RefUpdateInsertTabContext rCxt )
 {
+// Adjust tokens only when it's not grouped or grouped top cell.
+bool bAdjustCode = !mxGroup || mxGroup-mpTopCell == this;
 bool bPosChanged = (rCxt.mnInsertPos = aPos.Tab());
 pCode-Reset();
 if (pDocument-IsClipOrUndo() || !pCode-GetNextReferenceRPN())
@@ -2815,6 +2817,9 @@ void ScFormulaCell::UpdateInsertTab( 
sc::RefUpdateInsertTabContext rCxt )
 if (bPosChanged)
 aPos.IncTab(rCxt.mnSheets);
 
+if (!bAdjustCode)
+return;
+
 sc::RefUpdateResult aRes = pCode-AdjustReferenceOnInsertedTab(rCxt, 
aOldPos);
 if (aRes.mbNameModified)
 // Re-compile after new sheet(s) have been inserted.
@@ -2825,6 +2830,8 @@ void ScFormulaCell::UpdateInsertTab( 
sc::RefUpdateInsertTabContext rCxt )
 
 bool ScFormulaCell::UpdateDeleteTab( sc::RefUpdateDeleteTabContext rCxt )
 {
+// Adjust tokens only when it's not grouped or grouped top cell.
+bool bAdjustCode = !mxGroup || mxGroup-mpTopCell == this;
 bool bPosChanged = (aPos.Tab() = rCxt.mnDeletePos + rCxt.mnSheets);
 pCode-Reset();
 if (pDocument-IsClipOrUndo() || !pCode-GetNextReferenceRPN())
@@ -2840,6 +2847,9 @@ bool ScFormulaCell::UpdateDeleteTab( 
sc::RefUpdateDeleteTabContext rCxt )
 if (bPosChanged)
 aPos.IncTab(-1*rCxt.mnSheets);
 
+if (!bAdjustCode)
+return false;
+
 sc::RefUpdateResult aRes = pCode-AdjustReferenceOnDeletedTab(rCxt, 
aOldPos);
 if (aRes.mbNameModified)
 // Re-compile after sheet(s) have been deleted.
@@ -2850,6 +2860,9 @@ bool ScFormulaCell::UpdateDeleteTab( 
sc::RefUpdateDeleteTabContext rCxt )
 
 void ScFormulaCell::UpdateMoveTab( sc::RefUpdateMoveTabContext rCxt, SCTAB 
nTabNo )
 {
+// Adjust tokens only when it's not grouped or grouped top cell.
+bool bAdjustCode = !mxGroup || mxGroup-mpTopCell == this;
+
 pCode-Reset();
 if (!pCode-GetNextReferenceRPN() || pDocument-IsClipOrUndo())
 {
@@ -2863,6 +2876,10 @@ void ScFormulaCell::UpdateMoveTab( 
sc::RefUpdateMoveTabContext rCxt, SCTAB nTab
 aPos.SetTab(nTabNo);
 
 // no StartListeningTo because pTab[nTab] not yet correct!
+
+if (!bAdjustCode)
+return;
+
 sc::RefUpdateResult aRes = pCode-AdjustReferenceOnMovedTab(rCxt, aOldPos);
 if (aRes.mbNameModified)
 // Re-compile after sheet(s) have been deleted.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-20 Thread Oliver-Rainer Wittmann

 i18nutil/source/utility/unicode.cxx |2 +-
 sw/source/core/text/inftxt.hxx  |1 -
 sw/source/core/text/portxt.cxx  |   10 ++
 vcl/source/control/field.cxx|   11 ++-
 4 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 6789e6de929c7685cf1573170534891aeffe5fa1
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Mon Jan 20 10:57:12 2014 +

Resolves: #i124039# assure correct line break for multi-lined Input Fields

(cherry picked from commit 14e0270c3ebad9a1fb817fcfced2aa8ee2f3e3f0)

Change-Id: If5664a5260e683cd5a80885b3f39b04f85de8db9

diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index b6e40b7..3ce3972 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -594,7 +594,6 @@ public:
 inline void Right( const SwTwips nNew ) { nRight = nNew; }
 inline SwTwips First() const { return nFirst; }
 inline void First( const SwTwips nNew ) { nFirst = nNew; }
-inline SwTwips CurrLeft() const { return (nLineStart ? nLeft : nFirst); }
 inline KSHORT RealWidth() const { return nRealWidth; }
 inline void RealWidth( const KSHORT nNew ) { nRealWidth = nNew; }
 inline KSHORT ForcedLeftMargin() const { return nForcedLeftMargin; }
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 50767f1..bab1eb8 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -733,6 +733,12 @@ sal_Bool SwTxtInputFldPortion::Format( SwTxtFormatInfo 
rInf )
 }
 else
 {
+const sal_Int32 nFormerLineStart = rInf.GetLineStart();
+if ( !mbContainsInputFieldStart )
+{
+rInf.SetLineStart( 0 );
+}
+
 bRet = SwTxtPortion::Format( rInf );
 
 if ( mbContainsInputFieldEnd )
@@ -749,6 +755,10 @@ sal_Bool SwTxtInputFldPortion::Format( SwTxtFormatInfo 
rInf )
 // adjust portion length accordingly
 SetLen( GetLen() + 1 );
 }
+else
+{
+rInf.SetLineStart( nFormerLineStart );
+}
 }
 }
 
commit 062e6f76ba26d2c0a54a476a1168202bae2322a7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 13:31:17 2014 +

Related: #i56998# use locale rules to format percentage

Change-Id: I2cdeefc5a5a1ee970ee3da5191ceae28b58340a1

diff --git a/i18nutil/source/utility/unicode.cxx 
b/i18nutil/source/utility/unicode.cxx
index 56daacd..0fb6b72 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -955,7 +955,7 @@ OUString SAL_CALL unicode::formatPercent(double dNumber,
 }
 
 UnicodeString output;
-xF-format(dNumber, output);
+xF-format(dNumber/100, output);
 return OUString(reinterpret_castconst sal_Unicode *(output.getBuffer()),
 output.length());
 }
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 9a0e569..b765ded 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -1423,13 +1423,22 @@ void MetricFormatter::SetValue( sal_Int64 nNewValue, 
FieldUnit eInUnit )
 
 OUString MetricFormatter::CreateFieldText( sal_Int64 nValue ) const
 {
+//whether percent is separated from its number is locale
+//specific, pawn it off to icu to decide
+if (meUnit == FUNIT_PERCENT)
+{
+double dValue = nValue;
+dValue /= ImplPower10(GetDecimalDigits());
+return unicode::formatPercent(dValue, 
Application::GetSettings().GetUILanguageTag());
+}
+
 OUString aStr = NumericFormatter::CreateFieldText( nValue );
 
 if( meUnit == FUNIT_CUSTOM )
 aStr += maCustomUnitText;
 else
 {
-if (meUnit != FUNIT_NONE  meUnit != FUNIT_PERCENT  meUnit != 
FUNIT_DEGREE)
+if (meUnit != FUNIT_NONE  meUnit != FUNIT_DEGREE)
 aStr +=  ;
 aStr += ImplMetricToString( meUnit );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 compilerplugins/clang/implicitboolconversion.cxx |   33 ---
 1 file changed, 30 insertions(+), 3 deletions(-)

New commits:
commit 3c2a6ad96b3549961f4c72c200da42ff82d8a188
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jan 20 14:31:54 2014 +0100

Make implicitboolconversion.cxx compile with Clang 3.2

Change-Id: I011e74fd044d0b7660adea362805917c584a

diff --git a/compilerplugins/clang/implicitboolconversion.cxx 
b/compilerplugins/clang/implicitboolconversion.cxx
index 98cb94c..31377d8 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -65,6 +65,33 @@ bool isBoolExpr(Expr const * expr) {
 return false;
 }
 
+// It appears that, given a function declaration, there is no way to determine
+// the language linkage of the function's type, only of the function's name
+// (via FunctionDecl::isExternC); however, in a case like
+//
+//   extern C { static void f(); }
+//
+// the function's name does not have C language linkage while the function's
+// type does (as clarified in C++11 [decl.link]); cf. http://clang-developers.
+// 42468.n3.nabble.com/Language-linkage-of-function-type-tt4037248.html
+// Language linkage of function type:
+bool hasCLanguageLinkageType(FunctionDecl const * decl) {
+assert(decl != nullptr);
+if (decl-isExternC()) {
+return true;
+}
+#if (__clang_major__ == 3  __clang_minor__ = 3) || __clang_major__  3
+if (decl-isInExternCContext()) {
+return true;
+}
+#else
+if (decl-getDeclContext()-isExternCContext()) {
+return true;
+}
+#endif
+return false;
+}
+
 class ImplicitBoolConversion:
 public RecursiveASTVisitorImplicitBoolConversion, public loplugin::Plugin
 {
@@ -126,14 +153,14 @@ bool ImplicitBoolConversion::TraverseCallExpr(CallExpr * 
expr) {
 FunctionProtoType const * t = nullptr;
 if (d != nullptr) {
 FunctionDecl const * fd = dyn_castFunctionDecl(d);
-if (fd != nullptr  (fd-isExternC() || fd-isInExternCContext())) {
+if (fd != nullptr  fd-isExternC()) {
 ext = true;
 PointerType const * pt = dyn_castPointerType(fd-getType());
 t = (pt == nullptr ? fd-getType() : pt-getPointeeType())
 -getAsFunctionProtoType();
 } else {
 VarDecl const * vd = dyn_castVarDecl(d);
-if (vd != nullptr  (vd-isExternC() || vd-isInExternCContext()))
+if (vd != nullptr  vd-isExternC())
 {
 ext = true;
 PointerType const * pt = dyn_castPointerType(vd-getType());
@@ -432,7 +459,7 @@ bool ImplicitBoolConversion::TraverseReturnStmt(ReturnStmt 
* stmt) {
 }
 
 bool ImplicitBoolConversion::TraverseFunctionDecl(FunctionDecl * decl) {
-bool ext = (decl-isExternC() || decl-isInExternCContext())
+bool ext = hasCLanguageLinkageType(decl)
  decl-isThisDeclarationADefinition()
  (decl-getResultType()-isSpecificBuiltinType(BuiltinType::Int)
 || 
decl-getResultType()-isSpecificBuiltinType(BuiltinType::UInt));
___
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' - 14/e0270c3ebad9a1fb817fcfced2aa8ee2f3e3f0

 14/e0270c3ebad9a1fb817fcfced2aa8ee2f3e3f0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d073380ea59ce1649bafef7f82c22d52dad1f6d7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 13:32:36 2014 +

Notes added by 'git notes add'

diff --git a/14/e0270c3ebad9a1fb817fcfced2aa8ee2f3e3f0 
b/14/e0270c3ebad9a1fb817fcfced2aa8ee2f3e3f0
new file mode 100644
index 000..03c15a6
--- /dev/null
+++ b/14/e0270c3ebad9a1fb817fcfced2aa8ee2f3e3f0
@@ -0,0 +1 @@
+merged as: 6789e6de929c7685cf1573170534891aeffe5fa1
___
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' - ea/cf6ec741dcc66f07e0b7b2a3a402d2f3c670fa

 ea/cf6ec741dcc66f07e0b7b2a3a402d2f3c670fa |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fc3e27ad6a10715fe58d8342e883aec5d7cf5344
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 13:36:57 2014 +

Notes added by 'git notes add'

diff --git a/ea/cf6ec741dcc66f07e0b7b2a3a402d2f3c670fa 
b/ea/cf6ec741dcc66f07e0b7b2a3a402d2f3c670fa
new file mode 100644
index 000..bda0c4c
--- /dev/null
+++ b/ea/cf6ec741dcc66f07e0b7b2a3a402d2f3c670fa
@@ -0,0 +1 @@
+prefer: 45a570f55b66c992d7dd1fccfae4424a40d624d5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-20 Thread Michael Stahl

 vcl/win/source/window/salframe.cxx |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 145a4c58b51d3e9e6b5914b65ad9a73247ae7061
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jan 15 15:00:51 2014 +0100

fdo#72397: vcl: do not enable A11y in Win32 message handler

On the libreoffice-4-2 branch, IA2 is experimental so it must be enabled
by user explicitly; the automatic enabling when a WM_GETOBJECT is
received will effectively enable the JAB which can be annoying.

Change-Id: I16bd8d77657567ad29f3538cd3ab1de8145d531e
Reviewed-on: https://gerrit.libreoffice.org/7443
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit bbaa97a79a72391aaa3dda1a55d92938ab3ea466)
Reviewed-on: https://gerrit.libreoffice.org/7499
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/win/source/window/salframe.cxx 
b/vcl/win/source/window/salframe.cxx
index f7c3086..d9f57b8 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5487,12 +5487,7 @@ static void ImplHandleIMENotify( HWND hWnd, WPARAM 
wParam )
 static bool
 ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT  nRet)
 {
-// IA2 should be enabled automatically
-AllSettings aSettings = Application::GetSettings();
-MiscSettings aMisc = aSettings.GetMiscSettings();
-aMisc.SetEnableATToolSupport( sal_True );
-aSettings.SetMiscSettings( aMisc );
-Application::SetSettings( aSettings );
+// IA2 should not be enabled automatically since it's experimental
 
 if (!Application::GetSettings().GetMiscSettings().GetEnableATToolSupport())
 return false; // locked down somehow ?
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

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

Bug 65675 depends on bug 73655, which changed state.

Bug 73655 Summary: Absolute cell references changes from reference sheet to 
current when I move one of sheet after reference
https://bugs.freedesktop.org/show_bug.cgi?id=73655

   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

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

2014-01-20 Thread Chris Sherlock

 include/vcl/svapp.hxx |  468 --
 1 file changed, 418 insertions(+), 50 deletions(-)

New commits:
commit 89a7b8a13285dcf614b162c1b8bd94b6785d3f87
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Sat Jan 18 23:10:58 2014 +1100

Document VCL Application class

Documented the VCL Application class in Doxygen format. Also
reindented some of the code, and moved ValidateSystemFont down
the list of class functions (better code organization).

Change-Id: Id421647a9a25e11be87b0f6c46d1ac0f4846f6a4
Reviewed-on: https://gerrit.libreoffice.org/7515
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 1620efa..aee 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -140,78 +140,432 @@ private:
 std::vectorOUString aData;
 };
 
+/**
+ @brief Abstract base class used for the LibreOffice Desktop class.
+
+ Abstract base class used for the LibreOffice Desktop class.
+
+ The Application class is an abstract class with one pure virtual
+ function: @Main. The main class that is subclassed is the Desktop
+ class, however there are a \em lot of static functions that are
+ vital for applications. It is really meant to be subclassed to
+ provide a global singleton, and heavily relies on a single data
+ structure ImplSVData
 
+ The reason Application exists is because the VCL used to be a
+ standalone framework, long since abandoned by anything other than
+ our application.
+
+ @see   Desktop, ImplSVData
+ */
 class VCL_DLLPUBLIC Application
 {
 public:
 enum DialogCancelMode {
-DIALOG_CANCEL_OFF, /// do not automatically cancel dialogs
-DIALOG_CANCEL_SILENT, /// silently cancel any dialogs
-DIALOG_CANCEL_FATAL
-/// cancel any dialogs by std::abort
+DIALOG_CANCEL_OFF,  /// do not automatically cancel dialogs
+DIALOG_CANCEL_SILENT,   /// silently cancel any dialogs
+DIALOG_CANCEL_FATAL /// cancel any dialogs by std::abort
 };
 
+/**
+Default constructor for Application class.
+
+Initializes the LibreOffice global instance data structure if needed,
+and then sets itself to be the Application class. Also initializes any
+platform specific data structures.
+
+@attention The initialization of the application itself is done in
+@Init
+
+@seeInitSalData is implemented by platform specific code.
+ImplInitSVData initializes the global instance data
+*/
 Application();
+
+/** Virtual destructor for Application class.
+
+Deinitializes the LibreOffice global instance data structure, then
+deinitializes any platform specific data structures.
+
+ @see   ImplDeInitSVData deinitializes the global instance data,
+DeInitSalData is implemented by platform specific code
+*/
 virtual ~Application();
 
+/** @brief Pure virtual entrypoint to the application.
+
+ Main() is the pure virtual entrypoint to your application. You
+ inherit your class from Application and subclass this function to
+ implement an application.
+
+ The Main() function does not pass in command line parameters,
+ you must use the functions @GetCommandLineParamCount() and
+ @GetCommandLineParam to get these values as these are platform
+ independent ways of getting the command line (use @GetAppFileName
+ to get the invoked executable filename).
+
+ Once in this function, you create windows, etc. then call on
+ @Execute to start the application's main event loop.
+
+ An example code snippet follows (it won't compile, this just gives the
+ general flavour of the framework and is adapted from an old HelloWorld
+ example program that Star Division used to provide as part of their
+ library).
+
+ \code{.cpp}
+class TheApplication : public Application
+{
+public:
+virtual void Main();
+};
+
+class TheWindow : public WorkWindow
+{
+public:
+TheWindow(Window *parent, WinBits windowStyle) :
+WorkWindow(parent, windowStyle) {}
+
+virtual void Paint(const Rectangle );
+};
+
+void TheWindow::Paint(const Rectangle)
+{
+DrawText(Point(100,100), String(Hello World!));
+}
+
+void TheApplication::Main()
+{
+TheWindow aWindow(NULL, WB_APP | WB_STDWORK);
+aWindow.Show();
+Execute();
+}
+
+TheApplication anApplication;
+\endcode
+
+Some examples in the source tree can be found here:
+
+\example vcl\workben\svdem.cxx
+This is an example of how to use the Application and WorkWindow. 
Unfortunately,

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

 starmath/source/document.cxx |1 +
 starmath/source/unomodel.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 5c6ef989906c6aa51b2e3702bac0323ef97e9f2d
Author: Tsutomu Uchino ha...@apache.org
Date:   Mon Jan 20 13:22:16 2014 +

#i121289# printer options should contain SID_SAVE_ONLY_USED_SYMBOLS value

diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index bfd8768..0991185 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -622,6 +622,7 @@ Printer* SmDocShell::GetPrt()
SID_PRINTTEXT,   SID_PRINTTEXT,
SID_PRINTFRAME,  SID_PRINTFRAME,
SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES,
+   SID_SAVE_ONLY_USED_SYMBOLS, 
SID_SAVE_ONLY_USED_SYMBOLS,
0);
 
 SmModule *pp = SM_MOD();
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index bff1854..7a0b154 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -699,6 +699,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** 
ppEntries, const Any*
 SID_PRINTTEXT,   SID_PRINTTEXT,
 SID_PRINTFRAME,  SID_PRINTFRAME,
 SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES,
+SID_SAVE_ONLY_USED_SYMBOLS, SID_SAVE_ONLY_USED_SYMBOLS,
 0
 };
 SfxItemSet *pItemSet = new SfxItemSet( pDocSh-GetPool(), 
nRange );
___
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' - dictionaries

2014-01-20 Thread Martin Srebotnjak

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

New commits:
commit d43b1244c867f39829ee8807eb67bf9d3d67fef1
Author: Martin Srebotnjak mi...@filmsi.net
Date:   Fri Jan 17 21:46:33 2014 +0100

Updated core
Project: dictionaries  0d96065c26879bd36f779def78f13363bf24b420

update Slovenian thesaurus

Change-Id: I80c89e153fa4ada0c3793bee6e0d089f73041734
Reviewed-on: https://gerrit.libreoffice.org/7508
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/dictionaries b/dictionaries
index 6ae2c96..0d96065 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 6ae2c9648e080d147b57da7edfca8cbb12b5a069
+Subproject commit 0d96065c26879bd36f779def78f13363bf24b420
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-20 Thread Martin Srebotnjak

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

New commits:
commit ffdea858b69b1e7181023a60a136688ccf449a2c
Author: Martin Srebotnjak mi...@filmsi.net
Date:   Fri Jan 17 21:46:33 2014 +0100

Updated core
Project: dictionaries  7b8732d1195ee67b84d98d568904a1d8f4402f1b

update Slovenian thesaurus

Change-Id: I80c89e153fa4ada0c3793bee6e0d089f73041734
Reviewed-on: https://gerrit.libreoffice.org/7506
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/dictionaries b/dictionaries
index 02314dc..7b8732d 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 02314dc1d63277226f048527d7fb843f751e84e8
+Subproject commit 7b8732d1195ee67b84d98d568904a1d8f4402f1b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - editeng/source sc/CppunitTest_sc_ucalc.mk sc/Library_sc.mk sc/source sd/CppunitTest_sd_uimpress.mk sd/Library_sd.mk sd/source svx/Library_svxcore.mk svx/sou

 editeng/source/items/frmitems.cxx |   46 +-
 sc/CppunitTest_sc_ucalc.mk|1 
 sc/Library_sc.mk  |1 
 sc/source/core/data/docpool.cxx   |   11 +++--
 sd/CppunitTest_sd_uimpress.mk |1 
 sd/Library_sd.mk  |1 
 sd/source/ui/animations/CustomAnimationDialog.cxx |4 +
 svx/Library_svxcore.mk|1 
 svx/source/svdraw/svdattr.cxx |7 ++-
 svx/source/tbxctrls/grafctrl.cxx  |3 -
 svx/source/xoutdev/xattr2.cxx |8 ++-
 sw/source/ui/ribbar/workctrl.cxx  |8 ++-
 sw/source/ui/utlui/unotools.cxx   |5 +-
 13 files changed, 73 insertions(+), 24 deletions(-)

New commits:
commit d33b4c311e3b9c0b8f50080cb38a31c19f587a16
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 13:55:03 2014 +

Related: #i56998# use locale rules to format percentage

Change-Id: I4b744cf10165383153d2a71c05df0c0ed327c641

diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index 6fd9113..69bdcf1 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -43,6 +43,7 @@
 #include com/sun/star/frame/status/UpperLowerMarginScale.hpp
 #include com/sun/star/drawing/ShadingPattern.hpp
 
+#include i18nutil/unicode.hxx
 #include unotools/securityoptions.hxx
 #include unotools/ucbstreamhelper.hxx
 #include limits.h
@@ -56,6 +57,7 @@
 #include rtl/ustring.hxx
 #include rtl/ustrbuf.hxx
 #include vcl/graphicfilter.hxx
+#include vcl/svapp.hxx
 #include editeng/editids.hrc
 #include editeng/editrids.hrc
 #include editeng/pbinitem.hxx
@@ -600,19 +602,28 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
 case SFX_ITEM_PRESENTATION_NAMELESS:
 {
 if ( 100 != nPropLeftMargin )
-rText = OUString::number( nPropLeftMargin ) + %;
+{
+rText = unicode::formatPercent(nPropLeftMargin,
+Application::GetSettings().GetUILanguageTag());
+}
 else
 rText = GetMetricText( (long)nLeftMargin,
eCoreUnit, ePresUnit, pIntl );
 rText += OUString(cpDelim);
 if ( 100 != nPropFirstLineOfst )
-rText = rText + OUString::number( nPropFirstLineOfst ) + %;
+{
+rText += unicode::formatPercent(nPropFirstLineOfst,
+Application::GetSettings().GetUILanguageTag());
+}
 else
 rText += GetMetricText( (long)nFirstLineOfst,
 eCoreUnit, ePresUnit, pIntl );
 rText += OUString(cpDelim);
 if ( 100 != nRightMargin )
-rText = rText + OUString::number( nRightMargin ) + %;
+{
+rText += unicode::formatPercent(nRightMargin,
+Application::GetSettings().GetUILanguageTag());
+}
 else
 rText += GetMetricText( (long)nRightMargin,
 eCoreUnit, ePresUnit, pIntl );
@@ -622,7 +633,8 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
 {
 rText = EE_RESSTR(RID_SVXITEMS_LRSPACE_LEFT);
 if ( 100 != nPropLeftMargin )
-rText += OUString::number( nPropLeftMargin ) + %;
+rText += unicode::formatPercent(nPropLeftMargin,
+Application::GetSettings().GetUILanguageTag());
 else
 {
 rText = rText +
@@ -634,7 +646,8 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
 {
 rText += EE_RESSTR(RID_SVXITEMS_LRSPACE_FLINE);
 if ( 100 != nPropFirstLineOfst )
-rText = rText + OUString::number( nPropFirstLineOfst ) + 
%;
+rText = rText + unicode::formatPercent(nPropFirstLineOfst,
+Application::GetSettings().GetUILanguageTag());
 else
 {
 rText = rText +
@@ -646,7 +659,8 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
 }
 rText += EE_RESSTR(RID_SVXITEMS_LRSPACE_RIGHT);
 if ( 100 != nPropRightMargin )
-rText = rText + OUString::number( nPropRightMargin ) + %;
+rText = rText + unicode::formatPercent(nPropRightMargin,
+Application::GetSettings().GetUILanguageTag());
 else
 {
 rText = rText +
@@ -961,12 +975,18 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation
 case SFX_ITEM_PRESENTATION_NAMELESS:
 {
 if ( 100 != nPropUpper )
-rText = OUString::number( nPropUpper ) + %;
+{
+

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - dictionaries

2014-01-20 Thread Martin Srebotnjak

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

New commits:
commit 8c9b04e1f3891c05f320819d6bd01b2bfd419534
Author: Martin Srebotnjak mi...@filmsi.net
Date:   Fri Jan 17 21:46:33 2014 +0100

Updated core
Project: dictionaries  c105c14a73366c171947eb442f64f1fb20a98098

update Slovenian thesaurus

Change-Id: I80c89e153fa4ada0c3793bee6e0d089f73041734
Reviewed-on: https://gerrit.libreoffice.org/7507
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/dictionaries b/dictionaries
index 1cdd621..c105c14a 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 1cdd621dcee55813db4f80e26ecc206e070d7355
+Subproject commit c105c14a73366c171947eb442f64f1fb20a98098
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-20 Thread Michael Stahl

 sw/source/core/crsr/findtxt.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 22183794b50d3d55094e1363755af74a10a4b555
Author: Michael Stahl mst...@redhat.com
Date:   Fri Jan 17 23:09:50 2014 +0100

fdo#73660: sw: fix Find of words containing soft-hyphen

Soft hyphen was not detected if there is no hint (-1).

(regression from ebeff3f074dd94dce4ce6cc55abd0495103684bd)

Change-Id: I09108796a32429a01eff93f797a6de521ab1d08a
(cherry picked from commit 156a0235bd8ff06840cecad1e70a57ffc5b8e7e1)
Reviewed-on: https://gerrit.libreoffice.org/7511
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 796da83..5567cfa 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -89,7 +89,9 @@ lcl_CleanStr(const SwTxtNode rNd, sal_Int32 const nStart, 
sal_Int32 rEnd,
 bNewHint = true;
 }
 // Check if next stop is a soft hyphen.
-else if (-1 != nSoftHyphen  nSoftHyphen  nHintStart  nSoftHyphen 
 nEnd)
+else if (   -1 != nSoftHyphen
+  (-1 == nHintStart || nSoftHyphen  nHintStart)
+  nSoftHyphen  nEnd)
 {
 nStt = nSoftHyphen;
 bNewSoftHyphen = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - comphelper/source configmgr/source desktop/source

2014-01-20 Thread Eike Rathke

 comphelper/source/misc/configuration.cxx   |2 +-
 configmgr/source/configurationprovider.cxx |2 +-
 desktop/source/app/langselect.cxx  |3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5f209df8858e56e639394687784d34d3944acad5
Author: Eike Rathke er...@redhat.com
Date:   Fri Jan 17 19:21:56 2014 +0100

fdo#73549 do not attempt to resolve an empty locale

... to match installed UI locales

Change-Id: If0ad0fde392bc5ea3cf454f4858330f5e93a
(cherry picked from commit 8e826c7ff7c597e9f585377b2117f4dc24239dcc)

fdo#73549 do not resolve empty locale here if not determined yet

Change-Id: Iad03d6209a2b4024b27c6195195e5aa557c295fe
(cherry picked from commit db6f8f9f8969b592ed90c841960fdd186e1cbc5a)

do not resolve empty locale here when set, fdo#73549 related

Change-Id: Id9c8c3926f64826fd2295e0f75f007ce435f5915
(cherry picked from commit 26fc9be1bf2d6aaeb52a571ea416f4527a52e146)
Reviewed-on: https://gerrit.libreoffice.org/7530
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/comphelper/source/misc/configuration.cxx 
b/comphelper/source/misc/configuration.cxx
index 69885b9..6f9e5fd 100644
--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@@ -47,7 +47,7 @@ OUString getDefaultLocale(
 css::uno::Reference css::lang::XLocalizable (
 css::configuration::theDefaultProvider::get(context),
 css::uno::UNO_QUERY_THROW)-
-getLocale()).getBcp47();
+getLocale()).getBcp47(false);
 }
 
 OUString extendLocalizedPath(OUString const  path, OUString const  locale) {
diff --git a/configmgr/source/configurationprovider.cxx 
b/configmgr/source/configurationprovider.cxx
index a4aaa15..7293e9f 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -324,7 +324,7 @@ void Service::setLocale(css::lang::Locale const  eLocale)
 throw (css::uno::RuntimeException)
 {
 osl::MutexGuard guard(*lock_);
-locale_ = LanguageTag::convertToBcp47( eLocale);
+locale_ = LanguageTag::convertToBcp47( eLocale, false);
 }
 
 css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException) {
diff --git a/desktop/source/app/langselect.cxx 
b/desktop/source/app/langselect.cxx
index 291e708..21228f8 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -53,6 +53,9 @@ OUString foundLocale;
 OUString getInstalledLocale(
 css::uno::SequenceOUString const  installed, OUString const  locale)
 {
+if (locale.isEmpty())
+return OUString();  // do not attempt to resolve anything
+
 for (sal_Int32 i = 0; i != installed.getLength(); ++i) {
 if (installed[i] == locale) {
 return installed[i];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac external/openssl

2014-01-20 Thread Douglas Mencken

 configure.ac|   12 ++--
 external/openssl/ExternalProject_openssl.mk |2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 8ae8d5165c29cb899e6a8a57d1021a844ac30b30
Author: Douglas Mencken dougmenc...@gmail.com
Date:   Mon Dec 30 10:55:47 2013 -0500

Get bundled openssl to be used on OS X too, at least on OS X 10.7

Also note that OpenSSL is incompatible with -fvisibility=hidden on OS X

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

diff --git a/configure.ac b/configure.ac
index 9e5f7de..eb024d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9375,19 +9375,11 @@ if test $enable_openssl = yes; then
 #
 # 
http://stackoverflow.com/questions/7406946/why-is-apple-deprecating-openssl-in-macos-10-7-lion
 # 
http://stackoverflow.com/questions/7475914/libcrypto-deprecated-on-mac-os-x-10-7-lion
-#
-# They apparently got fed up with the unstable ABI of
-# OpenSSL, or something, and recommend you either move to
-# their Common Crypto Architecture, or, if you have to stay
-# with OpenSSL, just build it yourself statically and bundle
-# with your application.
 
 with_system_openssl=no
 libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl])
-elif test $_os = Darwin -o $_os = NetBSD -o $_os = OpenBSD -o \
-$_os = DragonFly  test $with_system_openssl != no; then
-# Mac OS builds should get out without extra stuff is the Mac porters'
-# wish. And pkg-config is although Xcode ships a .pc for openssl
+elif test $_os = NetBSD -o $_os = OpenBSD -o $_os = DragonFly \
+ test $with_system_openssl != no; then
 with_system_openssl=yes
 SYSTEM_OPENSSL=YES
 OPENSSL_CFLAGS=
diff --git a/external/openssl/ExternalProject_openssl.mk 
b/external/openssl/ExternalProject_openssl.mk
index 919e354..d04c186 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -83,7 +83,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
$(if $(SYSBASE),-I$(SYSBASE)/usr/include 
-L$(SYSBASE)/usr/lib)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
 $(MAKE) build_libs \
-   CC=$(CC) -fPIC $(if $(filter-out WNT,$(OS)),\
+   CC=$(CC) -fPIC $(if $(filter-out WNT MACOSX,$(OS)),\
$(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\
-fvisibility=hidden)) \
)
___
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' - 86/918fa571a9d40911a6ce500376466bd56c8a93

 86/918fa571a9d40911a6ce500376466bd56c8a93 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9fc6cef991f7448c24f37dc3cc24709e833e1a42
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 15:07:09 2014 +

Notes added by 'git notes add'

diff --git a/86/918fa571a9d40911a6ce500376466bd56c8a93 
b/86/918fa571a9d40911a6ce500376466bd56c8a93
new file mode 100644
index 000..8a2345e
--- /dev/null
+++ b/86/918fa571a9d40911a6ce500376466bd56c8a93
@@ -0,0 +1 @@
+ignore: fixed
___
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' - 5c/6ef989906c6aa51b2e3702bac0323ef97e9f2d

 5c/6ef989906c6aa51b2e3702bac0323ef97e9f2d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ef21d0857711d0a71d6e15ac8b757ca50684585e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 15:06:30 2014 +

Notes added by 'git notes add'

diff --git a/5c/6ef989906c6aa51b2e3702bac0323ef97e9f2d 
b/5c/6ef989906c6aa51b2e3702bac0323ef97e9f2d
new file mode 100644
index 000..3b37390
--- /dev/null
+++ b/5c/6ef989906c6aa51b2e3702bac0323ef97e9f2d
@@ -0,0 +1 @@
+merged as: 78dd3fb45e05305691261e6c781578aed8bc92f0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/Library_cui.mk starmath/source

 cui/Library_cui.mk   |1 +
 starmath/source/unomodel.cxx |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 4e0cd21369b1bde28f57633f9b8c0e475eabc333
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 15:04:24 2014 +

require icu_headers here

Change-Id: Iee8d757f29c03e71e48c211966daaa89548710b4

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index cc80cf4..3d4edbc 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,cui,\
 $(eval $(call gb_Library_use_externals,cui,\
boost_headers \
 icuuc \
+icu_headers \
 ))
 
 ifeq ($(OS),WNT)
commit 78dd3fb45e05305691261e6c781578aed8bc92f0
Author: Tsutomu Uchino ha...@apache.org
Date:   Mon Jan 20 13:22:16 2014 +

Related: #i121289# printer options should have SID_SAVE_ONLY_USED_SYMBOLS

(cherry picked from commit 5c6ef989906c6aa51b2e3702bac0323ef97e9f2d)

Change-Id: Ida372f0558fd7e5cdb9c98384c21544e197f88a9

diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 1576670..1c3811f 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -654,6 +654,7 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** 
ppEntries, const Any*
 SID_PRINTTEXT,   SID_PRINTTEXT,
 SID_PRINTFRAME,  SID_PRINTFRAME,
 SID_NO_RIGHT_SPACES, SID_NO_RIGHT_SPACES,
+SID_SAVE_ONLY_USED_SYMBOLS, SID_SAVE_ONLY_USED_SYMBOLS,
 0
 };
 SfxItemSet *pItemSet = new SfxItemSet( pDocSh-GetPool(), 
nRange );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/Library_svxcore.mk

 svx/Library_svxcore.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 24ea8a7c5070fd48a7b162c2e5c092a0f29093ff
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 15:12:59 2014 +

require icu_headers here

Change-Id: If15c208f23d09dbd55ad0625448f864a7725c553

diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 58eb5e9..968c922 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_Library_use_libraries,svxcore,\
 $(eval $(call gb_Library_use_externals,svxcore,\
boost_headers \
icuuc \
+   icu_headers \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,svxcore,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-20 Thread Miklos Vajna

 oox/source/export/drawingml.cxx  |   11 +++
 sw/qa/extras/ooxmlexport/data/dml-textshape.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |8 
 3 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 305077c6c382aee1c5509b5b7809d8d73d65c674
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Mon Jan 20 15:05:50 2014 +0100

drawingML export: zero rotation shouldn't alter the shape position

I'm not exactly sure why existing code didn't do this implicitly, but at
least this improves the situation.

Change-Id: Id2bb169c513827b7ef48640dc88fad90a83d2bee

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 2a7d11a..2cddbf5 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -743,10 +743,13 @@ void DrawingML::WriteShapeTransformation( Reference 
XShape  rXShape, sal_Int32
 {
 SdrObject* pShape = (SdrObject*) GetSdrObjectFromXShape( rXShape );
 nRotation=pShape-GetRotateAngle();
-int faccos=bFlipV ? -1 : 1;
-int facsin=bFlipH ? -1 : 1;
-
aPos.X-=(1-faccos*cos(nRotation*F_PI18000))*aSize.Width/2-facsin*sin(nRotation*F_PI18000)*aSize.Height/2;
-
aPos.Y-=(1-faccos*cos(nRotation*F_PI18000))*aSize.Height/2+facsin*sin(nRotation*F_PI18000)*aSize.Width/2;
+if (nRotation)
+{
+int faccos=bFlipV ? -1 : 1;
+int facsin=bFlipH ? -1 : 1;
+
aPos.X-=(1-faccos*cos(nRotation*F_PI18000))*aSize.Width/2-facsin*sin(nRotation*F_PI18000)*aSize.Height/2;
+
aPos.Y-=(1-faccos*cos(nRotation*F_PI18000))*aSize.Height/2+facsin*sin(nRotation*F_PI18000)*aSize.Width/2;
+}
 }
 if (!bSuppressRotation)
 {
diff --git a/sw/qa/extras/ooxmlexport/data/dml-textshape.docx 
b/sw/qa/extras/ooxmlexport/data/dml-textshape.docx
index e5be42c..b98eea7 100644
Binary files a/sw/qa/extras/ooxmlexport/data/dml-textshape.docx and 
b/sw/qa/extras/ooxmlexport/data/dml-textshape.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 8d01930..ae4ab8c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -43,6 +43,7 @@
 #include unotools/tempfile.hxx
 #include unotools/ucbstreamhelper.hxx
 #include rtl/strbuf.hxx
+#include comphelper/sequenceashashmap.hxx
 #include com/sun/star/text/XDocumentIndex.hpp
 
 #include libxml/xpathInternals.h
@@ -2483,6 +2484,13 @@ DECLARE_OOXMLEXPORT_TEST(testDmlTextshape, 
dml-textshape.docx)
 return;
 // This was wrap=none.
 assertXPath(pXmlDocument, 
/w:document/w:body/w:p[2]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:inline/a:graphic/a:graphicData/wpg:wgp/wps:wsp[2]/wps:bodyPr,
 wrap, square);
+
+xShape.set(xGroup-getByIndex(3), uno::UNO_QUERY);
+OUString aType = 
comphelper::SequenceAsHashMap(getPropertybeans::PropertyValues(xShape, 
CustomShapeGeometry))[Type].getOUString();
+CPPUNIT_ASSERT_EQUAL(OUString(ooxml-bentConnector3), aType);
+// Connector was incorrectly shifted towards the top left corner, X was 
552, Y was 0.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4018), xShape-getPosition().X);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1256), xShape-getPosition().Y);
 }
 
 DECLARE_OOXMLEXPORT_TEST(testShapeThemePreservation, 
shape-theme-preservation.docx)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/inc desktop/source include/vcl svtools/source vcl/source

2014-01-20 Thread Chris Sherlock

 desktop/inc/app.hxx|2 +-
 desktop/source/app/app.cxx |2 +-
 include/vcl/svapp.hxx  |3 +--
 svtools/source/config/apearcfg.cxx |2 +-
 vcl/source/app/svapp.cxx   |3 +--
 vcl/source/window/window.cxx   |2 +-
 vcl/source/window/winproc.cxx  |   11 +++
 7 files changed, 9 insertions(+), 16 deletions(-)

New commits:
commit b799cb7528552b0538f3ee1f5afc935c406f5637
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Tue Jan 21 01:26:32 2014 +1100

Remove unused Window parameter from SystemSettingsChanging

This took a bit of code archaelogy for me to track down. It turns out that
as part of an effort to optimize startup, the line of code in this function
was commented out, presumably to be rewritten later. This happened in
commit ee3351d78c in July 2001 (!).

About three years later, in February 2004, the function was rewritten in
commit 189c2388d80. As it turns out, the only two functions that used
the Window parameter were vcl/source/window/window.cxx (which passed
itself in, but of course this did nothing) and
vcl/source/window/winproc.cxx. Furthermore, winproc only ever passed in
the first frame, so it didn't really do anything either.

Consequently, the function as it stands *now* only notifies the
application that system settings have been changed. It doesn't care
which window it tells.

Therefore, I have excised this parameter from the function. I don't
think it made sense when it was implemented anyway, so there is no net
loss.

After removing the unneeded parameter, I was also able to remove the
Window parameter from winproc.cxx's ImplHandleSalSettings function as
it was only ever used to set the top level window, which is now
irrelevant.

Change-Id: I84f2c5c5ff8969387da3af81e4a9c7f9ac6237e1
Reviewed-on: https://gerrit.libreoffice.org/7541
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 31d0dae..009bd75 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -78,7 +78,7 @@ class Desktop : public Application
 virtual voidDeInit();
 virtual sal_BoolQueryExit();
 virtual sal_uInt16  Exception(sal_uInt16 nError);
-virtual voidSystemSettingsChanging( AllSettings 
rSettings, Window* pFrame );
+virtual voidSystemSettingsChanging( AllSettings rSettings 
);
 virtual voidAppEvent( const ApplicationEvent rAppEvent );
 
 DECL_LINK(  OpenClients_Impl, void* );
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 691dc6c..962e2b4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1933,7 +1933,7 @@ sal_Bool Desktop::InitializeQuickstartMode( const 
Reference XComponentContext 
 }
 }
 
-void Desktop::SystemSettingsChanging( AllSettings rSettings, Window* )
+void Desktop::SystemSettingsChanging( AllSettings rSettings )
 {
 if ( !SvtTabAppearanceCfg::IsInitialized () )
 return;
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index aee..0432a17 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -563,8 +563,7 @@ public:
  */
 static sal_Bool IsUICaptured();
 
-virtual voidSystemSettingsChanging( AllSettings rSettings,
-Window* pFrame );
+virtual voidSystemSettingsChanging( AllSettings rSettings 
);
 static void MergeSystemSettings( AllSettings rSettings );
 
 static void SetSettings( const AllSettings rSettings );
diff --git a/svtools/source/config/apearcfg.cxx 
b/svtools/source/config/apearcfg.cxx
index b24c200..81948c6 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -219,7 +219,7 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( 
Application* pApp )
 
 hAppSettings.SetStyleSettings( hAppStyle );
 pApp-MergeSystemSettings( hAppSettings );  // Allow 
system-settings to apply
-pApp-SystemSettingsChanging ( hAppSettings, NULL );// Allow overruling of 
system-settings
+pApp-SystemSettingsChanging ( hAppSettings );  // Allow overruling of 
system-settings
 //is concerned with 
window drag
 
 pApp-SetSettings ( hAppSettings );
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 5e573d0..6d345f3 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -476,8 +476,7 @@ sal_Bool Application::IsUICaptured()
 return sal_False;
 }
 
-void Application::SystemSettingsChanging( AllSettings /*rSettings*/,
-

[Libreoffice-commits] core.git: sd/Library_sd.mk

 sd/Library_sd.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f2b3760ce564c9119600dace26f59799503f81ef
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 15:54:40 2014 +

require icu_headers here

Change-Id: I56e161d42f7a58a7931191ab3d0af79f2af9ee5c

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index cb5ff9a..5ce5374 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -102,6 +102,7 @@ $(eval $(call gb_Library_use_externals,sd,\
$(if $(ENABLE_AVAHI), \
avahi \
) \
+   icu_headers \
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-01-20 Thread Andre Fischer

 sc/source/core/data/table2.cxx |   26 --
 1 file changed, 16 insertions(+), 10 deletions(-)

New commits:
commit 3551c988e2757394dadce776515fccdef78f0214
Author: Andre Fischer a...@apache.org
Date:   Mon Jan 20 14:11:17 2014 +

124033: Made the update of maColManualBreaks more conservative.

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 544a265..5b96472 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -267,18 +267,24 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW 
nStartRow, SCROW nEndRow, SCSIZE
 
 if (!maColManualBreaks.empty())
 {
-std::setSCCOL::reverse_iterator rit = maColManualBreaks.rbegin();
-while (rit != maColManualBreaks.rend())
+std::vectorSCCOL aUpdatedBreaks;
+
+while ( ! maColManualBreaks.empty())
 {
-SCCOL nCol = *rit;
-if (nCol  nStartCol)
-break;  // while
-else
-{
-maColManualBreaks.erase( (++rit).base());
-maColManualBreaks.insert( static_castSCCOL( nCol + 
nSize));
-}
+std::setSCCOL::iterator aLast (--maColManualBreaks.end());
+
+// Check if there are more entries that have to be processed.
+if (*aLast  nStartRow)
+break;
+
+// Remember the updated break location and erase the entry.
+aUpdatedBreaks.push_back(static_castSCCOL(*aLast + nSize));
+maColManualBreaks.erase(aLast);
 }
+
+// Insert the updated break locations.
+if ( ! aUpdatedBreaks.empty())
+maColManualBreaks.insert(aUpdatedBreaks.begin(), 
aUpdatedBreaks.end());
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/calc-cell-borders' - 3 commits - drawinglayer/source sc/qa

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |  181 +++-
 sc/qa/unit/data/xls/cell-borders.xls|binary
 2 files changed, 135 insertions(+), 46 deletions(-)

New commits:
commit 74af71890f588deffb20ce096c6c89a47acbf54e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Jan 20 11:10:52 2014 -0500

Better on-screen drawing of vertical dashed lines.

Change-Id: I53d5f8b0278d1228cd941221a07cd360943c5ce6

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index d037d0c..06ca763 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -267,6 +267,20 @@ namespace drawinglayer
 double fX2 = rE.getX();
 double fY2 = rE.getY();
 
+bool bHorizontal = false;
+if (fX1 == fX2)
+{
+// Vertical line.
+}
+else if (fY1 == fY2)
+{
+// Horizontal line.
+bHorizontal = true;
+}
+else
+// Neither.  Bail out.
+return false;
+
 switch (rSource.getStyle())
 {
 case table::BorderLineStyle::SOLID:
@@ -275,14 +289,12 @@ namespace drawinglayer
 
maBColorModifierStack.getModifiedColor(rSource.getRGBColorLeft());
 double nThick = rtl::math::round(rSource.getLeftWidth());
 
-bool bDraw = false;
 bool bAsLine = false;
 basegfx::B2DPolygon aTarget;
 
-if (fY1 == fY2)
+if (bHorizontal)
 {
 // Horizontal line.  Draw it as a rectangle.
-bDraw = true;
 
 aTarget = makeRectPolygon(fX1, fY1, fX2-fX1, nThick);
 aTarget.transform(maCurrentTransformation);
@@ -299,10 +311,9 @@ namespace drawinglayer
 bAsLine = true;
 }
 }
-else if (fX1 == fX2)
+else
 {
 // Vertical line.  Draw it as a rectangle.
-bDraw = true;
 
 aTarget = makeRectPolygon(fX1, fY1, nThick, fY2-fY1);
 aTarget.transform(maCurrentTransformation);
@@ -320,9 +331,6 @@ namespace drawinglayer
 }
 }
 
-if (!bDraw)
-return false;
-
 if (bAsLine)
 {
 mpOutputDevice-SetFillColor();
@@ -342,30 +350,37 @@ namespace drawinglayer
 case table::BorderLineStyle::DASHED:
 case table::BorderLineStyle::FINE_DASHED:
 {
-double fH = rtl::math::round(rSource.getLeftWidth());
+std::vectordouble aPattern =
+svtools::GetLineDashing(rSource.getStyle(), 
rSource.getPatternScale()*10.0);
 
-if (fY1 == fY2)
-{
-// Horizontal line.
+if (aPattern.empty())
+// Failed to get pattern values.
+return false;
 
-basegfx::B2DPolyPolygon aDashes;
-std::vectordouble aPattern =
-svtools::GetLineDashing(rSource.getStyle(), 
rSource.getPatternScale()*10.0);
+double nThick = rtl::math::round(rSource.getLeftWidth());
+
+// Transform the current line range before using it for 
rendering.
+basegfx::B2DRange aRange(fX1, fY1, fX2, fY2);
+aRange.transform(maCurrentTransformation);
+fX1 = aRange.getMinX();
+fX2 = aRange.getMaxX();
+fY1 = aRange.getMinY();
+fY2 = aRange.getMaxY();
 
-if (aPattern.empty())
-// Failed to get pattern values.
-return false;
+basegfx::B2DPolyPolygon aTarget;
+
+if (bHorizontal)
+{
+// Horizontal line.
 
 // Create a dash unit polygon set.
+basegfx::B2DPolyPolygon aDashes;
 std::vectordouble::const_iterator it = 
aPattern.begin(), itEnd = aPattern.end();
 for (; it != itEnd; ++it)
-{
-double fW = *it;
-aDashes.append(makeRectPolygon(0, 0, fW, fH));
-}
+

[Libreoffice-commits] core.git: bin/count-todo-dialogs

2014-01-20 Thread Michael Meeks

 bin/count-todo-dialogs |4 
 1 file changed, 4 insertions(+)

New commits:
commit 88ca84d56113fa5228a1fd9297d7c16fdafa7c47
Author: Michael Meeks michael.me...@collabora.com
Date:   Mon Jan 20 16:20:32 2014 +

Add a %age completion.

Change-Id: I6066d42abddcefc9d7fe4bd19477a11294b138b2

diff --git a/bin/count-todo-dialogs b/bin/count-todo-dialogs
index fdb6fbb..27f5f3c 100755
--- a/bin/count-todo-dialogs
+++ b/bin/count-todo-dialogs
@@ -22,3 +22,7 @@ echo There are $tabpages unconverted tabpages
 
 num=$(($dialogs + $tabpages))
 echo An estimated additional $num .ui are required
+
+percent=$(($converted * 100 / ($num + $converted)))
+echo We are $percent% of the way through.
+
___
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' - 35/51c988e2757394dadce776515fccdef78f0214

 35/51c988e2757394dadce776515fccdef78f0214 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bc26c4f9e1f7f3646de270d51dd179ebe1c7cd46
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 16:24:03 2014 +

Notes added by 'git notes add'

diff --git a/35/51c988e2757394dadce776515fccdef78f0214 
b/35/51c988e2757394dadce776515fccdef78f0214
new file mode 100644
index 000..8a2345e
--- /dev/null
+++ b/35/51c988e2757394dadce776515fccdef78f0214
@@ -0,0 +1 @@
+ignore: fixed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Mac OS X 64-bit, libstdc++ vs. libc++

2014-01-20 Thread Norbert Thiebaud

On Mon, Jan 20, 2014 at 4:27 AM, Stephan Bergmann sberg...@redhat.com wrote:
 Current libreoffice-4-2 does build fine for me against Xcode 5.0.2 (on OS X
 10.9.1), with --enable-64-bit --enable-libc++ (among various other
 configuration switches).  (The underlying Clang of that Xcode version is
 reported as Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM
 3.3.svn).)

Well that is surprizing because here --enable-libc++ make autogen
choke due to 'unrecognized option'And I did the test above with
--enable-64-bit and --enable-libcpp (I modified the name of the
argument to get pass autogen.sh issue with it) --with-macosx-sdk=10.8
--with-macosx-version-min-required=10.8

clang is Apple clang version 4.1 (tags/Apple/clang-421.11.66 ( based
on LLVM 3.1svn)

I'll updade xcode and see if that works better

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

Latest xcode does not have command line tools

2014-01-20 Thread Jonathan Aquilina

I had to reinstall OSX 10.9 on my imac and the latest xcode doesnt seem to 
have the command line tools available any more.

Will this start causing issues for building on mac both for releases and 
contributors alike?

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

[Libreoffice-commits] help.git: helpers/help_hid.lst

 helpers/help_hid.lst |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 934de4f8116eb69e621b7eff487e743a8a1866e2
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 16:38:22 2014 +

drop unused help ids

Change-Id: I3b2df7d2e4ec43acae4edf5a98de39c76ee1a41b

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index de03375..a1168c6 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1466,7 +1466,6 @@ HID_DOCLINKEDIT_URL,38975,
 HID_DOCUMENT_CREATE_REPWIZ,38995,
 HID_DRAW_TEXT_TOOLBOX,54835,
 HID_DRAW_TOOLBOX,54832,
-HID_DSADMIN_ADVANCED,39016,
 HID_DSADMIN_ALLOWLONG,38813,
 HID_DSADMIN_ALL_TABLES,38823,
 HID_DSADMIN_APPENDTABLEALIAS,39031,
@@ -1547,7 +1546,6 @@ HID_DSADMIN_SHOWDELETED,38812,
 HID_DSADMIN_SPECIAL_MESSAGE,38840,
 HID_DSADMIN_SQL92CHECK,38993,
 HID_DSADMIN_SUPPRESS_VERSIONCL,38827,
-HID_DSADMIN_TABCONTROL,38795,
 HID_DSADMIN_TABLE_SELECTOR,38826,
 HID_DSADMIN_TABLE_SUBSCRIPTION,38802,
 HID_DSADMIN_TABLE_TOOLBOX,38939,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dbaccess/inc dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk helpcontent2

 dbaccess/UIConfig_dbaccess.mk  |1 
 dbaccess/inc/dbaccess_helpid.hrc   |2 
 dbaccess/source/ui/dlg/UserAdminDlg.src|1 
 dbaccess/source/ui/dlg/advancedsettings.cxx|   16 ++-
 dbaccess/source/ui/dlg/advancedsettings.hrc|3 
 dbaccess/source/ui/dlg/advancedsettings.src|   30 --
 dbaccess/source/ui/dlg/dbadmin.src |2 
 dbaccess/source/ui/dlg/dbadminsetup.src|1 
 dbaccess/source/ui/inc/dbu_resource.hrc|1 
 dbaccess/uiconfig/ui/advancedsettingsdialog.ui |  120 +
 helpcontent2   |2 
 11 files changed, 132 insertions(+), 47 deletions(-)

New commits:
commit 85f1c4a2cb1b54aabcb5249cf3c0b07182e8c434
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Mon Jan 20 16:21:10 2014 +

convert advanced db settings dialog to .ui format

Change-Id: Ia3152b7cc5edd89f37c78841e10bb5feacc6fc12

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 258975f..702b9a2 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_UIConfig_UIConfig,dbaccess))
 
 $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
+dbaccess/uiconfig/ui/advancedsettingsdialog \
 dbaccess/uiconfig/ui/colwidthdialog \
 dbaccess/uiconfig/ui/directsqldialog  \
 dbaccess/uiconfig/ui/fielddialog \
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index f7488c6..2f0e3b4 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -34,7 +34,6 @@
 #define HID_DSADMIN_DIALOG
DBACCESS_HID_DSADMIN_DIALOG
 
 
-#define HID_DSADMIN_TABCONTROL
DBACCESS_HID_DSADMIN_TABCONTROL
 #define HID_DSADMIN_PAGE_GENERAL  
DBACCESS_HID_DSADMIN_PAGE_GENERAL
 #define HID_DSADMIN_PAGE_DBASE
DBACCESS_HID_DSADMIN_PAGE_DBASE
 #define HID_DSADMIN_PAGE_JDBC 
DBACCESS_HID_DSADMIN_PAGE_JDBC
@@ -272,7 +271,6 @@
 #define HID_DSADMIN_PAGE_MSACCESS 
DBACCESS_HID_DSADMIN_PAGE_MSACCESS
 #define HID_DSADMIN_FLAT_PATH 
DBACCESS_HID_DSADMIN_FLAT_PATH
 #define HID_DSADMIN_CALC_PATH 
DBACCESS_HID_DSADMIN_CALC_PATH
-#define HID_DSADMIN_ADVANCED  
DBACCESS_HID_DSADMIN_ADVANCED
 #define HID_DSADMIN_BOOLEANCOMPARISON 
DBACCESS_HID_DSADMIN_BOOLEANCOMPARISON
 #define HID_DSADMIN_ORACLE_DATABASE   
DBACCESS_HID_DSADMIN_ORACLE_DATABASE
 #define HID_DSADMIN_MAXROWSCAN
DBACCESS_HID_DSADMIN_MAXROWSCAN
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src 
b/dbaccess/source/ui/dlg/UserAdminDlg.src
index 3a683bc..dc26bf8 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.src
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.src
@@ -33,7 +33,6 @@ TabDialog DLG_DATABASE_USERADMIN
 TabControl 1
 {
 OutputSize = TRUE ;
-HelpId = HID_DSADMIN_TABCONTROL;
 };
 String STR_PAGETITLE_USERADMIN
 {
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx 
b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 84088c7..fcc0bf2 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -429,7 +429,8 @@ namespace dbaui
 // AdvancedSettingsDialog
 AdvancedSettingsDialog::AdvancedSettingsDialog( Window* _pParent, 
SfxItemSet* _pItems,
 const Reference XComponentContext  _rxContext, const Any 
_aDataSourceName )
-:SfxTabDialog(_pParent, ModuleRes(DLG_DATABASE_ADVANCED), _pItems)
+: SfxTabDialog(_pParent, AdvancedSettingsDialog,
+dbaccess/ui/advancedsettingsdialog.ui, _pItems)
 {
 m_pImpl.reset(new 
ODbDataSourceAdministrationHelper(_rxContext,_pParent,this));
 m_pImpl-setDataSourceOrName(_aDataSourceName);
@@ -446,16 +447,19 @@ namespace dbaui
 const FeatureSet rFeatures( aMeta.getFeatureSet() );
 
 // auto-generated values?
-if ( rFeatures.supportsGeneratedValues() )
-AddTabPage( PAGE_GENERATED_VALUES, OUString( ModuleRes( 
STR_GENERATED_VALUE ) ), ODriversSettings::CreateGeneratedValuesPage, NULL );
+if (rFeatures.supportsGeneratedValues())
+AddTabPage(generated, 
ODriversSettings::CreateGeneratedValuesPage, NULL);
+else
+RemoveTabPage(generated);
 
 // any special settings?
-if ( rFeatures.supportsAnySpecialSetting() )
-AddTabPage( PAGE_ADVANCED_SETTINGS_SPECIAL, OUString( ModuleRes( 
STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateSpecialSettingsPage, NULL );
+if (rFeatures.supportsAnySpecialSetting())
+AddTabPage(special, ODriversSettings::CreateSpecialSettingsPage, 
NULL);
+else
+RemoveTabPage(special);

[Libreoffice-commits] core.git: 3 commits - configure.ac odk/CustomTarget_settings.mk odk/settings qadevOOo/tests

 configure.ac   |2 
 odk/CustomTarget_settings.mk   |3 
 odk/settings/dk.mk |2 
 odk/settings/settings.mk   |   38 ++---
 qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java |   40 
--
 5 files changed, 13 insertions(+), 72 deletions(-)

New commits:
commit ef602ba8ce58211c9588d8df72cbde7d48542a1a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jan 20 17:39:11 2014 +0100

Remove unused XInitialization.args data

...now that ModuleUIConfigurationManager no longer implements 
XInitialization
since 72b5343bd16deec540d8cd148cd7aebd74e92c16 fwk: Use constructor 
feature for
ModuleUIConfigurationManager.

Change-Id: I479c6c93e9982d80318e53b794bac99e949a5e46

diff --git a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java 
b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
index eedef1c..21945a1 100644
--- a/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
+++ b/qadevOOo/tests/java/mod/_fwk/ModuleUIConfigurationManager.java
@@ -22,11 +22,7 @@ import com.sun.star.beans.PropertyValue;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XIndexContainer;
 import com.sun.star.container.XNameAccess;
-import com.sun.star.embed.ElementModes;
-import com.sun.star.embed.XStorage;
-import com.sun.star.embed.XTransactedObject;
 import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XSingleServiceFactory;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.ui.XModuleUIConfigurationManagerSupplier;
@@ -51,7 +47,6 @@ public class ModuleUIConfigurationManager extends TestCase {
 XInterface oObj = null;
 XMultiServiceFactory xMSF = null;
 XTextDocument xTextDoc = null;
-XStorage xStore = null;
 
 /**
  * Cleanup: close the created document
@@ -72,9 +67,6 @@ public class ModuleUIConfigurationManager extends TestCase {
 }
 }
 log.println(   disposing storage);
-if (xStore != null) {
-xStore.dispose();
-}
 }
 
 /**
@@ -101,38 +93,6 @@ public class ModuleUIConfigurationManager extends TestCase {
 XNameAccess xMM = UnoRuntime.queryInterface(XNameAccess.class, 
xMSF.createInstance(com.sun.star.comp.framework.ModuleManager));
 xMM.getElementNames();
 
-o = xMSF.createInstance(com.sun.star.embed.StorageFactory);
-XSingleServiceFactory xStorageService = 
UnoRuntime.queryInterface(XSingleServiceFactory.class, o);
-Object[]props = new Object[2];
-
-String aFile = util.utils.getOfficeTempDir(xMSF) + dummyFile.dat;
-log.println(storage file : '+ aFile + ');
-
-props[0] = aFile;
-props[1] = new Integer(ElementModes.READWRITE);
-xStore = UnoRuntime.queryInterface(XStorage.class, 
xStorageService.createInstanceWithArguments(props));
-
-PropertyValue[] initProps = new PropertyValue[4];
-PropertyValue propVal = new PropertyValue();
-propVal.Name = DefaultConfigStorage;
-propVal.Value = xStore;
-initProps[0] = propVal;
-propVal = new PropertyValue();
-propVal.Name = UserConfigStorage;
-propVal.Value = xStore;
-initProps[1] = propVal;
-propVal = new PropertyValue();
-propVal.Name = ModuleIdentifier;
-propVal.Value = swriter;
-initProps[2] = propVal;
-propVal = new PropertyValue();
-propVal.Name = UserRootCommit;
-propVal.Value = UnoRuntime.queryInterface(XTransactedObject.class, 
xStore);
-initProps[3] = propVal;
-
-
-tEnv.addObjRelation(XInitialization.args, initProps);
-
 // the short cut manager service name
 // 2do: correct the service name when it's no longer in
 tEnv.addObjRelation(XConfigurationManager.ShortCutManager,
commit e5d643327d9fefe788e6d8dbbee0203e36da6d73
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jan 20 17:27:02 2014 +0100

Typo in PLATFORMID for Linux powerpc64

cf. the list of platform tokens at https://wiki.openoffice.org/wiki/
Documentation/DevGuide/Extensions/Target_Platform and in
desktop/source/deployment/misc/dp_platform.cxx.

Change-Id: Ibfc103bed1f6756654225e2c456ad73ab56c0d5a

diff --git a/configure.ac b/configure.ac
index eb024d7..a6f5b42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4203,7 +4203,7 @@ linux-gnu*)
 CPUNAME=POWERPC64
 RTL_ARCH=PowerPC_64
 LIB64=lib64
-PLATFORMID=linux_powerpc_64
+PLATFORMID=linux_powerpc64
 OUTPATH=unxlngppc64
 ;;
 sparc)
commit dea0398ee24eb278cdb14999efbf34d634454eaa
Author:

[Libreoffice-commits] core.git: Branch 'feature/calc-cell-borders' - drawinglayer/source

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |   63 ++--
 1 file changed, 40 insertions(+), 23 deletions(-)

New commits:
commit 5446c05ffbf8a0e94955fc3cfa8653a8d0f254f8
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Jan 20 11:41:41 2014 -0500

Substitute dashed line with a solid line at lower zoom levels.

Change-Id: I0437409b6a5d6163fadf777df5c028950727e786

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 06ca763..68abfa4 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -73,6 +73,19 @@ basegfx::B2DPolygon makeRectPolygon( double fX, double fY, 
double fW, double fH
 return aPoly;
 }
 
+void drawHairLine(
+OutputDevice* pOutDev, double fX1, double fY1, double fX2, double fY2,
+const basegfx::BColor rColor )
+{
+basegfx::B2DPolygon aTarget;
+aTarget.append(basegfx::B2DPoint(fX1, fY1));
+aTarget.append(basegfx::B2DPoint(fX2, fY2));
+
+pOutDev-SetFillColor();
+pOutDev-SetLineColor(Color(rColor));
+pOutDev-DrawPolyLine(aTarget);
+}
+
 }
 
 namespace drawinglayer
@@ -289,7 +302,6 @@ namespace drawinglayer
 
maBColorModifierStack.getModifiedColor(rSource.getRGBColorLeft());
 double nThick = rtl::math::round(rSource.getLeftWidth());
 
-bool bAsLine = false;
 basegfx::B2DPolygon aTarget;
 
 if (bHorizontal)
@@ -305,10 +317,10 @@ namespace drawinglayer
 if (fH = 1.0)
 {
 // Draw it as a line.
-aTarget.clear();
-aTarget.append(basegfx::B2DPoint(aRange.getMinX(), 
aRange.getMinY()));
-aTarget.append(basegfx::B2DPoint(aRange.getMaxX(), 
aRange.getMinY()));
-bAsLine = true;
+drawHairLine(
+mpOutputDevice, aRange.getMinX(), 
aRange.getMinY(), aRange.getMaxX(), aRange.getMinY(),
+aLineColor);
+return true;
 }
 }
 else
@@ -324,25 +336,16 @@ namespace drawinglayer
 if (fW = 1.0)
 {
 // Draw it as a line.
-aTarget.clear();
-aTarget.append(basegfx::B2DPoint(aRange.getMinX(), 
aRange.getMinY()));
-aTarget.append(basegfx::B2DPoint(aRange.getMinX(), 
aRange.getMaxY()));
-bAsLine = true;
+drawHairLine(
+mpOutputDevice, aRange.getMinX(), 
aRange.getMinY(), aRange.getMinX(), aRange.getMaxY(),
+aLineColor);
+return true;
 }
 }
 
-if (bAsLine)
-{
-mpOutputDevice-SetFillColor();
-mpOutputDevice-SetLineColor(Color(aLineColor));
-mpOutputDevice-DrawPolyLine(aTarget);
-}
-else
-{
-mpOutputDevice-SetFillColor(Color(aLineColor));
-mpOutputDevice-SetLineColor();
-mpOutputDevice-DrawPolygon(aTarget);
-}
+mpOutputDevice-SetFillColor(Color(aLineColor));
+mpOutputDevice-SetLineColor();
+mpOutputDevice-DrawPolygon(aTarget);
 return true;
 }
 break;
@@ -358,6 +361,8 @@ namespace drawinglayer
 return false;
 
 double nThick = rtl::math::round(rSource.getLeftWidth());
+const basegfx::BColor aLineColor =
+
maBColorModifierStack.getModifiedColor(rSource.getRGBColorLeft());
 
 // Transform the current line range before using it for 
rendering.
 basegfx::B2DRange aRange(fX1, fY1, fX2, fY2);
@@ -391,6 +396,13 @@ namespace drawinglayer
 basegfx::B2DPolygon aPoly = 
aDashes.getB2DPolygon(i);
 aRange = aPoly.getB2DRange();
 double fW = rtl::math::round(aRange.getWidth());
+if (basegfx::fTools::equalZero(fW))
+{
+// Dash line segment too small to draw.  
Substitute it with a solid line.
+drawHairLine(mpOutputDevice, fX1, fY1, fX2, 
fY1, aLineColor);
+return true;

[Libreoffice-commits] core.git: Branch 'feature/calc-cell-borders' - drawinglayer/source

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit c69e618225652a109a101ff213d9b8a21eff97a6
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Jan 20 11:48:36 2014 -0500

Do the same when the pixel thickness is zero.

Change-Id: Icfbb295abb19cf58477f4f14f4a7294a540151c2

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 68abfa4..ce22687 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -378,6 +378,13 @@ namespace drawinglayer
 {
 // Horizontal line.
 
+if (basegfx::fTools::equalZero(nThick))
+{
+// Dash line segment too small to draw.  
Substitute it with a solid line.
+drawHairLine(mpOutputDevice, fX1, fY1, fX2, fY1, 
aLineColor);
+return true;
+}
+
 // Create a dash unit polygon set.
 basegfx::B2DPolyPolygon aDashes;
 std::vectordouble::const_iterator it = 
aPattern.begin(), itEnd = aPattern.end();
@@ -438,6 +445,13 @@ namespace drawinglayer
 {
 // Vertical line.
 
+if (basegfx::fTools::equalZero(nThick))
+{
+// Dash line segment too small to draw.  
Substitute it with a solid line.
+drawHairLine(mpOutputDevice, fX1, fY1, fX1, fY2, 
aLineColor);
+return true;
+}
+
 // Create a dash unit polygon set.
 basegfx::B2DPolyPolygon aDashes;
 std::vectordouble::const_iterator it = 
aPattern.begin(), itEnd = aPattern.end();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Call For Papers. Kindly impart in your University/Organization/College/Colleagues/Academia/Circle

2014-01-20 Thread Editor IJTEMT

INTERNATIONAL JOURNAL OF TRENDS IN ECONOMICS MANAGEMENT TECHNOLOGY IJTEMT invites you to submit your research paper for publishing in Volume III, Issue I (JANUARY 2014). CALL FOR PAPERS VOLUME III, ISSUE I
www.ijtemt.org
INDEXED IN: Google Scholar, .docstoc, slideshare, Scribd, J-Gate, Academia.edu, Directory of Open Journals, Bielefeld Academic Search Engine, ulrichsweb.com(TM) -- The Global Source for Periodicals
About IJTEMTwww.ijtemt.org
International Journal of Trends in Economics Management and Technology (IJTEMT) in an International Academic Journal e-published bimonthly in India and open to the world. In this present interdisciplinary era, here at IJTEMT, a group of intellectual came together to find a common platform for three major components of any economy i.e., Economics, Management and Technology. Here we provide a forum to bridge the gap between the brushed-up professional in their respective fields and the new researcher which will results in better understanding and fruitful outcomes.The focus of this journal is to publish paper on economics management and technology. Submitted papers are reviewed by a full double â blind manner by the technical committee of the journal. The audience for the journal is professionals from related fields, academicians and new students research scholars.All submitted articles should report original, previously unpublished research results, experimental or theoretical, and will be peer-reviewed. Articles submitted to the journal should meet these criteria and must not be under consideration for publication elsewhere. Manuscripts should follow the style of the journal and are subject to both review and editing.
Why Select IJTEMT Journal www.ijtemt.org
IJTEMT Provides E-Certificates to Author'sif Needed.IJTEMT is Globally Approved International Journal having Strong Editorial Board.This is Online Open Journal .Author's can Download Paper from Library of Journal at any Time from Anywhere.IJTEMT is a Association of Eminent Scientist, Researchers and Experienced Members of More than 20 Countries.IJTEMT Publishes High Quality Papers which are Peer Reviewed by International/National Reviewers. Author's Query can be solved within 18 Hours.
Subject Category: ECONOMICS, MANAGEMENT TECHNOLOGY.
Important Dates:
Paper Submission:22nd JANUARY 2014www.ijtemt.org
Review Results (Acceptance/Rejection) Notification: Within two weeks after submitting manuscript. Guidelines for submission and Review Process:www.ijtemt.org
IJTEMT welcomes author submission of papers concerning any branch of the economics, management and technology and their applications in business, industry and other subjects relevant. The review process goes through following phases which can take time from ten days to two months:a. Each manuscript will be initially evaluated by the editorial board / editor, who may make use of appropriate software to examine the originality of the contents of the manuscript.b. The manuscripts passed through screening at above noted level will be forwarded to two referees for blind peer review, each of whom will make a recommendation to publish the article in its present form/edit/reject. During this period referees shall treat the contents of papers under review as privileged information.c. The reviewers' recommendations determine whether a paper will be accepted / accepted subject to change / subject to resubmission with significant changes / rejected.d. For papers which require changes, the same reviewers will be used to ensure that the quality of the revised paper is acceptable.e. All papers are refereed, and the Editor-in-Chief reserves the right to refuse any typescript, whether on invitation or otherwise, and to make suggestions and/or modifications before publication.
Submission of Paper will takes place in two phases:www.ijtemt.orga. Initial Paper Submission: Prospective author (s) is/are encouraged to submit their manuscript including charts, tables, figures and appendixes in .pdf and .doc (both) format to e-mail: sub...@ijtemt.org. All submitted articles should report original, previously unpublished research results, experimental or theoretical. Articles submitted to the IJIMT should meet these criteria and must not be under consideration for publication elsewhere.b. Camera Ready Paper Submission:On the acceptance of the paper after completion of the review process the author (s) is/are has to submit camera ready full text paper in .doc and .pdf (both) format to e-mail: submitfi...@ijtemt.org along with the corresponding signed copy of copyright transfer form and scanned copy of payment slip.
Publication fees www.ijtemt.org
Each accepted paper will be charged, for publication and paper handling, 60 USD per paper (for a maximum of 8 pages, above which 1 USD will be charged for every additional page) which is to be paid as per the instructions mentioned in the letter of acceptance of the manuscript submitted.
-S.LalEditor International Journal of Trends in

[Libreoffice-commits] core.git: Branch 'feature/calc-cell-borders' - drawinglayer/source

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 3b15f5324bc3dc6eeadee545d8a5884f670d811b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Jan 20 12:03:39 2014 -0500

Ensure that the pixel line is at least 1 pixel wide.

Without this, some dashed lines may not get drawn at all at some zoom 
levels.

Change-Id: I273c1548325d14f56618df8ca4166aac58a3ff3f

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index ce22687..439ce61 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -430,7 +430,12 @@ namespace drawinglayer
 if (fX + fBlockW  fX2)
 // Clip the right end in case it spills 
over the range.
 fBlockW = fX2 - fX + 1;
-aTarget.append(makeRectPolygon(fX, fY1, 
fBlockW, aRange.getHeight()));
+
+double fH = aRange.getHeight();
+if (basegfx::fTools::equalZero(fH))
+fH = 1.0;
+
+aTarget.append(makeRectPolygon(fX, fY1, 
fBlockW, fH));
 }
 
 bLine = !bLine; // line and blank alternate.
@@ -497,7 +502,12 @@ namespace drawinglayer
 if (fY + fBlockH  fY2)
 // Clip the bottom end in case it spills 
over the range.
 fBlockH = fY2 - fY + 1;
-aTarget.append(makeRectPolygon(fX1, fY, 
aRange.getWidth(), fBlockH));
+
+double fW = aRange.getWidth();
+if (basegfx::fTools::equalZero(fW))
+fW = 1.0;
+
+aTarget.append(makeRectPolygon(fX1, fY, fW, 
fBlockH));
 }
 
 bLine = !bLine; // line and blank alternate.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - codemaker/source cppuhelper/source include/sfx2 sax/source sfx2/source stoc/source svtools/Library_svt.mk svtools/source svtools/util svx/source

2014-01-20 Thread Jan Holesovsky

 codemaker/source/cppumaker/cpputype.cxx   |4 
 cppuhelper/source/servicemanager.cxx  |   11 --
 include/sfx2/app.hxx  |6 -
 sax/source/expatwrap/sax_expat.cxx|4 
 sax/source/expatwrap/saxwriter.cxx|4 
 sax/source/fastparser/fastparser.cxx  |4 
 sfx2/source/appl/appbas.cxx   |   10 --
 sfx2/source/appl/appbaslib.cxx|   10 --
 sfx2/source/appl/appdispatchprovider.cxx  |4 
 sfx2/source/appl/macroloader.cxx  |4 
 sfx2/source/appl/shutdownicon.cxx |4 
 sfx2/source/appl/xpackcreator.cxx |4 
 sfx2/source/dialog/backingcomp.cxx|4 
 sfx2/source/doc/SfxDocumentMetaData.cxx   |8 -
 sfx2/source/doc/doctemplates.cxx  |4 
 sfx2/source/doc/iframe.cxx|4 
 sfx2/source/doc/ownsubfilterservice.cxx   |4 
 sfx2/source/doc/plugin.cxx|4 
 sfx2/source/inc/appbaslib.hxx |2 
 sfx2/source/view/frmload.cxx  |4 
 stoc/source/defaultregistry/defaultregistry.cxx   |4 
 stoc/source/implementationregistration/implreg.cxx|4 
 stoc/source/loader/dllcomponentloader.cxx |4 
 stoc/source/security/access_controller.cxx|4 
 stoc/source/security/file_policy.cxx  |4 
 stoc/source/servicemanager/servicemanager.cxx |   12 --
 stoc/source/simpleregistry/simpleregistry.cxx |4 
 svtools/Library_svt.mk|1 
 svtools/source/filter/SvFilterOptionsDialog.cxx   |4 
 svtools/source/graphic/graphicunofactory.cxx  |4 
 svtools/source/graphic/provider.cxx   |4 
 svtools/source/graphic/renderer.cxx   |4 
 svtools/source/hatchwindow/documentcloser.cxx |4 
 svtools/source/hatchwindow/hatchwindowfactory.cxx |4 
 svtools/source/uno/addrtempuno.cxx|4 
 svtools/source/uno/fpicker.cxx|   52 +---
 svtools/source/uno/fpicker.hxx|   47 ++
 svtools/source/uno/miscservices.cxx   |   77 ++
 svtools/source/uno/wizard/unowizard.cxx   |4 
 svtools/util/svt.component|8 -
 svx/source/customshapes/EnhancedCustomShapeEngine.cxx |4 
 svx/source/sdr/primitive2d/primitivefactory2d.cxx |4 
 svx/source/sidebar/PanelFactory.cxx   |4 
 svx/source/tbxctrls/tbunocontroller.cxx   |4 
 svx/source/tbxctrls/tbunosearchcontrollers.cxx|   30 +--
 svx/source/unodraw/UnoGraphicExporter.cxx |4 
 svx/source/unodraw/recoveryui.cxx |4 
 svx/source/unodraw/unoctabl.cxx   |4 
 svx/source/unodraw/unoshcol.cxx   |4 
 svx/source/unogallery/unogalthemeprovider.cxx |4 
 svx/source/xml/xmlgrhlp.cxx   |   10 --
 51 files changed, 234 insertions(+), 198 deletions(-)

New commits:
commit 9bc2ab30e302c210b725e7035ea4d17774ef90e1
Author: Jan Holesovsky ke...@collabora.com
Date:   Mon Jan 20 09:26:58 2014 +0100

Revert svt: Use constructor feature for FilePicker and FolderPicker...

It does not make a real sense to use constructor for implementations that 
act
as a trampoline; instead, we should do a constructor for the real
implementations that hide behind it.

This reverts commit 2fbb47156773b2e300fc987efc2da85c66e567d1.
This reverts (part of) commit 58ea27124af27bfac21a796b0d13d72354bd0dd3.
This reverts (part of) commit 194bdbde25dd70988c94ff5e1af43b530d47d94b.
This reverts (part of) commit df002e39f7518036ae1c1d2afec7a525ef902327.
This reverts (part of) commit eb89c6f7dcd613cda6a9eee6f7897225e0334a25.
This reverts (part of) commit bdeb57c23973f3ef79020847b2fe39f312cf3c0b.
This reverts (part of) commit 4337a0664f4fb73f9e1be74f2a632847871da402.

Change-Id: Ibd9b1066f3b6ea215d8da9f491d5f026cd75b029

diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 4690961..4762808 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -230,6 +230,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
 svtools/source/uno/framestatuslistener \
 svtools/source/uno/generictoolboxcontroller \
 svtools/source/uno/genericunodialog \
+svtools/source/uno/miscservices \
 svtools/source/uno/popupmenucontrollerbase \
 svtools/source/uno/popupwindowcontroller \
 svtools/source/uno/statusbarcontroller \
diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx
index 1eccb57..c3961e8 100644
---

[Libreoffice-commits] core.git: Branch 'feature/calc-cell-borders' - drawinglayer/source

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |   22 ++--
 1 file changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 80187cb4faeb7426dcb565abe43f5616b4e9d8a8
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Mon Jan 20 12:30:11 2014 -0500

Handle double lines for screen rendering.

Double lines are always drawn as 2 parallel hair lines that are 1 pixel
apart, at any zoom level.

Change-Id: I2796477d0ea45c9880aa8057bd1a10104df96673

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 439ce61..61145f5 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -297,11 +297,14 @@ namespace drawinglayer
 switch (rSource.getStyle())
 {
 case table::BorderLineStyle::SOLID:
+case table::BorderLineStyle::DOUBLE:
 {
 const basegfx::BColor aLineColor =
 
maBColorModifierStack.getModifiedColor(rSource.getRGBColorLeft());
 double nThick = rtl::math::round(rSource.getLeftWidth());
 
+bool bDouble = rSource.getStyle() == 
table::BorderLineStyle::DOUBLE;
+
 basegfx::B2DPolygon aTarget;
 
 if (bHorizontal)
@@ -314,12 +317,20 @@ namespace drawinglayer
 basegfx::B2DRange aRange = aTarget.getB2DRange();
 double fH = aRange.getHeight();
 
-if (fH = 1.0)
+if (fH = 1.0 || bDouble)
 {
 // Draw it as a line.
 drawHairLine(
 mpOutputDevice, aRange.getMinX(), 
aRange.getMinY(), aRange.getMaxX(), aRange.getMinY(),
 aLineColor);
+
+if (bDouble)
+{
+drawHairLine(
+mpOutputDevice, aRange.getMinX(), 
aRange.getMinY()+2.0, aRange.getMaxX(), aRange.getMinY()+2.0,
+aLineColor);
+}
+
 return true;
 }
 }
@@ -333,12 +344,19 @@ namespace drawinglayer
 basegfx::B2DRange aRange = aTarget.getB2DRange();
 double fW = aRange.getWidth();
 
-if (fW = 1.0)
+if (fW = 1.0 || bDouble)
 {
 // Draw it as a line.
 drawHairLine(
 mpOutputDevice, aRange.getMinX(), 
aRange.getMinY(), aRange.getMinX(), aRange.getMaxY(),
 aLineColor);
+
+if (bDouble)
+{
+drawHairLine(
+mpOutputDevice, aRange.getMinX()+2.0, 
aRange.getMinY(), aRange.getMinX()+2.0, aRange.getMaxY(),
+aLineColor);
+}
 return true;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Mac OS X 64-bit, libstdc++ vs. libc++

 Well that is surprizing because here --enable-libc++ make autogen
 choke

Install a newer autoconf.

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

Re: Mac OS X 64-bit, libstdc++ vs. libc++