Kaydet (Commit) ff1016c0 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1441522 bSdrViewInsertMode is always true

Change-Id: I5fcab474b517a0482bd04dedd0fcee6a817dd3b0
Reviewed-on: https://gerrit.libreoffice.org/65164
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst ac7508c3
...@@ -194,12 +194,11 @@ void FontWorkGalleryDialog::insertSelectedFontwork() ...@@ -194,12 +194,11 @@ void FontWorkGalleryDialog::insertSelectedFontwork()
// the mrSdrView that is used to insert (InsertObjectAtView below) the // the mrSdrView that is used to insert (InsertObjectAtView below) the
// cloned SdrObject. // cloned SdrObject.
const bool bUseSpecialCalcMode(nullptr != mppSdrObject && nullptr != mpDestModel); const bool bUseSpecialCalcMode(nullptr != mppSdrObject && nullptr != mpDestModel);
const bool bSdrViewInsertMode(true);
// center shape on current view // center shape on current view
OutputDevice* pOutDev(mrSdrView.GetFirstOutputDevice()); OutputDevice* pOutDev(mrSdrView.GetFirstOutputDevice());
if(pOutDev && (bUseSpecialCalcMode || bSdrViewInsertMode)) if (pOutDev)
{ {
// Clone directly to target SdrModel (may be different due to user/caller (!)) // Clone directly to target SdrModel (may be different due to user/caller (!))
SdrObject* pNewObject( SdrObject* pNewObject(
...@@ -226,11 +225,11 @@ void FontWorkGalleryDialog::insertSelectedFontwork() ...@@ -226,11 +225,11 @@ void FontWorkGalleryDialog::insertSelectedFontwork()
tools::Rectangle aNewObjectRectangle(aPagePos, aObjRect.GetSize()); tools::Rectangle aNewObjectRectangle(aPagePos, aObjRect.GetSize());
pNewObject->SetLogicRect(aNewObjectRectangle); pNewObject->SetLogicRect(aNewObjectRectangle);
if(bUseSpecialCalcMode) if (bUseSpecialCalcMode)
{ {
*mppSdrObject = pNewObject; *mppSdrObject = pNewObject;
} }
else // bSdrViewInsertMode else
{ {
SdrPageView* pPV(mrSdrView.GetSdrPageView()); SdrPageView* pPV(mrSdrView.GetSdrPageView());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment