diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-06 19:05:49 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-06 19:37:48 +0300 |
commit | 951ed199f1a47c02dad3dc899b9804b4574a151d (patch) | |
tree | d8f82a3afa345351ce6a4a206424c6f2bd2aed46 /framework/source/fwe/xml | |
parent | be616c26f990d651c752be201e29e2b89ba17f2a (diff) |
Kill superfluous vertical whitespace
Change-Id: Ia1bb2b40c74efb17e655dd6f00d7ba48c16c65ae
Diffstat (limited to 'framework/source/fwe/xml')
8 files changed, 0 insertions, 74 deletions
diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index 3e3600128517..8b87cdde2b23 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -49,12 +49,10 @@ MenuConfiguration::MenuConfiguration( { } - MenuConfiguration::~MenuConfiguration() { } - Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML( Reference< XInputStream >& rInputStream ) throw ( WrappedTargetException ) @@ -66,7 +64,6 @@ throw ( WrappedTargetException ) aInputSource.aInputStream = rInputStream; - // create menu bar Reference< XIndexContainer > xItemContainer( static_cast< cppu::OWeakObject *>( new RootItemContainer()), UNO_QUERY ); diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 85479e99aaa3..4f02287d7001 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <sal/macros.h> @@ -34,7 +33,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/attributelist.hxx> - #define XMLNS_MENU "http://openoffice.org/2001/menu" #define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" @@ -83,10 +81,8 @@ static const char CMD_PROTOCOL[] = ".uno:"; static const char ADDDIRECT_CMD[] = ".uno:AddDirect" ; static const char AUTOPILOTMENU_CMD[] = ".uno:AutoPilotMenu" ; - // using namespaces - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; @@ -109,7 +105,6 @@ MenuStyleItem MenuItemStyles[ ] = { { ::com::sun::star::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO } }; - sal_Int32 nMenuStyleItemEntries = (sizeof (MenuItemStyles) / sizeof (MenuItemStyles[0])); static void ExtractMenuParameters( const Sequence< PropertyValue > rProp, @@ -150,8 +145,6 @@ static void ExtractMenuParameters( const Sequence< PropertyValue > rProp, } } - - // Base class implementation ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() : @@ -222,8 +215,6 @@ void ReadMenuDocumentHandlerBase::initPropertyCommon( rProps[5].Value <<= ::com::sun::star::ui::ItemType::DEFAULT; } - - OReadMenuDocumentHandler::OReadMenuDocumentHandler( const Reference< XIndexContainer >& rMenuBarContainer ) : m_nElementDepth( 0 ), @@ -237,13 +228,11 @@ OReadMenuDocumentHandler::~OReadMenuDocumentHandler() { } - void SAL_CALL OReadMenuDocumentHandler::startDocument(void) throw ( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuDocumentHandler::endDocument(void) throw( SAXException, RuntimeException, std::exception ) { @@ -255,7 +244,6 @@ void SAL_CALL OReadMenuDocumentHandler::endDocument(void) } } - void SAL_CALL OReadMenuDocumentHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttrList ) throw( SAXException, RuntimeException, std::exception ) @@ -275,13 +263,11 @@ 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 ) { @@ -304,9 +290,6 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) } } - - - OReadMenuBarHandler::OReadMenuBarHandler( const Reference< XIndexContainer >& rMenuBarContainer, const Reference< XSingleComponentFactory >& rFactory ) @@ -317,24 +300,20 @@ OReadMenuBarHandler::OReadMenuBarHandler( { } - OReadMenuBarHandler::~OReadMenuBarHandler() { } - void SAL_CALL OReadMenuBarHandler::startDocument(void) throw ( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuBarHandler::endDocument(void) throw( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuBarHandler::startElement( const OUString& rName, const Reference< XAttributeList > &xAttrList ) throw( SAXException, RuntimeException, std::exception ) @@ -424,13 +403,11 @@ 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 ) { @@ -454,10 +431,6 @@ void OReadMenuBarHandler::endElement( const OUString& aName ) } } - - - - OReadMenuHandler::OReadMenuHandler( const Reference< XIndexContainer >& rMenuContainer, const Reference< XSingleComponentFactory >& rFactory ) : @@ -468,24 +441,20 @@ OReadMenuHandler::OReadMenuHandler( { } - OReadMenuHandler::~OReadMenuHandler() { } - void SAL_CALL OReadMenuHandler::startDocument(void) throw ( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuHandler::endDocument(void) throw( SAXException, RuntimeException, std::exception) { } - void SAL_CALL OReadMenuHandler::startElement( const OUString& aName, const Reference< XAttributeList > &xAttrList ) throw( SAXException, RuntimeException, std::exception ) @@ -510,13 +479,11 @@ 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 ) { @@ -540,10 +507,6 @@ void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) } } - - - - OReadMenuPopupHandler::OReadMenuPopupHandler( const Reference< XIndexContainer >& rMenuContainer, const Reference< XSingleComponentFactory >& rFactory ) : @@ -556,18 +519,15 @@ OReadMenuPopupHandler::OReadMenuPopupHandler( { } - OReadMenuPopupHandler::~OReadMenuPopupHandler() { } - void SAL_CALL OReadMenuPopupHandler::startDocument(void) throw ( SAXException, RuntimeException, std::exception ) { } - void SAL_CALL OReadMenuPopupHandler::endDocument(void) throw( SAXException, RuntimeException, std::exception) { @@ -714,13 +674,11 @@ 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 ) { @@ -767,10 +725,8 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) } } - // --------------------------------- Write XML --------------------------------- - OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( const Reference< XIndexAccess >& rMenuBarContainer, const Reference< XDocumentHandler >& rDocumentHandler ) : @@ -782,12 +738,10 @@ OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( m_aAttributeType = OUString( ATTRIBUTE_TYPE_CDATA ); } - OWriteMenuDocumentHandler::~OWriteMenuDocumentHandler() { } - void OWriteMenuDocumentHandler::WriteMenuDocument() throw ( SAXException, RuntimeException ) { @@ -823,7 +777,6 @@ throw ( SAXException, RuntimeException ) m_xWriteDocumentHandler->endDocument(); } - void OWriteMenuDocumentHandler::WriteMenu( const Reference< XIndexAccess >& rMenuContainer ) throw ( SAXException, RuntimeException ) { @@ -904,7 +857,6 @@ throw ( SAXException, RuntimeException ) } } - void OWriteMenuDocumentHandler::WriteMenuItem( const OUString& aCommandURL, const OUString& aLabel, const OUString& aHelpURL, sal_Int16 nStyle ) { ::comphelper::AttributeList* pList = new ::comphelper::AttributeList; @@ -952,7 +904,6 @@ void OWriteMenuDocumentHandler::WriteMenuItem( const OUString& aCommandURL, cons m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_MENUITEM ) ); } - void OWriteMenuDocumentHandler::WriteMenuSeparator() { m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx index cff7cf734497..894e7f11c25d 100644 --- a/framework/source/fwe/xml/saxnamespacefilter.cxx +++ b/framework/source/fwe/xml/saxnamespacefilter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - /** Attention: stl headers must(!) be included at first. Otherwhise it can make trouble with solaris headers ... */ @@ -36,7 +35,6 @@ using namespace ::com::sun::star::uno; namespace framework{ - SaxNamespaceFilter::SaxNamespaceFilter( Reference< XDocumentHandler >& rSax1DocumentHandler ) : m_xLocator( 0 ), xDocumentHandler( rSax1DocumentHandler ), diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index 0a9c3d8843b5..69aaf0c097c6 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <framework/statusbarconfiguration.hxx> #include <xml/statusbardocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> @@ -38,7 +37,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; using namespace ::com::sun::star::container; - namespace framework { diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index 6837dbb8d170..cf4ce24b5aa6 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <xml/statusbardocumenthandler.hxx> @@ -143,7 +142,6 @@ StatusBarEntryProperty StatusBarEntries[OReadStatusBarDocumentHandler::SB_XML_EN { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_HELPURL } }; - OReadStatusBarDocumentHandler::OReadStatusBarDocumentHandler( const Reference< XIndexContainer >& rStatusBarItems ) : m_aStatusBarItems( rStatusBarItems ) @@ -482,11 +480,8 @@ OUString OReadStatusBarDocumentHandler::getErrorLineString() return OUString(); } - - // OWriteStatusBarDocumentHandler - OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler( const Reference< XIndexAccess >& aStatusBarItems, const Reference< XDocumentHandler >& rWriteDocumentHandler ) : @@ -567,10 +562,8 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw m_xWriteDocumentHandler->endDocument(); } - // protected member functions - void OWriteStatusBarDocumentHandler::WriteStatusBarItem( const OUString& rCommandURL, const OUString& /*rHelpURL*/, diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx index 26bd8d66f6bc..013702dec886 100644 --- a/framework/source/fwe/xml/toolboxconfiguration.cxx +++ b/framework/source/fwe/xml/toolboxconfiguration.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <framework/toolboxconfiguration.hxx> #include <xml/toolboxdocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> @@ -38,7 +37,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; using namespace ::com::sun::star::container; - namespace framework { @@ -80,7 +78,6 @@ bool ToolBoxConfiguration::LoadToolBox( } } - bool ToolBoxConfiguration::StoreToolBox( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream, diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 854cb4b4fa03..f4425bc8be0b 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include <xml/toolboxdocumenthandler.hxx> @@ -42,7 +41,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::xml::sax; - #define TOOLBAR_DOCTYPE "<!DOCTYPE toolbar:toolbar PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"toolbar.dtd\">" namespace framework @@ -653,11 +651,8 @@ OUString OReadToolBoxDocumentHandler::getErrorLineString() return OUString(); } - - // OWriteToolBoxDocumentHandler - OWriteToolBoxDocumentHandler::OWriteToolBoxDocumentHandler( const Reference< XIndexAccess >& rItemAccess, Reference< XDocumentHandler >& rWriteDocumentHandler ) : @@ -758,10 +753,8 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw m_xWriteDocumentHandler->endDocument(); } - // protected member functions - void OWriteToolBoxDocumentHandler::WriteToolBoxItem( const OUString& rCommandURL, const OUString& rLabel, diff --git a/framework/source/fwe/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx index 12c252b6dfd2..d44c06c7c1ec 100644 --- a/framework/source/fwe/xml/xmlnamespaces.cxx +++ b/framework/source/fwe/xml/xmlnamespaces.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <xml/xmlnamespaces.hxx> using namespace ::com::sun::star::xml::sax; |