LibreOffice Gerrit News for core on 2014-09-11

2014-09-11 Thread gerrit
Moin!

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

 First time contributors doing great things! 
+ Make UNO and wizard mail merge use same function.
  in https://gerrit.libreoffice.org/10981 from Jan-Marek Glogowski
  about module sw
+ scripting: Pass a proper array equal to collection size.
  in https://gerrit.libreoffice.org/11375 from Robert Antoni Buj i Gelonch
  about module scripting
+ mediawiki: use String.length()==0 instead of String.equals(empty string)
  in https://gerrit.libreoffice.org/11372 from Robert Antoni Buj i Gelonch
  about module swext
+ qadevOOo: use String.length()==0 instead of String.equals(empty string)
  in https://gerrit.libreoffice.org/11368 from Robert Antoni Buj i Gelonch
  about module qadevOOo
+ fdo#78611 Don't create automatic rules on reset
  in https://gerrit.libreoffice.org/10988 from Jan-Marek Glogowski
  about module sw
+ fdo#81782 MM: copy most document properties
  in https://gerrit.libreoffice.org/10987 from Jan-Marek Glogowski
  about module sw
+ MM: restore the non-saving wizard behaviour
  in https://gerrit.libreoffice.org/10986 from Jan-Marek Glogowski
  about module sw
+ MM: add missing CreateMonitor handling
  in https://gerrit.libreoffice.org/10985 from Jan-Marek Glogowski
  about module sw
+ MM: refactor cancel handling for dbui dialogs
  in https://gerrit.libreoffice.org/10984 from Jan-Marek Glogowski
  about module sw
+ MM: Don't adapt the view when saving dbg documents
  in https://gerrit.libreoffice.org/10983 from Jan-Marek Glogowski
  about module sw
+ Remove superfluous merge function.
  in https://gerrit.libreoffice.org/10982 from Jan-Marek Glogowski
  about module sw
+ fdo#70346 MM: Fix language for DB dict values
  in https://gerrit.libreoffice.org/10979 from Jan-Marek Glogowski
  about module sw
+ fdo#70346 MM: add mail merge data to condition dict
  in https://gerrit.libreoffice.org/10978 from Jan-Marek Glogowski
  about module sw
+ fdo#39468: Translated German to English
  in https://gerrit.libreoffice.org/11373 from Jennifer Liebel
  about module forms, include
 End of freshness 

+ fdo#75256 Correct the alignment of some icons. New icons for quit and avm
  in https://gerrit.libreoffice.org/11345 from Matthias Freund
  about module icon-themes
+ (Rudimentary) C++11 support is a hard requirement now
  in https://gerrit.libreoffice.org/11385 from Stephan Bergmann
  about module build, config_host, helpcompiler, include, solenv, xmlhelp
+ sal: create threads on Linux with a larger stack for ASAN
  in https://gerrit.libreoffice.org/11387 from Michael Stahl
  about module sal
+ Add support for external hamcrest when using junit 4.11+
  in https://gerrit.libreoffice.org/11383 from Peter Foley
  about module build, solenv
+ Turn SfxItemState into a C++11 scoped enumeration
  in https://gerrit.libreoffice.org/11384 from Stephan Bergmann
  about module avmedia, basctl, chart2, cui, desktop, editeng, extensions, 
filter, forms, include, reportdesign, sc, sd, sfx2, starmath, svl, svx, sw
+ fdo#83010: have WrapFields support adjustments
  in https://gerrit.libreoffice.org/11278 from Katarina Behrens
  about module chart2, cui, extras, include, svx, vcl


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

+ fdo#81272 Speed up break iterators
  in https://gerrit.libreoffice.org/11386 from Matthew Francis
+ Invalidate rect cache before moving object
  in https://gerrit.libreoffice.org/10977 from Jan-Marek Glogowski
+ fdo#80926 Don't move anchors of invalid pages
  in https://gerrit.libreoffice.org/10976 from Jan-Marek Glogowski
+ Fix single node CopyRange
  in https://gerrit.libreoffice.org/10972 from Jan-Marek Glogowski
+ Normalize SwDBManager::Merge{MailFiles,Documents}
  in https://gerrit.libreoffice.org/10971 from Jan-Marek Glogowski
+ Clean-up
  in https://gerrit.libreoffice.org/11380 from Vinaya Mandke
+ more fixes for SfxItemState
  in https://gerrit.libreoffice.org/11378 from Noel Grandin
+ fdo#75757: remove inheritance to std::vector
  in https://gerrit.libreoffice.org/11379 from Takeshi Abe
+ fdo#81272 Speed up break iterators
  in https://gerrit.libreoffice.org/11374 from Matthew Francis
+ fdo#55380 replaced use of obsolete interfaces
  in https://gerrit.libreoffice.org/11256 from Daniel Sikeler
+ Fallback DPI detection on X11
  in https://gerrit.libreoffice.org/11377 from Giuseppe Bilotta
+ Refactor DPI settings validity check
  in https://gerrit.libreoffice.org/11376 from Giuseppe Bilotta
+ Add debug documents to SwDBManager::MergeMailFiles
  in https://gerrit.libreoffice.org/10970 from Jan-Marek Glogowski
+ Add debug messages for sw.{createcopy,docappend}
  in https://gerrit.libreoffice.org/10969 from Jan-Marek Glogowski
+ MM: introduce SwDoc::Append helper function
  in https://gerrit.libreoffice.org/10967 from Jan-Marek Glogowski
+ mediawiki: use a character literal
  in https://gerrit.libreoffice.org/11371 from Robert Antoni Buj i Gelonch
+ qadevOOo: Convert a primitive 

[Libreoffice-commits] core.git: swext/mediawiki

2014-09-11 Thread rbuj
 swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2844128a9494c2877595b65ee01f4c099176cafa
Author: rbuj robert@gmail.com
Date:   Wed Sep 10 00:31:08 2014 +0200

mediawiki: use String.length()==0 instead of String.equals(empty string)

Change-Id: I849da46aee801686cf6a581d65276ab60575c078
Reviewed-on: https://gerrit.libreoffice.org/11372
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java 
b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
index 2c74d40..aa95ea4 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
@@ -233,13 +233,13 @@ public class WikiEditSettingDialog extends WikiDialog
 //the URL is valid
 String sMainURL = Helper.GetMainURL( sWebPage, sURL );
 
