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

[Miklos Vajna]

 sw/inc/IDocumentContentOperations.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ae083c1cf423fc5695019e48f3bdc7979b15b6bb
Author: Miklos Vajna 
Date:   Wed Sep 10 09:49:10 2014 +0200

IDocumentContentOperations::CopyRange: fix comment

Change-Id: Ide5705323579aa5ea1e725685acb7421f416cf04

diff --git a/sw/inc/IDocumentContentOperations.hxx 
b/sw/inc/IDocumentContentOperations.hxx
index 8f64f1c..f30b774 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -73,7 +73,7 @@ public:
 \warning The range has to include at least two nodes or has to be a
 SwDoc::IsColumnSelection!
 
-Normally this functions should work only with content nodes. But there
+Normally this function should work only with content nodes. But there
 is a special case used by SwDoc::Paste, which starts the SwPaM at the
 content start node. This position doesn't contain any content:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[rbuj]

 scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java |
5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 0876cc15fc188db801a2198d9ca90a5a8b88f92f
Author: rbuj 
Date:   Tue Sep 9 15:38:30 2014 +0200

scripting: fix array copy and, use System.arraycopy

Change-Id: If8addcc5d95f610ade404e62e4a2a775319e9ff3
Reviewed-on: https://gerrit.libreoffice.org/11354
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git 
a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java 
b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
index d221155..b1c663c 100644
--- a/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
+++ b/scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java
@@ -71,10 +71,7 @@ public class XOutputStreamWrapper extends OutputStream {
 throw new java.io.IOException( "Stream is null" );
 }
 byte[] bytes = new byte[len];
-for ( int i=off; i< off+len; i++ )
-{
-bytes[i] = b[i];
-}
+System.arraycopy(b, off, bytes, 0, len);
 try
 {
 m_xOutputStream.writeBytes(bytes);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOffice / Future / design notes foo ...

[Michael Meeks]

On Tue, 2014-09-09 at 19:05 +0200, Thorsten Behrens wrote:
> Michael Meeks wrote:
> > * VCL lifecycle
> > + switching to reference counted / smart-pointer
> >   for all VCL Window sub-classes
>
> As a random word of warning - windows point back & forth all over the
> place, to both parent _and_ children; unless one uses weak pointers or
> some other means of breaking cycles, this change would just exchange
> crashes for leaks.

The proposed means of breaking cycles is reasonably reliable: replace
all 'delete ' calls with a pWindow->dispose(); call -
that releases / clears those refs =)

Of course, its a chunk of work too - particularly when looking for some
incremental approach to that.

ATB,

Michael.

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

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

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

[Caolán McNamara]

 sw/source/core/uibase/utlui/glbltree.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d468b72a27f9c20cea1c3df186ac7eb267df9a5b
Author: Caolán McNamara 
Date:   Tue Sep 9 15:03:37 2014 +0100

Resolves: fdo#83251 menu on master doc insert disappears

on releaseing mouse button

(cherry picked from commit a29ece90621b2fef9126a6e9a976561ce5d1b461)

Conflicts:
sw/source/uibase/utlui/glbltree.cxx

Change-Id: Ia2f8da6e62d708744707b8187d5961fe12169eb8
Reviewed-on: https://gerrit.libreoffice.org/11362
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/core/uibase/utlui/glbltree.cxx 
b/sw/source/core/uibase/utlui/glbltree.cxx
index 3c4b938..07ebd80 100644
--- a/sw/source/core/uibase/utlui/glbltree.cxx
+++ b/sw/source/core/uibase/utlui/glbltree.cxx
@@ -396,7 +396,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* 
pBox)
 pMenu->EnableItem(CTX_INSERT_FILE,  0 != (nEnableFlags & 
ENABLE_INSERT_FILE));
 pMenu->EnableItem(CTX_INSERT_NEW_FILE,  0 != (nEnableFlags & 
ENABLE_INSERT_FILE));
 pMenu->SetSelectHdl(LINK(this, SwGlobalTree, PopupHdl));
-pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft());
+pMenu->Execute(pBox, pBox->GetItemRect(nTbxId));
 delete pMenu;
 pBox->EndSelection();
 pBox->Invalidate();
@@ -411,7 +411,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* 
pBox)
 }
 pMenu->EnableItem(CTX_UPDATE_SEL, 0 != (nEnableFlags & 
ENABLE_UPDATE_SEL));
 pMenu->SetSelectHdl(LINK(this, SwGlobalTree, PopupHdl));
-pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft());
+pMenu->Execute(pBox, pBox->GetItemRect(nTbxId));
 delete pMenu;
 pBox->EndSelection();
 pBox->Invalidate();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[rbuj]

 qadevOOo/runner/lib/Parameters.java |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit c6a2868a75a90005f9d711d6f1419ba704670781
Author: rbuj 
Date:   Tue Sep 9 15:42:53 2014 +0200

qadevOOo: use System.arraycopy

Change-Id: Ibbac337b481e138ff9bfaa9d350b52e368ba5f2b
Reviewed-on: https://gerrit.libreoffice.org/11355
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/qadevOOo/runner/lib/Parameters.java 
b/qadevOOo/runner/lib/Parameters.java
index e66ea50..8c05d77 100644
--- a/qadevOOo/runner/lib/Parameters.java
+++ b/qadevOOo/runner/lib/Parameters.java
@@ -91,10 +91,7 @@ public class Parameters implements XPropertySet {
 parameters.put(name, value);
 int size = props.length;
 Property[] addProps = new Property[size+1];
-for (int i=0; ihttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

[rbuj]

 bean/com/sun/star/comp/beans/LocalOfficeWindow.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f114c3d00f73441a405d25bc6d98be3a829cd8e
Author: rbuj 
Date:   Tue Sep 9 19:22:59 2014 +0200

bean: Boolean Parsing

Change-Id: If5e77da2b42b126e2c8fd7613b6adaed635fd683
Reviewed-on: https://gerrit.libreoffice.org/11364
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java 
b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
index 0fb6f9d..84c2a8a 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
@@ -266,7 +266,7 @@ public class LocalOfficeWindow
 String vendor = System.getProperty("java.vendor");
 if ((vendor.equals("Sun Microsystems Inc.")
 || vendor.equals("Oracle Corporation"))
-&& 
Boolean.valueOf(System.getProperty("sun.awt.xembedserver")).booleanValue())
+&& 
Boolean.parseBoolean(System.getProperty("sun.awt.xembedserver")))
 {
 xembed = new NamedValue(
 "XEMBED",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/com

[rbuj]

 wizards/com/sun/star/wizards/form/StyleApplier.java   |2 +-
 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |2 +-
 wizards/com/sun/star/wizards/ui/FilterComponent.java  |2 +-
 wizards/com/sun/star/wizards/ui/ImageList.java|2 +-
 wizards/com/sun/star/wizards/ui/event/DataAwareFields.java|2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 10e8e10605b9c52bd7fd8a0665dd4d358c733a66
Author: rbuj 
Date:   Tue Sep 9 16:29:01 2014 +0200

wizards: Number Parsing

Change-Id: Ic8d9c97ee6bc48c8440c27c5ae4fc9bb20fa5acd
Reviewed-on: https://gerrit.libreoffice.org/11359
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java 
b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 2cd30ff..dfb5c8a 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -224,7 +224,7 @@ public class StyleApplier
 {
 sPropValue = 
JavaTools.replaceSubString(sPropValue, PropertyNames.EMPTY_STRING, 
PropertyNames.SEMI_COLON);
 sPropValue = 
JavaTools.replaceSubString(sPropValue, PropertyNames.EMPTY_STRING, 
PropertyNames.SPACE);
-return Integer.decode(sPropValue).intValue();
+return Integer.parseInt(sPropValue);
 }
 }
 }
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index ee477c4..efc8402 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -240,7 +240,7 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 }
 getRecordParser().setRecordFieldNames(sNewList);
 getRecordParser().GroupFieldNames = 
JavaTools.ArrayoutofString(sGroupFieldNames, PropertyNames.SEMI_COLON);
-int nOrigCommandType = 
Integer.valueOf(sCommandType).intValue();
+int nOrigCommandType = Integer.parseInt(sCommandType);
 getRecordParser().setCommandType(nOrigCommandType);
 
 sMsgQueryCreationImpossible = 
