svx: Cleanup ASCII art and useless comments

Change-Id: I5399362056276f324fd43eda05d3f606dc6f8c71
Reviewed-on: https://gerrit.libreoffice.org/11011
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

34 files changed, 1 insertions, 374 deletions

diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index a17f12b2ee66..7d776cb63b0d 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -33,9 +33,6 @@
 using namespace svxform;
 using namespace ::connectivity;
 
-//= OSystemParseContext
-
-
 OSystemParseContext::OSystemParseContext() : IParseContext()
 {
     SolarMutexGuard aGuard;
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index efabc93b1d6f..e09593bc5e65 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -37,9 +37,6 @@ namespace svx
     using namespace ::com::sun::star::ucb;
     using namespace ::comphelper;
 
-
-    //= ODADescriptorImpl
-
     class ODADescriptorImpl
     {
     protected:
@@ -272,10 +269,6 @@ namespace svx
         m_bSequenceOutOfDate = false;
     }
 
-
-    //= ODataAccessDescriptor
-
-
     ODataAccessDescriptor::ODataAccessDescriptor()
         :m_pImpl(new ODADescriptorImpl)
     {
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index f2143334e6bd..2a4f2d40b8cc 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -50,9 +50,6 @@ namespace svx
 
     namespace TemplateDescription = ::com::sun::star::ui::dialogs::TemplateDescription;
 
-
-    //= DatabaseLocationInputController_Impl
-
     class DatabaseLocationInputController_Impl
     {
     public:
@@ -263,10 +260,6 @@ namespace svx
         m_bNeedExistenceCheck = true;
     }
 
-
-    //= DatabaseLocationInputController
-
-
     DatabaseLocationInputController::DatabaseLocationInputController( const Reference<XComponentContext>& _rContext,
             ::svt::OFileURLControl& _rLocationInput, PushButton& _rBrowseButton )
         :m_pImpl( new DatabaseLocationInputController_Impl( _rContext, _rLocationInput, _rBrowseButton ) )
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 6708f9081bcb..69b24e2e8abd 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -124,7 +124,6 @@ namespace svxform
             m_xPropSet( _rxSet ) {}
     };
 
-    // class DataTreeListBox
     DataTreeListBox::DataTreeListBox(Window* pParent, WinBits nBits)
         : SvTreeListBox(pParent, nBits)
         , m_pXFormsPage(NULL)
@@ -1343,7 +1342,6 @@ namespace svxform
         }
     }
 
-    // class DataNavigatorWindow
     DataNavigatorWindow::DataNavigatorWindow(Window* pParent, SfxBindings* pBindings)
         : Window(pParent)
         , m_pInstPage(NULL)
@@ -2127,10 +2125,6 @@ namespace svxform
         }
     }
 
-
-    // class DataNavigator
-
-
     DataNavigator::DataNavigator( SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent ) :
 
         SfxDockingWindow( _pBindings, _pMgr, _pParent,
@@ -2248,10 +2242,6 @@ namespace svxform
         ( (SfxDockingWindow*)pWindow )->Initialize( _pInfo );
     }
 
-
-    // class AddDataItemDialog
-
-
     AddDataItemDialog::AddDataItemDialog(Window* pParent, ItemNode* _pNode,
         const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper)
         : ModalDialog(pParent, "AddDataItemDialog" , "svx/ui/adddataitemdialog.ui")
@@ -2729,10 +2719,6 @@ namespace svxform
         m_pItemFrame->set_label(sText);
     }
 
-
-    // class AddConditionDialog
-
-
     AddConditionDialog::AddConditionDialog(Window* pParent,
         const OUString& _rPropertyName,
         const Reference< XPropertySet >& _rPropSet)
@@ -2858,10 +2844,6 @@ namespace svxform
         return 0;
     }
 
-
-    // class NamespaceItemDialog
-
-
     NamespaceItemDialog::NamespaceItemDialog(
         AddConditionDialog* _pCondDlg,
             Reference< XNameContainer >& _rContainer )
@@ -3032,10 +3014,6 @@ namespace svxform
         }
     }
 
