cui/source/options/optgdlg.cxx | 5 ++++- cui/source/options/optgdlg.hxx | 1 + sfx2/source/sidebar/SidebarController.cxx | 9 +++++---- 3 files changed, 10 insertions(+), 5 deletions(-)
New commits: commit f0814d1b8bb93ea08f9e0c275e6b83e0e422a159 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Aug 7 10:13:08 2019 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Aug 29 09:19:09 2019 +0200 Resolves: tdf#125483 locale separator label needs to be derived from original regression from... commit fa3d5ca1f99fe253689004a45ec2888ebbe85fd3 Date: Thu May 30 12:33:32 2013 +0200 Convert Languages tab page to .ui Change-Id: I940269d14a0a84768c4f8e62c153cfac51cf577f Reviewed-on: https://gerrit.libreoffice.org/77088 Tested-by: Jenkins Reviewed-by: Xisco Faulí <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/77909 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 535262f022a8..082919e25768 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -1170,6 +1170,9 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet& get(m_pCTLSupportCB, "ctlsupport"); get(m_pIgnoreLanguageChangeCB, "ignorelanguagechange"); + // tdf#125483 save original default label + m_sDecimalSeparatorLabel = m_pDecimalSeparatorCB->GetText(); + // initialize user interface language selection m_sSystemDefaultString = SvtLanguageTable::GetLanguageString( LANGUAGE_SYSTEM ); @@ -1801,7 +1804,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, ListBox&, rListBox, void ) LocaleDataWrapper aLocaleWrapper( aLanguageTag ); // update the decimal separator key of the related CheckBox - OUString sTempLabel(m_pDecimalSeparatorCB->GetText()); + OUString sTempLabel(m_sDecimalSeparatorLabel); sTempLabel = sTempLabel.replaceFirst("%1", aLocaleWrapper.getNumDecimalSep() ); m_pDecimalSeparatorCB->SetText(sTempLabel); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 08d5634a889e..890c2efce3e3 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -163,6 +163,7 @@ class OfaLanguagesTabPage : public SfxTabPage OUString m_sUserLocaleValue; OUString m_sSystemDefaultString; + OUString m_sDecimalSeparatorLabel; bool m_bDatePatternsValid; commit 7dafc2aff5df5b36ca1ebdc55933953a4eaa0acd Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Mon Jul 29 10:09:11 2019 +0200 Commit: Andras Timar <[email protected]> CommitDate: Thu Aug 29 09:18:56 2019 +0200 Expand collapsed sidebar when calling XSidebarProvider::showDecks This UNO call did not work correctly when the sidebar was completely collapsed. Change-Id: I3de0b89d95aa81287c36911bbd52a9941d9886b3 Reviewed-on: https://gerrit.libreoffice.org/76531 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/77908 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 2ed61d330c98..0b6df46d1388 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -621,10 +621,6 @@ void SidebarController::OpenThenToggleDeck ( void SidebarController::OpenThenSwitchToDeck ( const OUString& rsDeckId) { - SfxSplitWindow* pSplitWindow = GetSplitWindow(); - if ( pSplitWindow && !pSplitWindow->IsFadeIn() ) - // tdf#83546 Collapsed sidebar should expand first - pSplitWindow->FadeIn(); RequestOpenDeck(); SwitchToDeck(rsDeckId); @@ -1226,6 +1222,11 @@ void SidebarController::RequestCloseDeck() void SidebarController::RequestOpenDeck() { + SfxSplitWindow* pSplitWindow = GetSplitWindow(); + if ( pSplitWindow && !pSplitWindow->IsFadeIn() ) + // tdf#83546 Collapsed sidebar should expand first + pSplitWindow->FadeIn(); + mbIsDeckRequestedOpen = true; UpdateDeckOpenState(); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
