diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /svtools/source/uno/treecontrolpeer.cxx | |
parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff) |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'svtools/source/uno/treecontrolpeer.cxx')
-rw-r--r-- | svtools/source/uno/treecontrolpeer.cxx | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index c74af2eaec94..1403ed538051 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -68,8 +68,6 @@ public: }; - - class ImplContextGraphicItem : public SvLBoxContextBmp { public: @@ -81,7 +79,6 @@ public: }; - class UnoTreeListBoxImpl : public SvTreeListBox { public: @@ -105,7 +102,6 @@ private: }; - class UnoTreeListItem : public SvLBoxString { public: @@ -127,7 +123,6 @@ private: }; - class UnoTreeListEntry : public SvTreeListEntry { public: @@ -150,7 +145,6 @@ TreeControlPeer::TreeControlPeer() } - TreeControlPeer::~TreeControlPeer() { if( mpTreeImpl ) @@ -159,7 +153,6 @@ TreeControlPeer::~TreeControlPeer() } - void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry ) { if( pEntry && pEntry->mxNode.is() ) @@ -174,7 +167,6 @@ void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry ) } - void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry ) { if( mpTreeNodeMap && pEntry && pEntry->mxNode.is() ) @@ -188,7 +180,6 @@ void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry ) } - UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode, bool bThrow /* = true */ ) throw( IllegalArgumentException ) { if( mpTreeNodeMap ) @@ -205,7 +196,6 @@ UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode } - vcl::Window* TreeControlPeer::createVclControl( vcl::Window* pParent, sal_Int64 nWinStyle ) { mpTreeImpl = VclPtr<UnoTreeListBoxImpl>::Create( this, pParent, nWinStyle ); @@ -213,7 +203,6 @@ vcl::Window* TreeControlPeer::createVclControl( vcl::Window* pParent, sal_Int64 } - /** called from the UnoTreeListBoxImpl when it gets deleted */ void TreeControlPeer::disposeControl() { @@ -223,14 +212,12 @@ void TreeControlPeer::disposeControl() } - void TreeControlPeer::SetWindow( const VclPtr< vcl::Window > &pWindow ) { VCLXWindow::SetWindow( pWindow ); } - UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uLong nPos /* = TREELIST_APPEND */ ) { UnoTreeListEntry* pEntry = nullptr; @@ -270,7 +257,6 @@ UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xN } - void TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry ) { bool bChanged = false; @@ -336,7 +322,6 @@ void TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry ) } - void TreeControlPeer::onSelectionChanged() { Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); @@ -345,7 +330,6 @@ void TreeControlPeer::onSelectionChanged() } - void TreeControlPeer::onRequestChildNodes( const Reference< XTreeNode >& xNode ) { try @@ -360,7 +344,6 @@ void TreeControlPeer::onRequestChildNodes( const Reference< XTreeNode >& xNode ) } - bool TreeControlPeer::onExpanding( const Reference< XTreeNode >& xNode, bool bExpanding ) { try @@ -384,7 +367,6 @@ bool TreeControlPeer::onExpanding( const Reference< XTreeNode >& xNode, bool bEx } - void TreeControlPeer::onExpanded( const Reference< XTreeNode >& xNode, bool bExpanding ) { try @@ -407,7 +389,6 @@ void TreeControlPeer::onExpanded( const Reference< XTreeNode >& xNode, bool bExp } - void TreeControlPeer::fillTree( UnoTreeListBoxImpl& rTree, const Reference< XTreeDataModel >& xDataModel ) { rTree.Clear(); @@ -432,7 +413,6 @@ void TreeControlPeer::fillTree( UnoTreeListBoxImpl& rTree, const Reference< XTre } - void TreeControlPeer::addNode( UnoTreeListBoxImpl& rTree, const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParentEntry ) { if( xNode.is() ) @@ -445,7 +425,6 @@ void TreeControlPeer::addNode( UnoTreeListBoxImpl& rTree, const Reference< XTree } - UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (RuntimeException ) { if( !mpTreeImpl ) @@ -454,7 +433,6 @@ UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (Runtim } - void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, bool bSetSelection ) throw( RuntimeException, IllegalArgumentException ) { SolarMutexGuard aGuard; @@ -524,7 +502,6 @@ sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (Illega } - Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -560,14 +537,12 @@ Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException, std::excep } - void SAL_CALL TreeControlPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) { maSelectionListeners.addInterface( xListener ); } - void SAL_CALL TreeControlPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception) { maSelectionListeners.addInterface( xListener ); @@ -584,14 +559,12 @@ sal_Bool SAL_CALL TreeControlPeer::addSelection( const Any& rSelection ) throw ( } - void SAL_CALL TreeControlPeer::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception) { ChangeNodesSelection( rSelection, false, false ); } - void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -599,7 +572,6 @@ void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException, std::ex } - sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -607,7 +579,6 @@ sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException, } - class TreeSelectionEnumeration : public ::cppu::WeakImplHelper< XEnumeration > { public: @@ -620,7 +591,6 @@ public: }; - TreeSelectionEnumeration::TreeSelectionEnumeration( std::list< Any >& rSelection ) { maSelection.swap( rSelection ); @@ -628,14 +598,12 @@ TreeSelectionEnumeration::TreeSelectionEnumeration( std::list< Any >& rSelection } - sal_Bool SAL_CALL TreeSelectionEnumeration::hasMoreElements() throw (RuntimeException, std::exception) { return maIter != maSelection.end(); } - Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { if( maIter == maSelection.end() ) @@ -645,7 +613,6 @@ Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementExcepti } - Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -669,7 +636,6 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() } - Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumeration() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -703,7 +669,6 @@ OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (css::un } - void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDefaultExpandedGraphicURL ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -733,7 +698,6 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDe } - OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -741,7 +705,6 @@ OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (css::u } - void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sDefaultCollapsedGraphicURL ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -771,7 +734,6 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sD } - sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -782,7 +744,6 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& } - sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -790,7 +751,6 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode > } - void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -802,7 +762,6 @@ void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xN } - sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -813,7 +772,6 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& } - void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -825,7 +783,6 @@ void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) } - void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception) { SolarMutexGuard aGuard; @@ -837,21 +794,18 @@ void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode } - void SAL_CALL TreeControlPeer::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception) { maTreeExpansionListeners.addInterface( xListener ); } - void SAL_CALL TreeControlPeer::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception) { maTreeExpansionListeners.removeInterface( xListener ); } - Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -869,7 +823,6 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x } - Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -887,7 +840,6 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_ } - awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode >& i_Node ) throw (IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -900,7 +852,6 @@ awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode } - sal_Bool SAL_CALL TreeControlPeer::isEditing( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -910,7 +861,6 @@ sal_Bool SAL_CALL TreeControlPeer::isEditing( ) throw (RuntimeException, std::e } - sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -928,7 +878,6 @@ sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException, std::e } - void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -938,7 +887,6 @@ void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException, std::e } - void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1488,7 +1436,6 @@ UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, vcl::Window* pPa } - UnoTreeListBoxImpl::~UnoTreeListBoxImpl() { disposeOnce(); @@ -1502,7 +1449,6 @@ void UnoTreeListBoxImpl::dispose() } - IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnSelectionChangeHdl, SvTreeListBox*, void) { if( mxPeer.is() ) @@ -1510,7 +1456,6 @@ IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnSelectionChangeHdl, SvTreeListBox*, } - IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandingHdl, SvTreeListBox*, bool) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() ); @@ -1523,7 +1468,6 @@ IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandingHdl, SvTreeListBox*, bool) } - IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandedHdl, SvTreeListBox*, void) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() ); @@ -1534,7 +1478,6 @@ IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandedHdl, SvTreeListBox*, void) } - void UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos ) { if( pParent ) @@ -1544,7 +1487,6 @@ void UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParen } - void UnoTreeListBoxImpl::RequestingChildren( SvTreeListEntry* pParent ) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( pParent ); @@ -1553,14 +1495,12 @@ void UnoTreeListBoxImpl::RequestingChildren( SvTreeListEntry* pParent ) } - bool UnoTreeListBoxImpl::EditingEntry( SvTreeListEntry* pEntry, Selection& ) { return mxPeer.is() && mxPeer->onEditingEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ) ); } - bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { return mxPeer.is() && mxPeer->onEditedEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ), rNewText ); @@ -1576,20 +1516,17 @@ UnoTreeListItem::UnoTreeListItem( SvTreeListEntry* pEntry ) } - UnoTreeListItem::UnoTreeListItem() : SvLBoxString() { } - UnoTreeListItem::~UnoTreeListItem() { } - void UnoTreeListItem::Paint( const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext, const SvViewDataEntry* /*pView*/, const SvTreeListEntry& rEntry) { @@ -1606,14 +1543,12 @@ void UnoTreeListItem::Paint( } - SvLBoxItem* UnoTreeListItem::Create() const { return new UnoTreeListItem; } - void UnoTreeListItem::Clone( SvLBoxItem* pSource ) { UnoTreeListItem* pSourceItem = dynamic_cast< UnoTreeListItem* >( pSource ); @@ -1625,24 +1560,18 @@ void UnoTreeListItem::Clone( SvLBoxItem* pSource ) } - void UnoTreeListItem::SetImage( const Image& rImage ) { maImage = rImage; } - - - - void UnoTreeListItem::SetGraphicURL( const OUString& rGraphicURL ) { maGraphicURL = rGraphicURL; } - void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData) { if( !pViewData ) @@ -1664,7 +1593,6 @@ void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry } - UnoTreeListEntry::UnoTreeListEntry( const Reference< XTreeNode >& xNode, TreeControlPeer* pPeer ) : SvTreeListEntry() , mxNode( xNode ) @@ -1675,7 +1603,6 @@ UnoTreeListEntry::UnoTreeListEntry( const Reference< XTreeNode >& xNode, TreeCon } - UnoTreeListEntry::~UnoTreeListEntry() { if( mpPeer ) |