summaryrefslogtreecommitdiff
path: root/xmloff/source
AgeCommit message (Collapse)AuthorFilesLines
2013-09-19Resolves: fdo#34987 skip autoheight reset if it will be set to the same valueCaolán McNamara1-2/+43
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> (cherry picked from commit 0964a73d03bf9f5b9f485ff39f97c7e7b54339b3) Reviewed-on: https://gerrit.libreoffice.org/5939 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-09-03fdo#68839: ODF import: fix name of multi-image frameMichael Stahl3-6/+33
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) (cherry picked from commit b69d152cfa1da868ba960345d72ba78f9f8e1b35) Conflicts: xmloff/source/core/xmlmultiimagehelper.cxx xmloff/source/draw/ximpshap.cxx xmloff/source/text/XMLTextFrameContext.cxx Change-Id: I28a8a752f3eed176cc2ebb4c9af11a0dd4d18ea6 Reviewed-on: https://gerrit.libreoffice.org/5781 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-08-23Work around -Werror=unused-local-typedefs from comphelper/stl_types.hxxStephan Bergmann1-3/+2
Change-Id: Id9f588e551b40a64bc86cae7c6d50f99659f94ab (cherry picked from commit 3912e47044f753f82c63ac11e803be5fb756c14f)
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/5487 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-07-19fdo#60075 open drawings with connector attached to SVGDavid Tardon3-7/+81
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. (cherry picked from commit 30b248dfe5bfb8a0649e36f22c943b3feb2f1385) Signed-off-by: David Tardon <dtardon@redhat.com> Conflicts: include/xmloff/unointerfacetouniqueidentifiermapper.hxx include/xmloff/xmlmultiimagehelper.hxx xmloff/source/draw/ximpshap.cxx Change-Id: I2e11cfd38e1e3534df2b3c01d85da0d755a266c3 Reviewed-on: https://gerrit.libreoffice.org/4982 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-28fdo#66171 ListBox correctly save empty or zero BoundColumnLionel Elie Mamane3-6/+12
Change-Id: I05fa923f962191081ea3318837d3e181c183b466 Reviewed-on: https://gerrit.libreoffice.org/4590 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-05-06fdo#48056 treat report chart as draw chartLionel Elie Mamane1-1/+2
Change-Id: I0a716b4339747f1994e5c8710e15474807aea4a2 Reviewed-on: https://gerrit.libreoffice.org/3767 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-30Fix fdo#64062 - can't assume para styles to be there.Thorsten Behrens1-1/+1
Change-Id: I5da53ff44fdf00ec6c0fdf1a722f806971b6683a Reviewed-on: https://gerrit.libreoffice.org/3694 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2013-04-10fdo#39066: using UNO_QUERY instead of UNO_QUERY_THROW displays hyperlinksChr. Rossmanith1-1/+1
Change-Id: Iafa9e273c009fe0772a9401b47b51738dc235a13 Reviewed-on: https://gerrit.libreoffice.org/3296 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7bcba4c910fa7eecf256a05a1f274f7b253e5fc5) Reviewed-on: https://gerrit.libreoffice.org/3303 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-04-05export darken/darkeless/lighten/lightenless commandsRadek Doulik2-0/+52
Change-Id: I4531ab82a52e3da41f12409185f7c0730381aa23
2013-04-05export subpath sizes (these are for example in pptx custom shape presets)Radek Doulik4-0/+61
Change-Id: Iab21d0845d0cb6e4dadeffb5f7b9ebab1e4b955a
2013-03-20fdo#60769 implement odf export of multi-paragraph comment rangesMiklos Vajna1-8/+12
(cherry picked from commits 287c254d5ebf9b58ca63a8c271e523adf0d34b82 and 1fba17854b2be4fdbe436f44da3ae57a1f75a27c) Conflicts: sw/qa/extras/odfexport/odfexport.cxx Change-Id: Ifb850438586eb6589fde79d10ed9eef727368f42 Reviewed-on: https://gerrit.libreoffice.org/2873 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com>
2013-03-19we need to register data sequences during import, fdo#52159Markus Mohrhard3-9/+17
Change-Id: I203be719a6ee19c87ed232218f7700d875c2871f (cherry picked from commit 094bab7f9097fba62800d3dd578bd42640d8c6e2) Reviewed-on: https://gerrit.libreoffice.org/2821 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-19use the right range representation, fdo#52159Markus Mohrhard1-2/+2
Change-Id: I36ede89ccb8836708a4f87c4815bbe2fb6d6f3cf (cherry picked from commit a6d12acda9bb24f2acca45e0bd1aea577e49fbbf) Reviewed-on: https://gerrit.libreoffice.org/2818 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-18fdo#61256 - the Get.*Export methods also create and register stylesMichael Meeks2-0/+4
unwind problem introduced by cleanup in: fd226710fef768543a3ad0fe5081f79dc875dcf3 Change-Id: Id5f7b20087cbbdeffe1a2e64e039ee0a11995faa Reviewed-on: https://gerrit.libreoffice.org/2814 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-03-06another fix for error bar import, related fdo#60083Markus Mohrhard1-0/+7
Change-Id: I843a597702cb0cb66d8696c277666e1605091c09 Reviewed-on: https://gerrit.libreoffice.org/2560 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-03-06and one more fix for error bar import, related fdo#60083Markus Mohrhard1-0/+8
Change-Id: I76ff4849137aaad175b3c95dce6644d612871201 Reviewed-on: https://gerrit.libreoffice.org/2559 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-02-27one more fix for error bar import, fdo#60083Markus Mohrhard1-5/+17
This makes it finally possible to import the original test document. Change-Id: I5941f2ce303a28674dcf04aeabbbbc2d178c0913 Reviewed-on: https://gerrit.libreoffice.org/2434 Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
2013-02-26get error bar import working again, fdo#60083Markus Mohrhard1-53/+88
Change-Id: I8022fbfc8d372c9863d236253a2a63364198bfc8 Reviewed-on: https://gerrit.libreoffice.org/2415 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-02-26fdo#52948 fix print-repeated-values=no with formatted valuesLionel Elie Mamane1-1/+1
Factorise the "should this element be printed" decision into an utility function, which is used by 1) AbstractReportElementLayoutController (in charge of non-formatted values: string, image, OLE object, ...) which already obeyed PrintRepeatedValues. 2) TableCellLayoutController (in charge of formatted values: dates, numbers, ...) which blissfully ignored PrintRepeatedValues, but obeyed the display condition. Rename the inconsistently named PrintWhenGroupChange PrintWhenGroupChanges print-only-when-group-change print-when-group-change to PrintWhenGroupChange / print-when-group-change Change the meaning of "PrintWhenGroupChange" to "override PrintRepeatedValues in first occurrence in group". Since this feature never worked under the old semantics, no loss of feature. Since we change the XML attribute name, no ascending compatibility problem: it will be reset to its default value. Pursuant to the new meaning of PrintWhenGroupChange, change its default to *true*, which is the sane default. Change-Id: Idbe8e90565a354f70db222d047b3d51eeddbbb9f Reviewed-on: https://gerrit.libreoffice.org/2255 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-02-08Resolves: fdo#60132 Error reading file after inserting commentCaolán McNamara1-0/+5
Change-Id: Ib2b388c78c8f44a626267c2f8d3975b46ead3bd5 (cherry picked from commit 165a53f3a7f08e65055e08ecd4cfc068c5d353b8) Reviewed-on: https://gerrit.libreoffice.org/2041 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-01-24fdo#58562: Ensure internal data is always used when pasting to another doc.Kohei Yoshida1-5/+25
Without this, pasting a chart object from one Calc doc to another may occasionally incorrectly switch to range references *if* the destination document contains the "right" set of sheet names. With this fix, pasted chart objects always switch to internal cached data source when pasting to another document, while retaining range references when pasting within the same document. Change-Id: If1dbc854c5faae62f06ece155fad470b229ca0c7 Reviewed-on: https://gerrit.libreoffice.org/1835 Tested-by: Noel Power <noel.power@suse.com> Reviewed-by: Noel Power <noel.power@suse.com>
2013-01-21xmloff: refactor Generator version handling:Michael Stahl3-30/+89
Since there are now 2 forks of OpenOffice.org, we cannot rely on a simple total ordering of versions any more; add a new function SvXMLImport::isGeneratorVersionOlderThan(), taking 2 reference versions. Also extract the LibreOffice version number from the generator string, and extend the BuildId property to store this as a third number. This also allows removal of the "fake LibreOffice3 as OpenOffice.org 3.3 release" hack, which is not future-proof. (cherry picked from commit bea63709d05514555d5283279cd66439f4ceed73) Conflicts: xmloff/source/core/xmlimp.cxx Change-Id: I44d8105eb537ac43fb9529a8b1b661ae0f2bba30 Reviewed-on: https://gerrit.libreoffice.org/1761 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Tested-by: Thorsten Behrens <tbehrens@suse.com>
2013-01-21fdo#59517: fix detection of ancient OOo ODF generator strings:Michael Stahl1-4/+5
SvXMLMetaDocumentContext::setBuildId: check only the prefix of the generator string, not all of it. (regression from 17ff7b41d15ab9928e2e2706faa26234a09802cd) Change-Id: I0cdd958d67cd13fd2368cc6958893ce3528a9e94 (cherry picked from commit 0669d78ea76ab9bfeff27ea02d785973f3720d6b) Reviewed-on: https://gerrit.libreoffice.org/1760 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
2013-01-18Resolves: fdo#58730 workaround [UL|LR]Space 100% problemCaolán McNamara2-1/+30
If all paragraph margins are 100% on import, ignore that as being the implicit default. That avoids explicit 100% being set onto the awesome [UL|LR]Space which takes a relative propsize of 100% as a flag that its value field is absolute and so rejected by SwTxtFmtColl::Modify as a candidate for getting its true value initialized relative to its parent, so it ends up as an absolute 0 Always elide the property on export because writing individual margin-foos provides better backward compatibility with older versions anyway. Trigged by 3c5facfce42a0dbe362d6b9fa5ac374fd76f51a1 Change-Id: I55f6ceeae287b7d8e99befa4bd3cc06738a21299 (cherry picked from commit 23c099a0236062724430efb986251637095c8d4f) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2013-01-03limit the number of imported digits, fdo#58539Markus Mohrhard1-1/+3
This should fix the crash with gnome#627420. Change-Id: Ibfff498282dc1c6fe9124ced645392107ef8829f
2012-12-26text:p is not allowed for chart objects, fdo#58571Markus Mohrhard1-2/+6
Change-Id: I24c485d31ea3f0540164ff65074b392be1e557e6
2012-12-13added some FIXME-BCP47 markersEike Rathke1-0/+6
Change-Id: I085ca72b6c2dc1e73f4af7233017895bf92b2ef8 (cherry picked from commit 34b7826f9814b09dcd6aba15552bef1c330f3db2)
2012-12-06OUStringBuffer::remove( int ) -> truncate( int )Luboš Luňák1-1/+1
Although this may seem consistent with remove( int, int ), it is in fact rather misleading API. The biggest offender is most probably buffer.remove( 'a' ) , which definitely does not do what it suggests to do. Change-Id: I287619cd4b953228b93fa68fb381d66c344c3865 Reviewed-on: https://gerrit.libreoffice.org/1256 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2012-12-03API CHANGE: roll back the XStyle changes to add a new Hidden property on StyleCédric Bosdonnat7-9/+38
Change-Id: If6d23925567fb184cd8fc4e00fc72fe4d216e756
2012-11-30Hidden styles: ODF import/exportCédric Bosdonnat8-5/+24
Change-Id: I1138314eba33dc8cf8d1f60e77ac419b4550bbcc
2012-11-28OUString::trim() does not modify in-placeTor Lillqvist1-2/+2
Change-Id: I68227dcf77b9082708503d2c0d9bf829d78a442e
2012-11-28OUString::trim() does not modify in-placeTor Lillqvist1-1/+1
Change-Id: I9efc0ef7e8fa433352dcbc3d3173b95fdf838e20
2012-11-27String and OUString cleaning in xmloffNorbert Thiebaud9-334/+320
Change-Id: I85d7fd7733814c60a048a7f87d43fbcbb83b0eb0
2012-11-27migrate user of InsertBlanks to OUStringNorbert Thiebaud1-3/+6
Change-Id: Idc7379daf25a226622e5599124df2ab68b98902a
2012-11-23some i18n wrappers with LanguageTagEike Rathke2-16/+16
Change-Id: I2ceaa3159e8669c2c569fa8559c1e061dcad399d
2012-11-18svl: OUString conversion of most of zforscanNorbert Thiebaud2-4/+4
Change-Id: I02ca7f7770e2d53371e7c597c087c4a370ce8d3f
2012-11-18xmloff: simplify the use of AddToCodeNorbert Thiebaud1-13/+23
most use of that API is to add a single sal_Unicode, it is silly to manufacture a full OUString just to pass that via AddToCode to then append it to a OUStringBuffer adding AddToCode(sal_Unicode c) to simplify these case also remove a silly iteration over a OUString's character to re-add each character one by one via AddToCode() Change-Id: Ia8a58551a1c24312baaa250b8d36fe21c46127e7
2012-11-18xmloff: convert lcl_FindSymbol to OUStringNorbert Thiebaud1-12/+21
Change-Id: I6d93cb64126d60c35fda58039989d57b18a44773
2012-11-18svl: convert GetQuoteEnd to OUStringNorbert Thiebaud1-2/+2
Change-Id: I79bd0aecb98b7b47ee892ed4ce1b53abcd09ff44
2012-11-16use LanguageTagEike Rathke2-13/+14
Change-Id: I568af42912ce1ec7701dc0043dfbd9d69243d533
2012-11-15WaE: 'const' type qualifier on return type has no effectTor Lillqvist1-2/+2
Change-Id: I06cc8b77e49ec2a22534e1f45d93dfa0d0a0689f
2012-11-15re-base on ALv2 code. Includes:Michael Meeks300-6936/+4310
Patches contributed by: Armin Le Grand. #118558# Correcting OLE attributes of LO3.4 at load time by loading as OOo3.3, details see task. http://svn.apache.org/viewvc?view=revision&revision=1195906 #118485# - Styles for OLEs are not saved. http://svn.apache.org/viewvc?view=revision&revision=1182166 #118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles http://svn.apache.org/viewvc?view=revision&revision=1293316 #119337# Solves the wrong get/setPropertyValue calls in SvxShapeText (and thus in SvxOle2Shape) http://svn.apache.org/viewvc?view=revision&revision=1344156 Patches contributed by Mathias Bauer (and others) gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 cws mba34issues01: #i117717#: remove wrong assertion http://svn.apache.org/viewvc?view=revision&revision=1172349 Patch contributed by Herbert Duerr goodbye Registration and License dialogs, don't let the door hit you http://svn.apache.org/viewvc?view=revision&revision=1172613 help gcc 4.6.0 on 32bit ubuntu 11.10" http://svn.apache.org/viewvc?view=revision&revision=1245357 Do not add targets for junit tests when junit is disabled. Patch contributed by Andre Fischer http://svn.apache.org/viewvc?view=revision&revision=1241508 Revert "sb140: #i117082# avoid unncessary static class data members commit 21d97438e2944861e26e4984195f959a0cce1e41. remove obsolete FreeBSD visibility special case. retain consolidated BSD bridge code, remove OS/2 pieces.
2012-11-15Revert "sb140: #i117310# remove unnecessary dependencyMichael Meeks2-33/+78
on XTypeProvider::getImplementationId" This reverts commit 27b9f9f348b720e08f37db829533372dc4b73248. Conflicts: xmloff/inc/xmloff/txtparae.hxx xmloff/source/style/SinglePropertySetInfoCache.cxx
2012-11-15masterfix OOO340: #i117696# do not write fo:marginKurt Zenker1-15/+1
Conflicts: xmloff/source/style/PageMasterExportPropMapper.cxx
2012-11-15fdo#46808, use service constructor for i18n::NumberFormatMapperNoel Grandin2-6/+6
Also create a utility constructor for LocaleDataWrapper, which simplifies many of the calling sites. Change-Id: Ic8510b51c4201fa17fc0620e18d3e258e43636ba
2012-11-13save fixed denominator for fractions fdo#56419Noel Power3-10/+32
Change-Id: I612ff2340b272661067cb6a54106e91443fec91e
2012-11-09s/aIter++/++aIter/jailletc361-1/+1
Change-Id: Id80013cbab8f1633db59d2d4492c7363224871bd Signed-off-by: jailletc36 <christophe.jaillet@wanadoo.fr> Reviewed-on: https://gerrit.libreoffice.org/1016 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2012-11-09Cut and paste typo ?jailletc361-1/+0
Corrected according to surrounding code. I don't know if or when this code is called. Change-Id: I4ed63439e47a89cc982d792c619c4c58335daf93 Signed-off-by: jailletc36 <christophe.jaillet@wanadoo.fr> Reviewed-on: https://gerrit.libreoffice.org/1009 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
2012-11-09Same, cut and paste typo ?jailletc361-1/+0
Change-Id: I34e1de922544e5e0f0ea0e03be5d238d600aa833 Signed-off-by: jailletc36 <christophe.jaillet@wanadoo.fr> Reviewed-on: https://gerrit.libreoffice.org/1010 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 05:50:08 +0000