sc/source/ui/inc/content.hxx | 3 ---
sc/source/ui/navipi/content.cxx | 12 +-----------
sc/source/ui/navipi/navipi.cxx | 10 ----------
3 files changed, 1 insertion(+), 24 deletions(-)
New commits:
commit d34c975c849db6c99d3b1f0155cce34234468fc1
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Oct 6 15:39:37 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Oct 6 21:32:15 2023 +0200
aHiddenTitle is always an empty string
Change-Id: I881c8d017da0792420ba6929c0dccbfa0df78e04
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157650
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx
index 9f7f6aada3b8..5a14cb48b4a4 100644
--- a/sc/source/ui/inc/content.hxx
+++ b/sc/source/ui/inc/content.hxx
@@ -51,7 +51,6 @@ class ScContentTree
OUString aManualDoc; // Switched in Navigator
(Title)
bool bHiddenDoc; // Hidden active?
OUString aHiddenName; // URL to load
- OUString aHiddenTitle; // for display
ScDocument* pHiddenDocument; // temporary
bool bIsInNavigatorDlg;
bool m_bFreeze;
@@ -149,8 +148,6 @@ public:
void SelectDoc(const OUString& rName);
void SelectEntryByName(const ScContentId nRoot, std::u16string_view
rName);
- const OUString& GetHiddenTitle() const { return aHiddenTitle; }
-
/** Applies the navigator settings to the listbox. */
void ApplyNavigatorSettings();
/** Stores the current listbox state in the navigator settings. */
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 96bd64a75924..1af85b31d051 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -586,16 +586,6 @@ IMPL_LINK(ScContentTree, CommandHdl, const CommandEvent&,
rCEvt, bool)
xDocMenu->append_radio(sId, pParentWindow->aStrActiveWin);
if (!bHiddenDoc && aManualDoc.isEmpty())
sActive = sId;
- // hidden document
- if ( !aHiddenTitle.isEmpty() )
- {
- OUString aEntry = aHiddenTitle + pParentWindow->aStrHidden;
- ++i;
- sId = "document" + OUString::number(i);
- xDocMenu->append_radio(sId, aEntry);
- if (bHiddenDoc)
- sActive = sId;
- }
xDocMenu->set_active(sActive, true);
OUString sIdent = xPop->popup_at_rect(m_xTreeView.get(),
tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1)));
@@ -1408,7 +1398,7 @@ bool ScContentTree::ActiveDocChanged()
OUString aCurrent;
if ( bHiddenDoc )
- aCurrent = aHiddenTitle;
+ aCurrent = OUString();
else
{
ScDocShell* pSh = GetManualOrCurrent();
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 940a8f4e4f8f..ad5e149e9028 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -884,16 +884,6 @@ void ScNavigatorDlg::GetDocNames( const OUString*
pManualSel )
m_xLbDocuments->append_text(aStrActiveWin);
- OUString aHidden = m_xLbEntries->GetHiddenTitle();
- if (!aHidden.isEmpty())
- {
- OUString aEntry = aHidden + aStrHidden;
- m_xLbDocuments->append_text(aEntry);
-
- if ( pManualSel && aHidden == *pManualSel )
- aSelEntry = aEntry;
- }
-
m_xLbDocuments->thaw();
m_xLbDocuments->set_active_text(aSelEntry);
