Skip to content

C
core
Dal (branch)/etiket değiştir
  1. 31 May, 2019 2 kayıt (commit)
  3. 30 May, 2019 3 kayıt (commit)
  5. 29 May, 2019 4 kayıt (commit)
  7. 28 May, 2019 1 kayıt (commit)
  9. 27 May, 2019 2 kayıt (commit)
  11. 24 May, 2019 6 kayıt (commit)
  13. 23 May, 2019 9 kayıt (commit)
  15. 22 May, 2019 13 kayıt (commit)
    • Michael Stahl's avatar
      curl: upgrade to release 7.65.0 · 9fbc8648
      Michael Stahl yazdı 
      Fixes CVE-2019-5435. It looks like this is not a problem on 32-bit
Windows because fortunately we don't use /LARGEADDRESSAWARE flag
to set IMAGE_FILE_LARGE_ADDRESS_AWARE... but on 32-bit Linux
the user-space VM is 3GB so an exploit might be possible.

Apparently there's no code in LO that uses the CURLU_URLENCODE flag.

The other one, CVE-2019-5436, doesn't matter because we disable tftp.

Change-Id: I0d4f087befa5a3c4fb21ec36761dad68932425d9
Reviewed-on: https://gerrit.libreoffice.org/72732
Tested-by: Jenkins
Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit edb01616)
Reviewed-on: https://gerrit.libreoffice.org/72775Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
      9fbc8648
    • László Németh's avatar
      tdf#125310 change tracking: don't copy page break · 0bc56f30
      László Németh yazdı 
      at paragraph join, because file saving or changing
to Hide Changes mode don't affect this. Also
adding page breaks to every paragraph of a deletion
is much more annoying, than helpful.

See also commit 1bbbe57d
"change tracking: show layout changes at paragraph join"

Reviewed-on: https://gerrit.libreoffice.org/72469
Tested-by: Jenkins
Reviewed-by: 's avatarLászló Németh <nemeth@numbertext.org>

 Conflicts:
	sw/qa/extras/uiwriter/uiwriter2.cxx

Change-Id: Ic05f06b9fdb5152b717e824f9a9eaed878fecc2d
Reviewed-on: https://gerrit.libreoffice.org/72778
Tested-by: Jenkins
Reviewed-by: 's avatarXisco Faulí <xiscofauli@libreoffice.org>
      0bc56f30
    • Julien Nabet's avatar
      tdf#122538: add index appendix for hsqldb · 0cc10a99
      Julien Nabet yazdı 
      Regression from
https://cgit.freedesktop.org/libreoffice/core/commit/?id=3208fcb3a36d75d6290d9c548430682f153b09db

Change-Id: I8f85f0a5838df87671ecb9bdb5751b7ec43c09ea
Reviewed-on: https://gerrit.libreoffice.org/72701
(cherry picked from commit ff251f4a)
Reviewed-on: https://gerrit.libreoffice.org/72777Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
Tested-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
      0cc10a99
    • Michael Weghorn's avatar
      Qt5Menu.hxx: Add missing include/forward-declaration · d31279d1
      Michael Weghorn yazdı 
      Since 'QObject' and the 'Q_OBJECT' macro are used,
the corresponding header needs to be included.

Without the include and forward-declaration given here,
the compiler doesn't know about 'QObject' and 'QAction'
which are used further below, unless another header that
takes care of this is included before 'QtMenu.hxx'.

The error could be provoked e.g. by moving the
'#include <Qt5Menu.hxx>' in front of all other includes
in 'vcl/qt5/Qt5Frame.cxx'.

Change-Id: I76c15eb445cbe26774d6e4177e12c93658daf0ad
Reviewed-on: https://gerrit.libreoffice.org/65130
Tested-by: Jenkins
Reviewed-by: 's avatarMichael Weghorn <m.weghorn@posteo.de>
(cherry picked from commit 4ad69820)
Reviewed-on: https://gerrit.libreoffice.org/72733Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
      d31279d1
    • Michael Weghorn's avatar
      tdf#123750 kde5: Show removable devices in file dialog · 5cd08cc0
      Michael Weghorn yazdı 
      As the Qt documentation for 'QFileDialog::supportedSchemes'
says, setting supported schemes to a non-empty list restricts
the available options:
"Setting this property allows to restrict the type of URLs
the user will be able to select. It is a way for the application
to declare the protocols it will support to fetch the file
content. An empty list means that no restriction is applied
(the default)."

The call to 'QFileDialog::setSupportedSchemes' was copied
over from the gtk3_kde5 VCL plugin in commit
6196b729, where it had been
added by commit f1b60bd6
"Support opening of (some) remote URLs through the KDE file
dialog".

Since only either all schemes (if nothing explicitly set)
or a whitelist of supported locations seems to
be possible (s.a. the Phabricator changes referenced
in the commit message of commit
f1b60bd6), add the
"" scheme that makes removable devices shown -- while
there doesn't seem to be an official documentation on
the available schemes, at least not in
KFileWidget's API documentation [1].

A quick test with all new available options after removing
the call to 'QFileDialog::setSupportedSchemes' altogether
indicated that opening and saving files there doesn't work
reliably in all cases, so rather excplicitly add the ""
scheme rather than claiming support for all schemes
(including e.g. "timeline", "search", "remote", "trash").

[1] https://api.kde.org/frameworks/kio/html/classKFileWidget.html

Change-Id: I89dc37d0f06d280e5dd599f90768c13e8edb915b
Reviewed-on: https://gerrit.libreoffice.org/71320
Tested-by: Jenkins
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 2c69c93f)
Reviewed-on: https://gerrit.libreoffice.org/72750Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
      5cd08cc0
    • Michael Stahl's avatar
      tdf#119856 vcl: convert Qt5FilePicker and Qt5Menu to RunInMainThread · 97ecb2af
      Michael Stahl yazdı 
      ... and also convert KDE5FilePicker. And Qt5Frame.

The UNO methods in Qt5FilePicker/KDE5FilePicker have to ensure that the
thread actually owns SolarMutex, because if RunInMainThread() is
called without that it will deadlock.

Change-Id: Ie4d2f494ac81c799ec7c9a3acb3a9b0f77bb6361
Reviewed-on: https://gerrit.libreoffice.org/68357
Tested-by: Jenkins
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 7e251025)
Reviewed-on: https://gerrit.libreoffice.org/72660Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
      97ecb2af
    • Michael Stahl's avatar
      tdf#119856 vcl: fix Qt warning Qt5Frame::SetModal() · 5be0bd7c
      Michael Stahl yazdı 
      This prints a warning "Cannot create children for a parent that is in a
different thread"; let's fix it before it causes another hard to debug
crash.

0  check_parent_thread(QObject*, QThreadData*, QThreadData*) (parent=parent@entry=0xe88ca0, parentThreadData=<optimized out>, currentThreadData=<optimized out>) at kernel/qobject.cpp:781
1  check_parent_thread (currentThreadData=<optimized out>, parentThreadData=<optimized out>, parent=0xe88ca0) at kernel/qobject.cpp:822
2  QObject::QObject(QObject*) (this=0x9ed2e80, parent=0xe88ca0) at kernel/qobject.cpp:810
3  Adwaita::GenericData::GenericData(QObject*, QWidget*, int) () at /usr/lib64/qt5/plugins/styles/adwaita.so
4  Adwaita::WidgetStateEngine::registerWidget(QWidget*, QFlags<Adwaita::AnimationMode>) () at /usr/lib64/qt5/plugins/styles/adwaita.so
5  Adwaita::Animations::registerWidget(QWidget*) const () at /usr/lib64/qt5/plugins/styles/adwaita.so
6  Adwaita::Style::polish(QWidget*) () at /usr/lib64/qt5/plugins/styles/adwaita.so
7  QWidget::event(QEvent*) () at /lib64/libQt5Widgets.so.5
8  Qt5Widget::event(QEvent*) (this=0x7321790, pEvent=0x7f90c27d3750) at vcl/qt5/Qt5Widget.cxx:416
9  QApplicationPrivate::notify_helper(QObject*, QEvent*) () at /lib64/libQt5Widgets.so.5
10 QApplication::notify(QObject*, QEvent*) () at /lib64/libQt5Widgets.so.5
11 QCoreApplication::notifyInternal2(QObject*, QEvent*) (receiver=0x7321790, event=0x7f90c27d3750) at kernel/qcoreapplication.cpp:1047
12 QWidget::ensurePolished() const () at /lib64/libQt5Widgets.so.5
13 QWidget::setVisible(bool) () at /lib64/libQt5Widgets.so.5
14 Qt5Frame::SetModal(bool) (this=0x9f411b0, bModal=true) at vcl/qt5/Qt5Frame.cxx:482

