loplugin:unusedfields in xmlhelp,xmloff

Change-Id: I4d2f0ff95da5abaa3d0a0a5223616e09e0c476fc
This commit is contained in:
Noel Grandin
2015-12-21 10:50:20 +02:00
parent a218039d2a
commit 4c7ce41582
14 changed files with 4 additions and 58 deletions

View File

@@ -330,9 +330,7 @@ uno::Any SAL_CALL Content::execute(
uno::Reference< ucb::XDynamicResultSet > xSet uno::Reference< ucb::XDynamicResultSet > xSet
= new DynamicResultSet( = new DynamicResultSet(
m_xContext, m_xContext,
this,
aOpenCommand, aOpenCommand,
Environment,
new ResultSetForRootFactory( new ResultSetForRootFactory(
m_xContext, m_xContext,
m_xProvider.get(), m_xProvider.get(),
@@ -346,9 +344,7 @@ uno::Any SAL_CALL Content::execute(
uno::Reference< ucb::XDynamicResultSet > xSet uno::Reference< ucb::XDynamicResultSet > xSet
= new DynamicResultSet( = new DynamicResultSet(
m_xContext, m_xContext,
this,
aOpenCommand, aOpenCommand,
Environment,
new ResultSetForQueryFactory( new ResultSetForQueryFactory(
m_xContext, m_xContext,
m_xProvider.get(), m_xProvider.get(),

View File

@@ -33,13 +33,9 @@ using namespace chelp;
DynamicResultSet::DynamicResultSet( DynamicResultSet::DynamicResultSet(
const Reference< XComponentContext >& rxContext, const Reference< XComponentContext >& rxContext,
const rtl::Reference< Content >& rxContent,
const OpenCommandArgument2& rCommand, const OpenCommandArgument2& rCommand,
const Reference< XCommandEnvironment >& rxEnv,
ResultSetFactory* pFactory ) ResultSetFactory* pFactory )
: ResultSetImplHelper( rxContext, rCommand ), : ResultSetImplHelper( rxContext, rCommand ),
m_xContent( rxContent ),
m_xEnv( rxEnv ),
m_pFactory( pFactory ) m_pFactory( pFactory )
{ {
} }

View File

@@ -31,8 +31,6 @@ namespace chelp {
class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
{ {
rtl::Reference< Content > m_xContent;
css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv;
ResultSetFactory* m_pFactory; ResultSetFactory* m_pFactory;
private: private:
@@ -42,9 +40,7 @@ namespace chelp {
public: public:
DynamicResultSet( DynamicResultSet(
const css::uno::Reference< css::uno::XComponentContext >& rxContext, const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const rtl::Reference< Content >& rxContent,
const css::ucb::OpenCommandArgument2& rCommand, const css::ucb::OpenCommandArgument2& rCommand,
const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv,
ResultSetFactory* pFactory ); ResultSetFactory* pFactory );
virtual ~DynamicResultSet(); virtual ~DynamicResultSet();

View File

@@ -1341,8 +1341,6 @@ public:
class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext
{ {
css::uno::Any aValue;
public: public:
XMLCustomPropertyFieldImportContext (SvXMLImport& rImport, XMLCustomPropertyFieldImportContext (SvXMLImport& rImport,

View File

@@ -37,7 +37,6 @@ public:
virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
private: private:
css::uno::Reference< css::chart2::XChartDocument > mxChartDocument;
SchXMLImportHelper& mrImportHelper; SchXMLImportHelper& mrImportHelper;
css::uno::Reference< css::chart2::XDataSeries > mxDataSeries; css::uno::Reference< css::chart2::XDataSeries > mxDataSeries;

View File

@@ -94,7 +94,7 @@ SvXMLImportContext* SchXMLRegressionCurveObjectContext::CreateChildContext(
if( nPrefix == XML_NAMESPACE_CHART && IsXMLToken( rLocalName, XML_EQUATION ) ) if( nPrefix == XML_NAMESPACE_CHART && IsXMLToken( rLocalName, XML_EQUATION ) )
{ {
pContext = new SchXMLEquationContext( pContext = new SchXMLEquationContext(
mrImportHelper, GetImport(), nPrefix, rLocalName, mxSeries, maChartSize, mrRegressionStyleList.back()); mrImportHelper, GetImport(), nPrefix, rLocalName, maChartSize, mrRegressionStyleList.back());
} }
else else
{ {
@@ -109,15 +109,12 @@ SchXMLEquationContext::SchXMLEquationContext(
SvXMLImport& rImport, SvXMLImport& rImport,
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const css::uno::Reference<
css::chart2::XDataSeries >& xSeries,
const awt::Size& rChartSize, const awt::Size& rChartSize,
RegressionStyle& rRegressionStyle ) : RegressionStyle& rRegressionStyle ) :
SvXMLImportContext( rImport, nPrefix, rLocalName ), SvXMLImportContext( rImport, nPrefix, rLocalName ),
mrImportHelper( rImpHelper ), mrImportHelper( rImpHelper ),
mrRegressionStyle( rRegressionStyle ), mrRegressionStyle( rRegressionStyle ),
mxSeries( xSeries ),
maChartSize( rChartSize ) maChartSize( rChartSize )
{} {}

View File

@@ -63,7 +63,6 @@ public:
SvXMLImport& rImport, SvXMLImport& rImport,
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
const css::awt::Size & rChartSize, const css::awt::Size & rChartSize,
RegressionStyle & rRegressionStyle ); RegressionStyle & rRegressionStyle );
@@ -74,7 +73,6 @@ public:
private: private:
SchXMLImportHelper& mrImportHelper; SchXMLImportHelper& mrImportHelper;
RegressionStyle& mrRegressionStyle; RegressionStyle& mrRegressionStyle;
css::uno::Reference< css::chart2::XDataSeries > mxSeries;
css::awt::Size maChartSize; css::awt::Size maChartSize;
}; };

View File

@@ -196,9 +196,6 @@ class SdXMLImport: public SvXMLImport
bool mbLoadDoc; bool mbLoadDoc;
bool mbPreview; bool mbPreview;
std::map< sal_Int32, css::uno::Reference< css::drawing::XDrawPage >, SdXMLltXDrawPageId >
maDrawPageIds;
OUString msPageLayouts; OUString msPageLayouts;
OUString msPreview; OUString msPreview;

View File

@@ -95,9 +95,6 @@ struct XMLShapeImportHelperImpl
// context for sorting shapes // context for sorting shapes
ShapeSortContext* mpSortContext; ShapeSortContext* mpSortContext;
std::map<sal_Int32, css::uno::Reference< css::drawing::XShape >, ltint32>
maShapeIds;
std::vector<ConnectionHint> maConnections; std::vector<ConnectionHint> maConnections;
// #88546# possibility to switch progress bar handling on/off // #88546# possibility to switch progress bar handling on/off

View File

@@ -108,7 +108,6 @@ public:
OUString GetDefaultCellStyleName() const; OUString GetDefaultCellStyleName() const;
rtl::Reference< XMLTableImport > mxTableImporter;
css::uno::Reference< css::table::XTable > mxTable; css::uno::Reference< css::table::XTable > mxTable;
Reference< XTableColumns > mxColumns; Reference< XTableColumns > mxColumns;
Reference< XTableRows > mxRows; 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 ) XMLTableImportContext::XMLTableImportContext( const rtl::Reference< XMLTableImport >& xImporter, sal_uInt16 nPrfx, const OUString& rLName, Reference< XColumnRowRange >& xColumnRowRange )
: SvXMLImportContext( xImporter->mrImport, nPrfx, rLName ) : SvXMLImportContext( xImporter->mrImport, nPrfx, rLName )
, mxTableImporter( xImporter )
, mxTable( xColumnRowRange, UNO_QUERY ) , mxTable( xColumnRowRange, UNO_QUERY )
, mxColumns( xColumnRowRange->getColumns() ) , mxColumns( xColumnRowRange->getColumns() )
, mxRows( xColumnRowRange->getRows() ) , mxRows( xColumnRowRange->getRows() )

View File

@@ -39,12 +39,6 @@ namespace com { namespace sun { namespace star {
*/ */
class XMLSectionImportContext : public SvXMLImportContext 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 /// TextSection (as XPropertySet) for passing down to data source elements
css::uno::Reference<css::beans::XPropertySet> xSectionPropertySet; css::uno::Reference<css::beans::XPropertySet> xSectionPropertySet;

View File

@@ -507,7 +507,6 @@ struct XMLTextImportHelper::Impl
std::unique_ptr<XMLTextListsHelper> m_xTextListsHelper; std::unique_ptr<XMLTextListsHelper> m_xTextListsHelper;
SvXMLImportContextRef m_xAutoStyles; SvXMLImportContextRef m_xAutoStyles;
SvXMLImportContextRef m_xFontDecls;
rtl::Reference< SvXMLImportPropertyMapper > m_xParaImpPrMap; rtl::Reference< SvXMLImportPropertyMapper > m_xParaImpPrMap;
rtl::Reference< SvXMLImportPropertyMapper > m_xTextImpPrMap; rtl::Reference< SvXMLImportPropertyMapper > m_xTextImpPrMap;

View File

@@ -1219,16 +1219,8 @@ bool XMLNumber8OneBasedHdl::exportXML(
} }
return bRet; return bRet;
} }
class XMLTextPropertyHandlerFactory_Impl
{
public:
static const XMLPropertyHandler *GetPropertyHandler( sal_Int32 nType );
XMLTextPropertyHandlerFactory_Impl(); static const XMLPropertyHandler *GetPropertyHandler
~XMLTextPropertyHandlerFactory_Impl();
};
const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler
( sal_Int32 nType ) ( sal_Int32 nType )
{ {
const XMLPropertyHandler* pHdl = nullptr; const XMLPropertyHandler* pHdl = nullptr;
@@ -1432,17 +1424,8 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler
return pHdl; return pHdl;
} }
XMLTextPropertyHandlerFactory_Impl::XMLTextPropertyHandlerFactory_Impl()
{
}
XMLTextPropertyHandlerFactory_Impl::~XMLTextPropertyHandlerFactory_Impl()
{
}
XMLTextPropertyHandlerFactory::XMLTextPropertyHandlerFactory() : XMLTextPropertyHandlerFactory::XMLTextPropertyHandlerFactory() :
XMLPropertyHandlerFactory(), XMLPropertyHandlerFactory()
pImpl( new XMLTextPropertyHandlerFactory_Impl )
{ {
} }
@@ -1458,7 +1441,7 @@ const XMLPropertyHandler *XMLTextPropertyHandlerFactory::GetPropertyHandler(
if( !pHdl ) if( !pHdl )
{ {
const XMLPropertyHandler *pNewHdl = XMLTextPropertyHandlerFactory_Impl::GetPropertyHandler( nType ); const XMLPropertyHandler *pNewHdl = ::GetPropertyHandler( nType );
if( pNewHdl ) if( pNewHdl )
PutHdlCache( nType, pNewHdl ); PutHdlCache( nType, pNewHdl );

View File

@@ -27,8 +27,6 @@ class XMLTextPropertyHandlerFactory_Impl;
class XMLTextPropertyHandlerFactory : public XMLPropertyHandlerFactory class XMLTextPropertyHandlerFactory : public XMLPropertyHandlerFactory
{ {
std::unique_ptr<XMLTextPropertyHandlerFactory_Impl> pImpl;
public: public:
XMLTextPropertyHandlerFactory(); XMLTextPropertyHandlerFactory();