sw/source/filter/html/parcss1.cxx | 3 ++-
wizards/com/sun/star/wizards/report/ReportTextImplementation.java | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 6c3b51a251b7933a5952e0faaf26cae0e8d204de
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jul 22 12:03:44 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jul 23 09:34:05 2019 +0200
cid#1448370 Explicit null dereferenced
Change-Id: I5c0744c4e348f50a22f9c687659310f6c75178be
Reviewed-on: https://gerrit.libreoffice.org/76129
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/filter/html/parcss1.cxx
b/sw/source/filter/html/parcss1.cxx
index f5ab8dd00cab..4de0201302a7 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -952,7 +952,8 @@ std::unique_ptr<CSS1Selector> CSS1Parser::ParseSelector()
m_nToken = GetNextToken();
if( CSS1_IDENT==m_nToken )
{
- pLast->SetNext( new CSS1Selector(CSS1_SELTYPE_PSEUDO,m_aToken) );
+ if (pLast)
+ pLast->SetNext( new CSS1Selector(CSS1_SELTYPE_PSEUDO,m_aToken)
);
m_nToken = GetNextToken();
}
else
commit 1a2be9dadaf3fc906987a68e6697bc52be64ca10
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jul 22 12:29:40 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jul 23 09:33:48 2019 +0200
cid#1448373 UC: Useless code
Change-Id: Ie7555620655b890b9790300e2f19c40b3b55d381
Reviewed-on: https://gerrit.libreoffice.org/76138
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 783025d5de98..590d54473861 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -333,7 +333,6 @@ public class ReportTextImplementation extends
ReportImplementationHelper impleme
int GroupFieldCount = getRecordParser().GroupFieldNames.length;
int FieldCount = getRecordParser().FieldColumns.length;
Object[] OldGroupFieldValues = new Object[GroupFieldCount];
- XTextTable[] xGroupBaseTables = new XTextTable[GroupFieldCount];
int RecordFieldCount = FieldCount - GroupFieldCount;
XTextDocument xTextDocument = getDoc().xTextDocument;
XTextCursor xTextCursor =
ReportTextDocument.createTextCursor(getDoc().xTextDocument.getText());
@@ -347,7 +346,6 @@ public class ReportTextImplementation extends
ReportImplementationHelper impleme
{
CurGroupTableName = ReportTextDocument.TBLGROUPSECTION +
Integer.toString(ColIndex + 1);
oTable =
getDoc().oTextTableHandler.xTextTablesSupplier.getTextTables().getByName(CurGroupTableName);
- xGroupBaseTables[ColIndex] = UnoRuntime.queryInterface(
XTextTable.class, oTable );
CurGroupValue =
getRecordParser().getGroupColumnValue(ColIndex);
OldGroupFieldValues[ColIndex] = CurGroupValue;
CurDBColumn = getDoc().DBColumnsVector.get(ColIndex);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
