summaryrefslogtreecommitdiff
path: root/svx
AgeCommit message (Collapse)AuthorFilesLines
2014-10-23Resolves: fdo#62682 crash on second export of svgCaolán McNamara3-0/+20
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. (cherry picked from commit 5bdfa8c12472eb9ff6ca054c2ada7150b1869fff) Change-Id: I064a154ece488c9a4c3467b753451df7e73ae883 Reviewed-on: https://gerrit.libreoffice.org/12009 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-10-02fdo#84315 quick fixLionel Elie Mamane2-2/+2
In mergedlib case, load ourselves (that is, mergedlib). Fixes bug symptoms, while waiting for fully clean solution, which is killing svx/dbtoolsclient completely. Change-Id: Ib8ad34ee4697f89bdc6bbe64d406053f9e7f7521 Reviewed-on: https://gerrit.libreoffice.org/11739 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2014-10-01Resolves: fdo#79131 crash in EnhancedCustomShapeTypeNames::GetCaolán McNamara1-1/+1
Change-Id: Ib21a4a1574119120f09d4ecac73b93a0f2f6739f (cherry picked from commit 65277f994ae25d930c15aebba0ed19f8de0abba1) Reviewed-on: https://gerrit.libreoffice.org/11703 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-09-04fdo#44081 don't remove 'edit' pop-up menu entry from form in design modeLionel Elie Mamane1-3/+0
Conflicts: sw/source/core/uibase/app/docsh.cxx Change-Id: I009b0e1a155c298bd7f461547125df4ba76805d9 Reviewed-on: https://gerrit.libreoffice.org/11232 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-09-03fdo#67615 TextField in table should use same formatting as floating TextFieldLionel Elie Mamane3-16/+4
Change-Id: Ia6333d12f9f1ecdd5a552089f0df8703c5fce88a Reviewed-on: https://gerrit.libreoffice.org/11197 Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-08-28Resolves: fdo#77516 sub-grid shouldn't be allowed as 0Caolán McNamara1-2/+6
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/11164 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2014-08-27Resolves: fdo#83062 infinite recursionCaolán McNamara1-4/+4
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 Change-Id: If5fce4b7a88d4d0972f52705334e4b9b48425cca (cherry picked from commit 8d8e8942b2ee2a2e85c65d71628057316c9f5897) Reviewed-on: https://gerrit.libreoffice.org/11149 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-08-26bnc#770711: Make changing table text color in impress always workMatúš Kukan1-0/+2
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/11122 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-07-29rhbz#1121254 reload font list from shell on changeDavid Tardon1-0/+6
Change-Id: Ief88373c210b3b6f65c1df5b31870aca561095bb (cherry picked from commit 0497864bd4f603605997938d504ef9598623e713) Reviewed-on: https://gerrit.libreoffice.org/10547 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-21bnc#883684: Better fix for this.Kohei Yoshida2-11/+9
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 Change-Id: I2312e86c9376d3699ef4aa1e0cf2f4c04f706c1e Reviewed-on: https://gerrit.libreoffice.org/10237 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-13fdo#81004 this looks like a mis-merge to meDavid Tardon1-8/+0
Change-Id: I2d30774a8a89002b6c2d8487bfce15eb13c82e0d (cherry picked from commit 8817e5e3a0d92a4febae955ced7a35c52cb08910) Reviewed-on: https://gerrit.libreoffice.org/10170 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-07-10bnc#883684: Make chart objects exempt from automatic unloading.Kohei Yoshida2-0/+10
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: svx/source/svdraw/svdetc.cxx Change-Id: I7dd92550880efb4db8fc843cf1c915c712166da4 Reviewed-on: https://gerrit.libreoffice.org/10179 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-07-04svx: the openglprimitive2d.hxx has been removedMichael Stahl2-2/+0
Change-Id: Icfb4772fd13db381739e178b70886139705aca84
2014-07-04fdo#78908 Revert "Merge back branch alg_writerframes to trunk"Miklos Vajna16-115/+84
This reverts commit 6e61ecd09679a66060f932835622821d39e92f01. Better not to have this on libreoffice-4-3 without 7d9bb549d498d6beed2c4050c402d09643febdfa (Related: #i124638# Second step of DrawingLayer FillAttributes..., 2014-06-02). Conflicts: cui/source/inc/backgrnd.hxx cui/source/inc/cuitabarea.hxx cui/source/tabpages/backgrnd.cxx cui/source/tabpages/tparea.cxx include/basegfx/numeric/ftools.hxx include/svx/svxids.hrc include/svx/unoshprp.hxx sc/source/ui/drawfunc/drawsh.cxx sd/source/ui/func/fuarea.cxx sfx2/source/dialog/tabdlg.cxx sw/inc/fillattributes.hxx sw/inc/format.hxx sw/inc/frmatr.hxx sw/inc/swatrset.hxx sw/inc/unobrushitemhelper.hxx sw/qa/extras/rtfexport/rtfexport.cxx sw/source/core/attr/format.cxx sw/source/core/attr/swatrset.cxx sw/source/core/doc/docfly.cxx sw/source/core/doc/notxtfrm.cxx sw/source/core/inc/frame.hxx sw/source/core/inc/frmtool.hxx sw/source/core/layout/fillattributes.cxx sw/source/core/layout/paintfrm.cxx sw/source/core/txtnode/fntcache.cxx sw/source/core/uibase/shells/frmsh.cxx sw/source/core/unocore/unobrushitemhelper.cxx sw/source/core/unocore/unoframe.cxx sw/source/core/unocore/unostyle.cxx xmloff/source/text/txtexppr.cxx xmloff/source/text/txtprhdl.cxx Also: Revert "cppcheck: Prefer prefix ++/-- operators for non-primitive types" This reverts commit 80ec4885e97b3fcb34b93e71ced52a4aab43ce93. Revert "WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'" This reverts commit d5d10b03b1f3e4bf784ad35254cb55d719a8c1b3. Revert "i#124638 support for DrawingLayre FillStyle for GraphicFrames and ..." This reverts commit 4a0b5e569d070c286daefb0fdfe45c0dd15d241c. Revert "svx: fix SID_OFFER_IMPORT and SID_ATTR_CHAR_GRABBAG having the same SID" This reverts commit b66d87086804460c1986df1b832fd6b2ea075a90. Revert "SwXStyle::getPropertyValue: don't try to read a float into a sal_Int32" This reverts commit 1e3c7b854baac2502bed72ff8e3e1b21b507735b. Revert "SwXTextFrame: also restore semi-lost BackColorTransparency property" This reverts commit 102bb87ca1a5dee3a09442bf503a54bb703c79ea. Revert "SwXTextFrame: restore semi-lost BackColor property" This reverts commit 5ce92b73ce06c805c66e53c48aa2c70c722aaf60. Revert "DocxAttributeOutput: port to FillAttributes" This reverts commit ec221b7339f8fe5520926ef85b450daa94392780. Revert "MSWordExportBase::OutputItemSet: handle fill attributes as frame ones" This reverts commit 84c40768f8acb0342dcfa223133497f57620fc14. Revert "sw: put getSvx* and setSvx* to a namespace, now that these are public" This reverts commit ebf960960a69c1edb5da1994c330ddddbecac44d. Revert "sw: fix DOC/DOCX/RTF export of TextFrame background color" This reverts commit c7837b8caad61b8c0dfd3704a133cdeaffd69b06. Revert "sw: still use SvxBrushItem for page style background" This reverts commit e826950e9d7736a6e3f9042755ba1b528f58a505. Revert "cui: unused code in SvxAreaTabPage::ClickBitmapHdl_Impl" This reverts commit 2032e9f5d7683e49b8753d7c7362899c690005b6. Revert "cui: unused code in SvxAreaTabPage::ClickGradientHdl_Impl" This reverts commit f4fa202b31277276dc4f05046c82152c0830ef21. Revert "cui: unused code in SvxAreaTabPage::ClickColorHdl_Impl" This reverts commit 1478e89e08a54f02a137c74c0cde6ae75e80d9f3. Revert "cui: unused code in SvxAreaTabPage::ClickHatchingHdl_Impl()" This reverts commit e9c9f3f793a91525ac4fb74f8791ba74222515e4. Revert "svx: fix Writer's insert -> frame crash" This reverts commit 831b8751fc9f423fd4e459623e54801c0a020eb3. Revert "sw: adapt frame/templatedialog4.ui to FillAttributes" This reverts commit 55916fc50a5b2d6273bca8c9ef6253011cf4fdbc. Revert "-Werror,-Wunused-variable" This reverts commit d0542fe7251d9c6538331b22a4b5e2e294a92e97. Revert "loplugin:implicitboolconversion,literaltoboolconversion" This reverts commit 47862e75de51a4ac7476acff773b504fdc0d6e76. Revert "loplugin:saloverride" This reverts commit be89e8b8ac19c0feca8850ccaddd90205c63dbe5. Revert "loplugin:literaltoboolconversion" This reverts commit 355b31fe347479f63906e41300042ec5cb38837c. Revert "-Werror,-Wunused-private-field" This reverts commit df9d13dd2e754184a4c6e321b8910ee1bc0cafa1. Revert "-Werror,-Wunused-const-variable" This reverts commit d757a98001a65baf4066c2eda037a08ab1beda46. Revert "unused XFillStyleItem ctor" This reverts commit b735fe1d67e6ad7ad448e448f237dcabef1a1c38. Revert "unused XGradient::VclGradient" This reverts commit 5bbc90be755aae4b87125f9d748828d74efe645d. Revert "fix "transparency" of floating tables in docx import (fdo#77723)" This reverts commit 313b59d787357ef3da34e2833fefcf1143b09b5e. Change-Id: If855b090f94288d384f8733f88ef1172e68c50a6 Reviewed-on: https://gerrit.libreoffice.org/10077 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-07-04Make OpenGL 2D rendering working again.Markus Mohrhard8-32/+2
Change-Id: I29101aee77ac37f5a8e1b929793d7554bc425b26 Reviewed-on: https://gerrit.libreoffice.org/10075 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-07-01Resolves: fdo#42747 limits need to multiplied by num of decimal placesCaolán McNamara1-0/+7
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/10014 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-07-01Related: fdo#80713 make 'Gif image', etc. translatableCaolán McNamara3-10/+70
Change-Id: I47d15623bd12b4b63a8d3701aaf1bebbba5ca7c5 (cherry picked from commit 33e9d408aa2c0a9b86c5daaed0e15d86f6c599dc) Reviewed-on: https://gerrit.libreoffice.org/10017 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-06-26fixes for up-casting to Reference<XInterface>Noel Grandin7-11/+11
Fix regressions introduced with 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 "Use the new type-checking Reference constructor to reduce code noise" Change-Id: I85662856f21c810a7db497fe3b0e116f075b1687 Signed-off-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 533c6cb6bad6ef0432e8eebbfd4daf90ef71f3b4) Reviewed-on: https://gerrit.libreoffice.org/9919 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-25fdo#37401 - fixed the old vector lengthHideki Ikeda1-1/+1
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)
2014-06-24fdo#75339: Substituting XInterface* eq. for object eq. requires queryInterfaceStephan Bergmann1-2/+4
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/9874 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-24Related bnc#822625: Minimum height was not invalidated when rectangle changes.Matúš Kukan3-14/+9
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/9870 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-06-23fdo#71076, fdo#71767: Preserve number formats when charts are copied.Kohei Yoshida12-33/+52
(cherry picked from commit 1d38cb365543924f9c50014e6b2227e77de1d0c9) Conflicts: sd/source/ui/view/sdview3.cxx xmloff/source/chart/SchXMLExport.cxx Change-Id: If5ae8852152012483237e7602e56a0c46ea8748a Reviewed-on: https://gerrit.libreoffice.org/9836 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2014-06-23Resolves: fdo#80327 Sound list box when non-English UIJulien Nabet1-28/+10
Fallback strings are in English wheresas ImplGetThemeEntry expects localized strings Let's put localized strings in fallback to make ImplGetThemeEntry happy Cherry-picked from e4ca1f900a5585d35af04159bdd854f10b495355 Change-Id: I27dd992bac4f5aaf6e0e6237fe59dac990f11c92 Reviewed-on: https://gerrit.libreoffice.org/9845 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-06-17bnc#882627: Allow to edit spacing to contents even with no borders visible.Matúš Kukan1-1/+1
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. Change-Id: I676b211e1a4a1d7341c385d63503aa740718ed5d (cherry picked from commit b1d8df61b47e84bf0de64342556049673dd9c543) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-06-13Introduce HAVE_FEATURE_GLTF to enable/disable gltf related codeZolnai Tamás1-0/+6
When it is a release build then enable it only on Windows and Linux. Change-Id: I7c462aeb75e6ab60eeaa0fa42ca7853a6369b742 (cherry picked from commit fe70101856332663f600df144b39d2638b3d0570)
2014-06-12fdo#79883 the page view object contact must existDavid Tardon1-3/+6
Change-Id: I5c6bd3ea267f1ea84b46e46aa508a27d00903347 (cherry picked from commit 551c915dcbf3e1d6bfd799c6e13e5700e2c3e535)
2014-06-10avoid problems with poppler's and vcl's FontInfo during runtimeMarkus Mohrhard4-26/+26
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
2014-06-03disallow private use language tags in combo box editEike Rathke1-1/+1
Change-Id: I75f0b93507d31a12b07e4bb7d2c86671aa074486 (cherry picked from commit a8c5adabb98d4152527b553f904c1841c7393748)
2014-06-02Resolves: fdo#79506 Some numbers are marked as translatableJulien Nabet1-5/+5
Exception: http://opengrok.libreoffice.org/xref/core/sd/source/ui/view/DocumentRenderer.src#55 Cherry-picked from acdff9f9763847c992e0853022896cff781c5ffe Change-Id: Iecfe49b51ed68de00f1b5adfb5bca9fa793fb1f9 Reviewed-on: https://gerrit.libreoffice.org/9614 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2014-06-02Pass also const CellRef& to save a lot of getCellByPosition() calls.Matúš Kukan3-10/+7
Change-Id: I86c89a05d263cada38ff54eaccf9ba39458db52e (cherry picked from commit 7b9b57b41936eea673eb678407ed817856ba0912)
2014-05-29reportdesign: Fix applying the last used colorMaxim Monastirsky1-2/+4
The last used color is stored inside SvxColorToolBoxControl, so we must call its Select method to do that. (This also fixes using the last shape, See previous commit for a fix of exactly the same problem in chart2.) For the font color, there was also another problem: The SID used for that button is SID_ATTR_CHAR_COLOR2. The problem is that SvxColorToolBoxControl::Select actually calls for that SID the ".uno:CharColorExt" command instead of ".uno:FontColor" (which activates in writer the format paintbrush mode). Given that since commit 584b415924bba22db23a4258062e54973de0ed7c this command also receives the last used color as argument, the easiest solution is to register ".uno:CharColorExt" here as well. (cherry picked from commit 426033250db0b9b6344980655ca0be59efe6a6a5) Change-Id: I2db25a7fb537ce10dfec7b1c2d049dd77d9f8f6b
2014-05-28Related bnc#822625: Cache minimum height for table cells.Matúš Kukan2-5/+10
Change-Id: I35e295347a046376289f5d4fd5468860d0b8f0ae (cherry picked from commit 5792e76cb5beb630c135f57b74f57d74dd2dc2b0)
2014-05-27various situations where graphic go missing on saveOliver-Rainer Wittmann1-3/+5
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 Change-Id: I9d4a02af2561467fe1a66f036b55d6dcf2429986 (cherry picked from commit 192abfb36b8a4859879fcb49326d59ed62083c8d) Resolves: #i124717# do not mark *.svm graphic files as *.bmp graphic files (cherry picked from commit a5cfb91f3dc4b38055fb920f65101cc45d52f8de) Conflicts: svtools/source/filter/filter.cxx Change-Id: I43f62a453bfa17254cebc07bde95f07f16a329c2 (cherry picked from commit 12dd68e3d20ad36ebe7cb40a600215f6d2b7b6ec) 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 Change-Id: Ia9771932ae5b380ccae9b0a3cbb79d41f5d9bdb8 (cherry picked from commit 05e07167e422caf58d23ff883edda30acc3ba88d) 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 Change-Id: Ifecb07b4d5d33d593502fccd6f21644893027d2d (cherry picked from commit 597ae8dd9c28ee370874b219d594fa1c105f2c72) Reviewed-on: https://gerrit.libreoffice.org/9455 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-05-27fdo#78920: Number %NUMBERSTRING in tooltipJason Hulme2-38/+3
Fixed string in Bullets and Numbering and changed sidebar to use the same set of strings. Change-Id: Ib8a103e203cf66c979216175d4047bca518290ce Reviewed-on: https://gerrit.libreoffice.org/9492 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit ceb7ea5091bd9b862f92e853fd9f8f2542fb8b41) Signed-off-by: Andras Timar <andras.timar@collabora.com>
2014-05-23feedback color indicator for invalid tagsEike Rathke1-0/+19
Change-Id: I235e32587779369c139aedd1961b37d8fcad8f53 (cherry picked from commit 04ccece7299ac1e57488e5ef36af122edeec2aae)
2014-05-23switch the Western language list box to SvxLanguageComboBoxEike Rathke1-0/+90
This allows the user to assign an arbitrary (but valid) BCP 47 language tag to a portion of text, so that customized spell-checkers or other language-dependent tools can be used without the need to wait for LibreOffice to add yet another language to the list in the next release. +bool SvtLanguageTable::HasLanguageType() (cherry picked from commit 2a8eff589a53c8dd65e18d7a9d11cdb98a937e68) + SvxLanguageComboBox EditModifyHdl(), SaveEditedAsEntry() (cherry picked from commit 29c024afbe6a46459e37c5ceec510de1cd0ca7c8) handle SvxLanguageComboBox edit (cherry picked from commit 1aad7628dcd7fd14d48814d00c3d04e4ec0c59d5) finally switch the Western language list box to SvxLanguageComboBox (cherry picked from commit dbe8b3b6d4f2d2cc2e8c702b78034e9013f71e8f) advance start of edit selection on a matching entry ... to allow continuous typing. (cherry picked from commit fe2b8ef18b11b226fddd1cf3fc7f9133426a1b1a) Change-Id: Id57eb51b69e50be78f85d19a7b3623c1acdf6509 Reviewed-on: https://gerrit.libreoffice.org/9447 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Kohei Yoshida <libreoffice@kohei.us> Tested-by: Kohei Yoshida <libreoffice@kohei.us>
2014-05-21we have GetEntryPos(), use itEike Rathke1-8/+12
Change-Id: Iebb19951efa81817793a155164862076d1198e6e
2014-05-21Split ZCodec::BeginCompression param into its 3 independent componentsStephan Bergmann1-1/+1
Change-Id: I275abafe81c8bb617c70646244b14f6cecc33854
2014-05-21RID_DLG_UPDATE conversion to .uisk941-5/+5
Conflicts: desktop/source/deployment/gui/descedit.hxx Change-Id: Icf9ee3081b468f99833d1e38182887ad1da6f675 Reviewed-on: https://gerrit.libreoffice.org/9417 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-05-20Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part18Julien Nabet30-363/+363
Change-Id: Ibf958dbfbf7cdbe6ad31d390138be8d4d468c225
2014-05-20SvxRelativeField: set the unit from the passed stringmapMichael Stahl1-4/+10
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. Change-Id: I6001c93079fd7d899f1e119913b29ea4898b1c34
2014-05-20fdo#77282 Replace "Edit Group" with "Enter Group"Laurent Balland-Poirier1-1/+1
Command to enter in a group of objects should be the same in Writer and Draw Update of Help in commit 8944 Change-Id: I39d9c9f9e969978f4084703d2468bdf8a2bf7372 Reviewed-on: https://gerrit.libreoffice.org/8923 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2014-05-19hrc and src files: squeeze multiple newlinesThomas Arnhold19-66/+0
for i in `find . -name *.src -or -name *.hrc`; do FILE=$(cat -s "$i"); echo "$FILE" > "$i"; done Change-Id: I2bac5ad3e1eb3c566e5c867ccf45893a19e1561e
2014-05-19loplugin:saloverrideStephan Bergmann1-9/+9
Change-Id: I2c1033358c546adefa4e280f0b6cb577ee7e3b25
2014-05-19loplugin:unreffunStephan Bergmann1-7/+0
Change-Id: I54aabdf4a373c3b7163bfc304ee270ab212d738a
2014-05-19svx: SvxPixelCtl should never be able to have zero linesChris Sherlock1-0/+1
Change-Id: I898d4d8f00a190a57d3402aa6c9da96c960b6fe5
2014-05-19Resolves: fdo#78841 crash because parent isn't SvxTabPageCaolán McNamara2-15/+9
regression from 60f11adb950e4f9645cc9ecb0f5af8235cc97366 Change-Id: I244dd9fba3dc8230fcac8710a1289151b25dcf6c
2014-05-19We apparently don't want to build pixelctl for WNTTor Lillqvist1-1/+2
Change-Id: I01bbafe8a73f6cf71c1040f2d94744922154b896
2014-05-19svx: pixelctl demo - cleanup headersChris Sherlock1-8/+0
Change-Id: I9664a064789f5e072d24cfead6a83d64accce27d
2014-05-19svx: Create pixel control (bitmap editing) demoChris Sherlock3-0/+203
Change-Id: Id2cacd8c080b4df0600ab48b2ce4558f3539bbbe