Age | Commit message (Collapse) | Author | Files | Lines |
|
Change-Id: I33f0bc2acc8f94bbebb0e32bca49bbbf65072f6f
|
|
That allows us to potentially change the import depending on the
producer of the document.
This becomes necessary to handle MSO 2007 chart drawingml streams
correctly.
(cherry picked from commit a2fa9e2468aa5c4fd4b610c5d0ebc8959e87a072)
Conflicts:
sc/source/filter/oox/excelfilter.cxx
Change-Id: I9be8b019fae69cd206203591982a89648965692f
|
|
(cherry picked from commit 15174177091367332b57cd79575e2f7dd27388b2)
Conflicts:
oox/source/core/xmlfilterbase.cxx
Change-Id: I4052c6f1e5dde71ce4cede1ec9a313f461861d71
|
|
Change-Id: Ie143751d22404dac8f31c8ecef90a0e185e07973
|
|
Change-Id: I32f44acbcf5a6aed4d9f7442ad7212af31073352
Reviewed-on: https://gerrit.libreoffice.org/14723
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 4acffa65b58c8bd359215345dca2c61e2c5ceba5)
|
|
Change-Id: I457bece6409f89f3668e53c9862cd7caf54807a7
|
|
(cherry picked from commit b13534de022972131b46f93f5ada90af155eec9e)
Conflicts:
chart2/qa/extras/chart2import.cxx
Change-Id: Iefb52f6fa77cf90955dbb47c1b9ca7ab699a43eb
|
|
Change-Id: I943be2cf660d2dc77eebd776208af96c0b5f67a4
(cherry picked from commit 0d1bd8c4f12d4e60d1f33f7df0a201d2affb7767)
|
|
Change-Id: I40a3816b0a942ca9dcdb84c0fe96b21c71496c9f
|
|
(cherry picked from commit aad90e18cd00ac8af6bcddf14e4e19c9475dedbf)
Conflicts:
oox/source/drawingml/chart/objectformatter.cxx
Change-Id: I116e7e8c9046009cfcadc04b5367a6fe25f88d96
|
|
(cherry picked from commit de684f47da785c0da6194df1f582648ebf3d1569)
Conflicts:
oox/source/drawingml/chart/chartspaceconverter.cxx
Change-Id: I53002c0b97da66c44429b5ace0fc709b5e8a325f
|
|
(cherry picked from commit a9924d94e7db6db50b8b36a311f7d7abf80e4700)
Conflicts:
chart2/qa/extras/chart2import.cxx
Change-Id: I052838eaf4134a72feb067fc2a1355fabcafe11f
|
|
(cherry picked from commit 32fe0c6adcff25a0df536127ca980413e1cabefd)
Conflicts:
oox/source/ppt/pptimport.cxx
Change-Id: Iee7fea0f55cf54d43a349b6cc0ffa25995069e40
|
|
Change-Id: I7b488e222cd44e75d1e0ff7f8e545e9399f418b5
(cherry picked from commit a51300bc9223b28fc5da6059e4fe1d2af62fb323)
|
|
(cherry picked from commit 5fb41ae3920cd635fa42057e1623aa21bcb53167)
Conflicts:
oox/source/drawingml/chart/chartspacefragment.cxx
Change-Id: Ic35f1188e66cf89f203b34f354a2c4b11f1f65a2
|
|
We implement in many places wrong default values based on how MSO 2007
behaves. Newer MSO versions produce correct files so our import is
wrong. Instead of changing the default value we need to be able to use
default values based on the document producer.
Change-Id: I6a2a0b30885ebccc384d17f896709ecdd475d786
(cherry picked from commit ffc0391e2e9d797ef8ce3d1089e8d9d2b11a5ead)
|
|
Change-Id: I5061b96787324fa5c2a718650b8dee4da3b447e3
|
|
The problem was that the bugdoc had a table, and inside the table there
was a long paragraph that flows to the next page, but only the paragraph
mark of it does so. We first split the frame to have space for the
paragraph mark, but later decided that all the content would fit the
first frame, and this way the last hard line break and the paragraph
mark was painted on each other.
This is normally not a problem without tables, because
SwTxtFrm::FormatAdjust() just calls SplitFrm(), sets its nNew flag to
non-zero make sure that later SwTxtFrm::_AdjustFollow() doesn't try to
join it, and we're ready. However, when the paragraph is inside a table,
then the paragraph was formatted multiple times, and next time when we
already had a follow nNew was not set, so even if there was a correct
split first, the new frame was joined later.
Fix the problem by explicitly setting nNew for the "in a table and
paragraph ends with a hard line break" case, that way we don't blindly
join the frame, only in case there is enough space for the follow in the
master.
(cherry picked from commit 7e33cce05b2df3f1761bcc66606c4d3b2b2671e9)
Conflicts:
sw/CppunitTest_sw_uiwriter.mk
sw/qa/extras/uiwriter/uiwriter.cxx
Change-Id: Iede654740dcb0d8aa768d742ee330208291a383a
|
|
Change-Id: I731a58c7749e157f6b40c60808687ce629683742
Reviewed-on: https://gerrit.libreoffice.org/14410
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
Change-Id: I1acff9fe3e907b303851984674da33dff5ed0e08
|
|
As explained in the following link, access mode should be set to
"EnableShareDenyNone" to avoid blocking others process to access the
file opened by the Property Handler.
http://msdn.microsoft.com/en-us/library/windows/desktop/dd894084%28v=vs.85%29.aspx
Reviewed-on: https://gerrit.libreoffice.org/13596
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Conflicts:
scp2/source/winexplorerext/registryitem_winexplorerext.scp
Change-Id: I61cc251078c20f6a8cf7fa052c222a86e4e383b3
|
|
Change-Id: I4ac5fe6f42b425ee96124b2dde39ff397a081638
(cherry picked from commit 1746c886362b8525b04365dd6b7203b8098b99ba)
Reviewed-on: https://gerrit.libreoffice.org/14290
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
Change-Id: I7559067c00617482d34e7cbdd177202868cbfc76
(cherry picked from commit dae7d2089516d9cf014b9fad0adb484f19282a29)
Reviewed-on: https://gerrit.libreoffice.org/14161
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
Change-Id: I74a9748a2e4981dc5d1677f06db7eceed9e4b108
(cherry picked from commit 0efbd9931ea854cf71c4c54ca3f3d55d6db1fa13)
Reviewed-on: https://gerrit.libreoffice.org/14144
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit a0ef7698b7df63b8befe274305051063425f8eb6)
|
|
GetEnglishSearchFontName() returns incorrect value for specific localized
font name as parameter(ex."HGS Gothic M").
Because, the conversion table "aImplLocalizedNamesList[]" is wrong.
http://opengrok.libreoffice.org/xref/core/unotools/source/misc/fontdefs.cxx#181
This causes the assertion from vcl/source/font/PhysicalFontFamily.cxx(line:297),
and more problems, probably.
This patch fixes two entries in the conversion table.
One fixes the assertion, another fixes typo.
Change-Id: I3141bbbb7956608cc59f20ad42c76ef97a42189d
Reviewed-on: https://gerrit.libreoffice.org/14244
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit c8c4e766643c8ad0a3d6d48e5105518ef5f66250)
Reviewed-on: https://gerrit.libreoffice.org/14262
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
Change-Id: Ica66c89fe86c18c436290a03849aa5ebfb4e8bc3
|
|
Change-Id: Iecedb87f6329c1cddcaa4cd939b349924e58d256
|
|
where odt checks for a null pTxtCrsr and skips the object and fodt
just ploughed ahead. i.e. make fodt equally useless as odt (fdo#84942)
(cherry picked from commit 4345a3de0e5a600685fef5dc9fa422fe6849a0a3)
Conflicts:
sw/source/filter/xml/xmltexti.cxx
Change-Id: I915cc1f7c065ea83377e895a932636c82698cf1f
Reviewed-on: https://gerrit.libreoffice.org/14058
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I67f472d72efe123b533d4d94be0084986c0e8349
(cherry picked from commit 6acd5c45c764d81aea1539e66adbfadb51df0aa3)
Reviewed-on: https://gerrit.libreoffice.org/14081
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: Ia30271426ea47b7bf5af85d16591a02e6d52b3d9
(cherry picked from commit 0442cd217645aa4fdd924e4c2e4f90a77f1fbbad)
Reviewed-on: https://gerrit.libreoffice.org/14140
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
|
|
Change-Id: Id53e589789144d892427a8a4ec1af1926aa97b52
(cherry picked from commit 3a5fa612b4afb72b5f91877a5c52e25c7604ae1a)
Reviewed-on: https://gerrit.libreoffice.org/14159
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
See void SmNodeToTextVisitor::Visit( SmFontNode* pNode ) for comparison.
Change-Id: Id7e58fef3b715ef2a4bcb4e1a1d390aadf917b5f
Reviewed-on: https://gerrit.libreoffice.org/14193
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 9efb04dfbf70e123da1755adcede8199eabf0d9a)
Reviewed-on: https://gerrit.libreoffice.org/14198
|
|
regression from
commit 832e5aadbff006ec24959162c29756fe2b1982be
Author: Caolán McNamara <caolanm@redhat.com>
Date: Tue Oct 8 10:06:59 2013 +0100
Related: fdo#38838 remove UniString::SearchAndReplaceAll
(cherry picked from commit 6cde3ff3dd646f51f37f2342863371db8de9087a)
Conflicts:
sw/source/filter/html/wrthtml.cxx
Change-Id: If792925eddc9c640584a2e8fa313a4297a32c74c
Reviewed-on: https://gerrit.libreoffice.org/14172
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
regression from
commit e0cce521f1ad0cc384d30ce2f1077ea229fffe62
Author: Armin Le Grand <alg@apache.org>
AuthorDate: Thu Jan 10 16:28:40 2013 +0000
Commit: Caolán McNamara <caolanm@redhat.com>
CommitDate: Thu Jun 13 14:50:46 2013 +0100
Resolves: #i121504# Support for alpha channel in clipboard for all systems
(cherry picked from commit ef3931ff410117e1237b3bef7bc090e8b83b9519)
which blindly just bulldozed out the bMSOFormat branch
(cherry picked from commit 470fcca594ba4f6bf473d4d44b415c2ba151b0d9)
Conflicts:
vcl/source/gdi/dibtools.cxx
Change-Id: Iec354f1fb585f0803b9df472bc9ec9e103aa5847
|
|
Change-Id: Ib43b42caac84aa0218be5944b2b4f808860da9c0
|
|
Change-Id: If5977b280fed8d8b053f59852d3984a59ce61a69
(cherry picked from commit ce5cc7afb0f1c99237d04e0c754527c725d8491c)
Reviewed-on: https://gerrit.libreoffice.org/11832
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
|
|
The implementation of SwXStyle's FirstIsShared property is busted, and
that causes xmloff to write the footer-first content into the master
footer.
This is a re-implementation of 0f21f932081471b2a5eda820fa1a194fbf3ab85c
because unostyle.cxx is very different on master...
Reviewed-on: https://gerrit.libreoffice.org/11722
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 902de8a1cbdb86c1eb1a05c8307b109fd75f493c)
Conflicts:
sw/source/core/unocore/unostyle.cxx
Change-Id: I485d8089c1fb5ba3ca369fbfe8f3115bf700ba13
Reviewed-on: https://gerrit.libreoffice.org/11752
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
... instead of attempting to stringize a NaN coded error value.
Regression introduced with 30a20743ae17e6e02183a65603d38968253b3ffb
(cherry picked from commit 994607b55104b9ae4554554c13b001b8d5d513b6)
construct grouped ScFormulaCell with bDirty=true, fdo#79249 related
Noticed when loading
https://bugs.freedesktop.org/attachment.cgi?id=99844
with fdo#79249 fix where oox::xls::applyCellFormulas() groups the
consecutive =#N/A formulas. Only A1 result was displayed, other cells
were displayed empty.
(cherry picked from commit a1dc5e97da273bf35d58d54e625149022569a993)
correct error string, #N/A instead of #NA
(cherry picked from commit 758755e31b3d9e1ed2eab522d4794282178346ac)
implement an actually working setErrorCell() from BIFF error codes
(cherry picked from commit ca9a81b2ca858b82e863e1e6f917928916fea79e)
3a541f74d3d25e1515a1c6d47f02ec6a8e817c93
15019072b6e812b9ffe29d3ee6afacd9ab526948
67b8fc324779875ba14e2d69204c40fe27cc180e
Reviewed-on: https://gerrit.libreoffice.org/13492
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Conflicts:
sc/source/filter/oox/sheetdatabuffer.cxx
Change-Id: Ia7a8ca39938820ac75db169404446fa696c6ee1b
|
|
on loading id:000386,src:000000,op:havoc,rep:128.jpg as text
Change-Id: I98364ffbcc4ea788613cc8071c4d8774ba167033
(cherry picked from commit 0b39d560da27ece227830a4bcc5556ae902a0921)
Reviewed-on: https://gerrit.libreoffice.org/13744
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
Change-Id: I6440832fe508689ffa8e20fa17827528331e3585
(cherry picked from commit 2645b1979365085edf4a94500f2c610bfc4e668b)
|
|
Found by Asan. e.g moz233272-2.xpm
Change-Id: Ic563db41dbd4ce7250492e99f3e48a203cfdcf00
Reviewed-on: https://gerrit.libreoffice.org/13686
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit ba4b5741db25ff3b76a8d10d8f3745dfc1973749)
(cherry picked from commit cda3b8767fd8f5b43b1043852e9f90fd17a129f4)
|
|
Change-Id: Ibb7ecfa637ff96fbda3a8ed5d67943ece28927e5
(cherry picked from commit f901624b5e13e300f8e2facd2a824202c21d9729)
Reviewed-on: https://gerrit.libreoffice.org/13739
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
(cherry picked from commit e1351ed4c5f9152c80b32bbaa53e3eff56671331)
Change-Id: Ic5d678a2b1197ce8d83b308b0a4387bf657052d5
|
|
Change-Id: I7e8b7ed552a37c6d9c6ce7c75765267b343d508c
|
|
Change-Id: If84d468d4bd55ed55ccd517d0b078d283a1a9c38
|
|
Change-Id: Ia70f96e1d31e71c56f03c828be0a4e49fff4b198
|
|
When theme index is 0, it means it's unset so we should not
apply that.
(cherry picked from commit 89206c472ecf18bfde6824cea8004921cd404365)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: I62a9cd2a9b4c19f5acffc334d5e8263fe24fc8fd
|
|
Change-Id: Ieac082a3b312602eff5ec101529536d747fa3836
|
|
Maybe since 0960ec3e1b7b0d872d1f84d2d56f480a4df08b21 all conditions of a
single filter stack were OR connected, regardless whether filter-and was
given in the file.
Change-Id: Ifb423ccc7deb42bb6bba0bfc810607633f2c342c
(cherry picked from commit b500e60b32b5cf8fd61beb7476c2c29e65aee3e4)
Reviewed-on: https://gerrit.libreoffice.org/13450
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Id9a052e61b0c098ff9e843b04e738fc1daa3a7c7
|