... compressed size = 0.
The problem is that vector::data() on a vector of size 0 returns
nullptr, and osl_readFile into a nullptr buffer returns E_INVAL, which
causes an exception to be thrown.
Catch the exception, so that there is a chance to read the values from
the data descriptor instead.
(regression from commit 32cad89592
and/or commit a6ad198d09)
Change-Id: I9b2d9a930997146faf224d8033955b142fe93f58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176289
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Jenkins
This is effectively the weld::Dialog equivalent of
Change-Id: Ia839fac90ea93b9ac6be5819aa4bb3261a775f33
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Sun Nov 10 23:01:07 2024 +0100
vcl: Return unique_ptr in weld::MessageDialog::weld_message_area
Change-Id: I3eee2d3617c3576b442a5578090cd5de53e17f33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176365
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
The returned weld::Container* (but not the associated toolkit
widget) is owned by the caller.
Make that more obvious by returning a unique_ptr<weld::Container>
instead of a raw pointer.
This is also consistent with what other methods returning
instances for which the caller takes over ownership
(like weld::Widget::weld_parent) do, whereas
e.g. weld::Notebook::get_page returns a weld::Container*
that is owned by the weld::Notebook instance, not the caller.
Change-Id: Ia839fac90ea93b9ac6be5819aa4bb3261a775f33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176363
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Move VclBuilder::handleMenuObject to the WidgetBuilder template
base class, and add a new purely virtual WidgetBuilder::insertMenuObject
that the existing VclBuilder equivalent now overrides.
This moves the remaining XML parsing logic from VclBuilder
to one of the base classes (WidgetBuilder, BuilderBase),
following the approach outlined in
commit f61ecf2563
Author: OmkarAcharekar <omkaracharekar12@gmail.com>
Date: Fri Sep 20 13:33:01 2024 +0200
tdf#130857 refactor VclBuilder: Extract template base class
Update the source code comments accordingly.
For QtBuilder, initially add a dummy implementation
that simply triggers an assert, but can be adjusted
in the future to create native Qt menus.
Change-Id: I3147cac28c7273cd4c4ea7344a083cd66af8337f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176362
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Move VclBuilder::handleMenu and VclBuilder::handleMenuChild
to the base class WidgetBuilder and add a new virtual
WidgetBuilder::handleMenuObject method (used by
WidgetBuilder::handleMenuChild) that
the existing VclBuilder implementation now overrides.
This prepares for allowing to use this by subclasses
that create menus other than the VCL PopupMenu and
continues the intended separation between XML parsing
done in WidgetBuilder and actual widget creation
(in subclasses implementing the vcl::Window or toolkit
specific logic.)
Change-Id: Idc896570e4b21f6997e548b7bdab8a9610042bff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176361
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Add a new purely virtual WidgetBuilder::createMenu
and use that in VclBuilder::handleMenu instead
of directly calling VclPtr<PopupMenu>::Create there.
This is in preparation of moving
VclBuilder::handleMenu to WidgetBuilder as well,
to make it reusable for other child classes, in
particular QtBuilder.
Change-Id: Icf3f937ea8e876c8393185e41a95e0f66458ce11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176360
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
Move the MenuAndId struct and the `m_aMenus` member from
VclBuilder to the WidgetBuilder base class and add two template
parameters `MenuClass` and `MenuPtr`, which VclBuilder
specializes with `PopupMenu` and `VclPtr<PopupMenu>`,
effectively leaving the logic unchanged.
Move VclBuilder::get_menu accordingly.
For QtBuilder, use `QMenu` and `QMenu*` for
the new template class parameters.
This can be used to implement support for
native Qt menus in the future.
Change-Id: Ib015b1b1e6968338ed7419b1822665a521ca748d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176359
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Now that GtkMenuBar support was dropped in
Change-Id: I550c83c6d5d13a5e45dc9332e981bae8b0f0a9a3
commit fa245e4eea218b3c707998e597c526b9d1fdb508
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Sun Nov 10 20:24:11 2024 +0100
tdf#130857 VclBuilder: Drop unused "GtkMenuBar" support
, use PopupMenu directly in MenuAndId instead of just the
Menu base class, which makes it unnecessary to cast when
a PopupMenu is wanted.
Change-Id: I51a44f219970f29a12aa15ee58e8512c62fca43e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176358
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
The last use of a "GtkMenuBar" object in .ui files
was dropped in
commit 7b4169c9d5
Date: Wed Jun 9 01:56:48 2021 +0530
Implement Interface for Data Providers.
Drop the code handling it, to simplify the existing code
and an upcoming refactoring.
Change-Id: I550c83c6d5d13a5e45dc9332e981bae8b0f0a9a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176357
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Call the corresponding handlers to notify about
the previous and current tab page when switching
the tab page in QtInstanceNotebook, by remembering
the identifier of the current page and using that
in a slot connected to the QTabWidget::currentChanged
signal.
Change-Id: I387c75b3af138cf9b89f169f0a3c223c262c2a92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176356
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
Declare support for the Writer "Tools" ->
"Footnote/Endnote Settings" dialog.
This means that native Qt widgets are used for that dialog
now when using the qt5 or qt6 VCL plugin and starting LO with
environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set.
This is the first supported dialog making use of "GtkNotebook"/
QtInstanceNotebook, i.e. of what was implemented in previous commit
Change-Id: I52e11ecf053a48940b88b7e6d1e6f9ba8778d9bb
Author: Michael Weghorn <m.weghorn@posteo.de>
Date: Sun Nov 10 18:54:28 2024 +0100
tdf#130857 qt weld: Implement QtInstanceNotebook logic
For such dialogs, support doesn't only need to be declared for
the dialog's top-level .ui file ("modules/swriter/ui/footendnotedialog.ui"),
but also for the .ui files of the single tab pages
(s. SwEndNoteOptionPage::SwEndNoteOptionPage), otherwise
the tab page content isn't shown.
Change-Id: Icb8c05cf0616651ae811185095232716bea21bcf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176354
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Implement all of the QtInstanceNotebook methods,
see also GtkInstanceNotebook and SalInstanceNotebook
for the gtk3 and VCL implementations for comparison.
Unlike weld::Notebook, QTabWidget doesn't have the
concept of IDs for tabs in addition to indices.
Introduce a PROPERTY_TAB_PAGE_ID property that
gets set on the widget of the corresponding tabs
and holds the tab identifier in order to support
that.
Implement QtBuilder::applyTabChildProperties
to set the tab label and ID property by using
the newly introduced QtInstanceNotebook::setTabIdAndLabel,
so only QtInstanceNotebook needs to handle that
property.
The weld::Container* returned by QtInstanceNotebook::get_page
is owned by QtInstanceNotebook, so keep create one
on demand and keep a mapping between tab pages and
the corresponding weld::Container.
In QtInstanceNotebook::insert_page, create a new
widget and set a QVBoxLayout for now. That could
be changed to use a different QLayout class in the
future if that turns out to be more useful.
In QtBuilder::makeObject, as the tab pages are children
of the "GtkNotebook" in the .ui file, they are initially
created as child widgets of the QTabWidget.
However, they need to be set via QTabWidget::setTab instead,
so add special handling for that case towards the end and
unset the parent relationship and call that method.
Change-Id: I52e11ecf053a48940b88b7e6d1e6f9ba8778d9bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176353
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Add asserts, so that it becomes clear if any dialog
wants to use logic that's not implemented yet, rather
than just not doing what was requested.
This helps prioritize what to implement while
adding support for more dialogs.
Change-Id: Iee708d96260d836879974b65e240ba7343b205f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176351
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
During native dictation, waiting for the next native event is
blocked while dictation runs in a loop within a native callback.
Because of this, LibreOffice's painting timers won't fire until
dictation is cancelled or the user pauses speaking. So, force
any pending timers to fire after the marked text changes.
Also, remove the fix for OpenOffice bug 106901 as causes any
key down events to cancel dictation and removing the fix does
not appear to cause the original crashing bug to reoccur.
Note: inserting a character from the system Character Viewer
window causes dictation to stop responding and the only way
I have found to restart dictation is by toggling dictation off
and then back on again. This same behavior occurs in Apple's
TextEdit application so this appears to be a macOS bug.
Change-Id: Iad2b54870ff1a315f2f71d72bef24af3cea808e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176100
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
Reviewed-by: Patrick Luby <guibomacdev@gmail.com>
V1048 The 'bNumeric' variable was assigned the same value. See line 205 and 232.
Change-Id: If047644a491c8c52933e9bc25d8d85dcbd3565c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175154
Reviewed-by: David Gilbert <freedesktop@treblig.org>
Tested-by: Jenkins
V1048 The 'eEnableChildren' variable was assigned the same value. See lines 2537 and 2542.
Change-Id: If1e7630ea3fc3bec8401977a011f29380c70da0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175156
Reviewed-by: David Gilbert <freedesktop@treblig.org>
Tested-by: Jenkins
Change-Id: If68fa2c871472a21d9404370351828753db37ee4
V1037: Two or more case-branches perform the same actions. Check lines: 727, 731
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175159
Tested-by: Jenkins
Reviewed-by: David Gilbert <freedesktop@treblig.org>
* Update helpcontent2 from branch 'master'
to 4c8d7f27a01462bf8e05b6fd5cdc979433d62412
- Remove empty paragraph at line 78
Removed empty paragraph at line 78 to avoid warnings and translation problems.
Change-Id: I6d28f08bed4ec68921c1b8640504eff966cf517c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/176349
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Jenkins
* Update helpcontent2 from branch 'master'
to 9e9a188e016b3126a9b07d50084338dfead65bf6
- Fix empty heading in 'Edit module' help page
Added text to the heading in line 77, so that in now reads "Reset", to avoid the warning:
> Helpex warning: invalid po attributes extracted from /home/timar/libreoffice-master/helpcontent2/source/text/shared/optionen/01010401.xhp
> No string specified!>
> GroupID: hd_id3161832
- and problems with translation.
Change-Id: Ia5936a110fa1bbe663032f5fc36b07b7e1af210c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/176347
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Jenkins
and extrusion-specularity.
In ODF strict always value 'draw:MetalODF' was written. Changed the
logic to write 'loext:MetalMSCompatible' too, depending on eMetalType.
Using a QName as value requires a namespace declaration for the prefix
'loext'. That is now written directly at the element, not as global
declaration, to restrict its scope to the element. A global declaration
would hide when attributes or elements are accidentially written in
'loext' namespace.
The pattern for nonNegativePercent had missed the percent sign.
The export is adapted to write the percent sign.
Validation is skipped for save to ODF 1.3, because currently the
implicit validation uses always latest ODF version, see tdf#163806.
Tests are extended to cover ODF 1.4 and value draw:MetalODF.
Change-Id: I836d11b9cd327b9772e800d9797e04e1613ab2f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176246
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
Commit f4c2c7c79c lowered the Skia
flushing priority to solve tdf#157312. But the commit caused the
"window will dock in rectangle" border to not be drawn when dragging
a dockable window over a dockable position.
Surprisingly, tdf#157312 does not reoccur without the commit so
it appears that the commit is now unnecessary.
Change-Id: Ibd74ef94e8448cf32fd690d7a26dd098191040b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176341
Tested-by: Jenkins
Reviewed-by: Patrick Luby <guibomacdev@gmail.com>
so make this less confusing
Change-Id: Icc4d4c43f0d35963bb71cdcd64bdd78b00ed9632
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176324
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Add a new QtInstanceNotebook class that is the
weld::Notebook implementation using a native
Qt widget. It uses a QTabWidget.
Initially, all methods trigger an assert;
the actual logic still needs to be implemented
in future commits.
Let QtBuilder handle "GtkNotebook" objects by
creating a QTabWidget and let
QtInstanceBuilder::weld_notebook return
an instance of the new class.
Change-Id: I5a0671a1ba98bea3e0659e4f280706179bfb4d47
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176322
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Split the existing VclBuilder::handleTabChild into two
methods and make the logic not specific to vcl::Window
available to other subclasses as well, to make it
available for reuse by QtBuilder in the future.
In order to do that, move the existing XML parsing logic
from the beginning of VclBuilder::handleTabChild to the base
class into WidgetBuilder::handleTabChild.
Add a new purely virtual method `applyTabChildProperties`
to WidgetBuilder and move the corresponding logic for
vcl::Window to the new VclBuilder override of this method.
Call that method at the end of WidgetBuilder::handleTabChild.
For QtBuilder, just add a dummy implementation that
triggers an assert initially, which matches what
would have happened right at the beginning
of the previous WidgetBuilder::handleTabChild
implementation without this commit in place.
Change-Id: Ie5664bd341182fa51035b547accf9393d65a0702
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176320
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
In VclBuilder::handleTabChild, move casting the vcl::Window to
TabControl further down to avoid vcl::Window specific code in
the XML parsing logic.
Introduce a new purely virtual helper method
WidgetBuilder::isHorizontalTabControl,
implement for VclBuilder and QtBuilder and
use that in the XML parsing logic instead
of directly checking whether the parent is
a TabControl widget.
This gets rid of one detail specific to the VCL
implementation in the XML parsing part and is in
preparation of further refactoring of
VclBuilder::handleTabChild for reuse with QtBuilder.
Change-Id: I05c637f81bce4a5cdd443960a1ad096c347df560
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176319
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
V1037 Two or more case-branches perform the same actions. Check lines: 94, 97
Change-Id: If4eeadad5a9985a2d4e8336ab4cba9188655b6ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175227
Tested-by: Jenkins
Reviewed-by: David Gilbert <freedesktop@treblig.org>
V1037 Two or more case-branches perform the same actions. Check lines: 94, 99
Change-Id: I406b94c79426cebbd4813a019389d0cac0616bbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175226
Tested-by: Jenkins
Reviewed-by: David Gilbert <freedesktop@treblig.org>
V1037 Two or more case-branches perform the same actions. Check lines: 999, 1003
V1037 Two or more case-branches perform the same actions. Check lines: 1557, 1566, 1595
V1037 Two or more case-branches perform the same actions. Check lines: 2593, 2689
Change-Id: I0a3ab375e9e8c72802615108948c96808a2ec0b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175208
Tested-by: Jenkins
Reviewed-by: David Gilbert <freedesktop@treblig.org>
and
cid#1634580 Use of auto that causes a copy
cid#1634578 Use of auto that causes a copy
Change-Id: Iad2ec6285b1eb923f3f30e8b18ee577d53ca140b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176312
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Add a new QtInstanceTreeView class that is the
weld::TreeView implementation using a native
Qt widget. It uses a QTreeView.
Initially, all methods trigger an assert;
the actual logic still needs to be implemented
in future commits.
Let QtBuilder handle "GtkTreeView" objects by
creating a QTreeView.
Let QtInstanceBuilder::weld_treeview return
an instance of the new class.
Change-Id: Ia3e694dbef9033fe45a6d2bdbe09fc021cd47c58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176307
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Similar to how OutputDevice::approximate_digit_width, used
by SalInstanceWidget::get_approximate_digit_width does it,
get the width for all a text containing all of of the 10 digits
and divide by 10 to get the average/approximate width of a digit.
This method e.g. gets called by the print progress dialog.
Change-Id: Ib1779a0a211f571c10714a291fed8f84ae5906ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176306
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
Trigger asserts in more currently not (yet)
implemented methods, so anything missing becomes
clear more easily when working on adding support for another
dialog in the future, rather than some functionality
just not working as expected.
None of the newly added asserts was triggered
in a quick test of opening all of the dialogs
currently listed in QtInstanceBuilder::IsUIFileSupported.
Change-Id: Iea0c7aa22744cd7652ca6cbc2fbb287bfeaa4ef7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176305
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
The gtk_window_present doc says:
> Presents a window to the user.
>
> This may mean raising the window in the stacking order, unminimizing it,
> moving it to the current desktop and/or giving it the keyboard
> focus (possibly dependent on the user’s platform, window manager
> and preferences).
Therefore, call QWindow::requestActivate [2] for the Qt
implementation of weld::Window::present.
[1] https://docs.gtk.org/gtk4/method.Window.present.html
[2] https://doc.qt.io/qt-6/qwindow.html#requestActivate
Change-Id: I1c73dba1675523171a92c760836c6702a81f4c12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176303
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