Change-Id: Ib6b4d1ee859dfce650422a6c7860abf2eb2686f1
Reviewed-on: https://gerrit.libreoffice.org/68356
Tested-by: Jenkins
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 69c46bf5)
Reviewed-on: https://gerrit.libreoffice.org/72659Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
      5be0bd7c
    • Michael Stahl's avatar
      tdf#119856 vcl: fix Qt5FilePicker destructor to run in main thread · c6f2f4e8
      Michael Stahl yazdı 
      During QFileDialog dtor, QSocketNotifier::setEnabled(false) is called,
but it doesn't do anything other than print a stupid warning and so it's
still registered and later it receives events after it's dead.

0   QSocketNotifier::setEnabled(bool) (this=this@entry=0x991c058, enable=enable@entry=false) at kernel/qsocketnotifier.cpp:240
1   QInotifyFileSystemWatcherEngine::~QInotifyFileSystemWatcherEngine() (this=0x991c030, __in_chrg=<optimized out>) at io/qfilesystemwatcher_inotify.cpp:260
2   QInotifyFileSystemWatcherEngine::~QInotifyFileSystemWatcherEngine() (this=0x991c030, __in_chrg=<optimized out>) at io/qfilesystemwatcher_inotify.cpp:258
3   QObjectPrivate::deleteChildren() (this=this@entry=0x991c240) at kernel/qobject.cpp:1997
4   QObject::~QObject() (this=<optimized out>, __in_chrg=<optimized out>) at kernel/qobject.cpp:1025
5   QFileSystemWatcher::~QFileSystemWatcher() (this=0x9641b60, __in_chrg=<optimized out>) at io/qfilesystemwatcher.cpp:277
6   QObjectPrivate::deleteChildren() (this=this@entry=0x2a30130) at kernel/qobject.cpp:1997
7   QObject::~QObject() (this=<optimized out>, __in_chrg=<optimized out>) at kernel/qobject.cpp:1025
8   QThread::~QThread() (this=0x2a079b8, __in_chrg=<optimized out>) at thread/qmutex.h:217
9    () at /lib64/libQt5Widgets.so.5
10  QScopedPointerDeleter<QObjectData>::cleanup(QObjectData*) (pointer=<optimized out>) at ../../include/QtCore/../../src/corelib/tools/qscopedpointer.h:52
11  QScopedPointer<QObjectData, QScopedPointerDeleter<QObjectData> >::~QScopedPointer() (this=0x98aa4d8, __in_chrg=<optimized out>) at ../../include/QtCore/../../src/corelib/tools/qscopedpointer.h:107
12  QObject::~QObject() (this=<optimized out>, __in_chrg=<optimized out>) at kernel/qobject.cpp:884
13  QFileSystemModel::~QFileSystemModel() () at /lib64/libQt5Widgets.so.5
14  QObjectPrivate::deleteChildren() (this=0x97bab00) at kernel/qobject.cpp:1997
15  QWidget::~QWidget() () at /lib64/libQt5Widgets.so.5
16  QFileDialog::~QFileDialog() () at /lib64/libQt5Widgets.so.5
17  std::default_delete<QFileDialog>::operator()(QFileDialog*) const (this=0x9770f90, __ptr=0x926e970) at /usr/include/c++/8/bits/unique_ptr.h:81
18  std::unique_ptr<QFileDialog, std::default_delete<QFileDialog> >::~unique_ptr() (this=0x9770f90, __in_chrg=<optimized out>) at /usr/include/c++/8/bits/unique_ptr.h:274
19  Qt5FilePicker::~Qt5FilePicker() (this=0x9770ed0, __in_chrg=<optimized out>) at vcl/qt5/Qt5FilePicker.cxx:155

Change-Id: Iddfa3d44de59e1760e20a389566d9e6815ab26f7
Reviewed-on: https://gerrit.libreoffice.org/68355
Tested-by: Jenkins
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 621bebd8)
Reviewed-on: https://gerrit.libreoffice.org/72658Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
      c6f2f4e8
    • Michael Stahl's avatar
      tdf#119856 vcl: Qt5/KDE5 RunInMainThread · 5ad697fd
      Michael Stahl yazdı 
      The problem with the current approach of transferring calls to the main
thread with Q_EMIT signals is that if the code that should run in the
main thread needs SolarMutex, then the non-main-thread must use
SolarMutexReleaser - but then the main thread will run not only the call
that is needed right now, but will potentially process all pending
events, and the other thread hasn't prepared for that.

We need the inter-thread feature of Qt::BlockingQueuedConnection and the
non-queued feature of Qt::DirectConnection, but this combination doesn't
appear to exist.

