cui/source/inc/autocdlg.hxx | 29 +++++-- cui/source/tabpages/autocdlg.cxx | 37 ++++------ nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java | 2 qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java | 4 - qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java | 4 - qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java | 2 qadevOOo/tests/java/ifc/form/_XConfirmDeleteBroadcaster.java | 2 qadevOOo/tests/java/ifc/frame/_XLayoutManager.java | 2 qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java | 2 qadevOOo/tests/java/ifc/io/_XActiveDataControl.java | 1 qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java | 4 - qadevOOo/tests/java/ifc/sdbc/_XIsolatedConnection.java | 3 qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java | 9 +- qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java | 6 - qadevOOo/tests/java/ifc/text/_XFootnote.java | 1 qadevOOo/tests/java/ifc/text/_XParagraphCursor.java | 1 qadevOOo/tests/java/ifc/text/_XTextRange.java | 7 - qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java | 2 qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java | 10 +- qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java | 1 qadevOOo/tests/java/ifc/util/_XReplaceable.java | 2 qadevOOo/tests/java/ifc/util/_XSearchable.java | 2 qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java | 2 qadevOOo/tests/java/mod/_forms/ODatabaseForm.java | 2 qadevOOo/tests/java/mod/_remotebridge/uno/various.java | 2 qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java | 2 qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java | 3 qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java | 1 reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java | 2 reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport.java | 3 wizards/com/sun/star/wizards/ui/PeerConfig.java | 12 --- 31 files changed, 61 insertions(+), 101 deletions(-)
New commits: commit d4d4e00a5a449bdf46608ce0cecbfa07c340e555 Author: Caolán McNamara <[email protected]> Date: Wed Nov 4 13:04:00 2015 +0000 Resolves: tdf#95352 resize the columns when the edits reposition instead of assuming they are in their final position when the top level dialog resizes. Cause there's a timer/idle involved so the final position isn't known yet Change-Id: I713e938b0e275f181514315cb4ce4531f36191ca diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index bf83041..1c4eac6 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -184,21 +184,35 @@ public: class AutoCorrEdit : public Edit { Link<AutoCorrEdit&,bool> aActionLink; - bool bSpaces; + VclPtr<SvTabListBox> m_xReplaceTLB; + sal_Int32 m_nCol; + bool bSpaces; - public: - AutoCorrEdit(vcl::Window* pParent, const ResId& rResId) : - Edit(pParent, rResId), bSpaces(false){} - AutoCorrEdit(vcl::Window* pParent) : - Edit(pParent), bSpaces(false){} +public: + AutoCorrEdit(vcl::Window* pParent, const ResId& rResId) + : Edit(pParent, rResId) + , m_nCol(0) + , bSpaces(false) + { + } + + AutoCorrEdit(vcl::Window* pParent) + : Edit(pParent) + , m_nCol(0) + , bSpaces(false) + { + } void SetActionHdl( const Link<AutoCorrEdit&,bool>& rLink ) { aActionLink = rLink;} + void ConnectColumn(const VclPtr<SvTabListBox>& rTable, sal_Int32 nCol); + void SetSpaces(bool bSet) {bSpaces = bSet;} virtual void KeyInput( const KeyEvent& rKEvent ) override; + virtual void Resize() override; }; // class OfaAutocorrReplacePage ------------------------------------------ @@ -262,7 +276,6 @@ private: LanguageType eOldLanguage, LanguageType eNewLanguage); - void setTabs(); public: OfaAutocorrReplacePage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaAutocorrReplacePage(); @@ -274,8 +287,6 @@ public: virtual void Reset( const SfxItemSet* rSet ) override; virtual void ActivatePage( const SfxItemSet& ) override; virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override; - virtual void Resize() override; - virtual void StateChanged(StateChangedType nStateChange) override; void SetLanguage(LanguageType eSet); void DeleteEntry(const OUString& sShort, const OUString& sLong); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 72deb49..4d1b049 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -906,28 +906,9 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( vcl::Window* pParent, m_pReplaceED->SetSpaces(true); m_pShortED->SetSpaces(true); -} - -void OfaAutocorrReplacePage::setTabs() -{ - m_pReplaceTLB->SetTab(0, m_pShortED->GetPosPixel().X(), MAP_PIXEL); - m_pReplaceTLB->SetTab(1, m_pReplaceED->GetPosPixel().X(), MAP_PIXEL); -} - -void OfaAutocorrReplacePage::StateChanged(StateChangedType nStateChange) -{ - SfxTabPage::StateChanged(nStateChange); - - if (nStateChange == StateChangedType::InitShow) - { - setTabs(); - } -} -void OfaAutocorrReplacePage::Resize() -{ - SfxTabPage::Resize(); - setTabs(); + m_pShortED->ConnectColumn(m_pReplaceTLB, 0); + m_pReplaceED->ConnectColumn(m_pReplaceTLB, 1); } OfaAutocorrReplacePage::~OfaAutocorrReplacePage() @@ -1766,6 +1747,12 @@ IMPL_LINK_TYPED(OfaAutocorrExceptPage, ModifyHdl, Edit&, rEdt, void) VCL_BUILDER_FACTORY(AutoCorrEdit) +void AutoCorrEdit::ConnectColumn(const VclPtr<SvTabListBox>& rTable, sal_Int32 nCol) +{ + m_xReplaceTLB = rTable; + m_nCol = nCol; +} + void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt ) { const vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); @@ -1781,6 +1768,14 @@ void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt ) Edit::KeyInput(rKEvt); } +void AutoCorrEdit::Resize() +{ + Edit::Resize(); + if (!m_xReplaceTLB) + return; + m_xReplaceTLB->SetTab(m_nCol, GetPosPixel().X(), MAP_PIXEL); +} + enum OfaQuoteOptions { ADD_NONBRK_SPACE, commit 17a3d40e0f41d2769ac9a6ed6331b84736530289 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 14:04:26 2015 +0000 coverity#1326592 Useless call Change-Id: I82350eab9ccfa331ada54a26f257d22bfcf6c8d8 diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java index c45a4eb..583166d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java @@ -156,9 +156,7 @@ public class ScDataPilotFieldGroupItemObj extends TestCase int x = sCellAdress.Column; int y = sCellAdress.Row + 3; - oSheet.getCellByPosition (x, y); - Integer.valueOf(27); // create the test objects diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java index c9f08c2..72ea60e 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java @@ -155,10 +155,7 @@ public class ScDataPilotFieldGroupObj extends TestCase int x = sCellAdress.Column; int y = sCellAdress.Row + 3; - oSheet.getCellByPosition (x, y); - Integer.valueOf(27); - // create the test objects log.println ("Getting test objects"); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java index 508469a..93e61ff 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java @@ -175,7 +175,6 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration oSheet.getCellByPosition(x, y); - Integer.valueOf(27); // create the test objects log.println("Getting test objects"); commit eba1c9f93f8d62505dcd6fbc5af05fd03065ddd2 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 14:00:20 2015 +0000 coverity#1326554 Dereference before null check Change-Id: Ib17eb78f4790880945a82ecff54d94528993bb22 diff --git a/qadevOOo/tests/java/ifc/util/_XSearchable.java b/qadevOOo/tests/java/ifc/util/_XSearchable.java index 932a474..9e168c6 100644 --- a/qadevOOo/tests/java/ifc/util/_XSearchable.java +++ b/qadevOOo/tests/java/ifc/util/_XSearchable.java @@ -96,7 +96,7 @@ public class _XSearchable extends MultiMethodTest { Sdesc = oObj.createSearchDescriptor(); Sdesc.setSearchString(mSearchString); - tRes.tested("createSearchDescriptor()", Sdesc != null); + tRes.tested("createSearchDescriptor()", true); } commit 20c0ba1757439931df93a44e087327d18944dd4c Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:59:53 2015 +0000 coverity#1326555 Dereference before null check Change-Id: If684189efc0ebba70c283f18ee8bd95b63be3557 diff --git a/qadevOOo/tests/java/ifc/util/_XReplaceable.java b/qadevOOo/tests/java/ifc/util/_XReplaceable.java index 98c9e4f..e530d59 100644 --- a/qadevOOo/tests/java/ifc/util/_XReplaceable.java +++ b/qadevOOo/tests/java/ifc/util/_XReplaceable.java @@ -94,7 +94,7 @@ public class _XReplaceable extends MultiMethodTest { Rdesc = oObj.createReplaceDescriptor(); Rdesc.setSearchString(mSearchString); Rdesc.setReplaceString(mReplaceString); - tRes.tested("createReplaceDescriptor()", Rdesc != null); + tRes.tested("createReplaceDescriptor()", true); } commit fcbddc2a7113c29f4ab0f3b7afad9e9c28811c20 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:59:12 2015 +0000 coverity#1326227 Dereference after null check Change-Id: I9cf946c24ad867ce5f2a2a476dbd1d9df473c1aa diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java index 0c57bc2..8392363 100644 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java @@ -101,7 +101,6 @@ public class _XUIConfigurationManager extends MultiMethodTest { boolean result = true; try { mxMenuBarSettings = oObj.getSettings(msResourceUrl, true); - result = mxMenuBarSettings != null; for (int i=0; i<mxMenuBarSettings.getCount(); i++) { Object[] o = (Object[])mxMenuBarSettings.getByIndex(i); log.println("+++++++++ i = " + i); commit 28c6c1913ffbf5ca2c757f5287903cda24a89246 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:56:27 2015 +0000 coverity#1326220 Dereference after null check Change-Id: I85d82f2c0a1c0ef8c123d9ba1a197e06cd76b92c diff --git a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java index ff94615..0d34af2 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java +++ b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java @@ -463,15 +463,16 @@ public class _XSimpleFileAccess extends MultiMethodTest { com.sun.star.io.XOutputStream oStream = oObj.openFileWrite(copiedFile); - tRes.tested("openFileWrite()", oStream != null); oStream.closeOutput(); oObj.kill(copiedFile); + + tRes.tested("openFileWrite()", true); } catch (com.sun.star.uno.Exception ex) { log.println("Exception occurred while testing 'openFileWrite()'"); ex.printStackTrace(log); - tRes.tested("openFileWrite()",false); + tRes.tested("openFileWrite()", false); } } //EOF openFileWrite() commit 41b3bce73a95034a3a246db6344cd065e1ca4597 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:55:56 2015 +0000 coverity#1326219 Dereference after null check Change-Id: I76bb111d01cfbb72b707cedc3706d02922991dc7 diff --git a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java index 609a01b..ff94615 100644 --- a/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java +++ b/qadevOOo/tests/java/ifc/ucb/_XSimpleFileAccess.java @@ -493,17 +493,18 @@ public class _XSimpleFileAccess extends MultiMethodTest { com.sun.star.io.XStream aStream = oObj.openFileReadWrite(copiedFile); - tRes.tested("openFileReadWrite()", aStream != null); aStream.getInputStream().closeInput(); aStream.getOutputStream().closeOutput(); oObj.kill(copiedFile); + + tRes.tested("openFileReadWrite()", true); } catch (com.sun.star.uno.Exception ex) { log.println("Exception occurred while testing 'openFileReadWrite()'"); ex.printStackTrace(log); - tRes.tested("openFileReadWrite()",false); + tRes.tested("openFileReadWrite()", false); } } //EOF openFileReadWrite() commit 736a1ecf3bf598cc40dbc7c0affbfa14a2ac5049 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:54:53 2015 +0000 coverity#1326557 Dereference before null check Change-Id: I6923585dae30fb1fb2b0a7ce1a2d9d104b42ebc7 diff --git a/qadevOOo/tests/java/ifc/text/_XTextRange.java b/qadevOOo/tests/java/ifc/text/_XTextRange.java index b96804f..033f870 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextRange.java +++ b/qadevOOo/tests/java/ifc/text/_XTextRange.java @@ -78,9 +78,7 @@ public class _XTextRange extends MultiMethodTest { log.println("Start: "+exp); - tRes.tested( "getStart()", oStartRange != null && - exp.startsWith("Start")); - + tRes.tested( "getStart()", exp.startsWith("Start")); oStartRange.setString(""); commit 77857808771f76ba18c1dfe745bffafaf45a131d Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:54:29 2015 +0000 coverity#1326556 Dereference before null check Change-Id: I250a03387dd714d844019b363e3be1f2e2ed6a20 diff --git a/qadevOOo/tests/java/ifc/text/_XTextRange.java b/qadevOOo/tests/java/ifc/text/_XTextRange.java index 04a721f..b96804f 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextRange.java +++ b/qadevOOo/tests/java/ifc/text/_XTextRange.java @@ -115,8 +115,7 @@ public class _XTextRange extends MultiMethodTest { log.println("End: "+exp); - tRes.tested( "getEnd()", oEndRange != null && - exp.endsWith("End")); + tRes.tested( "getEnd()", exp.endsWith("End")); oEndRange.setString(""); } commit 0e3e4ca53275cef263a53a58b25fc33d0d95c5bf Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:52:36 2015 +0000 coverity#1326264 Dereference after null check Change-Id: I0623ecb8e9737e117f3db183d5aee7be5a405abf diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java b/qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java index e309c9a1..a1015a6 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java +++ b/qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor.java @@ -199,12 +199,6 @@ public class _XSheetCellCursor extends MultiMethodTest { } XMergeable mergeRange = UnoRuntime.queryInterface (XMergeable.class, newRange); - if (mergeRange == null) { - log.println("DB: newRange doesn't implement XMergeable interface"); - } else { - log.println("DB: XMergeable interface successfully queried."); - } - mergeRange.merge(true); log.println("DB: Successfully merged.") ; commit 0f3656816c15290f7a21f45d4334787a69a88c5b Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:50:18 2015 +0000 coverity#1326301 Explicit null dereferenced and coverity#1326561 Dereference before null check Change-Id: I53d1e99ee05dd8d32a7fadc870344391647f3b9d diff --git a/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java b/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java index 79b5411..5c48e44 100644 --- a/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java +++ b/qadevOOo/tests/java/ifc/sdbcx/_XTablesSupplier.java @@ -58,11 +58,12 @@ public class _XTablesSupplier extends MultiMethodTest { (XServiceInfo.class, tabs.getByName(tabNames[0])) ; } catch (com.sun.star.uno.Exception e) {} - log.println("Support : " + - info.supportsService("com.sun.star.sdbcx.Table")) ; - + if (info != null) { + log.println("Support : " + + info.supportsService("com.sun.star.sdbcx.Table")) ; + } - tRes.tested("getTables()", tabs != null) ; + tRes.tested("getTables()", info != null) ; } } // finish class _XTablesSupplier commit b7d32843ccf42ae3d54600496370034ee161e017 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:48:29 2015 +0000 coverity#1326296 Dereference after null check Change-Id: I0438dba50a9842e67ebeef872e27e6006871020f diff --git a/qadevOOo/tests/java/ifc/sdbc/_XIsolatedConnection.java b/qadevOOo/tests/java/ifc/sdbc/_XIsolatedConnection.java index fdaba84..64af7fe 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XIsolatedConnection.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XIsolatedConnection.java @@ -86,9 +86,6 @@ public class _XIsolatedConnection extends MultiMethodTest { String user = null; String pwd = null; - if (userSettings == null) { - log.println("Required object relation not found !") ; - } if (userSettings[0] != null) user = userSettings[0].equals("")?"<empty>":userSettings[0]; commit 36a764e7a064a7677b520268daf11aa2e0eb8508 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:47:27 2015 +0000 coverity#1326558 Dereference before null check Change-Id: Id0ed896b36293703c39d61cad6d74871ef16a806 diff --git a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java index a3c42cc..f77b3ba 100644 --- a/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java +++ b/qadevOOo/tests/java/ifc/reflection/_XIdlReflection.java @@ -86,7 +86,9 @@ public class _XIdlReflection extends MultiMethodTest{ XIdlClass cls = oObj.getType(obj); - log.println("The name is " + cls.getName()); + if (cls != null) { + log.println("The name is " + cls.getName()); + } tRes.tested("getType()", cls != null); } commit 21d53a213265196833c4cd2af471c2dd53f12ffa Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:45:37 2015 +0000 coverity#1326580 Useless call Change-Id: I85a469a482ab0d7c1f897dd8f9fb809f1e55a7c2 diff --git a/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java b/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java index 37383b0..d332391 100644 --- a/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java +++ b/qadevOOo/tests/java/ifc/io/_XActiveDataControl.java @@ -207,7 +207,6 @@ public class _XActiveDataControl extends MultiMethodTest { // check, if any error occurred if (errorCalled) { - Status.failed("Unexpected error"); log.println("Unexpected error " + error); ((Exception)error).printStackTrace(log); } commit 026f38aca9d4f0c2755c7affe0a1e0f75fac2887 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:41:26 2015 +0000 coverity#1327152 UrF: Unread field Change-Id: I8a5418907570a53c2aaf88fc20458559b5bbf40e diff --git a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java index f1d2f12..b214364 100644 --- a/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java +++ b/qadevOOo/tests/java/ifc/frame/_XNotifyingDispatch.java @@ -55,7 +55,6 @@ public class _XNotifyingDispatch extends MultiMethodTest { */ protected static class TestNotificationListener implements com.sun.star.frame.XDispatchResultListener { - public boolean disposingCalled = false ; public boolean finishedDispatch = false ; private final java.io.PrintWriter log; @@ -64,7 +63,6 @@ public class _XNotifyingDispatch extends MultiMethodTest { } public void disposing(com.sun.star.lang.EventObject e) { - disposingCalled = true ; log.println(" disposing was called.") ; } commit 104a7281f057bd9e11e88b1d61c2fc308b86fdbb Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:40:46 2015 +0000 coverity#1326546 Dereference before null check Change-Id: I2f91ca0876e52a2480a2d6a3098f570b32e7d07a diff --git a/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java b/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java index ce26414..7f2a40c 100644 --- a/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java +++ b/qadevOOo/tests/java/ifc/frame/_XLayoutManager.java @@ -106,7 +106,7 @@ public class _XLayoutManager extends MultiMethodTest { Object o = xElements[i].getRealInterface(); log.println("Element " + i + ": " + o.toString() + " " + utils.getImplName(o)); } - tRes.tested("getElements()", xElements != null); + tRes.tested("getElements()", true); } public void _hideElement() { commit cfc7fb91fd7fde884cc870b0422f72e6b4505aba Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:14:14 2015 +0000 coverity#1328489 SIC: Inner class could be made static Change-Id: Icca5032f27a25e3e67e821aa338c428687249ba2 diff --git a/qadevOOo/tests/java/ifc/form/_XConfirmDeleteBroadcaster.java b/qadevOOo/tests/java/ifc/form/_XConfirmDeleteBroadcaster.java index 7f5b613..496227c 100644 --- a/qadevOOo/tests/java/ifc/form/_XConfirmDeleteBroadcaster.java +++ b/qadevOOo/tests/java/ifc/form/_XConfirmDeleteBroadcaster.java @@ -44,7 +44,7 @@ public class _XConfirmDeleteBroadcaster extends MultiMethodTest { protected XConfirmDeleteListener mxConfirmDeleteListener = new ConfirmDeleteImpl(); - private class ConfirmDeleteImpl implements XConfirmDeleteListener { + private static class ConfirmDeleteImpl implements XConfirmDeleteListener { public boolean confirmDelete(RowChangeEvent rowChangeEvent) { return true; } commit 5e89fc23a82abf120e9eba855ac29de71d04445f Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:13:47 2015 +0000 coverity#1327068 SIC: Inner class could be made static Change-Id: I1fd9d122f2bde1db9101e937999d75ac19cc4dfb diff --git a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java index 99aa6d4..899e740 100644 --- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java +++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java @@ -64,7 +64,7 @@ public class SDBCReportDataFactory implements DataSourceFactory private static final String ESCAPEPROCESSING = "EscapeProcessing"; - private class RowSetProperties + private static class RowSetProperties { final Boolean escapeProcessing; commit ba27090ae13e2176afd50c6d5a8b66c7361a317f Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:13:00 2015 +0000 coverity#1327066 SIC: Inner class could be made static Change-Id: I26d5a42cd52b442cc5ba9947b39508f4695adffa diff --git a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java index b3307db..b9bc786 100644 --- a/qadevOOo/tests/java/mod/_remotebridge/uno/various.java +++ b/qadevOOo/tests/java/mod/_remotebridge/uno/various.java @@ -79,7 +79,7 @@ public class various extends TestCase { * * @see com.sun.star.bridge.XInstanceProvider */ - private class MyInstanceProvider implements XInstanceProvider { + private static class MyInstanceProvider implements XInstanceProvider { /** * a MultiServiceFactory for creating instances * commit 8bb7c4c27d8ad9da4afdb9dee0de7b419f2c6969 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:11:34 2015 +0000 1327065 SIC: Inner class could be made static Change-Id: I05e24d706679ae8e17fb382837e4edfe69e3b96d diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index 7ab7235..d8845e5 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -757,7 +757,7 @@ public class ODatabaseForm extends TestCase { * for the XDatabaseParameterBroadcaster test * @see ifc.form._XDatabaseParameterBroadcaster */ - private class ParameterListenerImpl implements _XDatabaseParameterBroadcaster.CheckParameterListener { + private static class ParameterListenerImpl implements _XDatabaseParameterBroadcaster.CheckParameterListener { private boolean listenerWasCalled = false; private PrintWriter log = new PrintWriter(System.out); commit 612acf5400910355de75c81ad6140b0fc131623c Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:10:57 2015 +0000 coverity#1327027 SIC: Inner class could be made static Change-Id: I9c36aa362e58de724c63b9d23334eabfc973ee42 diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java index e1386a6..acfd569 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java @@ -163,7 +163,7 @@ public abstract class BaseNLPSolver extends WeakBase return m_variables; } - private class RowInfo { + private static class RowInfo { private short Sheet; private int Row; private int StartCol; commit 385e9afea22380c718660a1f167c737e52544930 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:08:38 2015 +0000 coverity#1327210 UwF: Unwritten field Change-Id: I6fb5b18b6a6e51727d7350039da97f06f65736ff diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport.java index 410515d..e9ba60f 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeReport.java @@ -34,7 +34,6 @@ public class OfficeReport extends Element private Node pageHeader; private Node pageFooter; - private Node columnHeader; private Node reportHeader; private Node reportFooter; private Node bodySection; @@ -83,7 +82,7 @@ public class OfficeReport extends Element public Node getColumnHeader() { - return columnHeader; + return null; } public Node getColumnFooter() commit 79831c6d6de44327e88ff23bc514a7c2a6ef1ac3 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:06:25 2015 +0000 coverity#1327212 UwF: Unwritten field Change-Id: Ib12d8909430fceef654d6960a42439cc6ad5cd69 diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java index 80a12c3..5b7b89d 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.java +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java @@ -33,7 +33,6 @@ public class PeerConfig implements XWindowListener { private final ArrayList<PeerTask> m_aPeerTasks = new ArrayList<PeerTask>(); - private ArrayList<ControlTask> aControlTasks = new ArrayList<ControlTask>(); private ArrayList<ImageUrlTask> aImageUrlTasks = new ArrayList<ImageUrlTask>(); private UnoDialog oUnoDialog = null; @@ -58,12 +57,6 @@ public class PeerConfig implements XWindowListener } } - private static class ControlTask - { - Object oModel; - String propname; - } - private static class ImageUrlTask { @@ -100,11 +93,6 @@ public class PeerConfig implements XWindowListener xVclWindowPeer.setProperty(aPeerTask.propnames[n], aPeerTask.propvalues[n]); } } - for (int i = 0; i < this.aControlTasks.size(); i++) - { - ControlTask aControlTask = aControlTasks.get(i); - Helper.setUnoPropertyValue(aControlTask.oModel, aControlTask.propname, null); - } for (int i = 0; i < this.aImageUrlTasks.size(); i++) { ImageUrlTask aImageUrlTask = aImageUrlTasks.get(i); commit 8b7bee3b44a4ddeef7357deebf3db3d68459af4f Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:00:54 2015 +0000 coverity#1327111 UrF: Unread field Change-Id: I8013eb660ab0d2cd159a8a30277be6552089e428 diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java index 250652e..00835dd 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java @@ -135,8 +135,6 @@ import com.sun.star.uno.XInterface; */ public class OSingleSelectQueryComposer extends TestCase { - String tableName = null; - DBTools.DataSourceInfo srcInf = null; protected static final String dbSourceName = "OSingleSelectQueryComposerDataSource"; /** commit ad60e7f773037b519d8cc6dc46512054cf284b2c Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:00:24 2015 +0000 coverity#1327106 UrF: Unread field Change-Id: I36ccf3fdf17e409c15e0e75ac4964d31781699a3 diff --git a/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java b/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java index 0cf3c37..4cdea2b 100644 --- a/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java +++ b/qadevOOo/tests/java/ifc/text/_XTextRangeCompare.java @@ -61,10 +61,8 @@ public class _XTextRangeCompare extends MultiMethodTest { */ public XTextRangeCompare oObj = null; String nameStr = null; - XTextRange oRange = null; XTextCursor cursor1 = null; XTextCursor cursor2 = null; - String startStr = null; XText oText = null; /** commit dec9478c5273040f90d65e698544687acd70a35a Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 13:00:01 2015 +0000 coverity#1327103 UrF: Unread field Change-Id: I0b0d71f86343b45fafdc8c2648f4667456e6bcd4 diff --git a/qadevOOo/tests/java/ifc/text/_XParagraphCursor.java b/qadevOOo/tests/java/ifc/text/_XParagraphCursor.java index 9458013..bfa772d 100644 --- a/qadevOOo/tests/java/ifc/text/_XParagraphCursor.java +++ b/qadevOOo/tests/java/ifc/text/_XParagraphCursor.java @@ -44,7 +44,6 @@ import com.sun.star.text.XParagraphCursor; public class _XParagraphCursor extends MultiMethodTest { public XParagraphCursor oObj = null; // oObj filled by MultiMethodTest - XInstCreator info = null; // instance creator /** * Test calls the method. <p> commit 1213f829824e140e57ee3740030d05d85546a664 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 12:59:44 2015 +0000 coverity#1327103 UrF: Unread field Change-Id: I31fdf38a9a62c4bf92286509c973fe4e7273b643 diff --git a/qadevOOo/tests/java/ifc/text/_XFootnote.java b/qadevOOo/tests/java/ifc/text/_XFootnote.java index 7984f1c..0bb4057 100644 --- a/qadevOOo/tests/java/ifc/text/_XFootnote.java +++ b/qadevOOo/tests/java/ifc/text/_XFootnote.java @@ -37,7 +37,6 @@ import com.sun.star.text.XFootnote; public class _XFootnote extends MultiMethodTest { public XFootnote oObj = null; // oObj filled by MultiMethodTest - XInstCreator info = null; // instance creator /** * Test calls the method. <p> commit be08e967b416b61af0514007dda857d1259855f8 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 12:59:14 2015 +0000 coverity#1327096 UrF: Unread field Change-Id: I5d6fb9c9bbec5b17e764677b34cfa4a9e2f4ceb6 diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java index 4fa6a27..49236c8 100644 --- a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java +++ b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboardNotifier.java @@ -54,10 +54,8 @@ public class _XClipboardNotifier extends MultiMethodTest { * stores parameters passed to <code>lostOwnership</code> method. */ static class MyOwner implements XClipboardOwner { - XClipboard board; public void lostOwnership(XClipboard board, XTransferable contents) { - this.board = board; } } commit 4975651b099f9a41a779e621da60a68ba3a11203 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 12:58:49 2015 +0000 coverity#1327095 UrF: Unread field Change-Id: I297f4495a64d0fb32c7a07841668006c4f3f5ed6 diff --git a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java index e2a86a5..ffbec7a 100644 --- a/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java +++ b/qadevOOo/tests/java/ifc/datatransfer/clipboard/_XClipboard.java @@ -49,12 +49,8 @@ public class _XClipboard extends MultiMethodTest { * stores parameters passed to <code>lostOwnership</code> method. */ static class MyOwner implements XClipboardOwner { - XClipboard board; - XTransferable contents; public void lostOwnership(XClipboard board, XTransferable contents) { - this.board = board; - this.contents = contents; } } commit 3110464a3fc8e331d9e6157b1fd66c20d0c92851 Author: Caolán McNamara <[email protected]> Date: Tue Nov 3 12:57:57 2015 +0000 coverity#1327093 UrF: Unread field Change-Id: Ia6d9fbc90f526603f8dc1aff72d5cba9ed9a2d76 diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java index 0913895..c7400e4 100644 --- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java +++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeControl.java @@ -84,8 +84,6 @@ public class _XTreeControl extends MultiMethodTest { boolean mTreeNodeEditing1 = false; boolean mTreeNodeEdit1 = false; - boolean mTreeNodeEdit2 = false; - public interface XTreeDataModelListenerEvent{ void fireEvent(); } @@ -174,7 +172,6 @@ public class _XTreeControl extends MultiMethodTest { public void nodeEdited(XTreeNode xTreeNode, String string) { log.println("event at EditListener 2: nodeEdited"); - mTreeNodeEdit2 = true; } public void disposing(EventObject eventObject) { @@ -196,7 +193,6 @@ public class _XTreeControl extends MultiMethodTest { private void resetEditListener(){ mTreeNodeEditing1 = false; mTreeNodeEdit1 = false; - mTreeNodeEdit2 = false; } @Override
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
