include/vcl/layout.hxx | 4 +++- swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java | 2 ++ vcl/source/window/layout.cxx | 1 - 3 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit 253b97cc353731dfec6fa6dc9923f34a946b0d21 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Sep 8 13:42:49 2014 +0100 missing imports Change-Id: Id569f55097cf513825b62225ec8861319b0a93cf diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java index 959cf99..15ece8c 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java @@ -36,6 +36,8 @@ import com.sun.star.frame.XFrame; import com.sun.star.frame.XModel; import com.sun.star.frame.XStorable; import com.sun.star.lang.XInitialization; +import com.sun.star.lang.XSingleComponentFactory; +import com.sun.star.lib.uno.helper.Factory; import com.sun.star.lib.uno.helper.WeakBase; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; commit fbc634d448000089376cf5fbde4413093ea9ed2d Author: Caolán McNamara <caol...@redhat.com> Date: Mon Sep 8 08:05:18 2014 +0100 make this ctor of MessageDialog for the builder only Change-Id: Ic92f6e46164bdb2e15a0a23876fce5be10a73324 diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 6c4ce28..cddac9e 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -719,6 +719,9 @@ private: void setButtonHandlers(VclButtonBox *pButtonBox); short get_response(const Window *pWindow) const; void create_owned_areas(); + + friend class VclBuilder; + MessageDialog(Window* pParent, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); public: MessageDialog(Window* pParent, @@ -726,7 +729,6 @@ public: VclMessageType eMessageType = VCL_MESSAGE_ERROR, VclButtonsType eButtonsType = VCL_BUTTONS_OK, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); - MessageDialog(Window* pParent, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); MessageDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription); virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 3c71327..fb99034 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1946,7 +1946,6 @@ MessageDialog::MessageDialog(Window* pParent, WinBits nStyle) , m_pSecondaryMessage(NULL) { SetType(WINDOW_MESSBOX); - create_owned_areas(); } MessageDialog::MessageDialog(Window* pParent,
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits