Kayıtlar (commit) · ae223c4139c98af99a8c543ff710aef0e6ec16f7 · LibreOffice / core

31 Agu, 2015 40 kayıt (commit)

opengl: push mask coords to the shaders along the image coords · ae223c41

Tomaž Vajngerl Agu 24, 2015 yazdı

If using the same texture to store the image and mask data (for
example when using texture atlas) the mask and image (RGB) coords
aren't the same anymore. With this commit we always define the mask
coords separately.

(cherry picked from commit bdce4e29)

Conflicts:
	vcl/opengl/program.cxx

Change-Id: Ie33f87a6e9ab398972c6a3d5938e5f1364c82d36
Reviewed-on: https://gerrit.libreoffice.org/18012Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>

ae223c41

Fixed (fixed size) texture atlas for "caching" OpenGL texures · e0f8b0ce

Tomaž Vajngerl Agu 19, 2015 yazdı

Plus two trivial follow-up build fixes.

Change-Id: I7fe90c0a0033b4d9a341a4f0b8356d7f7133e93e
(cherry picked from commit b26ba85d)
(cherry picked from commit 2792868d)
(cherry picked from commit 1e8e3a8c)
Reviewed-on: https://gerrit.libreoffice.org/18011Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>

e0f8b0ce

Resolves: rhbz#1255811 implement Edit modify handler · 6f880246

Eike Rathke Agu 25, 2015 yazdı

... and disable/enable Apply/Ok buttons for in/valid ranges.

(cherry picked from commit ad1284df)

implement Edit modify handler, rhbz#1255811 related

Same as in ScRandomNumberGeneratorDialog.

(cherry picked from commit da9ecf1a)

implement Edit modify handler, rhbz#1255811 related

Same as in ScSamplingDialog.

(cherry picked from commit a88fecdc)

implement Edit modify handler, rhbz#1255811 related

Same as in ScStatisticsInputOutputDialog.

(cherry picked from commit b2363e98)

1bc9296bfc8b1b2b8f3fc20183e2c626f94dee09
ff709ec2284673efa8824a9b8cfc037e4d6d567a
0e3eb06bc86cf77c405c54f312340c7b2551c1ec

Change-Id: I52b5eae2f34e3fca7c0761b14124477a0d160b01
Reviewed-on: https://gerrit.libreoffice.org/18009Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

6f880246

-Werror,-Winconsistent-missing-override · db65b271
Stephan Bergmann Haz 10, 2015 yazdı
```
Change-Id: I2d1aa79a67bf130c3844b3bccb34a1761e8e4dfc
(cherry picked from commit 2ed0de57)
```
db65b271
Accept also OS X 10.11 · d4e34db6
Tor Lillqvist Haz 08, 2015 yazdı
```
Change-Id: Ieedf4810f1e726bf11f0d0b1a203e560a0b16550
```
d4e34db6

vcl OpenGL program: Cache mvp matrix to reduce ~200 api calls per frame. · 8dc2806f

Lubosz Sarnecki Agu 20, 2015 yazdı

Change-Id: I86ae50bd8d2148e86a6c8fc0821d3e2bc29a0cd4
(cherry picked from commit e3cd97ce0b2e153b8b6812cc66f2e7d33504a7da)
Reviewed-on: https://gerrit.libreoffice.org/18006Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>

8dc2806f

there may be no storage available in older formats · 1ef21a7b

Caolán McNamara Agu 25, 2015 yazdı

Change-Id: I23cbaf7fc1320168eb75ca33fd6d704125508785
(cherry picked from commit 666fb214)
Reviewed-on: https://gerrit.libreoffice.org/17982Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

1ef21a7b

tdf#93614 - detect hanging OpenGL drivers with a watchdog. · ccba41f1

Michael Meeks Agu 25, 2015 yazdı

If an OpenGL zone takes >2s to make progress, disable OpenGL.
If an OpenGL zone takes >5s to make progress, abort the app.

Reviewed-on: https://gerrit.libreoffice.org/17986Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

Conflicts:
	vcl/workben/vcldemo.cxx

Change-Id: I776c06a3f8ba460ff9842a9130c21f9ee2147eee
Reviewed-on: https://gerrit.libreoffice.org/17995Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

ccba41f1

Fix tdf#77514 CJK ruby text in RTL( vertical ) base line issue. · 335ff329

Mark Hung Agu 01, 2015 yazdı

Change-Id: Id670e83db01efe6bcd5fb6bb374ab9cb92898f88
Reviewed-on: https://gerrit.libreoffice.org/17460Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
(cherry picked from commit b14861e1)
Reviewed-on: https://gerrit.libreoffice.org/17994Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

335ff329

Avoid overflow in PBMReader::ImplReadHeader · 15efa811

Stephan Bergmann Agu 25, 2015 yazdı

...as found by UBSan in CppunitTest_filter_ppm_test on
filter/qa/cppunit/data/pbm/fail/crash-1.pbm

Change-Id: Ib7c50ef1f07aba6b78f79c608be69c3dac38ddfe
(cherry picked from commit 662498ab)
Reviewed-on: https://gerrit.libreoffice.org/17984Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

15efa811

Handle non-aligned FFNs · f3efaf0b

Stephan Bergmann Agu 24, 2015 yazdı

...as found by UBSan in CppunitTest_sw_filters_test (see below), and at the same
time limit reads within the pA array to its bounds.

> Testing file:///.../sw/qa/core/data/ww6/pass/crash-2.doc:
> sw/source/filter/ww8/ww8scan.cxx:6473:32: runtime error: upcast of misaligned address 0x6200000e70e7 for type 'WW8_FFN_Ver6', which requires 2 byte alignment
> 0x6200000e70e7: note: pointer points here
>  00 00 00 00 00  00 00 00 00 00 00 00 00  00 00 00 0e 00 00 6a 00  00 00 00 0e 00 00 6a 00  00 00 6a
>              ^
>  WW8Fonts::WW8Fonts(SvStream&, WW8Fib&) sw/source/filter/ww8/ww8scan.cxx:6473:32
>  SwWW8ImplReader::CoreLoad(WW8Glossary*, SwPosition const&) sw/source/filter/ww8/ww8par.cxx:4961:20
>  SwWW8ImplReader::LoadThroughDecryption(SwPaM&, WW8Glossary*) sw/source/filter/ww8/ww8par.cxx:5767:19
>  SwWW8ImplReader::LoadDoc(SwPaM&, WW8Glossary*) sw/source/filter/ww8/ww8par.cxx:6039:19
>  WW8Reader::Read(SwDoc&, rtl::OUString const&, SwPaM&, rtl::OUString const&) sw/source/filter/ww8/ww8par.cxx:6157:20
>  SwReader::Read(Reader const&) sw/source/filter/basflt/shellio.cxx:175:18
>  SwDocShell::ConvertFrom(SfxMedium&) sw/source/uibase/app/docsh.cxx:258:22
>  SfxObjectShell::DoLoad(SfxMedium*) sfx2/source/doc/objstor.cxx:790:23
>  SwFiltersTest::filter(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) sw/qa/core/filters-test.cxx:112:20
>  SwFiltersTest::load(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int) sw/qa/core/filters-test.cxx:71:12
>  test::FiltersTest::recursiveScan(test::filterStatus, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) unotest/source/cpp/filters-test.cxx:129:20
>  test::FiltersTest::testDir(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) unotest/source/cpp/filters-test.cxx:154:5
>  SwFiltersTest::testCVEs() sw/qa/core/filters-test.cxx:154:5

(cherry picked from commit 63738868)

Change-Id: I31ac8dc11d985745785c9dda1cec8a11a41098bb
Reviewed-on: https://gerrit.libreoffice.org/17985Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

f3efaf0b

Fix GTK3 right-to-left rendering of spin buttons · 4f691bce

Khaled Hosny Agu 17, 2015 yazdı

The buttons were not drawn at all

