diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-01-01 20:22:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-04 20:22:57 +0000 |
| commit | 4b9c6542f7107be7536f239ca061fd363395b3d4 (patch) | |
| tree | 49586dcf8bbe98bb9018bff47686be4da74ab703 /include | |
| parent | a2045ea778ee0191528bdc69165ad382cc7c1cb1 (diff) | |
fdo#74104 fdo#73904 backport Message dialog creation from message strings
Original title:
"allow simple MessageDialogs to be created from just message strings"
Commit 9b6b03542df7f6b0feecf60a13bab7e885ef3587 upgraded
sd/source/ui/view/Outliner.cxx to use a MessageDialog created from just a
message string, but was done before the existence of this commit -- it's
presumably safest to backport this commit to ensure that any other such
changed dialogs will work as expected.
(cherry picked from commit 257d1f4ff3094a42952663d620d7c49e3e7c747f)
Conflicts:
basctl/source/basicide/moduldl2.cxx
Change-Id: I9f8324d1c61bd55ccc78e67699ebdfa946e48af6
Reviewed-on: https://gerrit.libreoffice.org/7859
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/layout.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 57890f2bc7b5..d758d630bb33 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -693,6 +693,8 @@ class VCL_DLLPUBLIC MessageDialog : public Dialog private: VclButtonsType m_eButtonsType; VclMessageType m_eMessageType; + VclBox *m_pOwnedContentArea; + VclButtonBox *m_pOwnedActionArea; VclGrid* m_pGrid; FixedImage* m_pImage; VclMultiLineEdit* m_pPrimaryMessage; @@ -704,14 +706,15 @@ private: DECL_DLLPRIVATE_LINK(ButtonHdl, Button *); void setButtonHandlers(VclButtonBox *pButtonBox); short get_response(const Window *pWindow) const; + void create_owned_areas(); public: MessageDialog(Window* pParent, const OUString &rMessage, VclMessageType eMessageType = VCL_MESSAGE_ERROR, VclButtonsType eButtonsType = VCL_BUTTONS_OK, - WinBits nStyle = WB_CLIPCHILDREN | WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); - MessageDialog(Window* pParent, WinBits nStyle = WB_CLIPCHILDREN); + 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); virtual short Execute(); |