JavaTools.replaceSubString(sMsgQueryCreationImpossible, 
getRecordParser().Command, "");
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java 
b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index 3a2b78b..4c67f0b 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -189,7 +189,7 @@ public class FilterComponent
  */
 private void togglefollowingControlRow(String _scurName)
 {
-int Index = Integer.valueOf(getIndexNumber(_scurName)).intValue();
+int Index = Integer.parseInt(getIndexNumber(_scurName));
 if (Index < oControlRows.length)
 {
 boolean bValue = oControlRows[Index - 1].isConditionComplete();
diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java 
b/wizards/com/sun/star/wizards/ui/ImageList.java
index 78c19ea..35c301d 100644
--- a/wizards/com/sun/star/wizards/ui/ImageList.java
+++ b/wizards/com/sun/star/wizards/ui/ImageList.java
@@ -763,7 +763,7 @@ public class ImageList implements XItemEventBroadcaster, 
ListDataListener
 {
 Object image = ((EventObject) event).Source;
 String controlName = (String) 
Helper.getUnoPropertyValue(getModel(image), PropertyNames.PROPERTY_NAME);
-return Integer.valueOf(controlName.substring(6 + 
name.length())).intValue();
+return Integer.parseInt(controlName.substring(6 + name.length()));
 
 }
 
diff --git a/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java 
b/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java
index c36e8b7..5df239a 100644
--- a/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java
+++ b/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java
@@ -420,7 +420,7 @@ public class DataAwareFields
 }
 else if (value instanceof String)
 {
-return Double.valueOf((String) value).doubleValue();
+return Double.parseDouble((String) value);
 }
 else if (value instanceof short[])
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[rbuj]

 qadevOOo/runner/complexlib/ComplexTestCase.java  |4 ++--
 qadevOOo/runner/convwatch/BuildID.java   |4 ++--
 qadevOOo/runner/convwatch/DB.java|4 ++--
 qadevOOo/runner/convwatch/FileHelper.java|4 ++--
 qadevOOo/runner/convwatch/IniFile.java   |4 ++--
 qadevOOo/runner/convwatch/PRNCompare.java|2 +-
 qadevOOo/runner/graphical/BuildID.java   |4 ++--
 qadevOOo/runner/graphical/FileHelper.java|   12 ++--
 qadevOOo/runner/graphical/IniFile.java   |6 +++---
 qadevOOo/runner/graphical/JPEGComparator.java|4 ++--
 qadevOOo/runner/helper/APIDescGetter.java|   22 +++---
 qadevOOo/runner/share/DescGetter.java|6 +++---
 qadevOOo/runner/stats/OutProducerFactory.java|2 +-
 qadevOOo/runner/stats/SimpleFileOutProducer.java |2 +-
 qadevOOo/runner/util/RegistryTools.java  |2 +-
 qadevOOo/runner/util/utils.java  |6 +++---
 16 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit e8ac22f3aa98e16ae7e2b26ad9a99311ba42af4b
Author: rbuj 
Date:   Tue Sep 9 23:48:11 2014 +0200

qadevOOo: use a character literal

Change-Id: I6d3e592de64c63e66bb788b112e188ef217e7bf7
Reviewed-on: https://gerrit.libreoffice.org/11367
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java 
b/qadevOOo/runner/complexlib/ComplexTestCase.java
index 8d39b7c..ff8b4fd 100644
--- a/qadevOOo/runner/complexlib/ComplexTestCase.java
+++ b/qadevOOo/runner/complexlib/ComplexTestCase.java
@@ -119,10 +119,10 @@ public abstract class ComplexTestCase extends Assurance 
implements ComplexTest
 String entryName = subEntry.entryName;
 Object[] parameter = null;
 
-int posLeftParenthesis = entryName.indexOf("(");
+int posLeftParenthesis = entryName.indexOf('(');
 if (posLeftParenthesis != -1)
 {
-String sParameter = 
(entryName.substring(posLeftParenthesis + 1, entryName.indexOf(")")));
+String sParameter = 
(entryName.substring(posLeftParenthesis + 1, entryName.indexOf(')')));
 mTestMethodName = entryName;
 parameter = new String[] { sParameter };
 entryName = entryName.substring(0, posLeftParenthesis);
diff --git a/qadevOOo/runner/convwatch/BuildID.java 
b/qadevOOo/runner/convwatch/BuildID.java
index 7f903af..6fb1687 100644
--- a/qadevOOo/runner/convwatch/BuildID.java
+++ b/qadevOOo/runner/convwatch/BuildID.java
@@ -28,7 +28,7 @@ public class BuildID
 String sOfficePath = "";
 if (_sApp.startsWith("\""))
 {
-int nIdx = _sApp.indexOf("\"", 1);
+int nIdx = _sApp.indexOf('"', 1);
 if (nIdx == -1)
 {
 }
@@ -41,7 +41,7 @@ public class BuildID
 else
 {
 // check if a space exist, so we get all until space
-int nIdx = _sApp.indexOf(" ", 1);
+int nIdx = _sApp.indexOf(' ', 1);
 if (nIdx == -1)
 {
 sOfficePath = _sApp;
diff --git a/qadevOOo/runner/convwatch/DB.java 
b/qadevOOo/runner/convwatch/DB.java
index a743f8a..808c8ce 100644
--- a/qadevOOo/runner/convwatch/DB.java
+++ b/qadevOOo/runner/convwatch/DB.java
@@ -353,8 +353,8 @@ public class DB extends DBHelper
 {
 String sToken = aTokenizer.nextToken();
 int nIndex = sToken.indexOf("uuid()=");
-int nIndexTuettel = sToken.indexOf("'", nIndex);
-int nIndexTuettel2 = sToken.lastIndexOf("'");
+int nIndexTuettel = sToken.indexOf('\'', nIndex);
+int nIndexTuettel2 = sToken.lastIndexOf('\'');
 String sUuid = sToken.substring(nIndexTuettel + 1, 
nIndexTuettel2);
 return sUuid;
 }
diff --git a/qadevOOo/runner/convwatch/FileHelper.java 
b/qadevOOo/runner/convwatch/FileHelper.java
index 7668405..e9f97ef 100644
--- a/qadevOOo/runner/convwatch/FileHelper.java
+++ b/qadevOOo/runner/convwatch/FileHelper.java
@@ -86,7 +86,7 @@ public class FileHelper
 public static String getNameNoSuffix(String _sFilename)
 {
 if (_sFilename == null) return "";
-int nIdx = _sFilename.lastIndexOf(".");
+int nIdx = _sFilename.lastIndexOf('.');
 if (nIdx > 0)
 {
 return _sFilename.substring(0, nIdx);
@@ -97,7 +97,7 @@ public class FileHelper
 public static String getSuffix(String _sFilename)
 {
 if (_sFilename == null) return "";
-int nIdx = _sFilename.lastIndexOf(".");
+int nIdx = _sFilename.lastIndexOf('.');
 

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

[rbuj]

 qadevOOo/runner/convwatch/PRNCompare.java |4 ++--
 qadevOOo/runner/graphical/IniFile.java|2 +-
 qadevOOo/runner/graphical/JPEGComparator.java |6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit dcd5aa95f75b5bd110e88d41c2589067ba8c3882
Author: rbuj 
Date:   Wed Sep 10 00:10:54 2014 +0200

qadevOOo: Number Parsing

Change-Id: I284a1b2bcb61695b74ec51bb46cbb683abf83449
Reviewed-on: https://gerrit.libreoffice.org/11369
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/qadevOOo/runner/convwatch/PRNCompare.java 
b/qadevOOo/runner/convwatch/PRNCompare.java
index 551cffb..049c7e2 100644
--- a/qadevOOo/runner/convwatch/PRNCompare.java
+++ b/qadevOOo/runner/convwatch/PRNCompare.java
@@ -59,7 +59,7 @@ public class PRNCompare
 int nValue = 0;
 try
 {
-nValue = Integer.valueOf(sValue).intValue();
+nValue = Integer.parseInt(sValue);
 }
 catch(java.lang.NumberFormatException e)
 {
@@ -397,7 +397,7 @@ public class PRNCompare
 sBack = sBack.substring(0, nIdx);
 }
 
-nResult = Integer.valueOf(sBack).intValue();
+nResult = Integer.parseInt(sBack);
 }
 catch(java.lang.NumberFormatException e)
 {
diff --git a/qadevOOo/runner/graphical/IniFile.java 
b/qadevOOo/runner/graphical/IniFile.java
index 08cae29..8c3e6f3 100644
--- a/qadevOOo/runner/graphical/IniFile.java
+++ b/qadevOOo/runner/graphical/IniFile.java
@@ -336,7 +336,7 @@ public class IniFile implements Enumeration
 {
 try
 {
-nValue = Integer.valueOf(sValue).intValue();
+nValue = Integer.parseInt(sValue);
 }
 catch (java.lang.NumberFormatException e)
 {
diff --git a/qadevOOo/runner/graphical/JPEGComparator.java 
b/qadevOOo/runner/graphical/JPEGComparator.java
index a0d2891..67267c9 100644
--- a/qadevOOo/runner/graphical/JPEGComparator.java
+++ b/qadevOOo/runner/graphical/JPEGComparator.java
@@ -59,7 +59,7 @@ class NameDPIPage
 String sDPI = sNameNoSuffix.substring(nDPIStart + 1, 
sNameNoSuffix.length() - 8);
 try
 {
-nDPI = Integer.valueOf(sDPI).intValue();
+nDPI = Integer.parseInt(sDPI);
 }
 catch (java.lang.NumberFormatException e)
 {
@@ -68,7 +68,7 @@ class NameDPIPage
 String sPage = sNameNoSuffix.substring(sNameNoSuffix.length() 
- 4);
 try
 {
-nPage = Integer.valueOf(sPage).intValue();
+nPage = Integer.parseInt(sPage);
 }
 catch (java.lang.NumberFormatException e)
 {
@@ -641,7 +641,7 @@ public class JPEGComparator extends EnhancedComplexTestCase
 sBack = sBack.substring(0, nIdx);
 }
 
-nResult = Integer.valueOf(sBack).intValue();
+nResult = Integer.parseInt(sBack);
 }
 catch (java.lang.NumberFormatException e)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[rbuj]

 qadevOOo/runner/util/SOfficeFactory.java |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bd9cd1a37488f7cf9f8af64e07ab6f29728665f4
Author: rbuj 
Date:   Wed Sep 10 00:20:32 2014 +0200

qadevOOo: Convert a primitive type into a string

Change-Id: I1a840346e75a3d7dd0de761660a0ea95c7ee034b
Reviewed-on: https://gerrit.libreoffice.org/11370
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/qadevOOo/runner/util/SOfficeFactory.java 
b/qadevOOo/runner/util/SOfficeFactory.java
index 54f119b..f672733 100644
--- a/qadevOOo/runner/util/SOfficeFactory.java
+++ b/qadevOOo/runner/util/SOfficeFactory.java
@@ -64,11 +64,11 @@ public class SOfficeFactory {
 
 public static SOfficeFactory getFactory(XMultiServiceFactory xMSF) {
 
-SOfficeFactory soFactory = 
lookup.get(Integer.valueOf(xMSF.hashCode()).toString());
+SOfficeFactory soFactory = 
lookup.get(Integer.toString(xMSF.hashCode()));
 
 if (soFactory == null) {
 soFactory = new SOfficeFactory(xMSF);
-lookup.put(Integer.valueOf(xMSF.hashCode()).toString(), soFactory);
+lookup.put(Integer.toString(xMSF.hashCode()), soFactory);
 }
 
 return soFactory;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[rbuj]

 swext/mediawiki/src/com/sun/star/wiki/Helper.java  |2 +-
 swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4157780bedd048a27cc33302ab5ebca5a93afa70
Author: rbuj 
Date:   Wed Sep 10 00:29:04 2014 +0200

mediawiki: use a character literal

Change-Id: I1dadf4f905fcf06aee616cc0cfea3d77a145a3a1
Reviewed-on: https://gerrit.libreoffice.org/11371
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java 
b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
index 50f1ece..1eb4204 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java
@@ -341,7 +341,7 @@ public class Helper
 int nURL = sWebPage.indexOf( "URL=", nContent );
 if ( nURL > 0 )
 {
-int nEndURL = sWebPage.indexOf( "\"", nURL );
+int nEndURL = sWebPage.indexOf('"', nURL );
 if ( nEndURL > 0 )
 sResultURL = sWebPage.substring( nURL + 4, nEndURL );
 }
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java 
b/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
index d293cb2..6b87778 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiArticle.java
@@ -146,7 +146,7 @@ public class WikiArticle
 if ( iPosStart >= 0 && iPosEnd > 0 )
 {
 String sArticle = sWebPage.substring(iPosStart, iPosEnd);
-iPosStart = sArticle.indexOf(">") + 1;
+iPosStart = sArticle.indexOf('>') + 1;
 sWikiCode = sArticle.substring( iPosStart, 
sArticle.length() );
 }
 }
___
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' - include/oox oox/source sd/qa

[Matúš Kukan]

 include/oox/drawingml/shape.hxx  |1 
 oox/source/drawingml/fillproperties.cxx  |8 -
 oox/source/drawingml/table/tablecell.cxx |   36 +++---
 sd/qa/unit/data/pptx/bnc480256.pptx  |binary
 sd/qa/unit/import-tests.cxx  |   49 +++
 5 files changed, 88 insertions(+), 6 deletions(-)

New commits:
commit aa653d4e34e2b982caffe4cb9a5f2da3aaa52ed7
Author: Matúš Kukan 
Date:   Tue Sep 9 10:37:23 2014 +0200

bnc#480256: OOXML import: Respect table background properties a bit more

Only getBackgroundFillProperties() (fill) was used.
Use also getBackgroundFillStyleRef() (fillRef).
Also, do not replace table background color value with cell color,
we have to interpolate the two colors (if cell color is transparent).

Unfortunately, we don't use background table property in LibreOffice, so
this seems to be a best workaround.

(cherry picked from commit 43efd9b40d40b791a2c2deedcac36b99f7efb2cf)

And add unit test.
(cherry picked from commit 5681725f1a2535a13b86104d8b8a33f750f34efc)

Change-Id: I21bcc87a149c9f6d865ebee4012132ccc3a54af2
Reviewed-on: https://gerrit.libreoffice.org/11353
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index f8e1b7c..1f0411a 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -50,6 +50,7 @@ struct ShapeStyleRef
 {
 Color   maPhClr;
 sal_Int32   mnThemedIdx;
+ShapeStyleRef() : mnThemedIdx(0) {}
 };
 
 typedef ::std::map< sal_Int32, ShapeStyleRef > ShapeStyleRefMap;
diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 330054d..5fc0dd9 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -233,7 +233,13 @@ Color FillProperties::getBestSolidColor() const
 break;
 case XML_gradFill:
 if( !maGradientProps.maGradientStops.empty() )
-aSolidColor = maGradientProps.maGradientStops.begin()->second;
+{
+GradientFillProperties::GradientStopMap::const_iterator 
aGradientStop =
+maGradientProps.maGradientStops.begin();
+if (maGradientProps.maGradientStops.size() > 2)
+++aGradientStop;
+aSolidColor = aGradientStop->second;
+}
 break;
 case XML_pattFill:
 aSolidColor = maPatternProps.maPattBgColor.isUsed() ? 
maPatternProps.maPattBgColor : maPatternProps.maPattFgColor;
diff --git a/oox/source/drawingml/table/tablecell.cxx 
b/oox/source/drawingml/table/tablecell.cxx
index baa1556..2c1fa3c 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -21,8 +21,11 @@
 #include "oox/drawingml/table/tableproperties.hxx"
 #include "oox/drawingml/shapepropertymap.hxx"
 #include "oox/drawingml/textbody.hxx"
+#include "oox/drawingml/theme.hxx"
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/helper/propertyset.hxx"
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -99,7 +102,7 @@ void applyTableStylePart( oox::drawingml::FillProperties& 
rFillProperties,
   oox::drawingml::LineProperties& 
rBottomLeftToTopRightBorder,
   TableStylePart& rTableStylePart )
 {
-boost::shared_ptr< ::oox::drawingml::FillProperties >& 
rPartFillPropertiesPtr( rTableStylePart.getFillProperties() );
+::oox::drawingml::FillPropertiesPtr& rPartFillPropertiesPtr( 
rTableStylePart.getFillProperties() );
 if ( rPartFillPropertiesPtr.get() )
 rFillProperties.assignUsed( *rPartFillPropertiesPtr );
 
@@ -168,10 +171,6 @@ void TableCell::pushToXCell( const 
::oox::core::XmlFilterBase& rFilterBase, ::oo
 oox::drawingml::LineProperties aLinePropertiesTopLeftToBottomRight;
 oox::drawingml::LineProperties aLinePropertiesBottomLeftToTopRight;
 
-boost::shared_ptr< ::oox::drawingml::FillProperties >& 
rBackgroundFillPropertiesPtr( rTable.getBackgroundFillProperties() );
-if ( rBackgroundFillPropertiesPtr.get() )
-aFillProperties.assignUsed( *rBackgroundFillPropertiesPtr );
-
 applyTableStylePart( aFillProperties, aTextStyleProps,
 aLinePropertiesLeft,
 aLinePropertiesRight,
@@ -352,6 +351,33 @@ void TableCell::pushToXCell( const 
::oox::core::XmlFilterBase& rFilterBase, ::oo
 
 aFillProperties.assignUsed( maFillProperties );
 ShapePropertyMap aPropMap( rFilterBase.getModelObjectHelper() );
+
+Color aBgColor;
+sal_Int32 nPhClr = API_RGB_TRANSPARENT;
+boost::shared_ptr< ::oox::drawingml::FillProperties >& 
rBackgroundFillPropertiesPtr( rTable.getBackgroundFillProperties() );
+::oox::drawingml::ShapeStyleRef& rBackgroundFillStyle( 
rTable.getBackgroundFillStyleRef() );
+if (rBackgroundFillPro

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

[bugzilla-daemon]

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

--- Comment #23 from d.sikele...@gmail.com ---
In Impress the function is already implemented. When you select text with
different sizes and then press the button all the text get the same size
(smallest of the selected text) in the first step. Afterwards you can increase
or decrease the size. Is this the way it should be done in Writer as well? An
other way to handle this, would be to increase or decrease every part with the
same size independent from the other parts.
When should the button be disabled? When any part of the selected text already
has the smallest/biggest size? Or when all the text has the smallest/biggest
size?

-- 
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: Performance samples for LibreOffice ...

[Michael Stahl]

On 10/09/14 07:45, Jan Hubicka wrote:

> Yep, I am curious too.  I just got my trees updated after vacation so 
> hopefully
> I will get there soon (for sure libreoffice will trigger few GCC bugs first)

yes we do have a certain reputation for that...thanks to Miklos now you
can even get the t-shirt for it:

http://vmiklos.hu/blog/so-many-bugs.html

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

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

[bugzilla-daemon]

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

--- Comment #24 from jim  ---
As the function is to "Decrease" or "Increase" font size it should do 
what it says - that implies it must NOT change all characters to the 
same size!
I gather then that "Impress" could annoy me a LOT?

The button could be disabled if a multi sized string is selected because 
it is likely to be a little used feature but if it exists it could be a 
useful feature for some.
The button should be disabled if one of the character sizes couldn't be 
increased or decreased further - ie if pressing it would not provide the 
expected function.

Thinking further it could be handy for changing font size if I had a 
whole paragraph with a bold/large header line - great now that's 
embedded in my expectaion when I hadn't considered it before.

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

I am new employee, with VS problem

[Juergen Funk]

Hi all,

My name is Juergen Funk I am 48 years old and have 15 years 
experience in C/C++ (VS). 
I'm for a month in the company of CIB, my new job is 
to support them (writer).

First of all, my English is very bad, but I'm trying 
do my best, so the same excuse if I do not always hit 
the right tone. 
Hope you can understand me.



Now my problem at the moment is to try do build the VS solution but 
I get follow

juergen@heiznix /cygdrive/d/src/lo/lo-core
$ make vs2012-ide-integration
cd D:/src/lo/lo-core && (LC_MESSAGES=C D:/Dev/cygwin/opt/lo/bin/make 
cmd="D:/Dev/cygwin/opt/lo/bin/make -npf Makefile.gbuild all" cmd || true) | 
D:/src/lo/lo-  core/bin/gbuild-to-ide --ide vs2012
make[1]: ***.  Stop.
Solution LibreOffice:
or
juergen@heiznix /cygdrive/d/src/lo/lo-core
$ LC_MESSAGES=C D:/Dev/cygwin/opt/lo/bin/make 
cmd="D:/Dev/cygwin/opt/lo/bin/make -npf Makefile.gbuild all" cmd | 
D:/src/lo/lo-core/bin/gbuild-to-ide --ide vs2012
Solution LibreOffice:

I have make the build in the "core" and build all of them, the last 
command look like okay, but the solution in the "lo-core" directory 
has the follow entry

Microsoft Visual Studio Solution File, Format Version 12.00
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Unit Tests|Win32 = Unit Tests|Win32
Integration tests|Win32 = Integration tests|Win32
Build|Win32 = Build|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
EndGlobalSection
EndGlobal

and in "bean" directory is not a solution, I have found the Bug 70414 
and the last comment say fixed, what is wrong in my case?


Thanks for your help,
Juergen


PS.: I build the whole stuff with the "Windows Build Dependencies-docu" 
 but my mainly problem was the make file. I have installed in 
 /opt/lo/bin but always used automatically the make file in /usr/bin.
 I'm a beginners with Linux and then needed help to find out the 
 problem, after that it work very well. 
 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tomas Hlavaty]

 desktop/source/app/cmdlinehelp.cxx |7 +--
 desktop/source/app/dispatchwatcher.cxx |   31 ---
 2 files changed, 33 insertions(+), 5 deletions(-)

New commits:
commit 4b8a0159ca80dad05ddcaad5897b786484fc8afb
Author: Tomas Hlavaty 
Date:   Tue Jun 3 12:42:47 2014 +0200

fdo#36313: allow passing FilterOptions via cli

Examples:
  --infilter="Text (encoded):UTF8,LF,,,"
  --convert-to "html:XHTML Writer File:UTF8"
  --convert-to "txt:Text (encoded):UTF8"

Change-Id: I69a0524ef63f6d486637d68280331528d1001b56
(cherry picked from commit 45ba4d79d968f81f74ef0c4588fd15b1ce91153f)
Signed-off-by: Stephan Bergmann 

diff --git a/desktop/source/app/cmdlinehelp.cxx 
b/desktop/source/app/cmdlinehelp.cxx
index 756dcab..a956038 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -109,14 +109,17 @@ namespace desktop
 "--unaccept=\n"\
 "  Close an acceptor that was created with 
--accept=\n"\
 "  Use --unnaccept=all to close all open acceptors\n"\
-"--infilter=\n"\
+"--infilter=[:filter_options]\n"\
 "  Force an input filter type if possible\n"\
 "  Eg. --infilter=\"Calc Office Open XML\"\n"\
-"--convert-to output_file_extension[:output_filter_name] [--outdir 
output_dir] files\n"\
+"  --infilter=\"Text (encoded):UTF8,LF,,,\"\n"\
+"--convert-to 
output_file_extension[:output_filter_name[:output_filter_options]] [--outdir 
output_dir] files\n"\
 "  Batch convert files.\n"\
 "  If --outdir is not specified then current working dir is used 
as output_dir.\n"\
 "  Eg. --convert-to pdf *.doc\n"\
 "  --convert-to pdf:writer_pdf_Export --outdir /home/user 
*.doc\n"\
+"  --convert-to \"html:XHTML Writer File:UTF8\" *.doc\n"\
+"  --convert-to \"txt:Text (encoded):UTF8\" *.doc\n"\
 "--print-to-file [-printer-name printer_name] [--outdir output_dir] 
files\n"\
 "  Batch print files to file.\n"\
 "  If --outdir is not specified then current working dir is used 
as output_dir.\n"\
diff --git a/desktop/source/app/dispatchwatcher.cxx 
b/desktop/source/app/dispatchwatcher.cxx
index abdbe38..77e5857 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -375,7 +375,21 @@ bool DispatchWatcher::executeDispatchRequests( const 
DispatchList& aDispatchRequ
 sal_Int32 nIndex = aArgs.getLength();
 aArgs.realloc(nIndex+1);
 aArgs[nIndex].Name = "FilterName";
-aArgs[nIndex].Value <<= aForcedInputFilter;
+
+sal_Int32 nFilterOptionsIndex = aForcedInputFilter.indexOf( 
':' );
+if( 0 < nFilterOptionsIndex )
+{
+aArgs[nIndex].Value <<= aForcedInputFilter.copy( 0, 
nFilterOptionsIndex );
+
+nIndex = aArgs.getLength();
+aArgs.realloc(nIndex+1);
+aArgs[nIndex].Name = "FilterOptions";
+aArgs[nIndex].Value <<= aForcedInputFilter.copy( 
nFilterOptionsIndex+1 );
+}
+else
+{
+aArgs[nIndex].Value <<= aForcedInputFilter;
+}
 }
 
 // This is a synchron loading of a component so we don't have to 
deal with our statusChanged listener mechanism.
@@ -449,12 +463,23 @@ bool DispatchWatcher::executeDispatchRequests( const 
DispatchList& aDispatchRequ
 aFilter = impl_GuessFilter( aName, aOutFile );
 }
 
-Sequence conversionProperties( 2 );
+sal_Int32 nFilterOptionsIndex = aFilter.indexOf( 
':' );
+Sequence conversionProperties( 0 < 
nFilterOptionsIndex ? 3 : 2 );
 conversionProperties[0].Name = "Overwrite";
 conversionProperties[0].Value <<= sal_True;
 
 conversionProperties[1].Name = "FilterName";
-conversionProperties[1].Value <<= aFilter;
+if( 0 < nFilterOptionsIndex )
+{
+conversionProperties[1].Value <<= 
aFilter.copy( 0, nFilterOptionsIndex );
+
+conversionProperties[2].Name = "FilterOptions";
+conversionProperties[2].Value <<= 
aFilter.copy( nFilterOptionsIndex+1 );
+}
+else
+{
+conversionProperties[1].Value <<= aFilter;
+}
 
 OUString aTempName;
 FileBase::getSystemPathFromFileU

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

[Chris Sherlock]

 vcl/inc/unx/gtk/gtkgdi.hxx   |1 +
 vcl/source/gdi/bitmapex.cxx  |3 ++-
 vcl/source/window/brdwin.cxx |   21 -
 vcl/source/window/window.cxx |3 ---
 vcl/source/window/winproc.cxx|   11 ++-
 vcl/unx/gtk/app/gtkinst.cxx  |6 +++---
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |9 +
 vcl/unx/gtk/window/gtksalframe.cxx   |5 ++---
 8 files changed, 19 insertions(+), 40 deletions(-)

New commits:
commit 8e174eab91acec0f1578af4dac23be76dce700af
Author: Chris Sherlock 
Date:   Wed Sep 10 20:13:13 2014 +1000

vcl: BitmapEx now states which icon theme is being used for missing image

Change-Id: I83b9c86685f72569c0df88231458183b1ae511c8

diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 7673f0b..b2d0dde 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -104,7 +104,8 @@ BitmapEx::BitmapEx( const ResId& rResId ) :
 #ifdef DBG_UTIL
 OStringBuffer aErrorStr(
 "BitmapEx::BitmapEx( const ResId& rResId ): could not load image 
<");
-aErrorStr.append(OUStringToOString(aFileName, 
RTL_TEXTENCODING_ASCII_US)).append('>');
+aErrorStr.append(OUStringToOString(aFileName, 
RTL_TEXTENCODING_ASCII_US)).append("> via icon theme ");
+aErrorStr.append(OUStringToOString(aIconTheme, 
RTL_TEXTENCODING_ASCII_US)).append('.');
 OSL_FAIL(aErrorStr.getStr());
 #endif
 }
commit b01bbc3516b63d2772e53fef4dc016788c779612
Author: Chris Sherlock 
Date:   Tue Sep 9 18:46:45 2014 +1000

vcl: no such thing as GtkSalInstance, remove commented code

Change-Id: I6627363aea34570b5f7d118b1d64b6a2d93c19cb

diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 042d541..1ca67f1 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -108,10 +108,10 @@ extern "C"
 gdk_threads_init();
 
 GtkInstance* pInstance = new GtkInstance( pYieldMutex );
-SAL_INFO("vcl.gtk", "creating GtkSalInstance " << pInstance);
+SAL_INFO("vcl.gtk", "creating GtkInstance " << pInstance);
 
-//Create SalData, this does not leak
-/*GtkData *pSalData =*/ new GtkData( pInstance );
+// Create SalData, this does not leak
+new GtkData( pInstance );
 
 return pInstance;
 }
commit 99f58dc2a6d9d2976948b2fe01b1ed1ae63d685e
Author: Chris Sherlock 
Date:   Tue Sep 9 18:32:41 2014 +1000

vcl: remove dead code and useless task comments from winproc.cxx

Change-Id: I10e4a0aa23fe83fa0f2edd671b321fa4588c880f

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index c4dac53..197a173 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -101,11 +101,7 @@ static bool ImplHandleMouseFloatMode( Window* pChild, 
const Point& rMousePos,
 pLastLevelFloat = 
pSVData->maWinData.mpFirstFloat->ImplFindLastLevelFloat();
 nPopupFlags = pLastLevelFloat->GetPopupModeFlags();
 pLastLevelFloat->EndPopupMode( 
FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL );
-// Erstmal ausgebaut als Hack fuer Bug 53378
-//if ( nPopupFlags & 
FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK )
-//return false;
-//else
-return true;
+return true;
 }
 else if ( nHitTest == HITTEST_RECT )
 {
@@ -550,7 +546,6 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 
nSVEvent, bool bMouseLeav
 if ( !ImplCallPreNotify( aNLeaveEvt ) )
 {
 pMouseMoveWin->MouseMove( aMLeaveEvt );
-// #82968#
 if( !aDelData.IsDead() )
 
aNLeaveEvt.GetWindow()->ImplNotifyKeyMouseCommandEventListeners( aNLeaveEvt );
 }
@@ -747,7 +742,6 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 
nSVEvent, bool bMouseLeav
 }
 }
 
-// #82968#
 if ( !aDelData.IsDead() )
 aNEvt.GetWindow()->ImplNotifyKeyMouseCommandEventListeners( aNEvt 
);
 }
@@ -1038,7 +1032,6 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 
nSVEvent,
 pChild->ImplGetWindowImpl()->mbKeyUp = false;
 pChild->KeyUp( aKeyEvt );
 }
-// #82968#
 if( !aDelData.IsDead() )
 aNotifyEvt.GetWindow()->ImplNotifyKeyMouseCommandEventListeners( 
aNotifyEvt );
 }
@@ -1152,7 +1145,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 
nSVEvent,
 pChild->ImplGetWindowImpl()->mbKeyUp = false;
 pChild->KeyUp( aKEvt );
 }
-// #82968#
+
 if( !aChildDelData.IsDead() )
 aNEvt.GetWin

Re: [libreoffice] allow passing FilterOptions via cli

[Stephan Bergmann]

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, 



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

Re: I am new employee, with VS problem

[Bjoern Michaelsen]

Hi,

welcome onboard Juergen!

On Wed, Sep 10, 2014 at 10:16:02AM +, Juergen Funk wrote:
> Now my problem at the moment is to try do build the VS solution but 
> I get follow

Hmmm, I dont know much about how MSVS solution files should look like.
But as a starting point I can hint you at the VisualStudioIntegrationGenerator
class in bin/gbuild-to-ide:

 
https://gerrit.libreoffice.org/gitweb?p=core.git;a=blob;f=bin/gbuild-to-ide;h=2e8bc3076dddbd6ff5ab5cb8bdd6cc358446b631;hb=8e174eab91acec0f1578af4dac23be76dce700af#l617

which is generating these. If you know how the solution should look in this
case, maybe you might find out what is wrong there.

Best,

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

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

[Jan-Marek Glogowski]

 sw/inc/doc.hxx  |4 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |4 
 sw/source/core/doc/docnew.cxx   |  162 
 sw/source/core/frmedt/fecopy.cxx|4 
 sw/source/uibase/dbui/dbmgr.cxx |  114 ++-
 5 files changed, 158 insertions(+), 130 deletions(-)

New commits:
commit c808802e94eba48dc23d7fca133ed35c17feb163
Author: Jan-Marek Glogowski 
Date:   Sat Jun 28 01:41:17 2014 +0200

MM: introduce SwDoc::Append helper function

This drops all the specialized, workaround code from MM, introduced
to use the SwFEShell::Paste function and additionally merges
and renames SwDoc::Paste into SwDoc::Append.

There is still a little common codepath, therefore this adds
comments to always update both functions.

Change-Id: I704b3ef3257dd977dac95e16e25049ff8ade97ed
Reviewed-on: https://gerrit.libreoffice.org/10967
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index a1d6236..f914326 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -460,7 +460,6 @@ private:
 OUString msDocAccTitle;
 
 void InitTOXTypes();
-void Paste( const SwDoc& );
 
 public:
 enum DocumentType {
@@ -1646,7 +1645,10 @@ public:
 ::sw::MetaFieldManager & GetMetaFieldManager();
 ::sw::UndoManager  & GetUndoManager();
 ::sw::UndoManager const& GetUndoManager() const;
+
 SfxObjectShell* CreateCopy(bool bCallInitNew) const;
+void Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber,
+ SwPageDesc* pTargetPageDesc, bool bDeletePrevious = false );
 
 /**
  * Dumps the entire nodes structure to the given destination (file 
nodes.xml in the current directory by default)
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 4bbe194..f60fc5e 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3138,8 +3138,10 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
 !rRg.aStart.GetNode().IsSectionNode() &&
 !aTmpI.GetNode().IsEndNode() )
 {
+// If the range starts with a SwStartNode, it isn't copied
+sal_uInt16 offset = (rRg.aStart.GetNode().GetNodeType() != 
ND_STARTNODE) ? 1 : 0;
 OSL_ENSURE( rInsPos.GetIndex() - aSavePos.GetIndex() ==
-rRg.aEnd.GetIndex() - rRg.aStart.GetIndex(),
+rRg.aEnd.GetIndex() - rRg.aStart.GetIndex() - 1 + offset,
 "An insufficient number of nodes were copied!" );
 }
 }
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 1a7e76e..ea9b136 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -106,6 +106,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -900,7 +901,8 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
 SfxObjectShell* pRetShell = new SwDocShell( pRet, SFX_CREATE_MODE_STANDARD 
);
 if( bCallInitNew )
 {
-// it could happen that DoInitNew creates model, that increases the 
refcount of the object
+// it could happen that DoInitNew creates model,
+// that increases the refcount of the object
 pRetShell->DoInitNew();
 }
 
@@ -912,14 +914,7 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
 
 pRet->ReplaceStyles(*this);
 
-// copy content
-pRet->Paste( *this );
-
-if ( bCallInitNew ) {
-// delete leading page / initial content from target document
-SwNodeIndex aDeleteIdx( pRet->GetNodes().GetEndOfExtras(), 2 );
-pRet->GetNodes().Delete( aDeleteIdx, 1 );
-}
+pRet->Append(*this, 0, NULL, bCallInitNew);
 
 // remove the temporary shell if it is there as it was done before
 pRet->SetTmpDocShell( (SfxObjectShell*)NULL );
@@ -929,29 +924,64 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) 
const
 return pRetShell;
 }
 
-// copy document content - code from SwFEShell::Paste( SwDoc* )
-void SwDoc::Paste( const SwDoc& rSource )
+// appends all pages of source SwDoc - based on SwFEShell::Paste( SwDoc* )
+void SwDoc::Append( const SwDoc& rSource, sal_uInt16 nStartPageNumber,
+SwPageDesc* pTargetPageDesc, bool bDeletePrevious )
 {
 // GetEndOfExtras + 1 = StartOfContent == no content node!
 // this ensures, that we have at least two nodes in the SwPaM.
 // @see IDocumentContentOperations::CopyRange
 SwNodeIndex aSourceIdx( rSource.GetNodes().GetEndOfExtras(), 1 );
+SwNodeIndex aSourceEndIdx( rSource.GetNodes().GetEndOfContent(), -1 );
 SwPaM aCpyPam( aSourceIdx );
 
+if ( aSourceEndIdx.GetNode().IsTxtNode() ) {
+aCpyPam.SetMark();
+// move

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

[Jan-Marek Glogowski]

 sw/source/core/doc/docnew.cxx |   82 +-
 1 file changed, 81 insertions(+), 1 deletion(-)

New commits:
commit 3b9361a930d62430044ea0b746f4b5751dbb8d88
Author: Jan-Marek Glogowski 
Date:   Tue Jul 1 15:48:01 2014 +0200

Add debug messages for sw.{createcopy,docappend}

This adds a lot of SAL_INFO messages to SwDoc::CreateCopy and
SwDoc::Append.

Change-Id: Ie924e20698bec84482fcc5496175a9e29245729e
Reviewed-on: https://gerrit.libreoffice.org/10969
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index ea9b136..fc7288b 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -891,6 +891,13 @@ void SwDoc::ReplaceCompatabilityOptions(const SwDoc& 
rSource)
 
m_pDocumentSettingManager->ReplaceCompatibilityOptions(rSource.GetDocumentSettingManager());
 }
 
+#ifdef DBG_UTIL
+#define CNTNT_DOC( doc ) \
+((doc)->GetNodes().GetEndOfContent().GetIndex() - 
(doc)->GetNodes().GetEndOfExtras().GetIndex() - 2)
+#define CNTNT_IDX( idx ) \
+((idx).GetNode().GetIndex() - GetNodes().GetEndOfExtras().GetIndex() - 1)
+#endif
+
 SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
 {
 SwDoc* pRet = new SwDoc;
@@ -914,7 +921,14 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
 
 pRet->ReplaceStyles(*this);
 
+#ifdef DBG_UTIL
+SAL_INFO( "sw.createcopy", "CC-Nd-Src: " << CNTNT_DOC( this ) );
+SAL_INFO( "sw.createcopy", "CC-Nd: " << CNTNT_DOC( pRet ) );
+#endif
 pRet->Append(*this, 0, NULL, bCallInitNew);
+#ifdef DBG_UTIL
+SAL_INFO( "sw.createcopy", "CC-Nd: " << CNTNT_DOC( pRet ) );
+#endif
 
 // remove the temporary shell if it is there as it was done before
 pRet->SetTmpDocShell( (SfxObjectShell*)NULL );
@@ -944,9 +958,35 @@ void SwDoc::Append( const SwDoc& rSource, sal_uInt16 
nStartPageNumber,
 else
 aCpyPam = SwPaM( aSourceIdx, aSourceEndIdx );
 
+#ifdef DBG_UTIL
+SAL_INFO( "sw.docappend", "NodeType 0x" << std::hex << (int) 
aSourceIdx.GetNode().GetNodeType()
+  << std::dec << " " << 
aSourceIdx.GetNode().GetIndex() );
+aSourceIdx++;
+SAL_INFO( "sw.docappend", "NodeType 0x" << std::hex << (int) 
aSourceIdx.GetNode().GetNodeType()
+<< std::dec << " " << 
aSourceIdx.GetNode().GetIndex() );
+if ( aSourceIdx.GetNode().GetNodeType() != ND_ENDNODE ) {
+aSourceIdx++;
+SAL_INFO( "sw.docappend", "NodeType 0x" << std::hex << (int) 
aSourceIdx.GetNode().GetNodeType() << std::dec );
+aSourceIdx--;
+}
+aSourceIdx--;
+SAL_INFO( "sw.docappend", ".." );
+SAL_INFO( "sw.docappend", "NodeType 0x" << std::hex << (int) 
aSourceEndIdx.GetNode().GetNodeType()
+  << std::dec << " " << 
aSourceEndIdx.GetNode().GetIndex() );
+aSourceEndIdx++;
+SAL_INFO( "sw.docappend", "NodeType 0x" << std::hex << (int) 
aSourceEndIdx.GetNode().GetNodeType()
+  << std::dec << " " << 
aSourceEndIdx.GetNode().GetIndex() );
+aSourceEndIdx--;
+SAL_INFO( "sw.docappend", "Src-Nd: " << CNTNT_DOC( &rSource ) );
+SAL_INFO( "sw.docappend", "Nd: " << CNTNT_DOC( this ) );
+#endif
+
 SwWrtShell* pTargetShell = GetDocShell()->GetWrtShell();
 sal_uInt16 nPhysPageNumber = 0;
 if ( pTargetShell ) {
+#ifdef DBG_UTIL
+SAL_INFO( "sw.docappend", "Has target write shell" );
+#endif
 pTargetShell->StartAllAction();
 
 // Otherwise we have to handle SwDummySectionNodes as first node
@@ -963,7 +1003,13 @@ void SwDoc::Append( const SwDoc& rSource, sal_uInt16 
nStartPageNumber,
 // We always start on an odd physical page number
 if (1 == nPhysPageNumber % 2)
 nPhysPageNumber++;
+#ifdef DBG_UTIL
+SAL_INFO( "sw.docappend", "PPNo " << nPhysPageNumber );
+#endif
 }
+#ifdef DBG_UTIL
+SAL_INFO( "sw.docappend", "Nd: " << CNTNT_DOC( this ) );
+#endif
 
 // -1, otherwise aFixupIdx would move to new EOC
 SwNodeIndex aFixupIdx( GetNodes().GetEndOfContent(), -1 );
@@ -972,6 +1018,13 @@ void SwDoc::Append( const SwDoc& rSource, sal_uInt16 
nStartPageNumber,
 SwNodeIndex aTargetIdx( GetNodes().GetEndOfContent() );
 SwPaM aInsertPam( aTargetIdx );
 
+#ifdef DBG_UTIL
+SAL_INFO( "sw.docappend", "Pam-Nd: " << aCpyPam.GetNode( true ).GetIndex() 
- aCpyPam.GetNode( false ).GetIndex() + 1
+  << " (0x" << std::hex << (int) aCpyPam.GetNode( 
false ).GetNodeType() << std::dec
+  << " " << aCpyPam.GetNode( false ).GetIndex()
+  << " - 0x" << std::hex << (int) aCpyPam.GetNode( 
true ).GetNodeType() << std::dec
+  << " " << aCpyPam.GetNode( true ).GetIndex() << 
")" );
+#endif
 
 this->GetIDocumentUndoRedo().StartUndo( UNDO_INSGLOSSARY, NULL );
 th

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

[Jan-Marek Glogowski]

 sw/source/uibase/dbui/dbmgr.cxx |   69 
 1 file changed, 42 insertions(+), 27 deletions(-)

New commits:
commit 74458301569bc9c0e7619e68be85e716d7b6f9f7
Author: Jan-Marek Glogowski 
Date:   Tue Jul 1 21:31:35 2014 +0200

Add debug documents to SwDBManager::MergeMailFiles

Just like the debug documents in SwDBManager::MergeDocuments.

Change-Id: I275575853c80d4e19d6df5ba9d8dc689353d7c85
Reviewed-on: https://gerrit.libreoffice.org/10970
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 7b013a7..895ffc3 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -809,6 +809,33 @@ static void lcl_RemoveSectionLinks( SwWrtShell& rWorkShell 
)
 rWorkShell.SetLabelDoc( false );
 }
 
+#ifdef DBG_UTIL
+
+#define MAX_DOC_DUMP 3
+
+static void lcl_SaveDoc( SfxObjectShell *xTargetDocShell,
+ const char *name, int no = 0 )
+{
+boost::scoped_ptr< utl::TempFile > aTempFile;
+OUString sExt( ".odt" );
+OUString basename = OUString::createFromAscii( name );
+if (no > 0 )
+basename += OUString::number(no) + "-";
+aTempFile.reset( new utl::TempFile( basename, true, &sExt ) );
+OSL_ENSURE( aTempFile.get(), "Temporary file not available" );
+INetURLObject aTempFileURL( aTempFile->GetURL() );
+SfxMedium* pDstMed = new SfxMedium(
+aTempFileURL.GetMainURL( INetURLObject::NO_DECODE ),
+STREAM_STD_READWRITE );
+xTargetDocShell->DoSaveAs( *pDstMed );
+xTargetDocShell->DoSaveCompleted( pDstMed );
+if( xTargetDocShell->GetError() )
+SAL_WARN( "sw.mailmerge", "Error saving: " << aTempFile->GetURL() );
+else
+SAL_INFO( "sw.mailmerge", "Saved doc as: " << aTempFile->GetURL() );
+}
+#endif
+
 bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 const SwMergeDescriptor& rMergeDescriptor)
 {
@@ -902,6 +929,9 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 // create a target docshell to put the merged document into
 xTargetDocShell = new SwDocShell( SFX_CREATE_MODE_STANDARD );
 xTargetDocShell->DoInitNew( 0 );
+#ifdef DBG_UTIL
+lcl_SaveDoc( xTargetDocShell, "MergeDoc" );
+#endif
 SfxViewFrame* pTargetFrame = SfxViewFrame::LoadHiddenDocument( 
*xTargetDocShell, 0 );
 
 pTargetView = static_cast( 
pTargetFrame->GetViewShell() );
@@ -1012,6 +1042,10 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* 
pSourceShell,
 // The SfxObjectShell will be closed explicitly later 
but it is more safe to use SfxObjectShellLock here
 // copy the source document
 SfxObjectShellLock xWorkDocSh = 
pSourceDocSh->GetDoc()->CreateCopy( true );
+#ifdef DBG_UTIL
+if ( nDocNo <= MAX_DOC_DUMP )
+lcl_SaveDoc( xWorkDocSh, "WorkDoc", nDocNo );
+#endif
 
 {
 //create a view frame for the document
@@ -1072,10 +1106,18 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* 
pSourceShell,
 else
 pTargetPageDesc = 
pTargetShell->FindPageDescByName( sModifiedStartingPageDesc );
 
+#ifdef DBG_UTIL
+if ( nDocNo <= MAX_DOC_DUMP )
+lcl_SaveDoc( xWorkDocSh, "WorkDoc", nDocNo 
);
+#endif
 pTargetDoc->Append( *(rWorkShell.GetDoc()), 
nStartingPageNo, pTargetPageDesc, nDocNo == 1 );
 
 // #i72820# calculate layout to be able to 
find the correct page index
 pTargetShell->CalcLayout();
+#ifdef DBG_UTIL
+if ( nDocNo <= MAX_DOC_DUMP )
+lcl_SaveDoc( xTargetDocShell, "MergeDoc" );
+#endif
 }
 else
 {
@@ -2628,33 +2670,6 @@ uno::Reference 
SwDBManager::createCursor(const OUString& _sDataSourc
 return xResultSet;
 }
 
-#ifdef DBG_UTIL
-
-#define MAX_DOC_DUMP 3
-
-static void lcl_SaveDoc( SfxObjectShell *xTargetDocShell,
- const char *name, int no = 0 )
-{
-boost::scoped_ptr< utl::TempFile > aTempFile;
-OUString sExt( ".odt" );
-OUString basename = OUString::createFromAscii( name );
-if (no > 0 )
-basename += OUString::number(no) + "-";
-aTempFile.reset( new utl::TempFile( basename, true, &sExt ) );
-OSL_ENSURE( aTempFile.get(), "Temporary file not available" );
-INetURLObject aTempFileURL( aTempFile->GetURL() );
-SfxMedium* pDstMed = new SfxMedium(
-aTempFileURL.GetMainURL( INetURLObject::NO_DECODE ),
-STREAM_STD_READWRITE );
-xTargetDo

AW: I am new employee, with VS problem

[Juergen Funk]

Hi Bjoern,

thanks for the fast answer.

But my problem is that is python and I have no plan in this language.

I'm not sure where is the fault is that make (have no plan too) or 
is that the python script.

I have see the gerrit script has one different to my script 
I use this but the result is the same. 

The question is, is that only in my configuration or has other the same
problem.


Thanks,
 
Juergen


> On Wed, Sep 10, 2014 at 12:45:00, Bjoern Michaelsen wrote:
> 
> Hi,
> 
> welcome onboard Juergen!
> 
> On Wed, Sep 10, 2014 at 10:16:02AM +, Juergen Funk wrote:
> > Now my problem at the moment is to try do build the VS solution but I
> > get follow
> 
> Hmmm, I dont know much about how MSVS solution files should look like.
> But as a starting point I can hint you at the
> VisualStudioIntegrationGenerator class in bin/gbuild-to-ide:
> 
>  https://gerrit.libreoffice.org/gitweb?p=core.git;a=blob;f=bin/gbuild-
> to-
> ide;h=2e8bc3076dddbd6ff5ab5cb8bdd6cc358446b631;hb=8e174eab91acec0f1578a
> f4dac23be76dce700af#l617
> 
> which is generating these. If you know how the solution should look in
> this case, maybe you might find out what is wrong there.
> 
> Best,
> 
> Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Giuseppe Bilotta]

 vcl/unx/generic/app/saldisp.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit a2d4bd6864e108a11d6ca2b69de5ebce265102dc
Author: Giuseppe Bilotta 
Date:   Tue Sep 9 21:31:20 2014 +0200

Refactor DPI settings validity check

Move the validity check for the DPI (>= 50 and <= 500) into its own
(static) function, since we're going to use it repeatedly in the
fallback DPI detection code.

Change-Id: Id5d9b10be385d45549bbb57cfa14939cd51a0324
Reviewed-on: https://gerrit.libreoffice.org/11376
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 5de927c..7c97a24 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -120,6 +120,12 @@ static int sal_significantBits( Pixel nMask )
 return nBits;
 }
 
+// check if the resolution is sane
+static bool sal_ValidDPI(long nDPI)
+{
+return (nDPI >= 50) && (nDPI <= 500);
+}
+
 static bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI )
 {
 int nInfos;
@@ -555,7 +561,7 @@ void SalDisplay::Init()
 const OString aValStr( pValStr );
 const long nDPI = (long) aValStr.toDouble();
 // guard against insane resolution
-if( (nDPI >= 50) && (nDPI <= 500) )
+if( sal_ValidDPI(nDPI) )
 {
 aResolution_ = Pair( nDPI, nDPI );
 bExactResolution = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: I am new employee, with VS problem

[Bjoern Michaelsen]

On Wed, Sep 10, 2014 at 11:11:13AM +, Juergen Funk wrote:
> I'm not sure where is the fault is that make (have no plan too) or 
> is that the python script.

Does a running "make" alone lead to a successful build? Can you run the product
after the build?

Note the MSVS integration needs one complete build from the commandline before
it does its magic IIRC.

Best,

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

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

[Giuseppe Bilotta]

 vcl/unx/generic/app/saldisp.cxx |   20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 1964870db4ad1e4334e8fc5050795469dc1fb05e
Author: Giuseppe Bilotta 
Date:   Tue Sep 9 21:34:45 2014 +0200

Fallback DPI detection on X11

When the Xft.dpi setting is not found, and if only one screen is
available, fall back to detecting the screen DPI from the reported
resolution and monitor size.

Change-Id: I1481d94b5dc4072c1f8da4659a221dfc7971080b
Reviewed-on: https://gerrit.libreoffice.org/11377
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 7c97a24..ee6aad7 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -569,7 +569,25 @@ void SalDisplay::Init()
 }
 if( bExactResolution == false )
 {
-aResolution_ = Pair( 96, 96 );
+/*  if Xft.dpi is not set, try and find the DPI from the
+ *  reported screen sizes and resolution. If there are multiple
+ *  screens, just fall back to the default 96x96
+ */
+long xDPI = 96;
+long yDPI = 96;
+if (m_aScreens.size() == 1) {
+xDPI = (long)round(DisplayWidth(pDisp_, 
0)*25.4/DisplayWidthMM(pDisp_, 0));
+yDPI = (long)round(DisplayHeight(pDisp_, 
0)*25.4/DisplayHeightMM(pDisp_, 0));
+// if either is invalid set it equal to the other
+if (!sal_ValidDPI(xDPI) && sal_ValidDPI(yDPI))
+xDPI = yDPI;
+if (!sal_ValidDPI(yDPI) && sal_ValidDPI(xDPI))
+yDPI = xDPI;
+// if both are invalid, reset them to the default
+if (!sal_ValidDPI(xDPI) && !sal_ValidDPI(yDPI))
+xDPI = yDPI = 96;
+}
+aResolution_ = Pair( xDPI, yDPI );
 }
 
 nMaxRequestSize_= XExtendedMaxRequestSize( pDisp_ ) * 4;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] mso-dumper.git: msodumper/msodraw.py

[Miklos Vajna]

 msodumper/msodraw.py |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit f6d4a8588d9eba8139ee399cd53fbdc0b1a62cf7
Author: Miklos Vajna 
Date:   Wed Sep 10 13:40:07 2014 +0200

msodraw: avoid dumping too large files in BlipEMF::dumpXml()

I'm not sure what would be a reasonable limit, I just came up with this
one to avoid hang on a document I wanted to inspect.

diff --git a/msodumper/msodraw.py b/msodumper/msodraw.py
index cfaf245..1e9c58f 100644
--- a/msodumper/msodraw.py
+++ b/msodumper/msodraw.py
@@ -349,7 +349,11 @@ class BlipEMF:
 recHdl.appendLine('' % hexdump(self.rgbUid2))
 self.metafileHeader.dumpXml(recHdl, model, rh)
 if self.metafileHeader.compression == 0x00:
-recHdl.appendLine('' % 
inflate(self.BLIPFileData))
+# No idea if this is a reasonable limit.
+if len(self.BLIPFileData) > pow(2, 18):
+recHdl.appendLine('' % len(self.BLIPFileData))
+else:
+recHdl.appendLine('' % 
inflate(self.BLIPFileData))
 else:
 recHdl.appendLine('' % hex(self.metafileHeader.compression))
 recHdl.appendLine('')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - include/vcl sc/inc sc/qa sc/source sd/source sfx2/source svtools/source svx/uiconfig unusedcode.easy vcl/source

[Caolán McNamara]

 include/vcl/toolbox.hxx
 |1 
 sc/inc/document.hxx
 |2 
 sc/inc/filter.hxx  
 |4 
 sc/qa/unit/data/wks/pass/gnome647171-1.wks 
 |binary
 
sc/qa/unit/data/wks/pass/sf_8de44549111f8ba3f67509354f677aab-2767-minimized.wks 
|binary
 sc/qa/unit/filters-test.cxx
 |4 
 sc/source/core/data/documen5.cxx   
 |   35 -
 sc/source/filter/inc/lotattr.hxx   
 |4 
 sc/source/filter/inc/lotform.hxx   
 |9 
 sc/source/filter/inc/lotimpop.hxx  
 |3 
 sc/source/filter/inc/lotrange.hxx  
 |7 
 sc/source/filter/inc/namebuff.hxx  
 |7 
 sc/source/filter/inc/op.h  
 |   63 +-
 sc/source/filter/inc/optab.h   
 |4 
 sc/source/filter/inc/root.hxx  
 |2 
 sc/source/filter/inc/scmem.h   
 |7 
 sc/source/filter/inc/tool.h
 |6 
 sc/source/filter/lotus/filter.cxx  
 |  108 +---
 sc/source/filter/lotus/lotattr.cxx 
 |   10 
 sc/source/filter/lotus/lotfilter.hxx   
 |   77 +++
 sc/source/filter/lotus/lotform.cxx 
 |   17 
 sc/source/filter/lotus/lotimpop.cxx
 |   42 -
 sc/source/filter/lotus/lotread.cxx 
 |   15 
 sc/source/filter/lotus/lotus.cxx   
 |   14 
 sc/source/filter/lotus/memory.cxx  
 |   43 -
 sc/source/filter/lotus/op.cxx  
 |  207 +++-
 sc/source/filter/lotus/optab.cxx   
 |5 
 sc/source/filter/lotus/tool.cxx
 |   65 --
 sc/source/ui/inc/gridwin.hxx   
 |7 
 sc/source/ui/view/gridwin.cxx  
 |   30 -
 sc/source/ui/view/gridwin5.cxx 
 |   18 
 sd/source/ui/dlg/LayerTabBar.cxx   
 |   11 
 sd/source/ui/inc/LayerTabBar.hxx   
 |4 
 sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx 
 |1 
 sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx 
 |   12 
 sfx2/source/dialog/templdlg.cxx
 |   18 
 sfx2/source/inc/templdgi.hxx   
 |2 
 svtools/source/table/tablecontrol_impl.cxx 
 |  254 --
 svtools/source/table/tablecontrol_impl.hxx 
 |   13 
 svx/uiconfig/ui/docrecoverybrokendialog.ui 
 |1 
 unusedcode.easy
 |3 
 vcl/source/window/toolbox2.cxx 
 |6 
 42 files changed, 385 insertions(+), 756 deletions(-)

New commits:
commit 50df87ceddc5f4dbebe9552c07e6c899dc17717c
Author: Caolán McNamara 
Date:   Wed Sep 10 11:59:36 2014 +0100

create a regression test for loading lotus wks documents

Change-Id: I274236939c6de4db811f8932025c619479bebbee

diff --git a/sc/qa/unit/data/wks/fail/.gitignore 
b/sc/qa/unit/data/wks/fail/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sc/qa/unit/data/wks/indeterminate/.gitignore 
b/sc/qa/unit/data/wks/indeterminate/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sc/qa/unit/data/wks/pass/.gitignore 
b/sc/qa/unit/data/wks/pass/.gitignore
new file mode 100644
index 000..e69de29
diff --git a/sc/qa/unit/data/wks/pass/gnome647171-1.wks 
b/sc/qa/unit/data/wks/pass/gnome647171-1.wks
new file mode 100644
index 000..b2130f5
Binary files /dev/null and b/sc/qa/unit/data/wks/pass/gnome647171-1.wks differ
diff --git 
a/sc/qa/unit/data/wks/pass/sf_8de44549111f8ba3f67509354f677aab-2767-minimized.wks
 
b/sc/qa/unit/data/wks/pass/sf_8de44549111f8ba3f67509354f677aab-2767-minimized.wks
new file mode 100644
index 000..92f36c7
Binary files /dev

[Libreoffice-commits] core.git: desktop/source extensions/source filter/source sfx2/source ucb/source

[Daniel Sikeler]

 desktop/source/app/app.cxx   |   16 +++
 extensions/source/update/ui/updatecheckui.cxx|   16 +++
 filter/source/xsltdialog/xmlfiltertestdialog.cxx |   12 +--
 filter/source/xsltdialog/xmlfiltertestdialog.hxx |6 ++---
 sfx2/source/appl/appinit.cxx |6 ++---
 ucb/source/ucp/tdoc/tdoc_docmgr.cxx  |   24 +++
 ucb/source/ucp/tdoc/tdoc_docmgr.hxx  |   12 +--
 7 files changed, 46 insertions(+), 46 deletions(-)

New commits:
commit db9cfa672c5944f22ca82a28ed150a5fbae6f5b5
Author: Daniel Sikeler 
Date:   Tue Sep 2 09:12:44 2014 +

fdo#55380 replaced use of obsolete interfaces

Change-Id: I94fed6a9361f21457b3e631efffc0db833068aef
Reviewed-on: https://gerrit.libreoffice.org/11256
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 3155d68..3313d03 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -67,7 +67,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -1323,7 +1323,7 @@ void Desktop::AppEvent( const ApplicationEvent& rAppEvent 
)
 
 struct ExecuteGlobals
 {
-Reference < css::document::XEventListener > xGlobalBroadcaster;
+Reference < css::document::XDocumentEventListener > xGlobalBroadcaster;
 bool bRestartRequested;
 bool bUseSystemFileDialog;
 std::auto_ptr pLanguageOptions;
@@ -1485,8 +1485,8 @@ int Desktop::Main()
 xDesktop = css::frame::Desktop::create( xContext );
 
 // create service for loadin SFX (still needed in startup)
-pExecGlobals->xGlobalBroadcaster = Reference < 
css::document::XEventListener >
-( css::frame::theGlobalEventBroadcaster::get(xContext), 
UNO_QUERY_THROW );
+pExecGlobals->xGlobalBroadcaster = Reference < 
css::document::XDocumentEventListener >
+( css::frame::theGlobalEventBroadcaster::get(xContext), 
UNO_SET_THROW );
 
 /* ensure existence of a default window that messages can be 
dispatched to
This is for the benefit of testtool which uses PostUserEvent 
extensively
@@ -1513,9 +1513,9 @@ int Desktop::Main()
 // keep a language options instance...
 pExecGlobals->pLanguageOptions.reset( new SvtLanguageOptions(true));
 
-css::document::EventObject aEvent;
+css::document::DocumentEvent aEvent;
 aEvent.EventName = "OnStartApp";
-pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
+pExecGlobals->xGlobalBroadcaster->documentEventOccured(aEvent);
 
 SetSplashScreenProgress(50);
 
@@ -1731,9 +1731,9 @@ int Desktop::doShutdown()
 
 if (pExecGlobals->xGlobalBroadcaster.is())
 {
-css::document::EventObject aEvent;
+css::document::DocumentEvent aEvent;
 aEvent.EventName = "OnCloseApp";
-pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent);
+pExecGlobals->xGlobalBroadcaster->documentEventOccured(aEvent);
 }
 
 delete pResMgr, pResMgr = NULL;
diff --git a/extensions/source/update/ui/updatecheckui.cxx 
b/extensions/source/update/ui/updatecheckui.cxx
index 5f15da3..2e2ea0b 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -25,8 +25,8 @@
 #include 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -119,7 +119,7 @@ public:
 
 
 class UpdateCheckUI : public ::cppu::WeakImplHelper3
-< lang::XServiceInfo, document::XEventListener, 
beans::XPropertySet >
+< lang::XServiceInfo, 
document::XDocumentEventListener, beans::XPropertySet >
 {
 uno::Reference< uno::XComponentContext > m_xContext;
 uno::Reference< task::XJob > mrJob;
@@ -168,8 +168,8 @@ public:
 virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
 throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-// XEventListener
-virtual void SAL_CALL notifyEvent(const document::EventObject& Event)
+// XDocumentEventListener
+virtual void SAL_CALL documentEventOccured(const document::DocumentEvent& 
Event)
 throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
 virtual void SAL_CALL disposing(const lang::EventObject& Event)
 throw (uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -218,8 +218,8 @@ UpdateCheckUI::UpdateCheckUI(const 
uno::Reference& xCont
 maTimeoutTimer.SetTimeout( 1 );
 maTimeoutTimer.SetTimeoutHdl( LINK( this, UpdateCheckUI, TimeOutHdl ) );
 
-uno::Reference< document::XEventBroadcaster > xBroadcaster( 
frame::theGlobalEventBroadcaster::get(m_xContext) );
-xBroadcaster->addEventListener( this );
+uno::Reference< document::XDocumentEventBroadcaster > xBroadcaster( 
frame::theGlobalEventBroadcaster::get(m_xContext) );
+xBroadcaster->add

[Bug 55380] Clients of GlobalEventBroadcaster should use DocumentEventBroadcaster/Listener

[bugzilla-daemon]

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|EasyHack|EasyHack
   |DifficultyInteresting   |DifficultyInteresting
   |SkillCpp|SkillCpp target:4.4.0

--- Comment #6 from Commit Notification 
 ---
Daniel Sikeler committed a patch related to this issue.
It has been pushed to "master":

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

fdo#55380 replaced use of obsolete interfaces



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: Branch 'refs/notes/commits' - c2/063d3da2916dc0f6f81b81232ce9d6407d697d

[Caolán McNamara]

 c2/063d3da2916dc0f6f81b81232ce9d6407d697d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 88c36c182a918ad0e8588487e993442e7d33c8a9
Author: Caolán McNamara 
Date:   Wed Sep 10 12:50:27 2014 +0100

Notes added by 'git notes add'

diff --git a/c2/063d3da2916dc0f6f81b81232ce9d6407d697d 
b/c2/063d3da2916dc0f6f81b81232ce9d6407d697d
new file mode 100644
index 000..403addb
--- /dev/null
+++ b/c2/063d3da2916dc0f6f81b81232ce9d6407d697d
@@ -0,0 +1 @@
+ignore: OS/2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3 commits - 0e/da64e2bb03cda98844ffcf16bfc0215d9b706f 13/fcc38291a3d30d4610492e527e2f30c906e30a 63/8e87e8d09a5f08a925b395710ad1e2cd310ef4

[Caolán McNamara]

 0e/da64e2bb03cda98844ffcf16bfc0215d9b706f |1 +
 13/fcc38291a3d30d4610492e527e2f30c906e30a |1 +
 63/8e87e8d09a5f08a925b395710ad1e2cd310ef4 |1 +
 3 files changed, 3 insertions(+)

New commits:
commit 969e60dbd6c443c560b08e5ce91477dc939a7c73
Author: Caolán McNamara 
Date:   Wed Sep 10 12:52:14 2014 +0100

Notes added by 'git notes add'

diff --git a/63/8e87e8d09a5f08a925b395710ad1e2cd310ef4 
b/63/8e87e8d09a5f08a925b395710ad1e2cd310ef4
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/63/8e87e8d09a5f08a925b395710ad1e2cd310ef4
@@ -0,0 +1 @@
+ignore: aoo
commit 9790923c2107a29f8c0b45edc61abe582977a02b
Author: Caolán McNamara 
Date:   Wed Sep 10 12:51:35 2014 +0100

Notes added by 'git notes add'

diff --git a/13/fcc38291a3d30d4610492e527e2f30c906e30a 
b/13/fcc38291a3d30d4610492e527e2f30c906e30a
new file mode 100644
index 000..403addb
--- /dev/null
+++ b/13/fcc38291a3d30d4610492e527e2f30c906e30a
@@ -0,0 +1 @@
+ignore: OS/2
commit abe431b7a8720e6c7599904e81f9a5c43de721ee
Author: Caolán McNamara 
Date:   Wed Sep 10 12:51:24 2014 +0100

Notes added by 'git notes add'

diff --git a/0e/da64e2bb03cda98844ffcf16bfc0215d9b706f 
b/0e/da64e2bb03cda98844ffcf16bfc0215d9b706f
new file mode 100644
index 000..403addb
--- /dev/null
+++ b/0e/da64e2bb03cda98844ffcf16bfc0215d9b706f
@@ -0,0 +1 @@
+ignore: OS/2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

AW: I am new employee, with VS problem

[Juergen Funk]

Yes it is running, in this case all is fine.

Thanks

Juergen


> -Ursprüngliche Nachricht-
> On Wed, Sep 10, 2014 at 13:57:00, Bjoern Michaelsen wrote
> 
> On Wed, Sep 10, 2014 at 11:11:13AM +, Juergen Funk wrote:
> > I'm not sure where is the fault is that make (have no plan too) or is
> > that the python script.
> 
> Does a running "make" alone lead to a successful build? Can you run the
> product after the build?
> 
> Note the MSVS integration needs one complete build from the commandline
> before it does its magic IIRC.
> 
> Best,
> 
> Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac

[Andras Timar]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c1a78b209ac600165a39559550370468cba864c
Author: Andras Timar 
Date:   Wed Sep 10 04:59:43 2014 -0700

Bump version to 4.2-9

Change-Id: Ief72a8a091c8e3e37bf5a5190dc95d0ebb7405b7

diff --git a/configure.ac b/configure.ac
index c721987..f77e6dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.2.10.8],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.2.10.9],[],[],[https://libreoffice-from-collabora.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 connectivity/source/drivers/dbase/DTable.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ce454057e09fef607ea8eab55e8e5db43941320b
Author: Caolán McNamara 
Date:   Wed Sep 10 13:41:50 2014 +0100

check for empty m_pBuffer

Change-Id: I90135b6d7780ba8a22fff725a965f0ea7e442707

diff --git a/connectivity/source/drivers/dbase/DTable.cxx 
b/connectivity/source/drivers/dbase/DTable.cxx
index a9f74b9..845d037 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -774,6 +774,9 @@ sal_Int64 ODbaseTable::getSomething( const Sequence< 
sal_Int8 > & rId ) throw (R
 
 bool ODbaseTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, 
bool _bUseTableDefs, bool bRetrieveData)
 {
+if (!m_pBuffer)
+return false;
+
 // Read the data
 bool bIsCurRecordDeleted = (char)m_pBuffer[0] == '*';
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 configure.ac |   73 ---
 1 file changed, 16 insertions(+), 57 deletions(-)

New commits:
commit aba0106926ceb337035cf46611ff0d590a2af28b
Author: Tor Lillqvist 
Date:   Wed Sep 10 13:28:34 2014 +0300

Always build 64-bit code for OS X

Change-Id: Id1c48d99f18736de1e9b0edf4b8a77becaa1c208

diff --git a/configure.ac b/configure.ac
index cce3519..561a15b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1288,9 +1288,10 @@ AC_ARG_ENABLE(ccache,
 
 AC_ARG_ENABLE(64-bit,
 AS_HELP_STRING([--enable-64-bit],
-[Build a 64-bit LibreOffice on platforms where the normal build is 
32-bit. Works fine for OS
- X. In other cases this option is experimental and possibly quite 
broken, use only if you are
- hacking on 64-bit support.]), ,)
+[Build a 64-bit LibreOffice on platforms where the normal build is 
32-bit.
+ At the moment meaningful only for iOS and Windows. On Windows this 
option is
+ experimental and possibly quite broken, and you should use it only if 
you are
+ hacking on 64-bitness support.]), ,)
 
 AC_ARG_ENABLE(extra-gallery,
 AS_HELP_STRING([--enable-extra-gallery],
@@ -2704,13 +2705,6 @@ dnl 
===
 
 if test $_os = Darwin; then
 
-if test "$enable_64_bit" = "" -o "$enable_64_bit" = "no"; then
-bitness=-m32
-else
-bitness=-m64
-BITNESS_OVERRIDE=64
-fi
-
 # If no --with-macosx-sdk option is given, look for 10.6,
 # 10.7, 10.8 and 10.9 SDKs, in that order. If not found
 # in some default locations, try the xcode-select tool.
@@ -2876,21 +2870,6 @@ if test $_os = Darwin; then
 ;;
 esac
 
-if test "$BITNESS_OVERRIDE" = ""; then
-case "$with_macosx_version_min_required" in
-10.5)
-case "$with_macosx_sdk" in
-10.5)
-;;
-*)
-AC_MSG_WARN([Building with a SDK > 10.5 possibly breaks 10.5 
compatibility.])
-add_warning "Building with a SDK > 10.5 possibly breaks 10.5 
compatibility."
-;;
-esac
-;;
-esac
-fi
-
 # If no CC and CXX environment vars, try to guess where the compiler is
 LIBTOOL=libtool
 INSTALL_NAME_TOOL=install_name_tool
@@ -2912,11 +2891,11 @@ if test $_os = Darwin; then
 10.6)
 # did someone copy her 10.6 sdk into xcode 4 (needed on Mountain 
Lion)?
 if test "$(echo $MACOSX_SDK_PATH | cut -c1-23)" = 
"/Applications/Xcode.app"; then
-CC="`xcrun -find gcc` $bitness 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
-CXX="`xcrun -find g++` $bitness 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
+CC="`xcrun -find gcc` -m64 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
+CXX="`xcrun -find g++` -m64 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
 else
-CC="gcc-4.2 $bitness 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
-CXX="g++-4.2 $bitness 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
+CC="gcc-4.2 -m64 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
+CXX="g++-4.2 -m64 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
 fi
 INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
 LIBTOOL=libtool
@@ -2929,8 +2908,8 @@ if test $_os = Darwin; then
 if test "$ENABLE_LTO" = TRUE; then
 lto=-flto
 fi
-CC="`xcrun -find clang` $bitness $lto 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
-CXX="`xcrun -find clang++` $bitness $lto $stdlib 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
+CC="`xcrun -find clang` -m64 $lto 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
+CXX="`xcrun -find clang++` -m64 $lto $stdlib 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
 INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
 AR=`xcrun -find ar`
 NM=`xcrun -find nm`
@@ -4145,26 +4124,17 @@ darwin*)
 OUTPATH=unxmacxp
 ;;
 i*86)
-if test "$BITNESS_OVERRIDE" = 64; then
-AC_MSG_ERROR([Can't build 64-bit code in 32-bit OS])
-fi
+AC_MSG_ERROR([Can't build 64-bit code in 32-bit OS])
 CPUNAME=INTEL
 RTL_ARCH=x86
 PLATFORMID=macosx_x86
 OUTPATH=unxmacxi
 ;;
 x86_64)
-

[Bug 46200] [RFE] Use the Scroll Lock key as a toggling lock key like Excel

[bugzilla-daemon]

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

--- Comment #9 from kol...@numericable.fr ---
(In reply to comment #8)
It's not that the scroll lock key is implemented differently on Ubuntu; it's
rather an X11 bug (press Ctrl-Shift-F2 and you'll see that scroll lock works on
the console). You may find more information as well as a workaround on
.
So when this X11 bug is fixed the problem should be solved for GNU/Linux
without any additional work for LibreOffice, and things should work out of the
box with Windows anyway. But because of this X11 bug, it would probably be a
good idea to test this enhancement request on Windows, indeed.

-- 
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: tools/source vcl/source

[Caolán McNamara]

 tools/source/generic/poly2.cxx |8 
 vcl/source/gdi/metaact.cxx |6 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit fd64d444b730f6cb7216dac8f6e3f94b97d7ab60
Author: Caolán McNamara 
Date:   Wed Sep 10 14:41:42 2014 +0100

clip PolyPolygon::Insert on .svm load

valgrind + bff

Change-Id: Ib3ed8a6e518c0686f8cbeaf021b9ca3a07005032

diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index 0262a36..cde16013 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -154,7 +154,7 @@ void PolyPolygon::Insert( const Polygon& rPoly, sal_uInt16 
nPos )
 
 void PolyPolygon::Remove( sal_uInt16 nPos )
 {
-DBG_ASSERT( nPos < Count(), "PolyPolygon::Remove(): nPos >= nSize" );
+assert(nPos < Count() && "PolyPolygon::Remove(): nPos >= nSize");
 
 if ( mpImplPolyPolygon->mnRefCount > 1 )
 {
@@ -171,7 +171,7 @@ void PolyPolygon::Remove( sal_uInt16 nPos )
 
 void PolyPolygon::Replace( const Polygon& rPoly, sal_uInt16 nPos )
 {
-DBG_ASSERT( nPos < Count(), "PolyPolygon::Replace(): nPos >= nSize" );
+assert(nPos < Count() && "PolyPolygon::Replace(): nPos >= nSize");
 
 if ( mpImplPolyPolygon->mnRefCount > 1 )
 {
@@ -185,7 +185,7 @@ void PolyPolygon::Replace( const Polygon& rPoly, sal_uInt16 
nPos )
 
 const Polygon& PolyPolygon::GetObject( sal_uInt16 nPos ) const
 {
-DBG_ASSERT( nPos < Count(), "PolyPolygon::GetObject(): nPos >= nSize" );
+assert(nPos < Count() && "PolyPolygon::GetObject(): nPos >= nSize");
 
 return *(mpImplPolyPolygon->mpPolyAry[nPos]);
 }
@@ -508,7 +508,7 @@ Rectangle PolyPolygon::GetBoundRect() const
 
 Polygon& PolyPolygon::operator[]( sal_uInt16 nPos )
 {
-DBG_ASSERT( nPos < Count(), "PolyPolygon::[](): nPos >= nSize" );
+assert(nPos < Count() && "PolyPolygon::[](): nPos >= nSize");
 
 if ( mpImplPolyPolygon->mnRefCount > 1 )
 {
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 93dbfa6..2417e0f 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1077,6 +1077,12 @@ void MetaPolyPolygonAction::Read( SvStream& rIStm, 
ImplMetaReadData* )
 rIStm.ReadUInt16( nIndex );
 Polygon aPoly;
 aPoly.Read( rIStm );
+if (nIndex >= maPolyPoly.Count())
+{
+SAL_WARN("vcl.gdi", "svm contains polygon index " << nIndex
+ << " outside possible range " << maPolyPoly.Count());
+continue;
+}
 maPolyPoly.Replace( aPoly, nIndex );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Adolfo Jayme  changed:

   What|Removed |Added

 Depends on|57433   |

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

Schedule for 4.3.2 - get your patches ready til next Monday (Sep 15)

[Christian Lohmaier]

Hi *,

LiboCon and getting vacation-replacement caused delay for 4.3.2 rc1 that
will be tagged today, but the rest of the schedule should remain as planned.

In other words: deadline for patches that should go into 4.3.2 final is
next Monday. If you have stoppers that need more time, be sure to show up
in the ESC call...

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

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

[Matthew J . Francis]

 i18npool/inc/xdictionary.hxx|2 +
 i18npool/source/breakiterator/breakiterator_unicode.cxx |2 -
 i18npool/source/breakiterator/xdictionary.cxx   |   19 
 3 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit a34a8fca21c670c4e7ee147d05ed9e6e4136cbe1
Author: Matthew J. Francis 
Date:   Wed Sep 10 17:34:01 2014 +0800

fdo#81272 Speed up break iterators

Change-Id: Idcd7de83ff7e551b350db0bf80e2ac78baa67686
Reviewed-on: https://gerrit.libreoffice.org/11374
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index 57f5238..f7c0110 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.hxx
@@ -76,6 +76,8 @@ public:
 
 private:
 WordBreakCache cache[CACHE_MAX];
+OUString segmentCachedString;
+Boundary segmentCachedBoundary;
 
 boolseekSegment(const OUString& rText, sal_Int32 pos, Boundary& 
boundary);
 WordBreakCache& getCache(const sal_Unicode *text, Boundary& boundary);
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 5270b1d..658d4ff 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -185,7 +185,7 @@ void SAL_CALL 
BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
 }
 }
 
-if (newBreak || !icuBI->aICUText.equals(rText))
+if (newBreak || icuBI->aICUText.pData != rText.pData)
 {
 // UChar != sal_Unicode in MinGW
 const UChar *pText = reinterpret_cast(rText.getStr());
diff --git a/i18npool/source/breakiterator/xdictionary.cxx 
b/i18npool/source/breakiterator/xdictionary.cxx
index 1067e33..95e1cc9 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -271,6 +271,21 @@ bool xdictionary::seekSegment(const OUString &rText, 
sal_Int32 pos,
 Boundary& segBoundary)
 {
 sal_Int32 indexUtf16;
+
+if (segmentCachedString.pData != rText.pData) {
+// Cache the passed text so we can avoid regenerating the segment if 
it's the same
+// (pData is refcounted and assigning the OUString references it, 
which ensures that
+// the object is the same if we get the same pointer back later)
+segmentCachedString = rText;
+} else {
+// If pos is within the cached boundary, use that boundary
+if (pos >= segmentCachedBoundary.startPos && pos <= 
segmentCachedBoundary.endPos) {
+indexUtf16 = segmentCachedBoundary.startPos;
+rText.iterateCodePoints(&indexUtf16, 1);
+return segmentCachedBoundary.endPos > indexUtf16;
+}
+}
+
 segBoundary.endPos = segBoundary.startPos = pos;
 
 indexUtf16 = pos;
@@ -293,6 +308,10 @@ bool xdictionary::seekSegment(const OUString &rText, 
sal_Int32 pos,
 break;
 }
 
+// Cache the calculated boundary
+segmentCachedBoundary.startPos = segBoundary.startPos;
+segmentCachedBoundary.endPos = segBoundary.endPos;
+
 indexUtf16 = segBoundary.startPos;
 rText.iterateCodePoints(&indexUtf16, 1);
 return segBoundary.endPos > indexUtf16;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/source/core/doc/doccomp.cxx |2 +-
 sw/source/core/docnode/section.cxx |5 +
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit b56558717d8b5291e5f547e3fd2cf21d33efe08e
Author: Michael Stahl 
Date:   Wed Sep 10 16:10:45 2014 +0200

fdo#83655: sw: RSID-only hint assertion when inserting in master document

For the temporary document there is no layout so SwTxtNode::MakeFrm()
isn't called.

(regression from 6db39dbd7378351f6476f6db25eb7110c9cfb291)

Change-Id: I711d32a81519edd6840cc29f5cd9dbc57ef21982

diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index dcbfc1c..41ac05e 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1760,7 +1760,7 @@ void SwCompareData::SetRedlinesToDoc( bool bUseDocInfo )
 }
 }
 
-static bool lcl_MergePortions(SwNode *const& pNode, void *)
+bool lcl_MergePortions(SwNode *const& pNode, void *)
 {
 if (pNode->IsTxtNode())
 {
diff --git a/sw/source/core/docnode/section.cxx 
b/sw/source/core/docnode/section.cxx
index 683c2d2..1755312 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1270,6 +1270,11 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, 
SwSectionNode& rSectNd )
 SwDoc* pSrcDoc = ((SwDocShell*)&xDocSh)->GetDoc();
 eOldRedlineMode = 
pSrcDoc->getIDocumentRedlineAccess().GetRedlineMode();
 pSrcDoc->getIDocumentRedlineAccess().SetRedlineMode( 
nsRedlineMode_t::REDLINE_SHOW_INSERT );
+if (2 == nRet)
+{
+bool lcl_MergePortions(SwNode *const& pNode, void *);
+pSrcDoc->GetNodes().ForEach(&lcl_MergePortions);
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 solenv/bin/macosx-codesign-app-bundle |4 
 1 file changed, 4 deletions(-)

New commits:
commit 084ec901d53dfcbdf61b256a71c4f722d1c2bbe5
Author: Tor Lillqvist 
Date:   Wed Sep 10 17:19:25 2014 +0300

Bin incorrect comment

diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
index cdaa8e8..d1ba433 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -32,10 +32,6 @@ APP_BUNDLE="$1"
 #
 # The dylibs in the Python framework are called *.so. Go figure
 #
-# First sign all files that can use the default identifier in the hope
-# that codesign will contact the timestamp server just once for all
-# mentioned on the command line.
-#
 # On Mavericks also would like to have data files signed...
 # add some where it makes sense. Make a depth-first search to sign the contents
 # of e.g. the spotlight plugin before attempting to sign the plugin itself
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - avmedia/source basctl/source cui/source editeng/source forms/source include/svl reportdesign/source sc/source sd/source sfx2/source starmath/source svl/sour

[Stephan Bergmann]

 avmedia/source/framework/mediatoolbox.cxx |2 
 basctl/source/basicide/basicbox.cxx   |4 
 cui/source/dialogs/cuihyperdlg.cxx|2 
 cui/source/dialogs/postdlg.cxx|6 
 cui/source/options/treeopt.cxx|   10 
 cui/source/tabpages/backgrnd.cxx  |   20 -
 cui/source/tabpages/border.cxx|2 
 cui/source/tabpages/page.cxx  |   12 -
 cui/source/tabpages/paragrph.cxx  |   34 +--
 editeng/source/editeng/editdbg.cxx|6 
 editeng/source/editeng/editdoc.cxx|   56 ++---
 editeng/source/editeng/editobj.cxx|   10 
 editeng/source/editeng/impedit4.cxx   |6 
 editeng/source/editeng/impedit5.cxx   |   18 -
 editeng/source/outliner/outliner.cxx  |4 
 editeng/source/uno/unofored.cxx   |2 
 forms/source/richtext/rtattributehandler.cxx  |2 
 include/svl/poolitem.hxx  |5 
 reportdesign/source/ui/misc/statusbarcontroller.cxx   |4 
 reportdesign/source/ui/misc/toolboxcontroller.cxx |2 
 sc/source/core/data/patattr.cxx   |2 
 sc/source/filter/html/htmlexp.cxx |2 
 sc/source/ui/cctrl/tbinsert.cxx   |2 
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx   |2 
 sc/source/ui/drawfunc/drawsh2.cxx |2 
 sc/source/ui/drawfunc/drtxtob.cxx |4 
 sc/source/ui/optdlg/tpview.cxx|2 
 sc/source/ui/pagedlg/tptable.cxx  |6 
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx   |4 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx|4 
 sc/source/ui/view/formatsh.cxx|2 
 sd/source/core/sdpage.cxx |   10 
 sd/source/filter/html/htmlex.cxx  |   14 -
 sd/source/ui/annotations/annotationmanager.cxx|8 
 sd/source/ui/app/sdmod1.cxx   |   10 
 sd/source/ui/app/tbxww.cxx|2 
 sd/source/ui/app/tmplctrl.cxx |2 
 sd/source/ui/dlg/animobjs.cxx |2 
 sd/source/ui/dlg/diactrl.cxx  |2 
 sd/source/ui/dlg/dlgolbul.cxx |4 
 sd/source/ui/dlg/gluectrl.cxx |2 
 sd/source/ui/dlg/navigatr.cxx |4 
 sd/source/ui/dlg/paragr.cxx   |4 
 sd/source/ui/dlg/tpoption.cxx |6 
 sd/source/ui/func/fubullet.cxx|   16 -
 sd/source/ui/func/fuolbull.cxx|2 
 sd/source/ui/func/futempl.cxx |2 
 sd/source/ui/sidebar/AllMasterPagesSelector.cxx   |2 
 sd/source/ui/slidesorter/controller/SlideSorterController.cxx |   10 
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx|   52 ++--
 sd/source/ui/view/drawview.cxx|8 
 sd/source/ui/view/drtxtob1.cxx|4 
 sd/source/ui/view/drviews2.cxx|4 
 sd/source/ui/view/drviews3.cxx|8 
 sd/source/ui/view/drviews6.cxx|   16 -
 sd/source/ui/view/drviews7.cxx|  112 +-
 sd/source/ui/view/drviewsa.cxx|8 
 sd/source/ui/view/drviewsf.cxx|   16 -
 sd/source/ui/view/drviewsj.cxx|   98 
 sd/source/ui/view/outlnvsh.cxx|   34 +--
 sd/source/ui/view/outlview.cxx|2 
 sd/source/ui/view/viewshe3.cxx|   10 
 sd/source/ui/view/viewshel.cxx|2 
 sfx2/source/control/bindings.cxx  |   18 -
 sfx2/source/control/ctrlitem.cxx  |4 
 sfx2/source/control/dispatch.cxx  |4 
 sfx2/source/control/querystatus.cxx   |2 
 sfx2/source/control/request.cxx   |2 
 sfx2/source/control/sfxstatuslistener.cxx |2 
 sfx2/source/control/shell.cxx 

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

[Tor Lillqvist]

 include/sal/log-areas.dox |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 019632c6628487189b8243c8a6ee99e878df2df3
Author: Tor Lillqvist 
Date:   Wed Sep 10 17:55:57 2014 +0300

WaE: unknown log area

Change-Id: I3339324ec99bbed56f81f2aa4e6cf54edcbec8e6

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 33a7999..691fae0 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -412,7 +412,9 @@ certain functionality.
 
 @li @c sw
 @li @c sw.core - Writer core
+@li @c sw.createcopy
 @li @c sw.doc
+@li @c sw.docappend
 @li @c sw.docx
 @li @c sw.envelp
 @li @c sw.filter
___
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' - tools/source vcl/source

[Caolán McNamara]

 tools/source/generic/poly2.cxx |8 
 vcl/source/gdi/metaact.cxx |6 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit adbdac2dd6799789a45cd3b6ca48919889a8b64d
Author: Caolán McNamara 
Date:   Wed Sep 10 14:41:42 2014 +0100

clip PolyPolygon::Insert on .svm load

valgrind + bff

Change-Id: Ib3ed8a6e518c0686f8cbeaf021b9ca3a07005032
(cherry picked from commit fd64d444b730f6cb7216dac8f6e3f94b97d7ab60)
Reviewed-on: https://gerrit.libreoffice.org/11381
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index 7ef7df1..ffd60e2 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -154,7 +154,7 @@ void PolyPolygon::Insert( const Polygon& rPoly, sal_uInt16 
nPos )
 
 void PolyPolygon::Remove( sal_uInt16 nPos )
 {
-DBG_ASSERT( nPos < Count(), "PolyPolygon::Remove(): nPos >= nSize" );
+assert(nPos < Count() && "PolyPolygon::Remove(): nPos >= nSize");
 
 if ( mpImplPolyPolygon->mnRefCount > 1 )
 {
@@ -171,7 +171,7 @@ void PolyPolygon::Remove( sal_uInt16 nPos )
 
 void PolyPolygon::Replace( const Polygon& rPoly, sal_uInt16 nPos )
 {
-DBG_ASSERT( nPos < Count(), "PolyPolygon::Replace(): nPos >= nSize" );
+assert(nPos < Count() && "PolyPolygon::Replace(): nPos >= nSize");
 
 if ( mpImplPolyPolygon->mnRefCount > 1 )
 {
@@ -185,7 +185,7 @@ void PolyPolygon::Replace( const Polygon& rPoly, sal_uInt16 
nPos )
 
 const Polygon& PolyPolygon::GetObject( sal_uInt16 nPos ) const
 {
-DBG_ASSERT( nPos < Count(), "PolyPolygon::GetObject(): nPos >= nSize" );
+assert(nPos < Count() && "PolyPolygon::GetObject(): nPos >= nSize");
 
 return *(mpImplPolyPolygon->mpPolyAry[nPos]);
 }
@@ -508,7 +508,7 @@ Rectangle PolyPolygon::GetBoundRect() const
 
 Polygon& PolyPolygon::operator[]( sal_uInt16 nPos )
 {
-DBG_ASSERT( nPos < Count(), "PolyPolygon::[](): nPos >= nSize" );
+assert(nPos < Count() && "PolyPolygon::[](): nPos >= nSize");
 
 if ( mpImplPolyPolygon->mnRefCount > 1 )
 {
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index fee3d80..36ce0d5 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -997,6 +997,12 @@ void MetaPolyPolygonAction::Read( SvStream& rIStm, 
ImplMetaReadData* )
 rIStm.ReadUInt16( nIndex );
 Polygon aPoly;
 aPoly.Read( rIStm );
+if (nIndex >= maPolyPoly.Count())
+{
+SAL_WARN("vcl.gdi", "svm contains polygon index " << nIndex
+ << " outside possible range " << maPolyPoly.Count());
+continue;
+}
 maPolyPoly.Replace( aPoly, nIndex );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 tools/source/generic/poly2.cxx |8 
 vcl/source/gdi/metaact.cxx |6 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 6db17c300e59884e652125a0b3b11bdffdea38e2
Author: Caolán McNamara 
Date:   Wed Sep 10 14:41:42 2014 +0100

clip PolyPolygon::Insert on .svm load

valgrind + bff

(cherry picked from commit fd64d444b730f6cb7216dac8f6e3f94b97d7ab60)

Conflicts:
tools/source/generic/poly2.cxx

Change-Id: Ib3ed8a6e518c0686f8cbeaf021b9ca3a07005032
Reviewed-on: https://gerrit.libreoffice.org/11382
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index 4fa9a83..d3d4e09 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -167,7 +167,7 @@ void PolyPolygon::Insert( const Polygon& rPoly, sal_uInt16 
nPos )
 void PolyPolygon::Remove( sal_uInt16 nPos )
 {
 DBG_CHKTHIS( PolyPolygon, NULL );
-DBG_ASSERT( nPos < Count(), "PolyPolygon::Remove(): nPos >= nSize" );
+assert(nPos < Count() && "PolyPolygon::Remove(): nPos >= nSize");
 
 if ( mpImplPolyPolygon->mnRefCount > 1 )
 {
@@ -185,7 +185,7 @@ void PolyPolygon::Remove( sal_uInt16 nPos )
 void PolyPolygon::Replace( const Polygon& rPoly, sal_uInt16 nPos )
 {
 DBG_CHKTHIS( PolyPolygon, NULL );
-DBG_ASSERT( nPos < Count(), "PolyPolygon::Replace(): nPos >= nSize" );
+assert(nPos < Count() && "PolyPolygon::Replace(): nPos >= nSize");
 
 if ( mpImplPolyPolygon->mnRefCount > 1 )
 {
@@ -200,7 +200,7 @@ void PolyPolygon::Replace( const Polygon& rPoly, sal_uInt16 
nPos )
 const Polygon& PolyPolygon::GetObject( sal_uInt16 nPos ) const
 {
 DBG_CHKTHIS( PolyPolygon, NULL );
-DBG_ASSERT( nPos < Count(), "PolyPolygon::GetObject(): nPos >= nSize" );
+assert(nPos < Count() && "PolyPolygon::GetObject(): nPos >= nSize");
 
 return *(mpImplPolyPolygon->mpPolyAry[nPos]);
 }
@@ -531,7 +531,7 @@ Rectangle PolyPolygon::GetBoundRect() const
 Polygon& PolyPolygon::operator[]( sal_uInt16 nPos )
 {
 DBG_CHKTHIS( PolyPolygon, NULL );
-DBG_ASSERT( nPos < Count(), "PolyPolygon::[](): nPos >= nSize" );
+assert(nPos < Count() && "PolyPolygon::[](): nPos >= nSize");
 
 if ( mpImplPolyPolygon->mnRefCount > 1 )
 {
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 2bc51b4..744ec58 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -1174,6 +1174,12 @@ void MetaPolyPolygonAction::Read( SvStream& rIStm, 
ImplMetaReadData* )
 rIStm >> nIndex;
 Polygon aPoly;
 aPoly.Read( rIStm );
+if (nIndex >= maPolyPoly.Count())
+{
+SAL_WARN("vcl.gdi", "svm contains polygon index " << nIndex
+ << " outside possible range " << maPolyPoly.Count());
+continue;
+}
 maPolyPoly.Replace( aPoly, nIndex );
 }
 }
___
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

[Caolán McNamara]

 i18npool/inc/xdictionary.hxx|2 -
 i18npool/source/breakiterator/breakiterator_unicode.cxx |2 -
 i18npool/source/breakiterator/xdictionary.cxx   |   19 
 3 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 997d1387abcfa40eca8d15a2fe025edc4a1de040
Author: Caolán McNamara 
Date:   Wed Sep 10 16:38:07 2014 +0100

Revert "fdo#81272 Speed up break iterators"

hmm, make CppunitTest_i18npool_test_breakiterator fails after all

This reverts commit 693f72384e081429cddb29415276cc4d07b05645.

diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index f7c0110..57f5238 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.hxx
@@ -76,8 +76,6 @@ public:
 
 private:
 WordBreakCache cache[CACHE_MAX];
-OUString segmentCachedString;
-Boundary segmentCachedBoundary;
 
 boolseekSegment(const OUString& rText, sal_Int32 pos, Boundary& 
boundary);
 WordBreakCache& getCache(const sal_Unicode *text, Boundary& boundary);
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 658d4ff..5270b1d 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -185,7 +185,7 @@ void SAL_CALL 
BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
 }
 }
 
-if (newBreak || icuBI->aICUText.pData != rText.pData)
+if (newBreak || !icuBI->aICUText.equals(rText))
 {
 // UChar != sal_Unicode in MinGW
 const UChar *pText = reinterpret_cast(rText.getStr());
diff --git a/i18npool/source/breakiterator/xdictionary.cxx 
b/i18npool/source/breakiterator/xdictionary.cxx
index 95e1cc9..1067e33 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -271,21 +271,6 @@ bool xdictionary::seekSegment(const OUString &rText, 
sal_Int32 pos,
 Boundary& segBoundary)
 {
 sal_Int32 indexUtf16;
-
-if (segmentCachedString.pData != rText.pData) {
-// Cache the passed text so we can avoid regenerating the segment if 
it's the same
-// (pData is refcounted and assigning the OUString references it, 
which ensures that
-// the object is the same if we get the same pointer back later)
-segmentCachedString = rText;
-} else {
-// If pos is within the cached boundary, use that boundary
-if (pos >= segmentCachedBoundary.startPos && pos <= 
segmentCachedBoundary.endPos) {
-indexUtf16 = segmentCachedBoundary.startPos;
-rText.iterateCodePoints(&indexUtf16, 1);
-return segmentCachedBoundary.endPos > indexUtf16;
-}
-}
-
 segBoundary.endPos = segBoundary.startPos = pos;
 
 indexUtf16 = pos;
@@ -308,10 +293,6 @@ bool xdictionary::seekSegment(const OUString &rText, 
sal_Int32 pos,
 break;
 }
 
-// Cache the calculated boundary
-segmentCachedBoundary.startPos = segBoundary.startPos;
-segmentCachedBoundary.endPos = segBoundary.endPos;
-
 indexUtf16 = segBoundary.startPos;
 rText.iterateCodePoints(&indexUtf16, 1);
 return segBoundary.endPos > indexUtf16;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 sd/source/filter/eppt/epptso.cxx|   74 ++--
 sd/source/filter/eppt/pptx-text.cxx |   34 +---
 sd/source/filter/eppt/text.hxx  |   12 -
 3 files changed, 66 insertions(+), 54 deletions(-)

New commits:
commit d707d025b6c3773538abd2eedc6dc4c6d869aa86
Author: Takeshi Abe 
Date:   Wed Sep 10 16:14:42 2014 +0900

fdo#75757: remove inheritance to std::vector

from ParagraphObj, by using boost::ptr_vector.

This is also a supposed fix for ParagraphObj::operator=(),
because ParagraphObj::ImplClear() now makes the vector empty
while its original code kept deleted pointers.

Change-Id: I7710eb33fc05bed55474ff00baaeb8e19cd79f3d
Reviewed-on: https://gerrit.libreoffice.org/11379
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index e40fa13..8c0eb7f 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -659,7 +659,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, 
TextObj& rTextObj )
 for ( sal_uInt32 i = 0;  i < rTextObj.ParagraphCount(); ++i, 
bFirstParagraph = false )
 {
 ParagraphObj* pPara = rTextObj.GetParagraph(i);
-PortionObj* pPortion = pPara->front();
+const PortionObj& rPortion = pPara->front();
 nCharCount = pPara->CharacterCount();
 
 nDepth = pPara->nDepth;
@@ -671,7 +671,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, 
TextObj& rTextObj )
 nPropertyFlags |= 0x0800;
 nLineSpacing = pPara->mnLineSpacing;
 
-const FontCollectionEntry* pDesc = maFontCollection.GetById( 
pPortion->mnFont );
+const FontCollectionEntry* pDesc = maFontCollection.GetById( 
rPortion.mnFont );
 sal_Int16 nNormalSpacing = 100;
 if ( !mbFontIndependentLineSpacing && pDesc )
 {
@@ -693,7 +693,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, 
TextObj& rTextObj )
 }
 else
 {
-if ( !pPara->mbFixedLineSpacing && pPortion->mnCharHeight > 
(sal_uInt16)( ((double)-nLineSpacing) * 0.001 * 72.0 / 2.54 ) ) // 1/100mm to 
point
+if ( !pPara->mbFixedLineSpacing && rPortion.mnCharHeight > 
(sal_uInt16)( ((double)-nLineSpacing) * 0.001 * 72.0 / 2.54 ) ) // 1/100mm to 
point
 nLineSpacing = nNormalSpacing;
 else
 nLineSpacing = (sal_Int16)( (double)nLineSpacing / 4.40972 
);
@@ -799,12 +799,12 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, 
TextObj& rTextObj )
 for ( sal_uInt32 i = 0; i < rTextObj.ParagraphCount(); ++i )
 {
 ParagraphObj* pPara = rTextObj.GetParagraph(i);
-for ( ParagraphObj::const_iterator it = pPara->begin(); it != 
pPara->end(); ++it )
+for ( boost::ptr_vector::const_iterator it = 
pPara->begin(); it != pPara->end(); ++it )
 {
-PortionObj* pPortion = *it;
+const PortionObj& rPortion = *it;
 nPropertyFlags = 0;
-sal_uInt32 nCharAttr = pPortion->mnCharAttr;
-sal_uInt32 nCharColor = pPortion->mnCharColor;
+sal_uInt32 nCharAttr = rPortion.mnCharAttr;
+sal_uInt32 nCharColor = rPortion.mnCharColor;
 
 if ( nCharColor == COL_AUTO )   // nCharColor depends to the 
background color
 {
@@ -917,19 +917,19 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, 
TextObj& rTextObj )
 nPropertyFlags |= nCharAttr & 0x217;// not all attributes 
ar inherited
 else
 {
-if ( /* ( pPortion->mnCharAttrHard & 1 ) || */
+if ( /* ( rPortion.mnCharAttrHard & 1 ) || */
 ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, 
CharAttr_Bold, nCharAttr ) ) )
 nPropertyFlags |= 1;
-if ( /* ( pPortion->mnCharAttrHard & 2 ) || */
+if ( /* ( rPortion.mnCharAttrHard & 2 ) || */
 ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, 
CharAttr_Italic, nCharAttr ) ) )
 nPropertyFlags |= 2;
-if ( /* ( pPortion->mnCharAttrHard & 4 ) || */
+if ( /* ( rPortion.mnCharAttrHard & 4 ) || */
 ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, 
CharAttr_Underline, nCharAttr ) ) )
 nPropertyFlags |= 4;
-if ( /* ( pPortion->mnCharAttrHard & 0x10 ) || */
+if ( /* ( rPortion.mnCharAttrHard & 0x10 ) || */
 ( mpStyleSheet->IsHardAttribute( nInstance, pPara->nDepth, 
CharAttr_Shadow, nCharAttr ) ) )
 nPropertyFlags |= 0x10;
-if ( /* ( pPortion->mnCharAttrHard & 0x200 ) || */
+if ( /* ( rPortion.mnCharAttrHard & 0x200 ) || */
 ( mpStyleSheet->IsHardAttribute( n

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

[bugzilla-daemon]

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

--- Comment #33 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

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

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: chart2/source sfx2/source svx/source sw/source

[Noel Grandin]

 chart2/source/controller/dialogs/tp_AxisLabel.cxx   |6 +++---
 sfx2/source/toolbox/tbxitem.cxx |   16 ++--
 svx/source/tbxctrls/formatpaintbrushctrl.cxx|2 +-
 sw/source/core/doc/DocumentContentOperationsManager.cxx |4 ++--
 4 files changed, 20 insertions(+), 8 deletions(-)

New commits:
commit d92602c5b13d0a60439d86c5a033d124178726ca
Author: Noel Grandin 
Date:   Wed Sep 10 14:20:18 2014 +0200

more fixes for SfxItemState

In commit 88a874fc "convert SfxItemState constants to a proper enum"
I made some mistakes in converting bitwise logic to boolean logic.

I fixed one of those places in commit 7ad83656 "fix bitwise->logic
conversion in SfxItemState commit"

This commit fixes the other places where I converted bitwise to normal
boolean logic. I also validated that none of the existing code tries to
uses combinations of these enum values.

This commit also introduces an exception-throwing check in the one place
where the enum is explicitly cast to make sure that no combinations
sneak in.

Change-Id: I545f7d17b76c4fd999078867caec314e83ffe165
Signed-off-by: Stephan Bergmann 

diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx 
b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 3567639..5163ebb 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -153,7 +153,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs 
)
 bCheck = static_cast< const SfxBoolItem * >( pPoolItem 
)->GetValue();
 m_pCbShowDescription->Check( bCheck );
 
-if( aState != SFX_ITEM_DEFAULT && aState != SFX_ITEM_SET)
+if( aState != SFX_ITEM_DEFAULT && aState != SFX_ITEM_SET )
 m_pCbShowDescription->Hide();
 }
 
@@ -201,7 +201,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs 
)
 bCheck = static_cast< const SfxBoolItem * >( pPoolItem 
)->GetValue();
 m_pCbTextOverlap->Check( bCheck );
 
-if( aState != SFX_ITEM_DEFAULT )
+if( aState != SFX_ITEM_DEFAULT && aState != SFX_ITEM_SET )
 m_pCbTextOverlap->Hide();
 }
 
@@ -220,7 +220,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs 
)
 bCheck = static_cast< const SfxBoolItem * >( pPoolItem 
)->GetValue();
 m_pCbTextBreak->Check( bCheck );
 
-if( aState != SFX_ITEM_DEFAULT )
+if( aState != SFX_ITEM_DEFAULT && aState != SFX_ITEM_SET )
 {
 m_pCbTextBreak->Hide();
 if( ! m_pCbTextOverlap->IsVisible() )
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 47348ec..22a36a7 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -547,7 +547,13 @@ throw ( ::com::sun::star::uno::RuntimeException, 
std::exception )
 {
 ItemStatus aItemStatus;
 rEvent.State >>= aItemStatus;
-eState = (SfxItemState) aItemStatus.State;
+SfxItemState tmpState = (SfxItemState) aItemStatus.State;
+// make sure no-one tries to send us a combination of 
states
+if (eState != SfxItemState::UNKNOWN && eState != 
SFX_ITEM_DISABLED &&
+eState != SFX_ITEM_READONLY && eState != 
SFX_ITEM_DONTCARE &&
+eState != SFX_ITEM_DEFAULT && eState != SFX_ITEM_SET)
+throw ::com::sun::star::uno::RuntimeException("unknown 
status");
+eState = tmpState;
 pItem = new SfxVoidItem( nSlotId );
 }
 else if ( pType == cppu::UnoType< 
::com::sun::star::frame::status::Visibility>::get() )
@@ -1095,7 +1101,13 @@ throw ( ::com::sun::star::uno::RuntimeException, 
std::exception )
 {
 ItemStatus aItemStatus;
 rEvent.State >>= aItemStatus;
-eState = (SfxItemState) aItemStatus.State;
+SfxItemState tmpState = (SfxItemState) aItemStatus.State;
+// make sure no-one tries to send us a combination of 
states
+if (eState != SfxItemState::UNKNOWN && eState != 
SFX_ITEM_DISABLED &&
+eState != SFX_ITEM_READONLY && eState != 
SFX_ITEM_DONTCARE &&
+eState != SFX_ITEM_DEFAULT && eState != SFX_ITEM_SET)
+throw ::com::sun::star::uno::RuntimeException("unknown 
status");
+eState = tmpState;
 pItem = new SfxVoidItem( nSlotId );
 }
 else if ( pType == cppu::UnoType< 
::com::sun::star::frame::status::Visibility>::get() )
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx 
b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 27c6c8a..7e5619d 1

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

[Tor Lillqvist]

 sw/source/core/doc/docnew.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 628a0f27de2ad6712c87899b96fe4dcc20a592ef
Author: Tor Lillqvist 
Date:   Wed Sep 10 18:52:58 2014 +0300

WaE: implicit conversion of literal of type 'int' to 'bool'

Change-Id: Ie21c61d718d720ec6bac741cd17e807123f47129

diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index fc7288b..60330c8 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -1080,7 +1080,7 @@ void SwDoc::Append( const SwDoc& rSource, sal_uInt16 
nStartPageNumber,
 SwFmt *pFmt = 0;
 
 // find the first node allowed to contain a RES_PAGEDESC
-while (1) {
+while (true) {
 aFixupIdx++;
 
 SwNode &node = aFixupIdx.GetNode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Vinaya Mandke]

 oox/source/export/chartexport.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3383fd7b229a9d78044231bfb5ccca256fe400a2
Author: Vinaya Mandke 
Date:   Wed Sep 10 18:23:06 2014 +0530

Clean-up

Change-Id: I66255e8bc37191e859c134eab7d7f8117cd9181a
Reviewed-on: https://gerrit.libreoffice.org/11380
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index d074fe2..8fe0a87 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1187,14 +1187,14 @@ void ChartExport::exportBitmapFill( Reference< 
XPropertySet > xPropSet )
 {
 if( xPropSet.is() )
  {
-OUString sFillGradientName;
-xPropSet->getPropertyValue("FillBitmapName") >>= sFillGradientName;
+OUString sFillBitmapName;
+xPropSet->getPropertyValue("FillBitmapName") >>= sFillBitmapName;
 
 uno::Reference< lang::XMultiServiceFactory > xFact( getModel(), 
uno::UNO_QUERY );
 try
 {
-uno::Reference< container::XNameAccess > xGradient( 
xFact->createInstance("com.sun.star.drawing.BitmapTable"), uno::UNO_QUERY );
-uno::Any rValue = xGradient->getByName( sFillGradientName );
+uno::Reference< container::XNameAccess > xBitmap( 
xFact->createInstance("com.sun.star.drawing.BitmapTable"), uno::UNO_QUERY );
+uno::Any rValue = xBitmap->getByName( sFillBitmapName );
 OUString sBitmapURL;
 if( (rValue >>= sBitmapURL) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 sfx2/source/toolbox/tbxitem.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 71f75fcac9d3696010f7cda16115c4392559ff4b
Author: Tor Lillqvist 
Date:   Wed Sep 10 19:04:33 2014 +0300

no member named 'UNKNOWN' in 'SfxItemState'

Change-Id: Ice3d2bc4a575b324377273cdb655e06577f6a4a2

diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 22a36a7..0e559cb 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -549,7 +549,7 @@ throw ( ::com::sun::star::uno::RuntimeException, 
std::exception )
 rEvent.State >>= aItemStatus;
 SfxItemState tmpState = (SfxItemState) aItemStatus.State;
 // make sure no-one tries to send us a combination of 
states
-if (eState != SfxItemState::UNKNOWN && eState != 
SFX_ITEM_DISABLED &&
+if (eState != SFX_ITEM_UNKNOWN && eState != 
SFX_ITEM_DISABLED &&
 eState != SFX_ITEM_READONLY && eState != 
SFX_ITEM_DONTCARE &&
 eState != SFX_ITEM_DEFAULT && eState != SFX_ITEM_SET)
 throw ::com::sun::star::uno::RuntimeException("unknown 
status");
@@ -1103,7 +1103,7 @@ throw ( ::com::sun::star::uno::RuntimeException, 
std::exception )
 rEvent.State >>= aItemStatus;
 SfxItemState tmpState = (SfxItemState) aItemStatus.State;
 // make sure no-one tries to send us a combination of 
states
-if (eState != SfxItemState::UNKNOWN && eState != 
SFX_ITEM_DISABLED &&
+if (eState != SFX_ITEM_UNKNOWN && eState != 
SFX_ITEM_DISABLED &&
 eState != SFX_ITEM_READONLY && eState != 
SFX_ITEM_DONTCARE &&
 eState != SFX_ITEM_DEFAULT && eState != SFX_ITEM_SET)
 throw ::com::sun::star::uno::RuntimeException("unknown 
status");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 chart2/source/view/charttypes/GL3DBarChart.cxx |   79 -
 chart2/source/view/inc/GL3DBarChart.hxx|2 
 2 files changed, 41 insertions(+), 40 deletions(-)

New commits:
commit 778dd8f6f1b272c01e848235613d839b9c42b07b
Author: Michael Meeks 
Date:   Wed Sep 10 16:42:39 2014 +0100

fdo#83716 - fix deadlock holding mutex required by rendering thread.

Change-Id: I7195bba02474ac1c00fce0a93f59be622a920686

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index cc8ab34..6245b5f 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -932,7 +932,6 @@ void GL3DBarChart::clickedAt(const Point& rPos, sal_uInt16 
nButtons)
 
 maStepDirection = (maTargetDirection - 
maCameraDirection)/((float)mnStepsTotal);
 */
-
 }
 
 void GL3DBarChart::render()
@@ -947,20 +946,27 @@ void GL3DBarChart::mouseDragMove(const Point& rStartPos, 
const Point& rEndPos, s
 {
 long nDirection = rEndPos.X() - rStartPos.X();
 SharedResourceAccess(maCond1, maCond2);
-osl::MutexGuard aGuard(maMutex);
+osl::ClearableGuard aGuard(maMutex);
 if ((maRenderEvent == EVENT_NONE) || (maRenderEvent == EVENT_SHOW_SCROLL) 
||
 (maRenderEvent == EVENT_AUTO_FLY) || (maRenderEvent == 
EVENT_SHOW_SELECT))
 maRenderEvent = nDirection > 0 ? EVENT_DRAG_RIGHT : EVENT_DRAG_LEFT;
+bool bMove = false;
 if(nDirection < 0)
 {
 mnCornerId = (mnCornerId + 1) % 4;
-moveToCorner();
+bMove = true;
 }
 else if(nDirection > 0)
 {
 mnCornerId = mnCornerId - 1;
 if(mnCornerId < 0)
 mnCornerId = 3;
+bMove = true;
+}
+
+if (bMove)
+{
+aGuard.clear();
 moveToCorner();
 }
 }
commit d7d05136003d1d3adf74285ea1d52a60caaaf763
Author: Michael Meeks 
Date:   Wed Sep 10 16:32:05 2014 +0100

Re-factor ~inexcusible copy/paste coding away.

Change-Id: I2ad27cb09031dfadaa628939c191ccc5d88ecffe

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index cd03a38..cc8ab34 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -546,8 +546,7 @@ GL3DBarChart::~GL3DBarChart()
 mbRenderDie = true;
 }
 
-if(mpRenderThread.is())
-mpRenderThread->join();
+joinRenderThread();
 
 if(mbValidContext && mpWindow)
 mpWindow->setRenderer(NULL);
@@ -776,30 +775,43 @@ void GL3DBarChart::create3DShapes(const 
boost::ptr_vector& rDataSer
 mpRenderer->SetScrollSpeed((float)(BAR_SIZE_X + BAR_DISTANCE_X) / 
(float)miScrollRate);
 mpRenderer->SetScrollDistance((float)(BAR_SIZE_X + 
BAR_DISTANCE_X));
 }
-Size aSize = mpWindow->GetSizePixel();
-mpWindow->getContext().setWinSize(aSize);
-mpRenderThread = rtl::Reference(new 
RenderBenchMarkThread(this));
-mpWindow->getContext().resetCurrent();
-mpRenderThread->launch();
+spawnRenderThread(new RenderBenchMarkThread(this));
 }
 miDataUpdateCounter++;
 maHistoryCounter++;
 mbNeedsNewRender = true;
 }
 
-void GL3DBarChart::update()
+void GL3DBarChart::joinRenderThread()
 {
-if (mbBenchMarkMode)
-return;
 if(mpRenderThread.is())
+{
+// FIXME: badly want to assert that we don't
+// hold the mutex here ... but can't API-wise.
 mpRenderThread->join();
+}
+}
+
+void GL3DBarChart::spawnRenderThread(RenderThread *pThread)
+{
+joinRenderThread(); // not holding maMutex
+
+osl::MutexGuard aGuard(maMutex);
+
 Size aSize = mpWindow->GetSizePixel();
 mpWindow->getContext().setWinSize(aSize);
-mpRenderThread = rtl::Reference(new 
RenderOneFrameThread(this));
+mpRenderThread = rtl::Reference(pThread);
 mpWindow->getContext().resetCurrent();
 mpRenderThread->launch();
 }
 
+void GL3DBarChart::update()
+{
+if (mbBenchMarkMode)
+return;
+spawnRenderThread(new RenderOneFrameThread(this));
+}
+
 namespace {
 
 class PickingModeSetter
@@ -839,15 +851,7 @@ void GL3DBarChart::moveToDefault()
 return;
 }
 
-if(mpRenderThread.is())
-mpRenderThread->join();
-
-osl::MutexGuard aGuard(maMutex);
-Size aSize = mpWindow->GetSizePixel();
-mpWindow->getContext().setWinSize(aSize);
-mpRenderThread = rtl::Reference(new 
RenderAnimationThread(this, maCameraPosition, maDefaultCameraPosition, STEPS));
-mpWindow->getContext().resetCurrent();
-mpRenderThread->launch();
+spawnRenderThread(new RenderAnimationThread(this, maCameraPosition, 
maDefaultCameraPosition, STEPS));
 
 /*
  * TODO: moggi: add to thread
@@ -891,7 +895,7 @@ void GL3DBarChart::clickedAt(const Point& rPos, sal_uInt16 
nButtons)
 {
 PickingModeSetter aPickingModeSetter(mpRenderer.get());
 update

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

[Michael Stahl]

 sw/source/core/doc/doccomp.cxx |   13 -
 sw/source/core/docnode/section.cxx |5 -
 sw/source/uibase/app/docsh2.cxx|   16 +++-
 3 files changed, 15 insertions(+), 19 deletions(-)

New commits:
commit f3d791f7545d7eb1c518dca80037e76586a11e86
Author: Michael Stahl 
Date:   Wed Sep 10 18:42:41 2014 +0200

sw: [loplugin:externandnotdefined]

It turns out that document compare / merge and master document
insert file are all the callers of SwFindDocShell() so move the fix-up
there...

Change-Id: I912a464c3acab8d0adb7b5b659d62f629a15cb70

diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 41ac05e..cdb45d7 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1760,23 +1760,12 @@ void SwCompareData::SetRedlinesToDoc( bool bUseDocInfo )
 }
 }
 
-bool lcl_MergePortions(SwNode *const& pNode, void *)
-{
-if (pNode->IsTxtNode())
-{
-pNode->GetTxtNode()->FileLoadedInitHints();
-}
-return true;
-}
-
 // Returns (the difference count?) if something is different
 long SwDoc::CompareDoc( const SwDoc& rDoc )
 {
 if( &rDoc == this )
 return 0;
 
-const_cast(rDoc).GetNodes().ForEach(&lcl_MergePortions);
-
 long nRet = 0;
 
 // Get comparison options
@@ -2018,8 +2007,6 @@ long SwDoc::MergeDoc( const SwDoc& rDoc )
 
 long nRet = 0;
 
-const_cast(rDoc).GetNodes().ForEach(&lcl_MergePortions);
-
 GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
 
 SwDoc& rSrcDoc = (SwDoc&)rDoc;
diff --git a/sw/source/core/docnode/section.cxx 
b/sw/source/core/docnode/section.cxx
index 1755312..683c2d2 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1270,11 +1270,6 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, 
SwSectionNode& rSectNd )
 SwDoc* pSrcDoc = ((SwDocShell*)&xDocSh)->GetDoc();
 eOldRedlineMode = 
pSrcDoc->getIDocumentRedlineAccess().GetRedlineMode();
 pSrcDoc->getIDocumentRedlineAccess().SetRedlineMode( 
nsRedlineMode_t::REDLINE_SHOW_INSERT );
-if (2 == nRet)
-{
-bool lcl_MergePortions(SwNode *const& pNode, void *);
-pSrcDoc->GetNodes().ForEach(&lcl_MergePortions);
-}
 }
 }
 
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 38adecf..5caaaf7 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1488,6 +1488,15 @@ SfxInPlaceClient* SwDocShell::GetIPClient( const 
::svt::EmbeddedObjectRef& xObjR
 return pResult;
 }
 
+static bool lcl_MergePortions(SwNode *const& pNode, void *)
+{
+if (pNode->IsTxtNode())
+{
+pNode->GetTxtNode()->FileLoadedInitHints();
+}
+return true;
+}
+
 int SwFindDocShell( SfxObjectShellRef& xDocSh,
 SfxObjectShellLock& xLockRef,
 const OUString& rFileName,
@@ -1572,10 +1581,15 @@ int SwFindDocShell( SfxObjectShellRef& xDocSh,
 pMed->SetFilter( pSfxFlt );
 
 // If the new shell is created, SfxObjectShellLock should be used 
to let it be closed later for sure
-xLockRef = new SwDocShell( SFX_CREATE_MODE_INTERNAL );
+SwDocShell *const pNew(new SwDocShell(SFX_CREATE_MODE_INTERNAL));
+xLockRef = pNew;
 xDocSh = (SfxObjectShell*)xLockRef;
 if( xDocSh->DoLoad( pMed ) )
+{
+SwDoc const& rDoc(*pNew->GetDoc());
+
const_cast(rDoc).GetNodes().ForEach(&lcl_MergePortions);
 return 2;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 5 commits - Makefile.in scp2/inc scp2/source solenv/bin

[Tor Lillqvist]

 Makefile.in   |2 +-
 scp2/inc/macros.inc   |2 --
 scp2/source/ooo/common_brand.scp  |8 
 scp2/source/ooo/ure.scp   |   22 --
 scp2/source/python/file_python.scp|3 +++
 solenv/bin/macosx-codesign-app-bundle |9 ++---
 solenv/bin/ooinstall  |2 +-
 7 files changed, 31 insertions(+), 17 deletions(-)

New commits:
commit ed275039085f66feafe00d9eb05e95d0d12ab352
Author: Tor Lillqvist 
Date:   Tue Jun 10 12:34:10 2014 +0300

Make test-install work also in the non-release-build case

In the (default) --disable-release-build case the -p option to
make_installer.pl should be "LibreOffice_Dev", not "LibreOffice". See
instsetoo_native/util/openoffice.lst.in.

Also, the pathname passed to solenv/bin/macosx-codesign-app-bundle
needs to adapt to ENABLE_RELEASE_BUILD, either LibreOffice.app or
LibreOfficeDev.app.

Change-Id: If2b8efee096339f9c0cf52e663826d0086b1e35e
(cherry picked from commit 7826428cf80364099a3f351e7fec44043d88b05a)

diff --git a/Makefile.in b/Makefile.in
index f356208..c688bbf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -291,7 +291,7 @@ ifeq ($(OS_FOR_BUILD),WNT)
 else
@ooinstall $(TESTINSTALLDIR)
 ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-   @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice.app
+   @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if 
$(ENABLE_RELASE_BUILD),,Dev).app
 endif
 endif
@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 70763c9..cf4d3db 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -98,7 +98,7 @@ system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
 "perl " .
 (scalar keys(%DB::sub) ? "-d " : "") .
 "-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
-"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
LibreOffice " .
+"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
LibreOffice" . ($ENV{ENABLE_RELEASE_BUILD} ? "" : "_Dev") . " " .
 "-u $tmp_dir " .
 "-buildid $BUILD $destdir $strip $msi " .
 "-simple $path") && die "Failed to install: $!";
commit 12b047165eef7bc48065ab6604f7705966a92586
Author: Tor Lillqvist 
Date:   Fri Aug 15 01:52:17 2014 +0300

The --resource-rules option in being deprecated

The documentation is a bit unclear yet, but I think it is safe to
assume that Apple strongly wants sandboxed apps to have what we call
ENABLE_MACOSX_MACLIKE_APP_STRUCTURE and to be signed without any
special resource rules.

(cherry picked from commit 41f2ebfbaa9fb06f56530b4a330fc029df87ecfd)

diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
index d21031a..de5ec79 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -84,11 +84,14 @@ done
 # (bootstraprc and similar that the user might adjust and image files)
 # See also https://developer.apple.com/library/mac/technotes/tn2206/
 
-if test "$ENABLE_MACOSX_SANDBOX" = "TRUE"; then
+id=`echo ${MACOSX_APP_NAME} | tr ' ' '-'`
+
+if test -n "$ENABLE_MACOSX_SANDBOX"; then
 entitlements="--entitlements $BUILDDIR/lo.xcent"
+else
+resource_rules="--resource-rules 
$SRCDIR/setup_native/source/mac/CodesignRules.plist"
 fi
 
-id=`echo ${MACOSX_APP_NAME} | tr ' ' '-'`
-codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}.$id" 
--resource-rules "$SRCDIR/setup_native/source/mac/CodesignRules.plist" --sign 
"$MACOSX_CODESIGNING_IDENTITY" $entitlements "$APP_BUNDLE"
+codesign --force --verbose --identifier="${MACOSX_BUNDLE_IDENTIFIER}.$id" 
$resource_rules --sign "$MACOSX_CODESIGNING_IDENTITY" $entitlements 
"$APP_BUNDLE"
 
 exit 0
commit 4867113c0078037d0549e635a6b93aa4ddfad99c
Author: Tor Lillqvist 
Date:   Fri Aug 15 09:01:00 2014 +0300

Typo

Change-Id: I9ba1a5679eb636103ccf7b34f120ed0d03903e76
(cherry picked from commit 5794fcad10df4d6ac8388627662ea830dde7e629)

diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 6d4e84d..ab7e0fd 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -91,7 +91,7 @@ Directory gid_Dir_Ure_Share_Misc
 #if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 ParentID = gid_Brand_Dir_Share_Ure_Share;
 #else
-ParentID = gir_Dir_Ure_Share;
+ParentID = gid_Dir_Ure_Share;
 #endif
 DosName = "misc";
 End
commit d3a0971204c947e3540d72a750bf417cbc9564b4
Author: Tor Lillqvist 
Date:   Fri Aug 15 01:51:05 2014 +0300

Fixes for the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE case

Change-Id: Ic3d27298264df9aa4e3e976fbca477106dbe180a
(cherry picked from commit 88be7b54c5be57c7ecabe200731262e24c0ca0a4)

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index d2514fb..dbd43cf 100755
--- a/scp2/inc/macros.in

Re: I am new employee, with VS problem

[Bjoern Michaelsen]

On Wed, Sep 10, 2014 at 12:00:13PM +, Juergen Funk wrote:
> Yes it is running, in this case all is fine.

So, if the MSVS solution generation still doesnt work after that, the:

"make[1]: ***.  Stop."

Suggests that the:

 LC_MESSAGES=C D:/Dev/cygwin/opt/lo/bin/make cmd="D:/Dev/cygwin/opt/lo/bin/make 
-npf Makefile.gbuild all" cmd

call somehow is unhappy. But this is kinda hard to analyse remotely, maybe you
can get in contact on #libreoffice-dev on freenode IRC for more interactive 
help?

Best,

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

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

[Jan-Marek Glogowski]

 sw/source/uibase/dbui/dbmgr.cxx |   44 ++--
 1 file changed, 29 insertions(+), 15 deletions(-)

New commits:
commit 65981011d84fdcf90533b59f25f01a7f734d6c5e
Author: Jan-Marek Glogowski 
Date:   Tue Jul 1 21:42:30 2014 +0200

Normalize SwDBManager::Merge{MailFiles,Documents}

There is still a difference, if run mail merge throught one or
the other function (MM wizard or UNO).

Change-Id: Ia372bd3edea4c8dfb58e045fc8fed2efcb2a4fde
Reviewed-on: https://gerrit.libreoffice.org/10971
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 895ffc3..80edc3a 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -943,21 +943,23 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 
 //copy the styles from the source to the target document
 pTargetView->GetDocShell()->_LoadStyles( *pSourceDocSh, true );
+
 //determine the page style and number used at the start of the 
source document
 pSourceShell->SttEndDoc(true);
 nStartingPageNo = pSourceShell->GetVirtPageNum();
 sStartingPageDesc = sModifiedStartingPageDesc = 
pSourceShell->GetPageDesc(
 
pSourceShell->GetCurPageDesc()).GetName();
-// copy compatibility options
-lcl_CopyCompatibilityOptions( *pSourceShell, *pTargetShell);
-// #72821# copy dynamic defaults
-lcl_CopyDynamicDefaults( *pSourceShell->GetDoc(), 
*pTargetShell->GetDoc() );
+
 // #i72517#
 const SwPageDesc* pSourcePageDesc = 
pSourceShell->FindPageDescByName( sStartingPageDesc );
 const SwFrmFmt& rMaster = pSourcePageDesc->GetMaster();
 bPageStylesWithHeaderFooter = rMaster.GetHeader().IsActive()  
||
 rMaster.GetFooter().IsActive();
 
+// copy compatibility options
+lcl_CopyCompatibilityOptions( *pSourceShell, *pTargetShell);
+// #72821# copy dynamic defaults
+lcl_CopyDynamicDefaults( *pSourceShell->GetDoc(), 
*pTargetShell->GetDoc() );
 }
 
 PrintMonitor aPrtMonDlg(&pSourceShell->GetView().GetEditWin(), 
PrintMonitor::MONITOR_TYPE_PRINT);
@@ -1047,18 +1049,24 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* 
pSourceShell,
 lcl_SaveDoc( xWorkDocSh, "WorkDoc", nDocNo );
 #endif
 
-{
 //create a view frame for the document
-SfxViewFrame* pWorkFrame = 
SfxViewFrame::LoadHiddenDocument( *xWorkDocSh, 0 );
+SwView* pWorkView = static_cast< SwView* >( 
SfxViewFrame::LoadHiddenDocument( *xWorkDocSh, 0 )->GetViewShell() );
 //request the layout calculation
-SwWrtShell& rWorkShell =
-static_cast< SwView* 
>(pWorkFrame->GetViewShell())->GetWrtShell();
-rWorkShell.CalcLayout();
-SwDoc* pWorkDoc = 
((SwDocShell*)(&xWorkDocSh))->GetDoc();
+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));
-
pWorkDoc->getIDocumentFieldsAccess().UpdateFlds(NULL, false);
+rWorkShell.SwViewShell::UpdateFlds();
 
SfxGetpApp()->NotifyEvent(SfxEventHint(SW_EVENT_FIELD_MERGE_FINISHED, 
SwDocShell::GetEventName(STR_SW_EVENT_FIELD_MERGE_FINISHED), xWorkDocSh));
 
 pWorkDoc->RemoveInvisibleContent();
@@ -1226,7 +1234,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
 }
 }
 pWorkDoc->SetDBManager( pOldDBManager );
-}
+
 xWorkDocSh->DoCl

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

[Jan-Marek Glogowski]

 sw/inc/IDocumentContentOperations.hxx   |3 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   58 +---
 sw/source/core/doc/docnew.cxx   |1 
 sw/source/core/inc/DocumentContentOperationsManager.hxx |6 +
 sw/source/core/view/vdraw.cxx   |   11 +++
 5 files changed, 48 insertions(+), 31 deletions(-)

New commits:
commit 508d2d2b1a6a23043c8c0f0d3fea4ec033ac2684
Author: Jan-Marek Glogowski 
Date:   Sun Jul 13 20:15:55 2014 +0200

fdo#80926 Don't move anchors of invalid pages

If the anchor is valid, check if its page is valid too,
before moving anchors on view change.

Change-Id: Idffdfdb786cb29a105c06d652e6ad7315abfb4c5
Reviewed-on: https://gerrit.libreoffice.org/10976
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index cfadd9e..4ac2908 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -227,6 +227,17 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz )
 {
 continue;
 }
+else
+{
+// Actually this should never happen but currently layouting
+// is broken. So don't move anchors, if the page is invalid.
+// This should be turned into an DBG_ASSERT, once layouting is 
fixed!
+const SwPageFrm *pPageFrm = pAnchor->FindPageFrm();
+if (!pPageFrm || pPageFrm->IsInvalid() ) {
+SAL_WARN( "sw.resizeview", "Trying to move anchor from 
invalid page - fix layouting!" );
+continue;
+}
+}
 
 // no move for drawing objects in header/footer
 if ( pAnchor->FindFooterOrHeader() )
commit 9099e21b89184bd4e39def497e483cac4a77ec5a
Author: Jan-Marek Glogowski 
Date:   Tue Jul 1 15:45:47 2014 +0200

Fix single node CopyRange

Previously there was a restriction for the range to contain at
least two nodes.

Change-Id: Iadf21d3928303c2ab8df0d93dabd969ed1ff7e09
Reviewed-on: https://gerrit.libreoffice.org/10972
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sw/inc/IDocumentContentOperations.hxx 
b/sw/inc/IDocumentContentOperations.hxx
index f30b774..2676a2f 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -70,9 +70,6 @@ public:
 The position can be in the same or in an another document. It can also
 be within the range!
 
-\warning The range has to include at least two nodes or has to be a
-SwDoc::IsColumnSelection!
-
 Normally this function should work only with content nodes. But there
 is a special case used by SwDoc::Paste, which starts the SwPaM at the
 content start node. This position doesn't contain any content:
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index e9aeddb..c6cabe8 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -1586,7 +1586,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, 
SwPosition& rPos, cons
 bool bColumnSel = pDoc->IsClipBoard() && pDoc->IsColumnSelection();
 
 // Catch if there's no copy to do
-if( !rPam.HasMark() || ( *pStt >= *pEnd && !bColumnSel ) )
+if( !rPam.HasMark() || ( *pStt > *pEnd && !bColumnSel ) )
 return false;
 
 // Prevent copying in Flys that are anchored in the area
@@ -3111,7 +3111,8 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
 const SwPaM* pCopiedPaM,
 const bool bMakeNewFrms,
 const bool bDelRedlines,
-const bool bCopyFlyAtFly ) const
+const bool bCopyFlyAtFly,
+const bool bMergedFirstNode ) const
 {
 SwDoc* pDest = rInsPos.GetNode().GetDoc();
 
@@ -3119,13 +3120,17 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
 
 SwNodeIndex aSavePos( rInsPos, -1 );
 bool bEndIsEqualEndPos = rInsPos == rRg.aEnd;
-m_rSwdoc.GetNodes()._CopyNodes( rRg, rInsPos, bMakeNewFrms, true );
-++aSavePos;
-if( bEndIsEqualEndPos )
+SwNodeRange aRg( rRg );
+if ( bMergedFirstNode )
+aRg.aStart++;
+if ( aRg.aStart <= aRg.aEnd )
+m_rSwdoc.GetNodes()._CopyNodes( aRg, rInsPos, bMakeNewFrms, true );
+if ( !bMergedFirstNode )
+++aSavePos;
+if ( bEndIsEqualEndPos )
 ((SwNodeIndex&)rRg.aEnd) = aSavePos;
 
 aRedlRest.Restore();
-
 #if OSL_DEBUG_LEVEL > 0
 {
 //JP 17.06.99: Bug 66973 - check count only if the selection is in
@@ -3139,9 +3144,9 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
 !aTmpI.GetNode().IsEndNode() )
 {
 // If the range starts with a SwStartNode, it isn't copied
- 

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

[Jan-Marek Glogowski]

 sw/source/core/layout/anchoreddrawobject.cxx |   16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 5dc8691e0909654c68eb0dcbc6d787701d02839b
Author: Jan-Marek Glogowski 
Date:   Sat Jul 12 19:27:11 2014 +0200

Invalidate rect cache before moving object

Otherwise I get sw/source/core/layout/anchoredobject.cxx:582:

   - cache for object
  rectangle inclusive spaces marked as valid, but it couldn't be.
  Missing invalidation of cache. Please inform OD.

Change-Id: I3f315b15fca6e2480c11183269be5583e6aea123
Reviewed-on: https://gerrit.libreoffice.org/10977
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sw/source/core/layout/anchoreddrawobject.cxx 
b/sw/source/core/layout/anchoreddrawobject.cxx
index 43aeb13..628ed13 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -794,14 +794,20 @@ void SwAnchoredDrawObject::_SetPositioningAttr()
 
 // --> #i71182#
 // only change position - do not lose other attributes
+
 SwFmtHoriOrient aHori( GetFrmFmt().GetHoriOrient() );
-aHori.SetPos( nHoriPos );
-GetFrmFmt().SetFmtAttr( aHori );
+if (nHoriPos != aHori.GetPos()) {
+aHori.SetPos( nHoriPos );
+InvalidateObjRectWithSpaces();
+GetFrmFmt().SetFmtAttr( aHori );
+}
 
 SwFmtVertOrient aVert( GetFrmFmt().GetVertOrient() );
-
-aVert.SetPos( nVertPos );
-GetFrmFmt().SetFmtAttr( aVert );
+if (nVertPos != aVert.GetPos()) {
+aVert.SetPos( nVertPos );
+InvalidateObjRectWithSpaces();
+GetFrmFmt().SetFmtAttr( aVert );
+}
 
 // --> #i36010# - set layout direction of the position
 GetFrmFmt().SetPositionLayoutDir(
___
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

[Matthew J . Francis]

 i18npool/inc/xdictionary.hxx|2 +
 i18npool/source/breakiterator/breakiterator_unicode.cxx |2 -
 i18npool/source/breakiterator/xdictionary.cxx   |   21 
 3 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 44ead04eb5fc61a3f56f783adb1509fab440e212
Author: Matthew J. Francis 
Date:   Thu Sep 11 00:42:49 2014 +0800

fdo#81272 Speed up break iterators

Change-Id: I7a45a61465f71a1cc6f583b9ffc68157d19e51fa
Reviewed-on: https://gerrit.libreoffice.org/11386
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index 57f5238..f7c0110 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.hxx
@@ -76,6 +76,8 @@ public:
 
 private:
 WordBreakCache cache[CACHE_MAX];
+OUString segmentCachedString;
+Boundary segmentCachedBoundary;
 
 boolseekSegment(const OUString& rText, sal_Int32 pos, Boundary& 
boundary);
 WordBreakCache& getCache(const sal_Unicode *text, Boundary& boundary);
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 5270b1d..658d4ff 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -185,7 +185,7 @@ void SAL_CALL 
BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
 }
 }
 
-if (newBreak || !icuBI->aICUText.equals(rText))
+if (newBreak || icuBI->aICUText.pData != rText.pData)
 {
 // UChar != sal_Unicode in MinGW
 const UChar *pText = reinterpret_cast(rText.getStr());
diff --git a/i18npool/source/breakiterator/xdictionary.cxx 
b/i18npool/source/breakiterator/xdictionary.cxx
index 1067e33..b930f46 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -271,6 +271,23 @@ bool xdictionary::seekSegment(const OUString &rText, 
sal_Int32 pos,
 Boundary& segBoundary)
 {
 sal_Int32 indexUtf16;
+
+if (segmentCachedString.pData != rText.pData) {
+// Cache the passed text so we can avoid regenerating the segment if 
it's the same
+// (pData is refcounted and assigning the OUString references it, 
which ensures that
+// the object is the same if we get the same pointer back later)
+segmentCachedString = rText;
+} else {
+// If pos is within the cached boundary, use that boundary
+if (pos >= segmentCachedBoundary.startPos && pos <= 
segmentCachedBoundary.endPos) {
+segBoundary.startPos = segmentCachedBoundary.startPos;
+segBoundary.endPos = segmentCachedBoundary.endPos;
+indexUtf16 = segmentCachedBoundary.startPos;
+rText.iterateCodePoints(&indexUtf16, 1);
+return segmentCachedBoundary.endPos > indexUtf16;
+}
+}
+
 segBoundary.endPos = segBoundary.startPos = pos;
 
 indexUtf16 = pos;
@@ -293,6 +310,10 @@ bool xdictionary::seekSegment(const OUString &rText, 
sal_Int32 pos,
 break;
 }
 
+// Cache the calculated boundary
+segmentCachedBoundary.startPos = segBoundary.startPos;
+segmentCachedBoundary.endPos = segBoundary.endPos;
+
 indexUtf16 = segBoundary.startPos;
 rText.iterateCodePoints(&indexUtf16, 1);
 return segBoundary.endPos > indexUtf16;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source editeng/source filter/source fpicker/source framework/inc framework/source helpcontent2 include/ucbhelper include/unotools odk/examples qadevOOo/tests s

[Julien Nabet]

 dbaccess/source/ui/browser/unodatbr.cxx
  |2 -
 editeng/source/editeng/impedit3.cxx
  |2 -
 filter/source/config/cache/cacheitem.hxx   
  |2 -
 filter/source/config/cache/typedetection.hxx   
  |4 +-
 fpicker/source/win32/misc/WinImplHelper.cxx
  |4 +-
 framework/inc/classes/filtercachedata.hxx  
  |4 +-
 framework/inc/dispatch/closedispatcher.hxx 
  |2 -
 framework/inc/dispatch/interceptionhelper.hxx  
  |2 -
 framework/inc/general.h
  |2 -
 framework/inc/jobs/jobdata.hxx 
  |2 -
 framework/inc/threadhelp/transactionmanager.hxx
  |2 -
 framework/source/accelerators/keymapping.cxx   
  |2 -
 framework/source/accelerators/presethandler.cxx
  |2 -
 framework/source/dispatch/closedispatcher.cxx  
  |2 -
 framework/source/dispatch/dispatchprovider.cxx 
  |8 ++--
 framework/source/fwe/dispatch/interaction.cxx  
  |2 -
 framework/source/fwi/jobs/configaccess.cxx 
  |2 -
 framework/source/fwi/threadhelp/transactionmanager.cxx 
  |2 -
 framework/source/helper/ocomponentenumeration.cxx  
  |4 +-
 framework/source/helper/oframes.cxx
  |2 -
 framework/source/inc/accelerators/presethandler.hxx
  |4 +-
 framework/source/inc/loadenv/loadenv.hxx   
  |2 -
 framework/source/jobs/job.cxx  
  |2 -
 framework/source/recording/dispatchrecordersupplier.cxx
  |2 -
 framework/source/services/autorecovery.cxx 
  |   20 +-
 framework/source/services/desktop.cxx  
  |8 ++--
 framework/source/services/frame.cxx
  |4 +-
 helpcontent2   
  |2 -
 include/ucbhelper/interceptedinteraction.hxx   
  |2 -
 include/unotools/viewoptions.hxx   
  |4 +-
 odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java 
  |2 -
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
  |4 +-
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java  
  |6 +--
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java   
  |2 -
 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
 |2 -
 qadevOOo/tests/java/ifc/container/_XContainerQuery.java
  |2 -
 sal/textenc/tcvtjp2.tab
  |2 -
 sfx2/source/inc/templdgi.hxx   
  |2 -
 shell/source/tools/lngconvex/lngconvex.cxx 
  |2 -
 toolkit/source/awt/vclxaccessiblecomponent.cxx 
  |2 -
 unotools/source/config/viewoptions.cxx 
  |2 -
 41 files changed, 66 insertions(+), 66 deletions(-)

New commits:
commit 037d03b9facb414ba6be01fa6ee92fc7ca89f70c
Author: Julien Nabet 
Date:   Wed Sep 10 22:35:39 2014 +0200

Typo: (N|n)ormaly->(N|n)ormally

Change-Id: I96d081f394b0b62d99ec1034bf5e99da9aedd9d9

diff --git a/dbaccess/source/ui/browser/unodatbr.cxx 
b/dbaccess/source/ui/browser/unodatbr.cxx
index 1076acc..4e8e4e7 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -659,7 +659,7 @@ bool SbaTableQueryBrowser::InitializeGridModel(const 
Reference< ::com::sun::star
 Reference xConnection;
 Reference xRowSetProps(getRowSet(),UNO_QUERY);
 xRow

[Libreoffice-commits] core.git: Changes to 'libreoffice-4-3-2'

[Robinson Tryon]

New branch 'libreoffice-4-3-2' available with the following commits:
commit a7481a80747a297d0968552af94b730718e25ea7
Author: Robinson Tryon 
Date:   Wed Sep 10 18:07:56 2014 -0400

   Branch libreoffice-4-3-2

   This is 'libreoffice-4-3-2' - the stable branch for the 4.3.2 release.
   Only very safe changes, reviewed by three people are allowed.

   If you want to commit more complicated fix for the next 4.3.x release,
   please use the 'libreoffice-4-3' branch.

   If you want to build something cool, unstable, and risky, use master.

___
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' - configure.ac

[Robinson Tryon]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 306f499f0468c9b2260f3e3797594b8fcaaba706
Author: Robinson Tryon 
Date:   Wed Sep 10 19:29:54 2014 -0400

bump product version to 4.3.3.0.0+

Change-Id: If10a7c3e1b92e4c9514064458d103d7e21040586

diff --git a/configure.ac b/configure.ac
index 9cd589b..7aaa5d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.3.2.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.3.3.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
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-2' - configure.ac

[Robinson Tryon]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a932f1105f0601e06d5792a2214e9567040aba00
Author: Robinson Tryon 
Date:   Wed Sep 10 19:44:18 2014 -0400

bump product version to 4.3.2.1.0+

Change-Id: Ic8cd21120c38fcf7eaf50acb857b1595d75cd6eb

diff --git a/configure.ac b/configure.ac
index 9cd589b..a4c7e97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.3.2.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.3.2.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Robinson Tryon]

Tag 'libreoffice-4.3.2.1' created by Robinson Tryon  at 
2014-09-11 02:05 -0700

Tag libreoffice-4.3.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUEPVjAAoJEPQ0oe+v7q6jNJUP/ikAnDnCsCl1BKYt7ki3TCtd
wIWByjvL2J4bQEJI7uAdzhRQo4sgElllFQ5IaKjvKRftdWFx4+zy5O+jsGK9QPaK
yjemPZ0FpkKlERqJhq3y8C03kuEd8U0Za989nOBGxpvZjBSmFNyTJOfDMJUIEass
Sy7apC2SF1Prlh3cCRo074oY56TNnW2hxgdRb+4MdbXuMZmFomTn4vQgOUQ42xcQ
fJ6rimmOa2Cf5NKXh75XeihREXnJcBrBTpHfp83gMqZ083loXUOhvxIY3Px2KCAD
y/bIMbDmk6tRSuBwHqnatMsX293B5z3OTCHu4CMvCQjGnPke9bVVTPEEI8IISnoP
4nvfhgKxRUUqz4JgLBHHzr3xjXTk0mrnFqUBXrf444dqpXCad1KRpngzLUUlAcVl
9K4p10r5pSgicip+GG/SJGBr/byFUFbbWxrJJi0HLwXJUWYV7UeWagWl0dcJIg16
Udt3VPSxdDned9qJbvDtVdQVmJtOtMlqAaouXFSRD+c3ODeHxkD+ShxIc7JIlu8N
TLHGTDNniC84PnaMburDfOWicWBMVThkMcjWwNlqRC7xtUqW3wXc0KCc8oXLJzEs
1SIgdXnTCrnOdau9PLxKAOmUh1caCgfu5JYl8V2DQy8abaDqaOBZWtbkYwUiMpQ9
3xnTjezDYeLpnCEdU1VG
=zmax
-END PGP SIGNATURE-

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

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

[Robinson Tryon]

Tag 'libreoffice-4.3.2.1' created by Robinson Tryon  at 
2014-09-11 02:05 -0700

Tag libreoffice-4.3.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUEPVkAAoJEPQ0oe+v7q6jYKIQAIexTlLRQC84RnWaMJOs18Eq
I4Xj95IdTt+nZA96mNZPyzau0xq2NSpBtLgyh+3o3VsM5X6b9gkxVXTTCDwzCrDy
btIvRJMrk9ayYxh1sCUIP30JZy3HHPKhaoOvH10qETs7Ak+4+BA3RoA99BxCEBvl
zSoICfYDh+j+0IurCq4i43dtuIy5pLMRhsCg00QOOAIxdTmedbelwCbGxGoHMk0g
RRES5duPISVv087EnaIO/doOrJRk6klCh2UQE1QzoIjLRynHLmvJ0k2tKJPIqR1P
AsWWVIsuvgHHvRlcph55A+CxpqzRgqULFbeDEgAMWUBUHdR4BU5kWhpsu1pFLmbV
gTgFAogGuVlG5il9AHs/I+bgwzay121OgOSr0jOcKhB9AIcm5y30BJjLZwM1L+cZ
e8ahCyFxinohKAj0uxKlCZgV7TlvmTdgtrt9pN42swvtFRx7yn8jKp6PczDfHpTC
7bO4UmjnlfmX8jMPdrwJXosuv3hYb4ptj0fJLFo4+2kNEzMnsHPhb2YLTmzFJi7X
AezBaCBSlrZx7R2oVped2yEhQstZ2hNX5hM5a0kETLegEQ7K798nhTPPXQxA5tXA
A37Wo80SW78DexsvHA+um+dMQ6cHMMjDjAxVevRWpNd+NMfI8p/uxikeCX2Bv7Fw
7Ud5MkceAJP8zYJlP3pe
=6lT5
-END PGP SIGNATURE-

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

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

[Robinson Tryon]

Tag 'libreoffice-4.3.2.1' created by Robinson Tryon  at 
2014-09-11 02:05 -0700

Tag libreoffice-4.3.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUEPVkAAoJEPQ0oe+v7q6j6x4QAM7lDH6WGLYVHeyxemy7ILoW
un0HXBL1mCa5KsAeuJWOFXtfXEjYExY4fbKDpt16or3wxefOJ4ZPno0ftdjGHBkv
/Af7SpD7fxYr1wClg+wD8NqIOlfirGZ6JZ2VshdVw8HxMITfyObMTwyKbl0adPvW
5wHNmH87zMMvNfHwod+vVK0al8mSN370wyCkaIaA1FWE7OUTp0siBTbA/TGZmn2k
wii4gL53Rvs6Ewk8c4272UqaEHg421KeDEF5rslbYKkNrHMOBG7+ykCKdN20NPEY
wGDRtwJpneHuHiYv7ZvvTnftM1PEaWqdni8YKVc4K8bHZPkfV7Rd5CYgG9o3sSz5
rXiJ32H5qf6vs2IS5bxcgZW2m1X3A/xUrDzhCgb9Vw4LHYK6T6kEDiDFwPC/2ADr
dMC4NGo+zic/BCe/ZQc9HyXc3fuJqS02nQl+HclM6CnXyY86JDCHFTnlqAxnfAsm
DJwU2Bu+ihI6L+7chgpaXkN8HVdgmamtix1je1N/cYe/A8Cb6KeqAgTjO6Hg2N99
wC7h81JqfDVHzTGMJ+4TI/+91AjTOlroQj8DAHZze2hxveCiIshxCluTq7e88tT3
4R04oXy1Tguoly9WnxNIg2tprhDk+EofGLCVxQQlqqkwK0SITBzA16VlZn1lhzHD
M5QeOAccW1LXYXU4TvgX
=OKnG
-END PGP SIGNATURE-

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

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

[Robinson Tryon]

Tag 'libreoffice-4.3.2.1' created by Robinson Tryon  at 
2014-09-11 02:05 -0700

Tag libreoffice-4.3.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJUEPVkAAoJEPQ0oe+v7q6jgs8P/j/LF04gnvvRbRZQTRTsO6is
LGbGI/NtHesbFrV/ZL+B51RQZ3Jw7nJl+yJl3eeWs+a7qreahBpoffCsIQhC3JIc
hVyQohpswGfinQxAN2B90ApyjMRGDVUNQZ6oRhJ8e19DAz+Eovd06DW19XtnA1a3
J4VF1eoT6BQIcQ3va5EJbE9v7UwabAA6wt9UwNBiHB4rdDGOqpOnN92+IXzG1XaM
09vOs/ORlubbT85mHGI0l64ML5pebA4G4nVvkfLifzPMiaOevY2VS1PXLn6XR8ax
iVPlUScsX2hx9FMw9SznJYuUYJn6wVZ+maHqSrPhuyF8V8GT66awQNpGr78RtaF4
BKmF+4afxH1ZmI0P7DbE5CSIui9HEY3w7pJ2TqG8gqbxJmEMbu9ZjD6PWzGYium2
xd0KwNvmeZUIpn3IXWSS6qgjVg3kySe3BdCS+vLRPds6GvSpRfTXv1/exiuK0RZc
G8ZNfpQ8oxF97I2WmfOXcMnyysuR2ago0kERR4Qm3VOtdbrl+WOSyGFbMTEb9p5i
x/ZDvBGqU5soPhannt0lyPHA+bqRrcV4sf/utOMjMY3v6k8JAzkSXgFyDtobe9Vp
xiUUE9aZJ2ehAYeHSyms9C4GhtE+KRSgWcaRfqmvJI/GFm2ekyX2Vvqi2wyQ/TJ1
IgyFHvzLf7JpPHvICJie
=piIx
-END PGP SIGNATURE-

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

Re: Performance samples for LibreOffice ...

[Jan Hubicka]

> On 10/09/14 07:45, Jan Hubicka wrote:
> 
> > Yep, I am curious too.  I just got my trees updated after vacation so 
> > hopefully
> > I will get there soon (for sure libreoffice will trigger few GCC bugs first)
> 
> yes we do have a certain reputation for that...thanks to Miklos now you
> can even get the t-shirt for it:
> 
> http://vmiklos.hu/blog/so-many-bugs.html

:) Lovely
After all I needed to fix only two bugs to get LO build with mainline LTO again.

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.

Most of the later cases seems real.

/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
 ^
/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;
   ^
/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;
 ^
/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;
 ^
/aux/hubicka/libreoffice/xmloff/source/text/XMLIndexTemplateContext.hxx:42:0: 
warning: type of ‘aSvLevelNameTOCMap’ does not match original declaration
 extern const SvXMLEnumMapEntry aSvLevelNameTOCMap[];
 ^
/aux/hubicka/libreoffice/xmloff/source/text

LibreOffice Gerrit News for core on 2014-09-11

[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 typ

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

[rbuj]

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

New commits:
commit 2844128a9494c2877595b65ee01f4c099176cafa
Author: rbuj 
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 
Tested-by: Noel Grandin 

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

[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 
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 
Tested-by: Noel Grandin 

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

[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 
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 
Tested-by: Noel Grandin 

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

[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 
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 
Tested-by: Noel Grandin 

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

[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 
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 
Tested-by: Noel Grandin 

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

[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 
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

[Michael Stahl]

 sal/osl/unx/thread.c |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit f49abb2ab3349d4c9956142e835b7f8bb5734692
Author: Michael Stahl 
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 

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

[Stephan Bergmann]

 sw/source/uibase/dbui/dbmgr.cxx |  308 
 1 file changed, 154 insertions(+), 154 deletions(-)

New commits:
commit a1251a7825096f9ff8240baa66f6318e448b2654
Author: Stephan Bergmann 
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 );
-