-
-    // class ManageNamespaceDialog
-
-
     ManageNamespaceDialog::ManageNamespaceDialog(Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit)
         : ModalDialog(pParent, "AddNamespaceDialog", "svx/ui/addnamespacedialog.ui")
         , m_pConditionDlg ( _pCondDlg )
@@ -3075,10 +3053,6 @@ namespace svxform
         return 0;
     }
 
-
-    // class AddSubmissionDialog
-
-
     AddSubmissionDialog::AddSubmissionDialog(
         Window* pParent, ItemNode* _pNode,
         const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper)
@@ -3297,10 +3271,6 @@ namespace svxform
         m_pRefBtn->Enable( m_xTempBinding.is() );
     }
 
-
-    // class AddModelDialog
-
-
     AddModelDialog::AddModelDialog(Window* pParent, bool bIsEdit)
         : ModalDialog(pParent, "AddModelDialog", "svx/ui/addmodeldialog.ui")
     {
@@ -3311,10 +3281,6 @@ namespace svxform
             SetText(get<FixedText>("alttitle")->GetText());
     }
 
-
-    // class AddInstanceDialog
-
-
     AddInstanceDialog::AddInstanceDialog(Window* pParent, bool _bEdit)
         : ModalDialog(pParent, "AddInstanceDialog" , "svx/ui/addinstancedialog.ui")
     {
@@ -3353,10 +3319,6 @@ namespace svxform
         return 0;
     }
 
-
-    // class LinkedInstanceWarningBox
-
-
     LinkedInstanceWarningBox::LinkedInstanceWarningBox( Window* pParent ) :
 
         MessBox( pParent, SVX_RES( RID_QRY_LINK_WARNING ) )
diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx
index a3fea992940d..f401592e9644 100644
--- a/svx/source/form/dbcharsethelper.cxx
+++ b/svx/source/form/dbcharsethelper.cxx
@@ -23,11 +23,6 @@
 namespace svxform
 {
 
-
-
-    //= ODataAccessCharsetHelper
-
-
     ODataAccessCharsetHelper::ODataAccessCharsetHelper( )
     {
     }
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index 90e89774dd8e..c5b6d052c408 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -159,10 +159,6 @@ namespace svxform
         OSL_ENSURE(s_nClients >= 0,"Illegall call of revokeClient()");
     }
 
-
-    //= OStaticDataAccessTools
-
-
     OStaticDataAccessTools::OStaticDataAccessTools()
     {
     }
@@ -311,10 +307,6 @@ namespace svxform
         return bReturn;
     }
 
-
-    //= DBToolsObjectFactory
-
-
     DBToolsObjectFactory::DBToolsObjectFactory()
     {
     }
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index f90fbbfccd33..7de8f32a1730 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1023,9 +1023,6 @@ void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem )
     }
 }
 
-
-// class FmFilterItemsString
-
 class FmFilterItemsString : public SvLBoxString
 {
 public:
@@ -1082,9 +1079,6 @@ void FmFilterItemsString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pE
     pViewData->maSize = aSize;
 }
 
-
-// class FmFilterString
-
 class FmFilterString : public SvLBoxString
 {
     OUString m_aName;
@@ -1138,9 +1132,6 @@ void FmFilterString::Paint(
     rDev.DrawText( aPos, GetText() );
 }
 
-
-// class FmFilterNavigator
-
 FmFilterNavigator::FmFilterNavigator( Window* pParent )
                   :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HASBUTTONSATROOT )
                   ,m_pModel( NULL )
@@ -1886,10 +1877,6 @@ void FmFilterNavigator::DeleteSelection()
     }
 }
 
-
-
-// class FmFilterNavigatorWin
-
 FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWindow* _pMgr,
                               Window* _pParent )
                      :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) )
@@ -2020,11 +2007,6 @@ void FmFilterNavigatorWin::GetFocus()
         m_pNavigator->GrabFocus();
 }
 