So the SolarMutexReleaser needs to go - but then the main thread does
need SolarMutex for some things, and hence we need to trick it into
believing it has SolarMutex with the m_bNoYieldLock hack.

Then it becomes apparent that the main thread may be blocked on either
Qt events, which is fine, or on the SalYieldMutex's m_aMutex, which will
never be released now.

So the main thread must never block on m_aMutex; the alternative is to
use the same approach as the osx code (and, in a somewhat different
form, the svp code), and add some condition variables on which the main
thread can block if it fails to acquire the m_aMutex immediately.

It's even possible to do this in a somewhat generic way with lambdas.

This does appear to work, but it makes the Q_EMIT approach entirely
untenable, because now the main thread will be blocked on the condition
variable and the non-main-thread will be blocked until the Qt event is
processed.

Reviewed-on: https://gerrit.libreoffice.org/68232
Tested-by: Jenkins
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 265caa43)

Change-Id: I6480a6b909d5ec8814b2ff10dbefb0f3686a83c7
Reviewed-on: https://gerrit.libreoffice.org/72657
Tested-by: Jenkins
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
      5ad697fd
    • Caolán McNamara's avatar
      Resolves: tdf#125387 gtk3 fit-to-text stuck as disabled · 6431b8e8
      Caolán McNamara yazdı 
      should only disable/enable its parent container

Change-Id: I002a525b7ac4c178c3db7efc06848315afb785e0
Reviewed-on: https://gerrit.libreoffice.org/72624
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
(cherry picked from commit c278c1cf)
Reviewed-on: https://gerrit.libreoffice.org/72664Reviewed-by: 's avatarXisco Faulí <xiscofauli@libreoffice.org>
      6431b8e8
    • Miklos Vajna's avatar
      tdf#123106: oox: disable gradient fill grab-bag for PPTX · 2045a84c
      Miklos Vajna yazdı 
      This was added in commit 2fcf3a87
(ooxml: preserve gradient shape fill, 2014-01-31), and assumes that the
theme colors can be preserved, as the theme definition is grab-bagged as
well.

But the theme is grab-bagged only for DOCX, not for PPTX, so skip
gradient grab-bag for PPTX, otherwise the gradient would refer to
incorrect colors in the theme.

Change-Id: I98e1c67d4b10e68916f81dd7fc508eb4146d506b
Reviewed-on: https://gerrit.libreoffice.org/67386Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/72681Reviewed-by: 's avatarXisco Faulí <xiscofauli@libreoffice.org>
      2045a84c
    • Michael Weghorn's avatar
      kde5 fpicker: Reuse 'initialize()' from base class · 3be6a74d
      Michael Weghorn yazdı 
      Take over missing case from 'KDE5FilePicker::initialize' to
'Qt5FilePicker::initialize' and make
'Qt5FilePicker::addCustomControl' virtual, so that the
subclass's implementation is called in the 'initialize()'
method (in particular to avoid adding another autoextension
checkbox).

Drop the 'KDE5FilePicker::initialize' so that the
base class implementation is used, which now does the
same thing.

Add 'override' keyword in KDE5Filepicker.hxx.

Change-Id: Id151a4d4862af4275f6c21c6537a79c52e3ed513
Reviewed-on: https://gerrit.libreoffice.org/68059
Tested-by: Jenkins
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 77d5795f)
Reviewed-on: https://gerrit.libreoffice.org/72656
      3be6a74d
    • Michael Weghorn's avatar
      Make 'setDefaultName()' work again for kde5 fpicker · 54ca7549
      Michael Weghorn yazdı 
      Add an option to Qt5FilePicker constructor to
say whether the QFileDialog should be a native one or not,
since 'QFileDialog::selectFile' does not preselect the correct
name in the native dialog any more if the
'QFileDialog::DontUseNativeDialog' option has ever been set, i.e.

    QFileDialog fileDialog;
    fileDialog.setOption(QFileDialog::DontUseNativeDialog);
    fileDialog.setOption(QFileDialog::DontUseNativeDialog, false);
    fileDialog.selectFile("test.txt");

will not properly set the name in the native file dialog, which
broke 'setDefaultName' for the KDE5FilePicker.

This makes it work again, even though I think that the underlying
issue is a Qt bug
(s. https://bugreports.qt.io/browse/QTBUG-73682 ).

Change-Id: I99a1e7c97d594925d600fa8eaf3303f9013551c2
Reviewed-on: https://gerrit.libreoffice.org/68058
Tested-by: Jenkins
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 1d01ebc8)
Reviewed-on: https://gerrit.libreoffice.org/72655
      54ca7549