Age | Commit message (Collapse) | Author | Files | Lines |
|
Change-Id: I58e151743bf910b8b51f1b453e0bfcb4ed767d9d
(cherry picked from commit ef5e7b69440baa9f222d1ec870668d31d08268f0)
Reviewed-on: https://gerrit.libreoffice.org/7151
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Although a rather large change this does not change the property
mappings or import/export behavior yet, but prepares for further
changes that add mappings for generating correct ODF and consuming
both old and new namespace/element/attribute names.
This is a combination of 4 commits:
added bool bForExport parameter to XMLPropertySetMapper ctor
Set to true for export, false for import. If export true, an
XMLPropertyMapEntry with mbImportOnly==true is not added to the
mappings. This to be able to have more than one mappings for import
(for example a current extension namespace and the future namespace
proposed to the ODF-TC, or corrected typos in element or attribute
names), but map only to one entry on export, of course.
(cherry picked from commit ebc1b2fe50c7ed1002ed8431410b8e2ac6e795b9)
Conflicts:
dbaccess/source/filter/xml/xmlHelper.cxx
xmloff/source/chart/PropertyMaps.cxx
xmloff/source/draw/sdpropls.cxx
xmloff/source/style/PageMasterPropMapper.cxx
xmloff/source/table/XMLTableImport.cxx
prepared XMLPropertyMapEntry with mbImportOnly flag
(cherry picked from commit 9dd7ee88bd9835ae2bae36093100fcd651fd3aeb)
Conflicts:
dbaccess/source/filter/xml/xmlHelper.cxx
xmloff/source/table/XMLTableExport.cxx
xmloff/source/text/txtprmap.cxx
just beautify this a little
(cherry picked from commit 44b4973fbd0f190906f36321b31215d80b363d52)
reordered member variables for 4 byte alignment
(cherry picked from commit dd902b8e256867b5d5fed06b52995f14d969f67d)
Change-Id: I15b03870fd14f110833037b6c0ff934624d72de1
Reviewed-on: https://gerrit.libreoffice.org/7144
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
... on style:header-left, style:header-first, style:footer-left,
style:footer-first.
(regression from d92345561c998f7382cf9ef0fdcd29096f978435)
Change-Id: I48c51fcd2b07ae8b0e3ec2c1087a388c6900b366
(cherry picked from commit 8f73c7615ebe60ef71d6e8b49a0f19ddac6f03a0)
Reviewed-on: https://gerrit.libreoffice.org/7141
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
(cherry picked from commit 49f9694e34d07468cff4a7e4de332f11be3e0dd8)
Conflicts:
xmloff/source/text/txtflde.cxx
Change-Id: I32097cc4b8a67615b0b6d6172cafd0edad7469b6
(cherry picked from commit 4031765b004dded31f04c54f9a055b7a3d0053f2)
Reviewed-on: https://gerrit.libreoffice.org/7078
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
... of to-be <text:sender-initials>
Change-Id: Ia601c0debc5d66682aa92e14fb063395f9f48ab5
(cherry picked from commit 1379294741ff85d4c09d9ded7579ad50dea88fb7)
Reviewed-on: https://gerrit.libreoffice.org/7076
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
The value written for an Impress time field is something like
text:time-value="0000-00-00T23:28:07" (in LO 3.5+) or
text:time-value="0-00-00T23:28:07" (in OOo 3.3) which contains an
invalid all-zero date. Such values are actually rejected by the
ODF import since commit ae3e2f170045a1525f67e9f3e9b7e03d94f2b56b.
Actually there was no real support to read the RelaxNG type
timeOrDateTime before.
So fix that by:
- adding convertTimeOrDateTime/parseTimeOrDateTime functions to
sax::Converter
- recognizing and ignoring the 2 invalid all-zero values written by
LO 3.5 and historic OOo respectively
- writing a bare "time" in text:time-value if the DateTime struct
contains zero Date members
(Older OOo versions and AOO cannot actually read that, but everything
they _can_ read is invalid ODF...)
(cherry picked from commit cc407e50e8a1a74f9d1ed29d444dce9bd2e9167a)
The backport contains one change:
XMLTextFieldExport::ProcessTimeOrDateTime() still writes the invalid
value (to not add new backwards compat issues in stable branch),
so this patch only fixes the import side of things.
Conflicts:
sax/source/tools/converter.cxx
xmloff/source/text/txtfldi.cxx
Change-Id: I754076caee74a5163ed3f972af0f23796aa14f9f
Reviewed-on: https://gerrit.libreoffice.org/7026
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
|
|
... instead of <number:fill-character> but read both.
(cherry picked from commit 9f87de91cee05656808a98ab1bd65ad9509ef7df)
Also needed for this is:
xmloff: add a generic LibreOffice ODF extension namespace
XML_NAMESPACE_LO_EXT can be used for elements and attributes that are
not yet specified by OpenDocument.
(Change-Id: Id29392533d46f6592d964ce79c05ffefa4d69ebc)
Reviewed-on: https://gerrit.libreoffice.org/5419
Tested-by: Thorsten Behrens <tbehrens@suse.com>
Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit de9b067bd13ec6632b49c9683255bd3a1d7ae13e)
Change-Id: Ia620fad575782f6174a9ee5fbbd8b396b21948e3
Reviewed-on: https://gerrit.libreoffice.org/7013
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Trying to set a name that is already in use will throw an exception (and
set a different, generated name); if there is actually no name in the
file then there's no point trying to set anything.
(regression from b69d152cfa1da868ba960345d72ba78f9f8e1b35)
Change-Id: Ie54d4a830cc23e2853a6efeb81f77dcc788192ea
(cherry picked from commit 8171e713e74e3d09e86592c28abfe05d0400c071)
Reviewed-on: https://gerrit.libreoffice.org/6907
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
This reverts commit 14fa5488a829936275f79a7693b13da55114220e.
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Conflicts:
xmloff/source/chart/SchXMLTableContext.cxx
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
|
|
Reviewed-on: https://gerrit.libreoffice.org/5810
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric@lanedo.com>
Tested-by: Pierre-Eric Pelloux-Prayer <pierre-eric@lanedo.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit d87cb77b42b591b1333aacd60e107514d6e20864)
Conflicts:
xmloff/source/style/xmlexppr.cxx
Change-Id: Ib904af4fac5659821ba3b5dbbf62370df8243001
Reviewed-on: https://gerrit.libreoffice.org/5988
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Triggered by aa9af08b389a106fcfb53842ac7669b208a27205 which explicitly sets
rSet.Put( SdrTextAutoGrowHeightItem(FALSE) ); so there is something set on the
style which is being overwritten.
The code here resets the style to the default of "true" before going on to set
it to the explicit "false" again. In that window of time the master shapes
listen to the property change, on being set to autoheight they resize and on
being unset, they remain stuck on their autoheight calculated size.
Reviewed-on: https://gerrit.libreoffice.org/5887
Reviewed-by: mhofmann <borim7@web.de>
Reviewed-by: Thorsten Behrens <thb@documentfoundation.org>
Tested-by: Thorsten Behrens <thb@documentfoundation.org>
(cherry picked from commit 14e7a290dab7fead66ef6ff7f94c6a425d80ceb6)
Conflicts:
xmloff/source/draw/ximpstyl.cxx
Change-Id: I567a791b2bbbcb3a1a111633fabf509142984645
Reviewed-on: https://gerrit.libreoffice.org/5929
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
When multiple image child elements are inside a frame, each one is
imported and gets unique name via SwDoc::SetFlyName(). But the
retained one is not necessarily the first one, which is the only one
that may have the original name.
Also the solveMultipleImages needs to return a smart pointer, as nothing
else keeps the image contexts alive.
(regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70)
Change-Id: I28a8a752f3eed176cc2ebb4c9af11a0dd4d18ea6
(cherry picked from commit b69d152cfa1da868ba960345d72ba78f9f8e1b35)
Reviewed-on: https://gerrit.libreoffice.org/5777
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Ia529992d15152db981379a1e0a4dec63b2dad40c
(cherry picked from commit 26dc5f2ee67342bd474640e1cc39b96d3220721b)
Reviewed-on: https://gerrit.libreoffice.org/5533
Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
Tested-by: Thorsten Behrens <tbehrens@suse.com>
|
|
Export works and import has just a little typo.
Change-Id: I570d70423b5a626f21117971fb7eff030eae20af
(cherry picked from commit 932901224ea8473bbcae6feced953340d489bcc5)
Reviewed-on: https://gerrit.libreoffice.org/5488
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
squash of steps 1, 2 and 3 in master
Change-Id: If68ecf0691919d71d06d7b97d46db115013f9805
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Change-Id: Ic7a6b330094c597aaed09377cde55c2e7be1b08f
Reviewed-on: https://gerrit.libreoffice.org/5152
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
|
|
Add IsUTC member to:
com.sun.star.util.DateTime
com.sun.star.util.DateTimeRange
com.sun.star.util.Time
Add new stucts with explicit time zones:
com.sun.star.util.DateTimeWithTimezone
com.sun.star.util.DateWithTimezone
com.sun.star.util.TimeWithTimezone
Adapt the sax::Converter to read/write timezones, and fix the unit test.
Everything else just uses default (no time zone), this commit is just
to fix the API.
STRUCT: /UCR/com/sun/star/util/DateTime
nFields1 = 7 != nFields2 = 8
Registry2 contains 1 more fields
STRUCT: /UCR/com/sun/star/util/DateTimeRange
nFields1 = 14 != nFields2 = 15
Registry2 contains 1 more fields
STRUCT: /UCR/com/sun/star/util/Time
nFields1 = 4 != nFields2 = 5
Registry2 contains 1 more fields
Conflicts:
sc/source/filter/oox/unitconverter.cxx
Reviewed-on: https://gerrit.libreoffice.org/4833
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 652ccbdf3111766fadc379a8cf4650b744e1e19c)
i#108348: fix TimeZone -> Timezone in struct names
(cherry picked from commit 604aae1fd240254fe851d93dc35b5408bd13296c)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Signed-off-by: Lionel Elie Mamane <lionel@mamane.lu>
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
Conflicts:
forms/source/xforms/convert.cxx
offapi/type_reference/offapi.rdb
reportdesign/source/core/sdr/RptObject.cxx
sc/source/filter/oox/unitconverter.cxx
|
|
b40bcde076f9fabf24810d2520e878d604d99637 made writing .odp use style:font-name
and office:font-face-decls, instead of using fo:font-family . But the reading
back was broken, as xFontDecls is not set
in XMLTextImportPropertyMapper::handleSpecialItem(), so the font data was
ignored. And xFontDecls was not set because it's set while reading
office:font-face-decls, which is at the top of the xml document, but even
before the xml is parsed, the call to SdXMLImport::setTargetDocument() calls
GetShapeImport(), which creates XMLShapeImportHelper instance, which calls
XMLTextImportHelper::CreateParaExtPropMapper(), and XMLTextImportPropertyMapper
is created with rImport.GetFontDecls() still being NULL at that point.
And it actually doesn't seem to make any sense to just pass around all
the pointers to XMLFontStylesContext, as eventually it's always just the one
from SvXMLImport. So simply dump all that and make the one single place
that actually uses it (i.e. XMLTextImportPropertyMapper::handleSpecialItem())
refer directly to SvXMLImport::GetFontDecls().
Change-Id: Ib1b3e4b1bcaf87ca3e4703d1cc1563ad6b3f9ce7
Reviewed-on: https://gerrit.libreoffice.org/4816
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
This is an ugly hack but it at least works. This regression has been
introduced by the merge from the AOO code. The order of calls during
import is totally screwed and I have no idea how to properly fix all
these problems without introducing new regressions.
The best solution would be to move the import/export code into chart2
where we could manipulate tese properties directly and would not need to
transform the same information N times until it is written into the
chart code.
(cherry picked from commit 14fa5488a829936275f79a7693b13da55114220e)
Conflicts:
xmloff/source/chart/SchXMLTableContext.cxx
Change-Id: Id53c49441c683b19a973a48884135a3f4e89de03
Reviewed-on: https://gerrit.libreoffice.org/4628
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
Change-Id: I05fa923f962191081ea3318837d3e181c183b466
Reviewed-on: https://gerrit.libreoffice.org/4589
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
so the createInstance throws, so the element doesn't get inserted into
the documents.
regression since f0cd6fe9075cd0aa00162474784ad804a07ed138
Change-Id: Ie6cef7a4f0d5ac8a34d41139c3439fc04e9c7f20
(cherry picked from commit fd240ba81b317a54fc4512aaec33650cd7a30e29)
Reviewed-on: https://gerrit.libreoffice.org/4466
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
Old number formats had predefined formats from 0..49, locale data could
define additional formats from index 50 on. Internal (fractional)
formats were added to the number formatter, shifting the number of
predefined entries NF_INDEX_TABLE_ENTRIES by two that was also used as
an offset to determine whether a format needed to be added additionally.
As a consequece, formats defined with index values 50 and 51 in locale
data were ignored and not available in the dialog.
Introduced a new enum constant NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS to
use as the old offset value for not having to change all locale data
definitions everytime an internally generated format is added.
Change-Id: I94bdaabf360f7b9c253b1e3f5b73087f0c45fb44
(cherry picked from commit e7d73b42bd71aaab862c3e519348507a84f74754)
|
|
A regression from writing error cell information into the file.
Change-Id: Idb55646094fcd76912bdcd2102370681bcc8703d
|
|
Change-Id: I5df2dd44a0612da893b1afe08d0c7a9ea71f3905
|
|
from commit 19abb8de7e218ba08b2fa79c0379844303da328a)
|
|
polygon is closed(cherry picked from commit 6e114c242bb21950fd8ea01885c2269744d0fc6f)
|
|
(cherry picked from commit 7b3f5521bd3c400cd9e08b745176b4ce40885011)
Conflicts:
xmloff/source/draw/ximpshap.cxx
Change-Id: I973627f85ce6463c863863d6c180cb4c2cab86d0
|
|
For a new document the default is already effectively "false" due to
SwDocShell::InitNew() and the ODF and WW8 filters set it explicitly to
false... which is also the appropriate value for RTF and DOCX.
But only OOoXML and (perhaps) HTML (not sure) want "true" as the
default.
It is also mysteriously reset to "true" in
SwDoc::RemoveAllFmtLanguageDependencies() (which is called after loading
a template) for no apparent reason.
Change-Id: If5ad33c99f97412cb3ad4f9cec32f47825ed6f6b
|
|
It is not quite obvious what that commit attempts to do... especially
since the bugdoc attachment does not actually exercise the code that was
added in the commit, which changes the handling of the
"IsFollowingTextFlow" property.
The corresponding ODF attribute is style:flow-with-text, which has been
added in OOo 2.0. Investigation revels that MSO's ODF filter does not
support this attribute and acts as if it always had value "false".
The code in FillBaseProperties effectively acts as a default if the
value is not set; the ODF spec does not specify what the default should
be. But when an ODF document was written by MSO, "false" makes more
sense than the previous "true" default. Except when the document is not
ODF but OOoXML format, which indicates it's likely written by OOo 1.x
which did not support the attribute and acts as if it always had value
"true".
The Writer UNO API implementation is however not the right place for
format specific handling, so replace that with an addition to the
function reading the default graphic style that sets the
"IsFollowingTextFlow" property to false as a default, which should
have the same effect because all styles inherit from it.
Note: MSO 2010 Word always writes a default graphic style into ODF docs.
This has a side effect for loaded ODF documents: various newly
inserted objects have the property turned off then. But it turns out
this is actually an advantage, since the same behavior already exists
for _new_ documents (see SwDocShell::InitNew) so it is more consistent
now.
Change-Id: Iba6444a0515fd583398ff052fc5018254da31c30
|
|
Change-Id: I9ccfe565bde1112f9f3cb8c666e901bf121862dc
|
|
Change-Id: I5b2de61407924cdde5d74a7ea639365a876de74e
|
|
Fixes a regression from the pick-best-image from draw:frame in ODF,
where before sometimes the XShape got deleted that the
UnoInterfaceToUniqueIdentifierMapper::registerReference stored.
For that, added a
UnoInterfaceToUniqueIdentifierMapper::registerReferenceAlways
function, which overwrites potentially existing earlier entries
with the same identifier string.
This fix was originally much more messy, but then dtardon committed
30b248dfe5bfb8a0649e36f22c943b3feb2f1385 which also fixes this here
bug. Now only sneaking in slightly less involved interface map
handling and a safeguard in ximpshap.cxx.
Change-Id: I87501e43518a5fc2fee166c45a4e2f01718f5228
|
|
This is already (identically) documented in the header file.
Change-Id: I4a10cb0c1d1b1eee80fd828ab95829fb8128433f
|
|
Align multiimagehelper with module standard.
Change-Id: I70a4dbc66a0d127b9bf04d1e8db694d3526b21d7
|
|
|
|
The service already existed, it just needed an IDL file
Change-Id: I56b7079b098a7615dfb24598d15fe7d57691f317
|
|
Change-Id: I2e3480bf4f616231ee50a83f440d9bb0955e4ce6
|
|
Change-Id: If75cad038f35033be6dcad6f051673bd795accf3
|
|
- replaced osl_trace with sal_info
- replaced dbg_* with sal_*
Change-Id: I80aca85562e4a43fded5c37f9895e51f79e42c14
Reviewed-on: https://gerrit.libreoffice.org/3771
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
|
|
unify the various c-string compares and hashes.
(cherry picked from commit b7e3470a154538a92f0a21b14e726d75723f4a92)
Conflicts:
oox/inc/oox/export/shapes.hxx
oox/source/export/shapes.cxx
sal/inc/rtl/string.hxx
sdext/source/minimizer/pppoptimizertoken.cxx
svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
vcl/source/glyphs/gcach_ftyp.cxx
writerfilter/source/resourcemodel/TagLogger.cxx
xmloff/source/draw/EnhancedCustomShapeToken.cxx
Change-Id: Ib742744077bfb4d38a462d88b44bdef45601b4ae
|
|
Change-Id: I7c0c9158eb17cb79ffceae6770b4c513d57b3817
Reviewed-on: https://gerrit.libreoffice.org/3831
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
|
|
Instead include generated headers directly from workdir.
Change-Id: I9d2bcc07175d2bbc16d3cc548c2245e7a4fb0c65
|
|
|
|
Do we need to install them? Or even have them in the sources, FWIW? The
old XML format has been superceded by ODF 10 years ago...
Change-Id: I909afcf86ae808441c7dbc6182512bedb9789c1c
|
|
Change-Id: I0a716b4339747f1994e5c8710e15474807aea4a2
|
|
Change-Id: I6886f5ed011871a1c2718c9e1fadc9d0cb053098
|
|
Change-Id: I0baf90cfe8d3caa96f826695c1be4bc563864c00
|
|
Change-Id: I53a83a3f2234dc061c23344116b0e294594f1c90
|
|
This problem arises when there is a connector attached to draw:frame
element with multiple draw:image elements in it. The import code expects
that they are different representations of the same image (I have not
found if this is specified in ODF), so it only selects the most
"suitable" for import. To do that, it imports them all and then removes
all but the selected one. The image import context,
SdXMLGraphicObjectShapeContext, shares the parent frame's attributes,
which means that all the images in a frame have got the same ID. in
SdXMLGraphicObjectShapeContext::AddShape, the created css::draw::XShape
is registered with its ID... That means that anything that refers to the
frame's ID, like a draw:connector, will always get the _first_ image in
the frame.
Solution is to extend comphelper::UnoInterfaceToUniqueIdentifierMapper
to allow reserving an identifier and setting an interface for it later.
That way, SdXMLFrameShapeContext can reserve its own ID before it starts
importing the first draw:image, and then set the selected XShape at the
end.
Change-Id: I2e11cfd38e1e3534df2b3c01d85da0d755a266c3
|
|
Change-Id: Ieb48dfe85ed16a8123917b30873f301d523ea381
|