sc/source/core/data/documen2.cxx | 3 +-- vcl/source/opengl/OpenGLContext.cxx | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 27cd91f4355ce7de5e89e5097246ee25882ba3ab Author: Markus Mohrhard <[email protected]> Date: Sun Dec 7 05:14:10 2014 +0100 we need the original context that contains the data, fdo#85856 Change-Id: I107201ab736b548f010d813540e0a9cec7402e79 diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 404dd31..02e1992 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -882,9 +882,8 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM aRefCxt.mnTabDelta = nDz; maTabs[nNewPos]->UpdateReference(aRefCxt, NULL); - sc::RefUpdateInsertTabContext aInsTabCxt(nNewPos, 1); maTabs[nNewPos]->UpdateInsertTabAbs(nNewPos); // move all paragraphs up by one!! - maTabs[nOldPos]->UpdateInsertTab(aInsTabCxt); + maTabs[nOldPos]->UpdateInsertTab(aCxt); maTabs[nOldPos]->UpdateCompile(); maTabs[nNewPos]->UpdateCompile( true ); // maybe already compiled in Clone, but used names need recompilation commit 372791c0cda00b1a6561253a92d1622a3e5afd4f Author: Markus Mohrhard <[email protected]> Date: Fri Dec 5 03:32:41 2014 +0100 simple check to prevent crash with old drivers Change-Id: Ia5cfdcae1d762ed8ee4b182c141565f20c97ec7d diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 1ff93cf..01dc185 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -909,6 +909,9 @@ bool OpenGLContext::ImplInit() if (!vShareList.empty()) hSharedCtx = vShareList.front(); + if (!wglCreateContextAttribsARB) + return false; + // now setup the shared context; this needs a temporary context already // set up in order to work m_aGLWin.hRC = wglCreateContextAttribsARB(m_aGLWin.hDC, hSharedCtx, NULL); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
