[Libreoffice-commits] core.git: 7 commits - qadevOOo/tests wizards/com xmerge/source
Noel Grandin
noel at peralex.com
Thu Oct 15 02:29:57 PDT 2015
qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java | 4 ----
qadevOOo/tests/java/ifc/chart/_XChartDocument.java | 1 -
qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java | 5 +----
qadevOOo/tests/java/ifc/drawing/_XControlShape.java | 5 +----
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 6 +-----
wizards/com/sun/star/wizards/report/ReportWizard.java | 1 -
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java | 2 --
7 files changed, 3 insertions(+), 21 deletions(-)
New commits:
commit 454aa71cdd299773ebac7ccb6d6b8d64d27c86fd
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 15 10:47:46 2015 +0200
cid#1327097 UrF: Unread field
Change-Id: I37fc97591a653ec298e66edd676b8556c78d99a1
diff --git a/qadevOOo/tests/java/ifc/drawing/_XControlShape.java b/qadevOOo/tests/java/ifc/drawing/_XControlShape.java
index 4dfb8dbe..f0e5ca2 100644
--- a/qadevOOo/tests/java/ifc/drawing/_XControlShape.java
+++ b/qadevOOo/tests/java/ifc/drawing/_XControlShape.java
@@ -48,16 +48,13 @@ public class _XControlShape extends MultiMethodTest {
public XControlShape oObj = null;
- XControlModel model = null;
-
/**
* Test calls the method. <p>
* Has <b> OK </b> status if the method successfully returns
* and no exceptions were thrown. <p>
*/
public void _getControl() {
- model = oObj.getControl() ;
-
+ oObj.getControl();
tRes.tested("getControl()", true) ;
}
commit 4f4cf9e30306937e67d79bfd776dabfe25f02f39
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 15 10:46:37 2015 +0200
cid#1327095 UrF: Unread field
Change-Id: I4d2a1feabe553003ef992422b4d50def992b08f2
diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java
index dbb6b10..e2a86a5 100644
--- a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java
+++ b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java
@@ -44,8 +44,6 @@ public class _XClipboard extends MultiMethodTest {
MyTransferable myTransferable1;
MyTransferable myTransferable2;
- MyOwner myOwner;
-
/**
* <code>XClipboardOwner</code> interface implementation which
* stores parameters passed to <code>lostOwnership</code> method.
@@ -84,8 +82,7 @@ public class _XClipboard extends MultiMethodTest {
*/
@Override
public void before() {
- oObj.setContents(myTransferable1 = new MyTransferable(),
- myOwner = new MyOwner());
+ oObj.setContents(myTransferable1 = new MyTransferable(), new MyOwner());
}
/**
commit 8beb89c3f2895030d0bfa25ea0da5c6429819f2f
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 15 10:45:24 2015 +0200
cid#1327094 UrF: Unread field
Change-Id: I90cc21cc089725507e7bbdf373466f7fc51993b1
diff --git a/qadevOOo/tests/java/ifc/chart/_XChartDocument.java b/qadevOOo/tests/java/ifc/chart/_XChartDocument.java
index c09582e..87fe405 100644
--- a/qadevOOo/tests/java/ifc/chart/_XChartDocument.java
+++ b/qadevOOo/tests/java/ifc/chart/_XChartDocument.java
@@ -53,7 +53,6 @@ import com.sun.star.drawing.XShape;
public class _XChartDocument extends MultiMethodTest {
public XChartDocument oObj = null;
- boolean result = true;
XDiagram diagram = null;
XChartData ChartData = null;
commit f417fea70d83105dc575b1b5f3f9a38ca643766b
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 15 10:41:34 2015 +0200
cid#1327093 UrF: Unread field
Change-Id: Id6b91dcbfafb798b62feeb65e7d1b6a5d608d1c8
diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java
index c6c4b59..0913895 100644
--- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java
+++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java
@@ -84,7 +84,6 @@ public class _XTreeControl extends MultiMethodTest {
boolean mTreeNodeEditing1 = false;
boolean mTreeNodeEdit1 = false;
- boolean mTreeNodeEditing2 = false;
boolean mTreeNodeEdit2 = false;
public interface XTreeDataModelListenerEvent{
@@ -171,8 +170,6 @@ public class _XTreeControl extends MultiMethodTest {
public class TreeEditListenerImpl2 implements XTreeEditListener{
public void nodeEditing(XTreeNode xTreeNode) throws VetoException {
log.println("event at EditListener 2: nodeEditing");
- mTreeNodeEditing2 = true;
-
}
public void nodeEdited(XTreeNode xTreeNode, String string) {
@@ -199,7 +196,6 @@ public class _XTreeControl extends MultiMethodTest {
private void resetEditListener(){
mTreeNodeEditing1 = false;
mTreeNodeEdit1 = false;
- mTreeNodeEditing2 = false;
mTreeNodeEdit2 = false;
}
commit fac24cd6ff75f3e64c760fd511b4d92a5476991c
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 15 10:36:46 2015 +0200
cid#1326571 and cid#1326572 Unused value
Change-Id: I0e984135a5abf918ba556c700ffa111097fd48c1
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
index 8f65633..98c0d8a 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java
@@ -230,8 +230,6 @@ public final class CharacterBaseParagraphMerge implements NodeMergeAlgorithm {
newTextPosition += cacheLength;
// reset the markers
- lastDiffPosition = -1;
- lastDiffOperation = Difference.UNCHANGE;
cacheLength = 0;
}
}
commit 480dda56950d01bbfb7ea6a00b826bb794bf4cae
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 15 10:33:58 2015 +0200
cid#1326570 Unused value
Change-Id: I377671a552764e39f0f651c03949c99005084dcb
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 0a30846..8305f09 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -169,7 +169,6 @@ public class SQLQueryComposer
private void appendSortingcriteria(boolean _baddAliasFieldNames) throws SQLException
{
- String sOrder = "";
m_queryComposer.setOrder("");
for (int i = 0; i < CurDBMetaData.getSortFieldNames().length; i++)
{
@@ -177,7 +176,7 @@ public class SQLQueryComposer
int iAggregate = CurDBMetaData.getAggregateIndex(sSortValue);
if (iAggregate > -1)
{
- sOrder = m_xQueryAnalyzer.getOrder();
+ String sOrder = m_xQueryAnalyzer.getOrder();
if (sOrder.length() > 0)
{
sOrder += ", ";
@@ -190,10 +189,7 @@ public class SQLQueryComposer
{
appendSortingCriterion(i, _baddAliasFieldNames);
}
- sOrder = m_xQueryAnalyzer.getOrder();
}
- // just for debug!
- sOrder = m_queryComposer.getOrder();
}
private void appendGroupByColumns(boolean _baddAliasFieldNames) throws SQLException
commit 9edbcbe137411fb00f0e2d8eae8a682fb634c32d
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 15 10:31:50 2015 +0200
cid#1326569 Unused value
Change-Id: I7a945e0d299eaf20f8245c6697959885f4ef4ade
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index d14b46f..c988036 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -271,7 +271,6 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
String sCommand = (String) oCommand.getPropertySet().getPropertyValue(PropertyNames.COMMAND);
if (bHasEscapeProcessing)
{
- bQueryCreated = (!sCommand.equals(PropertyNames.EMPTY_STRING));
if (m_reportDocument instanceof ReportTextImplementation)
{
sqlQueryComposer.m_xQueryAnalyzer.setQuery(sCommand);
More information about the Libreoffice-commits
mailing list