[Libreoffice-commits] core.git: svx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Dec 14 16:23:48 UTC 2018
svx/source/tbxctrls/fontworkgallery.cxx | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit ff1016c087377cb4f10613923f65466b74f39643
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Dec 14 13:29:29 2018 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Dec 14 17:23:21 2018 +0100
coverity#1441522 bSdrViewInsertMode is always true
Change-Id: I5fcab474b517a0482bd04dedd0fcee6a817dd3b0
Reviewed-on: https://gerrit.libreoffice.org/65164
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index b21db9d4220d..4cc981480872 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -194,12 +194,11 @@ void FontWorkGalleryDialog::insertSelectedFontwork()
// the mrSdrView that is used to insert (InsertObjectAtView below) the
// cloned SdrObject.
const bool bUseSpecialCalcMode(nullptr != mppSdrObject && nullptr != mpDestModel);
- const bool bSdrViewInsertMode(true);
// center shape on current view
OutputDevice* pOutDev(mrSdrView.GetFirstOutputDevice());
- if(pOutDev && (bUseSpecialCalcMode || bSdrViewInsertMode))
+ if (pOutDev)
{
// Clone directly to target SdrModel (may be different due to user/caller (!))
SdrObject* pNewObject(
@@ -226,11 +225,11 @@ void FontWorkGalleryDialog::insertSelectedFontwork()
tools::Rectangle aNewObjectRectangle(aPagePos, aObjRect.GetSize());
pNewObject->SetLogicRect(aNewObjectRectangle);
- if(bUseSpecialCalcMode)
+ if (bUseSpecialCalcMode)
{
*mppSdrObject = pNewObject;
}
- else // bSdrViewInsertMode
+ else
{
SdrPageView* pPV(mrSdrView.GetSdrPageView());
More information about the Libreoffice-commits
mailing list