date:20131017

LibreOffice Gerrit News for core on 2013-10-17

2013-10-17 Thread gerrit

Moin!

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

+ fdo#60698: Move fpicker lib  to vcl
  in https://gerrit.libreoffice.org/6288 from Marcos Souza
+ fdo#70393: move cppunit to a subdir of external
  in https://gerrit.libreoffice.org/6286 from Khaled Hosny
+ fdo#70393: move harfbuzz to a subdir of external
  in https://gerrit.libreoffice.org/6276 from Khaled Hosny
+ fdo#70393: move clucene to a subdir of external
  in https://gerrit.libreoffice.org/6285 from Khaled Hosny
+ fdo#70393: move cairo to a subdir of external
  in https://gerrit.libreoffice.org/6284 from Khaled Hosny
+ fdo#70393: move beanshell to a subdir of external
  in https://gerrit.libreoffice.org/6283 from Khaled Hosny
+ fdo#70393: move boost to a subdir of external
  in https://gerrit.libreoffice.org/6282 from Khaled Hosny
+ fdo#70393: move apache-commons to a subdir of external
  in https://gerrit.libreoffice.org/6281 from Khaled Hosny
+ fdo#70393: move afms to a subdir of external
  in https://gerrit.libreoffice.org/6280 from Khaled Hosny
+ Remove GetKernPairs() with no implementation
  in https://gerrit.libreoffice.org/6260 from Khaled Hosny
+ Removed unused kerning stuff
  in https://gerrit.libreoffice.org/6259 from Khaled Hosny
+ Drop support for non-Unicode fonts
  in https://gerrit.libreoffice.org/6258 from Khaled Hosny
+ Bin pointless #ifdef'd code
  in https://gerrit.libreoffice.org/6256 from Khaled Hosny
+ fdo#54938: Adapt svtools and comphelper module ...
  in https://gerrit.libreoffice.org/6279 from Marcos Souza
+ added draw tile signature and select all fix
  in https://gerrit.libreoffice.org/6264 from Ptyl
+ sw: clone InputField dialog on input-field removal
  in https://gerrit.libreoffice.org/6261 from Pierre-Eric Pelloux-Prayer
+ fdo#7 add support for COVARIANCE.P and COVARIANCE.S functions
  in https://gerrit.libreoffice.org/6135 from Winfried Donkers


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

+ Normalize DISABLE_OPENSSL to USE TRUE/nothing
  in https://gerrit.libreoffice.org/5724 from Norbert Thiebaud
+ Revert no need to double the conditional, once is enough
  in https://gerrit.libreoffice.org/6287 from Lionel Elie Mamane
+ remove glibc stub and tarball, it seems to be completely unused
  in https://gerrit.libreoffice.org/6278 from Björn Michaelsen
+ move mingw-externals to subdir
  in https://gerrit.libreoffice.org/6277 from Björn Michaelsen
+ empty statement is empty
  in https://gerrit.libreoffice.org/6267 from Björn Michaelsen
+ no need to double the conditional, once is enough
  in https://gerrit.libreoffice.org/6266 from Björn Michaelsen
+ move MSVC externals to subdir
  in https://gerrit.libreoffice.org/6265 from Björn Michaelsen
+ i123485 secured file import scanning existing pages
  in https://gerrit.libreoffice.org/6272 from Michael Meeks
+ fdo#70393: move libpng to a subdir of external
  in https://gerrit.libreoffice.org/6231 from Björn Michaelsen
+ fdo#69548 do not remove last space from hyperlink target
  in https://gerrit.libreoffice.org/6262 from Andras Timar
+ sd: Fix output for unit test file n819614.pptx
  in https://gerrit.libreoffice.org/6257 from Andres Gomez
+ unotools: add menu option to enable/disable Smart-Art lock
  in https://gerrit.libreoffice.org/6138 from Andres Gomez
+ oox: added methods to lock Smart-Art edition
  in https://gerrit.libreoffice.org/6059 from Andres Gomez
+ sw: Smart-Art related UTs updated to new option
  in https://gerrit.libreoffice.org/6139 from Andres Gomez
+ cui: allow lines in MS filter section to have independently enabled check
  in https://gerrit.libreoffice.org/6137 from Andres Gomez
+ Code changes  unit tests for fixing multicolumn section separator line i
  in https://gerrit.libreoffice.org/6211 from Yogesh Bharate


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

+ Remove obsolete MIME associatons on MAC OS
  in https://gerrit.libreoffice.org/6103 from Samuel Mehrbrodt


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

+ Make ./autogen.sh --help work again
  in https://gerrit.libreoffice.org/6100 from Arnaud Versini
+ Make libatomic_ops buildable and enable on non-X86.
  in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt
+ Increase number of remembered recent documents from 10 to 25
  in https://gerrit.libreoffice.org/6101 from Krisztian Pinter
+ startcenter: Make SC open faster by timeouting thumbnails
  in https://gerrit.libreoffice.org/6102 from Krisztian Pinter
+ Remove old outdated gallery images and sounds
  in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt
+ Remove more unusedcode
  in https://gerrit.libreoffice.org/5937 from Marcos Souza
+ Simplify oslThreadIdentifier on Linux 32.
  in https://gerrit.libreoffice.org/5553 from Arnaud Versini
+ Dynamically align toolbars in LibreOffice
  in https://gerrit.libreoffice.org/5655 from Prashant Pandey
+ fdo#36791 : fix for import of greeting card
  in

[Bug 35862] Increase font and decrease font could work even if the selection contains differing font sizes

2013-10-17 Thread bugzilla-daemon

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

--- Comment #19 from Daniel Brown da...@dannybrown.net ---
Active development on this bug has started :)

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

2013-10-17 Thread Stephan Bergmann

 cui/source/dialogs/hlinettp.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 08b4ce61d37f138a366ba52bc27ca0a9d7192b09
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 17 08:36:18 2013 +0200

-Werror,-Wunused-const-variable

Change-Id: I635235896853693dd7687e0b72ccb3caf4febb89

diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index b6d3802..bd47534 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -27,7 +27,6 @@
 
 sal_Char const sAnonymous[]= anonymous;
 sal_Char const sHTTPScheme[]   = INET_HTTP_SCHEME;
-sal_Char const sHTTPSScheme[]  = INET_HTTPS_SCHEME;
 sal_Char const sFTPScheme[]= INET_FTP_SCHEME;
 
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/lo.xcconfig.in ios/MobileLibreOffice ios/shared

2013-10-17 Thread Tor Lillqvist

 ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj |2 +-
 ios/lo.xcconfig.in|1 +
 ios/shared/ios_sharedlo.xcodeproj/project.pbxproj |4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e3c461104057fde8bcfc5778b24039ff387c4926
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Oct 17 10:20:11 2013 +0300

Make the MobileLibreOffice project work better in a srcdir!=builddir 
scenario

Manual intervention still needed to copy over the
ios/MobileLibreOffice and ios/shared directories, though.

Change-Id: I1e985cb9bf61238631bd01cd222eeaeb447d58b9

diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj 
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 931bcd5..2001342 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -1469,7 +1469,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
-   shellScript = 
dest_lib=lib_link\ndest_resource=resource_link\nproduct_ver=`sed -ne 
's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p' 
$LO_BUILDDIR/config_host.mk`\nbuildid=`git log -1 --format=%H`\n\nrm -rf 
$dest_lib $dest_resource\nmkdir -p $dest_lib $dest_resource\n\n# Libs #\nfor 
file in $LO_OUTDIR/lib/*.a $LO_INSTDIR/program/*.a 
$LO_WORKDIR/LinkTarget/StaticLibrary/*.a 
$LO_WORKDIR/UnpackedTarball/*/.libs/*.a 
$LO_WORKDIR/UnpackedTarball/*/src/.libs/*.a 
$LO_WORKDIR/UnpackedTarball/*/src/*/.libs/*.a 
$LO_WORKDIR/UnpackedTarball/openssl/*.a; do\nln -f $file 
$dest_lib/${file##*/}\ndone\n\n# Resources #\nmkdir -p $dest_resource/ure\n\n# 
copy rdb files\ncp $LO_OUTDIR/bin/offapi.rdb  $dest_resource\ncp 
$LO_OUTDIR/bin/udkapi.rdb  $dest_resource\ncp 
$LO_OUTDIR/bin/oovbaapi.rdb$dest_resource\ncp 
$LO_INSTDIR/program/services/services.rdb  $dest_resource\ncp 
$LO_INSTDIR/ure/share/misc/services.rdb$dest_resource/ure\n\n# copy .res 
files\n# program/resou
 rce is hardcoded in tools/source/rc/resmgr.cxx. Sure,\n# we could set 
STAR_RESOURCE_PATH instead. sigh...\nmkdir -p 
$dest_resource/program/resource\ncp $LO_INSTDIR/program/resource/*en-US.res 
$dest_resource/program/resource\n\n# soffice.cfg\nmkdir -p 
$dest_resource/share/config\ncp -R $LO_INSTDIR/share/config/soffice.cfg 
$dest_resource/share/config\n\n# \registry\\ncp -R 
$LO_INSTDIR/share/registry $dest_resource/share\n\n# Set up rc, the 
\inifile\. See getIniFileName_Impl().\nfile=$dest_resource/rc\necho 
'[Bootstrap]'$file\necho 
'URE_BOOTSTRAP=file://$APP_DATA_DIR/fundamentalrc'  $file\necho 
'HOME=$APP_DATA_DIR/tmp'$file\n\n# Set up 
fundamentalrc, unorc, bootstraprc and versionrc.\n# Do we really need all 
these?\nfile=$dest_resource/fundamentalrc\necho '[Bootstrap]'   
 $file\necho 'BRAND_BASE_DIR=file://$APP_DATA_DIR' 
  $file
 \necho 'CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry 
res:${BRAND_BASE_DIR}/registry'  $file\n\nfile=$dest_resource/unorc\necho 
'[Bootstrap]'  $file\n\n# bootstraprc must be in 
$BRAND_BASE_DIR/program\nmkdir -p 
$dest_resource/program\nfile=$dest_resource/program/bootstraprc\necho 
'[Bootstrap]'
$file\necho 'InstallMode=installmode' 
$file\necho \ProductKey=LibreOffice $product_ver\   
$file\necho 
'UserInstallation=file://$APP_DATA_DIR/../Library/Application%20Support'
$file\n\n# Is this really needed?\nfile=$dest_resource/program/versionrc\necho 
'[Version]'  $file\necho 'AllLanguages=en-US'$file\necho 
'BuildVersion=' $file\necho \buildid=$buildid\  $file\necho 
'ProductMajor=360'  $file\necho 'ProductMinor=1'$file\n 
  ;
+   shellScript = 
dest_lib=lib_link\ndest_resource=resource_link\nproduct_ver=`sed -ne 
's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p' 
$LO_BUILDDIR/config_host.mk`\nbuildid=`(cd $LO_SRCDIR  git log -1 
--format=%H)`\n\nrm -rf $dest_lib $dest_resource\nmkdir -p $dest_lib 
$dest_resource\n\n# Libs #\nfor file in $LO_OUTDIR/lib/*.a 
$LO_INSTDIR/program/*.a $LO_WORKDIR/LinkTarget/StaticLibrary/*.a 
$LO_WORKDIR/UnpackedTarball/*/.libs/*.a 
$LO_WORKDIR/UnpackedTarball/*/src/.libs/*.a 
$LO_WORKDIR/UnpackedTarball/*/src/*/.libs/*.a 
$LO_WORKDIR/UnpackedTarball/openssl/*.a; do\nln -f $file 
$dest_lib/${file##*/}\ndone\n\n# Resources #\nmkdir -p $dest_resource/ure\n\n# 
copy rdb files\ncp $LO_OUTDIR/bin/offapi.rdb  $dest_resource\ncp 
$LO_OUTDIR/bin/udkapi.rdb  $dest_resource\ncp 
$LO_OUTDIR/bin/oovbaapi.rdb

Manual tests on regression for 4.2.x version

2013-10-17 Thread Sophie

Dear developers,

I'm currently working on updating manual tests for the 4.2.x version.
Tests for new features will be written as well.

Do you have any regressions in mind that we should particularly monitor
during the test series we will run on this version?
If yes, please give me the bug number and I'll add a test for it.

Thanks in advance
Kind regards
Sophie

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

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

2013-10-17 Thread Caolán McNamara

 include/tools/string.hxx   |2 -
 sw/source/core/unocore/unocoll.cxx |7 +--
 sw/source/filter/ww8/ww8scan.hxx   |1 
 tools/source/string/strascii.cxx   |   70 -
 tools/source/string/tustring.cxx   |1 
 5 files changed, 3 insertions(+), 78 deletions(-)

New commits:
commit c975d6b751c48471d413b2e15ccb86e742e9e231
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Oct 16 21:12:30 2013 +0100

Related: fdo#38838 remove String::CompareToAscii

Change-Id: Ie853747ec693bce34e5be3940c236be5e5544b00

diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 796971e..8441ac0 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -224,8 +224,6 @@ public:
 
 StringCompare   CompareTo( const UniString rStr,
xub_StrLen nLen = STRING_LEN ) const;
-StringCompare   CompareToAscii( const sal_Char* pAsciiStr,
-xub_StrLen nLen = STRING_LEN ) const;
 sal_BoolEquals( const UniString rStr ) const;
 sal_BoolEquals( const UniString rStr,
 xub_StrLen nIndex, xub_StrLen nLen ) const;
diff --git a/sw/source/core/unocore/unocoll.cxx 
b/sw/source/core/unocore/unocoll.cxx
index 2807f5b..a5d86ef 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1543,19 +1543,18 @@ uno::Sequence OUString  
SwXTextSections::getElementNames(void)
 return aSeq;
 }
 
-sal_Bool SwXTextSections::hasByName(const OUString Name)
+sal_Bool SwXTextSections::hasByName(const OUString rName)
 throw( uno::RuntimeException )
 {
 SolarMutexGuard aGuard;
 sal_Bool bRet = sal_False;
-String aName(Name);
 if(IsValid())
 {
 SwSectionFmts rFmts = GetDoc()-GetSections();
 for(sal_uInt16 i = 0; i  rFmts.size(); i++)
 {
 const SwSectionFmt* pFmt = rFmts[i];
-if (aName == pFmt-GetSection()-GetSectionName())
+if (rName == pFmt-GetSection()-GetSectionName())
 {
 bRet = sal_True;
 break;
@@ -1565,7 +1564,7 @@ sal_Bool SwXTextSections::hasByName(const OUString Name)
 else
 {
 //Sonderbehandlung der dbg_ - Methoden
-if( COMPARE_EQUAL != aName.CompareToAscii(dbg_, 4))
+if( !rName.startsWith(dbg_))
 throw uno::RuntimeException();
 }
 return bRet;
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 5b4c115..712dfab 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -29,7 +29,6 @@
 #include algorithm
 #include tools/solar.h// UINTXX
 #include tools/stream.hxx
-#include tools/string.hxx
 #include rtl/ustring.hxx
 #include hash_wrap.hxx
 #include sortedarray.hxx
diff --git a/tools/source/string/strascii.cxx b/tools/source/string/strascii.cxx
deleted file mode 100644
index 85cca27..000
--- a/tools/source/string/strascii.cxx
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifdef DBG_UTIL
-static sal_Bool ImplDbgCheckAsciiStr( const sal_Char* pAsciiStr, sal_Int32 
nLen )
-{
-while ( nLen  *pAsciiStr )
-{
-if ( ((unsigned char)*pAsciiStr)  127 )
-return sal_False;
-++pAsciiStr,
---nLen;
-}
-
-return sal_True;
-}
-#endif
-
-static sal_Int32 ImplStringCompareAscii( const sal_Unicode* pStr1, const 
sal_Char* pStr2,
- xub_StrLen nCount )
-{
-sal_Int32 nRet = 0;
-while ( nCount 
-((nRet = ((sal_Int32)*pStr1)-((sal_Int32)((unsigned char)*pStr2))) 
== 0) 
-*pStr2 )
-{
-++pStr1,
-++pStr2,
---nCount;
-}
-
-return nRet;
-}
-
-StringCompare UniString::CompareToAscii( const sal_Char* pAsciiStr,
- xub_StrLen nLen ) const
-{
-DBG_CHKTHIS( UniString, DbgCheckUniString );
-DBG_ASSERT( ImplDbgCheckAsciiStr( pAsciiStr, nLen ),
-

[Libreoffice-commits] core.git: 3 commits - shell/source

2013-10-17 Thread Stephan Bergmann

 shell/source/unix/misc/open-url.sh |   24 +---
 1 file changed, 5 insertions(+), 19 deletions(-)

New commits:
commit fcdde111e451f84e373c67a485c87d1ad744cfe4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 17 10:17:22 2013 +0200

fdo#69462 Properly escape URL in Mozilla -remote openURL(...) command

Verbatim ) or , in the URL will apparently cause problems when Mozilla-
derived browsers parse the openURL(...) command (see
http://www-archive.mozilla.org/unix/remote.html remote control of unix
mozilla), so percent-escape all (, ), and , in the URL.  Also, 
remove the
space before new-window as Commands should /not/ have spaces in them 
(see
link above).

Change-Id: I4b0f3f6a19c94ed9346bb6c55e77d6eae82baba2

diff --git a/shell/source/unix/misc/open-url.sh 
b/shell/source/unix/misc/open-url.sh
index cbad78d..98a4d3f 100755
--- a/shell/source/unix/misc/open-url.sh
+++ b/shell/source/unix/misc/open-url.sh
@@ -38,7 +38,9 @@ run_mozilla() {
 if [ $? -eq 2 ]; then
   $1 $2 
 else
-  $1 -remote openURL($2, new-window) 
+  $1 -remote \
+openURL($(printf '%s' $2 \
+  | sed -e 's/(/%28/g' -e 's/)/%29/g' -e 's/,/%2C/g'),new-window) 
 fi
   else
 $1 $2 
commit 7ff0a2e41c872dbfacf132ff756ed10dc8f3e8c7
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 17 10:04:28 2013 +0200

Quoting clean-up

cosmetics only; even the unquoted echo $1 would not have caused any problems

Change-Id: Iabae872fe6232dc1cd627b736f0c4fc5a8611037

diff --git a/shell/source/unix/misc/open-url.sh 
b/shell/source/unix/misc/open-url.sh
index 4b1d6d4..cbad78d 100755
--- a/shell/source/unix/misc/open-url.sh
+++ b/shell/source/unix/misc/open-url.sh
@@ -33,7 +33,7 @@ which() {
 # checks for the original mozilla start script(s)
 # and restrict the -remote semantics to those.
 run_mozilla() {
-  if file $1 | grep script  /dev/null  grep NPL $1  /dev/null; then
+  if file $1 | grep script  /dev/null  grep NPL $1  /dev/null; then
 $1 -remote 'ping()' 2/dev/null /dev/null
 if [ $? -eq 2 ]; then
   $1 $2 
@@ -46,7 +46,7 @@ run_mozilla() {
 }
 
 # special handling for mailto: uris
-if echo $1 | grep '^mailto:'  /dev/null; then
+if echo $1 | grep '^mailto:'  /dev/null; then
   # check for xdg-email
   mailer=`which xdg-email`
   if [ ! -z $mailer ]; then
commit 288d1a3ff4a5b2b96b278c791c52376d2c3c980b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 17 10:00:14 2013 +0200

Remove unused run_browser()

...unused right from the start in 3d5468a8590ff9b36ac16845782af118d07b7786
INTEGRATION: CWS defaultbrowser: #i27120# new unix shell execute service
implementation.

Change-Id: I18ae3c4c372163787e9bd4f8c946e15128a9deeb

diff --git a/shell/source/unix/misc/open-url.sh 
b/shell/source/unix/misc/open-url.sh
index ff92375..4b1d6d4 100755
--- a/shell/source/unix/misc/open-url.sh
+++ b/shell/source/unix/misc/open-url.sh
@@ -45,22 +45,6 @@ run_mozilla() {
   fi
 }
 
-# checks the browser value for a %s as defined in
-# http://www.catb.org/~esr/BROWSER/index.html
-run_browser() {
-  echo $1|$2 | awk '
-{
-FS=|;
-$syscmd=;
-if (index($1,%s)  0) {
-$syscmd=sprintf($1,$2);
-} else {
-$syscmd=sprintf(%s \%s\,$1,$2);
-}
-system($syscmd  );
-}'  /dev/null
-}
-
 # special handling for mailto: uris
 if echo $1 | grep '^mailto:'  /dev/null; then
   # check for xdg-email
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.

2013-10-17 Thread bugzilla-daemon

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

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

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

Related: fdo#38838 remove String::CompareToAscii



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

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

[Libreoffice-commits] libvisio.git: src/lib

2013-10-17 Thread David Tardon

 src/lib/VSDZipStream.cpp |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 410f564d9a728b983cf11ba9b3eadfc7d59c187c
Author: David Tardon dtar...@redhat.com
Date:   Thu Oct 17 10:35:34 2013 +0200

fdo#70480 do not crash reading malformed zip

Change-Id: Ia37e8be5172a49669cb9f7271c5401ca88f39072

diff --git a/src/lib/VSDZipStream.cpp b/src/lib/VSDZipStream.cpp
index 3b3e08a..1c12d56 100644
--- a/src/lib/VSDZipStream.cpp
+++ b/src/lib/VSDZipStream.cpp
@@ -203,6 +203,8 @@ bool libvisio::VSDZipStreamImpl::isZipStream()
 return false;
   if (!readCentralDirectory(end))
 return false;
+  if (m_cdir.empty())
+return false;
   CentralDirectoryEntry entry = m_cdir.begin()-second;
   m_input-seek(entry.offset, WPX_SEEK_SET);
   LocalFileHeader header;
___
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/distro/collabora/cp-4.1'

2013-10-17 Thread Andras Timar

Tag 'distro/collabora/cp-4.1' created by Andras Timar 
andras.ti...@collabora.com at 2013-10-17 08:47 -0700

distro/collabora/cp-4.1 branch point

Changes since libreoffice-4-1-branch-point-17:
---
 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/distro/collabora/cp-4.1'

2013-10-17 Thread Lionel Elie Mamane

Tag 'distro/collabora/cp-4.1' created by Andras Timar 
andras.ti...@collabora.com at 2013-10-17 08:48 -0700

distro/collabora/cp-4.1 branch point

Changes since libreoffice-4-1-branch-point-16:
---
 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/distro/collabora/cp-4.1'

2013-10-17 Thread Christian Lohmaier

Tag 'distro/collabora/cp-4.1' created by Andras Timar 
andras.ti...@collabora.com at 2013-10-17 08:48 -0700

distro/collabora/cp-4.1 branch point

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/distro/collabora/cp-4.1'

2013-10-17 Thread Mathieu Parent

Tag 'distro/collabora/cp-4.1' created by Andras Timar 
andras.ti...@collabora.com at 2013-10-17 08:46 -0700

distro/collabora/cp-4.1 branch point

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

[Libreoffice-commits] libcdr.git: libcdr.pc.in

2013-10-17 Thread Fridrich Štrba

 libcdr.pc.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 66c1820f54c52fe3a45ef1fe9f33b669b620c324
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Oct 8 17:01:32 2013 +0200

lcms2 and zlib are compile-time dependencies only

Change-Id: I58f4fe2527f309fa862a52403472e123d86030da

diff --git a/libcdr.pc.in b/libcdr.pc.in
index 644469c..212502a 100644
--- a/libcdr.pc.in
+++ b/libcdr.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
 Description: Library for parsing the Corel Draw file format structure
 Version: @VERSION@
-Requires: libwpd-0.9 libwpd-stream-0.9 libwpg-0.2 lcms2
-Libs: -L${libdir} -lcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@ -lz
+Requires: libwpd-0.9 libwpd-stream-0.9 libwpg-0.2
+Libs: -L${libdir} -lcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
 Cflags: -I${includedir}/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'refs/tags/distro/collabora/cp-4.1' - 0 commits -

2013-10-17 Thread Unknown

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'refs/tags/distro/collabora/cp-4.1' - 0 commits -

2013-10-17 Thread Unknown

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'refs/tags/distro/collabora/cp-4.1' - 0 commits -

2013-10-17 Thread Unknown

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/tags/distro/collabora/cp-4.1' - 0 commits -

2013-10-17 Thread Unknown

Rebased ref, commits from common ancestor:
___
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/cp-4.1-branch-point'

2013-10-17 Thread Christian Lohmaier

Tag 'cp-4.1-branch-point' created by Andras Timar andras.ti...@collabora.com 
at 2013-10-17 09:14 -0700

distro/collabora/cp-4.1 branch point

Changes since libreoffice-4-1-branch-point-38:
---
 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/cp-4.1-branch-point'

2013-10-17 Thread Lionel Elie Mamane

Tag 'cp-4.1-branch-point' created by Andras Timar andras.ti...@collabora.com 
at 2013-10-17 09:14 -0700

distro/collabora/cp-4.1 branch point

Changes since libreoffice-4-1-branch-point-16:
---
 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/cp-4.1-branch-point'

2013-10-17 Thread Andras Timar

Tag 'cp-4.1-branch-point' created by Andras Timar andras.ti...@collabora.com 
at 2013-10-17 09:13 -0700

distro/collabora/cp-4.1 branch point

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

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

2013-10-17 Thread Mathieu Parent

Tag 'cp-4.1-branch-point' created by Andras Timar andras.ti...@collabora.com 
at 2013-10-17 09:13 -0700

distro/collabora/cp-4.1 branch point

Changes since libreoffice-4.1.0.1-630:
---
 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 'distro/collabora/cp-4.1'

2013-10-17 Thread Andras Timar

New branch 'distro/collabora/cp-4.1' available with the following commits:
commit e88d1a227b24bc3dfb5c0660ce9e0402498ec5b2
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Oct 17 10:16:45 2013 +0200

Branch distro/collabora/cp-4.1

This is 'distro/collabora/cp-4.1' - tha stable branch for Collabora 4.1
release. We want here all safe L3 and other important fixes. Only safe
changes are allowed.

Change-Id: I71d2f1f114d0d906ea64736ddf30f809928ef32b

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

[Libreoffice-commits] dictionaries.git: Changes to 'distro/collabora/cp-4.1'

2013-10-17 Thread Andras Timar

New branch 'distro/collabora/cp-4.1' available with the following commits:
commit 07f5f0907df3cf35df5960b414fa32904e203825
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Oct 17 10:16:51 2013 +0200

Branch distro/collabora/cp-4.1

This is 'distro/collabora/cp-4.1' - tha stable branch for Collabora 4.1
release. We want here all safe L3 and other important fixes. Only safe
changes are allowed.

Change-Id: I57cd023fff7b6e36ec1674a9f5bc72154dce273c

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

[Libreoffice-commits] translations.git: Changes to 'distro/collabora/cp-4.1'

2013-10-17 Thread Andras Timar

New branch 'distro/collabora/cp-4.1' available with the following commits:
commit 8a18f81a58da9f9e7d1f42b3acc963f5dd514dd7
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Oct 17 10:17:05 2013 +0200

Branch distro/collabora/cp-4.1

This is 'distro/collabora/cp-4.1' - tha stable branch for Collabora 4.1
release. We want here all safe L3 and other important fixes. Only safe
changes are allowed.

Change-Id: I882c4bb502ff464249dc96ee63de2e56e86a5f32

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

[Libreoffice-commits] core.git: Changes to 'distro/collabora/cp-4.1'

2013-10-17 Thread Andras Timar

New branch 'distro/collabora/cp-4.1' available with the following commits:
commit 51307994fd270b78d7798fd9a11d4a28636f2fb1
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Oct 17 10:16:36 2013 +0200

Branch distro/collabora/cp-4.1

This is 'distro/collabora/cp-4.1' - tha stable branch for Collabora 4.1
release. We want here all safe L3 and other important fixes. Only safe
changes are allowed.

Change-Id: I30793bd3198487186e948cfd4804da673e001fea

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

[Libreoffice-commits] core.git: 2 commits - include/touch ios/shared vcl/ios

2013-10-17 Thread Jan Holesovsky

 include/touch/touch.h  
 |7 +
 ios/shared/ios_sharedlo/cxx/mlo_uno.mm 
 |2 -
 
ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m
 |2 -
 vcl/ios/iosinst.cxx
 |   13 ++
 4 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit f2202fed9e9682a6316df0deb0f4679a0a3184e2
Author: Jan Holesovsky ke...@collabora.com
Date:   Thu Oct 17 11:10:34 2013 +0200

Tiles: Documentation of the parameters.

Change-Id: Ibe31a105972cee2aff9b6896cdd80bd93a1a0e7d

diff --git a/include/touch/touch.h b/include/touch/touch.h
index 892e3b2..c8af48e 100644
--- a/include/touch/touch.h
+++ b/include/touch/touch.h
@@ -58,7 +58,12 @@ void touch_lo_pan(int deltaX, int deltaY);
 void touch_lo_zoom(int x, int y, float scale);
 void touch_lo_keyboard_input(int c);
 
-void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, 
int tileWidth, int tileHeight, int tilePosX, int tilePosY);
+/** Draw part of the document.
+
+tilePosX, tilePosY, tileWidth, tileHeight address the part of the document to 
be drawn.
+context, contextHeight, contextWidth specify where to draw.
+*/
+void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, 
int tilePosX, int tilePosY, int tileWidth, int tileHeight);
 
 typedef enum { DOWN, MOVE, UP} MLOMouseButtonState;
 
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 8adc26a..b4e7257 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -504,7 +504,7 @@ void touch_lo_keyboard_did_hide()
 }
 
 extern C
-void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, 
int tileWidth, int tileHeight, int tilePosX, int tilePosY)
+void touch_lo_draw_tile(void * /*context*/, int /*contextWidth*/, int 
/*contextHeight*/, int /*tilePosX*/, int /*tilePosY*/, int /*tileWidth*/, int 
/*tileHeight*/)
 {
 // draws the area of one tile
 
commit d8e8e6bcbeaa9c4d0058e01ce7be07e57f615b1d
Author: p...@cloudon.com p...@cloudon.com
Date:   Wed Oct 16 16:02:44 2013 +0200

added draw tile signature and select all fix

Change-Id: I6118c55caa12d9ba52000f89e869e27b218859be

diff --git a/include/touch/touch.h b/include/touch/touch.h
index 1d93e65..892e3b2 100644
--- a/include/touch/touch.h
+++ b/include/touch/touch.h
@@ -58,6 +58,8 @@ void touch_lo_pan(int deltaX, int deltaY);
 void touch_lo_zoom(int x, int y, float scale);
 void touch_lo_keyboard_input(int c);
 
+void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, 
int tileWidth, int tileHeight, int tilePosX, int tilePosY);
+
 typedef enum { DOWN, MOVE, UP} MLOMouseButtonState;
 
 void touch_lo_mouse_drag(int x, int y, MLOMouseButtonState state);
diff --git a/ios/shared/ios_sharedlo/cxx/mlo_uno.mm 
b/ios/shared/ios_sharedlo/cxx/mlo_uno.mm
index f75fe1a..ff92821 100644
--- a/ios/shared/ios_sharedlo/cxx/mlo_uno.mm
+++ b/ios/shared/ios_sharedlo/cxx/mlo_uno.mm
@@ -471,7 +471,7 @@ mlo_is_document_open(void){
 
 extern C
 void
-lmo_select_all(void){
+mlo_select_all(void){
 getXDispatchHelper()-executeDispatch(getXDispatchProvider(),
   OUString(.uno:SelectAll),
   OUString(_self),
diff --git 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m
 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m
index c9a75c4..79ccd4d 100644
--- 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m
+++ 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/selection/MLOContextualMenuFocus.m
@@ -33,11 +33,9 @@
 
 -(void)loSelectAll:(id) sender{
 
-#if 0 // No mlo_select_all() anywhere !?
 NSLog(@Calling mlo_select_all());
 mlo_select_all();
 NSLog(@mlo_select_all() returned. reshowing contextualMenu);
-#endif
 [_selectionViewController showPostSelectAll];
 }
 
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 353abe4..8adc26a 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -503,4 +503,17 @@ void touch_lo_keyboard_did_hide()
 }
 }
 
+extern C
+void touch_lo_draw_tile(void *context, int contextWidth, int contextHeight, 
int tileWidth, int tileHeight, int tilePosX, int tilePosY)
+{
+// draws the area of one tile
+
+SalFrame *pFocus = IosSalInstance::getInstance()-getFocusFrame();
+if (pFocus) {
+
+// TODO: calling tile drawing code
+
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - dictionaries

2013-10-17 Thread Nagy Akos

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

New commits:
commit 5d9598bc54ee690e33eb2d1fe751bd9d958e44c2
Author: Nagy Akos akosc...@gmail.com
Date:   Thu Oct 3 15:31:35 2013 +0300

Updated core
Project: dictionaries  f4273344b893afe67da57b36956d3f6fd4fef24e

diff --git a/dictionaries b/dictionaries
index 8349227..f427334 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 8349227a9dd98665d90b1ce744247fdaf5582936
+Subproject commit f4273344b893afe67da57b36956d3f6fd4fef24e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'distro/collabora/cp-4.1' - ro/hyph_ro_RO.dic

2013-10-17 Thread Nagy Akos

 ro/hyph_ro_RO.dic | 3419 +-
 1 file changed, 2091 insertions(+), 1328 deletions(-)

New commits:
commit f4273344b893afe67da57b36956d3f6fd4fef24e
Author: Nagy Akos akosc...@gmail.com
Date:   Thu Oct 3 15:31:35 2013 +0300

Correct some errors and add new rules.
Change-Id: Ibcc651f0e4120a8dfddeaac5a20a6b401a71516f
Reviewed-on: https://gerrit.libreoffice.org/6117
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

Signed-off-by: Andras Timar andras.ti...@collabora.com

diff --git a/ro/hyph_ro_RO.dic b/ro/hyph_ro_RO.dic
index d5df9e5..8557bee 100644
--- a/ro/hyph_ro_RO.dic
+++ b/ro/hyph_ro_RO.dic
@@ -1,89 +1,124 @@
 UTF-8
-%Versiune:
-% 3.3.6
+% Versiune:
+%  3.3.6
 %
-%Authors:
-% Adrian Stoica (off...@cuvinte.ro)
-% Lucian Constantin (http://rospell.sourceforge.net)
+% Authors:
+%  Adrian Stoica (off...@cuvinte.ro)
+%  Lucian Constantin (http://rospell.sourceforge.net)
 %
-%License:
-% GNU General Public License Version 2 or later (see COPYING.GPL)
+% License:
+%  GNU General Public License Version 2 or later (see COPYING.GPL)
 %
-%Support:
+% Support:
 %  Please direct all your questions on http://groups.google.com/group/rospell 
mailing list.
-
 %
 % excepÈii
 %
 % romÃ¢neascÄ, romÃ¢nesc, romÃ¢neÈte
 ro1m
-neas
-
-.alt1fel.
-.ast1fel.
-.de1altfel.
-.a1no1fel.
+3ne
+nea1s
+ne1a1
+.alt1fe4l.
+.a1
+.a1l
+.2a2l1t2
+.al2t3f4
+.a1ltf2e1l
+.ast1fe4l.
+.a1s
+.a2s1t2
+.as2t3f4
+.astf2e1l
+.de1altfe4l.
+.1d
+.de1a1
+.de1a1l
+.de2a2l1t2
+.deal2t3f4
+.dea1ltf2e1l
+.a1no1fe4l.
+.a2n
+.a3no
+.ano1f4
+.anof2e1l
 .a1no1fe1lÄ.
-
-%
-% terminaÈii
-%
-2ci.
-2ni.
-2ri.
-2Èi.
-ve3ni.
-o1ve4ni.
-%
-% vocale
-%
-a1e
-Ä1i
-e1a
-e1e
-e1o
+.anofel2Ä1
+1c
+2c4i.
+c2i1
+3n2i1
+4n4i.
+4r4i.
+r2i1
+1È
+2È4i.
+È2i1
+1v
+ve5n2i1
+ve4n4i.
+v2en
+o1v
+o1ve4n4i.
+ove5n2i1
+ov2en
+a1
+a3e
+2Ä1
+Ä3i1
+e1a1
+e3e
+e1o1
+2i1
 i1e
-i1i
+2i2i1
 i1o
-i1u
-o1e
-o1u
-u1i
+i2u1
+o3e
+o3u1
+2u1
+u2i1
 u1o
-%
-% consoane
-%
-l2p1t
-m2p1t
-m2p1È
-n2c1È
-n2c1t
+1l
+2l1p2
+l2p3t2
+1m
+2m1p2
+m2p3t2
+m2p3È
+2n1c
+n2c2È
+n2c1t2
 n2c1È
+2n1d
 n2d1v
-r2c1t
-r2t1f
-s2t1m
+2r1c
+r2c1t2
+2r1t2
+r2t3f4
+1s
+2s1t2
+s2t3m
+2r1s2
+r3s1t2
 r2s2t1n
-%
-% vocalÄ urmatÄ de consoanÄ
-%
 a1b
 a1c
 a1d
-a1f
-a1g
+a1f4
+a1g2
 a1h
 a1j
 a1k
 a1l
-a1m
-a1n
-a1p
+a2m
+a2n
+a1p2
 a1q
 a1r
 a1s
-a1È
-a1t
+a2È
+a1t2
 a1È
 a1v
 a1w
@@ -92,152 +127,152 @@ a1z
 Ä1b
 Ä1c
 Ä1d
-Ä1f
-Ä1g
+Ä1f4
+Ä1g2
 Ä1h
 Ä1j
 Ä1k
 Ä1l
-Ä1m
+Ä2m2
 Ä1n
-Ä1p
+Ä1p2
 Ä1q
 Ä1r
 Ä1s
-Ä1È
-Ä1t
+Ä3È
+Ä1t2
 Ä1È
-Ä1v
+Ä3v
 Ä1w
 Ä1x
 Ä1z
 Ã¢1b
 Ã¢1c
 Ã¢1d
-Ã¢1f
-Ã¢1g
+Ã¢1f4
+Ã¢1g2
 Ã¢1h
 Ã¢1j
 Ã¢1k
 Ã¢1l
 Ã¢1m
 Ã¢1n
-Ã¢1p
+Ã¢1p2
 Ã¢1q
 Ã¢1r
 Ã¢1s
-Ã¢1È
-Ã¢1t
+Ã¢2È
+Ã¢1t2
 Ã¢1È
 Ã¢1v
 Ã¢1w
 Ã¢1x
 Ã¢1z
 e1b
-e1c
+2e1c
 e1d
-e1f
-e1g
+e1f4
+e1g2
 e1h
 e1j
 e1k
-e1l
-e1m
-e1n
-e1p
+2e1l
+e2m
+2en
+e1p2
 e1q
 e1r
-e1s
-e1È
-e1t
-e1È
+2e2s
+2e2È
+e1t2
+2e1È
 e1v
 e1w
-e1x
-e1z
+e2x
+2e1z
 i1b
 i1c
 i1d
-i1f
-i1g
+i1f4
+i1g2
 i1h
 i1j
 i1k
 i1l
 i1m
-i1n
-i1p
+i2n
+i1p2
 i1q
 i1r
-i1s
-i1È
-i1t
+i2s
+i2È
+i1t2
 i1È
 i1v
 i1w
 i1x
 i1z
+Ã®2
 Ã®1b
 Ã®1c
-Ã®1d
-Ã®1f
-Ã®1g
+Ã®3d
+Ã®1f4
+Ã®1g2
 Ã®1h
 Ã®1j
 Ã®1k
 Ã®1l
 Ã®1m
 Ã®1n
-Ã®1p
+Ã®1p2
 Ã®1q
 Ã®1r
 Ã®1s
-Ã®1È
-Ã®1t
-Ã®1È
+Ã®2È
+Ã®3t2
+Ã®3È
 Ã®1v
 Ã®1w
 Ã®1x
-Ã®1z
+Ã®3z
 o1b
 o1c
-o1d
-o1f
-o1g
+2o1d
+o1f4
+o1g2
 o1h
 o1j
 o1k
 o1l
 o1m
-o1n
-o1p
+2on
+o1p2
 o1q
 o1r
 o1s
-o1È
-o1t
+o2È
+o1t2
 o1È
-o1v
 o1w
 o1x
 o1z
 u1b
 u1c
 u1d
-u1f
-u1g
+u1f4
+u1g2
 u1h
 u1j
 u1k
-u1l
+u2l
 u1m
 u1n
-u1p
+u1p2
 u1q
 u1r
-u1s
-u1È
-u1t
+u2s
+u3È
+u1t2
 u1È
 u1v
 u1w
@@ -246,46 +281,40 @@ u1z
 y1b
 y1c
 y1d
-y1f
-y1g
+y1f4
+y1g2
 y1h
 y1j
 y1k
 y1l
 y1m
 y1n
-y1p
+y1p2
 y1q
 y1r
 y1s
-y1È
-y1t
+y2È
+y1t2
 y1È
 y1v
 y1w
 y1x
 y1z
-%
-% vocalÄ urmatÄ de consoane, cu excepÈia vocalelor urmate de grupurile
-%de consoane bl, cl, dl, fl, gl, hl, pl, tl, vl,
-%br, cr, dr, fr, gr, hr, pr, tr, vr,
-%ch, gh
-%
 a2b1b
 a2b1c
 a2b1d
-a2b1f
-a2b1g
+a2b1f4
+a2b1g2
 a2b1h
 a2b1j
 a2b1k
 a2b1m
 a2b1n
-a2b1p
+a2b1p2
 a2b1q
 a2b1s
-a2b1È
-a2b1t
+a2b2È
+a2b1t2
 a2b1È
 a2b1v
 a2b1w
@@ -294,17 +323,17 @@ a2b1z
 a2c1b
 a2c1c
 a2c1d
-a2c1f
-a2c1g
+a2c1f4
+a2c1g2
 a2c1j
 a2c1k
 a2c1m
-a2c1n
-a2c1p
+a2c5n
+a2c1p2
 a2c1q
 a2c1s
-a2c1È
-a2c1t
+a2c2È
+a2c1t2
 a2c1È
 a2c1v
 a2c1w
@@ -313,18 +342,18 @@ a2c1z
 a2d1b
 a2d1c
 a2d1d
-a2d1f
-a2d1g
+a2d1f4
+a2d1g2
 a2d1h
 a2d1j
 a2d1k
 a2d1m
 a2d1n
-a2d1p
+a2d1p2
 a2d1q
 a2d1s
-a2d1È
-a2d1t
+a2d2È
+a2d1t2
 a2d1È
 a2d1v
 a2d1w
@@ -333,18 +362,18 @@ a2d1z
 a2f1b
 a2f1c
 a2f1d
-a2f1f
-a2f1g
+a2f4f4
+a2f1g2
 a2f1h
 a2f1j
 a2f1k
 a2f1m
 a2f1n
-a2f1p
+a2f1p2
 a2f1q
 a2f1s
-a2f1È
-a2f1t
+a2f2È
+a2f1t2
 a2f1È
 a2f1v
 a2f1w
@@ -353,37 +382,37 @@ a2f1z
 a2g1b
 a2g1c
 a2g1d
-a2g1f
-a2g1g
+a2g1f4
+a2g2g2
 a2g1j
 a2g1k
-a2g1m
-a2g1n
-a2g1p
+a2g3m
+a2g3n

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sw/qa writerfilter/source

2013-10-17 Thread Miklos Vajna

 sw/qa/extras/ooxmlimport/data/default-sect-break-cols.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |   17 +
 writerfilter/source/dmapper/PropertyMap.cxx|4 ++-
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 870e1d6e74e9d8eea13dec0cab52755980cf2a93
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Sep 11 15:18:26 2013 +0200

DOCX import: fix default section break type inside multiple columns

Signed-off-by: Andras Timar andras.ti...@collabora.com

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

Change-Id: I7c44a2bdb69563953d3257b435aeed5bae50f7b2

diff --git a/sw/qa/extras/ooxmlimport/data/default-sect-break-cols.docx 
b/sw/qa/extras/ooxmlimport/data/default-sect-break-cols.docx
new file mode 100755
index 000..b66b844
Binary files /dev/null and 
b/sw/qa/extras/ooxmlimport/data/default-sect-break-cols.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 2076c8c..bbf1d3e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -25,6 +25,7 @@
 #include com/sun/star/text/XDependentTextField.hpp
 #include com/sun/star/text/XFormField.hpp
 #include com/sun/star/text/XPageCursor.hpp
+#include com/sun/star/text/XTextColumns.hpp
 #include com/sun/star/text/XTextFieldsSupplier.hpp
 #include com/sun/star/text/XTextFrame.hpp
 #include com/sun/star/text/XTextFramesSupplier.hpp
@@ -135,6 +136,7 @@ public:
 void testVmlTextVerticalAdjust();
 void testGroupshapeSdt();
 void testBnc779620();
+void testDefaultSectBreakCols();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -235,6 +237,7 @@ void Test::run()
 {vml-text-vertical-adjust.docx, Test::testVmlTextVerticalAdjust},
 {groupshape-sdt.docx, Test::testGroupshapeSdt},
 {bnc779620.docx, Test::testBnc779620},
+{default-sect-break-cols.docx, Test::testDefaultSectBreakCols},
 };
 header();
 for (unsigned int i = 0; i  SAL_N_ELEMENTS(aMethods); ++i)
@@ -1652,6 +1655,20 @@ void Test::testBnc779620()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess-getCount());
 }
 
+void Test::testDefaultSectBreakCols()
+{
+// First problem: the first two paragraphs did not have their own text 
section, so the whole document had two columns.
+uno::Referencebeans::XPropertySet xTextSection = getProperty 
uno::Referencebeans::XPropertySet (getParagraph(1, First.), TextSection);
+CPPUNIT_ASSERT(xTextSection.is());
+uno::Referencetext::XTextColumns xTextColumns = getProperty 
uno::Referencetext::XTextColumns (xTextSection, TextColumns);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xTextColumns-getColumnCount());
+
+// Second problem: the page style had two columns, while it shouldn't have 
any.
+uno::Referencebeans::XPropertySet 
xPageStyle(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+xTextColumns = getProperty uno::Referencetext::XTextColumns 
(xPageStyle, TextColumns);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), xTextColumns-getColumnCount());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 3c4a470..2de47e9 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -890,7 +890,9 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl rDM_Impl )
 }
 
 //depending on the break type no page styles should be created
-if(m_nBreakType == 0)
+// If the section type is missing, but we have columns, then this should be
+// handled as a continuous section break.
+if(m_nBreakType == 0 || (m_nBreakType == -1  m_nColumnCount  0))
 {
 //todo: insert a section or access the already inserted section
 uno::Reference beans::XPropertySet  xSection =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - writerfilter/source

2013-10-17 Thread Andras Timar

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit d8bdfd5051b822c87215682d845c601832374efb
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Oct 16 09:29:56 2013 +0200

fdo#69548 do not remove last space from hyperlink target

Change-Id: Ia56a4012590cc56b3beaa887cbbb91318a0977b1

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 5bd4e62..45cc5fe 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2155,14 +2155,10 @@ void FieldContext::AppendCommand(const OUString rPart)
 
 if (bInString)
 {
-if (bInStringNext)
-{
-sPart += OUString(' ');
-sPart += sToken;
-}
-else
+sPart += OUString(' ');
+sPart += sToken;
+if (!bInStringNext)
 {
-sPart += sToken;
 aResult.push_back(sPart);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-17 Thread Stephan Bergmann

 0 files changed

New commits:
commit d879a74ee2d8baad5de4edc4e13144d3cc0c6bf0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 17 11:44:02 2013 +0200

Scripts need executable bit

...or else they would end up non-executable in instdir, now that they are
directly copied there via desktop/Package_scripts_install.mk.

Change-Id: I8d2add1fd7f13ae9080d2f710b5fbb60d1e8ad1a

diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
old mode 100644
new mode 100755
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
old mode 100644
new mode 100755
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/harfbuzz external/Module_external.mk harfbuzz/ExternalProject_harfbuzz.mk harfbuzz/Makefile harfbuzz/Module_harfbuzz.mk harfbuzz/README harfbuzz/UnpackedTarbal

2013-10-17 Thread Khaled Hosny

 RepositoryModule_host.mk  |1 
 external/Module_external.mk   |6 ++--
 external/harfbuzz/ExternalProject_harfbuzz.mk |   36 ++
 external/harfbuzz/Makefile|7 +
 external/harfbuzz/Module_harfbuzz.mk  |   17 
 external/harfbuzz/README  |1 
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |   14 ++
 harfbuzz/ExternalProject_harfbuzz.mk  |   36 --
 harfbuzz/Makefile |7 -
 harfbuzz/Module_harfbuzz.mk   |   21 ---
 harfbuzz/README   |1 
 harfbuzz/UnpackedTarball_harfbuzz.mk  |   14 --
 12 files changed, 79 insertions(+), 82 deletions(-)

New commits:
commit 268a3214073f95371b7e5ae35b95ca01967f0494
Author: Khaled Hosny khaledho...@eglug.org
Date:   Wed Oct 16 19:59:27 2013 +0200

fdo#70393: move harfbuzz to a subdir of external

Change-Id: I3eaa6d95aaa1753822e20d21f90f39cadb939332
Reviewed-on: https://gerrit.libreoffice.org/6276
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Tested-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 366a885..27b3c07 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
framework \
$(call gb_Helper_optional,FREETYPE,freetype) \
$(call gb_Helper_optional,GRAPHITE,graphite) \
-   $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,DESKTOP,helpcompiler) \
$(call gb_Helper_optional,HELP,helpcontent2) \
$(call gb_Helper_optional,HSQLDB,hsqldb) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 538b3fd..48d7842 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -17,7 +17,9 @@ ifeq ($(COM),MSC)
 $(eval $(call gb_Module_add_moduledir,external,msc-externals))
 endif
 
-$(call gb_Helper_optional,LIBPNG,\
-$(eval $(call gb_Module_add_moduledir,external,libpng)))
+$(eval $(call gb_Module_add_moduledirs,external,\
+   $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
+   $(call gb_Helper_optional,LIBPNG,libpng) \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/harfbuzz/ExternalProject_harfbuzz.mk 
b/external/harfbuzz/ExternalProject_harfbuzz.mk
similarity index 100%
rename from harfbuzz/ExternalProject_harfbuzz.mk
rename to external/harfbuzz/ExternalProject_harfbuzz.mk
diff --git a/harfbuzz/Makefile b/external/harfbuzz/Makefile
similarity index 100%
rename from harfbuzz/Makefile
rename to external/harfbuzz/Makefile
diff --git a/harfbuzz/Module_harfbuzz.mk b/external/harfbuzz/Module_harfbuzz.mk
similarity index 89%
rename from harfbuzz/Module_harfbuzz.mk
rename to external/harfbuzz/Module_harfbuzz.mk
index af64eff..ffbadd7 100644
--- a/harfbuzz/Module_harfbuzz.mk
+++ b/external/harfbuzz/Module_harfbuzz.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,harfbuzz))
 
-ifeq ($(ENABLE_HARFBUZZ)-$(SYSTEM_HARFBUZZ),TRUE-NO)
-
 $(eval $(call gb_Module_add_targets,harfbuzz,\
ExternalProject_harfbuzz \
UnpackedTarball_harfbuzz \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/harfbuzz/README b/external/harfbuzz/README
similarity index 100%
rename from harfbuzz/README
rename to external/harfbuzz/README
diff --git a/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
similarity index 100%
rename from harfbuzz/UnpackedTarball_harfbuzz.mk
rename to external/harfbuzz/UnpackedTarball_harfbuzz.mk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-17 Thread Stephan Bergmann

 desktop/scripts/unopkg.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 15be40969c107f073a3fa7f5fd67e8012ffdcbb3
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 17 11:51:15 2013 +0200

Fix quoting

Change-Id: Ie2228247f5edc107ed183a25ef30256d8041e000

diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 295f874..846c2eb 100755
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -66,7 +66,7 @@ do
 done
 
 #make sure shared extensions will be readable by all users
-[ $SHARED = true ]  umask 0022
+[ $SHARED = true ]  umask 0022
 
 # extend the ld_library_path for java: javaldx checks the sofficerc for us
 if [ -x $sd_prog/../ure-link/bin/javaldx ] ; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 70393] move external builds into subfolder

2013-10-17 Thread bugzilla-daemon

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

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

http://cgit.freedesktop.org/libreoffice/core/commit/?id=268a3214073f95371b7e5ae35b95ca01967f0494

fdo#70393: move harfbuzz to a subdir of external



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

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

[Libreoffice-commits] core.git: afms/ExternalPackage_fontunxafm.mk afms/Makefile afms/Module_afms.mk afms/README afms/UnpackedTarball_afms.mk external/afms external/Module_external.mk RepositoryModule

2013-10-17 Thread Khaled Hosny

 RepositoryModule_host.mk|1 
 afms/ExternalPackage_fontunxafm.mk  |   48 
 afms/Makefile   |7 
 afms/Module_afms.mk |   17 -
 afms/README |1 
 afms/UnpackedTarball_afms.mk|   14 
 external/Module_external.mk |1 
 external/afms/ExternalPackage_fontunxafm.mk |   48 
 external/afms/Makefile  |7 
 external/afms/Module_afms.mk|   17 +
 external/afms/README|1 
 external/afms/UnpackedTarball_afms.mk   |   14 
 12 files changed, 88 insertions(+), 88 deletions(-)

New commits:
commit 6cef5936a9cf9e004b6940edfaf57493558332b9
Author: Khaled Hosny khaledho...@eglug.org
Date:   Thu Oct 17 00:52:25 2013 +0200

fdo#70393: move afms to a subdir of external

Change-Id: I73d7998a9a36d466b4c6d9cac408506a42bceebf
Reviewed-on: https://gerrit.libreoffice.org/6280
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Tested-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 27b3c07..111d3b5 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_Module_Module,libreoffice))
 
 $(eval $(call gb_Module_add_moduledirs,libreoffice,\
accessibility \
-   $(call gb_Helper_optional,AFMS,afms) \
android \
animations \
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 48d7842..a141b65 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals))
 endif
 
 $(eval $(call gb_Module_add_moduledirs,external,\
+   $(call gb_Helper_optional,AFMS,afms) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LIBPNG,libpng) \
 ))
diff --git a/afms/ExternalPackage_fontunxafm.mk 
b/external/afms/ExternalPackage_fontunxafm.mk
similarity index 100%
rename from afms/ExternalPackage_fontunxafm.mk
rename to external/afms/ExternalPackage_fontunxafm.mk
diff --git a/afms/Makefile b/external/afms/Makefile
similarity index 100%
rename from afms/Makefile
rename to external/afms/Makefile
diff --git a/afms/Module_afms.mk b/external/afms/Module_afms.mk
similarity index 100%
rename from afms/Module_afms.mk
rename to external/afms/Module_afms.mk
diff --git a/afms/README b/external/afms/README
similarity index 100%
rename from afms/README
rename to external/afms/README
diff --git a/afms/UnpackedTarball_afms.mk 
b/external/afms/UnpackedTarball_afms.mk
similarity index 100%
rename from afms/UnpackedTarball_afms.mk
rename to external/afms/UnpackedTarball_afms.mk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: apache-commons/ExternalPackage_apache_commons_logging.mk apache-commons/ExternalProject_apache_commons_codec.mk apache-commons/ExternalProject_apache_commons_httpclient

2013-10-17 Thread Khaled Hosny

 RepositoryModule_host.mk |1 
 apache-commons/ExternalPackage_apache_commons_logging.mk |   16 -
 apache-commons/ExternalProject_apache_commons_codec.mk   |   32 --
 apache-commons/ExternalProject_apache_commons_httpclient.mk  |   37 ---
 apache-commons/ExternalProject_apache_commons_lang.mk|   32 --
 apache-commons/ExternalProject_apache_commons_logging.mk |   43 ---
 apache-commons/Makefile  |7 
 apache-commons/Module_apache-commons.mk  |   31 --
 apache-commons/Package_apache_commons_codec.mk   |   16 -
 apache-commons/Package_apache_commons_httpclient.mk  |   16 -
 apache-commons/Package_apache_commons_lang.mk|   16 -
 apache-commons/README|1 
 apache-commons/UnpackedTarball_apache_commons_codec.mk   |   24 --
 apache-commons/UnpackedTarball_apache_commons_httpclient.mk  |   19 -
 apache-commons/UnpackedTarball_apache_commons_lang.mk|   14 -
 apache-commons/UnpackedTarball_apache_commons_logging.mk |   22 -
 apache-commons/patches/codec.patch   |   20 -
 apache-commons/patches/httpclient.patch  |  119 
--
 apache-commons/patches/httpclient_no_javadoc.patch   |   11 
 apache-commons/patches/logging.patch |   15 -
 external/Module_external.mk  |1 
 external/apache-commons/ExternalPackage_apache_commons_logging.mk|   16 +
 external/apache-commons/ExternalProject_apache_commons_codec.mk  |   32 ++
 external/apache-commons/ExternalProject_apache_commons_httpclient.mk |   37 +++
 external/apache-commons/ExternalProject_apache_commons_lang.mk   |   32 ++
 external/apache-commons/ExternalProject_apache_commons_logging.mk|   43 +++
 external/apache-commons/Makefile |7 
 external/apache-commons/Module_apache-commons.mk |   27 ++
 external/apache-commons/Package_apache_commons_codec.mk  |   16 +
 external/apache-commons/Package_apache_commons_httpclient.mk |   16 +
 external/apache-commons/Package_apache_commons_lang.mk   |   16 +
 external/apache-commons/README   |1 
 external/apache-commons/UnpackedTarball_apache_commons_codec.mk  |   24 ++
 external/apache-commons/UnpackedTarball_apache_commons_httpclient.mk |   19 +
 external/apache-commons/UnpackedTarball_apache_commons_lang.mk   |   14 +
 external/apache-commons/UnpackedTarball_apache_commons_logging.mk|   22 +
 external/apache-commons/patches/codec.patch  |   20 +
 external/apache-commons/patches/httpclient.patch |  119 
++
 external/apache-commons/patches/httpclient_no_javadoc.patch  |   11 
 external/apache-commons/patches/logging.patch|   15 +
 40 files changed, 488 insertions(+), 492 deletions(-)

New commits:
commit 694248e9785e943bfc83d119304a5b18b683e21f
Author: Khaled Hosny khaledho...@eglug.org
Date:   Thu Oct 17 00:56:05 2013 +0200

fdo#70393: move apache-commons to a subdir of external

Change-Id: I97f27f1fd53e416767c7aa3478deb23aae0427e0
Reviewed-on: https://gerrit.libreoffice.org/6281
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Tested-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 111d3b5..a4ad804 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
accessibility \
android \
animations \
-   $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
apple_remote \
avmedia \
basctl \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index a141b65..2aca373 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -19,6 +19,7 @@ endif
 
 $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,AFMS,afms) \
+   $(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LIBPNG,libpng) \
 ))
diff --git a/apache-commons/ExternalPackage_apache_commons_logging.mk 
b/external/apache-commons/ExternalPackage_apache_commons_logging.mk
similarity index 100%
rename from apache-commons/ExternalPackage_apache_commons_logging.mk
rename to external/apache-commons/ExternalPackage_apache_commons_logging.mk
diff --git a/apache-commons/ExternalProject_apache_commons_codec.mk

[Libreoffice-commits] core.git: Branch 'private/moggi/abstract-chart-rendering' - chart2/Library_chartopengl.mk

2013-10-17 Thread Markus Mohrhard

 chart2/Library_chartopengl.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 1468c3d1d8a6103d5446e2702234975f26f9ed5f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Thu Oct 17 12:36:35 2013 +0200

try to make it build on windows

Change-Id: I1bc87e1c84926699a80a2bb0a9ee789e92663dfc

diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
index da71c21..88c8e5f 100644
--- a/chart2/Library_chartopengl.mk
+++ b/chart2/Library_chartopengl.mk
@@ -35,7 +35,11 @@ $(eval $(call gb_Library_add_exception_objects,chartopengl,\
 chart2/source/view/main/DummyXShape \
 ))
 
-ifeq ($(OS),LINUX)
+ifeq ($(strip $(OS)),WNT)
+$(eval $(call gb_Library_use_system_win32_libs,chartopengl,\
+opengl32 \
+))
+else ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_libs,chartopengl,\
 -ldl \
 -lGL \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: boost/boost_1_44_0-clang-warnings.patch boost/boost_1_44_0-gcc4.8.patch boost/boost_1_44_0-unused-parameters.patch boost/boost.3780.aliasing.patch boost/boost.4100.warn

2013-10-17 Thread Khaled Hosny

 RepositoryModule_host.mk|1 
 boost/Makefile  |7 
 boost/Module_boost.mk   |   28 
 boost/README|4 
 boost/StaticLibrary_boostdatetime.mk|   30 
 boost/StaticLibrary_boostsystem.mk  |   27 
 boost/StaticLibrary_boostthread.mk  |   29 
 boost/UnpackedTarball_boost.mk  |   61 -
 boost/boost.3780.aliasing.patch |   23 
 boost/boost.4100.warnings.patch |   19 
 boost/boost.4510.warnings.patch |   26 
 boost/boost.4713.warnings.patch |  282 --
 boost/boost.6142.warnings.patch.1   |   38 
 boost/boost.6369.warnings.patch |  323 ---
 boost/boost.6397.warnings.patch |  568 
 boost/boost.7551.unusedvars.patch   |   10 
 boost/boost.auto_link.patch |   40 
 boost/boost.endian.patch|   13 
 boost/boost.gcc47679.patch  |   61 -
 boost/boost.libcdr.warnings.patch.1 |  539 ---
 boost/boost.loplugin.patch  |   19 
 boost/boost.std.move.patch  |   20 
 boost/boost.transform_width.patch   |   11 
 boost/boost.vc2012.patch|   25 
 boost/boost.wdeprecated-auto_ptr.patch.0|   91 -
 boost/boost.wdeprecated-register.patch.0|   36 
 boost/boost.windows.patch   |   12 
 boost/boost.wshadow.patch   |  330 ---
 boost/boost.wundef.patch|  119 --
 boost/boost.wuninitialized.patch|   10 
 boost/boost.wunused.patch   |   50 -
 boost/boost_1_44_0-clang-warnings.patch |   50 -
 boost/boost_1_44_0-gcc4.8.patch |  448 -
 boost/boost_1_44_0-unused-parameters.patch  |  916 
 external/Module_external.mk |1 
 external/boost/Makefile |7 
 external/boost/Module_boost.mk  |   24 
 external/boost/README   |4 
 external/boost/StaticLibrary_boostdatetime.mk   |   30 
 external/boost/StaticLibrary_boostsystem.mk |   27 
 external/boost/StaticLibrary_boostthread.mk |   29 
 external/boost/UnpackedTarball_boost.mk |   61 +
 external/boost/boost.3780.aliasing.patch|   23 
 external/boost/boost.4100.warnings.patch|   19 
 external/boost/boost.4510.warnings.patch|   26 
 external/boost/boost.4713.warnings.patch|  282 ++
 external/boost/boost.6142.warnings.patch.1  |   38 
 external/boost/boost.6369.warnings.patch|  323 +++
 external/boost/boost.6397.warnings.patch|  568 
 external/boost/boost.7551.unusedvars.patch  |   10 
 external/boost/boost.auto_link.patch|   40 
 external/boost/boost.endian.patch   |   13 
 external/boost/boost.gcc47679.patch |   61 +
 external/boost/boost.libcdr.warnings.patch.1|  539 +++
 external/boost/boost.loplugin.patch |   19 
 external/boost/boost.std.move.patch |   20 
 external/boost/boost.transform_width.patch  |   11 
 external/boost/boost.vc2012.patch   |   25 
 external/boost/boost.wdeprecated-auto_ptr.patch.0   |   91 +
 external/boost/boost.wdeprecated-register.patch.0   |   36 
 external/boost/boost.windows.patch  |   12 
 external/boost/boost.wshadow.patch  |  330 +++
 external/boost/boost.wundef.patch   |  119 ++
 external/boost/boost.wuninitialized.patch   |   10 
 external/boost/boost.wunused.patch  |   50 +
 external/boost/boost_1_44_0-clang-warnings.patch|   50 +
 external/boost/boost_1_44_0-gcc4.8.patch|  448 +
 external/boost/boost_1_44_0-unused-parameters.patch |  916 
 68 files changed, 4262 insertions(+), 4266 deletions(-)

New commits:
commit 174e242f76da94df3bdefa5416c5f2256b78
Author: Khaled Hosny khaledho...@eglug.org
Date:   Thu Oct 17 01:15:08 2013 +0200

fdo#70393: move boost to a subdir of external

Change-Id: Ib6aa36e296dfc1237463c4257f7ea1bd1fe72a1b
Reviewed-on: https://gerrit.libreoffice.org/6282
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Tested-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index a4ad804..dccdb4d 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -22,7 +22,6 @@ $(eval $(call

[Libreoffice-commits] core.git: cairo/cairo cairo/ExternalPackage_cairo.mk cairo/ExternalPackage_pixman.mk cairo/ExternalProject_cairo.mk cairo/ExternalProject_pixman.mk cairo/Makefile cairo/Module_ca

2013-10-17 Thread Khaled Hosny

 RepositoryModule_host.mk  |1 
 cairo/ExternalPackage_cairo.mk|   17 -
 cairo/ExternalPackage_pixman.mk   |   17 -
 cairo/ExternalProject_cairo.mk|   57 
 cairo/ExternalProject_pixman.mk   |   43 ---
 cairo/Makefile|7 
 cairo/Module_cairo.mk |   25 -
 cairo/README  |6 
 cairo/UnpackedTarball_cairo.mk|   50 ---
 cairo/UnpackedTarball_pixman.mk   |   28 --
 cairo/cairo/cairo-1.10.2-oldfontconfig.patch  |   11 
 cairo/cairo/cairo-1.10.2.android.patch|   13 
 cairo/cairo/cairo-1.10.2.ios.patch|   27 --
 cairo/cairo/cairo-1.10.2.no-atsui.patch   |   22 -
 cairo/cairo/cairo-1.10.2.patch|  236 --
 cairo/cairo/cairo-1.10.2.wntmsc.patch |   56 
 cairo/cairo/cairo.dlsym.lcdfilter.patch   |   56 
 cairo/cairo/dummy_pkg_config  |3 
 cairo/cairo/no-flto-clang.patch   |   11 
 cairo/pixman/Makefile.win32.common|   54 
 cairo/pixman/pixman-0.24.4.android.patch  |   13 
 cairo/pixman/pixman-0.24.4.patch  |   96 ---
 external/Module_external.mk   |1 
 external/cairo/ExternalPackage_cairo.mk   |   17 +
 external/cairo/ExternalPackage_pixman.mk  |   17 +
 external/cairo/ExternalProject_cairo.mk   |   57 
 external/cairo/ExternalProject_pixman.mk  |   43 +++
 external/cairo/Makefile   |7 
 external/cairo/Module_cairo.mk|   21 +
 external/cairo/README |6 
 external/cairo/UnpackedTarball_cairo.mk   |   50 +++
 external/cairo/UnpackedTarball_pixman.mk  |   28 ++
 external/cairo/cairo/cairo-1.10.2-oldfontconfig.patch |   11 
 external/cairo/cairo/cairo-1.10.2.android.patch   |   13 
 external/cairo/cairo/cairo-1.10.2.ios.patch   |   27 ++
 external/cairo/cairo/cairo-1.10.2.no-atsui.patch  |   22 +
 external/cairo/cairo/cairo-1.10.2.patch   |  236 ++
 external/cairo/cairo/cairo-1.10.2.wntmsc.patch|   56 
 external/cairo/cairo/cairo.dlsym.lcdfilter.patch  |   56 
 external/cairo/cairo/dummy_pkg_config |3 
 external/cairo/cairo/no-flto-clang.patch  |   11 
 external/cairo/pixman/Makefile.win32.common   |   54 
 external/cairo/pixman/pixman-0.24.4.android.patch |   13 
 external/cairo/pixman/pixman-0.24.4.patch |   96 +++
 44 files changed, 845 insertions(+), 849 deletions(-)

New commits:
commit 214fc9134176c79c701ce90dc252738d8038e01f
Author: Khaled Hosny khaledho...@eglug.org
Date:   Thu Oct 17 01:22:19 2013 +0200

fdo#70393: move cairo to a subdir of external

Change-Id: I5a5d43521d3d7227dadd05525e2c69c63a3f1c1b
Reviewed-on: https://gerrit.libreoffice.org/6284
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Tested-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 1cd280f..1f358f6 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
bean \
binaryurp \
bridges \
-   $(call gb_Helper_optional,CAIRO,cairo) \
canvas \
chart2 \
cli_ure \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 18becdf..85fb170 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
$(call gb_Helper_optional,BOOST,boost) \
$(call gb_Helper_optional,BSH,beanshell) \
+   $(call gb_Helper_optional,CAIRO,cairo) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LIBPNG,libpng) \
 ))
diff --git a/cairo/ExternalPackage_cairo.mk 
b/external/cairo/ExternalPackage_cairo.mk
similarity index 100%
rename from cairo/ExternalPackage_cairo.mk
rename to external/cairo/ExternalPackage_cairo.mk
diff --git a/cairo/ExternalPackage_pixman.mk 
b/external/cairo/ExternalPackage_pixman.mk
similarity index 100%
rename from cairo/ExternalPackage_pixman.mk
rename to external/cairo/ExternalPackage_pixman.mk
diff --git a/cairo/ExternalProject_cairo.mk 
b/external/cairo/ExternalProject_cairo.mk
similarity index 100%
rename from cairo/ExternalProject_cairo.mk
rename to external/cairo/ExternalProject_cairo.mk
diff --git a/cairo/ExternalProject_pixman.mk

[Bug 70393] move external builds into subfolder

2013-10-17 Thread bugzilla-daemon

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

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

http://cgit.freedesktop.org/libreoffice/core/commit/?id=6cef5936a9cf9e004b6940edfaf57493558332b9

fdo#70393: move afms to a subdir of external



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

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

[Bug 70393] move external builds into subfolder

2013-10-17 Thread bugzilla-daemon

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

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

http://cgit.freedesktop.org/libreoffice/core/commit/?id=694248e9785e943bfc83d119304a5b18b683e21f

fdo#70393: move apache-commons to a subdir of external



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

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

[Bug 70393] move external builds into subfolder

2013-10-17 Thread bugzilla-daemon

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

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

http://cgit.freedesktop.org/libreoffice/core/commit/?id=174e242f76da94df3bdefa5416c5f2256b78

fdo#70393: move boost to a subdir of external



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

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

[Bug 70393] move external builds into subfolder

2013-10-17 Thread bugzilla-daemon

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

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

http://cgit.freedesktop.org/libreoffice/core/commit/?id=4641fd9aecc73b3cbdcb83d67f423c8d06f456fd

fdo#70393: move beanshell to a subdir of external



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

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

[Bug 70393] move external builds into subfolder

2013-10-17 Thread bugzilla-daemon

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

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

http://cgit.freedesktop.org/libreoffice/core/commit/?id=214fc9134176c79c701ce90dc252738d8038e01f

fdo#70393: move cairo to a subdir of external



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

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

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

2013-10-17 Thread Miklos Vajna

 writerfilter/source/dmapper/StyleSheetTable.cxx |   28 +++-
 1 file changed, 27 insertions(+), 1 deletion(-)

New commits:
commit ab2c1321776e0b622c5f0747366bb0bfeb163cc5
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Oct 17 13:02:29 2013 +0200

writerfilter: fix default numbering style

Change-Id: Ia019c93841043ac5d65e08ad17400acc27f82d6c

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index c3fd4a8..ab07e89 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -826,6 +826,31 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr 
rFontTable )
 rPropNameSupplier.GetName( 
PROP_SERVICE_PARA_STYLE ) :
 (bListStyle ? 
OUString(com.sun.star.style.NumberingStyle) : rPropNameSupplier.GetName( 
PROP_SERVICE_CHAR_STYLE ))),
 uno::UNO_QUERY_THROW);
+
+// Numbering styles have to be inserted early, as e.g. 
the NumberingRules property is only available after insertion.
+if (bListStyle)
+{
+xStyles-insertByName( sConvertedStyleName, 
uno::makeAny( xStyle ) );
+
xStyle.set(xStyles-getByName(sConvertedStyleName), uno::UNO_QUERY_THROW);
+
+StyleSheetPropertyMap* pPropertyMap = 
dynamic_castStyleSheetPropertyMap*(pEntry-pProperties.get());
+if (pPropertyMap-GetListId() == -1)
+{
+// No properties? Word default is 'none', 
Writer one is 'arabic', handle this.
+uno::Referencebeans::XPropertySet 
xPropertySet(xStyle, uno::UNO_QUERY_THROW);
+uno::Referencecontainer::XIndexReplace 
xNumberingRules;
+
xPropertySet-getPropertyValue(NumberingRules) = xNumberingRules;
+uno::Referencecontainer::XIndexAccess 
xIndexAccess(xNumberingRules, uno::UNO_QUERY_THROW);
+for (sal_Int32 i = 0; i  
xIndexAccess-getCount(); ++i)
+{
+uno::Sequence beans::PropertyValue  
aLvlProps(1);
+aLvlProps[0].Name = NumberingType;
+aLvlProps[0].Value = 
style::NumberingType::NUMBER_NONE;
+xNumberingRules-replaceByIndex(i, 
uno::makeAny(aLvlProps));
+
xPropertySet-setPropertyValue(NumberingRules, uno::makeAny(xNumberingRules));
+}
+}
+}
 }
 if( !pEntry-sBaseStyleIdentifier.isEmpty() )
 {
@@ -1015,7 +1040,8 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr 
rFontTable )
 OSL_FAIL( Some style properties could not be 
set);
 }
 }
