[Libreoffice-commits] core.git: 3 commits - compilerplugins/clang xmloff/inc xmloff/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Jul 20 07:38:08 UTC 2017
compilerplugins/clang/unusedfields.readonly.results | 6 ------
xmloff/inc/SchXMLExport.hxx | 1 -
xmloff/inc/SchXMLImport.hxx | 2 --
xmloff/source/chart/SchXMLExport.cxx | 6 ------
xmloff/source/chart/SchXMLImport.cxx | 7 -------
xmloff/source/transform/TransformerBase.cxx | 14 ++------------
xmloff/source/transform/TransformerBase.hxx | 1 -
7 files changed, 2 insertions(+), 35 deletions(-)
New commits:
commit a976fa5f00a81ff0f006a2da73fded3825e0a7c1
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jul 20 09:26:09 2017 +0200
mxStatusIndicator is unused
ever since
commit 8dc268058690337459bc38862c1532c34f171a48
Author: Björn Milcke <bm at openoffice.org>
Date: Fri Feb 9 15:48:29 2001 +0000
Req. change Load/SaveAs for XML format - removed deprecated CTOR
Change-Id: I772123e89391fea3578c7ed0986e1bc2d2a42a97
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index d2878cfefe4c..18f29baaec63 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -1920,7 +1920,5 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:62
writerfilter::ooxml::AttributeInfo m_nRef Id
xmloff/inc/MultiPropertySetHelper.hxx:78
MultiPropertySetHelper aEmptyAny css::uno::Any
-xmloff/inc/SchXMLExport.hxx:39
- SchXMLExport mxStatusIndicator css::uno::Reference<css::task::XStatusIndicator>
xmloff/source/core/xmlexp.cxx:251
SvXMLExport_Impl maSaveOptions class SvtSaveOptions
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index 8792ea8acfc5..a2a36301a2f7 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star {
class SchXMLExport : public SvXMLExport
{
private:
- css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator;
rtl::Reference<SchXMLAutoStylePoolP> maAutoStylePool;
rtl::Reference<SchXMLExportHelper> maExportHelper;
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 92b53cafbc0d..26f46f8d24b9 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3517,12 +3517,6 @@ SchXMLExport::SchXMLExport(
SchXMLExport::~SchXMLExport()
{
- // stop progress view
- if( mxStatusIndicator.is())
- {
- mxStatusIndicator->end();
- mxStatusIndicator->reset();
- }
}
ErrCode SchXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
commit 1802cfca17e7f12a0666dd884108e5b5a666b36f
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jul 20 09:22:35 2017 +0200
mxStatusIndicator is unused
ever since
commit eaefa688bfff0f73992c84496d4ce89e16ac3550
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 2 22:33:34 2011 +0000
callcatcher: ditch some unused code
Change-Id: Ifca9734ad29257d0d692cf36e709837cbe02af29
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index 6ca50eb6d0f6..d2878cfefe4c 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -1922,7 +1922,5 @@ xmloff/inc/MultiPropertySetHelper.hxx:78
MultiPropertySetHelper aEmptyAny css::uno::Any
xmloff/inc/SchXMLExport.hxx:39
SchXMLExport mxStatusIndicator css::uno::Reference<css::task::XStatusIndicator>
-xmloff/inc/SchXMLImport.hxx:154
- SchXMLImport mxStatusIndicator css::uno::Reference<css::task::XStatusIndicator>
xmloff/source/core/xmlexp.cxx:251
SvXMLExport_Impl maSaveOptions class SvtSaveOptions
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index a1c3f698dca3..4119496c5894 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -151,8 +151,6 @@ enum SchXMLRegEquationAttrMap
class SchXMLImport : public SvXMLImport
{
private:
- css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator;
-
rtl::Reference<SchXMLImportHelper> maImportHelper;
protected:
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 21f9864b0cea..30d1b6506f28 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -503,13 +503,6 @@ SchXMLImport::SchXMLImport(
SchXMLImport::~SchXMLImport() throw ()
{
- // stop progress view
- if( mxStatusIndicator.is())
- {
- mxStatusIndicator->end();
- mxStatusIndicator->reset();
- }
-
uno::Reference< chart2::XChartDocument > xChartDoc( GetModel(), uno::UNO_QUERY );
if( xChartDoc.is() && xChartDoc->hasControllersLocked() )
xChartDoc->unlockControllers();
commit bd5a91f5a3ee9448279e67a50d27d9c6540f0dad
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jul 20 09:16:41 2017 +0200
m_xExtHandler is unused
ever since it was added in
commit eb4b36c6e797e5eda511422c48ff0a210e2cc460
Date: Tue Jul 13 08:00:42 2004 +0000
INTEGRATION: CWS oasis (1.1.2); FILE ADDED
Change-Id: If4375c6e57dbe635f53ca0395cb7bdc02de81b18
diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results
index d9ffd019a6be..6ca50eb6d0f6 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -1926,5 +1926,3 @@ xmloff/inc/SchXMLImport.hxx:154
SchXMLImport mxStatusIndicator css::uno::Reference<css::task::XStatusIndicator>
xmloff/source/core/xmlexp.cxx:251
SvXMLExport_Impl maSaveOptions class SvtSaveOptions
-xmloff/source/transform/TransformerBase.hxx:58
- XMLTransformerBase m_xExtHandler css::uno::Reference<css::xml::sax::XExtendedDocumentHandler>
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index a2fa1aff6cbf..3dafadeb6937 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -360,32 +360,22 @@ void SAL_CALL XMLTransformerBase::setDocumentLocator( const Reference< XLocator
// XExtendedDocumentHandler
void SAL_CALL XMLTransformerBase::startCDATA()
{
- if( m_xExtHandler.is() )
- m_xExtHandler->startCDATA();
}
void SAL_CALL XMLTransformerBase::endCDATA()
{
- if( m_xExtHandler.is() )
- m_xExtHandler->endCDATA();
}
-void SAL_CALL XMLTransformerBase::comment( const OUString& rComment )
+void SAL_CALL XMLTransformerBase::comment( const OUString& /*rComment*/ )
{
- if( m_xExtHandler.is() )
- m_xExtHandler->comment( rComment );
}
void SAL_CALL XMLTransformerBase::allowLineBreak()
{
- if( m_xExtHandler.is() )
- m_xExtHandler->allowLineBreak();
}
-void SAL_CALL XMLTransformerBase::unknown( const OUString& rString )
+void SAL_CALL XMLTransformerBase::unknown( const OUString& /*rString*/ )
{
- if( m_xExtHandler.is() )
- m_xExtHandler->unknown( rString );
}
// XInitialize
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index fed048b84de4..9b9af58a7157 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -55,7 +55,6 @@ class XMLTransformerBase : public XMLTransformer
css::uno::Reference< css::xml::sax::XLocator > m_xLocator;
css::uno::Reference< css::xml::sax::XDocumentHandler > m_xHandler; // the handlers
- css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > m_xExtHandler;
css::uno::Reference< css::beans::XPropertySet > m_xPropSet;
css::uno::Reference< css::i18n::XCharacterClassification > xCharClass;
More information about the Libreoffice-commits
mailing list