-if ( sMainURL.equals(  ) )
+if ( sMainURL.length() == 0 )
 {
 // TODO:
 // it's not a Wiki Page, check first whether a 
redirect is requested
 // happens usually in case of https
 sRedirectURL = Helper.GetRedirectURL( sWebPage, 
sURL );
-if ( sRedirectURL.equals(  ) )
+if ( sRedirectURL.length() == 0 )
 {
 // show error
 Helper.ShowError( m_xContext,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: qadevOOo/runner

2014-09-11 Thread rbuj
 qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java |2 +-
 qadevOOo/runner/helper/CfgParser.java   |2 +-
 qadevOOo/runner/helper/OfficeProvider.java  |2 +-
 qadevOOo/runner/util/XMLTools.java  |4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f1b8d8832d38621ae9fbe08bf9bde414230fc5c3
Author: rbuj robert@gmail.com
Date:   Wed Sep 10 00:02:15 2014 +0200

qadevOOo: use String.length()==0 instead of String.equals(empty string)

Change-Id: I5cdd1fb4fe77c7fc9614f2a6de8995d98d60b551
Reviewed-on: https://gerrit.libreoffice.org/11368
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java 
b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
index 1e69718..2d59022 100644
--- a/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
+++ b/qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java
@@ -320,7 +320,7 @@ public class GraphicalDifferenceCheck
 
 private static String ensureEndingFileSep(String s)
 {
-if(s != null  !s.equals()  !s.endsWith(File.separator))
+if(s != null  s.length() != 0  !s.endsWith(File.separator))
 {
 s = s.trim() + File.separator;
 }
diff --git a/qadevOOo/runner/helper/CfgParser.java 
b/qadevOOo/runner/helper/CfgParser.java
index 263655f3..6c77461 100644
--- a/qadevOOo/runner/helper/CfgParser.java
+++ b/qadevOOo/runner/helper/CfgParser.java
@@ -48,7 +48,7 @@ public class CfgParser
 {
 debug = param.getBool(PropertyName.DEBUG_IS_ACTIVE);
 Properties cfg = null;
-if (iniFile.equals())
+if (iniFile.length() == 0)
 {
 //no iniFile given, search one in the users home directory
 cfg = getProperties(getDefaultFileName(true));
diff --git a/qadevOOo/runner/helper/OfficeProvider.java 
b/qadevOOo/runner/helper/OfficeProvider.java
index 6b21841..d5ac4ba 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -183,7 +183,7 @@ public class OfficeProvider implements AppProvider
 Exception exConnectFailed = null;
 boolean isExecutable = false;
 boolean isAppKnown = ((cncstr.indexOf(host=localhost)  0) || 
(cncstr.indexOf(pipe,name=)  0));
-isAppKnown = !((String) 
param.get(AppExecutionCommand)).equals();
+isAppKnown = ((String) param.get(AppExecutionCommand)).length() 
!= 0;
 
 if (isAppKnown)
 {
diff --git a/qadevOOo/runner/util/XMLTools.java 
b/qadevOOo/runner/util/XMLTools.java
index a59f523..5f43f06 100644
--- a/qadevOOo/runner/util/XMLTools.java
+++ b/qadevOOo/runner/util/XMLTools.java
@@ -377,7 +377,7 @@ public class XMLTools {
 super.startElement(name, attrs) ;
 if (tags.containsKey(name)) {
 String outerTag = tags.get(name);
-if (!outerTag.equals()) {
+if (outerTag.length() != 0) {
 boolean isInTag = false ;
 for (int i = 0; i  tagStack.size(); i++) {
 if (outerTag.equals(tagStack.get(i))) {
@@ -401,7 +401,7 @@ public class XMLTools {
 
 if (chars.containsKey(ch)) {
 String outerTag = chars.get(ch);
-if (!outerTag.equals()) {
+if (outerTag.length() != 0) {
 boolean isInTag = false ;
 for (int i = 0; i  tagStack.size(); i++) {
 if (outerTag.equals(tagStack.get(i))) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-09-11 Thread rbuj
 xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d44ace5d50b41a7a68d77f16a77b31786e3a7f12
Author: rbuj robert@gmail.com
Date:   Tue Sep 9 23:20:09 2014 +0200

xmerge: Convert a primitive type into a string

Avoid unnecessary temporaries when converting primitive data types into a 
String.

Change-Id: Ied91859e756ff392b1a0ea8d6d889afae11b2f8d
Reviewed-on: https://gerrit.libreoffice.org/11366
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
index c3433f2..d2385bc 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java
@@ -100,7 +100,7 @@ public class OfficeUtil implements OfficeConstants {
 
 Element spaceNode = parentDoc.createElement(TAG_SPACE);
 spaceNode.setAttribute(ATTRIBUTE_SPACE_COUNT,
-   Integer.valueOf(nrSpaces).toString());
+   Integer.toString(nrSpaces));
 nodeVec.add(spaceNode);
 text = text.substring(nrSpaces);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: scripting/java

2014-09-11 Thread rbuj
 scripting/java/org/openoffice/idesupport/CommandLineTools.java |2 +-
 scripting/java/org/openoffice/idesupport/JavaFinder.java   |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit de1db03480c86aa386b5cff09c4eac0eddbadf53
Author: rbuj robert@gmail.com
Date:   Wed Sep 10 12:39:29 2014 +0200

scripting: Pass a proper array equal to collection size.

Change-Id: I2c4c85b2da7b7037fc9da16793d18667b3d25503
Reviewed-on: https://gerrit.libreoffice.org/11375
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git a/scripting/java/org/openoffice/idesupport/CommandLineTools.java 
b/scripting/java/org/openoffice/idesupport/CommandLineTools.java
index 8e2b397..c47e245 100644
--- a/scripting/java/org/openoffice/idesupport/CommandLineTools.java
+++ b/scripting/java/org/openoffice/idesupport/CommandLineTools.java
@@ -293,7 +293,7 @@ public class CommandLineTools {
 throw new Exception(No valid scripts found);
 
 ParcelDescriptor desc = new ParcelDescriptor(parcelxml, 
language);
-desc.setScriptEntries((ScriptEntry[])scripts.toArray(new 
ScriptEntry[0]));
+desc.setScriptEntries((ScriptEntry[])scripts.toArray(new 
ScriptEntry[scripts.size()]));
 if (properties.size() != 0) {
 Enumeration enumer = properties.keys();
 
diff --git a/scripting/java/org/openoffice/idesupport/JavaFinder.java 
b/scripting/java/org/openoffice/idesupport/JavaFinder.java
index f21cf3b..98043d2 100644
--- a/scripting/java/org/openoffice/idesupport/JavaFinder.java
+++ b/scripting/java/org/openoffice/idesupport/JavaFinder.java
@@ -138,7 +138,7 @@ public class JavaFinder implements MethodFinder {
 }
 }
 
-return new URLClassLoader(urls.toArray(new URL[0]));
+return new URLClassLoader(urls.toArray(new URL[urls.size()]));
 }
 
 private ClassLoader getClassLoader(File basedir) {
@@ -232,6 +232,6 @@ public class JavaFinder implements MethodFinder {
 }
 }
 }
-return result.toArray(new String[0]);
+return result.toArray(new String[result.size()]);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: scripting/java

2014-09-11 Thread rbuj
 scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java |   
49 --
 1 file changed, 23 insertions(+), 26 deletions(-)

New commits:
commit b50fedfc348eb9a834b6626dc95e3538c4962a47
Author: rbuj robert@gmail.com
Date:   Sat Sep 6 21:15:33 2014 +0200

scripting: avoid a possible NullPointerException

Change-Id: I90589bc042f4b88b700e9f3c167c460c3cff043c
Reviewed-on: https://gerrit.libreoffice.org/11311
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com

diff --git 
a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java 
b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
index 5c744b1..6073eb0 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
@@ -64,46 +64,43 @@ public class ScriptBrowseNode extends PropertySet
 this.provider = provider;
 this.name = name;
 this.parent = parent;
-ScriptMetaData data = null;
-XSimpleFileAccess xSFA = null;
 XComponentContext xCtx = 
provider.getScriptingContext().getComponentContext();
 XMultiComponentFactory xFac = xCtx.getServiceManager();
 try
 {
-data = (ScriptMetaData)parent.getByName( name );
-xSFA = UnoRuntime.queryInterface( XSimpleFileAccess.class,
+ScriptMetaData data = (ScriptMetaData)parent.getByName( name );
+XSimpleFileAccess xSFA = UnoRuntime.queryInterface( 
XSimpleFileAccess.class,
 xFac.createInstanceWithContext(
 com.sun.star.ucb.SimpleFileAccess,
 xCtx ) );
-}
-
-// TODO fix exception types to be caught here, should we rethrow?
-catch (  Exception e )
-{
-LogUtils.DEBUG(** caught exception getting script data for  + 
name +  - + e.toString() );
-}
-
-if (provider.hasScriptEditor())
-{
 
-this.editable  = true;
-try
+if (provider.hasScriptEditor())
 {
-if ( !parent.isUnoPkg() 
-!xSFA.isReadOnly( parent.getPathToParcel() ) )
+this.editable = true;
+try
 {
-this.deletable = true;
-this.renamable = true;
+if (!parent.isUnoPkg()
+ !xSFA.isReadOnly(parent.getPathToParcel()))
+{
+this.deletable = true;
+this.renamable = true;
+}
 }
-}
-// TODO propagate errors
-catch ( Exception e )
-{
-LogUtils.DEBUG(Caught exception in creation of 
ScriptBrowseNode);
-LogUtils.DEBUG( LogUtils.getTrace(e));
+// TODO propagate errors
+catch (Exception e)
+{
+LogUtils.DEBUG(Caught exception in creation of 
ScriptBrowseNode);
+LogUtils.DEBUG(LogUtils.getTrace(e));
+}
+
 }
 
 }
+// TODO fix exception types to be caught here, should we rethrow?
+catch (  Exception e )
+{
+LogUtils.DEBUG(** caught exception getting script data for  + 
name +  - + e.toString() );
+}
 
 registerProperty(Deletable, new Type(boolean.class),
 (short)0, deletable);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-09-11 Thread Tor Lillqvist
 compilerplugins/clang/sallogareas.cxx   |  140 
 compilerplugins/clang/sallogareas.hxx   |   43 
 compilerplugins/clang/store/sallogareas.cxx |  140 
 compilerplugins/clang/store/sallogareas.hxx |   43 
 4 files changed, 183 insertions(+), 183 deletions(-)

New commits:
commit dac678d44ed64da97a6874380bdba5a6f4b4eb9b
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Sep 11 09:15:45 2014 +0300

Deactivate the sallogareas plugin

It's boring and a waste of time to have to keep registering in
include/sal/log-areas.dox new log areas that other people have introduced.

We don't really have a uniform policy for logging anyway, so why bother 
trying
to enforce a such for the log areas? Anybody uses whatever log areas and log
output style and formatting they want in the code they happen to be working
on. And that's fine with me. We were supposed to be the project that avoids
unnecessary process, rules and bureaucracy, right?

Change-Id: I6bddcb56b58edcd885e5dc743c8730878de0036d

diff --git a/compilerplugins/clang/sallogareas.cxx 
b/compilerplugins/clang/store/sallogareas.cxx
similarity index 100%
rename from compilerplugins/clang/sallogareas.cxx
rename to compilerplugins/clang/store/sallogareas.cxx
diff --git a/compilerplugins/clang/sallogareas.hxx 
b/compilerplugins/clang/store/sallogareas.hxx
similarity index 100%
rename from compilerplugins/clang/sallogareas.hxx
rename to compilerplugins/clang/store/sallogareas.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: sal/osl

2014-09-11 Thread Michael Stahl
 sal/osl/unx/thread.c |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit f49abb2ab3349d4c9956142e835b7f8bb5734692
Author: Michael Stahl mst...@redhat.com
Date:   Wed Sep 10 22:07:23 2014 +0200

sal: create threads on Linux with a larger stack for ASAN

The default on Fedora 20 is 8MB, which causes stack overflows from
CPython code in some of the JunitTests when built with clang 3.4
-fsanitize=address.

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

diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c
index 17b4d6c..1c703ca 100644
--- a/sal/osl/unx/thread.c
+++ b/sal/osl/unx/thread.c
@@ -252,7 +252,7 @@ static oslThread osl_thread_create_Impl (
 short nFlags)
 {
 Thread_Impl* pImpl;
-#if defined OPENBSD || (defined MACOSX  !ENABLE_RUNTIME_OPTIMIZATIONS)
+#if defined OPENBSD || ((defined MACOSX || defined LINUX)  
!ENABLE_RUNTIME_OPTIMIZATIONS)
 pthread_attr_t attr;
 size_t stacksize;
 #endif
@@ -268,12 +268,14 @@ static oslThread osl_thread_create_Impl (
 
 pthread_mutex_lock ((pImpl-m_Lock));
 
-#if defined OPENBSD || (defined MACOSX  !ENABLE_RUNTIME_OPTIMIZATIONS)
+#if defined OPENBSD || ((defined MACOSX || defined LINUX)  
!ENABLE_RUNTIME_OPTIMIZATIONS)
 if (pthread_attr_init(attr) != 0)
 return (0);
 
 #if defined OPENBSD
 stacksize = 262144;
+#elif defined LINUX
+stacksize = 12 * 1024 * 1024; // 8MB is not enough for ASAN on x86-64
 #else
 stacksize = 100 * PTHREAD_STACK_MIN;
 #endif
@@ -285,7 +287,7 @@ static oslThread osl_thread_create_Impl (
 
 if ((nRet = pthread_create (
 (pImpl-m_hThread),
-#if defined OPENBSD || (defined MACOSX  !ENABLE_RUNTIME_OPTIMIZATIONS)
+#if defined OPENBSD || ((defined MACOSX || defined LINUX)  
!ENABLE_RUNTIME_OPTIMIZATIONS)
 attr,
 #else
 PTHREAD_ATTR_DEFAULT,
@@ -302,7 +304,7 @@ static oslThread osl_thread_create_Impl (
 return (0);
 }
 
-#if defined OPENBSD || (defined MACOSX  !ENABLE_RUNTIME_OPTIMIZATIONS)
+#if defined OPENBSD || ((defined MACOSX || defined LINUX)  
!ENABLE_RUNTIME_OPTIMIZATIONS)
 pthread_attr_destroy(attr);
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-09-11 Thread Stephan Bergmann
 sw/source/uibase/dbui/dbmgr.cxx |  308 
 1 file changed, 154 insertions(+), 154 deletions(-)

New commits:
commit a1251a7825096f9ff8240baa66f6318e448b2654
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 11 08:48:11 2014 +0200

loplugin:bodynotinblock

Change-Id: I7fa377b37e4985196ad25da0ff3d116aff36ab01

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 80edc3a..f249ffc 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1049,191 +1049,191 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* 
pSourceShell,
 lcl_SaveDoc( xWorkDocSh, WorkDoc, nDocNo );
 #endif
 
-//create a view frame for the document
-SwView* pWorkView = static_cast SwView* ( 
SfxViewFrame::LoadHiddenDocument( *xWorkDocSh, 0 )-GetViewShell() );
-//request the layout calculation
-SwWrtShell rWorkShell = pWorkView-GetWrtShell();
-pWorkView-AttrChangedNotify( rWorkShell );// in 
order for SelectShell to be called
-
-SwDoc* pWorkDoc = rWorkShell.GetDoc();
-SwDBManager* pOldDBManager = 
pWorkDoc-GetDBManager();
-pWorkDoc-SetDBManager( this );
-
pWorkDoc-getIDocumentLinksAdministration().EmbedAllLinks();
-
-// #i69485# lock fields to prevent access to the 
result set while calculating layout
-rWorkShell.LockExpFlds();
-rWorkShell.CalcLayout();
-rWorkShell.UnlockExpFlds();
-
-
SfxGetpApp()-NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, 
SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE), xWorkDocSh));
-rWorkShell.SwViewShell::UpdateFlds();
-
SfxGetpApp()-NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, 
SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE_FINISHED), xWorkDocSh));
-
-pWorkDoc-RemoveInvisibleContent();
-
-// launch MailMergeEvent if required
-const SwXMailMerge *pEvtSrc = GetMailMergeEvtSrc();
-if(pEvtSrc)
+//create a view frame for the document
+SwView* pWorkView = static_cast SwView* ( 
SfxViewFrame::LoadHiddenDocument( *xWorkDocSh, 0 )-GetViewShell() );
+//request the layout calculation
+SwWrtShell rWorkShell = pWorkView-GetWrtShell();
+pWorkView-AttrChangedNotify( rWorkShell );// in 
order for SelectShell to be called
+
+SwDoc* pWorkDoc = rWorkShell.GetDoc();
+SwDBManager* pOldDBManager = pWorkDoc-GetDBManager();
+pWorkDoc-SetDBManager( this );
+
pWorkDoc-getIDocumentLinksAdministration().EmbedAllLinks();
+
+// #i69485# lock fields to prevent access to the 
result set while calculating layout
+rWorkShell.LockExpFlds();
+rWorkShell.CalcLayout();
+rWorkShell.UnlockExpFlds();
+
+
SfxGetpApp()-NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE, 
SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE), xWorkDocSh));
+rWorkShell.SwViewShell::UpdateFlds();
+
SfxGetpApp()-NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, 
SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE_FINISHED), xWorkDocSh));
+
+pWorkDoc-RemoveInvisibleContent();
+
+// launch MailMergeEvent if required
+const SwXMailMerge *pEvtSrc = GetMailMergeEvtSrc();
+if(pEvtSrc)
+{
+uno::Reference XInterface  xRef( 
(XMailMergeBroadcaster *) pEvtSrc );
+text::MailMergeEvent aEvt( xRef, 
xWorkDocSh-GetModel() );
+pEvtSrc-LaunchMailMergeEvent( aEvt );
+}
+
+if(rMergeDescriptor.bCreateSingleFile || bAsSingleFile 
)
+{
+OSL_ENSURE( pTargetShell, no target shell 
available! );
+// copy created file into the target document
+rWorkShell.ConvertFieldsToText();
+rWorkShell.SetNumberingRestart();
+if( bSynchronizedDoc )
 {
-uno::Reference XInterface  xRef( 
(XMailMergeBroadcaster *) pEvtSrc );
-

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.2-9'

2014-09-11 Thread Zolnai Tamás
Tag 'cp-4.2-9' created by Andras Timar andras.ti...@collabora.com at 
2014-09-11 08:11 -0700

cp-4.2-9

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


[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.2-9'

2014-09-11 Thread Caolán McNamara
Tag 'cp-4.2-9' created by Andras Timar andras.ti...@collabora.com at 
2014-09-11 08:11 -0700

cp-4.2-9

Changes since cp-4.2-6:
Caolán McNamara (1):
  Resolves: fdo#79012 wrong path to dictionaries

---
 ca/description.xml  |2 +-
 ca/dictionaries.xcu |8 
 2 files changed, 5 insertions(+), 5 deletions(-)
---
___
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.2-9'

2014-09-11 Thread Andras Timar
Tag 'cp-4.2-9' created by Andras Timar andras.ti...@collabora.com at 
2014-09-11 08:11 -0700

cp-4.2-9

Changes since cp-4.2-6:
Andras Timar (1):
  sync with libreoffice-4-2-5 branch

---
 source/cy/scp2/source/accessories.po   |   
18 
 source/cy/svx/source/unodialogs/textconversiondlgs.po  |   
 9 
 source/cy/sw/source/ui/config.po   |   
14 
 source/de/officecfg/registry/data/org/openoffice/Office/UI.po  |   
 6 
 source/de/svx/uiconfig/ui.po   |   
10 
 source/et/helpcontent2/source/text/swriter/01.po   |   
 8 
 source/et/sw/source/ui/fldui.po|   
10 
 source/fr/sd/uiconfig/sdraw/ui.po  |   
 9 
 source/gl/scp2/source/accessories.po   |   
22 -
 source/gl/sfx2/source/dialog.po|   
 8 
 source/gl/sfx2/uiconfig/ui.po  |   
10 
 source/gl/svx/source/unodialogs/textconversiondlgs.po  |   
 9 
 source/gl/sw/source/ui/inc.po  |   
14 
 source/gl/sw/uiconfig/swriter/ui.po|   
10 
 source/id/cui/source/options.po|   
10 
 source/id/cui/uiconfig/ui.po   |   
10 
 source/id/extensions/source/propctrlr.po   |   
10 
 source/id/filter/uiconfig/ui.po|   
14 
 source/id/officecfg/registry/data/org/openoffice/Office/UI.po  |   
26 -
 source/id/sc/source/ui/drawfunc.po |   
12 
 source/id/sc/source/ui/navipi.po   |   
10 
 source/id/sc/source/ui/src.po  |   
16 
 source/id/sd/source/ui/app.po  |   
40 -
 source/id/sd/source/ui/dlg.po  |   
18 
 source/id/sd/uiconfig/sdraw/ui.po  |   
16 
 source/id/sd/uiconfig/simpress/ui.po   |   
12 
 source/id/sfx2/source/appl.po  |   
20 
 source/nl/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po |   
 9 
 source/nl/cui/uiconfig/ui.po   |   
 6 
 source/nl/dbaccess/source/ui/dlg.po|   
 6 
 source/nl/extensions/source/abpilot.po |   
13 
 source/nl/filter/source/pdf.po |   
12 
 source/nl/helpcontent2/source/text/shared/guide.po |   
 8 
 source/nl/officecfg/registry/data/org/openoffice/Office/UI.po  |   
10 
 source/nl/reportdesign/source/ui/dlg.po|   
10 
 source/nl/sc/source/ui/StatisticsDialogs.po|   
10 
 source/nl/sc/source/ui/dbgui.po|   
14 
 source/nl/sc/source/ui/src.po  |   
18 
 source/nl/scaddins/source/analysis.po  |   
10 
 source/nl/starmath/source.po   |   
10 
 source/nn/helpcontent2/source/text/shared/guide.po |  
204 +-
 source/pl/cui/source/dialogs.po|   
10 
 source/pl/filter/source/config/fragments/filters.po|   
10 
 source/pl/helpcontent2/source/text/sbasic/shared.po|   
 8 
 source/pl/helpcontent2/source/text/shared/00.po|   
 8 
 source/pl/helpcontent2/source/text/shared/01.po|   
10 
 source/pl/helpcontent2/source/text/shared/optionen.po  |   
10 
 source/pl/sc/source/ui/styleui.po  |   
14 
 source/pl/sfx2/source/appl.po  |   
 8 
 source/pl/svx/source/items.po  |   
16 
 source/pl/svx/source/stbctrls.po   |   
14 
 source/pl/svx/uiconfig/ui.po   |   
12 
 source/pl/sw/source/core/undo.po   |   
10 
 source/pl/sw/source/ui/dbui.po |   
10 
 source/pl/sw/uiconfig/swriter/ui.po|   
16 
 source/ru/chart2/uiconfig/ui.po|   
10 
 

[Libreoffice-commits] core.git: 2 commits - configure.ac

2014-09-11 Thread Lionel Elie Mamane
 configure.ac |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b553b534575b2ef8e9dab96819c133414c4a0dc8
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Sep 11 09:40:22 2014 +0200

untabify

Change-Id: I6a1abc2839de2c7b8508f7edabeec8016e67ba5c

diff --git a/configure.ac b/configure.ac
index d8bcb80..5b5ad1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10510,10 +10510,10 @@ if test x$enable_gltf != xno -a $_os != iOS -a 
$_os != Android; then
 AC_MSG_RESULT([yes])
 AC_DEFINE(HAVE_FEATURE_GLTF,1)
 if test $with_system_libgltf = yes; then
-   SYSTEM_LIBGLTF=TRUE
-   PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.0 = 0.0.1] )
+SYSTEM_LIBGLTF=TRUE
+PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.0 = 0.0.1] )
 else
-   BUILD_TYPE=$BUILD_TYPE LIBGLTF
+BUILD_TYPE=$BUILD_TYPE LIBGLTF
 fi
 else
 AC_MSG_RESULT([no])
commit 7860feb6ed1c8c2c60945a5c0b33595077228561
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Sep 11 09:39:47 2014 +0200

system-gltf should follow system-libs

Change-Id: I123b6dd56c21cdecd218152396f8cb8366ef53b2

diff --git a/configure.ac b/configure.ac
index 561a15b..d8bcb80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1608,7 +1608,7 @@ AC_ARG_WITH(system-jpeg,
 AC_ARG_WITH(system-libgltf,
 AS_HELP_STRING([--with-system-libgltf],
 [Use libgltf already on system.]),,
-[with_system_libgltf=auto])
+[with_system_libgltf=$with_system_libs])
 
 AC_ARG_WITH(system-clucene,
 AS_HELP_STRING([--with-system-clucene],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 75025] LibreOffice 4.3 most annoying bugs

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=75025

Jacobo Aragunde Pérez jaragu...@igalia.com changed:

   What|Removed |Added

 Depends on||81264

--- Comment #66 from Jacobo Aragunde Pérez jaragu...@igalia.com ---
Adding bug #81264: Calc is not accessible to screen readers on Linux if sheet
is modified [a11y]

The result of this bug is Calc becoming unusable with screen readers, once they
modify a cell they stop receiving accessible events. It seems to affect Windows
and Linux users, so probably OS X version is affected too.

-- 
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 - sw/source

2014-09-11 Thread Michael Stahl
 sw/source/core/crsr/crstrvl.cxx |   59 +++-
 1 file changed, 34 insertions(+), 25 deletions(-)

New commits:
commit 5979ab84e8a0038a1225020e19e4b884423247fc
Author: Michael Stahl mst...@redhat.com
Date:   Thu Sep 11 10:34:51 2014 +0200

sw: actually check that iterator is valid

Change-Id: Icefedf1d3fe09ed6670481dcdc4c5e745e816b1b

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index ab6c2d4..898f56b 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -635,7 +635,7 @@ lcl_FindField(bool  o_rFound, _SetGetExpFlds const 
rSrtLst,
 
 _SetGetExpFlds::const_iterator it = rSrtLst.lower_bound(pSrch.get());
 
-o_rFound = (**it == *pSrch);
+o_rFound = (it == rSrtLst.end()) ? false : (**it == *pSrch);
 return it;
 }
 
commit cd994fc07f82bf950410bbdc88fbc4de7805547a
Author: Michael Stahl mst...@redhat.com
Date:   Thu Sep 11 10:27:23 2014 +0200

sw: factor out a function to encapsulate object lifetimes

Change-Id: Ie49cb4729d70f2b1fee9a2b7bd4ac095732a3d58

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 86ebf8c..ab6c2d4 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -608,6 +608,37 @@ void lcl_MakeFldLst(
 }
 }
 
+static _SetGetExpFlds::const_iterator
+lcl_FindField(bool  o_rFound, _SetGetExpFlds const rSrtLst,
+SwRootFrm *const pLayout, SwTxtNode *const pTxtNode,
+SwTxtFld *const pTxtFld, SwPosition const rPos,
+sal_Int32 const nContentOffset)
+{
+boost::scoped_ptr_SetGetExpFld pSrch;
+boost::scoped_ptrSwIndex pIndex;
+if (-1 == nContentOffset)
+{
+pSrch.reset(new _SetGetExpFld(rPos.nNode, pTxtFld, rPos.nContent));
+}
+else
+{
+pIndex.reset(new SwIndex(rPos.nNode.GetNode().GetCntntNode(), 
nContentOffset));
+pSrch.reset(new _SetGetExpFld(rPos.nNode, pTxtFld, pIndex.get()));
+}
+
+if (rPos.nNode.GetIndex()  
pTxtNode-GetNodes().GetEndOfExtras().GetIndex())
+{
+// also at collection use only the first frame
+Point aPt;
+pSrch-SetBodyPos(*pTxtNode-getLayoutFrm(pLayout, aPt, rPos, 
false));
+}
+
+_SetGetExpFlds::const_iterator it = rSrtLst.lower_bound(pSrch.get());
+
+o_rFound = (**it == *pSrch);
+return it;
+}
+
 bool SwCrsrShell::MoveFldType(
 const SwFieldType* pFldType,
 const bool bNext,
@@ -693,31 +724,9 @@ bool SwCrsrShell::MoveFldType(
  rPos.nContent.GetIndex() != pTxtFld-GetStart())
 nContentOffset = pTxtFld-GetStart();
 }
-
-_SetGetExpFld *pSrch = NULL;
-SwIndex *pIndex = NULL;
-if( -1 == nContentOffset )
-{
-pSrch = new _SetGetExpFld( rPos.nNode, pTxtFld, rPos.nContent );
-}
-else
-{
-pIndex = new SwIndex( rPos.nNode.GetNode().GetCntntNode(), 
nContentOffset );
-pSrch = new _SetGetExpFld( rPos.nNode, pTxtFld, pIndex );
-}
-
-if( rPos.nNode.GetIndex()  
mpDoc-GetNodes().GetEndOfExtras().GetIndex() )
-{
-// also at collection use only the first frame
-Point aPt;
-pSrch-SetBodyPos( *pTNd-getLayoutFrm( GetLayout(), aPt, rPos, 
false ) );
-}
-
-it = aSrtLst.lower_bound( pSrch );
-
-bool isSrch = (**it == *pSrch);
-delete pIndex;
-delete pSrch;
+bool isSrch;
+it = lcl_FindField(isSrch, aSrtLst,
+GetLayout(), pTNd, pTxtFld, rPos, nContentOffset);
 
 if( bDelFld )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Michael Weghorn license statement

2014-09-11 Thread Michael Weghorn

Hi,

all of my past and future contributions to LibreOffice may be licensed 
under the MPLv2/LGPLv3+ dual license.


Best regards,
Michael Weghorn

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


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

2014-09-11 Thread Miklos Vajna
 writerfilter/source/dmapper/WrapPolygonHandler.cxx |   16 ++--
 writerfilter/source/dmapper/WrapPolygonHandler.hxx |3 ++-
 2 files changed, 4 insertions(+), 15 deletions(-)

New commits:
commit 126a33dd57de1356f6739d8e0e5bd4c4df6c765c
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Sep 11 10:54:35 2014 +0200

Use comphelper::SequenceAsVector

Change-Id: I25b123d8086feef028ffea707d4854392964df7b

diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx 
b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
index dfed4fb..d01190e 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -130,20 +130,8 @@ WrapPolygon::Pointer_t 
WrapPolygon::correctWordWrapPolygon(const awt::Size  rSr
 drawing::PointSequenceSequence WrapPolygon::getPointSequenceSequence() const
 {
 drawing::PointSequenceSequence aPolyPolygon(1L);
-drawing::PointSequence * pPolygon = aPolyPolygon.getArray();
-pPolygon-realloc(size());
-
-sal_uInt32 n = 0;
-Points_t::const_iterator aIt = begin();
-Points_t::const_iterator aItEnd = end();
-
-while (aIt != aItEnd)
-{
-(*pPolygon)[n] = *aIt;
-++n;
-++aIt;
-}
-
+drawing::PointSequence aPolygon = mPoints.getAsConstList();
+aPolyPolygon[0] = aPolygon;
 return aPolyPolygon;
 }
 
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx 
b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index e7a470d..a855c02 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -24,6 +24,7 @@
 #include com/sun/star/drawing/PointSequenceSequence.hpp
 #include resourcemodel/LoggedResources.hxx
 #include tools/fract.hxx
+#include comphelper/sequenceasvector.hxx
 
 namespace writerfilter {
 namespace dmapper {
@@ -31,7 +32,7 @@ namespace dmapper {
 class WrapPolygon
 {
 public:
-typedef ::std::dequecss::awt::Point Points_t;
+typedef comphelper::SequenceAsVectorcss::awt::Point Points_t;
 typedef ::boost::shared_ptrWrapPolygon Pointer_t;
 
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-09-11 Thread Daniel Sikeler
 avmedia/source/viewer/mediawindow.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 380a4618dd8205c56a5c6622e01e88ae8911fe5e
Author: Daniel Sikeler d.sikele...@gmail.com
Date:   Wed Sep 10 11:56:42 2014 +

fdo#82994 Added some more audio formats

Change-Id: I0acd880dc1886f46e1fe146941f1027c9b6ab265
Reviewed-on: https://gerrit.libreoffice.org/11388
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/avmedia/source/viewer/mediawindow.cxx 
b/avmedia/source/viewer/mediawindow.cxx
index 10a32db..bf70de6 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -201,7 +201,7 @@ void MediaWindow::getMediaFilters( FilterNameVector 
rFilterNameVector )
 {
 static const char* pFilters[] = { Advanced Audio Coding, aac,
   AIF Audio, aif;aiff,
-  Advanced Systems, asf,
+  Advanced Systems Format, asf;wma;wmv,
   AU Audio, au,
   AC3 Audio, ac3,
   AVI, avi,
@@ -213,7 +213,7 @@ void MediaWindow::getMediaFilters( FilterNameVector 
rFilterNameVector )
   MIDI Audio, mid;midi,
   MPEG Audio, mp2;mp3;mpa;m4a,
   MPEG Video, mpg;mpeg;mpv;mp4;m4v,
-  Ogg Audio, ogg;oga,
+  Ogg Audio, ogg;oga;opus,
   Ogg Video, ogv;ogx,
   Real Audio, ra,
   Real Media, rm,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: configure.ac

2014-09-11 Thread Stephan Bergmann
 configure.ac |   16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 4b758c52955e1931850938bf70764ee6376616a0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 11 11:02:13 2014 +0200

Fix check for ABI-broken GCC 4.7.{0,1} libstdc++

...to avoid mis-clasification of e.g. GCC 4.6 libstdc++ on Ubuntu 12.04 as
witnessed at http://ci.libreoffice.org/job/buildbot/2461/consoleFull

Change-Id: Ia754a8d847e7af4e0e25b4bf82e17214f7212894

diff --git a/configure.ac b/configure.ac
index 5b5ad1d..7119839 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6136,17 +6136,23 @@ elif test $GCC = yes; then
 fi
 fi
 
+dnl Test for temporarily incompatible libstdc++ 4.7.{0,1}, where
+dnl https://gcc.gnu.org/viewcvs/gcc?view=revisionrevision=179528 introduced
+dnl an additional member _M_size into C++11 std::list towards 4.7.0 and
+dnl https://gcc.gnu.org/viewcvs/gcc?view=revisionrevision=189186 removed it
+dnl again towards 4.7.2:
 if test $CPP_LIBRARY = GLIBCXX -a $HAVE_CXX11 = TRUE; then
 AC_MSG_CHECKING([whether using C++11 causes libstdc++ 4.7.0/4.7.1 ABI 
breakage])
 AC_LANG_PUSH([C++])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include list
-#if !defined(__GLIBCXX__)
+#if !defined __GLIBCXX__ || (__GLIBCXX__ != 20120322  __GLIBCXX__ != 
20120614)
+// according to https://gcc.gnu.org/onlinedocs/libstdc++/manual/abi.html:
+//   GCC 4.7.0: 20120322
+//   GCC 4.7.1: 20120614
+// and using a range check is not possible as the mapping between
+// __GLIBCXX__ values and GCC versions is not monotonic
 /* ok */
-#elif __GLIBCXX__  20111004
-/* before breakage */
-#elif __GLIBCXX__  20120703
-/* after breakage */
 #else
 abi broken
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[ANNOUNCE] Branch libreoffice-4-3-2 and Tag libreoffice-4.3.2.1 created

2014-09-11 Thread Christian Lohmaier
Hi all,

The tag libreoffice-4.3.2.1 (AKA 4.3.2 RC1) and the corresponding
branch libreoffice-4-3-2 have been created.
The branch will be used for fine tuning of the 4.3.2 release. (there
is one additional RC planned)

The following rules apply:

+ preferably just translation or blocker fixes
+ only cherry-picking from libreoffice-4-3 branch
+ 2 additional reviews needed; 2nd reviewer pushes
+ no regular merges back to anything

The 'libreoffice-4-3' branch is still active and will be used for the
4.3.3 bugfix release. Please read more at
   http://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.2_release
   http://wiki.documentfoundation.org/Development/Branches
   http://wiki.documentfoundation.org/Release_Criteria

Now, if you want to switch your clone to the branch, please do:

./g pull -r
./g checkout -b libreoffice-4-3-2 origin/libreoffice-4-3-2

To checkout the tag, use

./g fetch --tags
./g checkout -b tag-libreoffice-4.3.2.1 libreoffice-4.3.2.1

Hopefully it will work for you :-)  Most probably, you will also want to
do (if you haven't done it yet):

git config --global push.default tracking

When you do git push with this, git will push only the branch you are
on; e.g. libreoffice-4-3-2 when you have switched to it.  This will
save you some git shouting at you.

Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will soon be available from the official page together with the builds.

Attached is the list of changes against 4.3.1 RC2 (4.3.1 final)

Happy hacking,
Christian
+ OOXML import: Respect table background properties a bit more (bnc#480256) [Matúš Kukan]
+ fix reading even/odd page breaks from .docx (bnc#519228) [Luboš Luňák]
+ I can't remove a path in AutoText dialog (bnc#529470) [Tor Lillqvist]
+ avoid opening embedded OLE object as text (bnc#648251) [Tor Lillqvist]
+ sd: check that master page matches when setting parent style (bnc#708518) [Michael Stahl]
+ we need the proper alpha mask (bnc#719994) [Tor Lillqvist]
+ copy first-header-footer test from ww8 to ooxml (bnc#751077) [Luke Deller]
+ make changing table text color in impress always work (bnc#770711) [Matúš Kukan]
+ copy first-header-footer test from ww8 to ooxml (bnc#780843) [Luke Deller]
+ fix reading a .doc that has frame anchored to the end of page (bnc#787942) [Luboš Luňák]
+ better algorithm to find placeholder shape. (bnc#821916) [Matúš Kukan]
+ let's not even try to export invalid chart objects. (bnc#822170) [Kohei Yoshida]
+ if number type is not set, skip numbering (bnc#822347) [Tomaž Vajngerl]
+ PPTX import: Properly show data labels in percent format. (bnc#862510) [Matúš Kukan]
+ DOCX import: handle w:hideMark table cell property (bnc#865381) [Miklos Vajna]
+ improved handling of placeholder shapes (bnc#880448) [Matúš Kukan]
+ set the date time mode to non-fixed after the import is done. (bnc#885548) [Kohei Yoshida]
+ do not set TextAutoGrowHeight for vertical text. (bnc#887227) [Matúš Kukan]
+ fix build, Unchecked dynamic_cast (coverity#1209547) [Caolán McNamara]
+ allow passing FilterOptions via cli (fdo#36313) [Tomas Hlavaty]
+ DOCX import: list styles don't support automatic updates (fdo#38414) [Miklos Vajna]
+ mac Keyboard shortcut Option key ko in Customize dialog (fdo#39477) [Julien Nabet]
+ don't remove 'edit' pop-up menu entry from form in design mode (fdo#44081) [Lionel Elie Mamane]
+ write OOXML externalReferences, externalLinks, (fdo#45286) [Eike Rathke]
+ don't loop autosave if userautosave fails (fdo#46635) [Maxim Monastirsky]
+ pyuno: fix deadlock in Runtime::any2PyObject() (fdo#46678) [Michael Stahl]
+ disable the Automatically currency unless already used (fdo#48110) [Eike Rathke]
+ make Draw use paper size when printing (fdo#63905) [Eilidh McAdam]
+ TextField in table should use same formatting as floating TextField (fdo#67615) [Lionel Elie Mamane]
+ avoid crashing on Accellerator in poorly initialized context (fdo#69162) [Norbert Thiebaud]
+ don't loop autosave if userautosave fails (fdo#71625) [Maxim Monastirsky]
+ sub-grid shouldn't be allowed as 0 (fdo#77516) [Caolán McNamara]
+ (+dup File crashes while opening. (fdo#78906) [Umesh Kadam]
+ labels are truncated (fdo#79227) [Caolán McNamara]
+ make generic autocorr files (German/Spanish/Italian) (fdo#79276) [Julien Nabet]
+ check for empty slots' valid NULL pointer, (fdo#79441) [Eike Rathke]
+ use \highlightN instead of \chcbpatN in RTF import and export (fdo#79599) [nrb...@gmail.com]
+ add 'Save a Copy' to Calc/Impress/Draw (LO4.3-Branch) (fdo#79917) [Heiko Scheidt]
+ handle autocomplete with dot in formula name, (fdo#80058) [Markus Mohrhard]
+ fix the check whether the window is active on OS X. (fdo#80474) [Jan Holesovsky]
+ bad default value (0) for the number of rows (fdo#80534) 

[Libreoffice-commits] core.git: bin/get-bugzilla-attachments-by-mimetype comphelper/source extensions/source filter/Configuration_filter.mk filter/source include/comphelper include/sot officecfg/regis

2014-09-11 Thread Caolán McNamara
 bin/get-bugzilla-attachments-by-mimetype |1 
 comphelper/source/misc/storagehelper.cxx |1 
 extensions/source/activex/so_activex.cxx |1 
 filter/Configuration_filter.mk   |3 
 filter/source/config/fragments/filters/writerglobal8_template.xcu|   17 +++
 filter/source/config/fragments/filters/writerglobal8_template_ui.xcu |   12 ++
 filter/source/config/fragments/types/writerglobal8_template.xcu  |   19 

 filter/source/storagefilterdetect/filterdetect.cxx   |1 
 include/comphelper/documentconstants.hxx |2 
 include/sot/formats.hxx  |3 
 officecfg/registry/data/org/openoffice/Setup.xcu |4 
 package/source/manifest/ManifestExport.cxx   |1 
 scp2/source/writer/registryitem_writer.scp   |8 +
 sfx2/source/control/recentdocsview.cxx   |2 
 sfx2/source/control/templateabstractview.cxx |2 
 solenv/inc/mime.types|1 
 sot/source/base/exchange.cxx |5 -
 sot/source/sdstor/storage.cxx|1 
 sot/source/sdstor/ucbstorage.cxx |1 
 sw/source/uibase/app/docsh.cxx   |1 
 sw/source/uibase/globdoc/globdoc.cxx |5 -
 sysui/CustomTarget_share.mk  |2 
 sysui/Package_osxicons.mk|1 
 sysui/desktop/debian/postinst|2 
 sysui/desktop/freedesktop/freedesktop-menus.spec |1 
 sysui/desktop/icons/oasis-master-document-template.icns  |binary
 sysui/desktop/macosx/Info.plist.in   |   43 
++
 sysui/desktop/menus/writer.desktop   |2 
 sysui/desktop/mimetypes/oasis-master-document-template.desktop   |   26 
++
 sysui/desktop/mimetypes/oasis-master-document-template.keys  |9 ++
 sysui/desktop/mimetypes/openoffice.applications  |2 
 sysui/desktop/share/documents.ulf|3 
 sysui/desktop/solaris/mailcap|1 
 sysui/desktop/solaris/mime.types |1 
 34 files changed, 171 insertions(+), 13 deletions(-)

New commits:
commit ed00d0ddd663085a5fd180301cdc82af80bc8077
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Sep 8 15:31:14 2014 +0100

create a master document template type

of application/vnd.oasis.opendocument.text-master-template with
suffic otm

https://lists.oasis-open.org/archives/office-comment/201002/msg00042.html

desktop/icons/oasis-master-document-template.icns is just a copy
of
desktop/icons/oasis-master-document.icns
because I can't draw

Change-Id: I0d18c79c4c893e97505052884ee8be97d0f117a1
Reviewed-on: https://gerrit.libreoffice.org/11350
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/bin/get-bugzilla-attachments-by-mimetype 
b/bin/get-bugzilla-attachments-by-mimetype
index 6f72dc7..5ac0a26 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -357,6 +357,7 @@ mimetypes = {
 'application/vnd.oasis.opendocument.text-flat-xml': 'fodt',
 'application/vnd.oasis.opendocument.text-master': 'odm',
 'application/vnd.oasis.opendocument.text-template': 'ott',
+'application/vnd.oasis.opendocument.text-master-template': 'otm',
 'application/vnd.oasis.opendocument.text-web': 'oth',
 # OOo XML
 'application/vnd.sun.xml.base': 'odb',
diff --git a/comphelper/source/misc/storagehelper.cxx 
b/comphelper/source/misc/storagehelper.cxx
index 51ee8c5..67d14c1 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -263,6 +263,7 @@ sal_Int32 OStorageHelper::GetXStorageFormat(
 
aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII) 
||
 
aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII 
   ) ||
 
aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII
) ||
+
aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII
 ) ||
 
aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII
 ) ||
 
aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII)
 ||
  

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

2014-09-11 Thread Caolán McNamara
 sw/source/uibase/web/wview.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 8712f0555baab0830aace424f143ad3c9eeaa028
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Sep 11 10:42:24 2014 +0100

fix corner case crash in xhtml headless export as pdf

Change-Id: I255504e2c84783387d2fc308800812bef5e82734

diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index b215f53..c2bd48b 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -142,9 +142,12 @@ void SwWebView::SelectShell()
 pSfxShell-ISA( SwDrawTextShell ) || pSfxShell-ISA( 
SwAnnotationShell ) ) )
 break;
 }
-pSfxShell = rDispatcher.GetShell( --i );
-OSL_ENSURE( pSfxShell, My Shell ist lost in space );
-rDispatcher.Pop( *pSfxShell, SFX_SHELL_POP_UNTIL | 
SFX_SHELL_POP_DELETE);
+if (i)
+{
+pSfxShell = rDispatcher.GetShell( --i );
+OSL_ENSURE( pSfxShell, My Shell ist lost in space );
+rDispatcher.Pop( *pSfxShell, SFX_SHELL_POP_UNTIL | 
SFX_SHELL_POP_DELETE);
+}
 }
 
 bool bInitFormShell = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 79641] LibreOffice 4.4 most annoying bugs

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=79641

Bug 79641 depends on bug 80448, which changed state.

Bug 80448 Summary: FILEOPEN: openGL init crashes Calc
https://bugs.freedesktop.org/show_bug.cgi?id=80448

   What|Removed |Added

 Status|NEEDINFO|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


Re: [libreoffice] allow passing FilterOptions via cli

2014-09-11 Thread Tomas Hlavaty
Hi Stephan,

thank you very much!  I'll try it when it's available from the daily builds.

Tomas

On 10/09/14 12:24, Stephan Bergmann wrote:
 On 09/09/2014 11:57 AM, Tomas Hlavaty wrote:
 It would definitely help us to have the bugfix earlier then in v4.4.

 ...so I've backported it to libreoffice-4-3 now,
 https://bugs.freedesktop.org/show_bug.cgi?id=36313#c18

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

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


[Libreoffice-commits] core.git: configure.ac

2014-09-11 Thread Stephan Bergmann
 configure.ac |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ab819ab4f49ec7e0d57dcf8bf77beb8cd323ceb1
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 11 12:01:50 2014 +0200

Default to MAC_OS_X_VERSION_MIN_REQUIRED=1080 for Mac OS X SDK = 10.8

...esp. after aba0106926ceb337035cf46611ff0d590a2af28b Always build 64-bit 
code
for OS X combined with the fact that the TDF 64-bit builds state 10.8 as a
minimum requirement.

For a build with SDK = 10.8 and no explicit 
--with-macosx-version-min-required,
this also enforces libc++ instead of libstdc++, which is a prerequisite for
future use of more C++11 features.

Change-Id: Idc770c30ff844b6c3e84d088b5deead0a577e7bf

diff --git a/configure.ac b/configure.ac
index 7119839..48e2490 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2830,8 +2830,10 @@ if test $_os = Darwin; then
 case $with_macosx_sdk in
 10.5)
 with_macosx_version_min_required=10.5;;
-*)
+10.6|10.7)
 with_macosx_version_min_required=10.6;;
+*)
+with_macosx_version_min_required=10.8;;
 esac
 fi
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-09-11 Thread Stephan Bergmann

On 01/17/2014 10:02 AM, Stephan Bergmann wrote:

The first appearance of LO for a new platform, like happens with 64-bit
builds of LO 4.2 for Mac OS X now, is always a good time to revisit any
decisions that may bite us later for backwards-compatibility.

In the case of Mac OS X 64-bit, the natural thing to revisit is whether
to use libstdc++ or libc++.  libstdc++ is the tried-and-tested GCC 4.2
thing that we've been using ever since, but it is a dead end (due to
Apple not upgrading past GCC 4.2 for license reasons) that will likely
block future progress of using C++11 in LO (and I'd not be surprised if
Apple drops it from a future OS X version).  On the other hand, libc++
is clearly the way ahead on OS X, but somewhat less well tested with LO
for now (only some individual developer builds having been configured to
use it in the past).

Now, the good news appears to be that Libc++ is specifically designed
so that you can use it in the same process as libstdc++.
[http://clang-developers.42468.n3.nabble.com/Adopting-libc-hitting-problems-on-Mac-OS-X-td4027011.html]
  That means that it hopefully works to stick with libstdc++ for LO 4.2
(and avoid any trouble switching this late in the release schedule),
switch to libc++ for LO 4.3 say, and expect any native extensions using
either of the two libraries to work with both flavors of LO.  (And,
given the assumption that Apple will eventually discontinue the support
of libstdc++, recommend that native extensions---which there are none
yet for Mac OS X 64-bit---use libc++.)


With 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=ab819ab4f49ec7e0d57dcf8bf77beb8cd323ceb1 
Default to MAC_OS_X_VERSION_MIN_REQUIRED=1080 for Mac OS X SDK = 10.8 
on master towards LO 4.4, a build on Mac OS X against SDK = 10.8 and 
with no explicit --with-macosx-version-min-required will now use libc++ 
instead of libstdc++, and I expect TDF Mac OS X builds towards LO 4.4 to 
in fact use libc++.


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


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

2014-09-11 Thread Stephan Bergmann
 i18npool/inc/calendar_gregorian.hxx   |2 -
 i18npool/inc/nativenumbersupplier.hxx |6 
+--
 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |2 -
 i18npool/source/nativenumber/nativenumbersupplier.cxx |   20 
+-
 i18npool/source/transliteration/transliteration_Numeric.cxx   |4 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 91ba527a63f77658ee147515f1699792059aa2e5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 11 12:31:25 2014 +0200

Avoid name clash with generated C++ class corresponding to UNOIDL service

Change-Id: I96582bf05787a30479d324ff8deb7cea758bb2c2

diff --git a/i18npool/inc/calendar_gregorian.hxx 
b/i18npool/inc/calendar_gregorian.hxx
index bd99d18..ea06b00 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.hxx
@@ -93,7 +93,7 @@ public:
 protected:
 const Era *eraArray;
 icu::Calendar *body;
-NativeNumberSupplier aNatNum;
+NativeNumberSupplierService aNatNum;
 const sal_Char* cCalendar;
 com::sun::star::lang::Locale aLocale;
 sal_uInt32 fieldSet;
diff --git a/i18npool/inc/nativenumbersupplier.hxx 
b/i18npool/inc/nativenumbersupplier.hxx
index 750b509..14d17f6 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.hxx
@@ -28,16 +28,16 @@
 namespace com { namespace sun { namespace star { namespace i18n {
 
 //  
-//  class NativeNumberSupplier
+//  class NativeNumberSupplierService
 //  
-class NativeNumberSupplier : public cppu::WeakImplHelper2
+class NativeNumberSupplierService : public cppu::WeakImplHelper2
 
 com::sun::star::i18n::XNativeNumberSupplier,
 com::sun::star::lang::XServiceInfo
 
 {
 public:
-NativeNumberSupplier(bool _useOffset = false) : useOffset(_useOffset) 
{}
+NativeNumberSupplierService(bool _useOffset = false) : 
useOffset(_useOffset) {}
 
 // Methods
 virtual OUString SAL_CALL getNativeNumberString( const OUString 
aNumberString,
diff --git 
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 6e373b0..e7b1309 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -857,7 +857,7 @@ DefaultNumberingProvider::makeNumberingString( const 
Sequencebeans::PropertyVal
   }
 
 if (natNum) {
-NativeNumberSupplier sNatNum;
+NativeNumberSupplierService sNatNum;
 result += sNatNum.getNativeNumberString(OUString::number( number 
), locale, natNum);
 } else if (tableSize) {
 if ( number  tableSize  !recycleSymbol)
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx 
b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 4d54397..a8f08ba 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -517,7 +517,7 @@ static sal_Int16 SAL_CALL getLanguageNumber( const Locale 
rLocale)
 return -1;
 }
 
-OUString SAL_CALL NativeNumberSupplier::getNativeNumberString(const OUString 
aNumberString, const Locale rLocale,
+OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const 
OUString aNumberString, const Locale rLocale,
 sal_Int16 nNativeNumberMode, Sequence sal_Int32  offset) 
throw (RuntimeException)
 {
 const Number *number = 0;
@@ -595,14 +595,14 @@ OUString SAL_CALL 
NativeNumberSupplier::getNativeNumberString(const OUString aN
 return aNumberString;
 }
 
-OUString SAL_CALL NativeNumberSupplier::getNativeNumberString(const OUString 
aNumberString, const Locale rLocale,
+OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const 
OUString aNumberString, const Locale rLocale,
 sal_Int16 nNativeNumberMode) throw (RuntimeException, 
std::exception)
 {
 Sequence sal_Int32  offset;
 return getNativeNumberString(aNumberString, rLocale, nNativeNumberMode, 
offset);
 }
 
-sal_Unicode SAL_CALL NativeNumberSupplier::getNativeNumberChar( const 
sal_Unicode inChar, const Locale rLocale, sal_Int16 nNativeNumberMode ) 
throw(com::sun::star::uno::RuntimeException)
+sal_Unicode SAL_CALL NativeNumberSupplierService::getNativeNumberChar( const 
sal_Unicode inChar, const Locale rLocale, sal_Int16 nNativeNumberMode ) 
throw(com::sun::star::uno::RuntimeException)
 {
 if (nNativeNumberMode == NativeNumberMode::NATNUM0) { // Ascii
 for (sal_Int16 i = 0; i  NumberChar_Count; i++)
@@ -636,7 +636,7 @@ sal_Unicode SAL_CALL 
NativeNumberSupplier::getNativeNumberChar( const sal_Unicod
 return inChar;
 }
 

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

2014-09-11 Thread Stephan Bergmann
 i18npool/inc/ordinalsuffix.hxx  |6 +++---
 i18npool/source/ordinalsuffix/ordinalsuffix.cxx |   14 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit a6104092925a6fe9f96ca239c0292bd1539d5746
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 11 12:34:19 2014 +0200

Avoid name clash with generated C++ class corresponding to UNOIDL service

Change-Id: Ie76cab45f5fd609457b11cb3b9732cba2da3b023

diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx
index 127d1f1..36a6d18 100644
--- a/i18npool/inc/ordinalsuffix.hxx
+++ b/i18npool/inc/ordinalsuffix.hxx
@@ -28,15 +28,15 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-class OrdinalSuffix : public cppu::WeakImplHelper2
+class OrdinalSuffixService : public cppu::WeakImplHelper2
 
 XOrdinalSuffix,
 com::sun::star::lang::XServiceInfo
 
 {
 public:
-OrdinalSuffix();
-virtual ~OrdinalSuffix();
+OrdinalSuffixService();
+virtual ~OrdinalSuffixService();
 
 // XOrdinalSuffix
 virtual com::sun::star::uno::Sequence OUString  SAL_CALL 
getOrdinalSuffix( sal_Int32 nNumber, const com::sun::star::lang::Locale 
rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) 
SAL_OVERRIDE;
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx 
b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index dafc783..53cea5f 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -35,11 +35,11 @@ using namespace ::com::sun::star;
 namespace com { namespace sun { namespace star { namespace i18n {
 
 
-OrdinalSuffix::OrdinalSuffix()
+OrdinalSuffixService::OrdinalSuffixService()
 {
 }
 
-OrdinalSuffix::~OrdinalSuffix()
+OrdinalSuffixService::~OrdinalSuffixService()
 {
 }
 
@@ -65,7 +65,7 @@ namespace
  * For this method to properly return the ordinal suffix for other locales
  * than english ones, ICU 4.2+ has to be used.
  */
-uno::Sequence OUString  SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 
nNumber,
+uno::Sequence OUString  SAL_CALL OrdinalSuffixService::getOrdinalSuffix( 
sal_Int32 nNumber,
 const lang::Locale rLocale ) throw( RuntimeException, std::exception )
 {
 uno::Sequence OUString  retValue;
@@ -135,17 +135,17 @@ uno::Sequence OUString  SAL_CALL 
OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN
 
 const sal_Char cOrdinalSuffix[] = com.sun.star.i18n.OrdinalSuffix;
 
-OUString SAL_CALL OrdinalSuffix::getImplementationName(void) throw( 
RuntimeException, std::exception )
+OUString SAL_CALL OrdinalSuffixService::getImplementationName(void) throw( 
RuntimeException, std::exception )
 {
 return OUString::createFromAscii(cOrdinalSuffix);
 }
 
-sal_Bool SAL_CALL OrdinalSuffix::supportsService( const OUString 
rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OrdinalSuffixService::supportsService( const OUString 
rServiceName) throw( RuntimeException, std::exception )
 {
 return cppu::supportsService(this, rServiceName);
 }
 
-Sequence OUString  SAL_CALL OrdinalSuffix::getSupportedServiceNames(void) 
throw( RuntimeException, std::exception )
+Sequence OUString  SAL_CALL 
OrdinalSuffixService::getSupportedServiceNames(void) throw( RuntimeException, 
std::exception )
 {
 Sequence OUString  aRet(1);
 aRet[0] = OUString::createFromAscii(cOrdinalSuffix);
@@ -159,7 +159,7 @@ com_sun_star_i18n_OrdinalSuffix_get_implementation(
 css::uno::XComponentContext *,
 css::uno::Sequencecss::uno::Any const )
 {
-return cppu::acquire(new css::i18n::OrdinalSuffix());
+return cppu::acquire(new css::i18n::OrdinalSuffixService());
 }
 
 /* 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: i18npool/inc i18npool/source

2014-09-11 Thread Stephan Bergmann
 i18npool/inc/textconversion.hxx  |   12 ++--
 i18npool/source/textconversion/textconversion.cxx|   12 ++--
 i18npool/source/textconversion/textconversion_ko.cxx |2 +-
 i18npool/source/textconversion/textconversion_zh.cxx |2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 63bc11b81f8af188564a385c1e501fd7334c343d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 11 12:37:10 2014 +0200

Avoid name clash with generated C++ class corresponding to UNOIDL service

Change-Id: Id8201bc91c8e398b972b7294b8916d4ac76c787d

diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index d068c0e..6a41d92 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -31,17 +31,17 @@
 namespace com { namespace sun { namespace star { namespace i18n {
 
 
-//  class TextConversion
+//  class TextConversionService
 
-class TextConversion: public cppu::WeakImplHelper2
+class TextConversionService: public cppu::WeakImplHelper2
 
 com::sun::star::i18n::XExtendedTextConversion,
 com::sun::star::lang::XServiceInfo
 
 {
 public:
-TextConversion(const char* pImplName);
-virtual ~TextConversion();
+TextConversionService(const char* pImplName);
+virtual ~TextConversionService();
 // Methods
 virtual com::sun::star::i18n::TextConversionResult SAL_CALL
 getConversions( const OUString aText, sal_Int32 nStartPos, sal_Int32 
nLength,
@@ -100,7 +100,7 @@ typedef struct {
 
 //  class TextConversion_ko
 
-class TextConversion_ko : public TextConversion
+class TextConversion_ko : public TextConversionService
 {
 public:
 TextConversion_ko( const com::sun::star::uno::Reference  
com::sun::star::uno::XComponentContext  rxContext );
@@ -156,7 +156,7 @@ typedef struct {
 sal_Int16 count;
 } STC_WordIndex;
 
-class TextConversion_zh : public TextConversion
+class TextConversion_zh : public TextConversionService
 {
 public:
 TextConversion_zh( const com::sun::star::uno::Reference  
com::sun::star::uno::XComponentContext  rxContext );
diff --git a/i18npool/source/textconversion/textconversion.cxx 
b/i18npool/source/textconversion/textconversion.cxx
index aec186e..7ef257d 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.cxx
@@ -31,7 +31,7 @@ extern C { static void SAL_CALL thisModule() {} }
 
 #endif
 
-TextConversion::TextConversion(const char *pImplName)
+TextConversionService::TextConversionService(const char *pImplName)
 : implementationName(pImplName)
 {
 #ifndef DISABLE_DYNLOADING
@@ -45,7 +45,7 @@ TextConversion::TextConversion(const char *pImplName)
 #endif
 }
 
-TextConversion::~TextConversion()
+TextConversionService::~TextConversionService()
 {
 #ifndef DISABLE_DYNLOADING
 if (hModule) osl_unloadModule(hModule);
@@ -60,7 +60,7 @@ static void* nullFunc()
 }
 
 oslGenericFunction SAL_CALL
-TextConversion::getFunctionBySymbol(const sal_Char* func)
+TextConversionService::getFunctionBySymbol(const sal_Char* func)
 {
 if (hModule)
 return osl_getFunctionSymbol(hModule, 
OUString::createFromAscii(func).pData);
@@ -71,19 +71,19 @@ TextConversion::getFunctionBySymbol(const sal_Char* func)
 #endif
 
 OUString SAL_CALL
-TextConversion::getImplementationName() throw( RuntimeException, 
std::exception )
+TextConversionService::getImplementationName() throw( RuntimeException, 
std::exception )
 {
 return OUString::createFromAscii(implementationName);
 }
 
 sal_Bool SAL_CALL
-TextConversion::supportsService(const OUString rServiceName) throw( 
RuntimeException, std::exception )
+TextConversionService::supportsService(const OUString rServiceName) throw( 
RuntimeException, std::exception )
 {
 return cppu::supportsService(this, rServiceName);
 }
 
 Sequence OUString  SAL_CALL
-TextConversion::getSupportedServiceNames() throw( RuntimeException, 
std::exception )
+TextConversionService::getSupportedServiceNames() throw( RuntimeException, 
std::exception )
 {
 Sequence OUString  aRet(1);
 aRet[0] = OUString::createFromAscii(implementationName);
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx 
b/i18npool/source/textconversion/textconversion_ko.cxx
index 2423180..02dc72e 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star { namespace 
i18n {
 #define SCRIPT_HANGUL   2
 
 TextConversion_ko::TextConversion_ko( const Reference  XComponentContext  
xContext )
-: TextConversion(com.sun.star.i18n.TextConversion_ko)
+: TextConversionService(com.sun.star.i18n.TextConversion_ko)
 {
 Reference  XInterface  xI;
 
diff --git a/i18npool/source/textconversion/textconversion_zh.cxx 
b/i18npool/source/textconversion/textconversion_zh.cxx
index 74ecb19..89f652c 100644
--- 

Re: Performance samples for LibreOffice ...

2014-09-11 Thread Stephan Bergmann

On 09/11/2014 07:05 AM, Jan Hubicka wrote:

Anyway those are warning I currently get with ODR type merging.  The first 
three are
quite puzzling - the type layout differs, but by abstract field so I am unable 
to print
out any resonable message. This may suggest difference in virtual inheritance 
or someting like
that (or just plain bug in my code comparing types).  I will dig deeper into it 
tomorrow.

[...]

/aux/hubicka/libreoffice/i18npool/inc/nativenumbersupplier.hxx:33:0: warning: 
type ‘struct NativeNumberSupplier’ violates one definition rule [-Wodr]
  class NativeNumberSupplier : public cppu::WeakImplHelper2
  ^
/aux/hubicka/libreoffice/50-lto/workdir/UnoApiHeadersTarget/offapi/normal/com/sun/star/i18n/NativeNumberSupplier.hpp:29:0:
 note: a type with different memory representation is defined in another 
translation unit
  class NativeNumberSupplier {
  ^
/aux/hubicka/libreoffice/50-lto/workdir/UnoApiHeadersTarget/offapi/normal/com/sun/star/i18n/OrdinalSuffix.hpp:29:0:
 warning: type ‘struct OrdinalSuffix’ violates one definition rule [-Wodr]
  class OrdinalSuffix {
  ^
/aux/hubicka/libreoffice/i18npool/inc/ordinalsuffix.hxx:28:0: note: a type with 
different memory representation is defined in another translation unit
  class OrdinalSuffix : public cppu::WeakImplHelper2
  ^
/aux/hubicka/libreoffice/50-lto/workdir/UnoApiHeadersTarget/offapi/normal/com/sun/star/i18n/TextConversion.hpp:29:0:
 warning: type ‘struct TextConversion’ violates one definition rule [-Wodr]
  class TextConversion {
  ^
/aux/hubicka/libreoffice/i18npool/inc/textconversion.hxx:36:0: note: a type 
with different memory representation is defined in another translation unit
  class TextConversion: public cppu::WeakImplHelper2
  ^


Those three are indeed clashes with cppumaker-generated C++ classes 
corresponding to UNOIDL (new-style) services.  The clashes have been 
fixed now as 
cgit.freedesktop.org/libreoffice/core/commit/?id=91ba527a63f77658ee147515f1699792059aa2e5, 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=a6104092925a6fe9f96ca239c0292bd1539d5746, 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=63bc11b81f8af188564a385c1e501fd7334c343d 
Avoid name clash with generated C++ class corresponding to UNOIDL service.


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


[master] avmedia fails to link / libgltf related

2014-09-11 Thread Lionel Elie Mamane
Hi,

Anybody has a clue how I can unstuck my build (--without-system-glm
--without-system-libgltf) that fails with below error? I'm a bit
unsure where this symbol is supposed to come from... libgltf? glm
seems to be only headers, so not there :)

make glm.clean  make glm  make avmedia.clean  make avmedia
does not help.

[ LNK ] Library/libavmediaogl.so
/home/master/src/libreoffice/workdirs/libreoffice-4-4/workdir/CxxObject/avmedia/source/opengl/oglwindow.o:
In function `CameraHandler':
/home/master/src/libreoffice/workdirs/libreoffice-4-4/avmedia/source/opengl/oglwindow.cxx:250:
undefined reference to
`libgltf::gltf_get_camera_pos(libgltf::glTFHandle*,
glm::detail::tvec3float*, glm::detail::tvec3float*,
glm::detail::tvec3float*)'
collect2: error: ld returned 1 exit status
/home/master/src/libreoffice/workdirs/libreoffice-4-4/avmedia/Library_avmediaogl.mk:10:
recipe for target
'/home/master/src/libreoffice/workdirs/libreoffice-4-4/instdir/program/libavmediaogl.so'
failed
make[1]: ***
[/home/master/src/libreoffice/workdirs/libreoffice-4-4/instdir/program/libavmediaogl.so]
Error 1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2014-09-11 Thread Stephan Bergmann
 i18npool/inc/transliteration_Ignore.hxx|   14 +++---
 i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx   |2 +-
 i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx |2 +-
 i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx   |2 +-
 i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx   |2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit d9645bf8a1c1c95aeeb9a90b89387d82795f56dd
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 11 12:53:25 2014 +0200

Prevent erroneous pick up of unrelated css::i18n::Maping

...from include/i18nutil/casefolding.hxx

Change-Id: I892a83b8e40dadcffc1b59eaa18bee2b782131f1

diff --git a/i18npool/inc/transliteration_Ignore.hxx 
b/i18npool/inc/transliteration_Ignore.hxx
index da3ed51..b610bf6 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -24,13 +24,6 @@
 
 typedef sal_Unicode (*TransFunc)(const sal_Unicode);
 
-typedef struct {
-sal_Unicode previousChar;
-sal_Unicode currentChar;
-sal_Unicode replaceChar;
-bool two2one;
-} Mapping;
-
 namespace com { namespace sun { namespace star { namespace i18n {
 
 class transliteration_Ignore : public transliteration_commonclass
@@ -68,6 +61,13 @@ public:
 transliterateRange( const OUString str1, const OUString str2, 
XTransliteration t1, XTransliteration t2 )
 throw(com::sun::star::uno::RuntimeException);
 
+struct Mapping {
+sal_Unicode previousChar;
+sal_Unicode currentChar;
+sal_Unicode replaceChar;
+bool two2one;
+};
+
 protected:
 TransFunc func;
 oneToOneMapping *table;
diff --git a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx 
b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
index 39cd4c2..1285447 100644
--- a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
@@ -23,7 +23,7 @@ using namespace com::sun::star::uno;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-static const Mapping BaFa[] = {
+static const transliteration_Ignore::Mapping BaFa[] = {
 { 0x30F4, 0x30A1, 0x30D0, true },
 { 0x3094, 0x3041, 0x3070, true },
 { 0x30D5, 0x30A1, 0x30CF, true },
diff --git a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx 
b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
index ae3c0c1..43e5bd0 100644
--- a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
@@ -24,7 +24,7 @@ using namespace com::sun::star::lang;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-static const Mapping HyuByu[] = {
+static const transliteration_Ignore::Mapping HyuByu[] = {
 { 0x30D5, 0x30E5, 0x30D2, false },
 { 0x3075, 0x3085, 0x3072, false },
 { 0x30F4, 0x30E5, 0x30D3, false },
diff --git a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx 
b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
index 21c8853..fcc32a2 100644
--- a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
@@ -24,7 +24,7 @@ using namespace com::sun::star::lang;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-static const Mapping SeZe[] = {
+static const transliteration_Ignore::Mapping SeZe[] = {
 // SI + E -- SE
 { 0x30B7, 0x30A7, 0x30BB, true },
 // SI + E -- SE
diff --git a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx 
b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
index 732257b..6bdf54a 100644
--- a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
@@ -24,7 +24,7 @@ using namespace com::sun::star::lang;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-static const Mapping TiJi[] = {
+static const transliteration_Ignore::Mapping TiJi[] = {
 // TU + I -- TI
 { 0x30C4, 0x30A3, 0x30C1, true },
 // TE + I -- TI
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


tb3-docker repository

2014-09-11 Thread Bjoern Michaelsen
Hi,

Im about to create a tb3-docker repository on gerrit for the
docker/saltstack/tb3 setup I presented about in Bern.

Protest this in the next 24 hours, or it will have happened. ;)

Best,

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


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

2014-09-11 Thread Tomaž Vajngerl
 android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java  
  |6 -
 
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
 |   40 ++-
 sd/source/ui/unoidl/unohelp.hxx
  |4 
 sd/source/ui/unoidl/unomodel.cxx   
  |   46 +---
 sd/source/ui/unoidl/unopage.cxx
  |   55 ++
 5 files changed, 82 insertions(+), 69 deletions(-)

New commits:
commit 0968e47b7190832c6c06c0aa38f8da129660f854
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date:   Thu Sep 11 12:56:57 2014 +0200

android: remove unneeded code paths

Change-Id: I5da4ca67caf2bc2e368c74cf719b080c63b6d47f

diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index a831a55..b9dc0fb 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -64,11 +64,7 @@ public class LOKitThread extends Thread {
 mViewportMetrics.setPageSize(new FloatSize(pageWidth, pageHeight));
 
 GeckoLayerClient layerClient = mApplication.getLayerClient();
-boolean shouldContinue = layerClient.beginDrawing(mViewportMetrics);
-
-if (!shouldContinue) {
-return false;
-}
+layerClient.beginDrawing(mViewportMetrics);
 
 ViewportMetrics metrics = 
mApplication.getLayerController().getViewportMetrics();
 RectF viewport = normlizeRect(metrics);
diff --git 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
index bfac3a9..cf13afb 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
@@ -81,18 +81,12 @@ public class GeckoLayerClient {
 mScreenSize = new IntSize(0, 0);
 }
 
-protected boolean setupLayer() {
-Log.i(LOGTAG, Creating MultiTileLayer);
+protected void setupLayer() {
 if (mTileLayer == null) {
+Log.i(LOGTAG, Creating MultiTileLayer);
 mTileLayer = new MultiTileLayer(TILE_SIZE);
 mLayerController.setRoot(mTileLayer);
 }
-
-// Force a resize event to be sent because the results of this
-// are different depending on what tile system we're using
-//sendResizeEventIfNecessary(true);
-
-return false;
 }
 
 protected void updateLayerAfterDraw() {
@@ -119,15 +113,10 @@ public class GeckoLayerClient {
 sendResizeEventIfNecessary(false);
 }
 
-public boolean beginDrawing(ViewportMetrics viewportMetrics) {
-if (setupLayer()) {
-Log.e(LOGTAG, ### Cancelling due to layer setup);
-return false;
-}
+public void beginDrawing(ViewportMetrics viewportMetrics) {
+setupLayer();
 mNewGeckoViewport = viewportMetrics;
 mTileLayer.beginTransaction();
-
-return true;
 }
 
 public void endDrawing() {
@@ -213,19 +202,11 @@ public class GeckoLayerClient {
 
 long timeDelta = System.currentTimeMillis() - mLastViewportChangeTime;
 if (timeDelta  MIN_VIEWPORT_CHANGE_DELAY) {
-mLayerController.getView().postDelayed(
-new Runnable() {
-public void run() {
-mPendingViewportAdjust = false;
-adjustViewport();
-}
-}, MIN_VIEWPORT_CHANGE_DELAY - timeDelta
-);
+mLayerController.getView().postDelayed(new AdjustRunnable(), 
MIN_VIEWPORT_CHANGE_DELAY - timeDelta);
 mPendingViewportAdjust = true;
-return;
+} else {
+adjustViewport();
 }
-
-adjustViewport();
 }
 
 public void viewportSizeChanged() {
@@ -273,4 +254,11 @@ public class GeckoLayerClient {
 }
 return null;
 }
+
+private class AdjustRunnable implements Runnable {
+public void run() {
+mPendingViewportAdjust = false;
+adjustViewport();
+}
+}
 }
\ No newline at end of file
commit aa4ac53ecdb5726a36ec642f860526f790586db9
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date:   Thu Aug 14 20:32:26 2014 +0200

get rid of QUERYINT macro in sd

Change-Id: I058cf5bdd3d11fb28b3e497c1a13e4ffc7e4ed84

diff --git a/sd/source/ui/unoidl/unohelp.hxx b/sd/source/ui/unoidl/unohelp.hxx
index 8b43596..507d4dd 100644
--- a/sd/source/ui/unoidl/unohelp.hxx
+++ b/sd/source/ui/unoidl/unohelp.hxx
@@ -29,10 +29,6 @@ inline void bool2any( 

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

2014-09-11 Thread Stephan Bergmann
 xmloff/source/core/XMLEmbeddedObjectImportContext.cxx |4 
 xmloff/source/core/xmlexp.cxx |4 
 2 files changed, 8 insertions(+)

New commits:
commit d4494c33e4114f194262c4ad202a3eafca41fba7
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 11 13:05:16 2014 +0200

Avoid ODR-violating name clash

Change-Id: I4911dcb5d902a5b92d4c175054acd220e449459d

diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx 
b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
index 92c9705..939b48b 100644
--- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
@@ -41,6 +41,8 @@ using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::xml::sax;
 using namespace ::xmloff::token;
 
+namespace {
+
 struct XMLServiceMapEntry_Impl
 {
 enum XMLTokenEnum eClass;
@@ -48,6 +50,8 @@ struct XMLServiceMapEntry_Impl
 sal_Int32  nFilterServiceLen;
 };
 
+}
+
 #define SERVICE_MAP_ENTRY( cls, app ) \
 { XML_##cls, \
   XML_IMPORT_FILTER_##app, sizeof(XML_IMPORT_FILTER_##app)-1}
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 1122dfc..d704318 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -114,6 +114,8 @@ sal_Char const sXML_1_2[] = 1.2;
 
 #define XML_USEPRETTYPRINTING   UsePrettyPrinting
 
+namespace {
+
 struct XMLServiceMapEntry_Impl
 {
 const sal_Char *sModelService;
@@ -122,6 +124,8 @@ struct XMLServiceMapEntry_Impl
 sal_Int32  nFilterServiceLen;
 };
 
+}
+
 #define SERVICE_MAP_ENTRY( app ) \
 { XML_MODEL_SERVICE_##app, sizeof(XML_MODEL_SERVICE_##app)-1, \
   XML_EXPORT_FILTER_##app, sizeof(XML_EXPORT_FILTER_##app)-1 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-09-11 Thread Stephan Bergmann
 svx/source/form/tabwin.cxx |3 +++
 xmloff/source/table/XMLTableImport.cxx |4 
 2 files changed, 7 insertions(+)

New commits:
commit 4d3c88805d1917932ee88a0f22ae93c43e8e389a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 11 13:13:24 2014 +0200

Avoid ODR-violating name clash

Change-Id: I69c3b11b01d520a485b07c8e5397a7f971210af2

diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 12baa61..58b357b 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -71,6 +71,7 @@ using namespace ::com::sun::star;
 using namespace ::svxform;
 using namespace ::svx;
 
+namespace {
 
 struct ColumnInfo
 {
@@ -83,6 +84,8 @@ struct ColumnInfo
 }
 };
 
+}
+
 static void lcl_addToList( SvTreeListBox _rListBox, const uno::Reference 
container::XNameAccess i_xColumns )
 {
 uno::Sequence OUString  aEntries = i_xColumns-getElementNames();
diff --git a/xmloff/source/table/XMLTableImport.cxx 
b/xmloff/source/table/XMLTableImport.cxx
index 798a9e3..3b37618 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -51,6 +51,8 @@ using namespace ::com::sun::star::style;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
+namespace {
+
 struct ColumnInfo
 {
 OUString msStyleName;
@@ -58,6 +60,8 @@ struct ColumnInfo
 OUString msDefaultCellStyleName;
 };
 
+}
+
 class XMLProxyContext : public SvXMLImportContext
 {
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [master] avmedia fails to link / libgltf related

2014-09-11 Thread Matúš Kukan
Hi

On 11 September 2014 12:44, Lionel Elie Mamane lio...@mamane.lu wrote:
 Anybody has a clue how I can unstuck my build (--without-system-glm
 --without-system-libgltf) that fails with below error? I'm a bit
 unsure where this symbol is supposed to come from... libgltf? glm
 seems to be only headers, so not there :)

 make glm.clean  make glm  make avmedia.clean  make avmedia
 does not help.

 [ LNK ] Library/libavmediaogl.so
 /home/master/src/libreoffice/workdirs/libreoffice-4-4/workdir/CxxObject/avmedia/source/opengl/oglwindow.o:
 In function `CameraHandler':
 /home/master/src/libreoffice/workdirs/libreoffice-4-4/avmedia/source/opengl/oglwindow.cxx:250:
 undefined reference to
 `libgltf::gltf_get_camera_pos(libgltf::glTFHandle*,
 glm::detail::tvec3float*, glm::detail::tvec3float*,
 glm::detail::tvec3float*)'
 collect2: error: ld returned 1 exit status

grep gltf_get_camera_pos -r workdir/UnpackedTarball/libgltf shows it's
from there.
does make libgltf.clean  make libgltf help?

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


Re: [master] avmedia fails to link / libgltf related

2014-09-11 Thread Lionel Elie Mamane
On Thu, Sep 11, 2014 at 01:14:05PM +0200, Matúš Kukan wrote:

 On 11 September 2014 12:44, Lionel Elie Mamane lio...@mamane.lu wrote:
  Anybody has a clue how I can unstuck my build

  [ LNK ] Library/libavmediaogl.so
  /home/master/src/libreoffice/workdirs/libreoffice-4-4/workdir/CxxObject/avmedia/source/opengl/oglwindow.o:
  In function `CameraHandler':
  /home/master/src/libreoffice/workdirs/libreoffice-4-4/avmedia/source/opengl/oglwindow.cxx:250:
  undefined reference to
  `libgltf::gltf_get_camera_pos(libgltf::glTFHandle*,
  glm::detail::tvec3float*, glm::detail::tvec3float*,
  glm::detail::tvec3float*)'
  collect2: error: ld returned 1 exit status

 grep gltf_get_camera_pos -r workdir/UnpackedTarball/libgltf shows it's
 from there.
 does make libgltf.clean  make libgltf help?

Yes. Why didn't I think of that... Thanks.

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


Re: Performance samples for LibreOffice ...

2014-09-11 Thread Stephan Bergmann

On 09/11/2014 07:05 AM, Jan Hubicka wrote:

/aux/hubicka/libreoffice/i18npool/inc/transliteration_Ignore.hxx:36:7: warning: 
type ‘struct transliteration_Ignore’ violates one definition rule [-Wodr]
  class transliteration_Ignore : public transliteration_commonclass
^
/aux/hubicka/libreoffice/i18npool/inc/transliteration_Ignore.hxx:36:7: note: a 
different type is defined in another translation unit
  class transliteration_Ignore : public transliteration_commonclass
^
/aux/hubicka/libreoffice/i18npool/inc/transliteration_Ignore.hxx:74:24: note: 
the first difference of corresponding definitions is field ‘map’
  const Mapping *map;
 ^
/aux/hubicka/libreoffice/i18npool/inc/transliteration_Ignore.hxx:74:24: note: a 
field of same name but different type is defined in another translation unit
  const Mapping *map;
 ^
/aux/hubicka/libreoffice/include/i18nutil/casefolding.hxx:51:0: note: type 
‘const struct Mapping’ should match type ‘const struct Mapping’ but is defined 
in different namespace
  struct Mapping
  ^
/aux/hubicka/libreoffice/i18npool/inc/transliteration_Ignore.hxx:32:3: note: 
the incompatible type is defined here
  } Mapping;
^


Fixed as 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=d9645bf8a1c1c95aeeb9a90b89387d82795f56dd 
Prevent erroneous pick up of unrelated css::i18n::Maping now.  Shudder.



/aux/hubicka/libreoffice/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx:44:0:
 warning: type ‘struct XMLServiceMapEntry_Impl’ violates one definition rule 
[-Wodr]
  struct XMLServiceMapEntry_Impl
  ^
/aux/hubicka/libreoffice/xmloff/source/core/xmlexp.cxx:118:0: note: a different 
type is defined in another translation unit
  struct XMLServiceMapEntry_Impl
  ^
/aux/hubicka/libreoffice/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx:46:0:
 note: the first difference of corresponding definitions is field ‘eClass’
  enum XMLTokenEnum eClass;
  ^
/aux/hubicka/libreoffice/xmloff/source/core/xmlexp.cxx:120:0: note: a field 
with different name is defined in another translation unit
  const sal_Char *sModelService;
  ^


Fixed as 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=d4494c33e4114f194262c4ad202a3eafca41fba7 
Avoid ODR-violating name clash now.



/aux/hubicka/libreoffice/svx/source/form/tabwin.cxx:76:0: warning: type ‘struct 
ColumnInfo’ violates one definition rule [-Wodr]
  struct ColumnInfo
  ^
/aux/hubicka/libreoffice/xmloff/source/table/XMLTableImport.cxx:54:0: note: a 
different type is defined in another translation unit
  struct ColumnInfo
  ^
/aux/hubicka/libreoffice/svx/source/form/tabwin.cxx:78:0: note: the first 
difference of corresponding definitions is field ‘sColumnName’
  OUString sColumnName;
  ^
/aux/hubicka/libreoffice/xmloff/source/table/XMLTableImport.cxx:56:0: note: a 
field with different name is defined in another translation unit
  OUString msStyleName;
  ^


Fixed as 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=4d3c88805d1917932ee88a0f22ae93c43e8e389a 
Avoid ODR-violating name clash now.


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


Marco Lechner (mlechner) license statement

2014-09-11 Thread Marco Lechner - FOSSGIS e.V.
All of my past  future contributions to LibreOffice may be licensed under the 
MPLv2/LGPLv3+ dual license.

Marco Lechner

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


please urgently review you patches for 4.3.2 (was: (no) LibreOffice ESC call, Thur - 16:00 central European (local) time)

2014-09-11 Thread Bjoern Michaelsen
Hi all,

forwarding this to the developer list, as there will be no minutes of an ESC
call (as there will be no ESC call this week).

Christian wrote:
 On Thu, Sep 11, 2014 at 12:12 PM, Michael Meeks
 michael.me...@collabora.com wrote:
  Hi guys,
 
  I propose no call this Thursday; but here is the agenda so far for 
  next
  week; and I attach the bug metrics etc.
 
 And the reminder that libreoffice-4-3-2 branch has been created.
 
 Also, the deadline for RC2 aka final is unchanged, despite tagging of
 rc1 being delayed.
 
 * make sure to submit all patches that should go into 4.3.2 to the
 libreoffice-4-3-2 branch
 * get them reviewed until next Monday (Sep. 15)
 * if you need more time for an important fix, make sure to ping
 Robinson (colonelqubit on IRC), as he'll do the tagging for rc2 since
 I'll be on vacation

Also note that because of the conference and the late tagging not all open
patches on the libreoffice-4-3 branch were ensured to be included before the
branch off this time:

 
https://gerrit.libreoffice.org/#/q/status:open+project:core+branch:libreoffice-4-3,n,z
 (5 open patches by Markus, Kohei and Lionel)

To get these into 4.3.2 still they need to be resubmitted to the
libreoffice-4-3-2 branch and reviewed there. Please note the shortened
timeframe for this and make sure the relevant patches are reviewed by Monday.

Thanks and happy hacking!

Best,

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


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

2014-09-11 Thread Markus Mohrhard
 sc/source/core/data/documen2.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 5a200a6e14e87c48656bae767289c42d6b260235
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Sep 7 12:22:54 2014 +0200

prevent duplicated conditional formatting during copying of sheeets

Change-Id: I866c0c4c05830af0070767aec36375a846a2bf84
Reviewed-on: https://gerrit.libreoffice.org/11326
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index d65c42c..daba57b 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1000,8 +1000,6 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc, 
SCTAB nSrcPos,
 pSrcDoc-maTabs[nSrcPos]-CopyToTable(aCxt, 0, 0, MAXCOL, 
MAXROW,
 ( bResultsOnly ? IDF_ALL  ~IDF_FORMULA : IDF_ALL),
 false, maTabs[nDestPos] );
-maTabs[nDestPos]-CopyConditionalFormat(0, 0, MAXCOL, MAXROW,
-0, 0, pSrcDoc-maTabs[nSrcPos]);
 }
 }
 maTabs[nDestPos]-SetTabNo(nDestPos);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-09-11 Thread Markus Mohrhard
 sc/source/core/data/documen2.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit f3cdb7804a26c5cf0623d9b83130594f83372768
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sun Sep 7 13:43:33 2014 +0200

fix copypaste of conditional format between sheets

Change-Id: I8856bff376f0f6e366062eddbc68a9eee098be5b
Reviewed-on: https://gerrit.libreoffice.org/11327
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index daba57b..98cb68f 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -907,10 +907,6 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, 
const ScMarkData* pOnlyM
 maTabs[nOldPos]-StartAllListeners();
 maTabs[nNewPos]-StartAllListeners();
 
-ScConditionalFormatList* pNewList = new 
ScConditionalFormatList(*maTabs[nOldPos]-GetCondFormList());
-pNewList-UpdateReference(aRefCxt);
-maTabs[nNewPos]-SetCondFormList( pNewList );
-
 sc::SetFormulaDirtyContext aFormulaDirtyCxt;
 SetAllFormulasDirty(aFormulaDirtyCxt);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

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

New commits:
commit 04fe5e6a31c9701177a744bbc8a53b2f664fe71c
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Sep 11 12:23:18 2014 +0200

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

Change-Id: If06c6bcdda97447e6014223d997c7ff8abd64b48

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


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

2014-09-11 Thread Caolán McNamara
 svx/source/dialog/txenctab.src |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 22ff143b1c26ec6bfcf6dbb52da43c26ee4e4edd
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Sep 11 13:40:03 2014 +0100

add windows 1258 to charset list

Change-Id: Ia12fff0bd25daf39a01f8faef9a152e23bbe7fcf

diff --git a/svx/source/dialog/txenctab.src b/svx/source/dialog/txenctab.src
index 965f1a4..56add1e 100644
--- a/svx/source/dialog/txenctab.src
+++ b/svx/source/dialog/txenctab.src
@@ -64,6 +64,7 @@ StringArray RID_SVXSTR_TEXTENCODING_TABLE
  Hebrew (Windows-1255)   ; 
RTL_TEXTENCODING_MS_1255  ;  ;
  Arabic (Windows-1256)   ; 
RTL_TEXTENCODING_MS_1256  ;  ;
  Baltic (Windows-1257)   ; 
RTL_TEXTENCODING_MS_1257  ;  ;
+ Vietnamese (Windows-1258)   ; 
RTL_TEXTENCODING_MS_1258  ;  ;
  Eastern Europe (Apple Macintosh); 
RTL_TEXTENCODING_APPLE_CENTEURO   ;  ;
  Eastern Europe (Apple Macintosh/Croatian)   ; 
RTL_TEXTENCODING_APPLE_CROATIAN   ;  ;
  Cyrillic (Apple Macintosh)  ; 
RTL_TEXTENCODING_APPLE_CYRILLIC   ;  ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-09-11 Thread Stephan Bergmann
 external/python3/ExternalProject_python3.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e9778073e37fb75f1b65a8d38b41feb584060705
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 11 15:18:29 2014 +0200

For ASAN __cxa_throw interception to work, link python.bin to libstdc++

...where the intercepted __cxa_throw is found, as otherwise 
PythonTest_sw_python
fails with

AddressSanitizer CHECK failed: 
projects/compiler-rt/lib/asan/asan_interceptors.cc:293 
((IndirectExternCall(__interception::real___cxa_throw))) != (0) (0x0, 0x0)
 #0 in __asan::AsanCheckFailed(char const*, int, char const*, unsigned long 
long, unsigned long long) projects/compiler-rt/lib/asan/asan_rtl.cc:70:3
 #1 in __sanitizer::CheckFailed(char const*, int, char const*, unsigned 
long long, unsigned long long) 
projects/compiler-rt/lib/sanitizer_common/sanitizer_common.cc:76:5
 #2 0x48c3ac in __cxa_throw 
projects/compiler-rt/lib/asan/asan_interceptors.cc:293:3
 #3 0x7f67faec0ef5 in pyuno::createClass(rtl::OUString const, 
pyuno::Runtime const) pyuno/source/module/pyuno_except.cxx:92:9
...

Change-Id: I0cb364eacab49644b426fb62f49bf9d7c8b5090c

diff --git a/external/python3/ExternalProject_python3.mk 
b/external/python3/ExternalProject_python3.mk
index 21a3f11..b0548f6 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -83,6 +83,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(if $(SYSBASE), -I$(SYSBASE)/usr/include) \
) \
$(if $(python3_cflags),CFLAGS='$(python3_cflags)') \
+   $(if $(filter -fsanitize=address,$(CC)),LINKCC=$(CXX)) \
LDFLAGS=$(strip $(LDFLAGS) \
$(if $(SYSTEM_OPENSSL),,-L$(call 
gb_UnpackedTarball_get_dir,openssl)) \
$(if $(SYSTEM_EXPAT),,-L$(gb_StaticLibrary_WORKDIR)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-09-11 Thread Caolán McNamara
 vcl/generic/glyphs/gcach_ftyp.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 884229ed3ee2f84eb052c866e22bdb242a385788
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Sep 11 14:16:05 2014 +0100

server font dtor always calls ReleaseFaceFT

therefore we must always call GetFaceFT in the ctor
and not return early *before* calling GetFaceFT which
could happen in case of inane font size requests, i.e.

if( (mnWidth  0) || (mfStretch  +64.0) || (mfStretch  -64.0) )

valgrind+bff

Change-Id: If22f8f7ff6aaed3ffa9eec68630da8601dfd5cae

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index a95ab5e..3d75744 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -488,6 +488,10 @@ ServerFont::ServerFont( const FontSelectPattern rFSD, 
FtFontInfo* pFI )
 // it becomes reponsible for the ServerFont instantiation
 ((ImplServerFontEntry*)rFSD.mpFontEntry)-SetServerFont( this );
 
+maFaceFT = pFI-GetFaceFT();
+if( !maFaceFT )
+return;
+
 if( rFSD.mnOrientation != 0 )
 {
 const double dRad = rFSD.mnOrientation * ( F_2PI / 3600.0 );
@@ -504,10 +508,6 @@ ServerFont::ServerFont( const FontSelectPattern rFSD, 
FtFontInfo* pFI )
 if( (mnWidth  0) || (mfStretch  +64.0) || (mfStretch  -64.0) )
 return;
 
-maFaceFT = pFI-GetFaceFT();
-if( !maFaceFT )
-return;
-
 FT_New_Size( maFaceFT, maSizeFT );
 FT_Activate_Size( maSizeFT );
 FT_Error rc = FT_Set_Pixel_Sizes( maFaceFT, mnWidth, rFSD.mnHeight );
@@ -623,8 +623,7 @@ const OString ServerFont::GetFontFileName() const
 
 ServerFont::~ServerFont()
 {
-if( mpLayoutEngine )
-delete mpLayoutEngine;
+delete mpLayoutEngine;
 
 if( maSizeFT )
 FT_Done_Size( maSizeFT );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-09-11 Thread Takeshi Abe
 sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx |   28 ++---
 1 file changed, 24 insertions(+), 4 deletions(-)

New commits:
commit 2f1a28cf8fcfdfc369cf91936062c4f942ec03dd
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Thu Sep 11 19:23:03 2014 +0900

fdo#75757: remove inheritance to std::vector

from LayeredDevice::LayerContainer.

Change-Id: Icc4b16db92daadbd742e83e90c95477c0c465f5b
Reviewed-on: https://gerrit.libreoffice.org/11397
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx 
b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index 72fdfe6..2fc8f01 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -130,11 +130,31 @@ typedef ::boost::shared_ptrLayer SharedLayer;
 
 } // end of anonymous namespace
 
-class LayeredDevice::LayerContainer : public ::std::vectorSharedLayer
+class LayeredDevice::LayerContainer
 {
 public:
-LayerContainer (void) {}
-~LayerContainer (void) {}
+LayerContainer() : mvLayers() {}
+
+bool empty() const { return mvLayers.empty(); }
+
+size_t size() const { return mvLayers.size(); }
+
+const SharedLayer back() const { return mvLayers.back(); }
+
+const ::std::vectorSharedLayer::const_iterator begin() const { return 
mvLayers.begin(); }
+const ::std::vectorSharedLayer::const_iterator end() const { return 
mvLayers.end(); }
+
+void clear() { mvLayers.clear(); }
+
+void pop_back() { mvLayers.pop_back(); }
+
+void resize(size_t n) { mvLayers.resize(n); }
+
+const SharedLayer operator[](size_t i) const { return mvLayers[i]; }
+SharedLayer operator[](size_t i) { return mvLayers[i]; }
+
+private:
+::std::vectorSharedLayer mvLayers;
 };
 
 //= LayeredDevice =
@@ -232,7 +252,7 @@ void LayeredDevice::RemovePainter (
 
 // Remove top most layers that do not contain any painters.
 while ( ! mpLayers-empty()  ! mpLayers-back()-HasPainter())
-mpLayers-erase(mpLayers-end()-1);
+mpLayers-pop_back();
 }
 
 void LayeredDevice::Repaint (const Region rRepaintRegion)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 75757] remove inheritance to std::map and std::vector

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=75757

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

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

fdo#75757: remove inheritance to std::vector



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_global.h.in config_host.mk.in configure.ac helpcompiler/inc include/osl solenv/gbuild xmlhelp/source

2014-09-11 Thread Stephan Bergmann
 config_host.mk.in |1 
 config_host/config_global.h.in|2 
 configure.ac  |  195 +++---
 helpcompiler/inc/HelpCompiler.hxx |5 
 include/osl/diagnose.hxx  |5 
 solenv/gbuild/platform/macosx.mk  |2 
 solenv/gbuild/platform/mingw.mk   |6 
 solenv/gbuild/platform/solaris.mk |9 -
 solenv/gbuild/platform/unxgcc.mk  |9 -
 xmlhelp/source/cxxhelp/provider/databases.hxx |5 
 xmlhelp/source/cxxhelp/provider/db.hxx|4 
 11 files changed, 92 insertions(+), 151 deletions(-)

New commits:
commit fcf015832466f4d902e8aeb1466309a1bc230475
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Sep 10 18:22:32 2014 +0200

(Rudimentary) C++11 support is a hard requirement now

Change-Id: I43ed776d52336b822aa6152f0f2a29e39303bb75

diff --git a/config_host.mk.in b/config_host.mk.in
index c3aa2e4..40865e7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -241,7 +241,6 @@ export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@
 export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@
 export GUIBASE=@GUIBASE@
 export HARDLINKDELIVER=@HARDLINKDELIVER@
-export HAVE_CXX11=@HAVE_CXX11@
 export HAVE_GCC_AVX=@HAVE_GCC_AVX@
 export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
 export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@
diff --git a/config_host/config_global.h.in b/config_host/config_global.h.in
index 88b7a1f..929e5a0 100644
--- a/config_host/config_global.h.in
+++ b/config_host/config_global.h.in
@@ -12,8 +12,6 @@ Any change in this header will cause a rebuild of almost 
everything.
 #ifndef CONFIG_GLOBAL_H
 #define CONFIG_GLOBAL_H
 
-/* Prefer using a feature-specific check such as HAVE_CXX11_DELETE to the 
generic HAVE_CXX11. */
-#define HAVE_CXX11 0
 #define HAVE_CXX11_DELETE 0
 #define HAVE_CXX11_OVERRIDE 0
 #define HAVE_CXX11_FINAL 0
diff --git a/configure.ac b/configure.ac
index 48e2490..84d697b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6109,14 +6109,13 @@ dnl C++11
 dnl ===
 
 CXXFLAGS_CXX11=
-HAVE_CXX11=
 if test $COM = MSC; then
 AC_MSG_CHECKING([whether $CXX supports C++11])
 AC_MSG_RESULT(yes)
 # MSVC supports (a subset of) CXX11 without any switch
-HAVE_CXX11=TRUE
 CXXFLAGS_CXX11=
 elif test $GCC = yes; then
+HAVE_CXX11=
 CXXFLAGS_CXX11=
 AC_MSG_CHECKING([whether $CXX supports C++11])
 for flag in -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x ; do
@@ -6134,7 +6133,7 @@ elif test $GCC = yes; then
 if test $HAVE_CXX11 = TRUE; then
 AC_MSG_RESULT([yes ($CXXFLAGS_CXX11)])
 else
-AC_MSG_RESULT(no)
+AC_MSG_ERROR(no)
 fi
 fi
 
@@ -6143,7 +6142,7 @@ dnl 
https://gcc.gnu.org/viewcvs/gcc?view=revisionrevision=179528 introduced
 dnl an additional member _M_size into C++11 std::list towards 4.7.0 and
 dnl https://gcc.gnu.org/viewcvs/gcc?view=revisionrevision=189186 removed it
 dnl again towards 4.7.2:
-if test $CPP_LIBRARY = GLIBCXX -a $HAVE_CXX11 = TRUE; then
+if test $CPP_LIBRARY = GLIBCXX; then
 AC_MSG_CHECKING([whether using C++11 causes libstdc++ 4.7.0/4.7.1 ABI 
breakage])
 AC_LANG_PUSH([C++])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -6159,18 +6158,16 @@ if test $CPP_LIBRARY = GLIBCXX -a $HAVE_CXX11 = TRUE; 
then
 abi broken
 #endif
 ]])], [AC_MSG_RESULT(no, ok)],
-[AC_MSG_RESULT(yes, disabling C++11)
- HAVE_CXX11=])
+[AC_MSG_ERROR(yes)])
 AC_LANG_POP([C++])
 fi
 
-if test $HAVE_CXX11 = TRUE; then
-AC_MSG_CHECKING([whether $CXX supports C++11 without Language Defect 757])
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS=$CXXFLAGS $CXXFLAGS_CXX11
-AC_LANG_PUSH([C++])
+AC_MSG_CHECKING([whether $CXX supports C++11 without Language Defect 757])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS=$CXXFLAGS $CXXFLAGS_CXX11
+AC_LANG_PUSH([C++])
 
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include stddef.h
 
 template typename T, size_t S char (sal_n_array_size( T()[S] ))[S];
@@ -6195,21 +6192,17 @@ size_t i = sizeof(sal_n_array_size(thinga));
 size_t j = sizeof(sal_n_array_size(thingb));
 return !(i != 0  j != 0);
 ]])
-], [ AC_MSG_RESULT(yes) ],
-[ AC_MSG_RESULT(no)
-  HAVE_CXX11=
-])
-AC_LANG_POP([C++])
-CXXFLAGS=$save_CXXFLAGS
-fi
+], [ AC_MSG_RESULT(yes) ],
+[ AC_MSG_ERROR(no)])
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
 
-if test $HAVE_CXX11 = TRUE; then
-AC_MSG_CHECKING([whether $CXX supports C++11 without __float128 compile 
error])
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS=$CXXFLAGS $CXXFLAGS_CXX11
-AC_LANG_PUSH([C++])
+AC_MSG_CHECKING([whether $CXX supports C++11 without __float128 compile error])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS=$CXXFLAGS $CXXFLAGS_CXX11
+AC_LANG_PUSH([C++])
 
-

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

2014-09-11 Thread Miklos Vajna
 sw/qa/extras/ooxmlexport/data/first-header-footer.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |   10 +
 sw/qa/extras/rtfimport/data/fdo82114.rtf   |   14 ++
 sw/qa/extras/rtfimport/rtfimport.cxx   |9 +
 sw/source/filter/ww8/rtfattributeoutput.cxx|7 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |   90 +
 writerfilter/source/dmapper/DomainMapper_Impl.hxx  |3 
 writerfilter/source/dmapper/PropertyMap.cxx|   59 +++
 8 files changed, 82 insertions(+), 110 deletions(-)

New commits:
commit ded74247a1200b3577ba3854e92f33de190d52a9
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Sep 11 12:23:18 2014 +0200

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

Change-Id: If06c6bcdda97447e6014223d997c7ff8abd64b48
(cherry picked from commit 04fe5e6a31c9701177a744bbc8a53b2f664fe71c)

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

diff --git a/sw/qa/extras/rtfimport/data/fdo82114.rtf 
b/sw/qa/extras/rtfimport/data/fdo82114.rtf
new file mode 100644
index 000..073d281
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo82114.rtf
@@ -0,0 +1,14 @@
+{\rtf1
+\paperw11906\paperh16838\margl1134\margr567\margt1418\margb851\gutter0\ltrsect
+\viewkind1\viewscale110\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nojkernpunct\rsidroot13516616\utinl
 \fet0
+\titlepg
+{\headerr Right page header, section 1\par
+}
+{\headerf First page header, section 1\par
+}
+\pard\plain First page, section 1.\par\sect
+\sectd\titlepg
+{\headerf First page header, section 2\par
+}
+\pard\plain First page, section 2.\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index b3349f1..07a82cb 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1695,6 +1695,15 @@ DECLARE_RTFIMPORT_TEST(testFdo79959, fdo79959.rtf)
 CPPUNIT_ASSERT_EQUAL(true, 
static_castbool(getStyles(ParagraphStyles)-hasByName(Test)));
 }
 
+DECLARE_RTFIMPORT_TEST(testFdo82114, fdo82114.rtf)
+{
+uno::Referencetext::XText xHeaderText = getProperty 
uno::Referencetext::XText (getStyles(PageStyles)-getByName(Converted1), 
HeaderText);
+OUString aActual = xHeaderText-getString();
+OUString aExpected(First page header, section 2);
+// This was 'Right page header, section 1'.
+CPPUNIT_ASSERT_EQUAL(aExpected, aActual);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 4434bdc..cde69b1 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -396,14 +396,18 @@ uno::Reference beans::XPropertySet  
SectionPropertyMap::GetPageStyle(
 m_aFirstPageStyle = uno::Reference beans::XPropertySet  (
 
xTextFactory-createInstance(com.sun.star.style.PageStyle),
 uno::UNO_QUERY);
+
+// Call insertByName() before GetPageStyle(), otherwise the
+// first and the follow page style will have the same name, and
+// insertByName() will fail.
+if (xPageStyles.is())
+xPageStyles-insertByName( m_sFirstPageStyleName, 
uno::makeAny(m_aFirstPageStyle) );
+
 // Ensure that m_aFollowPageStyle has been created
 GetPageStyle( xPageStyles, xTextFactory, false );
 // Chain m_aFollowPageStyle to be after m_aFirstPageStyle
 m_aFirstPageStyle-setPropertyValue(FollowStyle,
 uno::makeAny(m_sFollowPageStyleName));
-
-if (xPageStyles.is())
-xPageStyles-insertByName( m_sFirstPageStyleName, 
uno::makeAny(m_aFirstPageStyle) );
 }
 else if( !m_aFirstPageStyle.is()  xPageStyles.is() )
 {
@@ -430,8 +434,9 @@ uno::Reference beans::XPropertySet  
SectionPropertyMap::GetPageStyle(
 }
 
 }
-catch( const uno::Exception )
+catch( const uno::Exception rException )
 {
+SAL_WARN(writerfilter, SectionPropertyMap::GetPageStyle() failed:  
 rException.Message);
 }
 
 return xRet;
commit 79bd799f0571a7213faa9b81709d0b4084a21c57
Author: Luke Deller l...@deller.id.au
Date:   Sat Jul 12 21:49:50 2014 +1000

Related: fdo#82114 Copy first-header-footer test from ww8 to ooxml

The test document was converted from doc to docx using MS Word 2010.

Several fixes were required to make this test pass:

- Do not clear the FirstIsShared property on page styles, as the code
  instead uses the old fashioned method of translating a Word section
  with different first page header/footer: two page styles linked

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

2014-09-11 Thread Caolán McNamara
 vcl/source/outdev/bitmap.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fee95be5b637dbfbdbe78426c02240b1dc90e1f2
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Sep 11 15:11:05 2014 +0100

Resolves: fdo#82552 we only check pAlphaW on one branch

Change-Id: Ib2c5a0d751050af77f267edbb7a5a0fe57494622

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 56c5033..cd555f7 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -1249,7 +1249,7 @@ Bitmap OutputDevice::BlendBitmapWithAlpha(
 BitmapReadAccess*   pB = aBmp.AcquireReadAccess();
 BitmapWriteAccess*  pW = aDither.AcquireWriteAccess();
 
-if( pB  pP  pA  pW  pAlphaW )
+if (pB  pP  pA  pW  pAlphaW)
 {
 int nOutY;
 
@@ -1286,7 +1286,7 @@ Bitmap OutputDevice::BlendBitmapWithAlpha(
 else
 {
 BitmapWriteAccess*  pB = aBmp.AcquireWriteAccess();
-if( pP  pA  pB )
+if (pB  pP  pA  pAlphaW)
 {
 for( nY = 0; nY  nDstHeight; nY++ )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-09-11 Thread Norbert Thiebaud
On Thu, Sep 11, 2014 at 12:16 PM, Stephan Bergmann sberg...@redhat.com wrote:

 With
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=ab819ab4f49ec7e0d57dcf8bf77beb8cd323ceb1
 Default to MAC_OS_X_VERSION_MIN_REQUIRED=1080 for Mac OS X SDK = 10.8 on
 master towards LO 4.4, a build on Mac OS X against SDK = 10.8 and with no
 explicit --with-macosx-version-min-required will now use libc++ instead of
 libstdc++, and I expect TDF Mac OS X builds towards LO 4.4 to in fact use
 libc++.

As I get back an migrate the remaining mac tinderbox, I expect to be
even more radical and just plain drop out of autogen in 4.4+ anything
below 10.8
there is no point leaving the illustion of a configuration that will
soon be irremediably broken (as c++11 feature are being deployed and
recen API being used on MAC
I will also drop the 32 bits build altogether.. removing
--enable-retina and --enable-64bits (making them the default) and
making --with-macosx-version-min-requiered=10.8 the default,
forbiddign anything below that.

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


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

2014-09-11 Thread Tor Lillqvist
 I will also drop the 32 bits build altogether..


That was already done;)

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


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

2014-09-11 Thread Chris Sherlock
 vcl/source/gdi/impimagetree.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8cf6ba8a28f2c22817e94185121190f082c75754
Author: Chris Sherlock chris.sherloc...@gmail.com
Date:   Thu Sep 11 18:50:38 2014 +1000

minor whitespace change

Change-Id: I556a68a2da770080e475a4e6619722fd721101ca

diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 9ba36df..e81bafe 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -158,11 +158,12 @@ bool ImplImageTree::doLoadImage(
 }
 std::vector OUString  paths;
 paths.push_back(getRealImageName(name));
+
 if (localized) {
 sal_Int32 pos = name.lastIndexOf('/');
 if (pos != -1) {
 // find() uses a reverse iterator, so push in reverse order.
-std::vector OUString  aFallbacks( 
Application::GetSettings().GetUILanguageTag().getFallbackStrings( true));
+std::vector OUString  aFallbacks( 
Application::GetSettings().GetUILanguageTag().getFallbackStrings(true));
 for (std::vector OUString ::reverse_iterator it( 
aFallbacks.rbegin());
 it != aFallbacks.rend(); ++it)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-09-11 Thread Stephan Bergmann
 shell/source/backends/kde4be/kde4access.cxx |2 +-
 shell/source/backends/kdebe/kdeaccess.cxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8405ee507ee66e8d07eb69254c2763b299bae6d2
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 11 16:30:49 2014 +0200

shell: sal_Bool - bool

Change-Id: Ie4fedd95752aa1212481bff0cda7c0045956b361

diff --git a/shell/source/backends/kde4be/kde4access.cxx 
b/shell/source/backends/kde4be/kde4access.cxx
index 4cf3869..33a7789 100644
--- a/shell/source/backends/kde4be/kde4access.cxx
+++ b/shell/source/backends/kde4be/kde4access.cxx
@@ -83,7 +83,7 @@ css::beans::Optional css::uno::Any  getValue(OUString const 
 id) {
 } else if (id == EnableATToolSupport)
 {
 /* does not make much sense without an accessibility bridge */
-sal_Bool ATToolSupport = sal_False;
+bool ATToolSupport = false;
 return css::beans::Optional css::uno::Any (
 true, uno::makeAny( OUString::boolean( ATToolSupport ) ) );
 } else if (id == WorkPathVariable)
diff --git a/shell/source/backends/kdebe/kdeaccess.cxx 
b/shell/source/backends/kdebe/kdeaccess.cxx
index cff355f..b7de82a 100644
--- a/shell/source/backends/kdebe/kdeaccess.cxx
+++ b/shell/source/backends/kdebe/kdeaccess.cxx
@@ -79,7 +79,7 @@ css::beans::Optional css::uno::Any  getValue(OUString const 
 id) {
 } else if (id == EnableATToolSupport)
 {
 /* does not make much sense without an accessibility bridge */
-sal_Bool ATToolSupport = sal_False;
+bool ATToolSupport = false;
 return css::beans::Optional css::uno::Any (
 true, uno::makeAny( OUString::boolean( ATToolSupport ) ) );
 } else if (id == WorkPathVariable)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-09-11 Thread Norbert Thiebaud
On Thu, Sep 11, 2014 at 4:19 PM, Tor Lillqvist t...@iki.fi wrote:

 I will also drop the 32 bits build altogether..


 That was already done;)


:-D great, less work to do :-)

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


[Libreoffice-commits] core.git: 2 commits - jvmfwk/plugins smoketest/data

2014-09-11 Thread Michael Stahl
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx  |   16 
 smoketest/data/Basic/Standard/Test_10er.xml |   15 +--
 2 files changed, 25 insertions(+), 6 deletions(-)

New commits:
commit c5cdcd8f5ac16b571e083d3222e7447e5c5ed03a
Author: Michael Stahl mst...@redhat.com
Date:   Thu Sep 11 16:44:51 2014 +0200

jvmfwk: print a warning if running java fa

Change-Id: Ibfcd6678ed1503cfab0881f3ec67c4c158d798cb

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 4e46a67..0815ea8 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -390,12 +390,16 @@ bool getJavaProps(const OUString  exePath,
 OUString sThisLib;
 if (osl_getModuleURLFromAddress((void *) (sal_IntPtr) getJavaProps,
  sThisLib.pData) == sal_False)
+{
 return false;
+}
 sThisLib = getDirFromFile(sThisLib);
 OUString sClassPath;
 if (osl_getSystemPathFromFileURL(sThisLib.pData,  sClassPath.pData)
 != osl_File_E_None)
+{
 return false;
+}
 
 #ifdef MACOSX
 if (sClassPath.endsWith(/))
@@ -456,6 +460,8 @@ bool getJavaProps(const OUString  exePath,
 {
 JFW_TRACE2([Java framework] Execution failed. \n);
 *bProcessRun = false;
+SAL_WARN(jfw,
+osl_executeProcess failed (  ret  ): \  exePath  
\);
 return ret;
 }
 else
@@ -885,7 +891,9 @@ rtl::ReferenceVendorBase getJREInfoByPath(
 OUString sResolvedDir = resolveDirPath(path);
 // If this path is invalid then there is no chance to find a JRE here
 if (sResolvedDir.isEmpty())
+{
 return 0;
+}
 
 //check if the directory path is good, that is a JRE was already 
recognized.
 //Then we need not detect it again
@@ -936,13 +944,17 @@ rtl::ReferenceVendorBase getJREInfoByPath(
 //The file path (to java exe) is not valid
 cit_path ifull = find(vecBadPaths.begin(), vecBadPaths.end(), 
sFullPath);
 if (ifull == vecBadPaths.end())
+{
 vecBadPaths.push_back(sFullPath);
+}
 continue;
 }
 
 cit_path ifile = find(vecBadPaths.begin(), vecBadPaths.end(), 
sFilePath);
 if (ifile != vecBadPaths.end())
+{
 continue;
+}
 
 MapIt entry =  mapJREs.find(sFilePath);
 if (entry != mapJREs.end())
@@ -1008,7 +1020,9 @@ rtl::ReferenceVendorBase getJREInfoByPath(
 }
 
 if (props.empty())
+{
 return rtl::ReferenceVendorBase();
+}
 
 //find java.vendor property
 typedef vectorpairOUString, OUString ::const_iterator c_ip;
@@ -1040,7 +1054,9 @@ rtl::ReferenceVendorBase getJREInfoByPath(
 }
 }
 if (!ret.is())
+{
 vecBadPaths.push_back(sFilePath);
+}
 else
 {
 JFW_TRACE2(OUString([Java framework] sunjavaplugin)
commit fd35ddd3e1cf16876bbc57d29c7472e551304f0f
Author: Michael Stahl mst...@redhat.com
Date:   Thu Sep 11 16:35:06 2014 +0200

smoketest: run the extension test first

With clang 3.4 ASAN there is the problem that the smoketest fails if run
in make check while trying to start the JVM, in getJavaProps()
it forks a java process and that fails due to lack of memory.

Avoid that problem by running the extension test first, when there is
only one application loaded, so the process is using much less memory.

Change-Id: I7e8bdc6ceea65b212f376943c7814ad1cf28675d

diff --git a/smoketest/data/Basic/Standard/Test_10er.xml 
b/smoketest/data/Basic/Standard/Test_10er.xml
index 534abe0..67e5e40 100644
--- a/smoketest/data/Basic/Standard/Test_10er.xml
+++ b/smoketest/data/Basic/Standard/Test_10er.xml
@@ -160,6 +160,13 @@ DIM nStrPos as Long
 
 GlobalTestLog = OpenLogDat (sLogFileName)
 call WriteTestSequence
+
+apos; Do extension test first to avoid OOM with ASAN
+if bMakeExtensionTest then
+gCurrentDocTest = frmExtension
+call Test_Ext.TestExtensions
+end if
+
 if bMakeWriterTest then
 gCurrentDocTest = frmWriter
 call MakeDocTest
@@ -196,10 +203,6 @@ DIM nStrPos as Long
 gCurrentDocTest = frmDataBase
 call Test_DB.TestDB
 end if
-if bMakeExtensionTest then
-gCurrentDocTest = frmExtension
-call Test_Ext.TestExtensions
-end if
 
 Close #GlobalTestLog
 GlobalTestLog = 0
@@ -208,6 +211,8 @@ end Sub
 Sub WriteTestSequence
 Print #GlobalTestLog, quot;Sequence of testingquot;
 
+if bMakeExtensionTest then
+WriteExtensionTests (quot;Extension   : quot;, GlobalTestLog)
 if bMakeWriterTest then
 WriteTests (quot;writer  : quot;, true, GlobalTestLog)
 end if
@@ -235,8 +240,6 @@ Sub WriteTestSequence
 if bMakeDBTest then
 WriteDBTests (quot;Database: quot;, 

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

2014-09-11 Thread Miklos Vajna
 writerfilter/source/dmapper/DomainMapper.cxx  |   83 --
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   83 ++
 2 files changed, 83 insertions(+), 83 deletions(-)

New commits:
commit 0b937ef63a7bf00de07ce4daf3e3091b5350396f
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Sep 11 16:45:27 2014 +0200

Move DomainMapper_Impl::substream() to DomainMapper_Impl.cxx

Change-Id: Ic87ffe60def0346f28065d8c02e6022e237cee4d

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index a709a57..1586d1d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3141,89 +3141,6 @@ void DomainMapper::lcl_substream(Id rName, 
::writerfilter::ReferenceStream::Po
 m_pImpl-substream(rName, ref);
 }
 
-void DomainMapper_Impl::substream(Id rName,
-::writerfilter::ReferenceStream::Pointer_t const ref)
-{
-#ifndef NDEBUG
-size_t contextSize(m_aContextStack.size());
-size_t propSize[NUMBER_OF_CONTEXTS];
-for (int i = 0; i  NUMBER_OF_CONTEXTS; ++i) {
-propSize[i] = m_aPropertyStacks[i].size();
-}
-#endif
-
-appendTableManager();
-// Appending a TableManager resets its TableHandler, so we need to append
-// that as well, or tables won't be imported properly in headers/footers.
-appendTableHandler();
-getTableManager().startLevel();
-
-//import of page header/footer
-
-switch( rName )
-{
-case NS_ooxml::LN_headerl:
-
-PushPageHeader(SectionPropertyMap::PAGE_LEFT);
-break;
-case NS_ooxml::LN_headerr:
-
-PushPageHeader(SectionPropertyMap::PAGE_RIGHT);
-break;
-case NS_ooxml::LN_headerf:
-
-PushPageHeader(SectionPropertyMap::PAGE_FIRST);
-break;
-case NS_ooxml::LN_footerl:
-
-PushPageFooter(SectionPropertyMap::PAGE_LEFT);
-break;
-case NS_ooxml::LN_footerr:
-
-PushPageFooter(SectionPropertyMap::PAGE_RIGHT);
-break;
-case NS_ooxml::LN_footerf:
-
-PushPageFooter(SectionPropertyMap::PAGE_FIRST);
-break;
-case NS_ooxml::LN_footnote:
-case NS_ooxml::LN_endnote:
-PushFootOrEndnote( NS_ooxml::LN_footnote == rName );
-break;
-case NS_ooxml::LN_annotation :
-PushAnnotation();
-break;
-}
-ref-resolve(m_rDMapper);
-switch( rName )
-{
-case NS_ooxml::LN_headerl:
-case NS_ooxml::LN_headerr:
-case NS_ooxml::LN_headerf:
-case NS_ooxml::LN_footerl:
-case NS_ooxml::LN_footerr:
-case NS_ooxml::LN_footerf:
-PopPageHeaderFooter();
-break;
-case NS_ooxml::LN_footnote:
-case NS_ooxml::LN_endnote:
-PopFootOrEndnote();
-break;
-case NS_ooxml::LN_annotation :
-PopAnnotation();
-break;
-}
-
-getTableManager().endLevel();
-popTableManager();
-
-// check that stacks are the same as before substream
-assert(m_aContextStack.size() == contextSize);
-for (int i = 0; i  NUMBER_OF_CONTEXTS; ++i) {
-assert(m_aPropertyStacks[i].size() == propSize[i]);
-}
-}
-
 void DomainMapper::lcl_info(const std::string  /*info_*/)
 {
 }
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a7a3185..60a8932 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4924,6 +4924,89 @@ void 
DomainMapper_Impl::appendGrabBag(std::vectorbeans::PropertyValue rIntero
 rInteropGrabBag.push_back(aProperty);
 }
 
+void DomainMapper_Impl::substream(Id rName,
+::writerfilter::ReferenceStream::Pointer_t const ref)
+{
+#ifndef NDEBUG
+size_t contextSize(m_aContextStack.size());
+size_t propSize[NUMBER_OF_CONTEXTS];
+for (int i = 0; i  NUMBER_OF_CONTEXTS; ++i) {
+propSize[i] = m_aPropertyStacks[i].size();
+}
+#endif
+
+appendTableManager();
+// Appending a TableManager resets its TableHandler, so we need to append
+// that as well, or tables won't be imported properly in headers/footers.
+appendTableHandler();
+getTableManager().startLevel();
+
+//import of page header/footer
+
+switch( rName )
+{
+case NS_ooxml::LN_headerl:
+
+PushPageHeader(SectionPropertyMap::PAGE_LEFT);
+break;
+case NS_ooxml::LN_headerr:
+
+PushPageHeader(SectionPropertyMap::PAGE_RIGHT);
+break;
+case NS_ooxml::LN_headerf:
+
+PushPageHeader(SectionPropertyMap::PAGE_FIRST);
+break;
+case NS_ooxml::LN_footerl:
+
+PushPageFooter(SectionPropertyMap::PAGE_LEFT);
+break;
+case NS_ooxml::LN_footerr:
+
+PushPageFooter(SectionPropertyMap::PAGE_RIGHT);
+break;
+case NS_ooxml::LN_footerf:
+
+PushPageFooter(SectionPropertyMap::PAGE_FIRST);
+break;
+case NS_ooxml::LN_footnote:
+case NS_ooxml::LN_endnote:

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

2014-09-11 Thread Stephan Bergmann
 ucb/source/ucp/webdav-neon/DAVAuthListener.hxx |2 +-
 ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx |2 +-
 ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx   |2 +-
 ucb/source/ucp/webdav-neon/DAVSession.hxx  |4 ++--
 ucb/source/ucp/webdav-neon/NeonSession.cxx |4 ++--
 ucb/source/ucp/webdav-neon/NeonSession.hxx |4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 8d2818ff987cca3bac84fb66926b94cbc620a54a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Sep 11 17:07:50 2014 +0200

ucb: sal_Bool - bool

Change-Id: I333ffa13159eac5cc53c9f3985dde5a33daf8067

diff --git a/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx 
b/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx
index 1e44f59..1533a4e 100644
--- a/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx
@@ -46,7 +46,7 @@ class DAVAuthListener : public 
salhelper::SimpleReferenceObject
 const OUString  inHostName,
 OUString  inoutUserName,
 OUString  outPassWord,
-sal_Bool bCanUseSystemCredentials ) = 0;
+bool bCanUseSystemCredentials ) = 0;
 };
 
 } // namespace webdav_ucp
diff --git a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx 
b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx
index c0c5e00..0af177b 100644
--- a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx
@@ -63,7 +63,7 @@ namespace webdav_ucp
   const OUString  inHostName,
   OUString  inoutUserName,
   OUString  outPassWord,
-  sal_Bool bCanUseSystemCredentials ) 
SAL_OVERRIDE;
+  bool bCanUseSystemCredentials ) SAL_OVERRIDE;
 private:
 
 const com::sun::star::uno::Reference
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx 
b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
index cb4caf7..93c2278 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
@@ -57,7 +57,7 @@ int DAVAuthListener_Impl::authenticate(
 const OUString  inHostName,
 OUString  inoutUserName,
 OUString  outPassWord,
-sal_Bool bCanUseSystemCredentials )
+bool bCanUseSystemCredentials )
 {
 if ( m_xEnv.is() )
 {
diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx 
b/ucb/source/ucp/webdav-neon/DAVSession.hxx
index 081dbac..033cb37 100644
--- a/ucb/source/ucp/webdav-neon/DAVSession.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx
@@ -165,13 +165,13 @@ public:
 virtual void COPY( const OUString  inSource,
const OUString  inDestination,
const DAVRequestEnvironment  rEnv,
-   sal_Bool inOverwrite = false )
+   bool inOverwrite = false )
 throw( std::exception ) = 0;
 
 virtual void MOVE( const OUString  inSource,
const OUString  inDestination,
const DAVRequestEnvironment  rEnv,
-   sal_Bool inOverwrite = false )
+   bool inOverwrite = false )
 throw( std::exception ) = 0;
 
 virtual void DESTROY( const OUString  inPath,
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx 
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index e93d288..ef073e0 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -1239,7 +1239,7 @@ void NeonSession::MKCOL( const OUString  inPath,
 void NeonSession::COPY( const OUString  inSourceURL,
 const OUString  inDestinationURL,
 const DAVRequestEnvironment  rEnv,
-sal_Bool inOverWrite )
+bool inOverWrite )
 throw ( std::exception )
 {
 osl::Guard osl::Mutex  theGuard( m_aMutex );
@@ -1265,7 +1265,7 @@ void NeonSession::COPY( const OUString  inSourceURL,
 void NeonSession::MOVE( const OUString  inSourceURL,
 const OUString  inDestinationURL,
 const DAVRequestEnvironment  rEnv,
-sal_Bool inOverWrite )
+bool inOverWrite )
 throw ( std::exception )
 {
 osl::Guard osl::Mutex  theGuard( m_aMutex );
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx 
b/ucb/source/ucp/webdav-neon/NeonSession.hxx
index f2e9ae1..fa848ba 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx
@@ -186,14 +186,14 @@ public:
 COPY( const OUString  inSourceURL,
   const OUString  inDestinationURL,
   const DAVRequestEnvironment  rEnv,
-  sal_Bool inOverWrite )
+  bool inOverWrite )
 throw ( std::exception ) SAL_OVERRIDE;
 
 virtual void
 

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

2014-09-11 Thread Caolán McNamara
 connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
 |  120 +-
 connectivity/source/drivers/dbase/DTable.cxx   
 |   15 -
 connectivity/source/inc/dbase/DTable.hxx   
 |2 
 
sc/qa/unit/data/wks/fail/sf_8acee7303920116c1f58c9d0e669855f-7551-minimized.wks 
|binary
 4 files changed, 76 insertions(+), 61 deletions(-)

New commits:
commit e46e041c9050a2a7c3223236100ce49a65f7e5d0
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Sep 11 15:52:41 2014 +0100

reject invalid dbase files with 0 len db_slng right at the start

Change-Id: If4aa5249391ea2d2e475fa3ebaccf4e9fc7442de

diff --git a/connectivity/source/drivers/dbase/DTable.cxx 
b/connectivity/source/drivers/dbase/DTable.cxx
index 845d037..54b5407 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -214,6 +214,8 @@ void ODbaseTable::readHeader()
 (*m_pFileStream).ReadUInt16( m_aHeader.db_slng );
 if(ERRCODE_NONE != m_pFileStream-GetErrorCode())
 throwInvalidDbaseFormat();
+if (m_aHeader.db_slng == 0)
+throwInvalidDbaseFormat();
 m_pFileStream-Read((char*)(m_aHeader.db_frei), 20*sizeof(sal_uInt8));
 if(ERRCODE_NONE != m_pFileStream-GetErrorCode())
 throwInvalidDbaseFormat();
@@ -1497,9 +1499,9 @@ bool ODbaseTable::DropImpl()
 bool ODbaseTable::InsertRow(OValueRefVector rRow, bool bFlush, const 
ReferenceXIndexAccess _xCols)
 {
 // fill buffer with blanks
-AllocBuffer();
-if (!m_pBuffer)
+if (!AllocBuffer())
 return false;
+
 memset(m_pBuffer, 0, m_aHeader.db_slng);
 m_pBuffer[0] = ' ';
 
@@ -1556,7 +1558,8 @@ bool ODbaseTable::InsertRow(OValueRefVector rRow, bool 
bFlush, const Reference
 bool ODbaseTable::UpdateRow(OValueRefVector rRow, OValueRefRow pOrgRow, 
const ReferenceXIndexAccess _xCols)
 {
 // fill buffer with blanks
-AllocBuffer();
+if (!AllocBuffer())
+return false;
 
 // position on desired record:
 sal_Size nPos = m_aHeader.db_kopf + (long)(m_nFilePos-1) * 
m_aHeader.db_slng;
@@ -2743,10 +2746,10 @@ bool ODbaseTable::ReadMemo(sal_Size nBlockNo, 
ORowSetValue aVariable)
 return true;
 }
 
-void ODbaseTable::AllocBuffer()
+bool ODbaseTable::AllocBuffer()
 {
 sal_uInt16 nSize = m_aHeader.db_slng;
-OSL_ENSURE(nSize  0, Size too small);
+SAL_WARN_IF(nSize == 0, connectivity.drivers, Size too small);
 
 if (m_nBufferSize != nSize)
 {
@@ -2760,6 +2763,8 @@ void ODbaseTable::AllocBuffer()
 m_nBufferSize = nSize;
 m_pBuffer = new sal_uInt8[m_nBufferSize+1];
 }
+
+return m_pBuffer != NULL;
 }
 
 bool ODbaseTable::WriteBuffer()
diff --git a/connectivity/source/inc/dbase/DTable.hxx 
b/connectivity/source/inc/dbase/DTable.hxx
index 4f2635e..915503d 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -112,7 +112,7 @@ namespace connectivity
 bool WriteBuffer();
 bool UpdateBuffer(OValueRefVector rRow, OValueRefRow 
pOrgRow,const ::com::sun::star::uno::Reference 
::com::sun::star::container::XIndexAccess _xCols, bool bForceAllFields);
 ::com::sun::star::uno::Reference 
::com::sun::star::beans::XPropertySet isUniqueByColumnName(sal_Int32 
_nColumnPos);
-void AllocBuffer();
+bool AllocBuffer();
 
 void throwInvalidDbaseFormat();
 void SAL_CALL renameImpl( const OUString newName ) 
throw(::com::sun::star::sdbc::SQLException, 
::com::sun::star::container::ElementExistException, 
::com::sun::star::uno::RuntimeException);
diff --git 
a/sc/qa/unit/data/wks/fail/sf_8acee7303920116c1f58c9d0e669855f-7551-minimized.wks
 
b/sc/qa/unit/data/wks/fail/sf_8acee7303920116c1f58c9d0e669855f-7551-minimized.wks
new file mode 100644
index 000..d72176d
Binary files /dev/null and 
b/sc/qa/unit/data/wks/fail/sf_8acee7303920116c1f58c9d0e669855f-7551-minimized.wks
 differ
commit e7fb96a1c93f57b1ffc6c0bd2af578d6a3e4f78b
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Sep 11 16:37:00 2014 +0100

ODbaseDatabaseMetaData::getColumns dies if throwInvalidDbaseFormat occurs

Change-Id: If649c1cb8f41e8a29afb5ad350664a573cd1102a

diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx 
b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 00f3341..bc37bdb 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -18,6 +18,7 @@
  */
 
 #include dbase/DDatabaseMetaData.hxx
+#include com/sun/star/lang/WrappedTargetRuntimeException.hpp
 #include com/sun/star/sdbc/DataType.hpp
 #include com/sun/star/sdbc/ResultSetType.hpp
 #include com/sun/star/sdbc/ColumnValue.hpp
@@ -157,7 +158,6 @@ Reference XResultSet  SAL_CALL 
ODbaseDatabaseMetaData::getColumns(
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 
-
 Reference 

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

2014-09-11 Thread Tor Lillqvist
 sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 4700a95f51a54acef1ae770010a27e74a59cdc70
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Sep 11 21:05:37 2014 +0300

WaE: Unreferenced function definition

Change-Id: I6f6560e2c2aaf4b71480fc2ffc7ef2f6e2474ab0

diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx 
b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index 2fc8f01..b7ae8cd 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -150,7 +150,6 @@ public:
 
 void resize(size_t n) { mvLayers.resize(n); }
 
-const SharedLayer operator[](size_t i) const { return mvLayers[i]; }
 SharedLayer operator[](size_t i) { return mvLayers[i]; }
 
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Performance samples for LibreOffice ...

2014-09-11 Thread Jan Hubicka
 On 09/11/2014 07:05 AM, Jan Hubicka wrote:
 Anyway those are warning I currently get with ODR type merging.  The first 
 three are
 quite puzzling - the type layout differs, but by abstract field so I am 
 unable to print
 out any resonable message. This may suggest difference in virtual 
 inheritance or someting like
 that (or just plain bug in my code comparing types).  I will dig deeper into 
 it tomorrow.
 [...]
 /aux/hubicka/libreoffice/i18npool/inc/nativenumbersupplier.hxx:33:0: 
 warning: type ‘struct NativeNumberSupplier’ violates one definition rule 
 [-Wodr]
   class NativeNumberSupplier : public cppu::WeakImplHelper2
   ^
 /aux/hubicka/libreoffice/50-lto/workdir/UnoApiHeadersTarget/offapi/normal/com/sun/star/i18n/NativeNumberSupplier.hpp:29:0:
  note: a type with different memory representation is defined in another 
 translation unit
   class NativeNumberSupplier {
   ^
 /aux/hubicka/libreoffice/50-lto/workdir/UnoApiHeadersTarget/offapi/normal/com/sun/star/i18n/OrdinalSuffix.hpp:29:0:
  warning: type ‘struct OrdinalSuffix’ violates one definition rule [-Wodr]
   class OrdinalSuffix {
   ^
 /aux/hubicka/libreoffice/i18npool/inc/ordinalsuffix.hxx:28:0: note: a type 
 with different memory representation is defined in another translation unit
   class OrdinalSuffix : public cppu::WeakImplHelper2
   ^
 /aux/hubicka/libreoffice/50-lto/workdir/UnoApiHeadersTarget/offapi/normal/com/sun/star/i18n/TextConversion.hpp:29:0:
  warning: type ‘struct TextConversion’ violates one definition rule [-Wodr]
   class TextConversion {
   ^
 /aux/hubicka/libreoffice/i18npool/inc/textconversion.hxx:36:0: note: a type 
 with different memory representation is defined in another translation unit
   class TextConversion: public cppu::WeakImplHelper2
   ^
 
 Those three are indeed clashes with cppumaker-generated C++ classes
 corresponding to UNOIDL (new-style) services.  The clashes have been
 fixed now as 
 cgit.freedesktop.org/libreoffice/core/commit/?id=91ba527a63f77658ee147515f1699792059aa2e5,
  
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=a6104092925a6fe9f96ca239c0292bd1539d5746,
  
 http://cgit.freedesktop.org/libreoffice/core/commit/?id=63bc11b81f8af188564a385c1e501fd7334c343d
 Avoid name clash with generated C++ class corresponding to UNOIDL
 service.

Cool, would you mind showing me how they are different?  I could try to improve 
the error message to be bit more informative then.

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


Re: Missing image warning

2014-09-11 Thread julien2412
Hello Chris,

You might be interested in this bugtracker:
https://bugs.freedesktop.org/show_bug.cgi?id=83315
Other: could not load image svx/res/notcertificate_16.png
:-)

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/Missing-image-warning-tp4121972p4122004.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] core.git: 3 commits - android/experimental

2014-09-11 Thread Jacobo Aragunde Pérez
 android/experimental/LibreOffice4Android/AndroidManifest.xml   
|4 
 android/experimental/LibreOffice4Android/Makefile  
|5 
 
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
 |   52 --
 3 files changed, 27 insertions(+), 34 deletions(-)

New commits:
commit 085c6ebc14bd9670cd23a732b905d3c2379a9185
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date:   Thu Sep 11 20:39:37 2014 +0200

LibreOffice4Android: Fix NullPointerException

The member fileNames was being correctly set in createUI() but it was
being reset at openDirectory(). The only purpose of this member was
sending the file name to open() method, but we can rewrite open() to
accept File objects so fileNames became useless and was removed.

Change-Id: I944be8ff13d221573a5a7accf0081c30872c62f0

diff --git 
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
 
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
index 63371f4..96e4251 100644
--- 
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ 
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -21,6 +21,7 @@ import java.util.Date;
 import java.util.prefs.Preferences;
 
 import android.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
 import android.os.Build;
 import android.graphics.Shader.TileMode;
 import android.graphics.BlurMaskFilter;
@@ -34,6 +35,7 @@ import android.app.Activity;
 import android.os.AsyncTask;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -93,7 +95,6 @@ public class LibreOfficeUIActivity extends Activity 
implements ActionBar.OnNavig

FileFilter fileFilter;
FilenameFilter filenameFilter;
-   private String[] fileNames;
private File[] filePaths;


@@ -173,17 +174,15 @@ public class LibreOfficeUIActivity extends Activity 
implements ActionBar.OnNavig
// code to make a grid view
setContentView(R.layout.file_grid);
gv = (GridView)findViewById(R.id.file_explorer_grid_view);
-   fileNames = currentDirectory.list( 
FileUtilities.getFilenameFilter( filterMode ) );
filePaths = currentDirectory.listFiles( 
FileUtilities.getFileFilter( filterMode ) );
gv.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView? parent, View view,
int position, long id) {
File file = filePaths[position];
if(!file.isDirectory()){
-   open(fileNames[position]);
+open(file);
}else{
-   file = new File( currentDirectory, 
file.getName() );
-   openDirectory( file );
+openDirectory( file );
}

}
@@ -194,7 +193,6 @@ public class LibreOfficeUIActivity extends Activity 
implements ActionBar.OnNavig
setContentView(R.layout.file_list);
lv = (ListView)findViewById( R.id.file_explorer_list_view);
lv.setClickable(true);
-   fileNames = currentDirectory.list( 
FileUtilities.getFilenameFilter( filterMode ) );
filePaths = currentDirectory.listFiles( 
FileUtilities.getFileFilter( filterMode ) );
lv.setAdapter( new ListItemAdapter(getApplicationContext(), 
filePaths) );
actionBar.setSelectedNavigationItem( filterMode + 1 );
@@ -212,7 +210,6 @@ public class LibreOfficeUIActivity extends Activity 
implements ActionBar.OnNavig
 actionBar.setDisplayHomeAsUpEnabled( false );
 }
filePaths = currentDirectory.listFiles( FileUtilities.getFileFilter( 
filterMode ) );
-   fileNames = new String[ filePaths.length ];
FileUtilities.sortFiles( filePaths, sortMode );
 /*
for( int i = 0; i  fileNames.length; i++){
@@ -230,7 +227,7 @@ public class LibreOfficeUIActivity extends Activity 
implements ActionBar.OnNavig
}
 }
 
-public void open(String file){
+public void open(File file) {
/*
Intent i = new Intent( this , WriterViewerActivity.class );
i.putExtra( CURRENT_DIRECTORY_KEY , currentDirectory.getAbsolutePath() 
);
@@ -239,7 +236,7 @@ public class LibreOfficeUIActivity extends Activity 
implements ActionBar.OnNavig
startActivity( i );
*/
Intent i = new Intent( this , DocumentLoader.class );
-   

[Libreoffice-commits] core.git: icon-themes/tango

2014-09-11 Thread Maxim Monastirsky
 icon-themes/tango/links.txt |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 1387027aa9acf9e62f2d7bf50f71a5889626d194
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Thu Sep 11 22:53:48 2014 +0300

fdo#83315 Tango doesn't have notcertificate_16.png

Change-Id: I29da25f80a2044d267b879cee7e15b4eae6c3b6b

diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index d20bfe0..2f06158 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -407,7 +407,6 @@ res/minus.png sfx2/res/minus.png
 res/plus.png sfx2/res/plus.png
 vcl/res/closedoc.png sfx2/res/closedoc.png
 xmlsecurity/res/signet_11x16.png svx/res/signet_11x16.png
-svx/res/notcertificate_16.png xml/security/notcertificate_16.png
 sc/res/sf02.png sw/imglst/sf04.png
 svx/res/symphony/spacing3.png cmd/sc_spacepara2.png
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2014-09-11 Thread Matúš Kukan
 chart2/qa/extras/chart2import.cxx  |   52 +
 chart2/qa/extras/data/xlsx/number-formats.xlsx |binary
 oox/inc/drawingml/chart/objectformatter.hxx|3 -
 oox/source/drawingml/chart/axisconverter.cxx   |2 
 oox/source/drawingml/chart/chartconverter.cxx  |7 ++
 oox/source/drawingml/chart/chartspaceconverter.cxx |   14 -
 oox/source/drawingml/chart/objectformatter.cxx |   24 +
 oox/source/drawingml/chart/seriesconverter.cxx |2 
 8 files changed, 77 insertions(+), 27 deletions(-)

New commits:
commit d22a4d945ccf1456fbdb2c39802d956afa583a2a
Author: Matúš Kukan matus.ku...@collabora.com
Date:   Thu Sep 11 08:56:22 2014 +0200

bnc#892610: OOXML import: Improve chart number formats.

If sourceLinked is used, do not set PercentageNumberFormat even if
showPercent is true. The format string should be used for NumberFormat.

c8cc89ff802d86b1f3a69afe1b4835b7df7f70c7 unnecessarily disabled
LinkNumberFormatToSource. Use that for data labels but not for axis.

Also, actually make attaching number format supplier work for Calc.
Previously, non standard formats were added into wrong supplier,
and they were thrown away later because it was attached too late.
(See also ChartModel::attachNumberFormatsSupplier)

Change-Id: Iaf9945abc3d82d0ac63d9f36beb49f39ab57

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 73200f9..302d2b5 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -53,6 +53,7 @@ public:
 void testFdo78080();
 void testFdo54361();
 void testAutoBackgroundXLSX();
+void testNumberFormatsXLSX();
 
 CPPUNIT_TEST_SUITE(Chart2ImportTest);
 CPPUNIT_TEST(Fdo60083);
@@ -85,6 +86,7 @@ public:
 CPPUNIT_TEST(testFdo78080);
 CPPUNIT_TEST(testFdo54361);
 CPPUNIT_TEST(testAutoBackgroundXLSX);
+CPPUNIT_TEST(testNumberFormatsXLSX);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -626,6 +628,56 @@ void Chart2ImportTest::testAutoBackgroundXLSX()
 (nColor  0x00FF) == 0x00FF); // highest 2 bytes are 
transparency which we ignore here.
 }
 
+void Chart2ImportTest::testNumberFormatsXLSX()
+{
+load(/chart2/qa/extras/data/xlsx/, number-formats.xlsx);
+Referencechart2::XChartDocument xChartDoc = getChartDocFromSheet(0, 
mxComponent);
+CPPUNIT_ASSERT_MESSAGE(failed to load chart, xChartDoc.is());
+
+uno::Referencechart2::XDataSeries 
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
+CPPUNIT_ASSERT(xDataSeries.is());
+uno::Referencebeans::XPropertySet xPropertySet;
+chart2::DataPointLabel aLabel;
+sal_Int32 nNumberFormat;
+bool bLinkNumberFormatToSource = false;
+bool bSuccess = false;
+const sal_Int32 nChartDataNumberFormat = getNumberFormat(
+xChartDoc, _(\$\* #,##0_);_(\$\* \\(#,##0\\);_(\$\* 
\-\??_);_(@_));
+
+xPropertySet.set(xDataSeries-getDataPointByIndex(0), 
uno::UNO_QUERY_THROW);
+xPropertySet-getPropertyValue(Label) = aLabel;
+CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumber);
+CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent);
+xPropertySet-getPropertyValue(CHART_UNONAME_NUMFMT) = nNumberFormat;
+CPPUNIT_ASSERT_EQUAL(nChartDataNumberFormat, nNumberFormat);
+bSuccess = xPropertySet-getPropertyValue(PercentageNumberFormat) = 
nNumberFormat;
+CPPUNIT_ASSERT_EQUAL(false, bSuccess);
+bSuccess = 
xPropertySet-getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) = 
bLinkNumberFormatToSource;
+CPPUNIT_ASSERT_MESSAGE(\LinkNumberFormatToSource\ should be set to 
true., bSuccess  bLinkNumberFormatToSource);
+
+xPropertySet.set(xDataSeries-getDataPointByIndex(1), 
uno::UNO_QUERY_THROW);
+xPropertySet-getPropertyValue(Label) = aLabel;
+CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumber);
+CPPUNIT_ASSERT_EQUAL(sal_False, aLabel.ShowNumberInPercent);
+xPropertySet-getPropertyValue(CHART_UNONAME_NUMFMT) = nNumberFormat;
+CPPUNIT_ASSERT_EQUAL(nChartDataNumberFormat, nNumberFormat);
+bSuccess = xPropertySet-getPropertyValue(PercentageNumberFormat) = 
nNumberFormat;
+CPPUNIT_ASSERT_EQUAL(false, bSuccess);
+bSuccess = 
xPropertySet-getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) = 
bLinkNumberFormatToSource;
+CPPUNIT_ASSERT_MESSAGE(\LinkNumberFormatToSource\ should be set to 
true., bSuccess  bLinkNumberFormatToSource);
+
+xPropertySet.set(xDataSeries-getDataPointByIndex(2), 
uno::UNO_QUERY_THROW);
+xPropertySet-getPropertyValue(Label) = aLabel;
+CPPUNIT_ASSERT_EQUAL(sal_False, aLabel.ShowNumber);
+CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent);
+xPropertySet-getPropertyValue(CHART_UNONAME_NUMFMT) = nNumberFormat;
+CPPUNIT_ASSERT_EQUAL(nChartDataNumberFormat, nNumberFormat);
+bSuccess = xPropertySet-getPropertyValue(PercentageNumberFormat) = 
nNumberFormat;
+CPPUNIT_ASSERT_EQUAL(false, 

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

2014-09-11 Thread Tomaž Vajngerl
 oox/source/export/drawingml.cxx |  405 +++-
 1 file changed, 275 insertions(+), 130 deletions(-)

New commits:
commit 388edde56431d2cfc0583aabb47c2d766139cc0c
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date:   Tue Sep 9 23:15:54 2014 +0200

SAL_WARN_IF

Change-Id: Ic2644f8a0f2f1479779aef2d6b0886604c139acb

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 35d837f..36869e6 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -707,18 +707,18 @@ void DrawingML::WriteOutline( ReferenceXPropertySet 
rXPropSet )
 }
 }
 
-if ( nLineWidth = 0 )
-SAL_WARN(oox, while writing outline - custom dash - line 
width was  0  :   nLineWidth);
-if ( aLineDash.Dashes  0 )
-SAL_WARN(oox, while writing outline - custom dash - number 
of dashes was  0  :   aLineDash.Dashes);
-if ( aLineDash.Dashes  0  aLineDash.DashLen = 0 )
-SAL_WARN(oox, while writing outline - custom dash - dash 
length was  0  :   aLineDash.DashLen);
-if ( aLineDash.Dots  0 )
-SAL_WARN(oox, while writing outline - custom dash - number 
of dots was  0  :   aLineDash.Dots);
-if ( aLineDash.Dots  0  aLineDash.DotLen = 0 )
-SAL_WARN(oox, while writing outline - custom dash - dot 
length was  0  :   aLineDash.DotLen);
-if ( aLineDash.Distance = 0 )
-SAL_WARN(oox, while writing outline - custom dash - 
distance was  0  :   aLineDash.Distance);
+SAL_WARN_IF(nLineWidth = 0,
+oox, while writing outline - custom dash - line 
width was  0  :   nLineWidth);
+SAL_WARN_IF(aLineDash.Dashes  0,
+oox, while writing outline - custom dash - number 
of dashes was  0  :   aLineDash.Dashes);
+SAL_WARN_IF(aLineDash.Dashes  0  aLineDash.DashLen = 0,
+oox, while writing outline - custom dash - dash 
length was  0  :   aLineDash.DashLen);
+SAL_WARN_IF(aLineDash.Dots  0,
+oox, while writing outline - custom dash - number 
of dots was  0  :   aLineDash.Dots);
+SAL_WARN_IF(aLineDash.Dots  0  aLineDash.DotLen = 0,
+oox, while writing outline - custom dash - dot 
length was  0  :   aLineDash.DotLen);
+SAL_WARN_IF(aLineDash.Distance = 0,
+oox, while writing outline - custom dash - distance 
was  0  :   aLineDash.Distance);
 
 mpFS-endElementNS( XML_a, XML_custDash );
 }
commit e910705421b40f3accff684e956854ff68761574
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date:   Tue Sep 9 23:14:01 2014 +0200

Use Any.getT(..) instead of Any.getValue(..) and ugly cast

Change-Id: I1c76ee7c7873e76fb1682475141c14dd658bff4a

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index a9377f3..35d837f 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -542,7 +542,7 @@ void DrawingML::WriteLineArrow( Reference XPropertySet  
rXPropSet, bool bLineS
 }
 }
 
-void DrawingML::WriteOutline( Reference XPropertySet  rXPropSet )
+void DrawingML::WriteOutline( ReferenceXPropertySet rXPropSet )
 {
 drawing::LineStyle aLineStyle( drawing::LineStyle_NONE );
 
@@ -558,15 +558,23 @@ void DrawingML::WriteOutline( Reference XPropertySet  
rXPropSet )
 
 // get InteropGrabBag and search the relevant attributes
 OUString sColorFillScheme;
-sal_uInt32 nOriginalColor( 0 ), nStyleColor( 0 ), nStyleLineWidth( 0 );
-Sequence PropertyValue  aStyleProperties, aTransformations;
-drawing::LineStyle aStyleLineStyle( drawing::LineStyle_NONE );
-drawing::LineJoint aStyleLineJoint( drawing::LineJoint_NONE );
-if ( GetProperty( rXPropSet, InteropGrabBag ) )
+
+sal_uInt32 nOriginalColor = 0;
+sal_uInt32 nStyleColor = 0;
+sal_uInt32 nStyleLineWidth = 0;
+
+SequencePropertyValue aStyleProperties;
+SequencePropertyValue aTransformations;
+
+drawing::LineStyle aStyleLineStyle(drawing::LineStyle_NONE);
+drawing::LineJoint aStyleLineJoint(drawing::LineJoint_NONE);
+
+if (GetProperty(rXPropSet, InteropGrabBag))
 {
-Sequence PropertyValue  aGrabBag;
+SequencePropertyValue aGrabBag;
 mAny = aGrabBag;
-for( sal_Int32 i=0; i  aGrabBag.getLength(); ++i )
+
+for (sal_Int32 i=0; i  aGrabBag.getLength(); ++i)
 {
 if( aGrabBag[i].Name == SpPrLnSolidFillSchemeClr )
 aGrabBag[i].Value = sColorFillScheme;
@@ -577,9 +585,9 @@ void DrawingML::WriteOutline( Reference XPropertySet  
rXPropSet )
 else if( aGrabBag[i].Name == 
SpPrLnSolidFillSchemeClrTransformations )
 aGrabBag[i].Value = aTransformations;
 }
-if( aStyleProperties.hasElements() )

[Libreoffice-commits] core.git: 10 commits - basctl/source cppuhelper/source editeng/source include/vcl svl/source ucbhelper/source ucb/source vcl/inc vcl/quartz vcl/README vcl/source vcl/unx vcl/win

2014-09-11 Thread Norbert Thiebaud
 basctl/source/basicide/baside2b.cxx|   11 +
 cppuhelper/source/paths.cxx|   20 ++-
 editeng/source/outliner/outliner.cxx   |2 
 include/vcl/outdev.hxx |2 
 svl/source/numbers/zforscan.hxx|2 
 ucb/source/ucp/webdav-neon/NeonSession.cxx |2 
 ucbhelper/source/client/proxydecider.cxx   |4 
 vcl/README |8 +
 vcl/inc/graphite_layout.hxx|2 
 vcl/inc/graphite_serverfont.hxx|2 
 vcl/inc/sallayout.hxx  |6 -
 vcl/quartz/ctlayout.cxx|   10 -
 vcl/source/gdi/sallayout.cxx   |   12 +-
 vcl/source/glyphs/graphite_layout.cxx  |4 
 vcl/source/outdev/map.cxx  |   25 
 vcl/source/outdev/text.cxx |  117 +
 vcl/source/window/builder.cxx  |6 -
 vcl/source/window/layout.cxx   |2 
 vcl/unx/generic/printer/ppdparser.cxx  |   12 +-
 vcl/win/source/gdi/winlayout.cxx   |   22 +--
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |6 -
 21 files changed, 206 insertions(+), 71 deletions(-)

New commits:
commit f5d3114cc4b62f95bcd3ce3a5a1d859a69603269
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Thu Sep 11 19:05:19 2014 +0200

vcl: protect against out-of-bound access of empty OUString

Change-Id: If2671ba0547eb69fce7005f5427dcd175a5c29a2

diff --git a/vcl/unx/generic/printer/ppdparser.cxx 
b/vcl/unx/generic/printer/ppdparser.cxx
index 606fd55..e8e2a78 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -887,8 +887,14 @@ void PPDParser::parse( ::std::list OString  rLines )
 sal_Int32 nPos = aKey.indexOf('/');
 if (nPos != -1)
 aKey = aKey.copy(0, nPos);
-aKey = aKey.copy(1); // remove the '*'
-
+if(!aKey.isEmpty())
+{
+aKey = aKey.copy(1); // remove the '*'
+}
+if(aKey.isEmpty())
+{
+continue;
+}
 if ((aKey == CloseUI) ||
 (aKey == JCLCloseUI) ||
 (aKey == OpenGroup) ||
@@ -1245,7 +1251,7 @@ void PPDParser::parseConstraint( const OString rLine )
 for( int i = 0; i  nTokens; i++ )
 {
 OUString aToken = GetCommandLineToken( i, aLine );
-if( aToken[ 0 ] == '*' )
+if( !aToken.isEmpty()  aToken[ 0 ] == '*' )
 {
 aToken = aToken.replaceAt( 0, 1,  );
 if( aConstraint.m_pKey1 )
commit 5500c51e9bddcf3bb4356ac3e69f4df1043df6c9
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Thu Sep 11 19:00:14 2014 +0200

harden access to OUString[0]

Change-Id: Ibc2997f9974b8f6d561db0632642060ab95b80f0

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 8db0652..8a36713 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2807,7 +2807,7 @@ void VclBuilder::applyPackingProperty(Window *pCurrent,
 
 if (sKey == expand)
 {
-bool bTrue = (sValue[0] == 't' || sValue[0] == 'T' || 
sValue[0] == '1');
+bool bTrue = (!sValue.isEmpty()  (sValue[0] == 't' || 
sValue[0] == 'T' || sValue[0] == '1'));
 if (pToolBoxParent)
 
pToolBoxParent-SetItemExpand(m_pParserState-m_nLastToolbarId, bTrue);
 else
@@ -2820,12 +2820,12 @@ void VclBuilder::applyPackingProperty(Window *pCurrent,
 
 if (sKey == fill)
 {
-bool bTrue = (sValue[0] == 't' || sValue[0] == 'T' || 
sValue[0] == '1');
+bool bTrue = (!sValue.isEmpty()  (sValue[0] == 't' || 
sValue[0] == 'T' || sValue[0] == '1'));
 pCurrent-set_fill(bTrue);
 }
 else if (sKey == pack-type)
 {
-VclPackType ePackType = (sValue[0] == 'e' || sValue[0] == 'E') 
? VCL_PACK_END : VCL_PACK_START;
+VclPackType ePackType = (!sValue.isEmpty()  (sValue[0] == 
'e' || sValue[0] == 'E')) ? VCL_PACK_END : VCL_PACK_START;
 pCurrent-set_pack_type(ePackType);
 }
 else if (sKey == left-attach)
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index fb99034..d38c56b 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1231,7 +1231,7 @@ void VclGrid::setAllocation(const Size rAllocation)
 
 bool toBool(const OString rValue)
 {
-return (rValue[0] == 't' || rValue[0] == 'T' || rValue[0] == '1');
+return (!rValue.isEmpty()  (rValue[0] == 't' || rValue[0] == 'T' || 
rValue[0] == '1'));
 }
 
 bool VclGrid::set_property(const OString rKey, const OString rValue)
commit 18fa868f1424c9f859181dac4b5212ed7cb7dd0f

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

2014-09-11 Thread Norbert Thiebaud
 vcl/win/source/gdi/winlayout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cc3294e127a6aedb8f6da5741ac9063da1cc2135
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Fri Sep 12 02:33:27 2014 +0200

vcl: fix typo in DeviceCoordinate

Change-Id: I7e0ec3c276826105c89dae5471c484ec7ae999d2

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index a232bd7..3c8f19e 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -667,7 +667,7 @@ sal_Int32 SimpleWinLayout::GetTextBreak( DeviceCoordinate 
nMaxWidth, DeviceCoord
 return -1;
 }
 
-void SimpleWinLayout::GetCaretPositions( int nMaxIdx, DeviceCoordinat* 
pCaretXArray ) const
+void SimpleWinLayout::GetCaretPositions( int nMaxIdx, DeviceCoordinate* 
pCaretXArray ) const
 {
 DeviceCoordinate nXPos = mnBaseAdv;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-qa] [ANNOUNCE] Branch libreoffice-4-3-2 and Tag libreoffice-4.3.2.1 created

2014-09-11 Thread Christian Lohmaier
Hi all,

The tag libreoffice-4.3.2.1 (AKA 4.3.2 RC1) and the corresponding
branch libreoffice-4-3-2 have been created.
The branch will be used for fine tuning of the 4.3.2 release. (there
is one additional RC planned)

The following rules apply:

+ preferably just translation or blocker fixes
+ only cherry-picking from libreoffice-4-3 branch
+ 2 additional reviews needed; 2nd reviewer pushes
+ no regular merges back to anything

The 'libreoffice-4-3' branch is still active and will be used for the
4.3.3 bugfix release. Please read more at
   http://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.2_release
   http://wiki.documentfoundation.org/Development/Branches
   http://wiki.documentfoundation.org/Release_Criteria

Now, if you want to switch your clone to the branch, please do:

./g pull -r
./g checkout -b libreoffice-4-3-2 origin/libreoffice-4-3-2

To checkout the tag, use

./g fetch --tags
./g checkout -b tag-libreoffice-4.3.2.1 libreoffice-4.3.2.1

Hopefully it will work for you :-)  Most probably, you will also want to
do (if you haven't done it yet):

git config --global push.default tracking

When you do git push with this, git will push only the branch you are
on; e.g. libreoffice-4-3-2 when you have switched to it.  This will
save you some git shouting at you.

Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will soon be available from the official page together with the builds.

Attached is the list of changes against 4.3.1 RC2 (4.3.1 final)

Happy hacking,
Christian
+ OOXML import: Respect table background properties a bit more (bnc#480256) [Matúš Kukan]
+ fix reading even/odd page breaks from .docx (bnc#519228) [Luboš Luňák]
+ I can't remove a path in AutoText dialog (bnc#529470) [Tor Lillqvist]
+ avoid opening embedded OLE object as text (bnc#648251) [Tor Lillqvist]
+ sd: check that master page matches when setting parent style (bnc#708518) [Michael Stahl]
+ we need the proper alpha mask (bnc#719994) [Tor Lillqvist]
+ copy first-header-footer test from ww8 to ooxml (bnc#751077) [Luke Deller]
+ make changing table text color in impress always work (bnc#770711) [Matúš Kukan]
+ copy first-header-footer test from ww8 to ooxml (bnc#780843) [Luke Deller]
+ fix reading a .doc that has frame anchored to the end of page (bnc#787942) [Luboš Luňák]
+ better algorithm to find placeholder shape. (bnc#821916) [Matúš Kukan]
+ let's not even try to export invalid chart objects. (bnc#822170) [Kohei Yoshida]
+ if number type is not set, skip numbering (bnc#822347) [Tomaž Vajngerl]
+ PPTX import: Properly show data labels in percent format. (bnc#862510) [Matúš Kukan]
+ DOCX import: handle w:hideMark table cell property (bnc#865381) [Miklos Vajna]
+ improved handling of placeholder shapes (bnc#880448) [Matúš Kukan]
+ set the date time mode to non-fixed after the import is done. (bnc#885548) [Kohei Yoshida]
+ do not set TextAutoGrowHeight for vertical text. (bnc#887227) [Matúš Kukan]
+ fix build, Unchecked dynamic_cast (coverity#1209547) [Caolán McNamara]
+ allow passing FilterOptions via cli (fdo#36313) [Tomas Hlavaty]
+ DOCX import: list styles don't support automatic updates (fdo#38414) [Miklos Vajna]
+ mac Keyboard shortcut Option key ko in Customize dialog (fdo#39477) [Julien Nabet]
+ don't remove 'edit' pop-up menu entry from form in design mode (fdo#44081) [Lionel Elie Mamane]
+ write OOXML externalReferences, externalLinks, (fdo#45286) [Eike Rathke]
+ don't loop autosave if userautosave fails (fdo#46635) [Maxim Monastirsky]
+ pyuno: fix deadlock in Runtime::any2PyObject() (fdo#46678) [Michael Stahl]
+ disable the Automatically currency unless already used (fdo#48110) [Eike Rathke]
+ make Draw use paper size when printing (fdo#63905) [Eilidh McAdam]
+ TextField in table should use same formatting as floating TextField (fdo#67615) [Lionel Elie Mamane]
+ avoid crashing on Accellerator in poorly initialized context (fdo#69162) [Norbert Thiebaud]
+ don't loop autosave if userautosave fails (fdo#71625) [Maxim Monastirsky]
+ sub-grid shouldn't be allowed as 0 (fdo#77516) [Caolán McNamara]
+ (+dup File crashes while opening. (fdo#78906) [Umesh Kadam]
+ labels are truncated (fdo#79227) [Caolán McNamara]
+ make generic autocorr files (German/Spanish/Italian) (fdo#79276) [Julien Nabet]
+ check for empty slots' valid NULL pointer, (fdo#79441) [Eike Rathke]
+ use \highlightN instead of \chcbpatN in RTF import and export (fdo#79599) [nrb...@gmail.com]
+ add 'Save a Copy' to Calc/Impress/Draw (LO4.3-Branch) (fdo#79917) [Heiko Scheidt]
+ handle autocomplete with dot in formula name, (fdo#80058) [Markus Mohrhard]
+ fix the check whether the window is active on OS X. (fdo#80474) [Jan Holesovsky]
+ bad default value (0) for the number of rows (fdo#80534) 

Re: [Libreoffice-qa] BSA 2.0 - First Draft of Concept Questions

2014-09-11 Thread Jay Philips
On 09/11/2014 04:40 AM, Joel Madero wrote:
 
 On 09/10/2014 04:32 PM, Jay Philips wrote:
 Hey Joel,

 Yes i think a step by step process is a nice user friendly way to go.
 When Calligra Words crashed on me, their step by step bug report was fun
 to go through.

 About your doc, here are some thoughts.

 1) I'm assuming that many users coming to the BSA are coming through the
 Help  Send Feedback menu item and the libreoffice version number will
 be provided through this link, so the first question should be for the
 user to enter in the libreoffice version they are using and that the
 list be automatically set to the version present in the link. After the
 user selects his version, or simply clicks ok as his version is already
 selected, then either it takes him to the 'please upgrade your version'
 notice or step 2.
 Not sure I'm following this.

About suggestion 1, when a user goes to Help  Send Feedback, its a link
that looks like this 
http://www.libreoffice.org/get-help/feedback/?LOversion=4.4.0.0.alpha0LOlocale=en-USLOmodule=StartModule
 and in the LOversion part of the url, that is the libreoffice version
number, so that should be used to automatically set it in the drop down.

Forgot to mention that in the 'Reproducible Steps:' step, the module
selection should be there as well, and the link mentioned above will
also help in its auto selection.

 2) I think we should ask them to download the latest stable/still
 version if they are running an EOL version or if they are on an older
 version of the current stable/still.
 I strongly disagree - if it's fixed in Fresh - that is sufficient 95% of
 the time (ie. we're not going to go dig through to find a backport if
 stable isn't fixed). The idea here is to lessen the load on QA, not to
 increase, and this would increase it. Else they download stable, confirm
 that their minor bug is still in it, report, we find that it's fixed in
 Fresh, and just set to WFM. This is not the ideal situation. They can
 always download stable - we'll just direct them to the Fresh page, if
 they go to the Stable branch, fine.

 3) Step 2 should be asking the user for his operating system, with that
 being automatically selected by means of javascript through the user's
 browser agent (florian already has that code).
 Takes more work to implement. Florian's thing is a concept, not
 currently workable without additional steps by user.

The main point here is that step 2 should be the user choosing his
operating system and the javascript can assist with that selection. If
the javascript is never implemented, that is also not a problem for this
to be step 2. This should be very easy to implement and Liongold or I
can assist with it with Florian's code.

 3) Step 3 should be asking them if this is a bug report or an
 enhancement request and this step should be skipped if the user clicks
 the two different links on 
 http://www.libreoffice.org/get-help/feedback/ , as presently they link
 to the same page.
 Again this takes more work and coding WITHIN LibreOffice but I'm not
 opposed to the idea.

I'm assuming cloph or Liongold can easily make this minor change and
worst case, i'll can do it if i get the keys. :D

 4) Step 4 is only for users who are submitting a bug report and that
 asks them if this bug had happened in a previous version and shows the
 version list with the first entry being something like i'm not sure.
 Yup agreed.

 5) I think it would be great to have bug priority set by simple yes/no
 questions, but think that is the job of the QA team to set that feature,
 and a simple yes/no question of whether it hangs/crashes is sufficient
 for BSA bug reporters.
 This would just set a quasi setting that could always be changed, I
 disagree that we can't ask users to help us. Else - the reality is we
 don't have the time to even triage bugs let alone deal with prioritizing
 them. A rough idea through 4 questions seems fine and if users are
 unhappy answering 4 simple questions, I have little patience for taking
 my time to triage their bugs.
 
 Best,
 Joel
 
 ___
 List Name: Libreoffice-qa mailing list
 Mail address: Libreoffice-qa@lists.freedesktop.org
 Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
 Problems? 
 http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
 Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
 List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
 
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/


[Libreoffice-bugs] [Bug 80650] lower case greek alphabet missing in localized Math symbol table

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=80650

Matthew Francis fdb...@neosheffield.co.uk changed:

   What|Removed |Added

 CC||fdb...@neosheffield.co.uk

--- Comment #53 from Matthew Francis fdb...@neosheffield.co.uk ---
I can reproduce this issue on 4.3.1.2/OSX with the de language pack.

However, if I take a fresh build from master and add the contents of the de
language pack from 4.3.1.2*, it works as expected - e.g. a lower case %sigma is
now shown correctly.

Although mixing and matching versions and langpacks is probably not recommended
in general, if the problem is in fact already fixed in master this might
provide a path for finding where through bisection?


(* Language packs don't seem to be built for the dailies and I'm not sure of
the procedure for building them from source)

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


[Libreoffice-bugs] [Bug 81920] UI: vertical scrollbar in Appearance dialog is broken

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=81920

--- Comment #4 from Abdulaziz Ayed aala...@kacst.edu.sa ---
Works also well for me now

Version: 4.4.0.0.alpha0+
Build ID: e2723d00b77dc1044e2ba599ba93517af34e1ea5
TinderBox: Linux-rpm_deb-x86_64@46-TDF, Branch:master



I think it should closed

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


[Libreoffice-bugs] [Bug 81920] UI: vertical scrollbar in Appearance dialog is broken

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=81920

--- Comment #5 from Abdulaziz Ayed aala...@kacst.edu.sa ---
*be

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


[Libreoffice-bugs] [Bug 81920] UI: vertical scrollbar in Appearance dialog is broken

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=81920

Abdulaziz Ayed aala...@kacst.edu.sa changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |NOTABUG

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


[Libreoffice-bugs] [Bug 81759] the Speech Editor Siri of MAC OS 10.9.4 does not work with Libreoffice 4.3.0.3

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=81759

--- Comment #3 from Uwe Altmann l...@altsys.de ---
I'n not a coder so this won't bring us far :-)

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


[Libreoffice-bugs] [Bug 83709] UNDO: Crash after undoing cell moving

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=83709

--- Comment #3 from ign_christian ign_christ...@yahoo.com ---
Hi Jay.. I can't reproduce crash with LO 4.3.1.2 and 4.2.6.2 portable under
Win7 x86

Have you tried resetting user profile?

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


[Libreoffice-bugs] [Bug 81635] An extension can't be installed with more than 3 libraries

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=81635

--- Comment #12 from sophie gautier.sop...@gmail.com ---
Hi Robinson, the crashes I experienced was on the first installation of the
extensions for both versions. Sophie

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


[Libreoffice-bugs] [Bug 83726] Applying Styles Does Not Consistently Set Character Properties

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=83726

--- Comment #4 from Urmas davian...@gmail.com ---
It's not a bug. Bold and italics from the direct formatting should be XORed
with the style, not override it.

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


[Libreoffice-bugs] [Bug 83709] UNDO: Crash after undoing cell moving

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=83709

--- Comment #4 from ign_christian ign_christ...@yahoo.com ---
(In reply to comment #3)
 ... 4.2.6.2 portable ...
Sorry..it's 4.2.6.3

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


[Libreoffice-bugs] [Bug 41640] Clipboard pasted after press Enter in cell comment

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=41640

--- Comment #15 from Winfried Donkers winfrieddonk...@libreoffice.org ---
Still present in 4.4.0.0alpha0+ (Linux) and 4.2.6 (Windows).
The way to reproduce is properly described in desription of this bug report.

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


[Libreoffice-bugs] [Bug 41640] Clipboard pasted after press Enter in cell comment

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=41640

--- Comment #16 from Winfried Donkers winfrieddonk...@libreoffice.org ---
Further to the steps to reproduce in description of this bug:
-the clipboard must contain a cell or a range of cells, with text in the
clipboard, the problem does not occur
-the problem occurs regardless of the contents of the clipboard have been
pasted or not.
-the problem occurs only once, i.e. if you reproduce the problem and insert
'another' comment, it works as expected.
-if the text entry in the comment is finished and Enter is not used, it works
as expected. However inserting a next comment and pressing Enter makes the
problem occur.
-when the problem occurs, the cursor is still in some sort of comment mode,
i.e. when selecting a cell, the cursor looks like a + and the cell is not
selected. Only when selecting a second time, the cell is selected.

So:
-the clipboard must contain (range of ) cell(s)
-using Enter to finish comment creation triggers a paste action in the cell
(and discards the comment creation, but does not fully restore the mouse-mode),
but only once, unless the clipboard content changes.

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


[Libreoffice-bugs] [Bug 81920] UI: vertical scrollbar in Appearance dialog is broken

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=81920

Abdulaziz Ayed aala...@kacst.edu.sa changed:

   What|Removed |Added

 Resolution|NOTABUG |WORKSFORME

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


[Libreoffice-bugs] [Bug 83751] New: FILESAVE: Custom Properties dropped while exporting to .pptx

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=83751

  Priority: medium
Bug ID: 83751
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: FILESAVE: Custom Properties dropped while exporting to
.pptx
  Severity: normal
Classification: Unclassified
OS: Linux (All)
  Reporter: heena.h.gu...@ericsson.com
  Hardware: All
Status: NEW
   Version: 4.4.0.0.alpha0+ Master
 Component: Presentation
   Product: LibreOffice

Created attachment 106106
  -- https://bugs.freedesktop.org/attachment.cgi?id=106106action=edit
Sample File And Screenshot of Bug

Steps to reproduce:-
1) Open a new presentation in impress.
2) Add some custom properties in this presentation(File - Properties - Custom
Properties - Add)
3) Save the presentation as pptx.
4) Close the pptx presentation.
5) Open the pptx presentation again and go to File - Properties - Custom
Properties.
Observed, all the custom properties are disappeared.

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


[Libreoffice-bugs] [Bug 83751] FILESAVE: Custom Properties dropped while exporting to .pptx

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=83751

--- Comment #1 from Heena Gupta heena.h.gu...@ericsson.com ---
Created attachment 106107
  -- https://bugs.freedesktop.org/attachment.cgi?id=106107action=edit
Sample File And Screenshot of bug

Please ignore the previous attachment. And here find the right attachment.

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


[Libreoffice-bugs] [Bug 83751] FILESAVE: Custom Properties dropped while exporting to .pptx

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=83751

Heena Gupta heena.h.gu...@ericsson.com changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |heena.h.gu...@ericsson.com
   |desktop.org |

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


[Libreoffice-bugs] [Bug 83752] New: FORMATTING: Chinese environment, time modification

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=83752

  Priority: medium
Bug ID: 83752
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: FORMATTING: Chinese environment, time modification
  Severity: normal
Classification: Unclassified
OS: Windows (All)
  Reporter: chen.w@gmail.com
  Hardware: Other
Whiteboard: BSA
Status: UNCONFIRMED
   Version: 4.2.6.2 release
 Component: Spreadsheet
   Product: LibreOffice

Created attachment 106108
  -- https://bugs.freedesktop.org/attachment.cgi?id=106108action=edit
document

Problem description: 
In Chinese environment, when I use ctrl+; to insert a time, and I change it, it
will make mistakes. it goes right that I change the cell's language into
English.

Steps to reproduce:
1. [A1]ctrl+; [B1]ctrl+; [C1]=B1-A1, format is [HH]:MM

2. change [B1]'s hour or minite, it make [C1] error like '#VALUE!'. Look at
[B1], it like strings.

Current behavior:
#VALUE!

Expected behavior:
recompute and show me a time like 40:21

Operating System: Windows 7
Version: 4.2.6.2 release

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


[Libreoffice-bugs] [Bug 83720] PIVOTTABLE: Wrong date format in column field

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=83720

ign_christian ign_christ...@yahoo.com changed:

   What|Removed |Added

   Hardware|x86-64 (AMD64)  |All
 OS|Windows (All)   |All
 Whiteboard||BibisectRequest
   Priority|medium  |high
Version|4.3.1.2 release |4.3.0.0.beta1
   Keywords||regression

--- Comment #2 from ign_christian ign_christ...@yahoo.com ---
Reproduced from scratch with LO 4.3.1.2 and 4.3.0.0.beta1 under Ubuntu 12.04
x86.

Not reproduced with LO 4.2.6.3

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


[Libreoffice-bugs] [Bug 83664] VIEWING: Assertion failed! Error with Win-x86@39 build

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=83664

--- Comment #13 from Jan Holesovsky ke...@collabora.com ---
The reason why the error cannot be seen with TB @42 is that it does not have
the debugging turned on.

So the assertion is real; the question is whether it is that the condition we
are asserting is incorrect (should not be asserting that), or whether there is
a bug.

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


[Libreoffice-bugs] [Bug 83687] FORMULAEDITOR: math symbols in formula editor replaced by wingdings font-like symbols

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=83687

Maxim Monastirsky momonas...@gmail.com changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |DUPLICATE

--- Comment #3 from Maxim Monastirsky momonas...@gmail.com ---
(In reply to comment #1)
 Downloaded a random OpenSymbol.ttf file
That's IMHO a bad idea. This font could differ between releases, and also the
file name should be opens___.ttf so future installers could replace it
properly. The best way to obtain this font is to download it directly from the
git repository at
http://cgit.freedesktop.org/libreoffice/core/tree/extras/source/truetype/symbol/opens___.ttf.
You need to select your version from the dropdown that located at the top right
corner, and then click the link named plain. It's also possible to extract it
from the msi file. You can do it using 7Zip, or using the administrative mode
of window installer - msiexec /a downloaded_package.msi (replace
downloaded_package.msi with the actual name of the installer).

 it seems that the font was not in the package I downloaded yesterday.
The font is in the package, but sometimes it won't retain in the system after
an upgrade, for some unknown reason.

*** This bug has been marked as a duplicate of bug 76239 ***

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


[Libreoffice-bugs] [Bug 76239] VIEWING: Strange symbols instead of normal ones

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=76239

Maxim Monastirsky momonas...@gmail.com changed:

   What|Removed |Added

 CC||sylvain.cg.an...@gmail.com

--- Comment #26 from Maxim Monastirsky momonas...@gmail.com ---
*** Bug 83687 has been marked as a duplicate of this bug. ***

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


[Libreoffice-bugs] [Bug 83753] New: LibreOffice does not take into account JAVA_HOME and PATH to select JRE

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=83753

  Priority: medium
Bug ID: 83753
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: LibreOffice does not take into account JAVA_HOME and
PATH to select JRE
  Severity: enhancement
Classification: Unclassified
OS: All
  Reporter: m.wegh...@posteo.de
  Hardware: All
Status: UNCONFIRMED
   Version: 4.4.0.0.alpha0+ Master
 Component: Libreoffice
   Product: LibreOffice

When the Java Runtime Environment (JRE) to be used by LibreOffice is
automatically detected by LibreOffice (e.g. on the first start of the program),
the JAVA_HOME and PATH environment variables are currently not taken into
account, i.e. they have no effect on the JRE that is selected.

Possibly it would be a good idea to prefer the Java installations which these
environment variables refer to over other Java installations on the system as
they (JAVA_HOME, PATH) generally indicate which JRE should be used on the
system.
Thus, users/administrators can control which JRE is used if multiple JREs are
installed on the system. Therefore, I think this setting should be taken into
account by LibreOffice as well.

It would also offer administrators an easy possibility to set a specific JRE
for LibreOffice by providing a startup script that first sets the JAVA_HOME
environment variable before starting LibreOffice (e.g. in large companies).

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


[Libreoffice-bugs] [Bug 76239] OpenSymbol font is not retained after an upgrade

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=76239

Maxim Monastirsky momonas...@gmail.com changed:

   What|Removed |Added

 Status|REOPENED|NEW
Summary|VIEWING: Strange symbols|OpenSymbol font is not
   |instead of normal ones  |retained after an upgrade
  Component|Formula Editor  |Installation

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


[Libreoffice-bugs] [Bug 83718] Background picture of spreadsheets of a xls/xlsx file is not visible

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=83718

--- Comment #2 from Zeki Bildirici kobz...@gmail.com ---
Created attachment 106110
  -- https://bugs.freedesktop.org/attachment.cgi?id=106110action=edit
Calendar - XLSX version

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


[Libreoffice-bugs] [Bug 83718] Background picture of spreadsheets of a xls/xlsx file is not visible

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=83718

--- Comment #3 from Zeki Bildirici kobz...@gmail.com ---
Created attachment 106111
  -- https://bugs.freedesktop.org/attachment.cgi?id=106111action=edit
Calc and Excel comparison - screenshot

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


[Libreoffice-bugs] [Bug 83753] LibreOffice does not take into account JAVA_HOME and PATH to select JRE

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=83753

--- Comment #1 from Michael Weghorn m.wegh...@posteo.de ---
I have submitted a patch to Gerrit that implements this
(https://gerrit.libreoffice.org/#/c/11392/) and would be very glad to receive
feedback on both, the general idea, and the patch.

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


[Libreoffice-bugs] [Bug 81264] Calc is not accessible to screen readers on Linux if sheet is modified [a11y]

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=81264

Jacobo Aragunde Pérez jaragu...@igalia.com changed:

   What|Removed |Added

 Blocks||75025

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


[Libreoffice-bugs] [Bug 75025] LibreOffice 4.3 most annoying bugs

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=75025

Jacobo Aragunde Pérez jaragu...@igalia.com changed:

   What|Removed |Added

 Depends on||81264

--- Comment #66 from Jacobo Aragunde Pérez jaragu...@igalia.com ---
Adding bug #81264: Calc is not accessible to screen readers on Linux if sheet
is modified [a11y]

The result of this bug is Calc becoming unusable with screen readers, once they
modify a cell they stop receiving accessible events. It seems to affect Windows
and Linux users, so probably OS X version is affected too.

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


[Libreoffice-bugs] [Bug 59299] [PERSONAS] only applies to toolbars at top

2014-09-11 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=59299

--- Comment #7 from Michael Jaumann meta_...@yahoo.com ---
He,

as far as i am i have a view questions:

1. this features works:

  persona/themes on the bottom toolbars/ statusbar.

  textColor is the same as in the menu bar.(menubar textcolor changes with
switching between personas). (Wasnt implemented till yet in the upper toolbars)
 - needs a restart of LO after changing theme
2. dosent work as expected :

persona consists of two parts: header and footer bitmap. the problem is that
the header and footer bitmap are the same. My solution. I use for the top
toolbars the top area and for the bottom toolbars the part up from the bottom
area.

Is my solution okay? Created an attachment the shows the progress.

Thanks !

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


  1   2   3   >