summaryrefslogtreecommitdiff
path: root/sw/source/core
AgeCommit message (Collapse)AuthorFilesLines
2015-12-15tdf#96125 Fix broken Writer paragraph text-to-text alignment feature.Mark Hung1-1/+1
Revert "Fix tdf#77514 CJK ruby text in RTL( vertical ) base line issue." This reverts commit b14861e1dfb9f83d26d6032ae96b664845528f2a. Conflicts: sw/source/core/text/itrpaint.cxx Change-Id: I4b7f7437014032566227f745e5e81b6a01ba022f Reviewed-on: https://gerrit.libreoffice.org/20358 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2015-12-15fix paint table border in DOUBLE_THIN styleaqcoder1-0/+18
it always paint partial table border which have line style of DOUBLE_THIN. Becouse the partial of the border line is out of the invalid window rect. so, we extend it. Change-Id: I9d95ca71a96cfa869c68d9d2200f29c7cd447eca Reviewed-on: https://gerrit.libreoffice.org/20701 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2015-12-15tdf#96113 sw: don't overwrite fo:background-color on ODT frame importMiklos Vajna1-1/+1
The situation is similar to commit 79fb61efb847405fa47235002b52ee8efad5e339 (tdf#92379: svx: don't overwrite fo:background-color on ODF import, 2015-08-21), except that here text frames had the problem of loosing colors when transparency is set. Fix the problem by informing getSvxBrushItemFromSourceSet() about if we're in XML import or not. Change-Id: Id1adf60b14a3762f0a2a43c49caeed9f6ea039be
2015-12-14Move var decl to where it gets actually usedStephan Bergmann1-18/+20
Change-Id: I8f9e74f7fbbff055c67cafba5d534db4635e5399
2015-12-14Related: rhbz#1289394 always provide the screen area the tip applies toCaolán McNamara1-3/+3
this will make it easier to implement native help tips Change-Id: I984dfadaf02e9b7bf542ba82cf070911c89cb699
2015-12-12tdf#36722: Enable footnote separator line style NONEOliver Specht1-1/+1
adds detection of css::table::BorderLineStyle::NONE to the LineListBox and stops painting NONE style lines Change-Id: Ib24fa25a9e3e3ae685f2000685f01cae42d1653f Reviewed-on: https://gerrit.libreoffice.org/20639 Reviewed-by: Oliver Specht <oliver.specht@cib.de> Tested-by: Oliver Specht <oliver.specht@cib.de>
2015-12-12replace homegrown map with std::map<>Bjoern Michaelsen1-104/+41
Change-Id: I5f35e0aeb6cef5920891eaa338c1d9b29e0ce554
2015-12-11use preincrement here for graceBjoern Michaelsen1-1/+1
Change-Id: I7141510fbda1158511698f73c48274008f0a41dc
2015-12-11add test for UNO writer style families ...Bjoern Michaelsen1-8/+7
... and fix the breakages it finds. Change-Id: Ibc7289cc0cd7fb5648d686bd55afff9016f58b3b Reviewed-on: https://gerrit.libreoffice.org/20638 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Jenkins <ci@libreoffice.org>
2015-12-11tdf#69977: uno::Sequence is expensiveNoel Grandin8-79/+71
when used as a mutable data-structure. Plain std::vector halves the time taken to display the chart dialog Create a class to represent the std::vector we are going to be passing around, and move some of the utility methods into it to make the code prettier. Also create an optimised append(&&) method for the common case of appending small temporaries. Change-Id: I7f5b43fb4a8a84e40e6a52fcb7e9f974091b4485
2015-12-11sw: clean up no longer needed SwViewShell::isTiledRendering()Miklos Vajna5-18/+17
Change-Id: Icd719c461613f8c59cad81b256678307f69974e1
2015-12-10tdf#91665 l10n: replace string lists - by separate stringsJuergen Funk1-37/+31
Convert the stingarray in resource strings. A lot of need a translation in other language Improve a lot of stuff Change-Id: I1c97949fa3a3de17efe0a358370b5a7b6a772686 Reviewed-on: https://gerrit.libreoffice.org/20557 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2015-12-10sw: accept a const text node in SwRDFHelper::getTextNodeStatements()Miklos Vajna1-1/+4
It's an implementation detail that the used UNO API needs a non-cost text node, even if only read methods are called on the wrapper object. Change-Id: If15eaca48339f1531fd54da3422a6b7c41eb48f7
2015-12-09tdf#92623 Handle StartOfContent node for copying bookmarksJan-Marek Glogowski1-1/+9
For SwDoc::AppendDoc we use the StartOfContent node as the starting copy node to prevent merging of the first node in CopyRange and to get a 2nd node needed for CopyRange in case of single content node documents. This correctly counts StartOfContent as a non-copy node when adapting the bookmark ranges for copying. Change-Id: Ia3ee0328a1be5548f8751aa2240812c4662fb73f Reviewed-on: https://gerrit.libreoffice.org/20383 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2015-12-09sw: implement addition of statements in SwRDFHelperMiklos Vajna1-1/+18
With this, the only thing that blocks the DOC import to handle smart tags is the lack of RDF metadata initialization in the filter. Change-Id: I33ab74c7d6ceaac42cc94fdf0b1dfcb0eaf61ab4
2015-12-09sw: handle RDF mark in SwFltControlStack::SetAttrInDoc()Miklos Vajna1-0/+4
Change-Id: I13e510e305c4aa24c37b1c25b4c3116ef3f06a8a
2015-12-08sw: redundant condition, was checked previouslyMichael Stahl1-1/+1
Change-Id: I7934bc993e049169a08b835f922da8ef50ea05ee
2015-12-07Avoid -fsanitize=signed-integer-overflowStephan Bergmann1-1/+1
...later on during loading of (a local copy of) <https://wiki.documentfoundation.org/images/5/50/BH40-BaseHandbook.odt> at > sw/inc/swrect.hxx:249:48: runtime error: signed integer overflow: 1080100 + 9223372036853697509 cannot be represented in type 'long' > SwRect::Bottom() const sw/inc/swrect.hxx:249:48 > SwTextFly::CalcMinBottom() const sw/source/core/text/txtfly.cxx:996:31 > SwTextFly::GetMinBottom() const sw/source/core/inc/txtfly.hxx:339:45 > SwTextFormatter::CalcBottomLine() const sw/source/core/text/itrform2.cxx:1917:20 > SwTextFrame::FormatAdjust(SwTextFormatter&, WidowsAndOrphans&, int, bool) sw/source/core/text/frmform.cxx:1092:26 > SwTextFrame::_Format(SwTextFormatter&, SwTextFormatInfo&, bool) sw/source/core/text/frmform.cxx:1552:13 > SwTextFrame::_Format(OutputDevice*, SwParaPortion*) sw/source/core/text/frmform.cxx:1662:5 > SwTextFrame::Format(OutputDevice*, SwBorderAttrs const*) sw/source/core/text/frmform.cxx:1809:17 > SwContentFrame::MakeAll(OutputDevice*) sw/source/core/layout/calcmove.cxx:1391:17 > SwFrame::PrepareMake(OutputDevice*) sw/source/core/layout/calcmove.cxx:307:21 > SwFrame::Calc(OutputDevice*) const sw/source/core/layout/trvlfrm.cxx:1798:9 > SwObjectFormatterTextFrame::FormatAnchorFrameAndItsPrevs(SwTextFrame&) sw/source/core/layout/objectformattertxtfrm.cxx:753:9 > SwFlyAtContentFrame::MakeAll(OutputDevice*) sw/source/core/layout/flycnt.cxx:419:21 > SwFrame::PrepareMake(OutputDevice*) sw/source/core/layout/calcmove.cxx:341:5 > SwFlyFrame::Calc(OutputDevice*) const sw/source/core/layout/fly.cxx:2665:9 > SwLayAction::FormatLayoutFly(SwFlyFrame*) sw/source/core/layout/layact.cxx:1428:9 > SwObjectFormatter::_FormatObj(SwAnchoredObject&) sw/source/core/layout/objectformatter.cxx:331:17 > SwObjectFormatterTextFrame::DoFormatObj(SwAnchoredObject&, bool) sw/source/core/layout/objectformattertxtfrm.cxx:134:9 > SwObjectFormatter::_FormatObjsAtFrame(SwTextFrame*) sw/source/core/layout/objectformatter.cxx:453:19 > SwObjectFormatterTextFrame::DoFormatObjs() sw/source/core/layout/objectformattertxtfrm.cxx:336:20 > SwObjectFormatter::FormatObjsAtFrame(SwFrame&, SwPageFrame const&, SwLayAction*) sw/source/core/layout/objectformatter.cxx:193:20 > SwLayAction::FormatContent(SwPageFrame const*) sw/source/core/layout/layact.cxx:1651:19 > SwLayAction::InternalAction(OutputDevice*) sw/source/core/layout/layact.cxx:572:31 > SwLayAction::Action(OutputDevice*) sw/source/core/layout/layact.cxx:352:5 > SwLayIdle::SwLayIdle(SwRootFrame*, SwViewShellImp*) sw/source/core/layout/layact.cxx:2159:13 > SwViewShell::LayoutIdle() sw/source/core/view/viewsh.cxx:728:19 > sw::DocumentTimerManager::DoIdleJobs(Idle*) sw/source/core/doc/DocumentTimerManager.cxx:119:17 > sw::DocumentTimerManager::LinkStubDoIdleJobs(void*, Idle*) sw/source/core/doc/DocumentTimerManager.cxx:81:1 > Link<Idle*, void>::Call(Idle*) const include/tools/link.hxx:84:45 > Idle::Invoke() vcl/source/app/idle.cxx:25:5 > ImplSchedulerData::Invoke() vcl/source/app/scheduler.cxx:40:5 > Scheduler::ProcessTaskScheduling(bool) vcl/source/app/scheduler.cxx:170:9 > ImplYield(bool, bool, unsigned long) vcl/source/app/svapp.cxx:519:5 > Application::Yield() vcl/source/app/svapp.cxx:535:5 > Application::Execute() vcl/source/app/svapp.cxx:471:9 > desktop::Desktop::DoExecute() desktop/source/app/app.cxx:1284:5 > desktop::Desktop::Main() desktop/source/app/app.cxx:1609:17 > ImplSVMain() vcl/source/app/svmain.cxx:170:19 > SVMain() vcl/source/app/svmain.cxx:207:16 > soffice_main desktop/source/app/sofficemain.cxx:96:12 > sal_main desktop/source/app/main.c:48:15 > main desktop/source/app/main.c:47 ...whatever those hardcoded odd values used here, the code is the same ever since 84a3db80b4fd66c6854b3135b5f69b61fd828e62 "initial import" Change-Id: I7f10034f97c52256d873b86a683c9204b944e704
2015-12-04fix SwClient crash in SwXNumberingRules/SwXTableRows/SwXTableColumnsNoel Grandin2-13/+57
was generated a crash when running 'make check' on my Linux box. These classes need to hold the SolarMutex when destructing their SwClient base class. Change-Id: I448ea00978d003aa37d8663d37b4edf9e54a6a56 Reviewed-on: https://gerrit.libreoffice.org/20391 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-12-03tdf#34957 - don't push multi-page table to next page.Justin Luth1-2/+1
Removing an old hack that is no longer needed. A table marked as “keep with next” doesn't split and keeps with the following paragraph already. It doesn't require this old hack to function properly anymore. Preventing tables from splitting had forced large tables to always start on a new page. Removing the hack allows everything to lay out nicely now. There is a fairly large suite of tests in the bug report that prove the proper layout of various keep-with-next situations. Any document depending on the old behaviour can simply (and properly) insert a manual page-break before the table in order to force it to start on a new page. Change-Id: Ie2036c1a638009aaf95247574998077a1e55b5e5 Reviewed-on: https://gerrit.libreoffice.org/20216 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org>
2015-12-03uno:Sequence->std::vector in SmartTagMgrNoel Grandin1-13/+6
Change-Id: I163f7d6c0f30ac2929df1cae202e695d21bb49fc
2015-12-02sw: initial SwRDFHelperMiklos Vajna1-0/+51
The purpose of this class is to provide access to the subset of the RDF metadata that's interesting for core code and for internal filters. Change-Id: Ibecba302dd839b537a36b9f7a15f012c6ea26869
2015-12-02an empty string here seems no hardshipCaolán McNamara1-1/+0
Change-Id: I8c8589f6ff7a190556cc4aa016ae343a19378b18
2015-12-01tdf#88443:percent value fixedOliver Specht1-1/+1
Change-Id: I221f07b930fa1f152b9bf379aa966c02b936abb2
2015-12-01tdf#88443: set relative width to objects with captions except formulasOliver Specht1-1/+13
a fix to aoo issue 51453 switched off relative with to all objects with captions to solve a problem related to formulas now all objects with captions get relative width except math formulas Change-Id: I39ccc292ff156c4c94a7a898a6a0602c72bbdd26 Reviewed-on: https://gerrit.libreoffice.org/20320 Reviewed-by: Oliver Specht <oliver.specht@cib.de> Tested-by: Oliver Specht <oliver.specht@cib.de>
2015-11-30Move uses of SwFrame pointer-to-member after definition of class SwFrameStephan Bergmann1-92/+91
...to avoid trouble with MSVC's pointer-to-member model, where the details of a pointer-to-member depend on details of the pointed-to class type. Change-Id: Id5b3be1696794d23fbad96f047d114e27395b134
2015-11-30loplugin:unusedfieldsNoel Grandin2-33/+9
Change-Id: Ife94d488ead512abc6d137a0df74298bac67185d
2015-11-29our little MSVC cant read C++11 proper and has special needs instead ...Bjoern Michaelsen1-18/+19
Change-Id: Ibc5ed9406679f469a7d4855f08f1a8c23c7239ef
2015-11-29use a range template for the frame,page,pseudo translationsBjoern Michaelsen1-25/+9
Change-Id: I50698023c006025bad4ae5d9a632c20b8f897006
2015-11-29use the entry vector for lcl_TranslateIndex dispatchBjoern Michaelsen1-57/+69
Change-Id: I4a8361821b9a5af2a59ad29684ee243d2f4591ed
2015-11-29remove copy patsaBjoern Michaelsen1-7/+1
Change-Id: I753786b6d3e92f0ebd609cc4430887fd7e2c2f81
2015-11-29use entries to create stylesBjoern Michaelsen1-33/+23
Change-Id: Ie68277b2ca9f4a82d048c7b74ab6705e8ca164b2
2015-11-29use the entry vector for lcl_GetCountOrName dispatchBjoern Michaelsen1-32/+17
- since the "entries" gain virtual functions now, it might make sense to make the entries proper classes. Lets see. Change-Id: I9ffae682869bc7560ee108c120efe6b65ea6c82f
2015-11-29tdf#38835: use singleton instead of staticBjoern Michaelsen1-21/+37
Change-Id: Id200dd245043537d288e30118debe2b338cf1774
2015-11-29keep a reference to the static entry data for the familyBjoern Michaelsen1-50/+53
Change-Id: I9171202fb5c6e32016550243a027001e5c910c3c
2015-11-29use Families instead of the generic 'Container'Bjoern Michaelsen1-4/+4
Change-Id: I009002621a5481b91e14a215237278d56d742579
2015-11-29typo: m_nRedId => m_nResIdBjoern Michaelsen1-4/+4
Change-Id: I0659155b19870117e97f691aa4fdceee8f2d4c08
2015-11-29clean up and reduce indent levelsBjoern Michaelsen1-8/+6
Change-Id: I5aa38475eff213620b29e89a0df0833c95207a91
2015-11-29add ranges for pages, frames, numsBjoern Michaelsen1-13/+13
Change-Id: Id3c0f39b076bd3908d3ac4154e72ee14ca3963ae
2015-11-29make GetCountOrName a private member to reduce argsBjoern Michaelsen1-10/+11
Change-Id: I72430f032d032f825034ec00d662ceaaa6a4dc62
2015-11-29consolidate range voodooBjoern Michaelsen1-49/+41
Change-Id: I76c64f15cd94ea281e44ddd488bc7eb7abc1575d
2015-11-29inline trivial functionsBjoern Michaelsen1-75/+45
Change-Id: I00a75c846ca86dc05f42211c700561c066f85586
2015-11-29SwXStyleFamily=>sw::XStyleFamilyBjoern Michaelsen1-79/+86
Change-Id: I334c4db5113902668d6967719c65ba403e9dde65
2015-11-29SwXStyleFamily has no need to be in a headerBjoern Michaelsen1-0/+53
Change-Id: I2bc38e870377bd4355b373e1fee0a3fd95866793
2015-11-29clean up and reduce indent levelsBjoern Michaelsen1-6/+4
Change-Id: I8cbc62d9d404f4dd4039d43411c53d3cf4a8275f
2015-11-29clean up and reduce indent levelsBjoern Michaelsen1-20/+6
Change-Id: Ic96a95a3263c1b10c33e79f5fee19e7bf06498c9
2015-11-29simplifyBjoern Michaelsen1-4/+2
Change-Id: If065b30b93c603032f47a3e470f4faadf92a4d09
2015-11-29OSL_FAIL->SAL_WARNBjoern Michaelsen1-15/+5
Change-Id: Ic21516d1d3892cd73aaa29ae477985ca2d35638d
2015-11-29clean up and reduce indent levelsBjoern Michaelsen1-13/+8
Change-Id: Iccc1b3f2499025b8dad920f4b0f4b674b5d394ce
2015-11-29clean up and reduce indent levelsBjoern Michaelsen1-23/+19
Change-Id: Idfc5ea5acf7f09046c92aa37ff01df29147cd738