-if(bInsert)
+// Numbering style got inserted earlier.
+if(bInsert  !bListStyle)
 {
 xStyles-insertByName( sConvertedStyleName, 
uno::makeAny( xStyle) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 3 commits - chart2/source include/oox oox/source sc/source

2013-10-17 Thread Muthu Subramanian

 chart2/source/view/axes/VCartesianAxis.cxx |8 
 include/oox/core/xmlfilterbase.hxx |3 +++
 oox/source/drawingml/shape.cxx |   15 +++
 sc/source/filter/inc/excelfilter.hxx   |1 +
 sc/source/filter/inc/workbookhelper.hxx|4 +++-
 sc/source/filter/oox/excelfilter.cxx   |5 +
 sc/source/filter/oox/workbookhelper.cxx|   21 ++---
 7 files changed, 53 insertions(+), 4 deletions(-)

New commits:
commit 1328bc86b724980ceee39f5a38bcb6f1989ff2da
Author: Muthu Subramanian sumu...@suse.com
Date:   Tue Jul 9 14:00:21 2013 +0530

n#819822: Crash fix, check validity.

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index a929262..64a7ab5 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -717,7 +717,7 @@ void Shape::finalizeXShape( XmlFilterBase rFilter, const 
Reference XShapes 
 {
 Reference chart2::data::XDataReceiver  xDataRec( 
xChartDoc, UNO_QUERY );
 Reference chart2::data::XDataSource  xData( 
xDataRec-getUsedData(), UNO_QUERY );
-if( 
xData-getDataSequences()[0]-getValues()-getData().getLength() = 0 )
+if( xData-getDataSequences().getLength() = 0 || 
xData-getDataSequences()[0]-getValues()-getData().getLength() = 0 )
 {
 rFilter.useInternalChartDataTable( true );
 rFilter.getChartConverter()-convertFromModel( 
rFilter, aModel, xChartDoc, xExternalPage, mxShape-getPosition(), 
mxShape-getSize() );
commit 4db2664536d5d442775f05c4e013f04405b13150
Author: Muthu Subramanian sumu...@suse.com
Date:   Tue Jul 9 13:31:16 2013 +0530

n#819822: XLSX Chart import with internal data table.

When the import with xlsx ranges fail - try with
internal data table.

diff --git a/include/oox/core/xmlfilterbase.hxx 
b/include/oox/core/xmlfilterbase.hxx
index 4b5c1e0..5bddea4 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -90,6 +90,9 @@ public:
 converter object, that should be global per imported document. */
 virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() = 0;
 
+/** Helper to switch chart data table - specifically for xlsx imports */
+ virtual void useInternalChartDataTable( bool /*bInternal*/ ) { }
+
 /** Has to be implemented by each filter to return the table style list. */
 virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() 
= 0;
 
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 9715973..a929262 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -52,6 +52,7 @@
 #include basegfx/polygon/b2dpolygon.hxx
 #include basegfx/matrix/b2dhommatrix.hxx
 #include com/sun/star/document/XActionLockable.hpp
+#include com/sun/star/chart2/data/XDataReceiver.hpp
 
 using namespace ::oox::core;
 using namespace ::com::sun::star;
@@ -710,7 +711,21 @@ void Shape::finalizeXShape( XmlFilterBase rFilter, const 
Reference XShapes 
 if( !mxChartShapeInfo-mbEmbedShapes )
 xExternalPage = rxShapes;
 if( rFilter.getChartConverter() )
+{
 rFilter.getChartConverter()-convertFromModel( rFilter, 
aModel, xChartDoc, xExternalPage, mxShape-getPosition(), mxShape-getSize() );
+if( !xChartDoc-hasInternalDataProvider() )
+{
+Reference chart2::data::XDataReceiver  xDataRec( 
xChartDoc, UNO_QUERY );
+Reference chart2::data::XDataSource  xData( 
xDataRec-getUsedData(), UNO_QUERY );
+if( 
xData-getDataSequences()[0]-getValues()-getData().getLength() = 0 )
+{
+rFilter.useInternalChartDataTable( true );
+rFilter.getChartConverter()-convertFromModel( 
rFilter, aModel, xChartDoc, xExternalPage, mxShape-getPosition(), 
mxShape-getSize() );
+rFilter.useInternalChartDataTable( false );
+}
+}
+
+}
 }
 catch( Exception )
 {
diff --git a/sc/source/filter/inc/excelfilter.hxx 
b/sc/source/filter/inc/excelfilter.hxx
index fc108c3..de7d6df 100644
--- a/sc/source/filter/inc/excelfilter.hxx
+++ b/sc/source/filter/inc/excelfilter.hxx
@@ -61,6 +61,7 @@ public:
 virtual ::oox::vml::Drawing* getVmlDrawing();
 virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles();
 virtual ::oox::drawingml::chart::ChartConverter* getChartConverter();
+virtual void useInternalChartDataTable( bool bInternal );
 
 virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence 
::com::sun::star::beans::PropertyValue

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - chart2/source

2013-10-17 Thread Muthu Subramanian

 chart2/source/view/main/VLegend.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 7f7853f5165423b990eae3229dc8edad206433e3
Author: Muthu Subramanian sumu...@suse.com
Date:   Thu Jul 25 11:19:53 2013 +0530

n#827332: Charts shrink when there are no legends.

diff --git a/chart2/source/view/main/VLegend.cxx 
b/chart2/source/view/main/VLegend.cxx
index 2bc9a65..6296c01 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -944,12 +944,14 @@ void VLegend::createShapes(
 
 bool bSymbolsLeftSide = lcl_shouldSymbolsBePlacedOnTheLeftSide( 
xLegendProp, m_nDefaultWritingMode );
 
-// place entries
-aLegendSize = lcl_placeLegendEntries( aViewEntries, eExpansion, 
bSymbolsLeftSide, fViewFontSize, aMaxSymbolExtent
-, aTextProperties, xLegendContainer, m_xShapeFactory, 
aLegendSize );
+if( aViewEntries.size() ) {
+// place entries
+aLegendSize = lcl_placeLegendEntries( aViewEntries, 
eExpansion, bSymbolsLeftSide, fViewFontSize, aMaxSymbolExtent,
+  aTextProperties, 
xLegendContainer, m_xShapeFactory, aLegendSize );
 
-if( xBorder.is() )
-xBorder-setSize( aLegendSize );
+if( xBorder.is() )
+xBorder-setSize( aLegendSize );
+}
 }
 }
 catch( const uno::Exception  ex )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - oox/source

2013-10-17 Thread Muthu Subramanian

 oox/source/drawingml/chart/axisconverter.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit f0e7e96f4f65af8dd0f74e43a092171391bcbeb5
Author: Muthu Subramanian sumu...@collabora.com
Date:   Wed Sep 11 21:41:43 2013 +0530

n#834720: Labels wrongly interpreted as dates.

If the numFormat is available we should probably use that.

diff --git a/oox/source/drawingml/chart/axisconverter.cxx 
b/oox/source/drawingml/chart/axisconverter.cxx
index dfc08b8..da1a732 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -310,10 +310,8 @@ void AxisConverter::convertFromModel( const Reference 
XCoordinateSystem  rxCo
 {
 bool bPercent = false;
 if( mrModel.maNumberFormat.maFormatCode.indexOf('%') = 0)
-{
-mrModel.maNumberFormat.mbSourceLinked = false;
 bPercent = true;
-}
+mrModel.maNumberFormat.mbSourceLinked = false;
 getFormatter().convertNumberFormat( aAxisProp, 
mrModel.maNumberFormat, bPercent );
 }
 
commit da7ab1cf6183194eee55a012a2113f9c09c61158
Author: Muthu Subramanian sumu...@suse.com
Date:   Mon Sep 9 21:05:42 2013 +0530

n#834722: Chart shown flipped.

Auto and manual axis positioning seems to cause a problem.
Needs to be tested with more charts.

diff --git a/oox/source/drawingml/chart/axisconverter.cxx 
b/oox/source/drawingml/chart/axisconverter.cxx
index 1f725d6..dfc08b8 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -327,7 +327,8 @@ void AxisConverter::convertFromModel( const Reference 
XCoordinateSystem  rxCo
 case XML_max:   eAxisPos = cssc::ChartAxisPosition_END; 
break;
 case XML_autoZero:  eAxisPos = cssc::ChartAxisPosition_VALUE;   
break;
 }
-aAxisProp.setProperty( PROP_CrossoverPosition, eAxisPos );
+if( !mrModel.mbAuto )
+aAxisProp.setProperty( PROP_CrossoverPosition, eAxisPos );
 
 // calculate automatic origin depending on scaling mode of crossing 
axis
 bool bCrossingLogScale = pCrossingAxis  lclIsLogarithmicScale( 
*pCrossingAxis );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - configmgr/Library_configmgr.mk configmgr/source scp2/source

2013-10-17 Thread Janos Farago

 configmgr/Library_configmgr.mk|5 
 configmgr/source/components.cxx   |   23 +++
 configmgr/source/winreg.cxx   |  235 ++
 configmgr/source/winreg.hxx   |   22 +++
 configmgr/source/writemodfile.cxx |5 
 configmgr/source/writemodfile.hxx |4 
 scp2/source/ooo/common_brand.scp  |4 
 7 files changed, 291 insertions(+), 7 deletions(-)

New commits:
commit 2f0208dc68670023b0afeffd3a4b84a2ea1426bd
Author: Janos Farago farago.ja...@andrews.hu
Date:   Sun Sep 29 15:03:53 2013 +0200

winreg backend: add support for oor:op in config nodes

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

diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx
index b68b9d2..2969598 100644
--- a/configmgr/source/winreg.cxx
+++ b/configmgr/source/winreg.cxx
@@ -36,18 +36,39 @@ namespace configmgr {
 
 namespace {
 // This is not a generic registry reader. We assume the following structure:
-// Last element of Key becomes prop, first part is the path.
+// Last element of Key becomes prop, first part is the path and optionally 
nodes,
+// when the node has oor:op attribute.
 // Values can be the following: Value (string) and Final (dword, optional)
+//
 // For example the following registry setting:
 // 
[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\LibreOffice\org.openoffice.UserProfile\Data\o]
 // Value=Example Corp.
 // Final=dword:0001
 // becomes the following in configuration:
+// !-- set the Company name --
 // item oor:path=/org.openoffice.UserProfile/Data
 // prop oor:name=o oor:finalized=true
 // valueExample Corp./value
 // /prop
 // /item
+//
+// Another example:
+// 
[HKEY_LOCAL_MACHINE\Policies\LibreOffice\org.openoffice.Office.OptionsDialog\OptionsDialogGroups\ProductName/#fuse\Pages\AboutConfig/#fuse\Hide]
+// Value=true
+// becomes the following in configuration:
+// !-- Hide Tools - Options - LibreOffice - Expert Config panel --
+// item oor:path=/org.openoffice.Office.OptionsDialog/OptionsDialogGroups
+// node oor:name=ProductName oor:op=fuse
+// node oor:name=Pages
+// node oor:name=AboutConfig oor:op=fuse
+// prop oor:name=Hide
+// valuetrue/value
+// /prop
+// /node
+// /node
+// /node
+// /item
+
 void dumpWindowsRegistryKey(HKEY hKey, OUString aKeyName, oslFileHandle 
aFileHandle)
 {
 HKEY hCurKey;
@@ -107,19 +128,59 @@ void dumpWindowsRegistryKey(HKEY hKey, OUString aKeyName, 
oslFileHandle aFileHan
 bFinal = true;
 }
 sal_Int32 aLastSeparator = aKeyName.lastIndexOf('\\');
-OUString aPath = aKeyName.replaceAll(\\,/).copy(0, 
aLastSeparator);
+OUString aPathAndNodes = aKeyName.copy(0, aLastSeparator);
 OUString aProp = aKeyName.copy(aLastSeparator + 1);
+bool bHasNode = false;
+sal_Int32 nCloseNode = 0;
+
+writeData(aFileHandle, item oor:path=\);
+for(sal_Int32 nIndex = 0;; ++nIndex)
+{
+OUString aNextPathPart = aPathAndNodes.getToken(nIndex, 
'\\');
+
+if(!aNextPathPart.isEmpty())
+{
+if((aNextPathPart.lastIndexOf(/#) != -1) || bHasNode)
+{
+bHasNode = true;
+nCloseNode++;
+writeData(aFileHandle, \node oor:name=\);
+sal_Int32 nCommandSeparator = 
aNextPathPart.lastIndexOf('#');
+if(nCommandSeparator != -1)
+{
+OUString aNodeOp = 
aNextPathPart.copy(nCommandSeparator + 1);
+writeAttributeValue(aFileHandle, 
aNextPathPart.copy(0, nCommandSeparator - 1));
+writeData(aFileHandle, \ oor:op=\);
+writeAttributeValue(aFileHandle, aNodeOp);
+}
+else
+{
+writeAttributeValue(aFileHandle, 
aNextPathPart);
+}
+}
+else
+{
+writeAttributeValue(aFileHandle, / + 
aNextPathPart);
+}
+}
+else
+{
+writeData(aFileHandle, \);
+break;
+}
+}
 
-writeData(aFileHandle, item oor:path=\/);
-writeAttributeValue(aFileHandle, aPath);
-

[Libreoffice-commits] core.git: desktop/CustomTarget_desktop_unopackages_install.mk desktop/GeneratedPackage_desktop_unopackages_install.mk desktop/Module_desktop.mk

2013-10-17 Thread Stephan Bergmann

 desktop/CustomTarget_desktop_unopackages_install.mk |   19 
 desktop/GeneratedPackage_desktop_unopackages_install.mk |   16 +
 desktop/Module_desktop.mk   |2 +
 3 files changed, 37 insertions(+)

New commits:
commit 6fe26facd06d4d1e5e37384d25d83209209229fa
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 17 14:29:00 2013 +0200

Produce empty share/uno_packages/cache/uno_packages/ hier in instdir, too

...though the way to do it is probably somewhat overblown...

Change-Id: I9b0da2913e0584eaf7d2ec98d1a29e1d78533d51

diff --git a/desktop/CustomTarget_desktop_unopackages_install.mk 
b/desktop/CustomTarget_desktop_unopackages_install.mk
new file mode 100644
index 000..f16845f
--- /dev/null
+++ b/desktop/CustomTarget_desktop_unopackages_install.mk
@@ -0,0 +1,19 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,desktop/unopackages_install))
+
+$(call gb_CustomTarget_get_target,desktop/unopackages_install) : | \
+$(call 
gb_CustomTarget_get_workdir,desktop/unopackages_install)/uno_packages/cache/uno_packages
+
+$(call 
gb_CustomTarget_get_workdir,desktop/unopackages_install)/uno_packages/cache/uno_packages
 : | \
+$(call gb_CustomTarget_get_workdir,desktop/unopackages_install)/.dir
+   mkdir -p $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/GeneratedPackage_desktop_unopackages_install.mk 
b/desktop/GeneratedPackage_desktop_unopackages_install.mk
new file mode 100644
index 000..243396c
--- /dev/null
+++ b/desktop/GeneratedPackage_desktop_unopackages_install.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call 
gb_GeneratedPackage_GeneratedPackage,desktop_unopackages_install,$(call 
gb_CustomTarget_get_workdir,desktop/unopackages_install)))
+
+$(eval $(call 
gb_GeneratedPackage_use_customtarget,desktop_unopackages_install,desktop/unopackages_install))
+
+$(eval $(call 
gb_GeneratedPackage_add_dir,desktop_unopackages_install,$(INSTROOT)/share/uno_packages,uno_packages))
+
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 8c1dd94..e13e8fc 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_Module_add_targets,desktop,\
 AllLangResTarget_deployment \
 AllLangResTarget_deploymentgui \
 AllLangResTarget_dkt \
+CustomTarget_desktop_unopackages_install \
+GeneratedPackage_desktop_unopackages_install \
 Library_deployment \
 Library_deploymentgui \
 Library_deploymentmisc \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - basic/source comphelper/source configmgr/source dbaccess/source oox/source svl/source svtools/source

2013-10-17 Thread Stephan Bergmann

 basic/source/uno/namecont.cxx |   15 
+--
 comphelper/source/container/enumerablemap.cxx |8 +---
 comphelper/source/misc/documentiologring.cxx  |   13 +-
 comphelper/source/misc/ihwrapnofilter.cxx |   12 +-
 comphelper/source/misc/instancelocker.cxx |   13 +-
 comphelper/source/misc/officerestartmanager.cxx   |   12 +-
 comphelper/source/officeinstdir/officeinstallationdirectories.cxx |   14 
+--
 comphelper/source/property/genericpropertyset.cxx |   11 +
 comphelper/source/property/opropertybag.cxx   |7 +--
 comphelper/source/streaming/seqinputstreamserv.cxx|8 +---
 comphelper/source/streaming/seqoutputstreamserv.cxx   |8 +---
 configmgr/source/access.cxx   |   12 +-
 dbaccess/source/core/misc/DatabaseDataProvider.cxx|4 +-
 dbaccess/source/filter/xml/dbloader2.cxx  |9 +---
 dbaccess/source/sdbtools/connection/connectiontools.cxx   |6 +--
 dbaccess/source/ui/browser/dbloader.cxx   |9 +---
 dbaccess/source/ui/browser/genericcontroller.cxx  |   10 +
 oox/source/core/fasttokenhandler.cxx  |   16 
+---
 oox/source/core/filterdetect.cxx  |6 +--
 oox/source/docprop/ooxmldocpropimport.cxx |   19 
+-
 svl/source/fsstor/fsfactory.cxx   |9 +---
 svtools/source/graphic/descriptor.cxx |   12 +-
 svtools/source/graphic/renderer.cxx   |   12 +-
 svtools/source/hatchwindow/documentcloser.cxx |   15 
+--
 svtools/source/hatchwindow/hatchwindowfactory.cxx |   14 
+--
 svtools/source/uno/genericunodialog.cxx   |9 +---
 svtools/source/uno/popupmenucontrollerbase.cxx|   17 
+---
 svtools/source/uno/popupwindowcontroller.cxx  |   11 +
 svtools/source/uno/unoimap.cxx|   12 +-
 29 files changed, 60 insertions(+), 263 deletions(-)

New commits:
commit 2d1675c3adbd3f3ff4b0d6815c88938ed775b9b2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 17 15:03:50 2013 +0200

The getSupportedServiceNames implementations will already take care

Change-Id: I0c7ae8e0393f069259b943e04368e874abdf8386

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index fa71d36..5ad7de4 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -2971,7 +2971,6 @@ void SAL_CALL 
SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifie
 sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const OUString 
_rServiceName )
 throw (RuntimeException)
 {
-LibraryContainerMethodGuard aGuard( *this );
 return cppu::supportsService(this, _rServiceName);
 }
 
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 7ee8a03..2b047df 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -72,8 +72,8 @@
 #include comphelper/sequenceasvector.hxx
 #include cppu/unotype.hxx
 #include cppuhelper/queryinterface.hxx
+#include cppuhelper/supportsservice.hxx
 #include cppuhelper/weak.hxx
-#include cppuhelper/supportsservice.hxx
 #include osl/interlck.h
 #include osl/mutex.hxx
 #include rtl/ref.hxx
@@ -222,9 +222,6 @@ OUString Access::getImplementationName() throw 
(css::uno::RuntimeException)
 sal_Bool Access::supportsService(OUString const  ServiceName)
 throw (css::uno::RuntimeException)
 {
-assert(thisIs(IS_ANY));
-osl::MutexGuard g(*lock_);
-checkLocalizedPropertyAccess();
 return cppu::supportsService(this, ServiceName);
 }
 
commit 3d3293144b0e0d2d28136b1b2c7154d6352463b8
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Wed Oct 16 19:25:05 2013 -0300

fdo#54938: Adapt svtools and comphelper module ...

to  use cppu::supportsService and other pieces.

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

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 70e88d3..fa71d36 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -61,6 +61,7 @@
 #include com/sun/star/deployment/ExtensionManager.hpp
 #include comphelper/storagehelper.hxx
 #include cppuhelper/exc_hlp.hxx
+#include cppuhelper/supportsservice.hxx
 #include basic/sbmod.hxx
 #include boost/scoped_ptr.hpp
 
@@ -2971,20 +2972,9 @@ sal_Bool SAL_CALL SfxLibraryContainer::supportsService( 
const OUString _rServic
 throw (RuntimeException)
 {
 LibraryContainerMethodGuard

[Bug 54938] Adapt supportsService implementations to cppu::supportsService

2013-10-17 Thread bugzilla-daemon

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

--- Comment #4 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Marcos Paulo de Souza committed a patch related to this issue.
It has been pushed to master:

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

fdo#54938: Adapt svtools and comphelper module ...



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

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

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-10-17 Thread bugzilla-daemon

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

Bug 54157 depends on bug 40594, which changed state.

Bug 40594 Summary: FILEOPEN .docx (MSO2010) does not show CHART object
https://bugs.freedesktop.org/show_bug.cgi?id=40594

   What|Removed |Added

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

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

[Libreoffice-commits] core.git: 2 commits - include/svx include/tools reportdesign/source sw/source tools/source

2013-10-17 Thread Thomas Arnhold

 include/svx/fontworkgallery.hxx|1 
 include/svx/tbcontrl.hxx   |1 
 include/tools/string.hxx   |5 --
 reportdesign/source/core/sdr/UndoActions.cxx   |5 +-
 reportdesign/source/ui/inc/StartMarker.hxx |2 -
 reportdesign/source/ui/report/ReportController.cxx |   10 ++---
 reportdesign/source/ui/report/SectionWindow.cxx|6 +--
 reportdesign/source/ui/report/StartMarker.cxx  |2 -
 sw/source/core/view/printdata.cxx  |5 +-
 tools/source/string/tustring.cxx   |   36 -
 10 files changed, 13 insertions(+), 60 deletions(-)

New commits:
commit c65eb7e56934b22f9bea68e62c0a51fd59869f1c
Author: Thomas Arnhold tho...@arnhold.org
Date:   Thu Oct 17 11:43:40 2013 +0200

Related: fdo#38838 remove String::SearchAndReplace

Change-Id: I1cc52d0be360b05e722a18b3ca5d08b2b0b0842d

diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 8441ac0..f8a9d88 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -233,11 +233,6 @@ public:
 xub_StrLen  Search( sal_Unicode c, xub_StrLen nIndex = 0 ) const;
 xub_StrLen  Search( const UniString rStr, xub_StrLen nIndex = 0 ) 
const;
 
-xub_StrLen  SearchAndReplace( sal_Unicode c, sal_Unicode cRep,
-  xub_StrLen nIndex = 0 );
-xub_StrLen  SearchAndReplace( const UniString rStr, const 
UniString rRepStr,
-  xub_StrLen nIndex = 0 );
-
 UniString   GetToken( xub_StrLen nToken, sal_Unicode cTok, 
sal_Int32 rIndex ) const;
 UniString   GetToken( xub_StrLen nToken, sal_Unicode cTok = ';' ) 
const;
 
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx 
b/reportdesign/source/core/sdr/UndoActions.cxx
index 943a5e3..b430337 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -392,10 +392,9 @@ void ORptUndoPropertyAction::setProperty(sal_Bool _bOld)
 
 OUString ORptUndoPropertyAction::GetComment() const
 {
-String aStr(ModuleRes(RID_STR_UNDO_PROPERTY).toString());
+OUString aStr( ModuleRes(RID_STR_UNDO_PROPERTY).toString() );
 
-aStr.SearchAndReplace(OUString('#'), m_aPropertyName);
-return aStr;
+return aStr.replaceFirst(#, m_aPropertyName);
 }
 
 OUndoPropertyGroupSectionAction::OUndoPropertyGroupSectionAction(SdrModel 
_rMod
diff --git a/reportdesign/source/ui/inc/StartMarker.hxx 
b/reportdesign/source/ui/inc/StartMarker.hxx
index 0c3115c..77e2fa8 100644
--- a/reportdesign/source/ui/inc/StartMarker.hxx
+++ b/reportdesign/source/ui/inc/StartMarker.hxx
@@ -60,7 +60,7 @@ namespace rptui
 virtual voidRequestHelp( const HelpEvent rHEvt );
 using Window::Notify;
 
-voidsetTitle(const String _sTitle);
+voidsetTitle(const OUString _sTitle);
 sal_Int32   getMinHeight() const;
 
 /** shows or hides the ruler.
diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index 7741b49..146e01f 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3281,15 +3281,13 @@ void OReportController::createPageNumber(const 
Sequence PropertyValue  _aArgs
 SequenceAsHashMap aMap(_aArgs);
 sal_Bool bStateOfPage = 
aMap.getUnpackedValueOrDefault(PROPERTY_STATE,sal_False);
 
-String sFunction = String(ModuleRes(STR_RPT_PN_PAGE));
-OUString sPageNumber(PageNumber());
-sFunction.SearchAndReplace(OUString(#PAGENUMBER#),sPageNumber);
+OUString sFunction( ModuleRes(STR_RPT_PN_PAGE).toString() );
+sFunction = sFunction.replaceFirst(#PAGENUMBER#, PageNumber());
 
 if ( bStateOfPage )
 {
-OUString sPageCount(PageCount());
-sFunction += String(ModuleRes(STR_RPT_PN_PAGE_OF));
-sFunction.SearchAndReplace(OUString(#PAGECOUNT#),sPageCount);
+sFunction += ModuleRes(STR_RPT_PN_PAGE_OF).toString();
+sFunction = sFunction.replaceFirst(#PAGECOUNT#, PageCount());
 }
 
 sal_Bool bInPageHeader = 
aMap.getUnpackedValueOrDefault(PROPERTY_PAGEHEADERON,sal_True);
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx 
b/reportdesign/source/ui/report/SectionWindow.cxx
index 3dbc65f..96e03c3 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -184,9 +184,9 @@ bool OSectionWindow::setGroupSectionTitle(const 
uno::Reference report::XGroup
 sExpression = sLabel;
 }
 
-String sTitle = ModuleRes(_nResId).toString();
-sTitle.SearchAndReplace(OUString('#') ,sExpression);
-m_aStartMarker.setTitle(sTitle);
+OUString sTitle( ModuleRes(_nResId).toString() );
+sTitle = sTitle.replaceFirst(#,

Re: [Libreoffice-commits] bogus WaE: 'bValue' may be used uninitialized in this function

2013-10-17 Thread Stephan Bergmann

In cases like the below, I usually settle on the compromise of 
explicitly value-initializing the variable v of (fundamental) type T with


  T v = T();

(maybe even adding a comment like // avoid warnings), which keeps 
compilers happy but still makes it clear to the reader not to assume v 
is deliberately assigned a specific value at that point, which is the 
problem with a hack like


  bool bValue = false;

Stephan

On 10/17/2013 04:07 AM, Lionel Elie Mamane wrote:

commit 9d5e05edb20819e7b989f366fbd86ca4c2cd7cc5
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Oct 17 04:06:24 2013 +0200

 bogus WaE: 'bValue' may be used uninitialized in this function

 Change-Id: I14983509a41bd6be0d7fed29d7f89fa4a21fe08a

diff --git a/forms/source/component/CheckBox.cxx 
b/forms/source/component/CheckBox.cxx
index 5198ccc..5db7397 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -217,7 +217,7 @@ Any OCheckBoxModel::translateDbColumnToControlValue()

  //
  // Set value in ControlModel
-bool bValue = false;
+bool bValue;
  if(DbUseBool())
  {
  bValue = m_xColumn-getBoolean();
@@ -241,7 +241,17 @@ Any OCheckBoxModel::translateDbColumnToControlValue()
  }
  else if ( !aValue.hasValue() )
  {
+// Since above either bValue is initialised, either aValue.hasValue(),
+// bValue cannot be used uninitialised here.
+// But GCC does not see/understand that, which breaks -Werror builds.
+#if defined __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored -Wmaybe-uninitialized
+#endif
  aValue = (sal_Int16)( bValue ? STATE_CHECK : STATE_NOCHECK );
+#if defined __GNUC__
+#pragma GCC diagnostic pop
+#endif
  }

  return aValue;

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

[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.

2013-10-17 Thread bugzilla-daemon

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

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

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

Related: fdo#38838 remove String::SearchAndReplace



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

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

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

2013-10-17 Thread Stephan Bergmann

 desktop/scripts/unopkg.sh |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 1fc195f7e830619d56cc4c56043b154bc3a72b02
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 17 15:34:53 2013 +0200

Simplify code (VERBOSE was unused)

Change-Id: I281be165fe110fee3e174e96e11cdbc4aa5671e0

diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 846c2eb..d16d226 100755
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -59,15 +59,11 @@ for arg in $@
 do
   case $arg in
-env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS $arg;;
-   -v) VERBOSE=true;;
-   --verbose) VERBOSE=true;;
-   --shared) SHARED=true;;
+   --shared) umask 0022;;
+   # make sure shared extensions will be readable by all users
   esac
 done
 
-#make sure shared extensions will be readable by all users
-[ $SHARED = true ]  umask 0022
-
 # extend the ld_library_path for java: javaldx checks the sofficerc for us
 if [ -x $sd_prog/../ure-link/bin/javaldx ] ; then
 my_path=`$sd_prog/../ure-link/bin/javaldx $BOOTSTRAPVARS \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-17 Thread Lionel Elie Mamane

 forms/source/component/CheckBox.cxx |   14 +++---
 1 file changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 080e9c298738988f36df43b8edd7b6e7bf4224cf
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Oct 17 16:00:07 2013 +0200

bogus WaE: 'bValue' may be used uninitialized in this function

Change-Id: Ifde0f9370d093f447edac4899c5bbc7940da5a8c

diff --git a/forms/source/component/CheckBox.cxx 
b/forms/source/component/CheckBox.cxx
index 4796729..04a5399 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -211,17 +211,13 @@ bool OCheckBoxModel::DbUseBool()
 }
 
 
//--
-#if defined __GNUC__  ! defined __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored -Wmaybe-uninitialized
-#endif
 Any OCheckBoxModel::translateDbColumnToControlValue()
 {
 Any aValue;
 
 //
 // Set value in ControlModel
-bool bValue;
+bool bValue = bool(); // avoid warning
 if(DbUseBool())
 {
 bValue = m_xColumn-getBoolean();
@@ -247,17 +243,13 @@ Any OCheckBoxModel::translateDbColumnToControlValue()
 {
 // Since above either bValue is initialised, either aValue.hasValue(),
 // bValue cannot be used uninitialised here.
-// But GCC does not see/understand that, which breaks -Werror builds.
-// And Clang compiler does not support #pragma GCC diagnostic
-// within a function, moved them to outside the function.
+// But GCC does not see/understand that, which breaks -Werror builds,
+// so we explicitly default-initialise it.
 aValue = (sal_Int16)( bValue ? STATE_CHECK : STATE_NOCHECK );
 }
 
 return aValue;
 }
-#if defined __GNUC__  ! defined __clang__
-#pragma GCC diagnostic pop
-#endif
 
 //-
 sal_Bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-17 Thread Lionel Elie Mamane

 connectivity/source/commontools/FValue.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a1c600098413725540e2219369dab3134e19920a
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Oct 17 16:20:19 2013 +0200

per SQL standard, BIT is 0/1 but BOOLEAN is true/false

Change-Id: If088cd33c19bccddbf145a44d19bf37adf638f3b

diff --git a/connectivity/source/commontools/FValue.cxx 
b/connectivity/source/commontools/FValue.cxx
index 46fe62f..0a4a880 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -1021,6 +1021,8 @@ OUString ORowSetValue::getString( ) const
 }
 break;
 case DataType::BIT:
+aRet = OUString::number(static_castbool(*this));
+break;
 case DataType::BOOLEAN:
 aRet = OUString::boolean(static_castbool(*this));
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-17 Thread Lionel Elie Mamane

 source/auxiliary/sbasic.tree |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e4a53e8dd344207f81e1a06db8db153883fddcb3
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Sep 10 16:20:15 2013 +0200

add DateAdd to index of all Basic functions

Change-Id: I822dffb39e12a3bc8702e3bb50d22bbd3dfa2eaf
Reviewed-on: https://gerrit.libreoffice.org/5900
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu

diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index c04ca39..0e39d32 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -88,6 +88,7 @@
 topic id=sbasic/text/sbasic/shared/03131600.xhpCreateUnoService Function 
[Runtime]/topic
 topic id=sbasic/text/sbasic/shared/03131500.xhpCreateUnoStruct Function 
[Runtime]/topic
 topic id=sbasic/text/sbasic/shared/03020403.xhpCurDir Function 
[Runtime]/topic
+topic id=sbasic/text/sbasic/shared/03030110.xhpDateAdd Function 
[Runtime]/topic
 topic id=sbasic/text/sbasic/shared/03030101.xhpDateSerial Function 
[Runtime]/topic
 topic id=sbasic/text/sbasic/shared/03030102.xhpDateValue Function 
[Runtime]/topic
 topic id=sbasic/text/sbasic/shared/03030301.xhpDate Statement 
[Runtime]/topic
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2013-10-17 Thread Lionel Elie Mamane

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

New commits:
commit 647d766c328668a1ab404fb464970647a3916e28
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Tue Sep 10 16:20:15 2013 +0200

Updated core
Project: help  e4a53e8dd344207f81e1a06db8db153883fddcb3

add DateAdd to index of all Basic functions

Change-Id: I822dffb39e12a3bc8702e3bb50d22bbd3dfa2eaf
Reviewed-on: https://gerrit.libreoffice.org/5900
Reviewed-by: Lionel Elie Mamane lio...@mamane.lu
Tested-by: Lionel Elie Mamane lio...@mamane.lu

diff --git a/helpcontent2 b/helpcontent2
index 5158a59..e4a53e8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5158a5975dcc23ec1bb3dcd92fbfb5da03155596
+Subproject commit e4a53e8dd344207f81e1a06db8db153883fddcb3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

2013-10-17 Thread Caolán McNamara

* Present: Robinson, Stephan, Miklos, Lionel, Eike, David, Caolan,
Kendy, Bjoern, Eilidh

* FOSDEM:
  + Add abstracts to
  https://wiki.documentfoundation.org/Marketing/Events/Fosdem2014/talks
  + Target is short technical talks to squeeze as many of you as
possible
  into our limited time.

* Completed Action Items
  + mail out list of potentially obsolete branches (Michael)
  + create easy-hack to indentify good places for unit tests: (Bjoern)
[ done  script is implemented, with output here:
 https://wiki.documentfoundation.org/Development/RegressionHotspots
  and new easy-hack filed for creating new tests ]
  + design-team raising template concerns, address these if possible 
push (Ahmad)
[ re concerns: no objections on last design ]
  + point Cloph at bug-triager / credits script in dev-tools for release
notes (Bjoern)
  + QA team / prioritise un-tagging unconfirmed/needinfo
   'regression' (Robinson)
  + 90 - 45

* Dropped Action Items:
  + transition and automate api.libreoffice.org inside a VM for Cloph
  (Lionel)
+ Not on the scale of a week or two, migrate this to longer-term
bugzilla issue

* Pending Action Items:
  + find better way to export from Coverity categories of non-security
critical bugs (Caolan)
+ In progress. Works in theory, but in practice slow and due to
network issues practical limit of just a few hundred
  + Include new C* font google replacements into vanilla install
(Caolan)
  + New templates (Ahmad)
+ Template has to be hard-coded in code. Ideally as real documents.
  - Try hard-coding and look into a better more flexible long term
  solution.
  + setup infrastructure to build bibisect repos (Cloph / Bjoern /
Norbert)
  + The ubuntu one is now up to date again, will be published in a
  few days, can use that until status of documentfoundation bibisect
  builds is clarified
  + produce a VM for the load / crash regressions (Cloph / Markus)
  + partition document test loads / run them on tinderboxen (Norbert)
  + produce a VM with callgrind metrics (Matus)
  + create script to auto-mail users list for each API Change commit
(Bjoern/Stephan)
  + ask Florian for a minimal / simple solution for larger bug docs
(Robinson)
  + Work in progress. Got a place to put them, but some teething
problems.
  + get setup wrt. mobile app-store access (Cloph / Thorsten)
  + ask mobile app-authors wrt. freeze (Kendy)
  + not done
  + draw bugzilla migration threads together  propose funding to the
board (Robinson)
  + Call tomorrow about this. Get more input.

* Threaded fastsaxparser (Matus)
  + actually fast
  + 'free' parsing / string allocation in a thread
  + many allocations / frees per element / attribute killed
  + 20 seconds to load - 10 seconds oox filters
  + To merge after the call for 4.2.0

* FOSDEM dev-room talk roster roundup (Kendy)
  + Please submit talks for FOSDEM
  + We want to squeeze everyone in to the limited time we have, so 
  lots of technical short ones please.
  + Travel can covered by TDF
  + Where do we sent them ?
Add your abstracts to

https://wiki.documentfoundation.org/Marketing/Events/Fosdem2014/talks

* New Google C* font replacements / update (Caolan)
  + Now included in Fedora and RHEL
  + important for interoperability with MSOffice

* Filing good easy-hacks (Bjoern)
  + The best ones are explicitly created as easy hacks
rather than convert an existing bug. Too much clutter.

  + Re-targetting existing bugs without a nice, readable
subject / title is suboptimal.

* QA update (Robinson)
  + https://bugs.freedesktop.org/page.cgi?id=weekly-bug-summary.html
+128   -104 (+24 overall)
 many thanks to the top five bug squashers:
   Thomas Arnhold22
   Caolán McNamara9
   Jorendc8
   Maxim  7
   mariosv5

* QA stats:
* Open 4.2 MAB
  + 4/13 6/13 4/10 2/8 1/6 1/6 2/6 5/6 5/6 6/6 7/7 2/2
  + https://bugs.freedesktop.org/show_bug.cgi?id=65675

* Open 4.1 MAB
  + 20/103 18/100 17/99 15/96 14/93 12/91 14/91 17/89 15/85 15/81 13/77
8/68
 19%18%17%   16%   15%   13%   15%   19%   18%   19%   17%
12%
  +
https://bugs.freedesktop.org/showdependencytree.cgi?id=60270hide_resolved=1

* Open 4.0 MAB
  + 57/200 56/198 58/198 56/195 54/193 55/194 52/183 50/180 52/180
44/171
 29%29%29%29%28%29%28%28%29%26%
  +
https://bugs.freedesktop.org/showdependencytree.cgi?id=54157hide_resolved=1

* Bibisected bugs open: whiteboard 'bibsected'
  + 38/146 36/144 35/143 34/142 34/141 34/140 35/140 36/167 37/137
41/137
+ http://bit.ly/VQfF3Q
* all bugs tagged with 'regression'
+ 382(-2) bugs open of 2083(+13) total
* ~Component   count net *
   Writer - 113 (+3)
  Spreadsheet - 57 (+3)
  Libreoffice - 43 (-4)
 Presentation - 30 (-5)
  Crashes - 28 (-1)

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

2013-10-17 Thread Andras Timar

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 3dac8f65123aa6046e0e94c98faf0e9708a8cc98
Author: Andras Timar andras.ti...@collabora.com
Date:   Wed Oct 16 09:29:56 2013 +0200

fdo#69548 do not remove last space from hyperlink target

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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 5bd4e62..45cc5fe 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2155,14 +2155,10 @@ void FieldContext::AppendCommand(const OUString rPart)
 
 if (bInString)
 {
-if (bInStringNext)
-{
-sPart += OUString(' ');
-sPart += sToken;
-}
-else
+sPart += OUString(' ');
+sPart += sToken;
+if (!bInStringNext)
 {
-sPart += sToken;
 aResult.push_back(sPart);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-17 Thread Caolán McNamara

 include/tools/string.hxx  |5 +++--
 sw/source/core/doc/docnum.cxx |9 -
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d1563b818d335495a5591f5fd491fee77b47c93d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Oct 17 09:21:50 2013 +0100

Related: fdo#38838 make String::CompareTo private

Change-Id: Ibb17bb9e5df9fa9cf9abc4c05dc6ae8fa15b4058

diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index f8a9d88..ed3f42e 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -105,6 +105,9 @@ private:
 TOOLS_DLLPRIVATE inline void ImplCopyData();
 TOOLS_DLLPRIVATE inline sal_Unicode * ImplCopyStringData(sal_Unicode *);
 
+StringCompare   CompareTo( const UniString rStr,
+   xub_StrLen nLen = STRING_LEN ) const;
+
 UniString( const int* pDummy );// not implemented: 
to prevent UniString( NULL )
 UniString(int); // not implemented; to detect misuses 
of
 // UniString(sal_Unicode)
@@ -222,8 +225,6 @@ public:
 UniString  Erase( xub_StrLen nIndex = 0, xub_StrLen nCount = 
STRING_LEN );
 UniString   Copy( xub_StrLen nIndex = 0, xub_StrLen nCount = 
STRING_LEN ) const;
 
-StringCompare   CompareTo( const UniString rStr,
-   xub_StrLen nLen = STRING_LEN ) const;
 sal_BoolEquals( const UniString rStr ) const;
 sal_BoolEquals( const UniString rStr,
 xub_StrLen nIndex, xub_StrLen nLen ) const;
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index cc5b272..5a142ec 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -562,7 +562,7 @@ bool SwDoc::MoveOutlinePara( const SwPaM rPam, short 
nOffset )
 return MoveParagraph( aPam, nOffs, true );
 }
 
-static sal_uInt16 lcl_FindOutlineName( const SwNodes rNds, const String 
rName,
+static sal_uInt16 lcl_FindOutlineName( const SwNodes rNds, const OUString 
rName,
 bool bExact )
 {
 sal_uInt16 nSavePos = USHRT_MAX;
@@ -570,15 +570,14 @@ static sal_uInt16 lcl_FindOutlineName( const SwNodes 
rNds, const String rName,
 for( sal_uInt16 n = 0; n  rOutlNds.size(); ++n )
 {
 SwTxtNode* pTxtNd = rOutlNds[ n ]-GetTxtNode();
-String sTxt( pTxtNd-GetExpandTxt() );
-if( sTxt.Equals( rName ) )
+OUString sTxt( pTxtNd-GetExpandTxt() );
+if (sTxt == rName)
 {
 // Found exact, set Pos to the Node
 nSavePos = n;
 break;
 }
-else if( !bExact  USHRT_MAX == nSavePos 
-COMPARE_EQUAL == sTxt.CompareTo( rName, rName.Len()) )
+else if( !bExact  USHRT_MAX == nSavePos  sTxt.startsWith(rName) )
 {
 // maybe we just found the text's first part
 nSavePos = n;
___
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-6' - icu/icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch icu/makefile.mk

2013-10-17 Thread Eike Rathke

 icu/icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch |   43 +
 icu/makefile.mk|1 
 2 files changed, 44 insertions(+)

New commits:
commit 640e86b4ba06a7c8381857d79627ec43416d72b3
Author: Eike Rathke er...@redhat.com
Date:   Wed Oct 16 16:39:20 2013 +0200

Resolves: rhbz#1015594 CVE-2013-2924 use-after-free

Added icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch from
https://ssl.icu-project.org/trac/changeset/34076 assigned to
https://ssl.icu-project.org/trac/ticket/10318

Backported to 4-0 and ICU 49 from
970eca0d3040dbf61a9c91943b4b1281fdbcf48c

Change-Id: I33ba5569919878123909d032a0ed7bed43a4c549
Reviewed-on: https://gerrit.libreoffice.org/6271
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/icu/icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch 
b/icu/icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch
new file mode 100644
index 000..360a96c
--- /dev/null
+++ b/icu/icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch
@@ -0,0 +1,43 @@
+diff -ru orig.icu/source/i18n/csrucode.cpp icu/source/i18n/csrucode.cpp
+--- misc/build/orig.icu/source/i18n/csrucode.cpp   2012-04-05 
22:45:54.0 +0200
 misc/build/icu/source/i18n/csrucode.cpp2013-10-09 18:56:06.521791271 
+0200
+@@ -1,6 +1,6 @@
+ /*
+  **
+- *   Copyright (C) 2005-2006, International Business Machines
++ *   Copyright (C) 2005-2013, International Business Machines
+  *   Corporation and others.  All Rights Reserved.
+  **
+  */
+@@ -31,8 +31,9 @@
+ int32_t CharsetRecog_UTF_16_BE::match(InputText* textIn)
+ {
+ const uint8_t *input = textIn-fRawInput;
++int32_t length = textIn-fRawLength;
+ 
+-if (input[0] == 0xFE  input[1] == 0xFF) {
++if (length =2  input[0] == 0xFE  input[1] == 0xFF) {
+ return 100;
+ }
+ 
+@@ -53,8 +54,9 @@
+ int32_t CharsetRecog_UTF_16_LE::match(InputText* textIn)
+ {
+ const uint8_t *input = textIn-fRawInput;
++int32_t length = textIn-fRawLength;
+ 
+-if (input[0] == 0xFF  input[1] == 0xFE  (input[2] != 0x00 || input[3] 
!= 0x00)) {
++if (length = 4  input[0] == 0xFF  input[1] == 0xFE  (input[2] != 
0x00 || input[3] != 0x00)) {
+ return 100;
+ }
+ 
+@@ -76,7 +78,7 @@
+ bool hasBOM = FALSE;
+ int32_t confidence = 0;
+ 
+-if (getChar(input, 0) == 0xFEFFUL) {
++if (limit  0  getChar(input, 0) == 0xFEFFUL) {
+ hasBOM = TRUE;
+ }
+ 
+Only in icu/source/i18n: csrucode.cpp.orig
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 1f6e8e8..35894cc 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -46,6 +46,7 @@ TARFILE_ROOTDIR=icu
 #http://bugs.icu-project.org/trac/ticket/8198 rendering with 0D30 and 0D31
 
 PATCH_FILES=\
+   icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch \
 icu4c.10129.wintz.patch \
 icu4c.9948.mlym-crash.patch \
 icu4c-bsd.patch \
___
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' - icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch icu/UnpackedTarball_icu.mk

2013-10-17 Thread Eike Rathke

 icu/UnpackedTarball_icu.mk  |1 
 icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch |   36 
 2 files changed, 37 insertions(+)

New commits:
commit 8a955a1f86c4578d4d0442baee7bbf4b6e37175a
Author: Eike Rathke er...@redhat.com
Date:   Wed Oct 16 16:10:46 2013 +0200

Resolves: rhbz#1015594 CVE-2013-2924 use-after-free

Added icu.10318.CVE-2013-2924_changeset_34076.patch from
https://ssl.icu-project.org/trac/changeset/34076 assigned to
https://ssl.icu-project.org/trac/ticket/10318

Change-Id: I93a33e59aec9b79fb8d4b1517cd0990c79ee65fb
(cherry picked from commit 7693a4b9fbb60105d8438465db51c7afef4c3eb1)
Reviewed-on: https://gerrit.libreoffice.org/6268
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/icu/UnpackedTarball_icu.mk b/icu/UnpackedTarball_icu.mk
index 3e084a9..cb01378 100644
--- a/icu/UnpackedTarball_icu.mk
+++ b/icu/UnpackedTarball_icu.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,icu,\
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,icu,\
+   icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch \
icu/icu4c.10129.wintz.patch \
icu/icu4c.9948.mlym-crash.patch \
icu/icu4c-build.patch \
diff --git a/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch 
b/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch
new file mode 100644
index 000..90f50ab
--- /dev/null
+++ b/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch
@@ -0,0 +1,36 @@
+Index: /icu/trunk/source/i18n/csrucode.cpp
+===
+--- a/orig.icu/source/i18n/csrucode.cpp(revision 34075)
 b/icu/source/i18n/csrucode.cpp (revision 34076)
+@@ -1,5 +1,5 @@
+ /*
+  **
+- *   Copyright (C) 2005-2012, International Business Machines
++ *   Copyright (C) 2005-2013, International Business Machines
+  *   Corporation and others.  All Rights Reserved.
+  **
+@@ -34,6 +34,7 @@
+ const uint8_t *input = textIn-fRawInput;
+ int32_t confidence = 0;
++int32_t length = textIn-fRawLength;
+ 
+-if (input[0] == 0xFE  input[1] == 0xFF) {
++if (length =2  input[0] == 0xFE  input[1] == 0xFF) {
+ confidence = 100;
+ }
+@@ -58,6 +59,7 @@
+ const uint8_t *input = textIn-fRawInput;
+ int32_t confidence = 0;
++int32_t length = textIn-fRawLength;
+ 
+-if (input[0] == 0xFF  input[1] == 0xFE  (input[2] != 0x00 || input[3] 
!= 0x00)) {
++if (length = 4  input[0] == 0xFF  input[1] == 0xFE  (input[2] != 
0x00 || input[3] != 0x00)) {
+ confidence = 100;
+ }
+@@ -82,5 +84,5 @@
+ int32_t confidence = 0;
+ 
+-if (getChar(input, 0) == 0xFEFFUL) {
++if (limit  0  getChar(input, 0) == 0xFEFFUL) {
+ hasBOM = TRUE;
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - icu/icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch icu/makefile.mk

2013-10-17 Thread Eike Rathke

 icu/icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch |   43 +
 icu/makefile.mk|1 
 2 files changed, 44 insertions(+)

New commits:
commit 6d348beb63e8adf052503bc7921b91fd9e3ec51d
Author: Eike Rathke er...@redhat.com
Date:   Wed Oct 16 16:39:20 2013 +0200

Resolves: rhbz#1015594 CVE-2013-2924 use-after-free

Added icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch from
https://ssl.icu-project.org/trac/changeset/34076 assigned to
https://ssl.icu-project.org/trac/ticket/10318

Backported to 4-0 and ICU 49 from
970eca0d3040dbf61a9c91943b4b1281fdbcf48c

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

diff --git a/icu/icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch 
b/icu/icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch
new file mode 100644
index 000..360a96c
--- /dev/null
+++ b/icu/icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch
@@ -0,0 +1,43 @@
+diff -ru orig.icu/source/i18n/csrucode.cpp icu/source/i18n/csrucode.cpp
+--- misc/build/orig.icu/source/i18n/csrucode.cpp   2012-04-05 
22:45:54.0 +0200
 misc/build/icu/source/i18n/csrucode.cpp2013-10-09 18:56:06.521791271 
+0200
+@@ -1,6 +1,6 @@
+ /*
+  **
+- *   Copyright (C) 2005-2006, International Business Machines
++ *   Copyright (C) 2005-2013, International Business Machines
+  *   Corporation and others.  All Rights Reserved.
+  **
+  */
+@@ -31,8 +31,9 @@
+ int32_t CharsetRecog_UTF_16_BE::match(InputText* textIn)
+ {
+ const uint8_t *input = textIn-fRawInput;
++int32_t length = textIn-fRawLength;
+ 
+-if (input[0] == 0xFE  input[1] == 0xFF) {
++if (length =2  input[0] == 0xFE  input[1] == 0xFF) {
+ return 100;
+ }
+ 
+@@ -53,8 +54,9 @@
+ int32_t CharsetRecog_UTF_16_LE::match(InputText* textIn)
+ {
+ const uint8_t *input = textIn-fRawInput;
++int32_t length = textIn-fRawLength;
+ 
+-if (input[0] == 0xFF  input[1] == 0xFE  (input[2] != 0x00 || input[3] 
!= 0x00)) {
++if (length = 4  input[0] == 0xFF  input[1] == 0xFE  (input[2] != 
0x00 || input[3] != 0x00)) {
+ return 100;
+ }
+ 
+@@ -76,7 +78,7 @@
+ bool hasBOM = FALSE;
+ int32_t confidence = 0;
+ 
+-if (getChar(input, 0) == 0xFEFFUL) {
++if (limit  0  getChar(input, 0) == 0xFEFFUL) {
+ hasBOM = TRUE;
+ }
+ 
+Only in icu/source/i18n: csrucode.cpp.orig
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 1f6e8e8..35894cc 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -46,6 +46,7 @@ TARFILE_ROOTDIR=icu
 #http://bugs.icu-project.org/trac/ticket/8198 rendering with 0D30 and 0D31
 
 PATCH_FILES=\
+   icu4c.10318.CVE-2013-2924_changeset_34076_icu-49.patch \
 icu4c.10129.wintz.patch \
 icu4c.9948.mlym-crash.patch \
 icu4c-bsd.patch \
___
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-6' - sw/source

2013-10-17 Thread Michael Stahl

 sw/source/ui/shells/textsh1.cxx |   16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 4898ccc561af302db3b947f3a7b983e7f4c08566
Author: Michael Stahl mst...@redhat.com
Date:   Fri Oct 11 18:36:47 2013 +0200

fdo#67796: sw: fix table cursor when setting language in status bar

Unfortunately it turns out that the neat hack in commit
b227a8e4d65e4bbfe991aed9342fe3e30eca8639 does not work unless something
actually _deletes_ the current m_pTblCrsr between Push() and Pop(),
e.g. by calling SwCrsrShell::ClearMark() or KillPams().

It would be possible to do some invalidation of m_pTblCrsr in
SwCrsrShell::ClearUpCrsrs() or UpdateCrsr(), to set it's bChg flag
or perhaps call ParkTblCrsr(); not sure if doing that is an improvement;
certainly it shouldn't be tried in a 4.0.6 backport.

So work around the problem locally in SwTextShell::Execute().

Conflicts:
sw/source/ui/shells/textsh1.cxx

Change-Id: I2981506b3065e824532deda28d21dad4a5734a8c
(cherry picked from commit 9533e01713c0170bdae030429de38756d9c5ca74)
Reviewed-on: https://gerrit.libreoffice.org/6224
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com

diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index c351e38..373731e 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -311,8 +311,6 @@ void SwTextShell::Execute(SfxRequest rReq)
 rWrtSh.StartAction();
 // prevent view from jumping because of (temporary) selection 
changes
 rWrtSh.LockView( sal_True );
-// save selection for later restoration
-rWrtSh.Push();
 
 // setting the new language...
 if (aNewLangTxt.Len()  0)
@@ -352,6 +350,12 @@ void SwTextShell::Execute(SfxRequest rReq)
 bForSelection = false;
 }
 
+if (bForParagraph || !bForSelection)
+{
+rWrtSh.Push(); // save selection for later restoration
+rWrtSh.ClearMark(); // fdo#67796: invalidate table crsr
+}
+
 if (bForParagraph)
 SwLangHelper::SelectCurrentPara( rWrtSh );
 
@@ -366,10 +370,12 @@ void SwTextShell::Execute(SfxRequest rReq)
 SwLangHelper::ResetLanguages( rWrtSh, bForSelection );
 else
 SwLangHelper::SetLanguage( rWrtSh, aNewLangTxt, 
bForSelection, aCoreSet );
-}
 
-// restore selection...
-rWrtSh.Pop( sal_False );
+if (bForParagraph || !bForSelection)
+{
+rWrtSh.Pop(false); // restore selection...
+}
+}
 
 rWrtSh.LockView( sal_False );
 rWrtSh.EndAction();
___
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-3' - sw/source

2013-10-17 Thread Arnaud Versini

 sw/source/core/doc/docedt.cxx |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit a55ba57c0ad4d5c2d8f49d4d57d00e7e05380351
Author: Arnaud Versini arnaud.vers...@libreoffice.org
Date:   Mon Oct 7 21:09:26 2013 +0200

fdo#70143: fix SwDoc::ReplaceRangeImpl()

Fix fdo#70143 by reporting swaping of positions

(regression from 6b08fe833186a04f9aef698a540d3a7493ac4519,
which changed SwUndoReplace::Impl::SetEnd to use the wrongly set end
position in rPam)

Change-Id: I14c6f58bc5c1418c69eb565d42f1829856eed58c
(cherry picked from commit 9685d20f2a0526a4c454cea1bd947eccbaeefa84)

Fixes regex replace of $ with nothing (to delete line
breaks).

Change-Id: If7ec1e5f524f7bb308a2949ace16cb8aa6989106
(cherry picked from commit f011a5c5071ed4a60f0ee7117608b72cecbb958d)
Reviewed-on: https://gerrit.libreoffice.org/6175
Reviewed-by: Arnaud Versini arnaud.vers...@libreoffice.org
Tested-by: CaolÃ¡n McNamara caol...@redhat.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
(cherry picked from commit ca83560f3079289df88dd7df7c00917efbd72dc0)
Reviewed-on: https://gerrit.libreoffice.org/6225

diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index f169ae5..b0794e6 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -2442,17 +2442,23 @@ SetRedlineMode( eOld );
 }
 }
 
-*rPam.GetMark() = *aDelPam.GetMark();
-
+*rPam.GetPoint() = *aDelPam.GetMark();
 ++aPtNd;
 rPam.GetMark()-nNode = aPtNd;
 rPam.GetMark()-nContent.Assign( aPtNd.GetNode().GetCntntNode(),
 nPtCnt );
 
-if (bJoinTxt  !bJoinPrev)
+if (bJoinTxt)
 {
+assert(rPam.GetPoint() == rPam.End());
+// move so that SetEnd remembers position after sw_JoinText
 rPam.Move(fnMoveBackward);
 }
+else if (aDelPam.GetPoint() == pStt) // backward selection?
+{
+assert(*rPam.GetMark() = *rPam.GetPoint());
+rPam.Exchange(); // swap so that rPam is backwards
+}
 
 if( pUndoRpl )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-17 Thread Stephan Bergmann

 vcl/unx/generic/desktopdetect/desktopdetector.cxx |7 ---
 vcl/unx/generic/plugadapt/salplug.cxx |6 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 63691a62c8695889144841abf8a32d52535ae671
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 17 17:33:10 2013 +0200

Consistently use SAL_USE_VCLPLUGIN as a bootstrap variable

...and neither exclusively nor additionally as an environment variable 
(where
bootstrap variables include environment variables, see the @file comment in
include/rtl/bootstrap.h).  Note that LibLibreOffice_Impl::initialize
(desktop/source/lib/init.cxx) sets it as a bootstrap, not as an environment
variable.  (Though desktop/unx/source/start.c still only reads it as an
environment variable; could potentially check argv for
-env:SAL_USE_VCLPLUGIN=...)

Change-Id: I9315f585cdb4f0783181359e030686167c4e4625

diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx 
b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index 6edf8d1..f18bf0a 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -24,6 +24,7 @@
 
 #include unx/desktops.hxx
 
+#include rtl/bootstrap.hxx
 #include rtl/process.h
 #include rtl/ustrbuf.hxx
 #include osl/module.h
@@ -303,10 +304,10 @@ DESKTOP_DETECTOR_PUBLIC DesktopType 
get_desktop_environment()
 // get display to connect to
 const char* pDisplayStr = getenv( DISPLAY );
 
-const char* pUsePlugin = getenv( SAL_USE_VCLPLUGIN );
+OUString plugin;
+rtl::Bootstrap::get(SAL_USE_VCLPLUGIN, plugin);
 
-if ((pUsePlugin  (strcmp(pUsePlugin, svp) == 0))
-|| Application::IsHeadlessModeRequested())
+if (plugin == svp || Application::IsHeadlessModeRequested())
 pDisplayStr = NULL;
 else
 {
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index 1e0b0db..ddd0422 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -220,11 +220,7 @@ SalInstance *CreateSalInstance()
 aUsePlugin = svp;
 else
 {
-static const char* pUsePlugin = getenv( SAL_USE_VCLPLUGIN );
-if( pUsePlugin )
-aUsePlugin = OUString::createFromAscii( pUsePlugin );
-else
-rtl::Bootstrap::get( SAL_USE_VCLPLUGIN, aUsePlugin );
+rtl::Bootstrap::get( SAL_USE_VCLPLUGIN, aUsePlugin );
 }
 
 if( !aUsePlugin.isEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-17 Thread Miklos Vajna

 sw/source/filter/ww8/attributeoutputbase.hxx |9 -
 sw/source/filter/ww8/docxattributeoutput.cxx |4 ++--
 sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
 sw/source/filter/ww8/rtfattributeoutput.cxx  |4 ++--
 sw/source/filter/ww8/rtfattributeoutput.hxx  |2 +-
 sw/source/filter/ww8/wrtw8sty.cxx|8 
 sw/source/filter/ww8/ww8attributeoutput.hxx  |2 +-
 7 files changed, 19 insertions(+), 12 deletions(-)

New commits:
commit 2ed29702ab29240e8e68c9c0f168a551d17f79f6
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Oct 17 17:56:10 2013 +0200

sw: bool - enum for style type in AttributeOutputBase

For now just use what we have already: paragraph and character styles.
But it enum should contain numbering styles as well in the future.

Change-Id: Ifd2f918446537e04cb5ba2cd8df822c5a1f9099c

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 1ff4474..fc04861 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -132,6 +132,13 @@ namespace msword {
 const sal_uInt8 PageBreak   = 0xC;
 }
 
+/// Type of a style in the style table.
+enum StyleType
+{
+STYLE_TYPE_PARA,
+STYLE_TYPE_CHAR
+};
+
 class AttributeOutputBase
 {
 public:
@@ -260,7 +267,7 @@ public:
 virtual void DefaultStyle( sal_uInt16 nStyle ) = 0;
 
 /// Start of a style in the styles table.
-virtual void StartStyle( const OUString rName, bool bPapFmt,
+virtual void StartStyle( const OUString rName, StyleType eType,
 sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwId, sal_uInt16 
nId,
 bool bAutoUpdate ) = 0;
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5821bfc..4a1cdcf 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3596,11 +3596,11 @@ oox::drawingml::DrawingML 
DocxAttributeOutput::GetDrawingML()
 return m_rDrawingML;
 }
 
-void DocxAttributeOutput::StartStyle( const OUString rName, bool bPapFmt,
+void DocxAttributeOutput::StartStyle( const OUString rName, StyleType eType,
 sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 /*nWwId*/, sal_uInt16 
nId, bool bAutoUpdate )
 {
 m_pSerializer-startElementNS( XML_w, XML_style,
-FSNS( XML_w, XML_type ), bPapFmt? paragraph: character, // 
FIXME is this correct?
+FSNS( XML_w, XML_type ), (eType == STYLE_TYPE_PARA ? paragraph: 
character),
 FSNS( XML_w, XML_styleId ), 
m_rExport.pStyles-GetStyleId(nId).getStr(),
 FSEND );
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 5a53d34..29dec70 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -225,7 +225,7 @@ public:
 void OutputDefaultItem(const SfxPoolItem rHt);
 
 /// Start of a style in the styles table.
-virtual void StartStyle( const OUString rName, bool bPapFmt,
+virtual void StartStyle( const OUString rName, StyleType eType,
 sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwId, sal_uInt16 
nId,
 bool bAutoUpdate );
 
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 47b66e7..a0ce1d7 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1061,14 +1061,14 @@ void RtfAttributeOutput::DefaultStyle( sal_uInt16 
/*nStyle*/ )
 /* noop, the default style is always 0 in RTF */
 }
 
-void RtfAttributeOutput::StartStyle( const OUString rName, bool bPapFmt,
+void RtfAttributeOutput::StartStyle( const OUString rName, StyleType eType,
 sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 /*nWwId*/, sal_uInt16 
nId,
 bool /* bAutoUpdate */ )
 {
 SAL_INFO(sw.rtf, OSL_THIS_FUNC  , rName = '  rName  ');
 
 m_aStylesheet.append('{');
-if (bPapFmt)
+if (eType == STYLE_TYPE_PARA)
 m_aStylesheet.append(OOO_STRING_SVTOOLS_RTF_S);
 else
 m_aStylesheet.append( OOO_STRING_SVTOOLS_RTF_IGNORE 
OOO_STRING_SVTOOLS_RTF_CS);
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx 
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 708a406..0ec6cbf 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -134,7 +134,7 @@ public:
 virtual void DefaultStyle( sal_uInt16 nStyle );
 
 /// Start of a style in the styles table.
-virtual void StartStyle( const OUString rName, bool bPapFmt,
+virtual void StartStyle( const OUString rName, StyleType eType,
 sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwId, sal_uInt16 
nId,
 bool bAutoUpdate );
 
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index

[Libreoffice-commits] core.git: sal/qa sal/rtl

2013-10-17 Thread Stephan Bergmann

 sal/qa/rtl/math/test-rtl-math.cxx |6 ++
 sal/rtl/math.cxx  |4 
 2 files changed, 10 insertions(+)

New commits:
commit 7bbd58eafc3146abcefc73d2d1ca6869bb47ef5a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 17 18:01:47 2013 +0200

fdo#70319 exponent followed by at least on digit also for special case 0.0

Change-Id: I07e7917417b8a22cf6d64f2b7a447f9084b9fa2d

diff --git a/sal/qa/rtl/math/test-rtl-math.cxx 
b/sal/qa/rtl/math/test-rtl-math.cxx
index 3ebdb15..c0ccaaa 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -81,6 +81,12 @@ public:
 CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(1)), end);
 CPPUNIT_ASSERT_EQUAL(1.0, res);
+res = rtl::math::stringToDouble(
+rtl::OUString(0e),
+sal_Unicode('.'), sal_Unicode(','), status, end);
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(1)), end);
+CPPUNIT_ASSERT_EQUAL(0.0, res);
 }
 
 CPPUNIT_TEST_SUITE(Test);
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index f66039a..3bca171 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -819,6 +819,10 @@ inline double stringToDouble(CharT const * pBegin, CharT 
const * pEnd,
 // offset
 while (p != pEnd  rtl::isAsciiDigit(*p))
 ++p;
+if (p == pFirstExpDigit)
+{   // no digits in exponent, reset end of scan
+p = pExponent;
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - sal/qa sal/rtl

2013-10-17 Thread Eike Rathke

 sal/qa/rtl/math/test-rtl-math.cxx |   12 
 sal/rtl/source/math.cxx   |6 ++
 2 files changed, 18 insertions(+)

New commits:
commit d7eae616fcb80e1d77ea981cce363e1414fd5238
Author: Eike Rathke er...@redhat.com
Date:   Mon Oct 14 14:55:23 2013 +0200

resolved fdo#70319 exponent must be followed by at least one digit

Change-Id: Icdd22fa0f1efcdd18cfea7cb48e1cbf2cf8d3533
(cherry picked from commit f20feba4c43c34fd2ee05b4658b0de0248c08eb9)
Reviewed-on: https://gerrit.libreoffice.org/6242
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit 2afaef576d0567e7137a439fc98804960cd7c17c)
Reviewed-on: https://gerrit.libreoffice.org/6269
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sal/qa/rtl/math/test-rtl-math.cxx 
b/sal/qa/rtl/math/test-rtl-math.cxx
index 70e8107..8f6578c 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -72,9 +72,21 @@ public:
 CPPUNIT_ASSERT_EQUAL(0.0, res);
 }
 
+void test_stringToDouble_exponent_without_digit() {
+rtl_math_ConversionStatus status;
+sal_Int32 end;
+double res = rtl::math::stringToDouble(
+rtl::OUString(1e),
+sal_Unicode('.'), sal_Unicode(','), status, end);
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(1)), end);
+CPPUNIT_ASSERT_EQUAL(1.0, res);
+}
+
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(test_stringToDouble_good);
 CPPUNIT_TEST(test_stringToDouble_bad);
+CPPUNIT_TEST(test_stringToDouble_exponent_without_digit);
 CPPUNIT_TEST_SUITE_END();
 };
 
diff --git a/sal/rtl/source/math.cxx b/sal/rtl/source/math.cxx
index c0d93b6..e5c44d5 100644
--- a/sal/rtl/source/math.cxx
+++ b/sal/rtl/source/math.cxx
@@ -805,6 +805,7 @@ inline double stringToDouble(CharT const * pBegin, CharT 
const * pEnd,
 // Exponent
 if (p != p0  p != pEnd  (*p == CharT('E') || *p == CharT('e')))
 {
+CharT const * const pExponent = p;
 ++p;
 bool bExpSign;
 if (p != pEnd  *p == CharT('-'))
@@ -818,6 +819,7 @@ inline double stringToDouble(CharT const * pBegin, CharT 
const * pEnd,
 if (p != pEnd  *p == CharT('+'))
 ++p;
 }
+CharT const * const pFirstExpDigit = p;
 if ( fVal == 0.0 )
 {   // no matter what follows, zero stays zero, but carry on the
 // offset
@@ -863,6 +865,10 @@ inline double stringToDouble(CharT const * pBegin, CharT 
const * pEnd,
 else
 fVal = rtl::math::pow10Exp( fVal, nExp );  // normal
 }
+else if (p == pFirstExpDigit)
+{   // no digits in exponent, reset end of scan
+p = pExponent;
+}
 }
 }
 else if (p - p0 == 2  p != pEnd  p[0] == CharT('#')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.

2013-10-17 Thread bugzilla-daemon

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

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

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

Related: fdo#38838 make String::CompareTo private



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

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

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

2013-10-17 Thread Eike Rathke

 i18nlangtag/qa/cppunit/test_languagetag.cxx|   24 
 i18nlangtag/source/isolang/isolang.cxx |1 
 i18nlangtag/source/languagetag/languagetag.cxx |   71 +
 include/i18nlangtag/lang.h |1 
 4 files changed, 75 insertions(+), 22 deletions(-)

New commits:
commit c450aafad00da4553fc6f7abadb19b4b16df6b88
Author: Eike Rathke er...@redhat.com
Date:   Thu Oct 17 18:33:47 2013 +0200

solve the 'dz' vs 'bo' and 'nn', 'nb' and 'nn' share primary ID cases

Change-Id: I7ccead4493c9848b55f642c2636daa3c60aeb7a6

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx 
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 8a055be..6f7cc2d 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -335,13 +335,35 @@ void TestLanguageTag::testAllTags()
 CPPUNIT_ASSERT( aLocale.Variant ==  );
 LanguageType de_LangID = de.getLanguageType();
 CPPUNIT_ASSERT( de_LangID != LANGUAGE_GERMAN );
-CPPUNIT_ASSERT( MsLangId::getPrimaryLanguage( de_LangID) == 
MsLangId::getPrimaryLanguage( LANGUAGE_GERMAN) );
+CPPUNIT_ASSERT( de_LangID == MsLangId::getPrimaryLanguage( 
LANGUAGE_GERMAN) );
 CPPUNIT_ASSERT( de.makeFallback().getBcp47() == de-DE);
 // Check registered mapping.
 LanguageTag de_l( de_LangID);
 CPPUNIT_ASSERT( de_l.getBcp47() == s_de );
 }
 
+// bo and dz share the same primary language ID, only one gets it
+// assigned, dz language-only has a special mapping.
+{
+LanguageTag bo( bo, true );
+CPPUNIT_ASSERT( bo.getLanguageType() == MsLangId::getPrimaryLanguage( 
LANGUAGE_TIBETAN) );
+LanguageTag dz( dz, true );
+CPPUNIT_ASSERT( dz.getLanguageType() == 
LANGUAGE_USER_DZONGKHA_MAP_LONLY );
+}
+
+// no, nb and nn share the same primary language ID, which even is
+// assigned to no-NO for legacy so none gets it assigned, all on-the-fly.
+{
+LanguageTag no( no, true );
+CPPUNIT_ASSERT( LanguageTag::isOnTheFlyID( no.getLanguageType()) );
+LanguageTag nb( nb, true );
+CPPUNIT_ASSERT( LanguageTag::isOnTheFlyID( nb.getLanguageType()) );
+LanguageTag nn( nn, true );
+CPPUNIT_ASSERT( LanguageTag::isOnTheFlyID( nn.getLanguageType()) );
+LanguageTag no_NO( no-NO, true );
+CPPUNIT_ASSERT( no_NO.getLanguageType() == LANGUAGE_NORWEGIAN );
+}
+
 // 'de-1901' derived from 'de-DE-1901' grandfathered to check that it is
 // accepted as (DIGIT 3ALNUM) variant
 {
diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 25e8eb2..fb75395 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -352,6 +352,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_TIBETAN, bo, CN, false },   // CN 
politically correct?
 { LANGUAGE_USER_TIBETAN_INDIA,  bo, IN, false },
 { LANGUAGE_DZONGKHA,dz, BT, false },
+{ LANGUAGE_USER_DZONGKHA_MAP_LONLY, dz,   , false },// because 
of the MS error, see lang.h
 { LANGUAGE_TURKMEN, tk, TM, false },
 { LANGUAGE_WELSH,   cy, GB, false },
 { LANGUAGE_SESOTHO, st, ZA, false },
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index fc1f5b5..4f8af9a 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -309,8 +309,10 @@ private:
 /** Generates on-the-fly LangID and registers the maBcp47,mnLangID pair.
 
 @param  nRegisterID
-If not 0 and not LANGUAGE_DONTKNOW, use that ID instead of
-generating an on-the-fly ID.
+If not 0 and not LANGUAGE_DONTKNOW, suggest (!) to use that ID
+instead of generating an on-the-fly ID. Implementation may
+still generate an ID if the suggested ID is already used for
+another language tag.
 
 @return NULL if no ID could be obtained or registration failed.
  */
@@ -616,10 +618,10 @@ LanguageTag::ImplPtr LanguageTagImpl::registerOnTheFly( 
LanguageType nRegisterID
 
 osl::MutexGuard aGuard( theMutex::get());
 
-MapBcp47 rMap = theMapBcp47::get();
-MapBcp47::const_iterator it( rMap.find( maBcp47));
+MapBcp47 rMapBcp47 = theMapBcp47::get();
+MapBcp47::const_iterator it( rMapBcp47.find( maBcp47));
 bool bOtherImpl = false;
-if (it != rMap.end())
+if (it != rMapBcp47.end())
 {
 SAL_INFO( i18nlangtag, LanguageTag::registerOnTheFly: found impl 
for '  maBcp47  ');
 pImpl = (*it).second;
@@ -639,23 +641,47 @@ LanguageTag::ImplPtr LanguageTagImpl::registerOnTheFly( 
LanguageType nRegisterID
 {
 SAL_INFO(

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sal/qa sal/rtl

2013-10-17 Thread Stephan Bergmann

 sal/qa/rtl/math/test-rtl-math.cxx |6 ++
 sal/rtl/source/math.cxx   |4 
 2 files changed, 10 insertions(+)

New commits:
commit 68befdd269a226e22dabd1b609326b38efc7eb21
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 17 18:01:47 2013 +0200

fdo#70319 exponent followed by at least on digit also for special case 0.0

(cherry picked from commit 7bbd58eafc3146abcefc73d2d1ca6869bb47ef5a)
Conflicts:
sal/rtl/math.cxx

Change-Id: I07e7917417b8a22cf6d64f2b7a447f9084b9fa2d
Reviewed-on: https://gerrit.libreoffice.org/6295
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/sal/qa/rtl/math/test-rtl-math.cxx 
b/sal/qa/rtl/math/test-rtl-math.cxx
index 8f6578c..3929a53 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -81,6 +81,12 @@ public:
 CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(1)), end);
 CPPUNIT_ASSERT_EQUAL(1.0, res);
+res = rtl::math::stringToDouble(
+rtl::OUString(0e),
+sal_Unicode('.'), sal_Unicode(','), status, end);
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(1)), end);
+CPPUNIT_ASSERT_EQUAL(0.0, res);
 }
 
 CPPUNIT_TEST_SUITE(Test);
diff --git a/sal/rtl/source/math.cxx b/sal/rtl/source/math.cxx
index e5c44d5..ec2bfc4 100644
--- a/sal/rtl/source/math.cxx
+++ b/sal/rtl/source/math.cxx
@@ -825,6 +825,10 @@ inline double stringToDouble(CharT const * pBegin, CharT 
const * pEnd,
 // offset
 while (p != pEnd  isDigit(*p))
 ++p;
+if (p == pFirstExpDigit)
+{   // no digits in exponent, reset end of scan
+p = pExponent;
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sal/qa sal/rtl

2013-10-17 Thread Stephan Bergmann

 sal/qa/rtl/math/test-rtl-math.cxx |6 ++
 sal/rtl/math.cxx  |4 
 2 files changed, 10 insertions(+)

New commits:
commit 5f13aa4eae758e6592b73b3de3a62a5d94c45a9f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 17 18:01:47 2013 +0200

fdo#70319 exponent followed by at least on digit also for special case 0.0

Change-Id: I07e7917417b8a22cf6d64f2b7a447f9084b9fa2d
(cherry picked from commit 7bbd58eafc3146abcefc73d2d1ca6869bb47ef5a)
Reviewed-on: https://gerrit.libreoffice.org/6294
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/sal/qa/rtl/math/test-rtl-math.cxx 
b/sal/qa/rtl/math/test-rtl-math.cxx
index 3ebdb15..c0ccaaa 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -81,6 +81,12 @@ public:
 CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(1)), end);
 CPPUNIT_ASSERT_EQUAL(1.0, res);
+res = rtl::math::stringToDouble(
+rtl::OUString(0e),
+sal_Unicode('.'), sal_Unicode(','), status, end);
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(1)), end);
+CPPUNIT_ASSERT_EQUAL(0.0, res);
 }
 
 CPPUNIT_TEST_SUITE(Test);
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index f66039a..3bca171 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -819,6 +819,10 @@ inline double stringToDouble(CharT const * pBegin, CharT 
const * pEnd,
 // offset
 while (p != pEnd  rtl::isAsciiDigit(*p))
 ++p;
+if (p == pFirstExpDigit)
+{   // no digits in exponent, reset end of scan
+p = pExponent;
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-17 Thread Miklos Vajna

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 +--
 sw/source/filter/ww8/attributeoutputbase.hxx |3 +
 sw/source/filter/ww8/docxattributeoutput.cxx |   13 ++-
 sw/source/filter/ww8/docxexport.cxx  |2 -
 sw/source/filter/ww8/wrtw8sty.cxx|   44 +++
 sw/source/filter/ww8/wrtww8.hxx  |8 +++-
 6 files changed, 61 insertions(+), 15 deletions(-)

New commits:
commit 8e434a45c2f8bee39d9a70fbe2707d8a144ac790
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Oct 17 18:47:36 2013 +0200

MSWordStyles: initial DOCX export of list styles

Change-Id: I96522b72de1e039105c24913ed011b28d170

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 962f09b..64e4c06 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1372,9 +1372,6 @@ void Test::testCharacterBorder()
 
 void Test::testStyleInheritance()
 {
-// This document has several issues to fix, more checks will be here to
-// test its various aspects
-
 // Check that now styleId's are more like what MSO produces
 xmlDocPtr pXmlStyles = parseExport(word/styles.xml);
 // the 1st style always must be Normal
@@ -1440,6 +1437,9 @@ void Test::testStyleInheritance()
 if (aLatentStyleException[i].Name == name)
 aName = aLatentStyleException[i].Value.getOUString();
 CPPUNIT_ASSERT_EQUAL(OUString(Normal), aName); // This checks the name 
attribute of the first exception.
+
+// This numbering style wasn't roundtripped.
+assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='NoList']/w:name, 
val, No List);
 }
 
 void Test::testSmartart()
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index fc04861..a528d28 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -136,7 +136,8 @@ namespace msword {
 enum StyleType
 {
 STYLE_TYPE_PARA,
-STYLE_TYPE_CHAR
+STYLE_TYPE_CHAR,
+STYLE_TYPE_LIST
 };
 
 class AttributeOutputBase
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4a1cdcf..53f15b2 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3599,8 +3599,15 @@ oox::drawingml::DrawingML 
DocxAttributeOutput::GetDrawingML()
 void DocxAttributeOutput::StartStyle( const OUString rName, StyleType eType,
 sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 /*nWwId*/, sal_uInt16 
nId, bool bAutoUpdate )
 {
+const char* pType = 0;
+switch (eType)
+{
+case STYLE_TYPE_PARA: pType = paragraph; break;
+case STYLE_TYPE_CHAR: pType = character; break;
+case STYLE_TYPE_LIST: pType = numbering; break;
+}
 m_pSerializer-startElementNS( XML_w, XML_style,
-FSNS( XML_w, XML_type ), (eType == STYLE_TYPE_PARA ? paragraph: 
character),
+FSNS( XML_w, XML_type ), pType,
 FSNS( XML_w, XML_styleId ), 
m_rExport.pStyles-GetStyleId(nId).getStr(),
 FSEND );
 
@@ -3608,14 +3615,14 @@ void DocxAttributeOutput::StartStyle( const OUString 
rName, StyleType eType,
 FSNS( XML_w, XML_val ), OUStringToOString( OUString( rName ), 
RTL_TEXTENCODING_UTF8 ).getStr(),
 FSEND );
 
-if ( nBase != 0x0FFF )
+if ( nBase != 0x0FFF  eType != STYLE_TYPE_LIST)
 {
 m_pSerializer-singleElementNS( XML_w, XML_basedOn,
 FSNS( XML_w, XML_val ), 
m_rExport.pStyles-GetStyleId(nBase).getStr(),
 FSEND );
 }
 
-if ( nNext != nId )
+if ( nNext != nId  eType != STYLE_TYPE_LIST)
 {
 m_pSerializer-singleElementNS( XML_w, XML_next,
 FSNS( XML_w, XML_val ), 
m_rExport.pStyles-GetStyleId(nNext).getStr(),
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index bf45dac..14f8174 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -457,7 +457,7 @@ void DocxExport::PrepareNewPageDesc( const SfxItemSet* pSet,
 
 void DocxExport::InitStyles()
 {
-pStyles = new MSWordStyles( *this );
+pStyles = new MSWordStyles( *this, /*bListStyles =*/ true );
 
 // setup word/styles.xml and the relations + content type
 m_pFilter-addRelation( m_pDocumentFS-getOutputStream(),
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index 52ac302..850a6ea50 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -139,8 +139,9 @@ sal_uInt16 MSWordExportBase::GetId( const SwTxtFmtColl 
rColl ) const
 
 
 //typedef pFmtT
-MSWordStyles::MSWordStyles( MSWordExportBase rExport )
-: m_rExport( rExport )
+MSWordStyles::MSWordStyles( MSWordExportBase rExport, bool bListStyles )
+: m_rExport( rExport ),
+

[Libreoffice-commits] core.git: clucene/configs clucene/Library_clucene.mk clucene/Makefile clucene/Module_clucene.mk clucene/patches clucene/README clucene/UnpackedTarball_clucene.mk external/clucene

2013-10-17 Thread Khaled Hosny

 RepositoryModule_host.mk |1 
 clucene/Library_clucene.mk   |  236 ---
 clucene/Makefile |   11 
 clucene/Module_clucene.mk|   21 
 clucene/README   |4 
 clucene/UnpackedTarball_clucene.mk   |   65 ---
 clucene/configs/_clucene-config-LINUX.h  |  114 -
 clucene/configs/_clucene-config-MSVC.h   |  114 -
 clucene/configs/_clucene-config-generic.h|  114 -
 clucene/configs/clucene-config-GCC-atomic.h  |  150 --
 clucene/configs/clucene-config-MINGW-atomic.h|  150 --
 clucene/configs/clucene-config-MINGW.h   |  150 --
 clucene/configs/clucene-config-MSVC.h|  150 --
 clucene/configs/clucene-config-generic.h |  150 --
 clucene/patches/clucene-aix.patch|   40 -
 clucene/patches/clucene-debug.patch  |   11 
 clucene/patches/clucene-git1-win64.patch |   45 --
 clucene/patches/clucene-libcpp.patch |   42 -
 clucene/patches/clucene-multimap-put.patch   |9 
 clucene/patches/clucene-narrowing-conversions.patch  |   36 -
 clucene/patches/clucene-nullptr.patch|   22 -
 clucene/patches/clucene-warnings.patch   |   54 --
 clucene/patches/contribs-lib-makefile.patch  |   23 -
 external/Module_external.mk  |1 
 external/clucene/Library_clucene.mk  |  236 +++
 external/clucene/Makefile|   11 
 external/clucene/Module_clucene.mk   |   21 
 external/clucene/README  |4 
 external/clucene/UnpackedTarball_clucene.mk  |   65 +++
 external/clucene/configs/_clucene-config-LINUX.h |  114 +
 external/clucene/configs/_clucene-config-MSVC.h  |  114 +
 external/clucene/configs/_clucene-config-generic.h   |  114 +
 external/clucene/configs/clucene-config-GCC-atomic.h |  150 ++
 external/clucene/configs/clucene-config-MINGW-atomic.h   |  150 ++
 external/clucene/configs/clucene-config-MINGW.h  |  150 ++
 external/clucene/configs/clucene-config-MSVC.h   |  150 ++
 external/clucene/configs/clucene-config-generic.h|  150 ++
 external/clucene/patches/clucene-aix.patch   |   40 +
 external/clucene/patches/clucene-debug.patch |   11 
 external/clucene/patches/clucene-git1-win64.patch|   45 ++
 external/clucene/patches/clucene-libcpp.patch|   42 +
 external/clucene/patches/clucene-multimap-put.patch  |9 
 external/clucene/patches/clucene-narrowing-conversions.patch |   36 +
 external/clucene/patches/clucene-nullptr.patch   |   22 +
 external/clucene/patches/clucene-warnings.patch  |   54 ++
 external/clucene/patches/contribs-lib-makefile.patch |   23 +
 46 files changed, 1712 insertions(+), 1712 deletions(-)

New commits:
commit 894f5e46a6d72d3cfc3731c49a5f01626c6b95db
Author: Khaled Hosny khaledho...@eglug.org
Date:   Thu Oct 17 01:28:29 2013 +0200

fdo#70393: move clucene to a subdir of external

Change-Id: Ia9b7b18526119e29e21eb315d84d099861e15ea0
Reviewed-on: https://gerrit.libreoffice.org/6285
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Tested-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 1f358f6..0ec4fca 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
canvas \
chart2 \
cli_ure \
-   $(call gb_Helper_optional,CLUCENE,clucene) \
$(call gb_Helper_optional,DESKTOP,codemaker) \
comphelper \
configmgr \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 85fb170..7d6880e 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,BOOST,boost) \
$(call gb_Helper_optional,BSH,beanshell) \
$(call gb_Helper_optional,CAIRO,cairo) \
+   $(call gb_Helper_optional,CLUCENE,clucene) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LIBPNG,libpng) \
 ))
diff --git a/clucene/Library_clucene.mk b/external/clucene/Library_clucene.mk
similarity index 100%
rename from clucene/Library_clucene.mk
rename to

[Libreoffice-commits] core.git: cppunit/android.patch cppunit/disable-dynloading.patch cppunit/ExternalPackage_cppunit.mk cppunit/ExternalProject_cppunit.mk cppunit/ios.patch cppunit/Makefile cppunit/

2013-10-17 Thread Khaled Hosny

 RepositoryModule_host.mk|1 
 cppunit/ExternalPackage_cppunit.mk  |   50 --
 cppunit/ExternalProject_cppunit.mk  |   63 
 cppunit/Makefile|7 ---
 cppunit/Module_cppunit.mk   |   24 --
 cppunit/README  |3 -
 cppunit/UnpackedTarball_cppunit.mk  |   34 ---
 cppunit/android.patch   |   33 --
 cppunit/disable-dynloading.patch|   25 ---
 cppunit/ios.patch   |   18 
 cppunit/unix.patch  |   15 --
 cppunit/windows.patch   |   48 -
 cppunit/wundef.patch|   12 -
 external/Module_external.mk |1 
 external/cppunit/ExternalPackage_cppunit.mk |   50 ++
 external/cppunit/ExternalProject_cppunit.mk |   63 
 external/cppunit/Makefile   |7 +++
 external/cppunit/Module_cppunit.mk  |   18 
 external/cppunit/README |3 +
 external/cppunit/UnpackedTarball_cppunit.mk |   34 +++
 external/cppunit/android.patch  |   33 ++
 external/cppunit/disable-dynloading.patch   |   25 +++
 external/cppunit/ios.patch  |   18 
 external/cppunit/unix.patch |   15 ++
 external/cppunit/windows.patch  |   48 +
 external/cppunit/wundef.patch   |   12 +
 26 files changed, 327 insertions(+), 333 deletions(-)

New commits:
commit 7223027a3a7e6599e387559d85f1eaebf3bbbd6c
Author: Khaled Hosny khaledho...@eglug.org
Date:   Thu Oct 17 01:32:29 2013 +0200

fdo#70393: move cppunit to a subdir of external

Change-Id: I96ab796757af0c6c6741059b35fcaeefc2bf4507
Reviewed-on: https://gerrit.libreoffice.org/6286
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Tested-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 0ec4fca..ee95730 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
cppcanvas \
cppu \
cppuhelper \
-   $(call gb_Helper_optional,CPPUNIT,cppunit) \
cpputools \
$(call gb_Helper_optional,CRASHREP,crashrep) \
$(call gb_Helper_optional,CT2N,ct2n) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 7d6880e..2c8b492 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,BSH,beanshell) \
$(call gb_Helper_optional,CAIRO,cairo) \
$(call gb_Helper_optional,CLUCENE,clucene) \
+   $(call gb_Helper_optional,CPPUNIT,cppunit) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LIBPNG,libpng) \
 ))
diff --git a/cppunit/ExternalPackage_cppunit.mk 
b/external/cppunit/ExternalPackage_cppunit.mk
similarity index 100%
rename from cppunit/ExternalPackage_cppunit.mk
rename to external/cppunit/ExternalPackage_cppunit.mk
diff --git a/cppunit/ExternalProject_cppunit.mk 
b/external/cppunit/ExternalProject_cppunit.mk
similarity index 100%
rename from cppunit/ExternalProject_cppunit.mk
rename to external/cppunit/ExternalProject_cppunit.mk
diff --git a/cppunit/Makefile b/external/cppunit/Makefile
similarity index 100%
rename from cppunit/Makefile
rename to external/cppunit/Makefile
diff --git a/cppunit/Module_cppunit.mk b/external/cppunit/Module_cppunit.mk
similarity index 86%
rename from cppunit/Module_cppunit.mk
rename to external/cppunit/Module_cppunit.mk
index 53ed611..f0af9e8 100644
--- a/cppunit/Module_cppunit.mk
+++ b/external/cppunit/Module_cppunit.mk
@@ -9,16 +9,10 @@
 
 $(eval $(call gb_Module_Module,cppunit))
 
-ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
-
-ifeq ($(SYSTEM_CPPUNIT),NO)
 $(eval $(call gb_Module_add_targets,cppunit,\
UnpackedTarball_cppunit \
ExternalPackage_cppunit \
ExternalProject_cppunit \
 ))
-endif
-
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/cppunit/README b/external/cppunit/README
similarity index 100%
rename from cppunit/README
rename to external/cppunit/README
diff --git a/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
similarity index 79%
rename from cppunit/UnpackedTarball_cppunit.mk
rename to external/cppunit/UnpackedTarball_cppunit.mk
index 0a5f649..e1a77a5 100644
--- a/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -12,22 +12,22 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cppunit))
 $(eval

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.0.6.2'

2013-10-17 Thread Christian Lohmaier

Tag 'libreoffice-4.0.6.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-10-17 18:23 -0700

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

iQIcBAABAgAGBQJSYB0CAAoJEPQ0oe+v7q6jRfYP/0eaqUGNg21H6djwmukUhVZz
9di1lb7LyNhBDHybtEwp/G1vr591I6bkKgq9/ucOvjR8dETYOA+xyHQAkAHn2psz
aCfXK63z2lEWD8bt3bZxwsf7yT1hgaQAzfEAbG8SCMAt05jMWZv0wLzyySZtP5p7
oOZvayp89vP476kka4TxVYpF/TusXVZvHqrejYpP3gxMuYUqFVaLMohfZyCZqXpz
DkpM/+X/TV8o60OUR0yiTbFwc9ljNLjTqhlTzjfO3UEKD8xLkdWxhhv7nvSxWctK
1Uvd768e8lrB8CSLRWBJFH86mU+r4tVeBzOu0IM6CsnQj0aemQNSq+vhI5yxcB5q
cb/FaI6S6e7W4o1PEIa/pG94+EadZeCEEfLqqigXQci9SiNvnU2hPj5vFEygPUW0
aYsh3XiGjZNTkcQtr+JnxRCPJzJPT1nCdPIcCWxRfHf8WuPTaLJ93ulF0RmQPemB
mNu1yjoyliaqQE8rf67GlsaAT1moXkd9vMwai43W7XTkLyOPIf5NXaSK/Iq5ZDcQ
eVv+Y3ONQeYTYEtuHFiUDbCGuwZaaGrwZR9iA56wzhNobjImnuUvnFaIA5SZe0+0
pCfmNlT9ZluoZvV54Xgqrt5mPID5TiVNGu+OCSKK8AhU7+FZWVUB0qqs+dVtq4+n
eTtocr08Ch8DCkPdWee/
=31qC
-END PGP SIGNATURE-

Changes since sdremote-1.0.2-19:
---
 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/libreoffice-4.0.6.2'

2013-10-17 Thread Christian Lohmaier

Tag 'libreoffice-4.0.6.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-10-17 18:23 -0700

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

iQIcBAABAgAGBQJSYB0MAAoJEPQ0oe+v7q6jt/8P/Rdbi6oe3sqrvqGr1d0Agh88
geMQCL2B9KjNEdmN7S5QS0zpxuTEnQoKQniAg7wcqrFVbX7Z5wf9BNFTx81SjjT1
0U1nevAV3/vrEDUyUk2F8RQACLBZ86zmmZQ+wCg1KqvA089uLr+1ZSarFbzubKMe
+5MsRVB3Oy+67NODUkR+NeWB8BuFj4neUx8I29zAWy0G0rMQGRJqhXINs1C3YbLp
3qHmdt6L1OZ/PNzlLv2esWNXJuGvzqV2f/Ys1kstpWRWNw4dEmzBjVtoRXYOI5nj
WS/rDOoBzzkT2EA1S9VW6kUoNWnzOOwCAFNMosI2evzRuZi+RrxnSu/inRztfAE3
EEKlp2nOtHHgJtyWLcEjdnZ8r6WDdMwiArGsqVNB71UyXxXK0V0wXGf5S34AxC0/
4uzydvikQRmLHfAMPcQu8V23slRowOHsOEh51NpoZXvzBwew+L6MDdN202SJjv/7
7aZC+kpST9bDIXK5ObBwXjaX4EnN4OhDvF+9cXUQOHG6BSjN2Yz1TVkvu69X+qXV
kyPNvx9Mv5g3+VDkLtpiwTSxlURPKI420rVVmFaoRNaZzqEzi3p4UddEOk89HmS8
DNUYlM44sY1bIOs6+v7DUp8Gb484pB4sMlqswik6PIZapwARKrBmOQkDBxUmmTOa
nAnZIuxbsEunUQo1qcIQ
=FRn5
-END PGP SIGNATURE-

Changes since sdremote-1.0.2-18:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.0.6.2'

2013-10-17 Thread Christian Lohmaier

Tag 'libreoffice-4.0.6.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-10-17 18:23 -0700

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

iQIcBAABAgAGBQJSYB0QAAoJEPQ0oe+v7q6j57cP/jnx+hmjcv4ulu1ExclG/wGX
NRvKWp6Q9CibCe4glAr0TIwZC48XVVOplbzYaxwSuaLWhUmeXXbJCuhRhPI8YUid
jgDkD5VR/ZYEyMygo7VOenTbWfbrQ4bkFr4AqIQ9RBcbZ8JxfE4ER3S7G4VEbQJs
1f8I1rgZfkyznH859RUiMGRpC0h6fMMSxU0MToMx9mvK+4F6J7QJHJrv8/4QtMeg
0rTWK2dhemwzf9Ij/roevw+y2PeQtqZ4HoA3wlXNZcd+NQaEyNBphXm2I4LiCFxx
FmUHsroDUizc9OighmVoybtcECelJJ3Ak791UhFpp/IJE83xPMoFmv3K70wqf9Am
xkR0n+Ioojyf50pEBM9L5alt5jPJhepAkInxlzgv6LfGpy7RqT62AAC+7F8XKv6a
m9ZsTKVnaqCMyRnml0CxxkVLdlGyluqAWDjSalYZqs/YKLj+OpX9GQzs+7bYjvPv
TGsX9Umfthn/dMO/UNAUdqWJrJrMmSGi+tk1OgLL+gmvV+ImKZ0Cee5eZg/m4Buy
g5I/utfpVe5mucvcTFtBTXUzc6WGjNESHmDATu+r8TocKF7kLqWjXMt1NMUJYBKs
nhYhDnA+c/RCGXgdnPsKSAtaokM3/G+h9OXKeOgFH/pDR2uKUr1lMS82hA+o1eIk
TCJlJTw86SwIhL6i5yN0
=Jj4J
-END PGP SIGNATURE-

Changes since sdremote-1.0.0-892:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-17 Thread Miklos Vajna

 writerfilter/source/doctok/WW8StyleSheet.cxx |  142 
 writerfilter/source/doctok/resources.xmi |  768 +--
 2 files changed, 55 insertions(+), 855 deletions(-)

New commits:
commit cce7939a166bbf9713ea06bcd3901dfaf162126d
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Oct 17 19:20:55 2013 +0200

writerfilter: remove unused WW8Style class

Change-Id: I24af395c6899e9b3551bd7ff473ada2315812173

diff --git a/writerfilter/source/doctok/WW8StyleSheet.cxx 
b/writerfilter/source/doctok/WW8StyleSheet.cxx
index 2231d0b..7137632 100644
--- a/writerfilter/source/doctok/WW8StyleSheet.cxx
+++ b/writerfilter/source/doctok/WW8StyleSheet.cxx
@@ -28,152 +28,12 @@ sal_uInt32 WW8StyleSheet::getEntryCount()
 }
 
 writerfilter::ReferenceProperties::Pointer_t
-WW8StyleSheet::getEntry(sal_uInt32 nIndex)
+WW8StyleSheet::getEntry(sal_uInt32)
 {
 writerfilter::ReferenceProperties::Pointer_t pResult;
-
-sal_uInt32 nCount = entryOffsets[nIndex + 1] - entryOffsets[nIndex];
-
-if (nCount  get_cbSTDBaseInFile() + 2U)
-{
-WW8Style * pStyle = new WW8Style(this, entryOffsets[nIndex], nCount);
-
-pStyle-setIndex(nIndex);
-
-pResult = writerfilter::ReferenceProperties::Pointer_t(pStyle);
-}
-
-return pResult;
-}
-
-OUString WW8Style::get_xstzName()
-{
-sal_uInt32 nCount = getU8(0xc);
-
-if (nCount  0)
-{
-Sequence aSeq(mSequence, 0xe, nCount * 2);
-
-rtl_uString * pNew = 0;
-rtl_uString_newFromStr
-(pNew, reinterpret_castconst sal_Unicode *(aSeq[0]));
-
-return OUString(pNew);
-
-}
-
-return get_xstzName1();
-}
-
-OUString WW8Style::get_xstzName1()
-{
-WW8StyleSheet * pParentStyleSheet = dynamic_castWW8StyleSheet 
*(mpParent);
-
-if (mpParent != NULL)
-{
-sal_uInt32 nOffset = pParentStyleSheet-get_cbSTDBaseInFile() + 2;
-
-if (nOffset  getCount())
-{
-sal_uInt32 nCount = getU16(nOffset);
-
-if (nCount  0)
-{
-Sequence aSeq(mSequence, nOffset + 2, nCount * 2);
-
-rtl_uString * pNew = 0;
-rtl_uString_newFromStr
-(pNew, reinterpret_castconst sal_Unicode *(aSeq[0]));
-
-return OUString(pNew);
-
-}
-}
-}
-
-return OUString();
-}
-
-sal_uInt32 WW8Style::get_upxstart()
-{
-sal_uInt32 nResult = 0;
-sal_uInt32 nCount = getU8(0xc);
-
-if (nCount  0)
-{
-nResult = 0xc + 1 + nCount * 2;
-
-nResult += nResult % 2;
-}
-else
-{
-WW8StyleSheet * pParentStyleSheet =
-dynamic_castWW8StyleSheet *(mpParent);
-
-nResult = pParentStyleSheet-get_cbSTDBaseInFile() + 2;
-
-if (nResult  getCount())
-{
-sal_uInt32 nCountTmp = getU16(nResult);
-
-nResult += 4 + nCountTmp * 2;
-}
-}
-
-return nResult;
-}
-
-sal_uInt32 WW8Style::get_upx_count()
-{
-return get_cupx();
-}
-
-writerfilter::ReferenceProperties::Pointer_t WW8Style::get_upx
-(sal_uInt32 nIndex)
-{
-writerfilter::ReferenceProperties::Pointer_t pResult;
-
-WW8StructBaseTmpOffset aOffset(this);
-
-aOffset.set(get_upxstart());
-
-if (aOffset.get()  0 )
-{
-sal_uInt32 nCount;
-
-for (sal_uInt32 n = 0; n  nIndex; ++n)
-{
-nCount = getU16(aOffset);
-
-aOffset.inc(nCount + 2);
-aOffset.inc(aOffset.get() % 2);
-}
-
-nCount = getU16(aOffset);
-
-if (nCount  0)
-{
-aOffset.inc(2);
-
-bool bIsPap = get_cupx() == 2  nIndex == 0;
-WW8PropertySet::Pointer_t
-pProps(new WW8PropertySetImpl(*this, aOffset.get(), nCount,
-  bIsPap));
-
-WW8PropertiesReference * pRef =
-new WW8PropertiesReference(pProps);
-
-pResult = writerfilter::ReferenceProperties::Pointer_t(pRef);
-}
-}
-
 return pResult;
 }
 
-void WW8Style::resolveNoAuto(Properties  /*rHandler*/)
-{
-}
-
 }}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index 8dca3a7..bac140d 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -3925,639 +3925,128 @@
 !--Class Font--
 !--Class Style--
 UML:Class xmi.id=Style name=Style
-  UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=ww8resource/
-  /UML:ModelElement.stereotype
-  UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=resolvenoauto/
-  /UML:ModelElement.stereotype
-  UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=withindex/
-  /UML:ModelElement.stereotype
-  UML:Classifier.feature
-UML:Attribute

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.0.6.2'

2013-10-17 Thread Christian Lohmaier

Tag 'libreoffice-4.0.6.2' created by Christian Lohmaier 
lohmaier+libreoff...@googlemail.com at 2013-10-17 18:23 -0700

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

iQIcBAABAgAGBQJSYB0HAAoJEPQ0oe+v7q6j+cAP+wVr6oho92s3hp2SbwWuOSWm
QbPrxV+qti3U9NRdf+XjNeBnbPe7efZp51kn/XqNUy7Usd1uEbVigywCQ33bx+sF
+rYDBdDc2r95hpn0C9ekxkmauYGQ0h9RF1OY1uuouLY4jONRvaN+AW8H5529+sYe
9Xp3SxxRX0LdnJUvgM3jSieVTrjayzYHzMPsv290WxegMwXZp9/x2AWzv4SJyOaC
AZeJq3znZuDV/8qDZMhP81j+FzWj2kGNhmiw8Z7kLbPac7lmXyWNkgpbhMn/cShI
NnI98i4vvSqwnGt9SJ7vsA0VCBX4QvwKVWXTYvg4nmj92LLlMMdRxT/7DL7slFeg
r2ha6sO7R2bHdWp2nyAOWr1PgRuP/u3X6dp4KZV9SdQRFyYzT+PF7QjNF0G9GKk8
OLqC8px+/LZyDj1lrQzHv7KxgN+zVKJ7PDgpmPbBvYPywez7Ec3DNsKYeAtREhQI
dsnd17jWUX7zJNfdk2p06OxJjXkdF8VlrNXTqO3EBhya97s24jeV4/zIJLHblOMi
ISqkCJoySHy3dbRB34PHr6Q7l6JZxGO50wXfnHbwYUwF2p20p9eCk111v5AzlFmv
bIg50eD+n1Npv4BJTGyuPbm1faTHUB+fiufntHV05G5n1CZIbVPA5G4yrPX2w83m
crBO0xknbfk+eg3BVvCO
=KNnY
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - instsetoo_native/util solenv/inc

2013-10-17 Thread Christian Lohmaier

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

New commits:
commit c97aee0be0a8c1d39c51ef53ba0be9c695220668
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Thu Oct 17 19:26:59 2013 +0200

bump product version to 4.0.6.2+, release number to 2

Change-Id: I1087b36498cf3c5cea9bb31b1174108db585f99d

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index b45897f..1d2c445 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
 {
 variables
 {
-UREPACKAGEVERSION 4.0.6.1
+UREPACKAGEVERSION 4.0.6.2
 URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
 UNIXBASISROOTNAME libreoffice4.0
@@ -50,12 +50,12 @@ LibreOffice
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.1
+PRODUCTEXTENSION .6.2
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.6.1
+ABOUTBOXPRODUCTVERSION 4.0.6.2
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 4.0
 PCPFILENAME libreoffice.pcp
@@ -65,7 +65,7 @@ LibreOffice
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.6.1
+PACKAGEVERSION 4.0.6.2
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -100,13 +100,13 @@ LibreOffice_Dev
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.1
+PRODUCTEXTENSION .6.2
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.6.1
+ABOUTBOXPRODUCTVERSION 4.0.6.2
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 4.0
 DEVELOPMENTPRODUCT 1
@@ -121,7 +121,7 @@ LibreOffice_Dev
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.6.1
+PACKAGEVERSION 4.0.6.2
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -159,9 +159,9 @@ URE
 {
 PRODUCTNAME URE
 PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.6.1
+PACKAGEVERSION 4.0.6.2
 PACKAGEREVISION 1
-PRODUCTEXTENSION .6.1
+PRODUCTEXTENSION .6.2
 BRANDPACKAGEVERSION 4.0
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
@@ -192,11 +192,11 @@ LibreOffice_SDK
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.1
+PRODUCTEXTENSION .6.2
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.6.1
+PACKAGEVERSION 4.0.6.2
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION SDK
@@ -231,12 +231,12 @@ LibreOffice_Dev_SDK
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.1
+PRODUCTEXTENSION .6.2
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.6.1
+PACKAGEVERSION 4.0.6.2
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -276,11 +276,11 @@ LibreOffice_Test
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.1
+PRODUCTEXTENSION .6.2
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.6.1
+PACKAGEVERSION 4.0.6.2
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION TEST
@@ -315,12 +315,12 @@ LibreOffice_Dev_Test
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.1
+PRODUCTEXTENSION .6.2
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
-

[Bug 70393] move external builds into subfolder

2013-10-17 Thread bugzilla-daemon

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

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

http://cgit.freedesktop.org/libreoffice/core/commit/?id=894f5e46a6d72d3cfc3731c49a5f01626c6b95db

fdo#70393: move clucene to a subdir of external



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

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

[Bug 70393] move external builds into subfolder

2013-10-17 Thread bugzilla-daemon

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

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

http://cgit.freedesktop.org/libreoffice/core/commit/?id=7223027a3a7e6599e387559d85f1eaebf3bbbd6c

fdo#70393: move cppunit to a subdir of external



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

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

[Libreoffice-commits] core.git: config_host/config_features.h.in configure.ac sfx2/source sw/inc

2013-10-17 Thread Tor Lillqvist

 config_host/config_features.h.in |   13 +++--
 configure.ac |9 -
 sfx2/source/appl/workwin.cxx |2 +-
 sfx2/source/control/dispatch.cxx |2 +-
 sfx2/source/view/viewfrm.cxx |2 +-
 sw/inc/viewopt.hxx   |   10 +-
 6 files changed, 11 insertions(+), 27 deletions(-)

New commits:
commit ad55d4e904634871c75a7007801c1b700bcb7ca3
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Oct 17 20:45:17 2013 +0300

Bin --enable-desktop-gui-elements

Nobody wants LO's own widgets in a touch / mobile app after all.

Change-Id: I84f1e85cebce80b6ff4ec5e4e3254654b5f5e6ec

diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 38d41fd..0f63f26 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -29,19 +29,12 @@
  * Non-DESKTOP implies no traditional help mechanism, and to some
  * extent (as noticed, and as possible without making the code too
  * ugly) the related code is ifdeffed out.
- */
-
-#define HAVE_FEATURE_DESKTOP 0
-
-/* DESKTOP_GUI_ELEMENTS
  *
- * In the non-DESKTOP case, whether to still display (and enable
- * interactive use of) traditional desktop-style GUI elements like
- * toolbars and scrollbars, drawn and handled using mostly the normal
- * LO code.
+ * Non-DESKTOP implies no traditional desktop-style GUI elements like
+ * toolbars and scrollbars presented by the LO code.
  */
 
-#define HAVE_FEATURE_DESKTOP_GUI_ELEMENTS 0
+#define HAVE_FEATURE_DESKTOP 0
 
 /* X11
  *
diff --git a/configure.ac b/configure.ac
index 42dfd44..d8a26e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1197,12 +1197,6 @@ AC_ARG_ENABLE(silent-msi,
 [Enable MSI with LIMITUI=1 (silent install).]),
 ,)
 
-AC_ARG_ENABLE(desktop-gui-elements,
-AS_HELP_STRING([--enable-desktop-gui-elements],
-[Enable display and use of desktop style GUI elements
- even on a non-desktop platform.]),
-,)
-
 AC_ARG_ENABLE(macosx-code-signing,
 AS_HELP_STRING([--enable-macosx-code-signing=identity],
 [Sign executables, dylibs, frameworks and the app bundle. If you
@@ -2252,10 +2246,7 @@ dnl cross-compiling would imply a non-desktop OS.
 if test $_os != iOS -a $_os != Android; then
 BUILD_TYPE=$BUILD_TYPE DESKTOP
 AC_DEFINE(HAVE_FEATURE_DESKTOP)
-AC_DEFINE(HAVE_FEATURE_DESKTOP_GUI_ELEMENTS)
 AC_DEFINE(HAVE_FEATURE_MULTIUSER_ENVIRONMENT)
-elif test $enable_desktop_gui_elements = yes; then
-AC_DEFINE(HAVE_FEATURE_DESKTOP_GUI_ELEMENTS)
 fi
 
 DISABLE_EXPORT=''
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 4873daf..123cb8b 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -594,7 +594,7 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings 
rB, SfxWorkWindow* pPar
 bDockingAllowed(sal_True),
 bInternalDockingAllowed(sal_True),
 bAllChildrenVisible(sal_True),
-#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
+#if HAVE_FEATURE_DESKTOP
 bIsFullScreen( sal_False ),
 bShowStatusBar( sal_True ),
 #else
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 7ebb940..08e958e 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1240,7 +1240,7 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, 
pReq )
 //
 void SfxDispatcher::SetMenu_Impl()
 {
-#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
+#if HAVE_FEATURE_DESKTOP
 if ( pImp-pFrame )
 {
 SfxViewFrame* pTop = pImp-pFrame-GetTopViewFrame();
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 141406e..8fa2e23 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -153,7 +153,7 @@ SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0))
 {
 SFX_CHILDWINDOW_REGISTRATION( SID_BROWSER );
 SFX_CHILDWINDOW_REGISTRATION( SID_RECORDING_FLOATWINDOW );
-#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
+#if HAVE_FEATURE_DESKTOP
 SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_FULLSCREEN | 
SFX_VISIBILITY_FULLSCREEN, SfxResId(RID_FULLSCREENTOOLBOX) );
 SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | 
SFX_VISIBILITY_STANDARD, SfxResId(RID_ENVTOOLBOX) );
 #endif
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index b205f1e..3a91d57 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -446,7 +446,7 @@ public:
 
 sal_BoolIsViewVScrollBar() const
 {
-#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
+#if HAVE_FEATURE_DESKTOP
 return nUIOptions  VIEWOPT_2_VSCROLLBAR ? sal_True : sal_False;
 #else
 return sal_False;
@@ -454,7 +454,7 @@ public:
 }
 sal_BoolIsViewHScrollBar() const
 {
-#if HAVE_FEATURE_DESKTOP_GUI_ELEMENTS
+#if HAVE_FEATURE_DESKTOP
 return nUIOptions  VIEWOPT_2_HSCROLLBAR ? sal_True : sal_False;
 #else
 return sal_False;
@@ -501,7 +501,7

Collapsing 3.5.x FDO Maintenance

2013-10-17 Thread Joel Madero


Hi All,

I've begun the process of collapsing 3.5.x to 3.5 all releases. I've 
already hidden all RC's and Beta's other than 3.5.0. Beta0 (we're still 
using this as pre-bibisect version, QA still needs to figure this out 
as it's confusing/misleading). This is to be consistent with what we did 
with 3.3 and 3.4 which seemed to work very well.


Unless thre are serious complaints about 3.5.x.x release I want to hide 
these as well. There are currently 24 versions of 3.5.x, so hiding all 
other than Beta 0 and all releases makes it so we're 22 versions removed 
(which is awesome for users).


So, complaints?



All the best,
Joel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-10-17 Thread Miklos Vajna

 writerfilter/Library_writerfilter.mk |1 
 writerfilter/source/doctok/WW8StyleSheet.cxx |   39 --
 writerfilter/source/doctok/resources.xmi |  452 ---
 3 files changed, 492 deletions(-)

New commits:
commit 5d4f1fa7b6a9384cff6a89829fcd507c05380fd4
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Oct 17 20:10:45 2013 +0200

writerfilter: remove unused WW8StyleSheet class

Change-Id: Id006db1013c981a6f2392bb52c2f26cf5e5bae5d

diff --git a/writerfilter/Library_writerfilter.mk 
b/writerfilter/Library_writerfilter.mk
index 3e54241..ddbd3a4 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -134,7 +134,6 @@ $(eval $(call 
gb_Library_add_exception_objects,writerfilter,\
 writerfilter/source/doctok/WW8ResourceModelImpl \
 writerfilter/source/doctok/WW8StructBase \
 writerfilter/source/doctok/WW8Sttbf \
-writerfilter/source/doctok/WW8StyleSheet \
 writerfilter/source/doctok/WW8Table \
 writerfilter/source/doctok/WW8Text \
 writerfilter/source/filter/ImportFilter \
diff --git a/writerfilter/source/doctok/WW8StyleSheet.cxx 
b/writerfilter/source/doctok/WW8StyleSheet.cxx
deleted file mode 100644
index 7137632..000
--- a/writerfilter/source/doctok/WW8StyleSheet.cxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include doctok/resources.hxx
-
-namespace writerfilter {
-namespace doctok {
-
-sal_uInt32 WW8StyleSheet::getEntryCount()
-{
-return get_cstd();
-}
-
-writerfilter::ReferenceProperties::Pointer_t
-WW8StyleSheet::getEntry(sal_uInt32)
-{
-writerfilter::ReferenceProperties::Pointer_t pResult;
-return pResult;
-}
-
-}}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index bac140d..2dec720 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -4127,544 +4127,100 @@
 !--Class Style--
 !--Class StyleSheet--
 UML:Class xmi.id=StyleSheet name=StyleSheet
-  UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=ww8resource/
-  /UML:ModelElement.stereotype
-  UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=plcf/
-  /UML:ModelElement.stereotype
-  UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=ww8nopayloadoffset/
-  /UML:ModelElement.stereotype
   UML:Classifier.feature
-UML:ModelElement.stereotype
-  UML:Stereotype xmi.idref=ww8nocalcsize/
-/UML:ModelElement.stereotype
-UML:Attribute name=size
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValueSize of style sheet 
info/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=comment/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValue0x0/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=offset/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValue0/UML:TaggedValue.dataValue
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=shift/
-  /UML:TaggedValue.type
-/UML:TaggedValue
-  /UML:ModelElement.taggedValue
-  UML:ModelElement.taggedValue
-UML:TaggedValue
-  UML:TaggedValue.dataValue/
-  UML:TaggedValue.type
-UML:TagDefinition xmi.idref=mask/
-  /UML:TaggedValue.type
-

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - sal/qa sal/rtl

2013-10-17 Thread Stephan Bergmann

 sal/qa/rtl/math/test-rtl-math.cxx |6 ++
 sal/rtl/source/math.cxx   |4 
 2 files changed, 10 insertions(+)

New commits:
commit 23c7aeb5ec633674a51b41e936ad9708e502841b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Oct 17 18:01:47 2013 +0200

fdo#70319 exponent followed by at least on digit also for special case 0.0

(cherry picked from commit 7bbd58eafc3146abcefc73d2d1ca6869bb47ef5a)
Conflicts:
sal/rtl/math.cxx

Change-Id: I07e7917417b8a22cf6d64f2b7a447f9084b9fa2d
Reviewed-on: https://gerrit.libreoffice.org/6296
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
Reviewed-by: BjÃ¶rn Michaelsen bjoern.michael...@canonical.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sal/qa/rtl/math/test-rtl-math.cxx 
b/sal/qa/rtl/math/test-rtl-math.cxx
index 8f6578c..3929a53 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -81,6 +81,12 @@ public:
 CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
 CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(1)), end);
 CPPUNIT_ASSERT_EQUAL(1.0, res);
+res = rtl::math::stringToDouble(
+rtl::OUString(0e),
+sal_Unicode('.'), sal_Unicode(','), status, end);
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(RTL_CONSTASCII_LENGTH(1)), end);
+CPPUNIT_ASSERT_EQUAL(0.0, res);
 }
 
 CPPUNIT_TEST_SUITE(Test);
diff --git a/sal/rtl/source/math.cxx b/sal/rtl/source/math.cxx
index e5c44d5..ec2bfc4 100644
--- a/sal/rtl/source/math.cxx
+++ b/sal/rtl/source/math.cxx
@@ -825,6 +825,10 @@ inline double stringToDouble(CharT const * pBegin, CharT 
const * pEnd,
 // offset
 while (p != pEnd  isDigit(*p))
 ++p;
+if (p == pFirstExpDigit)
+{   // no digits in exponent, reset end of scan
+p = pExponent;
+}
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-17 Thread Samuel Mehrbrodt

 desktop/unx/source/splashx.c |   23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

New commits:
commit 5d4558da5f4b5ee61589fd2b9acaf4eff9b515f5
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Thu Oct 3 14:51:58 2013 +0200

fdo#58982 Center the splash screen in dual-monitor setup

The problem was that the position of the screen was not considered.

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

diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index a154a06..24b2152 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -425,8 +425,11 @@ static void suppress_decorations(struct splash* splash)
 suppress_decorations_motif(splash); // FIXME: Unconditional until 
Metacity/compiz's SPLASH handling is fixed
 }
 
-// Create the window
-// Return: 1 - success, 0 - failure
+/**
+ * Create the window for the splash screen
+ *
+ * @return Success: 1; Failure: 0
+ */
 static int splash_create_window( struct splash* splash, int argc, char** argv )
 {
 char *display_name = NULL;
@@ -434,6 +437,8 @@ static int splash_create_window( struct splash* splash, int 
argc, char** argv )
 Window root_win;
 int display_width = 0;
 int display_height = 0;
+int display_x_pos = 0;
+int display_y_pos = 0;
 unsigned long value_mask = 0;
 XGCValues values;
 const char* name = LibreOffice;
@@ -478,13 +483,14 @@ static int splash_create_window( struct splash* splash, 
int argc, char** argv )
 p_screens = XineramaQueryScreens( splash-display, n_xinerama_screens );
 if( p_screens )
 {
-int j = 0;
-for( ; j  n_xinerama_screens; j++ )
+for( i=0; i  n_xinerama_screens; i++ )
 {
-if ( p_screens[j].screen_number == splash-screen )
+if ( p_screens[i].screen_number == splash-screen )
 {
-display_width = p_screens[j].width;
-display_height = p_screens[j].height;
+display_width = p_screens[i].width;
+display_height = p_screens[i].height;
+display_x_pos = p_screens[i].x_org;
+display_y_pos = p_screens[i].y_org;
 break;
 }
 }
@@ -493,7 +499,8 @@ static int splash_create_window( struct splash* splash, int 
argc, char** argv )
 #endif
 
 splash-win = XCreateSimpleWindow( splash-display, root_win,
-( display_width - splash-width ) / 2, ( display_height - 
splash-height ) / 2,
+(display_x_pos + (display_width - splash-width)/2),
+(display_y_pos + (display_height - splash-height)/2),
 splash-width, splash-height, 0,
 BlackPixel( splash-display, splash-screen ), BlackPixel( 
splash-display, splash-screen ) );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/saxparser' - 0 commits -

2013-10-17 Thread Unknown

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac external/cppunit RepositoryModule_build.mk

2013-10-17 Thread Tor Lillqvist

 RepositoryModule_build.mk   |3 --
 configure.ac|4 ++-
 external/cppunit/UnpackedTarball_cppunit.mk |9 ---
 external/cppunit/android.patch  |   33 
 external/cppunit/ios.patch  |   18 ---
 5 files changed, 3 insertions(+), 64 deletions(-)

New commits:
commit 2b8b417401577156c39d5cdd86985ae55c6e03a9
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Oct 17 22:42:42 2013 +0300

We don't use cppunit when cross-compiling

Change-Id: I8ff723233546d9becd001ab54a7df5ad98223f90

diff --git a/configure.ac b/configure.ac
index d8a26e9..efbebc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7772,7 +7772,9 @@ fi
 dnl ===
 dnl Check for system cppunit
 dnl ===
-libo_CHECK_SYSTEM_MODULE([cppunit],[CPPUNIT],[cppunit = 1.12.0])
+if test $cross_compiling != yes; then
+libo_CHECK_SYSTEM_MODULE([cppunit],[CPPUNIT],[cppunit = 1.12.0])
+fi
 
 dnl ===
 dnl Check whether freetype is available
diff --git a/external/cppunit/UnpackedTarball_cppunit.mk 
b/external/cppunit/UnpackedTarball_cppunit.mk
index e1a77a5..5898a88 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -16,15 +16,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/unix.patch \
external/cppunit/wundef.patch \
 ))
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
-   external/cppunit/android.patch \
-))
-else ifeq ($(OS),IOS)
-$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
-   external/cppunit/ios.patch \
-))
-endif
 ifeq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
external/cppunit/disable-dynloading.patch \
diff --git a/external/cppunit/android.patch b/external/cppunit/android.patch
deleted file mode 100644
index 59ae451..000
--- a/external/cppunit/android.patch
+++ /dev/null
@@ -1,33 +0,0 @@
 misc/cppunit-1.13.1/config/ltmain.sh
-+++ misc/build/cppunit-1.13.1/config/ltmain.sh
-@@ -3228,6 +3228,12 @@
-   fi
-   else
- 
-+  # Force no versioning suffix for Android thanks to silly
-+  # apkbuilder which doesn't add extra native libs unless their
-+  # name ends with .so
-+
-+  version_type=none
-+
-   # Parse the version information argument.
-   save_ifs=$IFS; IFS=':'
-   set dummy $vinfo 0 0 0
 misc/cppunit-1.13.1/src/cppunit/UnixDynamicLibraryManager.cpp
-+++ misc/build/cppunit-1.13.1/src/cppunit/UnixDynamicLibraryManager.cpp
-@@ -13,7 +13,15 @@
- DynamicLibraryManager::LibraryHandle 
- DynamicLibraryManager::doLoadLibrary( const std::string libraryName )
- {
-+#ifdef __ANDROID__
-+  // Use our enhanced dlopen() wrapper, see sal/osl/android/jni/lo-wrapper.c
-+  void *(*lo_dlopen)(const char *) = (void *(*)(const char *)) dlsym( 
RTLD_DEFAULT, lo_dlopen );
-+  if (lo_dlopen == NULL)
-+return NULL;
-+  return (*lo_dlopen)( libraryName.c_str() );
-+#else
-   return ::dlopen( libraryName.c_str(), RTLD_NOW | RTLD_GLOBAL );
-+#endif
- }
- 
- 
diff --git a/external/cppunit/ios.patch b/external/cppunit/ios.patch
deleted file mode 100644
index d7e355c..000
--- a/external/cppunit/ios.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 misc/cppunit-1.13.1/configure
-+++ misc/cppunit-1.13.1/configure
-@@ -23273,7 +23273,7 @@
-   { $as_echo $as_me:${as_lineno-$LINENO}: result: creating 
$ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP 
defines 5
- $as_echo creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for 
$ac_prefix_conf_INP defines 6; }
-   if test -f $ac_prefix_conf_INP ; then
--$as_dirname -- /* automatically generated */ ||
-+$as_dirname -- '/* automatically generated */' ||
- $as_expr X/* automatically generated */ : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-X/* automatically generated */ : 'X\(//\)[^/]' \| \
-X/* automatically generated */ : 'X\(//\)$' \| \
-@@ -23318,5 +23318,5 @@
-   else
- as_fn_error $? input file $ac_prefix_conf_IN does not exist, skip 
generating $ac_prefix_conf_OUT $LINENO 5
-   fi
--  rm -f conftest.*
-+  rm -f -r conftest.*
- fi
commit 04aaf0a52ff692e340d4acd47c4ddf5857b12df2
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Oct 17 22:38:23 2013 +0300

These are handled in external/Module_external.mk

Change-Id: I1d1fbef457a34f730c9a83c5580fd56a0bed455c

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 92ab57e..22bc481 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -55,9 +55,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
unotools \
ure \
xmlreader \
-   $(call gb_Helper_optional,BOOST,boost) \
-

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

2013-10-17 Thread Eike Rathke

 i18nlangtag/source/isolang/mslangid.cxx |  134 +++-
 1 file changed, 64 insertions(+), 70 deletions(-)

New commits:
commit 45d569be8f1db177bc539db75e225d8c60cdfca6
Author: Eike Rathke er...@redhat.com
Date:   Thu Oct 17 21:53:53 2013 +0200

use LANGUAGE_MASK_PRIMARY in MsLangId::getScriptType()

Change-Id: I55ce19b615722fe9152a4c683037bbb4578dd49e

diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index f547c34..36d5d8a 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -312,67 +312,21 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
 sal_Int16 nScript;
 switch( nLang )
 {
-// CJK
-// all LANGUAGE_CHINESE_... are caught below
-case LANGUAGE_JAPANESE:
-case LANGUAGE_KOREAN:
-case LANGUAGE_KOREAN_JOHAB:
-case LANGUAGE_USER_KOREAN_NORTH:
-nScript = ::com::sun::star::i18n::ScriptType::ASIAN;
-break;
-
 // CTL
-// all LANGUAGE_ARABIC_... are caught below
-case LANGUAGE_AMHARIC_ETHIOPIA:
-case LANGUAGE_ASSAMESE:
-case LANGUAGE_BENGALI:
-case LANGUAGE_BENGALI_BANGLADESH:
-case LANGUAGE_BURMESE:
-case LANGUAGE_FARSI:
-case LANGUAGE_HEBREW:
-case LANGUAGE_YIDDISH:
-case LANGUAGE_USER_YIDDISH_US:
-case LANGUAGE_MARATHI:
-case LANGUAGE_PUNJABI:
-case LANGUAGE_GUJARATI:
-case LANGUAGE_HINDI:
-case LANGUAGE_KANNADA:
-case LANGUAGE_KASHMIRI:
-case LANGUAGE_KASHMIRI_INDIA:
-case LANGUAGE_KHMER:
-case LANGUAGE_LAO:
-case LANGUAGE_MALAYALAM:
-case LANGUAGE_MANIPURI:
 case LANGUAGE_MONGOLIAN_MONGOLIAN:
-case LANGUAGE_NEPALI:
-case LANGUAGE_NEPALI_INDIA:
-case LANGUAGE_ORIYA:
-case LANGUAGE_SANSKRIT:
-case LANGUAGE_SINDHI:
-case LANGUAGE_SINDHI_PAKISTAN:
-case LANGUAGE_SINHALESE_SRI_LANKA:
-case LANGUAGE_SYRIAC:
-case LANGUAGE_TAMIL:
-case LANGUAGE_TELUGU:
-case LANGUAGE_THAI:
-case LANGUAGE_TIBETAN:
-case LANGUAGE_DZONGKHA:
-case LANGUAGE_USER_TIBETAN_INDIA:
-case LANGUAGE_URDU_PAKISTAN:
-case LANGUAGE_URDU_INDIA:
-case LANGUAGE_USER_KURDISH_IRAQ:
 case LANGUAGE_USER_KURDISH_IRAN:
-case LANGUAGE_DHIVEHI:
-case LANGUAGE_USER_BODO_INDIA:
-case LANGUAGE_USER_DOGRI_INDIA:
-case LANGUAGE_USER_MAITHILI_INDIA:
-case LANGUAGE_UIGHUR_CHINA:
-case LANGUAGE_USER_LIMBU:
+case LANGUAGE_USER_KURDISH_IRAQ:
 case LANGUAGE_USER_KYRGYZ_CHINA:
-case LANGUAGE_USER_NKO:
 nScript = ::com::sun::star::i18n::ScriptType::COMPLEX;
 break;
 
+// Western
+case LANGUAGE_MONGOLIAN:
+case LANGUAGE_USER_KURDISH_SYRIA:
+case LANGUAGE_USER_KURDISH_TURKEY:
+nScript = ::com::sun::star::i18n::ScriptType::LATIN;
+break;
+
 // currently not knowing scripttype - defaulted to LATIN:
 /*
 #define LANGUAGE_ARMENIAN   0x042B
@@ -383,22 +337,62 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
 #define LANGUAGE_TATAR  0x0444
 */
 
-default:
-switch ( nLang  LANGUAGE_MASK_PRIMARY )
-{
-// CJK catcher
-case LANGUAGE_CHINESE  LANGUAGE_MASK_PRIMARY:
-nScript = ::com::sun::star::i18n::ScriptType::ASIAN;
-break;
-// CTL catcher
-case LANGUAGE_ARABIC_SAUDI_ARABIA  LANGUAGE_MASK_PRIMARY:
-nScript = ::com::sun::star::i18n::ScriptType::COMPLEX;
-break;
-// Western (actually not necessarily Latin but also Cyrillic, for 
example)
-default:
-nScript = ::com::sun::star::i18n::ScriptType::LATIN;
-}
-break;
+default:
+switch ( nLang  LANGUAGE_MASK_PRIMARY )
+{
+// CJK catcher
+case LANGUAGE_CHINESE   LANGUAGE_MASK_PRIMARY:
+case LANGUAGE_JAPANESE  LANGUAGE_MASK_PRIMARY:
+case LANGUAGE_KOREANLANGUAGE_MASK_PRIMARY:
+nScript = ::com::sun::star::i18n::ScriptType::ASIAN;
+break;
+
+// CTL catcher
+case LANGUAGE_AMHARIC_ETHIOPIA LANGUAGE_MASK_PRIMARY:
+case LANGUAGE_ARABIC_SAUDI_ARABIA  LANGUAGE_MASK_PRIMARY:
+case LANGUAGE_ASSAMESE LANGUAGE_MASK_PRIMARY:
+case LANGUAGE_BENGALI  LANGUAGE_MASK_PRIMARY:
+case LANGUAGE_BURMESE  LANGUAGE_MASK_PRIMARY:
+case LANGUAGE_DHIVEHI  LANGUAGE_MASK_PRIMARY:
+case LANGUAGE_FARSI

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

2013-10-17 Thread Matúš Kukan

 sax/qa/cppunit/attributes.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b9c9874853c3e5f6e2bd83d4b48fdd9eb8b5c561
Author: MatÃºÅ¡ Kukan matus.ku...@gmail.com
Date:   Thu Oct 17 21:55:49 2013 +0200

sax: fix build: needs explicit type

Change-Id: I5a5c52215b0177d663f0694515240c3f95a3ab40

diff --git a/sax/qa/cppunit/attributes.cxx b/sax/qa/cppunit/attributes.cxx
index b0f99b0..a573f9d 100644
--- a/sax/qa/cppunit/attributes.cxx
+++ b/sax/qa/cppunit/attributes.cxx
@@ -63,15 +63,15 @@ void AttributesTest::test()
 aAttributeList.addUnknown(a, a);
 aAttributeList.addUnknown(b, b, b);
 aAttributeList.addUnknown(c, c);
-CPPUNIT_ASSERT_EQUAL( 3, aAttributeList.getUnknownAttributes().getLength() 
);
+CPPUNIT_ASSERT_EQUAL( (sal_Int32) 3, 
aAttributeList.getUnknownAttributes().getLength() );
 
-CPPUNIT_ASSERT_EQUAL( 2, aAttributeList.getFastAttributes().getLength() );
+CPPUNIT_ASSERT_EQUAL( (sal_Int32) 2, 
aAttributeList.getFastAttributes().getLength() );
 
 aAttributeList.clear();
 CPPUNIT_ASSERT( !aAttributeList.hasAttribute(1) );
-CPPUNIT_ASSERT_EQUAL( 0, aAttributeList.getFastAttributes().getLength() );
+CPPUNIT_ASSERT_EQUAL( (sal_Int32) 0, 
aAttributeList.getFastAttributes().getLength() );
 aAttributeList.addUnknown(c, c);
-CPPUNIT_ASSERT_EQUAL( 1, aAttributeList.getUnknownAttributes().getLength() 
);
+CPPUNIT_ASSERT_EQUAL( (sal_Int32) 1, 
aAttributeList.getUnknownAttributes().getLength() );
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION( AttributesTest );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/matus/fastparser' - 0 commits -

2013-10-17 Thread Unknown

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-10-17 Thread Andras Timar

 sw/source/ui/dbui/mmaddressblockpage.cxx |2 +-
 sw/source/ui/dbui/mmaddressblockpage.src |   21 -
 2 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 7527e8f71bbdb87f283a6c19e4dbdfa0faf0622a
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Oct 17 21:14:01 2013 +0200

fix thinko

Change-Id: I75e9b4cc83a78d718b194eb8dbb3fd5113aa

diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx 
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index e9ead95..aef961e 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -684,7 +684,7 @@ sal_Int32 
SwCustomizeAddressBlockDialog::GetSelectedItem_Impl()
 {
 SvTreeListEntry* pEntry = m_pAddressElementsLB-GetEntry(i);
 OUString sEntry = m_pAddressElementsLB-GetEntryText(pEntry);
-if( sSelected == sEntry.copy( 1, sSelected.getLength() - 2 ) )
+if( sEntry == sSelected.copy( 1, sSelected.getLength() - 2 ) )
 {
 nRet = (sal_Int32)(sal_IntPtr)pEntry-GetUserData();
 break;
commit 828bc9d9376d296db47fbee699ae08e546b50a8d
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Oct 17 20:38:59 2013 +0200

remove German text from resource

Change-Id: I8a34d2a5d4ea5e8e7f2245b97e4b8b0577edcc17

diff --git a/sw/source/ui/dbui/mmaddressblockpage.src 
b/sw/source/ui/dbui/mmaddressblockpage.src
index fdd871d..81f6f9e 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.src
+++ b/sw/source/ui/dbui/mmaddressblockpage.src
@@ -232,13 +232,6 @@ String ST_TEXT
 };
 StringArray RA_SALUTATION_MALE
 {
-ItemList =
-{
- Sehr geehrter Herr 2, ;  ;
- Lieber Herr 2, ;  ;
- Hallo Herr 2, ;  ;
- Hallo 1, ;  ;
-};
 ItemList [en-US]=
 {
  Dear Mr. 2, ;  ;
@@ -249,13 +242,6 @@ StringArray RA_SALUTATION_MALE
 };
 StringArray RA_SALUTATION_FEMALE
 {
-ItemList =
-{
- Sehr geehrte Frau 2, ;  ;
- Liebe Frau 2, ;  ;
- Hallo Frau 2, ;  ;
- Hallo 1, ;  ;
-};
 ItemList [en-US]=
 {
  Dear Mrs. 2, ;  ;
@@ -266,13 +252,6 @@ StringArray RA_SALUTATION_FEMALE
 };
 StringArray RA_PUNCTUATION
 {
-ItemList =
-{
- , ;  ;
- : ;  ;
- ! ;  ;
- (kein) ;  ;
-};
 ItemList [en-US]=
 {
  , ;  ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 3 >

1 - 100 of 265 matches

Mail list logo