jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
| 7 +++++--
odk/source/com/sun/star/lib/loader/Loader.java
| 4 ++--
scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
| 2 +-
vcl/unx/gtk3/gtk3gtkframe.cxx
| 2 +-
wizards/com/sun/star/wizards/form/FormDocument.java
| 2 +-
wizards/com/sun/star/wizards/form/StyleApplier.java
| 10 ++++++----
wizards/com/sun/star/wizards/report/ReportTextDocument.java
| 2 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
| 2 +-
8 files changed, 18 insertions(+), 13 deletions(-)
New commits:
commit d7a292ce490eeb8ff02e145e0a55f41f4c179541
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 18 17:20:34 2016 +0000
gtk3: Resolves: tdf#96333 fix RTL menu positioning
Change-Id: I22c5186371e558ed84da81c43400379c218ca816
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 4e917ba..c1d7f6e 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1620,7 +1620,7 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long
nWidth, long nHeight, sal_u
if( m_pParent )
{
if( AllSettings::GetLayoutRTL() )
- nX = m_pParent->maGeometry.nWidth-maGeometry.nWidth-1-nX;
+ nX = m_pParent->maGeometry.nWidth-m_nWidthRequest-1-nX;
nX += m_pParent->maGeometry.nX;
nY += m_pParent->maGeometry.nY;
}
commit 825e23ff12eca36d299b8903af340e3795bcbf16
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 18 16:41:06 2016 +0000
coverity#1326383 Dereference null return value
Change-Id: Iaa1769e4ecf116bfbab32b9ef6f6413e25a5f5fe
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java
b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 3f20fd8..88c1a63 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -349,10 +349,12 @@ public class StyleApplier
String sFilePath = getStylePath() + "/" + _filename;
int[] oStylePropList = new int[6];
String[] sData = FileAccess.getDataFromTextFile(xMSF, sFilePath);
- oStylePropList[SOBACKGROUNDCOLOR] = getStyleColor(sData, ".toctitle
{", "background-color:");
- oStylePropList[SODBTEXTCOLOR] = getStyleColor(sData, ".doctitle {",
"color:");
- oStylePropList[SOLABELTEXTCOLOR] = getStyleColor(sData, ".toctitle {",
"color:");
- oStylePropList[SOBORDERCOLOR] = getStyleColor(sData, ".tcolor {",
"border-color:");
+ if (sData != null) {
+ oStylePropList[SOBACKGROUNDCOLOR] = getStyleColor(sData,
".toctitle {", "background-color:");
+ oStylePropList[SODBTEXTCOLOR] = getStyleColor(sData, ".doctitle
{", "color:");
+ oStylePropList[SOLABELTEXTCOLOR] = getStyleColor(sData, ".toctitle
{", "color:");
+ oStylePropList[SOBORDERCOLOR] = getStyleColor(sData, ".tcolor {",
"border-color:");
+ }
return oStylePropList;
}
commit 56d43328d7e15b73ea76c72ac4cab82940ce95fa
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 18 16:35:47 2016 +0000
coverity#1326433 Dereference null return value
Change-Id: I440512bc4eb7c930c8c4c69eb9f5a92d630a61b9
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java
b/wizards/com/sun/star/wizards/form/FormDocument.java
index 72faa38..af72449 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -274,7 +274,7 @@ public class FormDocument extends TextDocument
return curControlForm;
}
}
- return null;
+ throw new IllegalArgumentException("Searching for control " + _sname +
" failed");
}
public boolean finalizeForms(DataEntrySetter _curDataEntrySetter,
FieldLinker _curFieldLinker, FormConfiguration _curFormConfiguration)
commit 3c48764e4f8bf4752de15308a17d222165948099
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 18 16:34:25 2016 +0000
coverity#1326434 Dereference null return value
Change-Id: I409a8f43ff2533a676546065405010a7fb877295
diff --git a/odk/source/com/sun/star/lib/loader/Loader.java
b/odk/source/com/sun/star/lib/loader/Loader.java
index 750f0b7..d73260f 100644
--- a/odk/source/com/sun/star/lib/loader/Loader.java
+++ b/odk/source/com/sun/star/lib/loader/Loader.java
@@ -77,8 +77,8 @@ public final class Loader {
JarURLConnection jarConnection =
(JarURLConnection) jarurl.openConnection();
Manifest mf = jarConnection.getManifest();
- Attributes attrs = mf.getAttributes(
- "com/sun/star/lib/loader/Loader.class" );
+ Attributes attrs = (mf != null) ? mf.getAttributes(
+ "com/sun/star/lib/loader/Loader.class") : null;
if ( attrs != null ) {
className = attrs.getValue( "Application-Class" );
if ( className != null )
commit 5750444aff7c8b3b424a01f31b16ba71867f1639
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 18 16:32:52 2016 +0000
coverity#1326437 Dereference null return value
Change-Id: I9fe5f799b7b47d8dc1fd34893c392fcecef5b5a4
diff --git
a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index 90d66e3..31475a0 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -552,7 +552,7 @@ public abstract class ScriptProvider implements
XPackage newPackage = UnoRuntime.queryInterface(XPackage.class,
aElement);
- if (aName.length() == 0) {
+ if (aName == null || aName.length() == 0) {
throw new com.sun.star.lang.IllegalArgumentException("Empty
name");
}
commit dd922f104a80394ac4bb52622e47e1342dd9bacb
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 18 16:28:29 2016 +0000
coverity#1326443 Dereference null return value
Change-Id: Ic5f9290c5f8d9ce46b6f5bb7120b9da85d395d40
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
index 0fd2320..019beaf 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
@@ -410,7 +410,7 @@ public final class ConverterInfoMgr {
} else {
ConverterInfo[] foundInfo =
ConverterInfoMgr.findConverterInfoChain(findMimeOne,
findMimeTwo);
- if (foundInfo[0] != null && foundInfo[1] != null ) {
+ if (foundInfo != null && foundInfo[0] != null &&
foundInfo[1] != null ) {
System.out.println(" Found ConverterInfo Chain");
System.out.println(" DisplayName : " +
foundInfo[0].getDisplayName());
System.out.println(" DisplayName : " +
foundInfo[1].getDisplayName());
commit 089dae6676ef34378c3093a71db6e1dca6cffd80
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 18 16:26:09 2016 +0000
coverity#1326445 Dereference null return value
Change-Id: Ic279b6e8c51cbb559943027f987162678a17b143
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index 4fe8991..f607ede 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -515,7 +515,7 @@ class ReportTextDocument extends
com.sun.star.wizards.text.TextDocument implemen
return oDBColumn;
}
}
- return null;
+ throw new IllegalArgumentException("Searching for column " +
_FieldName + " failed");
}
private static FieldColumn[] removeFieldColumnByFieldName(String
_FieldName, FieldColumn[] _FieldColumns)
commit 6727fa583164e630aeb10f39ad1f5e9f69f9b6ae
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 18 16:19:34 2016 +0000
coverity#1326462 Dereference null return value
Change-Id: I80358cffe74f64fa710d9381b9615b64f903db3e
diff --git a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
index da33625..f9b375a 100644
--- a/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
+++ b/jurt/com/sun/star/lib/connections/socket/socketAcceptor.java
@@ -155,8 +155,11 @@ public final class socketAcceptor implements XAcceptor {
if (tcpNoDelay != null) {
socket.setTcpNoDelay(tcpNoDelay.booleanValue());
}
- else if
(((InetSocketAddress)socket.getRemoteSocketAddress()).getAddress().isLoopbackAddress())
{
- socket.setTcpNoDelay(true);
+ else {
+ InetSocketAddress address =
(InetSocketAddress)socket.getRemoteSocketAddress();
+ if (address != null &&
address.getAddress().isLoopbackAddress()) {
+ socket.setTcpNoDelay(true);
+ }
}
return new SocketConnection(acceptingDescription, socket);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
