summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-12-21 15:09:05 +0200
committerNoel Grandin <noel@peralex.com>2015-12-22 09:53:27 +0200
commit4e8e81f0d6dcbdd4d491cec09dfb485ffa30ab98 (patch)
tree81e13e477a97cdbe4b025329dc6b2732aae15524 /reportdesign
parente24c4c40c052591414cedab2fba152170d385580 (diff)
loplugin:unusedfields in reportdesign
Change-Id: Ida5e91105d204b431edf743a9f5272febd50e688
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/inc/RptObject.hxx2
-rw-r--r--reportdesign/inc/UndoActions.hxx2
-rw-r--r--reportdesign/source/core/api/Function.cxx1
-rw-r--r--reportdesign/source/core/inc/Function.hxx1
-rw-r--r--reportdesign/source/filter/xml/xmlExport.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlHelper.hxx3
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.hxx45
-rw-r--r--reportdesign/source/ui/dlg/Navigator.cxx1
-rw-r--r--reportdesign/source/ui/inc/DataProviderHandler.hxx1
-rw-r--r--reportdesign/source/ui/inc/DefaultInspection.hxx2
-rw-r--r--reportdesign/source/ui/inc/GeometryHandler.hxx2
-rw-r--r--reportdesign/source/ui/inc/ReportComponentHandler.hxx2
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx1
-rw-r--r--reportdesign/source/ui/inspection/DefaultInspection.cxx1
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx1
-rw-r--r--reportdesign/source/ui/inspection/ReportComponentHandler.cxx1
16 files changed, 27 insertions, 43 deletions
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 4333721dd15a..283e8f2ac5d7 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 4317b50a0255..89e667d2f31a 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 43bc4b7a1aae..3210d6c379bf 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 756877189aae..bd45f84851ee 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 517b7a32e12e..4d8a343feade 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 20350762c4cc..cd901bd67af3 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 105c0e547475..1def596e2ef4 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 1575cbcb0e6b..1d757c78d138 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 b9231593017e..e4b2e1c4296e 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 c88e2d39775d..fc4eed5baa4d 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 1bcc651b6099..9d84ae9b34a0 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 97521de09513..be013a6e8ed7 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 1d0a3071ed43..1d56abb990dc 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 1d8b699d2b91..766660acf4e1 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 fab5cc5a4437..c234c0f0a55b 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 6c8c475f46f3..be623b479152 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
{