date:20130531

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

2013-05-31 Thread Michael Stahl

 download |   20 +---
 1 file changed, 17 insertions(+), 3 deletions(-)

New commits:
commit fb591d1b46d074b3c7cb02ef14ab47765246cdf5
Author: Michael Stahl mst...@redhat.com
Date:   Thu May 30 17:45:32 2013 +0200

fix copying of MSVC2008 runtime DLLs

(regression from d7b428453b07f48b56e7d83f05d81fae91b921c8)

Change-Id: Id3ba5bdb1f28b619add7d2e255cd9e1edc0d1bd1
Reviewed-on: https://gerrit.libreoffice.org/4110
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/download b/download
index a04d1f4..469fed6 100755
--- a/download
+++ b/download
@@ -51,9 +51,23 @@ fi
 
 if [ $COM = MSC ]; then
 # use oowintool to copy CRT dlls and manifest
-if ! ./oowintool --msvc-copy-dlls-64 ./external/msvcp ; then
-   echo oowintool failed to copy 64-bit CRT
-   exit 1
+if [ $VCVER = 90 ]; then
+# need only 32 bit DLLs in solver for MSVC 2008
+if ! ./oowintool --msvc-copy-dlls ./external/msvcp ; then
+   echo oowintool failed to copy CRT
+   exit 1
+fi
+# 64 bit DLLs handled via MSM
+if [ $CPUNAME = INTEL ]; then
+if ! ./oowintool --msvc-copy-msms-64 ./external/msm$VCVER ; then
+   echo WARNING: oowintool failed to copy x64 merge modules, 
installation will lack the 64-bit Explorer extension
+fi
+fi
+else
+if ! ./oowintool --msvc-copy-dlls-64 ./external/msvcp ; then
+   echo oowintool failed to copy 64-bit CRT
+   exit 1
+fi
 fi
 
 # use oowintool to copy VC redist merge modules
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - libcdr/msvc2008.patch.1 libcdr/UnpackedTarball_cdr.mk

2013-05-31 Thread Michael Stahl

 libcdr/UnpackedTarball_cdr.mk |4 
 libcdr/msvc2008.patch.1   |   13 +
 2 files changed, 17 insertions(+)

New commits:
commit 29296665015f4b21e28b88818a35442fdc7c2816
Author: Michael Stahl mst...@redhat.com
Date:   Thu May 30 17:42:27 2013 +0200

libcdr: fix build with MSVC2008

Change-Id: I70731e13ab4ef0d6eadd803b8f6a24f565be5346
Reviewed-on: https://gerrit.libreoffice.org/4109
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index be1e7d7..8affb0b 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
+   libcdr/msvc2008.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/libcdr/msvc2008.patch.1 b/libcdr/msvc2008.patch.1
new file mode 100644
index 000..27e327a
--- /dev/null
+++ b/libcdr/msvc2008.patch.1
@@ -0,0 +1,13 @@
+Fix broken MSVC 2008 project file
+
+--- cdr/build/win32/libcdr.vcproj  2013-05-30 17:36:43.08480 +0200
 cdr/build/win32/libcdr.vcproj  2013-05-30 17:36:52.71000 +0200
+@@ -217,7 +217,7 @@
+   /FileConfiguration
+   /File
+   File
+-  RelativePath=..\..\inc\libcdr\CDRDocument.cpp
++  RelativePath=..\..\src\lib\CDRDocument.cpp
+   
+   FileConfiguration
+   Name=Debug|Win32
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fix copying of MSVC2008 runtime DLLs