-
-
-
-// class FmFilterNavigatorWinMgr
-
 SFX_IMPL_DOCKINGWINDOW( FmFilterNavigatorWinMgr, SID_FM_FILTER_NAVIGATOR )
 
 
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 57523e43864d..3b92a972c40b 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -73,8 +73,6 @@ using namespace ::com::sun::star::inspection;
 using namespace ::com::sun::star::form::inspection;
 using ::com::sun::star::awt::XWindow;
 
-/*************************************************************************/
-
 //= FmPropBrwMgr
 
 
@@ -185,10 +183,6 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
     return SVX_RESSTR(nClassNameResourceId);
 }
 
-
-// class FmPropBrw
-
-
 FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* _pBindings,
             SfxChildWindow* _pMgr, Window* _pParent, const SfxChildWinInfo* _pInfo )
     :SfxFloatingWindow(_pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE) )
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index 32ce91cb6cd1..25c5ee44bf7c 100644
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -83,10 +83,6 @@ namespace svxform
         _rxPeer->setProperty( FM_PROP_BORDERCOLOR, makeAny( _rBoder.nBorderColor ) );
     }
 
-
-    //= ControlBorderManager
-
-
     ControlBorderManager::ControlBorderManager()
         :m_nFocusColor    ( 0x000000FF )
         ,m_nMouseHoveColor( 0x007098BE )
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index 214728978aac..edcf75f3b60d 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -55,9 +55,6 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type&
     return aRet;
 }
 
-/***********************************************************************
-*                                                                      *
-***********************************************************************/
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL SvxFmDrawPage::getTypes(  ) throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > aTypes(SvxDrawPage::getTypes());
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index b224432d8e86..40e4fe05246e 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -36,10 +36,6 @@ namespace svxform
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::datatransfer;
 
-
-    //= OLocalExchange
-
-
     OLocalExchange::OLocalExchange( )
         :m_bDragging( false )
         ,m_bClipboardOwner( false )
@@ -120,10 +116,6 @@ namespace svxform
         return false;   // do not have any formats by default
     }
 
-
-    //= OControlTransferData
-
-
     OControlTransferData::OControlTransferData( )
         :m_pFocusEntry( NULL )
     {
@@ -281,10 +273,6 @@ namespace svxform
         }
     }
 
-
-    //= OControlExchange
-
-
     OControlExchange::OControlExchange( )
     {
     }
@@ -372,10 +360,6 @@ namespace svxform
         return new OControlExchange;
     }
 
-
-    //= OLocalExchangeHelper
-
-
     OLocalExchangeHelper::OLocalExchangeHelper(Window* _pDragSource)
         :m_pDragSource(_pDragSource)
         ,m_pTransferable(NULL)
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 6fd2b10024e5..ca585ae128d8 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -69,9 +69,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
-
-// class FmNavInsertedHint
-
 TYPEINIT1( FmNavInsertedHint, SfxHint );
 
 FmNavInsertedHint::FmNavInsertedHint( FmEntryData* pInsertedEntryData, sal_uInt32 nRelPos )
@@ -102,9 +99,6 @@ FmNavModelReplacedHint::~FmNavModelReplacedHint()
 {
 }
 
-
-// class FmNavRemovedHint
-
 TYPEINIT1( FmNavRemovedHint, SfxHint );
 
 FmNavRemovedHint::FmNavRemovedHint( FmEntryData* pRemovedEntryData )
@@ -117,10 +111,6 @@ FmNavRemovedHint::~FmNavRemovedHint()
 {
 }
 
-
-
-// class FmNavNameChangedHint
-
 TYPEINIT1( FmNavNameChangedHint, SfxHint );
 
 FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName )
@@ -134,9 +124,6 @@ FmNavNameChangedHint::~FmNavNameChangedHint()
 {
 }
 
-
-// class FmNavClearedHint
-
 TYPEINIT1( FmNavClearedHint, SfxHint );
 
 FmNavClearedHint::FmNavClearedHint()
@@ -158,10 +145,6 @@ TYPEINIT1(FmNavRequestSelectHint, SfxHint);
 
 TYPEINIT1(FmNavViewMarksChanged, SfxHint);
 
