• Stephan Bergmann's avatar
    Revert "fdo#46808, Convert awt::UnoControlDialogModel to new style" · e36f83d8
    Stephan Bergmann yazdı
    This reverts commit 6c61b20a.  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 2e2a4827 "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 6c61b20a again.
    
    I wasn't able to revert without also reverting
    be50ad28 "fdo#46808, Convert
    awt::XUnoControlDialog to new style," as the two were tightly dependant.  Also
    reverts all the follow-up fixes cb4b6dde
    "-Werror,-Wuninitialized" (sans the const-ness fix in
    UpdateHandler::insertControlModel), 697a007c
    "Fix exception specifications," 2ce6828b "fix
    awt::UnoControlModelDialog crash," and 2e2a4827
    "scripting: get CreateUnoDialog() work again."
    
    Conflicts:
    	basctl/source/dlged/dlged.cxx
    	filter/source/t602/t602filter.cxx
    	xmlscript/test/imexp.cxx
    
    Change-Id: I5d133468062f3ca36300db52fbd699be1ac72998
    e36f83d8
Adı
Son kayıt (commit)
Son güncelleme
..
qa Loading commit data...
source Loading commit data...
test/accessibility Loading commit data...
util Loading commit data...
AllLangResTarget_tk.mk Loading commit data...
JunitTest_toolkit_complex.mk Loading commit data...
JunitTest_toolkit_unoapi.mk Loading commit data...
Library_tk.mk Loading commit data...
Makefile Loading commit data...
Module_toolkit.mk Loading commit data...
README Loading commit data...