sc/inc/SheetViewManager.hxx | 2 + sc/inc/globstr.hrc | 3 ++ sc/source/core/data/SheetViewManager.cxx | 7 +++++- sc/source/ui/dialogs/SelectSheetViewDialog.cxx | 28 ++++++++++++++----------- 4 files changed, 27 insertions(+), 13 deletions(-)
New commits: commit cbd3e80f753b614785b93438899126c3b416fbe4 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Sat Oct 18 10:43:54 2025 +0900 Commit: Miklos Vajna <[email protected]> CommitDate: Wed Oct 22 08:22:38 2025 +0200 sc: put sheet view strings for translation Sheet view generated name and the default view name were not added for translation, so add that in this change. Change-Id: Ie48f98f5102b7d308ffd709698e619bcf50d693d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192603 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sc/inc/SheetViewManager.hxx b/sc/inc/SheetViewManager.hxx index f516e3a76c22..dc2bf8677230 100644 --- a/sc/inc/SheetViewManager.hxx +++ b/sc/inc/SheetViewManager.hxx @@ -63,6 +63,8 @@ public: SheetViewID getPreviousSheetView(SheetViewID nID); void unsyncAllSheetViews(); + + static OUString defaultViewName(); }; } diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index ceca2b5d31c7..49b203c82661 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -589,6 +589,9 @@ #define STR_SENSITIVITY_SHADOWPRICE NC_("STR_SENSITIVITY_SHADOWPRICE", "Shadow Price") #define STR_SENSITIVITY_RHS NC_("STR_SENSITIVITY_RHS", "Constraint R.H. Side") +#define STR_SHEET_VIEW_DEFAULT_VIEW_NAME NC_("STR_SHEET_VIEW_DEFAULT_VIEW_NAME", "Default View") +#define STR_SHEET_VIEW_TEMPORARY_NAME_TEMPLATE NC_("STR_SHEET_VIEW_TEMPORARY_NAME_TEMPLATE", "Temporary View %1") + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/SheetViewManager.cxx b/sc/source/core/data/SheetViewManager.cxx index 95a01b1f27d4..77d66d3102ee 100644 --- a/sc/source/core/data/SheetViewManager.cxx +++ b/sc/source/core/data/SheetViewManager.cxx @@ -9,6 +9,8 @@ #include <SheetViewManager.hxx> #include <table.hxx> +#include <globstr.hrc> +#include <scresid.hxx> namespace sc { @@ -122,8 +124,11 @@ void SheetViewManager::unsyncAllSheetViews() OUString SheetViewManager::generateName() { maNameCounter++; - return u"Temp View " + OUString::number(maNameCounter); + OUString aTemplate = ScResId(STR_SHEET_VIEW_TEMPORARY_NAME_TEMPLATE); + return aTemplate.replaceAll("%1", OUString::number(maNameCounter)); } + +OUString SheetViewManager::defaultViewName() { return ScResId(STR_SHEET_VIEW_DEFAULT_VIEW_NAME); } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dialogs/SelectSheetViewDialog.cxx b/sc/source/ui/dialogs/SelectSheetViewDialog.cxx index 9f1222e4d77d..c3f31022814a 100644 --- a/sc/source/ui/dialogs/SelectSheetViewDialog.cxx +++ b/sc/source/ui/dialogs/SelectSheetViewDialog.cxx @@ -44,27 +44,31 @@ SelectSheetViewDialog::SelectSheetViewDialog(weld::Window* pParent, ScViewData& ScDocument& rDocument = mrViewData.GetDocument(); auto pSheetManager = rDocument.GetSheetViewManager(mrViewData.GetTabNumber()); + m_xEntryTree->clear(); m_xEntryTree->freeze(); - m_xEntryTree->clear(); OUString sActiveID = u"-1"_ustr; - m_xEntryTree->append(u"-1"_ustr, u"Default View"_ustr); - - sc::SheetViewID nSheetViewID = 0; + m_xEntryTree->append(u"-1"_ustr, SheetViewManager::defaultViewName()); - for (auto const& pSheetView : pSheetManager->getSheetViews()) + if (pSheetManager) { - if (pSheetView) + sc::SheetViewID nSheetViewID = 0; + + for (auto const& pSheetView : pSheetManager->getSheetViews()) { - auto& aEntry = m_aEntries.emplace_back(pSheetView, nSheetViewID); - OUString sID = OUString::number(m_aEntries.size() - 1); - if (nSheetViewID == mrViewData.GetSheetViewID()) - sActiveID = sID; - m_xEntryTree->append(sID, aEntry.getName()); + if (pSheetView) + { + auto& aEntry = m_aEntries.emplace_back(pSheetView, nSheetViewID); + OUString sID = OUString::number(m_aEntries.size() - 1); + if (nSheetViewID == mrViewData.GetSheetViewID()) + sActiveID = sID; + m_xEntryTree->append(sID, aEntry.getName()); + } + nSheetViewID++; } - nSheetViewID++; } + m_xEntryTree->thaw(); m_xEntryTree->select_id(sActiveID);
