diff options
Diffstat (limited to 'framework/source/fwe/xml')
-rw-r--r-- | framework/source/fwe/xml/menuconfiguration.cxx | 2 | ||||
-rw-r--r-- | framework/source/fwe/xml/menudocumenthandler.cxx | 25 | ||||
-rw-r--r-- | framework/source/fwe/xml/saxnamespacefilter.cxx | 8 | ||||
-rw-r--r-- | framework/source/fwe/xml/statusbardocumenthandler.cxx | 12 | ||||
-rw-r--r-- | framework/source/fwe/xml/toolboxdocumenthandler.cxx | 21 | ||||
-rw-r--r-- | framework/source/fwe/xml/xmlnamespaces.cxx | 8 |
6 files changed, 9 insertions, 67 deletions
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index fcda2ed2f1d4..9ed762ce2d59 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -54,7 +54,6 @@ MenuConfiguration::~MenuConfiguration() Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML( Reference< XInputStream >& rInputStream ) - throw (WrappedTargetException, RuntimeException) { Reference< XParser > xParser = Parser::create( m_xContext ); @@ -102,7 +101,6 @@ Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML( void MenuConfiguration::StoreMenuBarConfigurationToXML( Reference< XIndexAccess >& rMenuBarConfiguration, Reference< XOutputStream >& rOutputStream, bool bIsMenuBar ) - throw (WrappedTargetException, RuntimeException) { Reference< XWriter > xWriter = Writer::create(m_xContext); xWriter->setOutputStream( rOutputStream ); diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 759244db6c54..485717088a00 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -163,19 +163,16 @@ ReadMenuDocumentHandlerBase::~ReadMenuDocumentHandlerBase() void SAL_CALL ReadMenuDocumentHandlerBase::ignorableWhitespace( const OUString& ) -throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL ReadMenuDocumentHandlerBase::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) -throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL ReadMenuDocumentHandlerBase::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException, std::exception ) { m_xLocator = xLocator; } @@ -226,12 +223,10 @@ OReadMenuDocumentHandler::~OReadMenuDocumentHandler() } void SAL_CALL OReadMenuDocumentHandler::startDocument() - throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuDocumentHandler::endDocument() - throw( SAXException, RuntimeException, std::exception ) { if ( m_nElementDepth > 0 ) { @@ -243,7 +238,6 @@ void SAL_CALL OReadMenuDocumentHandler::endDocument() void SAL_CALL OReadMenuDocumentHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException, std::exception ) { if ( m_eReaderMode != ReaderMode::None ) { @@ -268,12 +262,10 @@ throw( SAXException, RuntimeException, std::exception ) } void SAL_CALL OReadMenuDocumentHandler::characters(const OUString&) -throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException, std::exception ) { if ( m_eReaderMode != ReaderMode::None ) { @@ -315,18 +307,15 @@ OReadMenuBarHandler::~OReadMenuBarHandler() } void SAL_CALL OReadMenuBarHandler::startDocument() - throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuBarHandler::endDocument() - throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuBarHandler::startElement( const OUString& rName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException, std::exception ) { if ( m_bMenuMode ) { @@ -413,12 +402,10 @@ throw( SAXException, RuntimeException, std::exception ) } void SAL_CALL OReadMenuBarHandler::characters(const OUString&) -throw( SAXException, RuntimeException, std::exception ) { } void OReadMenuBarHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException, std::exception ) { if ( m_bMenuMode ) { @@ -455,18 +442,15 @@ OReadMenuHandler::~OReadMenuHandler() } void SAL_CALL OReadMenuHandler::startDocument() - throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuHandler::endDocument() - throw( SAXException, RuntimeException, std::exception) { } void SAL_CALL OReadMenuHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException, std::exception ) { if ( m_bMenuPopupMode ) { @@ -489,12 +473,10 @@ throw( SAXException, RuntimeException, std::exception ) } void SAL_CALL OReadMenuHandler::characters(const OUString&) -throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException, std::exception ) { if ( m_bMenuPopupMode ) { @@ -533,18 +515,15 @@ OReadMenuPopupHandler::~OReadMenuPopupHandler() } void SAL_CALL OReadMenuPopupHandler::startDocument() - throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuPopupHandler::endDocument() - throw( SAXException, RuntimeException, std::exception) { } void SAL_CALL OReadMenuPopupHandler::startElement( const OUString& rName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException, std::exception ) { ++m_nElementDepth; @@ -682,12 +661,10 @@ throw( SAXException, RuntimeException, std::exception ) } void SAL_CALL OReadMenuPopupHandler::characters(const OUString&) -throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException, std::exception ) { --m_nElementDepth; if ( m_bMenuMode ) @@ -752,7 +729,6 @@ OWriteMenuDocumentHandler::~OWriteMenuDocumentHandler() } void OWriteMenuDocumentHandler::WriteMenuDocument() -throw ( SAXException, RuntimeException ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; Reference< XAttributeList > rList( static_cast<XAttributeList *>(pList) , UNO_QUERY ); @@ -793,7 +769,6 @@ throw ( SAXException, RuntimeException ) } void OWriteMenuDocumentHandler::WriteMenu( const Reference< XIndexAccess >& rMenuContainer ) -throw ( SAXException, RuntimeException ) { sal_Int32 nItemCount = rMenuContainer->getCount(); bool bSeparator = false; diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx index 4e4b1bf122b7..f2f8169b3258 100644 --- a/framework/source/fwe/xml/saxnamespacefilter.cxx +++ b/framework/source/fwe/xml/saxnamespacefilter.cxx @@ -49,18 +49,15 @@ SaxNamespaceFilter::~SaxNamespaceFilter() // XDocumentHandler void SAL_CALL SaxNamespaceFilter::startDocument() - throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL SaxNamespaceFilter::endDocument() - throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL SaxNamespaceFilter::startElement( const OUString& rName, const Reference< XAttributeList > &xAttribs ) - throw( SAXException, RuntimeException, std::exception ) { XMLNamespaces aXMLNamespaces; if ( !m_aNamespaceStack.empty() ) @@ -119,7 +116,6 @@ void SAL_CALL SaxNamespaceFilter::startElement( } void SAL_CALL SaxNamespaceFilter::endElement(const OUString& aName) - throw( SAXException, RuntimeException, std::exception ) { XMLNamespaces& aXMLNamespaces = m_aNamespaceStack.top(); OUString aNamespaceElementName; @@ -139,27 +135,23 @@ void SAL_CALL SaxNamespaceFilter::endElement(const OUString& aName) } void SAL_CALL SaxNamespaceFilter::characters(const OUString& aChars) - throw( SAXException, RuntimeException, std::exception ) { xDocumentHandler->characters( aChars ); } void SAL_CALL SaxNamespaceFilter::ignorableWhitespace(const OUString& aWhitespaces) - throw( SAXException, RuntimeException, std::exception ) { xDocumentHandler->ignorableWhitespace( aWhitespaces ); } void SAL_CALL SaxNamespaceFilter::processingInstruction( const OUString& aTarget, const OUString& aData) - throw( SAXException, RuntimeException, std::exception ) { xDocumentHandler->processingInstruction( aTarget, aData ); } void SAL_CALL SaxNamespaceFilter::setDocumentLocator( const Reference< XLocator > &xLocator) - throw( SAXException, RuntimeException, std::exception ) { m_xLocator = xLocator; xDocumentHandler->setDocumentLocator( xLocator ); diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index 4d7e66a06ca8..190877c78546 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -179,12 +179,10 @@ OReadStatusBarDocumentHandler::~OReadStatusBarDocumentHandler() // XDocumentHandler void SAL_CALL OReadStatusBarDocumentHandler::startDocument() -throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadStatusBarDocumentHandler::endDocument() -throw( SAXException, RuntimeException, std::exception ) { SolarMutexGuard g; @@ -198,7 +196,6 @@ throw( SAXException, RuntimeException, std::exception ) void SAL_CALL OReadStatusBarDocumentHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttribs ) -throw( SAXException, RuntimeException, std::exception ) { SolarMutexGuard g; @@ -397,7 +394,6 @@ throw( SAXException, RuntimeException, std::exception ) } void SAL_CALL OReadStatusBarDocumentHandler::endElement(const OUString& aName) -throw( SAXException, RuntimeException, std::exception ) { SolarMutexGuard g; @@ -439,24 +435,20 @@ throw( SAXException, RuntimeException, std::exception ) } void SAL_CALL OReadStatusBarDocumentHandler::characters(const OUString&) -throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadStatusBarDocumentHandler::ignorableWhitespace(const OUString&) -throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadStatusBarDocumentHandler::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) -throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadStatusBarDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException, std::exception ) { SolarMutexGuard g; @@ -496,8 +488,7 @@ OWriteStatusBarDocumentHandler::~OWriteStatusBarDocumentHandler() { } -void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw -( SAXException, RuntimeException ) +void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() { SolarMutexGuard g; @@ -567,7 +558,6 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarItem( sal_Int16 nOffset, sal_Int16 nStyle, sal_Int16 nWidth ) -throw ( SAXException, RuntimeException ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY ); diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index e31da549bfe8..fad320b13108 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -178,12 +178,10 @@ OReadToolBoxDocumentHandler::~OReadToolBoxDocumentHandler() // XDocumentHandler void SAL_CALL OReadToolBoxDocumentHandler::startDocument() -throw ( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadToolBoxDocumentHandler::endDocument() -throw( SAXException, RuntimeException, std::exception ) { SolarMutexGuard g; @@ -197,7 +195,6 @@ throw( SAXException, RuntimeException, std::exception ) void SAL_CALL OReadToolBoxDocumentHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttribs ) -throw( SAXException, RuntimeException, std::exception ) { SolarMutexGuard g; @@ -491,7 +488,6 @@ throw( SAXException, RuntimeException, std::exception ) } void SAL_CALL OReadToolBoxDocumentHandler::endElement(const OUString& aName) -throw( SAXException, RuntimeException, std::exception ) { SolarMutexGuard g; @@ -572,24 +568,20 @@ throw( SAXException, RuntimeException, std::exception ) } void SAL_CALL OReadToolBoxDocumentHandler::characters(const OUString&) -throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadToolBoxDocumentHandler::ignorableWhitespace(const OUString&) -throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadToolBoxDocumentHandler::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) -throw( SAXException, RuntimeException, std::exception ) { } void SAL_CALL OReadToolBoxDocumentHandler::setDocumentLocator( const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException, std::exception ) { SolarMutexGuard g; @@ -629,8 +621,7 @@ OWriteToolBoxDocumentHandler::~OWriteToolBoxDocumentHandler() { } -void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw -( SAXException, RuntimeException ) +void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() { SolarMutexGuard g; @@ -718,7 +709,6 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxItem( const OUString& rHelpURL, sal_Int16 nStyle, bool bVisible ) -throw ( SAXException, RuntimeException ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; Reference< XAttributeList > xList( static_cast<XAttributeList *>(pList) , UNO_QUERY ); @@ -777,8 +767,7 @@ throw ( SAXException, RuntimeException ) m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARITEM ); } -void OWriteToolBoxDocumentHandler::WriteToolBoxSpace() throw -( SAXException, RuntimeException ) +void OWriteToolBoxDocumentHandler::WriteToolBoxSpace() { m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARSPACE, m_xEmptyList ); @@ -786,8 +775,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxSpace() throw m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARSPACE ); } -void OWriteToolBoxDocumentHandler::WriteToolBoxBreak() throw -( SAXException, RuntimeException ) +void OWriteToolBoxDocumentHandler::WriteToolBoxBreak() { m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARBREAK, m_xEmptyList ); @@ -795,8 +783,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxBreak() throw m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARBREAK ); } -void OWriteToolBoxDocumentHandler::WriteToolBoxSeparator() throw -( SAXException, RuntimeException ) +void OWriteToolBoxDocumentHandler::WriteToolBoxSeparator() { m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARSEPARATOR, m_xEmptyList ); diff --git a/framework/source/fwe/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx index a208e440a3b4..7b103eae24c5 100644 --- a/framework/source/fwe/xml/xmlnamespaces.cxx +++ b/framework/source/fwe/xml/xmlnamespaces.cxx @@ -40,7 +40,7 @@ XMLNamespaces::~XMLNamespaces() { } -void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue ) throw( SAXException ) +void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue ) { NamespaceMap::iterator p; OUString aNamespaceName( aName ); @@ -93,7 +93,7 @@ void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue } } -OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const throw( SAXException, std::exception ) +OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const { // xml draft: there is no default namespace for attributes! @@ -118,7 +118,7 @@ OUString XMLNamespaces::applyNSToAttributeName( const OUString& aName ) const th return aName; } -OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const throw( SAXException, std::exception ) +OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const { // xml draft: element names can have a default namespace @@ -156,7 +156,7 @@ OUString XMLNamespaces::applyNSToElementName( const OUString& aName ) const th return aElementName; } -OUString XMLNamespaces::getNamespaceValue( const OUString& aNamespace ) const throw( SAXException ) +OUString XMLNamespaces::getNamespaceValue( const OUString& aNamespace ) const { if ( aNamespace.isEmpty() ) return m_aDefaultNamespace; |