Change-Id: I51dfa30a6daa1034b5e978b09bcdfcc83e859f3d
Reviewed-on: https://gerrit.libreoffice.org/17790Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/17943Tested-by: Jenkins <ci@libreoffice.org>

4f691bce

don't mirror 0, RECT_EMPTY, 0, RECT_EMPTY rectangle · 5a1826a4

Caolán McNamara Agu 23, 2015 yazdı

leave it untouched to make gtk3 rtl spin buttons possible
where the additional mirrorValue contains the region
of the spinbuttons to render within this rectangle

Change-Id: I2648d98ed36373c95947cc4d78e2e54797f01155
Reviewed-on: https://gerrit.libreoffice.org/17940Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/17942Tested-by: Jenkins <ci@libreoffice.org>

5a1826a4

tdf#91969: Parts of paragraph border is missing · 90c1f461

Zolnai Tamás Agu 23, 2015 yazdı

...when border is around more than one paragraph

Regression from:
16f637da

Change-Id: Iea9455dd7cc3c301c3e2d5d7903c98d98e515595
(cherry picked from commit 8d933132)
Reviewed-on: https://gerrit.libreoffice.org/17979Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

90c1f461

tdf#93569 - restore ACT_ABORT distinction. · 3342de97

Michael Meeks Agu 21, 2015 yazdı

In order to handle signals, we need to have ACT_ABORT in place
and distinct from ACT_SYSTEM.

cf. if (Signals[i].Action != ACT_SYSTEM) during setup.

Change-Id: I8c69d48244ba462f2e2385a530cbbf4740ccee9a
Reviewed-on: https://gerrit.libreoffice.org/17893Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

3342de97

in reality we are limited to max sal_Int32 here · a3ef30f0

Caolán McNamara Agu 24, 2015 yazdı

so accept that and test if the values were accepted or limited

Change-Id: Iaed5ebc2f12b52055506147c71117a2ad88d28ac
(cherry picked from commit 0a76c1fd)
Reviewed-on: https://gerrit.libreoffice.org/17972Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

a3ef30f0

consider validity of m_nDrawCpO · 20e57795

Caolán McNamara Agu 24, 2015 yazdı

(cherry picked from commit 8329eb5e)

Change-Id: Ifbd131440bad6d840d369c99628cb8904697ad96
Reviewed-on: https://gerrit.libreoffice.org/17971Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

20e57795

Handle GetBaseCp overflow · 74964f47

Stephan Bergmann Agu 24, 2015 yazdı

...as found by UBSan in CppunitTest_sw_filters_test (see below); note the TODOs
how best to report the errors up the call stack.

> Testing file:///.../sw/qa/core/data/ww6/pass/crash-3.doc:
> sw/source/filter/ww8/ww8scan.cxx:5240:63: runtime error: signed integer overflow: 1766665948 + 1768712052 cannot be represented in type 'int'
>  WW8Fib::GetBaseCp(ManTypes) const sw/source/filter/ww8/ww8scan.cxx:5240:63
>  SwWW8ImplReader::Read_GrafLayer(long) sw/source/filter/ww8/ww8graf.cxx:2393:18
>  SwWW8ImplReader::ReadChar(long, long) sw/source/filter/ww8/ww8par.cxx:3630:17
>  SwWW8ImplReader::ReadChars(int&, int, long, long) sw/source/filter/ww8/ww8par.cxx:3432:27
>  SwWW8ImplReader::ReadText(int, int, ManTypes) sw/source/filter/ww8/ww8par.cxx:3970:22
>  SwWW8ImplReader::CoreLoad(WW8Glossary*, SwPosition const&) sw/source/filter/ww8/ww8par.cxx:5169:9
>  SwWW8ImplReader::LoadThroughDecryption(SwPaM&, WW8Glossary*) sw/source/filter/ww8/ww8par.cxx:5767:19
>  SwWW8ImplReader::LoadDoc(SwPaM&, WW8Glossary*) sw/source/filter/ww8/ww8par.cxx:6039:19
>  WW8Reader::Read(SwDoc&, rtl::OUString const&, SwPaM&, rtl::OUString const&) sw/source/filter/ww8/ww8par.cxx:6157:20
>  SwReader::Read(Reader const&) sw/source/filter/basflt/shellio.cxx:175:18
>  SwDocShell::ConvertFrom(SfxMedium&) sw/source/uibase/app/docsh.cxx:258:22
>  SfxObjectShell::DoLoad(SfxMedium*) sfx2/source/doc/objstor.cxx:790:23
>  SwFiltersTest::filter(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) sw/qa/core/filters-test.cxx:112:20
>  SwFiltersTest::load(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int) sw/qa/core/filters-test.cxx:71:12
>  test::FiltersTest::recursiveScan(test::filterStatus, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) unotest/source/cpp/filters-test.cxx:129:20
>  test::FiltersTest::testDir(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) unotest/source/cpp/filters-test.cxx:154:5
>  SwFiltersTest::testCVEs() sw/qa/core/filters-test.cxx:154:5

Change-Id: I0b14f5c1e025565eb131e64590b7d5ff0135e767
Reviewed-on: https://gerrit.libreoffice.org/17965Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit d281b460)
Reviewed-on: https://gerrit.libreoffice.org/17969Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

74964f47

Handle zero nPLCF · a52d1781

Stephan Bergmann Agu 24, 2015 yazdı

...as found by ASan in CppunitTest_sw_filters_test:

> Testing file:///.../sw/qa/core/data/ww6/pass/crash-1.doc:
> ERROR: AddressSanitizer: heap-buffer-overflow on address 0x6020009382b0 at pc 0x2b1dcb5eabac bp 0x7fffe8ccbdb0 sp 0x7fffe8ccbda8
> READ of size 4 at 0x6020009382b0 thread T0
>  WW8PLCF::SeekPos(int) sw/source/filter/ww8/ww8scan.cxx:2219:14
>  WW8PLCF::WW8PLCF(SvStream&, int, int, int, int, int, int) sw/source/filter/ww8/ww8scan.cxx:2080:9
>  WW8PLCFx_Fc_FKP::WW8PLCFx_Fc_FKP(SvStream*, SvStream*, SvStream*, WW8Fib const&, ePLCFT, int) sw/source/filter/ww8/ww8scan.cxx:2883:21
>  WW8PLCFx_Cp_FKP::WW8PLCFx_Cp_FKP(SvStream*, SvStream*, SvStream*, WW8ScannerBase const&, ePLCFT) sw/source/filter/ww8/ww8scan.cxx:3088:7
>  WW8ScannerBase::WW8ScannerBase(SvStream*, SvStream*, SvStream*, WW8Fib*) sw/source/filter/ww8/ww8scan.cxx:1588:20
>  SwWW8ImplReader::CoreLoad(WW8Glossary*, SwPosition const&) sw/source/filter/ww8/ww8par.cxx:5022:20
>  SwWW8ImplReader::LoadThroughDecryption(SwPaM&, WW8Glossary*) sw/source/filter/ww8/ww8par.cxx:5767:19
>  SwWW8ImplReader::LoadDoc(SwPaM&, WW8Glossary*) sw/source/filter/ww8/ww8par.cxx:6039:19
>  WW8Reader::Read(SwDoc&, rtl::OUString const&, SwPaM&, rtl::OUString const&) sw/source/filter/ww8/ww8par.cxx:6157:20
>  SwReader::Read(Reader const&) sw/source/filter/basflt/shellio.cxx:175:18
>  SwDocShell::ConvertFrom(SfxMedium&) sw/source/uibase/app/docsh.cxx:258:22
>  SfxObjectShell::DoLoad(SfxMedium*) sfx2/source/doc/objstor.cxx:790:23
>  SwFiltersTest::filter(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) sw/qa/core/filters-test.cxx:112:20
>  SwFiltersTest::load(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int) sw/qa/core/filters-test.cxx:71:12
>  test::FiltersTest::recursiveScan(test::filterStatus, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) unotest/source/cpp/filters-test.cxx:129:20
>  test::FiltersTest::testDir(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) unotest/source/cpp/filters-test.cxx:154:5
>  SwFiltersTest::testCVEs() sw/qa/core/filters-test.cxx:154:5
> 0x6020009382b1 is located 0 bytes to the right of 1-byte region [0x6020009382b0,0x6020009382b1)
> allocated by thread T0 here:
>  operator new[](unsigned long) /home/sbergman/clang/trunk/src/projects/compiler-rt/lib/asan/asan_new_delete.cc:64
>  WW8PLCF::ReadPLCF(SvStream&, int, unsigned int) sw/source/filter/ww8/ww8scan.cxx:2091:26
>  WW8PLCF::WW8PLCF(SvStream&, int, int, int, int, int, int) sw/source/filter/ww8/ww8scan.cxx:2075:9
>  WW8PLCFx_Fc_FKP::WW8PLCFx_Fc_FKP(SvStream*, SvStream*, SvStream*, WW8Fib const&, ePLCFT, int) sw/source/filter/ww8/ww8scan.cxx:2883:21
>  WW8PLCFx_Cp_FKP::WW8PLCFx_Cp_FKP(SvStream*, SvStream*, SvStream*, WW8ScannerBase const&, ePLCFT) sw/source/filter/ww8/ww8scan.cxx:3088:7
>  WW8ScannerBase::WW8ScannerBase(SvStream*, SvStream*, SvStream*, WW8Fib*) sw/source/filter/ww8/ww8scan.cxx:1588:20
>  SwWW8ImplReader::CoreLoad(WW8Glossary*, SwPosition const&) sw/source/filter/ww8/ww8par.cxx:5022:20
>  SwWW8ImplReader::LoadThroughDecryption(SwPaM&, WW8Glossary*) sw/source/filter/ww8/ww8par.cxx:5767:19
>  SwWW8ImplReader::LoadDoc(SwPaM&, WW8Glossary*) sw/source/filter/ww8/ww8par.cxx:6039:19
>  WW8Reader::Read(SwDoc&, rtl::OUString const&, SwPaM&, rtl::OUString const&) sw/source/filter/ww8/ww8par.cxx:6157:20
>  SwReader::Read(Reader const&) sw/source/filter/basflt/shellio.cxx:175:18
>  SwDocShell::ConvertFrom(SfxMedium&) sw/source/uibase/app/docsh.cxx:258:22
>  SfxObjectShell::DoLoad(SfxMedium*) sfx2/source/doc/objstor.cxx:790:23
>  SwFiltersTest::filter(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) sw/qa/core/filters-test.cxx:112:20
>  SwFiltersTest::load(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int) sw/qa/core/filters-test.cxx:71:12
>  test::FiltersTest::recursiveScan(test::filterStatus, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) unotest/source/cpp/filters-test.cxx:129:20
>  test::FiltersTest::testDir(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, SfxFilterFlags, SotClipboardFormatId, unsigned int, bool) unotest/source/cpp/filters-test.cxx:154:5
>  SwFiltersTest::testCVEs() sw/qa/core/filters-test.cxx:154:5

Change-Id: I97d995aad621b829b6fb6ee4622d386fec0bedea
Reviewed-on: https://gerrit.libreoffice.org/17963Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 1a871f9d)
Reviewed-on: https://gerrit.libreoffice.org/17967Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

a52d1781

loop over successfully read bookmarks · a93ef1d8

Caolán McNamara Agu 24, 2015 yazdı

not over the amount that should be there

Change-Id: Ia2c353f9d7e274a5bebf405e1743ef1d1872b4de
(cherry picked from commit 02e9b490)
Reviewed-on: https://gerrit.libreoffice.org/17958Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

a93ef1d8

detect and reject loop in tif · 613f8c8b

Caolán McNamara Agu 24, 2015 yazdı

Change-Id: I77d315fa432a3eb1a65539489a2ba6da8508b283
(cherry picked from commit 6b82437d)
Reviewed-on: https://gerrit.libreoffice.org/17957Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

613f8c8b

limit seeks to valid area · 4cac1421

Caolán McNamara Agu 24, 2015 yazdı

(cherry picked from commit c0c90751)

Change-Id: I401d93491999a3fc3db4f597eea9c4fe5b9bc926
Reviewed-on: https://gerrit.libreoffice.org/17955Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

4cac1421

guard against hangs with bogus unsorted plcfs · 9f937bff

Caolán McNamara Agu 24, 2015 yazdı

This reverts commit 6d21cbd1.

Change-Id: I309302ab5357b8404ee4c75bd0bfcb4f816e0588
(cherry picked from commit 74c0f744)
Reviewed-on: https://gerrit.libreoffice.org/17951Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

9f937bff

tdf#93437: release reference held by ScFormulaReferenceHelper · 05f3148c

Katarina Behrens Agu 24, 2015 yazdı

which prevents destructor from being called. It was ScFormulaDlg's
own m_aHelper member variable holding reference to 'this'
(extra-wicked, through SetWindow(this)), never releasing it.

Change-Id: I258a280e09674d1a2f1ddebea19ea1b42dcdc777
Reviewed-on: https://gerrit.libreoffice.org/17954Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

05f3148c

tdf#89381 Revert "vcl: SalGraphics::mirror() - always use GetGraphicsWidth()" · 4b4841a9

Maxim Monastirsky Agu 23, 2015 yazdı

This reverts commit 28effca6.

Change-Id: Ie21ae1ef969b2cfdce81a152c195a69ad3c27f65
Reviewed-on: https://gerrit.libreoffice.org/17950Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

4b4841a9

dismiss bad seek offsets early · 9e40be7c

Caolán McNamara Agu 24, 2015 yazdı

Change-Id: Ia88bc1833d362547f45e073028203a4de581f3e2
(cherry picked from commit 8657e379)
Reviewed-on: https://gerrit.libreoffice.org/17945Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>

9e40be7c

fix crash with empty booknames · 2623ee56

Caolán McNamara Agu 24, 2015 yazdı

Change-Id: Ifadb2129be53530720cb2023cdc0782b6e737f18
(cherry picked from commit 11e73a08)
Reviewed-on: https://gerrit.libreoffice.org/17944Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

2623ee56

check for bad locations · 25813825

Caolán McNamara Agu 23, 2015 yazdı

Change-Id: I635585f664e700047d92821fb965d42b803a8a15
(cherry picked from commit b164d08f)
Reviewed-on: https://gerrit.libreoffice.org/17938Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

25813825

check that src index is in doc range · 97c09f20

Caolán McNamara Agu 22, 2015 yazdı

Change-Id: Ic81e7a14701ff30aa46a9293dd6db351bd350ba5
(cherry picked from commit 3230c8cf)

check that dest index is in doc range

Change-Id: I3006cf03cf97399a6c418162178acdb1d41c3b23
(cherry picked from commit cd6c9aef)
Reviewed-on: https://gerrit.libreoffice.org/17925Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

97c09f20

tdf#93077 - basic dialog localization issues. · 10746579

Michael Meeks Agu 22, 2015 yazdı

Don't remove non-existent languages to clean the dialog.
Avoid crashing when adding languages to a non-localized dialog.

Change-Id: Ie356177e00e56c214727d513ae0ce6d62d32591c
Reviewed-on: https://gerrit.libreoffice.org/17932Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

10746579

tdf#93188 - avoid crash in media player. · 9e59f241

Michael Meeks Agu 22, 2015 yazdı

ToggleFloatingMode can be run during dispose, and should handle that,
thanks to Maxim Monastirsky for the analysis.

Change-Id: I72c5aff9b75fa2c1b6795e239370244dafdafae2
Reviewed-on: https://gerrit.libreoffice.org/17931Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

9e59f241

Generalize CONFIGURATION_LAYERS "winreg:" notation · d7180aea

Stephan Bergmann Agu 21, 2015 yazdı

...after 097292fe "Add HKEY_CURRENT_USER
registry integration" added "winuserreg:".

