summaryrefslogtreecommitdiff
path: root/toolkit/source/controls
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 18:16:42 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 08:18:05 +0000
commita238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch)
tree083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /toolkit/source/controls
parent538f276ae0414ea34ede6090b5f56e8fecd6fc65 (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 'toolkit/source/controls')
-rw-r--r--toolkit/source/controls/controlmodelcontainerbase.cxx3
-rw-r--r--toolkit/source/controls/eventcontainer.cxx3
-rw-r--r--toolkit/source/controls/geometrycontrolmodel.cxx2
-rw-r--r--toolkit/source/controls/grid/gridcontrol.cxx1
-rw-r--r--toolkit/source/controls/grid/gridcontrol.hxx1
-rw-r--r--toolkit/source/controls/grid/initguard.hxx1
-rw-r--r--toolkit/source/controls/roadmapcontrol.cxx7
-rw-r--r--toolkit/source/controls/roadmapentry.cxx2
-rw-r--r--toolkit/source/controls/stdtabcontrollermodel.cxx1
-rw-r--r--toolkit/source/controls/tkscrollbar.cxx1
-rw-r--r--toolkit/source/controls/tree/treecontrol.cxx28
-rw-r--r--toolkit/source/controls/unocontrolbase.cxx1
-rw-r--r--toolkit/source/controls/unocontrolcontainer.cxx2
-rw-r--r--toolkit/source/controls/unocontrolmodel.cxx1
14 files changed, 0 insertions, 54 deletions
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index f137aeae762c..cb0fa9f6d9f9 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -582,7 +582,6 @@ void ControlModelContainerBase::insertByName( const OUString& aName, const Any&
}
-
if ( aName.isEmpty() || !xM.is() )
lcl_throwIllegalArgumentException();
@@ -925,7 +924,6 @@ void ControlModelContainerBase::implNotifyTabModelChange( const OUString& _rAcce
}
-
void ControlModelContainerBase::implUpdateGroupStructure()
{
if ( mbGroupsUpToDate )
@@ -1342,7 +1340,6 @@ throw ( RuntimeException, std::exception )
}
-
// class DialogContainerControl
ControlContainerBase::ControlContainerBase( const Reference< XComponentContext >& rxContext )
diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx
index b480f5eedfff..64c7d8a6e13b 100644
--- a/toolkit/source/controls/eventcontainer.cxx
+++ b/toolkit/source/controls/eventcontainer.cxx
@@ -185,7 +185,6 @@ void NameContainer_Impl::removeContainerListener( const css::uno::Reference< css
}
-
// Ctor
ScriptEventContainer::ScriptEventContainer()
: NameContainer_Impl( cppu::UnoType<ScriptEventDescriptor>::get())
@@ -195,6 +194,4 @@ ScriptEventContainer::ScriptEventContainer()
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index c0707d1d97ea..79da293067ae 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -439,7 +439,6 @@
//= OCommonGeometryControlModel
-
typedef std::unordered_map< OUString, sal_Int32, OUStringHash > HashMapString2Int;
typedef std::vector< css::uno::Sequence< css::beans::Property > > PropSeqArray;
typedef std::vector< ::std::vector< sal_Int32 > > IntArrayArray;
@@ -463,7 +462,6 @@
// service specifier.
-
OCommonGeometryControlModel::OCommonGeometryControlModel( Reference< XCloneable >& _rxAgg, const OUString& _rServiceSpecifier )
:OGeometryControlModel_Base( _rxAgg )
,m_sServiceSpecifier( _rServiceSpecifier )
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index a3991bcfb2c4..773bf22f4476 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -269,7 +269,6 @@ Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo( ) throw(Runtime
}
-
//= UnoGridControl
UnoGridControl::UnoGridControl()
diff --git a/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index 32a34c4d9073..e7e9cb7db709 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.hxx
@@ -80,7 +80,6 @@ public:
};
-
// = UnoGridControl
typedef ::cppu::ImplInheritanceHelper < UnoControlBase
diff --git a/toolkit/source/controls/grid/initguard.hxx b/toolkit/source/controls/grid/initguard.hxx
index d9c30bf396c2..75d84c0f0c75 100644
--- a/toolkit/source/controls/grid/initguard.hxx
+++ b/toolkit/source/controls/grid/initguard.hxx
@@ -29,7 +29,6 @@ namespace toolkit
{
-
//= InitGuard
template < class IMPL >
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 4b13004d243d..aaf8ee27effc 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -147,7 +147,6 @@ static void lcl_throwIndexOutOfBoundsException( )
IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoControlRoadmapModel, UnoControlRoadmapModel_Base, UnoControlRoadmapModel_IBase )
-
css::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception)
{
Any aRet = UnoControlRoadmapModel_Base::queryAggregation( rType );
@@ -157,7 +156,6 @@ static void lcl_throwIndexOutOfBoundsException( )
}
-
::cppu::IPropertyArrayHelper& UnoControlRoadmapModel::getInfoHelper()
{
static UnoPropertyArrayHelper* pHelper = nullptr;
@@ -194,7 +192,6 @@ static void lcl_throwIndexOutOfBoundsException( )
}
-
void UnoControlRoadmapModel::MakeRMItemValidation( sal_Int32 Index, Reference< XInterface > xRoadmapItem )
{
if ((Index > (sal_Int32)maRoadmapItems.size()) || ( Index < 0 ) )
@@ -300,7 +297,6 @@ static void lcl_throwIndexOutOfBoundsException( )
}
-
void SAL_CALL UnoControlRoadmapModel::removeByIndex( sal_Int32 Index)
throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{
@@ -401,14 +397,12 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >&
}
-
OUString UnoRoadmapControl::GetComponentServiceName()
{
return OUString("Roadmap");
}
-
void UnoRoadmapControl::dispose() throw(RuntimeException, std::exception)
{
EventObject aEvt;
@@ -418,7 +412,6 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >&
}
-
void UnoRoadmapControl::elementInserted( const ContainerEvent& rEvent )throw(RuntimeException, std::exception)
{
Reference< XInterface > xRoadmapItem;
diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx
index 1bfb4565a6b6..2327d0248690 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.cxx
@@ -49,8 +49,6 @@ ORoadmapEntry::ORoadmapEntry() : ORoadmapEntry_Base( )
& m_bInteractive, cppu::UnoType<decltype(m_bInteractive)>::get() );
-
-
// Note that the list of registered properties has to be fixed: Different
// instances of this class have to register the same set of properties with
// the same attributes.
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index f9c0f9c0d154..184d56c0fdcf 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@@ -88,7 +88,6 @@ void UnoControlModelEntryList::insert( size_t i, UnoControlModelEntry* item ) {
}
-
// class StdTabControllerModel
StdTabControllerModel::StdTabControllerModel()
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index 150f911a1cf4..46b2f0ada958 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -100,7 +100,6 @@ namespace toolkit
}
-
//= UnoControlScrollBarModel
UnoScrollBarControl::UnoScrollBarControl()
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index b8f17bddecce..1ca574067df4 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -213,14 +213,12 @@ sal_Bool SAL_CALL UnoTreeControl::select( const Any& rSelection ) throw (Illegal
}
-
Any SAL_CALL UnoTreeControl::getSelection() throw (RuntimeException, std::exception)
{
return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getSelection();
}
-
void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception)
{
maSelectionListeners.addInterface( xListener );
@@ -233,7 +231,6 @@ void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSele
}
-
void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException, std::exception)
{
if( getPeer().is() && (maSelectionListeners.getLength() == 1) )
@@ -255,35 +252,30 @@ sal_Bool SAL_CALL UnoTreeControl::addSelection( const Any& rSelection ) throw (I
}
-
void SAL_CALL UnoTreeControl::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException, std::exception)
{
Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->removeSelection(rSelection);
}
-
void SAL_CALL UnoTreeControl::clearSelection() throw (RuntimeException, std::exception)
{
Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->clearSelection();
}
-
sal_Int32 SAL_CALL UnoTreeControl::getSelectionCount() throw (RuntimeException, std::exception)
{
return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getSelectionCount();
}
-
Reference< XEnumeration > SAL_CALL UnoTreeControl::createSelectionEnumeration() throw (RuntimeException, std::exception)
{
return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->createSelectionEnumeration();
}
-
Reference< XEnumeration > SAL_CALL UnoTreeControl::createReverseSelectionEnumeration() throw (RuntimeException, std::exception)
{
return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->createReverseSelectionEnumeration();
@@ -299,70 +291,60 @@ OUString SAL_CALL UnoTreeControl::getDefaultExpandedGraphicURL() throw (RuntimeE
}
-
void SAL_CALL UnoTreeControl::setDefaultExpandedGraphicURL( const OUString& _defaultexpansiongraphicurl ) throw (RuntimeException, std::exception)
{
Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->setDefaultExpandedGraphicURL(_defaultexpansiongraphicurl);
}
-
OUString SAL_CALL UnoTreeControl::getDefaultCollapsedGraphicURL() throw (RuntimeException, std::exception)
{
return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getDefaultCollapsedGraphicURL();
}
-
void SAL_CALL UnoTreeControl::setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (RuntimeException, std::exception)
{
Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->setDefaultCollapsedGraphicURL(_defaultcollapsedgraphicurl);
}
-
sal_Bool SAL_CALL UnoTreeControl::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception)
{
return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeExpanded(xNode);
}
-
sal_Bool SAL_CALL UnoTreeControl::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception)
{
return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeCollapsed(xNode);
}
-
void SAL_CALL UnoTreeControl::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception)
{
Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->makeNodeVisible(xNode);
}
-
sal_Bool SAL_CALL UnoTreeControl::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException, std::exception)
{
return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeVisible(xNode);
}
-
void SAL_CALL UnoTreeControl::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception)
{
Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->expandNode(xNode);
}
-
void SAL_CALL UnoTreeControl::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException, std::exception)
{
Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->collapseNode(xNode);
}
-
void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception)
{
maTreeExpansionListeners.addInterface( xListener );
@@ -375,7 +357,6 @@ void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeEx
}
-
void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException, std::exception)
{
if( getPeer().is() && (maTreeExpansionListeners.getLength() == 1) )
@@ -388,56 +369,48 @@ void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTre
}
-
Reference< XTreeNode > SAL_CALL UnoTreeControl::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception)
{
return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getNodeForLocation(x,y);
}
-
Reference< XTreeNode > SAL_CALL UnoTreeControl::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException, std::exception)
{
return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getClosestNodeForLocation(x,y);
}
-
awt::Rectangle SAL_CALL UnoTreeControl::getNodeRect( const Reference< XTreeNode >& Node ) throw (IllegalArgumentException, RuntimeException, std::exception)
{
return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getNodeRect( Node );
}
-
sal_Bool SAL_CALL UnoTreeControl::isEditing( ) throw (RuntimeException, std::exception)
{
return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isEditing();
}
-
sal_Bool SAL_CALL UnoTreeControl::stopEditing() throw (RuntimeException, std::exception)
{
return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->stopEditing();
}
-
void SAL_CALL UnoTreeControl::cancelEditing() throw (RuntimeException, std::exception)
{
Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->cancelEditing();
}
-
void SAL_CALL UnoTreeControl::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException, std::exception)
{
Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->startEditingAtNode(xNode);
}
-
void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException, std::exception)
{
maTreeEditListeners.addInterface( xListener );
@@ -450,7 +423,6 @@ void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditLis
}
-
void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException, std::exception)
{
if( getPeer().is() && (maTreeEditListeners.getLength() == 1) )
diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx
index e29cd7fced5b..3ded2fcead43 100644
--- a/toolkit/source/controls/unocontrolbase.cxx
+++ b/toolkit/source/controls/unocontrolbase.cxx
@@ -255,5 +255,4 @@ void UnoControlBase::Impl_getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLine
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 0f7e3a4c1207..aec738fe0980 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -346,7 +346,6 @@ void implUpdateVisibility
}
-
// class DialogStepChangedListener
typedef ::cppu::WeakImplHelper< beans::XPropertyChangeListener > PropertyChangeListenerHelper;
@@ -700,7 +699,6 @@ void UnoControlContainer::removeControl( const uno::Reference< awt::XControl >&
}
-
// awt::XUnoControlContainer
void UnoControlContainer::setTabControllers( const uno::Sequence< uno::Reference< awt::XTabController > >& TabControllers ) throw(uno::RuntimeException, std::exception)
{
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 8a0f22a31dd9..fd711d1cd3c3 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -1356,7 +1356,6 @@ void UnoControlModel::setPropertyValues( const css::uno::Sequence< OUString >& r
}
-
void UnoControlModel::ImplNormalizePropertySequence( const sal_Int32, sal_Int32*,
uno::Any*, sal_Int32* ) const
{