summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-09-30fdo#70346 MM: add mail merge data to condition dictJan-Marek Glogowski
Currently section hide conditions are just evaluated based on document field data. This adds the current mail merge dataset to the condition dictionary, so this can be used in the condition evaluation. The dataset values are named from their columns and added initially, therefore DB fields with identical names will overwrite the values in the dictionary! Change-Id: I82a5f9f6962628a76c836e8e2a7c9e264fdc16e0 Reviewed-on: https://gerrit.libreoffice.org/10978 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 4851cde7b98226b0f82ae2b191c290173e9b06c6) Conflicts: sw/inc/dbfld.hxx sw/inc/dbmgr.hxx sw/source/core/doc/DocumentFieldsManager.cxx sw/source/core/fields/dbfld.cxx sw/source/uibase/dbui/dbmgr.cxx
2014-09-30MM: Don't adapt the view when saving dbg documentsJan-Marek Glogowski
DoSaveCompleted updates the SwViewShell and recent file lists after the document was saved via DoSaveAs. So we can simply drop the call and delete the SfxMedium to save a copy. Change-Id: I04a0710949ca60e1ff4cab24c6b504deb130db63 Reviewed-on: https://gerrit.libreoffice.org/10983 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit a65459eae58f342787abe4c766912f964a8383be) Conflicts: sw/source/uibase/dbui/dbmgr.cxx
2014-09-30MM: refactor cancel handling for dbui dialogsJan-Marek Glogowski
This simplifies the handling of CreateMonitor and PrintMonitor in the combined mail merge function. Change-Id: Iacf933ec1a6017949b29b3d5f62d5f55c4691053 Reviewed-on: https://gerrit.libreoffice.org/10984 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 57d7802145befa4ebc191cc646069aefb58f5c32) Conflicts: sw/source/ui/dbui/mmoutputpage.cxx sw/source/uibase/dbui/dbmgr.cxx sw/source/uibase/dbui/dbui.cxx sw/source/uibase/inc/dbui.hxx
2014-09-30Invalidate rect cache before moving objectJan-Marek Glogowski
Otherwise I get sw/source/core/layout/anchoredobject.cxx:582: <SwAnchoredObject::GetObjRectWithSpaces> - cache for object rectangle inclusive spaces marked as valid, but it couldn't be. Missing invalidation of cache. Please inform OD. Change-Id: I3f315b15fca6e2480c11183269be5583e6aea123 Reviewed-on: https://gerrit.libreoffice.org/10977 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 5dc8691e0909654c68eb0dcbc6d787701d02839b)
2014-09-30fdo#80926 Don't move anchors of invalid pagesJan-Marek Glogowski
If the anchor is valid, check if its page is valid too, before moving anchors on view change. Change-Id: Idffdfdb786cb29a105c06d652e6ad7315abfb4c5 Reviewed-on: https://gerrit.libreoffice.org/10976 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 508d2d2b1a6a23043c8c0f0d3fea4ec033ac2684)
2014-09-30Fix single node CopyRangeJan-Marek Glogowski
Previously there was a restriction for the range to contain at least two nodes. Change-Id: Iadf21d3928303c2ab8df0d93dabd969ed1ff7e09 Reviewed-on: https://gerrit.libreoffice.org/10972 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 9099e21b89184bd4e39def497e483cac4a77ec5a) Conflicts: sw/inc/IDocumentContentOperations.hxx sw/source/core/doc/DocumentContentOperationsManager.cxx sw/source/core/inc/DocumentContentOperationsManager.hxx
2014-09-30Refactor NumRule handling in CopyImplJan-Marek Glogowski
The bug fix for i#86492 added a lot of duplicated code. This moves the code into their own functions and uses macros to make the resulting code even more readable. Change-Id: Ifa0ece26f3152f1f8d8c65173b459e8c14c5b43a Reviewed-on: https://gerrit.libreoffice.org/10968 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2f5e266e978a6c9142e8a154ccddb2a07146ed42) Conflicts: sw/source/core/doc/DocumentContentOperationsManager.cxx
2014-09-30Normalize SwDBManager::Merge{MailFiles,Documents}Jan-Marek Glogowski
There is still a difference, if run mail merge throught one or the other function (MM wizard or UNO). Change-Id: Ia372bd3edea4c8dfb58e045fc8fed2efcb2a4fde Reviewed-on: https://gerrit.libreoffice.org/10971 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 65981011d84fdcf90533b59f25f01a7f734d6c5e) Conflicts: sw/source/uibase/dbui/dbmgr.cxx
2014-09-30Add debug documents to SwDBManager::MergeMailFilesJan-Marek Glogowski
Just like the debug documents in SwDBManager::MergeDocuments. Change-Id: I275575853c80d4e19d6df5ba9d8dc689353d7c85 Reviewed-on: https://gerrit.libreoffice.org/10970 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 74458301569bc9c0e7619e68be85e716d7b6f9f7) Conflicts: sw/source/uibase/dbui/dbmgr.cxx
2014-09-30Add debug messages for sw.{createcopy,docappend}Jan-Marek Glogowski
This adds a lot of SAL_INFO messages to SwDoc::CreateCopy and SwDoc::Append. Change-Id: Ie924e20698bec84482fcc5496175a9e29245729e Reviewed-on: https://gerrit.libreoffice.org/10969 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 3b9361a930d62430044ea0b746f4b5751dbb8d88) Conflicts: sw/source/core/doc/docnew.cxx
2014-09-30MM: introduce SwDoc::Append helper functionJan-Marek Glogowski
This drops all the specialized, workaround code from MM, introduced to use the SwFEShell::Paste function and additionally merges and renames SwDoc::Paste into SwDoc::Append. There is still a little common codepath, therefore this adds comments to always update both functions. Change-Id: I704b3ef3257dd977dac95e16e25049ff8ade97ed Reviewed-on: https://gerrit.libreoffice.org/10967 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit c808802e94eba48dc23d7fca133ed35c17feb163) Conflicts: sw/inc/doc.hxx sw/source/core/doc/DocumentContentOperationsManager.cxx sw/source/core/doc/docnew.cxx sw/source/uibase/dbui/dbmgr.cxx
2014-09-30MM: always copy the internal documentJan-Marek Glogowski
There is really no need to create the first document via UNO createClone(), which is also slower then the internal copy. Actually createClone also calls createCopy, but without initializing the document. Change-Id: I2d1ee6e12e37caf1b0d9bfa393fb4240516628e9 Reviewed-on: https://gerrit.libreoffice.org/10966 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 660349579d282bcc62f5eb8b777a78c7fadf8b1c) Conflicts: sw/source/uibase/dbui/dbmgr.cxx
2014-09-30Replace the whole content for copied documentsJan-Marek Glogowski
If the document is initialized in CreateCopy, it already contains the initial empty paragraph. So we have to delete the content from initial document, as we're going to replace the whole content with the pasted document. Change-Id: Ie6a64dcb070f7d611dfde97f2c1a721834b4167b Reviewed-on: https://gerrit.libreoffice.org/10963 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit ddffb797904c5ae1a5ab3bc66eeb9bfc168a0148) Conflicts: sw/inc/IDocumentContentOperations.hxx
2014-09-30Fix moving out-of-bounds draw / fly objectsJan-Marek Glogowski
Actually move the object in the right direction, if it's outside of the document boundaries. Fixes the mysterious effect, that negative y-offset in fdo#80926 changed the objects x-offset values. Change-Id: If88cf2a07fb44537b2e047e77c5e009664db94af Reviewed-on: https://gerrit.libreoffice.org/10975 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5a107d3fdc069fdf95b7ab9a24fd84accf4160ae)
2014-09-30Some minor MM related refactoringJan-Marek Glogowski
Refactors some code of SwFEShell::Paste and SwDBManager::MergeDocuments to make it more readable. Change-Id: Ifd78d6a44fa78eaf1f4fca63f4bbd3ee43ca129d Reviewed-on: https://gerrit.libreoffice.org/10965 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 8a798ef5582e91ca51ffc835f6b8c8521bee3174) Conflicts: sw/source/core/frmedt/fecopy.cxx sw/source/uibase/dbui/dbmgr.cxx
2014-09-30MM: fix workaround for single paragraph docsJan-Marek Glogowski
There is already a workaround for pasting a document with a single paragraph by appending a dummy empty paragraph to the working copy. This patch removes the dummy paragraph from the target document. Change-Id: I288d35264bf6f1a5f92c50d6a309e3bdd4ab5836 Reviewed-on: https://gerrit.libreoffice.org/10964 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 01e5ff37499d115e652ddab793488a54174fb4a9) Conflicts: sw/source/uibase/dbui/dbmgr.cxx
2014-09-30Better variable naming in SwViewImp::NotifySizeChgJan-Marek Glogowski
Make it obvious, which variable contains the document boundaries and which the draw / fly object boundaries. Change-Id: I0bc2bcb5515e317c7a204b3458b92c61482e1a5c Reviewed-on: https://gerrit.libreoffice.org/10974 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2d66f9dc4723fdbccf4bd64edcc66bf31df078fa)
2014-09-30Refactor a tiny bit of SwLayAction::IsShortCutJan-Marek Glogowski
Change-Id: I13d4fbebec02bddaa27e8929188d497dde715730 Reviewed-on: https://gerrit.libreoffice.org/10980 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7fc5207ebe57a2b88e2ba7ab45e4ce3f6c049df3)
2014-09-30Save debug mail merge documentsJan-Marek Glogowski
This saves the first three mail merge documents, the source and the corresponding working documents. For convenience all saved document URIs printed to the console. Change-Id: Ice86bf59fc519cfab170ff0956559dc9373d5a26 Reviewed-on: https://gerrit.libreoffice.org/9860 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 212dce21b62a4cfb85406bebe54ee07545516e21) Conflicts: sw/source/uibase/dbui/dbmgr.cxx
2014-09-29Update SwDoc::Paste from SwFEShell::PasteJan-Marek Glogowski
SwDoc::Paste is already an minimal version of SwFEShell::Paste. Update the code based on the changes made in commit 4580094d2d9d5b952c4526ee23204f75a5bb2f1b Change-Id: I4d784f393952374e2a174510f9378b05cfdb78eb Reviewed-on: https://gerrit.libreoffice.org/9861 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d3070bc5f9a7b1b93223c97c7167806f3b41b9fc)
2014-08-20fdo#69282: sw: fix updating of page styles via SwDocShell::_LoadStyles()Michael Stahl
SwDoc::CopyPageDesc() only copies master and left SwFrmFmt attributes, but not first-master and first-left. They will contain exactly the same attributes as master and left but they still need to be copied... (see also: that FIXME in pagedesc.hxx) (regression from 75084f6c42c27dc95418df9cefed2fddfb26000e) Change-Id: I3dcc3627708b5d6a477eb7fef76cf6c42c95c004 (cherry picked from commit 5c1cc92ee09f9fcc99077cacd3fc55640f03b7b2)
2014-08-20KDE: don't throw on TemplatePathVariableMaxim Monastirsky
This is required after commit 838b77f5f3d6d8fd98891e99a23ff78a6a357cb2. Actual functionality is still missing. Change-Id: Ib94d8a982609de730d9c61bf7bf9886093c51f5b Reviewed-on: https://gerrit.libreoffice.org/8367 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit e44a7eefb7f632977b4c8c91ad14244372c6e04d)
2014-08-20fdo#81516 Support fonts like Source Han Sans with > 16 FDArray elementsAudrey Tang
Change-Id: I3f82574f434060d62dc3faeb730341c5b169ce9f (cherry picked from commit 3b38a2342e48a2aec3c2e4f5aebf883db4b84101)
2014-08-20Resolves: rhbz#1065807 use xdg ~/Templates for default Template locationCaolán McNamara
(if it exists) (cherry picked from commit 838b77f5f3d6d8fd98891e99a23ff78a6a357cb2) Conflicts: shell/source/backends/gconfbe/gconfaccess.cxx Change-Id: I98fc9fd54d1f56c8bed24ce4d2ebf53756ded2cc
2014-08-20Resolves: #i120559# Corrected load for charts without RangeString...Armin Le Grand
but with local row-oriented data (cherry picked from commit 855d5e3bc075e516edf1dc7e844924bbf9ab590c) Conflicts: chart2/source/tools/ChartModelHelper.cxx Change-Id: I4979b639f5652a1c27b640b6b469f66c65a888aa
2014-08-20pagedesc: Consolidate FindPageDescByName() and FindPageDesc().Jan Holesovsky
(cherry picked from commit c1be76ec98cb465e07df961843134147100beaa9) Conflicts: sw/inc/doc.hxx sw/source/core/doc/docdesc.cxx sw/source/filter/ww8/rtfexport.cxx sw/source/uibase/app/docstyle.cxx Change-Id: I18d570509cd3f3b65a19a12a9df0b1d5db901d04
2014-08-20pagedesc: It's better when MakePageDesc returns a pointer.Jan Holesovsky
This removes many uses of GetPageDesc(sal_uInt16). (cherry picked from commit f246ac13bd1a12e11eba03cbe3c62ea77293e02e) Conflicts: sw/inc/doc.hxx sw/source/core/doc/docdesc.cxx sw/source/core/doc/poolfmt.cxx sw/source/filter/ww1/fltshell.cxx sw/source/filter/ww8/ww8par.cxx sw/source/uibase/app/docstyle.cxx sw/source/uibase/dbui/dbmgr.cxx Change-Id: I9660e30d7fccd4336422ba03b19087321a7ae973
2014-08-20String to OUStringMatteo Casalin
Change-Id: Idaf974536036d40d60a43b32a7104e2ead075b48 Reviewed-on: https://gerrit.libreoffice.org/5466 Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com> Tested-by: Matteo Casalin <matteo.casalin@yahoo.com> (cherry picked from commit 077c80b9d2ed863d881627a1e14ae5b6f84277b8)
2014-08-20force posted events before timer timeouts in KDE4 event loop (bnc#467278)Luboš Luňák
In this particular case, basctl::Shell::onDocumentCreated() and pretty much everything in basctl/ it seems operate on the current window. The "OnNew" event that triggers this comes from a timeout generated who knows where for whatever reason. However, the code "knows" what the current window is by having basctl::Shell::SetCurWindow() react on events about the current window changing ... which come from posted events. So, unless it's defined somewhere that an ordering here must exist, this is inherently racy. At least generic and Gtk event loops appear to always deliver the posted event first, so force the same ordering in the KDE event loop handling. Change-Id: Ia098f6b45e6b5a5133a12a9172eb09069e6362f9 (cherry picked from commit 8100131214ac2ee46b632703d8ba2babeaf3b5f6)
2014-08-20prevent deadlocks between main thread and other thread processing a Qt eventLuboš Luňák
This part of 13a34f4c6307d1bd2443cbf3fbd83bfdd8cdbafb was correct. The main thread will deadlock on the yield mutex if the calling thread does not release it before waiting on the main thread. Change-Id: I6692473457258b791c131e8bdb459b06b01550f7 (cherry picked from commit f09d4bc2853be2fa3faa0502b8efe94ad9719731)
2014-08-20avoid several 200ms delays in Qt testsLuboš Luňák
Since the tests are run during LO startup, this is not such a good idea. Also redo the socket notifier test which seems a bit of an overkill when a mere pipe will do (and I'm not sure TCP sockets would have the data available the moment it's written to). (cherry picked from commit 145f2e970f46a3a3e5456b122d71f17c3abe878f) Conflicts: vcl/unx/kde4/tst_exclude_socket_notifiers.hxx Change-Id: I6a436b286d20ceecf859f9028af98da03c2561b7
2014-08-20work around LO blocking when asking for QClipboard's contents, helps fdo#35950Luboš Luňák
Specific to KDE4 vclplug and just a bit of a hack, but it's at least something. (cherry picked from commit 9aa32a34c7c7a2ee4da5f01983a0ed224c38c875) Conflicts: vcl/unx/kde4/VCLKDEApplication.hxx Change-Id: I4bf0f9c8e0b4f7faebaf010a06fcc4ff2e44fa6b
2014-08-20add better info on the Qt patches needed for KFileDialogLuboš Luňák
Change-Id: I1902f962ac03b171c5e7a45d9c8e59450b04418f (cherry picked from commit 508337db0c53caa5fb43ef26f781df159497a482)
2014-08-20disable KFileDialog usage if QClipboard can recurseLuboš Luňák
Change-Id: If23a365b96c1634c2f8940f6ece973089dc3151f (cherry picked from commit 65a3622148ea67744c9c1fc18c2b8d48e5f1c79f)
2014-08-20fix Qt4 QSocketNotifier configure checkLuboš Luňák
When built as a part of the configure check, this doesn't know SAL_OVERRIDE. Change-Id: I1420dd50efdd6666f246884f286a3f29e0b56a2c (cherry picked from commit e809aa1e916e0f6d1a849d0374f59ef9619b1db7)
2014-08-20make sure KFileDialog does not leave the SolarMutex releasedLuboš Luňák
Change-Id: I806bf5fe1cd1871de499ceeeadf36de539e9d637 (cherry picked from commit 474ad6b0e2fb18370be9d228456a2abbfc15bad2)
2014-08-20Revert "Rewrite Qt4 based nested yield mutex locking."Luboš Luňák
In a dbgutil build LO aborts on an assertion failure the moment KFileDialog is open. It's definitely on okay to release SolarMutex just like that, since the Qt event loop is integrated with LO's, it'll call back to LO code without the mutex held. This reverts commit 13a34f4c6307d1bd2443cbf3fbd83bfdd8cdbafb. Conflicts: vcl/unx/kde4/KDE4FilePicker.cxx vcl/unx/kde4/KDEXLib.cxx Change-Id: Idfa27fbb4728b529c37c25f710ea208fdaa4455c (cherry picked from commit 2cd8a1e0f1e81efd15979953d7f274ab8a6806d6)
2014-08-20menu(bar) uses window text and background color, not button (fdo#50921)Luboš Luňák
Change-Id: I13adebd09746d21e7456927e14dcdc3efb2c723b (cherry picked from commit 5e7aad393c0c3fab20c8298697ca96563caa7afe)
2014-08-20prevent KDE/Qt from interfering with the session managerLuboš Luňák
I occassionally get lockups in IceProcessMessages() called from QtCore, I'm actually not exactly sure why, as theoretically two connections from one app shouldn't be a problem, but since LO does its own session handling, there's no need to the KDE/Qt code to be involved, so prevent it from connecting to the session manager altogether. Change-Id: Iebe20d4cb5403e5fea8bd5d8c1f69b62d1c2907b (cherry picked from commit 71f2aff7a56cef4e133abad3c2e447c76c5ee1fe)
2014-08-20KDE4: prevent blocking in Display::YieldJan-Marek Glogowski
SalX11Display registers a Yield handler, which splits check and and processing into two functions, which both lock the yield mutex. Normally this no problem, but during a Drag'n'Drop operation the D'n'D thread also checks and processes XEvents (for D'n'D). So the XNextEvent in Display::Yield will actually block, if the seen XEvent was for D'n'D and was already processed. Change-Id: I9f8d96d4f9986997cbe150a2b66bc767b4bbc2f1 (cherry picked from commit 6c7374f071d998f726cd4a5b67baf54e357d096b)
2014-08-20KDE4: add Qt4 glib ExcludeSocket runtime checkJan-Marek Glogowski
Add a runtime check and configure warning to disable KDE4 native file pickers, if the Qt4 glib dispatcher doesn't honor the QEventLoop::ExcludeSocketNotifiers flag. This way polling the QClipboard using the event loop won't crash LibreOffice with recursive paint events, See https://bugreports.qt-project.org/browse/QTBUG-37380 (cherry picked from commit cc8d566d74a2e0b969b92d9cf22cc95a3bf31a98) Conflicts: configure.ac Change-Id: I5cad30ead74571e49a075c084cca7a19acff7523
2014-08-20KDE4: change eventLoopType enum to glib boolJan-Marek Glogowski
Just check for glib; it's the default in later Qt4 versions on unix. Change-Id: Ia99466e9010eb835bea0c3c4420da3c8b3cd4671 (cherry picked from commit 516a8dedac9c3cb77cd26a740cf793b1cab920d0)
2014-08-20Revert "Rewrite Qt4 based nested yield mutex locking."Jan-Marek Glogowski
This reverts the unx/kde4/KDEXLib.cxx part of commit 13a34f4c6307d1bd2443cbf3fbd83bfdd8cdbafb. Conflicts: vcl/unx/kde4/KDE4FilePicker.cxx vcl/unx/kde4/KDEXLib.cxx Change-Id: Ica8a0f678f080ae7d763bb7da7761d20ceec328c (cherry picked from commit daf011870efae282244c0298494820d9a0c6d3bc)
2014-08-20fdo#73115: Always run timeouts as eventsJan-Marek Glogowski
Right-click popup menus run click events throught the LO main loop. In case of KDE4 the LO main loop is run by a timer in the main thread, with Qt::DirectConnection execution. If the timeout actually starts a nested event loop for a new dialog, the timer is blocked, the nested mainloop detects it was started from the timeout and drops the blocked timout from polling, which blocks any further LibreOffice event loop processing. This changes the timers to Qt::QueuedConnection, so they always generate an event and are processed by the Qt event loop. Change-Id: Ie626b22be3d8f9b8934bcc5e9e0e67a365549cfc (cherry picked from commit aeda478a02523cec146f6af69710f0391061db56)
2014-08-20fdo#45935: try hard to paint a frame for menusJan-Marek Glogowski
Current Oxygen theme doesn't draw frames for menus, but uses shaped and "colored" background images. This workaround paints the window and menu frame for menus. Any frame seems to be better then no frame at all. Change-Id: I4d553ea58cac2729826f8395cb2597fa200187b6 (cherry picked from commit e72849cd435cc50a744dcbcfb422f5600dd0cce9)
2014-08-20KDE4: evaluate frameWidth in the Qt threadJan-Marek Glogowski
When opening a document via Java UNO without a running LO instance, one gets the following Qt error messages: CE> QObject: Cannot create children for a parent that is in a different thread. CE> (Parent is Oxygen::WidgetStateEngine(0x8deb878), parent's thread is QThread(0x8d6cf70), current thread is QThread(0xa8fa7fc8) CE> QObject::installEventFilter(): Cannot filter events for objects in a different thread. CE> QObject::installEventFilter(): Cannot filter events for objects in a different thread. CE> QObject::installEventFilter(): Cannot filter events for objects in a different thread. This happens, because the Java UNO call is processed in the first / Qt thread while document loading happens in a second thread. Document loading actually just calls getNativeControlRegion, which should not involve any drawing. But the KDE4 backend does some style processing to get the correct frame width (QWidget::ensurePolished(), which uses GUI based events and need to be processed in the Qt thread. Change-Id: I344d5089d958963c48a9a8a84bfa9fe8f092b75a (cherry picked from commit 7163d64b90ac4d4259b1d0379cfca348dd30601c)
2014-08-20KDE4: Report correct check and radio item sizesJan-Marek Glogowski
Use the correct sizs from the current style. Change-Id: I7e163bdc8d467baf2d6e3d0d2bc3e1da7558cf42 (cherry picked from commit c11deb60cabfa8e7ee511b94abb0e19601b42fe6)
2014-08-20KDE4: Drop Qt 4.9 supportJan-Marek Glogowski
I don't think there will ever be any 4.9 release, so drop all the unused code. Change-Id: I4b72de96e6064240582cd83d4e45547096a2efb0 (cherry picked from commit 7b083444942b1d5890b51a1f4a8560ba4e411e46)
2014-08-20fix and simplify getting files from the KDE4 file dialogLuboš Luňák
- Fix multiple selection handling. - The "double click selection KDE4 bug" does not exist (anymore?) as far as I can tell. - Apparently it's not true that multiselect needs the first item in the list to be the directory. - KFileDialog can already give full URLs. (cherry picked from commit 03f666103d80f7a0c79150dae2367079b80e50a6) Conflicts: vcl/unx/kde4/KDE4FilePicker.cxx Change-Id: I5bb651902fb6c1d75af40b78bf32c79b004b7358
2014-08-20Fix minimal VCL menu item height with iconsJan-Marek Glogowski
Don't reset the calculated minimal menu item height to the icon height, if the minimal height is already larger then the icon height. Change-Id: Ifcd6c750352c4d3f754a693df7254a4654a8afe6 (cherry picked from commit 56bea42176e5f0b850da0bab410dda560fc89255)
generated by cgit (git 2.34.1) at 2024-05-18 05:35:51 +0000