-
-// class FmEntryDataList
-
-
 FmEntryDataList::FmEntryDataList()
 {
 }
@@ -209,9 +192,6 @@ void FmEntryDataList::clear()
     maEntryDataList.clear();
 }
 
-
-// class FmEntryData
-
 TYPEINIT0( FmEntryData );
 
 FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface >& _rxIFace )
@@ -293,10 +273,6 @@ bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData )
     return true;
 }
 
-
-
-// class FmFormData
-
 TYPEINIT1( FmFormData, FmEntryData );
 
 FmFormData::FmFormData(
@@ -359,10 +335,6 @@ bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData )
     return FmEntryData::IsEqualWithoutChildren( pFormData );
 }
 
-
-
-// class FmControlData
-
 TYPEINIT1( FmControlData, FmEntryData );
 
 FmControlData::FmControlData(
@@ -545,11 +517,6 @@ void FmControlData::ModelReplaced(
 namespace svxform
 {
 
-
-
-    // class NavigatorFrame
-
-
     NavigatorFrame::NavigatorFrame( SfxBindings* _pBindings, SfxChildWindow* _pMgr,
                                   Window* _pParent )
       :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) )
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index 5b13593a1605..e21271702c9b 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -53,11 +53,6 @@ struct FmFormModelImplData
     }
 };
 
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
 FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers)
     : SdrModel(pPool, pPers, false, LOADREFCOUNTS)
     , m_pImpl(NULL)
@@ -70,11 +65,6 @@ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers)
     m_pImpl->pUndoEnv->acquire();
 }
 
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
 FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers)
     : SdrModel(rPath, pPool, pPers, false, LOADREFCOUNTS)
     , m_pImpl(NULL)
@@ -87,11 +77,6 @@ FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShe
     m_pImpl->pUndoEnv->acquire();
 }
 
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
 FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers,
                          bool bUseExtColorTable)
     : SdrModel(rPath, pPool, pPers, bUseExtColorTable, LOADREFCOUNTS)
@@ -105,11 +90,6 @@ FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShe
     m_pImpl->pUndoEnv->acquire();
 }
 
-/*************************************************************************
-|*
-|* Dtor
-|*
-\************************************************************************/
 FmFormModel::~FmFormModel()
 {
     if (m_pObjShell && m_pImpl->pUndoEnv->IsListening(*m_pObjShell))
@@ -124,21 +104,11 @@ FmFormModel::~FmFormModel()
 
 }
 
-/*************************************************************************
-|*
-|* Erzeugt eine neue Seite
-|*
-\************************************************************************/
 SdrPage* FmFormModel::AllocPage(bool bMasterPage)
 {
     return new FmFormPage(*this, bMasterPage);
 }
 
-/*************************************************************************
-|*
-|* InsertPage
-|*
-\************************************************************************/
 void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
 {
     // hack solange Methode intern
@@ -148,11 +118,6 @@ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
     SdrModel::InsertPage( pPage, nPos );
 }
 
-/*************************************************************************
-|*
-|* MovePage
-|*
-\************************************************************************/
 void FmFormModel::MovePage( sal_uInt16 nPgNum, sal_uInt16 nNewPos )
 {
     m_pImpl->bMovingPage = true;
@@ -163,11 +128,6 @@ void FmFormModel::MovePage( sal_uInt16 nPgNum, sal_uInt16 nNewPos )
     m_pImpl->bMovingPage = false;
 }
 
-/*************************************************************************
-|*
-|* RemovePage
-|*
-\************************************************************************/
 SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum)
 {
     FmFormPage* pToBeRemovedPage = dynamic_cast< FmFormPage* >( GetPage( nPgNum ) );
@@ -185,11 +145,6 @@ SdrPage* FmFormModel::RemovePage(sal_uInt16 nPgNum)
     return pRemovedPage;
 }
 
-/*************************************************************************
-|*
-|* InsertMasterPage
-|*
-\************************************************************************/
 void FmFormModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos)
 {
     // hack solange Methode intern
@@ -199,11 +154,6 @@ void FmFormModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos)
     SdrModel::InsertMasterPage(pPage, nPos);
 }
 
-/*************************************************************************
-|*
-|* RemoveMasterPage
-|*
-\************************************************************************/
 SdrPage* FmFormModel::RemoveMasterPage(sal_uInt16 nPgNum)
 {
     FmFormPage* pPage = (FmFormPage*)SdrModel::RemoveMasterPage(nPgNum);
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 2e406d612cbb..3211331fb241 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -53,11 +53,6 @@ using namespace ::svxform;
 
 static bool bInit = false;
 
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
 FmFormObjFactory::FmFormObjFactory()
 {
     if ( !bInit )
@@ -92,22 +87,11 @@ FmFormObjFactory::FmFormObjFactory()
     }
 }
 
-
-/*************************************************************************
-|*
-|* Dtor
-|*
-\************************************************************************/
 FmFormObjFactory::~FmFormObjFactory()
 {
 }
 
-
-/*************************************************************************
-|*
-|* ::com::sun::star::form::Form-Objekte erzeugen
-|*
-\************************************************************************/
+// ::com::sun::star::form::Form-Objekte erzeugen
 namespace
 {
     void    lcl_initProperty( FmFormObj* _pObject, const OUString& _rPropName, const Any& _rValue )
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 120dcb5dc5e6..0be2f6ae61e4 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -137,9 +137,6 @@ namespace svxform
         DECL_LINK( OnAsyncScriptEvent, ScriptEvent* );
     };
 
-
-    //= FormScriptingEnvironment
-
     class FormScriptingEnvironment:
         public IFormScriptingEnvironment, private boost::noncopyable
     {
@@ -168,10 +165,6 @@ namespace svxform
         void impl_registerOrRevoke_throw( const Reference< XEventAttacherManager >& _rxManager, bool _bRegister );
     };
 
-
-    //= FormScriptListener
-
-
     FormScriptListener::FormScriptListener( FormScriptingEnvironment* pScriptExecutor )
         :m_pScriptExecutor( pScriptExecutor )
     {
@@ -794,10 +787,6 @@ namespace svxform
         return 0L;
     }
 
-
-    //= FormScriptingEnvironment
-
-
     FormScriptingEnvironment::FormScriptingEnvironment( FmFormModel& _rModel )
         :m_pScriptListener( NULL )
         ,m_rFormModel( _rModel )
@@ -869,9 +858,6 @@ namespace svxform
         };
         typedef ::boost::shared_ptr< IScript >  PScript;
 
-
-        //. NewStyleUNOScript
-
         class NewStyleUNOScript : public IScript
         {
             SfxObjectShell&         m_rObjectShell;
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 69cd665450e1..08c06341a83c 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -144,9 +144,6 @@ using namespace ::com::sun::star::form::runtime;
 using namespace ::com::sun::star::frame;
 using namespace ::svxform;
 
-
-// class FmDesignModeChangedHint
-
 TYPEINIT1( FmDesignModeChangedHint, SfxHint );
 
 
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 3c1798aa1c4d..b555eb8c7942 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -609,9 +609,6 @@ Reference< XForm > GetForm(const Reference< XInterface>& _rxElement)
     return Reference< XForm >();
 }
 
-
-// class FmXFormShell_Base_Disambiguation
-
 FmXFormShell_Base_Disambiguation::FmXFormShell_Base_Disambiguation( ::osl::Mutex& _rMutex )
     :FmXFormShell_BD_BASE( _rMutex )
 {
@@ -628,10 +625,6 @@ void SAL_CALL FmXFormShell_Base_Disambiguation::disposing()
     // base classes.
 }
 
