diff options
| author | Szymon Kłos <eszkadev@gmail.com> | 2014-11-08 13:43:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-11 16:39:39 +0000 |
| commit | 2fc7a10dbf7f76046cd287c7e7695fc547d2fab3 (patch) | |
| tree | e18f45fdab549b561507914b37949214ddab9d12 | |
| parent | bd78cbd028781c27c824c52715824e3cefda6054 (diff) | |
fdo#84582 : fixed label in the 'Insert Version Comment' dialog
When user's data are empty, dialog shows "(no name set)".
Dialog:
Writer->File->Versions...->Save New Version
Change-Id: I6780cbe452fbc206b3e153975dbb1c1d9570718b
Reviewed-on: https://gerrit.libreoffice.org/12307
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sfx2/source/dialog/dialog.hrc | 1 | ||||
| -rw-r--r-- | sfx2/source/dialog/versdlg.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/dialog/versdlg.src | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc index 74eaba91b313..73e39ac92df4 100644 --- a/sfx2/source/dialog/dialog.hrc +++ b/sfx2/source/dialog/dialog.hrc @@ -46,6 +46,7 @@ #define MN_CONTEXT_TEMPLDLG ( RC_DIALOG_BEGIN + 46) #define STR_VIEWVERSIONCOMMENT ( RC_DIALOG_BEGIN + 71 ) +#define STR_NO_NAME_SET ( RC_DIALOG_BEGIN + 72 ) #define STR_ERROR_WRONG_CONFIRM ( RC_DIALOG_BEGIN + 76 ) diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 5b3ebd592afb..35c5d73959d2 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -473,9 +473,11 @@ SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVe get(m_pCancelButton, "cancel"); get(m_pCloseButton, "close"); + OUString sAuthor = rInfo.aAuthor.isEmpty() ? SfxResId(STR_NO_NAME_SET) : rInfo.aAuthor; + const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); m_pDateTimeText->SetText(m_pDateTimeText->GetText() + formatTime(rInfo.aCreationDate, rLocaleWrapper)); - m_pSavedByText->SetText(m_pSavedByText->GetText() + rInfo.aAuthor); + m_pSavedByText->SetText(m_pSavedByText->GetText() + sAuthor); m_pEdit->SetText(rInfo.aComment); m_pEdit->set_height_request(7 * m_pEdit->GetTextHeight()); m_pEdit->set_width_request(40 * m_pEdit->approximate_char_width()); diff --git a/sfx2/source/dialog/versdlg.src b/sfx2/source/dialog/versdlg.src index 63471ac02c89..00171456fdde 100644 --- a/sfx2/source/dialog/versdlg.src +++ b/sfx2/source/dialog/versdlg.src @@ -24,4 +24,9 @@ String STR_VIEWVERSIONCOMMENT Text [ en-US ] = "View Version Comment" ; }; +String STR_NO_NAME_SET +{ + Text [ en-US ] = "(no name set)" ; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |