Age | Commit message (Collapse) | Author |
|
Avoid deadlock by disposing the accesibility context without the Mutex
locked, since it will eventually try to acquire the SolarMutex...
Thread 1 in UnoControl::getPosSize()
calling from sdr::contact::ControlHolder::getPosSize()
Thread 2 calling from UnoControl::setDesignMode()
trying to get SolarMutex in VCLXWindow::disposing()
Change-Id: I7d0ffe4fa0f8cd0c48e9b9b5e923ce229f97ca57
|
|
Change-Id: I79548f9dd1b83ef940e7a1302cf7b728610fed4a
Reviewed-on: https://gerrit.libreoffice.org/5757
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
|
|
mostly ResId using ctors left stranded post .ui conversion
Change-Id: I06689eea30ee9146ba05294f52056c0d263695f5
|
|
Change-Id: I4899c89ee5b2a54c9c05b531ab284365f1558e3d
Reviewed-on: https://gerrit.libreoffice.org/5270
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
|
|
Conflicts:
offapi/type_reference/offapi.rdb
Change-Id: If68ecf0691919d71d06d7b97d46db115013f9805
Reviewed-on: https://gerrit.libreoffice.org/5149
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
|
|
(cherry picked from commit 27cfcb1e9d103b3e49c1263b1fa59fee8b187b21)
Conflicts:
desktop/test/deployment/active/active_native.cxx
desktop/test/deployment/passive/Dispatch.java
desktop/test/deployment/passive/passive_native.cxx
odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
odk/examples/DevelopersGuide/GUI/MessageBox.java
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx
odk/examples/java/Inspector/Inspector.java
offapi/com/sun/star/awt/MessageBoxButtons.idl
offapi/com/sun/star/awt/MessageBoxResults.idl
offapi/com/sun/star/awt/XMessageBox.idl
offapi/com/sun/star/awt/XMessageBoxFactory.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/types.rdb
sdext/source/minimizer/unodialog.cxx
toolkit/inc/toolkit/awt/vclxtoolkit.hxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/layout/core/root.cxx
Change-Id: I170b494fb96362bb25ba8d0f2518d4e46934dd67
Related: #i121544# - Clean-up MessageBox API (post fix)
(cherry picked from commit c9f7a06e7798bcd5253844c49d210ea9345bd4b8)
Conflicts:
sw/inc/pch/precompiled_sw.hxx
Change-Id: Ib8b1e7aaac769feff5206fcdd238c487a6130dd1
Related: #i121544# - Fix header guards
Found by: Tsutomu Uchino
(cherry picked from commit 82194a19ff4f29c8451c8e6ab6fe4f1b9d08df27)
Conflicts:
offapi/com/sun/star/awt/MessageBoxType.idl
Change-Id: Ide8ba697fbc80395d2f30a068a0820a6afa3332f
|
|
(cherry picked from commit 514bb6777e001d02dbd9be63fc7a6187560aad63)
Conflicts:
offapi/com/sun/star/awt/UnoControlSimpleAnimation.idl
offapi/com/sun/star/awt/UnoControlSimpleAnimationModel.idl
offapi/com/sun/star/awt/XSimpleAnimation.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/typelibrary_history.txt
offapi/type_reference/types.rdb
toolkit/inc/toolkit/helper/servicenames.hxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/awt/xsimpleanimation.cxx
toolkit/source/controls/tksimpleanimation.cxx
toolkit/source/helper/registerservices.cxx
toolkit/source/helper/servicenames.cxx
toolkit/util/toolkit.xml
Change-Id: If7f8de62713e28434e28975026cf8e5c66c831aa
|
|
(cherry picked from commit 5569d97f06a0299e41b91ca248bf7eaa038b1f21)
Conflicts:
icon-themes/human/toolkit/source/awt/spinner03-grey_01.png
icon-themes/human/toolkit/source/awt/spinner03-grey_02.png
icon-themes/human/toolkit/source/awt/spinner03-grey_03.png
icon-themes/human/toolkit/source/awt/spinner03-grey_04.png
icon-themes/human/toolkit/source/awt/spinner03-grey_05.png
icon-themes/human/toolkit/source/awt/spinner03-grey_06.png
icon-themes/human/toolkit/source/awt/spinner03-grey_07.png
icon-themes/human/toolkit/source/awt/spinner03-grey_08.png
icon-themes/human/toolkit/source/awt/spinner03-grey_09.png
icon-themes/human/toolkit/source/awt/spinner03-grey_10.png
icon-themes/human/toolkit/source/awt/spinner03-grey_11.png
icon-themes/human/toolkit/source/awt/spinner03-grey_12.png
offapi/com/sun/star/awt/UnoControlThrobber.idl
offapi/com/sun/star/awt/UnoControlThrobberModel.idl
offapi/com/sun/star/awt/XThrobber.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/typelibrary_history.txt
offapi/type_reference/types.rdb
rat-excludes
swext/mediawiki/help/component.txt
swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
swext/mediawiki/src/description.xml
toolkit/AllLangResTarget_tk.mk
toolkit/inc/toolkit/helper/servicenames.hxx
toolkit/source/awt/vclxtoolkit.cxx
toolkit/source/awt/xthrobber.cxx
toolkit/source/awt/xthrobber.hrc
toolkit/source/awt/xthrobber.src
toolkit/source/controls/tkthrobber.cxx
toolkit/source/helper/registerservices.cxx
toolkit/source/helper/servicenames.cxx
toolkit/src2xml/src.lst
toolkit/util/toolkit.xml
Change-Id: Ic415a96fe6ba7040a3b03fd562f997d2df1516d6
|
|
Change-Id: Idb9971d848870f4d00dbf77e80e48bf7dfde8913
Reviewed-on: https://gerrit.libreoffice.org/4601
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
(cherry picked from commit 399946b82f5efec19cd82d1c320d5aa9295d235d)
Conflicts:
chart2/source/controller/main/ChartController_Window.cxx
framework/source/uielement/langselectionmenucontroller.cxx
framework/source/uielement/popupmenucontroller.cxx
framework/source/uielement/recentfilesmenucontroller.cxx
framework/source/uielement/toolbarsmenucontroller.cxx
odk/examples/DevelopersGuide/GUI/UnoMenu.java
odk/examples/DevelopersGuide/GUI/UnoMenu2.java
odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/SelectionModeStatusbarController.cxx
offapi/com/sun/star/awt/MenuBar.idl
offapi/com/sun/star/awt/MenuEvent.idl
offapi/com/sun/star/awt/MenuItemStyle.idl
offapi/com/sun/star/awt/MenuItemType.idl
offapi/com/sun/star/awt/MenuLogo.idl
offapi/com/sun/star/awt/PopupMenu.idl
offapi/com/sun/star/awt/PopupMenuDirection.idl
offapi/com/sun/star/awt/XMenu.idl
offapi/com/sun/star/awt/XMenuBar.idl
offapi/com/sun/star/awt/XMenuBarExtended.idl
offapi/com/sun/star/awt/XMenuExtended.idl
offapi/com/sun/star/awt/XMenuExtended2.idl
offapi/com/sun/star/awt/XMenuListener.idl
offapi/com/sun/star/awt/XPopupMenu.idl
offapi/com/sun/star/awt/XPopupMenuExtended.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/types.rdb
svtools/inc/svtools/popupmenucontrollerbase.hxx
svtools/source/uno/popupmenucontrollerbase.cxx
svx/source/tbxctrls/extrusioncontrols.cxx
toolkit/inc/pch/precompiled_toolkit.hxx
toolkit/inc/toolkit/awt/vclxmenu.hxx
toolkit/inc/toolkit/helper/listenermultiplexer.hxx
toolkit/source/awt/vclxmenu.cxx
Change-Id: I3d9a1e109b9ff35901a3075b44a4c27e7c12b5c7
Related: #i121542# css::awt::XPopupMenu::execute() needs a Rectangle
(cherry picked from commit c01a6f4f370b72f0751cf4f5c11310682e2b3248)
Conflicts:
odk/examples/DevelopersGuide/GUI/UnoMenu2.java
offapi/type_reference/types.rdb
toolkit/inc/toolkit/awt/vclxmenu.hxx
Change-Id: I2cccc95086fe3d1522d03346e3c577fb2f21f621
|
|
Change-Id: If91077da9d032d69e67a9ef1caf94f6fa7551844
|
|
from cws/fs35a by Frank Schoenheit [fs]
(cherry picked from commit e9bfcd0982bcb67071b344da377158fc0d88d8a6)
Conflicts:
toolkit/inc/toolkit/awt/vclxprinter.hxx
toolkit/source/awt/vclxprinter.cxx
Change-Id: I96b08d00c7e483891d3c24c90fa52764949add0b
Fix line endings
(cherry picked from commit f4f2c3189e5fc9f6fac57b5a6df0840ecdaaa731)
Conflicts:
toolkit/inc/toolkit/awt/vclxprinter.hxx
toolkit/source/awt/vclxprinter.cxx
Change-Id: I88acd74eec39410844030d3cba489e1fe62a91b3
|
|
Change-Id: I598926b72c5540b472f9607e2f3df134a8c50048
|
|
sed -i "s,<type>\([^<]\+\)</type>,\1,"
Change-Id: Ibdaeb2c396ad29ced05716142b38c6a1c3e49847
|
|
sed -i 's,<type scope="\([^"]*\)">\([^<]\+\)</type>,\1::\2,g'
Change-Id: I7eb32acd44132de79cc7ac1e7f78b43bb4814d14
|
|
Change-Id: I9a5256c8dbacda60167403b4e26900588943a9b2
|
|
This reverts commit 6c61b20a8d4a6dcac28801cde82a211fb7e30654. As discussed at
<http://lists.freedesktop.org/archives/libreoffice/2013-May/052449.html> "Re:
fdo#46808, Convert awt::UnoControlDialogModel to new style problem" why the odd
change in 2e2a4827ce6708f0e8677dba9cc92e1479a44086 "scripting: get
CreateUnoDialog() work again" appears to fix things again:
The problem is that the implementation of the css.awt.UnoControlDialogModel
involves UNO aggregation
(IMPL_CREATE_INSTANCE_WITH_GEOMETRY(UnoControlDialogModel) in
toolkit/soruce/helper/registerservices.cxx creating a
OGeometryControlModel<UnoControlDialogModel> instance that aggregates a
UnoControlDialogModel instance). That means that queryInterface can return a
reference to something that is technically a different object, and that's
what's happening here, and explains why calling setPropertyValue in two
different ways on what logically appears to be a single object can end up
calling two different implementations (of two different physical objects).
(UNO aggregation is known to be broken and should not be used. Nevertheless,
there's still code that does---code that is a horrible mess and hard to clean
up.)
That all this worked as intended in the past is just sheer luck, but any
way of substantially touching it is asking for trouble. I'm going to
revert 6c61b20a8d4a6dcac28801cde82a211fb7e30654 again.
I wasn't able to revert without also reverting
be50ad28f5bbdaeff527f646481ce263843c2401 "fdo#46808, Convert
awt::XUnoControlDialog to new style," as the two were tightly dependant. Also
reverts all the follow-up fixes cb4b6dde8fda2a5848e11063028bf44d72f85431
"-Werror,-Wuninitialized" (sans the const-ness fix in
UpdateHandler::insertControlModel), 697a007c61b9cabceb9767fad87cd5822b300452
"Fix exception specifications," 2ce6828bbbf6ba181bb2276adeec279e74151ef6 "fix
awt::UnoControlModelDialog crash," and 2e2a4827ce6708f0e8677dba9cc92e1479a44086
"scripting: get CreateUnoDialog() work again."
Conflicts:
basctl/source/dlged/dlged.cxx
filter/source/t602/t602filter.cxx
xmlscript/test/imexp.cxx
Change-Id: I5d133468062f3ca36300db52fbd699be1ac72998
|
|
...in commit 6c61b20a8d4a6dcac28801cde82a211fb7e30654,
"Convert awt::UnoControlDialogModel to new style"
I added an attribute "ResourceResolver" because some of the client
code was setting it using the property interface.
It turns out that this was a bad idea because the "ResourceResolver"
property is doing some very interesting stuff, so revert that part
of the change.
Change-Id: I62b890e60164e005867ced49c3e407a49ed09441
Reviewed-on: https://gerrit.libreoffice.org/4013
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Change-Id: Ic2384073bba833224815582d4b9fee88c1ead782
|
|
Change-Id: I86c2a3d8897278b47eb6b81327469cfae2f41fd5
|
|
A StatusbarController that draws its status bar item may need to draw a
graphic representing the feature state. css::awt::XGraphics API should
be extended to include VCL's OuptDevice::DrawImage
(cherry picked from commit 3ca8e86d4489f023160d69ba621a819a89ab90d5)
Conflicts:
offapi/com/sun/star/awt/XGraphics.idl
offapi/com/sun/star/awt/makefile.mk
offapi/type_reference/types.rdb
toolkit/inc/toolkit/awt/vclxgraphics.hxx
toolkit/source/awt/vclxgraphics.cxx
Change-Id: If2c37022e60e8a3c9fce51dac84f4a2af001b5c5
|
|
Change-Id: I40d2e2ddd92186a2ba22ebfbdda8367391e8d355
|
|
Change-Id: I4b912034ef3f4855b87d6d6f18ff13bd1ecc8f72
|
|
Change-Id: Id351109616737f916d7f4c2715347daa23367281
|
|
Change-Id: Ic390ceeb9f52953d5dea6999b194956e90eb4629
|
|
Change-Id: Iffeeffb015c59ea787838c737c6a11f6fbef2794
|
|
see https://gerrit.libreoffice.org/#/c/3367/
and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details
Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a
|