-
-// class FmXFormShell
-
-
 FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
         :FmXFormShell_BASE(m_aMutex)
         ,FmXFormShell_CFGBASE(OUString("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE)
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index 1bbf1ca01476..7c743d910459 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -33,11 +33,6 @@
 namespace svx
 {
 
-
-
-    //= TextControlCharAttribDialog
-
-
     TextControlCharAttribDialog::TextControlCharAttribDialog( Window* pParent, const SfxItemSet& _rCoreSet, const SvxFontListItem& _rFontList )
         : SfxTabDialog( pParent, "TextControlCharacterPropertiesDialog",
             "svx/ui/textcontrolchardialog.ui", &_rCoreSet )
diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx
index 23f0ec5295cf..a89e222887a2 100644
--- a/svx/source/form/fmtextcontrolfeature.cxx
+++ b/svx/source/form/fmtextcontrolfeature.cxx
@@ -30,10 +30,6 @@ namespace svx
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::util;
 
-
-    //= FmTextControlFeature
-
-
     FmTextControlFeature::FmTextControlFeature( const Reference< XDispatch >& _rxDispatcher, const URL& _rFeatureURL, SfxSlotId _nSlotId, ISlotInvalidator* _pInvalidator )
         :m_xDispatcher    ( _rxDispatcher )
         ,m_aFeatureURL    ( _rFeatureURL  )
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 4682df6244ab..2a7c71e59018 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -158,9 +158,6 @@ namespace svx
         0
     };
 
-
-    //= FmFocusListenerAdapter
-
     typedef ::cppu::WeakImplHelper1 <   XFocusListener
                                     >   FmFocusListenerAdapter_Base;
     class FmFocusListenerAdapter : public FmFocusListenerAdapter_Base
@@ -247,9 +244,6 @@ namespace svx
         m_xWindow.clear();
     }
 
-
-    //= FmMouseListenerAdapter
-
     typedef ::cppu::WeakImplHelper1 <   XMouseListener
                                     >   FmMouseListenerAdapter_Base;
     class FmMouseListenerAdapter : public FmMouseListenerAdapter_Base
@@ -275,11 +269,6 @@ namespace svx
         virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) SAL_OVERRIDE;
     };
 
-
-    //= FmMouseListenerAdapter
-
-
-
     FmMouseListenerAdapter::FmMouseListenerAdapter( const Reference< XControl >& _rxControl, IContextRequestObserver* _pObserver )
         :m_pObserver( _pObserver )
         ,m_xWindow( _rxControl, UNO_QUERY )
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index fd3c9576a6a5..17b7613ea000 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -94,9 +94,6 @@ namespace svxform
     namespace ColumnValue = ::com::sun::star::sdbc::ColumnValue;
     namespace WritingMode2 = ::com::sun::star::text::WritingMode2;
 
-
-    //= FormControlFactory_Data
-
     struct FormControlFactory_Data
     {
         Reference<XComponentContext>  m_xContext;
@@ -107,10 +104,6 @@ namespace svxform
         }
     };
 
-
-    //= FormControlFactory
-
-
     FormControlFactory::FormControlFactory( const Reference<XComponentContext>& _rContext )
         :m_pData( new FormControlFactory_Data( _rContext ) )
     {
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 1777ec745a41..0d950c53e9e7 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -208,9 +208,6 @@ namespace svxform
     namespace FormFeature = ::com::sun::star::form::runtime::FormFeature;
     namespace DataType = ::com::sun::star::sdbc::DataType;
 
-
-// ColumnInfo
-
 struct ColumnInfo
 {
     // information about the column itself
@@ -246,9 +243,6 @@ struct ColumnInfo
     }
 };
 
-
-//= ColumnInfoCache
-
 class ColumnInfoCache
 {
 public:
@@ -428,9 +422,6 @@ const ColumnInfo& ColumnInfoCache::getColumnInfo( size_t _pos )
     return m_aColumns[ _pos ];
 }
 
-
-// OParameterContinuation
-
 class OParameterContinuation : public OInteraction< XInteractionSupplyParameters >
 {
     Sequence< PropertyValue >       m_aValues;
@@ -465,9 +456,6 @@ struct FmFieldInfo
     {xField->getPropertyValue(FM_PROP_NAME) >>= aFieldName;}
 };
 
