summaryrefslogtreecommitdiff
path: root/svx
AgeCommit message (Collapse)Author
2014-10-18Resolves: fdo#62682 crash on second export of svgCaolán McNamara
because the first export has left "dangling" CalcFieldValueHdl Links in Outliners that got created based on the Drawing Outliner while it had a temporary CalcFieldValueHdl installed, and didn't get the old CalcFieldValueHdl installed when the old Drawing Outliner one was re-installed. Change-Id: I064a154ece488c9a4c3467b753451df7e73ae883
2014-10-08Fix thinko. Thanks to vmiklos for noticingTor Lillqvist
Change-Id: Id4e65908cc73978205bc0858a3a809b882864b62 (cherry picked from commit d61f8185e660a6820351b8cea3ac51d344f0ab3e)
2014-10-08Don't try to create cdefghij.klm inside the app bundle on OS X when sandboxedTor Lillqvist
Actually, we check HAVE_FEATURE_READONLY_INSTALLSET and not HAVE_FEATURE_MACOSX_SANDBOX, but in practice we set the former only for the latter case. We could do this test cross-platform but I didn't bother now. Nobody uses --enable-readonly-installset when building for Linux or Windows anyway, I think. (There must be more places where we could and should check HAVE_FEATURE_READONLY_INSTALLSET.) Change-Id: Ie54f436616a1db3119b0bc0148149784127b156d (cherry picked from commit 96d091d43428472c2c68054ed5dca22f79adc705)
2014-10-03Resolves: fdo#79131 crash in EnhancedCustomShapeTypeNames::GetCaolán McNamara
Change-Id: Ib21a4a1574119120f09d4ecac73b93a0f2f6739f (cherry picked from commit 65277f994ae25d930c15aebba0ed19f8de0abba1) Reviewed-on: https://gerrit.libreoffice.org/11704 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-09-23We need the gengal program at build timeTor Lillqvist
But don't bother shipping it on OS X, at least not in the sandboxed (App Store) case. Change-Id: Id73bef1ba71d126c2d2962fe846e9c31963d6c24
2014-09-20Skip some executables in the OS X sandboxed (Mac App Store) caseTor Lillqvist
I doubt end-users will miss gengal.bin, regview, or regmerge. Change-Id: I353610c0d039f25fa415f35902fe2b9890cd423f
2014-09-15Resolves: fdo#77516 sub-grid shouldn't be allowed as 0Caolán McNamara
regression from commit 3cb6587abbf6888ac9fb3b0cccc9a5aa0dc29b55 Author: Csikós Tamás <csks.tomi@gmail.com> Date: Sun Jul 7 13:40:53 2013 +0200 modern .ui widgetlayout for optgrid Change-Id: I9e998ce203c16c2303e00347ce6a2992c92cc8dc (cherry picked from commit 4bd317f845c2f3470c7fc354e478be08c2949e0c) Reviewed-on: https://gerrit.libreoffice.org/11165 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-09-15Resolves: fdo#83062 infinite recursionCaolán McNamara
regression from commit 7c03fc2fe77f9b1f910f4ab395923e52648c32b5 Date: Mon Sep 2 14:30:09 2013 +0000 Related: #i123048# Corrected connector layout after reload verified that #i123048# continues to work (cherry picked from commit 8d8e8942b2ee2a2e85c65d71628057316c9f5897) Conflicts: svx/source/svdraw/svdoedge.cxx Change-Id: If5fce4b7a88d4d0972f52705334e4b9b48425cca Reviewed-on: https://gerrit.libreoffice.org/11150 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-09-15bnc#770711: Make changing table text color in impress always workMatúš Kukan
We set text color for individual characters (in ContentNode::aCharAttribList) and for whole paragraph (in ContentNode::aContentAttribs) too. Problem: when table was loaded in an impress document with font color set, you could not change it by selecting a cell because only ContentNode::aContentAttribs was set, which has lower priority. So, in that case, remove font color character attributes. Change-Id: Ieb0c078481568dcb1739fe35d448c9591f687f2c (cherry picked from commit a217f3cb2dce71a4322f78ceb45edb6f171b2b65) Reviewed-on: https://gerrit.libreoffice.org/11123 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-08-21rhbz#1121254 reload font list from shell on changeDavid Tardon
Change-Id: Ief88373c210b3b6f65c1df5b31870aca561095bb (cherry picked from commit 0497864bd4f603605997938d504ef9598623e713) Reviewed-on: https://gerrit.libreoffice.org/10546 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-14Related cp#1000084: Make this work for other apps too and set proper defaultMatúš Kukan
Extend d98c817cc71e62a2beecc7142062f9ef33a7149b and fix default. (cherry picked from commit 37c3cf70c724b7402588d1d32d3aa76a965ee41b) Conflicts: sc/source/ui/drawfunc/fusel.cxx sd/source/ui/func/fusel.cxx Change-Id: I79ad35bd5ad6fbd6e7d260864d4bf40fafb6b604
2014-07-14Allow to move only callout handle with shift key (cp#1000084)Matúš Kukan
When line callout was used, you couldn't move the point next to the rectangle. Now it's possible with shift key pressed. (cherry picked from commit d98c817cc71e62a2beecc7142062f9ef33a7149b) Conflicts: include/svx/svddrgmt.hxx sw/source/core/frmedt/feshview.cxx sw/source/uibase/wrtsh/select.cxx Change-Id: I70565e4e3f80daf0e1007031ef7d49036fb0e26b
2014-07-11bnc#883684: Better fix for this.Kohei Yoshida
Instead of making all chart objects exempt from unloading, check each OLE object on whether or not it already has its persistent storage created. If not, don't unload it else it would have nothing to load back from once unloaded. (cherry picked from commit a0bd5587a5ac62974bdb10731d3fd21584521a72) Conflicts: svx/source/svdraw/svdetc.cxx embeddedobj/source/commonembedding/miscobj.cxx embeddedobj/source/commonembedding/persistence.cxx include/svx/svdoole2.hxx svx/source/svdraw/svdoole2.cxx Change-Id: I2312e86c9376d3699ef4aa1e0cf2f4c04f706c1e
2014-07-09bnc#883684: Make chart objects exempt from automatic unloading.Kohei Yoshida
The Memory option page contains "Number of objects" setting which controls how many OLE objects can be loaded at any given time. When the number of total OLE objects exceeds this number the oldest ones get unloaded. Note that the total number is across all open documents, not per document. Technically, chart objects are OLE objects, but unlike other OLE objects that are embedded Calc, Writer, Draw documents, chart objects normally "belong" to the host document. It therefore makes no sense to subject chart objects to this automatic unloading. In the future we may want to apply this exemption to other types of OLE objects, like formula objects for example.. Or maybe this setting can be removed altogether... (cherry picked from commit b023565d4f064cd0312e8c1fcc23a9f552112935) Conflicts: include/svx/svdoole2.hxx svx/source/svdraw/svdetc.cxx svx/source/svdraw/svdoole2.cxx Change-Id: I7dd92550880efb4db8fc843cf1c915c712166da4
2014-07-04Resolves: fdo#42747 limits need to multiplied by num of decimal placesCaolán McNamara
NumericFormatter limits need to multiplied by num of decimal places because the arg is a long so to retain decimal places its got to be raised up by the num of places Change-Id: Idbc49a9b1dde5fe176e5170d3be605a998050da5 (cherry picked from commit 63885c86f866411f01f1b6fceaa07f054a5a3550) Reviewed-on: https://gerrit.libreoffice.org/10015 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-07-02the chart root shape has to be at the bottom, fdo#74333, cp#1000057Markus Mohrhard
Change-Id: Ic99fec987f290e94e4b45f4d193406daa2de4740
2014-06-29fixes for up-casting to Reference<XInterface>Noel Grandin
Fix regressions introduced with 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 "Use the new type-checking Reference constructor to reduce code noise" Signed-off-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 533c6cb6bad6ef0432e8eebbfd4daf90ef71f3b4) Conflicts: framework/source/uifactory/menubarfactory.cxx Change-Id: I85662856f21c810a7db497fe3b0e116f075b1687 Reviewed-on: https://gerrit.libreoffice.org/9921 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-26fdo#37401 - fixed the old vector lengthHideki Ikeda
The center-left point in the area is used to calculate the old vector length but the coordinate was incorrect. Change-Id: I81a88182d11e30ee7a5caee3eac879b082bff160 Reviewed-on: https://gerrit.libreoffice.org/9887 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 03675ab4a8994cb7000fd738d1685720c8b9e584) Related: fdo#37401 adjust fix to original aCenter use i.e. as far as I can see the bug came about during.... commit 74cb1c4cb5f72fd8cf80c6d144eda00841394647 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Tue Nov 14 12:37:46 2006 +0000 with 2006/10/27 12:14:08 aw 1.2.1208.5: #i39528# ::basegfx -> basegfx adaption in - Vector2D aFullVec(aStartPos - aEndPos); - Vector2D aOldVec(Vector2D(aRect.Left(), aCenter.Y()) - aRect.TopLeft()); ^^^^^^^^^^^ - double fFullLen = aFullVec.GetLength(); - double fOldLen = aOldVec.GetLength(); - double fNewBorder = (fFullLen * 100.0) / fOldLen; - sal_Int32 nNewBorder = 100 - (sal_Int32)(fNewBorder + 0.5); + basegfx::B2DVector aFullVec(aStartPos - aEndPos); + const basegfx::B2DPoint aTopLeft(aRange.getMinX(), aRange.getMinY()); + const basegfx::B2DPoint aCenterLeft(aRange.getMinX(), aRange.getHeight()); ^^^^^^^^^^^^^^^^^^ + const basegfx::B2DVector aOldVec(aCenterLeft - aTopLeft); + const double fFullLen(aFullVec.getLength()); + const double fOldLen(aOldVec.getLength()); + const double fNewBorder((fFullLen * 100.0) / fOldLen); + sal_Int32 nNewBorder(100L - FRound(fNewBorder)); Change-Id: I840caa5e49a04f9b6460c4fa8e3731f3e5ebde05 (cherry picked from commit ef16d765306c932c49254f295f57e5853129c1ea) (cherry picked from commit 383135d77867d0f2c05b4c807eb17b099604eaa1)
2014-06-25Resolves: fdo#80327 Sound list box when non-English UIJulien Nabet
Fallback strings are in English wheresas ImplGetThemeEntry expects localized strings Let's put localized strings in fallback to make ImplGetThemeEntry happy Change-Id: I27dd992bac4f5aaf6e0e6237fe59dac990f11c92 Reviewed-on: https://gerrit.libreoffice.org/9846 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-25fdo#75339: Substituting XInterface* eq. for object eq. requires queryInterfaceStephan Bergmann
Regression introduced with 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 "Use the new type-checking Reference constructor to reduce code noise" which should have left (at least some) "querying upcasts" to XInterface alone. Closer inspection of that commit will probably turn up further regressions that need to be reverted. Change-Id: Ib81afc12d9df205b5b0fe6cec6ce85d012e9629f (cherry picked from commit f8115ce72dad45b82b044d9c8f5c253d0514574d) Reviewed-on: https://gerrit.libreoffice.org/9875 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-25Related bnc#822625: Minimum height was not invalidated when rectangle changes.Matúš Kukan
5792e76cb5beb630c135f57b74f57d74dd2dc2b0 was too optimistic and did not invalidate mnCachedMinHeight often enough. This was resulting in a grey area below table frame when resizing it. So, revert 5792e76cb5beb630c135f57b74f57d74dd2dc2b0 "Related bnc#822625: Cache minimum height for table cells." and istead just use getMinimumWidth() in TableLayouter if that's all we need. getMinimumHeight() is expensive. Change-Id: I34c49dda75d6ccccaa5b4d3746114352621a40dd (cherry picked from commit b8f7ea5da41d61d405adec54dcd10b54ee0e5591) Reviewed-on: https://gerrit.libreoffice.org/9871 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-19fdo#71076, fdo#71767: Preserve number formats when charts are copied.Kohei Yoshida
(cherry picked from commit 1d38cb365543924f9c50014e6b2227e77de1d0c9) Conflicts: xmloff/source/chart/SchXMLExport.cxx sd/source/ui/view/sdview3.cxx chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx chart2/source/controller/main/ChartTransferable.cxx chart2/source/controller/main/ChartTransferable.hxx chart2/source/model/main/Axis.cxx chart2/source/model/template/ChartTypeTemplate.cxx chart2/source/tools/AxisHelper.cxx chart2/source/view/main/ChartView.cxx comphelper/source/container/embeddedobjectcontainer.cxx dbaccess/source/ui/browser/dbexchange.cxx dbaccess/source/ui/inc/JoinExchange.hxx dbaccess/source/ui/inc/TableRowExchange.hxx dbaccess/source/ui/inc/dbexchange.hxx dbaccess/source/ui/querydesign/JoinExchange.cxx dbaccess/source/ui/tabledesign/TableRowExchange.cxx embeddedobj/source/commonembedding/persistence.cxx embeddedobj/source/inc/commonembobj.hxx include/comphelper/embeddedobjectcontainer.hxx include/svtools/embedtransfer.hxx include/svtools/stringtransfer.hxx include/svtools/transfer.hxx include/svx/dbaexchange.hxx include/svx/dbaobjectex.hxx include/svx/fmview.hxx include/svx/galmisc.hxx include/svx/svdobj.hxx include/svx/svdoole2.hxx include/svx/svdxcgv.hxx include/svx/view3d.hxx include/svx/xmlexchg.hxx include/xmloff/xmlexp.hxx reportdesign/source/ui/dlg/GroupExchange.cxx reportdesign/source/ui/dlg/GroupExchange.hxx reportdesign/source/ui/inc/dlgedclip.hxx reportdesign/source/ui/report/dlgedclip.cxx sc/inc/column.hxx sc/source/ui/app/drwtrans.cxx sc/source/ui/app/lnktrans.cxx sc/source/ui/app/seltrans.cxx sc/source/ui/app/transobj.cxx sc/source/ui/inc/drwtrans.hxx sc/source/ui/inc/lnktrans.hxx sc/source/ui/inc/seltrans.hxx sc/source/ui/inc/transobj.hxx sc/source/ui/inc/viewfunc.hxx sc/source/ui/view/viewfun5.cxx sc/source/ui/view/viewfun7.cxx sd/source/ui/app/sdxfer.cxx sd/source/ui/dlg/sdtreelb.cxx sd/source/ui/inc/TabControl.hxx sd/source/ui/inc/View.hxx sd/source/ui/inc/sdtreelb.hxx sd/source/ui/inc/sdxfer.hxx sd/source/ui/view/sdview2.cxx sd/source/ui/view/tabcontr.cxx sfx2/source/doc/objxtor.cxx svtools/source/misc/embedtransfer.cxx svtools/source/misc/stringtransfer.cxx svtools/source/misc/transfer.cxx svtools/source/misc/transfer2.cxx svx/source/engine3d/view3d.cxx svx/source/fmcomp/dbaexchange.cxx svx/source/fmcomp/dbaobjectex.cxx svx/source/fmcomp/xmlexchg.cxx svx/source/form/fmexch.cxx svx/source/form/fmview.cxx svx/source/gallery2/galmisc.cxx svx/source/inc/fmexch.hxx svx/source/svdraw/svdoole2.cxx svx/source/svdraw/svdxcgv.cxx svx/source/tbxctrls/colrctrl.cxx sw/source/core/uibase/dochdl/swdtflvr.cxx sw/source/core/uibase/inc/swdtflvr.hxx sw/source/core/undo/unins.cxx Change-Id: If5ae8852152012483237e7602e56a0c46ea8748a
2014-06-18bnc#882627: Allow to edit spacing to contents even with no borders visible.Matúš Kukan
SfxItemSet::MergeValue changes some items from SFX_ITEM_DEFAULT state to SFX_ITEM_SET which I think is a bug but this patch avoids the problem too. The issue was: visible changes in some tables, after changing e.g. borders spacing, because the cells had wrong SfxItemSet after the process. (cherry picked from commit b1d8df61b47e84bf0de64342556049673dd9c543) Signed-off-by: Andras Timar <andras.timar@collabora.com> Conflicts: cui/source/dialogs/sdrcelldlg.cxx cui/source/inc/border.hxx cui/source/inc/sdrcelldlg.hxx cui/source/tabpages/border.cxx svx/source/table/tablecontroller.cxx Change-Id: I676b211e1a4a1d7341c385d63503aa740718ed5d
2014-06-18fdo#79883 the page view object contact must existDavid Tardon
Change-Id: I5c6bd3ea267f1ea84b46e46aa508a27d00903347 (cherry picked from commit 551c915dcbf3e1d6bfd799c6e13e5700e2c3e535) Reviewed-on: https://gerrit.libreoffice.org/9747 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-10Resolves: fdo#78404 #i123468# Added SdrEndTextEdit before replacing...Armin Le Grand
EmptyPresObj, also secured ReplaceObjectAtView to check for active TextEdit, assert this and make an emergency correction (cherry picked from commit 623cd778689bd0851652b2db00b24c308dfb657a) Conflicts: svx/source/svdraw/svdedtv.cxx (cherry picked from commit 3b729ab35b5064dcd21f125dfd0aa7d7e709fd9f) Change-Id: I0e9ae1b1cd84e04c37c4de38aca7752804782384 Reviewed-on: https://gerrit.libreoffice.org/9482 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2014-06-10Resolves: rhbz#1104068 crash converting fontwork to curveCaolán McNamara
via metafile, i.e. take fontwork example 11, convert to metafile and convert that to curve was coverity#1019335 Dereference after null check (cherry picked from commit d77cc9d2cdc702f2b2016498df107f4120d27690) Change-Id: I309e0c3f8a0630991e2aad64f995567e0920be3b Reviewed-on: https://gerrit.libreoffice.org/9649 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-06-10avoid problems with poppler's and vcl's FontInfo during runtimeMarkus Mohrhard
Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8 Conflicts: include/vcl/metric.hxx svtools/source/control/ctrlbox.cxx svtools/source/control/ctrltool.cxx svtools/source/control/stdmenu.cxx svx/source/sidebar/nbdtmg.cxx Conflicts: include/svtools/ctrltool.hxx include/vcl/metric.hxx include/vcl/outdev.hxx svtools/source/control/ctrlbox.cxx svtools/source/control/ctrltool.cxx svtools/source/control/stdmenu.cxx svx/source/sidebar/nbdtmg.cxx sw/source/core/uibase/docvw/srcedtw.cxx vcl/source/gdi/metric.cxx vcl/source/outdev/font.cxx
2014-06-10removed pCaptionObj from accessibilityArmin Le Grand
it was not initialized but accessed in one place. Checked with symphony code, there was a set method which is not in AOO trunk, thus solved accesses to zero pointer usage (cherry picked from commit bd0c3b940f6006d3cb49381230795db667aeb943) Conflicts: svx/inc/svx/svdobj.hxx svx/source/svdraw/svdobj.cxx Change-Id: Ic8dec5c6def35753d757066c7ea02e1a92b46f6c
2014-06-10fdo#39944: Add DOCUMENT_* accessibility UNO rolesJacobo Aragunde Pérez
Added a set of UNO accessibility roles for specific kinds of documents: * DOCUMENT_PRESENTATION for Impress * DOCUMENT_SPREADSHEET for Calc * DOCUMENT_TEXT for Writer The other applications still use the existing DOCUMENT role. These roles translates directly to ATK but in the other toolkits we keep using the same association that DOCUMENT role had. Change-Id: Ibac47527e5effdecb28d2314cde8558cf4fb010a Reviewed-on: https://gerrit.libreoffice.org/7847 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2014-06-10restore SdrMarkView::HasMarkableObj, etc.Caolán McNamara
Change-Id: Ib5c0d5028792708bc0ac0e756aa47d486443bbb7
2014-06-10we will need getColorConfig, etc. againCaolán McNamara
Change-Id: Ie7f8d37b550c788fd6235a5de4bbcc51ac6f8150
2014-06-10C2872: 'accessibility' : ambiguous symbolCaolán McNamara
Change-Id: I9a7f5a768346539f14c1fc84d1c60e99107e3899
2014-06-10error C2872: 'accessibility' : ambiguous symbolCaolán McNamara
Change-Id: Ibff922712e25a846bab1628e87d0d322d1ff0a33 Reviewed-on: https://gerrit.libreoffice.org/6836 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-10restore GetChild, etc. we will need them againCaolán McNamara
Change-Id: Ic6da34e58975d85c84ded96fa90873558589f54a
2014-06-10Integrate branch of IAccessible2Steve Yin
Change-Id: I8327fb4ba2a86d4caa52b875221175b80464842a
2014-06-10Integrate branch of IAccessible2Steve Yin
WaE: Reorder initializations to prevent compiler warnings. (cherry picked from commit c05431aa92fa2c7c7258418a6ecd651b5c26d982) WaE: unname unused variable to prevent compiler warnings. (cherry picked from commit 2259256a390c4b6f83cfb5dbe4a65df5032aee47) Conflicts: editeng/source/accessibility/AccessibleEditableTextPara.cxx ad61537527a74670af266feb9e4d26d2d654daf7 66044902b8d94fc15d4c30270e6cc419fb7d3565 Change-Id: I3ec9798f2c7d854824722c0cf44b62128b4f4cb4
2014-06-02fix bad cast in SvxStyleBox_Impl::StateChanged()Michael Stahl
This causes various JunitTest crashes on Windows, regression from 887bc4dd3e62fe6dd19dc9d1c3ba273a5b21b5ec. Change-Id: Iab24e0d39375ac1e5ac63d32470dca1e54d518c5 Reviewed-on: https://gerrit.libreoffice.org/9621 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2014-06-02various situations where graphic go missing on saveOliver-Rainer Wittmann
Resolves: #i114361# provide and accept changed URL... of embedded graphic file during save (ODF export) (cherry picked from commit a90c007908eb3f66e28a9ea525729065db652b6f) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx sw/source/core/unocore/unoframe.cxx sw/source/filter/xml/xmltexte.cxx xmloff/source/draw/shapeexport2.cxx (cherry picked from commit 192abfb36b8a4859879fcb49326d59ed62083c8d) Conflicts: sw/inc/ndgrf.hxx Change-Id: I9d4a02af2561467fe1a66f036b55d6dcf2429986 Resolves: #i124946# only apply new embedded stream name... for a graphic, if is already has one. - needed correction for the fix made for issue #i114361# (cherry picked from commit 23a4bd91ceb89e5e0a2413f80fc987db106a0bc9) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx sw/source/filter/xml/xmltexte.cxx (cherry picked from commit 05e07167e422caf58d23ff883edda30acc3ba88d) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx Change-Id: Ia9771932ae5b380ccae9b0a3cbb79d41f5d9bdb8 Resolves: #i124966# keep picture format information - <GfxLink> instance - also for the reading of preview picture data in order to avoid trouble on save in case that the preview data equals the picture data (cherry picked from commit d6af1b601bb8fe2569d17e01505f67e1becc9366) Conflicts: svx/source/svdraw/svdograf.cxx (cherry picked from commit 597ae8dd9c28ee370874b219d594fa1c105f2c72) Conflicts: svx/source/svdraw/svdograf.cxx Change-Id: Ifecb07b4d5d33d593502fccd6f21644893027d2d Reviewed-on: https://gerrit.libreoffice.org/9456 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-01Related bnc#822625: Cache minimum height for table cells.Matúš Kukan
Change-Id: I35e295347a046376289f5d4fd5468860d0b8f0ae (cherry picked from commit 5792e76cb5beb630c135f57b74f57d74dd2dc2b0)
2014-05-22SvxRelativeField: set the unit from the passed stringmapMichael Stahl
In the Paragraph "Indents & Spacing" tab there are fields with unit: <object class="svxlo-SvxRelativeField" id="spinED_LEFTINDENT:0cm"> But the unit is effectively ignored, and the resulting SvxRelativeField with FUNIT_NONE and 9999 max somehow results in 0.18cm max when the dialog sets cm as unit. (cherry picked from commit 68bc8af6b6c4d0399bd10ed450d81aa2f17931a1) Conflicts: svx/source/dialog/relfld.cxx Change-Id: I6001c93079fd7d899f1e119913b29ea4898b1c34 Reviewed-on: https://gerrit.libreoffice.org/9416 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-18strangely obvious leaky codeCaolán McNamara
Change-Id: I968cbb784d53e0cff0649061c58f752939226a09 (cherry picked from commit 5b2f1b46b129c41890c54513c6d386407db6718a) Reviewed-on: https://gerrit.libreoffice.org/9385 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-05-18Resolves: rhbz#1096486 avoid access to nonexisting parent dialogCaolán McNamara
was Related: rhbz#1047174 (cherry picked from commit 794f5af121906668870a58700aed25b660381240) Change-Id: I0bf9116d088adde838993ac5e909a6f3481f883e Reviewed-on: https://gerrit.libreoffice.org/9326 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-05-09fdo#62176: Revert "n757419: Hidden/Non-wrapping text."Michael Stahl
This reverts commit 0f8f92a5b6fcba1fef456539bb929819a9162a85. Negative fo:text-indent values are explicitly allowed by ODF, so whatever problem was worked around here needs to be fixed differently. Conflicts: svx/source/unodraw/unoshape.cxx Change-Id: I7e2ae38c4c950e37f0c96a32164a5b6ec10fd47d (cherry picked from commit 3b566ca82ebbe754902c1837e11da5fba1e6c93d) Reviewed-on: https://gerrit.libreoffice.org/9275 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-05-01fdo#76878 Revert "Resolves: #i116244# need to reset rotation..."Andras Timar
This reverts commit 20dee85b6390ef3edc5434889523cd9fd0137bae. (cherry picked from commit 1e48bfcd7aa811d31ecdf9df897b30cffebd5669) Change-Id: I712e11a84b01965882da40eca7ac5a5f0c8cb294 Reviewed-on: https://gerrit.libreoffice.org/9140 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-04-30fdo#73891 Fix "UI color panel does not show the actual color in Writer"Tomofumi Yagi
1.The Font/Background/Highlight Color panels identify the actual color by a small frame. (Regression from the commit 35aa48d80b4b800d408d26bd72fbdfd711abbb6f See also fdo#32376 - Set default color to the current one in toolbar popups) 2.Fix this in the Floating Font/Background/Highlight Color Toolbar,too. Reviewed-on: https://gerrit.libreoffice.org/9103 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us> (cherry picked from commit 5c31515d2e54a42ceac1b21409cb730cdbb825ed) Change-Id: I5c2db8ab8923ab146cbf921dcb90894765f8420c Signed-off-by: Kohei Yoshida <kohei.yoshida@collabora.com>
2014-04-30table not resizing when rows/columns added to itCaolán McNamara
I happened across a presentation whose table didn't resize when extra rows and columns were added to it. It worked on a higher resolution machine, but not on a 1024x768 one Change-Id: I98a7a04bee0b0175174e6376e9ebc046b9eff2dc (cherry picked from commit 88c3b4bbf005299203370efecbc09dd9d9d26a72) Reviewed-on: https://gerrit.libreoffice.org/9122 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2014-04-16coverity#708388 Uninitialized scalar fieldCaolán McNamara
Change-Id: Idaa2ec4863beb6be790022c3c66bc4a72e9bf626 (cherry picked from commit 409ebeb20d1ee4552ac21bd739ae4e25eaeb68d9) Reviewed-on: https://gerrit.libreoffice.org/8891 Tested-by: David Tardon <dtardon@redhat.com> Reviewed-by: David Tardon <dtardon@redhat.com>
2014-04-08fixed display of available dictionaries stringsEike Rathke
Since commit 9dc57be59d1a8dc17e77f21cbce04e2bb7247dca under Tools->Options->LanguageSettings->WritingAids "User-defined dictionaries" the language strings are displayed as " '[' Language (Country) ']'" that before was and instead should be "[Language (Country)]" Change-Id: Id7e7ef6ab86112c46707f1451a072dfc196aec44 (cherry picked from commit cc658066aec0a0f9589e7f9522c4431b3a3d5e96) Reviewed-on: https://gerrit.libreoffice.org/8829 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-04-08Support SmartTagRecognizers againStephan Bergmann
The XContentEnumerationAccess is at the service manager, not the component context. Regression introduced in LO 4.0 with 4381f3dd5ae9e042840a16f69d07267208160420 "fdo#46808, Use BreakIterator ::create method." Change-Id: Idb7d38b9c14beea9a9ad347e6cbc8190d7248b2d (cherry picked from commit d4c8325ea9cbffeff91de49d5e1f1f026be319de) Reviewed-on: https://gerrit.libreoffice.org/8824 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-26avoid repeated table layouting (fdo#75622)Luboš Luňák
With the document from fdo#75622, this saves 3775 calls and leaves only 13. e586fe4585dc07e6f6dd061d09f6a7fb0b22948c removed avoiding the call to LayoutTable(), which made loading slow. I checked that the doc from that bugreport still works, so if very original code was correct in avoiding the call sometimes, this should be ok too. Conflicts: svx/source/table/svdotable.cxx Change-Id: Ia80f974d4497e5cb04612331527eb87b579ddb76 Reviewed-on: https://gerrit.libreoffice.org/8738 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
generated by cgit (git 2.34.1) at 2024-06-06 16:37:48 +0000