summaryrefslogtreecommitdiff
path: root/basctl/source
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-22 21:20:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-23 03:38:49 +0000
commit0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch)
tree5024cba9f9ea5e3b23ea26025323f6aef39488d0 /basctl/source
parentb81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff)
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'basctl/source')
-rw-r--r--basctl/source/accessibility/accessibledialogcontrolshape.cxx86
-rw-r--r--basctl/source/accessibility/accessibledialogwindow.cxx118
-rw-r--r--basctl/source/basicide/basidectrlr.cxx24
-rw-r--r--basctl/source/basicide/basobj2.cxx22
-rw-r--r--basctl/source/basicide/basobj3.cxx34
-rw-r--r--basctl/source/basicide/doceventnotifier.cxx31
-rw-r--r--basctl/source/basicide/docsignature.cxx20
-rw-r--r--basctl/source/basicide/documentenumeration.cxx18
-rw-r--r--basctl/source/basicide/moduldl2.cxx96
-rw-r--r--basctl/source/basicide/tbxctl.hxx3
-rw-r--r--basctl/source/basicide/unomodel.hxx1
-rw-r--r--basctl/source/dlged/dlgedclip.cxx22
-rw-r--r--basctl/source/dlged/dlgedfunc.cxx38
-rw-r--r--basctl/source/dlged/dlgedlist.cxx30
-rw-r--r--basctl/source/dlged/dlgedmod.cxx8
-rw-r--r--basctl/source/dlged/dlgedobj.cxx111
-rw-r--r--basctl/source/dlged/dlgedpage.cxx8
-rw-r--r--basctl/source/dlged/dlgedview.cxx10
-rw-r--r--basctl/source/inc/basidesh.hxx3
19 files changed, 118 insertions, 565 deletions
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index 4078efe153bd..691295074564 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -46,9 +46,9 @@ using namespace ::com::sun::star::accessibility;
using namespace ::comphelper;
-// -----------------------------------------------------------------------------
+
// class AccessibleDialogControlShape
-// -----------------------------------------------------------------------------
+
AccessibleDialogControlShape::AccessibleDialogControlShape (DialogWindow* pDialogWindow, DlgEdObj* pDlgEdObj)
:AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
@@ -68,7 +68,7 @@ AccessibleDialogControlShape::AccessibleDialogControlShape (DialogWindow* pDialo
m_aBounds = GetBounds();
}
-// -----------------------------------------------------------------------------
+
AccessibleDialogControlShape::~AccessibleDialogControlShape()
{
@@ -79,7 +79,7 @@ AccessibleDialogControlShape::~AccessibleDialogControlShape()
m_pExternalLock = NULL;
}
-// -----------------------------------------------------------------------------
+
bool AccessibleDialogControlShape::IsFocused()
{
@@ -94,7 +94,7 @@ bool AccessibleDialogControlShape::IsFocused()
return bFocused;
}
-// -----------------------------------------------------------------------------
+
bool AccessibleDialogControlShape::IsSelected()
{
@@ -103,7 +103,7 @@ bool AccessibleDialogControlShape::IsSelected()
return false;
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogControlShape::SetFocused( bool bFocused )
{
@@ -119,7 +119,7 @@ void AccessibleDialogControlShape::SetFocused( bool bFocused )
}
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogControlShape::SetSelected( bool bSelected )
{
@@ -135,7 +135,7 @@ void AccessibleDialogControlShape::SetSelected( bool bSelected )
}
}
-// -----------------------------------------------------------------------------
+
awt::Rectangle AccessibleDialogControlShape::GetBounds()
{
@@ -165,7 +165,7 @@ awt::Rectangle AccessibleDialogControlShape::GetBounds()
return aBounds;
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogControlShape::SetBounds( const awt::Rectangle& aBounds )
{
@@ -176,7 +176,7 @@ void AccessibleDialogControlShape::SetBounds( const awt::Rectangle& aBounds )
}
}
-// -----------------------------------------------------------------------------
+
Window* AccessibleDialogControlShape::GetWindow() const
{
@@ -191,7 +191,7 @@ Window* AccessibleDialogControlShape::GetWindow() const
return pWindow;
}
-// -----------------------------------------------------------------------------
+
OUString AccessibleDialogControlShape::GetModelStringProperty( const sal_Char* pPropertyName )
{
@@ -215,7 +215,7 @@ OUString AccessibleDialogControlShape::GetModelStringProperty( const sal_Char* p
return sReturn;
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogControlShape::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
{
@@ -238,30 +238,30 @@ void AccessibleDialogControlShape::FillAccessibleStateSet( utl::AccessibleStateS
rStateSet.AddState( AccessibleStateType::RESIZABLE );
}
-// -----------------------------------------------------------------------------
+
// OCommonAccessibleComponent
-// -----------------------------------------------------------------------------
+
awt::Rectangle AccessibleDialogControlShape::implGetBounds() throw (RuntimeException)
{
return GetBounds();
}
-// -----------------------------------------------------------------------------
+
// XInterface
-// -----------------------------------------------------------------------------
+
IMPLEMENT_FORWARD_XINTERFACE2( AccessibleDialogControlShape, AccessibleExtendedComponentHelper_BASE, AccessibleDialogControlShape_BASE )
-// -----------------------------------------------------------------------------
+
// XTypeProvider
-// -----------------------------------------------------------------------------
+
IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleDialogControlShape, AccessibleExtendedComponentHelper_BASE, AccessibleDialogControlShape_BASE )
-// -----------------------------------------------------------------------------
+
// XComponent
-// -----------------------------------------------------------------------------
+
void AccessibleDialogControlShape::disposing()
{
@@ -275,9 +275,9 @@ void AccessibleDialogControlShape::disposing()
m_xControlModel.clear();
}
-// -----------------------------------------------------------------------------
+
// XEventListener
-// -----------------------------------------------------------------------------
+
void AccessibleDialogControlShape::disposing( const lang::EventObject& ) throw (RuntimeException)
{
@@ -286,9 +286,9 @@ void AccessibleDialogControlShape::disposing( const lang::EventObject& ) throw (
m_xControlModel.clear();
}
-// -----------------------------------------------------------------------------
+
// XPropertyChangeListener
-// -----------------------------------------------------------------------------
+
void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEvent& rEvent ) throw (RuntimeException)
{
@@ -345,7 +345,7 @@ sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount() throw (Runtime
return 0;
}
-// -----------------------------------------------------------------------------
+
Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
{
@@ -357,7 +357,7 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_I
return Reference< XAccessible >();
}
-// -----------------------------------------------------------------------------
+
Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent( ) throw (RuntimeException)
{
@@ -370,7 +370,7 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent( ) t
return xParent;
}
-// -----------------------------------------------------------------------------
+
sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent( ) throw (RuntimeException)
{
@@ -402,7 +402,7 @@ sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent( ) throw (Ru
return nIndexInParent;
}
-// -----------------------------------------------------------------------------
+
sal_Int16 AccessibleDialogControlShape::getAccessibleRole( ) throw (RuntimeException)
{
@@ -411,7 +411,7 @@ sal_Int16 AccessibleDialogControlShape::getAccessibleRole( ) throw (RuntimeExce
return AccessibleRole::SHAPE;
}
-// -----------------------------------------------------------------------------
+
OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (RuntimeException)
{
@@ -420,7 +420,7 @@ OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (Runti
return GetModelStringProperty( "HelpText" );
}
-// -----------------------------------------------------------------------------
+
OUString AccessibleDialogControlShape::getAccessibleName( ) throw (RuntimeException)
{
@@ -429,7 +429,7 @@ OUString AccessibleDialogControlShape::getAccessibleName( ) throw (RuntimeExcep
return GetModelStringProperty( "Name" );
}
-// -----------------------------------------------------------------------------
+
Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleRelationSet( ) throw (RuntimeException)
{
@@ -440,7 +440,7 @@ Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleR
return xSet;
}
-// -----------------------------------------------------------------------------
+
Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStateSet( ) throw (RuntimeException)
{
@@ -461,7 +461,7 @@ Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStat
return xSet;
}
-// -----------------------------------------------------------------------------
+
Locale AccessibleDialogControlShape::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException)
{
@@ -470,9 +470,9 @@ Locale AccessibleDialogControlShape::getLocale( ) throw (IllegalAccessibleCompo
return Application::GetSettings().GetLanguageTag().getLocale();
}
-// -----------------------------------------------------------------------------
+
// XAccessibleComponent
-// -----------------------------------------------------------------------------
+
Reference< XAccessible > AccessibleDialogControlShape::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
{
@@ -481,14 +481,14 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleAtPoint( con
return Reference< XAccessible >();
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogControlShape::grabFocus( ) throw (RuntimeException)
{
// no focus for shapes
}
-// -----------------------------------------------------------------------------
+
sal_Int32 AccessibleDialogControlShape::getForeground( ) throw (RuntimeException)
{
@@ -514,7 +514,7 @@ sal_Int32 AccessibleDialogControlShape::getForeground( ) throw (RuntimeExceptio
return nColor;
}
-// -----------------------------------------------------------------------------
+
sal_Int32 AccessibleDialogControlShape::getBackground( ) throw (RuntimeException)
{
@@ -533,9 +533,9 @@ sal_Int32 AccessibleDialogControlShape::getBackground( ) throw (RuntimeExceptio
return nColor;
}
-// -----------------------------------------------------------------------------
+
// XAccessibleExtendedComponent
-// -----------------------------------------------------------------------------
+
Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) throw (RuntimeException)
{
@@ -562,7 +562,7 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) throw (Runtime
return xFont;
}
-// -----------------------------------------------------------------------------
+
OUString AccessibleDialogControlShape::getTitledBorderText( ) throw (RuntimeException)
{
@@ -571,7 +571,7 @@ OUString AccessibleDialogControlShape::getTitledBorderText( ) throw (RuntimeExc
return OUString();
}
-// -----------------------------------------------------------------------------
+
OUString AccessibleDialogControlShape::getToolTipText( ) throw (RuntimeException)
{
@@ -585,7 +585,7 @@ OUString AccessibleDialogControlShape::getToolTipText( ) throw (RuntimeExceptio
return sText;
}
-// -----------------------------------------------------------------------------
+
} // namespace basctl
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index dc482853cbce..19240ee72602 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -50,9 +50,9 @@ using namespace ::comphelper;
DBG_NAME( AccessibleDialogWindow )
-// -----------------------------------------------------------------------------
+
// class ChildDescriptor
-// -----------------------------------------------------------------------------
+
AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( DlgEdObj* _pDlgEdObj )
:pDlgEdObj( _pDlgEdObj )
@@ -60,13 +60,13 @@ AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( DlgEdObj* _pDlgEdObj )
{
}
-// -----------------------------------------------------------------------------
+
AccessibleDialogWindow::ChildDescriptor::~ChildDescriptor()
{
}
-// -----------------------------------------------------------------------------
+
AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( const ChildDescriptor& rDesc )
:pDlgEdObj( rDesc.pDlgEdObj )
@@ -74,7 +74,7 @@ AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( const ChildDescriptor&
{
}
-// -----------------------------------------------------------------------------
+
AccessibleDialogWindow::ChildDescriptor& AccessibleDialogWindow::ChildDescriptor::operator=( const ChildDescriptor& rDesc )
{
@@ -84,7 +84,7 @@ AccessibleDialogWindow::ChildDescriptor& AccessibleDialogWindow::ChildDescriptor
return *this;
}
-// -----------------------------------------------------------------------------
+
bool AccessibleDialogWindow::ChildDescriptor::operator==( const ChildDescriptor& rDesc )
{
@@ -95,7 +95,7 @@ bool AccessibleDialogWindow::ChildDescriptor::operator==( const ChildDescriptor&
return bRet;
}
-// -----------------------------------------------------------------------------
+
bool AccessibleDialogWindow::ChildDescriptor::operator<( const ChildDescriptor& rDesc ) const
{
@@ -106,9 +106,9 @@ bool AccessibleDialogWindow::ChildDescriptor::operator<( const ChildDescriptor&
return bRet;
}
-// -----------------------------------------------------------------------------
+
// class AccessibleDialogWindow
-// -----------------------------------------------------------------------------
+
AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWindow)
: AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
@@ -143,7 +143,7 @@ AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWin
}
}
-// -----------------------------------------------------------------------------
+
AccessibleDialogWindow::~AccessibleDialogWindow()
{
@@ -161,7 +161,7 @@ AccessibleDialogWindow::~AccessibleDialogWindow()
m_pExternalLock = NULL;
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::UpdateFocused()
{
@@ -177,7 +177,7 @@ void AccessibleDialogWindow::UpdateFocused()
}
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::UpdateSelected()
{
@@ -195,7 +195,7 @@ void AccessibleDialogWindow::UpdateSelected()
}
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::UpdateBounds()
{
@@ -211,7 +211,7 @@ void AccessibleDialogWindow::UpdateBounds()
}
}
-// -----------------------------------------------------------------------------
+
bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc )
{
@@ -255,7 +255,7 @@ bool AccessibleDialogWindow::IsChildVisible( const ChildDescriptor& rDesc )
return bVisible;
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::InsertChild( const ChildDescriptor& rDesc )
{
@@ -284,7 +284,7 @@ void AccessibleDialogWindow::InsertChild( const ChildDescriptor& rDesc )
}
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::RemoveChild( const ChildDescriptor& rDesc )
{
@@ -314,7 +314,7 @@ void AccessibleDialogWindow::RemoveChild( const ChildDescriptor& rDesc )
}
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::UpdateChild( const ChildDescriptor& rDesc )
{
@@ -330,7 +330,7 @@ void AccessibleDialogWindow::UpdateChild( const ChildDescriptor& rDesc )
}
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::UpdateChildren()
{
@@ -343,7 +343,7 @@ void AccessibleDialogWindow::UpdateChildren()
}
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::SortChildren()
{
@@ -351,7 +351,7 @@ void AccessibleDialogWindow::SortChildren()
::std::sort( m_aAccessibleChildren.begin(), m_aAccessibleChildren.end() );
}
-// -----------------------------------------------------------------------------
+
IMPL_LINK( AccessibleDialogWindow, WindowEventListener, VclSimpleEvent*, pEvent )
{
@@ -368,7 +368,7 @@ IMPL_LINK( AccessibleDialogWindow, WindowEventListener, VclSimpleEvent*, pEvent
return 0;
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
{
@@ -464,7 +464,7 @@ void AccessibleDialogWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindo
}
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
{
@@ -489,9 +489,9 @@ void AccessibleDialogWindow::FillAccessibleStateSet( utl::AccessibleStateSetHelp
}
}
-// -----------------------------------------------------------------------------
+
// OCommonAccessibleComponent
-// -----------------------------------------------------------------------------
+
awt::Rectangle AccessibleDialogWindow::implGetBounds() throw (RuntimeException)
{
@@ -502,9 +502,9 @@ awt::Rectangle AccessibleDialogWindow::implGetBounds() throw (RuntimeException)
return aBounds;
}
-// -----------------------------------------------------------------------------
+
// SfxListener
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
@@ -563,21 +563,21 @@ void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
}
-// -----------------------------------------------------------------------------
+
// XInterface
-// -----------------------------------------------------------------------------
+
IMPLEMENT_FORWARD_XINTERFACE2( AccessibleDialogWindow, AccessibleExtendedComponentHelper_BASE, AccessibleDialogWindow_BASE )
-// -----------------------------------------------------------------------------
+
// XTypeProvider
-// -----------------------------------------------------------------------------
+
IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleDialogWindow, AccessibleExtendedComponentHelper_BASE, AccessibleDialogWindow_BASE )
-// -----------------------------------------------------------------------------
+
// XComponent
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::disposing()
{
@@ -641,7 +641,7 @@ sal_Int32 AccessibleDialogWindow::getAccessibleChildCount() throw (RuntimeExcept
return m_aAccessibleChildren.size();
}
-// -----------------------------------------------------------------------------
+
Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
{
@@ -669,7 +669,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i
return xChild;
}
-// -----------------------------------------------------------------------------
+
Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( ) throw (RuntimeException)
{
@@ -686,7 +686,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( ) throw (
return xParent;
}
-// -----------------------------------------------------------------------------
+
sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( ) throw (RuntimeException)
{
@@ -713,7 +713,7 @@ sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( ) throw (RuntimeE
return nIndexInParent;
}
-// -----------------------------------------------------------------------------
+
sal_Int16 AccessibleDialogWindow::getAccessibleRole( ) throw (RuntimeException)
{
@@ -722,7 +722,7 @@ sal_Int16 AccessibleDialogWindow::getAccessibleRole( ) throw (RuntimeException)
return AccessibleRole::PANEL;
}
-// -----------------------------------------------------------------------------
+
OUString AccessibleDialogWindow::getAccessibleDescription( ) throw (RuntimeException)
{
@@ -735,7 +735,7 @@ OUString AccessibleDialogWindow::getAccessibleDescription( ) throw (RuntimeExce
return sDescription;
}
-// -----------------------------------------------------------------------------
+
OUString AccessibleDialogWindow::getAccessibleName( ) throw (RuntimeException)
{
@@ -748,7 +748,7 @@ OUString AccessibleDialogWindow::getAccessibleName( ) throw (RuntimeException)
return sName;
}
-// -----------------------------------------------------------------------------
+
Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelationSet( ) throw (RuntimeException)
{
@@ -759,7 +759,7 @@ Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelatio
return xSet;
}
-// -----------------------------------------------------------------------------
+
Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet( ) throw (RuntimeException)
{
@@ -780,7 +780,7 @@ Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet(
return xSet;
}
-// -----------------------------------------------------------------------------
+
Locale AccessibleDialogWindow::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException)
{
@@ -789,9 +789,9 @@ Locale AccessibleDialogWindow::getLocale( ) throw (IllegalAccessibleComponentSt
return Application::GetSettings().GetLanguageTag().getLocale();
}
-// -----------------------------------------------------------------------------
+
// XAccessibleComponent
-// -----------------------------------------------------------------------------
+
Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException)
{
@@ -820,7 +820,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt
return xChild;
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::grabFocus( ) throw (RuntimeException)
{
@@ -830,7 +830,7 @@ void AccessibleDialogWindow::grabFocus( ) throw (RuntimeException)
m_pDialogWindow->GrabFocus();
}
-// -----------------------------------------------------------------------------
+
sal_Int32 AccessibleDialogWindow::getForeground( ) throw (RuntimeException)
{
@@ -855,7 +855,7 @@ sal_Int32 AccessibleDialogWindow::getForeground( ) throw (RuntimeException)
return nColor;
}
-// -----------------------------------------------------------------------------
+
sal_Int32 AccessibleDialogWindow::getBackground( ) throw (RuntimeException)
{
@@ -873,9 +873,9 @@ sal_Int32 AccessibleDialogWindow::getBackground( ) throw (RuntimeException)
return nColor;
}
-// -----------------------------------------------------------------------------
+
// XAccessibleExtendedComponent
-// -----------------------------------------------------------------------------
+
Reference< awt::XFont > AccessibleDialogWindow::getFont( ) throw (RuntimeException)
{
@@ -901,7 +901,7 @@ Reference< awt::XFont > AccessibleDialogWindow::getFont( ) throw (RuntimeExcept
return xFont;
}
-// -----------------------------------------------------------------------------
+
OUString AccessibleDialogWindow::getTitledBorderText( ) throw (RuntimeException)
{
@@ -910,7 +910,7 @@ OUString AccessibleDialogWindow::getTitledBorderText( ) throw (RuntimeException
return OUString();
}
-// -----------------------------------------------------------------------------
+
OUString AccessibleDialogWindow::getToolTipText( ) throw (RuntimeException)
{
@@ -923,9 +923,9 @@ OUString AccessibleDialogWindow::getToolTipText( ) throw (RuntimeException)
return sText;
}
-// -----------------------------------------------------------------------------
+
// XAccessibleSelection
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
{
@@ -945,7 +945,7 @@ void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) thro
}
}
-// -----------------------------------------------------------------------------
+
sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
{
@@ -960,7 +960,7 @@ sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildInde
return false;
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::clearAccessibleSelection()
throw (RuntimeException, std::exception)
@@ -971,7 +971,7 @@ void AccessibleDialogWindow::clearAccessibleSelection()
m_pDialogWindow->GetView().UnmarkAll();
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::selectAllAccessibleChildren( ) throw (RuntimeException)
{
@@ -981,7 +981,7 @@ void AccessibleDialogWindow::selectAllAccessibleChildren( ) throw (RuntimeExcep
m_pDialogWindow->GetView().MarkAll();
}
-// -----------------------------------------------------------------------------
+
sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) throw (RuntimeException)
{
@@ -998,7 +998,7 @@ sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) throw (Run
return nRet;
}
-// -----------------------------------------------------------------------------
+
Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
{
@@ -1021,7 +1021,7 @@ Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal
return xChild;
}
-// -----------------------------------------------------------------------------
+
void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
{
@@ -1042,7 +1042,7 @@ void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex ) th
}
}
-// -----------------------------------------------------------------------------
+
} // namespace basctl
diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx
index 855ad1ee3f6f..0335269819b0 100644
--- a/basctl/source/basicide/basidectrlr.cxx
+++ b/basctl/source/basicide/basidectrlr.cxx
@@ -42,9 +42,6 @@ OUString const sPropertyIconId("IconId");
}
-
-//----------------------------------------------------------------------------
-
Controller::Controller (Shell* pViewShell)
:OPropertyContainer( m_aBHelper )
,SfxBaseController( pViewShell )
@@ -57,14 +54,10 @@ Controller::Controller (Shell* pViewShell)
);
}
-//----------------------------------------------------------------------------
-
Controller::~Controller()
{ }
// XInterface
-//----------------------------------------------------------------------------
-
Any SAL_CALL Controller::queryInterface( const Type & rType ) throw(RuntimeException)
{
Any aReturn = SfxBaseController::queryInterface( rType );
@@ -74,24 +67,17 @@ Any SAL_CALL Controller::queryInterface( const Type & rType ) throw(RuntimeExcep
return aReturn;
}
-//----------------------------------------------------------------------------
-
void SAL_CALL Controller::acquire() throw()
{
SfxBaseController::acquire();
}
-//----------------------------------------------------------------------------
-
void SAL_CALL Controller::release() throw()
{
SfxBaseController::release();
}
-
// XTypeProvider ( ::SfxBaseController )
-//----------------------------------------------------------------------------
-
Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException)
{
Sequence< Type > aTypes = ::comphelper::concatSequences(
@@ -102,8 +88,6 @@ Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException)
return aTypes;
}
-//----------------------------------------------------------------------------
-
Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId() throw(RuntimeException)
{
static ::cppu::OImplementationId * pId = 0;
@@ -120,8 +104,6 @@ Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId() throw(RuntimeExc
}
// XPropertySet
-//----------------------------------------------------------------------------
-
Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() throw(RuntimeException)
{
Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
@@ -129,16 +111,12 @@ Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() t
}
// OPropertySetHelper
-//----------------------------------------------------------------------------
-
::cppu::IPropertyArrayHelper& Controller::getInfoHelper()
{
return *getArrayHelper();
}
// OPropertyArrayUsageHelper
-//----------------------------------------------------------------------------
-
::cppu::IPropertyArrayHelper* Controller::createArrayHelper( ) const
{
Sequence< Property > aProps;
@@ -146,8 +124,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() t
return new ::cppu::OPropertyArrayHelper( aProps );
}
-//----------------------------------------------------------------------------
-
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 721ab895fd53..63c1db46d357 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -50,9 +50,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
-
-//----------------------------------------------------------------------------
-
extern "C" {
SAL_DLLPUBLIC_EXPORT rtl_uString* basicide_choose_macro( void* pOnlyInDocument_AsXModel, sal_Bool bChooseOnly, rtl_uString* pMacroDesc )
{
@@ -71,8 +68,6 @@ extern "C" {
}
}
-//----------------------------------------------------------------------------
-
void Organize( sal_Int16 tabId )
{
EnsureIde();
@@ -86,8 +81,6 @@ void Organize( sal_Int16 tabId )
OrganizeDialog(pParent, tabId, aDesc).Execute();
}
-//----------------------------------------------------------------------------
-
bool IsValidSbxName( const OUString& rName )
{
for ( sal_uInt16 nChar = 0; nChar < rName.getLength(); nChar++ )
@@ -110,8 +103,6 @@ static bool StringCompareLessThan( const OUString& rStr1, const OUString& rStr2
return rStr1.compareToIgnoreAsciiCase( rStr2 ) < 0;
}
-//----------------------------------------------------------------------------
-
Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryContainer >& xModLibContainer, const Reference< script::XLibraryContainer >& xDlgLibContainer )
{
// create a sorted list of module library names
@@ -153,8 +144,6 @@ Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryCon
return aSeqLibNames;
}
-//----------------------------------------------------------------------------
-
bool RenameModule (
Window* pErrorParent,
const ScriptDocument& rDocument,
@@ -212,9 +201,6 @@ bool RenameModule (
return true;
}
-
-//----------------------------------------------------------------------------
-
namespace
{
struct MacroExecutionData
@@ -235,7 +221,6 @@ namespace
DECL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, MacroExecutionData* );
};
-
IMPL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, MacroExecutionData*, i_pData )
{
(void)pThis;
@@ -257,8 +242,6 @@ namespace
}
}
-//----------------------------------------------------------------------------
-
OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument, bool bChooseOnly, const OUString& rMacroDesc )
{
(void)rMacroDesc;
@@ -394,8 +377,6 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
return aScriptURL;
}
-//----------------------------------------------------------------------------
-
Sequence< OUString > GetMethodNames( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName )
throw(NoSuchElementException )
{
@@ -443,8 +424,6 @@ Sequence< OUString > GetMethodNames( const ScriptDocument& rDocument, const OUSt
return aSeqMethods;
}
-//----------------------------------------------------------------------------
-
bool HasMethod (
ScriptDocument const& rDocument,
OUString const& rLibName,
@@ -482,7 +461,6 @@ bool HasMethod (
return bHasMethod;
}
-//----------------------------------------------------------------------------
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 651798d50196..a735a4bd9ab1 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -60,9 +60,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
-
-//----------------------------------------------------------------------------
-
extern "C" {
SAL_DLLPUBLIC_EXPORT long basicide_handle_basic_error( void* pPtr )
{
@@ -70,8 +67,6 @@ extern "C" {
}
}
-//----------------------------------------------------------------------------
-
SbMethod* CreateMacro( SbModule* pModule, const OUString& rMacroName )
{
SfxDispatcher* pDispatcher = GetDispatcher();
@@ -160,8 +155,6 @@ SbMethod* CreateMacro( SbModule* pModule, const OUString& rMacroName )
return pMethod;
}
-//----------------------------------------------------------------------------
-
bool RenameDialog (
Window* pErrorParent,
ScriptDocument const& rDocument,
@@ -226,8 +219,6 @@ bool RenameDialog (
return true;
}
-//----------------------------------------------------------------------------
-
bool RemoveDialog( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rDlgName )
{
if (Shell* pShell = GetShell())
@@ -242,8 +233,6 @@ bool RemoveDialog( const ScriptDocument& rDocument, const OUString& rLibName, co
return rDocument.removeDialog( rLibName, rDlgName );
}
-//----------------------------------------------------------------------------
-
StarBASIC* FindBasic( const SbxVariable* pVar )
{
SbxVariable const* pSbx = pVar;
@@ -252,8 +241,6 @@ StarBASIC* FindBasic( const SbxVariable* pVar )
return (StarBASIC*)pSbx;
}
-//----------------------------------------------------------------------------
-
BasicManager* FindBasicManager( StarBASIC* pLib )
{
ScriptDocuments aDocuments( ScriptDocument::getAllScriptDocuments( ScriptDocument::AllWithApplication ) );
@@ -281,8 +268,6 @@ BasicManager* FindBasicManager( StarBASIC* pLib )
return NULL;
}
-//----------------------------------------------------------------------------
-
void MarkDocumentModified( const ScriptDocument& rDocument )
{
// does not have to come from a document...
@@ -307,8 +292,6 @@ void MarkDocumentModified( const ScriptDocument& rDocument )
}
}
-//----------------------------------------------------------------------------
-
void RunMethod( SbMethod* pMethod )
{
SbxValues aRes;
@@ -316,8 +299,6 @@ void RunMethod( SbMethod* pMethod )
pMethod->Get( aRes );
}
-//----------------------------------------------------------------------------
-
void StopBasic()
{
StarBASIC::Stop();
@@ -335,8 +316,6 @@ void StopBasic()
BasicStopped();
}
-//----------------------------------------------------------------------------
-
void BasicStopped(
bool* pbAppWindowDisabled,
bool* pbDispatcherLocked,
@@ -346,7 +325,6 @@ void BasicStopped(
{
// maybe there are some locks to be removed after an error
// or an explicit cancelling of the basic...
-
if ( pbAppWindowDisabled )
*pbAppWindowDisabled = false;
if ( pbDispatcherLocked )
@@ -358,7 +336,7 @@ void BasicStopped(
if ( ppSWLockViewCount )
*ppSWLockViewCount = 0;
- // AppWait ?
+ // AppWait?
if (Shell* pShell = GetShell())
{
sal_uInt16 nWait = 0;
@@ -381,8 +359,6 @@ void BasicStopped(
}
-//----------------------------------------------------------------------------
-
void InvalidateDebuggerSlots()
{
if (SfxBindings* pBindings = GetBindingsPtr())
@@ -406,8 +382,6 @@ void InvalidateDebuggerSlots()
}
}
-//----------------------------------------------------------------------------
-
long HandleBasicError( StarBASIC* pBasic )
{
EnsureIde();
@@ -465,8 +439,6 @@ long HandleBasicError( StarBASIC* pBasic )
return nRet;
}
-//----------------------------------------------------------------------------
-
SfxBindings* GetBindingsPtr()
{
SfxBindings* pBindings = NULL;
@@ -495,8 +467,6 @@ SfxBindings* GetBindingsPtr()
return pBindings;
}
-//----------------------------------------------------------------------------
-
SfxDispatcher* GetDispatcher ()
{
if (Shell* pShell = GetShell())
@@ -505,8 +475,6 @@ SfxDispatcher* GetDispatcher ()
return pDispatcher;
return 0;
}
-
-//----------------------------------------------------------------------------
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index 95ed06fa12e2..1037da1760a9 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "doceventnotifier.hxx"
#include "scriptdocument.hxx"
@@ -36,10 +35,8 @@
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
-//........................................................................
namespace basctl
{
-//........................................................................
using ::com::sun::star::document::XDocumentEventBroadcaster;
using ::com::sun::star::document::XDocumentEventListener;
@@ -55,9 +52,8 @@ namespace basctl
namespace csslang = ::com::sun::star::lang;
- //====================================================================
- //= DocumentEventNotifier::Impl
- //====================================================================
+ // DocumentEventNotifier::Impl
+
typedef ::cppu::WeakComponentImplHelper1 < XDocumentEventListener
> DocumentEventNotifier_Impl_Base;
@@ -101,7 +97,6 @@ namespace basctl
Reference< XModel > m_xModel;
};
- //--------------------------------------------------------------------
DocumentEventNotifier::Impl::Impl (DocumentEventListener& rListener, Reference<XModel> const& rxDocument) :
DocumentEventNotifier_Impl_Base(m_aMutex),
m_pListener(&rListener),
@@ -112,7 +107,6 @@ namespace basctl
osl_atomic_decrement( &m_refCount );
}
- //--------------------------------------------------------------------
DocumentEventNotifier::Impl::~Impl ()
{
if ( !impl_isDisposed_nothrow() )
@@ -122,7 +116,6 @@ namespace basctl
}
}
- //--------------------------------------------------------------------
void SAL_CALL DocumentEventNotifier::Impl::documentEventOccured( const DocumentEvent& _rEvent ) throw (RuntimeException)
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -176,7 +169,6 @@ namespace basctl
}
}
- //--------------------------------------------------------------------
void SAL_CALL DocumentEventNotifier::Impl::disposing( const csslang::EventObject& /*Event*/ ) throw (RuntimeException)
{
SolarMutexGuard aSolarGuard;
@@ -186,21 +178,18 @@ namespace basctl
impl_dispose_nothrow();
}
- //--------------------------------------------------------------------
void SAL_CALL DocumentEventNotifier::Impl::disposing()
{
impl_listenerAction_nothrow( RemoveListener );
impl_dispose_nothrow();
}
- //--------------------------------------------------------------------
void DocumentEventNotifier::Impl::impl_dispose_nothrow()
{
m_pListener = NULL;
m_xModel.clear();
}
- //--------------------------------------------------------------------
void DocumentEventNotifier::Impl::impl_listenerAction_nothrow( ListenerAction _eAction )
{
try
@@ -225,39 +214,31 @@ namespace basctl
}
}
- //====================================================================
- //= DocumentEventNotifier
- //====================================================================
- //--------------------------------------------------------------------
+ // DocumentEventNotifier
+
DocumentEventNotifier::DocumentEventNotifier (DocumentEventListener& rListener, Reference<XModel> const& rxDocument) :
m_pImpl(new Impl(rListener, rxDocument))
{ }
- //--------------------------------------------------------------------
DocumentEventNotifier::DocumentEventNotifier (DocumentEventListener& rListener) :
m_pImpl(new Impl(rListener, Reference<XModel>()))
{ }
- //--------------------------------------------------------------------
DocumentEventNotifier::~DocumentEventNotifier()
{
}
- //--------------------------------------------------------------------
void DocumentEventNotifier::dispose()
{
m_pImpl->dispose();
}
- //====================================================================
- //= DocumentEventListener
- //====================================================================
+ // DocumentEventListener
+
DocumentEventListener::~DocumentEventListener()
{
}
-//........................................................................
} // namespace basctl
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/docsignature.cxx b/basctl/source/basicide/docsignature.cxx
index 0060ca6f19e9..0553bbd191be 100644
--- a/basctl/source/basicide/docsignature.cxx
+++ b/basctl/source/basicide/docsignature.cxx
@@ -23,11 +23,8 @@
#include <sfx2/objsh.hxx>
#include <sfx2/signaturestate.hxx>
-//........................................................................
namespace basctl
{
-//........................................................................
-
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::UNO_QUERY;
using ::com::sun::star::uno::UNO_QUERY_THROW;
@@ -35,9 +32,8 @@ namespace basctl
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::frame::XModel;
- //====================================================================
- //= DocumentSignature::Impl
- //====================================================================
+ // DocumentSignature::Impl
+
struct DocumentSignature::Impl
{
SfxObjectShell* pShell;
@@ -45,10 +41,8 @@ namespace basctl
Impl () : pShell(0) { }
};
- //====================================================================
- //= DocumentSignature
- //====================================================================
- //--------------------------------------------------------------------
+ // DocumentSignature
+
DocumentSignature::DocumentSignature (ScriptDocument const& rDocument) :
m_pImpl(new Impl)
{
@@ -67,18 +61,15 @@ namespace basctl
}
}
- //--------------------------------------------------------------------
DocumentSignature::~DocumentSignature()
{
}
- //--------------------------------------------------------------------
bool DocumentSignature::supportsSignatures() const
{
return ( m_pImpl->pShell != NULL );
}
- //--------------------------------------------------------------------
void DocumentSignature::signScriptingContent() const
{
OSL_PRECOND( supportsSignatures(), "DocumentSignature::signScriptingContent: signatures not supported by this document!" );
@@ -86,7 +77,6 @@ namespace basctl
m_pImpl->pShell->SignScriptingContent();
}
- //--------------------------------------------------------------------
sal_uInt16 DocumentSignature::getScriptingSignatureState() const
{
if ( m_pImpl->pShell )
@@ -94,8 +84,6 @@ namespace basctl
return SIGNATURESTATE_NOSIGNATURES;
}
-//........................................................................
} // namespace basctl
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx
index f281ecadd112..de65f8cb1a56 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -34,9 +34,7 @@
#include <comphelper/stl_types.hxx>
-//........................................................................
namespace basctl { namespace docs {
-//........................................................................
using ::com::sun::star::uno::Exception;
using ::com::sun::star::uno::Reference;
@@ -59,9 +57,7 @@ namespace basctl { namespace docs {
namespace FrameSearchFlag = ::com::sun::star::frame::FrameSearchFlag;
- //====================================================================
- //= DocumentEnumeration_Data
- //====================================================================
+ // DocumentEnumeration_Data
struct DocumentEnumeration_Data
{
Reference< com::sun::star::uno::XComponentContext > aContext;
@@ -74,24 +70,18 @@ namespace basctl { namespace docs {
}
};
- //====================================================================
- //= DocumentEnumeration
- //====================================================================
- //--------------------------------------------------------------------
+ // DocumentEnumeration
DocumentEnumeration::DocumentEnumeration( Reference< com::sun::star::uno::XComponentContext > const & _rContext, const IDocumentDescriptorFilter* _pFilter )
:m_pData( new DocumentEnumeration_Data( _rContext, _pFilter ) )
{
}
- //--------------------------------------------------------------------
DocumentEnumeration::~DocumentEnumeration()
{
}
- //--------------------------------------------------------------------
namespace
{
- //................................................................
void lcl_getDocumentControllers_nothrow( DocumentDescriptor& _io_rDocDesc )
{
OSL_PRECOND( _io_rDocDesc.xModel.is(), "lcl_getDocumentControllers_nothrow: illegal model!" );
@@ -118,7 +108,6 @@ namespace basctl { namespace docs {
}
}
- //................................................................
void lcl_getDocuments_nothrow( const Sequence< Reference< XFrame > >& _rFrames, Documents& _out_rDocuments,
const IDocumentDescriptorFilter* _pFilter )
{
@@ -170,7 +159,6 @@ namespace basctl { namespace docs {
}
}
- //--------------------------------------------------------------------
void DocumentEnumeration::getDocuments( Documents& _out_rDocuments ) const
{
_out_rDocuments.clear();
@@ -189,8 +177,6 @@ namespace basctl { namespace docs {
}
}
-//........................................................................
} } // namespace basctl::docs
-//........................................................................
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 475d182ec29f..ae356ed80632 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -74,7 +74,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::ui::dialogs;
-
typedef ::cppu::WeakImplHelper1< task::XInteractionHandler > HandlerImpl_BASE;
namespace
@@ -97,9 +96,7 @@ public:
}
};
-//----------------------------------------------------------------------------
-// LibUserData
-//----------------------------------------------------------------------------
+// LibUserData
class LibUserData
{
private:
@@ -112,10 +109,7 @@ public:
const ScriptDocument& GetDocument() const { return m_aDocument; }
};
-//----------------------------------------------------------------------------
// LibLBoxString
-//----------------------------------------------------------------------------
-
class LibLBoxString : public SvLBoxString
{
public:
@@ -125,8 +119,6 @@ public:
virtual void Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
};
-//----------------------------------------------------------------------------
-
void LibLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry)
{
// Change text color if library is read only:
@@ -156,11 +148,7 @@ void LibLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDa
} // namespace
-
-//----------------------------------------------------------------------------
// basctl::CheckBox
-//----------------------------------------------------------------------------
-
CheckBox::CheckBox(Window* pParent, WinBits nStyle)
: SvTabListBox(pParent, nStyle)
, eMode(ObjectMode::Module)
@@ -181,8 +169,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCheckBox(Window *pParent, V
return new CheckBox(pParent, nWinBits);
}
-//----------------------------------------------------------------------------
-
CheckBox::~CheckBox()
{
delete pCheckButton;
@@ -196,8 +182,6 @@ CheckBox::~CheckBox()
}
}
-//----------------------------------------------------------------------------
-
void CheckBox::Init()
{
pCheckButton = new SvLBoxButtonData(this);
@@ -210,8 +194,6 @@ void CheckBox::Init()
SetHighlightRange();
}
-//----------------------------------------------------------------------------
-
void CheckBox::SetMode (ObjectMode::Mode e)
{
eMode = e;
@@ -222,15 +204,11 @@ void CheckBox::SetMode (ObjectMode::Mode e)
EnableCheckButton( 0 );
}
-//----------------------------------------------------------------------------
-
SvTreeListEntry* CheckBox::DoInsertEntry( const OUString& rStr, sal_uLong nPos )
{
return SvTabListBox::InsertEntryToColumn( rStr, nPos, 0 );
}
-//----------------------------------------------------------------------------
-
SvTreeListEntry* CheckBox::FindEntry( const OUString& rName )
{
sal_uLong nCount = GetEntryCount();
@@ -244,8 +222,6 @@ SvTreeListEntry* CheckBox::FindEntry( const OUString& rName )
return 0;
}
-//----------------------------------------------------------------------------
-
void CheckBox::CheckEntryPos( sal_uLong nPos )
{
if ( nPos < GetEntryCount() )
@@ -257,8 +233,6 @@ void CheckBox::CheckEntryPos( sal_uLong nPos )
}
}
-//----------------------------------------------------------------------------
-
bool CheckBox::IsChecked( sal_uLong nPos ) const
{
if ( nPos < GetEntryCount() )
@@ -266,8 +240,6 @@ bool CheckBox::IsChecked( sal_uLong nPos ) const
return false;
}
-//----------------------------------------------------------------------------
-
void CheckBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rTxt,
const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind )
{
@@ -286,8 +258,6 @@ void CheckBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rTxt,
}
}
-//----------------------------------------------------------------------------
-
sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
{
if (eMode != ObjectMode::Module)
@@ -334,8 +304,6 @@ sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& )
return true;
}
-//----------------------------------------------------------------------------
-
sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName )
{
bool bValid = rNewName.getLength() <= 30 && IsValidSbxName(rNewName);
@@ -382,10 +350,7 @@ sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewNam
return bValid;
}
-//----------------------------------------------------------------------------
// NewObjectDialog
-//----------------------------------------------------------------------------
-
IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler)
{
if (IsValidSbxName(m_pEdit->GetText()))
@@ -429,10 +394,7 @@ NewObjectDialog::NewObjectDialog(Window * pParent, ObjectMode::Mode eMode,
m_pOKButton->SetClickHdl(LINK(this, NewObjectDialog, OkButtonHandler));
}
-//----------------------------------------------------------------------------
// GotoLineDialog
-//----------------------------------------------------------------------------
-
GotoLineDialog::GotoLineDialog(Window * pParent )
: ModalDialog(pParent, "GotoLineDialog",
"modules/BasicIDE/ui/gotolinedialog.ui")
@@ -457,11 +419,7 @@ IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler)
return 0;
}
-
-//----------------------------------------------------------------------------
// ExportDialog
-//----------------------------------------------------------------------------
-
IMPL_LINK_NOARG(ExportDialog, OkButtonHandler)
{
mbExportAsPackage = m_pExportAsPackageButton->IsChecked();
@@ -481,10 +439,7 @@ ExportDialog::ExportDialog(Window * pParent)
m_pOKButton->SetClickHdl(LINK(this, ExportDialog, OkButtonHandler));
}
-//----------------------------------------------------------------------------
-// LibPage
-//----------------------------------------------------------------------------
-
+// LibPage
LibPage::LibPage(Window * pParent)
: TabPage(pParent, "LibPage",
"modules/BasicIDE/ui/libpage.ui")
@@ -529,8 +484,6 @@ LibPage::LibPage(Window * pParent)
CheckButtons();
}
-//----------------------------------------------------------------------------
-
LibPage::~LibPage()
{
sal_uInt16 nCount = m_pBasicsBox->GetEntryCount();
@@ -541,8 +494,6 @@ LibPage::~LibPage()
}
}
-//----------------------------------------------------------------------------
-
void LibPage::CheckButtons()
{
SvTreeListEntry* pCur = m_pLibBox->GetCurEntry();
@@ -594,23 +545,15 @@ void LibPage::CheckButtons()
}
}
-//----------------------------------------------------------------------------
-
void LibPage::ActivatePage()
{
SetCurLib();
}
-//----------------------------------------------------------------------------
-
-
void LibPage::DeactivatePage()
{
}
-//----------------------------------------------------------------------------
-
-
IMPL_LINK_INLINE_START( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox )
{
if ( pBox->IsSelected( pBox->GetHdlEntry() ) )
@@ -619,8 +562,6 @@ IMPL_LINK_INLINE_START( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox )
}
IMPL_LINK_INLINE_END( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox )
-//----------------------------------------------------------------------------
-
IMPL_LINK_INLINE_START( LibPage, BasicSelectHdl, ListBox *, pBox )
{
(void)pBox;
@@ -630,8 +571,6 @@ IMPL_LINK_INLINE_START( LibPage, BasicSelectHdl, ListBox *, pBox )
}
IMPL_LINK_INLINE_END( LibPage, BasicSelectHdl, ListBox *, pBox )
-//----------------------------------------------------------------------------
-
IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
{
if (pButton == m_pEditButton)
@@ -722,8 +661,6 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton )
return 0;
}
-//----------------------------------------------------------------------------
-
IMPL_LINK_INLINE_START( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
{
long nRet = 0;
@@ -750,15 +687,11 @@ IMPL_LINK_INLINE_START( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
}
IMPL_LINK_INLINE_END( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg )
-//----------------------------------------------------------------------------
-
void LibPage::NewLib()
{
createLibImpl( static_cast<Window*>( this ), m_aCurDocument, m_pLibBox, NULL);
}
-//----------------------------------------------------------------------------
-
void LibPage::InsertLib()
{
Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
@@ -1119,8 +1052,6 @@ void LibPage::InsertLib()
}
}
-//----------------------------------------------------------------------------
-
void LibPage::Export( void )
{
SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry();
@@ -1146,7 +1077,6 @@ void LibPage::Export( void )
return;
}
-
ExportDialog aNewDlg(this);
if (aNewDlg.Execute() == RET_OK)
{
@@ -1178,10 +1108,7 @@ void LibPage::implExportLib( const OUString& aLibName, const OUString& aTargetUR
xDlgLibContainerExport->exportLibrary( aOULibName, aTargetURL, Handler );
}
-
-//===========================================================================
// Implementation XCommandEnvironment
-
typedef cppu::WeakImplHelper1< XCommandEnvironment > LibCommandEnvironmentHelper;
class OLibCommandEnvironment : public LibCommandEnvironmentHelper
@@ -1213,8 +1140,6 @@ Reference< XProgressHandler > OLibCommandEnvironment::getProgressHandler()
return xRet;
}
-
-
void LibPage::ExportAsPackage( const OUString& aLibName )
{
// file open dialog
@@ -1364,8 +1289,6 @@ void LibPage::ExportAsBasic( const OUString& aLibName )
}
}
-//----------------------------------------------------------------------------
-
void LibPage::DeleteCurrent()
{
SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry();
@@ -1402,8 +1325,6 @@ void LibPage::DeleteCurrent()
}
}
-//----------------------------------------------------------------------------
-
void LibPage::EndTabDialog( sal_uInt16 nRet )
{
DBG_ASSERT( pTabDlg, "TabDlg nicht gesetzt!" );
@@ -1411,8 +1332,6 @@ void LibPage::EndTabDialog( sal_uInt16 nRet )
pTabDlg->EndDialog( nRet );
}
-//----------------------------------------------------------------------------
-
void LibPage::FillListBox()
{
InsertListBoxEntry( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_USER );
@@ -1428,8 +1347,6 @@ void LibPage::FillListBox()
}
}
-//----------------------------------------------------------------------------
-
void LibPage::InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocation eLocation )
{
OUString aEntryText( rDocument.getTitle( eLocation ) );
@@ -1437,8 +1354,6 @@ void LibPage::InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocati
m_pBasicsBox->SetEntryData( nPos, new DocumentEntry(rDocument, eLocation) );
}
-//----------------------------------------------------------------------------
-
void LibPage::SetCurLib()
{
sal_uInt16 nSelPos = m_pBasicsBox->GetSelectEntryPos();
@@ -1477,8 +1392,6 @@ void LibPage::SetCurLib()
}
}
-//----------------------------------------------------------------------------
-
SvTreeListEntry* LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong nPos )
{
// check, if library is password protected
@@ -1514,8 +1427,6 @@ SvTreeListEntry* LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong
return pNewEntry;
}
-//----------------------------------------------------------------------------
-
// Helper function
void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
CheckBox* pLibBox, TreeListBox* pBasicBox )
@@ -1624,9 +1535,6 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
}
}
}
-
-//----------------------------------------------------------------------------
-
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/tbxctl.hxx b/basctl/source/basicide/tbxctl.hxx
index 320336093782..18eefab9af17 100644
--- a/basctl/source/basicide/tbxctl.hxx
+++ b/basctl/source/basicide/tbxctl.hxx
@@ -25,9 +25,6 @@
namespace basctl
{
-//-------------------
-// class TbxControls
-//-------------------
class TbxControls : public SfxToolBoxControl
{
private:
diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx
index ba1d2193c95d..46b9f2fa8183 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -26,7 +26,6 @@
namespace basctl
{
-//-----------------------------------------------------------------------------
class SIDEModel : public SfxBaseModel,
public com::sun::star::lang::XServiceInfo
{
diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx
index 99b8684bbbd3..dbef9d595db4 100644
--- a/basctl/source/dlged/dlgedclip.cxx
+++ b/basctl/source/dlged/dlgedclip.cxx
@@ -33,24 +33,14 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::datatransfer;
using namespace ::com::sun::star::datatransfer::clipboard;
-
-
-//----------------------------------------------------------------------------
-
DlgEdTransferableImpl::DlgEdTransferableImpl( const Sequence< DataFlavor >& aSeqFlavors, const Sequence< Any >& aSeqData )
{
m_SeqFlavors = aSeqFlavors;
m_SeqData = aSeqData;
}
-
-//----------------------------------------------------------------------------
-
DlgEdTransferableImpl::~DlgEdTransferableImpl()
{
}
-
-//----------------------------------------------------------------------------
-
sal_Bool DlgEdTransferableImpl::compareDataFlavors( const DataFlavor& lFlavor, const DataFlavor& rFlavor )
{
// compare mime content types
@@ -71,8 +61,6 @@ sal_Bool DlgEdTransferableImpl::compareDataFlavors( const DataFlavor& lFlavor, c
}
// XTransferable
-//----------------------------------------------------------------------------
-
Any SAL_CALL DlgEdTransferableImpl::getTransferData( const DataFlavor& rFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException)
{
const SolarMutexGuard aGuard;
@@ -93,18 +81,12 @@ Any SAL_CALL DlgEdTransferableImpl::getTransferData( const DataFlavor& rFlavor )
return aData;
}
-
-//----------------------------------------------------------------------------
-
Sequence< DataFlavor > SAL_CALL DlgEdTransferableImpl::getTransferDataFlavors( ) throw(RuntimeException)
{
const SolarMutexGuard aGuard;
return m_SeqFlavors;
}
-
-//----------------------------------------------------------------------------
-
sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor& rFlavor ) throw(RuntimeException)
{
const SolarMutexGuard aGuard;
@@ -116,8 +98,6 @@ sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor
}
// XClipboardOwner
-//----------------------------------------------------------------------------
-
void SAL_CALL DlgEdTransferableImpl::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) throw(RuntimeException)
{
const SolarMutexGuard aGuard;
@@ -125,8 +105,6 @@ void SAL_CALL DlgEdTransferableImpl::lostOwnership( const Reference< XClipboard
m_SeqFlavors = Sequence< DataFlavor >();
m_SeqData = Sequence< Any >();
}
-
-
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 85ec1bf6b092..f5f2c4137b99 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -27,8 +27,6 @@
namespace basctl
{
-//----------------------------------------------------------------------------
-
IMPL_LINK_INLINE_START( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
{
(void)pTimer;
@@ -40,8 +38,6 @@ IMPL_LINK_INLINE_START( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
}
IMPL_LINK_INLINE_END( DlgEdFunc, ScrollTimeout, Timer *, pTimer )
-//----------------------------------------------------------------------------
-
void DlgEdFunc::ForceScroll( const Point& rPos )
{
aScrollTimer.Stop();
@@ -83,8 +79,6 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
aScrollTimer.Start();
}
-//----------------------------------------------------------------------------
-
DlgEdFunc::DlgEdFunc (DlgEditor& rParent_) :
rParent(rParent_)
{
@@ -92,36 +86,26 @@ DlgEdFunc::DlgEdFunc (DlgEditor& rParent_) :
aScrollTimer.SetTimeout( SELENG_AUTOREPEAT_INTERVAL );
}
-//----------------------------------------------------------------------------
-
DlgEdFunc::~DlgEdFunc()
{
}
-//----------------------------------------------------------------------------
-
bool DlgEdFunc::MouseButtonDown( const MouseEvent& )
{
return true;
}
-//----------------------------------------------------------------------------
-
bool DlgEdFunc::MouseButtonUp( const MouseEvent& )
{
aScrollTimer.Stop();
return true;
}
-//----------------------------------------------------------------------------
-
bool DlgEdFunc::MouseMove( const MouseEvent& )
{
return true;
}
-//----------------------------------------------------------------------------
-
bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
{
bool bReturn = false;
@@ -349,23 +333,17 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt )
return bReturn;
}
-//----------------------------------------------------------------------------
-
DlgEdFuncInsert::DlgEdFuncInsert (DlgEditor& rParent_) :
DlgEdFunc(rParent_)
{
rParent.GetView().SetCreateMode(true);
}
-//----------------------------------------------------------------------------
-
DlgEdFuncInsert::~DlgEdFuncInsert()
{
rParent.GetView().SetEditMode( true );
}
-//----------------------------------------------------------------------------
-
bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
{
if( !rMEvt.IsLeft() )
@@ -405,8 +383,6 @@ bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
return true;
}
-//----------------------------------------------------------------------------
-
bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
{
DlgEdFunc::MouseButtonUp( rMEvt );
@@ -439,8 +415,6 @@ bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
}
}
-//----------------------------------------------------------------------------
-
bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
{
SdrView& rView = rParent.GetView();
@@ -461,22 +435,16 @@ bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
return true;
}
-//----------------------------------------------------------------------------
-
DlgEdFuncSelect::DlgEdFuncSelect (DlgEditor& rParent_) :
DlgEdFunc(rParent_),
bMarkAction(false)
{
}
-//----------------------------------------------------------------------------
-
DlgEdFuncSelect::~DlgEdFuncSelect()
{
}
-//----------------------------------------------------------------------------
-
bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
{
// get view from parent
@@ -539,8 +507,6 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
return true;
}
-//----------------------------------------------------------------------------
-
bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
{
DlgEdFunc::MouseButtonUp( rMEvt );
@@ -575,8 +541,6 @@ bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
return true;
}
-//----------------------------------------------------------------------------
-
bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
{
SdrView& rView = rParent.GetView();
@@ -600,8 +564,6 @@ bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
return true;
}
-//----------------------------------------------------------------------------
-
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedlist.cxx b/basctl/source/dlged/dlgedlist.cxx
index fbcc89c26309..ad871511cd30 100644
--- a/basctl/source/dlged/dlgedlist.cxx
+++ b/basctl/source/dlged/dlgedlist.cxx
@@ -23,88 +23,58 @@
namespace basctl
{
-//============================================================================
// DlgEdPropListenerImpl
-//============================================================================
-
-//----------------------------------------------------------------------------
-
DlgEdPropListenerImpl::DlgEdPropListenerImpl (DlgEdObj& rObj) :
rDlgEdObj(rObj)
{
}
-//----------------------------------------------------------------------------
-
DlgEdPropListenerImpl::~DlgEdPropListenerImpl()
{
}
// XEventListener
-//----------------------------------------------------------------------------
-
void SAL_CALL DlgEdPropListenerImpl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException)
{
}
// XPropertyChangeListener
-//----------------------------------------------------------------------------
-
void SAL_CALL DlgEdPropListenerImpl::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException)
{
rDlgEdObj._propertyChange( evt );
}
-//----------------------------------------------------------------------------
-
-//============================================================================
// DlgEdEvtContListenerImpl
-//============================================================================
-
-//----------------------------------------------------------------------------
-
DlgEdEvtContListenerImpl::DlgEdEvtContListenerImpl (DlgEdObj& rObj) :
rDlgEdObj(rObj)
{
}
-//----------------------------------------------------------------------------
-
DlgEdEvtContListenerImpl::~DlgEdEvtContListenerImpl()
{
}
// XEventListener
-//----------------------------------------------------------------------------
-
void SAL_CALL DlgEdEvtContListenerImpl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException)
{
}
// XContainerListener
-//----------------------------------------------------------------------------
-
void SAL_CALL DlgEdEvtContListenerImpl::elementInserted(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException)
{
rDlgEdObj._elementInserted( Event );
}
-//----------------------------------------------------------------------------
-
void SAL_CALL DlgEdEvtContListenerImpl::elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException)
{
rDlgEdObj._elementReplaced( Event );
}
-//----------------------------------------------------------------------------
-
void SAL_CALL DlgEdEvtContListenerImpl::elementRemoved(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException)
{
rDlgEdObj._elementRemoved( Event );
}
-//----------------------------------------------------------------------------
-
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx
index 93527d1b9761..4c83b53e3eac 100644
--- a/basctl/source/dlged/dlgedmod.cxx
+++ b/basctl/source/dlged/dlgedmod.cxx
@@ -28,31 +28,23 @@ DBG_NAME(DlgEdModel)
TYPEINIT1(DlgEdModel,SdrModel);
-//----------------------------------------------------------------------------
-
DlgEdModel::DlgEdModel()
:SdrModel(NULL, NULL)
{
DBG_CTOR(DlgEdModel,0);
}
-//----------------------------------------------------------------------------
-
DlgEdModel::~DlgEdModel()
{
DBG_DTOR(DlgEdModel,0);
}
-//----------------------------------------------------------------------------
-
SdrPage* DlgEdModel::AllocPage(bool bMasterPage)
{
DBG_CHKTHIS(DlgEdModel, 0);
return new DlgEdPage(*this, bMasterPage);
}
-//----------------------------------------------------------------------------
-
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 35c41cf73072..379f6bc8956c 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "dlged.hxx"
#include "dlgeddef.hxx"
#include "dlgedlist.hxx"
@@ -61,8 +60,6 @@ DlgEditor& DlgEdObj::GetDialogEditor ()
return pDlgEdForm->GetDlgEditor();
}
-//----------------------------------------------------------------------------
-
DlgEdObj::DlgEdObj()
:SdrUnoObj(OUString(), false)
,bIsListening(false)
@@ -71,8 +68,6 @@ DlgEdObj::DlgEdObj()
DBG_CTOR(DlgEdObj, NULL);
}
-//----------------------------------------------------------------------------
-
DlgEdObj::DlgEdObj(const OUString& rModelName,
const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac)
:SdrUnoObj(rModelName, rxSFac, false)
@@ -82,8 +77,6 @@ DlgEdObj::DlgEdObj(const OUString& rModelName,
DBG_CTOR(DlgEdObj, NULL);
}
-//----------------------------------------------------------------------------
-
DlgEdObj::~DlgEdObj()
{
DBG_DTOR(DlgEdObj, NULL);
@@ -92,19 +85,15 @@ DlgEdObj::~DlgEdObj()
EndListening();
}
-//----------------------------------------------------------------------------
-
void DlgEdObj::SetPage(SdrPage* _pNewPage)
{
// now set the page
SdrUnoObj::SetPage(_pNewPage);
}
-//----------------------------------------------------------------------------
-
namespace
{
- /** returns the DlgEdForm which the given DlgEdObj belongs to
+ /* returns the DlgEdForm which the given DlgEdObj belongs to
(which might in fact be the object itself)
Failure to obtain the form will be reported with an assertion in the non-product
@@ -120,8 +109,6 @@ namespace
}
}
-//----------------------------------------------------------------------------
-
uno::Reference< awt::XControl > DlgEdObj::GetControl() const
{
uno::Reference< awt::XControl > xControl;
@@ -133,8 +120,6 @@ uno::Reference< awt::XControl > DlgEdObj::GetControl() const
return xControl;
}
-//----------------------------------------------------------------------------
-
bool DlgEdObj::TransformSdrToControlCoordinates(
sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut )
@@ -190,8 +175,6 @@ bool DlgEdObj::TransformSdrToControlCoordinates(
return true;
}
-//----------------------------------------------------------------------------
-
bool DlgEdObj::TransformSdrToFormCoordinates(
sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut )
@@ -239,8 +222,6 @@ bool DlgEdObj::TransformSdrToFormCoordinates(
return true;
}
-//----------------------------------------------------------------------------
-
bool DlgEdObj::TransformControlToSdrCoordinates(
sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut )
@@ -301,8 +282,6 @@ bool DlgEdObj::TransformControlToSdrCoordinates(
return true;
}
-//----------------------------------------------------------------------------
-
bool DlgEdObj::TransformFormToSdrCoordinates(
sal_Int32 nXIn, sal_Int32 nYIn, sal_Int32 nWidthIn, sal_Int32 nHeightIn,
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut )
@@ -352,8 +331,6 @@ bool DlgEdObj::TransformFormToSdrCoordinates(
return true;
}
-//----------------------------------------------------------------------------
-
void DlgEdObj::SetRectFromProps()
{
// get control position and size from properties
@@ -378,8 +355,6 @@ void DlgEdObj::SetRectFromProps()
}
}
-//----------------------------------------------------------------------------
-
void DlgEdObj::SetPropsFromRect()
{
// get control position and size from rectangle
@@ -410,8 +385,6 @@ void DlgEdObj::SetPropsFromRect()
}
}
-//----------------------------------------------------------------------------
-
void DlgEdObj::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
{
DBG_ASSERT( pDlgEdForm, "DlgEdObj::PositionAndSizeChange: no form!" );
@@ -482,8 +455,6 @@ void DlgEdObj::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
SetRectFromProps();
}
-//----------------------------------------------------------------------------
-
void SAL_CALL DlgEdObj::NameChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException)
{
// get old name
@@ -530,8 +501,6 @@ void SAL_CALL DlgEdObj::NameChange( const ::com::sun::star::beans::PropertyChan
}
}
-//----------------------------------------------------------------------------
-
sal_Int32 DlgEdObj::GetStep() const
{
// get step property
@@ -544,8 +513,6 @@ sal_Int32 DlgEdObj::GetStep() const
return nStep;
}
-//----------------------------------------------------------------------------
-
void DlgEdObj::UpdateStep()
{
sal_Int32 nCurStep = GetDlgEdForm()->GetStep();
@@ -572,8 +539,6 @@ void DlgEdObj::UpdateStep()
}
}
-//----------------------------------------------------------------------------
-
void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) throw (RuntimeException)
{
DlgEdForm* pForm = GetDlgEdForm();
@@ -669,8 +634,6 @@ void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) throw (Ru
}
}
-//----------------------------------------------------------------------------
-
bool DlgEdObj::supportsService( OUString const & serviceName ) const
{
bool bSupports = false;
@@ -683,8 +646,6 @@ bool DlgEdObj::supportsService( OUString const & serviceName ) const
return bSupports;
}
-//----------------------------------------------------------------------------
-
OUString DlgEdObj::GetDefaultName() const
{
sal_uInt16 nResId = 0;
@@ -790,8 +751,6 @@ OUString DlgEdObj::GetDefaultName() const
return aDefaultName;
}
-//----------------------------------------------------------------------------
-
OUString DlgEdObj::GetUniqueName() const
{
OUString aUniqueName;
@@ -811,15 +770,11 @@ OUString DlgEdObj::GetUniqueName() const
return aUniqueName;
}
-//----------------------------------------------------------------------------
-
sal_uInt32 DlgEdObj::GetObjInventor() const
{
return DlgInventor;
}
-//----------------------------------------------------------------------------
-
sal_uInt16 DlgEdObj::GetObjIdentifier() const
{
if ( supportsService( "com.sun.star.awt.UnoControlDialogModel" ))
@@ -912,8 +867,6 @@ sal_uInt16 DlgEdObj::GetObjIdentifier() const
}
}
-//----------------------------------------------------------------------------
-
void DlgEdObj::clonedFrom(const DlgEdObj* _pSource)
{
// set parent form
@@ -955,8 +908,6 @@ void DlgEdObj::clonedFrom(const DlgEdObj* _pSource)
StartListening();
}
-//----------------------------------------------------------------------------
-
DlgEdObj* DlgEdObj::Clone() const
{
DlgEdObj* pDlgEdObj = CloneHelper< DlgEdObj >();
@@ -967,8 +918,6 @@ DlgEdObj* DlgEdObj::Clone() const
return pDlgEdObj;
}
-//----------------------------------------------------------------------------
-
SdrObject* DlgEdObj::getFullDragClone() const
{
// no need to really add the clone for dragging, it's a temporary
@@ -979,8 +928,6 @@ SdrObject* DlgEdObj::getFullDragClone() const
return pObj;
}
-//----------------------------------------------------------------------------
-
void DlgEdObj::NbcMove( const Size& rSize )
{
SdrUnoObj::NbcMove( rSize );
@@ -998,8 +945,6 @@ void DlgEdObj::NbcMove( const Size& rSize )
GetDlgEdForm()->GetDlgEditor().SetDialogModelChanged(true);
}
-//----------------------------------------------------------------------------
-
void DlgEdObj::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract)
{
SdrUnoObj::NbcResize( rRef, xFract, yFract );
@@ -1017,8 +962,6 @@ void DlgEdObj::NbcResize(const Point& rRef, const Fraction& xFract, const Fracti
GetDlgEdForm()->GetDlgEditor().SetDialogModelChanged(true);
}
-//----------------------------------------------------------------------------
-
bool DlgEdObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
bool bResult = SdrUnoObj::EndCreate(rStat, eCmd);
@@ -1029,8 +972,6 @@ bool DlgEdObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
return bResult;
}
-//----------------------------------------------------------------------------
-
void DlgEdObj::SetDefaults()
{
// set parent form
@@ -1114,8 +1055,6 @@ void DlgEdObj::SetDefaults()
}
}
-//----------------------------------------------------------------------------
-
void DlgEdObj::StartListening()
{
DBG_ASSERT(!isListening(), "DlgEdObj::StartListening: already listening!");
@@ -1152,8 +1091,6 @@ void DlgEdObj::StartListening()
}
}
-//----------------------------------------------------------------------------
-
void DlgEdObj::EndListening(bool bRemoveListener)
{
DBG_ASSERT(isListening(), "DlgEdObj::EndListening: not listening currently!");
@@ -1189,8 +1126,6 @@ void DlgEdObj::EndListening(bool bRemoveListener)
}
}
-//----------------------------------------------------------------------------
-
void SAL_CALL DlgEdObj::_propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException)
{
if (isListening())
@@ -1237,8 +1172,6 @@ void SAL_CALL DlgEdObj::_propertyChange( const ::com::sun::star::beans::Propert
}
}
-//----------------------------------------------------------------------------
-
void SAL_CALL DlgEdObj::_elementInserted(const ::com::sun::star::container::ContainerEvent& ) throw(::com::sun::star::uno::RuntimeException)
{
if (isListening())
@@ -1248,8 +1181,6 @@ void SAL_CALL DlgEdObj::_elementInserted(const ::com::sun::star::container::Cont
}
}
-//----------------------------------------------------------------------------
-
void SAL_CALL DlgEdObj::_elementReplaced(const ::com::sun::star::container::ContainerEvent& ) throw(::com::sun::star::uno::RuntimeException)
{
if (isListening())
@@ -1259,8 +1190,6 @@ void SAL_CALL DlgEdObj::_elementReplaced(const ::com::sun::star::container::Cont
}
}
-//----------------------------------------------------------------------------
-
void SAL_CALL DlgEdObj::_elementRemoved(const ::com::sun::star::container::ContainerEvent& ) throw(::com::sun::star::uno::RuntimeException)
{
if (isListening())
@@ -1270,8 +1199,6 @@ void SAL_CALL DlgEdObj::_elementRemoved(const ::com::sun::star::container::Conta
}
}
-//----------------------------------------------------------------------------
-
void DlgEdObj::SetLayer(SdrLayerID nLayer)
{
SdrLayerID nOldLayer = GetLayer();
@@ -1285,28 +1212,20 @@ void DlgEdObj::SetLayer(SdrLayerID nLayer)
}
}
-//----------------------------------------------------------------------------
-
TYPEINIT1(DlgEdForm, DlgEdObj);
DBG_NAME(DlgEdForm);
-//----------------------------------------------------------------------------
-
DlgEdForm::DlgEdForm (DlgEditor& rDlgEditor_) :
rDlgEditor(rDlgEditor_)
{
DBG_CTOR(DlgEdForm, NULL);
}
-//----------------------------------------------------------------------------
-
DlgEdForm::~DlgEdForm()
{
DBG_DTOR(DlgEdForm, NULL);
}
-//----------------------------------------------------------------------------
-
void DlgEdForm::SetRectFromProps()
{
// get form position and size from properties
@@ -1331,8 +1250,6 @@ void DlgEdForm::SetRectFromProps()
}
}
-//----------------------------------------------------------------------------
-
void DlgEdForm::SetPropsFromRect()
{
// get form position and size from rectangle
@@ -1363,22 +1280,16 @@ void DlgEdForm::SetPropsFromRect()
}
}
-//----------------------------------------------------------------------------
-
void DlgEdForm::AddChild( DlgEdObj* pDlgEdObj )
{
pChildren.push_back( pDlgEdObj );
}
-//----------------------------------------------------------------------------
-
void DlgEdForm::RemoveChild( DlgEdObj* pDlgEdObj )
{
pChildren.erase( ::std::find( pChildren.begin() , pChildren.end() , pDlgEdObj ) );
}
-//----------------------------------------------------------------------------
-
void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
{
DlgEditor& rEditor = GetDlgEditor();
@@ -1495,8 +1406,6 @@ void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt )
(*aIter)->SetRectFromProps();
}
-//----------------------------------------------------------------------------
-
void DlgEdForm::UpdateStep()
{
sal_uLong nObjCount;
@@ -1513,8 +1422,6 @@ void DlgEdForm::UpdateStep()
}
}
-//----------------------------------------------------------------------------
-
void DlgEdForm::UpdateTabIndices()
{
// stop listening with all children
@@ -1577,8 +1484,6 @@ void DlgEdForm::UpdateTabIndices()
}
}
-//----------------------------------------------------------------------------
-
void DlgEdForm::UpdateTabOrder()
{
// #110559#
@@ -1599,8 +1504,6 @@ void DlgEdForm::UpdateTabOrder()
}
}
-//----------------------------------------------------------------------------
-
void DlgEdForm::UpdateGroups()
{
// #110559#
@@ -1667,16 +1570,12 @@ void DlgEdForm::UpdateGroups()
}
}
-//----------------------------------------------------------------------------
-
void DlgEdForm::UpdateTabOrderAndGroups()
{
UpdateTabOrder();
UpdateGroups();
}
-//----------------------------------------------------------------------------
-
void DlgEdForm::NbcMove( const Size& rSize )
{
SdrUnoObj::NbcMove( rSize );
@@ -1699,8 +1598,6 @@ void DlgEdForm::NbcMove( const Size& rSize )
GetDlgEditor().SetDialogModelChanged(true);
}
-//----------------------------------------------------------------------------
-
void DlgEdForm::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract)
{
SdrUnoObj::NbcResize( rRef, xFract, yFract );
@@ -1723,8 +1620,6 @@ void DlgEdForm::NbcResize(const Point& rRef, const Fraction& xFract, const Fract
GetDlgEditor().SetDialogModelChanged(true);
}
-//----------------------------------------------------------------------------
-
bool DlgEdForm::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
bool bResult = SdrUnoObj::EndCreate(rStat, eCmd);
@@ -1744,8 +1639,6 @@ bool DlgEdForm::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
return bResult;
}
-//----------------------------------------------------------------------------
-
awt::DeviceInfo DlgEdForm::getDeviceInfo() const
{
awt::DeviceInfo aDeviceInfo;
@@ -1809,8 +1702,6 @@ bool DlgEdObj::MakeDataAware( const Reference< frame::XModel >& xModel )
}
return bRes;
}
-//----------------------------------------------------------------------------
-
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedpage.cxx b/basctl/source/dlged/dlgedpage.cxx
index d315227f2183..c170032928dd 100644
--- a/basctl/source/dlged/dlgedpage.cxx
+++ b/basctl/source/dlged/dlgedpage.cxx
@@ -27,29 +27,23 @@ namespace basctl
TYPEINIT1( DlgEdPage, SdrPage );
-//----------------------------------------------------------------------------
-
DlgEdPage::DlgEdPage(DlgEdModel& rModel, bool bMasterPage)
: SdrPage(rModel, bMasterPage)
, pDlgEdForm(0)
{
}
-//----------------------------------------------------------------------------
-
DlgEdPage::~DlgEdPage()
{
Clear();
}
-//----------------------------------------------------------------------------
SdrPage* DlgEdPage::Clone() const
{
return new DlgEdPage( *this );
}
-//----------------------------------------------------------------------------
SdrObject* DlgEdPage::SetObjectOrdNum(sal_uLong nOldObjNum, sal_uLong nNewObjNum)
{
@@ -62,8 +56,6 @@ SdrObject* DlgEdPage::SetObjectOrdNum(sal_uLong nOldObjNum, sal_uLong nNewObjNum
return pObj;
}
-//----------------------------------------------------------------------------
-
} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx
index ee06f8ffda4b..c75fd1915a22 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -33,8 +33,6 @@ namespace basctl
TYPEINIT1( DlgEdView, SdrView );
-//----------------------------------------------------------------------------
-
DlgEdView::DlgEdView (SdrModel& rModel, OutputDevice& rOut, DlgEditor& rEditor) :
SdrView(&rModel, &rOut),
rDlgEditor(rEditor)
@@ -44,14 +42,10 @@ DlgEdView::DlgEdView (SdrModel& rModel, OutputDevice& rOut, DlgEditor& rEditor)
SetBufferedOverlayAllowed(true);
}
-//----------------------------------------------------------------------------
-
DlgEdView::~DlgEdView()
{
}
-//----------------------------------------------------------------------------
-
void DlgEdView::MarkListHasChanged()
{
SdrView::MarkListHasChanged();
@@ -61,8 +55,6 @@ void DlgEdView::MarkListHasChanged()
rDlgEditor.UpdatePropertyBrowserDelayed();
}
-//----------------------------------------------------------------------------
-
void DlgEdView::MakeVisible( const Rectangle& rRect, Window& rWin )
{
// visible area
@@ -131,8 +123,6 @@ void DlgEdView::MakeVisible( const Rectangle& rRect, Window& rWin )
}
}
-//----------------------------------------------------------------------------
-
SdrObject* impLocalHitCorrection(SdrObject* pRetval, const Point& rPnt, sal_uInt16 nTol)
{
DlgEdObj* pDlgEdObj = dynamic_cast< DlgEdObj* >(pRetval);
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 9f1f0a3f462e..eca619b3a698 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -39,12 +39,9 @@ class StarBASIC;
namespace basctl
{
-//----------------------------------------------------------------------------
const sal_uLong BASICIDE_UI_FEATURE_SHOW_BROWSER = 0x00000001;
-//----------------------------------------------------------------------------
-
class Layout;
class ModulWindow;
class ModulWindowLayout;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 09:30:08 +0000