-
-// FmXAutoControl
-
 class FmXAutoControl: public UnoControl
 
 {
@@ -543,9 +531,6 @@ IMPL_LINK( FormController, OnInvalidateFeatures, void*, /*_pNotInterestedInThisP
     return 1;
 }
 
-/*************************************************************************/
-
-
 FormController::FormController(const Reference< css::uno::XComponentContext > & _rxORB )
                   :FormController_BASE( m_aMutex )
                   ,OPropertySetHelper( FormController_BASE::rBHelper )
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 541fa5d99f3d..dfa6e9177bcb 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -192,10 +192,6 @@ namespace svx
         return ( pos != rDescriptions.end() ) ? pos->nSlotId : -1;
     }
 
-
-    //= ControllerFeatures
-
-
     ControllerFeatures::ControllerFeatures( IControllerFeatureInvalidation* _pInvalidationCallback )
         :m_pInvalidationCallback( _pInvalidationCallback )
         ,m_pImpl( NULL )
@@ -235,10 +231,6 @@ namespace svx
         }
     }
 
-
-    //= FormControllerHelper
-
-
     FormControllerHelper::FormControllerHelper( const Reference< XFormController >& _rxController, IControllerFeatureInvalidation* _pInvalidationCallback )
         :m_pInvalidationCallback( _pInvalidationCallback )
     {
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 66bedcf534ac..261d62af88a8 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -46,11 +46,6 @@ namespace svxform
     using ::com::sun::star::frame::XDispatchProvider;
     using ::com::sun::star::lang::EventObject;
 
-
-    //= DispatchInterceptionMultiplexer
-
-
-
     DispatchInterceptionMultiplexer::DispatchInterceptionMultiplexer(
                 const Reference< XDispatchProviderInterception >& _rxToIntercept, DispatchInterceptor* _pMaster )
         :DispatchInterceptionMultiplexer_BASE(_pMaster && _pMaster->getInterceptorMutex() ? *_pMaster->getInterceptorMutex() : m_aFallback)
diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx
index aca6ad92ecbc..2c18dbd3c30f 100644
--- a/svx/source/form/formfeaturedispatcher.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
@@ -35,10 +35,6 @@ namespace svx
     using namespace ::com::sun::star::util;
     using namespace ::com::sun::star::form::runtime;
 
-
-    //= OSingleFeatureDispatcher
-
-
     OSingleFeatureDispatcher::OSingleFeatureDispatcher( const URL& _rFeatureURL, const sal_Int16 _nFormFeature,
             const Reference< XFormOperations >& _rxFormOperations, ::osl::Mutex& _rMutex )
         :m_rMutex( _rMutex )
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index c2bb99dbfa2f..784e2ec1f296 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -32,10 +32,6 @@ namespace svxform
     using namespace ::com::sun::star::frame;
     using namespace ::com::sun::star::beans;
 
-
-    //= FormToolboxes
-
-
     FormToolboxes::FormToolboxes( const Reference< XFrame >& _rxFrame )
     {
         // the layout manager
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index c2890ca42f53..80298a70c78f 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -112,11 +112,6 @@ namespace svxform
         }
     }
 
-
-    // class NavigatorTree
-
-
-
     NavigatorTree::NavigatorTree( Window* pParent )
         :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL ) // #100258# OJ WB_HSCROLL added
         ,m_aControlExchange(this)
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 6a5d79058e69..672692eef518 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -52,10 +52,6 @@ namespace svxform
     using namespace ::com::sun::star::script;
     using namespace ::com::sun::star::sdb;
 
-
-    // class OFormComponentObserver
-
-
     OFormComponentObserver::OFormComponentObserver(NavigatorTreeModel* _pModel)
         :m_pNavModel(_pModel)
         ,m_nLocks(0)
@@ -190,11 +186,6 @@ namespace svxform
         Remove( xElement );
     }
 
-
-    // class NavigatorTreeModel
-
-
-
     NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages )
                     :m_pFormShell(NULL)
                     ,m_pFormPage(NULL)
diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx
index 34e2bd92027c..f9c40e850f49 100644
--- a/svx/source/form/sqlparserclient.cxx
+++ b/svx/source/form/sqlparserclient.cxx
@@ -28,10 +28,6 @@ namespace svxform
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::lang;
 
