summaryrefslogtreecommitdiff
path: root/include/toolkit
AgeCommit message (Collapse)AuthorFilesLines
2013-05-25Revert "fdo#46808, Convert awt::UnoControlDialogModel to new style"Stephan Bergmann1-224/+4
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 (cherry picked from commit e36f83d81c462e1a5959b160886e481a8d449494)
2013-05-24fix awt::UnoControlModelDialog crashNoel Grandin1-3/+0
...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> (cherry picked from commit 2ce6828bbbf6ba181bb2276adeec279e74151ef6)
2013-05-22de-break published API changeCaolán McNamara1-2/+2
Change-Id: I86c2a3d8897278b47eb6b81327469cfae2f41fd5 (cherry picked from commit 7de47fe4ce076695a654198cf2c81ce3021d2cfb)
2013-05-22Related: #i121442# - Extend css::awt::XGraphic to draw imagesAriel Constenla-Haile1-33/+43
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 (cherry picked from commit f858fa266d8b33ccc27bb6a91f1923b9ea9cdaaa)
2013-05-22Fix exception specificationsStephan Bergmann1-12/+12
Change-Id: Ic2384073bba833224815582d4b9fee88c1ead782 (cherry picked from commit 697a007c61b9cabceb9767fad87cd5822b300452)
2013-05-21fdo#46808, Convert awt::XUnoControlDialog to new styleNoel Grandin1-3/+71
Change-Id: I40d2e2ddd92186a2ba22ebfbdda8367391e8d355
2013-05-21fdo#46808, Convert awt::UnoControlDialogModel to new styleNoel Grandin1-1/+156
Change-Id: I4b912034ef3f4855b87d6d6f18ff13bd1ecc8f72
2013-05-18Resolves: #i87883# add a PrinterServer.idl and fix implCaolán McNamara1-16/+8
Change-Id: Id351109616737f916d7f4c2715347daa23367281
2013-05-15These functions can throw RuntimeExceptionStephan Bergmann9-10/+10
Change-Id: Ic390ceeb9f52953d5dea6999b194956e90eb4629
2013-04-25don't pollute global namespaceThomas Arnhold2-55/+43
Change-Id: Iffeeffb015c59ea787838c737c6a11f6fbef2794
2013-04-23execute move of global headersBjoern Michaelsen66-0/+10405
see https://gerrit.libreoffice.org/#/c/3367/ and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-13 11:19:01 +0000