summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx2
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.hxx2
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx18
-rw-r--r--writerfilter/source/dmapper/ModelEventListener.cxx4
-rw-r--r--writerfilter/source/dmapper/ModelEventListener.hxx4
-rw-r--r--writerfilter/source/dmapper/PropertyMap.cxx5
-rw-r--r--writerfilter/source/dmapper/PropertyMap.hxx7
-rw-r--r--writerfilter/source/filter/RtfFilter.cxx32
-rw-r--r--writerfilter/source/filter/WriterFilter.cxx32
-rw-r--r--writerfilter/source/filter/WriterFilterDetection.cxx20
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.cxx40
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.hxx117
-rw-r--r--writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx10
-rw-r--r--writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx30
14 files changed, 107 insertions, 216 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f82e45cb8b5b..09da1b3bb345 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2636,7 +2636,7 @@ void DomainMapper_Impl::ChainTextFrames()
}
}
-uno::Reference<beans::XPropertySet> DomainMapper_Impl::FindOrCreateFieldMaster(const sal_Char* pFieldMasterService, const OUString& rFieldMasterName) throw(uno::Exception)
+uno::Reference<beans::XPropertySet> DomainMapper_Impl::FindOrCreateFieldMaster(const sal_Char* pFieldMasterService, const OUString& rFieldMasterName)
{
// query master, create if not available
uno::Reference< text::XTextFieldsSupplier > xFieldsSupplier( GetTextDocument(), uno::UNO_QUERY_THROW );
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 3185840dcb51..cce9d590b463 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -459,7 +459,7 @@ private:
void GetCurrentLocale(css::lang::Locale& rLocale);
void SetNumberFormat(const OUString& rCommand, css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, bool bDetectFormat = false);
/// @throws css::uno::Exception
- css::uno::Reference<css::beans::XPropertySet> FindOrCreateFieldMaster(const sal_Char* pFieldMasterService, const OUString& rFieldMasterName) throw(css::uno::Exception);
+ css::uno::Reference<css::beans::XPropertySet> FindOrCreateFieldMaster(const sal_Char* pFieldMasterService, const OUString& rFieldMasterName);
css::uno::Reference<css::beans::XPropertySet> const & GetDocumentSettings();
std::map<sal_Int32, css::uno::Any> deferredCharacterProperties;
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 41c1166e129c..6307510f1e94 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -81,11 +81,11 @@ class XInputStreamHelper : public cppu::WeakImplHelper<io::XInputStream>
public:
XInputStreamHelper(const sal_uInt8* buf, size_t len);
- virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL available( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL closeInput( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) override;
+ virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) override;
+ virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) override;
+ virtual ::sal_Int32 SAL_CALL available( ) override;
+ virtual void SAL_CALL closeInput( ) override;
};
XInputStreamHelper::XInputStreamHelper(const sal_uInt8* buf, size_t len) :
@@ -100,13 +100,11 @@ XInputStreamHelper::XInputStreamHelper(const sal_uInt8* buf, size_t len) :
}
sal_Int32 XInputStreamHelper::readBytes( uno::Sequence<sal_Int8>& aData, sal_Int32 nBytesToRead )
- throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception)
{
return readSomeBytes( aData, nBytesToRead );
}
sal_Int32 XInputStreamHelper::readSomeBytes( uno::Sequence<sal_Int8>& aData, sal_Int32 nMaxBytesToRead )
- throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception)
{
sal_Int32 nRet = 0;
if( nMaxBytesToRead > 0 )
@@ -136,7 +134,7 @@ sal_Int32 XInputStreamHelper::readSomeBytes( uno::Sequence<sal_Int8>& aData, sal
}
-void XInputStreamHelper::skipBytes( sal_Int32 nBytesToSkip ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception)
+void XInputStreamHelper::skipBytes( sal_Int32 nBytesToSkip )
{
if( nBytesToSkip < 0 || m_nPosition + nBytesToSkip > (m_nLength + m_nHeaderLength))
throw io::BufferSizeExceededException();
@@ -144,13 +142,13 @@ void XInputStreamHelper::skipBytes( sal_Int32 nBytesToSkip ) throw (io::NotConne
}
-sal_Int32 XInputStreamHelper::available( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception)
+sal_Int32 XInputStreamHelper::available( )
{
return ( m_nLength + m_nHeaderLength ) - m_nPosition;
}
-void XInputStreamHelper::closeInput( ) throw (io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception)
+void XInputStreamHelper::closeInput( )
{
}
diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx
index fc8b6b2b2e23..851825e27699 100644
--- a/writerfilter/source/dmapper/ModelEventListener.cxx
+++ b/writerfilter/source/dmapper/ModelEventListener.cxx
@@ -48,7 +48,7 @@ ModelEventListener::~ModelEventListener()
}
-void ModelEventListener::notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException, std::exception)
+void ModelEventListener::notifyEvent( const document::EventObject& rEvent )
{
if ( rEvent.EventName == "OnFocus" && m_bIndexes)
{
@@ -102,7 +102,7 @@ void ModelEventListener::notifyEvent( const document::EventObject& rEvent ) thro
}
-void ModelEventListener::disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception)
+void ModelEventListener::disposing( const lang::EventObject& rEvent )
{
try
{
diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/writerfilter/source/dmapper/ModelEventListener.hxx
index f2396dce2b14..3a5dab834a11 100644
--- a/writerfilter/source/dmapper/ModelEventListener.hxx
+++ b/writerfilter/source/dmapper/ModelEventListener.hxx
@@ -34,8 +34,8 @@ public:
ModelEventListener(bool bIndexes, bool bControls);
virtual ~ModelEventListener() override;
- virtual void SAL_CALL notifyEvent(const css::document::EventObject& Event) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL notifyEvent(const css::document::EventObject& Event) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override;
};
}//namespace writerfilter
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index cea2dc473a8d..7cba5a1a3a8a 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1105,11 +1105,6 @@ bool SectionPropertyMap::FloatingTableConversion(FloatingTableInfo& rInfo)
}
void SectionPropertyMap::InheritOrFinalizePageStyles( DomainMapper_Impl& rDM_Impl )
-throw ( css::beans::UnknownPropertyException,
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception )
{
const uno::Reference< container::XNameContainer >& xPageStyles = rDM_Impl.GetPageStyles();
const uno::Reference < lang::XMultiServiceFactory >& xTextFactory = rDM_Impl.GetTextFactory();
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 6ab6b4b8285c..7e6a1365bcab 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -294,12 +294,7 @@ public:
/// @throws css::lang::IllegalArgumentException
/// @throws css::lang::WrappedTargetException
/// @throws css::uno::RuntimeException
- void InheritOrFinalizePageStyles( DomainMapper_Impl& rDM_Impl )
- throw ( css::beans::UnknownPropertyException,
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception);
+ void InheritOrFinalizePageStyles( DomainMapper_Impl& rDM_Impl );
void SetBorder(BorderPosition ePos, sal_Int32 nLineDistance, const css::table::BorderLine2& rBorderLine, bool bShadow);
void SetBorderParams( sal_Int32 nSet ) { m_nBorderParams = nSet; }
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index ad7ed9a8d847..a148a2ff32f6 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -55,22 +55,22 @@ public:
explicit RtfFilter(const uno::Reference<uno::XComponentContext>& xContext);
// XFilter
- sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception) override;
- void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) override;
+ void SAL_CALL cancel() override;
// XImporter
- void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+ void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) override;
// XExporter
- void SAL_CALL setSourceDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+ void SAL_CALL setSourceDocument(const uno::Reference<lang::XComponent>& xDoc) override;
// XInitialization
- void SAL_CALL initialize(const uno::Sequence<uno::Any>& rArguments) throw (uno::Exception, uno::RuntimeException, std::exception) override;
+ void SAL_CALL initialize(const uno::Sequence<uno::Any>& rArguments) override;
// XServiceInfo
- OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (uno::RuntimeException, std::exception) override;
- uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
};
@@ -79,7 +79,7 @@ RtfFilter::RtfFilter(const uno::Reference< uno::XComponentContext >& rxContext)
{
}
-sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor) throw(uno::RuntimeException, std::exception)
+sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor)
{
sal_uInt32 nStartTime = osl_getGlobalTimer();
if (m_xSrcDoc.is())
@@ -162,37 +162,37 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescrip
return bResult;
}
-void RtfFilter::cancel() throw(uno::RuntimeException, std::exception)
+void RtfFilter::cancel()
{
}
-void RtfFilter::setSourceDocument(const uno::Reference< lang::XComponent >& xDoc) throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void RtfFilter::setSourceDocument(const uno::Reference< lang::XComponent >& xDoc)
{
m_xSrcDoc = xDoc;
}
-void RtfFilter::setTargetDocument(const uno::Reference< lang::XComponent >& xDoc) throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void RtfFilter::setTargetDocument(const uno::Reference< lang::XComponent >& xDoc)
{
m_xDstDoc = xDoc;
}
-void RtfFilter::initialize(const uno::Sequence< uno::Any >& /*aArguments*/) throw(uno::Exception, uno::RuntimeException, std::exception)
+void RtfFilter::initialize(const uno::Sequence< uno::Any >& /*aArguments*/)
{
// The DOCX exporter here extracts 'type' of the filter, ie 'Word' or
// 'Word Template' but we don't need it for RTF.
}
-OUString RtfFilter::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString RtfFilter::getImplementationName()
{
return OUString("com.sun.star.comp.Writer.RtfFilter");
}
-sal_Bool RtfFilter::supportsService(const OUString& rServiceName) throw(uno::RuntimeException, std::exception)
+sal_Bool RtfFilter::supportsService(const OUString& rServiceName)
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence<OUString> RtfFilter::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+uno::Sequence<OUString> RtfFilter::getSupportedServiceNames()
{
uno::Sequence<OUString> aRet =
{
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index e247000158f3..a940046d36ad 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -100,29 +100,29 @@ public:
{}
// XFilter
- sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception) override;
- void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) override;
+ sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) override;
+ void SAL_CALL cancel() override;
// XImporter
- void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+ void SAL_CALL setTargetDocument(const uno::Reference<lang::XComponent>& xDoc) override;
// XExporter
- void SAL_CALL setSourceDocument(const uno::Reference<lang::XComponent>& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override;
+ void SAL_CALL setSourceDocument(const uno::Reference<lang::XComponent>& xDoc) override;
// XInitialization
- void SAL_CALL initialize(const uno::Sequence<uno::Any>& rArguments) throw (uno::Exception, uno::RuntimeException, std::exception) override;
+ void SAL_CALL initialize(const uno::Sequence<uno::Any>& rArguments) override;
// XServiceInfo
- OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override;
- uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override;
+ uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
void putPropertiesToDocumentGrabBag(const comphelper::SequenceAsHashMap& rProperties);
};
-sal_Bool WriterFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor) throw (uno::RuntimeException, std::exception)
+sal_Bool WriterFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor)
{
if (m_xSrcDoc.is())
{
@@ -263,11 +263,11 @@ sal_Bool WriterFilter::filter(const uno::Sequence< beans::PropertyValue >& aDesc
}
-void WriterFilter::cancel() throw (uno::RuntimeException, std::exception)
+void WriterFilter::cancel()
{
}
-void WriterFilter::setTargetDocument(const uno::Reference< lang::XComponent >& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void WriterFilter::setTargetDocument(const uno::Reference< lang::XComponent >& xDoc)
{
m_xDstDoc = xDoc;
@@ -301,28 +301,28 @@ void WriterFilter::setTargetDocument(const uno::Reference< lang::XComponent >& x
xSettings->setPropertyValue("DoNotCaptureDrawObjsOnPage", uno::makeAny(true));
}
-void WriterFilter::setSourceDocument(const uno::Reference< lang::XComponent >& xDoc) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
+void WriterFilter::setSourceDocument(const uno::Reference< lang::XComponent >& xDoc)
{
m_xSrcDoc = xDoc;
}
-void WriterFilter::initialize(const uno::Sequence< uno::Any >& /*rArguments*/) throw (uno::Exception, uno::RuntimeException, std::exception)
+void WriterFilter::initialize(const uno::Sequence< uno::Any >& /*rArguments*/)
{
}
-OUString WriterFilter::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString WriterFilter::getImplementationName()
{
return OUString("com.sun.star.comp.Writer.WriterFilter");
}
-sal_Bool WriterFilter::supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception)
+sal_Bool WriterFilter::supportsService(const OUString& rServiceName)
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence<OUString> WriterFilter::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence<OUString> WriterFilter::getSupportedServiceNames()
{
uno::Sequence<OUString> aRet =
{
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
index 3202721ded5a..83f6024ebb0d 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -37,20 +37,20 @@ public:
explicit WriterFilterDetection();
//XExtendedFilterDetection
- OUString SAL_CALL detect(uno::Sequence<beans::PropertyValue>& Descriptor) throw (uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL detect(uno::Sequence<beans::PropertyValue>& Descriptor) override;
// XServiceInfo
- OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) override;
- sal_Bool SAL_CALL supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception) override;
- uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) override;
+ OUString SAL_CALL getImplementationName() override;
+ sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override;
+ uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
};
/// @throws uno::RuntimeException
-uno::Sequence<OUString> SAL_CALL WriterFilterDetection_getSupportedServiceNames() throw (uno::RuntimeException);
+uno::Sequence<OUString> SAL_CALL WriterFilterDetection_getSupportedServiceNames();
WriterFilterDetection::WriterFilterDetection() = default;
-OUString WriterFilterDetection::detect(uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception)
+OUString WriterFilterDetection::detect(uno::Sequence<beans::PropertyValue>& rDescriptor)
{
OUString sTypeName;
bool bWord = false;
@@ -102,7 +102,7 @@ OUString WriterFilterDetection::detect(uno::Sequence<beans::PropertyValue>& rDes
return sTypeName;
}
-uno::Sequence<OUString> WriterFilterDetection_getSupportedServiceNames() throw (uno::RuntimeException)
+uno::Sequence<OUString> WriterFilterDetection_getSupportedServiceNames()
{
uno::Sequence<OUString> aRet =
{
@@ -111,17 +111,17 @@ uno::Sequence<OUString> WriterFilterDetection_getSupportedServiceNames() throw (
return aRet;
}
-OUString WriterFilterDetection::getImplementationName() throw (uno::RuntimeException, std::exception)
+OUString WriterFilterDetection::getImplementationName()
{
return OUString("com.sun.star.comp.Writer.WriterFilterDetector");
}
-sal_Bool WriterFilterDetection::supportsService(const OUString& rServiceName) throw (uno::RuntimeException, std::exception)
+sal_Bool WriterFilterDetection::supportsService(const OUString& rServiceName)
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence<OUString> WriterFilterDetection::getSupportedServiceNames() throw (uno::RuntimeException, std::exception)
+uno::Sequence<OUString> WriterFilterDetection::getSupportedServiceNames()
{
return WriterFilterDetection_getSupportedServiceNames();
}
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 7cee46482905..802d577a6f5c 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -157,7 +157,6 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t nElement, const uno::Ref
void SAL_CALL OOXMLFastContextHandler::startFastElement
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (oox::getNamespace(Element) == static_cast<sal_Int32>(NMSP_mce))
m_bDiscardChildren = prepareMceContext(Element, Attribs);
@@ -172,12 +171,10 @@ void SAL_CALL OOXMLFastContextHandler::startFastElement
void SAL_CALL OOXMLFastContextHandler::startUnknownElement
(const OUString & /*Namespace*/, const OUString & /*Name*/,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
}
void SAL_CALL OOXMLFastContextHandler::endFastElement(Token_t Element)
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (Element == (NMSP_mce | XML_Choice) || Element == (NMSP_mce | XML_Fallback))
m_bDiscardChildren = false;
@@ -195,7 +192,6 @@ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
void OOXMLFastContextHandler::lcl_startFastElement
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
OOXMLFactory::startAction(this, Element);
if( Element == (NMSP_dmlWordDr|XML_positionV) )
@@ -207,14 +203,12 @@ void OOXMLFastContextHandler::lcl_startFastElement
void OOXMLFastContextHandler::lcl_endFastElement
(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
OOXMLFactory::endAction(this, Element);
}
void SAL_CALL OOXMLFastContextHandler::endUnknownElement
(const OUString & , const OUString & )
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
}
@@ -222,7 +216,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
OOXMLFastContextHandler::createFastChildContext
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference< xml::sax::XFastContextHandler > xResult;
if (oox::getNamespace(Element) != NMSP_mce && !m_bDiscardChildren)
@@ -237,7 +230,6 @@ uno::Reference< xml::sax::XFastContextHandler >
OOXMLFastContextHandler::lcl_createFastChildContext
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
return OOXMLFactory::createFastChildContext(this, Element);
}
@@ -247,7 +239,6 @@ OOXMLFastContextHandler::createUnknownChildContext
(const OUString &,
const OUString &,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
return uno::Reference< xml::sax::XFastContextHandler >
(new OOXMLFastContextHandler(*const_cast<const OOXMLFastContextHandler *>(this)));
@@ -255,14 +246,12 @@ OOXMLFastContextHandler::createUnknownChildContext
void SAL_CALL OOXMLFastContextHandler::characters
(const OUString & aChars)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
lcl_characters(aChars);
}
void OOXMLFastContextHandler::lcl_characters
(const OUString & rString)
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (!m_bDiscardChildren)
OOXMLFactory::characters(this, rString);
@@ -280,7 +269,6 @@ OOXMLValue::Pointer_t OOXMLFastContextHandler::getValue() const
void OOXMLFastContextHandler::attributes
(const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException)
{
OOXMLFactory::attributes(this, Attribs);
}
@@ -935,7 +923,6 @@ OOXMLFastContextHandlerProperties::~OOXMLFastContextHandlerProperties()
void OOXMLFastContextHandlerProperties::lcl_endFastElement
(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
try
{
@@ -1104,7 +1091,6 @@ OOXMLFastContextHandlerPropertyTable::~OOXMLFastContextHandlerPropertyTable()
void OOXMLFastContextHandlerPropertyTable::lcl_endFastElement
(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
OOXMLPropertySet::Pointer_t pPropSet(mpPropertySet->clone());
OOXMLTable::ValuePointer_t pTmpVal
@@ -1145,7 +1131,6 @@ OOXMLValue::Pointer_t OOXMLFastContextHandlerValue::getValue() const
void OOXMLFastContextHandlerValue::lcl_endFastElement
(Token_t Element)
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
sendPropertyToParent();
@@ -1205,7 +1190,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
OOXMLFastContextHandlerTable::createFastChildContext
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
addCurrentChild();
@@ -1216,7 +1200,6 @@ OOXMLFastContextHandlerTable::createFastChildContext
void OOXMLFastContextHandlerTable::lcl_endFastElement
(Token_t /*Element*/)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
addCurrentChild();
@@ -1262,7 +1245,6 @@ OOXMLFastContextHandlerXNote::~OOXMLFastContextHandlerXNote()
void OOXMLFastContextHandlerXNote::lcl_startFastElement
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
mbForwardEventsSaved = isForwardEvents();
@@ -1277,7 +1259,6 @@ void OOXMLFastContextHandlerXNote::lcl_startFastElement
void OOXMLFastContextHandlerXNote::lcl_endFastElement
(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
endAction(Element);
@@ -1515,7 +1496,6 @@ OOXMLFastContextHandlerTextTable::~OOXMLFastContextHandlerTextTable()
void OOXMLFastContextHandlerTextTable::lcl_startFastElement
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
mpParserState->startTable();
mnTableDepth++;
@@ -1534,7 +1514,6 @@ void OOXMLFastContextHandlerTextTable::lcl_startFastElement
void OOXMLFastContextHandlerTextTable::lcl_endFastElement
(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
endAction(Element);
@@ -1586,7 +1565,6 @@ OOXMLFastContextHandlerShape::~OOXMLFastContextHandlerShape()
void OOXMLFastContextHandlerShape::lcl_startFastElement
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
startAction(Element);
@@ -1600,7 +1578,6 @@ void SAL_CALL OOXMLFastContextHandlerShape::startUnknownElement
(const OUString & Namespace,
const OUString & Name,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (mrShapeContext.is())
mrShapeContext->startUnknownElement(Namespace, Name, Attribs);
@@ -1642,7 +1619,6 @@ void OOXMLFastContextHandlerShape::sendShape( Token_t Element )
void OOXMLFastContextHandlerShape::lcl_endFastElement
(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (mrShapeContext.is())
{
@@ -1661,7 +1637,6 @@ void OOXMLFastContextHandlerShape::lcl_endFastElement
void SAL_CALL OOXMLFastContextHandlerShape::endUnknownElement
(const OUString & Namespace,
const OUString & Name)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (mrShapeContext.is())
mrShapeContext->endUnknownElement(Namespace, Name);
@@ -1671,7 +1646,6 @@ uno::Reference< xml::sax::XFastContextHandler >
OOXMLFastContextHandlerShape::lcl_createFastChildContext
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference< xml::sax::XFastContextHandler > xContextHandler;
@@ -1730,7 +1704,6 @@ OOXMLFastContextHandlerShape::createUnknownChildContext
(const OUString & Namespace,
const OUString & Name,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference< xml::sax::XFastContextHandler > xResult;
@@ -1743,7 +1716,6 @@ OOXMLFastContextHandlerShape::createUnknownChildContext
void OOXMLFastContextHandlerShape::lcl_characters
(const OUString & aChars)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (mrShapeContext.is())
mrShapeContext->characters(aChars);
@@ -1771,7 +1743,6 @@ void SAL_CALL OOXMLFastContextHandlerWrapper::startUnknownElement
(const OUString & Namespace,
const OUString & Name,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (mxContext.is())
mxContext->startUnknownElement(Namespace, Name, Attribs);
@@ -1780,7 +1751,6 @@ void SAL_CALL OOXMLFastContextHandlerWrapper::startUnknownElement
void SAL_CALL OOXMLFastContextHandlerWrapper::endUnknownElement
(const OUString & Namespace,
const OUString & Name)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (mxContext.is())
mxContext->endUnknownElement(Namespace, Name);
@@ -1791,7 +1761,6 @@ OOXMLFastContextHandlerWrapper::createUnknownChildContext
(const OUString & Namespace,
const OUString & Name,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference< xml::sax::XFastContextHandler > xResult;
@@ -1806,7 +1775,6 @@ OOXMLFastContextHandlerWrapper::createUnknownChildContext
void OOXMLFastContextHandlerWrapper::attributes
(const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
-throw (uno::RuntimeException, xml::sax::SAXException)
{
if (mxContext.is())
{
@@ -1835,7 +1803,6 @@ void OOXMLFastContextHandlerWrapper::addToken( Token_t Token )
void OOXMLFastContextHandlerWrapper::lcl_startFastElement
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (mxContext.is())
mxContext->startFastElement(Element, Attribs);
@@ -1843,7 +1810,6 @@ void OOXMLFastContextHandlerWrapper::lcl_startFastElement
void OOXMLFastContextHandlerWrapper::lcl_endFastElement
(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (mxContext.is())
mxContext->endFastElement(Element);
@@ -1853,7 +1819,6 @@ uno::Reference< xml::sax::XFastContextHandler >
OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference< xml::sax::XFastContextHandler > xResult;
@@ -1890,7 +1855,6 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
void OOXMLFastContextHandlerWrapper::lcl_characters
(const OUString & aChars)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if (mxContext.is())
mxContext->characters(aChars);
@@ -2025,14 +1989,12 @@ OOXMLFastContextHandlerLinear::OOXMLFastContextHandlerLinear(OOXMLFastContextHan
void OOXMLFastContextHandlerLinear::lcl_startFastElement(Token_t Element,
const uno::Reference< xml::sax::XFastAttributeList >& Attribs)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
buffer.appendOpeningTag( Element, Attribs );
++depthCount;
}
void OOXMLFastContextHandlerLinear::lcl_endFastElement(Token_t Element)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
buffer.appendClosingTag( Element );
if( --depthCount == 0 )
@@ -2042,7 +2004,6 @@ void OOXMLFastContextHandlerLinear::lcl_endFastElement(Token_t Element)
uno::Reference< xml::sax::XFastContextHandler >
OOXMLFastContextHandlerLinear::lcl_createFastChildContext(Token_t,
const uno::Reference< xml::sax::XFastAttributeList >&)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference< xml::sax::XFastContextHandler > xContextHandler;
xContextHandler.set( this );
@@ -2050,7 +2011,6 @@ OOXMLFastContextHandlerLinear::lcl_createFastChildContext(Token_t,
}
void OOXMLFastContextHandlerLinear::lcl_characters(const OUString& aChars)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
buffer.appendCharacters( aChars );
}
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index f3b70b1fbe11..f1786c6f0471 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -51,28 +51,21 @@ public:
virtual ~OOXMLFastContextHandler() override;
// css::xml::sax::XFastContextHandler:
- virtual void SAL_CALL startFastElement (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL startFastElement (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList >& Attribs) override;
- virtual void SAL_CALL startUnknownElement(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL startUnknownElement(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void SAL_CALL endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL endFastElement(Token_t Element) override;
- virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name) override;
virtual css::uno::Reference<css::xml::sax::XFastContextHandler> SAL_CALL createFastChildContext(Token_t Element,
- const css::uno::Reference<css::xml::sax::XFastAttributeList>& Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const css::uno::Reference<css::xml::sax::XFastAttributeList>& Attribs) override;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext(const OUString & Namespace, const OUString & Name,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void SAL_CALL characters(const OUString & aChars)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL characters(const OUString & aChars) override;
// local
@@ -98,7 +91,7 @@ public:
/// @throws css::uno::RuntimeException
/// @throws css::xml::sax::SAXException
- virtual void attributes(const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) throw (css::uno::RuntimeException, css::xml::sax::SAXException);
+ virtual void attributes(const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs);
virtual void newProperty(Id aId, const OOXMLValue::Pointer_t& pVal);
virtual void setPropertySet(const OOXMLPropertySet::Pointer_t& pPropertySet);
@@ -211,23 +204,19 @@ protected:
/// @throws css::uno::RuntimeException
/// @throws css::xml::sax::SAXException
- virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception);
+ virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs);
/// @throws css::uno::RuntimeException
/// @throws css::xml::sax::SAXException
- virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception);
+ virtual void lcl_endFastElement(Token_t Element);
/// @throws css::uno::RuntimeException
/// @throws css::xml::sax::SAXException
- virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception);
+ virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs);
/// @throws css::uno::RuntimeException
/// @throws css::xml::sax::SAXException
- virtual void lcl_characters(const OUString & aChars)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception);
+ virtual void lcl_characters(const OUString & aChars);
void startAction(Token_t Element);
void endAction(Token_t Element);
@@ -297,8 +286,7 @@ protected:
/// the properties
OOXMLPropertySet::Pointer_t mpPropertySet;
- virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_endFastElement(Token_t Element) override;
virtual void setParent(OOXMLFastContextHandler * pParent) override;
private:
@@ -316,8 +304,7 @@ public:
protected:
OOXMLTable mTable;
- virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_endFastElement(Token_t Element) override;
};
class OOXMLFastContextHandlerValue :
@@ -330,8 +317,7 @@ public:
void setValue(const OOXMLValue::Pointer_t& pValue);
virtual OOXMLValue::Pointer_t getValue() const override;
- virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_endFastElement(Token_t Element) override;
virtual std::string getType() const override { return "Value"; }
@@ -351,16 +337,14 @@ public:
virtual ~OOXMLFastContextHandlerTable() override;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext (Token_t Element,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
protected:
OOXMLTable mTable;
css::uno::Reference<css::xml::sax::XFastContextHandler> mCurrentChild;
- virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_endFastElement(Token_t Element) override;
virtual ResourceEnum_t getResource() const override { return TABLE; }
@@ -386,11 +370,9 @@ private:
sal_Int32 mnMyXNoteId;
sal_Int32 mnMyXNoteType;
- virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_endFastElement(Token_t Element) override;
virtual ResourceEnum_t getResource() const override { return STREAM; }
};
@@ -433,11 +415,9 @@ public:
virtual std::string getType() const override { return "TextTable"; }
protected:
- virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_endFastElement(Token_t Element) override;
};
class OOXMLFastContextHandlerShape: public OOXMLFastContextHandlerProperties
@@ -453,15 +433,12 @@ public:
virtual std::string getType() const override { return "Shape"; }
// css::xml::sax::XFastContextHandler:
- virtual void SAL_CALL startUnknownElement (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL startUnknownElement (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name) override;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext(const OUString & Namespace, const OUString & Name,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
virtual void setToken(Token_t nToken) override;
@@ -473,17 +450,13 @@ public:
protected:
css::uno::Reference<css::xml::sax::XFastShapeContextHandler> mrShapeContext;
- virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_endFastElement(Token_t Element) override;
- virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext (Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void lcl_characters(const OUString & aChars)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_characters(const OUString & aChars) override;
};
@@ -500,18 +473,14 @@ public:
virtual ~OOXMLFastContextHandlerWrapper() override;
// css::xml::sax::XFastContextHandler:
- virtual void SAL_CALL startUnknownElement(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL startUnknownElement(const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL endUnknownElement(const OUString & Namespace, const OUString & Name) override;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext (const OUString & Namespace, const OUString & Name,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void attributes(const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException) override;
+ virtual void attributes(const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
virtual ResourceEnum_t getResource() const override;
@@ -525,17 +494,13 @@ public:
virtual std::string getType() const override;
protected:
- virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void lcl_endFastElement(Token_t Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_endFastElement(Token_t Element) override;
- virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void lcl_characters(const OUString & aChars)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_characters(const OUString & aChars) override;
virtual void setId(Id nId) override;
virtual Id getId() const override;
@@ -584,16 +549,14 @@ protected:
*/
virtual void process() = 0;
- virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_startFastElement(Token_t Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void lcl_endFastElement(Token_t Element) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_endFastElement(Token_t Element) override;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > lcl_createFastChildContext(Token_t Element,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
- virtual void lcl_characters(const OUString & aChars) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void lcl_characters(const OUString & aChars) override;
// should be private, but not much point in making deep copies of it
oox::formulaimport::XmlStreamBuilder buffer;
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index 89287f140412..f7092dfc6761 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -51,7 +51,6 @@ void SAL_CALL OOXMLFastDocumentHandler::startFastElement
Element
#endif
, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
#ifdef DEBUG_WRITERFILTER
clog << this << ":start element:"
@@ -71,7 +70,6 @@ Name
#endif
,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
#ifdef DEBUG_WRITERFILTER
clog << this << ":start unknown element:"
@@ -87,7 +85,6 @@ void SAL_CALL OOXMLFastDocumentHandler::endFastElement(::sal_Int32
Element
#endif
)
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
#ifdef DEBUG_WRITERFILTER
clog << this << ":end element:"
@@ -106,7 +103,6 @@ Namespace
Name
#endif
)
-throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
#ifdef DEBUG_WRITERFILTER
clog << this << ":end unknown element:"
@@ -136,7 +132,6 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
OOXMLFastDocumentHandler::createFastChildContext
(::sal_Int32 Element,
const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
if ( mpStream == nullptr && mpDocument == nullptr )
{
@@ -160,7 +155,6 @@ Namespace
Name
#endif
, const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
#ifdef DEBUG_WRITERFILTER
clog << this << ":createUnknownChildContext:"
@@ -175,24 +169,20 @@ Name
}
void SAL_CALL OOXMLFastDocumentHandler::characters(const OUString & /*aChars*/)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
}
// css::xml::sax::XFastDocumentHandler:
void SAL_CALL OOXMLFastDocumentHandler::startDocument()
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
}
void SAL_CALL OOXMLFastDocumentHandler::endDocument()
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
}
void SAL_CALL OOXMLFastDocumentHandler::setDocumentLocator
(const uno::Reference< xml::sax::XLocator > & /*xLocator*/)
- throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
}
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index a473c55b31d7..c47bb96ad18a 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -45,43 +45,33 @@ public:
virtual ~OOXMLFastDocumentHandler() override;
// css::xml::sax::XFastDocumentHandler:
- virtual void SAL_CALL startDocument()
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
- virtual void SAL_CALL endDocument()
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ virtual void SAL_CALL startDocument() override;
+ virtual void SAL_CALL endDocument() override;
virtual void SAL_CALL setDocumentLocator
- (const css::uno::Reference< css::xml::sax::XLocator > & xLocator)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ (const css::uno::Reference< css::xml::sax::XLocator > & xLocator) override;
// css::xml::sax::XFastContextHandler:
virtual void SAL_CALL startFastElement
(::sal_Int32 Element,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
virtual void SAL_CALL startUnknownElement
(const OUString & Namespace,
const OUString & Name,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
- virtual void SAL_CALL endFastElement(::sal_Int32 Element)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
+ virtual void SAL_CALL endFastElement(::sal_Int32 Element) override;
virtual void SAL_CALL endUnknownElement
(const OUString & Namespace,
- const OUString & Name)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const OUString & Name) override;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext
(::sal_Int32 Element,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createUnknownChildContext
(const OUString & Namespace,
const OUString & Name,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
- virtual void SAL_CALL characters(const OUString & aChars)
- throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override;
+ const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) override;
+ virtual void SAL_CALL characters(const OUString & aChars) override;
void setIsSubstream( bool bSubstream );
generated by cgit (git 2.34.1) at 2024-08-14 18:54:47 +0000