Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2949
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/2949/1
coverity#704245 Logically dead code
Change-Id: I34d642f383b7fd323b4d5cbd1e8e7e726f83e32f
---
M reportdesign/source/ui/report/dlgedfunc.cxx
1 file changed, 7 insertions(+), 19 deletions(-)
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx
b/reportdesign/source/ui/report/dlgedfunc.cxx
index 6805f5e..5b3f27a 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -685,26 +685,14 @@
return sal_False;
}
- if( eHit != SDRHIT_UNMARKEDOBJECT || nId == OBJ_CUSTOMSHAPE)
+ // if no action, create object
+ if ( !m_pParent->getSectionWindow()->getViewsWindow()->IsAction() )
{
- // if no action, create object
- if ( !m_pParent->getSectionWindow()->getViewsWindow()->IsAction() )
- {
- deactivateOle(true);
- if ( m_pParent->getSectionWindow()->getViewsWindow()->HasSelection() )
- m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(&m_rView);
- m_rView.BegCreateObj(m_aMDPos);
- m_pParent->getSectionWindow()->getViewsWindow()->createDefault();
- }
- }
- else
- {
- if( !rMEvt.IsShift() )
- {
- // shift key pressed?
- m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL);
- }
- m_pParent->getSectionWindow()->getViewsWindow()->BegMarkObj( m_aMDPos,&m_rView );
+ deactivateOle(true);
+ if ( m_pParent->getSectionWindow()->getViewsWindow()->HasSelection() )
+ m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(&m_rView);
+ m_rView.BegCreateObj(m_aMDPos);
+ m_pParent->getSectionWindow()->getViewsWindow()->createDefault();
}
return sal_True;
--
To view, visit https://gerrit.libreoffice.org/2949
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34d642f383b7fd323b4d5cbd1e8e7e726f83e32f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet <serval2412@yahoo.fr>
Context
- [PATCH] coverity#704245 Logically dead code · Julien Nabet (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.