summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-10tdf#90230 SwDoc::AppendDoc: take care of marks when inserting page breakMiklos Vajna
SwDoc::AppendDoc() inserts nodes from an other document, and before doing that, it inserts a page break at the end of the document. In case there are marks at the end of the last paragraph, the insertion of the page break moves them to the next page. This is a rare situation, but happens e.g. when the source document is an empty one: then MM puts a mark at the first paragraph of each inserted MM part, and then the first paragraph == the last paragraph, so the mark of the only paragraph in the document gets moved to the next page. This is a problem on its own, but is detected by the SwIndexReg dtor when that empty paragraph gets deleted later in SwNodes::Delete() called by SwDoc::AppendDoc(), resulting in an assertion failure. Triggered by commit a305a2c91420652db450b7f8edd140e1d69f42cf (use bookmarks to mark mailmerge parts in a mailmerge document (fdo#80823), 2014-10-20), these not adjusted bookmarks were not detected before. Change-Id: I89775b477a2fd3182b2bc87144aed2bfe7912aff
2015-04-10sw::mark::MarkManager::dumpAsXml(): show UNO marksMiklos Vajna
Change-Id: Ic19ef6465036050b3b72949af65e23f8dde3afcf
2015-04-10cppcheck: provide a ctorTakeshi Abe
This also employs smart pointers for some variables in Test, and drops unused code which b3edb2410387e0ad63ee663cd3b706076bea3edb left behind. Change-Id: I6c19d4b8f65b057bad2106c3e9d081446a2619a1 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2015-04-10Update @since tags LO 4.5 -> 5.0Stephan Bergmann
Change-Id: Idb2e46fcaa080d6763d2e3ed963f7673a2353eb2
2015-04-10No need to go via floating-point calculationsStephan Bergmann
Change-Id: I049aa3f5be42c520f824ec62943c37e8ffac78ad
2015-04-10Get rid of false GCC 4.7 -Werror=type-limits in template codeStephan Bergmann
Change-Id: I4b13d3b7d74690401234dfa30c8c1b6647820b6a Reviewed-on: https://gerrit.libreoffice.org/15216 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2015-04-10convert SFXOBJECTSHELL_ constants to scoped enumNoel Grandin
Change-Id: I5a159be0c342b778730cedb0fe35843c2c368c97
2015-04-10convert SFXMODEL_ to scoped enumNoel Grandin
and fix up some confusion in SC and STARMATH about which constants to use Change-Id: Ib75bc78a24bd2fad6ec6d7c94c4c1ad7dc222c1a
2015-04-10convert SfxObjectCreateMode to scoped enumNoel Grandin
and fix some dodgy usage in /sc in the process Change-Id: Ia2bee267df31aba431fc8cb81195bb83e5b64deb
2015-04-10convert SfxSlotFilterState to scoped enumNoel Grandin
Change-Id: I424a1c71429078f8f83f8f0138c6e12567628ef8
2015-04-10Windows installer: remove unused stringAndras Timar
Change-Id: I0a1163b54601932957b0217894173aeadbf34e6e Reviewed-on: https://gerrit.libreoffice.org/15223 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2015-04-10Don't try to install LibreOffice on XP, if it was built with SDK 8.x or higherAndras Timar
Change-Id: I79a357a51a3d98774745001d5f99b045ef964255 Reviewed-on: https://gerrit.libreoffice.org/15218 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2015-04-10DocxAttributeOutput::m_postponedDiagram: use std::unique_ptr<>Miklos Vajna
Change-Id: Id969145f25e99047d21e9ea3c97323274168cf64
2015-04-09WaE: VarDecl, use "bool" instead of "sal_Bool"Tor Lillqvist
Change-Id: I0b868edad579f9ccf46f6d9f6015086557e528da
2015-04-09Use comphelper::LibreOfficeKit::isActive() instead of LOK_TEST env varTor Lillqvist
Change-Id: Iaa0c751f101df6db25e9fca9123b81ac63033159
2015-04-09Change from <osl/diagnose.h> to <sal/log.hxx> and add more loggingTor Lillqvist
Change-Id: Iee8c093f5aa8306c3e5336d6dd5e801df6df87a4
2015-04-09upgrade to openssl-1.0.2aCaolán McNamara
and de-ifdef-per-platform the patch makefile so an upgrade attempt on one platform tests the patchs applying on all platforms ubsan.patch.0 was effectively applied upstream while need to add http://rt.openssl.org/Ticket/Display.html?id=3650 to build under windows Change-Id: Ieffd9bc3dd861a94a083d8b6b8d4117bba7f527c Reviewed-on: https://gerrit.libreoffice.org/15183 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-09initial load of bibliography doesn't set bibliography typeCaolán McNamara
moving to a new row will set the new type, but initially its not set because the ListStore property was set after the model is connected to the database so at the initial connection time there isn't a available set of values to map the row to. So move that connection code from general.cxx to datman.cxx and put it before the connection is established we can then remove the intermediate aBibTypeArr list and those resources then need to be global bib ones. Change-Id: I12276c3df9955ec399e1b5de6d0836c69ebb1ebb
2015-04-09more verbose debug message from WMFWriter::WriteRecordsAndras Timar
Change-Id: Iebdc66d1c994e3702efa5609fb36b5b2b9273c86 Reviewed-on: https://gerrit.libreoffice.org/15217 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2015-04-09Change tools::Time::GetSystemTicks to sal_uInt64Stephan Bergmann
...as follow-up clean-up after 71fefe1dc2bcda3a4cc18d71e1acaf161cc059f2 "Change 'blink times' to be of type sal_uInt64 and thus consistent with Timer::Get/SetTimeout since 9c7016b5b530ca212b1275f44f9e2fc0527109ee 'Scheduler: Changed uLong to uInt32/uInt64.'" Transitively meant to change quite a number of further time-related places from sal_uLong/sal_uIntPtr to consistently use sal_uInt64. Change-Id: I38eb493943906356138bf58eb098d2f54a3dee34 Reviewed-on: https://gerrit.libreoffice.org/15214 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2015-04-09TableRef: correct GetToken() logicEike Rathke
Ensure that only desired tokens are obtained and the resulting new token is actually the current one upon return. Change-Id: I624c324b861d8658accf3285cad2cfc5a598b450
2015-04-09TableRef: allow column specifier without itemEike Rathke
Change-Id: I1263f190d769254949701b3a257b2af5d6ea61a2
2015-04-09TableRef: lookup column specifierEike Rathke
Change-Id: I73109e5a862b2f4bc456dff512bddf5d23586a6d
2015-04-09stop assert on exit from bibliographyCaolán McNamara
Change-Id: Ia4a52a5e605474738983d48a925b6b3ba90877d4
2015-04-09Resolves: tdf#90384 queue_resize needs to Invalidate the optimal cache sizeCaolán McNamara
but the PanelLayout didn't Change-Id: I38a8975f1488fa2a2ffe91b66745e1a1c6c48a28
2015-04-09Just use a plain std::vector<OUString>Stephan Bergmann
Nothing obvious that would speak against converting from the original SvStringsDtor to plain std::vector<...> instead of slavishly sticking to boost::ptr_vector<boost::nullable<...>>. Also, prevents a false -fsanitize=null warning about "reference binding to null pointer of type 'rtl::OUString'" in boost::void_ptr_iterator<...>::operator*() during ~SvxClipboardFmtItem_Impl(). Change-Id: I08d8fc573ff99a5bddd67c0d2be4e7ea38025958
2015-04-09tdf#89214 SwDoc::GetUniqueNumRuleName: always return pChkStr if it's unusedMiklos Vajna
Regression from commit bb00a0097900ae054401f7758a915047cfde4065 (do not bother with nice unique names during mailmerge, 2014-11-08), SwAttrSet::CopyToModify() expects that in case SwDoc::FindNumRulePtr() returns 0 for a name, then the call to SwDoc::MakeNumRule() will use the not found name (as SwDoc::GetUniqueNumRuleName() will return the just checked name). As a result, simply always returning a random unique name during mail merge is a problem. Only return a cheap random unique name if no hint is given. Change-Id: I49d65009ced97d00aa2e8db35a529f2f30ac9ae5
2015-04-09Resolves: tdf#90423 too risky to dlclose basctl once openedCaolán McNamara
Change-Id: I92c171b5900d770195bcad71a7df2a282649d479
2015-04-09Resolves: tdf#90473 bibliography doesn't resize after reloadCaolán McNamara
resize *after* setting visibility of controls and not before Change-Id: I9318b8a5bc1f4afc6f4ceb4503af3425d0f6364b
2015-04-09Resolves: tdf#90481 fix cropped buttonsCaolán McNamara
this reverts commit f0ee8ed43528b17e9ea6d83388fbaab0a645b677 Author: Caolán McNamara <caolanm@redhat.com> see if we can merge floating window and dialog child size/pos setting seeing as we apparently can't merge them the way that tried to do Change-Id: I25fb741c9ae73375124b469f98bf1eecd76ff3c1
2015-04-09newly set nStart and nEnd are not usedCaolán McNamara
Change-Id: Id9ba3dbd1df46638eb4ca2ef84ba1b40ca424108
2015-04-09Relate: tdf#88045 Edit Numbering Style Button is nonclickable for None EntryHeena Gupta
Conflicts: sw/source/ui/chrdlg/numpara.cxx Change-Id: I3e2c493d412c8e7974e7cb314eb0ba8f13edb6b6 Reviewed-on: https://gerrit.libreoffice.org/14518 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-09Related: tdf#87675 Edit Linked Style Button is nonclickable on None EntryHeena Gupta
Conflicts: sfx2/source/dialog/mgetempl.cxx Change-Id: Ieac16f9cd6063e38c6d8dee0a1f0dba29e1adc6f Reviewed-on: https://gerrit.libreoffice.org/14516 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-09Related: tdf#87675 "Edit" Button for linked style in edit paragraph styleHeena Gupta
Change-Id: Ibb80d88865048e178a8d3e93cb9737881dd9f102 Reviewed-on: https://gerrit.libreoffice.org/13785 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-09fdo#88045-Edit Button for Numbering Style in Edit Paragraph StyleHeena Gupta
Change-Id: I7356eb2074520884ff24d89c68bf1214664f4af3 Reviewed-on: https://gerrit.libreoffice.org/13740 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-09loplugin:staticmethodsNoel Grandin
Change-Id: I715374b531da2850434b2436633b6042ecb9ebe0
2015-04-09tdf#85594 Additional tweaking of the standard, formatting and draw toolbarsYousuf Philips
Change-Id: I37f16184d8671f6f0eba7679e712e458abee314c Reviewed-on: https://gerrit.libreoffice.org/15195 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-09NSAppKitVersionNumber is always greater than NSAppKitVersionNumber10_7Robert Antoni Buj Gelonch
Change-Id: I9e2b9388c5df1b3a5fc0b2deb570b6f63e59b8eb Reviewed-on: https://gerrit.libreoffice.org/14637 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-09tdf#89199: UI option to show data bar only (no values)Katarina Behrens
Change-Id: I13cbde947d6252c1157ec79a5f2190df24cca978
2015-04-09SwEditWin tiled rendering: do word selection even if the cursor was correctedMiklos Vajna
When tiled rendering, we always want to create some kind of selection when long pushing on a table cell. If there is at least one word in the cell, then we want to select the nearest cell, and when it's empty, then we want to select the cell itself. In case there is a table with 1 rows and 2 columns, and A1 is empty, but A2 has multiple lines, then in A1 there is an area that's outside the text frame of the empty paragraph, but inside the A1 cell frame. When clicking on that area, the cursor position gets corrected. With this change, we get a proper selection on long push even when pushing on that "outside text, inside cell" area, too. Change-Id: Ic61743014708f127087243cb7b129f8abd72edaa
2015-04-09loplugin:salboolNoel Grandin
Change-Id: Id4194f4d5bb6fcf064985fddc6f7344a4d34ca04
2015-04-09add Product function to Subtotals UIClément Lassieur
Change-Id: I240859bafa953c75ee639ccb77305161274217d1 Reviewed-on: https://gerrit.libreoffice.org/15210 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-09loplugin:staticmethodsNoel Grandin
Change-Id: Ie348778ea666c24e95e048386547f301083a0017
2015-04-09hinter: 'after' better than 'behind'Caolán McNamara
this has niggled me for decades http://german.stackexchange.com/questions/7528/meaning-of-behind-when-translated-from-german summarizes it well "'Behind' is typically used when the context has meanings of depth, and as such becomes ambiguous when used in a flat list ... 'After'/'before' contain meanings of ordering which are unambiguous" Change-Id: Ib2e7244f1dc0a66a9ca30df3a20e31de7a9b9d09
2015-04-09fix windows and android buildsNoel Grandin
more 'extern C' fallout from my conversion of enum to scoped enum Change-Id: I4c9aabbfbd255775a8f3edc2b7c8c62647f539eb
2015-04-09sc tiled editing: Make the 'long tap to select' work again in shapes.Jan Holesovsky
Change-Id: I77914d1b6fe538f3f38beb449e68f50ae36b0798
2015-04-09fix android buildNoel Grandin
since after my converting stuff in include/registry/types.h to use 'enum class', it can obviously no longer be "extern C", so drop the "extern C" and rename the file to reflect that. Change-Id: Ia30f5731316525e48531c4785ab7471a428bcf6f
2015-04-09DocxAttributeOutput::m_pPostponedGraphic: use std::unique_ptr<>Miklos Vajna
Change-Id: I033cc6fce66203ad2967064211f9144b0edf8d1e
2015-04-09loplugin:staticmethodsNoel Grandin
Change-Id: I2177e424d54dc2b5e26b7bbfe073b524e9cc5bab Reviewed-on: https://gerrit.libreoffice.org/15187 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-04-09convert SFX_SHELL constants to scoped enumNoel Grandin
Change-Id: If1649e8f3b9d200b0b176bef7deea41445bd3f2f