summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-12-21 14:53:14 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-20 01:25:50 -0400
commit7efa4d838b5b60bf371840e2b8ddee231f9c1f68 (patch)
tree618978fc4c1f3f109600d6230c940b1e24f63b64 /sc
parent03ed2c47d3396a4ff1c53205ef816fb50be67ba5 (diff)
loplugin:unusedfields in sc
Change-Id: Ic801acdd16eded595fdb2a452bbed532b7c9fd65 (cherry picked from commit e24c4c40c052591414cedab2fba152170d385580)
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/AccessibleFilterTopWindow.hxx4
-rw-r--r--sc/inc/datauno.hxx1
-rw-r--r--sc/source/core/data/column3.cxx1
-rw-r--r--sc/source/filter/excel/xlroot.cxx1
-rw-r--r--sc/source/filter/inc/xlroot.hxx1
-rw-r--r--sc/source/ui/Accessibility/AccessibilityHints.cxx24
-rw-r--r--sc/source/ui/cctrl/tbzoomsliderctrl.cxx6
-rw-r--r--sc/source/ui/inc/AccessibilityHints.hxx14
-rw-r--r--sc/source/ui/inc/tabvwsh.hxx1
-rw-r--r--sc/source/ui/inc/tbzoomsliderctrl.hxx3
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.cxx1
-rw-r--r--sc/source/ui/sidebar/AlignmentPropertyPanel.hxx1
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx1
-rw-r--r--sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx1
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx1
-rw-r--r--sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx1
-rw-r--r--sc/source/ui/unoobj/datauno.cxx1
-rw-r--r--sc/source/ui/vba/vbachartobject.hxx1
-rw-r--r--sc/source/ui/vba/vbaformat.hxx2
-rw-r--r--sc/source/ui/vba/vbaoleobject.cxx2
-rw-r--r--sc/source/ui/vba/vbaoleobject.hxx1
-rw-r--r--sc/source/ui/vba/vbapagebreaks.cxx6
-rw-r--r--sc/source/ui/vba/vbapagebreaks.hxx3
-rw-r--r--sc/source/ui/vba/vbarange.cxx15
-rw-r--r--sc/source/ui/view/gridwin.cxx4
-rw-r--r--sc/source/ui/view/preview.cxx4
26 files changed, 22 insertions, 79 deletions
diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx
index b5149ea9788d..12a77c82d1ea 100644
--- a/sc/inc/AccessibleFilterTopWindow.hxx
+++ b/sc/inc/AccessibleFilterTopWindow.hxx
@@ -55,10 +55,6 @@ public:
ChildControlType eType);
private:
- /** The top menu part */
- css::uno::Reference< css::accessibility::XAccessible >
- mxAccMenu;
-
/** Edit search box for searching field members */
css::uno::Reference< css::accessibility::XAccessible >
mxAccEditSearchBox;
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 1759f394d5c3..cbaebc7514a9 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -238,7 +238,6 @@ class ScSubTotalFieldObj : public cppu::WeakImplHelper<
css::lang::XServiceInfo >
{
private:
- css::uno::Reference<css::sheet::XSubTotalDescriptor> xRef;
ScSubTotalDescriptorBase& rParent;
sal_uInt16 nPos;
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index de39bfd8edb5..d59e5d588d5b 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2933,7 +2933,6 @@ namespace {
class GroupFormulaCells
{
- ScFormulaCellGroupRef mxNone;
std::vector<ScAddress>* mpGroupPos;
public:
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 874b7971131c..986050ee8624 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -82,7 +82,6 @@ XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
mrMedium( rMedium ),
mxRootStrg( xRootStrg ),
mrDoc( rDoc ),
- maDocImport(mrDoc),
maDefPassword( "VelvetSweatshop" ),
meTextEnc( eTextEnc ),
meSysLang( Application::GetSettings().GetLanguageTag().getLanguageType() ),
diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx
index 80d1b74b07c7..00366f2a3b32 100644
--- a/sc/source/filter/inc/xlroot.hxx
+++ b/sc/source/filter/inc/xlroot.hxx
@@ -81,7 +81,6 @@ struct XclRootData
SfxMedium& mrMedium; /// The medium to import from.
tools::SvRef<SotStorage> mxRootStrg; /// The root OLE storage of imported/exported file.
ScDocument& mrDoc; /// The source or destination document.
- ScDocumentImport maDocImport;
OUString maDocUrl; /// Document URL of imported/exported file.
OUString maBasePath; /// Base path of imported/exported file (path of maDocUrl).
OUString maUserName; /// Current user name.
diff --git a/sc/source/ui/Accessibility/AccessibilityHints.cxx b/sc/source/ui/Accessibility/AccessibilityHints.cxx
index f7309f6010ff..1614e6011017 100644
--- a/sc/source/ui/Accessibility/AccessibilityHints.cxx
+++ b/sc/source/ui/Accessibility/AccessibilityHints.cxx
@@ -23,36 +23,21 @@ using namespace ::com::sun::star;
// ScAccWinFocusLostHint - the current window lost its focus (to another application, view or document)
-ScAccWinFocusLostHint::ScAccWinFocusLostHint(
- const uno::Reference< uno::XInterface >& xOld )
- :
- xOldAccessible(xOld)
-{
-}
-
ScAccWinFocusLostHint::~ScAccWinFocusLostHint()
{
}
// ScAccWinFocusGotHint - the window got the focus (from another application, view or document)
-ScAccWinFocusGotHint::ScAccWinFocusGotHint(
- const uno::Reference< uno::XInterface >& xNew )
- :
- xNewAccessible(xNew)
-{
-}
-
ScAccWinFocusGotHint::~ScAccWinFocusGotHint()
{
}
// ScAccGridWinFocusLostHint - the current grid window lost its focus (to another application, view or document)
-ScAccGridWinFocusLostHint::ScAccGridWinFocusLostHint(ScSplitPos eOld,
- const uno::Reference< uno::XInterface >& xOld )
+ScAccGridWinFocusLostHint::ScAccGridWinFocusLostHint(ScSplitPos eOld )
:
- ScAccWinFocusLostHint(xOld),
+ ScAccWinFocusLostHint(),
eOldGridWin(eOld)
{
}
@@ -63,10 +48,9 @@ ScAccGridWinFocusLostHint::~ScAccGridWinFocusLostHint()
// ScAccGridWinFocusGotHint - the grid window got the focus (from another application, view or document)
-ScAccGridWinFocusGotHint::ScAccGridWinFocusGotHint(ScSplitPos eNew,
- const uno::Reference< uno::XInterface >& xNew )
+ScAccGridWinFocusGotHint::ScAccGridWinFocusGotHint(ScSplitPos eNew )
:
- ScAccWinFocusGotHint(xNew),
+ ScAccWinFocusGotHint(),
eNewGridWin(eNew)
{
}
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index 79d1ccb9142a..cac2d488c131 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -85,7 +85,7 @@ VclPtr<vcl::Window> ScZoomSliderControl::CreateItemWindow( vcl::Window *pParent
// The view's value is always notified via StateChanged later.
VclPtrInstance<ScZoomSliderWnd> pSlider( pParent,
css::uno::Reference< css::frame::XDispatchProvider >( m_xFrame->getController(),
- css::uno::UNO_QUERY ), m_xFrame, 100 );
+ css::uno::UNO_QUERY ), 100 );
return pSlider.get();
}
@@ -218,13 +218,11 @@ long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const
ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent,
const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider,
- const css::uno::Reference< css::frame::XFrame >& _xFrame,
sal_uInt16 nCurrentZoom ):
Window( pParent ),
mpImpl( new ScZoomSliderWnd_Impl( nCurrentZoom ) ),
aLogicalSize( 115, 40 ),
- m_xDispatchProvider( rDispatchProvider ),
- m_xFrame( _xFrame )
+ m_xDispatchProvider( rDispatchProvider )
{
mpImpl->maSliderButton = Image( SVX_RES( RID_SVXBMP_SLIDERBUTTON ) );
mpImpl->maIncreaseButton = Image( SVX_RES( RID_SVXBMP_SLIDERINCREASE ) );
diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx
index 1b6df14fbd61..8992835eaa68 100644
--- a/sc/source/ui/inc/AccessibilityHints.hxx
+++ b/sc/source/ui/inc/AccessibilityHints.hxx
@@ -36,21 +36,13 @@
class ScAccWinFocusLostHint : public SfxHint
{
- css::uno::Reference< css::uno::XInterface >
- xOldAccessible;
public:
- ScAccWinFocusLostHint(
- const css::uno::Reference< css::uno::XInterface >& xOld );
virtual ~ScAccWinFocusLostHint();
};
class ScAccWinFocusGotHint : public SfxHint
{
- css::uno::Reference< css::uno::XInterface >
- xNewAccessible;
public:
- ScAccWinFocusGotHint(
- const css::uno::Reference< css::uno::XInterface >& xNew );
virtual ~ScAccWinFocusGotHint();
};
@@ -58,8 +50,7 @@ class ScAccGridWinFocusLostHint : public ScAccWinFocusLostHint
{
ScSplitPos eOldGridWin;
public:
- ScAccGridWinFocusLostHint( ScSplitPos eOldGridWin,
- const css::uno::Reference< css::uno::XInterface >& xOld );
+ ScAccGridWinFocusLostHint( ScSplitPos eOldGridWin );
virtual ~ScAccGridWinFocusLostHint();
ScSplitPos GetOldGridWin() const { return eOldGridWin; }
@@ -69,8 +60,7 @@ class ScAccGridWinFocusGotHint : public ScAccWinFocusGotHint
{
ScSplitPos eNewGridWin;
public:
- ScAccGridWinFocusGotHint( ScSplitPos eNewGridWin,
- const css::uno::Reference< css::uno::XInterface >& xNew );
+ ScAccGridWinFocusGotHint( ScSplitPos eNewGridWin );
virtual ~ScAccGridWinFocusGotHint();
ScSplitPos GetNewGridWin() const { return eNewGridWin; }
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index cb1819b4344a..ec6f22622b5e 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -93,7 +93,6 @@ enum ObjectSelectionType
class SC_DLLPUBLIC ScTabViewShell: public SfxViewShell, public ScDBFunc
{
private:
- SvxHtmlOptions aHTMLOpt;
ObjectSelectionType eCurOST;
sal_uInt16 nDrawSfxId;
sal_uInt16 nFormSfxId;
diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx
index 67202401908d..64aac6fdbf12 100644
--- a/sc/source/ui/inc/tbzoomsliderctrl.hxx
+++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx
@@ -44,7 +44,6 @@ private:
ScZoomSliderWnd_Impl* mpImpl;
Size aLogicalSize;
css::uno::Reference<css::frame::XDispatchProvider> m_xDispatchProvider;
- css::uno::Reference<css::frame::XFrame> m_xFrame;
sal_uInt16 Offset2Zoom(long nOffset) const;
long Zoom2Offset(sal_uInt16 nZoom) const;
@@ -52,7 +51,7 @@ private:
public:
ScZoomSliderWnd(vcl::Window* pParent, const css::uno::Reference<css::frame::XDispatchProvider >& rDispatchProvider,
- const css::uno::Reference<css::frame::XFrame>& _xFrame, sal_uInt16 nCurrentZoom);
+ sal_uInt16 nCurrentZoom);
virtual ~ScZoomSliderWnd();
virtual void dispose() override;
void UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem );
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 4def79cbe17b..64fa31c4b586 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -50,7 +50,6 @@ AlignmentPropertyPanel::AlignmentPropertyPanel(
maVrtStackControl(SID_ATTR_ALIGN_STACKED, *pBindings, *this),
maRefEdgeControl(SID_ATTR_ALIGN_LOCKPOS, *pBindings, *this),
mbMultiDisable(false),
- mxFrame(rxFrame),
maContext(),
mpBindings(pBindings)
{
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
index 0572de89eded..1ae9b98f6b3d 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
@@ -93,7 +93,6 @@ private:
/// bitfield
bool mbMultiDisable : 1;
- css::uno::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index f4f78f1ed37a..23ba189bf18b 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -125,7 +125,6 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel(
mpCellLineStylePopup(),
mpCellBorderStylePopup(),
- mxFrame(rxFrame),
maContext(),
mpBindings(pBindings)
{
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index 3218d2e8fe7b..f8cddae8d0a8 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -136,7 +136,6 @@ private:
std::unique_ptr< CellLineStylePopup > mpCellLineStylePopup;
std::unique_ptr< CellBorderStylePopup > mpCellBorderStylePopup;
- css::uno::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index b4e89076cf1b..3240d40692c4 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -51,7 +51,6 @@ NumberFormatPropertyPanel::NumberFormatPropertyPanel(
maFormatControl(SID_NUMBER_FORMAT, *pBindings, *this),
mnCategorySelected(0),
- mxFrame(rxFrame),
maContext(),
mpBindings(pBindings)
{
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
index 31ff2b45745d..c984f2763641 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
@@ -80,7 +80,6 @@ private:
sal_Int32 mnCategorySelected;
- css::uno::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext;
SfxBindings* mpBindings;
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 5a38f7dd0289..ab7486db7d02 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -446,7 +446,6 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
}
ScSubTotalFieldObj::ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, sal_uInt16 nP ) :
- xRef( pDesc ), // Objekt festhalten
rParent( *pDesc ),
nPos( nP )
{
diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx
index da405ac70964..097ccf94bce9 100644
--- a/sc/source/ui/vba/vbachartobject.hxx
+++ b/sc/source/ui/vba/vbachartobject.hxx
@@ -36,7 +36,6 @@ class ScVbaChartObject : public ChartObjectImpl_BASE
css::uno::Reference< css::table::XTableChart > xTableChart;
css::uno::Reference< css::document::XEmbeddedObjectSupplier > xEmbeddedObjectSupplier;
- css::uno::Reference< css::beans::XPropertySet > xPropertySet;
css::uno::Reference< css::drawing::XDrawPageSupplier > xDrawPageSupplier;
css::uno::Reference< css::drawing::XDrawPage > xDrawPage;
css::uno::Reference< css::drawing::XShape > xShape;
diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx
index 0f2d9c8e7fff..5c96d61eaa49 100644
--- a/sc/source/ui/vba/vbaformat.hxx
+++ b/sc/source/ui/vba/vbaformat.hxx
@@ -47,8 +47,6 @@ protected:
css::uno::Reference< css::beans::XPropertyState > xPropertyState;
bool mbCheckAmbiguoity;
bool mbAddIndent;
- //NumberFormatter oNumberFormatter = null;
- css::uno::Reference< css::lang::XMultiServiceFactory > xMultiServiceFactory;
bool isAmbiguous(const OUString& _sPropertyName) throw ( css::script::BasicErrorException );
css::uno::Reference< css::beans::XPropertyState > getXPropertyState() throw ( css::uno::RuntimeException );
void initializeNumberFormats() throw ( css::script::BasicErrorException, css::uno::RuntimeException );
diff --git a/sc/source/ui/vba/vbaoleobject.cxx b/sc/source/ui/vba/vbaoleobject.cxx
index a4e79829d507..45a2ddd72846 100644
--- a/sc/source/ui/vba/vbaoleobject.cxx
+++ b/sc/source/ui/vba/vbaoleobject.cxx
@@ -34,7 +34,7 @@ using namespace ooo::vba;
ScVbaOLEObject::ScVbaOLEObject( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext,
css::uno::Reference< css::drawing::XControlShape > xControlShape )
-: OLEObjectImpl_BASE( xParent, xContext ), m_xControlShape( xControlShape )
+: OLEObjectImpl_BASE( xParent, xContext )
{
//init m_xWindowPeer
uno::Reference< awt::XControlModel > xControlModel( xControlShape->getControl(), css::uno::UNO_QUERY_THROW );
diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx
index 8abd91c14f25..3f4c37c7552e 100644
--- a/sc/source/ui/vba/vbaoleobject.hxx
+++ b/sc/source/ui/vba/vbaoleobject.hxx
@@ -30,7 +30,6 @@ typedef InheritedHelperInterfaceWeakImpl< ov::excel::XOLEObject > OLEObjectImpl_
class ScVbaOLEObject : public OLEObjectImpl_BASE
{
protected:
- css::uno::Reference< css::drawing::XControlShape > m_xControlShape;
virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override;
css::uno::Reference< ov::msforms::XControl> m_xControl;
diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx
index fcbeb946c988..3bf7e9a4903f 100644
--- a/sc/source/ui/vba/vbapagebreaks.cxx
+++ b/sc/source/ui/vba/vbapagebreaks.cxx
@@ -201,8 +201,7 @@ public:
ScVbaHPageBreaks::ScVbaHPageBreaks( const uno::Reference< XHelperInterface >& xParent,
const uno::Reference< uno::XComponentContext >& xContext,
uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak) throw (uno::RuntimeException):
- ScVbaHPageBreaks_BASE( xParent,xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, false )),
- mxSheetPageBreak( xSheetPageBreak )
+ ScVbaHPageBreaks_BASE( xParent,xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, false ))
{
}
@@ -256,8 +255,7 @@ ScVbaHPageBreaks::getServiceNames()
ScVbaVPageBreaks::ScVbaVPageBreaks( const uno::Reference< XHelperInterface >& xParent,
const uno::Reference< uno::XComponentContext >& xContext,
uno::Reference< sheet::XSheetPageBreak >& xSheetPageBreak ) throw ( uno::RuntimeException )
-: ScVbaVPageBreaks_BASE( xParent, xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, true ) ),
- mxSheetPageBreak( xSheetPageBreak )
+: ScVbaVPageBreaks_BASE( xParent, xContext, new RangePageBreaks( xParent, xContext, xSheetPageBreak, true ) )
{
}
diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx
index bab3d59874e4..f090f4bc90db 100644
--- a/sc/source/ui/vba/vbapagebreaks.hxx
+++ b/sc/source/ui/vba/vbapagebreaks.hxx
@@ -38,7 +38,6 @@ typedef CollTestImplHelper< ov::excel::XHPageBreaks > ScVbaHPageBreaks_BASE;
class ScVbaHPageBreaks : public ScVbaHPageBreaks_BASE
{
- css::uno::Reference< css::sheet::XSheetPageBreak > mxSheetPageBreak;
public:
ScVbaHPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
@@ -63,8 +62,6 @@ typedef CollTestImplHelper< ov::excel::XVPageBreaks > ScVbaVPageBreaks_BASE;
class ScVbaVPageBreaks : public ScVbaVPageBreaks_BASE
{
- css::uno::Reference< css::sheet::XSheetPageBreak > mxSheetPageBreak;
-
public:
ScVbaVPageBreaks( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index ce399b394a01..7ad853a3fa19 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -291,13 +291,11 @@ void ScVbaRange::fireChangeEvent()
class SingleRangeEnumeration : public EnumerationHelper_BASE
{
- uno::Reference< XHelperInterface > m_xParent;
uno::Reference< table::XCellRange > m_xRange;
- uno::Reference< uno::XComponentContext > mxContext;
bool bHasMore;
public:
- SingleRangeEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xRange( xRange ), mxContext( xContext ), bHasMore( true ) { }
+ SingleRangeEnumeration( const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException ) : m_xRange( xRange ), bHasMore( true ) { }
virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) override { return bHasMore; }
virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override
{
@@ -334,7 +332,7 @@ public:
virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) override { return sal_True; }
// XEnumerationAccess
- virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException, std::exception) override { return new SingleRangeEnumeration( mxParent, mxContext, m_xRange ); }
+ virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException, std::exception) override { return new SingleRangeEnumeration( m_xRange ); }
};
@@ -615,14 +613,13 @@ typedef ::std::vector< CellPos > vCellPos;
// multi area ranges?? )
class ColumnsRowEnumeration: public CellsEnumeration_BASE
{
- uno::Reference< uno::XComponentContext > mxContext;
- uno::Reference< excel::XRange > mxRange;
+ uno::Reference< excel::XRange > mxRange;
sal_Int32 mMaxElems;
sal_Int32 mCurElem;
public:
- ColumnsRowEnumeration( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< excel::XRange >& xRange, sal_Int32 nElems ) : mxContext( xContext ), mxRange( xRange ), mMaxElems( nElems ), mCurElem( 0 )
- {
+ ColumnsRowEnumeration( const uno::Reference< excel::XRange >& xRange, sal_Int32 nElems ) : mxRange( xRange ), mMaxElems( nElems ), mCurElem( 0 )
+ {
}
virtual sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception) override { return mCurElem < mMaxElems; }
@@ -3717,7 +3714,7 @@ ScVbaRange::createEnumeration() throw (uno::RuntimeException, std::exception)
nElems = xColumnRowRange->getColumns()->getCount();
else
nElems = xColumnRowRange->getRows()->getCount();
- return new ColumnsRowEnumeration( mxContext, xRange, nElems );
+ return new ColumnsRowEnumeration( xRange, nElems );
}
return new CellsEnumeration( mxParent, mxContext, m_Areas );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 5bb10b3cb797..127ef26b4ec4 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4884,7 +4884,7 @@ void ScGridWindow::GetFocus()
pViewShell->SetFormShellAtTop( false ); // focus in GridWindow -> FormShell no longer on top
if (pViewShell->HasAccessibilityObjects())
- pViewShell->BroadcastAccessibility(ScAccGridWinFocusGotHint(eWhich, GetAccessible()));
+ pViewShell->BroadcastAccessibility(ScAccGridWinFocusGotHint(eWhich));
if ( !SC_MOD()->IsFormulaMode() )
{
@@ -4903,7 +4903,7 @@ void ScGridWindow::LoseFocus()
ScTabViewShell* pViewShell = pViewData->GetViewShell();
if (pViewShell && pViewShell->HasAccessibilityObjects())
- pViewShell->BroadcastAccessibility(ScAccGridWinFocusLostHint(eWhich, GetAccessible()));
+ pViewShell->BroadcastAccessibility(ScAccGridWinFocusLostHint(eWhich));
Window::LoseFocus();
}
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index cad06961757f..18f40388d8ee 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -1502,13 +1502,13 @@ void ScPreview::GetFocus()
{
Window::GetFocus();
if (pViewShell && pViewShell->HasAccessibilityObjects())
- pViewShell->BroadcastAccessibility( ScAccWinFocusGotHint(GetAccessible()) );
+ pViewShell->BroadcastAccessibility( ScAccWinFocusGotHint() );
}
void ScPreview::LoseFocus()
{
if (pViewShell && pViewShell->HasAccessibilityObjects())
- pViewShell->BroadcastAccessibility( ScAccWinFocusLostHint(GetAccessible()) );
+ pViewShell->BroadcastAccessibility( ScAccWinFocusLostHint() );
Window::LoseFocus();
}