summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-09-26 09:09:53 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-09-28 09:06:48 +0200
commita6c7c2fe1bc48ffddca486de0f97164421ca6404 (patch)
treefc6f095e839f6a2576293ab1f6b857c6ab92bb09 /sc
parentd938a896b8fa0b5b7591a7de39c689e004de8893 (diff)
loplugin:unusedfields
Change-Id: I355fad84ed8765e8eb3fadb7c239b3b902ec1747 Reviewed-on: https://gerrit.libreoffice.org/61059 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeader.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleText.cxx57
-rw-r--r--sc/source/ui/inc/AccessiblePageHeaderArea.hxx2
-rw-r--r--sc/source/ui/inc/AccessibleText.hxx3
5 files changed, 24 insertions, 46 deletions
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index 41408fc18639..e8c2d2818d26 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -362,12 +362,12 @@ void ScAccessiblePageHeader::AddChild(const EditTextObject* pArea, sal_uInt32 nI
{
if (!ScGlobal::EETextObjEqual(maAreas[nIndex]->GetEditTextObject(), pArea))
{
- maAreas[nIndex] = new ScAccessiblePageHeaderArea(this, mpViewShell, pArea, mbHeader, eAdjust);
+ maAreas[nIndex] = new ScAccessiblePageHeaderArea(this, mpViewShell, pArea, eAdjust);
}
}
else
{
- maAreas[nIndex] = new ScAccessiblePageHeaderArea(this, mpViewShell, pArea, mbHeader, eAdjust);
+ maAreas[nIndex] = new ScAccessiblePageHeaderArea(this, mpViewShell, pArea, eAdjust);
}
++mnChildCount;
}
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 1109f8de7429..c68232e2081f 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -49,12 +49,10 @@ ScAccessiblePageHeaderArea::ScAccessiblePageHeaderArea(
const uno::Reference<XAccessible>& rxParent,
ScPreviewShell* pViewShell,
const EditTextObject* pEditObj,
- bool bHeader,
SvxAdjust eAdjust)
: ScAccessibleContextBase(rxParent, AccessibleRole::TEXT),
mpEditObj(pEditObj->Clone().release()),
mpViewShell(pViewShell),
- mbHeader(bHeader),
meAdjust(eAdjust)
{
if (mpViewShell)
@@ -280,7 +278,7 @@ void ScAccessiblePageHeaderArea::CreateTextHelper()
mpTextHelper.reset( new ::accessibility::AccessibleTextHelper(
o3tl::make_unique<ScAccessibilityEditSource>(
o3tl::make_unique<ScAccessibleHeaderTextData>(
- mpViewShell, mpEditObj.get(), mbHeader, meAdjust))) );
+ mpViewShell, mpEditObj.get(), meAdjust))) );
mpTextHelper->SetEventSource(this);
}
}
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index a3ca67e793ab..246db80cad97 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -49,10 +49,9 @@
class ScViewForwarder : public SvxViewForwarder
{
ScTabViewShell* mpViewShell;
- ScAddress maCellPos;
ScSplitPos meSplitPos;
public:
- ScViewForwarder(ScTabViewShell* pViewShell, ScSplitPos eSplitPos, const ScAddress& rCell);
+ ScViewForwarder(ScTabViewShell* pViewShell, ScSplitPos eSplitPos);
virtual bool IsValid() const override;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override;
@@ -61,10 +60,9 @@ public:
void SetInvalid();
};
-ScViewForwarder::ScViewForwarder(ScTabViewShell* pViewShell, ScSplitPos eSplitPos, const ScAddress& rCell)
+ScViewForwarder::ScViewForwarder(ScTabViewShell* pViewShell, ScSplitPos eSplitPos)
:
mpViewShell(pViewShell),
- maCellPos(rCell),
meSplitPos(eSplitPos)
{
}
@@ -270,49 +268,37 @@ ScPreviewHeaderFooterViewForwarder::ScPreviewHeaderFooterViewForwarder(ScPreview
class ScPreviewCellViewForwarder : public ScPreviewViewForwarder
{
- ScAddress maCellPos;
public:
- ScPreviewCellViewForwarder(ScPreviewShell* pViewShell,
- const ScAddress& aCellPos);
+ ScPreviewCellViewForwarder(ScPreviewShell* pViewShell);
};
-ScPreviewCellViewForwarder::ScPreviewCellViewForwarder(ScPreviewShell* pViewShell,
- const ScAddress& aCellPos)
+ScPreviewCellViewForwarder::ScPreviewCellViewForwarder(ScPreviewShell* pViewShell)
:
- ScPreviewViewForwarder(pViewShell),
- maCellPos(aCellPos)
+ ScPreviewViewForwarder(pViewShell)
{
}
class ScPreviewHeaderCellViewForwarder : public ScPreviewViewForwarder
{
- ScAddress maCellPos;
public:
- ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell,
- const ScAddress& aCellPos);
+ ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell);
};
-ScPreviewHeaderCellViewForwarder::ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell,
- const ScAddress& aCellPos)
+ScPreviewHeaderCellViewForwarder::ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell)
:
- ScPreviewViewForwarder(pViewShell),
- maCellPos(aCellPos)
+ ScPreviewViewForwarder(pViewShell)
{
}
class ScPreviewNoteViewForwarder : public ScPreviewViewForwarder
{
- ScAddress maCellPos;
public:
- ScPreviewNoteViewForwarder(ScPreviewShell* pViewShell,
- const ScAddress& aCellPos);
+ ScPreviewNoteViewForwarder(ScPreviewShell* pViewShell);
};
-ScPreviewNoteViewForwarder::ScPreviewNoteViewForwarder(ScPreviewShell* pViewShell,
- const ScAddress& aCellPos)
+ScPreviewNoteViewForwarder::ScPreviewNoteViewForwarder(ScPreviewShell* pViewShell)
:
- ScPreviewViewForwarder(pViewShell),
- maCellPos(aCellPos)
+ ScPreviewViewForwarder(pViewShell)
{
}
@@ -632,7 +618,7 @@ SvxTextForwarder* ScAccessibleCellTextData::GetTextForwarder()
SvxViewForwarder* ScAccessibleCellTextData::GetViewForwarder()
{
if (!mpViewForwarder)
- mpViewForwarder.reset(new ScViewForwarder(mpViewShell, meSplitPos, aCellPos));
+ mpViewForwarder.reset(new ScViewForwarder(mpViewShell, meSplitPos));
return mpViewForwarder.get();
}
@@ -976,7 +962,7 @@ SvxTextForwarder* ScAccessiblePreviewCellTextData::GetTextForwarder()
SvxViewForwarder* ScAccessiblePreviewCellTextData::GetViewForwarder()
{
if (!mpViewForwarder)
- mpViewForwarder.reset(new ScPreviewCellViewForwarder(mpViewShell, aCellPos));
+ mpViewForwarder.reset(new ScPreviewCellViewForwarder(mpViewShell));
return mpViewForwarder.get();
}
@@ -1076,7 +1062,7 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder()
SvxViewForwarder* ScAccessiblePreviewHeaderCellTextData::GetViewForwarder()
{
if (!mpViewForwarder)
- mpViewForwarder.reset(new ScPreviewHeaderCellViewForwarder(mpViewShell, aCellPos));
+ mpViewForwarder.reset(new ScPreviewHeaderCellViewForwarder(mpViewShell));
return mpViewForwarder.get();
}
@@ -1089,13 +1075,12 @@ ScDocShell* ScAccessiblePreviewHeaderCellTextData::GetDocShell(ScPreviewShell* p
}
ScAccessibleHeaderTextData::ScAccessibleHeaderTextData(ScPreviewShell* pViewShell,
- const EditTextObject* pEditObj, bool bHeader, SvxAdjust eAdjust)
+ const EditTextObject* pEditObj, SvxAdjust eAdjust)
:
mpViewForwarder(nullptr),
mpViewShell(pViewShell),
mpDocSh(nullptr),
mpEditObj(pEditObj),
- mbHeader(bHeader),
mbDataValid(false),
meAdjust(eAdjust)
{
@@ -1119,7 +1104,7 @@ ScAccessibleHeaderTextData::~ScAccessibleHeaderTextData()
ScAccessibleTextData* ScAccessibleHeaderTextData::Clone() const
{
- return new ScAccessibleHeaderTextData(mpViewShell, mpEditObj, mbHeader, meAdjust);
+ return new ScAccessibleHeaderTextData(mpViewShell, mpEditObj, meAdjust);
}
void ScAccessibleHeaderTextData::Notify( SfxBroadcaster&, const SfxHint& rHint )
@@ -1298,7 +1283,7 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder()
SvxViewForwarder* ScAccessibleNoteTextData::GetViewForwarder()
{
if (!mpViewForwarder)
- mpViewForwarder = new ScPreviewNoteViewForwarder(mpViewShell, maCellPos);
+ mpViewForwarder = new ScPreviewNoteViewForwarder(mpViewShell);
return mpViewForwarder;
}
@@ -1306,11 +1291,10 @@ SvxViewForwarder* ScAccessibleNoteTextData::GetViewForwarder()
class ScCsvViewForwarder : public SvxViewForwarder
{
- tools::Rectangle maBoundBox;
VclPtr<vcl::Window> mpWindow;
public:
- explicit ScCsvViewForwarder( vcl::Window* pWindow, const tools::Rectangle& rBoundBox );
+ explicit ScCsvViewForwarder( vcl::Window* pWindow );
virtual bool IsValid() const override;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const override;
@@ -1319,8 +1303,7 @@ public:
void SetInvalid();
};
-ScCsvViewForwarder::ScCsvViewForwarder( vcl::Window* pWindow, const tools::Rectangle& rBoundBox ) :
- maBoundBox( rBoundBox ),
+ScCsvViewForwarder::ScCsvViewForwarder( vcl::Window* pWindow ) :
mpWindow( pWindow )
{
}
@@ -1396,7 +1379,7 @@ SvxTextForwarder* ScAccessibleCsvTextData::GetTextForwarder()
SvxViewForwarder* ScAccessibleCsvTextData::GetViewForwarder()
{
if( !mpViewForwarder.get() )
- mpViewForwarder.reset( new ScCsvViewForwarder( mpWindow, maBoundBox ) );
+ mpViewForwarder.reset( new ScCsvViewForwarder( mpWindow ) );
return mpViewForwarder.get();
}
diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
index 7a3eba11eac4..b29ca101098c 100644
--- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
+++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
@@ -39,7 +39,6 @@ public:
const css::uno::Reference<css::accessibility::XAccessible>& rxParent,
ScPreviewShell* pViewShell,
const EditTextObject* pEditObj,
- bool bHeader,
SvxAdjust eAdjust);
protected:
virtual ~ScAccessiblePageHeaderArea() override;
@@ -107,7 +106,6 @@ private:
std::unique_ptr<EditTextObject> mpEditObj;
std::unique_ptr<accessibility::AccessibleTextHelper> mpTextHelper;
ScPreviewShell* mpViewShell;
- bool mbHeader;
SvxAdjust meAdjust;
void CreateTextHelper();
diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx
index 057515a329e3..3ffb27588355 100644
--- a/sc/source/ui/inc/AccessibleText.hxx
+++ b/sc/source/ui/inc/AccessibleText.hxx
@@ -201,7 +201,7 @@ class ScAccessibleHeaderTextData : public ScAccessibleTextData
{
public:
ScAccessibleHeaderTextData(ScPreviewShell* pViewShell,
- const EditTextObject* pEditObj, bool bHeader, SvxAdjust eAdjust);
+ const EditTextObject* pEditObj, SvxAdjust eAdjust);
virtual ~ScAccessibleHeaderTextData() override;
virtual ScAccessibleTextData* Clone() const override;
@@ -220,7 +220,6 @@ private:
std::unique_ptr<SvxEditEngineForwarder> mpForwarder;
ScDocShell* mpDocSh;
const EditTextObject* mpEditObj;
- bool mbHeader;
bool mbDataValid;
SvxAdjust meAdjust;
};