sc/inc/docpool.hxx | 2 --
sc/source/ui/inc/pfuncache.hxx | 3 ---
sc/source/ui/view/pfuncache.cxx | 9 +++------
sw/inc/tox.hxx | 8 +++-----
sw/qa/unit/sw-dialogs-test.cxx | 2 --
sw/qa/unit/sw-dialogs-test_2.cxx | 3 ---
sw/source/core/crsr/crstrvl.cxx | 2 +-
7 files changed, 7 insertions(+), 22 deletions(-)
New commits:
commit 471bbaf15fb392a194b9392d982cf2e33495f4b3
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sat Mar 16 17:58:30 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Mar 16 19:58:41 2024 +0100
loplugin:unusedfields
Change-Id: I91ec189ea1f389a978ef56339bbf6b43cbec6798
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164929
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index 614e3d4229b8..af6d9535177d 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -28,8 +28,6 @@ class ScDocument;
class SC_DLLPUBLIC ScDocumentPool final : public SfxItemPool
{
- std::vector<SfxPoolItem*> mvPoolDefaults;
-
public:
ScDocumentPool();
private:
diff --git a/sc/source/ui/inc/pfuncache.hxx b/sc/source/ui/inc/pfuncache.hxx
index 7cd286f39223..7eddedd258be 100644
--- a/sc/source/ui/inc/pfuncache.hxx
+++ b/sc/source/ui/inc/pfuncache.hxx
@@ -90,9 +90,6 @@ class ScPrintFuncCache
std::vector<tools::Long> nFirstAttr;
std::vector<ScPrintPageLocation> aLocations;
bool bLocInitialized;
- Size aPrintPageSize; // print page size in
Print dialog
- bool bPrintPageLandscape; // print page orientation
in Print dialog
- bool bUsePrintDialogSetting; // use Print dialog
setting
public:
ScPrintFuncCache(ScDocShell* pD, const ScMarkData& rMark,
ScPrintSelectionStatus aStatus,
diff --git a/sc/source/ui/view/pfuncache.cxx b/sc/source/ui/view/pfuncache.cxx
index 078633da5da0..aa6abd52e7ff 100644
--- a/sc/source/ui/view/pfuncache.cxx
+++ b/sc/source/ui/view/pfuncache.cxx
@@ -28,16 +28,13 @@
#include <utility>
ScPrintFuncCache::ScPrintFuncCache(ScDocShell* pD, const ScMarkData& rMark,
- ScPrintSelectionStatus aStatus, Size
aPageSize, bool bLandscape,
- bool bUsed)
+ ScPrintSelectionStatus aStatus, Size
aPrintPageSize, bool bPrintPageLandscape,
+ bool bUsePrintDialogSetting)
:
aSelection(std::move( aStatus )),
pDocSh( pD ),
nTotalPages( 0 ),
- bLocInitialized( false ),
- aPrintPageSize( aPageSize ),
- bPrintPageLandscape( bLandscape ),
- bUsePrintDialogSetting( bUsed )
+ bLocInitialized( false )
{
// page count uses the stored cell widths for the printer anyway,
// so ScPrintFunc with the document's printer can be used to count
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 74b26b9515d7..bd1c25f50668 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -54,11 +54,9 @@ namespace sw {
};
struct FindContentFrameHint final : SfxHint {
SwContentFrame*& m_rpContentFrame;
- const SwDoc& m_rDoc;
const SwRootFrame& m_rLayout;
- FindContentFrameHint(SwContentFrame*& rpContentFrame, const SwDoc&
rDoc, const SwRootFrame& rLayout)
+ FindContentFrameHint(SwContentFrame*& rpContentFrame,const
SwRootFrame& rLayout)
: m_rpContentFrame(rpContentFrame)
- , m_rDoc(rDoc)
, m_rLayout(rLayout)
{}
};
@@ -185,10 +183,10 @@ public:
SwDoc& GetDoc() const { return m_rDoc; }
void CollectTextMarks(SwTOXMarks& rMarks) const
{
const_cast<SwTOXType*>(this)->GetNotifier().Broadcast(sw::CollectTextMarksHint(rMarks));
}
- SwContentFrame* FindContentFrame(const SwDoc& rDoc, const SwRootFrame&
rLayout) const
+ SwContentFrame* FindContentFrame(const SwRootFrame& rLayout) const
{
SwContentFrame* pContentFrame = nullptr;
-
const_cast<SwTOXType*>(this)->GetNotifier().Broadcast(sw::FindContentFrameHint(pContentFrame,
rDoc, rLayout));
+
const_cast<SwTOXType*>(this)->GetNotifier().Broadcast(sw::FindContentFrameHint(pContentFrame,
rLayout));
return pContentFrame;
}
void
CollectTextTOXMarksForLayout(std::vector<std::reference_wrapper<SwTextTOXMark>>&
rMarks, const SwRootFrame* pLayout) const
diff --git a/sw/qa/unit/sw-dialogs-test.cxx b/sw/qa/unit/sw-dialogs-test.cxx
index 0e9bd50db309..ee5d3dec4d11 100644
--- a/sw/qa/unit/sw-dialogs-test.cxx
+++ b/sw/qa/unit/sw-dialogs-test.cxx
@@ -10,7 +10,6 @@
#include <sal/config.h>
#include <test/screenshot_test.hxx>
#include <rtl/bootstrap.hxx>
-#include <osl/module.hxx>
#include <tools/svlibrary.h>
#include <vcl/abstdlg.hxx>
#include <comphelper/processfactory.hxx>
@@ -28,7 +27,6 @@ class SwDialogsTest : public ScreenshotTest
{
private:
css::uno::Reference<css::lang::XComponent> component_;
- osl::Module libSwui_;
/// helper method to populate KnownDialogs, called in setUp(). Needs to be
/// written and has to add entries to KnownDialogs
diff --git a/sw/qa/unit/sw-dialogs-test_2.cxx b/sw/qa/unit/sw-dialogs-test_2.cxx
index e0de86d276d3..d6bb345e6cfe 100644
--- a/sw/qa/unit/sw-dialogs-test_2.cxx
+++ b/sw/qa/unit/sw-dialogs-test_2.cxx
@@ -10,7 +10,6 @@
#include <sal/config.h>
#include <test/screenshot_test.hxx>
#include <rtl/bootstrap.hxx>
-#include <osl/module.hxx>
#include <tools/svlibrary.h>
#include <vcl/abstdlg.hxx>
#include <comphelper/processfactory.hxx>
@@ -28,8 +27,6 @@ extern "C" { using Fn = SwAbstractDialogFactory * (*)(); }
class SwDialogsTest2 : public ScreenshotTest
{
private:
- osl::Module libSwui_;
-
/// helper method to populate KnownDialogs, called in setUp(). Needs to be
/// written and has to add entries to KnownDialogs
virtual void registerKnownDialogsByID(mapType& rKnownDialogs) override;
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 0a2c404ce399..3972071383ab 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -367,7 +367,7 @@ void SwCursorShell::GotoTOXMarkBase()
return;
// Take the 1. and get the index type. Ask it for the actual index.
const SwTOXType* pType = aMarks[0]->GetTOXType();
- auto pContentFrame = pType->FindContentFrame(*GetDoc(), *GetLayout());
+ auto pContentFrame = pType->FindContentFrame(*GetLayout());
if(!pContentFrame)
return;
SwCallLink aLk(*this); // watch Cursor-Moves
