summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2014-01-06DocxAttributeOutput: factor out writeVMLTextFrame() into DocxSdrExportMiklos Vajna
Given that DocxSdrExport doesn't know DocxAttributeOutput this requires also moving a number of data members into that class, which is probably also a good thing. Change-Id: I7e9c7def505e11e5e27a2bf86544d2b66d9b3f86
2014-01-06translate German variables nUnten, nOben, nMittePhilipp Riemer
Change-Id: Ib8a1a7dee98f39f3fe10c0244f1888ecc55e7ff3
2014-01-06translate German comments and convert them to doxygen stylePhilipp Riemer
Change-Id: I5e77f951b5a34e54d924c785f277ea88d155c56a
2014-01-06remove visual noise in sw/source/core/text/wrong.cxxPhilipp Riemer
Change-Id: I8069602fd9d1fe127213bae118fd6ff358703eb3
2014-01-06DOCX export: implement drawingML export of TextFrame AutoSizeMiklos Vajna
Change-Id: I180158bfa0bd36ed1360d10788e7921c2fa945a7
2014-01-06cp#2013101510000026: fix file coruption caused by comments' doc exportZolnai Tamás
Plcfbkl contains only character positions. The Plcfbkf is that one which contains additional informations. Change-Id: I9bd8eec5c8e64d9d757764dae51bcb866456cdc9
2014-01-06fix copy&paste error on UIAndras Timar
Change-Id: Id45ef565883069705bd7dddf5f5ec1c05f4f9b63
2014-01-06fdo#73217 : Textbox with picture fill are rendered and saved properly.sushil_shinde
- Bitmap url was not stored propertly for textframes. - Exported background image fill for text box properly. - Added unit test. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/7259 Change-Id: I1fbab24b2a83b22be04fd6950c80ddf274436738
2014-01-06oox: handle pic:pic in WPG groupshape importMiklos Vajna
Change-Id: I7de11251bc4e1b58f9cb308e8b698d4c8c1a58d3
2014-01-05sw: whitespace fixes in docxtablestyleexportMiklos Vajna
Change-Id: I8a1b1dc0e7e6a5ab149c43028a539b636bd87afc
2014-01-05RTF export: write RTF_FTNSEP and RTF_CHFTNSEP if necessaryMiklos Vajna
Change-Id: Ie680436df68ea6287437f792d97259ee0a840ee1
2014-01-05RTF import: handle RTF_FTNSEP and RTF_CHFTNSEPMiklos Vajna
Commit 330b860205c7ba69dd6603f65324d0f89ad9cd5f (fdo#68787 DOCX import: handle when w:separator is missing for footnotes, 2013-09-04) disabled footnote separator by default in dmapper, as the OOXML tokenizer always provided a uFtnEdnSep in case a separator was wanted. Let the RTF tokenizer do the same, this way we're in sync with Word again: if RTF_CHFTNSEP is in RTF_FTNSEP, then we show the separator, otherwise we don't. Change-Id: I74b46c5d71227682e093695336dc9eb6fde22121
2014-01-05remove broken DBG_UNHANDLED_EXCEPTION macro crapBjoern Michaelsen
this breaks quickly doing a `make sw debug=T` hard, with e.g. sw/source/ui/vba/vbasystem.cxx:239: undefined reference to `DbgUnhandledException(com::sun::star::uno::Any const&, char const*, char const*)' fix this for --disable-dbgutl builds too before reverting this commit. Change-Id: Ie54d63ea11b4e36c737b22099027711ad0435acc
2014-01-05ancient USE_MEASUREMENT define is never setBjoern Michaelsen
Change-Id: Ib5c1001c08ac194367c211506416abaee1f156c8
2014-01-04hidpi: Sidebar, fontwork, autoformat and other improvements.Keith Curtis
This is a second batch of HiDPI changes. It fixes the following areas: Sidebar * Impress Master pages preview * deck title height * tab (icon) bar * valueset dropdown control * wider maximum width * Draw and other misc. buttons which didn't get fixed by earlier change to Toolbar.SetItemImage There are several more sidebar issues, but it is much improved. Other changes * Writer and Calc auto-format dialog text * file-properties document image * fontwork gallery preview size * Calc table border control Change-Id: I95a0169a3b011836b1c75b3dcacb2733c9567ef3
2014-01-03WaE: C4309: truncation of constant valueTor Lillqvist
Change-Id: I041989979321ad49341776a9a7fee4b46c0241ff
2014-01-03Fiy typos: nInitalsLen -> nInitialsLenZolnai Tamás
Change-Id: If3d4ee2d860d89378276aa9be212a59ec958c9e2
2014-01-03oox: fix handling of noop parent transformation from DOCXMiklos Vajna
It seems that in Word, a zero parent transformation, like: <a:chOff x="0" y="0"/> <a:chExt cx="0" cy="0"/> means the child shapes will have an absolute position / size. We actually use this feature in the exporter, but so far the importer didn't handle this. Change-Id: I250784a3dddd23649e391b548fc128dfdf153614
2014-01-03cp#2013101510000026: doc import of comments affecting more text nodesZolnai Tamás
Change-Id: I3932d82cb4cd640b19957b93cc7e59711af1b564
2014-01-03cp#2013101510000026: doc export of commented text rangesZolnai Tamás
Change-Id: I2d31da5d659edcbebc682d5604d2db24b5e341fb
2014-01-03cp#2013101510000026: fix doc export of comments initialsZolnai Tamás
It seems comments' authers were exported twice. Once istead of initials. Change-Id: I082fb5caea99df013922e16c5d8d4ef29e866665
2014-01-03cp#2013101510000026: wrong highlight of commented text range imported from docZolnai Tamás
When makeFieldBookmark() method is called with ODF_COMMENTRANGE it will ignore the added field name and generate an own one. We have to set the name of the SwPostItField to this generated name so these two names will match. Note: lTagBkmk is only an identifier but not the exported name of the fieldmark so we don't need to stick to use it as a name. Change-Id: I499abdcce1be0563c308bcf9f5c0a959a07f858b
2014-01-03drawingML import: fix default character height of WPG rectanglesMiklos Vajna
The problem was that due to setting it to 18 in oox, the rectangle didn't inherit the default 11 from the document. Change-Id: I05c3b9c1d64eec58695e2039651a5f015df1f9e4
2014-01-03fdo#69649 Fix for pre-rendered Table Of ContentsVinaya Mandke
Added Import and Export Uts for the same Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/7207 Change-Id: I966b3d268dd407aa05823e29fe1da4d097091265
2014-01-02fdo#73215 oox: don't assume single adjustment is adj during exportMiklos Vajna
So far adjustment names were either taken from the document model, or in case there the name was empty, either "adj" was used (in case of a single adjustment) or "adj1", "adj2", etc. The problem is that there is no consistency here, e.g. this behavior was correct for "cube" (single adjustment is called "adj"), but not for "bentConnector3", where the single argument is called "adj1". Instead of trying to guess or build a long list manually, use the new ooxDrawingMLGetAdjNames() to write the correct names. Change-Id: I3d609975d89c7c79f4a70c7a739cab8e01f9667f
2014-01-02Resolves: #i119568# The page number of the docx in the TOC is not correctSteve Yin
(cherry picked from commit 875f8fb79613875296139a6cbdbae265a92d7a32) Conflicts: sw/source/core/unocore/unoidx.cxx Change-Id: Ie5c66c8226284413419a5b4c105e9529cf8cadf7
2014-01-02hidpi: Really use BMP_SCALE_FAST when scaling the images.Keith Curtis
It is not a problem of performance, but of the look - the images get too blurry in the case of icons; and the blurry look is worse than than the artifacts of the fast scaling. Revert "hidpi: Use the default scaling algorithm." This reverts commit e07097cce36f1220f5574a80dc22eeabb3005261. Change-Id: I8af2827758e02ec3c8b7dade1559c45bd9f0ef35
2014-01-02fdo#73215 filter: don't try to handle pictureFrame in GetOOXMLPresetGeometry()Miklos Vajna
"pictureFrame" is not a valid drawingML shape type, VML export used to write just "rect", by removing an explicit entry for ESCHER_ShpInst_PictureFrame we now do the same. Change-Id: I57683b7f5f80bfef8c3b6fb9ae9f33e4599a7eb2
2014-01-02oox: fix export of TextShapes in DOCXMiklos Vajna
This was the last shape type that unconditionally wrote XML_sp for the shape element, which is invalid for DOCX. Change-Id: I3a6f8e6fd8ebbe663dce9ed4453396c3ec91c38a
2014-01-02Add unit-test for 'track changes - inserted paragraph mark' preservationAdam Co
This is a unit-test added to complement the patch that added support for the preservation of 'Track Changes - Inserted Paragraph Mark' from a DOCX file. Change-Id: I21e67b3ed8c98e8aba2c633dc6a549786ae44322 Reviewed-on: https://gerrit.libreoffice.org/7241 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2014-01-02Add unit-test for 'track changes - deleted paragraph mark' preservationAdam Co
This is a unit-test added to complement the patch that added support for the preservation of 'Track Changes - Deleted Paragraph Mark' from a DOCX file. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/7240 Change-Id: I161bcd90ec891fad60dfd5b7c77edddfd90b7fa8
2014-01-02fdo#73046 DOCX For anchor tag relativeHeight attributeNikhil Walvekar
should be always present. Change-Id: Ib54651878b6343e2ab8bb11a13c11289dd0f72f6 Reviewed-on: https://gerrit.libreoffice.org/7208 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-12-31Related: fdo#66440 RTF export: handle NULL component in FlyFrameOLEMath()Miklos Vajna
No testcase, for some reason the bugdoc doesn't crash in CppunitTest_sw_filters_test, but it does using './soffice --headless --convert-to'. But anyway, it's just a NULL pointer check. Change-Id: I21325a4df45b3b9bcd43d0a8eb57d45b3ab7397c
2013-12-31svx: Use constructor feature for SvXMLGraphicImportExportHelper.Matúš Kukan
Change-Id: Icc281ece80b81cdd95b6660c6a82077d283f5a62
2013-12-30Related: fdo#70624 RTF export: fix crash when header contains a page breakMiklos Vajna
I don't even try to imagine how such a thing can be created and/or how layout should handle that; but it turns out that the ODT bugdoc indeed contains a fo:break-before="page" in the header, and we at least should not crash on it. Fix the problem by simple moving the init of m_pSections before the WritePageDescTable() call. Change-Id: If414e2f6184c58fcfd8b761d3b43fa0fc22d3903
2013-12-30valgrind: invalid read on deleted SwPageFrmCaolán McNamara
VALGRIND=memcheck make CppunitTest_sw_ooxmlimport ==2829== Invalid read of size 2 ==2829== at 0x10B9A2CC: SwPageFrm::GetPhyPageNum() const (pagefrm.hxx:191) ==2829== by 0x1107A768: SwLayAction::InternalAction() (layact.cxx:573) ==2829== by 0x1107A0B6: SwLayAction::Action() (layact.cxx:448) ==2829== by 0x114E025E: SwViewShell::CalcLayout() (viewsh.cxx:915) ==2829== by 0xFC52E5B: SwModelTestBase::calcLayout() (swmodeltestbase.hxx:214) ==2829== by 0xFC54167: SwModelTestBase::load(char const*, char const*) (swmodeltestbase.hxx:425) ==2829== by 0xFC52A74: SwModelTestBase::executeImportTest(char const*) (swmodeltestbase.hxx:131) ==2829== by 0xFC6B046: testN830205::Import() (ooxmlimport.cxx:1248) ==2829== by 0xFC99A6B: CppUnit::TestCaller<testN830205>::runTest() (TestCaller.h:166) ==2829== by 0x4CAE1D3: CppUnit::TestCaseMethodFunctor::operator()() const (TestCase.cpp:32) ==2829== by 0xCF009E2: (anonymous namespace)::Prot::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) (unobootstrapprotector.cxx:88) ==2829== by 0x4CA630E: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (ProtectorChain.cpp:20) ==2829== by 0xBB0E535: (anonymous namespace)::Prot::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) (unoexceptionprotector.cxx:64) ==2829== by 0x4CA630E: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (ProtectorChain.cpp:20) ==2829== by 0x4C97C83: CppUnit::DefaultProtector::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) (DefaultProtector.cpp:15) ==2829== by 0x4CA630E: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (ProtectorChain.cpp:20) ==2829== by 0x4CA61A3: CppUnit::ProtectorChain::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) (ProtectorChain.cpp:77) ==2829== by 0x4CBD3B9: CppUnit::TestResult::protect(CppUnit::Functor const&, CppUnit::Test*, std::string const&) (TestResult.cpp:181) ==2829== by 0x4CADCA3: CppUnit::TestCase::run(CppUnit::TestResult*) (TestCase.cpp:92) ==2829== by 0x4CAEA3F: CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) (TestComposite.cpp:64) ==2829== by 0x4CAE8C9: CppUnit::TestComposite::run(CppUnit::TestResult*) (TestComposite.cpp:23) ==2829== by 0x4CAEA3F: CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) (TestComposite.cpp:64) ==2829== by 0x4CAE8C9: CppUnit::TestComposite::run(CppUnit::TestResult*) (TestComposite.cpp:23) ==2829== by 0x4CC45A5: CppUnit::TestRunner::WrappingSuite::run(CppUnit::TestResult*) (TestRunner.cpp:47) ==2829== by 0x4CBD0C3: CppUnit::TestResult::runTest(CppUnit::Test*) (TestResult.cpp:148) ==2829== by 0x4CC4803: CppUnit::TestRunner::run(CppUnit::TestResult&, std::string const&) (TestRunner.cpp:96) ==2829== by 0x403F3E: (anonymous namespace)::ProtectedFixtureFunctor::run() const (cppunittester.cxx:150) ==2829== by 0x4045C6: sal_main() (cppunittester.cxx:242) ==2829== by 0x40420E: main (cppunittester.cxx:166) ==2829== Address 0x2b4bbd48 is 312 bytes inside a block of size 320 free'd ==2829== at 0x4A074C4: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==2829== by 0x4F386E7: rtl_freeMemory_SYSTEM(void*) (alloc_global.cxx:276) ==2829== by 0x4F3899E: rtl_freeMemory (alloc_global.cxx:346) ==2829== by 0x4F37494: rtl_cache_free (alloc_cache.cxx:1231) ==2829== by 0x13D7EF6D: FixedMemPool::Free(void*) (mempool.cxx:48) ==2829== by 0x1106890F: SwPageFrm::operator delete(void*, unsigned long) (in /home/caolan/LibreOffice/core/instdir/program/libswlo.so) ==2829== by 0x110A113A: SwPageFrm::~SwPageFrm() (pagechg.cxx:301) ==2829== by 0x110A3713: SwFrm::CheckPageDescs(SwPageFrm*, unsigned char) (pagechg.cxx:1122) ==2829== by 0x1107A717: SwLayAction::InternalAction() (layact.cxx:566) ==2829== by 0x1107A0B6: SwLayAction::Action() (layact.cxx:448) ==2829== by 0x114E025E: SwViewShell::CalcLayout() (viewsh.cxx:915) ==2829== by 0xFC52E5B: SwModelTestBase::calcLayout() (swmodeltestbase.hxx:214) ==2829== by 0xFC54167: SwModelTestBase::load(char const*, char const*) (swmodeltestbase.hxx:425) ==2829== by 0xFC52A74: SwModelTestBase::executeImportTest(char const*) (swmodeltestbase.hxx:131) ==2829== by 0xFC6B046: testN830205::Import() (ooxmlimport.cxx:1248) ==2829== by 0xFC99A6B: CppUnit::TestCaller<testN830205>::runTest() (TestCaller.h:166) ==2829== by 0x4CAE1D3: CppUnit::TestCaseMethodFunctor::operator()() const (TestCase.cpp:32) ==2829== by 0xCF009E2: (anonymous namespace)::Prot::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) (unobootstrapprotector.cxx:88) ==2829== by 0x4CA630E: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (ProtectorChain.cpp:20) ==2829== by 0xBB0E535: (anonymous namespace)::Prot::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) (unoexceptionprotector.cxx:64) ==2829== by 0x4CA630E: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (ProtectorChain.cpp:20) ==2829== by 0x4C97C83: CppUnit::DefaultProtector::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) (DefaultProtector.cpp:15) ==2829== by 0x4CA630E: CppUnit::ProtectorChain::ProtectFunctor::operator()() const (ProtectorChain.cpp:20) ==2829== by 0x4CA61A3: CppUnit::ProtectorChain::protect(CppUnit::Functor const&, CppUnit::ProtectorContext const&) (ProtectorChain.cpp:77) ==2829== by 0x4CBD3B9: CppUnit::TestResult::protect(CppUnit::Functor const&, CppUnit::Test*, std::string const&) (TestResult.cpp:181) ==2829== by 0x4CADCA3: CppUnit::TestCase::run(CppUnit::TestResult*) (TestCase.cpp:92) ==2829== by 0x4CAEA3F: CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) (TestComposite.cpp:64) ==2829== by 0x4CAE8C9: CppUnit::TestComposite::run(CppUnit::TestResult*) (TestComposite.cpp:23) ==2829== by 0x4CAEA3F: CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*) (TestComposite.cpp:64) ==2829== by 0x4CAE8C9: CppUnit::TestComposite::run(CppUnit::TestResult*) (TestComposite.cpp:23) ==2829== by 0x4CC45A5: CppUnit::TestRunner::WrappingSuite::run(CppUnit::TestResult*) (TestRunner.cpp:47) ==2829== by 0x4CBD0C3: CppUnit::TestResult::runTest(CppUnit::Test*) (TestResult.cpp:148) ==2829== by 0x4CC4803: CppUnit::TestRunner::run(CppUnit::TestResult&, std::string const&) (TestRunner.cpp:96) ==2829== by 0x403F3E: (anonymous namespace)::ProtectedFixtureFunctor::run() const (cppunittester.cxx:150) ==2829== by 0x4045C6: sal_main() (cppunittester.cxx:242) ==2829== by 0x40420E: main (cppunittester.cxx:166) Revert "Revert "bnc#382137 SwFrm::CheckPageDescs: notify clients about deleted SwPageFrm"" This reverts commit 97035c95c27b34313eadd09692804045f67f440a seeing as the modified SwFrm::CheckPageDescs that updates the passed in previous page if it will be deleted is better than crashing and adds it to the other callsite that deletes the page. Change-Id: I653bab423ffa704aef45c2a7b2ac0699b72e9d3a
2013-12-29fdo#41109 RTF shape import: handle fBehindDocument propertyMiklos Vajna
Change-Id: I9bf24eb2d3087e855d54c0ee7aba4e98dc856cc2
2013-12-29fdo#41109 RTF shape import: shpz has priority over dhgtMiklos Vajna
And not the other way around, how 24ee3df385cf2aa95cd888581c84fdf90cc682dc (RTF import: fix priority handling of shpz vs dhgt, 2012-04-10) did, this time with a reproducer. Change-Id: I9412341c6b35ca2760e4490a18f11bc6a0e0b78a
2013-12-28Avoid obscure and almost unused typedefMatteo Casalin
Change-Id: Ia57b39c770adcb506fb8457ca6cdbd3c6a2b0a76
2013-12-28fdo#65090 RTF filter: import RTF_CLMGF and RTF_CLMRGMiklos Vajna
These describe an explicit horizontal merge, that is not something Word itself creates, but it turns out the Calc RTF export does. Change-Id: I1b6ec10bb8e8bd40e24791ccc96f2f066dd0d5d5
2013-12-27Related: fdo#65090 DOCX import: handle w:hMerge cell propertyMiklos Vajna
Change-Id: I82f334426715fd1a1f0105b86f763d41e66f32da
2013-12-27Related: fdo#65090 Fix crash in SwXTextTableCursor::mergeRange()Miklos Vajna
Regression from b844f06b36cf9a6c1411861a08701c8f9be2af0d (fdo#48692: fix problems with large number of table cells, 2012-09-21), the problem was that GetSelectedBoxesCount() may return 0, and if that happens, the prefix decrement operator set nCount to 0xffffffffffffffff, which then resulted in a call to DeleteBox(), which did not happen before. Thanks debug STL for pointing out this issue. Change-Id: I9eee55f642726343c4ce9af479ccd2c4dde03b6a
2013-12-27drop SfxNoLayoutSingleTabDialog declarationsCaolán McNamara
Change-Id: I1ceeff76292f9d9884112a69ecdd6052184a657c
2013-12-27use SfxSingleTabDialogBase here nowCaolán McNamara
Change-Id: Ibd5d82f93fb94db3e8d53acc9df05f2459807bb4
2013-12-27Fix stepping to the next changeZolnai Tamás
Bug description: In the "Accept or Reject Changes" dialog, when select a change (it should be after the first few ones) and clicking "Accept" or "Reject" button, acception/rejection is made but after it not the next change is selected for futher work, but a random one. This bug doesn't appear in all case, just if changes are complex enough. Solution: The nPos means absolute position so we have to get the next entry with the corresponding GetEntryAtAbsPos() method. It seems simple position can differ from absolute positions if changes are complex enough. Change-Id: I7996f81c2a09c492f9334f071591291d200d533f
2013-12-27Transex3: NO_LOCALIZE_EXPORTZolnai Tamás
In the past, NO_LOCALIZE_EXPORT macro must be used to skip uneeded parsing of src files which has no localizable content. It is unsued by now and it is more effective to handle this files on gmake level: gb_SrsTarget_add_nonlocalizable_files gb_SrsTarget_add_nonlocalizable_templates Plus remove some empty src file. Change-Id: I8fc9b2db0b5fd7a3379d3c5be970c4fc691f4c53
2013-12-25cppcheck: Prefer prefix ++/-- operators for non-primitive typesJulien Nabet
Change-Id: I8bd50f3c9ea3cfc770d530c9cbde0ad00e4def4c
2013-12-24DOCX import: close rPrChange properly.Zolnai Tamás
Call endtrackchanges when rPrChange ends so the corresponding redline will be removed. Change-Id: I4091d7b54e0a74f3158cc979f210577a2dc29783
2013-12-24Cleanup SwXMailMerge constructor.Jan-Marek Glogowski
Move all fixed initializers into constructor definition. Change-Id: I7317deae43abf6a9e865c66969cb39a4b69de826 Reviewed-on: https://gerrit.libreoffice.org/7189 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-12-23add a border to some widgets in exchange databaseCaolán McNamara
Change-Id: I48fed93932db28ca1649c7e6c1abf4017757cd45
generated by cgit (git 2.34.1) at 2025-01-29 05:20:42 +0000