RepositoryExternal.mk | 2 +- svx/source/svdraw/svdcrtv.cxx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit f7a6da202c20fb265653d450d95126a6c9daa0e0 Author: Michael Stahl <[email protected]> Date: Mon Feb 29 21:15:09 2016 +0100 RepositoryExternal.mk: ENABLE_HEADLESS needs cairo too Change-Id: Ia34093fd9afacb73746af0813f2c219119f9a1a1 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8e91812..ef79b1d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1252,7 +1252,7 @@ endif # ANDROID endif # SYSTEM_REDLAND -ifneq ($(USING_X11)$(ENABLE_CAIRO_CANVAS),) # or +ifneq ($(USING_X11)$(ENABLE_CAIRO_CANVAS)$(ENABLE_HEADLESS),) # or ifneq ($(SYSTEM_CAIRO),) commit 86df8242b522c4d52817f163c5fa2453923d69f0 Author: Michael Stahl <[email protected]> Date: Mon Feb 29 18:11:13 2016 +0100 svx: avoid instantiating OBJ_NONE (SdrObject) This happens when using the Drawing toolbar in Writer, the "Text Box" button. SdrCreateView::SetCurrentObj() already has the right fallback code in the "else" branch. Change-Id: Icddfa77ce10eddbfb2dc7165ce11ac6dec80b1ee diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 90ee92f..7b070cb 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -357,7 +357,8 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent) { nAktInvent=nInvent; nAktIdent=nIdent; - SdrObject* pObj = SdrObjFactory::MakeNewObject(nInvent,nIdent,nullptr); + SdrObject * pObj = (nIdent == OBJ_NONE) ? nullptr : + SdrObjFactory::MakeNewObject(nInvent, nIdent, nullptr); if(pObj) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
