sw/source/core/text/porlay.cxx | 2 -
sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx | 19 ++++++------------
2 files changed, 7 insertions(+), 14 deletions(-)
New commits:
commit e6f7cf71294ea117bdfe870a6fd18f45cc75346c
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Jun 12 08:44:03 2025 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Jun 12 11:46:32 2025 +0200
Drop redundant calls to SwDocShell::GetBaseModel
Change-Id: I012450017811b6d87207601ba37044f70e6cb76a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186398
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 1f0fce0d8797..e321a16160dc 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -919,8 +919,6 @@ static OUString getBookmarkType(const SwTextNode& rNode,
sw::mark::Bookmark* pBo
const rtl::Reference< SwXBookmark > xRef =
SwXBookmark::CreateXBookmark(rDoc, pBookmark);
if (const SwDocShell* pShell = rDoc.GetDocShell())
{
- rtl::Reference<SwXTextDocument> xModel = pShell->GetBaseModel();
-
static uno::Reference< uno::XComponentContext > xContext(
::comphelper::getProcessComponentContext());
diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
index 03b66dfefe47..c0980af7151d 100644
--- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
+++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
@@ -443,11 +443,11 @@ static void MetadataToTreeNode(const
css::uno::Reference<css::uno::XInterface>&
// under the tree node "Metadata Reference"
if (SwDocShell* pDocSh =
static_cast<SwDocShell*>(SfxObjectShell::Current()))
{
- rtl::Reference<SwXTextDocument>
xDocumentMetadataAccess(pDocSh->GetBaseModel());
- const uno::Reference<rdf::XRepository> xRepo =
xDocumentMetadataAccess->getRDFRepository();
+ rtl::Reference<SwXTextDocument>
pSwXTextDocument(pDocSh->GetBaseModel());
+ const uno::Reference<rdf::XRepository> xRepo =
pSwXTextDocument->getRDFRepository();
const css::uno::Reference<css::rdf::XResource> xSubject(rSource,
uno::UNO_QUERY);
std::map<OUString, OUString> xStatements
- = SwRDFHelper::getStatements(pDocSh->GetBaseModel(),
xRepo->getGraphNames(), xSubject);
+ = SwRDFHelper::getStatements(pSwXTextDocument,
xRepo->getGraphNames(), xSubject);
for (const auto& pair : xStatements)
aCurNode.children.push_back(SimplePropToTreeNode(pair.first,
uno::Any(pair.second)));
}
@@ -594,9 +594,8 @@ static void UpdateTree(SwDocShell& rDocSh, const
SwEditShell& rEditSh,
InsertValues(static_cast<cppu::OWeakObject*>(xRange.get()), aIsDefined,
aCharDFNode, false,
aHiddenProperties, aFieldsNode);
- rtl::Reference<SwXTextDocument>
xStyleFamiliesSupplier(rDocSh.GetBaseModel());
- uno::Reference<container::XNameAccess> xStyleFamilies
- = xStyleFamiliesSupplier->getStyleFamilies();
+ rtl::Reference<SwXTextDocument> pSwTextDocument(rDocSh.GetBaseModel());
+ uno::Reference<container::XNameAccess> xStyleFamilies =
pSwTextDocument->getStyleFamilies();
OUString sCurrentCharStyle, sCurrentParaStyle, sDisplayName;
uno::Reference<container::XNameAccess> xStyleFamily(
@@ -655,9 +654,7 @@ static void UpdateTree(SwDocShell& rDocSh, const
SwEditShell& rEditSh,
aParaNode.children.end()); // Parent style should be first
then children
// Collect bookmarks at character position
- rtl::Reference<SwXTextDocument> xBookmarksSupplier(rDocSh.GetBaseModel());
-
- uno::Reference<container::XIndexAccess>
xBookmarks(xBookmarksSupplier->getBookmarks(),
+ uno::Reference<container::XIndexAccess>
xBookmarks(pSwTextDocument->getBookmarks(),
uno::UNO_QUERY);
for (sal_Int32 i = 0; i < xBookmarks->getCount(); ++i)
{
@@ -690,9 +687,7 @@ static void UpdateTree(SwDocShell& rDocSh, const
SwEditShell& rEditSh,
}
// Collect sections at character position
- rtl::Reference<SwXTextDocument>
xTextSectionsSupplier(rDocSh.GetBaseModel());
-
- uno::Reference<container::XIndexAccess>
xTextSections(xTextSectionsSupplier->getTextSections(),
+ uno::Reference<container::XIndexAccess>
xTextSections(pSwTextDocument->getTextSections(),
uno::UNO_QUERY);
for (sal_Int32 i = 0; i < xTextSections->getCount(); ++i)
{
