dbaccess/source/ui/misc/WTypeSelect.cxx | 2 ++ dbaccess/source/ui/querydesign/JoinTableView.cxx | 2 ++ dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 2 ++ dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 14 +++++--------- sw/source/core/inc/UndoBookmark.hxx | 2 -- sw/source/core/undo/unbkmk.cxx | 2 -- 6 files changed, 11 insertions(+), 13 deletions(-)
New commits: commit c17f5bb6fb15239809e6b8439e9e443280bc2bde Author: Stephan Bergmann <[email protected]> Date: Mon Dec 1 14:03:10 2014 +0100 -Werror,-Wunused-private-field Change-Id: Ic090eee9e7705baf2c44fa2990a986e06cd0cf68 diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx index eaa0fcb..8338b01 100644 --- a/sw/source/core/inc/UndoBookmark.hxx +++ b/sw/source/core/inc/UndoBookmark.hxx @@ -71,8 +71,6 @@ class SwUndoRenameBookmark : public SwUndo { const OUString m_sOldName; const OUString m_sNewName; - const sal_uLong m_nNode; - const sal_Int32 m_nCntnt; public: SwUndoRenameBookmark( const ::sw::mark::IMark&, const OUString& rNewName ); diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx index 3501ed5..9620b75 100644 --- a/sw/source/core/undo/unbkmk.cxx +++ b/sw/source/core/undo/unbkmk.cxx @@ -90,8 +90,6 @@ SwUndoRenameBookmark::SwUndoRenameBookmark( const ::sw::mark::IMark& rBkmk, cons : SwUndo( UNDO_BOOKMARK_RENAME ) , m_sOldName( rOldName ) , m_sNewName( rBkmk.GetName() ) - , m_nNode( rBkmk.GetMarkPos().nNode.GetIndex() ) - , m_nCntnt( rBkmk.GetMarkPos().nContent.GetIndex() ) { } commit 1f13a4f40618b798fc84a058097b0ad26e77f111 Author: Stephan Bergmann <[email protected]> Date: Mon Dec 1 11:50:03 2014 +0100 -Werror,-Wswitch Change-Id: I807b63361af2e40c4adf66412615b91b5d610dab diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 7afd1c9..26e8323 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -158,16 +158,12 @@ namespace dbaui bool OQueryContainerWindow::PreNotify( NotifyEvent& rNEvt ) { bool bHandled = false; - switch (rNEvt.GetType()) + if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS && m_pViewSwitch) { - case MouseNotifyEvent::GETFOCUS: - if ( m_pViewSwitch ) - { - OJoinController& rController = m_pViewSwitch->getDesignView()->getController(); - rController.InvalidateFeature(SID_CUT); - rController.InvalidateFeature(SID_COPY); - rController.InvalidateFeature(SID_PASTE); - } + OJoinController& rController = m_pViewSwitch->getDesignView()->getController(); + rController.InvalidateFeature(SID_CUT); + rController.InvalidateFeature(SID_COPY); + rController.InvalidateFeature(SID_PASTE); } return bHandled || ODataView::PreNotify(rNEvt); } commit 4c03d837eb19e3a7d38e26ebac9740cb58f5d03c Author: Stephan Bergmann <[email protected]> Date: Mon Dec 1 11:48:22 2014 +0100 -Werror,-Wswitch Change-Id: Iad8c17f8d69d51d55c6cdf2ed355cda140399337 diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 1adeadf..40e2227 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -430,6 +430,8 @@ bool OWizTypeSelectList::PreNotify( NotifyEvent& rEvt ) nDone = true; } break; + default: + break; } return nDone || MultiListBox::PreNotify(rEvt); } diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index c2dd15d..8f6dc07 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -1418,6 +1418,8 @@ bool OJoinTableView::PreNotify(NotifyEvent& rNEvt) } } break; + default: + break; } if (!bHandled) diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 5b76764..ad460ff 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -84,6 +84,8 @@ bool LimitBoxImpl::Notify( NotifyEvent& rNEvt ) } break; } + default: + break; } return nHandled || LimitBox::Notify( rNEvt ); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
