summaryrefslogtreecommitdiff
path: root/editeng
AgeCommit message (Collapse)AuthorFilesLines
2013-03-05Merge branch 'distro/suse/suse-3.6' of ssh://logerrit/core into suse-3.6Petr Mladek3-4/+4
2013-03-04valgrind: use after freeCaolán McNamara1-1/+1
i.e. since b35980d9b seems remove, remove, delete was old pattern, new patterns ended up as remove+delete, remove. Reorder to remove, remove+delete Change-Id: I54ec8d0296e751110c516516465be2ac0615f6a1 (cherry picked from commit 069caf79d716ba73d3281beb13fa2af67cac24f9) Signed-off-by: David Tardon <dtardon@redhat.com>
2013-03-04Merge tag 'libreoffice-3.6.5.2' into suse-3.6Petr Mladek1-2/+2
Tag libreoffice-3.6.5.2 Conflicts: editeng/source/editeng/impedit3.cxx instsetoo_native/util/openoffice.lst oovbaapi/UnoApi_oovbaapi.mk sc/source/filter/oox/workbookhelper.cxx sc/source/ui/app/scmod.cxx sc/source/ui/cctrl/checklistmenu.cxx solenv/inc/minor.mk writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx writerfilter/source/dmapper/PropertyMap.cxx Change-Id: I7ea70b82b3b874cbe78354d5dd97307e63842e72
2013-03-04Make LO buildable again after the GraphicFilter move.Jan Holesovsky3-4/+4
Conflicts: cui/source/dialogs/SpellDialog.cxx editeng/source/items/frmitems.cxx filter/qa/cppunit/filters-pict-test.cxx sd/source/filter/grf/sdgrffilter.cxx sd/source/ui/app/sddll.cxx svgio/source/svgreader/svgimagenode.cxx svtools/Library_svt.mk svtools/Module_svtools.mk svtools/Package_inc.mk svtools/source/filter/exportdialog.cxx svx/source/core/graphichelper.cxx svx/source/dialog/compressgraphicdialog.cxx sw/source/ui/shells/grfshex.cxx sw/source/ui/uiview/view2.cxx sw/source/ui/utlui/glbltree.cxx test/source/bootstrapfixture.cxx tubes/source/contacts.cxx vcl/Library_vcl.mk vcl/qa/cppunit/graphicfilter/filters-test.cxx vcl/source/filter/FilterConfigCache.cxx vcl/source/filter/graphicfilter.cxx writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I3455a7294b136400f32163626d5a7a7f2bfa898c
2013-03-04fdo#55931, fdo#57956: Fix both autofit and stretched width.Jan Holesovsky1-1/+7
This rewrites commit fa694a21b806ed7837c1337ec49a4b299c478393 (fix of fdo#55931), and fixes it a better way. Change-Id: I9ac0c78294e6a9c510c12b22547564b736416131
2012-12-21fdo#52640 fix right-aligned tabstopsDavid Tardon2-4/+4
It is no good to change temporary object... Change-Id: Ib1178e154341dd0216fd965d3ed6c264de40d634 Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
2012-12-04fdo#52640 fix right-aligned tabstopsDavid Tardon2-4/+4
It is no good to change temporary object... Change-Id: Ib1178e154341dd0216fd965d3ed6c264de40d634 Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
2012-11-29Resolves: fdo#57640 we really want to *titlecase* the initial characterCaolán McNamara1-2/+2
http://srfi.schemers.org/srfi-13/mail-archive/msg00046.html summarizes well.. " - Titlecase <> uppercase Unicode defines three kinds of case mapping: lowercase, uppercase, and titlecase. The difference between uppercasing and titlecasing a character or character sequence can be seen in compound characters (that is, a single character that represents a compount of two characters). For example, in Unicode, character U+01F3 is LATIN SMALL LETTER DZ. (Let us write this compound character using ASCII as "dz".) This character uppercases to character U+01F1, LATIN CAPITAL LETTER DZ. (Which is basically "DZ".) But it titlecases to to character U+01F2, LATIN CAPITAL LETTER D WITH SMALL LETTER Z. (Which we can write "Dz".) character uppercase titlecase --------- --------- --------- dz DZ Dz " See TestCharacterClassification::testTitleCase for titlecase regression tests. (cherry picked from commit 150e32777c99a5d67a51726972f46c06dae8a6ac) Conflicts: editeng/source/misc/svxacorr.cxx Change-Id: I198379832d1910632bb6358149a5276b68d7c6eb Reviewed-on: https://gerrit.libreoffice.org/1191 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2012-11-05Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6Petr Mladek4-15/+98
Conflicts: desktop/source/app/sofficemain.cxx instsetoo_native/util/openoffice.lst solenv/inc/minor.mk Change-Id: I3e9510067c7173f6c71368e70ba6dfe168c5318e
2012-10-29fdo#55931 Fix renderding of subscript/superscript with Autofit Text.Jan Holesovsky1-4/+1
We are using font metrics to compute the stretch ratio for autofit; but that collides with nPropr property of SvxFont - it is then counted twice, ie. in the case of nPropr == 25, we actually behave as if it was much less; and worse, only in the horizontal direction. Change-Id: Idba62f1e3f40802651b93f1344e376048866b1b6
2012-10-13fdo#55931 Fix renderding of subscript/superscript with Autofit Text.Jan Holesovsky1-4/+1
We are using font metrics to compute the stretch ratio for autofit; but that collides with nPropr property of SvxFont - it is then counted twice, ie. in the case of nPropr == 25, we actually behave as if it was much less; and worse, only in the horizontal direction. Change-Id: Idba62f1e3f40802651b93f1344e376048866b1b6 Reviewed-on: https://gerrit.libreoffice.org/866 Reviewed-by: Thorsten Behrens <tbehrens@suse.com> Tested-by: Thorsten Behrens <tbehrens@suse.com>
2012-10-10fdo#55526: fix import of RTF \brdrhair:Michael Stahl1-2/+16
This is a hairline border that should be mapped to a non-zero width border given that LO doesn't have hairline borders as such. Change-Id: I4a2d2f983ac8e016b2ddb6b38435f5562e545c72 (cherry picked from commit 59ab112fe93cbf4e2b052f4e8bafbdb4e6738bef) Reviewed-on: https://gerrit.libreoffice.org/847 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-10-10add editeng::ConvertBorderWidthFromWord:Michael Stahl2-3/+79
Replace the 2 duplicate implementations of this in ww8 and writerfilter with a common one. Differences were: 2) ww8 doubles the with, writerfilter does not 13) unsupported, mapped to THINTHICK_SMALLGAP vs. THICKTHIN_SMALLGAP 22) unsupported, mapped to DASHED vs. SOLID 26) INSET not supported in writerfilter 27) OUTSET not supported in writerfilter Change-Id: I533b77394388e736f38d70284a6a11061d81e813 (cherry picked from commit ecd70a727d7f559ebda1dd726cea1be472948270) Reviewed-on: https://gerrit.libreoffice.org/846 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2012-10-01n#707779: Fix overflowing of left margin value in editeng when negative.Jan Holesovsky2-13/+6
Change-Id: I9d39a9cfacf07aa596d047aee66c71b5ac6008ec (cherry picked from commit d953cc27fc5da5e612b1dc4c29707c09d17fc643) Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2012-08-02Related fdo#53006 Make CApitals correction work without dictionaryStephan Bergmann1-12/+14
In a language for which there is no dictionary available (no "ABC" check in front of the current item in Writer's "Format - Character... - Font - Language" list), "Correct TWo INitial CApitals" (from Writer's "Tools - AutoCorrect Options... - Options") did not work (i.e., typing "FOo" followed by a space would not change it to "Foo"). That was apparently a regression introduced with 51efaa592d4f54133c74e38cf294526bc78dffcd "Double-capital autocor takes spellcheck in account." (I verified that with this fix words like "MPs" in "English (UK)" are still left as "MPs.") Thanks to Caolán for help. Change-Id: Ia76286e4ca73138ce3571145b9c40b031a4553ba (cherry picked from commit 566bcf64ad9092ba6e55ba3de514226ae6b10c10) Signed-off-by: Michael Stahl <mstahl@redhat.com> Conflicts: editeng/source/misc/svxacorr.cxx
2012-08-02some tweaks in RTF filterMichael Stahl1-1/+3
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2012-07-05ConvertBorderWidthToWord: fix wrong INSET/OUSET conversion:Michael Stahl1-2/+2
This should do the inverse of ConvertBorderWidthFromWord. Change-Id: If0b2a8a83a7faa6600a07ecfcb13a124d7cdeab6 (cherry picked from commit 927f1e56d57ef9238a4574699ae36626b3daaf22)
2012-07-04refactor handling of double border widths:Michael Stahl4-21/+172
Word uses a completely different definition of "width" of a double border than OOo and ODF: for Word the width is apparently the largest of the 3 component widths, while OOo and ODF define the width as the total with of all 3 components. The new border implementation in LO 3.4 was apparently inspired by Word's double border definition, which resulted in various import filter regressions, see the previous fixes: 36e43b52992735c622833e923faa63774b9e2f76 e2ffb71305c5f085eec6d396651c76d6daee3406 70a6a4d425558340bb49507975343a3e0a1bdde8 These fixes set the ScaleMetrics, which actually seems sub-optimal as there is a ScaleItemSet function somewhere that apparently re-scales all items in an itemset, which could undo the fixes. Also, one of the fixes actually managed to break RTF/DOCX import of double borders, as that ended up in the same code via the API. This commit now reverses the change, so that the width of a border is now always the total with of all components, which is (imho) much more intutitive, and also leads to a consistent UI where selecting say 3pt width has predictable results, no matter what the border style. The border widths are now converted in the Word format import/export filters (writerfilter and sw/source/filter/ww8), and various tests were adapted to the new handling. (cherry picked from commit 2d045cdb69176b280812dda0b813371cf1ac72e2) Conflicts: sw/qa/extras/ooxmltok/ooxmltok.cxx Change-Id: I50456c49b1a298569607e6c88f19f18441348ac3
2012-07-04replace enum SvxBorderStyle with css::table::BorderLineSyleMichael Stahl5-114/+71
Change-Id: I1dadb53f46b23f92d34061ef78dda872bdbcda67 (cherry picked from commit 8b4593948582c3b5b3d013bd751bb19ffd37a31b)
2012-07-04rename SvxBorderLine::SetStyle to something unambiguousMichael Stahl5-34/+36
Change-Id: Iec70985319a64cdc3630e15499ac304a7f1aabae (cherry picked from commit 463e59d680467a7b0d30ae956935a444c513de9e)
2012-07-02fdo#51582: Avoid double deletion of a text portion.Kohei Yoshida1-3/+4
Change-Id: Ia1c31cc8122c99a7e37bc285f61f8c5d2779b577
2012-06-19typo: paramters, paramaters -> parametersAndras Timar1-1/+1
Change-Id: If58683331c50f2a95204e8e2dea11edbef3ccb63
2012-06-04fdo#46112: tweak condition to prevent guessing only...Michael Stahl1-1/+2
...if there are actually individual line widths given; fixes the sw_rtftok test. Change-Id: If5f6ef54b93c5bfccfd011f25d9d9301637d388e
2012-06-04fdo#46808, Adapt UNO services to new style, Part 7, updating ::createNoel Grandin1-5/+4
Update calls to factories to use new ::create methods Change-Id: I01d4417820f52718836c92faf3c2fae0dc96b30d Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, added some tweaks.
2012-06-04fdo#46112: fix Calc ODF border line import:Michael Stahl1-1/+10
There are 2 problems here: - the border widths are tripled on import, because that is effectively what SetWidth does for DOUBLE borders; set a divisor of 3 similar to e2ffb71305c5f085eec6d396651c76d6daee3406 - the 3 individual line widths are ignored and the 3 lines end up with the same width, while older versions had numerous pre-defined border styles with asymmetric line widths; fix this by always guessing the width from the 3 parts for DOUBLE lines Change-Id: Ibdde7e034e25433835765330e81db0825efd9eb8
2012-06-04Fix call of getLengthJulien Nabet1-2/+2
Change-Id: I5fb5bc5016bd2779643ecfcf2df40e00c4741a2c
2012-06-04Hyperlinks/Fields wrapping feature.Muthu Subramanian2-2/+69
* Known issue: If the hyperlink wraps the next content is always from the new line! :( * Pending: Creation of unit test case for this.
2012-05-31nuke unused typedefTakeshi Abe2-6/+0
Change-Id: I8848d0e687c3b19be1a8bc1f41c2a0c94e13bbbf
2012-05-29targeted string re-workNorbert Thiebaud11-58/+58
Change-Id: I477fc34c21530b51d975216156e66abf21a7149c
2012-05-29targetted SAL_N_ELEMENTS reversion.Michael Meeks1-1/+1
Change-Id: I30be93ccaeb1f9fd17cbe9e3ed3165e094810b2e
2012-05-21fdo#40874: make recorded border macros run:Michael Stahl1-3/+40
When the new BorderLine2 struct with its added members was introduced, the PutValues methods that are called by the macro recorder with seqeunces of Anys were not adapted, so running recorded macro for ".uno:BorderInner" ".uno:BorderOuter" ".uno:SetBorderStyle" fails. (regression from b624e6e6cf2ecfc6e6e983af45212fce5e731006, 7db30f7aa037f52eb07cbb4fd2796bd869204af8) Change-Id: Icd8a11d7f5c8d79c57020f213a1554540b6c666d
2012-05-18fd0#40778 - Remove dictionary choice when adding new entryRob Snelders4-4/+18
Change-Id: Id7bd039b505d30e71065c2cdf27eba1cb466be56
2012-05-16remove unneeded include of boost/bind.hppCaolán McNamara1-1/+1
Change-Id: I5a254459a491b9547530d8e312260dceed21f25c
2012-05-14Renamed FILE to DOCINFO_TITLE, which is more appropriate for this field.Kohei Yoshida4-7/+7
Change-Id: I1267629da8b66fc21c4ae2e78634c2093274aa61
2012-05-14convert GetComment family to rtl::OUStringCaolán McNamara2-4/+5
Change-Id: I563ab83a24ca4f839892548b350486e83dd071d3
2012-05-11Unit test for UNO field item implementation.Kohei Yoshida1-0/+139
Make sure the type IDs are associated with correct service names. Change-Id: I5ff8ec7fb56f2790f9a3eca8e019c784cb27de43
2012-05-11Removing EXTENDED_DATE. There is really no such thing.Kohei Yoshida3-12/+1
This can be safely substituted by the normal DATE. Change-Id: I I6b4ccfa342a8d7b638b013cdce64a0b7ff477ec0
2012-05-11Better names for presentation specific field item types.Kohei Yoshida3-16/+15
Change-Id: Ib9bea60e05f1dcdd9501a3320f3b1185d5890d17
2012-05-11Fixed a regression on impress/draw file save losing date field format info.Kohei Yoshida1-6/+6
Change-Id: If9e01ab91d52d21cab175bfda925e690625fac3e
2012-05-11Added UNSPECIFIED to textfield::Type.Kohei Yoshida3-8/+6
Change-Id: I28fbab54ba71f01b989a47ab357583113e85fccb
2012-05-11Return correct presentation strings for fields.Kohei Yoshida1-26/+36
Change-Id: Icab3910f49639fff1551dfdb5be9341bd3ea70b1
2012-05-11Return the correct service names for each field type.Kohei Yoshida1-43/+70
Change-Id: I1b6261d09dfc42913070ffd2f797688587ab7a8b
2012-05-10callcatcher: update unused code listCaolán McNamara2-2/+21
Change-Id: I286988eabcc2d813008597b3657c366d510f8ab6
2012-05-10Resolves: fdo#37044 two different TransliterationChgData structsCaolán McNamara1-12/+13
There are two structs called TransliterationChgData with different layout. The crashes on MacOSX must be due to this. Rename them so they've different names. Change-Id: I887a33bed26b339e229b7fb1ef8dddd192f6fae3
2012-05-08A little more cleanup; translation of field IDs are no longer needed.Kohei Yoshida4-44/+11
Change-Id: I85364368d2ffca717b38d17c3396f53699001a3f
2012-05-08Use defined UNO property names instead of hard-coded values.Kohei Yoshida2-19/+19
Change-Id: I56801d8ce1a9bb6f8f9faebdf15ce831b7e9ea3d
2012-05-08Removed commented out code blocks.Kohei Yoshida1-249/+0
Change-Id: I7e5d0abbf209fd975a1f886b2588b51e05cf35e7
2012-05-08Use scoped_ptr for this.Kohei Yoshida1-3/+3
Change-Id: I43aba3046fb0c7adcf5362ea26273189addc12fe
2012-05-08Create SvxFieldData instance directly from the UNO textfield object.Kohei Yoshida5-16/+228
Change-Id: Ifa8210ffdf29624689f547b436fd687a2de82eb1
2012-05-08Set anchor to XTextContent using UNO API.Kohei Yoshida3-2/+50
Change-Id: Id1ccae62037369917a46d620c0c46ac2447a0910