-
-    //= OSQLParserClient
-
-
     OSQLParserClient::OSQLParserClient(const Reference< XComponentContext >& rxContext)
     {
         m_xContext = rxContext;
diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx
index 4fe922c5a7ad..cea9e09a230c 100644
--- a/svx/source/form/stringlistresource.cxx
+++ b/svx/source/form/stringlistresource.cxx
@@ -25,9 +25,6 @@
 namespace svx
 {
 
-    //= StringListResource
-
-
     StringListResource::StringListResource( const ResId& _rResId )
         :Resource( _rResId )
     {
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 1ddfb40abd0a..adcda345e5f8 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -101,9 +101,6 @@ static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< conta
     }
 }
 
-// class FmFieldWinListBox
-
-
 FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent )
     :SvTreeListBox( pParent, WB_HASBUTTONS|WB_BORDER )
     ,pTabWin( pParent )
@@ -166,10 +163,6 @@ void FmFieldWinListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi
     }
 }
 
-
-// class FmFieldWinData
-
-
 FmFieldWinData::FmFieldWinData()
 {
 }
@@ -179,10 +172,6 @@ FmFieldWinData::~FmFieldWinData()
 {
 }
 
-
-// class FmFieldWin
-
-
 FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent)
             :SfxFloatingWindow(_pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE))
             ,SfxControllerItem(SID_FM_FIELDS_CONTROL, *_pBindings)
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index a8a474570e7a..667bb6473676 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -45,12 +45,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
 using ::com::sun::star::beans::XPropertySet;
 
-
-
-// class SvxFmAbsRecWin
-
-
-
 SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pController )
     :NumericField( _pParent, WB_BORDER )
     ,m_pController(_pController)
@@ -242,11 +236,6 @@ void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nSelectModifier*/ )
     }
 }
 
-
-
-// class SvxFmTbxCtlAbsRec
-
-
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlAbsRec, SfxInt32Item );
 
 SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
@@ -293,11 +282,6 @@ Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent )
     return pWin;
 }
 
-
-
-// SvxFmTbxCtlRecText
-
-
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecText, SfxBoolItem );
 
 SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
@@ -324,11 +308,6 @@ Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent )
     return pFixedText;
 }
 
-
-
-// SvxFmTbxCtlRecFromText
-
-
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecFromText, SfxBoolItem );
 
 SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
@@ -354,10 +333,6 @@ Window* SvxFmTbxCtlRecFromText::CreateItemWindow( Window* pParent )
     return pFixedText;
 }
 
-
-
-// SvxFmTbxCtlRecTotal
-
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecTotal, SfxStringItem );
 
 
@@ -406,9 +381,6 @@ void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, co
     SfxToolBoxControl::StateChanged( nSID, eState,pState );
 }
 
-
-// SvxFmTbxNextRec
-
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxNextRec, SfxBoolItem );
 
 
@@ -424,9 +396,6 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& r
     rTbx.SetSettings(aSettings, true);
 }
 
-
-// SvxFmTbxPrevRec
-
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxPrevRec, SfxBoolItem );
 
 
diff --git a/svx/source/form/typeconversionclient.cxx b/svx/source/form/typeconversionclient.cxx
index 14cb2d6f0053..8914d4e140b7 100644
--- a/svx/source/form/typeconversionclient.cxx
+++ b/svx/source/form/typeconversionclient.cxx
@@ -23,11 +23,6 @@
 namespace svxform
 {
 
-
-
-    //= OTypeConversionClient
-
-
     OTypeConversionClient::OTypeConversionClient()
     {
     }
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index a9d6eb6b4f67..26049284e9fd 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -64,10 +64,6 @@ namespace svxform
         return OUString("org.openoffice.comp.svx.OAddConditionDialog");
     }
 
-
-    //= OAddConditionDialog
-
-
     OAddConditionDialog::OAddConditionDialog( const Reference< XComponentContext >& _rxORB )
         :OAddConditionDialogBase( _rxORB )
     {