diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-06-28 10:39:39 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-09-03 18:58:45 +0000 |
| commit | a8af548c3be5a42cec7177c60c6d421d2dbc35b4 (patch) | |
| tree | eb916d8b8935cf7e2c4d17101a839d214de099d7 /include | |
| parent | bdcb0c43c72b0e682612c88cdc0796f921c7f67d (diff) | |
always call setDeferredProperties for dialog get/set title
so we always get the correct up to date title even if we have
been holding off on setting some properties to ensure that
virtual method aren't called during construction
e.g. insert/edit index marks is always "Insert Index Mark"
(cherry picked from commit 31fc0b74425253589b2ac0dcecb9e8a2714954b4)
Change-Id: I57f9cc8fbdb9d2a304c346e03893fa55d6a61bd5
Reviewed-on: https://gerrit.libreoffice.org/5762
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/passwd.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/dialog.hxx | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index 1f10c7416b98..b0efa7bc147c 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -73,7 +73,7 @@ private: void SetPasswdText(); public: - SfxPasswordDialog(Window* pParent, const String* pGroupText = NULL); + SfxPasswordDialog(Window* pParent, const OUString* pGroupText = NULL); String GetUser() const { diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index a8737d15395f..4e20d633e54d 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -114,6 +114,9 @@ public: virtual short Execute(); sal_Bool IsInExecute() const { return mbInExecute; } + virtual void SetText( const OUString& rStr ); + virtual OUString GetText() const; + //////////////////////////////////////// // Dialog::Execute replacement API public: |