sc/source/ui/optdlg/tpcalc.cxx | 2 +-
sd/source/ui/func/fuinsert.cxx | 18 ++++--------------
2 files changed, 5 insertions(+), 15 deletions(-)
New commits:
commit d3566e105819cda1e42f51fd5967a971c8f941ea
Author: Paul Trojahn <paul.troj...@gmail.com>
Date: Thu Jun 21 15:51:05 2018 +0200
tdf#115233 Don't reset crop when replacing a graphic
When passing DND_ACTION_MOVE to View::InsertGraphic, the whole object gets
replaced. DND_ACTION_LINK should be used, because it just replaces the
graphic and keeps crop information.
Marking the object is not needed, because InsertObjectAtView and
ReplaceObjectAtView already take care of that.
Change-Id: I0d829ec39a9d484a7c8946252e90eddb12ea9756
Reviewed-on: https://gerrit.libreoffice.org/56401
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
(cherry picked from commit 3f3c16e433f727bf52a6f894956b489187ab6dce)
Reviewed-on: https://gerrit.libreoffice.org/56837
Reviewed-by: Paul Trojahn <paul.troj...@gmail.com>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index d334d8908455..58140974a862 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -168,18 +168,13 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq )
if( mpViewShell && dynamic_cast< DrawViewShell *>( mpViewShell ) !=
nullptr)
{
sal_Int8 nAction = DND_ACTION_COPY;
- SdrObject* pPickObj = mpView->GetEmptyPresentationObject(
PRESOBJ_GRAPHIC );
- bool bSelectionReplaced(false);
+ SdrObject* pPickObj;
- if( pPickObj )
+ if( ( ( pPickObj = mpView->GetSelectedSingleObject(
mpView->GetPage() ) ) && mbReplaceExistingImage ) || (pPickObj =
mpView->GetEmptyPresentationObject( PRESOBJ_GRAPHIC ) ) )
{
nAction = DND_ACTION_LINK;
- }
- else if(mbReplaceExistingImage && mpView->GetMarkedObjectCount()
== 1)
- {
- pPickObj = mpView->GetMarkedObjectByIndex(0);
- nAction = DND_ACTION_MOVE;
- bSelectionReplaced = true;
+ } else {
+ pPickObj = nullptr;
}
Point aPos = mpWindow->GetVisibleCenter();
@@ -202,11 +197,6 @@ void FuInsertGraphic::DoExecute( SfxRequest& rReq )
}
pGrafObj->SetGraphicLink(aFileName, aReferer, aFilterName);
}
-
- if(bSelectionReplaced && pGrafObj)
- {
- mpView->MarkObj(pGrafObj, mpView->GetSdrPageView());
- }
}
}
else
commit fcf9d03950716aca830bd4b059cea13f103cb80f
Author: Gabor Kelemen <kelem...@ubuntu.com>
Date: Tue Jul 3 07:41:47 2018 +0200
tdf#118452 Don't crash when multi thread calculation is disabled
...by default configuration.
Change-Id: If6075ae66537f613434dd38766324436f2426517
Reviewed-on: https://gerrit.libreoffice.org/56840
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
(cherry picked from commit e119194aeec907f3d02cb914e5afde5ac763df7c)
Reviewed-on: https://gerrit.libreoffice.org/56844
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 77652e6d22b5..dc9ae0e28284 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -183,7 +183,7 @@ void ScTpCalcOptions::Reset( const SfxItemSet* /*
rCoreAttrs */ )
m_pEdPrec->SetValue(nPrec);
}
- m_pBtnThread->Enable();
+ m_pBtnThread->Enable(
!officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::isReadOnly()
);
m_pBtnThread->Check(
officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get()
);
CheckClickHdl(m_pBtnIterate);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