Even though changing from the exisiting "winreg:" to "winreg:LOCAL_MACHINE"
should be compatible, as it only ends up in fundamental.ini included in the LO
inst set, play it safe it keep treating "winreg" the same as
"winreg:LOCAL_MACHINE".

("url" is a misnomer now in configmgr's Components ctor, and should eventually
be renamed to something more accurate.)

Reviewed-on: https://gerrit.libreoffice.org/17891Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

(cherry picked from commit 53e3fb1d, including
fixes for the apparently inadvertent differences between
097292fe "Add HKEY_CURRENT_USER registry
integration" and its unfaithful backport
1b8812e7 "tdf#93546 -Add HKEY_CURRENT_USER
registry integration")
Conflicts:
	configmgr/source/components.cxx
	instsetoo_native/CustomTarget_setup.mk
	scp2/source/ooo/common_brand.scp

Change-Id: Ifbcf3284d904490891642599468470d03547f92a
Reviewed-on: https://gerrit.libreoffice.org/17905Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

d7180aea

avoid hang in certain ww6 docs · 4363606f

Caolán McNamara Agu 21, 2015 yazdı

Change-Id: Ife15f6a6e4b31c6e226a154dd708290266e86a2e
(cherry picked from commit d0813b43)
Reviewed-on: https://gerrit.libreoffice.org/17911Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

4363606f

don't crash due to earlier short reads · 882e20b2

Caolán McNamara Agu 21, 2015 yazdı

Change-Id: I682a9bf72cbe18999c0c5acc495e813727e0e372
(cherry picked from commit 0030efe0)
Reviewed-on: https://gerrit.libreoffice.org/17909Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

882e20b2

fix another ww6 crash · d935b5cc

Caolán McNamara Agu 21, 2015 yazdı

Change-Id: I47b4ffb1d96041d51dde313c080ed1d9cd4000be
(cherry picked from commit 64052037)
Reviewed-on: https://gerrit.libreoffice.org/17908Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

d935b5cc

if read string was truncated, then truncate attributes range to match · 30484103

Caolán McNamara Agu 21, 2015 yazdı

Change-Id: I3501d31e0310481a5872e537bf53ad2faaf25779
(cherry picked from commit 6071feec)
Reviewed-on: https://gerrit.libreoffice.org/17907Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

30484103

add ww6 test dir and fix a crash · 4308702e

Caolán McNamara Agu 21, 2015 yazdı

Change-Id: Id08176640672095c03e0b124cd65a9dce26ac2db
(cherry picked from commit 42a709d1)
Reviewed-on: https://gerrit.libreoffice.org/17892Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

4308702e

clip text to skip to max text available · d27b1190

Caolán McNamara Agu 20, 2015 yazdı

Change-Id: I5c5c033954d5b6f869a05f19f312f9330df74efb
(cherry picked from commit 684a210d)
Reviewed-on: https://gerrit.libreoffice.org/17885Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

d27b1190

tdf#93546 -Add HKEY_CURRENT_USER registry integration. · 0b4c3b82

Michael Meeks Tem 14, 2015 yazdı

Back-port this to allow merging a user registry fragment.

Conflicts:
	configmgr/source/components.cxx
	instsetoo_native/CustomTarget_setup.mk
	scp2/source/ooo/common_brand.scp

Conflicts:
	scp2/source/ooo/common_brand.scp

Change-Id: Ia32ba9ff3e7878d40032bd7d10fba2c143d11757
Reviewed-on: https://gerrit.libreoffice.org/17884Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>

0b4c3b82

tdf#93547 - Disable OpenGL if we have a SEGV on windows in that code. · 36cd0b37

Michael Meeks Agu 20, 2015 yazdı

Annotate when we are in an OpenGL rendering zone.
Check for this in the VCL signal handler, and force OpenGL off here
if exception occurred inside an OpenGL code-path.

Reviewed-on: https://gerrit.libreoffice.org/17881Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>

Conflicts:
	vcl/source/opengl/OpenGLHelper.cxx

Change-Id: I85a4b3d4a374593dc55d01a39ec4c7c3c262c332
Reviewed-on: https://gerrit.libreoffice.org/17883Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>

36cd0b37