summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-12-21 10:50:20 +0200
committerNoel Grandin <noel@peralex.com>2015-12-21 12:45:49 +0200
commit4c7ce41582b85375df385a05770a0a79fa742bbc (patch)
tree2d57baa7f995cdf92d896b364b56953c191a491f
parenta218039d2a1176a5c788498fd8b50efe9b195b54 (diff)
loplugin:unusedfields in xmlhelp,xmloff
Change-Id: I4d2f0ff95da5abaa3d0a0a5223616e09e0c476fc
-rw-r--r--xmlhelp/source/cxxhelp/provider/content.cxx4
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultset.cxx4
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultset.hxx4
-rw-r--r--xmloff/inc/txtfldi.hxx2
-rw-r--r--xmloff/source/chart/SchXMLPropertyMappingContext.hxx1
-rw-r--r--xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx5
-rw-r--r--xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx2
-rw-r--r--xmloff/source/draw/sdxmlimp_impl.hxx3
-rw-r--r--xmloff/source/draw/shapeimport.cxx3
-rw-r--r--xmloff/source/table/XMLTableImport.cxx2
-rw-r--r--xmloff/source/text/XMLSectionImportContext.hxx6
-rw-r--r--xmloff/source/text/txtimp.cxx1
-rw-r--r--xmloff/source/text/txtprhdl.cxx23
-rw-r--r--xmloff/source/text/txtprhdl.hxx2
14 files changed, 4 insertions, 58 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index c0355462413b..0826f439ab9c 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -330,9 +330,7 @@ uno::Any SAL_CALL Content::execute(
uno::Reference< ucb::XDynamicResultSet > xSet
= new DynamicResultSet(
m_xContext,
- this,
aOpenCommand,
- Environment,
new ResultSetForRootFactory(
m_xContext,
m_xProvider.get(),
@@ -346,9 +344,7 @@ uno::Any SAL_CALL Content::execute(
uno::Reference< ucb::XDynamicResultSet > xSet
= new DynamicResultSet(
m_xContext,
- this,
aOpenCommand,
- Environment,
new ResultSetForQueryFactory(
m_xContext,
m_xProvider.get(),
diff --git a/xmlhelp/source/cxxhelp/provider/resultset.cxx b/xmlhelp/source/cxxhelp/provider/resultset.cxx
index 64b7d5f57a64..67ad5df99739 100644
--- a/xmlhelp/source/cxxhelp/provider/resultset.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultset.cxx
@@ -33,13 +33,9 @@ using namespace chelp;
DynamicResultSet::DynamicResultSet(
const Reference< XComponentContext >& rxContext,
- const rtl::Reference< Content >& rxContent,
const OpenCommandArgument2& rCommand,
- const Reference< XCommandEnvironment >& rxEnv,
ResultSetFactory* pFactory )
: ResultSetImplHelper( rxContext, rCommand ),
- m_xContent( rxContent ),
- m_xEnv( rxEnv ),
m_pFactory( pFactory )
{
}
diff --git a/xmlhelp/source/cxxhelp/provider/resultset.hxx b/xmlhelp/source/cxxhelp/provider/resultset.hxx
index 53432d7b2410..00173669d187 100644
--- a/xmlhelp/source/cxxhelp/provider/resultset.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultset.hxx
@@ -31,8 +31,6 @@ namespace chelp {
class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
{
- rtl::Reference< Content > m_xContent;
- css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv;
ResultSetFactory* m_pFactory;
private:
@@ -42,9 +40,7 @@ namespace chelp {
public:
DynamicResultSet(
const css::uno::Reference< css::uno::XComponentContext >& rxContext,
- const rtl::Reference< Content >& rxContent,
const css::ucb::OpenCommandArgument2& rCommand,
- const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv,
ResultSetFactory* pFactory );
virtual ~DynamicResultSet();
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index c3c986d2a78f..4b3554103e0c 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -1341,8 +1341,6 @@ public:
class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext
{
- css::uno::Any aValue;
-
public:
XMLCustomPropertyFieldImportContext (SvXMLImport& rImport,
diff --git a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx
index afa6a7c42f9d..2a0ba1c61413 100644
--- a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx
+++ b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx
@@ -37,7 +37,6 @@ public:
virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
private:
- css::uno::Reference< css::chart2::XChartDocument > mxChartDocument;
SchXMLImportHelper& mrImportHelper;
css::uno::Reference< css::chart2::XDataSeries > mxDataSeries;
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
index d8a765fe9015..6ac0d5be3177 100644
--- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
@@ -94,7 +94,7 @@ SvXMLImportContext* SchXMLRegressionCurveObjectContext::CreateChildContext(
if( nPrefix == XML_NAMESPACE_CHART && IsXMLToken( rLocalName, XML_EQUATION ) )
{
pContext = new SchXMLEquationContext(
- mrImportHelper, GetImport(), nPrefix, rLocalName, mxSeries, maChartSize, mrRegressionStyleList.back());
+ mrImportHelper, GetImport(), nPrefix, rLocalName, maChartSize, mrRegressionStyleList.back());
}
else
{
@@ -109,15 +109,12 @@ SchXMLEquationContext::SchXMLEquationContext(
SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const css::uno::Reference<
- css::chart2::XDataSeries >& xSeries,
const awt::Size& rChartSize,
RegressionStyle& rRegressionStyle ) :
SvXMLImportContext( rImport, nPrefix, rLocalName ),
mrImportHelper( rImpHelper ),
mrRegressionStyle( rRegressionStyle ),
- mxSeries( xSeries ),
maChartSize( rChartSize )
{}
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
index 49274b5d9a42..f111ab2de909 100644
--- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
@@ -63,7 +63,6 @@ public:
SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
- const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
const css::awt::Size & rChartSize,
RegressionStyle & rRegressionStyle );
@@ -74,7 +73,6 @@ public:
private:
SchXMLImportHelper& mrImportHelper;
RegressionStyle& mrRegressionStyle;
- css::uno::Reference< css::chart2::XDataSeries > mxSeries;
css::awt::Size maChartSize;
};
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 3d251d55b9f2..4a585e79e0a6 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -196,9 +196,6 @@ class SdXMLImport: public SvXMLImport
bool mbLoadDoc;
bool mbPreview;
- std::map< sal_Int32, css::uno::Reference< css::drawing::XDrawPage >, SdXMLltXDrawPageId >
- maDrawPageIds;
-
OUString msPageLayouts;
OUString msPreview;
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 4bd6fe67d350..8ff67a3eac0a 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -95,9 +95,6 @@ struct XMLShapeImportHelperImpl
// context for sorting shapes
ShapeSortContext* mpSortContext;
- std::map<sal_Int32, css::uno::Reference< css::drawing::XShape >, ltint32>
- maShapeIds;
-
std::vector<ConnectionHint> maConnections;
// #88546# possibility to switch progress bar handling on/off
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index c621e19dd4b7..f1f1c4b29669 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -108,7 +108,6 @@ public:
OUString GetDefaultCellStyleName() const;
- rtl::Reference< XMLTableImport > mxTableImporter;
css::uno::Reference< css::table::XTable > mxTable;
Reference< XTableColumns > mxColumns;
Reference< XTableRows > mxRows;
@@ -275,7 +274,6 @@ void XMLTableImport::finishStyles()
XMLTableImportContext::XMLTableImportContext( const rtl::Reference< XMLTableImport >& xImporter, sal_uInt16 nPrfx, const OUString& rLName, Reference< XColumnRowRange >& xColumnRowRange )
: SvXMLImportContext( xImporter->mrImport, nPrfx, rLName )
-, mxTableImporter( xImporter )
, mxTable( xColumnRowRange, UNO_QUERY )
, mxColumns( xColumnRowRange->getColumns() )
, mxRows( xColumnRowRange->getRows() )
diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx
index 0a1a2de53154..952eeb533889 100644
--- a/xmloff/source/text/XMLSectionImportContext.hxx
+++ b/xmloff/source/text/XMLSectionImportContext.hxx
@@ -39,12 +39,6 @@ namespace com { namespace sun { namespace star {
*/
class XMLSectionImportContext : public SvXMLImportContext
{
- /// start position; ranges acquired via getStart(),getEnd() don't move
- css::uno::Reference<css::text::XTextRange> xStartRange;
-
- /// end position
- css::uno::Reference<css::text::XTextRange> xEndRange;
-
/// TextSection (as XPropertySet) for passing down to data source elements
css::uno::Reference<css::beans::XPropertySet> xSectionPropertySet;
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 9000846aa927..2ece1f4b4d32 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -507,7 +507,6 @@ struct XMLTextImportHelper::Impl
std::unique_ptr<XMLTextListsHelper> m_xTextListsHelper;
SvXMLImportContextRef m_xAutoStyles;
- SvXMLImportContextRef m_xFontDecls;
rtl::Reference< SvXMLImportPropertyMapper > m_xParaImpPrMap;
rtl::Reference< SvXMLImportPropertyMapper > m_xTextImpPrMap;
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 88562059ed2a..51a2ebdf597a 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -1219,16 +1219,8 @@ bool XMLNumber8OneBasedHdl::exportXML(
}
return bRet;
}
-class XMLTextPropertyHandlerFactory_Impl
-{
-public:
- static const XMLPropertyHandler *GetPropertyHandler( sal_Int32 nType );
- XMLTextPropertyHandlerFactory_Impl();
- ~XMLTextPropertyHandlerFactory_Impl();
-};
-
-const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler
+static const XMLPropertyHandler *GetPropertyHandler
( sal_Int32 nType )
{
const XMLPropertyHandler* pHdl = nullptr;
@@ -1432,17 +1424,8 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler
return pHdl;
}
-XMLTextPropertyHandlerFactory_Impl::XMLTextPropertyHandlerFactory_Impl()
-{
-}
-
-XMLTextPropertyHandlerFactory_Impl::~XMLTextPropertyHandlerFactory_Impl()
-{
-}
-
XMLTextPropertyHandlerFactory::XMLTextPropertyHandlerFactory() :
- XMLPropertyHandlerFactory(),
- pImpl( new XMLTextPropertyHandlerFactory_Impl )
+ XMLPropertyHandlerFactory()
{
}
@@ -1458,7 +1441,7 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory::GetPropertyHandler(
if( !pHdl )
{
- const XMLPropertyHandler *pNewHdl = XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler( nType );
+ const XMLPropertyHandler *pNewHdl = ::GetPropertyHandler( nType );
if( pNewHdl )
PutHdlCache( nType, pNewHdl );
diff --git a/xmloff/source/text/txtprhdl.hxx b/xmloff/source/text/txtprhdl.hxx
index 78aaa95b7476..f92d700b5346 100644
--- a/xmloff/source/text/txtprhdl.hxx
+++ b/xmloff/source/text/txtprhdl.hxx
@@ -27,8 +27,6 @@ class XMLTextPropertyHandlerFactory_Impl;
class XMLTextPropertyHandlerFactory : public XMLPropertyHandlerFactory
{
- std::unique_ptr<XMLTextPropertyHandlerFactory_Impl> pImpl;
-
public:
XMLTextPropertyHandlerFactory();