diff options
Diffstat (limited to 'framework/source/fwe/xml/menudocumenthandler.cxx')
| -rw-r--r-- | framework/source/fwe/xml/menudocumenthandler.cxx | 39 |
1 files changed, 13 insertions, 26 deletions
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 0a30b76cadec..8b9384f672fc 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -230,8 +230,7 @@ void SAL_CALL OReadMenuDocumentHandler::endDocument() { if ( m_nElementDepth > 0 ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "A closing element is missing!"; + OUString aErrorMessage = getErrorLineString() + "A closing element is missing!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -277,14 +276,12 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) m_xReader.clear(); if ( m_eReaderMode == ReaderMode::MenuBar && aName != ELEMENT_MENUBAR ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "closing element menubar expected!"; + OUString aErrorMessage = getErrorLineString() + "closing element menubar expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } else if ( m_eReaderMode == ReaderMode::MenuPopup && aName != ELEMENT_MENUPOPUP ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "closing element menupopup expected!"; + OUString aErrorMessage = getErrorLineString() + "closing element menupopup expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } m_eReaderMode = ReaderMode::None; @@ -384,8 +381,7 @@ void SAL_CALL OReadMenuBarHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "attribute id for element menu required!"; + OUString aErrorMessage = getErrorLineString() + "attribute id for element menu required!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -395,8 +391,7 @@ void SAL_CALL OReadMenuBarHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "element menu expected!"; + OUString aErrorMessage = getErrorLineString() + "element menu expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -417,8 +412,7 @@ void OReadMenuBarHandler::endElement( const OUString& aName ) m_bMenuMode = false; if ( aName != ELEMENT_MENU ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "closing element menu expected!"; + OUString aErrorMessage = getErrorLineString() + "closing element menu expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -466,8 +460,7 @@ void SAL_CALL OReadMenuHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "unknown element found!"; + OUString aErrorMessage = getErrorLineString() + "unknown element found!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -488,8 +481,7 @@ void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) m_bMenuPopupMode = false; if ( aName != ELEMENT_MENUPOPUP ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "closing element menupopup expected!"; + OUString aErrorMessage = getErrorLineString() + "closing element menupopup expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -585,8 +577,7 @@ void SAL_CALL OReadMenuPopupHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "attribute id for element menu required!"; + OUString aErrorMessage = getErrorLineString() + "attribute id for element menu required!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -654,8 +645,7 @@ void SAL_CALL OReadMenuPopupHandler::startElement( } else { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "unknown element found!"; + OUString aErrorMessage = getErrorLineString() + "unknown element found!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -676,8 +666,7 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) m_bMenuMode = false; if ( aName != ELEMENT_MENU ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "closing element menu expected!"; + OUString aErrorMessage = getErrorLineString() + "closing element menu expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -690,8 +679,7 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) { if ( aName != ELEMENT_MENUITEM ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "closing element menuitem expected!"; + OUString aErrorMessage = getErrorLineString() + "closing element menuitem expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } @@ -699,8 +687,7 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) { if ( aName != ELEMENT_MENUSEPARATOR ) { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += "closing element menuseparator expected!"; + OUString aErrorMessage = getErrorLineString() + "closing element menuseparator expected!"; throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } |