summaryrefslogtreecommitdiff
path: root/xmloff
AgeCommit message (Collapse)AuthorFilesLines
2013-08-20Resolves: fdo#67665 font names filtered out on odp/odg exportCaolán McNamara1-18/+41
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>
2013-08-20fdo#43807: Fix import of drop caps character styleZolnai Tamás1-1/+1
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>
2013-08-04fdo#67235 adapt form control code to time nanosecond API changeLionel Elie Mamane2-25/+32
squash of steps 1, 2 and 3 in master Change-Id: If68ecf0691919d71d06d7b97d46db115013f9805 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-07-28surely this is a typoLionel Elie Mamane1-2/+2
Change-Id: Ic7a6b330094c597aaed09377cde55c2e7be1b08f Reviewed-on: https://gerrit.libreoffice.org/5152 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-07-15i#108348 API CHANGE: add IsUTC to css.util.DateTime etc.Michael Stahl1-1/+1
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
2013-07-10fix reading fonts from .odp using style::font-name (fdo#65338)Luboš Luňák4-44/+13
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>
2013-07-02transpose "data in rows" ranges for internal data provider, fdo#62057Markus Mohrhard3-6/+36
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>
2013-06-28fdo#66171 ListBox correctly save empty or zero BoundColumnLionel Elie Mamane3-6/+12
Change-Id: I05fa923f962191081ea3318837d3e181c183b466 Reviewed-on: https://gerrit.libreoffice.org/4589 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-24Resolves: rhbz#976304 gallery elements may not support document.SettingsCaolán McNamara1-8/+9
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>
2013-06-15use proper offset for additional locale data formats, fdo#64947 relatedEike Rathke1-1/+1
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)
2013-05-23prevent invalid files if file contains currency formatsMarkus Mohrhard1-1/+5
A regression from writing error cell information into the file. Change-Id: Idb55646094fcd76912bdcd2102370681bcc8703d
2013-05-18set some bug id prefixes to indicate which tracker they are fromCaolán McNamara2-2/+2
Change-Id: I5df2dd44a0612da893b1afe08d0c7a9ea71f3905
2013-05-18i121972 Use svg rx/ry/cx/cy defines in draw:ellipse when used(cherry picked ↵Armin Le Grand1-0/+9
from commit 19abb8de7e218ba08b2fa79c0379844303da328a)
2013-05-18#121090# corrceted point reduction on svg:d export to only happen when ↵Armin Le Grand1-1/+3
polygon is closed(cherry picked from commit 6e114c242bb21950fd8ea01885c2269744d0fc6f)
2013-05-18i121965 Take draw:transform into account for draw:connector shapesArmin Le Grand1-1/+29
(cherry picked from commit 7b3f5521bd3c400cd9e08b745176b4ce40885011) Conflicts: xmloff/source/draw/ximpshap.cxx Change-Id: I973627f85ce6463c863863d6c180cb4c2cab86d0
2013-05-15sw: change pool default of RES_FOLLOW_TEXT_FLOW to "false"Michael Stahl1-6/+4
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
2013-05-15i#119922: reverse engineer 9a37613b5e8f08fae585d54a5745e887eb08f8ceMichael Stahl1-0/+10
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
2013-05-15factor out SvXMLImport::IsOOoXML()Michael Stahl1-5/+28
Change-Id: I9ccfe565bde1112f9f3cb8c666e901bf121862dc
2013-05-15Fix build.Thorsten Behrens1-8/+0
Change-Id: I5b2de61407924cdde5d74a7ea639365a876de74e
2013-05-15Fix fdo#64512 Handle xml:id correctly on multi-image draw:framesThorsten Behrens2-64/+37
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
2013-05-15Remove redundant doxygen doc strings.Thorsten Behrens1-16/+0
This is already (identically) documented in the header file. Change-Id: I4a10cb0c1d1b1eee80fd828ab95829fb8128433f
2013-05-15Use upper camel case for class names in xmloff.Thorsten Behrens5-8/+8
Align multiimagehelper with module standard. Change-Id: I70a4dbc66a0d127b9bf04d1e8db694d3526b21d7
2013-05-15Spelling "separate" (etc) correctly is hardTor Lillqvist3-6/+6
2013-05-15fdo#46808, Convert chart2::RegressionEquation service to new styleNoel Grandin1-36/+28
The service already existed, it just needed an IDL file Change-Id: I56b7079b098a7615dfb24598d15fe7d57691f317
2013-05-15fdo#46808, Convert some XMultiServiceFactory to XComponentContextNoel Grandin3-22/+20
Change-Id: I2e3480bf4f616231ee50a83f440d9bb0955e4ce6
2013-05-14typo fix: s/inavlid/invalid/Andras Timar1-1/+1
Change-Id: If75cad038f35033be6dcad6f051673bd795accf3
2013-05-14fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERTRadu Ioan7-88/+76
- 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>
2013-05-10Resolves: #i122208# introduce rtl::CStringHash and rtl::CStringEqualHerbert Dürr1-15/+1
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
2013-05-09Update pchAurimas Fišeras1-0/+1
Change-Id: I7c0c9158eb17cb79ffceae6770b4c513d57b3817 Reviewed-on: https://gerrit.libreoffice.org/3831 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-05-07officecfg: remove Package_cppheaderMichael Stahl1-0/+4
Instead include generated headers directly from workdir. Change-Id: I9d2bcc07175d2bbc16d3cc548c2245e7a4fb0c65
2013-05-06fix typos (wich instead of which)Philipp Riemer1-1/+1
2013-05-04install openoffice 1.0 DTD files using filelistDavid Tardon1-17/+20
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
2013-05-03fdo#48056 treat report chart as draw chartLionel Elie Mamane1-1/+2
Change-Id: I0a716b4339747f1994e5c8710e15474807aea4a2
2013-05-03janitorial: indentationLionel Elie Mamane1-1/+1
Change-Id: I6886f5ed011871a1c2718c9e1fadc9d0cb053098
2013-05-03add a warningDavid Tardon1-0/+8
Change-Id: I0baf90cfe8d3caa96f826695c1be4bc563864c00
2013-05-03fdo#60075 need to return context when availableDavid Tardon1-0/+4
Change-Id: I53a83a3f2234dc061c23344116b0e294594f1c90
2013-05-03fdo#60075 open drawings with connector attached to SVGDavid Tardon3-7/+77
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
2013-05-03the var. must be persistent over multiple callsDavid Tardon2-3/+4
Change-Id: Ieb48dfe85ed16a8123917b30873f301d523ea381
2013-05-02ditch explicit char arrays for string literalsLuboš Luňák2-123/+49
Change-Id: I77a4f6d338751c00942f091f4267e5f7d1d1742f
2013-04-30Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks4-100/+16
2013-04-30Fix fdo#64062 - can't assume para styles to be there.Thorsten Behrens1-1/+1
Change-Id: I5da53ff44fdf00ec6c0fdf1a722f806971b6683a
2013-04-26some more namespace cleanupThomas Arnhold2-33/+28
Change-Id: Ib1e80d717f199db8f8ac4181d4377a86d88e3244
2013-04-25add error to office:value-type for calc cells and fdo#51810Markus Mohrhard1-13/+14
For cached value import we need the information which cells are error cells. For ODF 1.2 extended we therefore export now calcext:office-value with the additional value "error". Change-Id: I9bc988ea4924bea767ba5e504b77f6a16e51a82e
2013-04-25update pchThomas Arnhold1-1/+1
Change-Id: I67e73438312f2a672e71762ee6707ec5d425bb47
2013-04-25comments and code reformatMaxime de Roucy5-10/+33
Change-Id: Ib4e45cb85c9e5e5ffa6476c939300c6795412b1a Reviewed-on: https://gerrit.libreoffice.org/3582 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-04-24x error bars are also defined in ODF 1.2Markus Mohrhard1-1/+1
I suppose they were deactivated in ODF 1.2 because of the invalid ODF files produced by the old code Change-Id: I42624a3e0f57405b38110bef86a0aa533f491c6c
2013-04-24fix a problem with error bar weightMarkus Mohrhard1-1/+1
Change-Id: I812bbcdc346bffd2f0c968077a3fe86a241cf231
2013-04-24gbuild: drop uses of removed packagesDavid Tardon1-2/+0
Change-Id: I400fad08c0ae7b6b34bad63693f54856867e4dac Reviewed-on: https://gerrit.libreoffice.org/3502 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-04-23execute move of global headersBjoern Michaelsen102-15602/+0
see https://gerrit.libreoffice.org/#/c/3367/ and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a
2013-04-23fdo#46808, convert form::Forms to new styleNoel Grandin2-2/+1
Change-Id: I966ed18d45dc8a04c97a703d3c83382714025f2c
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 15:19:05 +0000