diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-09-11 14:25:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-09-11 19:21:10 +0200 |
| commit | d30f9c74201880b62c51dc8c456a59a89b70d7da (patch) | |
| tree | f44c5db14f282868992c19e53e318eec0d83ca12 /chart2 | |
| parent | 0867f7f3a955549079722d61e0c13e233e0af150 (diff) | |
remove dead m_bCancelOperation flag from XMLFilter
has always been ignored
Change-Id: I272ca7026ddf25fbc679e7933ea23986466ad70b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156822
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/model/filter/XMLFilter.cxx | 14 | ||||
| -rw-r--r-- | chart2/source/model/inc/XMLFilter.hxx | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 6eccb22be375..f430e3e48851 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -186,8 +186,7 @@ namespace chart { XMLFilter::XMLFilter( Reference< uno::XComponentContext > const & xContext ) : - m_xContext( xContext ), - m_bCancelOperation( false ) + m_xContext( xContext ) {} XMLFilter::~XMLFilter() @@ -201,11 +200,6 @@ sal_Bool SAL_CALL XMLFilter::filter( MutexGuard aGuard( m_aMutex ); - // ignore cancel flag at start of function - // note: is currently ignored during import/export - if( m_bCancelOperation ) - m_bCancelOperation = false; - if( m_xSourceDoc.is()) { OSL_ENSURE( ! m_xTargetDoc.is(), "source doc is set -> target document should not be set" ); @@ -235,12 +229,6 @@ sal_Bool SAL_CALL XMLFilter::filter( void SAL_CALL XMLFilter::cancel() { - // if mutex is locked set "cancel state" - // note: is currently ignored in filter-method - if( ! m_aMutex.tryToAcquire()) - { - m_bCancelOperation = true; - } } // ____ XImporter ____ diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index c26587c3ebad..12c28ad40e79 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -123,8 +123,6 @@ private: css::uno::Sequence<css::beans::PropertyValue> m_aMediaDescriptor; OUString m_sDocumentHandler; // when set it will be set as doc handler - - volatile bool m_bCancelOperation; ::osl::Mutex m_aMutex; }; |