[Libreoffice-commits] core.git: 7 commits - include/tools oox/inc oox/source package/source reportdesign/inc reportdesign/source sc/inc scripting/source sc/source sd/source vcl/source
Noel Grandin
noel at peralex.com
Mon Dec 21 23:54:15 PST 2015
include/tools/link.hxx | 10 +-
oox/inc/drawingml/textbodycontext.hxx | 1
oox/source/core/filterbase.cxx | 2
oox/source/docprop/docprophandler.cxx | 3
oox/source/docprop/docprophandler.hxx | 1
oox/source/drawingml/chart/objectformatter.cxx | 16 ---
oox/source/drawingml/diagram/diagram.hxx | 1
oox/source/drawingml/effectproperties.hxx | 1
oox/source/ppt/commontimenodecontext.hxx | 1
oox/source/ppt/extdrawingfragmenthandler.cxx | 2
oox/source/ppt/extdrawingfragmenthandler.hxx | 2
oox/source/ppt/pptshapegroupcontext.cxx | 1
oox/source/shape/ShapeContextHandler.cxx | 5 -
oox/source/shape/ShapeContextHandler.hxx | 1
package/source/xstor/switchpersistencestream.cxx | 9 --
package/source/zipapi/XUnbufferedStream.cxx | 2
package/source/zipapi/XUnbufferedStream.hxx | 1
reportdesign/inc/RptObject.hxx | 2
reportdesign/inc/UndoActions.hxx | 2
reportdesign/source/core/api/Function.cxx | 1
reportdesign/source/core/inc/Function.hxx | 1
reportdesign/source/filter/xml/xmlExport.hxx | 4
reportdesign/source/filter/xml/xmlHelper.hxx | 3
reportdesign/source/filter/xml/xmlfilter.hxx | 45 ++++++----
reportdesign/source/ui/dlg/Navigator.cxx | 1
reportdesign/source/ui/inc/DataProviderHandler.hxx | 1
reportdesign/source/ui/inc/DefaultInspection.hxx | 2
reportdesign/source/ui/inc/GeometryHandler.hxx | 2
reportdesign/source/ui/inc/ReportComponentHandler.hxx | 2
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 1
reportdesign/source/ui/inspection/DefaultInspection.cxx | 1
reportdesign/source/ui/inspection/GeometryHandler.cxx | 1
reportdesign/source/ui/inspection/ReportComponentHandler.cxx | 1
sc/inc/AccessibleFilterTopWindow.hxx | 4
sc/inc/datauno.hxx | 1
sc/source/core/data/column3.cxx | 1
sc/source/filter/excel/xlroot.cxx | 1
sc/source/filter/inc/xlroot.hxx | 1
sc/source/ui/Accessibility/AccessibilityHints.cxx | 24 -----
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 6 -
sc/source/ui/inc/AccessibilityHints.hxx | 14 ---
sc/source/ui/inc/tabvwsh.hxx | 1
sc/source/ui/inc/tbzoomsliderctrl.hxx | 3
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 1
sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 1
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx | 1
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 1
sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 1
sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 1
sc/source/ui/unoobj/datauno.cxx | 1
sc/source/ui/vba/vbachartobject.hxx | 1
sc/source/ui/vba/vbaformat.hxx | 2
sc/source/ui/vba/vbaoleobject.cxx | 2
sc/source/ui/vba/vbaoleobject.hxx | 1
sc/source/ui/vba/vbapagebreaks.cxx | 6 -
sc/source/ui/vba/vbapagebreaks.hxx | 3
sc/source/ui/vba/vbarange.cxx | 15 +--
sc/source/ui/view/gridwin.cxx | 4
sc/source/ui/view/preview.cxx | 4
scripting/source/provider/BrowseNodeFactoryImpl.hxx | 1
scripting/source/stringresource/stringresource.cxx | 26 +----
scripting/source/vbaevents/eventhelper.cxx | 22 ++--
sd/source/core/annotations/Annotation.cxx | 1
sd/source/filter/eppt/eppt.hxx | 4
sd/source/filter/eppt/epptooxml.hxx | 2
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 2
sd/source/ui/animations/CustomAnimationDialog.hxx | 1
sd/source/ui/animations/CustomAnimationList.hxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 1
sd/source/ui/animations/CustomAnimationPane.hxx | 1
sd/source/ui/animations/motionpathtag.cxx | 2
sd/source/ui/controller/displaymodecontroller.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 8 -
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx | 2
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx | 3
sd/source/ui/framework/configuration/ConfigurationController.cxx | 2
sd/source/ui/framework/factories/ChildWindowPane.hxx | 1
sd/source/ui/framework/module/ToolPanelModule.cxx | 3
sd/source/ui/framework/module/ToolPanelModule.hxx | 3
sd/source/ui/inc/AccessibleSlideSorterView.hxx | 3
sd/source/ui/inc/docprev.hxx | 2
sd/source/ui/inc/navigatr.hxx | 4
sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 4
sd/source/ui/presenter/PresenterPreviewCache.hxx | 1
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx | 2
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx | 1
sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 1
sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx | 8 -
sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx | 1
sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx | 3
sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx | 1
sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx | 9 --
sd/source/ui/slidesorter/shell/SlideSorterService.hxx | 1
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 1
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 1
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 1
sd/source/ui/table/TableDesignPane.hxx | 1
sd/source/ui/unoidl/unomodule.cxx | 5 -
sd/source/ui/unoidl/unomodule.hxx | 6 -
sd/source/ui/unoidl/unoobj.cxx | 3
vcl/source/window/event.cxx | 7 -
101 files changed, 94 insertions(+), 291 deletions(-)
New commits:
commit c4f513b64ff6c8bd09d944a462549cd3842fcfcb
Author: Noel Grandin <noel at peralex.com>
Date: Tue Dec 22 09:30:57 2015 +0200
tdf#96643 - Standard toolbar isn't fully shown under gtk3
regression from commit 60e67b387e79185a33eb07bc03b01cd6d0d0a56b
"fix O(n^2) in vcl event broadcasting tdf#90199"
Change-Id: I6b4e14929624fdec431913528577fa41f09d5a57
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 85da86c..1f3eb24 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -249,8 +249,9 @@ void Window::CallEventListeners( sal_uLong nEvent, void* pData )
comphelper::ScopeGuard aGuard(
[&rWindowImpl]()
{
- if (--rWindowImpl.mnChildEventListenersIteratingCount == 0)
- rWindowImpl.maChildEventListenersDeleted.clear();
+ rWindowImpl.mnChildEventListenersIteratingCount--;
+ if (rWindowImpl.mnChildEventListenersIteratingCount == 0)
+ rWindowImpl.maChildEventListenersDeleted.clear();
}
);
for ( Link<VclWindowEvent&,void>& rLink : aCopy )
@@ -258,7 +259,7 @@ void Window::CallEventListeners( sal_uLong nEvent, void* pData )
if (aDelData.IsDead())
return;
// Check this hasn't been removed in some re-enterancy scenario fdo#47368.
- if( rWindowImpl.maChildEventListenersDeleted.find(rLink) != rWindowImpl.maChildEventListenersDeleted.end() )
+ if( rWindowImpl.maChildEventListenersDeleted.find(rLink) == rWindowImpl.maChildEventListenersDeleted.end() )
rLink.Call( aEvent );
}
}
commit 144e73f50c49333f61c6f27b882be9dbc232ceb4
Author: Noel Grandin <noel at peralex.com>
Date: Tue Dec 22 09:05:32 2015 +0200
fix Link::operator<
so that it is consistent with operator==
Change-Id: Ie4c68a1f02d8c298fe99e42c5854f89db79bf3bc
diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index cbac102..584f963 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -88,8 +88,14 @@ public:
bool operator !() const { return !IsSet(); }
bool operator <(Link const & other) const {
- return reinterpret_cast<sal_uIntPtr>(function_)
- < reinterpret_cast<sal_uIntPtr>(other.function_);
+ sal_uIntPtr ptr1 = reinterpret_cast<sal_uIntPtr>(function_);
+ sal_uIntPtr ptr2 = reinterpret_cast<sal_uIntPtr>(other.function_);
+ if (ptr1 < ptr2)
+ return true;
+ else if (ptr1 > ptr2)
+ return false;
+ else
+ return instance_ < other.instance_;
};
bool operator ==(Link const & other) const
commit 98f4f2bb0f873d6cae8e9646d8eecc857c1cdd0f
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 21 15:31:32 2015 +0200
loplugin:unusedfields in oox,package
Change-Id: I8f8c3ff9ded455a09f3df81c501da17cca0b2310
diff --git a/oox/inc/drawingml/textbodycontext.hxx b/oox/inc/drawingml/textbodycontext.hxx
index dc026d0..55c9cb0 100644
--- a/oox/inc/drawingml/textbodycontext.hxx
+++ b/oox/inc/drawingml/textbodycontext.hxx
@@ -37,7 +37,6 @@ public:
protected:
TextBody& mrTextBody;
- css::uno::Reference< css::text::XText > mxText;
};
// CT_RegularTextRun
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 3fefcc0..3500901 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -138,7 +138,6 @@ struct FilterBaseImpl
VbaProjectRef mxVbaProject; /// VBA project manager.
Reference< XComponentContext > mxComponentContext;
- Reference< XMultiComponentFactory > mxComponentFactory;
Reference< XModel > mxModel;
Reference< XMultiServiceFactory > mxModelFactory;
Reference< XFrame > mxTargetFrame;
@@ -161,7 +160,6 @@ FilterBaseImpl::FilterBaseImpl( const Reference< XComponentContext >& rxContext
meDirection( FILTERDIRECTION_UNKNOWN ),
meVersion( ECMA_DIALECT ),
mxComponentContext( rxContext, UNO_SET_THROW ),
- mxComponentFactory( rxContext->getServiceManager(), UNO_SET_THROW ),
mbExportVBA(false)
{
}
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index 420d783..b71c5ec 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -39,8 +39,7 @@ namespace docprop {
OOXMLDocPropHandler::OOXMLDocPropHandler( const uno::Reference< uno::XComponentContext >& xContext,
const uno::Reference< document::XDocumentProperties >& rDocProp )
- : m_xContext( xContext )
- , m_xDocProp( rDocProp )
+ : m_xDocProp( rDocProp )
, m_nState( 0 )
, m_nBlock( 0 )
, m_nType( 0 )
diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx
index e4dc28f..4dd4261 100644
--- a/oox/source/docprop/docprophandler.hxx
+++ b/oox/source/docprop/docprophandler.hxx
@@ -41,7 +41,6 @@ namespace docprop {
class OOXMLDocPropHandler : public ::cppu::WeakImplHelper< css::xml::sax::XFastDocumentHandler >
{
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::document::XDocumentProperties > m_xDocProp;
sal_Int32 m_nState;
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 6661ea2..af44ed5 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -649,15 +649,6 @@ private:
FillPropertiesPtr mxAutoFill; /// Automatic fill properties.
};
-class EffectFormatter : public DetailFormatterBase
-{
-public:
- explicit EffectFormatter(
- ObjectFormatterData& rData,
- const AutoFormatEntry* pAutoFormatEntry );
-
-};
-
class TextFormatter : public DetailFormatterBase
{
public:
@@ -720,7 +711,6 @@ public:
private:
LineFormatter maLineFormatter; /// Converter for line formatting.
FillFormatter maFillFormatter; /// Converter for fill formatting.
- EffectFormatter maEffectFormatter; /// Converter for effect formatting.
TextFormatter maTextFormatter; /// Converter for text formatting.
ModelObjectHelper& mrModelObjHelper; /// Helper for named drawing formatting.
const ObjectTypeFormatEntry& mrEntry; /// Additional settings.
@@ -894,11 +884,6 @@ void FillFormatter::convertFormatting( ShapePropertyMap& rPropMap, const ModelRe
aFillProps.pushToPropMap( rPropMap, mrData.mrFilter.getGraphicHelper(), 0, getPhColor( nSeriesIdx ) );
}
-EffectFormatter::EffectFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ) :
- DetailFormatterBase( rData, pAutoFormatEntry )
-{
-}
-
namespace {
const TextCharacterProperties* lclGetTextProperties( const ModelRef< TextBody >& rxTextProp )
@@ -951,7 +936,6 @@ void TextFormatter::convertFormatting( PropertySet& rPropSet, const ModelRef< Te
ObjectTypeFormatter::ObjectTypeFormatter( ObjectFormatterData& rData, const ObjectTypeFormatEntry& rEntry, const ChartSpaceModel& rChartSpace, const ObjectType eObjType ) :
maLineFormatter( rData, lclGetAutoFormatEntry( rEntry.mpAutoLines, rChartSpace.mnStyle ) ),
maFillFormatter( rData, lclGetAutoFormatEntry( rEntry.mpAutoFills, rChartSpace.mnStyle ), eObjType ),
- maEffectFormatter( rData, lclGetAutoFormatEntry( rEntry.mpAutoEffects, rChartSpace.mnStyle ) ),
maTextFormatter( rData, lclGetAutoTextEntry( rEntry.mpAutoTexts, rChartSpace.mnStyle ), rChartSpace.mxTextProp ),
mrModelObjHelper( rData.maModelObjHelper ),
mrEntry( rEntry )
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index f889abd..3c88772 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -283,7 +283,6 @@ private:
DiagramLayoutPtr mpLayout;
DiagramQStyleMap maStyles;
DiagramColorMap maColors;
- std::map< OUString, ShapePtr > maShapeMap;
DiagramDomMap maMainDomMap;
css::uno::Sequence< css::uno::Sequence< css::uno::Any > > maDataRelsMap;
};
diff --git a/oox/source/drawingml/effectproperties.hxx b/oox/source/drawingml/effectproperties.hxx
index 9089e1d..146214c 100644
--- a/oox/source/drawingml/effectproperties.hxx
+++ b/oox/source/drawingml/effectproperties.hxx
@@ -24,7 +24,6 @@ struct EffectShadowProperties
{
OptValue< sal_Int64 > moShadowDist;
OptValue< sal_Int64 > moShadowDir;
- OptValue< sal_Int64 > moShadowAlpha;
Color moShadowColor;
/** Overwrites all members that are explicitly set in rSourceProps. */
diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx
index 5353480..f5109ef 100644
--- a/oox/source/ppt/commontimenodecontext.hxx
+++ b/oox/source/ppt/commontimenodecontext.hxx
@@ -41,7 +41,6 @@ namespace oox { namespace ppt {
private:
bool mbIterate;
- css::uno::Reference< css::animations::XIterateContainer > mxIter;
};
} }
diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx
index d7a77ac..fadfec2 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.cxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
@@ -19,14 +19,12 @@ ExtDrawingFragmentHandler::ExtDrawingFragmentHandler( XmlFilterBase& rFilter,
const OUString& rFragmentPath,
const oox::ppt::SlidePersistPtr& rSlidePersistPtr,
const oox::ppt::ShapeLocation eShapeLocation,
- oox::drawingml::ShapePtr pMasterShapePtr,
oox::drawingml::ShapePtr pGroupShapePtr,
oox::drawingml::ShapePtr pShapePtr)
throw( )
: FragmentHandler2( rFilter, rFragmentPath ),
mpSlidePersistPtr (rSlidePersistPtr ),
meShapeLocation( eShapeLocation ),
- mpMasterShapePtr( pMasterShapePtr ),
mpGroupShapePtr( pGroupShapePtr ),
mpOrgShapePtr( pShapePtr )
{
diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx
index 17c84a7..8aaf4d0 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.hxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.hxx
@@ -24,7 +24,6 @@ public:
ExtDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath,
const oox::ppt::SlidePersistPtr& rSlidePersistPtr,
const oox::ppt::ShapeLocation eShapeLocation,
- oox::drawingml::ShapePtr pMasterShapePtr,
oox::drawingml::ShapePtr pGroupShapePtr,
oox::drawingml::ShapePtr pShapePtr ) throw();
virtual ~ExtDrawingFragmentHandler() throw();
@@ -34,7 +33,6 @@ public:
private:
const oox::ppt::SlidePersistPtr mpSlidePersistPtr;
const oox::ppt::ShapeLocation meShapeLocation;
- oox::drawingml::ShapePtr mpMasterShapePtr;
oox::drawingml::ShapePtr mpGroupShapePtr;
oox::drawingml::ShapePtr mpOrgShapePtr; // Original Shape data, if any
oox::drawingml::ShapePtr mpShapePtr;
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx
index 3b3d20c..d5c3dc6 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -129,7 +129,6 @@ void PPTShapeGroupContext::importExtDrawings( )
getFilter().importFragment( new ExtDrawingFragmentHandler( getFilter(), getFragmentPathFromRelId( *aIt ),
mpSlidePersistPtr,
meShapeLocation,
- mpMasterShapePtr,
mpGroupShapePtr,
pGraphicShape ) );
// Apply font color imported from color fragment
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 0a707d8..ae14d44 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -56,9 +56,8 @@ ShapeContextHandler_createInstance( const uno::Reference< uno::XComponentContext
return static_cast< ::cppu::OWeakObject* >( new ShapeContextHandler(context) );
}
-ShapeContextHandler::ShapeContextHandler
-(uno::Reference< uno::XComponentContext > const & context) :
-mnStartToken(0), m_xContext(context)
+ShapeContextHandler::ShapeContextHandler(uno::Reference< uno::XComponentContext > const & context) :
+ mnStartToken(0)
{
try
{
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index ea6b1a1..c336129 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -151,7 +151,6 @@ private:
::sal_uInt32 mnStartToken;
css::awt::Point maPosition;
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
drawingml::ShapePtr mpShape;
std::shared_ptr< vml::Drawing > mpDrawing;
diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx
index 88a5ab0..fbada20 100644
--- a/package/source/xstor/switchpersistencestream.cxx
+++ b/package/source/xstor/switchpersistencestream.cxx
@@ -33,7 +33,6 @@ struct SPStreamData_Impl
// the streams below are not visible from outside so there is no need to remember position
// original stream related members
- uno::Reference< io::XStream > m_xOrigStream;
uno::Reference< io::XTruncate > m_xOrigTruncate;
uno::Reference< io::XSeekable > m_xOrigSeekable;
uno::Reference< io::XInputStream > m_xOrigInStream;
@@ -44,7 +43,6 @@ struct SPStreamData_Impl
SPStreamData_Impl(
bool bInStreamBased,
- const uno::Reference< io::XStream >& xOrigStream,
const uno::Reference< io::XTruncate >& xOrigTruncate,
const uno::Reference< io::XSeekable >& xOrigSeekable,
const uno::Reference< io::XInputStream >& xOrigInStream,
@@ -52,7 +50,6 @@ struct SPStreamData_Impl
bool bInOpen,
bool bOutOpen )
: m_bInStreamBased( bInStreamBased )
- , m_xOrigStream( xOrigStream )
, m_xOrigTruncate( xOrigTruncate )
, m_xOrigSeekable( xOrigSeekable )
, m_xOrigInStream( xOrigInStream )
@@ -116,7 +113,7 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io:
CloseAll_Impl();
m_pStreamData = new SPStreamData_Impl( false,
- xStream, xNewTruncate, xNewSeekable, xNewInStream, xNewOutStream,
+ xNewTruncate, xNewSeekable, xNewInStream, xNewOutStream,
bInOpen, bOutOpen );
}
@@ -150,7 +147,7 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io:
CloseAll_Impl();
m_pStreamData = new SPStreamData_Impl( true,
- xNewStream, xNewTruncate, xNewSeekable, xInputStream, xNewOutStream,
+ xNewTruncate, xNewSeekable, xInputStream, xNewOutStream,
bInOpen, bOutOpen );
}
@@ -194,7 +191,7 @@ void SwitchablePersistenceStream::CopyAndSwitchPersistenceTo( const uno::Referen
CloseAll_Impl();
m_pStreamData = new SPStreamData_Impl( false,
- xTargetStream, xTargetTruncate, xTargetSeek, xTargetInStream, xTargetOutStream,
+ xTargetTruncate, xTargetSeek, xTargetInStream, xTargetOutStream,
bInOpen, bOutOpen );
}
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index 3af35f9..c005fc1 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -53,7 +53,6 @@ XUnbufferedStream::XUnbufferedStream(
, mxZipStream ( xNewZipStream )
, mxZipSeek ( xNewZipStream, UNO_QUERY )
, maEntry ( rEntry )
-, mxData ( rData )
, mnBlockSize( 1 )
, maInflater ( true )
, mbRawStream ( nStreamMode == UNBUFF_STREAM_RAW || nStreamMode == UNBUFF_STREAM_WRAPPEDRAW )
@@ -116,7 +115,6 @@ XUnbufferedStream::XUnbufferedStream(
: maMutexHolder( new SotMutexHolder )
, mxZipStream ( xRawStream )
, mxZipSeek ( xRawStream, UNO_QUERY )
-, mxData ( rData )
, mnBlockSize( 1 )
, maInflater ( true )
, mbRawStream ( false )
diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx
index 98674eb..26167e2 100644
--- a/package/source/zipapi/XUnbufferedStream.hxx
+++ b/package/source/zipapi/XUnbufferedStream.hxx
@@ -53,7 +53,6 @@ protected:
css::uno::Reference < css::io::XSeekable > mxZipSeek;
css::uno::Sequence < sal_Int8 > maCompBuffer, maHeader;
ZipEntry maEntry;
- ::rtl::Reference< EncryptionData > mxData;
sal_Int32 mnBlockSize;
css::uno::Reference< css::xml::crypto::XCipherContext > m_xCipherContext;
ZipUtils::Inflater maInflater;
commit 4e8e81f0d6dcbdd4d491cec09dfb485ffa30ab98
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 21 15:09:05 2015 +0200
loplugin:unusedfields in reportdesign
Change-Id: Ida5e91105d204b431edf743a9f5272febd50e688
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 4333721..283e8f2 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -75,8 +75,6 @@ protected:
mutable TMediator m_xMediator;
mutable css::uno::Reference< css::beans::XPropertyChangeListener> m_xPropertyChangeListener;
mutable css::uno::Reference< css::report::XReportComponent> m_xReportComponent;
- css::uno::Reference< css::container::XContainerListener> m_xContainerListener;
- css::uno::Reference< css::report::XSection> m_xSection;
css::uno::Reference< css::uno::XInterface > m_xKeepShapeAlive;
OUString m_sComponentName;
bool m_bIsListening;
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 4317b50..89e667d 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -177,8 +177,6 @@ namespace rptui
m_xOwnElement; // object owned by the action
css::uno::Reference< css::container::XIndexContainer >
m_xContainer;
- css::uno::Reference< css::report::XSection >
- m_xSection;
Action m_eAction;
public:
diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx
index 43bc4b7..3210d6c 100644
--- a/reportdesign/source/core/api/Function.cxx
+++ b/reportdesign/source/core/api/Function.cxx
@@ -40,7 +40,6 @@ uno::Reference< uno::XInterface > OFunction::create(uno::Reference< uno::XCompon
OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext)
:FunctionBase(m_aMutex)
,FunctionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
-,m_xContext(_xContext)
,m_bPreEvaluated(false)
,m_bDeepTraversing(false)
{
diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx
index 7568771..bd45f84 100644
--- a/reportdesign/source/core/inc/Function.hxx
+++ b/reportdesign/source/core/inc/Function.hxx
@@ -41,7 +41,6 @@ namespace reportdesign
public FunctionPropertySet
{
css::beans::Optional< OUString> m_sInitialFormula;
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::WeakReference< css::report::XFunctions > m_xParent;
OUString m_sName;
OUString m_sFormula;
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index 517b7a3..4d8a343 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -111,8 +111,6 @@ private:
OUString m_sTableStyle;
OUString m_sCellStyle;
OUString m_sColumnStyle;
- rtl::Reference < SvXMLExportPropertyMapper> m_xExportHelper;
- rtl::Reference < SvXMLExportPropertyMapper> m_xSectionPropMapper;
rtl::Reference < SvXMLExportPropertyMapper> m_xTableStylesExportPropertySetMapper;
rtl::Reference < SvXMLExportPropertyMapper> m_xCellStylesExportPropertySetMapper;
rtl::Reference < SvXMLExportPropertyMapper> m_xColumnStylesExportPropertySetMapper;
@@ -120,8 +118,6 @@ private:
rtl::Reference < SvXMLExportPropertyMapper > m_xParaPropMapper;
rtl::Reference < XMLPropertyHandlerFactory > m_xPropHdlFactory;
- mutable rtl::Reference < XMLPropertySetMapper > m_xControlStylePropertyMapper;
- mutable rtl::Reference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper;
mutable rtl::Reference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper;
Reference<XReportDefinition> m_xReportDefinition;
bool m_bAllreadyFilled;
diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx
index 2035076..cd901bd 100644
--- a/reportdesign/source/filter/xml/xmlHelper.hxx
+++ b/reportdesign/source/filter/xml/xmlHelper.hxx
@@ -40,9 +40,6 @@ namespace rptxml
{
OPropertyHandlerFactory(const OPropertyHandlerFactory&) = delete;
void operator =(const OPropertyHandlerFactory&) = delete;
- protected:
- mutable ::std::unique_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler;
- mutable ::std::unique_ptr<XMLPropertyHandler> m_pTextAlignHandler;
public:
OPropertyHandlerFactory();
virtual ~OPropertyHandlerFactory();
diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx
index 105c0e5..1def596 100644
--- a/reportdesign/source/filter/xml/xmlfilter.hxx
+++ b/reportdesign/source/filter/xml/xmlfilter.hxx
@@ -44,7 +44,7 @@
namespace rptui
{
- class OReportModel;
+class OReportModel;
}
namespace rptxml
{
@@ -70,7 +70,6 @@ public:
private:
TGroupFunctionMap m_aFunctions;
- Reference< XComponent > m_xSrcDoc;
mutable ::std::unique_ptr<SvXMLTokenMap> m_pDocElemTokenMap;
mutable ::std::unique_ptr<SvXMLTokenMap> m_pReportElemTokenMap;
@@ -97,16 +96,16 @@ private:
bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
SvXMLImportContext* CreateStylesContext(const OUString& rLocalName,
- const Reference< XAttributeList>& xAttrList, bool bIsAutoStyle );
+ const Reference< XAttributeList>& xAttrList, bool bIsAutoStyle );
SvXMLImportContext* CreateMetaContext(const OUString& rLocalName,
- const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
+ const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
SvXMLImportContext* CreateFontDeclsContext(const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
protected:
// SvXMLImport
virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
+ const OUString& rLocalName,
+ const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual XMLShapeImportHelper* CreateShapeImport() override;
@@ -121,15 +120,17 @@ public:
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface > SAL_CALL
- create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
+ create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
- inline Reference<XReportDefinition> getReportDefinition() const { return m_xReportDefinition; }
+ inline Reference<XReportDefinition> getReportDefinition() const {
+ return m_xReportDefinition;
+ }
void FinishStyles();
virtual void SAL_CALL startDocument()
- throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL endDocument()
- throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
const SvXMLTokenMap& GetDocElemTokenMap() const;
const SvXMLTokenMap& GetReportElemTokenMap() const;
@@ -145,9 +146,15 @@ public:
const SvXMLTokenMap& GetColumnTokenMap() const;
const SvXMLTokenMap& GetCellElemTokenMap() const;
- inline rtl::Reference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const { return m_xCellStylesPropertySetMapper; }
- inline rtl::Reference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const { return m_xColumnStylesPropertySetMapper; }
- inline rtl::Reference < XMLPropertySetMapper > GetRowStylesPropertySetMapper() const { return m_xRowStylesPropertySetMapper; }
+ inline rtl::Reference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const {
+ return m_xCellStylesPropertySetMapper;
+ }
+ inline rtl::Reference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const {
+ return m_xColumnStylesPropertySetMapper;
+ }
+ inline rtl::Reference < XMLPropertySetMapper > GetRowStylesPropertySetMapper() const {
+ return m_xRowStylesPropertySetMapper;
+ }
static OUString convertFormula(const OUString& _sFormula);
/** inserts a new function
*
@@ -155,7 +162,9 @@ public:
*/
void insertFunction(const css::uno::Reference< css::report::XFunction > & _xFunction);
void removeFunction(const OUString& _sFunctionName);
- inline const TGroupFunctionMap& getFunctions() const { return m_aFunctions; }
+ inline const TGroupFunctionMap& getFunctions() const {
+ return m_aFunctions;
+ }
bool isOldFormat() const;
};
@@ -170,7 +179,7 @@ public:
static OUString getImplementationName_Static( ) throw (css::uno::RuntimeException);
static Sequence< OUString > getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException);
static css::uno::Reference< css::uno::XInterface > SAL_CALL
- create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
+ create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
};
/** Imports only content
@@ -183,7 +192,7 @@ public:
static OUString getImplementationName_Static( ) throw (css::uno::RuntimeException);
static Sequence< OUString > getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException);
static css::uno::Reference< css::uno::XInterface > SAL_CALL
- create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
+ create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
};
/** Imports only styles
@@ -196,7 +205,7 @@ public:
static OUString getImplementationName_Static( ) throw (css::uno::RuntimeException);
static Sequence< OUString > getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException);
static css::uno::Reference< css::uno::XInterface > SAL_CALL
- create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
+ create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
};
/** Imports only meta data
@@ -209,7 +218,7 @@ public:
static OUString getImplementationName_Static( ) throw (css::uno::RuntimeException);
static Sequence< OUString > getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException);
static css::uno::Reference< css::uno::XInterface > SAL_CALL
- create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
+ create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
};
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 1575cbc..1d757c7 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -144,7 +144,6 @@ class NavigatorTree : public ::cppu::BaseMutex
enum DROP_ACTION { DA_SCROLLUP, DA_SCROLLDOWN, DA_EXPANDNODE };
AutoTimer m_aDropActionTimer;
- Timer m_aSynchronizeTimer;
ImageList m_aNavigatorImages;
Point m_aTimerTriggered; // position at which the DropTimer started
DROP_ACTION m_aDropActionType;
diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx
index b923159..e4b2e1c 100644
--- a/reportdesign/source/ui/inc/DataProviderHandler.hxx
+++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx
@@ -112,7 +112,6 @@ namespace rptui
css::uno::Reference< css::beans::XPropertyChangeListener > m_xMasterDetails;
/// type converter, needed on various occasions
css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter;
- ::std::unique_ptr< OPropertyInfoService > m_pInfoService;
};
} // namespace rptui
diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx
index c88e2d3..fc4eed5 100644
--- a/reportdesign/source/ui/inc/DefaultInspection.hxx
+++ b/reportdesign/source/ui/inc/DefaultInspection.hxx
@@ -50,8 +50,6 @@ namespace rptui
bool m_bIsReadOnly;
sal_Int32 m_nMinHelpTextLines;
sal_Int32 m_nMaxHelpTextLines;
- /// access to property meta data
- ::std::unique_ptr< OPropertyInfoService > m_pInfoService;
DefaultComponentInspectorModel(const DefaultComponentInspectorModel&) = delete;
DefaultComponentInspectorModel& operator=(const DefaultComponentInspectorModel&) = delete;
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index 1bcc651..9d84ae9 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -298,8 +298,6 @@ namespace rptui
mutable css::uno::Reference< css::sdbc::XRowSet > m_xRowSet;
/// type converter, needed on various occasions
css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter;
- /// access to property meta data
- ::std::unique_ptr< OPropertyInfoService > m_pInfoService;
mutable OUString m_sDefaultFunction;
mutable OUString m_sScope;
sal_uInt32 m_nDataFieldType;
diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
index 97521de..be013a6 100644
--- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx
+++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
@@ -96,9 +96,7 @@ namespace rptui
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::inspection::XPropertyHandler > m_xFormComponentHandler; /// delegatee
- css::uno::Reference< css::uno::XInterface > m_xReportComponent; /// inspectee
css::uno::Reference< css::uno::XInterface > m_xFormComponent; /// inspectee
- ::std::unique_ptr< OPropertyInfoService > m_pInfoService;
};
} // namespace rptui
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 1d0a307..1d56abb 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -60,7 +60,6 @@ using namespace ::com::sun::star;
DataProviderHandler::DataProviderHandler(uno::Reference< uno::XComponentContext > const & context)
:DataProviderHandler_Base(m_aMutex)
,m_xContext(context)
- ,m_pInfoService( new OPropertyInfoService() )
{
try
{
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index 1d8b699..766660a 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -57,7 +57,6 @@ namespace rptui
,m_bIsReadOnly(false)
,m_nMinHelpTextLines( 3 )
,m_nMaxHelpTextLines( 8 )
- ,m_pInfoService(new OPropertyInfoService())
{
}
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index fab5cc5..c234c0f 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -229,7 +229,6 @@ GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const
: GeometryHandler_Base(m_aMutex)
, m_aPropertyListeners(m_aMutex)
, m_xContext(context)
- , m_pInfoService(new OPropertyInfoService())
, m_nDataFieldType(0)
, m_bNewFunction(false)
, m_bIn(false)
diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index 6c8c475..be623b4 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -42,7 +42,6 @@ using namespace ::com::sun::star;
ReportComponentHandler::ReportComponentHandler(uno::Reference< uno::XComponentContext > const & context)
:ReportComponentHandler_Base(m_aMutex)
,m_xContext(context)
- ,m_pInfoService( new OPropertyInfoService() )
{
try
{
commit e24c4c40c052591414cedab2fba152170d385580
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 21 14:53:14 2015 +0200
loplugin:unusedfields in sc
Change-Id: Ic801acdd16eded595fdb2a452bbed532b7c9fd65
diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx
index b5149ea..12a77c8 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 1759f39..cbaebc7 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 4737121..9ba8227 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 874b797..986050e 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 80d1b74..00366f2 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 f7309f6..1614e60 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 79d1ccb..cac2d48 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 1b6df14..8992835 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 cb1819b..ec6f226 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 6720240..64aac6f 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 4def79c..64fa31c 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 0572de8..1ae9b98 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 f4f78f1..23ba189 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 3218d2e..f8cddae 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 b4e8907..3240d40 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 31ff2b4..c984f27 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 5a38f7d..ab7486d 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 da405ac..097ccf9 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 0f2d9c8..5c96d61 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 a4e7982..45a2ddd7 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 8abd91c..3f4c37c 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 fcbeb94..3bf7e9a 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 bab3d59..f090f4b 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 ce399b3..7ad853a 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 fc11103..ecfd538a 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4858,7 +4858,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() )
{
@@ -4877,7 +4877,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 b1c1b05..fb3e9cb 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();
}
commit 8ac44ca1890f31521e34c14db1b796a80456404b
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 21 14:10:42 2015 +0200
loplugin:unusedfields in scripting
Change-Id: Ida8fb31bd85f4807d74daab3d022d8e6340a774d
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
index 2d16c58..1509caaa 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
@@ -42,7 +42,6 @@ class BrowseNodeFactoryImpl :
{
private:
css::uno::Reference< css::uno::XComponentContext > m_xComponentContext;
- css::uno::Reference< css::script::browse::XBrowseNode > m_xSelectorBrowseNode;
protected:
virtual ~BrowseNodeFactoryImpl();
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index c539ce7..0e383b0 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1245,14 +1245,12 @@ void StringResourcePersistenceImpl::implStoreAtLocation
class BinaryOutput
{
- Reference< XMultiComponentFactory > m_xMCF;
Reference< XComponentContext > m_xContext;
Reference< XInterface > m_xTempFile;
Reference< io::XOutputStream > m_xOutputStream;
public:
- BinaryOutput( Reference< XMultiComponentFactory > xMCF,
- Reference< XComponentContext > xContext );
+ BinaryOutput( Reference< XComponentContext > xContext );
Reference< io::XOutputStream > getOutputStream() const
{ return m_xOutputStream; }
@@ -1270,10 +1268,8 @@ public:
void writeString( const OUString& aStr );
};
-BinaryOutput::BinaryOutput( Reference< XMultiComponentFactory > xMCF,
- Reference< XComponentContext > xContext )
- : m_xMCF( xMCF )
- , m_xContext( xContext )
+BinaryOutput::BinaryOutput( Reference< XComponentContext > xContext )
+ : m_xContext( xContext )
{
m_xTempFile = io::TempFile::create( m_xContext );
m_xOutputStream.set( m_xTempFile, UNO_QUERY_THROW );
@@ -1380,8 +1376,7 @@ Sequence< ::sal_Int8 > BinaryOutput::closeAndGetData()
Sequence< sal_Int8 > StringResourcePersistenceImpl::exportBinary( )
throw (RuntimeException, std::exception)
{
- Reference< XMultiComponentFactory > xMCF = getMultiComponentFactory();
- BinaryOutput aOut( xMCF, m_xContext );
+ BinaryOutput aOut( m_xContext );
sal_Int32 nLocaleCount = m_aLocaleItemVector.size();
Sequence< sal_Int8 >* pLocaleDataSeq = new Sequence< sal_Int8 >[ nLocaleCount ];
@@ -1397,7 +1392,7 @@ Sequence< sal_Int8 > StringResourcePersistenceImpl::exportBinary( )
if( m_pDefaultLocaleItem == pLocaleItem )
iDefault = iLocale;
- BinaryOutput aLocaleOut( m_xMCF, m_xContext );
+ BinaryOutput aLocaleOut( m_xContext );
implWriteLocaleBinary( pLocaleItem, aLocaleOut );
pLocaleDataSeq[iLocale] = aLocaleOut.closeAndGetData();
@@ -1462,7 +1457,6 @@ void StringResourcePersistenceImpl::implWriteLocaleBinary
class BinaryInput
{
Sequence< sal_Int8 > m_aData;
- Reference< XMultiComponentFactory > m_xMCF;
Reference< XComponentContext > m_xContext;
const sal_Int8* m_pData;
@@ -1470,8 +1464,7 @@ class BinaryInput
sal_Int32 m_nSize;
public:
- BinaryInput( const Sequence< ::sal_Int8 >& aData, Reference< XMultiComponentFactory > xMCF,
- Reference< XComponentContext > xContext );
+ BinaryInput( const Sequence< ::sal_Int8 >& aData, Reference< XComponentContext > xContext );
Reference< io::XInputStream > getInputStreamForSection( sal_Int32 nSize );
@@ -1485,10 +1478,8 @@ public:
OUString readString();
};
-BinaryInput::BinaryInput( const Sequence< ::sal_Int8 >& aData, Reference< XMultiComponentFactory > xMCF,
- Reference< XComponentContext > xContext )
+BinaryInput::BinaryInput( const Sequence< ::sal_Int8 >& aData, Reference< XComponentContext > xContext )
: m_aData( aData )
- , m_xMCF( xMCF )
, m_xContext( xContext )
{
m_pData = m_aData.getConstArray();
@@ -1607,8 +1598,7 @@ void StringResourcePersistenceImpl::importBinary( const Sequence< ::sal_Int8 >&
while( nOldLocaleCount > 0 );
// Import data
- Reference< XMultiComponentFactory > xMCF = getMultiComponentFactory();
- BinaryInput aIn( Data, xMCF, m_xContext );
+ BinaryInput aIn( Data, m_xContext );
sal_Int32 nVersion = aIn.readInt16();
(void)nVersion;
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 66b4f91..fdc80e3 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -557,7 +557,7 @@ class EventListener : public EventListener_BASE
{
public:
- explicit EventListener( const Reference< XComponentContext >& rxContext );
+ EventListener();
// XEventListener
virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( RuntimeException, std::exception ) override;
using cppu::OPropertySetHelper::disposing;
@@ -636,15 +636,14 @@ private:
void setShellFromModel();
void firing_Impl( const ScriptEvent& evt, Any *pSyncRet=nullptr ) throw( RuntimeException, std::exception );
- Reference< XComponentContext > m_xContext;
Reference< frame::XModel > m_xModel;
bool m_bDocClosed;
SfxObjectShell* mpShell;
OUString msProject;
};
-EventListener::EventListener( const Reference< XComponentContext >& rxContext ) :
-OPropertyContainer(GetBroadcastHelper()), m_xContext( rxContext ), m_bDocClosed(false), mpShell( nullptr )
+EventListener::EventListener() :
+OPropertyContainer(GetBroadcastHelper()), m_bDocClosed(false), mpShell( nullptr )
{
registerProperty( EVENTLSTNR_PROPERTY_MODEL, EVENTLSTNR_PROPERTY_ID_MODEL,
beans::PropertyAttribute::TRANSIENT, &m_xModel, cppu::UnoType<decltype(m_xModel)>::get() );
@@ -1026,7 +1025,7 @@ typedef ::cppu::WeakImplHelper< XVBAToOOEventDescGen, css::lang::XServiceInfo >
class VBAToOOEventDescGen : public VBAToOOEventDescGen_BASE
{
public:
- explicit VBAToOOEventDescGen(const Reference< XComponentContext >& rxContext);
+ VBAToOOEventDescGen();
// XVBAToOOEventDescGen
virtual Sequence< ScriptEventDescriptor > SAL_CALL getEventDescriptions( const OUString& sCtrlServiceName, const OUString& sCodeName ) throw (RuntimeException, std::exception) override;
@@ -1051,12 +1050,9 @@ public:
return Sequence< OUString >( &strName, 1 );
}
-private:
- Reference< XComponentContext > m_xContext;
-
};
-VBAToOOEventDescGen::VBAToOOEventDescGen( const Reference< XComponentContext >& rxContext ):m_xContext( rxContext ) {}
+VBAToOOEventDescGen::VBAToOOEventDescGen() {}
Sequence< ScriptEventDescriptor > SAL_CALL
VBAToOOEventDescGen::getEventDescriptions( const OUString& sCntrlServiceName, const OUString& sCodeName ) throw (RuntimeException, std::exception)
@@ -1076,18 +1072,18 @@ VBAToOOEventDescGen::getEventSupplier( const Reference< XInterface >& xControl,
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
-ooo_vba_EventListener_get_implementation(css::uno::XComponentContext* context,
+ooo_vba_EventListener_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new EventListener(context));
+ return cppu::acquire(new EventListener);
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
-ooo_vba_VBAToOOEventDesc_get_implementation(css::uno::XComponentContext* context,
+ooo_vba_VBAToOOEventDesc_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new VBAToOOEventDescGen(context));
+ return cppu::acquire(new VBAToOOEventDescGen);
}
commit 9570bdfcb9ffb59e0dd4a838295b0800b526fc8b
Author: Noel Grandin <noel at peralex.com>
Date: Mon Dec 21 14:05:52 2015 +0200
loplugin:unusedfields in sd
Change-Id: I59a127dace4a1818dfb2ccd6a7b673d39a9c5c60
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index ebc3a2d..c1b1065 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -98,7 +98,6 @@ private:
virtual void SAL_CALL disposing() override;
SdPage* mpPage;
- Reference< XComponentContext > m_xContext;
mutable ::osl::Mutex m_aMutex;
RealPoint2D m_Position;
RealSize2D m_Size;
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index b24d797..ea0a7fc 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -166,10 +166,6 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider
OUString maBaseURI;
css::uno::Reference< css::text::XSimpleText > mXText; // TextRef of the global text
- css::uno::Reference< css::text::XTextCursor > mXCursor;
- css::uno::Reference< css::text::XTextRange > mXCursorText; // TextRef of part of the cursor
- css::uno::Reference< css::beans::XPropertySet > mXCursorPropSet; // properties of the part
- css::uno::Reference< css::text::XTextField > mXTextField;
sal_uInt32 mnTextStyle;
bool mbFontIndependentLineSpacing;
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 4fac893..db07494 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -134,8 +134,6 @@ private:
virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
- std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;
-
::sax_fastparser::FSHelperPtr mPresentationFS;
LayoutInfo mLayoutInfo[EPP_LAYOUT_SIZE];
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 814230c..11cf574 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -109,11 +109,9 @@ private:
AccessibleSlideSorterView::AccessibleSlideSorterView(
::sd::slidesorter::SlideSorter& rSlideSorter,
- const Reference<XAccessible>& rxParent,
vcl::Window* pContentWindow)
: AccessibleSlideSorterViewBase(MutexOwner::maMutex),
mrSlideSorter(rSlideSorter),
- mxParent(rxParent),
mnClientId(0),
mpContentWindow(pContentWindow)
{
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx
index 672120d..ccdf464 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -154,7 +154,6 @@ private:
STLPropertySet* mpSet;
STLPropertySet* mpResultSet;
- CustomAnimationEffectPtr mpEffect;
VclPtr<TabControl> mpTabControl;
VclPtr<CustomAnimationDurationTabPage> mpDurationTabPage;
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index fb4d0f36..58f6153 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -107,8 +107,6 @@ private:
MainSequencePtr mpMainSequence;
- Image maImgEmpty;
-
Image maImages[ IMG_CUSTOMANIMATION_MEDIA_STOP - IMG_CUSTOMANIMATION_ON_CLICK + 1];
css::uno::Reference< css::drawing::XShape > mxLastTargetShape;
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index c50955f..d512283 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -151,7 +151,6 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase,
mrBase( rBase ),
mpCustomAnimationPresets(nullptr),
mnPropertyType( nPropertyTypeNone ),
- mxModel( rBase.GetDocShell()->GetDoc()->getUnoModel(), UNO_QUERY ),
maLateInitTimer()
{
// load resources
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index 86a6ec6..6574807 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -158,7 +158,6 @@ private:
css::uno::Reference< css::drawing::XDrawPage > mxCurrentPage;
css::uno::Reference< css::drawing::XDrawView > mxView;
- css::uno::Reference< css::frame::XModel > mxModel;
/** The mpCustomAnimationPresets is initialized either on demand or
after a short time after the construction of a new object of this
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index ba2008f..da3b0bf 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -252,13 +252,11 @@ public:
private:
SdrPathObj* mpPathObj;
- rtl::Reference< MotionPathTag > mxTag;
};
SdPathHdl::SdPathHdl( const SmartTagReference& xTag, SdrPathObj* pPathObj )
: SmartHdl( xTag, pPathObj->GetCurrentBoundRect().TopLeft() )
, mpPathObj( pPathObj )
-, mxTag( dynamic_cast< MotionPathTag* >( xTag.get() ) )
{
}
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx
index d5e3f47..a603a03 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -64,7 +64,6 @@ protected:
private:
DisplayModeController& mrController;
- Reference< XFrame > mxFrame;
VclPtr<ValueSet> mpDisplayModeSet1;
VclPtr<ValueSet> mpDisplayModeSet2;
};
@@ -138,7 +137,6 @@ DisplayModeToolbarMenu::DisplayModeToolbarMenu( DisplayModeController& rControll
const Reference< XFrame >& xFrame, vcl::Window* pParent )
: svtools::ToolbarMenu(xFrame, pParent, WB_CLIPCHILDREN )
, mrController( rController )
-, mxFrame(xFrame)
, mpDisplayModeSet1( nullptr )
, mpDisplayModeSet2( nullptr )
{
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index a72a71f..18eeb10 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -147,7 +147,7 @@ SdNavigatorWin::SdNavigatorWin(
void SdNavigatorWin::SetUpdateRequestFunctor(const UpdateRequestFunctor& rUpdateRequest)
{
mpNavigatorCtrlItem = new SdNavigatorControllerItem( SID_NAVIGATOR_STATE, this, mpBindings, rUpdateRequest);
- mpPageNameCtrlItem = new SdPageNameControllerItem( SID_NAVIGATOR_PAGENAME, this, mpBindings, rUpdateRequest);
+ mpPageNameCtrlItem = new SdPageNameControllerItem( SID_NAVIGATOR_PAGENAME, this, mpBindings);
// InitTlb; is initiated over Slot
if (rUpdateRequest)
@@ -934,11 +934,9 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
SdPageNameControllerItem::SdPageNameControllerItem(
sal_uInt16 _nId,
SdNavigatorWin* pNavWin,
- SfxBindings* _pBindings,
- const SdNavigatorWin::UpdateRequestFunctor& rUpdateRequest)
+ SfxBindings* _pBindings)
: SfxControllerItem( _nId, *_pBindings ),
- pNavigatorWin( pNavWin ),
- maUpdateRequest(rUpdateRequest)
+ pNavigatorWin( pNavWin )
{
}
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index 9ea1ddd..74b2e57 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -51,13 +51,11 @@ void TraceRequest (const Reference<XConfigurationChangeRequest>& rxRequest)
namespace sd { namespace framework {
ChangeRequestQueueProcessor::ChangeRequestQueueProcessor (
- const ::rtl::Reference<ConfigurationController>& rpConfigurationController,
const std::shared_ptr<ConfigurationUpdater>& rpConfigurationUpdater)
: maMutex(),
maQueue(),
mnUserEventId(nullptr),
mxConfiguration(),
- mpConfigurationController(rpConfigurationController),
mpConfigurationUpdater(rpConfigurationUpdater)
{
}
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
index a232dc7..214efb5 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
@@ -55,7 +55,6 @@ public:
be called when the queue becomes empty.
*/
ChangeRequestQueueProcessor (
- const ::rtl::Reference<ConfigurationController>& rxController,
const std::shared_ptr<ConfigurationUpdater>& rpUpdater);
~ChangeRequestQueueProcessor();
@@ -107,8 +106,6 @@ private:
css::uno::Reference<css::drawing::framework::XConfiguration> mxConfiguration;
- ::rtl::Reference<ConfigurationController> mpConfigurationController;
-
std::shared_ptr<ConfigurationUpdater> mpConfigurationUpdater;
/** Initiate the processing of the entries in the queue. The actual
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 9bdb6bb..1116652 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -553,7 +553,7 @@ ConfigurationController::Implementation::Implementation (
new ConfigurationControllerResourceManager(mpResourceFactoryContainer,mpBroadcaster)),
mpConfigurationUpdater(
new ConfigurationUpdater(mpBroadcaster, mpResourceManager,mxControllerManager)),
- mpQueueProcessor(new ChangeRequestQueueProcessor(&rController,mpConfigurationUpdater)),
+ mpQueueProcessor(new ChangeRequestQueueProcessor(mpConfigurationUpdater)),
mpConfigurationUpdaterLock(),
mnLockCount(0)
{
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx
index e90d184..8c61455 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.hxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx
@@ -90,7 +90,6 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
private:
- css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId;
sal_uInt16 mnChildWindowId;
ViewShellBase& mrViewShellBase;
::std::unique_ptr<SfxShell> mpShell;
diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx
index 617a293..0630163 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.cxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.cxx
@@ -41,8 +41,7 @@ ToolPanelModule::ToolPanelModule (
const Reference<frame::XController>& rxController,
const OUString& rsSidebarPaneURL)
: ResourceManager(rxController,
- FrameworkHelper::CreateResourceId(FrameworkHelper::msSidebarViewURL, rsSidebarPaneURL)),
- mxControllerManager(rxController,UNO_QUERY)
+ FrameworkHelper::CreateResourceId(FrameworkHelper::msSidebarViewURL, rsSidebarPaneURL))
{
if (mxConfigurationController.is())
{
diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx
index 2023499..3ad688f 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.hxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.hxx
@@ -44,9 +44,6 @@ public:
virtual void SAL_CALL notifyConfigurationChange (
const css::drawing::framework::ConfigurationChangeEvent& rEvent)
throw (css::uno::RuntimeException, std::exception) override;
-
-private:
- css::uno::Reference<css::drawing::framework::XControllerManager> mxControllerManager;
};
} } // end of namespace sd::framework
diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
index 1cedfc8..99a7b84 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx
@@ -65,7 +65,6 @@ class AccessibleSlideSorterView
public:
AccessibleSlideSorterView(
::sd::slidesorter::SlideSorter& rSlideSorter,
- const css::uno::Reference< css::accessibility::XAccessible> & rxParent,
vcl::Window* pParentWindow);
void Init();
@@ -280,8 +279,6 @@ private:
::sd::slidesorter::SlideSorter& mrSlideSorter;
- css::uno::Reference<css::accessibility::XAccessible> mxParent;
-
sal_uInt32 mnClientId;
VclPtr<vcl::Window> mpContentWindow;
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index faf1e7b..d484073 100644
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -55,8 +55,6 @@ protected:
static const int FRAME;
- svtools::ColorConfig maColorConfig;
-
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
void updateViewSettings();
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 8aae80a..5765382 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -181,8 +181,7 @@ private:
class SdPageNameControllerItem : public SfxControllerItem
{
public:
- SdPageNameControllerItem( sal_uInt16, SdNavigatorWin*, SfxBindings*,
- const SdNavigatorWin::UpdateRequestFunctor& rUpdateRequest);
+ SdPageNameControllerItem( sal_uInt16, SdNavigatorWin*, SfxBindings*);
protected:
virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
@@ -190,7 +189,6 @@ protected:
private:
VclPtr<SdNavigatorWin> pNavigatorWin;
- const SdNavigatorWin::UpdateRequestFunctor maUpdateRequest;
};
#endif
diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
index ac026cf..de847b3 100644
--- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
@@ -80,10 +80,6 @@ public:
*/
virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) override;
-private:
- std::unique_ptr< ToolPanelViewShell_Impl > mpImpl;
-
- std::shared_ptr<TaskPaneShellManager> mpSubShellManager;
};
} } // end of namespace ::sd::toolpanel
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx
index 6424185..3080700 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.hxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx
@@ -94,7 +94,6 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
private:
- css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
class PresenterCacheContext;
Size maPreviewSize;
std::shared_ptr<PresenterCacheContext> mpCacheContext;
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
index a0bffc5..a3567a6 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
@@ -60,8 +60,6 @@ protected:
virtual void ExecuteCommand (const sal_Int32 nCommandId) override;
private:
- css::uno::Reference<css::lang::XComponent> mxListener;
-
CurrentMasterPagesSelector (
vcl::Window* pParent,
SdDrawDocument& rDocument,
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
index fad9c8b..1e84b81 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
@@ -68,7 +68,6 @@ public:
private:
SlideSorter* mpTargetSlideSorter;
- model::SharedPageDescriptor mpHitDescriptor;
sal_Int32 mnInsertionIndex;
};
diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index d47c26f..fc834e2 100644
--- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -55,7 +55,6 @@ PageSelector::PageSelector (SlideSorter& rSlideSorter)
mbSelectionChangeBroadcastPending(false),
mpMostRecentlySelectedPage(),
mpSelectionAnchor(),
- mpCurrentPage(),
mnUpdateLockCount(0),
mbIsUpdateCurrentPagePending(true)
{
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
index d6d18f0..e2d8292 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
@@ -56,20 +56,12 @@ using namespace ::sd::slidesorter::controller;
namespace sd { namespace slidesorter { namespace controller {
-class SelectionManager::PageInsertionListener
- : public SfxListener
-{
-public:
-
-};
-
SelectionManager::SelectionManager (SlideSorter& rSlideSorter)
: mrSlideSorter(rSlideSorter),
mrController(rSlideSorter.GetController()),
mbIsMakeSelectionVisiblePending(true),
mnInsertionPosition(-1),
mnAnimationId(Animator::NotAnAnimationId),
- mpPageInsertionListener(),
mpSelectionObserver(new SelectionObserver(rSlideSorter))
{
}
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index 1a1ec8a..5485fb1 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -185,7 +185,6 @@ private:
model::SharedPageDescriptor mpMostRecentlySelectedPage;
/// Anchor for a range selection.
model::SharedPageDescriptor mpSelectionAnchor;
- model::SharedPageDescriptor mpCurrentPage;
sal_Int32 mnUpdateLockCount;
bool mbIsUpdateCurrentPagePending;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
index 2c052df..47b8929 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
@@ -127,9 +127,6 @@ private:
*/
Animator::AnimationId mnAnimationId;
- class PageInsertionListener;
- std::unique_ptr<PageInsertionListener> mpPageInsertionListener;
-
std::shared_ptr<SelectionObserver> mpSelectionObserver;
/** Delete the given list of normal pages. This method is a helper
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index a17f255..fc535c3 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -224,7 +224,6 @@ private:
Size maPreviewSize;
bool mbPreciousFlagUpdatePending;
Layouter::Orientation meOrientation;
- std::shared_ptr<controller::Properties> mpProperties;
model::SharedPageDescriptor mpPageUnderMouse;
std::shared_ptr<PageObjectPainter> mpPageObjectPainter;
std::shared_ptr<SelectionPainter> mpSelectionPainter;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index 978bddf..52c0374 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -71,19 +71,10 @@ public:
private:
const Layouter& mrLayouter;
std::shared_ptr<cache::PageCache> mpCache;
- std::shared_ptr<controller::Properties> mpProperties;
std::shared_ptr<view::Theme> mpTheme;
std::shared_ptr<vcl::Font> mpPageNumberFont;
std::unique_ptr<FramePainter> mpShadowPainter;
std::unique_ptr<FramePainter> mpFocusBorderPainter;
- Bitmap maNormalBackground;
- Bitmap maSelectionBackground;
- Bitmap maFocusedSelectionBackground;
- Bitmap maFocusedBackground;
- Bitmap maMouseOverBackground;
- Bitmap maMouseOverFocusedBackground;
- Bitmap maMouseOverSelectedBackground;
- Bitmap maMouseOverSelectedAndFocusedBackground;
void PaintBackground (
PageObjectLayouter *pPageObjectLayouter,
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
index c3ce8f6..9f7e09c 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx
@@ -183,7 +183,6 @@ private:
std::shared_ptr<SlideSorter> mpSlideSorter;
css::uno::Reference<css::drawing::framework::XResourceId> mxViewId;
css::uno::Reference<css::awt::XWindow> mxParentWindow;
- std::unique_ptr<cppu::IPropertyArrayHelper> mpPropertyArrayHelper;
void Resize();
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index a77a630..cbb97f5 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -259,7 +259,6 @@ css::uno::Reference<css::accessibility::XAccessible>
::accessibility::AccessibleSlideSorterView *pAccessibleView =
new ::accessibility::AccessibleSlideSorterView(
*mpSlideSorter.get(),
- pWindow->GetAccessibleParentWindow()->GetAccessible(),
pWindow);
css::uno::Reference< css::accessibility::XAccessible> xRet(pAccessibleView);
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 489370e..a44a3e5 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -144,7 +144,6 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter)
maPreviewSize(0,0),
mbPreciousFlagUpdatePending(true),
meOrientation(Layouter::GRID),
- mpProperties(rSlideSorter.GetProperties()),
mpPageUnderMouse(),
mpPageObjectPainter(),
mpSelectionPainter(),
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index b2278dc..515aaa8 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -46,7 +46,6 @@ PageObjectPainter::PageObjectPainter (
const SlideSorter& rSlideSorter)
: mrLayouter(rSlideSorter.GetView().GetLayouter()),
mpCache(rSlideSorter.GetView().GetPreviewCache()),
- mpProperties(rSlideSorter.GetProperties()),
mpTheme(rSlideSorter.GetTheme()),
mpPageNumberFont(Theme::GetFont(Theme::Font_PageNumber, *rSlideSorter.GetContentWindow())),
mpShadowPainter(new FramePainter(mpTheme->GetIcon(Theme::Icon_RawShadow))),
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index e37b416..886848b 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -98,7 +98,6 @@ private:
css::uno::Reference< css::beans::XPropertySet > mxSelectedTable;
css::uno::Reference< css::drawing::XDrawView > mxView;
css::uno::Reference< css::container::XIndexAccess > mxTableFamily;
- css::uno::Reference< css::ui::XUIElement > mxToolbar;
bool mbModal;
bool mbStyleSelected;
diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx
index c4a0a0e..05b52b0 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -129,13 +129,12 @@ uno::Sequence< OUString > SAL_CALL SdUnoModule::getSupportedServiceNames( ) thr
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
-com_sun_star_comp_Draw_DrawingModule_get_implementation(css::uno::XComponentContext* context,
+com_sun_star_comp_Draw_DrawingModule_get_implementation(css::uno::XComponentContext* ,
css::uno::Sequence<css::uno::Any> const &)
{
SolarMutexGuard aGuard;
- uno::Reference< lang::XMultiServiceFactory> xSM(context->getServiceManager(), uno::UNO_QUERY_THROW);
- return cppu::acquire(new SdUnoModule(xSM));
+ return cppu::acquire(new SdUnoModule);
}
diff --git a/sd/source/ui/unoidl/unomodule.hxx b/sd/source/ui/unoidl/unomodule.hxx
index 63df606..113e0a6 100644
--- a/sd/source/ui/unoidl/unomodule.hxx
+++ b/sd/source/ui/unoidl/unomodule.hxx
@@ -50,12 +50,8 @@ namespace com
class SdUnoModule : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo >
{
- css::uno::Reference < css::lang::XMultiServiceFactory > m_xFactory;
-
public:
- explicit SdUnoModule( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory )
- : m_xFactory( xFactory )
- {}
+ SdUnoModule() {}
// XnotifyingDispatch
virtual void SAL_CALL dispatchWithNotification( const css::util::URL& URL, const css::uno::Sequence< css::beans::PropertyValue >& Arguments, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener )
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 43d96f3..508555a 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -1113,7 +1113,6 @@ private:
const OUString maStrScript;
SdXShape* mpShape;
- uno::Reference< document::XEventsSupplier > mxShape;
public:
SdUnoEventsAccess( SdXShape* pShape ) throw();
@@ -1158,7 +1157,7 @@ SdUnoEventsAccess::SdUnoEventsAccess( SdXShape* pShape ) throw()
maStrSpeed( "Speed" ),
maStrStarBasic( "StarBasic" ),
maStrScript( "Script" ),
- mpShape( pShape ), mxShape( pShape )
+ mpShape( pShape )
{
}
More information about the Libreoffice-commits
mailing list