2013-05-31 Thread Fridrich Strba (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4110

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3ba5bdb1f28b619add7d2e255cd9e1edc0d1bd1
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[PUSHED libreoffice-4-0] libcdr: fix build with MSVC2008

2013-05-31 Thread Fridrich Strba (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4109

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I70731e13ab4ef0d6eadd803b8f6a24f565be5346
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[Libreoffice-commits] libcdr.git: build/win32

2013-05-31 Thread Michael Stahl

 build/win32/libcdr.vcproj |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8cd766dd834781c07e678753af302f8fccb24846
Author: Michael Stahl mst...@redhat.com
Date:   Fri May 31 08:43:16 2013 +0200

fix build with MSVC2008

diff --git a/build/win32/libcdr.vcproj b/build/win32/libcdr.vcproj
index f8213ca..a3c9d7c 100755
--- a/build/win32/libcdr.vcproj
+++ b/build/win32/libcdr.vcproj
@@ -217,7 +217,7 @@
/FileConfiguration
/File
File
-   RelativePath=..\..\inc\libcdr\CDRDocument.cpp
+   RelativePath=..\..\src\lib\CDRDocument.cpp

FileConfiguration
Name=Debug|Win32
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-31 Thread Thorsten Behrens

 vcl/source/gdi/gdimtf.cxx |   63 ++
 1 file changed, 36 insertions(+), 27 deletions(-)

New commits:
commit 243340c6e516892520907a8eb74f244e513dc065
Author: Thorsten Behrens tbehr...@suse.com
Date:   Fri May 31 08:58:13 2013 +0200

Band-aid fix for bnc#795857 and the pdf export black background.

Problem is the general un-awareness of the code base for inline
alpha. Needs larger rework eventually.

Change-Id: I01430d9087f98615819f0a7085b93f1c318e8b0b

diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 63b2b78..9bfcc5a 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -502,39 +502,48 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* 
pOut, const Point rPos, S
 }
 
 SalBitmap* pSalBmp = 
ImplGetSVData()-mpDefInst-CreateSalBitmap();
-// I don't quite understand this, but the old code didn't 
work properly on X11 when alpha was used,
-// and the commit that changed to the new code relied on 
alpha support in bitmap
-// (which that commit implemented only in X11SalBitmap) 
and so it didn't work on Windows.
-// So keep both.
 #ifdef UNX
 X11SalBitmap* X11Bmp = static_cast X11SalBitmap* ( 
pSalBmp );
-X11Bmp-SetHasAlpha( true );
-if( X11Bmp-Create( xBitmapCanvas, aSize ) )
-{
-Bitmap aBitmap( X11Bmp );
-if ( pOut-GetMapMode() == MAP_PIXEL )
-pOut-DrawBitmap( rPos, aBitmap );
-else
-pOut-DrawBitmap( rPos, rLogicDestSize, aBitmap );
-return true;
-}
-#else
-SalBitmap* pSalMask = 
ImplGetSVData()-mpDefInst-CreateSalBitmap();
 
-if( pSalBmp-Create( xBitmapCanvas, aSize )  
pSalMask-Create( xBitmapCanvas, aSize, true ) )
+// for pdf export metafile recording, don't break
+// other code's assumption that Bitmap with alpha
+// channel comes as BitmapEx
+if( !pOut-GetExtOutDevData() )
 {
-Bitmap aBitmap( pSalBmp );
-Bitmap aMask( pSalMask );
-AlphaMask aAlphaMask( aMask );
-BitmapEx aBitmapEx( aBitmap, aAlphaMask );
-if ( pOut-GetMapMode() == MAP_PIXEL )
-pOut-DrawBitmapEx( rPos, aBitmapEx );
-else
-pOut-DrawBitmapEx( rPos, rLogicDestSize, 
aBitmapEx );
-return true;
+X11Bmp-SetHasAlpha( true );
+if( X11Bmp-Create( xBitmapCanvas, aSize ) )
+{
+Bitmap aBitmap( X11Bmp );
+if ( pOut-GetMapMode() == MAP_PIXEL )
+pOut-DrawBitmap( rPos, aBitmap );
+else
+pOut-DrawBitmap( rPos, rLogicDestSize, 
aBitmap );
+return true;
+}
 }
-delete pSalMask;
+else
 #endif
+{
+// for Windows and Mac, exclusively use this
+// code path. The inline alpha on X11 is a
+// hack.
+SalBitmap* pSalMask = 
ImplGetSVData()-mpDefInst-CreateSalBitmap();
+if( pSalBmp-Create( xBitmapCanvas, aSize )  
pSalMask-Create( xBitmapCanvas, aSize, true ) )
+{
+Bitmap aBitmap( pSalBmp );
+Bitmap aMask( pSalMask );
+AlphaMask aAlphaMask( aMask );
+BitmapEx aBitmapEx( aBitmap, aAlphaMask );
+if ( pOut-GetMapMode() == MAP_PIXEL )
+pOut-DrawBitmapEx( rPos, aBitmapEx );
+else
+pOut-DrawBitmapEx( rPos, rLogicDestSize, 
aBitmapEx );
+return true;
+}
+
+delete pSalMask;
+}
+
 delete pSalBmp;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-31 Thread Takeshi Abe

 vcl/source/filter/ixbm/xbmread.cxx |   42 -
 vcl/source/filter/ixbm/xbmread.hxx |6 +-
 vcl/source/filter/ixpm/xpmread.cxx |   88 ++---
 vcl/source/filter/ixpm/xpmread.hxx |   20 
 4 files changed, 78 insertions(+), 78 deletions(-)

New commits:
commit 8483cf7812aa66af0d8b9b80f8a3e06730b158c6
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Fri May 31 15:52:17 2013 +0900

sal_Bool to bool

Change-Id: Idce2e9d650e9ff0d0e4fe17eeb06721cb73241e4

diff --git a/vcl/source/filter/ixbm/xbmread.cxx 
b/vcl/source/filter/ixbm/xbmread.cxx
index fc725f0..0e4b22c 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -33,7 +33,7 @@ XBMReader::XBMReader( SvStream rStm ) :
 nLastPos( rStm.Tell() ),
 nWidth  ( 0 ),
 nHeight ( 0 ),
-bStatus ( sal_True )
+bStatus ( true )
 {
 pHexTable = new short[ 256 ];
 maUpperName = OUString(SVIXBM);
@@ -96,7 +96,7 @@ OString XBMReader::FindTokenLine( SvStream* pInStm, const 
char* pTok1,
 OString aRet;
 sal_Int32 nPos1, nPos2, nPos3;
 
-bStatus = sal_False;
+bStatus = false;
 
 do
 {
@@ -107,23 +107,23 @@ OString XBMReader::FindTokenLine( SvStream* pInStm, const 
char* pTok1,
 {
 if( ( nPos1 = aRet.indexOf( pTok1 ) ) != -1 )
 {
-bStatus = sal_True;
+bStatus = true;
 
 if( pTok2 )
 {
-bStatus = sal_False;
+bStatus = false;
 
 if( ( ( nPos2 = aRet.indexOf( pTok2 ) ) != -1 ) 
  ( nPos2  nPos1 ) )
 {
-bStatus = sal_True;
+bStatus = true;
 
 if( pTok3 )
 {
-bStatus = sal_False;
+bStatus = false;
 
 if( ( ( nPos3 = aRet.indexOf( pTok3 ) ) != -1 )  
( nPos3  nPos2 ) )
-bStatus = sal_True;
+bStatus = true;
 }
 }
 }
@@ -186,7 +186,7 @@ long XBMReader::ParseDefine( const sal_Char* pDefine )
 
 // 
 
-sal_Bool XBMReader::ParseData( SvStream* pInStm, const OString aLastLine, 
XBMFormat eFormat )
+bool XBMReader::ParseData( SvStream* pInStm, const OString aLastLine, 
XBMFormat eFormat )
 {
 OStringaLine;
 longnRow = 0;
@@ -195,7 +195,7 @@ sal_Bool XBMReader::ParseData( SvStream* pInStm, const 
OString aLastLine, XBMFo
 longnBit;
 sal_uInt16  nValue;
 sal_uInt16  nDigits;
-sal_BoolbFirstLine = sal_True;
+boolbFirstLine = true;
 
 while( nRow  nHeight )
 {
@@ -207,7 +207,7 @@ sal_Bool XBMReader::ParseData( SvStream* pInStm, const 
OString aLastLine, XBMFo
 if( (nPos = ( aLine = aLastLine ).indexOf('{') ) != -1 )
 aLine = aLine.copy(nPos + 1);
 
-bFirstLine = sal_False;
+bFirstLine = false;
 }
 else if( !pInStm-ReadLine( aLine ) )
 break;
@@ -220,7 +220,7 @@ sal_Bool XBMReader::ParseData( SvStream* pInStm, const 
OString aLastLine, XBMFo
 {
 const OString aToken(comphelper::string::getToken(aLine,i, 
','));
 const sal_Int32 nLen = aToken.getLength();
-sal_Bool bProcessed = sal_False;
+bool bProcessed = false;
 
 nBit = nDigits = nValue = 0;
 
@@ -233,11 +233,11 @@ sal_Bool XBMReader::ParseData( SvStream* pInStm, const 
OString aLastLine, XBMFo
 {
 nValue = ( nValue  4 ) + nTable;
 nDigits++;
-bProcessed = sal_True;
+bProcessed = true;
 }
 else if( ( nTable  0 )  nDigits )
 {
-bProcessed = sal_True;
+bProcessed = true;
 break;
 }
 }
@@ -254,7 +254,7 @@ sal_Bool XBMReader::ParseData( SvStream* pInStm, const 
OString aLastLine, XBMFo
 }
 }
 
-return sal_True;
+return true;
 }
 
 // 
@@ -273,7 +273,7 @@ ReadState XBMReader::ReadXBM( Graphic rGraphic )
 if ( rIStm.GetError() != ERRCODE_IO_PENDING )
 {
 rIStm.Seek( nLastPos );
-bStatus = sal_False;
+bStatus = false;
 OString aLine = FindTokenLine( rIStm, #define, _width );
 
 if ( bStatus )
@@ -293,7 +293,7 @@ ReadState XBMReader::ReadXBM( Graphic rGraphic )

[Libreoffice-commits] core.git: dictionaries

2013-05-31 Thread Joren De Cuyper

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

New commits:
commit 1583e2117e9a87b3bca68e1b4af8d7aa5df10c23
Author: Joren De Cuyper joren.libreoff...@telenet.be
Date:   Thu May 30 18:49:45 2013 +0200

Updated core
Project: dictionaries  0bc4511b6060f68b422630c136a2e224e7ab3c8d

Update Dutch Hunspell to 2.10g too (fdo#63033 related)

Addition of commit 61644291cba7f6f8dd7e194f5abbe0b0e146a321

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

diff --git a/dictionaries b/dictionaries
index 9b6407d..0bc4511 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 9b6407dadc64e10e7117d8551917b46105ecc6c8
+Subproject commit 0bc4511b6060f68b422630c136a2e224e7ab3c8d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: nl_NL/nl_NL.aff

2013-05-31 Thread Joren De Cuyper

 nl_NL/nl_NL.aff | 1769 
 1 file changed, 895 insertions(+), 874 deletions(-)

New commits:
commit 0bc4511b6060f68b422630c136a2e224e7ab3c8d
Author: Joren De Cuyper joren.libreoff...@telenet.be
Date:   Thu May 30 18:49:45 2013 +0200

Update Dutch Hunspell to 2.10g too (fdo#63033 related)

Addition of commit 61644291cba7f6f8dd7e194f5abbe0b0e146a321

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

diff --git a/nl_NL/nl_NL.aff b/nl_NL/nl_NL.aff
index cf36e1a..7609730 100644
--- a/nl_NL/nl_NL.aff
+++ b/nl_NL/nl_NL.aff
@@ -1,17 +1,17 @@
 # Hunspell affix file
-# (c) 2006-2010 OpenTaal
+# (c) 2006-2011 OpenTaal
 # Coded by R. Baars
 # www.opentaal.org
-# version 2.00b2
-# d.d. 17-9-2010
+# version 2.10G
+# version date 2011-09-23
 
-# BEWARE: THIS AFFIX FILE AND DICTIONARY REQUIRE HUNSPELL 1.2.8 AS MINIMAL 
VERSION
+# BEWARE: THIS AFFIX FILE AND DICTIONARY REQUIRE HUNSPELL 1.3.1 AS MINIMAL 
VERSION
 
 # define char set
 SET UTF-8
 
-# - in front of try to suggest compuounds with - earlier
-TRY -esiadnrtolcugmphbyfvkwjkqxzÃ«Ã©Ã¨ÃªÃ¯Ã®Ã¤Ã 
Ã¢Ã¶Ã¼Ã»'ESIANRTOLCDUGMPHBYFVKWJKQXZ
+# statistical order as shown by Pander, except for the -, ââ and capitals
+TRY  -ernitsaoldgkupmchbvjwfzyx'âÃ«qÃ¯Ã©Ã¨Ã¶.ÃªÃ¼12635407Ã§Ã 
8Ã»9Ã®Ã±Ã¤Ã´ERNITSAOLDGKUPMCHBVJWFZYX
 
 # combined layout for BE and NL keyboards NL en BE
 KEY 
qwertyuiop|asdfghjkl|zxcvbnm|qawsedrftgyhujikolp|azsxdcfvgbhnjmk|aze|qsd|lm|wx|aqz|qws|
@@ -24,23 +24,37 @@ WORDCHARS 'â0123456789Ä³.-\/
 # Issue has been communicated with Hunspell's author.
 
 # do not offer split words (to prevent English desease, splitting up words)
-# it would be usefull, when suggestions would be last in list, but certainly 
not in front.
 NOSPLITSUGS
 
+# maximum number of compound suggestions
+# limit to 1 to prevent nonsense suggestions
+MAXCPDSUGS 1
+
+# max difference to be applied for all words (compounds and n-gram suggestions)
+ONLYMAXDIFF
+
+# max difference in chars for ngram suggestions
+# 3 limits wild suggestions a lot, but also drops suggestions for words with 
multiple errors
+MAXDIFF 3
+
 # avoid wrong spelling of letterwords in full uppercase (DVD should be dvd)
 KEEPCASE Kc
 
-# BREAK 0 does not work (reported as bug), so this is a work-around
-# This also causes the - to be seen as part of the word,
+# set the flag for warning with confusing words (kunne)
+WARN Wn
+
+# force uppercase for some word ends
+FORCEUCASE Fu
+
+# BREAK 0 causes the - to be seen as part of the word,
 # which is necessary to support the optional - in compounded words
-BREAK 1
-BREAK =
+BREAK 0
 
 # use double chars as flags, for more choice and readability
 # For readability reasons, use of flags is (mostly) restricted tu 
Upper-Lowercase combinations
 FLAG long
 
-# explicitly forbid words, wrongly generated by compounding
+# explicitly forbid words
 FORBIDDENWORD Fw
 
 # don't suggest words with extra accents
@@ -55,6 +69,7 @@ MAP oÃ³Ã²Ã¶Ã´
 MAP uÃ¼ÃºÃ¹Ã»
 
 # replace correct accented double vowels with unaccented ones for acceptance
+# also take care of apostrophe differences and ij as one character
 ICONV 9
 ICONV Ã¡Ã¡ aa
 ICONV Ã©Ã© ee
@@ -72,156 +87,244 @@ OCONV 2
 OCONV Ä³ ij
 OCONV Ä² IJ
 
-REP 487
+REP 593
+REP a's$ a # centra's=centra
+REP a's$ ums   # centra's=centrums
+REP pt$ bd # dichtgeslipt
+REP ^ad ad_# adrem
+REP kju cue# barbekju
+REP ^blackbox black_box
+REP ^bonvivant bon_vivant
+REP en e   # wolkenloos=wolkeloos
+REP on ont # onvankelijk=ontvankelijk
+REP ingswaard enswaard # benoemingswaard=benoemenswaard
+REP enswaard igenswaard# behartenswaard=behartigenswaard
+REP 'er Ã«r# havo'er = havoÃ«r
+REP Ã«r 'er# mboÃ«r=mbo'er
+REP ^immes$ immers
+REP os$ o's# autos=auto's
+REP as$ a's# papas=papa's
+REP us$ u's# tutus = tutu's
+REP t th   # etisch=ethisch
+REP oren oors  # pastoren=pastoors
+REP ^een een_
+REP wÄ³ziging wÄ³zing  # aanwijziging = aanwijzing
+REP ^clever$ slim
+REP ^clevere$ slimme
+REP pake opa
+REP rene RenÃ©
+REP ^hoe hoe_
+REP andere$ _andere
+REP ^ge-update$ geÃ¼pdatet
+REP ^als als_
+REP ^tenonder$ ten_onder
+REP ^goeiedag$ goedendag
+REP ^kunstof$ kunststof
+REP ^dattie$ dat_hÄ³
+REP ^tezÄ³nertÄ³d$ te_zÄ³ner_tÄ³d
+REP ^te te_
+REP ai e
+REP ^ter ter_
+REP ^stap-voor-stap stap_voor_stap
+REP elkaar$ _elkaar
+REP ^hierrond$ hieromheen  # Vlaams
+REP ^topdrie$ top_drie
+REP ^topvier$ top_vier
+REP ^topvÄ³f$ top_vÄ³f
+REP ^andre$ AndrÃ©
+REP ^eerstelÄ³n$ eerste_lÄ³n
+REP ^aande$ aan_de
+REP ^opde$ op_de
+REP ^zg$ zgn.
+REP ^'s 's_# 'savonds = 's avonds
+REP ^ook ook_
+REP check cheque
+REP ^us$ VS
+REP ore oire
+REP oor oir
+REP Ã¤ -a
+REP Ã¼ ue
+REP shock choqu
+REP talmud Talmoed
+REP kritik critic
+REP copier kopiÃ«r
+REP ^new-york$ New_York
+REP ske je
+REP

Re: oox service mess

2013-05-31 Thread Stephan Bergmann


On 05/30/2013 07:20 PM, Kohei Yoshida wrote:

On 05/30/2013 12:21 PM, Noel Power wrote:

is erroneously listed in sc/util/scfilt.component but not included in
scfilt_component_getFactory (sc/source/filter/excel/xestream.cxx);
its implementation got initially moved to the scfilt library, but has
since been removed as it was unreferenced.


intentional ( at least from me ) I doubt we want to do formula parsing
over uno ( I think Kohei would agree )

Yup. We just need to leave one service for formula parser available for
extension developers, but for the internal code we should not be using
the uno formula parser moving forward.


Just to be clear, with one service do you mean

(a) one service declaration in UNOIDL, for which extension developers 
can provide implementations, which the ScParserFactoryMap ctor in turn 
iterates over (which would be com.sun.star.sheet.FilterFormulaParser), or


(b) one service implementation (which would be the lost 
com.sun.star.comp.oox.xls.FormulaParser)?



And I believe the one we want to keep is made available by
ScFormulaParserObj under the com.sun.star.sheet.FormulaParser service
name, and this one is not on the list of services that Stephan listed,
so we are safe here.


Besides the com.sun.star.sheet.FilterFormulaParser UNOIDL (new-style 
marker, i.e., no ctor) service declaration there is indeed also a 
com.sun.star.sheet.FormulaParser UNOIDL old-style service declaration, 
It appears to be a service that is not available at the global service 
manager, but rather something that can be obtained from some Calc-local 
manager (ScServiceProvider::MakeInstance handing out ScFormulaParserObj 
instances under the com.sun.star.sheet.FormulaParser key).


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

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

2013-05-31 Thread Mark Wielaard

 basic/source/classes/propacc.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 287d483edb0359aa52238e75750f61a75f532436
Author: Mark Wielaard m...@klomp.org
Date:   Fri May 31 00:06:28 2013 +0200

propacc.cxx include limits.h for USHRT_MAX.

Don't depend on accidental definition depending on the version of boost 
used.

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

diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 67cd65a..c5ca85e 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -23,6 +23,8 @@
 #include basic/sbstar.hxx
 #include sbunoobj.hxx
 
+#include limits.h // USHRT_MAX
+
 using com::sun::star::uno::Reference;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Update Dutch Hunspell to 2.10g too (fdo#63033 related)

2013-05-31 Thread David Tardon (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4105

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia83eb1c894c8aa1fb710dfefceeb4ead3d323f08
Gerrit-PatchSet: 3
Gerrit-Project: dictionaries
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
Gerrit-Reviewer: David Tardon dtar...@redhat.com

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

[PUSHED] propacc.cxx include limits.h for USHRT_MAX.

2013-05-31 Thread David Tardon (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4111

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib26afdde895411bdf827e1af21e490b59ef7f2d5
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard m...@klomp.org
Gerrit-Reviewer: David Tardon dtar...@redhat.com

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

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

2013-05-31 Thread Chr . Rossmanith

 sd/source/core/CustomAnimationPreset.cxx  |4 -
 sd/source/core/drawdoc3.cxx   |2 
 sd/source/core/drawdoc4.cxx   |2 
 sd/source/core/sdpage.cxx |6 -
 sd/source/core/stlfamily.cxx  |4 -
 sd/source/core/stlpool.cxx|   10 +--
 sd/source/filter/eppt/pptx-text.cxx   |   22 +++---
 sd/source/filter/html/buttonset.cxx   |2 
 sd/source/filter/html/htmlex.cxx  |   83 --
 sd/source/filter/ppt/pptin.cxx|2 
 sd/source/filter/xml/sdxmlwrp.cxx |   22 ++
 sd/source/ui/app/sdmod.cxx|4 -
 sd/source/ui/dlg/TemplateScanner.cxx  |8 +-
 sd/source/ui/dlg/diactrl.cxx  |2 
 sd/source/ui/dlg/dlgass.cxx   |4 -
 sd/source/ui/dlg/dlgolbul.cxx |2 
 sd/source/ui/dlg/present.cxx  |2 
 sd/source/ui/dlg/prltempl.cxx |2 
 sd/source/ui/dlg/unchss.cxx   |2 
 sd/source/ui/func/fudraw.cxx  |8 +-
 sd/source/ui/func/fuolbull.cxx|2 
 sd/source/ui/func/futempl.cxx |2 
 sd/source/ui/sidebar/CustomAnimationPanel.cxx |2 
 sd/source/ui/sidebar/LayoutMenu.cxx   |2 
 sd/source/ui/sidebar/PanelBase.cxx|2 
 sd/source/ui/sidebar/PanelFactory.cxx |5 -
 sd/source/ui/sidebar/SlideTransitionPanel.cxx |2 
 sd/source/ui/sidebar/TableDesignPanel.cxx |2 
 28 files changed, 102 insertions(+), 110 deletions(-)

New commits:
commit 5b26722ace02f71c79573b3795b2bf7b9412090f
Author: Chr. Rossmanith chrrossman...@gmx.de
Date:   Thu May 30 22:22:11 2013 +0200

Remove RTL_CONSTASCII_(U)STRINGPARAM (sd)

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

diff --git a/sd/source/core/CustomAnimationPreset.cxx 
b/sd/source/core/CustomAnimationPreset.cxx
index 91b0836..619b8d2 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -471,7 +471,7 @@ void CustomAnimationPresets::importPresets( const 
Reference XMultiServiceFactor
 else
 {
 aMissedPresetIds += String(*pEffectNames);
-aMissedPresetIds += String( 
RTL_CONSTASCII_USTRINGPARAM(\n) );
+aMissedPresetIds += String( \n );
 }
 #endif
 pEffectNames++;
@@ -491,7 +491,7 @@ void CustomAnimationPresets::importPresets( const 
Reference XMultiServiceFactor
 #ifdef DEBUG
 if( aMissedPresetIds.Len() )
 {
-OStringBuffer 
aTmp(RTL_CONSTASCII_STRINGPARAM(sd::CustomAnimationPresets::importPresets(), 
invalid preset id!\n));
+OStringBuffer aTmp(sd::CustomAnimationPresets::importPresets(), 
invalid preset id!\n);
 aTmp.append(OUStringToOString(aMissedPresetIds,
 RTL_TEXTENCODING_ASCII_US));
 OSL_FAIL(aTmp.getStr());
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 903998c..e72a103 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1667,7 +1667,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
 }
 aName = aTest;
 String aPageLayoutName(aName);
-aPageLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( 
SD_LT_SEPARATOR ));
+aPageLayoutName.AppendAscii( SD_LT_SEPARATOR );
 aPageLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
 
 // Generate new stylesheets
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 040413c..6954913 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1110,7 +1110,7 @@ void SdDrawDocument::RenameLayoutTemplate(const String 
rOldLayoutName, const St
 // Now set the layout name of the drawing and the notes page, as well as
 // their master pages.
 String aPageLayoutName(rNewName);
-aPageLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR 
));
+aPageLayoutName.AppendAscii( SD_LT_SEPARATOR );
 aPageLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
 
 // Inform all text objects on pages that use the renamed layout and set the
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 48d5662..6c4faf3 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -561,7 +561,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, 
sal_Bool bVertical, const
 SfxStyleSheet* SdPage::GetStyleSheetForMasterPageBackground() const
 {
 String aName(GetLayoutName());
-String aSep( RTL_CONSTASCII_USTRINGPARAM( SD_LT_SEPARATOR ));
+String aSep( SD_LT_SEPARATOR );

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

2013-05-31 Thread Chr . Rossmanith

 sd/source/ui/sidebar/PanelFactory.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit a400b31069a913830b257ac8a1b2131665067ec5
Author: Chr. Rossmanith chrrossman...@gmx.de
Date:   Thu May 30 22:23:34 2013 +0200

Remove #define A2S() in PanelFactory.cxx

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

diff --git a/sd/source/ui/sidebar/PanelFactory.cxx 
b/sd/source/ui/sidebar/PanelFactory.cxx
index 53fbe58..e58ce5d 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -44,8 +44,6 @@ using namespace cssu;
 using namespace ::sd::framework;
 using ::rtl::OUString;
 
-#define A2S(pString) (OUString(pString))
-
 namespace sd {
 extern ::Window * createTableDesignPanel (::Window* pParent, 
ViewShellBase rBase);
 }
@@ -153,11 +151,11 @@ Referenceui::XUIElement SAL_CALL 
PanelFactory::createUIElement (
 ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow);
 if ( ! xParentWindow.is() || pParentWindow==NULL)
 throw RuntimeException(
-A2S(PanelFactory::createUIElement called without ParentWindow),
+OUString(PanelFactory::createUIElement called without 
ParentWindow),
 NULL);
 if ( ! xFrame.is())
 throw RuntimeException(
-A2S(PanelFactory::createUIElement called without XFrame),
+OUString(PanelFactory::createUIElement called without XFrame),
 NULL);
 
 // Tunnel through the controller to obtain a ViewShellBase.
@@ -171,7 +169,7 @@ Referenceui::XUIElement SAL_CALL 
PanelFactory::createUIElement (
 pBase = pController-GetViewShellBase();
 }
 if (pBase == NULL)
-throw RuntimeException(A2S(can not get ViewShellBase for frame), 
NULL);
+throw RuntimeException(OUString(can not get ViewShellBase for 
frame), NULL);
 
 // Get bindings from given arguments.
 const sal_uInt64 nBindingsValue (aArguments.getOrDefault(SfxBindings, 
sal_uInt64(0)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Remove RTL_CONSTASCII_(U)STRINGPARAM (sd)

2013-05-31 Thread David Tardon (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4107

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I179208d5ffe94e95719c7c6d0ea4eb354141531a
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith chrrossman...@web.de
Gerrit-Reviewer: David Tardon dtar...@redhat.com

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

[PUSHED] Remove #define A2S() in PanelFactory.cxx

2013-05-31 Thread David Tardon (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4108

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I650e5826d26b3a86dcddd517ae1f917d1edaedd1
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith chrrossman...@web.de
Gerrit-Reviewer: David Tardon dtar...@redhat.com

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

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

2013-05-31 Thread Fridrich Štrba

 oox/source/docprop/docprophandler.cxx |   41 ++
 1 file changed, 13 insertions(+), 28 deletions(-)

New commits:
commit db145ca43064ea46ed47dceada3052a105267140
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu May 30 11:46:35 2013 +0200

Fix crash with fdo60063-1.docx

Compared to the original version, this one tries hard
not to produce empty keywords.

Reviewed-on: https://gerrit.libreoffice.org/4091
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit b2f97d77237cde249b4c40acc8ad3f7f8755e768)
(cherry picked from commit 693707e338922d8dc7578975a1990e8a1cba6a53)

Conflicts:
oox/source/docprop/docprophandler.cxx

Change-Id: I11d036c2d54cde2d3c311a77c115011246f38d0a
Reviewed-on: https://gerrit.libreoffice.org/4093
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
(cherry picked from commit d60f81a3e9d020ff1ae0db2e73551bff45c43256)
Reviewed-on: https://gerrit.libreoffice.org/4103
Reviewed-by: LuboÅ¡ LuÅÃ¡k l.lu...@suse.cz
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/oox/source/docprop/docprophandler.cxx 
b/oox/source/docprop/docprophandler.cxx
index 1067315..ff6d170 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -25,6 +25,9 @@
 
 #include osl/time.h
 
+#include vector
+#include boost/algorithm/string.hpp
+
 #include oox/helper/attributelist.hxx
 
 using namespace ::com::sun::star;
@@ -157,39 +160,21 @@ uno::Sequence ::rtl::OUString  
OOXMLDocPropHandler::GetKeywordsSet( const ::rt
 {
 if ( !aChars.isEmpty() )
 {
-uno::Sequence ::rtl::OUString  aResult( 20 );
-sal_Int32 nCounter = 0;
+std::string aUtf8Chars = rtl::OUStringToOString( aChars, 
RTL_TEXTENCODING_UTF8 ).getStr();
+std::vectorstd::string aUtf8Result;
+boost::split( aUtf8Result, aUtf8Chars, boost::is_any_of( ,;:\t), 
boost::token_compress_on );
 
-const sal_Unicode* pStr = aChars.getStr();
-for( sal_Int32 nInd = 0; nInd  aChars.getLength()  pStr[nInd] != 0; 
nInd++ )
+if (!aUtf8Result.empty())
 {
-switch( pStr[nInd] )
-{
-case (sal_Unicode)' ':
-case (sal_Unicode)',':
-case (sal_Unicode)';':
-case (sal_Unicode)':':
-case (sal_Unicode)'\t':
-// this is a delimiter
-// unfortunately I did not find any specification for the 
possible delimiters
-if ( !aResult[nCounter].isEmpty() )
-{
-if ( nCounter = aResult.getLength() )
-aResult.realloc( nCounter + 10 );
-nCounter++;
-}
-break;
+uno::Sequence rtl::OUString  aResult( aUtf8Result.size() );
+OUString* pResultValues = aResult.getArray();
+for ( std::vector std::string ::const_iterator i = 
aUtf8Result.begin();
+  i != aUtf8Result.end(); ++i, ++pResultValues )
+*pResultValues = rtl::OUString( i-c_str(), static_cast 
sal_Int32 ( i-size() ),RTL_TEXTENCODING_UTF8 );
 
-default:
-// this should be a part of keyword
-aResult[nCounter] += ::rtl::OUString( 
(sal_Unicode)pStr[nInd] );
-}
+return aResult;
 }
-
-aResult.realloc( nCounter + 1 );
-return aResult;
 }
-
 return uno::Sequence ::rtl::OUString ();
 }
 // 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0-4] Fix crash with fdo60063-1.docx

2013-05-31 Thread David Tardon (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4103

Approvals:
  Luboš Luňák: Looks good to me, but someone else must approve
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I11d036c2d54cde2d3c311a77c115011246f38d0a
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-4
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: David Tardon dtar...@redhat.com
Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz
Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz

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

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

2013-05-31 Thread Thorsten Behrens

 vcl/source/gdi/gdimtf.cxx |   60 +-
 1 file changed, 33 insertions(+), 27 deletions(-)

New commits:
commit c2530b02311c46529eed53ee688bf6c83ce4b86e
Author: Thorsten Behrens tbehr...@suse.com
Date:   Fri May 31 08:58:13 2013 +0200

Band-aid fix for bnc#795857 and the pdf export black background.

Problem is the general un-awareness of the code base for inline
alpha. Needs larger rework eventually.

Change-Id: I01430d9087f98615819f0a7085b93f1c318e8b0b

diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index ffee748..019e18e 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -446,39 +446,45 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* 
pOut, const Point rPos, S
 }
 
 SalBitmap* pSalBmp = 
ImplGetSVData()-mpDefInst-CreateSalBitmap();
-// I don't quite understand this, but the old code didn't work 
properly on X11 when alpha was used,
-// and the commit that changed to the new code relied on alpha 
support in bitmap
-// (which that commit implemented only in X11SalBitmap) and so 
it didn't work on Windows.
-// So keep both.
 #if defined(UNX)  !defined(ANDROID)  !defined(IOS)  !defined(MACOSX)  
!defined(LIBO_HEADLESS)
 X11SalBitmap* X11Bmp = static_cast X11SalBitmap* ( pSalBmp );
-X11Bmp-SetHasAlpha( true );
-if( X11Bmp-Create( xBitmapCanvas, aSize ) )
-{
-Bitmap aBitmap( X11Bmp );
-if ( pOut-GetMapMode() == MAP_PIXEL )
-pOut-DrawBitmap( rPos, aBitmap );
-else
-pOut-DrawBitmap( rPos, rLogicDestSize, aBitmap );
-return true;
-}
-#else
-SalBitmap* pSalMask = 
ImplGetSVData()-mpDefInst-CreateSalBitmap();
 
-if( pSalBmp-Create( xBitmapCanvas, aSize )  
pSalMask-Create( xBitmapCanvas, aSize, true ) )
+// for pdf export metafile recording, don't break
+// other code's assumption that Bitmap with alpha
+// channel comes as BitmapEx
+if( !pOut-GetExtOutDevData() )
 {
-Bitmap aBitmap( pSalBmp );
-Bitmap aMask( pSalMask );
-AlphaMask aAlphaMask( aMask );
-BitmapEx aBitmapEx( aBitmap, aAlphaMask );
-if ( pOut-GetMapMode() == MAP_PIXEL )
-pOut-DrawBitmapEx( rPos, aBitmapEx );
-else
-pOut-DrawBitmapEx( rPos, rLogicDestSize, aBitmapEx );
-return true;
+X11Bmp-SetHasAlpha( true );
+if( X11Bmp-Create( xBitmapCanvas, aSize ) )
+{
+Bitmap aBitmap( X11Bmp );
+if ( pOut-GetMapMode() == MAP_PIXEL )
+pOut-DrawBitmap( rPos, aBitmap );
+else
+pOut-DrawBitmap( rPos, rLogicDestSize, aBitmap );
+return true;
+}
 }
-delete pSalMask;
+else
 #endif
+{
+// for Windows and Mac, exclusively use this code
+// path. The inline alpha on X11 is a hack.
+SalBitmap* pSalMask = 
ImplGetSVData()-mpDefInst-CreateSalBitmap();
+if( pSalBmp-Create( xBitmapCanvas, aSize )  
pSalMask-Create( xBitmapCanvas, aSize, true ) )
+{
+Bitmap aBitmap( pSalBmp );
+Bitmap aMask( pSalMask );
+AlphaMask aAlphaMask( aMask );
+BitmapEx aBitmapEx( aBitmap, aAlphaMask );
+if ( pOut-GetMapMode() == MAP_PIXEL )
+pOut-DrawBitmapEx( rPos, aBitmapEx );
+else
+pOut-DrawBitmapEx( rPos, rLogicDestSize, 
aBitmapEx );
+return true;
+}
+delete pSalMask;
+}
 delete pSalBmp;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

unexpected css::container::ElementExistException in SwXFrame::attachToRange

2013-05-31 Thread Stephan Bergmann

Loading test3.docx attached to 
https://bugs.freedesktop.org/show_bug.cgi?id=41466 Missing notes and 
moved components after importing .docx file leads to an unexpected 
css::container::ElementExistException in SwXFrame::attachToRange 
(resulting in std::unexpected abort with --enable-dbgutil) in recent 
master builds, where the exception is thrown as below.  Someone more 
familiar with the sw code would need to decide how to address this.


Stephan


#0  com::sun::star::container::ElementExistException::ElementExistException 
(this=0x161bc20) at 
lo/core/workdir/unxlngx6/UnoApiHeadersTarget/udkapi/normal/com/sun/star/container/ElementExistException.hpp:17
#1  0x7fffd137d9cf in SvxUnoNameItemTable::insertByName (this=0x7fffc9a0ddd8, 
aApiName=Gradient 7, aElement=uno::Any {Style = 
com::sun::star::awt::GradientStyle_LINEAR, StartColor = 8421504, EndColor = 14277081, 
Angle = 0, Border = 0, XOffset = 0, YOffset = 0, StartIntensity = 100, EndIntensity = 
100, StepCount = 0}) at lo/core/svx/source/unodraw/UnoNameItemTable.cxx:111
#2  0x7fffce67c427 in BaseFrameProperties_Impl::FillBaseProperties 
(this=0x161e7c0, pDoc=0x13f8620, rToSet=..., rFromSet=..., 
rSizeFound=@0x7fff904f: false) at 
lo/core/sw/source/core/unocore/unoframe.cxx:270
#3  0x7fffce67e879 in SwFrameProperties_Impl::AnyToItemSet (this=0x161e7c0, 
pDoc=0x13f8620, rSet=..., rSizeFound=@0x7fff904f: false) at 
lo/core/sw/source/core/unocore/unoframe.cxx:625
#4  0x7fffce6872bf in SwXFrame::attachToRange (this=0x7fffc9a046f8, 
xTextRange=uno::Reference to (SwXTextRange *) 0x7fffc95ebd70) at 
lo/core/sw/source/core/unocore/unoframe.cxx:2146
#5  0x7fffce6897e2 in SwXFrame::attach (this=0x7fffc9a046f8, 
xTextRange=uno::Reference to (SwXTextRange *) 0x7fffc95ebd70) at 
lo/core/sw/source/core/unocore/unoframe.cxx:2466
#6  0x7fffce68b804 in SwXTextFrame::attach (this=0x7fffc9a04650, 
xTextRange=uno::Reference to (SwXTextRange *) 0x7fffc95ebd70) at 
lo/core/sw/source/core/unocore/unoframe.cxx:2731
#7  0x7fffce75f54a in SwXText::insertTextContent (this=0x7fffe0ad44d0, 
xRange=uno::Reference to (SwXTextCursor *) 0x7fffc99f1f80, 
xContent=uno::Reference to (SwXTextFrame *) 0x7fffc9a04678, bAbsorb=0 '\000') 
at lo/core/sw/source/core/unocore/unotext.cxx:617
#8  0x7fffc9c1170d in 
writerfilter::dmapper::DomainMapper_Impl::PushShapeContext (this=0x14edc80, 
xShape=uno::Reference to (SwXTextFrame *) 0x7fffc9a04738) at 
lo/core/writerfilter/source/dmapper/DomainMapper_Impl.cxx:1723
#9  0x7fffc9bd455b in writerfilter::dmapper::DomainMapper::lcl_startShape 
(this=0x14ef5f0, xShape=uno::Reference to (SwXTextFrame *) 0x7fffc9a04738) at 
lo/core/writerfilter/source/dmapper/DomainMapper.cxx:3505
#10 0x7fffc9d5d40e in writerfilter::LoggedStream::startShape 
(this=0x14ef608, xShape=uno::Reference to (SwXTextFrame *) 0x7fffc9a04738) at 
lo/core/writerfilter/source/resourcemodel/LoggedResources.cxx:151
#11 0x7fffc9d1b8b8 in 
writerfilter::ooxml::OOXMLFastContextHandlerShape::sendShape 
(this=0x7fffc9a94f10, Element=1577992) at 
lo/core/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:2046
#12 0x7fffc9d1c981 in 
writerfilter::ooxml::OOXMLFastContextHandlerWrapper::lcl_createFastChildContext 
(this=0x7fffc99f3a30, Element=1577992, Attribs=uno::Reference to 
(sax_fastparser::FastAttributeList *) 0x7fffc9aa79f8) at 
lo/core/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:2308
#13 0x7fffc9d15160 in 
writerfilter::ooxml::OOXMLFastContextHandler::createFastChildContext 
(this=0x7fffc99f3a30, Element=1577992, Attribs=uno::Reference to 
(sax_fastparser::FastAttributeList *) 0x7fffc9aa79f8) at 
lo/core/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:275
#14 0x7fffcf76cbd6 in sax_fastparser::FastSaxParser::callbackStartElement 
(this=0x7fffe0ad6008, pwName=0x15bef20 v:textbox, awAttributes=0x1515170) at 
lo/core/sax/source/fastparser/fastparser.cxx:832
#15 0x7fffcf769747 in sax_fastparser::call_callbackStartElement 
(userData=0x7fffe0ad6008, name=0x15bef20 v:textbox, atts=0x1515170) at 
lo/core/sax/source/fastparser/fastparser.cxx:106
#16 0x7fffcf7821fb in doContent (parser=0x1542700, startTagLevel=0, enc=0x7fffcf9bf480 utf8_encoding, s=0x1626e75 v:textboxw:txbxContentw:p w:rsidR=\00C4245D\ 
w:rsidRPr=\0059319A\ w:rsidRDefault=\00C4245D\ w:rsidP=\0059319A\w:pPrw:jc w:val=\center\/w:rPrw:lang 
w:val=\cs-CZ\//w:rPr/w:pPrw:rw:r..., end=0x1626fd1 , nextPtr=0x1542730, haveMore=1 '\001') at lo/core/workdir/unxlngx6/UnpackedTarball/expat/lib/xmlparse.c:2443
#17 0x7fffcf781376 in contentProcessor (parser=0x1542700, start=0x1622fd0 /w:t/w:rw:proofErr w:type=\spellStart\/w:rw:rPrw:rFonts w:ascii=\Arial\ 
w:hAnsi=\Arial\/w:sz w:val=\20\/w:lang w:val=\cs-CZ\//w:rPrw:txxx/w:t/w:rw:proofErr w:type=\spellEnd\/..., end=0x1626fd1 
, endPtr=0x1542730) at lo/core/workdir/unxlngx6/UnpackedTarball/expat/lib/xmlparse.c:2105
#18 0x7fffcf780662 in XML_ParseBuffer (parser=0x1542700, len=16384, 
isFinal=0) at

Re: oox service mess

2013-05-31 Thread Noel Power


On 30/05/13 17:44, Stephan Bergmann wrote:


The problem is that sc/util/scfilt.component claims that the scfilt 
library contains an implementation of the 
com.sun.star.sheet.FilterFormulaParser service with implementation 
name com.sun.star.comp.oox.xls.FormulaParser, but 
scfilt_component_getFactory does not actually support it.

grr I missed than when I was locally grepping, ok now I understand


The ScParserFactoryMap ctor 
(sc/source/core/tool/formulaparserpool.cxx) iterates over all known 
implementations of the com.sun.star.sheet.FilterFormulaParser service 
and tries to instantiate each one.  It fails for this non-exisiting 
implementation (which also appears to be the only one), but that is 
silently ignored through a local try--catch.


I have no idea whether or not that effectively empty list of 
FilterFormulaParser implementations in the ScParserFactoryMap ctor is 
a problem or not, as I have not found a way to trigger that code, and 
neither Moggi nor Kohei new exactly how to do that either
hmm I confess I an not quite sure how/when/why the implementatation was 
removed, I remember moving the implementation ( like you mentioned ) 
perhaps I missed something in the move that made it seem like the 
service could no longer be instantiated ( and then someone else removed 
it ) I don't know, it's even possible I removed it myself ( do you know 
from whatever archaeology you already did ? )
. I'm putting Eike on cc, maybe he can shed some light once he's back 
from vacation.


Anyway, if that OOXMLFormulaParser implementation should be gone for 
good, the dangling reference to it should be remove from 
sc/util/scfilt.component.
I still believe the oox formula parser thingy was filter specific ( at 
least it's name suggests that ) and if most likely did deserved to die. 
The ScParserFactoryMap foo/goo introduces some doubt though about 
whether indeed it should have been killed or not.


Noel


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

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

2013-05-31 Thread abdulmajeed ahmed

 sc/source/core/data/attarray.cxx |3 ++-
 sc/source/ui/view/output2.cxx|   28 +---
 2 files changed, 19 insertions(+), 12 deletions(-)

New commits:
commit 4e673dbb5b7c7f0fd48d50255d10340229a33ade
Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa
Date:   Fri May 31 10:26:13 2013 +0200

Code clean up

Change-Id: I0e75478e4cb98409210ca40dcaa4676a69c30f6c

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 7bfcf4e..33432fa 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -140,19 +140,19 @@ public:
 void SetTextToWidthOrHash( ScRefCellValue rCell, long nWidth );
 voidSetAutoText( const String rAutoText );
 
-const ScPatternAttr*GetPattern() const  { return pPattern; }
-SvxCellOrientation  GetOrient() const   { return eAttrOrient; }
-SvxCellHorJustify   GetHorJust() const  { return eAttrHorJust; }
-SvxCellVerJustify   GetVerJust() const  { return eAttrVerJust; }
+const ScPatternAttr*GetPattern() const   { return pPattern; }
+SvxCellOrientation  GetOrient() const{ return eAttrOrient; }
+SvxCellHorJustify   GetHorJust() const   { return eAttrHorJust; }
+SvxCellVerJustify   GetVerJust() const   { return eAttrVerJust; }
 SvxCellJustifyMethodGetHorJustMethod() const { return 
eAttrHorJustMethod; }
 SvxCellJustifyMethodGetVerJustMethod() const { return 
eAttrVerJustMethod; }
-const SvxMarginItem*GetMargin() const   { return pMargin; }
+const SvxMarginItem*GetMargin() const{ return pMargin; }
 
 sal_uInt16  GetLeftTotal() const { return 
pMargin-GetLeftMargin() + nIndent; }
 sal_uInt16  GetRightTotal() const{ return 
pMargin-GetRightMargin() + nIndent; }
 
-const String   GetString() const   { return aString; }
-const Size GetTextSize() const { return aTextSize; }
+const String   GetString() const{ return aString; }
+const Size GetTextSize() const  { return aTextSize; }
 longGetOriginalWidth() const { return nOriginalWidth; }
 
 sal_uLong GetResultValueFormat( const ScRefCellValue rCell ) const;
commit af169a601dee381b17d1e87c346f2d97bad9a69f
Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa
Date:   Fri May 31 10:05:55 2013 +0200

Fix fdo#51835  Indent changes in Calc forces alignment to left

Change-Id: Ifef68cdd62a11b5cdc032a91a7dd96fa0357a42c

diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 7ef3103..0744247 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1653,7 +1653,8 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW 
nEndRow, bool bIncrement
 const SfxPoolItem* pItem;
 
 bool bNeedJust = ( rOldSet.GetItemState( ATTR_HOR_JUSTIFY, false, 
pItem ) != SFX_ITEM_SET
-|| ((const SvxHorJustifyItem*)pItem)-GetValue() != 
SVX_HOR_JUSTIFY_LEFT );
+   || (((const SvxHorJustifyItem*)pItem)-GetValue() 
!= SVX_HOR_JUSTIFY_LEFT 
+   ((const SvxHorJustifyItem*)pItem)-GetValue() 
!= SVX_HOR_JUSTIFY_RIGHT ));
 sal_uInt16 nOldValue = ((const SfxUInt16Item)rOldSet.Get( ATTR_INDENT 
)).GetValue();
 sal_uInt16 nNewValue = nOldValue;
 if ( bIncrement )
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index ef75405..7bfcf4e 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -148,7 +148,8 @@ public:
 SvxCellJustifyMethodGetVerJustMethod() const { return 
eAttrVerJustMethod; }
 const SvxMarginItem*GetMargin() const   { return pMargin; }
 
-sal_uInt16  GetLeftTotal() const{ return pMargin-GetLeftMargin() 
+ nIndent; }
+sal_uInt16  GetLeftTotal() const { return 
pMargin-GetLeftMargin() + nIndent; }
+sal_uInt16  GetRightTotal() const{ return 
pMargin-GetRightMargin() + nIndent; }
 
 const String   GetString() const   { return aString; }
 const Size GetTextSize() const { return aTextSize; }
@@ -422,7 +423,7 @@ void ScDrawStringsVars::SetPattern(
 //  Raender
 
 pMargin = (const SvxMarginItem*)pPattern-GetItem( ATTR_MARGIN, pCondSet 
);
-if ( eAttrHorJust == SVX_HOR_JUSTIFY_LEFT )
+if ( eAttrHorJust == SVX_HOR_JUSTIFY_LEFT || eAttrHorJust == 
SVX_HOR_JUSTIFY_RIGHT )
 nIndent = ((const SfxUInt16Item)pPattern-GetItem( ATTR_INDENT, 
pCondSet )).GetValue();
 else
 nIndent = 0;
@@ -1863,7 +1864,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
 break;
 case SVX_HOR_JUSTIFY_RIGHT:
 nJustPosX += nAvailWidth -

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

2013-05-31 Thread Caolán McNamara

 cui/source/options/optjava.cxx   |5 +
 include/svtools/restartdialog.hxx|5 -
 svtools/source/dialogs/restartdialog.cxx |3 +++
 svtools/uiconfig/ui/restartdialog.ui |   16 +++-
 4 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit 7ce2a89f4f8fa84232896766276cb3433ada239c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 30 20:00:46 2013 +0100

prompt to restart office when required for experimental features

Change-Id: I43051ec6b0efeaebcf4a28940f70913423b8ea9f

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 50428e34..74fa157 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -632,6 +632,11 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet 
/*rCoreSet*/ )
 {
 SvtMiscOptions aMiscOpt;
 aMiscOpt.SetExperimentalSidebar( m_pExpSidebarCB-IsChecked() );
+
+svtools::executeRestartDialog(
+comphelper::getProcessComponentContext(), this,
+svtools::RESTART_REASON_MODIFIED_SIDEBAR);
+
 bModified = sal_True;
 }
 
diff --git a/include/svtools/restartdialog.hxx 
b/include/svtools/restartdialog.hxx
index 993b099..d74d6d3 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -29,9 +29,12 @@ enum RestartReason {
 RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT,
 // For the modified default print job format to take effect,
 // %PRODUCTNAME must be restarted.
-RESTART_REASON_BIBLIOGRAPHY_INSTALL
+RESTART_REASON_BIBLIOGRAPHY_INSTALL,
 // For the bibliography to work properly,
 // %PRODUCTNAME must be restarted.
+RESTART_REASON_MODIFIED_SIDEBAR
+// For the sidebar to work properly,
+// %PRODUCTNAME must be restarted.
 };
 
 // Must be called with the solar mutex locked:
diff --git a/svtools/source/dialogs/restartdialog.cxx 
b/svtools/source/dialogs/restartdialog.cxx
index e5d64de..81655a5 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -40,6 +40,9 @@ public:
 case svtools::RESTART_REASON_BIBLIOGRAPHY_INSTALL:
 get(reason_, reason_bibliography_install);
 break;
+case svtools::RESTART_REASON_MODIFIED_SIDEBAR:
+get(reason_, reason_sidebar);
+break;
 default:
 assert(false); // this cannot happen
 }
diff --git a/svtools/uiconfig/ui/restartdialog.ui 
b/svtools/uiconfig/ui/restartdialog.ui
index 5027620..f2445df 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -101,6 +101,20 @@
   /packing
 /child
 child
+  object class=GtkLabel id=reason_sidebar
+property name=can_focusFalse/property
+property name=no_show_allTrue/property
+property name=label translatable=yesFor the modified 
sidebar setting to take effect, %PRODUCTNAME must be restarted./property
+property name=wrapTrue/property
+property name=max_width_chars50/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position3/property
+  /packing
+/child
+child
   object class=GtkLabel id=label
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -110,7 +124,7 @@
   packing
 property name=expandFalse/property
 property name=fillTrue/property
-property name=position3/property
+property name=position4/property
   /packing
 /child
   /object
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-31 Thread Caolán McNamara

 sw/inc/globals.hrc|1 -
 sw/source/ui/dialog/swdlgfact.cxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 3914c2e3f9b62684e0f1127118853025c6cf09c7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 09:38:43 2013 +0100

TP_COMPARISON_OPT is now unused

Change-Id: Ie73070c97f9918511a02e7c4d4073387385e9293

diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 22b5f54..f380db9 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -207,7 +207,6 @@
 #define TP_SECTION_INDENTS  (RC_GLOBALS_BEGIN +  102)
 #define TP_OPTCOMPATIBILITY_PAGE(RC_GLOBALS_BEGIN +  103)
 #define TP_MAILCONFIG   (RC_GLOBALS_BEGIN +  104)
-#define TP_COMPARISON_OPT   (RC_GLOBALS_BEGIN +  106)
 //maximum: RC_GLOBALS_BEGIN +  120
 
 
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index fffa43c..0f5a859 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1357,7 +1357,6 @@ CreateTabPage 
SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
 pRet = SwMailConfigPage::Create;
 break;
 case RID_SW_TP_COMPARISON_OPT :
-case TP_COMPARISON_OPT :
 pRet = SwCompareOptionsTabPage::Create;
 break;
 }
___
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' - 89/4ae72e805d5fc04b4004e7ae95cebf50ceacf1

2013-05-31 Thread Caolán McNamara

 89/4ae72e805d5fc04b4004e7ae95cebf50ceacf1 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 82beefddee559316478fa263c56645262a570873
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 09:44:18 2013 +0100

Notes added by 'git notes add'

diff --git a/89/4ae72e805d5fc04b4004e7ae95cebf50ceacf1 
b/89/4ae72e805d5fc04b4004e7ae95cebf50ceacf1
new file mode 100644
index 000..c2f426b
--- /dev/null
+++ b/89/4ae72e805d5fc04b4004e7ae95cebf50ceacf1
@@ -0,0 +1 @@
+reject: we didnt drop our lo suffix which avoids this
___
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' - 90/c9dbcd8275e3a9253192ee5f1dc4b230630b3f

2013-05-31 Thread Caolán McNamara

 90/c9dbcd8275e3a9253192ee5f1dc4b230630b3f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit db3d2bca3eb1aa616bab4bcde0f1bb5e5d92c8db
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 09:45:31 2013 +0100

Notes added by 'git notes add'

diff --git a/90/c9dbcd8275e3a9253192ee5f1dc4b230630b3f 
b/90/c9dbcd8275e3a9253192ee5f1dc4b230630b3f
new file mode 100644
index 000..0d12c93
--- /dev/null
+++ b/90/c9dbcd8275e3a9253192ee5f1dc4b230630b3f
@@ -0,0 +1 @@
+prefer: 77d3777c8934171a9557a96872d020cf12443fb9
___
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/e24052fb470d13c4848fb2eabc3d53ebf1521c

2013-05-31 Thread Caolán McNamara

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

New commits:
commit 96e5bbd5570ecfb342d1dd15d4e73f15537ea1f6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 09:46:04 2013 +0100

Notes added by 'git notes add'

diff --git a/9d/e24052fb470d13c4848fb2eabc3d53ebf1521c 
b/9d/e24052fb470d13c4848fb2eabc3d53ebf1521c
new file mode 100644
index 000..7a27c10
--- /dev/null
+++ b/9d/e24052fb470d13c4848fb2eabc3d53ebf1521c
@@ -0,0 +1 @@
+prefer: d7609ad71524207b847f07e7df9bea1c24fb3b70
___
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' - 6a/a4485de3754170a35e72e80fb9e218ff879645

2013-05-31 Thread Caolán McNamara

 6a/a4485de3754170a35e72e80fb9e218ff879645 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c30f6091909b11671e3a8096d629bb776edb24ee
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 09:55:28 2013 +0100

Notes added by 'git notes add'

diff --git a/6a/a4485de3754170a35e72e80fb9e218ff879645 
b/6a/a4485de3754170a35e72e80fb9e218ff879645
new file mode 100644
index 000..51b107d
--- /dev/null
+++ b/6a/a4485de3754170a35e72e80fb9e218ff879645
@@ -0,0 +1 @@
+prefer: e687e92c88498bdd4c64b10625c7663d982dd072
___
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' - 5f/0f155fd0c6a27abe876fb38ba4f4bc5c3571db

2013-05-31 Thread Caolán McNamara

 5f/0f155fd0c6a27abe876fb38ba4f4bc5c3571db |1 +
 1 file changed, 1 insertion(+)

New commits:
commit aefcd4efe02076909bef13795ffaef4c894a3ce1
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 09:56:05 2013 +0100

Notes added by 'git notes add'

diff --git a/5f/0f155fd0c6a27abe876fb38ba4f4bc5c3571db 
b/5f/0f155fd0c6a27abe876fb38ba4f4bc5c3571db
new file mode 100644
index 000..51b107d
--- /dev/null
+++ b/5f/0f155fd0c6a27abe876fb38ba4f4bc5c3571db
@@ -0,0 +1 @@
+prefer: e687e92c88498bdd4c64b10625c7663d982dd072
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-31 Thread Stephan Bergmann

 sd/source/filter/xml/sdxmlwrp.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 018c22d37878f1fc349085143ee4241165a4802a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri May 31 10:51:44 2013 +0200

UniString::CompareToAscii(RTL_CONSTASCII_STRINGPARAM(x))==COMPARE_EQUAL 
...

...corresponds to OUString::startsWith(x), not
UniString::CompareToAscii(x)==COMPARE_EQUAL.  Regression introduced with
5b26722ace02f71c79573b3795b2bf7b9412090f Remove 
RTL_CONSTASCII_(U)STRINGPARAM
(sd).

Change-Id: I116defec056ff1e2260a20ba5279180683eefd87

diff --git a/sd/source/filter/xml/sdxmlwrp.cxx 
b/sd/source/filter/xml/sdxmlwrp.cxx
index 554fff5..9763062 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -803,10 +803,9 @@ sal_Bool SdXMLFilter::Import( ErrCode nError )
  const SfxFilter * pFilter = mrMedium.GetFilter();
 if( pFilter )
 {
-const String rTypeName = pFilter-GetRealTypeName();
-
-if( (rTypeName.CompareToAscii( impress_StarImpress ) 
== 0) ||
-(rTypeName.CompareToAscii( draw_StarDraw ) == 0) 
)
+OUString typeName(pFilter-GetRealTypeName());
+if( typeName.startsWith( impress_StarImpress ) ||
+typeName.startsWith( draw_StarDraw ) )
 {
 bTransform = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] Remove RTL_CONSTASCII_(U)STRINGPARAM (sd)

2013-05-31 Thread Stephan Bergmann


On 05/30/2013 10:32 PM, Christina Roßmanith (via Code Review) wrote:

@@ -810,8 +805,8 @@
  {
  const String rTypeName = pFilter-GetRealTypeName();

-if( (rTypeName.CompareToAscii( 
RTL_CONSTASCII_STRINGPARAM(impress_StarImpress ) ) == 0) ||
-(rTypeName.CompareToAscii( 
RTL_CONSTASCII_STRINGPARAM(draw_StarDraw ) ) == 0) )
+if( (rTypeName.CompareToAscii( impress_StarImpress ) 
== 0) ||
+(rTypeName.CompareToAscii( draw_StarDraw ) == 0) 
)
  {
  bTransform = true;
  }


Careful with any string functions containing compare in their 
names---they don't necessarily do what one might expect.  Fixed now with 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=018c22d37878f1fc349085143ee4241165a4802a 
UniString::CompareToAscii(RTL_CONSTASCII_STRINGPARAM(x))==COMPARE_EQUAL 
...


Stephan

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

Re: oox service mess

2013-05-31 Thread Stephan Bergmann


On 05/31/2013 10:08 AM, Noel Power wrote:

On 30/05/13 17:44, Stephan Bergmann wrote:

The problem is that sc/util/scfilt.component claims that the scfilt
library contains an implementation of the
com.sun.star.sheet.FilterFormulaParser service with implementation
name com.sun.star.comp.oox.xls.FormulaParser, but
scfilt_component_getFactory does not actually support it.

[...]

hmm I confess I an not quite sure how/when/why the implementatation was
removed, I remember moving the implementation ( like you mentioned )
perhaps I missed something in the move that made it seem like the
service could no longer be instantiated ( and then someone else removed
it ) I don't know, it's even possible I removed it myself ( do you know
from whatever archaeology you already did ? )


The C++ class implementing com.sun.star.comp.oox.xls.FormulaParser was 
OOXMLFormulaParser, and the head of git log -SOOXMLFormulaParser reads



commit effda59a12cedd3cf200d2e9f5186a623b0855bb
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Mar 27 23:26:27 2012 +0100

callcatcher: regenerate list

commit 887d7945addeb823e0d3f783609c4e79d92ad4a7
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Mar 27 21:40:57 2012 +0100

callcatcher: update list

commit 226d310c1a31238b7f07d8e7e42ec75f0280fba5
Author: Petr Vorel petr.vo...@gmail.com
Date:   Thu Mar 22 20:14:13 2012 +0100

remove unused code (oox)

commit a92129ec175a1362e61a474cf64992f283db74b4
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Mar 20 01:07:37 2012 +

callcatcher: update list, I suspect SvLBoxBmp cannot be instantiated

commit 8ada1cd2846e5e60ad63250c68ddea3a9356546f
Author: Noel Power noel.po...@novell.com
Date:   Fri Mar 16 12:28:31 2012 +

move excel related oox bits to sc


(And the implementations of com.sun.star.comp.oox.xls.BiffDetector, 
com.sun.star.comp.oox.xls.ExcelBiffFilter, and 
com.sun.star.comp.oox.xls.ExcelVbaProjectFilter I mentioned in the 
original mail also appeared to get removed with automatic 
callcatcher-related clean-up, so that's what worried me a little.)


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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 1d/eb4e880ad5e6daf64dde007dcc09d9d2737884

2013-05-31 Thread Caolán McNamara

 1d/eb4e880ad5e6daf64dde007dcc09d9d2737884 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7458a4d57f5cef2c65615f851a89579580b2a32f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 10:42:02 2013 +0100

Notes added by 'git notes add'

diff --git a/1d/eb4e880ad5e6daf64dde007dcc09d9d2737884 
b/1d/eb4e880ad5e6daf64dde007dcc09d9d2737884
new file mode 100644
index 000..da35a16
--- /dev/null
+++ b/1d/eb4e880ad5e6daf64dde007dcc09d9d2737884
@@ -0,0 +1 @@
+prefer: b786a33cfdca2e8a4114ddef0340e0e0628dd09c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: oox service mess

2013-05-31 Thread Noel Power


On 31/05/13 08:16, Stephan Bergmann wrote:

On 05/30/2013 07:20 PM, Kohei Yoshida wrote:


[...]
Besides the com.sun.star.sheet.FilterFormulaParser UNOIDL (new-style 
marker, i.e., no ctor) service declaration there is indeed also a 
com.sun.star.sheet.FormulaParser UNOIDL old-style service declaration, 
It appears to be a service that is not available at the global service 
manager, but rather something that can be obtained from some 
Calc-local manager (ScServiceProvider::MakeInstance handing out 
ScFormulaParserObj instances under the 
com.sun.star.sheet.FormulaParser key)


like I mentioned I begin to also feel uneasy that we are missing 
something here ( especially regarding ScParserFactoryMap)


http://opengrok.libreoffice.org/xref/core/sc/source/core/tool/compiler.cxx#3944 
 
http://opengrok.libreoffice.org/xref/core/sc/source/filter/xml/xmlimprt.cxx#338 
would appear to suggest that service(s) ( perhaps the oox one ) should 
in fact be avaialble. I am not sure about what scerario should trigger 
this my formula knowledge is poor. What namespaces should map instances 
of which services? I think I still have an old 3.5 tree hanging about, I 
will try to check what at least that ScFormulaParserPool used contain


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

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

2013-05-31 Thread Mark Wielaard

 svx/source/dialog/charmap.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 30c3032920be91741ab089966f7e458ce08d09a4
Author: Mark Wielaard m...@klomp.org
Date:   Fri May 31 00:10:58 2013 +0200

Make charmap.cxx compile with icu = 4.4.

configure.ac claims ICU = 4.2 is supported. Make it so.

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

diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 23494a8..bc6c83e 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1302,6 +1302,7 @@ void SubsetMap::InitList()
 case UBLOCK_DOMINO_TILES:
 aAllSubsets.push_back( Subset( 0x1F030, 0x1F09F, 
RID_SUBSETSTR_DOMINO_TILES ) );
 break;
+#if U_ICU_VERSION_MAJOR_NUM = 44
 case UBLOCK_SAMARITAN:
 aAllSubsets.push_back( Subset( 0x0800, 0x083F, 
RID_SUBSETSTR_SAMARITAN ) );
 break;
@@ -1380,6 +1381,8 @@ void SubsetMap::InitList()
 case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C:
 aAllSubsets.push_back( Subset( 0x2A700, 0x2B73F, 
RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C ) );
 break;
+#endif
+#if U_ICU_VERSION_MAJOR_NUM = 46
 case UBLOCK_MANDAIC:
 aAllSubsets.push_back( Subset( 0x0840, 0x085F, 
RID_SUBSETSTR_MANDAIC ) );
 break;
@@ -1416,6 +1419,7 @@ void SubsetMap::InitList()
 case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D:
 aAllSubsets.push_back( Subset( 0x2B740, 0x2B81F, 
RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D ) );
 break;
+#endif
 #if U_ICU_VERSION_MAJOR_NUM = 49
 case UBLOCK_ARABIC_EXTENDED_A:
 aAllSubsets.push_back( Subset( 0x08A0, 0x08FF, 
RID_SUBSETSTR_ARABIC_EXTENDED_A ) );
___
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/218ac2472838d63485c3c6b4dc2f1aa0bdd0f6

2013-05-31 Thread Caolán McNamara

 26/218ac2472838d63485c3c6b4dc2f1aa0bdd0f6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 794da2dad51938ae5cb5df7ee61869392d7f5b88
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 10:53:26 2013 +0100

Notes added by 'git notes add'

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

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

2013-05-31 Thread Zhe Wang

 filter/source/msfilter/escherex.cxx  |   14 ++-
 include/filter/msfilter/escherex.hxx |2 
 include/svx/msdffdef.hxx |2 
 oox/source/export/shapes.cxx |4 
 svx/source/customshapes/EnhancedCustomShapeGeometry.cxx  |   63 +++
 svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx |3 
 6 files changed, 82 insertions(+), 6 deletions(-)

New commits:
commit cd582f922bf7bf350669c5d7cec379fe6bb7c886
Author: Zhe Wang wangz...@apache.org
Date:   Fri Sep 7 04:05:43 2012 +

Resolves: #i119631# Teardrop shape cannot be shown correctly in pptx

* subversion/main/filter/inc/filter/msfilter/escherex.hxx
* subversion/main/filter/source/msfilter/escherex.cxx
[]check whether one shape is default shape of ppt by shape type
* subversion/main/svx/inc/svx/msdffdef.hxx
* subversion/main/oox/source/drawingml/customshapegeometry.cxx
* subversion/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
[]add definition and declaration for tear drop
* subversion/main/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
[]the content of tear drop shape which incudes path, adjust value, handle

Patch by: Ma Bingbing jiaz...@gmail.com
Suggested by: Wang Zhe kingwise...@gmail.com
Found by: Zong Dongjun zongdong...@gmail.com
Review by: Wang Zhe kingwise...@gmail.com

(cherry picked from commit 26218ac2472838d63485c3c6b4dc2f1aa0bdd0f6)

Conflicts:
filter/inc/filter/msfilter/escherex.hxx
oox/source/drawingml/customshapegeometry.cxx
svx/inc/svx/msdffdef.hxx

Change-Id: I8347832bc842cca8b944c28e807af7f45a7da5b0

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 68bd12d..3f31b25 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2354,9 +2354,19 @@ void ConvertEnhancedCustomShapeEquation( 
SdrObjCustomShape* pCustoShape,
 }
 }
 
-sal_Bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* 
pCustoShape )
+sal_Bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* 
pCustoShape , const MSO_SPT eShapeType )
 {
 sal_Bool bIsDefaultObject = sal_False;
+switch(eShapeType)
+{
+//if the custom shape is not default shape of ppt, return sal_Fasle;
+case mso_sptTearDrop:
+return bIsDefaultObject;
+
+default:
+break;
+}
+
 if ( pCustoShape )
 {
 if (   pCustoShape-IsDefaultGeometry( 
SdrObjCustomShape::DEFAULT_EQUATIONS )
@@ -2439,7 +2449,7 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
 sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0;
 uno::Sequence beans::PropertyValues  aHandlesPropSeq;
 sal_Bool bPredefinedHandlesUsed = sal_True;
-sal_Bool bIsDefaultObject = IsDefaultObject( pCustoShape );
+sal_Bool bIsDefaultObject = IsDefaultObject( pCustoShape , 
eShapeType);
 
 // convert property Equations into std::vector 
EnhancedCustomShapeEquationEquation 
 std::vector EnhancedCustomShapeEquation   aEquations;
diff --git a/include/filter/msfilter/escherex.hxx 
b/include/filter/msfilter/escherex.hxx
index c4807e8..d21e2f0 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1344,7 +1344,7 @@ public:
 sal_Int32 rnArrowLength,
 sal_Int32 rnArrowWidth
 );
-static sal_Bool IsDefaultObject( SdrObjCustomShape* pCustoShape );
+static sal_Bool IsDefaultObject( SdrObjCustomShape* pCustoShape, const 
MSO_SPT eShapeType );
 static void LookForPolarHandles(
 const MSO_SPT eShapeType,
 sal_Int32 nAdjustmentsWhichNeedsToBeConverted
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index 007f273..671932c 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -781,6 +781,8 @@ typedef enum
mso_sptActionButtonMovie = 200,
mso_sptHostControl = 201,
mso_sptTextBox = 202,
+   //for pptx shape which not exist in ppt
+   mso_sptTearDrop = 203,
mso_sptMax = 0x0FFF,
mso_sptNil = mso_sptMax
  } MSO_SPT;
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index c487d2d..d4b65ff 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -675,12 +675,12 @@ ShapeExport ShapeExport::WriteCustomShape( Reference 
XShape  xShape )
 DBG(printf(write custom shape\n));
 
 Reference XPropertySet  rXPropSet( xShape, UNO_QUERY );
-SdrObjCustomShape* pShape = (SdrObjCustomShape*) GetSdrObjectFromXShape( 
xShape );
-sal_Bool bIsDefaultObject = EscherPropertyContainer::IsDefaultObject( 
pShape );
 sal_Bool bPredefinedHandlesUsed

[PUSHED] Make charmap.cxx compile with icu = 4.4.

2013-05-31 Thread via Code Review

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4112

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia08bb492f41dcb88bc84550edb51ce5e89fe1103
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard m...@klomp.org
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Mark Wielaard m...@klomp.org
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

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

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

2013-05-31 Thread Elie Roux

 i18npool/source/breakiterator/breakiterator_unicode.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 878b09a1a936c2d5bf4461e0123fafd377d948e2
Author: Elie Roux elie.r...@telecom-bretagne.eu
Date:   Wed May 29 09:58:17 2013 +0200

fdo#64926 use icu's breakiterator for Tibetan and Dzongkha

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

diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 620bba1..549abd1 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -120,7 +120,8 @@ void SAL_CALL 
BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
 rbi = new OOoRuleBasedBreakIterator(udata_open(OpenOffice, 
brk,
 OUStringToOString(breakRules[breakType], 
RTL_TEXTENCODING_ASCII_US).getStr(), status), status);
 }
-else if (rLocale.Language != th  rLocale.Language != km) 
//use icu's breakiterator for Thai and Khmer
+//use icu's breakiterator for Thai, Khmer, Tibetan and Dzongkha
+else if (rLocale.Language != th  rLocale.Language != km  
rLocale.Language != bo  rLocale.Language != dz)
 {
 status = U_ZERO_ERROR;
 OStringBuffer aUDName(64);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#64926 use icu's breakiterator for Tibetan and Dzongkha

2013-05-31 Thread via Code Review

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4082

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78010e216eb1582fa5074666f36c95f5b0eceee5
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Andras Timar ati...@suse.com
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com

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

Re: Extending / Chaining Spell Checker

2013-05-31 Thread Guenter Bartsch

Stephan,

On Thu, May 30, 2013 at 1:22 PM, Stephan Bergmann sberg...@redhat.com wrote:

 The following comment in
 offapi/com/sun/star/linguistic2/XLinguServiceManager.idl might be what you
 are looking for:

 For spell checking and thesaurus, the order in the list defines the order
 of creation/usage of those services. That is, if the first spell checker
 implementation does not recognize the given word as correct, the second
 service implementation for that language is created and gets queried. If
 that one fails, the third one gets created and queried and so on. This chain
 stops if an implementation reports the word as correct or the end of the
 list is reached, in which case the word is reported as incorrect.


excellent! - tried it and this is indeed exactly what we had been
looking for. thanks for the quick response, potentially saved us hours
of replicating functionality that is already there.

we're planning to make the plugin available for download soon - code
is a bit rough around the edges and undergoing testing right now - so
hopefully we can contribute something back here.

thanks again

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sfx2/Library_sfx.mk sfx2/source

2013-05-31 Thread Andre Fischer

 sfx2/Library_sfx.mk   |2 ++
 sfx2/source/sidebar/DeckTitleBar.cxx  |   11 +++
 sfx2/source/sidebar/DeckTitleBar.hxx  |1 +
 sfx2/source/sidebar/PanelTitleBar.cxx |   21 +
 sfx2/source/sidebar/PanelTitleBar.hxx |2 ++
 sfx2/source/sidebar/TitleBar.cxx  |   32 
 sfx2/source/sidebar/TitleBar.hxx  |5 +++--
 7 files changed, 52 insertions(+), 22 deletions(-)

New commits:
commit 6055c2b50b36a0fc1b26c18b030827e3e08a51fc
Author: Andre Fischer a...@apache.org
Date:   Fri May 31 09:03:08 2013 +

122271: Setting FOCUSABLE flag at accessibility object sidebar title bars

so that bridges create focus events and title bars become visible
to AT devices.

diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 5341571..38625ca 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -218,6 +218,8 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 sfx2/source/sidebar/SidebarController \
 sfx2/source/sidebar/SidebarPanelBase \
 sfx2/source/sidebar/SidebarToolBox \
+sfx2/source/sidebar/Accessible \
+sfx2/source/sidebar/AccessibleTitleBar \
 sfx2/source/sidebar/AsynchronousCall \
 sfx2/source/sidebar/CommandInfoProvider \
 sfx2/source/sidebar/Context \
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx 
b/sfx2/source/sidebar/DeckTitleBar.cxx
index 8e0c450..bd9e86c 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -139,6 +139,17 @@ void DeckTitleBar::HandleToolBoxItemClick (const 
sal_uInt16 nItemIndex)
 
 
 
+cssu::Referencecss::accessibility::XAccessible 
DeckTitleBar::CreateAccessible (void)
+{
+const ::rtl::OUString sAccessibleName(msTitle);
+SetAccessibleName(sAccessibleName);
+SetAccessibleDescription(sAccessibleName);
+return TitleBar::CreateAccessible();
+}
+
+
+
+
 void DeckTitleBar::DataChanged (const DataChangedEvent rEvent)
 {
 maToolBox.SetItemImage(
diff --git a/sfx2/source/sidebar/DeckTitleBar.hxx 
b/sfx2/source/sidebar/DeckTitleBar.hxx
index dfc5e9c..f75aad9 100644
--- a/sfx2/source/sidebar/DeckTitleBar.hxx
+++ b/sfx2/source/sidebar/DeckTitleBar.hxx
@@ -49,6 +49,7 @@ protected:
 virtual sidebar::Paint GetBackgroundPaint (void);
 virtual Color GetTextColor (void);
 virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex);
+virtual cssu::Referencecss::accessibility::XAccessible CreateAccessible 
(void);
 
 private:
 const sal_uInt16 mnCloserItemIndex;
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx 
b/sfx2/source/sidebar/PanelTitleBar.cxx
index 4917412..a8d1048 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -35,7 +35,6 @@
 #include vcl/image.hxx
 #include toolkit/helper/vclunohelper.hxx
 
-
 using namespace css;
 using namespace cssu;
 
@@ -55,16 +54,11 @@ PanelTitleBar::PanelTitleBar (
   mpPanel(pPanel),
   mnMenuItemIndex(1),
   mxFrame(),
-  msMoreOptionsCommand()
+  msMoreOptionsCommand(),
+  
msAccessibleNamePrefix(String(SfxResId(SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX)))
 {
 OSL_ASSERT(mpPanel != NULL);
 
-const ::rtl::OUString sAccessibleName(
-String(SfxResId(SFX_STR_SIDEBAR_ACCESSIBILITY_PANEL_PREFIX))
-+ rsTitle);
-SetAccessibleName(sAccessibleName);
-SetAccessibleDescription(sAccessibleName);
-
 #ifdef DEBUG
 SetText(A2S(PanelTitleBar));
 #endif
@@ -195,6 +189,17 @@ void PanelTitleBar::HandleToolBoxItemClick (const 
sal_uInt16 nItemIndex)
 
 
 
+Referenceaccessibility::XAccessible PanelTitleBar::CreateAccessible (void)
+{
+const ::rtl::OUString sAccessibleName(msAccessibleNamePrefix + msTitle);
+SetAccessibleName(sAccessibleName);
+SetAccessibleDescription(sAccessibleName);
+return TitleBar::CreateAccessible();
+}
+
+
+
+
 void PanelTitleBar::MouseButtonDown (const MouseEvent rMouseEvent)
 {
 if (rMouseEvent.IsLeft())
diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx 
b/sfx2/source/sidebar/PanelTitleBar.hxx
index 517d759..426f087 100644
--- a/sfx2/source/sidebar/PanelTitleBar.hxx
+++ b/sfx2/source/sidebar/PanelTitleBar.hxx
@@ -56,6 +56,7 @@ protected:
 virtual sidebar::Paint GetBackgroundPaint (void);
 virtual Color GetTextColor (void);
 virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex);
+virtual cssu::Referencecss::accessibility::XAccessible CreateAccessible 
(void);
 
 private:
 bool mbIsLeftButtonDown;
@@ -63,6 +64,7 @@ private:
 const sal_uInt16 mnMenuItemIndex;
 cssu::Referencecss::frame::XFrame mxFrame;
 ::rtl::OUString msMoreOptionsCommand;
+::rtl::OUString msAccessibleNamePrefix;
 };
 
 
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index d04dd4f..c2e01bf 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -23,11 +23,16 @@
 
 #include TitleBar.hxx
 #include Paint.hxx

[PUSHED] Convert Paragraph Alignment Indent to Widget UI

2013-05-31 Thread via Code Review

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4047

Approvals:
  Olivier Hallot: Looks good to me, but someone else must approve
  Caolán McNamara: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3b7d76a63bd677d5d94f7385bbf589f18eceeda
Gerrit-PatchSet: 7
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Olivier Hallot olivier.hal...@edx.srv.br
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: Olivier Hallot olivier.hal...@edx.srv.br

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

[Libreoffice-commits] dictionaries.git: Changes to 'distro/suse/suse-4.0.3'

2013-05-31 Thread Petr Mladek

New branch 'distro/suse/suse-4.0.3' available with the following commits:
commit 1514fe9851562bfc00bf9f04560b84aece1ef5c7
Author: Petr Mladek pmla...@suse.cz
Date:   Fri May 31 12:20:02 2013 +0200

Branch suse-4.0.3

This is 'suse-4.0.3' branch for final stabilization of the SUSE 4.0 release.
It will be used for the official maintenance update for SLED, openSUSE,
and Windows.

We want here only critical and safe fixes.

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

[Libreoffice-commits] core.git: Changes to 'distro/suse/suse-4.0.3'

2013-05-31 Thread Petr Mladek

New branch 'distro/suse/suse-4.0.3' available with the following commits:
commit daf135bf9ceebbf7453844aece6e5a2ba12255b6
Author: Petr Mladek pmla...@suse.cz
Date:   Fri May 31 12:20:04 2013 +0200

Branch suse-4.0.3

This is 'suse-4.0.3' branch for final stabilization of the SUSE 4.0 release.
It will be used for the official maintenance update for SLED, openSUSE,
and Windows.

We want here only critical and safe fixes.

Change-Id: I4bfb39ec7d9c0e313826e71754d03b82f8334323

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

[Libreoffice-commits] translations.git: Changes to 'distro/suse/suse-4.0.3'

2013-05-31 Thread Petr Mladek

New branch 'distro/suse/suse-4.0.3' available with the following commits:
commit b6633ed61b72b0f81b2a0d574eedfa0d8479832d
Author: Petr Mladek pmla...@suse.cz
Date:   Fri May 31 12:20:02 2013 +0200

Branch suse-4.0.3

This is 'suse-4.0.3' branch for final stabilization of the SUSE 4.0 release.
It will be used for the official maintenance update for SLED, openSUSE,
and Windows.

We want here only critical and safe fixes.

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

[Libreoffice-commits] help.git: Changes to 'distro/suse/suse-4.0.3'

2013-05-31 Thread Petr Mladek

New branch 'distro/suse/suse-4.0.3' available with the following commits:
commit 3d4c4595c7e922ac7327829aeaf0ebff258df60e
Author: Petr Mladek pmla...@suse.cz
Date:   Fri May 31 12:20:02 2013 +0200

Branch suse-4.0.3

This is 'suse-4.0.3' branch for final stabilization of the SUSE 4.0 release.
It will be used for the official maintenance update for SLED, openSUSE,
and Windows.

We want here only critical and safe fixes.

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

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

2013-05-31 Thread Fridrich Štrba

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

New commits:
commit 2cb9aaf44dc589af79d62d7b1136b5d65e9f47d4
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri May 31 12:27:49 2013 +0200

Fix crash with ooo120774-1.doc

Do not try to remove line breaks from empty string

Change-Id: Ieb12c541d42944aac813cee10ce479207b1c674b
Reviewed-on: https://gerrit.libreoffice.org/4114
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index d56cf61..f5372a7 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1533,6 +1533,8 @@ static String lcl_GetNumString( const SwTOXSortTabBase 
rBase, bool bUsePrefix,
 /// to a single space, and trailing space removed.
 String lcl_RemoveLineBreaks( String sRet )
 {
+if (!sRet.Len())
+return sRet;
 xub_StrLen nOffset = 0;
 sRet.SearchAndReplaceAll('\n', ' ');
 for (xub_StrLen i = 1; i  sRet.Len(); i++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Fix crash with ooo120774-1.doc

2013-05-31 Thread Fridrich Strba (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4114

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/4114/1

Fix crash with ooo120774-1.doc

Do not try to remove line breaks from empty string

Change-Id: Ieb12c541d42944aac813cee10ce479207b1c674b
---
M sw/source/core/doc/doctxm.cxx
1 file changed, 2 insertions(+), 0 deletions(-)



diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index d56cf61..f5372a7 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1533,6 +1533,8 @@
 /// to a single space, and trailing space removed.
 String lcl_RemoveLineBreaks( String sRet )
 {
+if (!sRet.Len())
+return sRet;
 xub_StrLen nOffset = 0;
 sRet.SearchAndReplaceAll('\n', ' ');
 for (xub_StrLen i = 1; i  sRet.Len(); i++)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb12c541d42944aac813cee10ce479207b1c674b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org

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

[PUSHED] Fix crash with ooo120774-1.doc

2013-05-31 Thread Fridrich Strba (via Code Review)

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4114

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb12c541d42944aac813cee10ce479207b1c674b
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[Libreoffice-commits] core.git: 2 commits - framework/inc framework/source include/svtools offapi/com sw/source

2013-05-31 Thread Michael Stahl

 framework/inc/uielement/statusbarmanager.hxx   |3 
 framework/source/uielement/statusbarmanager.cxx|  122 -
 include/svtools/statusbarcontroller.hxx|1 
 offapi/com/sun/star/frame/XStatusbarController.idl |9 +
 sw/source/core/unocore/unoframe.cxx|5 
 5 files changed, 63 insertions(+), 77 deletions(-)

New commits:
commit f5e8f5b0b5410d29b5cb1fb6fbbd8bf3c48a0201
Author: Michael Stahl mst...@redhat.com
Date:   Fri May 31 12:34:35 2013 +0200

sw: SwXFrame: fix gradient import problem:

BaseFrameProperties_Impl::FillBaseProperties: It may happen that
checkForUniqueItem returns an item with a name that already exists, if
the same gradient appears multiple times; don't crash with unhandled
ElementExistException then.
(can be reproduced with test3.docx from fdo#41466)
(regression from 1a3c90a292c7fc9060604151de9dc51eecf5b6a7)

Change-Id: Iace7af4c5679c1c7e978525fa31abf884038567c

diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index d3d5ed5..0273a1e 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -267,7 +267,10 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SwDoc* 
pDoc, SfxItemSet rToSe
 uno::Referenceframe::XModel 
xModel(pDoc-GetDocShell()-GetModel());
 uno::Referencelang::XMultiServiceFactory 
xServiceFact(xModel, uno::UNO_QUERY);
 uno::Reference container::XNameContainer  
xGradients(xServiceFact-createInstance(com.sun.star.drawing.GradientTable), 
uno::UNO_QUERY);
-xGradients-insertByName(pItem-GetName(), *pFillGradient);
+if (!xGradients-hasByName(pItem-GetName()))
+{
+xGradients-insertByName(pItem-GetName(), 
*pFillGradient);
+}
 
 delete pItem;
 }
commit d0508f79c15a5d789f5e6af214d78ce89e05071d
Author: Ariel Constenla-Haile arie...@apache.org
Date:   Mon May 27 05:46:18 2013 +

css::frame::XStatusbarController: add missing interface

Added ::com::sun::star::lang::XComponent. IDL documentation taken from

http://wiki.openoffice.org/wiki/Framework/Tutorial/Statusbar_Controller#Status_bar_controller_service
(cherry picked from commit f3dc398e002926792a0c6160691d46eb75cad236)

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

Change-Id: Id2d768250632b12b834602a33a4e9923cec9bd3f

diff --git a/framework/inc/uielement/statusbarmanager.hxx 
b/framework/inc/uielement/statusbarmanager.hxx
index 71bfc34..b469ad7 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -27,7 +27,6 @@
 #include stdtypes.h
 
 #include com/sun/star/frame/XFrame.hpp
-#include com/sun/star/frame/XStatusListener.hpp
 #include com/sun/star/frame/XStatusbarController.hpp
 #include com/sun/star/frame/XUIControllerFactory.hpp
 #include com/sun/star/ui/XUIConfiguration.hpp
@@ -104,7 +103,7 @@ class StatusBarManager : public 
::com::sun::star::frame::XFrameActionListener
 void MouseButton( const MouseEvent rMEvt ,sal_Bool ( SAL_CALL 
::com::sun::star::frame::XStatusbarController::*_pMethod )(const 
::com::sun::star::awt::MouseEvent));
 
 protected:
-typedef std::map sal_uInt16, ::com::sun::star::uno::Reference 
com::sun::star::frame::XStatusListener   StatusBarControllerMap;
+typedef std::map sal_uInt16, ::com::sun::star::uno::Reference 
com::sun::star::frame::XStatusbarController   StatusBarControllerMap;
 
 sal_Bool   
 m_bDisposed : 1,

 m_bFrameActionRegistered : 1,
diff --git a/framework/source/uielement/statusbarmanager.cxx 
b/framework/source/uielement/statusbarmanager.cxx
index 2b096a5..5a86dd6 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -37,9 +37,7 @@
 #include helper/mischelper.hxx
 
 #include com/sun/star/frame/XFrame.hpp
-#include com/sun/star/frame/XStatusListener.hpp
 #include com/sun/star/frame/StatusbarControllerFactory.hpp
-#include com/sun/star/util/XUpdatable.hpp
 #include com/sun/star/ui/ItemStyle.hpp
 #include com/sun/star/ui/ItemType.hpp
 #include com/sun/star/lang/XMultiComponentFactory.hpp
@@ -81,9 +79,8 @@ struct lcl_UpdateController : public std::unary_function 
typename MAP::value_ty
 {
 try
 {
-uno::Reference util::XUpdatable  xUpdatable( rElement.second, 
uno::UNO_QUERY );
-if ( xUpdatable.is() )
-xUpdatable-update();
+if ( rElement.second.is() )
+rElement.second-update();

Re: unexpected css::container::ElementExistException in SwXFrame::attachToRange

2013-05-31 Thread Michael Stahl

On 31/05/13 10:07, Stephan Bergmann wrote:
 Loading test3.docx attached to 
 https://bugs.freedesktop.org/show_bug.cgi?id=41466 Missing notes and 
 moved components after importing .docx file leads to an unexpected 
 css::container::ElementExistException in SwXFrame::attachToRange 
 (resulting in std::unexpected abort with --enable-dbgutil) in recent 
 master builds, where the exception is thrown as below.  Someone more 
 familiar with the sw code would need to decide how to address this.

this problem was introduced with

commit 1a3c90a292c7fc9060604151de9dc51eecf5b6a7
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed Feb 6 12:09:48 2013 +0100

sw: let drawinglayer manage gradient styles of our textframes

With this, the hacks from commits
81a46fc86a530f028a5bd2f5e52fe0372d50ee38 and
d7efffebd9651dd866349915360ade64b97d7301 are no longer necessary.


i hope i've fixed it with f5e8f5b0b5410d29b5cb1fb6fbbd8bf3c48a0201 but
don't have any real gradient bugdocs to check if it is the right fix.

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

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

2013-05-31 Thread Michael Stahl

 sw/source/core/unocore/unoframe.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f4743b5e7e6be74c1f399b7726ca85e38c96c132
Author: Michael Stahl mst...@redhat.com
Date:   Fri May 31 12:34:35 2013 +0200

sw: SwXFrame: fix gradient import problem:

BaseFrameProperties_Impl::FillBaseProperties: It may happen that
checkForUniqueItem returns an item with a name that already exists, if
the same gradient appears multiple times; don't crash with unhandled
ElementExistException then.
(can be reproduced with test3.docx from fdo#41466)
(regression from 1a3c90a292c7fc9060604151de9dc51eecf5b6a7)

Change-Id: Iace7af4c5679c1c7e978525fa31abf884038567c
(cherry picked from commit f5e8f5b0b5410d29b5cb1fb6fbbd8bf3c48a0201)

diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index d3d5ed5..0273a1e 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -267,7 +267,10 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SwDoc* 
pDoc, SfxItemSet rToSe
 uno::Referenceframe::XModel 
xModel(pDoc-GetDocShell()-GetModel());
 uno::Referencelang::XMultiServiceFactory 
xServiceFact(xModel, uno::UNO_QUERY);
 uno::Reference container::XNameContainer  
xGradients(xServiceFact-createInstance(com.sun.star.drawing.GradientTable), 
uno::UNO_QUERY);
-xGradients-insertByName(pItem-GetName(), *pFillGradient);
+if (!xGradients-hasByName(pItem-GetName()))
+{
+xGradients-insertByName(pItem-GetName(), 
*pFillGradient);
+}
 
 delete pItem;
 }
___
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' - f3/dc398e002926792a0c6160691d46eb75cad236

2013-05-31 Thread Michael Stahl

 f3/dc398e002926792a0c6160691d46eb75cad236 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a64da820f55886fe1c20459b122f7efdf1d2d23e
Author: Michael Stahl mst...@redhat.com
Date:   Fri May 31 12:47:34 2013 +0200

Notes added by 'git notes add'

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

[PATCH] Remove unused icons after cleaning up Math zoom

2013-05-31 Thread Rodolfo Ribeiro Gomes (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4117

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/4117/1

Remove unused icons after cleaning up Math zoom

After commit ffc2e5be1f712b09710e2096ad2f7eb81b80118d ,
these deleted icons are useless since other UNO commands are used instead:
  View050 - Zoom50Percent
  View100 - Zoom100Percent
  View200 - Zoom200Percent
  Adjust  - ZoomOptimal
  FitInWindow - ZoomOptimal

Sorry I forgot to remove then in that commit.

Change-Id: I141f2c4ad2f63928efb15faa5f68bc9c6dabc144
Signed-off-by: Rodolfo Ribeiro Gomes rodolf...@gmail.com
---
D icon-themes/crystal/cmd/lc_adjust.png
D icon-themes/crystal/cmd/lc_view100.png
D icon-themes/crystal/cmd/sc_adjust.png
D icon-themes/crystal/cmd/sc_view100.png
D icon-themes/galaxy/cmd/lc_adjust.png
D icon-themes/galaxy/cmd/lc_view100.png
D icon-themes/galaxy/cmd/sc_adjust.png
D icon-themes/galaxy/cmd/sc_view100.png
D icon-themes/hicontrast/cmd/lc_adjust.png
D icon-themes/hicontrast/cmd/lc_view100.png
D icon-themes/hicontrast/cmd/sc_adjust.png
D icon-themes/hicontrast/cmd/sc_view100.png
D icon-themes/human/cmd/lc_adjust.png
D icon-themes/human/cmd/lc_view100.png
D icon-themes/human/cmd/sc_adjust.png
D icon-themes/human/cmd/sc_view100.png
D icon-themes/industrial/cmd/lc_adjust.png
D icon-themes/industrial/cmd/lc_view100.png
D icon-themes/industrial/cmd/sc_adjust.png
D icon-themes/industrial/cmd/sc_view100.png
D icon-themes/oxygen/cmd/lc_adjust.png
D icon-themes/oxygen/cmd/lc_view100.png
D icon-themes/oxygen/cmd/sc_adjust.png
D icon-themes/oxygen/cmd/sc_view100.png
D icon-themes/tango/cmd/lc_adjust.png
D icon-themes/tango/cmd/lc_view100.png
D icon-themes/tango_testing/cmd/lc_view100.png
27 files changed, 0 insertions(+), 0 deletions(-)



diff --git a/icon-themes/crystal/cmd/lc_adjust.png 
b/icon-themes/crystal/cmd/lc_adjust.png
deleted file mode 100644
index 5de38bf..000
--- a/icon-themes/crystal/cmd/lc_adjust.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/crystal/cmd/lc_view100.png 
b/icon-themes/crystal/cmd/lc_view100.png
deleted file mode 100644
index cc8ce15..000
--- a/icon-themes/crystal/cmd/lc_view100.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/crystal/cmd/sc_adjust.png 
b/icon-themes/crystal/cmd/sc_adjust.png
deleted file mode 100644
index 9efbd54..000
--- a/icon-themes/crystal/cmd/sc_adjust.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/crystal/cmd/sc_view100.png 
b/icon-themes/crystal/cmd/sc_view100.png
deleted file mode 100644
index 8709d0a..000
--- a/icon-themes/crystal/cmd/sc_view100.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/galaxy/cmd/lc_adjust.png 
b/icon-themes/galaxy/cmd/lc_adjust.png
deleted file mode 100644
index 228d958..000
--- a/icon-themes/galaxy/cmd/lc_adjust.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/galaxy/cmd/lc_view100.png 
b/icon-themes/galaxy/cmd/lc_view100.png
deleted file mode 100644
index 2f00d91..000
--- a/icon-themes/galaxy/cmd/lc_view100.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/galaxy/cmd/sc_adjust.png 
b/icon-themes/galaxy/cmd/sc_adjust.png
deleted file mode 100644
index d9d1a66..000
--- a/icon-themes/galaxy/cmd/sc_adjust.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/galaxy/cmd/sc_view100.png 
b/icon-themes/galaxy/cmd/sc_view100.png
deleted file mode 100644
index bfd1a58..000
--- a/icon-themes/galaxy/cmd/sc_view100.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/hicontrast/cmd/lc_adjust.png 
b/icon-themes/hicontrast/cmd/lc_adjust.png
deleted file mode 100644
index 60765d6..000
--- a/icon-themes/hicontrast/cmd/lc_adjust.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/hicontrast/cmd/lc_view100.png 
b/icon-themes/hicontrast/cmd/lc_view100.png
deleted file mode 100644
index 33af72d..000
--- a/icon-themes/hicontrast/cmd/lc_view100.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/hicontrast/cmd/sc_adjust.png 
b/icon-themes/hicontrast/cmd/sc_adjust.png
deleted file mode 100644
index fdaabf5..000
--- a/icon-themes/hicontrast/cmd/sc_adjust.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/hicontrast/cmd/sc_view100.png 
b/icon-themes/hicontrast/cmd/sc_view100.png
deleted file mode 100644
index 2254149..000
--- a/icon-themes/hicontrast/cmd/sc_view100.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/human/cmd/lc_adjust.png 
b/icon-themes/human/cmd/lc_adjust.png
deleted file mode 100644
index 4beea80..000
--- a/icon-themes/human/cmd/lc_adjust.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/human/cmd/lc_view100.png 
b/icon-themes/human/cmd/lc_view100.png
deleted file mode 100644
index 2c52084..000
--- a/icon-themes/human/cmd/lc_view100.png
+++ /dev/null
Binary files differ
diff --git a/icon-themes/human/cmd/sc_adjust.png

Re: oox service mess

2013-05-31 Thread Noel Power


On 31/05/13 10:43, Noel Power wrote:

On 31/05/13 08:16, Stephan Bergmann wrote:

On 05/30/2013 07:20 PM, Kohei Yoshida wrote:


[...]
Besides the com.sun.star.sheet.FilterFormulaParser UNOIDL (new-style 
marker, i.e., no ctor) service declaration there is indeed also a 
com.sun.star.sheet.FormulaParser UNOIDL old-style service 
declaration, It appears to be a service that is not available at the 
global service manager, but rather something that can be obtained 
from some Calc-local manager (ScServiceProvider::MakeInstance handing 
out ScFormulaParserObj instances under the 
com.sun.star.sheet.FormulaParser key)


like I mentioned I begin to also feel uneasy that we are missing 
something here ( especially regarding ScParserFactoryMap)


http://opengrok.libreoffice.org/xref/core/sc/source/core/tool/compiler.cxx#3944 
 
http://opengrok.libreoffice.org/xref/core/sc/source/filter/xml/xmlimprt.cxx#338 
would appear to suggest that service(s) ( perhaps the oox one ) should 
in fact be avaialble. I am not sure about what scerario should trigger 
this my formula knowledge is poor. What namespaces should map 
instances of which services? I think I still have an old 3.5 tree 
hanging about, I will try to check what at least that 
ScFormulaParserPool used contain
Seems there is only one ( the oox one ) which takes care of namespace 
http://schemas.microsoft.com/office/excel/formula; Is it possible then 
that we can have microsoft formula saved in ods ? But.. the 
ScParserFactoryMap/Pool stuff seems to provide some extensible way of 
mapping specific parsers, no idea if this is really needed or not ( I 
guess Eike/Kohei ) would know.


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

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

2013-05-31 Thread Caolán McNamara

 cui/source/tabpages/paragrph.cxx |3 ---
 cui/uiconfig/ui/paragalignpage.ui|5 +
 cui/uiconfig/ui/paraindentspacing.ui |5 +
 svx/source/dialog/frmdirlbox.cxx |4 +++-
 4 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit c3cdc78e885d63aa4993c63b14fc034d1880d066
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 12:33:59 2013 +0100

set accessibility name for previews via .ui

Change-Id: I4abf90f43a8278e3c115a809deb1a8096f21c685

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index ff9d71b..b910f7a 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -678,9 +678,6 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* 
pParent,  const SfxItemS
 
 Init_Impl();
 m_pFLineIndent-SetMin(-);// is set to 0 on default
-
-//aExampleWin.SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
-
 }
 
 SvxStdParagraphTabPage::~SvxStdParagraphTabPage()
diff --git a/cui/uiconfig/ui/paragalignpage.ui 
b/cui/uiconfig/ui/paragalignpage.ui
index caa1f06..178f7c3 100644
--- a/cui/uiconfig/ui/paragalignpage.ui
+++ b/cui/uiconfig/ui/paragalignpage.ui
@@ -25,6 +25,11 @@
 property name=valignstart/property
 property name=hexpandTrue/property
 property name=vexpandTrue/property
+child internal-child=accessible
+  object class=AtkObject id=drawingareaWN_EXAMPLE-atkobject
+property name=AtkObject::accessible-name 
translatable=yesExample/property
+  /object
+/child
   /object
 /child
   /object
diff --git a/cui/uiconfig/ui/paraindentspacing.ui 
b/cui/uiconfig/ui/paraindentspacing.ui
index df44c1a..5016684 100644
--- a/cui/uiconfig/ui/paraindentspacing.ui
+++ b/cui/uiconfig/ui/paraindentspacing.ui
@@ -475,6 +475,11 @@
 property name=valignstart/property
 property name=hexpandTrue/property
 property name=vexpandTrue/property
+child internal-child=accessible
+  object class=AtkObject id=drawingareaWN_EXAMPLE-atkobject
+property name=AtkObject::accessible-name 
translatable=yesExample/property
+  /object
+/child
   /object
 /child
   /object
commit c799a1e5522971405fa45d3df7ebf259229df63e
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 12:29:43 2013 +0100

autosize the frame direction listbox

Change-Id: I440ca0255a6079c28b2314b12511c6c41d6a05f5

diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx
index 7de9437..ad1697d 100644
--- a/svx/source/dialog/frmdirlbox.cxx
+++ b/svx/source/dialog/frmdirlbox.cxx
@@ -56,7 +56,9 @@ FrameDirectionListBox::~FrameDirectionListBox()
 
 extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL 
makeFrameDirectionListBox(Window *pParent, VclBuilder::stringmap )
 {
-return new FrameDirectionListBox(pParent, 
WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP);
+FrameDirectionListBox* pListBox = new FrameDirectionListBox(pParent, 
WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP);
+pListBox-EnableAutoSize(true);
+return pListBox;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac extensions/test lcms2/ExternalPackage_lcms2.mk lcms2/ExternalProject_lcms2.mk

2013-05-31 Thread Tor Lillqvist

 config_host.mk.in|1 -
 configure.ac |1 -
 extensions/test/ole/cpnt/makefile.mk |9 -
 lcms2/ExternalPackage_lcms2.mk   |2 +-
 lcms2/ExternalProject_lcms2.mk   |   10 +-
 5 files changed, 2 insertions(+), 21 deletions(-)

New commits:
commit 8120e95e2b8f685f5c951cd316ac443a14dba79a
Author: Tor Lillqvist t...@iki.fi
Date:   Fri May 31 14:32:03 2013 +0300

Bin more VS2008 bits

Change-Id: Ia52fdae1e386ea92f11185ce7cdac65baed10495

diff --git a/config_host.mk.in b/config_host.mk.in
index a3770a5..6174641 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -55,7 +55,6 @@ export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@
 export CMIS_CFLAGS=$(gb_SPACE)@CMIS_CFLAGS@
 export CMIS_LIBS=$(gb_SPACE)@CMIS_LIBS@
 export COM=@COM@
-export COMEX=@COMEX@
 export COMMONS_CODEC_JAR=@COMMONS_CODEC_JAR@
 export COMMONS_HTTPCLIENT_JAR=@COMMONS_HTTPCLIENT_JAR@
 export COMMONS_LANG_JAR=@COMMONS_LANG_JAR@
diff --git a/configure.ac b/configure.ac
index 8dc7cd0..aee6047 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3210,7 +3210,6 @@ if test $_os = WINNT; then
 fi
 fi
 fi
-AC_SUBST(COMEX)
 AC_SUBST(VCVER)
 PathFormat $MSPDB_PATH
 MSPDB_PATH=$formatted_path
diff --git a/extensions/test/ole/cpnt/makefile.mk 
b/extensions/test/ole/cpnt/makefile.mk
index ee8a629..ad9d07b 100644
--- a/extensions/test/ole/cpnt/makefile.mk
+++ b/extensions/test/ole/cpnt/makefile.mk
@@ -39,15 +39,6 @@ SHL1STDLIBS= \
 $(CPPULIB) \
 $(CPPUHELPERLIB)
 
-.IF $(COMEX)==8 || $(COMEX)==10
-.IF $(USE_DEBUG_RUNTIME) != 
-SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
-SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
-.ENDIF
-
-
 SHL1DEPN=
 SHL1IMPLIB=i$(TARGET)
 SHL1LIBS=  $(SLB)$/$(TARGET).lib
diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk
index b5cd180..30bf089 100644
--- a/lcms2/ExternalPackage_lcms2.mk
+++ b/lcms2/ExternalPackage_lcms2.mk
@@ -20,7 +20,7 @@ ifeq ($(COM),GCC)
 $(eval $(call 
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dll.a,src/.libs/liblcms2.dll.a))
 $(eval $(call 
gb_ExternalPackage_add_library_for_install,lcms2,bin/liblcms2-2.dll,src/.libs/liblcms2-2.dll))
 else ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2$(if 
$(MSVC_USE_DEBUG_RUNTIME),d).lib,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),$(if 
$(filter-out 13 14,$(COMEX)),d)).lib))
+$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2$(if 
$(MSVC_USE_DEBUG_RUNTIME),d).lib,bin/lcms2.lib))
 # note: the lcms2d.lib references LCMS2.DLL (without D!) but the dll is
 # actually called LCMS2D.DLL then
 $(eval $(call 
gb_ExternalPackage_add_library_for_install,lcms2,bin/lcms2.dll,bin/lcms2$(if 
$(MSVC_USE_DEBUG_RUNTIME),d).dll))
diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk
index 1689482..e128b24 100644
--- a/lcms2/ExternalProject_lcms2.mk
+++ b/lcms2/ExternalProject_lcms2.mk
@@ -15,24 +15,16 @@ $(eval $(call gb_ExternalProject_register_targets,lcms2,\
 
 ifeq ($(COM),MSC)
 
-ifeq ($(filter-out 14 13,$(COMEX)),)
 $(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_run,build,\
MSBuild.exe lcms2_DLL.vcxproj \
/p:Configuration=$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=Win32 /p:TargetName=lcms2 \
-   $(if $(filter 14,$(COMEX)),/p:PlatformToolset=v110 
/p:VisualStudioVersion=11.0) \
+   $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110 
/p:VisualStudioVersion=11.0) \
,Projects/VC2010/lcms2_DLL)
 else
 $(call gb_ExternalProject_get_state_target,lcms2,build):
$(call gb_ExternalProject_run,build,\
-   $(COMPATH)/vcpackages/vcbuild.exe lcms2_DLL.vcproj \
-   $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)|Win32 \
-   ,Projects/VC2008/lcms2_DLL)
-endif
-else
-$(call gb_ExternalProject_get_state_target,lcms2,build):
-   $(call gb_ExternalProject_run,build,\
./configure --without-jpeg --without-tiff --with-pic \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
CPPFLAGS= $(SOLARINC) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: oox service mess

2013-05-31 Thread Michael Stahl

On 31/05/13 13:32, Noel Power wrote:
 Seems there is only one ( the oox one ) which takes care of namespace 
 http://schemas.microsoft.com/office/excel/formula; Is it possible then 
 that we can have microsoft formula saved in ods ? But.. the 
 ScParserFactoryMap/Pool stuff seems to provide some extensible way of 
 mapping specific parsers, no idea if this is really needed or not ( I 
 guess Eike/Kohei ) would know.

the MSO ODF 1.1 filter saves formulas as OOXML, not in the legacy
non-standard OpenOffice.org way that every other ODF 1.1 implementation
understands, because that way they can claim to implement ODF while
carefully avoiding actual real-world interoperability.


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

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

2013-05-31 Thread Caolán McNamara

 cui/source/options/optjava.cxx|5 +
 include/svtools/restartdialog.hxx |5 -
 sd/source/ui/framework/factories/TaskPanelFactory.cxx |1 -
 sfx2/source/dialog/taskpane.cxx   |   18 +++---
 svtools/source/dialogs/restartdialog.cxx  |3 +++
 svtools/uiconfig/ui/restartdialog.ui  |   16 +++-
 svx/source/dialog/frmdirlbox.cxx  |4 +++-
 svx/source/svdraw/svdundo.cxx |   10 ++
 8 files changed, 51 insertions(+), 11 deletions(-)

New commits:
commit 30adf73871cacede1ade5615acc54288b07cd0be
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 12:29:43 2013 +0100

autosize the frame direction listbox

Change-Id: I440ca0255a6079c28b2314b12511c6c41d6a05f5
(cherry picked from commit c799a1e5522971405fa45d3df7ebf259229df63e)

diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx
index 7de9437..ad1697d 100644
--- a/svx/source/dialog/frmdirlbox.cxx
+++ b/svx/source/dialog/frmdirlbox.cxx
@@ -56,7 +56,9 @@ FrameDirectionListBox::~FrameDirectionListBox()
 
 extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL 
makeFrameDirectionListBox(Window *pParent, VclBuilder::stringmap )
 {
-return new FrameDirectionListBox(pParent, 
WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP);
+FrameDirectionListBox* pListBox = new FrameDirectionListBox(pParent, 
WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP);
+pListBox-EnableAutoSize(true);
+return pListBox;
 }
 
 
commit c40202a032c9f10161f46142c6960427522466fa
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu May 30 20:00:46 2013 +0100

prompt to restart office when required for experimental features

Change-Id: I43051ec6b0efeaebcf4a28940f70913423b8ea9f
(cherry picked from commit 7ce2a89f4f8fa84232896766276cb3433ada239c)

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 1c03981..f7c8b17 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -627,6 +627,11 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet 
/*rCoreSet*/ )
 {
 SvtMiscOptions aMiscOpt;
 aMiscOpt.SetExperimentalSidebar( m_pExpSidebarCB-IsChecked() );
+
+svtools::executeRestartDialog(
+comphelper::getProcessComponentContext(), this,
+svtools::RESTART_REASON_MODIFIED_SIDEBAR);
+
 bModified = sal_True;
 }
 
diff --git a/include/svtools/restartdialog.hxx 
b/include/svtools/restartdialog.hxx
index 993b099..d74d6d3 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -29,9 +29,12 @@ enum RestartReason {
 RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT,
 // For the modified default print job format to take effect,
 // %PRODUCTNAME must be restarted.
-RESTART_REASON_BIBLIOGRAPHY_INSTALL
+RESTART_REASON_BIBLIOGRAPHY_INSTALL,
 // For the bibliography to work properly,
 // %PRODUCTNAME must be restarted.
+RESTART_REASON_MODIFIED_SIDEBAR
+// For the sidebar to work properly,
+// %PRODUCTNAME must be restarted.
 };
 
 // Must be called with the solar mutex locked:
diff --git a/svtools/source/dialogs/restartdialog.cxx 
b/svtools/source/dialogs/restartdialog.cxx
index e5d64de..81655a5 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -40,6 +40,9 @@ public:
 case svtools::RESTART_REASON_BIBLIOGRAPHY_INSTALL:
 get(reason_, reason_bibliography_install);
 break;
+case svtools::RESTART_REASON_MODIFIED_SIDEBAR:
+get(reason_, reason_sidebar);
+break;
 default:
 assert(false); // this cannot happen
 }
diff --git a/svtools/uiconfig/ui/restartdialog.ui 
b/svtools/uiconfig/ui/restartdialog.ui
index 5027620..f2445df 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -101,6 +101,20 @@
   /packing
 /child
 child
+  object class=GtkLabel id=reason_sidebar
+property name=can_focusFalse/property
+property name=no_show_allTrue/property
+property name=label translatable=yesFor the modified 
sidebar setting to take effect, %PRODUCTNAME must be restarted./property
+property name=wrapTrue/property
+property name=max_width_chars50/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position3/property
+  /packing
+/child
+child
   object class=GtkLabel id=label
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@

Re: oox service mess

2013-05-31 Thread Kohei Yoshida


On 05/31/2013 03:16 AM, Stephan Bergmann wrote:

On 05/30/2013 07:20 PM, Kohei Yoshida wrote:

On 05/30/2013 12:21 PM, Noel Power wrote:

is erroneously listed in sc/util/scfilt.component but not included in
scfilt_component_getFactory (sc/source/filter/excel/xestream.cxx);
its implementation got initially moved to the scfilt library, but has
since been removed as it was unreferenced.


intentional ( at least from me ) I doubt we want to do formula parsing
over uno ( I think Kohei would agree )

Yup. We just need to leave one service for formula parser available for
extension developers, but for the internal code we should not be using
the uno formula parser moving forward.


Just to be clear, with one service do you mean

(a) one service declaration in UNOIDL, for which extension developers 
can provide implementations, which the ScParserFactoryMap ctor in turn 
iterates over (which would be 
com.sun.star.sheet.FilterFormulaParser), or


(b) one service implementation (which would be the lost 
com.sun.star.comp.oox.xls.FormulaParser)?
No idea whatsoever. To be honest, I don't even know why we have so many 
service names just for the formula parser. Because internally there is 
only one parser implementation. So, whichever service will survive, we 
need to have at least one of them left standing.  That's what I meant.


We would probably need to ask Eike for anything more specific than that.




And I believe the one we want to keep is made available by
ScFormulaParserObj under the com.sun.star.sheet.FormulaParser service
name, and this one is not on the list of services that Stephan listed,
so we are safe here.


Besides the com.sun.star.sheet.FilterFormulaParser UNOIDL (new-style 
marker, i.e., no ctor) service declaration there is indeed also a 
com.sun.star.sheet.FormulaParser UNOIDL old-style service declaration, 
It appears to be a service that is not available at the global service 
manager, but rather something that can be obtained from some 
Calc-local manager (ScServiceProvider::MakeInstance handing out 
ScFormulaParserObj instances under the 
com.sun.star.sheet.FormulaParser key).
Yes. com.sun.star.sheet.FormulaParser is the one I'm familiar with. The 
rest were totally unknown to me.


Kohei

--
Kohei Yoshida, LibreOffice Calc hacker, SUSE.

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

Re: oox service mess

2013-05-31 Thread Kohei Yoshida


On 05/31/2013 07:32 AM, Noel Power wrote:
Seems there is only one ( the oox one ) which takes care of namespace 
http://schemas.microsoft.com/office/excel/formula; Is it possible 
then that we can have microsoft formula saved in ods ? 
Yes. I believe the kind of ODF 1.1 that Excel exports in fact contains 
Excel's own formula expression syntax with Excel's own namespace. I 
remember Daniel Rentz was working on supporting its import. Not sure 
whether he actually finished it or not before the Oracle team disbanded.


But.. the ScParserFactoryMap/Pool stuff seems to provide some 
extensible way of mapping specific parsers, no idea if this is really 
needed or not ( I guess Eike/Kohei ) would know.

Eike would, I wouldn't. ;-) I have no clue why it's even there.

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-05-31 Thread bugzilla-daemon

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

Jorendc joren.libreoff...@telenet.be changed:

   What|Removed |Added

 Depends on||64925

--- Comment #25 from Jorendc joren.libreoff...@telenet.be ---
I nominate Bug 64925 - Crash on display/paste Arabic text

-- 
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 'aoo/trunk' - sfx2/source

2013-05-31 Thread Andre Fischer

 sfx2/source/sidebar/Accessible.cxx |   68 +++
 sfx2/source/sidebar/Accessible.hxx |   72 +
 sfx2/source/sidebar/AccessibleTitleBar.cxx |   72 +
 sfx2/source/sidebar/AccessibleTitleBar.hxx |   53 +
 4 files changed, 265 insertions(+)

New commits:
commit 488befaed6d5203d8a6e1c9e986caa5d342f5b40
Author: Andre Fischer a...@apache.org
Date:   Fri May 31 11:29:01 2013 +

122271: Added missing files.

diff --git a/sfx2/source/sidebar/Accessible.cxx 
b/sfx2/source/sidebar/Accessible.cxx
new file mode 100644
index 000..19fb8f6
--- /dev/null
+++ b/sfx2/source/sidebar/Accessible.cxx
@@ -0,0 +1,68 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include precompiled_sfx2.hxx
+
+#include Accessible.hxx
+
+
+using namespace css;
+using namespace cssu;
+
+
+namespace sfx2 { namespace sidebar {
+
+
+Accessible::Accessible (
+const Referenceaccessibility::XAccessibleContext rxContext)
+: AccessibleInterfaceBase(m_aMutex),
+  mxContext(rxContext)
+{
+}
+
+
+
+
+Accessible::~Accessible (void)
+{
+}
+
+
+
+
+void SAL_CALL Accessible::disposing (void)
+{
+ReferenceXComponent xComponent (mxContext, UNO_QUERY);
+if (xComponent.is())
+xComponent-dispose();
+}
+
+
+
+
+Referenceaccessibility::XAccessibleContext SAL_CALL 
Accessible::getAccessibleContext (void)
+throw (cssu::RuntimeException)
+{
+return mxContext;
+}
+
+
+} } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/Accessible.hxx 
b/sfx2/source/sidebar/Accessible.hxx
new file mode 100644
index 000..6209c27
--- /dev/null
+++ b/sfx2/source/sidebar/Accessible.hxx
@@ -0,0 +1,72 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#ifndef SFX_SIDEBAR_ACCESSIBLE_HXX
+#define SFX_SIDEBAR_ACCESSIBLE_HXX
+
+#include com/sun/star/accessibility/XAccessible.hpp
+#include com/sun/star/accessibility/XAccessibleContext.hpp
+
+#include cppuhelper/compbase1.hxx
+#include cppuhelper/basemutex.hxx
+
+namespace css = ::com::sun::star;
+namespace cssu = ::com::sun::star::uno;
+
+namespace
+{
+typedef ::cppu::WeakComponentImplHelper1 
+css::accessibility::XAccessible
+ AccessibleInterfaceBase;
+}
+
+namespace sfx2 { namespace sidebar {
+
+
+/** Simple implementation of the XAccessible interface.
+Its getAccessibleContext() method returns a context object given
+to its constructor.
+*/
+class Accessible
+: private ::boost::noncopyable,
+  private ::cppu::BaseMutex,
+  public AccessibleInterfaceBase
+{
+public:
+Accessible (
+const cssu::Referencecss::accessibility::XAccessibleContext 
rxContext);
+virtual ~Accessible (void);
+
+virtual void SAL_CALL disposing (void);
+
+
+// XAccessible
+virtual cssu::Referencecss::accessibility::XAccessibleContext SAL_CALL 
getAccessibleContext (void)
+throw (cssu::RuntimeException);
+
+private:
+cssu::Referencecss::accessibility::XAccessibleContext mxContext;
+};
+
+
+} } // end of namespace sfx2::sidebar
+
+#endif
diff --git a/sfx2/source/sidebar/AccessibleTitleBar.cxx 
b/sfx2/source/sidebar/AccessibleTitleBar.cxx
new

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

2013-05-31 Thread Cédric Bosdonnat

 sw/qa/extras/ooxmlimport/data/n816593.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   11 ++
 writerfilter/inc/resourcemodel/TableData.hxx |5 +
 writerfilter/inc/resourcemodel/TableManager.hxx  |   31 ++-
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   61 ++-
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |4 
 writerfilter/source/dmapper/TablePositionHandler.cxx |   10 ++
 writerfilter/source/dmapper/TablePositionHandler.hxx |2 
 writerfilter/source/ooxml/OOXMLParserState.cxx   |3 
 9 files changed, 118 insertions(+), 9 deletions(-)

New commits:
commit 173d24a7316fccf0e838f71b92c10a772b19298d
Author: CÃ©dric Bosdonnat cedric.bosdon...@free.fr
Date:   Fri May 31 10:51:47 2013 +0200

n#816593: docx consecutive tables with different tblpPr needs to be split

When importing docx with 2 w:tbl following each other, we have 2
possible behaviors: either merge them as one table as we did before or
split them into two tables. The tables need to be split if they have
different floating position properties.

This required the ooxml tokenizer to repeat the table properties for
each row of the table: or how would we know we don't need to split the
table?

The basic idea behind this hack is to temporarily store the table
position and table properties before saving them. Thus we can compare
them at the end of the row and decide to split the table or not.

Change-Id: I2e3e70dfe7386090fe356575ee9d0e81aa031dc4

diff --git a/sw/qa/extras/ooxmlimport/data/n816593.docx 
b/sw/qa/extras/ooxmlimport/data/n816593.docx
new file mode 100644
index 000..7d784e6
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n816593.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 5a268e4..c422ecc 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -116,6 +116,7 @@ public:
 void testPageBackground();
 void testWatermark();
 void testPageBorderShadow();
+void testN816593();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -200,6 +201,7 @@ void Test::run()
 {page-background.docx, Test::testPageBackground},
 {watermark.docx, Test::testWatermark},
 {page-border-shadow.docx, Test::testPageBorderShadow},
+{n816593.docx, Test::testN816593},
 };
 header();
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
@@ -1430,6 +1432,15 @@ void Test::testPageBorderShadow()
 CPPUNIT_ASSERT_EQUAL(sal_Int16(TWIP_TO_MM100(48/8*20)), 
aShadow.ShadowWidth);
 }
 
+void Test::testN816593()
+{
+// Two consecutive w:tbl without any paragraph in between, but with 
different tblpPr. In this
+// case we need to have 2 different tables instead of 1
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xTables(xTablesSupplier-getTextTables( ), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables-getCount());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/inc/resourcemodel/TableData.hxx 
b/writerfilter/inc/resourcemodel/TableData.hxx
index 61efa41..7c9f9dc 100644
--- a/writerfilter/inc/resourcemodel/TableData.hxx
+++ b/writerfilter/inc/resourcemodel/TableData.hxx
@@ -409,6 +409,11 @@ public:
 {
 return mRows[i];
 }
+
+const RowPointer_t getCurrentRow() const
+{
+return mpRow;
+}
 };
 
 }
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx 
b/writerfilter/inc/resourcemodel/TableManager.hxx
index a8ee39b..72841ff 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -408,6 +408,8 @@ private:
for each level of nested tables there is one frame in the stack
  */
 stacktypename TableDataT, PropertiesPointer::Pointer_t  
mTableDataStack;
+typename RowDataT, PropertiesPointer::Pointer_t mpUnfinishedRow;
+bool mbKeepUnfinishedRow;
 
 typedef typename TableDataHandlerT, PropertiesPointer::Pointer_t 
TableDataHandlerPointer_t;
 
@@ -486,6 +488,14 @@ protected:
  */
 virtual void clearData();
 
+/** Should we keep the unfinished row in endLevel to initialize the table
+data in the following startLevel.
+  */
+void setKeepUnfinishedRow(bool bKeep)
+{
+mbKeepUnfinishedRow = bKeep;
+}
+
 
 public:
 TableManager();
@@ -618,7 +628,7 @@ public:
 
 template typename T, typename PropertiesPointer
 TableManagerT, PropertiesPointer::TableManager()
-: mnTableDepthNew(0), mnTableDepth(0)
+: mnTableDepthNew(0), mnTableDepth(0), mbKeepUnfinishedRow( false )
 {
 setRowEnd(false);
 setInCell(false);
@@ -731,6 +741,18 @@ void TableManagerT,

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

2013-05-31 Thread Caolán McNamara

 helpers/help_hid.lst   |2 -
 source/text/shared/01/05030100.xhp |   48 ++---
 source/text/shared/01/05030700.xhp |   38 ++---
 3 files changed, 43 insertions(+), 45 deletions(-)

New commits:
commit c80240cf0171f821d88110662b506774f15d89fe
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 13:19:37 2013 +0100

update help ids for paragraph align .ui conversion

Change-Id: I286338de0ac8e894d50d4bfbc52bab5c89f43d08

diff --git a/source/text/shared/01/05030700.xhp 
b/source/text/shared/01/05030700.xhp
index 4fcea39..148b42c 100644
--- a/source/text/shared/01/05030700.xhp
+++ b/source/text/shared/01/05030700.xhp
@@ -36,62 +36,62 @@
 bookmark_valuecentered text/bookmark_value
 bookmark_valuejustifying text/bookmark_value
 /bookmarkcommentMW deleted text;/comment
-bookmark xml-lang=en-US branch=hid/CUI_HID_FORMAT_PARAGRAPH_ALIGN 
id=bm_id3149495 localize=false/
+bookmark xml-lang=en-US branch=hid/cui/ui/paragalignpage/ParaAlignPage 
id=bm_id3149495 localize=false/
 paragraph role=heading id=hd_id3150008 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/shared/01/05030700.xhp 
name=AlignmentAlignment/link/paragraph
-paragraph role=paragraph id=par_id3147399 xml-lang=en-US l10n=U 
oldref=2ahelp hid=HID_FORMAT_PARAGRAPH_ALIGNSets the alignment of the 
paragraph relative to the margins of page./ahelp/paragraph
+paragraph role=paragraph id=par_id3147399 xml-lang=en-US l10n=U 
oldref=2ahelp hid=cui/ui/paragalignpage/ParaAlignPageSets the alignment 
of the paragraph relative to the margins of page./ahelp/paragraph
 /section
 section id=howtoget
 embed href=text/shared/00/00040500.xhp#absatzausrichtung/
 /section
 paragraph role=heading id=hd_id3143268 xml-lang=en-US level=2 
l10n=U oldref=3Alignment/paragraph
 paragraph role=paragraph id=par_id3147008 xml-lang=en-US l10n=CHG 
oldref=4Set the alignment options for the current paragraph./paragraph
-bookmark xml-lang=en-US 
branch=hid/cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN 
id=bm_id3155941 localize=false/
+bookmark xml-lang=en-US 
branch=hid/cui/ui/paragalignpage/radioBTN_LEFTALIGN id=bm_id3155941 
localize=false/
 paragraph role=heading id=hd_id3153681 xml-lang=en-US level=3 
l10n=U oldref=5Left/paragraph
-paragraph role=paragraph id=par_id3153031 xml-lang=en-US l10n=U 
oldref=6variable id=linkstextahelp 
hid=SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGNAligns the 
paragraph to the left page margin./ahelp
+paragraph role=paragraph id=par_id3153031 xml-lang=en-US l10n=U 
oldref=6variable id=linkstextahelp 
hid=cui/ui/paragalignpage/radioBTN_LEFTALIGNAligns the paragraph to the left 
page margin./ahelp
 /variable If Asian language support is enabled, this option is named 
Left/Top./paragraph
 embed href=text/shared/00/0007.xhp#objektleiste/
 embed href=text/shared/00/00040502.xhp#sylinksbuendig/
-bookmark xml-lang=en-US 
branch=hid/cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN 
id=bm_id3150465 localize=false/
+bookmark xml-lang=en-US 
branch=hid/cui/ui/paragalignpage/radioBTN_RIGHTALIGN id=bm_id3150465 
localize=false/
 paragraph role=heading id=hd_id3154142 xml-lang=en-US level=3 
l10n=U oldref=7Right/paragraph
-paragraph role=paragraph id=par_id3156326 xml-lang=en-US l10n=U 
oldref=8variable id=rechtstextahelp 
hid=SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGNAligns the 
paragraph to the right page margin./ahelp
+paragraph role=paragraph id=par_id3156326 xml-lang=en-US l10n=U 
oldref=8variable id=rechtstextahelp 
hid=cui/ui/paragalignpage/radioBTN_RIGHTALIGNAligns the paragraph to the 
right page margin./ahelp
 /variable If Asian language support is enabled, this option is named 
Right/Bottom./paragraph
 embed href=text/shared/00/0007.xhp#objektleiste/
 embed href=text/shared/00/00040502.xhp#syrechtsbuendig/
-bookmark xml-lang=en-US 
branch=hid/cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN 
id=bm_id3155179 localize=false/
+bookmark xml-lang=en-US 
branch=hid/cui/ui/paragalignpage/radioBTN_CENTERALIGN id=bm_id3155179 
localize=false/
 paragraph role=heading id=hd_id3148642 xml-lang=en-US level=3 
l10n=U oldref=9Centered/paragraph
-paragraph role=paragraph id=par_id3153257 xml-lang=en-US l10n=U 
oldref=10variable id=zentrierttextahelp 
hid=SVX:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGNCenters the 
contents of the paragraph on the page./ahelp
+paragraph role=paragraph id=par_id3153257 xml-lang=en-US l10n=U 
oldref=10variable id=zentrierttextahelp 
hid=cui/ui/paragalignpage/radioBTN_CENTERALIGNCenters the contents of the 
paragraph on the page./ahelp
 /variable/paragraph
 embed href=text/shared/00/0007.xhp#objektleiste/
 embed href=text/shared/00/00040502.xhp#syzentriert/
-bookmark xml-lang=en-US 
branch=hid/cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN 
id=bm_id3159270 localize=false/
+bookmark xml-lang=en-US 
branch=hid/cui/ui/paragalignpage/radioBTN_JUSTIFYALIGN

[Libreoffice-commits] core.git: 3 commits - cui/source helpcontent2 sfx2/Library_sfx.mk sfx2/source

2013-05-31 Thread Andre Fischer

 cui/source/inc/helpid.hrc  |2 
 helpcontent2   |2 
 sfx2/Library_sfx.mk|2 
 sfx2/source/sidebar/Accessible.cxx |   63 ++
 sfx2/source/sidebar/Accessible.hxx |   70 +
 sfx2/source/sidebar/AccessibleTitleBar.cxx |   67 +++
 sfx2/source/sidebar/AccessibleTitleBar.hxx |   49 
 sfx2/source/sidebar/DeckTitleBar.cxx   |   11 
 sfx2/source/sidebar/DeckTitleBar.hxx   |1 
 sfx2/source/sidebar/PanelTitleBar.cxx  |   21 +---
 sfx2/source/sidebar/PanelTitleBar.hxx  |2 
 sfx2/source/sidebar/TitleBar.cxx   |   32 -
 sfx2/source/sidebar/TitleBar.hxx   |5 +-
 13 files changed, 302 insertions(+), 25 deletions(-)

New commits:
commit 8502b8006fdf03d2bc634f53490200f853474867
Author: Andre Fischer a...@apache.org
Date:   Fri May 31 09:03:08 2013 +

Resolves: #i122271# FOCUSABLE flag at accessibility object sidebar title 
bars

so that bridges create focus events and title bars become visible
to AT devices.

(cherry picked from commit 6055c2b50b36a0fc1b26c18b030827e3e08a51fc)

Conflicts:
sfx2/source/sidebar/TitleBar.cxx

Change-Id: If863c2c9d5ba19ba627639b294a430869f245abd

diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 03775fd..aefe3a2 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -233,6 +233,8 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 sfx2/source/sidebar/SidebarController \
 sfx2/source/sidebar/SidebarPanelBase \
 sfx2/source/sidebar/SidebarToolBox \
+sfx2/source/sidebar/Accessible \
+sfx2/source/sidebar/AccessibleTitleBar \
 sfx2/source/sidebar/AsynchronousCall \
 sfx2/source/sidebar/CommandInfoProvider \
 sfx2/source/sidebar/Context \
diff --git a/sfx2/source/sidebar/Accessible.cxx 
b/sfx2/source/sidebar/Accessible.cxx
new file mode 100644
index 000..13d52aa
--- /dev/null
+++ b/sfx2/source/sidebar/Accessible.cxx
@@ -0,0 +1,63 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include Accessible.hxx
+
+
+using namespace css;
+using namespace cssu;
+
+
+namespace sfx2 { namespace sidebar {
+
+
+Accessible::Accessible (
+const Referenceaccessibility::XAccessibleContext rxContext)
+: AccessibleInterfaceBase(m_aMutex),
+  mxContext(rxContext)
+{
+}
+
+
+
+
+Accessible::~Accessible (void)
+{
+}
+
+
+
+
+void SAL_CALL Accessible::disposing (void)
+{
+ReferenceXComponent xComponent (mxContext, UNO_QUERY);
+if (xComponent.is())
+xComponent-dispose();
+}
+
+
+
+
+Referenceaccessibility::XAccessibleContext SAL_CALL 
Accessible::getAccessibleContext (void)
+throw (cssu::RuntimeException)
+{
+return mxContext;
+}
+
+
+} } // end of namespace sfx2::sidebar
diff --git a/sfx2/source/sidebar/Accessible.hxx 
b/sfx2/source/sidebar/Accessible.hxx
new file mode 100644
index 000..d6b8584
--- /dev/null
+++ b/sfx2/source/sidebar/Accessible.hxx
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the License); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SFX_SIDEBAR_ACCESSIBLE_HXX
+#define SFX_SIDEBAR_ACCESSIBLE_HXX
+
+#include boost/noncopyable.hpp
+
+#include com/sun/star/accessibility/XAccessible.hpp
+#include com/sun/star/accessibility/XAccessibleContext.hpp
+
+#include cppuhelper/compbase1.hxx
+#include

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 60/55c2b50b36a0fc1b26c18b030827e3e08a51fc

2013-05-31 Thread Caolán McNamara

 60/55c2b50b36a0fc1b26c18b030827e3e08a51fc |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2adf5ed8b2da33f3fb5ab312b0660397a173a559
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 13:38:07 2013 +0100

Notes added by 'git notes add'

diff --git a/60/55c2b50b36a0fc1b26c18b030827e3e08a51fc 
b/60/55c2b50b36a0fc1b26c18b030827e3e08a51fc
new file mode 100644
index 000..bbc7b9f
--- /dev/null
+++ b/60/55c2b50b36a0fc1b26c18b030827e3e08a51fc
@@ -0,0 +1 @@
+merged as: 8502b8006fdf03d2bc634f53490200f853474867
___
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' - 48/8befaed6d5203d8a6e1c9e986caa5d342f5b40

2013-05-31 Thread Caolán McNamara

 48/8befaed6d5203d8a6e1c9e986caa5d342f5b40 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 722be08d74b882ed3f023e9ab202295f820ced6d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 13:38:37 2013 +0100

Notes added by 'git notes add'

diff --git a/48/8befaed6d5203d8a6e1c9e986caa5d342f5b40 
b/48/8befaed6d5203d8a6e1c9e986caa5d342f5b40
new file mode 100644
index 000..bbc7b9f
--- /dev/null
+++ b/48/8befaed6d5203d8a6e1c9e986caa5d342f5b40
@@ -0,0 +1 @@
+merged as: 8502b8006fdf03d2bc634f53490200f853474867
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-31 Thread Wang Lei

 sc/source/filter/excel/xiescher.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f33ad3847da22350e69fd998d7494e4334c1ed9
Author: Wang Lei l...@apache.org
Date:   Fri Sep 7 08:56:23 2012 +

Resolves: #i119487 Images lose macro association when open Excel file in AOO

Patch by: Chen Peng
Review by: Wang Lei

(cherry picked from commit 0c3cf59b060aa28c6d16c98c6139b316971f8c6b)

Change-Id: Ibb68dba9427953e8477f40be79a6271dc1b84aa5

diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index 58c35c0..7db78f3 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2798,7 +2798,7 @@ XclImpPictureObj::XclImpPictureObj( const XclImpRoot 
rRoot ) :
 mbUseCtlsStrm( false )
 {
 SetAreaObj( true );
-SetSimpleMacro( false );
+SetSimpleMacro( true );
 SetCustomDffObj( true );
 }
 
___
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/3cf59b060aa28c6d16c98c6139b316971f8c6b

2013-05-31 Thread Caolán McNamara

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

New commits:
commit a71cc59a01da12bf9336a4a80ca45fa86ed28aa8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 13:42:58 2013 +0100

Notes added by 'git notes add'

diff --git a/0c/3cf59b060aa28c6d16c98c6139b316971f8c6b 
b/0c/3cf59b060aa28c6d16c98c6139b316971f8c6b
new file mode 100644
index 000..675319f
--- /dev/null
+++ b/0c/3cf59b060aa28c6d16c98c6139b316971f8c6b
@@ -0,0 +1 @@
+merged as: 0f33ad3847da22350e69fd998d7494e4334c1ed9
___
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' - 76/92e2c8fb4e978f272e38396b605b2140a6083c

2013-05-31 Thread Caolán McNamara

 76/92e2c8fb4e978f272e38396b605b2140a6083c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 65208bad81af5cb4aa47ddbc8d74e212c526bb58
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 13:47:32 2013 +0100

Notes added by 'git notes add'

diff --git a/76/92e2c8fb4e978f272e38396b605b2140a6083c 
b/76/92e2c8fb4e978f272e38396b605b2140a6083c
new file mode 100644
index 000..6f0a455
--- /dev/null
+++ b/76/92e2c8fb4e978f272e38396b605b2140a6083c
@@ -0,0 +1 @@
+prefer: acb2943c8125f4ceed74f35f31776929dedeb8d8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-1' - nl_NL/nl_NL.aff

2013-05-31 Thread Joren De Cuyper

 nl_NL/nl_NL.aff | 1769 
 1 file changed, 895 insertions(+), 874 deletions(-)

New commits:
commit 8ad9367a003c8b2db50b7d2fbe9659cd62b9f1c6
Author: Joren De Cuyper joren.libreoff...@telenet.be
Date:   Thu May 30 18:49:45 2013 +0200

Update Dutch Hunspell to 2.10g too (fdo#63033 related)

Addition of commit 61644291cba7f6f8dd7e194f5abbe0b0e146a321

Change-Id: Ia83eb1c894c8aa1fb710dfefceeb4ead3d323f08
Reviewed-on: https://gerrit.libreoffice.org/4118
Reviewed-by: TomÃ¡Å¡ ChvÃ¡tal tchva...@suse.cz
Tested-by: TomÃ¡Å¡ ChvÃ¡tal tchva...@suse.cz

diff --git a/nl_NL/nl_NL.aff b/nl_NL/nl_NL.aff
index cf36e1a..7609730 100644
--- a/nl_NL/nl_NL.aff
+++ b/nl_NL/nl_NL.aff
@@ -1,17 +1,17 @@
 # Hunspell affix file
-# (c) 2006-2010 OpenTaal
+# (c) 2006-2011 OpenTaal
 # Coded by R. Baars
 # www.opentaal.org
-# version 2.00b2
-# d.d. 17-9-2010
+# version 2.10G
+# version date 2011-09-23
 
-# BEWARE: THIS AFFIX FILE AND DICTIONARY REQUIRE HUNSPELL 1.2.8 AS MINIMAL 
VERSION
+# BEWARE: THIS AFFIX FILE AND DICTIONARY REQUIRE HUNSPELL 1.3.1 AS MINIMAL 
VERSION
 
 # define char set
 SET UTF-8
 
-# - in front of try to suggest compuounds with - earlier
-TRY -esiadnrtolcugmphbyfvkwjkqxzÃ«Ã©Ã¨ÃªÃ¯Ã®Ã¤Ã 
Ã¢Ã¶Ã¼Ã»'ESIANRTOLCDUGMPHBYFVKWJKQXZ
+# statistical order as shown by Pander, except for the -, ââ and capitals
+TRY  -ernitsaoldgkupmchbvjwfzyx'âÃ«qÃ¯Ã©Ã¨Ã¶.ÃªÃ¼12635407Ã§Ã 
8Ã»9Ã®Ã±Ã¤Ã´ERNITSAOLDGKUPMCHBVJWFZYX
 
 # combined layout for BE and NL keyboards NL en BE
 KEY 
qwertyuiop|asdfghjkl|zxcvbnm|qawsedrftgyhujikolp|azsxdcfvgbhnjmk|aze|qsd|lm|wx|aqz|qws|
@@ -24,23 +24,37 @@ WORDCHARS 'â0123456789Ä³.-\/
 # Issue has been communicated with Hunspell's author.
 
 # do not offer split words (to prevent English desease, splitting up words)
-# it would be usefull, when suggestions would be last in list, but certainly 
not in front.
 NOSPLITSUGS
 
+# maximum number of compound suggestions
+# limit to 1 to prevent nonsense suggestions
+MAXCPDSUGS 1
+
+# max difference to be applied for all words (compounds and n-gram suggestions)
+ONLYMAXDIFF
+
+# max difference in chars for ngram suggestions
+# 3 limits wild suggestions a lot, but also drops suggestions for words with 
multiple errors
+MAXDIFF 3
+
 # avoid wrong spelling of letterwords in full uppercase (DVD should be dvd)
 KEEPCASE Kc
 
-# BREAK 0 does not work (reported as bug), so this is a work-around
-# This also causes the - to be seen as part of the word,
+# set the flag for warning with confusing words (kunne)
+WARN Wn
+
+# force uppercase for some word ends
+FORCEUCASE Fu
+
+# BREAK 0 causes the - to be seen as part of the word,
 # which is necessary to support the optional - in compounded words
-BREAK 1
-BREAK =
+BREAK 0
 
 # use double chars as flags, for more choice and readability
 # For readability reasons, use of flags is (mostly) restricted tu 
Upper-Lowercase combinations
 FLAG long
 
-# explicitly forbid words, wrongly generated by compounding
+# explicitly forbid words
 FORBIDDENWORD Fw
 
 # don't suggest words with extra accents
@@ -55,6 +69,7 @@ MAP oÃ³Ã²Ã¶Ã´
 MAP uÃ¼ÃºÃ¹Ã»
 
 # replace correct accented double vowels with unaccented ones for acceptance
+# also take care of apostrophe differences and ij as one character
 ICONV 9
 ICONV Ã¡Ã¡ aa
 ICONV Ã©Ã© ee
@@ -72,156 +87,244 @@ OCONV 2
 OCONV Ä³ ij
 OCONV Ä² IJ
 
-REP 487
+REP 593
+REP a's$ a # centra's=centra
+REP a's$ ums   # centra's=centrums
+REP pt$ bd # dichtgeslipt
+REP ^ad ad_# adrem
+REP kju cue# barbekju
+REP ^blackbox black_box
+REP ^bonvivant bon_vivant
+REP en e   # wolkenloos=wolkeloos
+REP on ont # onvankelijk=ontvankelijk
+REP ingswaard enswaard # benoemingswaard=benoemenswaard
+REP enswaard igenswaard# behartenswaard=behartigenswaard
+REP 'er Ã«r# havo'er = havoÃ«r
+REP Ã«r 'er# mboÃ«r=mbo'er
+REP ^immes$ immers
+REP os$ o's# autos=auto's
+REP as$ a's# papas=papa's
+REP us$ u's# tutus = tutu's
+REP t th   # etisch=ethisch
+REP oren oors  # pastoren=pastoors
+REP ^een een_
+REP wÄ³ziging wÄ³zing  # aanwijziging = aanwijzing
+REP ^clever$ slim
+REP ^clevere$ slimme
+REP pake opa
+REP rene RenÃ©
+REP ^hoe hoe_
+REP andere$ _andere
+REP ^ge-update$ geÃ¼pdatet
+REP ^als als_
+REP ^tenonder$ ten_onder
+REP ^goeiedag$ goedendag
+REP ^kunstof$ kunststof
+REP ^dattie$ dat_hÄ³
+REP ^tezÄ³nertÄ³d$ te_zÄ³ner_tÄ³d
+REP ^te te_
+REP ai e
+REP ^ter ter_
+REP ^stap-voor-stap stap_voor_stap
+REP elkaar$ _elkaar
+REP ^hierrond$ hieromheen  # Vlaams
+REP ^topdrie$ top_drie
+REP ^topvier$ top_vier
+REP ^topvÄ³f$ top_vÄ³f
+REP ^andre$ AndrÃ©
+REP ^eerstelÄ³n$ eerste_lÄ³n
+REP ^aande$ aan_de
+REP ^opde$ op_de
+REP ^zg$ zgn.
+REP ^'s 's_# 'savonds = 's avonds
+REP ^ook ook_
+REP check cheque
+REP ^us$ VS
+REP ore oire
+REP oor oir
+REP Ã¤ -a
+REP Ã¼ ue
+REP shock choqu
+REP talmud Talmoed
+REP kritik critic
+REP copier kopiÃ«r
+REP ^new-york$ New_York
+REP ske je

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

2013-05-31 Thread Joren De Cuyper

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

New commits:
commit c74b7f6be03ab5fc6d7edd33b2d34cf4079b9eb7
Author: Joren De Cuyper joren.libreoff...@telenet.be
Date:   Thu May 30 18:49:45 2013 +0200

Updated core
Project: dictionaries  8ad9367a003c8b2db50b7d2fbe9659cd62b9f1c6

Update Dutch Hunspell to 2.10g too (fdo#63033 related)

Addition of commit 61644291cba7f6f8dd7e194f5abbe0b0e146a321

Change-Id: Ia83eb1c894c8aa1fb710dfefceeb4ead3d323f08
Reviewed-on: https://gerrit.libreoffice.org/4118
Reviewed-by: TomÃ¡Å¡ ChvÃ¡tal tchva...@suse.cz
Tested-by: TomÃ¡Å¡ ChvÃ¡tal tchva...@suse.cz

diff --git a/dictionaries b/dictionaries
index 8f8ce83..8ad9367 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 8f8ce83217b4d96c942a4199c54949f57b40ae76
+Subproject commit 8ad9367a003c8b2db50b7d2fbe9659cd62b9f1c6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-1] Update Dutch Hunspell to 2.10g too (fdo#63033 related)

2013-05-31 Thread via Code Review

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4118

Approvals:
  Tomáš Chvátal: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia83eb1c894c8aa1fb710dfefceeb4ead3d323f08
Gerrit-PatchSet: 2
Gerrit-Project: dictionaries
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
Gerrit-Reviewer: Tomáš Chvátal tchva...@suse.cz

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 28/e1cb1240e7c7a274a04756c7cab2f5797de400

2013-05-31 Thread Caolán McNamara

 28/e1cb1240e7c7a274a04756c7cab2f5797de400 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e8736e5872734eabbbd83ff7b77985bf356fbc03
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 14:11:05 2013 +0100

Notes added by 'git notes add'

diff --git a/28/e1cb1240e7c7a274a04756c7cab2f5797de400 
b/28/e1cb1240e7c7a274a04756c7cab2f5797de400
new file mode 100644
index 000..3b7b480
--- /dev/null
+++ b/28/e1cb1240e7c7a274a04756c7cab2f5797de400
@@ -0,0 +1 @@
+merged as: 0181f258e5598ee59b1c4847818944b8da16bd51
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-31 Thread Jian Fang Zhang

 sw/inc/unomap.hxx   |3 ++-
 sw/inc/unoprnms.hxx |4 +++-
 sw/source/core/unocore/unomap.cxx   |1 +
 sw/source/core/unocore/unoprnms.cxx |1 +
 sw/source/ui/uno/unotxdoc.cxx   |8 
 writerfilter/source/dmapper/PropertyIds.cxx |1 +
 writerfilter/source/dmapper/PropertyIds.hxx |1 +
 writerfilter/source/dmapper/PropertyMap.cxx |   26 +-
 8 files changed, 30 insertions(+), 15 deletions(-)

New commits:
commit 0181f258e5598ee59b1c4847818944b8da16bd51
Author: Jian Fang Zhang zhan...@apache.org
Date:   Wed Sep 12 11:19:10 2012 +

Resolves: #i119558# set default page mode value to false for docx

To avoid default page mode affect the calculation of table row height

Found by: xiao ting xiao, tingxi...@gmail.com
Patch by: zhaoshzh, aoo.zhaos...@gmail.com
Review by: zhangjf

(cherry picked from commit 28e1cb1240e7c7a274a04756c7cab2f5797de400)

Conflicts:
sw/inc/unomap.hxx
sw/inc/unoprnms.hxx
sw/source/core/unocore/unomap.cxx
sw/source/core/unocore/unoprnms.cxx
sw/source/ui/uno/unotxdoc.cxx
writerfilter/source/dmapper/PropertyIds.cxx

Change-Id: I41745eb9d727a5ae87d34872f9dc3f4442c7bc8d

diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index 7f130a2..128570c 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -237,7 +237,8 @@
 #define WID_DOC_LOCK_UPDATES1016
 #define WID_DOC_HAS_VALID_SIGNATURES1017
 #define WID_DOC_BUILDID 1024
-#define WID_DOC_ISTEMPLATEID1025
+#define WID_DOC_ISTEMPLATEID1025
+#define WID_DOC_DEFAULT_PAGE_MODE   1069
 
 // MailMerge
 #define WID_SELECTION   1071
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 42027af..fb6e9d3 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -820,7 +820,9 @@ enum SwPropNameIds
 /* 0758 */  UNO_NAME_FILL_GRADIENT,
 /* 0759 */  UNO_NAME_FILL_GRADIENT_NAME,
 
-/* 0760 */  SW_PROPNAME_END
+/* 0760 */  UNO_NAME_DEFAULT_PAGE_MODE,
+
+/* 0761 */  SW_PROPNAME_END
 
 // new items in this array must match SwPropNameTab aPropNameTab
 };
diff --git a/sw/source/core/unocore/unomap.cxx 
b/sw/source/core/unocore/unomap.cxx
index 5f3cfc2..a9bf548 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -1559,6 +1559,7 @@ const SfxItemPropertyMapEntry* 
SwUnoPropertyMapProvider::GetPropertyMapEntries(s
 { SW_PROP_NMID(UNO_NAME_LOCK_UPDATES),
WID_DOC_LOCK_UPDATES, CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,   0},
 { SW_PROP_NMID(UNO_NAME_HAS_VALID_SIGNATURES),  
WID_DOC_HAS_VALID_SIGNATURES, CPPU_E2T(CPPUTYPE_BOOLEAN), 
PropertyAttribute::READONLY,   0},
 { SW_PROP_NMID(UNO_NAME_BUILDID), WID_DOC_BUILDID, 
CPPU_E2T(CPPUTYPE_OUSTRING), 0, 0},
+{ SW_PROP_NMID(UNO_NAME_DEFAULT_PAGE_MODE),  
WID_DOC_DEFAULT_PAGE_MODE,  CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_NONE,  0},
 {0,0,0,0,0,0}
 };
 aMapEntriesArr[nPropertyId] = aDocMap_Impl;
diff --git a/sw/source/core/unocore/unoprnms.cxx 
b/sw/source/core/unocore/unoprnms.cxx
index f1e0f19..f28e927 100644
--- a/sw/source/core/unocore/unoprnms.cxx
+++ b/sw/source/core/unocore/unoprnms.cxx
@@ -789,6 +789,7 @@ const SwPropNameTab aPropNameTab = {
 /* 0757 UNO_NAME_FILL_STYLE */  {MAP_CHAR_LEN(FillStyle)},
 /* 0758 UNO_NAME_FILL_GRADIENT */  {MAP_CHAR_LEN(FillGradient)},
 /* 0759 UNO_NAME_FILL_GRADIENT_NAME */  
{MAP_CHAR_LEN(FillGradientName)},
+/* 0760 UNO_NAME_DEFAULT_PAGE_MODE */{MAP_CHAR_LEN(DefaultPageMode)}
 
 // new items in this array must match enum SwPropNameIds
 };
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index f8d33f0..84e2930 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -1991,6 +1991,14 @@ void SwXTextDocument::setPropertyValue(const OUString 
rPropertyName,
 aValue = maBuildId;
 break;
 
+case WID_DOC_DEFAULT_PAGE_MODE:
+{
+bool bDefaultPageMode( false );
+aValue = bDefaultPageMode;
+pDocShell-GetDoc()-SetDefaultPageMode( bDefaultPageMode );
+}
+break;
+
 default:
 {
 const SfxPoolItem rItem = 
pDocShell-GetDoc()-GetDefault(pEntry-nWID);
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index 86438b9..e506ee8 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -228,6 +228,7 @@ const OUString PropertyNameSupplier::GetName( PropertyIds 
eId ) const
 case PROP_GRID_LINES:sName = GridLines; break;

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

2013-05-31 Thread Faisal M . Al-Otaibi

 sc/UIConfig_scalc.mk   |1 
 sc/inc/helpids.h   |1 
 sc/source/ui/inc/optdlg.hrc|7 --
 sc/source/ui/inc/tpdefaults.hxx|9 +-
 sc/source/ui/optdlg/tpdefaults.cxx |   63 +-
 sc/source/ui/src/optdlg.src|   45 -
 sc/uiconfig/scalc/ui/optdefaultpage.ui |  111 +
 7 files changed, 147 insertions(+), 90 deletions(-)

New commits:
commit a20b8dce7985e0b78201c4d7adb207d167117b08
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Thu May 30 12:30:48 2013 +0200

conversion the calc default option page to .ui

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

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index cf715ff..94a8aea 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/optcalculatepage \
+   sc/uiconfig/scalc/ui/optdefaultpage \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
sc/uiconfig/scalc/ui/sheetprintpage \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 3eff53e..8bbc07a 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -65,7 +65,6 @@
 #define HID_SCPAGE_AREAS
SC_HID_SCPAGE_AREAS
 #define HID_SCPAGE_COMPATIBILITY
SC_HID_SCPAGE_COMPATIBILITY
 #define HID_SCPAGE_PRINT
SC_HID_SCPAGE_PRINT
-#define HID_SCPAGE_DEFAULTS 
SC_HID_SCPAGE_DEFAULTS
 #define HID_SCPAGE_SUBT_GROUP1  
SC_HID_SCPAGE_SUBT_GROUP1
 #define HID_SCPAGE_SUBT_GROUP2  
SC_HID_SCPAGE_SUBT_GROUP2
 #define HID_SCPAGE_SUBT_GROUP3  
SC_HID_SCPAGE_SUBT_GROUP3
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index ad60340..515ddcb 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -156,11 +156,4 @@
 #define FT_KEY_BINDINGS   2
 #define LB_KEY_BINDINGS   3
 
-// TP_DEFAULTS
-#define FL_INIT_SPREADSHEET  1
-#define FT_NSHEETS   2
-#define ED_NSHEETS   3
-#define FT_SHEETPREFIX   4
-#define ED_SHEETPREFIX   5
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx
index bd967bb..850ecda 100644
--- a/sc/source/ui/inc/tpdefaults.hxx
+++ b/sc/source/ui/inc/tpdefaults.hxx
@@ -38,11 +38,10 @@ private:
 DECL_LINK( PrefixEditOnFocusHdl, Edit* );
 
 private:
-FixedLine aFLInitSpreadSheet;
-FixedText aFtNSheets;
-NumericField  aEdNSheets;
-FixedText aFtSheetPrefix;
-Edit  aEdSheetPrefix;
+FixedText*m_pFtNSheets;
+NumericField* m_pEdNSheets;
+FixedText*m_pFtSheetPrefix;
+Edit* m_pEdSheetPrefix;
 
 // Stores old Sheet Prefix
 OUString maOldPrefixValue;
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx 
b/sc/source/ui/optdlg/tpdefaults.cxx
index 2dc5a42..06a75cd 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -19,36 +19,35 @@
 
 
 ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, const SfxItemSet 
rCoreSet) :
-SfxTabPage(pParent, ScResId(RID_SCPAGE_DEFAULTS), rCoreSet),
-aFLInitSpreadSheet ( this, ScResId( FL_INIT_SPREADSHEET ) ),
-aFtNSheets ( this, ScResId( FT_NSHEETS ) ),
-aEdNSheets ( this, ScResId( ED_NSHEETS ) ),
-aFtSheetPrefix ( this, ScResId( FT_SHEETPREFIX ) ),
-aEdSheetPrefix ( this, ScResId( ED_SHEETPREFIX ) )
+SfxTabPage(pParent, OptDefaultPage, 
modules/scalc/ui/optdefaultpage.ui, rCoreSet)
+
 {
-FreeResource();
+get( m_pFtNSheets, textsheetsnumber);
+get( m_pEdNSheets, sheetsnumber);
+get( m_pFtSheetPrefix, textsheetprefix);
+get( m_pEdSheetPrefix, sheetprefix);
 
 // the following computation must be modified accordingly if a third line 
is added to this dialog
-long nTxtW1 = aFtNSheets.GetCtrlTextWidth( aFtNSheets.GetText() );
-long nCtrlW1 = aFtNSheets.GetSizePixel().Width();
-long nTxtW2 = aFtSheetPrefix.GetCtrlTextWidth(aFtSheetPrefix.GetText() );
-long nCtrlW2 = aFtSheetPrefix.GetSizePixel().Width();
+long nTxtW1  = m_pFtNSheets-GetCtrlTextWidth( m_pFtNSheets-GetText() );
+long nCtrlW1 = m_pFtNSheets-GetSizePixel().Width();
+long nTxtW2  = 
m_pFtSheetPrefix-GetCtrlTextWidth(m_pFtSheetPrefix-GetText() );
+long nCtrlW2 = m_pFtSheetPrefix-GetSizePixel().Width();
 if ( nTxtW1 = nCtrlW1 || nTxtW2 = nCtrlW2)

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

2013-05-31 Thread Caolán McNamara

 sc/source/ui/inc/tpdefaults.hxx|2 --
 sc/source/ui/optdlg/tpdefaults.cxx |   20 
 sc/uiconfig/scalc/ui/optdefaultpage.ui |   10 +-
 3 files changed, 9 insertions(+), 23 deletions(-)

New commits:
commit a7feb6f570f75c63c3fd0be4d0e9808a6b52292f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 14:19:39 2013 +0100

post .ui conversion old mad manual placement code can go

with pleasing knock on effects of then unused class
members

also add an adjustment to keep the original 1-1024
range for number of worksheets

Change-Id: I9cfdff60a763b81cb0632ea5d4ccf382334da24c

diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx
index 850ecda..dce6fc1 100644
--- a/sc/source/ui/inc/tpdefaults.hxx
+++ b/sc/source/ui/inc/tpdefaults.hxx
@@ -38,9 +38,7 @@ private:
 DECL_LINK( PrefixEditOnFocusHdl, Edit* );
 
 private:
-FixedText*m_pFtNSheets;
 NumericField* m_pEdNSheets;
-FixedText*m_pFtSheetPrefix;
 Edit* m_pEdSheetPrefix;
 
 // Stores old Sheet Prefix
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx 
b/sc/source/ui/optdlg/tpdefaults.cxx
index 06a75cd..1d91d5c 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -22,29 +22,9 @@ ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, 
const SfxItemSet rCor
 SfxTabPage(pParent, OptDefaultPage, 
modules/scalc/ui/optdefaultpage.ui, rCoreSet)
 
 {
-get( m_pFtNSheets, textsheetsnumber);
 get( m_pEdNSheets, sheetsnumber);
-get( m_pFtSheetPrefix, textsheetprefix);
 get( m_pEdSheetPrefix, sheetprefix);
 
-// the following computation must be modified accordingly if a third line 
is added to this dialog
-long nTxtW1  = m_pFtNSheets-GetCtrlTextWidth( m_pFtNSheets-GetText() );
-long nCtrlW1 = m_pFtNSheets-GetSizePixel().Width();
-long nTxtW2  = 
m_pFtSheetPrefix-GetCtrlTextWidth(m_pFtSheetPrefix-GetText() );
-long nCtrlW2 = m_pFtSheetPrefix-GetSizePixel().Width();
-if ( nTxtW1 = nCtrlW1 || nTxtW2 = nCtrlW2)
-{
-long nTxtW = std::max(nTxtW1,nTxtW2);
-Size aNewSize = m_pFtNSheets-GetSizePixel();
-aNewSize.Width() = nTxtW;
-m_pFtNSheets-SetSizePixel( aNewSize );
-m_pFtSheetPrefix-SetSizePixel( aNewSize );
-Point aNewPoint = m_pEdNSheets-GetPosPixel();
-aNewPoint.X() += (nTxtW - nCtrlW1);
-m_pEdNSheets-SetPosPixel( aNewPoint );
-aNewPoint.Y() = m_pEdSheetPrefix-GetPosPixel().Y();
-m_pEdSheetPrefix-SetPosPixel( aNewPoint );
-}
 m_pEdNSheets-SetModifyHdl( LINK(this, ScTpDefaultsOptions, 
NumModifiedHdl) );
 m_pEdSheetPrefix-SetModifyHdl( LINK(this, ScTpDefaultsOptions, 
PrefixModifiedHdl) );
 m_pEdSheetPrefix-SetGetFocusHdl( LINK(this, ScTpDefaultsOptions, 
PrefixEditOnFocusHdl) );
diff --git a/sc/uiconfig/scalc/ui/optdefaultpage.ui 
b/sc/uiconfig/scalc/ui/optdefaultpage.ui
index ac0b8ad..3441605 100644
--- a/sc/uiconfig/scalc/ui/optdefaultpage.ui
+++ b/sc/uiconfig/scalc/ui/optdefaultpage.ui
@@ -1,12 +1,18 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
   !-- interface-requires gtk+ 3.0 --
+  object class=GtkAdjustment id=adjustment1
+property name=lower1/property
+property name=upper32000/property
+property name=value1/property
+property name=step_increment1/property
+property name=page_increment10/property
+  /object
   object class=GtkBox id=OptDefaultPage
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=border_width6/property
 property name=orientationvertical/property
-property name=spacing12/property
 child
   object class=GtkFrame id=frame1
 property name=visibleTrue/property
@@ -74,8 +80,10 @@
   object class=GtkSpinButton id=sheetsnumber
 property name=visibleTrue/property
 property name=can_focusTrue/property
+property name=halignstart/property
 property name=invisible_charâ/property
 property name=invisible_char_setTrue/property
+property name=adjustmentadjustment1/property
 property name=climb_rate1/property
 property name=update_policyif-valid/property
   /object
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] conversion the calc default option page to .ui

2013-05-31 Thread via Code Review

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/4092

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I09d8b012633e7fce916b54eee6b1b0d9db50ac23
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Faisal al-otaibi fmalota...@kacst.edu.sa
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com

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

[Libreoffice-commits] core.git: helpcontent2

2013-05-31 Thread Caolán McNamara

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

New commits:
commit 80615d7fffd2b38fd9e9a649d2734c94db30035c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 14:42:41 2013 +0100

Updated core
Project: help  1d9d3acc0df264a436b5ae719f13b2967a796ea8

diff --git a/helpcontent2 b/helpcontent2
index c80240c..1d9d3ac 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c80240cf0171f821d88110662b506774f15d89fe
+Subproject commit 1d9d3acc0df264a436b5ae719f13b2967a796ea8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-31 Thread Caolán McNamara

 helpers/help_hid.lst |1 -
 source/text/shared/optionen/01061000.xhp |2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1d9d3acc0df264a436b5ae719f13b2967a796ea8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 14:42:41 2013 +0100

update help ids for calc default page opt .ui conversion

Change-Id: I06c93362a56e2d3c1e817d9c6cbe236e562885f3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 6071767..5afac22 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3225,7 +3225,6 @@ HID_SCPAGE_SUBT_GROUP1,58885,
 HID_SCPAGE_SUBT_GROUP2,58886,
 HID_SCPAGE_SUBT_GROUP3,58887,
 HID_SCPAGE_SUBT_OPTIONS,58875,
-HID_SCPAGE_DEFAULTS,58894,
 HID_SCPAGE_USERLISTS,58880,
 HID_SCRIPTORG_DIALOG,39987,
 HID_SCRIPTSBOX,40011,
diff --git a/source/text/shared/optionen/01061000.xhp 
b/source/text/shared/optionen/01061000.xhp
index 001ead3..7671a32 100644
--- a/source/text/shared/optionen/01061000.xhp
+++ b/source/text/shared/optionen/01061000.xhp
@@ -24,7 +24,7 @@
 bookmark_valuenumber of worksheets in new documents/bookmark_value
 bookmark_valueprefix name for new worksheet/bookmark_value
 /bookmark
-bookmark xml-lang=en-US branch=hid/SC_HID_SCPAGE_DEFAULTS 
id=bm_id3149095 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/optdefaultpage/OptDefaultPage id=bm_id3149095 
localize=false/
 paragraph xml-lang=en-US id=hd_id3145071 role=heading 
level=1link href=text/shared/optionen/01061000.xhp 
name=DefaultsDefaults/link/paragraph
 paragraph xml-lang=en-US id=par_id3147576 role=paragraphahelp 
hid=.Defines default settings for new spreadsheet 
documents./ahelp/paragraph
 /section
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration

2013-05-31 Thread Tomáš Chvátal

 bin/distro-install-desktop-integration |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9652e297b811a52897599cb5426668caf2f6d444
Author: TomÃ¡Å¡ ChvÃ¡tal tomas.chva...@gmail.com
Date:   Fri May 31 15:56:11 2013 +0200

One more step to have desktop files built again with distro-pack-install

Change-Id: Ief2f645be521b74be74c6df030687c91c37cf0cd

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index e925924..a064846 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -95,7 +95,7 @@ add_wrapper()
 
 # install desktop integration from plain packages
 sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XX`
-cp -a sysui/unxlng*/misc/libreoffice/* $sysui_temp
+cp -a workdir/unxlng*/CustomTarget/sysui/share/libreoffice/* $sysui_temp
 cp -a sysui/desktop/share/create_tree.sh $sysui_temp
 builddir=`pwd`
 cd $sysui_temp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-31 Thread Tor Lillqvist

 cui/source/options/optjava.cxx |2 ++
 cui/source/options/optjava.hxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 0badc400706d059381ec396c33dd0760042c4c0b
Author: Tor Lillqvist t...@iki.fi
Date:   Fri May 31 16:50:01 2013 +0300

WaE: private fields are not used

Change-Id: I6c649804b0c03d8ca265e71be50aaa735e8fbeb2

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 74fa157..fbf91b9 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -131,11 +131,13 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, 
const SfxItemSet rSet
 : SfxTabPage(pParent, OptAdvancedPage, cui/ui/optadvancedpage.ui, rSet)
 , m_pParamDlg(NULL)
 , m_pPathDlg(NULL)
+#ifdef SOLAR_JAVA
 , m_parJavaInfo(NULL)
 , m_parParameters(NULL)
 , m_pClassPath(NULL)
 , m_nInfoSize(0)
 , m_nParamSize(0)
+#endif
 , xDialogListener(new ::svt::DialogClosedListener())
 {
 get(m_pJavaEnableCB, javaenabled);
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 5a60ecd..81ab967 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -58,11 +58,13 @@ private:
 SvxJavaParameterDlg*m_pParamDlg;
 SvxJavaClassPathDlg*m_pPathDlg;
 
+#ifdef SOLAR_JAVA
 JavaInfo**  m_parJavaInfo;
 rtl_uString**   m_parParameters;
 rtl_uString*m_pClassPath;
 sal_Int32   m_nInfoSize;
 sal_Int32   m_nParamSize;
+#endif
 String  m_sInstallText;
 String  m_sAccessibilityText;
 String  m_sAddDialogText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-31 Thread Jian Fang Zhang

 chart2/source/model/main/ChartModel.cxx |3 +++
 chart2/source/view/main/ChartView.cxx   |6 ++
 2 files changed, 9 insertions(+)

New commits:
commit 8196dab4f450d96905f0bbfe650ae7a78c8972e2
Author: Jian Fang Zhang zhan...@apache.org
Date:   Tue Sep 11 12:30:18 2012 +

Resolves: #i120831# call dispose() from ChartView dtor...

to make sure SfxBaseModel object is freed correctly

Found by: zhangjf
Patch by: zhangjf

(cherry picked from commit 4cb73634a602272d8de33dfe23722912e4494bbc)

Change-Id: I9e316178ef273b13e77d0b166f17fc700363f7bb

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index e5ae969..a19a413 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -200,6 +200,12 @@ void SAL_CALL ChartView::initialize( const uno::Sequence 
uno::Any  aArguments
 
 ChartView::~ChartView()
 {
+// #i120831#. In ChartView::initialize(), m_xShapeFactory is created from 
SdrModel::getUnoModel() and indirectly
+//   from SfxBaseModel, it needs call dispose() to make sure SfxBaseModel 
object is freed correctly.
+uno::Reference lang::XComponent  xComp( m_xShapeFactory, uno::UNO_QUERY);
+if ( xComp.is() )
+xComp-dispose();
+
 if( m_pDrawModelWrapper.get() )
 {
 EndListening( m_pDrawModelWrapper-getSdrModel(), false /*bAllDups*/ );
commit 275225ed4d401d306c75de92fb980a6a3f85c635
Author: Jian Fang Zhang zhan...@apache.org
Date:   Tue Sep 11 12:20:33 2012 +

Resolves: #i120828#, restore some ChartModel::dispose() calls..

to break cyclic reference

Found by: zhangjf
Patch by: zhangjf

(cherry picked from commit 1c564cb9a46fc6435750f9f1a70f654b52efd970)

Change-Id: I8aaac18584d55d9f381acdf4deb0e704bc9bcfc1

diff --git a/chart2/source/model/main/ChartModel.cxx 
b/chart2/source/model/main/ChartModel.cxx
index e2157c4..aa5f78f 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -556,6 +556,9 @@ void SAL_CALL ChartModel::dispose() 
throw(uno::RuntimeException)
 m_pUndoManager.clear();
 // that's important, since the UndoManager implementation delegates 
its ref counting to ourself.
 
+if( m_xOldModelAgg.is())  // #i120828#, to release cyclic reference to 
ChartModel object
+m_xOldModelAgg-setDelegator( 0 );
+
 m_aControllers.disposeAndClear( lang::EventObject( static_cast 
cppu::OWeakObject * ( this )));
 m_xCurrentController.clear();
 
___
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' - 1c/564cb9a46fc6435750f9f1a70f654b52efd970

2013-05-31 Thread Caolán McNamara

 1c/564cb9a46fc6435750f9f1a70f654b52efd970 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 05672fcc5a307b451a04e30159039b3b511de184
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 15:00:26 2013 +0100

Notes added by 'git notes add'

diff --git a/1c/564cb9a46fc6435750f9f1a70f654b52efd970 
b/1c/564cb9a46fc6435750f9f1a70f654b52efd970
new file mode 100644
index 000..b0bf03c
--- /dev/null
+++ b/1c/564cb9a46fc6435750f9f1a70f654b52efd970
@@ -0,0 +1 @@
+merged as: 275225ed4d401d306c75de92fb980a6a3f85c635
___
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' - 4c/b73634a602272d8de33dfe23722912e4494bbc

2013-05-31 Thread Caolán McNamara

 4c/b73634a602272d8de33dfe23722912e4494bbc |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1e52e00caf59a2a89084fe1683b8ca64469be65c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 15:00:15 2013 +0100

Notes added by 'git notes add'

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

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

2013-05-31 Thread Oliver-Rainer Wittmann

 sd/source/core/drawdoc3.cxx|  159 +++--
 sfx2/source/sidebar/Accessible.hxx |1 
 sw/source/ui/docvw/edtwin.cxx  |   34 ++-
 3 files changed, 146 insertions(+), 48 deletions(-)

New commits:
commit 7d2515d9ac497b3aaf47ae3ce79ec79bc6880330
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Fri May 31 14:03:01 2013 +

122262: correct handling of Shift-arrow key for bigger steps movement of 
objects in order to get back text selection via keys in a table

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index f1077ce..c577b21 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -1626,17 +1626,15 @@ void SwEditWin::KeyInput(const KeyEvent rKEvt)
 switch( rKeyCode.GetModifier() | rKeyCode.GetCode() )
 {
 case KEY_RIGHT | KEY_MOD2:
-case KEY_RIGHT | KEY_SHIFT:
 eKeyState = KS_ColRightBig;
 eFlyState = KS_Fly_Change;
-nDir = rKeyCode.GetModifier()  KEY_SHIFT ? 
MOVE_RIGHT_HUGE : MOVE_RIGHT_SMALL;
+nDir = MOVE_RIGHT_SMALL;
 goto KEYINPUT_CHECKTABLE;
 
 case KEY_LEFT | KEY_MOD2:
-case KEY_LEFT | KEY_SHIFT:
 eKeyState = KS_ColRightSmall;
 eFlyState = KS_Fly_Change;
-nDir = rKeyCode.GetModifier()  KEY_SHIFT ? MOVE_LEFT_HUGE 
: MOVE_LEFT_SMALL;
+nDir = MOVE_LEFT_SMALL;
 goto KEYINPUT_CHECKTABLE;
 
 case KEY_RIGHT | KEY_MOD2 | KEY_SHIFT:
@@ -1664,17 +1662,15 @@ void SwEditWin::KeyInput(const KeyEvent rKEvt)
 goto KEYINPUT_CHECKTABLE;
 
 case KEY_UP | KEY_MOD2:
-case KEY_UP | KEY_SHIFT:
 eKeyState = KS_ColBottomSmall;
 eFlyState = KS_Fly_Change;
-nDir = rKeyCode.GetModifier()  KEY_SHIFT ? MOVE_UP_HUGE : 
MOVE_UP_SMALL;
+nDir = MOVE_UP_SMALL;
 goto KEYINPUT_CHECKTABLE;
 
 case KEY_DOWN | KEY_MOD2:
-case KEY_DOWN | KEY_SHIFT:
 eKeyState = KS_ColBottomBig;
 eFlyState = KS_Fly_Change;
-nDir = rKeyCode.GetModifier()  KEY_SHIFT ? MOVE_DOWN_HUGE 
: MOVE_DOWN_SMALL;
+nDir = MOVE_DOWN_SMALL;
 goto KEYINPUT_CHECKTABLE;
 
 //  case KEY_UP | KEY_MOD2 | KEY_SHIFT:
@@ -1718,6 +1714,28 @@ KEYINPUT_CHECKTABLE:
 }
 break;
 
+// huge object move
+case KEY_RIGHT | KEY_SHIFT:
+case KEY_LEFT | KEY_SHIFT:
+case KEY_UP | KEY_SHIFT:
+case KEY_DOWN | KEY_SHIFT:
+{
+if ( pFlyFmt
+ || ( (rSh.GetSelectionType()  
(nsSelectionType::SEL_DRW|nsSelectionType::SEL_DRW_FORM))
+   rSh.GetDrawView()-AreObjectsMarked() ) )
+{
+eKeyState = pFlyFmt ? KS_Fly_Change : KS_Draw_Change;
+switch ( rKeyCode.GetCode() )
+{
+case KEY_RIGHT: nDir = MOVE_RIGHT_HUGE; break;
+case KEY_LEFT: nDir = MOVE_LEFT_HUGE; break;
+case KEY_UP: nDir = MOVE_UP_HUGE; break;
+case KEY_DOWN: nDir = MOVE_DOWN_HUGE; break;
+}
+}
+break;
+}
+
 //---
 // Insert/Delete
 case KEY_LEFT:
commit 2136f4599bdc6f44bc0cc551189bfa565d3fbe71
Author: Armin Le Grand a...@apache.org
Date:   Fri May 31 12:50:30 2013 +

i121863 Corrected DD from MasterPage view, source SlideSorter, target 2nd 
DocumentView

diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index d30abdd..ee6e698 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1512,6 +1512,58 @@ void 
SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool
 |* Ist rLayoutName leer, so wird die erste MasterPage genommen
 \/
 
+// #121863# factored out functionality
+bool isMasterPageLayoutNameUnique(const SdDrawDocument rDoc, const String 
rCandidate)
+{
+if(!rCandidate.Len())
+{
+return false;
+}
+
+const sal_uInt16 nPageCount(rDoc.GetMasterPageCount());
+
+for(sal_uInt16 a(0); a  nPageCount; a++)
+{
+const SdrPage* pCandidate = rDoc.GetMasterPage(a);
+String aPageLayoutName(pCandidate-GetLayoutName());
+aPageLayoutName.Erase(aPageLayoutName.SearchAscii(SD_LT_SEPARATOR));
+
+if(aPageLayoutName == rCandidate)
+{
+

[PATCH] fdo#60924 autoinstall - gbuild/scp2: add math module

2013-05-31 Thread David Tardon (via Code Review)

Hello LibreOffice gerrit bot,

I'd like you to reexamine a rebased change.  Please visit

https://gerrit.libreoffice.org/4065

to look at the new rebased patch set (#2).

Change subject: fdo#60924 autoinstall - gbuild/scp2: add math module
..

fdo#60924 autoinstall - gbuild/scp2: add math module

Change-Id: I466dd68069576d57740ef34b8f6fcd8f9025c5c8
---
M Repository.mk
A scp2/AutoInstallLibs_math.mk
M scp2/InstallModule_math.mk
M scp2/Module_scp2.mk
M scp2/source/math/file_math.scp
M scp2/source/math/module_math.scp
M solenv/gbuild/Helper.mk
7 files changed, 25 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/4065/2
-- 
To view, visit https://gerrit.libreoffice.org/4065
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I466dd68069576d57740ef34b8f6fcd8f9025c5c8
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
Gerrit-Reviewer: David Tardon dtar...@redhat.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com

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

[PATCH] Update pt-BR dictionary and grammar checker

2013-05-31 Thread Olivier Hallot (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4120

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/dictionaries 
refs/changes/20/4120/1

Update pt-BR dictionary and grammar checker

Change-Id: Ic30dcf8588b3408d59cb960956e9e1cf8d6a330b
---
M pt_BR/Lightproof.py
M pt_BR/README_pt_BR.txt
M pt_BR/description.xml
M pt_BR/dialog/pt_BR.xdl
M pt_BR/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu
M pt_BR/dialog/registry/schema/org/openoffice/Lightproof_pt_BR.xcs
M pt_BR/pt_BR.aff
M pt_BR/pt_BR.dic
M pt_BR/pythonpath/lightproof_handler_pt_BR.py
M pt_BR/pythonpath/lightproof_impl_pt_BR.py
M pt_BR/pythonpath/lightproof_opts_pt_BR.py
M pt_BR/pythonpath/lightproof_pt_BR.py
12 files changed, 20,381 insertions(+), 19,033 deletions(-)




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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic30dcf8588b3408d59cb960956e9e1cf8d6a330b
Gerrit-PatchSet: 1
Gerrit-Project: dictionaries
Gerrit-Branch: master
Gerrit-Owner: Olivier Hallot olivier.hal...@edx.srv.br

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

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0.3' - instsetoo_native/util solenv/inc

2013-05-31 Thread Petr Mladek

 instsetoo_native/util/openoffice.lst |   22 +++---
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit b9a93a1c8e917b6a4e0ec59ae653c8965fdb60a6
Author: Petr Mladek pmla...@suse.cz
Date:   Fri May 31 16:39:55 2013 +0200

bump product version to 4.0-4, release number to 304

Change-Id: Ica4dbb0099c03cbdf311f6e7ed173bd791e77c87

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 26ca787..591b430 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -50,13 +50,13 @@ LibreOffice
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-303
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-304
 BASEPRODUCTVERSION 4.0
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-303
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-304
 BASEPRODUCTVERSION 4.0
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -161,7 +161,7 @@ URE
 PRODUCTVERSION 4.0
 PACKAGEVERSION 4.0
 PACKAGEREVISION 1
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 BRANDPACKAGEVERSION 4.0
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
@@ -192,7 +192,7 @@ LibreOffice_SDK
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
@@ -231,7 +231,7 @@ LibreOffice_Dev_SDK
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -276,7 +276,7 @@ LibreOffice_Test
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
@@ -315,7 +315,7 @@ LibreOffice_Dev_Test
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
@@ -359,13 +359,13 @@ OxygenOffice
 {
 PRODUCTNAME OxygenOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -3
+PRODUCTEXTENSION -4
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-303
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-304
 BASEPRODUCTVERSION 4.0
 PCPFILENAME openoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 31cf9e8..f6260a6 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=400
-RSCREVISION=400m1(Build:303)
-BUILD=303
+RSCREVISION=400m1(Build:304)
+BUILD=304
 LAST_MINOR=m0
 SOURCEVERSION=OOO400
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-31 Thread Caolán McNamara

 include/svx/SvxColorValueSet.hxx |2 ++
 svx/source/tbxctrls/SvxColorValueSet.cxx |9 +
 2 files changed, 11 insertions(+)

New commits:
commit b425c2964b0f35fe12383b47c41816d612b6981b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 15:22:42 2013 +0100

make SvxColorValueSet not squish all colours into avail space

instead hook SvxColorValueSet::Resize() to layoutToGivenHeight
and let it add a scrollbar if the height would squish them

Change-Id: Ia94b01b247f734f3640b15f7161d28530e65d538

diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx
index 819de02..f4b2ba3 100644
--- a/include/svx/SvxColorValueSet.hxx
+++ b/include/svx/SvxColorValueSet.hxx
@@ -35,6 +35,8 @@ public:
 SvxColorValueSet(Window* pParent, WinBits nWinStyle = WB_ITEMBORDER);
 SvxColorValueSet(Window* pParent, const ResId rResId);
 
+virtual void Resize();
+
 sal_uInt32 getMaxRowCount() const;
 sal_uInt32 getEntryEdgeLength() const;
 sal_uInt32 getColumnCount() const;
diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx 
b/svx/source/tbxctrls/SvxColorValueSet.cxx
index d990fab..9c558c2 100644
--- a/svx/source/tbxctrls/SvxColorValueSet.cxx
+++ b/svx/source/tbxctrls/SvxColorValueSet.cxx
@@ -118,6 +118,15 @@ Size SvxColorValueSet::layoutAllVisible(sal_uInt32 
nEntryCount)
 return CalcWindowSizePixel(aItemSize);
 }
 
+void SvxColorValueSet::Resize()
+{
+Window *pParent = GetParent();
+//don't do this for the drop down color palettes
+if (pParent  pParent-GetType() != WINDOW_FLOATINGWINDOW)
+layoutToGivenHeight(GetOutputSizePixel().Height(), GetItemCount());
+ValueSet::Resize();
+}
+
 Size SvxColorValueSet::layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 
nEntryCount)
 {
 if(!nEntryCount)
___
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' - df/229e8441510da5116d648d7ee8bc1599427771

2013-05-31 Thread Caolán McNamara

 df/229e8441510da5116d648d7ee8bc1599427771 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 78fcb92835948ceaa6c173f04b92fd9af8389753
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri May 31 15:46:23 2013 +0100

Notes added by 'git notes add'

diff --git a/df/229e8441510da5116d648d7ee8bc1599427771 
b/df/229e8441510da5116d648d7ee8bc1599427771
new file mode 100644
index 000..b2f6098
--- /dev/null
+++ b/df/229e8441510da5116d648d7ee8bc1599427771
@@ -0,0 +1 @@
+prefer: 8502b8006fdf03d2bc634f53490200f853474867
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-4.0-4'

2013-05-31 Thread Petr Mladek

Tag 'suse-4.0-4' created by Petr Mladek pmla...@suse.cz at 2013-05-31 15:41 
-0700

Tag suse-4.0-4
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlGotqIACgkQKZC06p8y5oPSbgCdGNVQJnG4Oa/kcWPBy7jvZO5C
n3AAn1SD77NZ0fe0Np7tygpp3Uc+KUgy
=pLSt
-END PGP SIGNATURE-

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-4'

2013-05-31 Thread Petr Mladek

Tag 'suse-4.0-4' created by Petr Mladek pmla...@suse.cz at 2013-05-31 15:41 
-0700

Tag suse-4.0-4
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlGotqIACgkQKZC06p8y5oMkYQCdGn+/k08mFuSzyyKA7pASdC68
gwcAnikdif9OFeOfQFbVhCqImU1Jju5W
=RO+x
-END PGP SIGNATURE-

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

[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-4.0-4'

2013-05-31 Thread Petr Mladek

Tag 'suse-4.0-4' created by Petr Mladek pmla...@suse.cz at 2013-05-31 15:41 
-0700

Tag suse-4.0-4
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlGotqIACgkQKZC06p8y5oNq9ACeMLLLAvyExh87MERYc4UNgxKn
Z/kAn0Nh7mFnR3aCEp1ln9JmI4nnLqmY
=U/Tv
-END PGP SIGNATURE-

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

[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-4.0-4'

2013-05-31 Thread Petr Mladek

Tag 'suse-4.0-4' created by Petr Mladek pmla...@suse.cz at 2013-05-31 15:41 
-0700

Tag suse-4.0-4
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iEYEABECAAYFAlGotqIACgkQKZC06p8y5oOpQQCdHdeNv83qrTraedgrwVUCcpMx
uLwAn0kBP1gGxeVHE1t3GlejU6mp1Qg0
=uYA/
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - bin/distro-install-desktop-integration

2013-05-31 Thread Tomáš Chvátal

 bin/distro-install-desktop-integration |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 681449afee3f21b0df608109649e35ccdc770abd
Author: TomÃ¡Å¡ ChvÃ¡tal tomas.chva...@gmail.com
Date:   Fri May 31 15:56:11 2013 +0200

One more step to have desktop files built again with distro-pack-install

Change-Id: Ief2f645be521b74be74c6df030687c91c37cf0cd

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index e925924..a064846 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -95,7 +95,7 @@ add_wrapper()
 
 # install desktop integration from plain packages
 sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XX`
-cp -a sysui/unxlng*/misc/libreoffice/* $sysui_temp
+cp -a workdir/unxlng*/CustomTarget/sysui/share/libreoffice/* $sysui_temp
 cp -a sysui/desktop/share/create_tree.sh $sysui_temp
 builddir=`pwd`
 cd $sysui_temp
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-31 Thread Armin Le Grand

 sd/source/core/drawdoc3.cxx |  156 +---
 1 file changed, 117 insertions(+), 39 deletions(-)

New commits:
commit f0545c44400a78acea9ca7cb97de212f245efc6a
Author: Armin Le Grand a...@apache.org
Date:   Fri May 31 12:50:30 2013 +

Resolves: #i121863# Corrected DD from MasterPage view

source SlideSorter, target 2nd DocumentView

(cherry picked from commit 2136f4599bdc6f44bc0cc551189bfa565d3fbe71)

Conflicts:
sd/source/core/drawdoc3.cxx

Change-Id: I2ba9f2c062b464d3ab3fb28ab115c908b0a7e450

diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index e72a103..3881a9f 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1299,6 +1299,58 @@ void 
SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool
   * If pSourceDoc == NULL, an empty master page is applied.
   * If rLayoutName is empty, the first master page is used.
   */
+// #i121863# factored out functionality
+bool isMasterPageLayoutNameUnique(const SdDrawDocument rDoc, const String 
rCandidate)
+{
+if(!rCandidate.Len())
+{
+return false;
+}
+
+const sal_uInt16 nPageCount(rDoc.GetMasterPageCount());
+
+for(sal_uInt16 a(0); a  nPageCount; a++)
+{
+const SdrPage* pCandidate = rDoc.GetMasterPage(a);
+String aPageLayoutName(pCandidate-GetLayoutName());
+aPageLayoutName.Erase(aPageLayoutName.SearchAscii(SD_LT_SEPARATOR));
+
+if(aPageLayoutName == rCandidate)
+{
+return false;
+}
+}
+
+return true;
+}
+
+// #i121863# factored out functinality
+String createNewMasterPageLayoutName(const SdDrawDocument rDoc)
+{
+const String aBaseName(SdResId(STR_LAYOUT_DEFAULT_NAME));
+String aRetval;
+sal_uInt16 nCount(0);
+
+while(!aRetval.Len())
+{
+aRetval = aBaseName;
+
+if(nCount)
+{
+aRetval += OUString::number(nCount);
+}
+
+nCount++;
+
+if(!isMasterPageLayoutNameUnique(rDoc, aRetval))
+{
+aRetval.Erase();
+}
+}
+
+return aRetval;
+}
+
 void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
const String rLayoutName,
SdDrawDocument* pSourceDoc,
@@ -1328,8 +1380,6 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
 String aOldLayoutName(aOldPageLayoutName);
 aOldLayoutName.Erase(aOldLayoutName.SearchAscii( SD_LT_SEPARATOR ));
 
-String aNewLayoutName( rLayoutName );
-
 if (pSourceDoc)
 {
 std::vectorStyleReplaceData aReplList; // List of replaced 
stylesheets
@@ -1341,7 +1391,6 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
 // No LayoutName: take first MasterPage
 pMaster = (SdPage*) pSourceDoc-GetMasterSdPage(0, PK_STANDARD);
 pNotesMaster = (SdPage*) pSourceDoc-GetMasterSdPage(0, PK_NOTES);
-aNewLayoutName = pMaster-GetName();
 }
 else
 {
@@ -1372,7 +1421,6 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
 // so take the first MasterPage
 pMaster = (SdPage*) pSourceDoc-GetMasterSdPage(0, 
PK_STANDARD);
 pNotesMaster = (SdPage*) pSourceDoc-GetMasterSdPage(0, 
PK_NOTES);
-aNewLayoutName = pMaster-GetName();
 }
 }
 
@@ -1389,13 +1437,53 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 
nSdPageNum,
 return;
 }
 
+const String aOriginalNewLayoutName( pMaster-GetName() );
+String aTargetNewLayoutName(aOriginalNewLayoutName);
+
+if (pSourceDoc != this)
+{
+// #i121863# clone masterpages, they are from another model (!)
+SdPage* pNewNotesMaster = dynamic_cast SdPage* 
(pNotesMaster-Clone(this));
+SdPage* pNewMaster = dynamic_cast SdPage* (pMaster-Clone(this));
+
+if(!pNewNotesMaster || !pNewMaster)
+{
+delete pNewNotesMaster;
+delete pNewMaster;
+OSL_ASSERT(SdDrawDocument::SetMasterPage() cloning of 
MasterPage/NoteAmsterPage failed! );
+return;
+}
+
+pNotesMaster = pNewNotesMaster;
+pMaster = pNewMaster;
+
+// layout name needs to be unique
+aTargetNewLayoutName = pMaster-GetLayoutName();
+
aTargetNewLayoutName.Erase(aTargetNewLayoutName.SearchAscii(SD_LT_SEPARATOR));
+
+if(!isMasterPageLayoutNameUnique(*this, aTargetNewLayoutName))
+{
+aTargetNewLayoutName = createNewMasterPageLayoutName(*this);
+
+String aTemp(aTargetNewLayoutName);
+aTemp.AppendAscii(RTL_CONSTASCII_STRINGPARAM(SD_LT_SEPARATOR));
+aTemp.Append(String(SdResId(STR_LAYOUT_OUTLINE)));
+
+

1 2 3 4 >

1 - 100 of 351 matches

Mail list logo