[Libreoffice-commits] core.git: Branch 'feature/fixes11' - include/tools sc/source tools/Library_tl.mk tools/source
include/tools/cpuid.hxx| 28 ++ sc/source/core/inc/arraysumfunctor.hxx | 141 + sc/source/core/tool/interpr6.cxx | 71 +++- tools/Library_tl.mk|1 tools/source/misc/cpuid.cxx| 63 ++ 5 files changed, 282 insertions(+), 22 deletions(-) New commits: commit 599aab361bd44635386728a09452f53342419926 Author: László NémethDate: Sun Nov 8 20:52:39 2015 +0100 Revert "Revert "Adapt FuncSum to vectorize better - potentially ..."" This reverts commit 369a3f9cfa6738e8cd02fb41726f536694618ead. Revert "Revert "invalid array index when pCurrent pointer is incremented"" This reverts commit 3395c3ed22519c62b091a5065e03862bda587f20. diff --git a/include/tools/cpuid.hxx b/include/tools/cpuid.hxx new file mode 100644 index 000..316e656 --- /dev/null +++ b/include/tools/cpuid.hxx @@ -0,0 +1,28 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + */ + +#ifndef INCLUDED_TOOLS_CPUID_HXX +#define INCLUDED_TOOLS_CPUID_HXX + +#include +#include + +namespace tools +{ +namespace cpuid +{ +TOOLS_DLLPUBLIC bool hasSSE(); +TOOLS_DLLPUBLIC bool hasSSE2(); +} +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/inc/arraysumfunctor.hxx b/sc/source/core/inc/arraysumfunctor.hxx new file mode 100644 index 000..776c514 --- /dev/null +++ b/sc/source/core/inc/arraysumfunctor.hxx @@ -0,0 +1,141 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + */ + +#ifndef INCLUDED_SC_SOURCE_CORE_INC_ARRAYSUMFUNCTOR_HXX +#define INCLUDED_SC_SOURCE_CORE_INC_ARRAYSUMFUNCTOR_HXX + +#include +#include + +namespace sc +{ + +template +inline bool isAligned(const T* pointer) +{ +return 0 == (uintptr_t(pointer) % N); +} + +struct ArraySumFunctor +{ +private: +const double* mpArray; +size_t mnSize; + +public: +ArraySumFunctor(const double* pArray, size_t nSize) +: mpArray(pArray) +, mnSize(nSize) +{ +} + +double operator() () +{ +static bool hasSSE2 = tools::cpuid::hasSSE2(); + +double fSum = 0.0; +size_t i = 0; +const double* pCurrent = mpArray; + +if (hasSSE2) +{ +while (!isAligned (pCurrent)) +{ +fSum += *pCurrent++; +i++; +} +fSum += executeSSE2(i, pCurrent); +} +else +fSum += executeUnrolled(i, pCurrent); + +// sum rest of the array + +for (; i < mnSize; ++i) +fSum += mpArray[i]; + +return fSum; +} + +private: +inline double executeSSE2(size_t& i, const double* pCurrent) const +{ +double fSum = 0.0; +size_t nRealSize = mnSize - i; +size_t nUnrolledSize = nRealSize - (nRealSize % 8); + +if (nUnrolledSize > 0) +{ +__m128d sum1 = _mm_setzero_pd(); +__m128d sum2 = _mm_setzero_pd(); +__m128d sum3 = _mm_setzero_pd(); +__m128d sum4 = _mm_setzero_pd(); + +for (; i < nUnrolledSize; i += 8) +{ +__m128d load1 = _mm_load_pd(pCurrent); +sum1 = _mm_add_pd(sum1, load1); +pCurrent += 2; + +__m128d load2 = _mm_load_pd(pCurrent); +sum2 = _mm_add_pd(sum2, load2); +pCurrent += 2; + +__m128d load3 = _mm_load_pd(pCurrent); +sum3 = _mm_add_pd(sum3, load3); +pCurrent += 2; + +__m128d load4 = _mm_load_pd(pCurrent); +sum4 = _mm_add_pd(sum4, load4); +pCurrent += 2; +} +sum1 = _mm_add_pd(_mm_add_pd(sum1, sum2), _mm_add_pd(sum3, sum4)); + +double temp; + +_mm_storel_pd(, sum1); +fSum += temp; + +_mm_storeh_pd(, sum1); +fSum += temp; +} +return fSum; +} + +inline double executeUnrolled(size_t& i, const double* pCurrent) const +{ +size_t nRealSize = mnSize - i; +size_t nUnrolledSize = nRealSize - (nRealSize % 4); + +if (nUnrolledSize > 0) +{ +double sum0 = 0.0; +double sum1 = 0.0; +double sum2 = 0.0; +
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source
sw/source/core/objectpositioning/anchoredobjectposition.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 98ef16db0d228ebc0e7bad0290dcc9d3f1d6469b Author: László NémethDate: Fri Nov 6 14:54:02 2015 +0100 tdf#92648 fix DOCX import regression (textbox shrinking in footers) caused by the fix for tdf#91260 (cherry picked from commit 16331514fd10d444bec89f892a106cbbba9e16c0) Change-Id: I4a5a27b51c4cb1304647b5432c06ca9c5a96590d Reviewed-on: https://gerrit.libreoffice.org/19877 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index b4e63e3..ee354ce 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -484,8 +484,10 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( const SwTwips nTopOfAnc SwFrameFormat* pFrameFormat = ::FindFrameFormat(()); SwFormatFrmSize aSize(pFormat->GetFrmSize()); SwTwips nShrinked = aSize.GetHeight() - (nProposedRelPosY - nAdjustedRelPosY); -aSize.SetHeight( nShrinked > 0 ? nShrinked : 0 ); -pFrameFormat->SetFormatAttr(aSize); +if (nShrinked >= 0) { +aSize.SetHeight( nShrinked ); +pFrameFormat->SetFormatAttr(aSize); +} nAdjustedRelPosY = nProposedRelPosY; } else if ( SwTextBoxHelper::findTextBox(pFormat) ) // when the shape has a textbox, use only the proposed vertical position ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes12' -
0 files changed New commits: commit 5f9462ab5339e849d9600d299f65f153329f1040 Author: László NémethDate: Fri Nov 13 16:05:09 2015 +0100 disable mergelibs ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes12' -
0 files changed New commits: commit bab7ef726ec81c5890585c5229e9cf5c79dfbeae Author: László NémethDate: Mon Nov 16 19:57:42 2015 +0100 Revert "disable mergelibs" This reverts commit 5f9462ab5339e849d9600d299f65f153329f1040. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit edc620417410a637e5f22c80f25fd323b270c24e Author: László NémethDate: Mon Nov 16 00:03:16 2015 +0100 tdf#38395 enable smart apostrophe replacement by default Unicode apostrophe is mandatory for French, English, etc. typography, and it is a default option in all modern word processors. The fix enables single quote AutoCorrect replacement for all languages. Change-Id: I2964242ecd1cc839bf27e9a3d772f5cab95d8db0 (cherry picked from commit e6fade1ce133039d28369751b77ac8faff6e40cb) diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index bd6483a..dc68cac 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1347,7 +1347,7 @@ Specifies if single quotes should be replaced. Single quotes - Replace -false +true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e6fade1ce133039d28369751b77ac8faff6e40cb Author: László NémethDate: Mon Nov 16 00:03:16 2015 +0100 tdf#38395 enable smart apostrophe replacement by default Unicode apostrophe is mandatory for French, English, etc. typography, and it is a default option in all modern word processors. The fix enables single quote AutoCorrect replacement for all languages. Change-Id: I2964242ecd1cc839bf27e9a3d772f5cab95d8db0 diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index d693fc7..ebfe66f 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1347,7 +1347,7 @@ Specifies if single quotes should be replaced. Single quotes - Replace -false +true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 8ca4260edf89000b1b828277356092e27d86d341 Author: László NémethDate: Mon Nov 9 10:12:23 2015 +0100 loleaflet: fix Writer/Impress at zoom diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js index 203aa9a..1f00b05 100644 --- a/loleaflet/src/layer/tile/TileLayer.js +++ b/loleaflet/src/layer/tile/TileLayer.js @@ -114,7 +114,9 @@ L.TileLayer = L.GridLayer.extend({ map.on('paste', this._onPaste, this); map.on('zoomend', this._onUpdateCursor, this); map.on('zoomend', this._onUpdatePartPageRectangles, this); - map.on('zoomend', this._onCellCursorShift, this); + if (this._docType === 'spreadsheet') { + map.on('zoomend', this._onCellCursorShift, this); + } map.on('dragstart', this._onDragStart, this); map.on('requestloksession', this._onRequestLOKSession, this); map.on('error', this._mapOnError, this); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/uiwriter/data/tdf92648.docx |binary sw/qa/extras/uiwriter/uiwriter.cxx | 17 + 2 files changed, 17 insertions(+) New commits: commit 41d90d6c7c41df781ecaf7745872f20abd7e52a9 Author: László NémethDate: Tue Nov 10 01:00:51 2015 +0100 tdf#92648 unit test for DOCX import regression (textbox shrinking) Change-Id: I810708bbd337b325ed58927fcdd67f24f70f1252 diff --git a/sw/qa/extras/uiwriter/data/tdf92648.docx b/sw/qa/extras/uiwriter/data/tdf92648.docx new file mode 100644 index 000..4857723 Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf92648.docx differ diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 8924f28..f0b495d 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -167,6 +167,7 @@ public: void testTdf88986(); void testTdf87922(); void testTdf77014(); +void testTdf92648(); CPPUNIT_TEST_SUITE(SwUiWriterTest); CPPUNIT_TEST(testReplaceForward); @@ -243,6 +244,7 @@ public: CPPUNIT_TEST(testTdf88986); CPPUNIT_TEST(testTdf87922); CPPUNIT_TEST(testTdf77014); +CPPUNIT_TEST(testTdf92648); CPPUNIT_TEST_SUITE_END(); private: @@ -2743,6 +2745,21 @@ void SwUiWriterTest::testTdf77014() CPPUNIT_ASSERT_EQUAL(OUString("1"), parseDump("/root/page/body/txt[5]/Text[5]", "nLength")); } +void SwUiWriterTest::testTdf92648() +{ +SwDoc* pDoc = createDoc("tdf92648.docx"); +SdrPage* pPage = pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0); +std::set aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc); +// Make sure we have ten draw shapes. +CPPUNIT_ASSERT_EQUAL(sal_Int32(10), SwTextBoxHelper::getCount(pPage, aTextBoxes)); +// and the text boxes haven't got zero height +for (std::set::iterator it=aTextBoxes.begin(); it!=aTextBoxes.end(); ++it) +{ +SwFormatFrmSize aSize((*it)->GetFrmSize()); +CPPUNIT_ASSERT(aSize.GetHeight() != 0); +} +} + CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest); CPPUNIT_PLUGIN_IMPLEMENT(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/map/handler/Map.Keyboard.js | 169 ++ 1 file changed, 147 insertions(+), 22 deletions(-) New commits: commit 9ab64a14468a4190cc06227757431c224f65415a Author: László NémethDate: Tue Nov 3 18:04:53 2015 +0100 tdf#94608 Calc Ctrl shortcuts Basic Calc navigation and selection shortcuts + fix Ctrl+- (soft hyphen) in Firefox + fix Ctrl-L/R/E/J alignations in Calc + other shortcuts diff --git a/loleaflet/src/map/handler/Map.Keyboard.js b/loleaflet/src/map/handler/Map.Keyboard.js index a9c9ff7..3532795 100644 --- a/loleaflet/src/map/handler/Map.Keyboard.js +++ b/loleaflet/src/map/handler/Map.Keyboard.js @@ -69,6 +69,7 @@ L.Map.Keyboard = L.Handler.extend({ 122 : 778, // f11 : F11 144 : 1313, // num lock : NUMLOCK 145 : 1314, // scroll lock : SCROLLLOCK + 173 : 5,// dash : DASH (on Firefox) 186 : 1317, // semi-colon : SEMICOLON 187 : 1295, // equal sign : EQUAL 188 : 1292, // comma: COMMA @@ -190,7 +191,7 @@ L.Map.Keyboard = L.Handler.extend({ var ctrl = e.originalEvent.ctrlKey ? this.keyModifier.ctrl : 0; var alt = e.originalEvent.altKey ? this.keyModifier.alt : 0; this.modifier = shift | ctrl | alt; - if (e.originalEvent.ctrlKey) { + if (ctrl) { this._handleCtrlCommand(e); return; } @@ -214,8 +215,16 @@ L.Map.Keyboard = L.Handler.extend({ var keyCode = e.originalEvent.keyCode; var unoKeyCode = this._toUNOKeyCode(keyCode); - if (e.originalEvent.shiftKey) { + if (shift) { unoKeyCode |= this.keyModifier.shift; + + switch (e.originalEvent.keyCode) { + case 32: // space + if (this._map.getDocType() === 'spreadsheet') { + L.Socket.sendMessage('uno .uno:SelectRow'); + return; + } + } } if (docLayer._permission === 'edit') { @@ -262,6 +271,11 @@ L.Map.Keyboard = L.Handler.extend({ L.DomEvent.stopPropagation(e.originalEvent); }, + +_getUno: function (calc, writer) { + return this._map.getDocType() === 'spreadsheet' ? calc : writer; + }, + _handleCtrlCommand: function (e) { if (e.type !== 'keydown' && e.originalEvent.key !== 'c' && e.originalEvent.key !== 'v') { e.originalEvent.preventDefault(); @@ -273,6 +287,9 @@ L.Map.Keyboard = L.Handler.extend({ // Ctrl + Alt if (!e.originalEvent.shiftKey) { switch (e.originalEvent.keyCode) { + case 53: // 5 + L.Socket.sendMessage('uno .uno:Strikeout'); + break; case 70: // f L.Socket.sendMessage('uno .uno:InsertFootnote'); break; @@ -289,23 +306,76 @@ L.Map.Keyboard = L.Handler.extend({ // Ctrl + Shift if (!e.originalEvent.altKey) { switch (e.originalEvent.keyCode) { + case 8: // backspace + L.Socket.sendMessage('uno .uno:DelToStartOfSentence'); + break; + case 13: // return + L.Socket.sendMessage( this._getUno( + '', + 'uno .uno:InsertColumnBreak' + )); + case 32: // space + L.Socket.sendMessage( this._getUno( + 'uno .uno:SelectColumn', + 'uno .uno:InsertNonBreakingSpace' + )); + break; case 35: // end - L.Socket.sendMessage('uno .uno:EndOfDocumentSel'); + L.Socket.sendMessage( this._getUno( +
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/map/handler/Map.Keyboard.js | 310 ++ 1 file changed, 66 insertions(+), 244 deletions(-) New commits: commit fd610ff6a66db269f47413546bfb7aa712b0e2cf Author: László NémethDate: Thu Nov 5 16:48:41 2015 +0100 loleaflet: handle Ctrl/Alt keys in the core diff --git a/loleaflet/src/map/handler/Map.Keyboard.js b/loleaflet/src/map/handler/Map.Keyboard.js index 3532795..9ac81de 100644 --- a/loleaflet/src/map/handler/Map.Keyboard.js +++ b/loleaflet/src/map/handler/Map.Keyboard.js @@ -38,6 +38,42 @@ L.Map.Keyboard = L.Handler.extend({ 40 : 1024, // down arrow : DOWN 45 : 1285, // insert : INSERT 46 : 1286, // delete : DELETE + 48 : 256, // 0: NUM0 + 49 : 257, // 1: NUM1 + 50 : 258, // 2: NUM2 + 51 : 259, // 3: NUM3 + 52 : 260, // 4: NUM4 + 53 : 261, // 5: NUM5 + 54 : 262, // 6: NUM6 + 55 : 263, // 7: NUM7 + 56 : 264, // 8: NUM8 + 57 : 265, // 9: NUM9 + 65 : 512, // A: A + 66 : 513, // B: B + 67 : 514, // C: C + 68 : 515, // D: D + 69 : 516, // E: E + 70 : 517, // F: F + 71 : 518, // G: G + 72 : 519, // H: H + 73 : 520, // I: I + 74 : 521, // J: J + 75 : 522, // K: K + 76 : 523, // L: L + 77 : 524, // M: M + 78 : 525, // N: N + 79 : 526, // O: O + 80 : 527, // P: P + 81 : 528, // Q: Q + 82 : 529, // R: R + 83 : 530, // S: S + 84 : 531, // T: T + 85 : 532, // U: U + 86 : 533, // V: V + 87 : 534, // W: W + 88 : 535, // X: X + 89 : 536, // Y: Y + 90 : 537, // Z: Z 91 : null, // left window key : UNKOWN 92 : null, // right window key : UNKOWN 93 : null, // select key : UNKOWN @@ -69,11 +105,11 @@ L.Map.Keyboard = L.Handler.extend({ 122 : 778, // f11 : F11 144 : 1313, // num lock : NUMLOCK 145 : 1314, // scroll lock : SCROLLLOCK - 173 : 5,// dash : DASH (on Firefox) + 173 : 1288, // dash : DASH (on Firefox) 186 : 1317, // semi-colon : SEMICOLON 187 : 1295, // equal sign : EQUAL 188 : 1292, // comma: COMMA - 189 : 5,// dash : DASH + 189 : 1288, // dash : DASH 190 : null, // period : UNKOWN 191 : null, // forward slash: UNKOWN 192 : null, // grave accent : UNKOWN @@ -191,9 +227,10 @@ L.Map.Keyboard = L.Handler.extend({ var ctrl = e.originalEvent.ctrlKey ? this.keyModifier.ctrl : 0; var alt = e.originalEvent.altKey ? this.keyModifier.alt : 0; this.modifier = shift | ctrl | alt; + if (ctrl) { - this._handleCtrlCommand(e); - return; + if (this._handleCtrlCommand(e)) + return; } // page up or page down, handled by this.dopagejump @@ -215,15 +252,12 @@ L.Map.Keyboard = L.Handler.extend({ var keyCode = e.originalEvent.keyCode; var unoKeyCode = this._toUNOKeyCode(keyCode); - if (shift) { - unoKeyCode |= this.keyModifier.shift; - - switch (e.originalEvent.keyCode) { - case 32: // space - if (this._map.getDocType() === 'spreadsheet') { - L.Socket.sendMessage('uno .uno:SelectRow'); - return; - } + if (this.modifier) { + unoKeyCode |= this.modifier; +
[Libreoffice-commits] core.git: Branch 'feature/fixes11' -
0 files changed New commits: commit 2df2631b624688b3b1ba48db9588e41dbcbf88e7 Author: László NémethDate: Sat Nov 7 00:23:58 2015 +0100 update ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/map/handler/Map.Keyboard.js |6 ++ 1 file changed, 6 insertions(+) New commits: commit 26fa6adff748935670390da9f7671faa38010259 Author: László NémethDate: Thu Nov 5 19:02:13 2015 +0100 loleaflet: revert the removed Ctrl-5 for Calc strikethrough text diff --git a/loleaflet/src/map/handler/Map.Keyboard.js b/loleaflet/src/map/handler/Map.Keyboard.js index 9ac81de..3d1f846 100644 --- a/loleaflet/src/map/handler/Map.Keyboard.js +++ b/loleaflet/src/map/handler/Map.Keyboard.js @@ -341,6 +341,12 @@ L.Map.Keyboard = L.Handler.extend({ } switch (e.originalEvent.keyCode) { + case 53: // 5 + if (this._map.getDocType() === 'spreadsheet') { + L.Socket.sendMessage('uno .uno:Strikeout'); + return true; + } + return false; case 67: // c // we prepare for a copy event this._map._docLayer._textArea.value = 'dummy text'; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes11' -
0 files changed New commits: commit a88d41a9400224f08c5ad7fa76e37e53e9321d6f Author: László NémethDate: Sun Nov 8 00:31:28 2015 +0100 update2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Buttons.js | 17 - 1 file changed, 12 insertions(+), 5 deletions(-) New commits: commit 6fd782177977c3a902ae9f2b4a90f9f184bb45fb Author: László NémethDate: Wed Nov 4 14:09:47 2015 +0100 standard toolbar: fix alignation in spreadsheets diff --git a/loleaflet/src/control/Control.Buttons.js b/loleaflet/src/control/Control.Buttons.js index 88a5562..10ec71b 100644 --- a/loleaflet/src/control/Control.Buttons.js +++ b/loleaflet/src/control/Control.Buttons.js @@ -11,6 +11,8 @@ L.Control.Buttons = L.Control.extend({ var buttonsName = 'leaflet-control-buttons', container = L.DomUtil.create('div', buttonsName + '-container' + ' leaflet-bar'); + var sheetAlign = 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"'; + this._buttons = { 'bold': {title: 'Bold', uno: 'Bold', iconName: 'bold.png'}, 'italic':{title: 'Italic', uno: 'Italic', iconName: 'italic.png'}, @@ -18,10 +20,10 @@ L.Control.Buttons = L.Control.extend({ 'strikethrough': {title: 'Strike-through', uno: 'Strikeout',iconName: 'strikethrough.png'}, 'bullet' : {title: 'Bullets ON/OFF', uno: 'DefaultBullet',iconName: 'defaultbullet.png'}, 'numbering': {title: 'Numbering ON/OFF', uno: 'DefaultNumbering', iconName: 'defaultnumbering.png'}, - 'alignleft': {title: 'Align left', uno: 'LeftPara', iconName: 'alignleft.png'}, - 'aligncenter': {title: 'Center horizontaly', uno: 'CenterPara', iconName: 'aligncenter.png'}, - 'alignright':{title: 'Align right',uno: 'RightPara',iconName: 'alignright.png'}, - 'alignblock':{title: 'Justified', uno: 'JustifyPara', iconName: 'alignblock.png'}, + 'alignleft': {title: 'Align left', uno: 'LeftPara', unosheet: sheetAlign + '1"}}', iconName: 'alignleft.png'}, + 'aligncenter': {title: 'Center horizontaly', uno: 'CenterPara', unosheet: sheetAlign + '2"}}', iconName: 'aligncenter.png'}, + 'alignright':{title: 'Align right',uno: 'RightPara', unosheet: sheetAlign + '3"}}',iconName: 'alignright.png'}, + 'alignblock':{title: 'Justified', uno: 'JustifyPara', unosheet: sheetAlign + '4"}}', iconName: 'alignblock.png'}, 'incindent': {title: 'Increment indent', uno: 'IncrementIndent', iconName: 'incrementindent.png'}, 'decindent': {title: 'Decrement indent', uno: 'DecrementIndent', iconName: 'decrementindent.png'}, 'save': {title: 'Save', uno: 'Save', iconName: 'save.png'}, @@ -76,7 +78,12 @@ L.Control.Buttons = L.Control.extend({ }); } else if (button.uno && this._map._docLayer._permission === 'edit') { - this._map.toggleCommandState(button.uno); + if (button.unosheet && this._map.getDocType() === 'spreadsheet') { + this._map.toggleCommandState(button.unosheet); + } + else { + this._map.toggleCommandState(button.uno); + } } else if (id === 'edit' && !L.DomUtil.hasClass(button.el.firstChild, 'leaflet-control-buttons-disabled')) { if (this._map.getPermission() === 'edit') { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes11' - include/tools sc/source tools/Library_tl.mk tools/source
include/tools/cpuid.hxx| 28 -- sc/source/core/inc/arraysumfunctor.hxx | 141 - sc/source/core/tool/interpr6.cxx | 18 ++-- tools/Library_tl.mk|1 tools/source/misc/cpuid.cxx| 63 -- 5 files changed, 11 insertions(+), 240 deletions(-) New commits: commit 3395c3ed22519c62b091a5065e03862bda587f20 Author: László NémethDate: Fri Nov 6 01:14:31 2015 +0100 Revert "invalid array index when pCurrent pointer is incremented" This reverts commit b35c38c6e44b0df0fc2c5a3983ecd7547b964691. Revert "Fast array sum: aligned load, process 8 doubles per loop" This reverts commit f814b00bc908c5498156194f45bf8f9c0b8268ac. Revert "arraysumfunctor: fast sum a double array, use for SUM() in Calc" This reverts commit e59e6c572f3e7531800b396f7e4ad5f52f98d987. diff --git a/include/tools/cpuid.hxx b/include/tools/cpuid.hxx deleted file mode 100644 index 316e656..000 --- a/include/tools/cpuid.hxx +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - */ - -#ifndef INCLUDED_TOOLS_CPUID_HXX -#define INCLUDED_TOOLS_CPUID_HXX - -#include -#include - -namespace tools -{ -namespace cpuid -{ -TOOLS_DLLPUBLIC bool hasSSE(); -TOOLS_DLLPUBLIC bool hasSSE2(); -} -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/inc/arraysumfunctor.hxx b/sc/source/core/inc/arraysumfunctor.hxx deleted file mode 100644 index 776c514..000 --- a/sc/source/core/inc/arraysumfunctor.hxx +++ /dev/null @@ -1,141 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - */ - -#ifndef INCLUDED_SC_SOURCE_CORE_INC_ARRAYSUMFUNCTOR_HXX -#define INCLUDED_SC_SOURCE_CORE_INC_ARRAYSUMFUNCTOR_HXX - -#include -#include - -namespace sc -{ - -template -inline bool isAligned(const T* pointer) -{ -return 0 == (uintptr_t(pointer) % N); -} - -struct ArraySumFunctor -{ -private: -const double* mpArray; -size_t mnSize; - -public: -ArraySumFunctor(const double* pArray, size_t nSize) -: mpArray(pArray) -, mnSize(nSize) -{ -} - -double operator() () -{ -static bool hasSSE2 = tools::cpuid::hasSSE2(); - -double fSum = 0.0; -size_t i = 0; -const double* pCurrent = mpArray; - -if (hasSSE2) -{ -while (!isAligned (pCurrent)) -{ -fSum += *pCurrent++; -i++; -} -fSum += executeSSE2(i, pCurrent); -} -else -fSum += executeUnrolled(i, pCurrent); - -// sum rest of the array - -for (; i < mnSize; ++i) -fSum += mpArray[i]; - -return fSum; -} - -private: -inline double executeSSE2(size_t& i, const double* pCurrent) const -{ -double fSum = 0.0; -size_t nRealSize = mnSize - i; -size_t nUnrolledSize = nRealSize - (nRealSize % 8); - -if (nUnrolledSize > 0) -{ -__m128d sum1 = _mm_setzero_pd(); -__m128d sum2 = _mm_setzero_pd(); -__m128d sum3 = _mm_setzero_pd(); -__m128d sum4 = _mm_setzero_pd(); - -for (; i < nUnrolledSize; i += 8) -{ -__m128d load1 = _mm_load_pd(pCurrent); -sum1 = _mm_add_pd(sum1, load1); -pCurrent += 2; - -__m128d load2 = _mm_load_pd(pCurrent); -sum2 = _mm_add_pd(sum2, load2); -pCurrent += 2; - -__m128d load3 = _mm_load_pd(pCurrent); -sum3 = _mm_add_pd(sum3, load3); -pCurrent += 2; - -__m128d load4 = _mm_load_pd(pCurrent); -sum4 = _mm_add_pd(sum4, load4); -pCurrent += 2; -} -sum1 = _mm_add_pd(_mm_add_pd(sum1, sum2), _mm_add_pd(sum3, sum4)); - -double temp; - -_mm_storel_pd(, sum1); -fSum += temp; - -_mm_storeh_pd(, sum1); -fSum += temp; -} -return fSum; -} - -inline double executeUnrolled(size_t& i, const double* pCurrent) const -{ -size_t nRealSize = mnSize - i; -size_t nUnrolledSize = nRealSize - (nRealSize % 4); - -if
[Libreoffice-commits] core.git: Branch 'feature/fixes11' - sc/source
sc/source/core/tool/interpr6.cxx | 75 +++ 1 file changed, 22 insertions(+), 53 deletions(-) New commits: commit 369a3f9cfa6738e8cd02fb41726f536694618ead Author: László NémethDate: Fri Nov 6 11:07:02 2015 +0100 Revert "Adapt FuncSum to vectorize better - potentially ..." This reverts commit 14635e66cd1e948d1c7ff4e90973fc62567cb801. diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index 50c0768a..694a403 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.cxx @@ -203,11 +203,6 @@ double ScInterpreter::GetGammaDist( double fX, double fAlpha, double fLambda ) namespace { -// this is unpleasant - but ... we want raw access. -struct puncture_mdds_encap : public sc::numeric_block { -const double *getPtr(size_t nOffset) const { return _array[nOffset]; } -}; - class NumericCellAccumulator { double mfSum; @@ -216,58 +211,32 @@ class NumericCellAccumulator public: NumericCellAccumulator() : mfSum(0.0), mnError(0) {} -void operator() (const sc::CellStoreType::value_type& rNode, size_t nOffset, size_t nDataSize) +void operator() (size_t, double fVal) { -switch (rNode.type) -{ -case sc::element_type_numeric: -{ -const puncture_mdds_encap *pBlock = static_cast(rNode.data); -const double *p = pBlock->getPtr(nOffset); -size_t i, nUnrolled = (nDataSize & 0x3) >> 2; - -// Try to encourage the compiler/CPU to do something sensible (?) -for (i = 0; i < nUnrolled; i+=4) -{ -mfSum += p[i]; -mfSum += p[i+1]; -mfSum += p[i+2]; -mfSum += p[i+3]; -} -for (; i < nDataSize; ++i) -mfSum += p[i]; -break; -} +mfSum += fVal; +} -case sc::element_type_formula: -{ -sc::formula_block::const_iterator it = sc::formula_block::begin(*rNode.data); -std::advance(it, nOffset); -sc::formula_block::const_iterator itEnd = it; -std::advance(itEnd, nDataSize); -for (; it != itEnd; ++it) -{ -double fVal = 0.0; -sal_uInt16 nErr = 0; -ScFormulaCell& rCell = const_cast (*(*it)); -if (!rCell.GetErrorOrValue(nErr, fVal)) -// The cell has neither error nor value. Perhaps string result. -continue; +void operator() (size_t, const ScFormulaCell* pCell) +{ +if (mnError) +// Skip all the rest if we have an error. +return; -if (nErr) -{ -// Cell has error - skip all the rest -mnError = nErr; -return; -} +double fVal = 0.0; +sal_uInt16 nErr = 0; +ScFormulaCell& rCell = const_cast (*pCell); +if (!rCell.GetErrorOrValue(nErr, fVal)) +// The cell has neither error nor value. Perhaps string result. +return; -mfSum += fVal; -} -} -break; -default: -; +if (nErr) +{ +// Cell has error. +mnError = nErr; +return; } + +mfSum += fVal; } sal_uInt16 getError() const { return mnError; } @@ -366,7 +335,7 @@ public: return; NumericCellAccumulator aFunc; -maPos.miCellPos = sc::ParseBlock(maPos.miCellPos, mpCol->GetCellStore(), aFunc, nRow1, nRow2); +maPos.miCellPos = sc::ParseFormulaNumeric(maPos.miCellPos, mpCol->GetCellStore(), nRow1, nRow2, aFunc); mnError = aFunc.getError(); if (mnError) return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 81b2e040f44c657bc653458f4807d790f19a855a Author: László NémethDate: Fri Nov 6 13:14:36 2015 +0100 fix Writer/Impress work diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js index 3cdf098..203aa9a 100644 --- a/loleaflet/src/layer/tile/TileLayer.js +++ b/loleaflet/src/layer/tile/TileLayer.js @@ -124,7 +124,7 @@ L.TileLayer = L.GridLayer.extend({ // cell). map.on('statusindicator', function (e) { -if (e.statusType === 'alltilesloaded') { +if (e.statusType === 'alltilesloaded' && this._docType === 'spreadsheet') { this._onCellCursorShift(true); } }, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - libreofficekit/source sw/source
libreofficekit/source/gtk/lokdocview.cxx| 23 +++- sw/source/core/objectpositioning/anchoredobjectposition.cxx |6 ++- 2 files changed, 26 insertions(+), 3 deletions(-) New commits: commit 16331514fd10d444bec89f892a106cbbba9e16c0 Author: László NémethDate: Fri Nov 6 14:54:02 2015 +0100 tdf#92648 fix DOCX import regression (textbox shrinking in footers) caused by the fix for tdf#91260 Change-Id: I4a5a27b51c4cb1304647b5432c06ca9c5a96590d diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx index 1993919..a824989 100644 --- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx @@ -484,8 +484,10 @@ SwTwips SwAnchoredObjectPosition::_ImplAdjustVertRelPos( const SwTwips nTopOfAnc SwFrameFormat* pFrameFormat = ::FindFrameFormat(()); SwFormatFrmSize aSize(pFormat->GetFrmSize()); SwTwips nShrinked = aSize.GetHeight() - (nProposedRelPosY - nAdjustedRelPosY); -aSize.SetHeight( nShrinked > 0 ? nShrinked : 0 ); -pFrameFormat->SetFormatAttr(aSize); +if (nShrinked >= 0) { +aSize.SetHeight( nShrinked ); +pFrameFormat->SetFormatAttr(aSize); +} nAdjustedRelPosY = nProposedRelPosY; } else if ( SwTextBoxHelper::findTextBox(pFormat) ) // when the shape has a textbox, use only the proposed vertical position commit 63d2d50ecb3f3a83374a1a01713edce14ba378ed Author: László Németh Date: Fri Nov 6 19:26:29 2015 +0100 gtktiledviewer: add Ctrl, Alt, Shift shortcut support For example in Writer: Ctrl-B for bold text Ctrl-Shift-B/P for subscript/superscript Ctrl-Alt-C insert comment Ctrl-1 apply Heading 1 paragraph style Change-Id: Iaeb8341f2cb273980b637ff2fed89585094e0d9d diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index 9aaa5ef..475f388 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -337,7 +337,7 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent) return FALSE; } -priv->m_nKeyModifier = 0; +priv->m_nKeyModifier &= KEY_MOD2; switch (pEvent->keyval) { case GDK_KEY_BackSpace: @@ -381,6 +381,8 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent) case GDK_KEY_Alt_R: if (pEvent->type == GDK_KEY_PRESS) priv->m_nKeyModifier |= KEY_MOD2; +else +priv->m_nKeyModifier &= ~KEY_MOD2; break; default: if (pEvent->keyval >= GDK_KEY_F1 && pEvent->keyval <= GDK_KEY_F26) @@ -395,6 +397,25 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent) if (pEvent->state & GDK_SHIFT_MASK) nKeyCode |= KEY_SHIFT; +if (pEvent->state & GDK_CONTROL_MASK) +nKeyCode |= KEY_MOD1; + +if (priv->m_nKeyModifier & KEY_MOD2) +nKeyCode |= KEY_MOD2; + +if (nKeyCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2)) { +if (pEvent->keyval >= GDK_KEY_a && pEvent->keyval <= GDK_KEY_z) +{ +nKeyCode |= 512 + (pEvent->keyval - GDK_KEY_a); +} +else if (pEvent->keyval >= GDK_KEY_A && pEvent->keyval <= GDK_KEY_Z) { +nKeyCode |= 512 + (pEvent->keyval - GDK_KEY_A); +} +else if (pEvent->keyval >= GDK_KEY_0 && pEvent->keyval <= GDK_KEY_9) { +nKeyCode |= 256 + (pEvent->keyval - GDK_KEY_0); +} +} + if (pEvent->type == GDK_KEY_RELEASE) { GTask* task = g_task_new(pDocView, NULL, NULL, NULL); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/hunspell
external/hunspell/UnpackedTarball_hunspell.mk |1 external/hunspell/hunspell-tdf95024-compound.patch | 108 + 2 files changed, 109 insertions(+) New commits: commit c004e4185405bf1880f6c5e1247b525531c84e3b Author: László NémethDate: Wed Oct 14 01:17:26 2015 +0200 tdf#95024 fix compound word handling for new Hungarian orthography This commit contains the recent Hunspell fix for Hungarian compound word handling (commit 42807f970ac2d65f0d13a7c57eb454b210e92240 in Hunspell git repository), changing spell checking only in Hungarian documents. (cherry-picked from commit 2511a21841dd9dec735a53add8174e47d24deb88) Change-Id: I1c6c3736ecf8c1e2fffcf1c53959b25dc9d27966 Reviewed-on: https://gerrit.libreoffice.org/19363 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/external/hunspell/UnpackedTarball_hunspell.mk b/external/hunspell/UnpackedTarball_hunspell.mk index 6ad31dd..8f14062 100644 --- a/external/hunspell/UnpackedTarball_hunspell.mk +++ b/external/hunspell/UnpackedTarball_hunspell.mk @@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hunspell,\ external/hunspell/hunspell-morph-overflow.patch \ external/hunspell/ubsan.patch.0 \ external/hunspell/hunspell-1.3.3-rhbz1261421.patch \ + external/hunspell/hunspell-tdf95024-compound.patch \ )) ifeq ($(COM),MSC) diff --git a/external/hunspell/hunspell-tdf95024-compound.patch b/external/hunspell/hunspell-tdf95024-compound.patch new file mode 100644 index 000..133cf4a --- /dev/null +++ b/external/hunspell/hunspell-tdf95024-compound.patch @@ -0,0 +1,108 @@ +From 42807f970ac2d65f0d13a7c57eb454b210e92240 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= + +Date: Mon, 12 Oct 2015 08:43:12 +0200 +Subject: [PATCH] fix compound handling for new Hungarian orthography + +The frequent cases of this compound limitation are handled by +the extended dictionary, but not these ones with both derivative +and inflectional suffixes. +--- + src/hunspell/affixmgr.cxx | 19 +++ + src/hunspell/affixmgr.hxx | 1 + + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/src/hunspell/affixmgr.cxx b/src/hunspell/affixmgr.cxx +index 0992e6e..0950425 100644 +--- misc/hunspell-1.3.3/src/hunspell/affixmgr.cxx misc/build/hunspell-1.3.3/src/hunspell/affixmgr.cxx +@@ -139,8 +139,9 @@ AffixMgr::AffixMgr(const char * affpath, HashMgr** ptr, int * md, const char * k + cpdvowels=NULL; // vowels (for calculating of Hungarian compounding limit, O(n) search! XXX) + cpdvowels_utf16=NULL; // vowels for UTF-8 encoding (bsearch instead of O(n) search) + cpdvowels_utf16_len=0; // vowels +- pfxappnd=NULL; // previous prefix for counting the syllables of prefix BUG +- sfxappnd=NULL; // previous suffix for counting a special syllables BUG ++ pfxappnd=NULL; // previous prefix for counting syllables of the prefix BUG ++ sfxappnd=NULL; // previous suffix for counting syllables of the suffix BUG ++ sfxextra=0; // modifier for syllable count of sfxappnd BUG + cpdsyllablenum=NULL; // syllable count incrementing flag + checknum=0; // checking numbers, and word with numbers + wordchars=NULL; // letters + spec. word characters +@@ -1201,6 +1202,7 @@ struct hentry * AffixMgr::prefix_check(const char * word, int len, char in_compo + pfx = NULL; + pfxappnd = NULL; + sfxappnd = NULL; ++sfxextra = 0; + + // first handle the special case of 0 length prefixes + PfxEntry * pe = pStart[0]; +@@ -1261,6 +1263,7 @@ struct hentry * AffixMgr::prefix_check_twosfx(const char * word, int len, + + pfx = NULL; + sfxappnd = NULL; ++sfxextra = 0; + + // first handle the special case of 0 length prefixes + PfxEntry * pe = pStart[0]; +@@ -1302,6 +1305,7 @@ char * AffixMgr::prefix_check_morph(const char * word, int len, char in_compound + + pfx = NULL; + sfxappnd = NULL; ++sfxextra = 0; + + // first handle the special case of 0 length prefixes + PfxEntry * pe = pStart[0]; +@@ -1353,6 +1357,7 @@ char * AffixMgr::prefix_check_twosfx_morph(const char * word, int len, + + pfx = NULL; + sfxappnd = NULL; ++sfxextra = 0; + + // first handle the special case of 0 length prefixes + PfxEntry * pe = pStart[0]; +@@ -1993,7 +1998,7 @@ struct hentry * AffixMgr::compound_check(const char * word, int len, + // XXX only second suffix (inflections, not derivations) + if (sfxappnd) { + char * tmp = myrevstrdup(sfxappnd); +-numsyllable -= get_syllable(tmp, strlen(tmp)); ++numsyllable -= get_syllable(tmp, strlen(tmp)) + sfxextra; + free(tmp); + } +
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source
vcl/source/window/menufloatingwindow.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 48a7d0492dbae60d644dd7be9b1b0826fdf36f63 Author: László NémethDate: Wed Sep 30 22:29:46 2015 +0200 tdf#92702 Unable to select menu items that were initially off-screen Revert "Last item of menu with title cannot be hilighted" This reverts commit 8ced97caa409d6dc8f69230145e9c9f281fb84fe. (Cherry-picked from the commit 4f1dca5083c5a301181786b563b165f19a9dec7f) Change-Id: Ic8c2195d4791900ada0296215c335b9dc39db220 Reviewed-on: https://gerrit.libreoffice.org/19048 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 972ec16..5ff6cc2 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -190,7 +190,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, bool bMBDow long nY = GetInitialItemY(); long nMouseY = rMEvt.GetPosPixel().Y(); Size aOutSz = GetOutputSizePixel(); -if ( ( nMouseY >= nY ) && ( nMouseY < ( aOutSz.Height() + nY ) ) ) +if ( ( nMouseY >= nY ) && ( nMouseY < ( aOutSz.Height() - nY ) ) ) { bool bHighlighted = false; size_t nCount = pMenu->pItemList->size(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/hunspell
external/hunspell/UnpackedTarball_hunspell.mk |1 external/hunspell/hunspell-tdf95024-compound.patch | 108 + 2 files changed, 109 insertions(+) New commits: commit 2511a21841dd9dec735a53add8174e47d24deb88 Author: László NémethDate: Wed Oct 14 01:17:26 2015 +0200 tdf#95024 fix compound word handling for new Hungarian orthography This commit contains the recent Hunspell fix for Hungarian compound word handling (commit 42807f970ac2d65f0d13a7c57eb454b210e92240 in Hunspell git repository), changing spell checking only in Hungarian documents. Change-Id: I1c6c3736ecf8c1e2fffcf1c53959b25dc9d27966 diff --git a/external/hunspell/UnpackedTarball_hunspell.mk b/external/hunspell/UnpackedTarball_hunspell.mk index 6ad31dd..8f14062 100644 --- a/external/hunspell/UnpackedTarball_hunspell.mk +++ b/external/hunspell/UnpackedTarball_hunspell.mk @@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hunspell,\ external/hunspell/hunspell-morph-overflow.patch \ external/hunspell/ubsan.patch.0 \ external/hunspell/hunspell-1.3.3-rhbz1261421.patch \ + external/hunspell/hunspell-tdf95024-compound.patch \ )) ifeq ($(COM),MSC) diff --git a/external/hunspell/hunspell-tdf95024-compound.patch b/external/hunspell/hunspell-tdf95024-compound.patch new file mode 100644 index 000..133cf4a --- /dev/null +++ b/external/hunspell/hunspell-tdf95024-compound.patch @@ -0,0 +1,108 @@ +From 42807f970ac2d65f0d13a7c57eb454b210e92240 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= + +Date: Mon, 12 Oct 2015 08:43:12 +0200 +Subject: [PATCH] fix compound handling for new Hungarian orthography + +The frequent cases of this compound limitation are handled by +the extended dictionary, but not these ones with both derivative +and inflectional suffixes. +--- + src/hunspell/affixmgr.cxx | 19 +++ + src/hunspell/affixmgr.hxx | 1 + + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/src/hunspell/affixmgr.cxx b/src/hunspell/affixmgr.cxx +index 0992e6e..0950425 100644 +--- misc/hunspell-1.3.3/src/hunspell/affixmgr.cxx misc/build/hunspell-1.3.3/src/hunspell/affixmgr.cxx +@@ -139,8 +139,9 @@ AffixMgr::AffixMgr(const char * affpath, HashMgr** ptr, int * md, const char * k + cpdvowels=NULL; // vowels (for calculating of Hungarian compounding limit, O(n) search! XXX) + cpdvowels_utf16=NULL; // vowels for UTF-8 encoding (bsearch instead of O(n) search) + cpdvowels_utf16_len=0; // vowels +- pfxappnd=NULL; // previous prefix for counting the syllables of prefix BUG +- sfxappnd=NULL; // previous suffix for counting a special syllables BUG ++ pfxappnd=NULL; // previous prefix for counting syllables of the prefix BUG ++ sfxappnd=NULL; // previous suffix for counting syllables of the suffix BUG ++ sfxextra=0; // modifier for syllable count of sfxappnd BUG + cpdsyllablenum=NULL; // syllable count incrementing flag + checknum=0; // checking numbers, and word with numbers + wordchars=NULL; // letters + spec. word characters +@@ -1201,6 +1202,7 @@ struct hentry * AffixMgr::prefix_check(const char * word, int len, char in_compo + pfx = NULL; + pfxappnd = NULL; + sfxappnd = NULL; ++sfxextra = 0; + + // first handle the special case of 0 length prefixes + PfxEntry * pe = pStart[0]; +@@ -1261,6 +1263,7 @@ struct hentry * AffixMgr::prefix_check_twosfx(const char * word, int len, + + pfx = NULL; + sfxappnd = NULL; ++sfxextra = 0; + + // first handle the special case of 0 length prefixes + PfxEntry * pe = pStart[0]; +@@ -1302,6 +1305,7 @@ char * AffixMgr::prefix_check_morph(const char * word, int len, char in_compound + + pfx = NULL; + sfxappnd = NULL; ++sfxextra = 0; + + // first handle the special case of 0 length prefixes + PfxEntry * pe = pStart[0]; +@@ -1353,6 +1357,7 @@ char * AffixMgr::prefix_check_twosfx_morph(const char * word, int len, + + pfx = NULL; + sfxappnd = NULL; ++sfxextra = 0; + + // first handle the special case of 0 length prefixes + PfxEntry * pe = pStart[0]; +@@ -1993,7 +1998,7 @@ struct hentry * AffixMgr::compound_check(const char * word, int len, + // XXX only second suffix (inflections, not derivations) + if (sfxappnd) { + char * tmp = myrevstrdup(sfxappnd); +-numsyllable -= get_syllable(tmp, strlen(tmp)); ++numsyllable -= get_syllable(tmp, strlen(tmp)) + sfxextra; + free(tmp); + } + +@@ -2512,7 +2517,7 @@ int AffixMgr::compound_check_morph(const char * word, int len, + // XXX only second suffix (inflections, not derivations) + if (sfxappnd) { + char * tmp = myrevstrdup(sfxappnd); +-
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/tiledrendering/XTiledRenderable.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cd581f7e5d1eb7724463949a15bbec1ca950d461 Author: László NémethDate: Wed Nov 18 19:05:57 2015 +0100 XTiledRenderable: not a finished interface Marking as published was not intentional Change-Id: I1ec8d4e4b307eb2d93e66d286f1065eea197de48 diff --git a/offapi/com/sun/star/tiledrendering/XTiledRenderable.idl b/offapi/com/sun/star/tiledrendering/XTiledRenderable.idl index 2755e74..f2ccd15 100644 --- a/offapi/com/sun/star/tiledrendering/XTiledRenderable.idl +++ b/offapi/com/sun/star/tiledrendering/XTiledRenderable.idl @@ -26,7 +26,7 @@ module com { module sun { module star { module tiledrendering { /** tiled rendering using a system-specific handle to a window */ -published interface XTiledRenderable : com::sun::star::uno::XInterface +interface XTiledRenderable : com::sun::star::uno::XInterface { /** paint a tile to a system-specific window ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes7' - include/vcl vcl/osx vcl/source vcl/unx vcl/win
include/vcl/opengl/OpenGLHelper.hxx |3 --- vcl/osx/salframe.cxx|5 - vcl/source/opengl/OpenGLHelper.cxx |9 - vcl/unx/generic/window/salframe.cxx |3 --- vcl/unx/gtk/window/gtksalframe.cxx |3 --- vcl/win/source/window/salframe.cxx |3 --- 6 files changed, 26 deletions(-) New commits: commit f762c8272fbbae81a1ec210b5d5f4b06788e1386 Author: László Németh laszlo.nem...@collabora.com Date: Fri Aug 28 11:46:31 2015 +0200 Revert tdf#93530 - the VCL GDI flushing abstraction should glFlush too. This reverts commit b05e77d3a9ea0ad3f39239dba3abf7a303226bf9. diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx index d14df0d..95c23c8 100644 --- a/include/vcl/opengl/OpenGLHelper.hxx +++ b/include/vcl/opengl/OpenGLHelper.hxx @@ -67,9 +67,6 @@ public: */ static bool isVCLOpenGLEnabled(); -/// flush the OpenGL command queue - if OpenGL is enabled. -static void flush(); - #if defined UNX !defined MACOSX !defined IOS !defined ANDROID !defined(LIBO_HEADLESS) static bool GetVisualInfo(Display* pDisplay, int nScreen, XVisualInfo rVI); static GLXFBConfig GetPixmapFBConfig( Display* pDisplay, bool bInverted ); diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 05957fc..251f5c3 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -27,7 +27,6 @@ #include vcl/window.hxx #include vcl/syswin.hxx #include vcl/settings.hxx -#include vcl/opengl/OpenGLHelper.hxx #include osx/saldata.hxx #include quartz/salgdi.h @@ -38,7 +37,6 @@ #include osx/a11yfactory.h #include quartz/utils.h - #include salwtype.hxx #include premac.h @@ -882,7 +880,6 @@ void AquaSalFrame::Flush() { [mpNSView display]; } -OpenGLHelper::flush(); } void AquaSalFrame::Flush( const Rectangle rRect ) @@ -904,7 +901,6 @@ void AquaSalFrame::Flush( const Rectangle rRect ) { [mpNSView display]; } -OpenGLHelper::flush(); } void AquaSalFrame::Sync() @@ -917,7 +913,6 @@ void AquaSalFrame::Sync() [mpNSView setNeedsDisplay: YES]; [mpNSView display]; } -OpenGLHelper::flush(); } void AquaSalFrame::SetInputContext( SalInputContext* pContext ) diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 5cde27c..967d4c5 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -608,13 +608,4 @@ GLXFBConfig OpenGLHelper::GetPixmapFBConfig( Display* pDisplay, bool bInverted #endif -void OpenGLHelper::flush() -{ -if (!isVCLOpenGLEnabled()) -return; - -glFlush(); -CHECK_GL_ERROR(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 0cc6ee9..14e11d5 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -35,7 +35,6 @@ #include vcl/settings.hxx #include vcl/bmpacc.hxx #include vcl/opengl/OpenGLContext.hxx -#include vcl/opengl/OpenGLHelper.hxx #include prex.h #include X11/Xatom.h @@ -2453,13 +2452,11 @@ void X11SalFrame::SetTitle( const OUString rTitle ) void X11SalFrame::Flush() { XFlush( GetDisplay()-GetDisplay() ); -OpenGLHelper::flush(); } void X11SalFrame::Sync() { XSync( GetDisplay()-GetDisplay(), False ); -OpenGLHelper::flush(); } // Keyboard diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index f31d800..7f8570e 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -37,7 +37,6 @@ #include vcl/svapp.hxx #include vcl/window.hxx #include vcl/settings.hxx -#include vcl/opengl/OpenGLHelper.hxx #if !GTK_CHECK_VERSION(3,0,0) # include unx/x11/xlimits.hxx @@ -2897,13 +2896,11 @@ void GtkSalFrame::Flush() #else XFlush (GDK_DISPLAY_XDISPLAY (getGdkDisplay())); #endif -OpenGLHelper::flush(); } void GtkSalFrame::Sync() { gdk_display_sync( getGdkDisplay() ); -OpenGLHelper::flush(); } #ifndef GDK_Open diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index e97836e..f8e0b69 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -48,7 +48,6 @@ #include vcl/window.hxx #include vcl/wrkwin.hxx #include vcl/svapp.hxx -#include vcl/opengl/OpenGLHelper.hxx // Warning in SDK header #ifdef _MSC_VER @@ -2207,13 +2206,11 @@ void WinSalFrame::SetPointerPos( long nX, long nY ) void WinSalFrame::Flush() { GdiFlush(); -OpenGLHelper::flush(); } void WinSalFrame::Sync() { GdiFlush(); -OpenGLHelper::flush(); } static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pContext ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source
cui/Library_cui.mk |1 + cui/source/dialogs/about.cxx |6 ++ 2 files changed, 7 insertions(+) New commits: commit be881075568d7686ba2cbcd85d4d9c085e0517ef Author: László Németh laszlo.nem...@collabora.com Date: Wed Aug 26 12:25:14 2015 +0200 tdf#93620: show OpenGL status in Help-About Build ID will show enabled OpenGL with an extra string -GL helping the fix of rendering issues. Change-Id: Id7bf2db2edb165542bf7a2a253c698c494278a03 diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 833af3c..64f75aa 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_externals,cui,\ boost_headers \ icuuc \ icu_headers \ +glew \ )) ifeq ($(OS),WNT) diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 310082c..8f5caf6 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -48,6 +48,7 @@ #include rtl/ustrbuf.hxx #include vcl/bitmap.hxx #include officecfg/Office/Common.hxx +#include vcl/opengl/OpenGLHelper.hxx using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -294,6 +295,11 @@ OUString AboutDialog::GetVersionString() sVersion += m_sBuildStr.replaceAll($BUILDID, sBuildId); } +if (OpenGLHelper::isVCLOpenGLEnabled()) +{ +sVersion += -GL; +} + if (EXTRA_BUILDID[0] != '\0') { sVersion += \n EXTRA_BUILDID; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/breakiterator/breakiterator_unicode.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit cf4839cfd18bb3c478ee7f039a705e46877e442c Author: László Németh laszlo.nem...@collabora.com Date: Wed Aug 26 13:23:07 2015 +0200 remove unused calculation for hyphenation Introduced by the commit 968f4d72a23bb28d097a7694d66f0b866b3b33f0, problem found by Stephan Bergmann. Change-Id: If735185c34a0ba69a5cd753ef76032b1b6a4a0cf diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 262f06a..53c1916 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -393,7 +393,6 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak( if (hOptions.hyphenIndex - wBoundary.startPos nStartPosWordEnd) nStartPosWordEnd = hOptions.hyphenIndex - wBoundary.startPos; #define SPACE 0x0020 while (boundary_with_punctuation wBoundary.endPos Text[--boundary_with_punctuation] == SPACE); -if (boundary_with_punctuation != 0) boundary_with_punctuation += 1 - wBoundary.endPos; uno::Reference linguistic2::XHyphenatedWord aHyphenatedWord; aHyphenatedWord = hOptions.rHyphenator-hyphenate(Text.copy(wBoundary.startPos, wBoundary.endPos - wBoundary.startPos), rLocale, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cui/Library_cui.mk cui/source
cui/Library_cui.mk |1 + cui/source/dialogs/about.cxx |6 ++ 2 files changed, 7 insertions(+) New commits: commit 6f878a6964656683b0ea4cf43691b3fb7e28bdfd Author: László Németh laszlo.nem...@collabora.com Date: Wed Aug 26 12:25:14 2015 +0200 tdf#93620: show OpenGL status in Help-About Build ID will show enabled OpenGL with an extra string -GL helping the fix of rendering issues. Change-Id: Id7bf2db2edb165542bf7a2a253c698c494278a03 Reviewed-on: https://gerrit.libreoffice.org/18014 Reviewed-by: Tor Lillqvist t...@collabora.com Tested-by: Tor Lillqvist t...@collabora.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 833af3c..64f75aa 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_externals,cui,\ boost_headers \ icuuc \ icu_headers \ +glew \ )) ifeq ($(OS),WNT) diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 630dd30..e5732b2 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -48,6 +48,7 @@ #include rtl/ustrbuf.hxx #include vcl/bitmap.hxx #include officecfg/Office/Common.hxx +#include vcl/opengl/OpenGLHelper.hxx using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -296,6 +297,11 @@ OUString AboutDialog::GetVersionString() sVersion += m_sBuildStr.replaceAll($BUILDID, sBuildId); } +if (OpenGLHelper::isVCLOpenGLEnabled()) +{ +sVersion += -GL; +} + if (EXTRA_BUILDID[0] != '\0') { sVersion += \n EXTRA_BUILDID; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/stbctrls/zoomsliderctrl.cxx | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) New commits: commit 072c771be40f7f07ff31497049c1a15dd2f05178 Author: László NémethDate: Fri Sep 4 16:30:56 2015 +0200 tdf#92843: fix disappearing zoom slider Change-Id: I2b45b7cf96af7950cf097c2b6a880e9eda021184 diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index aa78ada..d6b3949 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -44,7 +44,6 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl ImagemaIncreaseButton; ImagemaDecreaseButton; bool mbValuesSet; -bool mbOmitPaint; bool mbDraggingStarted; SvxZoomSliderControl_Impl() : @@ -58,7 +57,6 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl maIncreaseButton(), maDecreaseButton(), mbValuesSet( false ), -mbOmitPaint( false ), mbDraggingStarted( false ) {} }; @@ -242,13 +240,12 @@ void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eStat } } -if (!mxImpl->mbOmitPaint) -forceRepaint(); +forceRepaint(); } void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt ) { -if ( !mxImpl->mbValuesSet || mxImpl->mbOmitPaint ) +if ( !mxImpl->mbValuesSet ) return; const Rectangle aControlRect = getControlRect(); @@ -408,9 +405,6 @@ void SvxZoomSliderControl::repaintAndExecute() { forceRepaint(); -mxImpl->mbOmitPaint = true; // optimization: paint before executing command, -// then omit painting which is triggered by the execute function - // commit state change SvxZoomSliderItem aZoomSliderItem(mxImpl->mnCurrentZoom); @@ -422,8 +416,6 @@ void SvxZoomSliderControl::repaintAndExecute() aArgs[0].Value = any; execute(aArgs); - -mxImpl->mbOmitPaint = false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/dialogs.hrc|1 - svx/source/stbctrls/stbctrls.src |5 - svx/source/stbctrls/zoomsliderctrl.cxx |3 ++- 3 files changed, 2 insertions(+), 7 deletions(-) New commits: commit 27949c810daa4090106cbed360f80869a4813d15 Author: László NémethDate: Fri Sep 4 18:26:34 2015 +0200 tdf#93928 don't hide the zoom slider and its handle with a tooltip Change-Id: I8e5a3a02e80b845ef65dfed35cc3c324197ed88c diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 4f71027..bbe795d 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -1035,7 +1035,6 @@ #define RID_SVXSTR_RECOVERYONLY_FINISH_DESCR (RID_SVX_START + 1289) #define RID_SVXSTR_RECOVERYONLY_FINISH (RID_SVX_START + 1290) #define RID_SVXSTR_ZOOMTOOL_HINT (RID_SVX_START + 1291) -#define RID_SVXSTR_ZOOM (RID_SVX_START + 1292) #define RID_SVXSTR_ZOOM_IN (RID_SVX_START + 1293) #define RID_SVXSTR_ZOOM_OUT (RID_SVX_START + 1294) #define RID_SVXSTR_CUSTOM(RID_SVX_START + 1295) diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src index a31e6d4..0337f77 100644 --- a/svx/source/stbctrls/stbctrls.src +++ b/svx/source/stbctrls/stbctrls.src @@ -126,11 +126,6 @@ String RID_SVXSTR_ZOOMTOOL_HINT Text [ en-US ] = "Zoom level. Right-click to change zoom level or click to open Zoom dialog."; }; -String RID_SVXSTR_ZOOM -{ -Text [ en-US ] = "Adjust zoom level"; -}; - String RID_SVXSTR_ZOOM_IN { Text [ en-US ] = "Zoom In"; diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index d6b3949..e5f05af 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -390,7 +390,8 @@ bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) nXDiff <= aControlRect.GetWidth() - nSliderXOffset + nButtonRightOffset ) GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_ZOOM_IN)); else -GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_ZOOM)); +// don't hide the slider and its handle with a tooltip during zooming +GetStatusBar().SetQuickHelpText(GetId(), ""); return true; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svx/source
svx/source/stbctrls/zoomsliderctrl.cxx | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) New commits: commit cdc5fe87ec8f4670600f86ad9cacac21d627c40f Author: László NémethDate: Fri Sep 4 16:30:56 2015 +0200 tdf#92843: fix disappearing zoom slider Change-Id: I2b45b7cf96af7950cf097c2b6a880e9eda021184 Reviewed-on: https://gerrit.libreoffice.org/18342 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index fcc6e5d..526bed7 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -44,7 +44,6 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl ImagemaIncreaseButton; ImagemaDecreaseButton; bool mbValuesSet; -bool mbOmitPaint; bool mbDraggingStarted; SvxZoomSliderControl_Impl() : @@ -58,7 +57,6 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl maIncreaseButton(), maDecreaseButton(), mbValuesSet( false ), -mbOmitPaint( false ), mbDraggingStarted( false ) {} }; @@ -242,13 +240,12 @@ void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eStat } } -if (!mxImpl->mbOmitPaint) -forceRepaint(); +forceRepaint(); } void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt ) { -if ( !mxImpl->mbValuesSet || mxImpl->mbOmitPaint ) +if ( !mxImpl->mbValuesSet ) return; const Rectangle aControlRect = getControlRect(); @@ -408,9 +405,6 @@ void SvxZoomSliderControl::repaintAndExecute() { forceRepaint(); -mxImpl->mbOmitPaint = true; // optimization: paint before executing command, -// then omit painting which is triggered by the execute function - // commit state change SvxZoomSliderItem aZoomSliderItem(mxImpl->mnCurrentZoom); @@ -422,8 +416,6 @@ void SvxZoomSliderControl::repaintAndExecute() aArgs[0].Value = any; execute(aArgs); - -mxImpl->mbOmitPaint = false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svtools/source
svtools/source/control/ruler.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fc94c658d688ded3fe8a883a84ca1a22cb3ff470 Author: László NémethDate: Mon Sep 7 14:05:32 2015 +0200 tdf#92357 clear tab type switcher button of ruler before drawing the new icon (cherry-picked from commit e74bc6b9a61dbc80caa6d2a8bfb79b3ac61c9899) Conflicts: svtools/source/control/ruler.cxx Change-Id: Ibbdbed448f965848429ace28dcfae47efc982164 Reviewed-on: https://gerrit.libreoffice.org/18376 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index ed0995e..d4b9374 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2534,7 +2534,7 @@ void Ruler::SetExtraType( RulerExtra eNewExtraType, sal_uInt16 nStyle ) meExtraType = eNewExtraType; mnExtraStyle = nStyle; if (IsReallyVisible() && IsUpdateMode()) -Invalidate(INVALIDATE_NOERASE); +Invalidate(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes10' - dictionaries helpcontent2 README.md
README.md|1 + dictionaries |2 +- helpcontent2 |2 +- 3 files changed, 3 insertions(+), 2 deletions(-) New commits: commit dea65645be9685118b2a4992c2d74d1d1ad67bc2 Author: László NémethDate: Thu Sep 10 12:33:20 2015 +0200 trigger new tests with more processIdle() with this empty commit Change-Id: I38e9d9491b07b7ca4e03e9e91b78bbee69dbfaf1 diff --git a/README.md b/README.md index 501c4a0..a612ea3 100644 --- a/README.md +++ b/README.md @@ -66,3 +66,4 @@ on the mailing list libreoffice@lists.freedesktop.org (no subscription required) or poke people on IRC `#libreoffice-dev` on irc.freenode.net - we're a friendly and generally helpful mob. We know the code can be hard to get into at first, and so there are no silly questions. + diff --git a/dictionaries b/dictionaries index 71f54e9..773db8a 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 71f54e95a0b443c673f924c71e23d04b540cc441 +Subproject commit 773db8ae5a62869bac230c124dd019f5123db685 diff --git a/helpcontent2 b/helpcontent2 index 68c46e7..f5f4e37 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 68c46e7dbaf5cf34a5b5ccb80122801dad778bbe +Subproject commit f5f4e37a3be9226440aebd9554c1bf950a8025d7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source
extras/source/autocorr/emoji/emoji.ulf |2 +- extras/source/autocorr/lang/en-US/DocumentList.xml |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 240d1f289c5788845cd4336f223f2c4bc8975a99 Author: László NémethDate: Tue Sep 8 11:23:39 2015 +0200 tdf#93957 fix Emoji pattern of horizontal ellipsis Typing :.: (one ASCII dot between colons) will enter the Unicode horizontal ellipsis (U+2026: â¦) instead of the bad :â¦: (the requested Unicode character between colons). Note: the pattern :...: (three ASCII dots between colons) was originally intended for the horizontal ellipsis, but that collides with .*... pattern (default in English and in several other languages, meaning: replace word ending three ASCII dots). Change-Id: I97632ff81e04ab9e53026da425b82a2541db0eb1 diff --git a/extras/source/autocorr/emoji/emoji.ulf b/extras/source/autocorr/emoji/emoji.ulf index 28a8b1f..294d0fa 100644 --- a/extras/source/autocorr/emoji/emoji.ulf +++ b/extras/source/autocorr/emoji/emoji.ulf @@ -281,7 +281,7 @@ en-US = "bullet2" [HORIZONTAL_ELLIPSIS] x-comment = "⦠(U+02026), see http://wiki.documentfoundation.org/Emoji; -en-US = "â¦" +en-US = "." [PER_MILLE_SIGN] x-comment = "â° (U+02030), see http://wiki.documentfoundation.org/Emoji; diff --git a/extras/source/autocorr/lang/en-US/DocumentList.xml b/extras/source/autocorr/lang/en-US/DocumentList.xml index 4d14a6e..da50017 100644 --- a/extras/source/autocorr/lang/en-US/DocumentList.xml +++ b/extras/source/autocorr/lang/en-US/DocumentList.xml @@ -987,7 +987,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svtools/source
svtools/source/control/ruler.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 00379a83cad8a016c54b3d90fef472a2ca6aeb96 Author: László NémethDate: Fri Sep 11 17:20:29 2015 +0200 tdf#92145: Writer table rows/columns can't be resized with disabled rulers. (This fix was suggested by Tomaž Vajngerl.) (Cherry-picked from the commit ed031895f6f5b3616811b53c6f2b9cfc3e23) Conflicts: svtools/source/control/ruler.cxx Change-Id: I161237cdb4941c0eaf934223b078acd94d72e21d Reviewed-on: https://gerrit.libreoffice.org/18507 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index d4b9374..2d4486c 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2344,6 +2344,12 @@ bool Ruler::StartDocDrag( const MouseEvent& rMEvt, RulerType eDragType ) // update ruler if ( mbFormat ) { +if (!IsReallyVisible()) +{ +// set mpData for ImplDocHitTest() +ImplFormat(*this); +} + Invalidate(INVALIDATE_NOERASE); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-2' - svtools/source
svtools/source/control/ruler.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 1bd52dd711cd4a563b08cc682ffa9d02b201e632 Author: László NémethDate: Fri Sep 11 17:20:29 2015 +0200 tdf#92145: Writer table rows/columns can't be resized with disabled rulers. (This fix was suggested by Tomaž Vajngerl.) (Cherry-picked from the commit ed031895f6f5b3616811b53c6f2b9cfc3e23) Conflicts: svtools/source/control/ruler.cxx Change-Id: I161237cdb4941c0eaf934223b078acd94d72e21d Reviewed-on: https://gerrit.libreoffice.org/18507 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl (cherry picked from commit 00379a83cad8a016c54b3d90fef472a2ca6aeb96) Reviewed-on: https://gerrit.libreoffice.org/18563 Reviewed-by: Jan Holesovsky Reviewed-by: Adolfo Jayme Barrientos Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index d4b9374..2d4486c 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2344,6 +2344,12 @@ bool Ruler::StartDocDrag( const MouseEvent& rMEvt, RulerType eDragType ) // update ruler if ( mbFormat ) { +if (!IsReallyVisible()) +{ +// set mpData for ImplDocHitTest() +ImplFormat(*this); +} + Invalidate(INVALIDATE_NOERASE); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-2' - svx/source
svx/source/stbctrls/zoomsliderctrl.cxx | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) New commits: commit 99a73cff9e9be6a39292d4d959ea2c0079cde0fe Author: László NémethDate: Fri Sep 4 16:30:56 2015 +0200 tdf#92843: fix disappearing zoom slider Change-Id: I2b45b7cf96af7950cf097c2b6a880e9eda021184 Reviewed-on: https://gerrit.libreoffice.org/18448 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna Reviewed-by: László Németh Reviewed-by: Tomaž Vajngerl Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index fcc6e5d..526bed7 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -44,7 +44,6 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl ImagemaIncreaseButton; ImagemaDecreaseButton; bool mbValuesSet; -bool mbOmitPaint; bool mbDraggingStarted; SvxZoomSliderControl_Impl() : @@ -58,7 +57,6 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl maIncreaseButton(), maDecreaseButton(), mbValuesSet( false ), -mbOmitPaint( false ), mbDraggingStarted( false ) {} }; @@ -242,13 +240,12 @@ void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eStat } } -if (!mxImpl->mbOmitPaint) -forceRepaint(); +forceRepaint(); } void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt ) { -if ( !mxImpl->mbValuesSet || mxImpl->mbOmitPaint ) +if ( !mxImpl->mbValuesSet ) return; const Rectangle aControlRect = getControlRect(); @@ -408,9 +405,6 @@ void SvxZoomSliderControl::repaintAndExecute() { forceRepaint(); -mxImpl->mbOmitPaint = true; // optimization: paint before executing command, -// then omit painting which is triggered by the execute function - // commit state change SvxZoomSliderItem aZoomSliderItem(mxImpl->mnCurrentZoom); @@ -422,8 +416,6 @@ void SvxZoomSliderControl::repaintAndExecute() aArgs[0].Value = any; execute(aArgs); - -mxImpl->mbOmitPaint = false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-2' - svtools/source
svtools/source/control/ruler.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3dae249c7bb0919d39dc88816d6ec38fb2b54e09 Author: László NémethDate: Mon Sep 7 14:05:32 2015 +0200 tdf#92357 clear tab type switcher button of ruler before drawing the new icon (cherry-picked from commit e74bc6b9a61dbc80caa6d2a8bfb79b3ac61c9899) Conflicts: svtools/source/control/ruler.cxx Change-Id: Ibbdbed448f965848429ace28dcfae47efc982164 Reviewed-on: https://gerrit.libreoffice.org/18376 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos Reviewed-on: https://gerrit.libreoffice.org/18447 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna Reviewed-by: László Németh diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index ed0995e..d4b9374 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2534,7 +2534,7 @@ void Ruler::SetExtraType( RulerExtra eNewExtraType, sal_uInt16 nStyle ) meExtraType = eNewExtraType; mnExtraStyle = nStyle; if (IsReallyVisible() && IsUpdateMode()) -Invalidate(INVALIDATE_NOERASE); +Invalidate(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes10' - sc/inc
sc/inc/formulacell.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 76c90de3671f6fc6040b9dc618ff9890a2e1d726 Author: László NémethDate: Tue Sep 15 17:57:46 2015 +0200 sc: inlining NeedsInterpret() and IsDirtyOrInTableOpDirty() Change-Id: Ieba9e33fefe05a2a11b8cf1349b7900375dd53ea diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 64ec06d..c017dbe 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -222,7 +222,7 @@ public: voidSetDirtyAfterLoad(); void ResetTableOpDirtyVar(); voidSetTableOpDirty(); -boolIsDirtyOrInTableOpDirty() const; +inline bool IsDirtyOrInTableOpDirty() const; bool GetDirty() const { return bDirty; } void ResetDirty(); bool NeedsListening() const { return bNeedListening; } @@ -390,7 +390,7 @@ public: /** Determines whether or not the result string contains more than one paragraph */ boolIsMultilineResult(); -bool NeedsInterpret() const; +inline bool NeedsInterpret() const; voidMaybeInterpret(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes10' - sc/inc sc/source
sc/inc/formulacell.hxx | 14 +++ sc/source/core/data/formulacell.cxx | 72 ++-- 2 files changed, 43 insertions(+), 43 deletions(-) New commits: commit 750ee5aa2f5f9cef008ff076bd5a5d69948f4c91 Author: László NémethDate: Tue Sep 15 17:36:54 2015 +0200 re-ordering the ScFormulaCell structure Change-Id: Id829c193d0287949705168f86c302743474e2b03 diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx index 66f4c9b..64ec06d 100644 --- a/sc/inc/formulacell.hxx +++ b/sc/inc/formulacell.hxx @@ -121,14 +121,7 @@ class SC_DLLPUBLIC ScFormulaCell : public SvtListener { private: ScFormulaCellGroupRef mxGroup; // re-factoring hack - group of formulae we're part of. -ScFormulaResult aResult; -formula::FormulaGrammar::Grammar eTempGrammar; // used between string (creation) and (re)compilation -ScTokenArray* pCode; // The (new) token array ScDocument* pDocument; -ScFormulaCell* pPrevious; -ScFormulaCell* pNext; -ScFormulaCell* pPreviousTrack; -ScFormulaCell* pNextTrack; sal_uInt16 nSeenInIteration; // Iteration cycle in which the cell was last encountered short nFormatType; sal_uInt8 cMatrixFlag: 2; // One of ScMatrixMode @@ -144,6 +137,13 @@ private: boolmbNeedsNumberFormat : 1; // set the calculated number format as hard number format boolmbPostponedDirty : 1; // if cell needs to be set dirty later boolmbIsExtRef : 1; // has references in ScExternalRefManager; never cleared after set +ScFormulaResult aResult; +ScTokenArray* pCode; // The (new) token array +ScFormulaCell* pPrevious; +ScFormulaCell* pNext; +ScFormulaCell* pPreviousTrack; +ScFormulaCell* pNextTrack; +formula::FormulaGrammar::Grammar eTempGrammar; // used between string (creation) and (re)compilation enum ScInterpretTailParameter { diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index b4ba29b..b55142f 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -589,13 +589,7 @@ void ScFormulaCellGroup::endAllGroupListening( ScDocument& rDoc ) } ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos ) : -eTempGrammar(formula::FormulaGrammar::GRAM_DEFAULT), -pCode(new ScTokenArray), pDocument(pDoc), -pPrevious(0), -pNext(0), -pPreviousTrack(0), -pNextTrack(0), nSeenInIteration(0), nFormatType(css::util::NumberFormat::NUMBER), cMatrixFlag(MM_NONE), @@ -611,6 +605,12 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos ) : mbNeedsNumberFormat(false), mbPostponedDirty(false), mbIsExtRef(false), +pCode(new ScTokenArray), +pPrevious(0), +pNext(0), +pPreviousTrack(0), +pNextTrack(0), +eTempGrammar(formula::FormulaGrammar::GRAM_DEFAULT), aPos(rPos) { SAL_INFO( "sc.core.formulacell", "ScFormulaCell ctor this " << this); @@ -620,13 +620,7 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos, const OUString& rFormula, const FormulaGrammar::Grammar eGrammar, sal_uInt8 cMatInd ) : -eTempGrammar( eGrammar), -pCode( NULL ), pDocument( pDoc ), -pPrevious(0), -pNext(0), -pPreviousTrack(0), -pNextTrack(0), nSeenInIteration(0), nFormatType ( css::util::NumberFormat::NUMBER ), cMatrixFlag ( cMatInd ), @@ -642,6 +636,12 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos, mbNeedsNumberFormat( false ), mbPostponedDirty(false), mbIsExtRef(false), +pCode( NULL ), +pPrevious(0), +pNext(0), +pPreviousTrack(0), +pNextTrack(0), +eTempGrammar( eGrammar), aPos(rPos) { SAL_INFO( "sc.core.formulacell", "ScFormulaCell ctor this " << this); @@ -655,13 +655,7 @@ ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos, ScFormulaCell::ScFormulaCell( ScDocument* pDoc, const ScAddress& rPos, ScTokenArray* pArray, const FormulaGrammar::Grammar eGrammar, sal_uInt8 cMatInd ) : -eTempGrammar( eGrammar), -pCode(pArray), pDocument( pDoc ), -pPrevious(0), -pNext(0), -pPreviousTrack(0), -pNextTrack(0), nSeenInIteration(0), nFormatType ( css::util::NumberFormat::NUMBER ), cMatrixFlag ( cMatInd ), @@ -677,6 +671,12 @@ ScFormulaCell::ScFormulaCell( mbNeedsNumberFormat( false ), mbPostponedDirty(false), mbIsExtRef(false), +pCode(pArray), +pPrevious(0), +pNext(0), +pPreviousTrack(0), +pNextTrack(0), +eTempGrammar( eGrammar), aPos(rPos) { SAL_INFO( "sc.core.formulacell",
[Libreoffice-commits] core.git: Branch 'feature/fixes10' - README.md
README.md |1 - 1 file changed, 1 deletion(-) New commits: commit 647587df990ffc8196e4bef05ab45f6e6ec4410d Author: László NémethDate: Thu Sep 17 12:13:29 2015 +0200 trigger new test Change-Id: I4a73cf7663d4f4f728339843bf3c3b9cdf6bc663 diff --git a/README.md b/README.md index a612ea3..501c4a0 100644 --- a/README.md +++ b/README.md @@ -66,4 +66,3 @@ on the mailing list libreoffice@lists.freedesktop.org (no subscription required) or poke people on IRC `#libreoffice-dev` on irc.freenode.net - we're a friendly and generally helpful mob. We know the code can be hard to get into at first, and so there are no silly questions. - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes10' -
0 files changed New commits: commit e1d9da8726e89a733928638c0d93dd7465c4b81d Author: László NémethDate: Thu Sep 17 17:43:20 2015 +0200 trigger new test again but now using git commit --allow-empty (thanks to Miklós Vajna for the tip) Change-Id: I399bce380e500d5fe4ebace2b0c3b7ae78530186 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/control/ruler.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit ed031895f6f5b3616811b53c6f2b9cfc3e23 Author: László NémethDate: Fri Sep 11 17:20:29 2015 +0200 tdf#92145: Writer table rows/columns can't be resized with disabled rulers. (This fix was suggested by Tomaž Vajngerl.) Change-Id: I161237cdb4941c0eaf934223b078acd94d72e21d diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 09af4c5..7ad59d4 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2338,6 +2338,12 @@ bool Ruler::StartDocDrag( const MouseEvent& rMEvt, RulerType eDragType ) // update ruler if ( mbFormat ) { +if (!IsReallyVisible()) +{ +// set mpData for ImplDocHitTest() +ImplFormat(*this); +} + Invalidate(InvalidateFlags::NoErase); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - editeng/source
editeng/source/editeng/edtspell.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 1e15cf04b5e167de1bfc5c19019dcae2042e1414 Author: László NémethDate: Fri Sep 25 11:51:04 2015 +0200 tdf#93141 Calc/Impress: remove last colon of emoji short names AutoCorrect Emoji replacements were incomplete in Calc cells and Impress text boxes, keeping the terminating colon: :omega: -> Ω: Corrected by this patch: :omega: -> Ω Change-Id: I0d1f6f9ec9c31a7b37e0c9afaaad17dcee568dd5 Reviewed-on: https://gerrit.libreoffice.org/18849 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 8b50d9f..510545d 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -743,9 +743,13 @@ bool EdtAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, pCurNode->GetString(), rSttPos, nEndPos, *this, aLanguageTag); if( pFnd && pFnd->IsTextOnly() ) { + +// replace also last colon of keywords surrounded by colons (for example, ":name:") +bool replaceLastChar = pFnd->GetShort()[0] == ':' && pFnd->GetShort().endsWith(":"); + // then replace EditSelection aSel( EditPaM( pCurNode, rSttPos ), -EditPaM( pCurNode, nEndPos ) ); +EditPaM( pCurNode, nEndPos + (replaceLastChar ? 1 : 0) )); aSel = mpEditEngine->DeleteSelection(aSel); SAL_WARN_IF(nCursor < nEndPos, "editeng", "Cursor in the heart of the action?!"); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/menufloatingwindow.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4f1dca5083c5a301181786b563b165f19a9dec7f Author: László NémethDate: Wed Sep 30 22:29:46 2015 +0200 tdf#92702 Unable to select menu items that were initially off-screen Revert "Last item of menu with title cannot be hilighted" This reverts commit 8ced97caa409d6dc8f69230145e9c9f281fb84fe. diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 1a2fb4c..0fff661 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -191,7 +191,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, bool bMBDow long nY = GetInitialItemY(); long nMouseY = rMEvt.GetPosPixel().Y(); Size aOutSz = GetOutputSizePixel(); -if ( ( nMouseY >= nY ) && ( nMouseY < ( aOutSz.Height() + nY ) ) ) +if ( ( nMouseY >= nY ) && ( nMouseY < ( aOutSz.Height() - nY ) ) ) { bool bHighlighted = false; size_t nCount = pMenu->pItemList->size(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes10' -
0 files changed New commits: commit e1e49921693a74ac9ff46a8db4eb636045e2d25b Author: László NémethDate: Thu Oct 1 15:40:51 2015 +0200 use random text ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes10' -
0 files changed New commits: commit fddafb71f3dce47765ea39ccc459290c16683815 Author: László NémethDate: Tue Sep 29 20:14:54 2015 +0200 reschedule all ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/edtspell.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit d7e7bf139a615f68345c36572d12219bcf2c2658 Author: László NémethDate: Fri Sep 25 11:51:04 2015 +0200 tdf#93141 Calc/Impress: remove last colon of emoji short names AutoCorrect Emoji replacements were incomplete in Calc cells and Impress text boxes, keeping the terminating colon: :omega: -> Ω: Corrected by this patch: :omega: -> Ω Change-Id: I0d1f6f9ec9c31a7b37e0c9afaaad17dcee568dd5 diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 4ba31d7..547c377 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -713,9 +713,13 @@ bool EdtAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos, pCurNode->GetString(), rSttPos, nEndPos, *this, aLanguageTag); if( pFnd && pFnd->IsTextOnly() ) { + +// replace also last colon of keywords surrounded by colons (for example, ":name:") +bool replaceLastChar = pFnd->GetShort()[0] == ':' && pFnd->GetShort().endsWith(":"); + // then replace EditSelection aSel( EditPaM( pCurNode, rSttPos ), -EditPaM( pCurNode, nEndPos ) ); +EditPaM( pCurNode, nEndPos + (replaceLastChar ? 1 : 0) )); aSel = mpEditEngine->DeleteSelection(aSel); SAL_WARN_IF(nCursor < nEndPos, "editeng", "Cursor in the heart of the action?!"); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes13' -
0 files changed New commits: commit 55ab05a50fdef1b774438ca9c4e5de3654db222a Author: László NémethDate: Fri Dec 18 12:43:28 2015 +0100 fix GDI ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes14' -
0 files changed New commits: commit 9a5f17292efe616b646b6e4b5ea4e0b4da759833 Author: László NémethDate: Mon Jan 4 22:41:45 2016 +0100 driver update Change-Id: I5c4ecd907280e1a16c29426f0c201dc000962a25 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes14' -
0 files changed New commits: commit 0bccebf1191f10f2ef7c4d790350c4d51dde9ec1 Author: László NémethDate: Tue Jan 5 11:22:15 2016 +0100 set default GL settings for GL runs Change-Id: I8ab31b5646e5040e20ef84c6b97436e0701aec32 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes14' -
0 files changed New commits: commit fe774c9c466df09ba3b8e09d41fe7cd737edcfaa Author: László NémethDate: Tue Jan 5 23:41:05 2016 +0100 system restart Change-Id: Idaec086ded7892585c4c264013ef1f559fe86e47 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5-1-branch-point'
Tag 'libreoffice-5-1-branch-point' created by Robinson Tryonat 2015-11-25 12:45 -0800 Tag libreoffice-5-1-branch-point -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWVa1QAAoJEPQ0oe+v7q6jsv8QAJgLzSmeoL21bWzWpl3587S7 9jcs16DfWwfTGhyIGaxnKXylQ4Qb2b0jUhOmnfkyrEb+Gv1H8drMt1QbJ8NdQRLD 3oRvBRtQHvunswtU3bTyjnJrsOWQDwkTriMPbbNLybEjHMGwuycM50d0W6cBGZQC u4TgEb4fs2nH7Verqma9yfXaSUUUtscB/fScxy22rLU3TP2MeCoXn9VKIEJqPSwe JFzk7UOAFz1QA++ZcmidTbdcZS1kMqr/3YKf8/fHTpFzrN6hNoihLbe7c5cEaW0i j7adL2ohE/uA7R3EEvBpVE5AZlZ9XkMeGEwiMq5sXPMGoHFljdO16ayHh4AYNhop w6Tfwcodp5qjzh+RcHcOytSoAxMvLS6fuw2NBjdciHcbu8XNS8UKzXrHErMPZ/Iv 2Ku1ZvVvMA8K8wUDQi+unOCAjMWXuYOX5dEUm1JKwbr8hJa7o8LAy4SFRueHE6+C Y6d2z9GlJbulc0JcJqkH/vBjQw0KlEOHxylKtTabRinBmRHyFf4JbYKfxl/xhc/R L6h1ZLmV2ioCJewaNgX1hbKpYrUSq0gq/c8/UMnrb/lLxpo5tE06mSPeIma/zMmE dyJFauhC2VKEdyB1cj7uMflFODz9jJ+MNnXhz3hUjwD0LWIO3DZnv1kJjRcsRa33 sdX/qYglCF8fvUiciAhi =IHSG -END PGP SIGNATURE- Changes since libreoffice-5-0-branch-point-13: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sfx2/source
sfx2/source/sidebar/SidebarController.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 6d101b6296962b444f535eeb2ff37580dc9bb60c Author: László NémethDate: Sat Nov 28 02:33:34 2015 +0100 tdf#94689 fix crash on new file, close file, open file partially cherry-picked from the commit 187445b2d2885ced92be37ffb11cd2a9bb11f8d6 Change-Id: I9e74fb41448c6be0b8daa6c0f8a0e207be0be6d6 Reviewed-on: https://gerrit.libreoffice.org/20250 Tested-by: Jenkins Reviewed-by: jan iversen Reviewed-by: Michael Meeks diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 9afa3f5..ae82afc 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -229,6 +229,7 @@ void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::Contex { maAsynchronousDeckSwitch.CancelRequest(); maContextChangeUpdate.RequestCall(); +UpdateConfigurations(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/inc sw/source
sw/inc/ndgrf.hxx |3 +++ sw/source/core/doc/notxtfrm.cxx | 15 ++- sw/source/core/graphic/ndgrf.cxx |7 +-- 3 files changed, 18 insertions(+), 7 deletions(-) New commits: commit 945da612c70cc67c3b182c3f2ecdfd4333c8f456 Author: László NémethDate: Fri Nov 27 21:59:30 2015 +0100 tdf#95614 fix freezing with linked graphic When an unloaded linked picture comes into the visible view (including repainting a page), SwNoTextFrm::PaintPicture() starts a thread to load it in the background using the TriggerAsyncRetrieveInputStream() method of the graphic node. To avoid to start a second thread on the same graphic node, TriggerAsyncRetrieveInputStream() checks mpThreadConsumer, the graphic node member variable for the possible thread object. The problem is that when the thread finished and SwGrfNode::UpdateLinkWithInputStream() reset mpThreadConsumer, the graphic object of the graphic node is still in unloaded state (its type is GRAPHIC_DEFAULT or GRAPHIC_NONE instead of GRAPHIC_BITMAP or GRAPHIC_GDIMETAFILE) for a while, because its modification is solved asynchronously after several SvFileObject::GetData() calls. In the intermediate state of the graphic object, with the high priority repaints of the new scheduler, PaintPicture() could start new thread to load the image again. Using the new member variable SwGrfNode::mbUpdateLinkInProgress, this patch will prevent the graphic node to start newer thread unnecessarily. Change-Id: I9433f0fa4613294103a00a3955fc2f35d8863b59 Reviewed-on: https://gerrit.libreoffice.org/19974 Reviewed-by: Michael Meeks Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 668c5f5..e7b2261 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -51,6 +51,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer; bool mbLinkedInputStreamReady; +bool mbUpdateLinkInProgress; com::sun::star::uno::Reference mxInputStream; bool mbIsStreamReadOnly; @@ -198,6 +199,8 @@ public: boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;} bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;} +bool IsUpdateLinkInProgress() const { return mbUpdateLinkInProgress;} +void SetUpdateLinkInProgress(bool b) { mbUpdateLinkInProgress = b; } void TriggerAsyncRetrieveInputStream(); void ApplyInputStream( com::sun::star::uno::Reference xInputStream, diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 02a815b..d943e6d 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -897,10 +897,11 @@ void SwNoTextFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect { Size aTmpSz; ::sfx2::SvLinkSource* pGrfObj = pGrfNd->GetLink()->GetObj(); -if( !pGrfObj || -!pGrfObj->IsDataComplete() || -!(aTmpSz = pGrfNd->GetTwipSize()).Width() || -!aTmpSz.Height() || !pGrfNd->GetAutoFormatLvl() ) +if ( ( !pGrfObj || + !pGrfObj->IsDataComplete() || + !(aTmpSz = pGrfNd->GetTwipSize()).Width() || + !aTmpSz.Height() || !pGrfNd->GetAutoFormatLvl() ) && +!pGrfNd->IsUpdateLinkInProgress() ) { pGrfNd->TriggerAsyncRetrieveInputStream(); // #i73788# } @@ -909,9 +910,13 @@ void SwNoTextFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect GetRealURL( *pGrfNd, aText ); ::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, false ); bContinue = false; +} else if ( rGrfObj.GetType() != GRAPHIC_DEFAULT && + rGrfObj.GetType() != GRAPHIC_NONE && + pGrfNd->IsUpdateLinkInProgress() ) +{ +pGrfNd->SetUpdateLinkInProgress( false ); } } - if( bContinue ) { if( rGrfObj.GetGraphic().IsSupportedGraphic()) diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 5c2867e..dbbe379 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -71,6 +71,7 @@ SwGrfNode::SwGrfNode( mpReplacementGraphic(0), // #i73788# mbLinkedInputStreamReady( false ), +mbUpdateLinkInProgress( false ), mbIsStreamReadOnly( false ) { maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) ); @@ -89,6
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - sw/inc sw/source
sw/inc/ndgrf.hxx |3 +++ sw/source/core/doc/notxtfrm.cxx | 15 ++- sw/source/core/graphic/ndgrf.cxx |7 +-- 3 files changed, 18 insertions(+), 7 deletions(-) New commits: commit 611be3d78d45c46c942b88e1149dfc428070fc71 Author: László NémethDate: Fri Nov 27 21:59:30 2015 +0100 tdf#95614 fix freezing with linked graphic When an unloaded linked picture comes into the visible view (including repainting a page), SwNoTextFrm::PaintPicture() starts a thread to load it in the background using the TriggerAsyncRetrieveInputStream() method of the graphic node. To avoid to start a second thread on the same graphic node, TriggerAsyncRetrieveInputStream() checks mpThreadConsumer, the graphic node member variable for the possible thread object. The problem is that when the thread finished and SwGrfNode::UpdateLinkWithInputStream() reset mpThreadConsumer, the graphic object of the graphic node is still in unloaded state (its type is GRAPHIC_DEFAULT or GRAPHIC_NONE instead of GRAPHIC_BITMAP or GRAPHIC_GDIMETAFILE) for a while, because its modification is solved asynchronously after several SvFileObject::GetData() calls. In the intermediate state of the graphic object, with the high priority repaints of the new scheduler, PaintPicture() could start new thread to load the image again. Using the new member variable SwGrfNode::mbUpdateLinkInProgress, this patch will prevent the graphic node to start newer thread unnecessarily. Change-Id: I9433f0fa4613294103a00a3955fc2f35d8863b59 diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 668c5f5..e7b2261 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -51,6 +51,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer; bool mbLinkedInputStreamReady; +bool mbUpdateLinkInProgress; com::sun::star::uno::Reference mxInputStream; bool mbIsStreamReadOnly; @@ -198,6 +199,8 @@ public: boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;} bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;} +bool IsUpdateLinkInProgress() const { return mbUpdateLinkInProgress;} +void SetUpdateLinkInProgress(bool b) { mbUpdateLinkInProgress = b; } void TriggerAsyncRetrieveInputStream(); void ApplyInputStream( com::sun::star::uno::Reference xInputStream, diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 02a815b..d943e6d 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -897,10 +897,11 @@ void SwNoTextFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect { Size aTmpSz; ::sfx2::SvLinkSource* pGrfObj = pGrfNd->GetLink()->GetObj(); -if( !pGrfObj || -!pGrfObj->IsDataComplete() || -!(aTmpSz = pGrfNd->GetTwipSize()).Width() || -!aTmpSz.Height() || !pGrfNd->GetAutoFormatLvl() ) +if ( ( !pGrfObj || + !pGrfObj->IsDataComplete() || + !(aTmpSz = pGrfNd->GetTwipSize()).Width() || + !aTmpSz.Height() || !pGrfNd->GetAutoFormatLvl() ) && +!pGrfNd->IsUpdateLinkInProgress() ) { pGrfNd->TriggerAsyncRetrieveInputStream(); // #i73788# } @@ -909,9 +910,13 @@ void SwNoTextFrm::PaintPicture( vcl::RenderContext* pOut, const SwRect GetRealURL( *pGrfNd, aText ); ::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, false ); bContinue = false; +} else if ( rGrfObj.GetType() != GRAPHIC_DEFAULT && + rGrfObj.GetType() != GRAPHIC_NONE && + pGrfNd->IsUpdateLinkInProgress() ) +{ +pGrfNd->SetUpdateLinkInProgress( false ); } } - if( bContinue ) { if( rGrfObj.GetGraphic().IsSupportedGraphic()) diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 5c2867e..dbbe379 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -71,6 +71,7 @@ SwGrfNode::SwGrfNode( mpReplacementGraphic(0), // #i73788# mbLinkedInputStreamReady( false ), +mbUpdateLinkInProgress( false ), mbIsStreamReadOnly( false ) { maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) ); @@ -89,6 +90,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere, mpReplacementGraphic(0), // #i73788# mbLinkedInputStreamReady( false ), +mbUpdateLinkInProgress( false ), mbIsStreamReadOnly( false ) {
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/fileobj.cxx | 25 + sfx2/source/appl/fileobj.hxx |5 + 2 files changed, 30 insertions(+) New commits: commit 58e2a9efe554ff2ac09a902d13a18e954487b672 Author: László NémethDate: Fri Nov 20 19:30:42 2015 +0100 tdf#95614 fix freezing with linked images Change-Id: Id9c718fda8f15d804e07ad87ff4ca930c2ea70cf diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index e652768..3b68b34 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -46,6 +46,8 @@ #define FILETYPE_GRF2 #define FILETYPE_OBJECT 3 +FnHashSet SvFileObject::m_aAsyncLoadsInProgress; + SvFileObject::SvFileObject() : nPostUserEventId(nullptr) , mxDelMed() @@ -79,6 +81,26 @@ bool SvFileObject::GetData( css::uno::Any & rData, const OUString & rMimeType, bool bGetSynchron ) { + +// avoid loading of the same graphics asynchronously in the same document +if ( !bAsyncLoadsInProgress ) +{ +// asynchronous loading of the same graphic in progress? +if ( m_aAsyncLoadsInProgress.find(sFileNm + sReferer) != m_aAsyncLoadsInProgress.end() ) +{ +// remove graphic id to sign overloading +m_aAsyncLoadsInProgress.erase(sFileNm + sReferer); +return true; +} +} +else +{ +bAsyncLoadsInProgress = false; +// sign of overloading? +if ( m_aAsyncLoadsInProgress.find(sFileNm + sReferer) == m_aAsyncLoadsInProgress.end() ) + return true; +} + SotClipboardFormatId nFmt = SotExchange::RegisterFormatMimeType( rMimeType ); switch( nType ) { @@ -262,6 +284,8 @@ bool SvFileObject::LoadFile_Impl() if( !bSynchron ) { +m_aAsyncLoadsInProgress.insert(sFileNm + sReferer); +bAsyncLoadsInProgress = true; bLoadAgain = bDataReady = bInNewData = false; bWaitForData = true; @@ -495,6 +519,7 @@ IMPL_LINK_NOARG_TYPED( SvFileObject, DelMedium_Impl, void*, void ) { nPostUserEventId = nullptr; mxDelMed.Clear(); +m_aAsyncLoadsInProgress.erase(sFileNm + sReferer); } IMPL_LINK_TYPED( SvFileObject, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx index a84126f..b6f878c3 100644 --- a/sfx2/source/appl/fileobj.hxx +++ b/sfx2/source/appl/fileobj.hxx @@ -22,10 +22,13 @@ #include #include #include +#include class Graphic; namespace sfx2 { class FileDialogHelper; } +typedef std::unordered_set< OUString, OUStringHash, ::std::equal_to< OUString > > FnHashSet; + class SvFileObject : public sfx2::SvLinkSource { OUStringsFileNm; @@ -36,6 +39,7 @@ class SvFileObject : public sfx2::SvLinkSource ImplSVEvent*nPostUserEventId; tools::SvRef mxDelMed; VclPtr pOldParent; +static FnHashSetm_aAsyncLoadsInProgress; sal_uInt8 nType; @@ -49,6 +53,7 @@ class SvFileObject : public sfx2::SvLinkSource bool bClearMedium : 1; bool bStateChangeCalled : 1; bool bInCallDownload : 1; +bool bAsyncLoadsInProgress : 1; bool GetGraphic_Impl( Graphic&, SvStream* pStream = nullptr ); bool LoadFile_Impl(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes23' -
0 files changed New commits: commit 4730b1fc0590c898b4ed8160a949f392b8ab894a Author: László NémethDate: Wed Jun 8 23:23:17 2016 +0200 empty commit (repeat) Change-Id: Ia0244798a2adb8a78b7713198f17d171f176041e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes23' -
0 files changed New commits: commit 1203e14df044a4e3eb6725d7564afa9dd892a49d Author: László NémethDate: Tue Jun 7 12:13:18 2016 +0200 empty commit (Writer first ServiceManager) Change-Id: I025ff32d2ddba2a8b3a40ef596701388f2a12a61 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes23' -
0 files changed New commits: commit e9b64dd30901e48e0e919303f84684956ac1dde2 Author: László NémethDate: Wed Jun 8 11:41:23 2016 +0200 empty commit (orig. Writer) Change-Id: If97daf35630596ca66293d7e0203e459a9484112 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes23' -
0 files changed New commits: commit d049c46985a8f6401c35af5d890e5ab6da2eb867 Author: László NémethDate: Wed Jun 8 13:59:22 2016 +0200 empty commit (empty Writer doc) Change-Id: Ie8924020fc85bca5e5b38f822f4520fe42172164 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes23' -
0 files changed New commits: commit bc32c382c1815f57cd2c5348ab86f356b7764e80 Author: László NémethDate: Mon Jun 6 14:27:29 2016 +0200 empty commit (new tests) Change-Id: I165444ef13ada5ca382b3b570587c3d7159150d5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes23' -
0 files changed New commits: commit b69f52f58413029f5d4e04d4508229c5a813d98e Author: László NémethDate: Mon Jun 6 17:37:55 2016 +0200 empty commit (Writer first proc. idle) Change-Id: I326396edc18d0eda2c12e3f82892112ff4aab01e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes23' -
0 files changed New commits: commit 96ce864aae6169010311a818cf8ca612833823fe Author: László NémethDate: Mon Jun 6 20:31:36 2016 +0200 empty commit (repeat) Change-Id: Id91553d177444eb896517d00ff5ccb06ec9bace3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes21' - 3 commits - include/sfx2 sfx2/source
include/sfx2/bindings.hxx|7 +-- sfx2/source/control/bindings.cxx | 75 ++- 2 files changed, 47 insertions(+), 35 deletions(-) New commits: commit f0bea419a5148aeade87046769f4355e333bfefd Author: László NémethDate: Wed May 25 02:01:45 2016 +0200 empty commit (repeat) Change-Id: I5ad3ae29ddd83760569ca7f02804e1e20e25f789 commit dcac2912b6653bd04214347344b8ee1a2041190b Author: László Németh Date: Wed May 25 02:01:34 2016 +0200 Revert "tdf#94236: Change Timer in SfxRequest to an Idle to improve feedback." This reverts commit 702718d3b49780c165afe59d2a7de950209dcaa8. diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index 1daec4e..bbe5cc4 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -35,7 +35,6 @@ // forwards, typedefs, declarations -class Idle; class SystemWindow; class SfxSlot; class SfxSlotServer; @@ -45,6 +44,7 @@ class SfxItemSet; class SfxDispatcher; class SfxBindings; class SfxBindings_Impl; +class Timer; class SfxWorkWindow; class SfxUnoControllerItem; struct SfxFoundCache_Impl; @@ -131,9 +131,8 @@ private: const SfxPoolItem *pItem, SfxItemState eItemState ); SAL_DLLPRIVATE SfxStateCache* GetStateCache( sal_uInt16 nId, sal_uInt16 *pPos); - -DECL_DLLPRIVATE_LINK_TYPED(NextJob, Idle *, void); -SAL_DLLPRIVATE bool NextJob_Impl(Idle * pIdle); +DECL_DLLPRIVATE_LINK_TYPED( NextJob, Timer *, void ); +SAL_DLLPRIVATE bool NextJob_Impl(Timer * pTimer); public: SfxBindings(); diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 49f4b17..98388a8 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -71,8 +71,15 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; +static sal_uInt16 nTimeOut = 300; + +#define TIMEOUT_FIRST nTimeOut +#define TIMEOUT_UPDATING 20 + typedef std::unordered_map< sal_uInt16, bool > InvalidateSlotMap; + + typedef std::vector SfxStateCacheArr_Impl; struct SfxFoundCache_Impl @@ -210,7 +217,7 @@ public: boolbAllMsgDirty; // Has a MessageServer been invalidated? boolbAllDirty; // After InvalidateAll boolbCtrlReleased; // while EnterRegistrations -IdlemaIdle; // for volatile Slots +AutoTimer aTimer; // for volatile Slots boolbInUpdate; // for Assertions boolbInNextJob; // for Assertions boolbFirstRound;// First round in Update @@ -245,12 +252,11 @@ SfxBindings::SfxBindings() // all caches are valid (no pending invalidate-job) // create the list of caches pImp->pCaches = new SfxStateCacheArr_Impl; - -pImp->maIdle.SetPriority(SchedulerPriority::MEDIUM); -pImp->maIdle.SetIdleHdl(LINK(this, SfxBindings, NextJob)); +pImp->aTimer.SetTimeoutHdl( LINK(this, SfxBindings, NextJob) ); } + SfxBindings::~SfxBindings() /* [Description] @@ -271,9 +277,7 @@ SfxBindings::~SfxBindings() ENTERREGISTRATIONS(); -pImp->maIdle.SetIdleHdl(Link()); -pImp->maIdle.Stop(); - +pImp->aTimer.Stop(); DeleteControllers_Impl(); // Delete Caches @@ -698,11 +702,11 @@ void SfxBindings::InvalidateAll (*pImp->pCaches)[n]->Invalidate(bWithMsg); pImp->nMsgPos = 0; - if ( !nRegLevel ) { -pImp->maIdle.Stop(); -pImp->maIdle.Start(); +pImp->aTimer.Stop(); +pImp->aTimer.SetTimeout(TIMEOUT_FIRST); +pImp->aTimer.Start(); } } @@ -750,11 +754,11 @@ void SfxBindings::Invalidate // if not enticed to start update timer pImp->nMsgPos = 0; - if ( !nRegLevel ) { -pImp->maIdle.Stop(); -pImp->maIdle.Start(); +pImp->aTimer.Stop(); +pImp->aTimer.SetTimeout(TIMEOUT_FIRST); +pImp->aTimer.Start(); } } @@ -804,11 +808,11 @@ void SfxBindings::InvalidateShell pCache->Invalidate(false); } pImp->nMsgPos = 0; - if ( !nRegLevel ) { -pImp->maIdle.Stop(); -pImp->maIdle.Start(); +pImp->aTimer.Stop(); +pImp->aTimer.SetTimeout(TIMEOUT_FIRST); +pImp->aTimer.Start(); pImp->bFirstRound = true; pImp->nFirstShell = nLevel; } @@ -841,11 +845,11 @@ void SfxBindings::Invalidate { pCache->Invalidate(false); pImp->nMsgPos = std::min(GetSlotPos(nId), pImp->nMsgPos); - if ( !nRegLevel ) { -pImp->maIdle.Stop(); -pImp->maIdle.Start(); +
[Libreoffice-commits] core.git: Branch 'feature/fixes24' -
0 files changed New commits: commit 81c5d132edb7dd7a488484c429d7831b54aea449 Author: László NémethDate: Tue Jun 14 13:58:17 2016 +0200 empty commit (repeat) Change-Id: Idea31806b675cbdf2e8a47f2d80e67fe929baaf0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes24' - 2 commits -
0 files changed New commits: commit 2668d09e980a873b9ddfa34dd7c78b3ff52764ed Author: László NémethDate: Tue Jun 14 16:34:57 2016 +0200 empty commit (repeat) Change-Id: I52b3970a805b9f510802b16b55f44b7347b8db6a commit eaca8f8ddb222e07c4c189882fb4fde695edba0c Author: László Németh Date: Tue Jun 14 16:33:40 2016 +0200 empty commit (repeat) Change-Id: I4b231f87aa1d1bb6ffc4b768bb3de8f17c233296 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes24' -
0 files changed New commits: commit 3519c3db4c6a3e18af347be6111dd6db2178d03d Author: László NémethDate: Tue Jun 14 02:44:22 2016 +0200 empty commit (repeat) Change-Id: If0a927d65b9085e28fa378b886a8b2f330db4dd9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes23' -
0 files changed New commits: commit 3e572ec3f6fe295272dd9fa539e55d756767fdd9 Author: László NémethDate: Mon Jun 6 23:57:21 2016 +0200 empty commit (repeat) Change-Id: I344c435bceb1930641ad52a3626d4d7eabc817a1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes23' -
0 files changed New commits: commit 42526c87b792429d183fb590118bc059724c4e7c Author: László NémethDate: Wed Jun 8 14:03:51 2016 +0200 empty commit (repeat) Change-Id: I7b91008f9ae9c7e63cc2ddb2936cba8bb6e91895 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes22' - 3 commits -
0 files changed New commits: commit 1dca410695ab1b0db54da0605df4138b9382c331 Author: László NémethDate: Tue May 31 00:49:31 2016 +0200 empty commit (retest) Change-Id: I51cc82b153e978e9b1232cdf56f7d14936094bdb commit 78b62ce7febb56d15295aa7d0bd681cd23540640 Author: László Németh Date: Tue May 31 00:49:20 2016 +0200 empty commit (retest) Change-Id: If93161ee38e8e22f5f188b6e688b2266008a960d commit b508c3be71d35f1ed92cc210249228d6fa43194a Author: László Németh Date: Tue May 31 00:49:10 2016 +0200 empty commit (retest) Change-Id: Ie06fd2fdd6d95f722a11f30188071de815c1b1c5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes22' - sw/source
sw/source/core/doc/DocumentStateManager.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 1d776d6db31c741afc810056fceef6d98029e90e Author: László NémethDate: Thu Jun 2 09:11:17 2016 +0200 Revert "sw::DocumentStateManager::SetModified: don't call the OLE link unconditionally" This reverts commit 5e8bc55b676116d55c3458cd799bdf4e3aebab44. diff --git a/sw/source/core/doc/DocumentStateManager.cxx b/sw/source/core/doc/DocumentStateManager.cxx index 575a010..ec6286a 100644 --- a/sw/source/core/doc/DocumentStateManager.cxx +++ b/sw/source/core/doc/DocumentStateManager.cxx @@ -40,10 +40,9 @@ DocumentStateManager::DocumentStateManager( SwDoc& i_rSwdoc ) : void DocumentStateManager::SetModified() { m_rDoc.GetDocumentLayoutManager().ClearSwLayouterEntries(); -bool bOldModified = mbModified; mbModified = true; m_rDoc.GetDocumentStatisticsManager().GetDocStat().bModified = true; -if( !bOldModified && m_rDoc.GetOle2Link().IsSet() ) +if( m_rDoc.GetOle2Link().IsSet() ) { mbInCallModified = true; m_rDoc.GetOle2Link().Call( true ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes22' -
0 files changed New commits: commit b0260681b7435f275fc58a6a6d6ff37eb26af5be Author: László NémethDate: Thu Jun 2 11:12:52 2016 +0200 empty commit (repeat) Change-Id: I8c56be53f787046744dd0a4c363485b9e82cde12 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes23' -
0 files changed New commits: commit 1d8dfbe0eb67214872ccd1bc8c921cf378acd2c6 Author: László NémethDate: Thu Jun 2 15:43:58 2016 +0200 empty commit (repeat) Change-Id: If175cd9e436afd03d484c86b4cb3d808a152c367 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes22' -
0 files changed New commits: commit 6f8de3c5ed19e5ac860e38043ad3b1d41bfa1ee9 Author: László NémethDate: Thu May 26 14:07:19 2016 +0200 empty commit (first proc. idle) Change-Id: I2444b4efdd8194eb910968d9045abd9089c288fd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes22' -
0 files changed New commits: commit 92a58a39344321aeb9754489ce6248f72b04421b Author: László NémethDate: Wed Jun 1 20:58:45 2016 +0200 empty commit (repeat) Change-Id: I4685f6a9d4417d9ec9067ad3f7c290d8db8cb749 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes22' - 3 commits - vcl/source
vcl/source/app/scheduler.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b59165138f1160512d90e83ec239e470c6b988db Author: László NémethDate: Thu Jun 2 00:29:23 2016 +0200 empty commit (repeat) Change-Id: I1d4b87ecc182e8070222d00b492f162bd548dbb4 commit d939f2ec656f1cadebcd5467e0802a4d80639e6e Author: László Németh Date: Thu Jun 2 00:29:11 2016 +0200 empty commit (repeat) Change-Id: Ic70524d93c887fb3bb3d1df51274968d71ae2961 commit 4e16211d34232bb5767f50900bdecd5f13443ac5 Author: László Németh Date: Thu Jun 2 00:26:22 2016 +0200 Revert "Switch deterministic scheduling on." + only first proc. idle This reverts commit 9d0e0ab8bd030b6560e97b245df4c0e94fb3ee7f. Change-Id: I458d8edf91ab1728fd1e7486b6630a5a68f08c8f diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx index 3f7e0bf6..efb65ca 100644 --- a/vcl/source/app/scheduler.cxx +++ b/vcl/source/app/scheduler.cxx @@ -174,7 +174,7 @@ bool Scheduler::ProcessTaskScheduling( bool bTimerOnly ) return false; } -static bool g_bDeterministicMode = true; +static bool g_bDeterministicMode = false; void Scheduler::SetDeterministicMode(bool bDeterministic) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes22' -
0 files changed New commits: commit 29911d499a6ed7ffc02d67cd27b68d8324a03348 Author: László NémethDate: Sun May 29 14:46:40 2016 +0200 empty commit (first proc. idle in start) Change-Id: I5e5d7572aff6a3ce26775fe0cd691bf440fd35e4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes22' -
0 files changed New commits: commit 4b07829ded22503e6a91b00989eb5a104128ed31 Author: László NémethDate: Sun May 29 22:29:08 2016 +0200 empty commit (first proc. idle after start) Change-Id: Ic0c32c71818e952a97ee881a9d9cdc52ab6dfefc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes24' -
0 files changed New commits: commit 146f255c4dd923aa9816a68e83312b84bb4bb5f6 Author: László NémethDate: Tue Jun 14 03:08:49 2016 +0200 empty commit (repeat) Change-Id: I6db628b254bf19cce1a1537664841d7caa69fec0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes24' -
0 files changed New commits: commit 1cf28a79661c164e938f14891346dcf0d515c942 Author: László NémethDate: Tue Jun 14 21:42:35 2016 +0200 empty commit (system restart) Change-Id: Ie585f3a9fa714535bb21eb2b9a74cf0582c0e065 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' -
0 files changed New commits: commit 98c988cb5b1629c6a718bb2ace4e28520ec3531d Author: László NémethDate: Tue Jun 21 14:03:38 2016 +0200 empty commit (orig. text typing) Change-Id: I58d71bfa14bc7b0c12fe99d2ecc814183b502095 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 2 commits -
0 files changed New commits: commit 646f94cac21286bf923719cf7ab319a9b05aa56b Author: László NémethDate: Tue Jun 21 14:15:54 2016 +0200 empty commit (repeat) Change-Id: Ie40880548c1a278aaff16947c2c93690bb95287d commit 594890424b859f85ac094f2ec4320a688906665c Author: László Németh Date: Tue Jun 21 14:15:01 2016 +0200 empty commit (repeat) Change-Id: I73405bb45bfc8b59fc1a363868682bcc5b6db3bc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 2 commits -
0 files changed New commits: commit 9717985719dee57cfefa05c1fc8027543e2b4ace Author: László NémethDate: Wed Jun 22 13:46:33 2016 +0200 empty commit (repeat) Change-Id: Ib72e3123747cf6eb2cee2aca6e20bb56b2a52557 commit 0c4fde39c9f60be84ae56fab796ecefca21793f9 Author: László Németh Date: Wed Jun 22 13:45:20 2016 +0200 empty commit (repeat, system restart in the prev. commit) Change-Id: Ibf0e49e8246f073b65f2eb7ececd27b612d95c2e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' -
0 files changed New commits: commit 5748ee277b685515bafad4dd3979b8c059236a02 Author: László NémethDate: Wed Jun 22 13:12:43 2016 +0200 empty commit (feature25, proc idle stretch window, high prec. type text) Change-Id: Ia2436f9f5394525b1de6850c131b381a15080cdc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 3 commits -
0 files changed New commits: commit a3b66a3c31977d19a683dacb5e59ac515d333c0b Author: László NémethDate: Wed Jun 22 20:58:01 2016 +0200 empty commit (repeat) Change-Id: Icef9a5be064d05bb3a38f503a5362ef55d6a904f commit 117fc12d65198da64f14e4073cb3f7f795689431 Author: László Németh Date: Wed Jun 22 20:57:52 2016 +0200 empty commit (repeat) Change-Id: I57aa5b1b91dd9dbc2abc4d1e676037187be21683 commit af5d79bf2820ce322eaf5ce73d6609c5808bf4d4 Author: László Németh Date: Wed Jun 22 20:56:43 2016 +0200 empty commit (proc idle text typing) Change-Id: I94bc30f52eee1e1ae4e73796b280f8b1dc5d17c0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes24' - 2 commits -
0 files changed New commits: commit 8ea32ce63664f6c46d1359c7e40c2b7b0f1a8f50 Author: László NémethDate: Wed Jun 15 01:09:51 2016 +0200 empty commit (repeat) Change-Id: I02bf1bccfc11d91178d8b18e6c48ffcb6aac424b commit d72c3e3fbc7e03b56040654afed0dfc37c80e33c Author: László Németh Date: Wed Jun 15 01:09:22 2016 +0200 empty commit (repeat) Change-Id: I1d08433bdc1ab0036239827dcea94488de61c884 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes24' - 2 commits -
0 files changed New commits: commit 6b221bc77c87b779dad5e554a2da0ed0af53642c Author: László NémethDate: Thu Jun 16 15:49:46 2016 +0200 empty commit (repeat) Change-Id: I4d5745d8f10c90c0442ec403c466724f502d44e2 commit fd1c46dbcbf1ddc0e6b56e2a875200270cda6c63 Author: László Németh Date: Thu Jun 16 15:49:32 2016 +0200 empty commit (repeat) Change-Id: I06e97b85ca107db249fe4961b40d1d435f4f743c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes24' -
0 files changed New commits: commit 02731e4ef3bda7bc43d86790a8a267c28ff138d2 Author: László NémethDate: Thu Jun 16 14:32:42 2016 +0200 empty commit (all opt. except TimerDiff) Change-Id: Ib662c42019c0bde74e71459d666b8b10b2d28844 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes24' - 3 commits -
0 files changed New commits: commit f3005e293319aca2709f4d089f2e2e4406d334b6 Author: László NémethDate: Fri Jun 17 01:20:37 2016 +0200 empty commit (repeat) Change-Id: I4566575876dc217dc90e1e98db9056c99fb0d4cf commit 4d5bf2576c7f4153320bd9db9135999478b6d97e Author: László Németh Date: Fri Jun 17 01:20:29 2016 +0200 empty commit (repeat) Change-Id: Ic7ae17139720d354676de685d0e172b2befe69cf commit c407e45089b14386232207e230f1dd90e9e3 Author: László Németh Date: Fri Jun 17 01:18:37 2016 +0200 empty commit (Writer high prec. timer and orig. text typing) Change-Id: Ib550b80ca0c409d9c397931cf3a8fd932c381736 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' -
0 files changed New commits: commit 43a22925499a17a245a83253c8160228d2399191 Author: László NémethDate: Mon Jun 20 18:15:50 2016 +0200 empty commit (repeat) Change-Id: I2e5f94a126df075198df247377ed9df46915b5c0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 2 commits -
0 files changed New commits: commit f5626e2735b0765672e4656d5ef819c20e10ffd6 Author: László NémethDate: Wed Jun 22 00:09:10 2016 +0200 empty commit (repeat) Change-Id: I4be25f099b5b38c93ad7180869877e0e9bf1bbf9 commit e34a73894e4caba8743458a30a18539cb2d8c2d9 Author: László Németh Date: Wed Jun 22 00:08:39 2016 +0200 empty commit (system restart) Change-Id: Ia0f9b25f2896ad2939e367d9527fa79a7d8b8b1c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes24' - 3 commits -
0 files changed New commits: commit ef48df52fbade72dc18e1a23a6023472a963fcb2 Author: László NémethDate: Sun Jun 19 02:20:28 2016 +0200 empty commit (repeat) Change-Id: I674df30c6663700a4345c0c26e64dd4e76161aa6 commit b9a7e0dbfbc081632257da83983e5699801ff650 Author: László Németh Date: Sun Jun 19 02:19:24 2016 +0200 empty commit (repeat) Change-Id: If3b49cca173d7a151349f52d3f42262d462dca3a commit 0f133352e418e5344d19b788d8420db453534bc3 Author: László Németh Date: Sun Jun 19 02:13:26 2016 +0200 empty commit (proc idle at task ends, resizes and text typing sleeps) Change-Id: I390511dd138d144bc15b529a3e291b6a1b13feae ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' -
0 files changed New commits: commit 73605564f90f3d16039b4ffe54e0a17d84c1a9af Author: László NémethDate: Thu Jun 23 00:02:27 2016 +0200 empty commit (repeat - partial system rest.) Change-Id: I9ac2903f46af83d124024b1c4dd5bc7f4e186f6e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 3 commits -
0 files changed New commits: commit 9eebe5dcbcea1e7481c988816ff5cbdb05847082 Author: László NémethDate: Thu Jun 23 13:55:30 2016 +0200 empty commit (repeat) Change-Id: I538d6acc978219fedbd067caa8150a5c0f7a6e65 commit faecb12969873aea9dcf18b075ba3b8858319f68 Author: László Németh Date: Thu Jun 23 13:55:21 2016 +0200 empty commit (repeat) Change-Id: Ib551a128ba1e8f03280afb96b172057d3a62df36 commit 7f71a7915bb5f22142f6a203875aab0cdb9fb9cb Author: László Németh Date: Thu Jun 23 13:53:33 2016 +0200 empty commit (setPosSize without proc. idle, text typing more proc. idle) Change-Id: I801982b99f80cc6033228b5ab1fb42c902548803 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 3 commits -
0 files changed New commits: commit 99fbb31a727a8b6d9947d33c29a348f33876e2ff Author: László NémethDate: Thu Jun 23 19:27:02 2016 +0200 empty commit (repeat) Change-Id: I668f70e448d14eab36c04bd5739840aed77cd922 commit fa054a92b75a0d60b8abeafd7e7dba6464505b9f Author: László Németh Date: Thu Jun 23 19:26:43 2016 +0200 empty commit (repeat) Change-Id: I376c96a7042a243a0347f89665243ca9a121a157 commit a071a3f984de0af0767025e5877b17a01e15015f Author: László Németh Date: Thu Jun 23 19:26:12 2016 +0200 empty commit (repeat) Change-Id: Ic9dc7f4a51c9f3f8bb8b2b62f731137ef02e43a8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes14' -
0 files changed New commits: commit 3ebf466865949886cd871573a5a727b2552a8801 Author: László NémethDate: Mon Jan 18 11:20:12 2016 +0100 system restart 2 Change-Id: Ibd05a911050acee00bf5c92f8231d637421bed42 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 2 commits -
0 files changed New commits: commit 39c5bc1034c133396f7e4d14bc3fda7680176f7e Author: László NémethDate: Mon Jun 27 17:33:46 2016 +0200 empty commit (repeat) Change-Id: I3add98be2f0e4bbe92abad35cbf7d0b3b09ada9f commit 148f4a3b67bf8bd20288f4141c3557088ea5751a Author: László Németh Date: Mon Jun 27 17:33:35 2016 +0200 empty commit (repeat) Change-Id: I9e16f8322916c9c2eeac3ab6c63c7bc24f5c7d7f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' -
0 files changed New commits: commit 42af233e5130a711466e72516e82457f6e1c741b Author: László NémethDate: Tue Jun 28 11:37:19 2016 +0200 empty commit (process idle window) Change-Id: I90cb062d7441cf33e00e9cbd9bd9ae30ae27c7dc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 2 commits -
0 files changed New commits: commit 287daa660571fc2fac583c33eb3e48b637d651f3 Author: László NémethDate: Tue Jun 28 11:40:06 2016 +0200 empty commit (repeat) Change-Id: Idf1d5186d4a6ff7bd6a12aad21a3f50b7680d39c commit 68809a2338b00940f925070c1f1c69b6ac6f8b49 Author: László Németh Date: Tue Jun 28 11:39:58 2016 +0200 empty commit (repeat) Change-Id: I313a20a1210319c48f986b6ccc0cefd5a13c520e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes25' - 3 commits -
0 files changed New commits: commit 5eda6e8867551ff88ad2465433907e5beb6a4919 Author: László NémethDate: Mon Jun 27 21:08:48 2016 +0200 empty commit (repeat) Change-Id: I87d36719605252804ec797b697e73f240411fc83 commit 614ca607c3acc634e1a4bc0e801f479aecc0d87f Author: László Németh Date: Mon Jun 27 21:08:41 2016 +0200 empty commit (repeat) Change-Id: I52f6473203521ac43493c1b27103ae08f83f699f commit f854638e41b0147600409d6651e324b669ce67e8 Author: László Németh Date: Mon Jun 27 21:07:43 2016 +0200 empty commit (base, empty doc) Change-Id: I94fe5e29461cfbfebfbf7636d85795e338f1c9e3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes24' - 3 commits -
0 files changed New commits: commit 2b84216bdaa83bfb3fc30de1018424e8d4860c0e Author: László NémethDate: Fri Jun 17 13:47:04 2016 +0200 empty commit (repeat) Change-Id: Ie81d9430426aa8f9d102ecaf70b4b65c33b58961 commit dcdb99da6ef79d2f07ba7831b57bb6712962a05f Author: László Németh Date: Fri Jun 17 13:46:47 2016 +0200 empty commit (repeat) Change-Id: I5a02d6d43e51920bad2e6bfddf55cebb2b173252 commit ddbc1e76cb941cb2628677674ae34a397148418c Author: László Németh Date: Fri Jun 17 13:45:06 2016 +0200 empty commit (Writer proc. idle text typing, window resiz.) Change-Id: Idf242d668fee6a183f6179764c8d57893b896c3c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits