Comment block removal, and other minor comments

3 files changed, 5 insertions, 151 deletions

diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 324d7d829153..ea775ba7306e 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -86,14 +86,11 @@ static ::rtl::OUString aTitlePropName =
 
 TYPEINIT1( DlgEdHint, SfxHint );
 
-//----------------------------------------------------------------------------
-
 DlgEdHint::DlgEdHint( DlgEdHintKind eHint )
     :eHintKind( eHint )
 {
 }
 
-//----------------------------------------------------------------------------
 
 DlgEdHint::DlgEdHint( DlgEdHintKind eHint, DlgEdObj* pObj )
     :eHintKind( eHint )
@@ -101,7 +98,6 @@ DlgEdHint::DlgEdHint( DlgEdHintKind eHint, DlgEdObj* pObj )
 {
 }
 
-//----------------------------------------------------------------------------
 
 DlgEdHint::~DlgEdHint()
 {
@@ -172,7 +168,6 @@ void DlgEditor::ShowDialog()
         xComponent->dispose();
 }
 
-//----------------------------------------------------------------------------
 
 BOOL DlgEditor::UnmarkDialog()
 {
@@ -187,7 +182,6 @@ BOOL DlgEditor::UnmarkDialog()
     return bWasMarked;
 }
 
-//----------------------------------------------------------------------------
 
 BOOL DlgEditor::RemarkDialog()
 {
@@ -202,7 +196,6 @@ BOOL DlgEditor::RemarkDialog()
     return bWasMarked;
 }
 
-//----------------------------------------------------------------------------
 
 DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel )
     :pHScroll(NULL)
@@ -260,7 +253,6 @@ DlgEditor::DlgEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::
     aMarkTimer.SetTimeoutHdl( LINK( this, DlgEditor, MarkTimeout ) );
 }
 
-//----------------------------------------------------------------------------
 
 DlgEditor::~DlgEditor()
 {
@@ -275,7 +267,6 @@ DlgEditor::~DlgEditor()
     delete pDlgEdModel;
 }
 
-//----------------------------------------------------------------------------
 
 Reference< awt::XControlContainer > DlgEditor::GetWindowControlContainer()
 {
@@ -284,7 +275,6 @@ Reference< awt::XControlContainer > DlgEditor::GetWindowControlContainer()
     return m_xControlContainer;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::SetWindow( Window* pWindow_ )
 {
@@ -309,7 +299,6 @@ void DlgEditor::SetWindow( Window* pWindow_ )
     ::comphelper::disposeComponent( m_xControlContainer );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::SetScrollBars( ScrollBar* pHS, ScrollBar* pVS )
 {
@@ -319,7 +308,6 @@ void DlgEditor::SetScrollBars( ScrollBar* pHS, ScrollBar* pVS )
     InitScrollBars();
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::InitScrollBars()
 {
@@ -345,7 +333,6 @@ void DlgEditor::InitScrollBars()
     DoScroll( pVScroll );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::DoScroll( ScrollBar* )
 {
@@ -375,18 +362,15 @@ void DlgEditor::DoScroll( ScrollBar* )
     //  pWindow->SetBackground();
 
     // #i74769# children should be scrolled
-    pWindow->Scroll( -nX, -nY, SCROLL_CHILDREN); // SCROLL_NOCHILDREN );
+    pWindow->Scroll( -nX, -nY, SCROLL_CHILDREN);
     aMap.SetOrigin( Point( -aScrollPos.Width(), -aScrollPos.Height() ) );
     pWindow->SetMapMode( aMap );
     pWindow->Update();
 
-    // pWindow->SetBackground( aOldBackground );
-
     DlgEdHint aHint( DLGED_HINT_WINDOWSCROLLED );
     Broadcast( aHint );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::UpdateScrollBars()
 {
@@ -400,7 +384,6 @@ void DlgEditor::UpdateScrollBars()
         pVScroll->SetThumbPos( -aOrg.Y() );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoControlDialogModel )
 {
@@ -484,8 +467,6 @@ void DlgEditor::ResetDialog( void )
 }
 
 
-//----------------------------------------------------------------------------
-
 Reference< util::XNumberFormatsSupplier > const & DlgEditor::GetNumberFormatsSupplier()
 {
     if ( !m_xSupplier.is() )
@@ -503,7 +484,6 @@ Reference< util::XNumberFormatsSupplier > const & DlgEditor::GetNumberFormatsSup
     return m_xSupplier;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -512,7 +492,6 @@ void DlgEditor::MouseButtonDown( const MouseEvent& rMEvt )
     pFunc->MouseButtonDown( rMEvt );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -522,21 +501,18 @@ void DlgEditor::MouseButtonUp( const MouseEvent& rMEvt )
         bCreateOK = bRet;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::MouseMove( const MouseEvent& rMEvt )
 {
     pFunc->MouseMove( rMEvt );
 }
 
-//----------------------------------------------------------------------------
 
 BOOL DlgEditor::KeyInput( const KeyEvent& rKEvt )
 {
     return pFunc->KeyInput( rKEvt );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::Paint( const Rectangle& rRect )
 {
@@ -544,7 +520,6 @@ void DlgEditor::Paint( const Rectangle& rRect )
     PaintTimeout( &aPaintTimer );
 }
 
-//----------------------------------------------------------------------------
 
 IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG )
 {
@@ -656,7 +631,6 @@ IMPL_LINK( DlgEditor, PaintTimeout, Timer *, EMPTYARG )
     return 0;
 }
 
-//----------------------------------------------------------------------------
 
 IMPL_LINK( DlgEditor, MarkTimeout, Timer *, EMPTYARG )
 {
@@ -672,7 +646,6 @@ IMPL_LINK( DlgEditor, MarkTimeout, Timer *, EMPTYARG )
     return 1;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::SetMode( DlgEdMode eNewMode )
 {
@@ -697,7 +670,6 @@ void DlgEditor::SetMode( DlgEdMode eNewMode )
     eMode = eNewMode;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::SetInsertObj( USHORT eObj )
 {
@@ -707,14 +679,12 @@ void DlgEditor::SetInsertObj( USHORT eObj )
         pDlgEdView->SetCurrentObj( eActObj, DlgInventor );
 }
 
-//----------------------------------------------------------------------------
 
 USHORT DlgEditor::GetInsertObj() const
 {
     return eActObj;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::CreateDefaultObject()
 {
@@ -743,7 +713,6 @@ void DlgEditor::CreateDefaultObject()
     }
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::Cut()
 {
@@ -751,7 +720,6 @@ void DlgEditor::Cut()
     Delete();
 }
 
-//----------------------------------------------------------------------------
 
 void implCopyStreamToByteSequence( Reference< XInputStream > xStream,
     Sequence< sal_Int8 >& bytes )
@@ -925,7 +893,6 @@ void DlgEditor::Copy()
     }
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::Paste()
 {
@@ -1090,7 +1057,7 @@ void DlgEditor::Paste()
                         pDlgEdModel->GetPage(0)->InsertObject( pCtrlObj );
                         pCtrlObj->SetRectFromProps();
                         pCtrlObj->UpdateStep();
-                        pDlgEdForm->UpdateTabOrderAndGroups();              // #110559#
+                        pDlgEdForm->UpdateTabOrderAndGroups();
                         pCtrlObj->StartListening();                         // start listening
 
                         // mark object
@@ -1114,7 +1081,6 @@ void DlgEditor::Paste()
     }
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::Delete()
 {
@@ -1171,7 +1137,6 @@ void DlgEditor::Delete()
         RemarkDialog();
 }
 
-//----------------------------------------------------------------------------
 
 BOOL DlgEditor::IsPasteAllowed()
 {
@@ -1197,7 +1162,6 @@ BOOL DlgEditor::IsPasteAllowed()
     return bPaste;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::ShowProperties()
 {
@@ -1207,21 +1171,18 @@ void DlgEditor::ShowProperties()
         pViewFrame->ToggleChildWindow( SID_SHOW_PROPERTYBROWSER );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::UpdatePropertyBrowserDelayed()
 {
     aMarkTimer.Start();
 }
 
-//----------------------------------------------------------------------------
 
 BOOL DlgEditor::IsModified() const
 {
     return pDlgEdModel->IsChanged() || bDialogModelChanged;
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::ClearModifyFlag()
 {
@@ -1229,7 +1190,6 @@ void DlgEditor::ClearModifyFlag()
     bDialogModelChanged = FALSE;
 }
 
-//----------------------------------------------------------------------------
 
 #define LMARGPRN        1700
 #define RMARGPRN         900
@@ -1237,7 +1197,6 @@ void DlgEditor::ClearModifyFlag()
 #define BMARGPRN        1000
 #define BORDERPRN       300
 
-//----------------------------------------------------------------------------
 
 void lcl_PrintHeader( Printer* pPrinter, const String& rTitle ) // not working yet
 {
@@ -1278,7 +1237,6 @@ void lcl_PrintHeader( Printer* pPrinter, const String& rTitle ) // not working y
     pPrinter->Pop();
 }
 
-//----------------------------------------------------------------------------
 
 sal_Int32 DlgEditor::countPages( Printer* )
 {
@@ -1291,7 +1249,6 @@ void DlgEditor::printPage( sal_Int32 nPage, Printer* pPrinter, const String& rTi
         Print( pPrinter, rTitle );
 }
 
-//----------------------------------------------------------------------------
 
 void DlgEditor::Print( Printer* pPrinter, const String& rTitle )    // not working yet
 {
@@ -1303,9 +1260,6 @@ void DlgEditor::Print( Printer* pPrinter, const String& rTitle )    // not worki
         MapMode aMap( MAP_100TH_MM );
         pPrinter->SetMapMode( aMap );
         Font aFont;
-#ifdef OS2
-        //aFont.SetName( System::GetStandardFont( STDFONT_SWISS ).GetName() );
-#endif
         aFont.SetAlign( ALIGN_BOTTOM );
         aFont.SetSize( Size( 0, 360 ));
         pPrinter->SetFont( aFont );
@@ -1319,15 +1273,12 @@ void DlgEditor::Print( Printer* pPrinter, const String& rTitle )    // not worki
         Bitmap aDlg;
 #ifdef OS2
         Bitmap* pDlg = new Bitmap;
-        //pSbxForm->SnapShot( *pDlg );
         SvMemoryStream* pStrm = new SvMemoryStream;
         *pStrm << *pDlg;
         delete pDlg;
         pStrm->Seek(0);
         *pStrm >> aDlg;
         delete pStrm;
-#else
-        //pSbxForm->SnapShot( aDlg );
 #endif
         Size aBmpSz( pPrinter->PixelToLogic( aDlg.GetSizePixel() ) );
         double nPaperSzWidth = aPaperSz.Width();
@@ -1363,7 +1314,6 @@ void DlgEditor::Print( Printer* pPrinter, const String& rTitle )    // not worki
     }
 }
 
-//----------------------------------------------------------------------------
 
 bool DlgEditor::AdjustPageSize()
 {
@@ -1420,6 +1370,4 @@ bool DlgEditor::AdjustPageSize()
     return bAdjustedPageSize;
 }
 
-//----------------------------------------------------------------------------
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 27bae6fbb8c7..cffec4c54805 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -40,21 +40,18 @@
 
 using namespace ::com::sun::star;
 
-//----------------------------------------------------------------------------
 
 DlgEdFactory::DlgEdFactory()
 {
     SdrObjFactory::InsertMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) );
 }
 
-//----------------------------------------------------------------------------
 
 DlgEdFactory::~DlgEdFactory()
 {
     SdrObjFactory::RemoveMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) );
 }
 
-//----------------------------------------------------------------------------
 
 IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
 {
@@ -191,73 +188,6 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
             case OBJ_DLG_TREECONTROL:
                  DlgEdObj* pNew = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.tree.TreeControlModel") , xDialogSFact );
                  pObjFactory->pNewObj = pNew;
-                 /*
-                 try
-                 {
-                    uno::Reference< beans::XPropertySet >  xPSet(pNew->GetUnoControlModel(), uno::UNO_QUERY);
-                    if (xPSet.is())
-                    {
-                        // first create a data model for our tree control
-                        Reference< XComponentContext > xComponentContext;
-
-                        Reference< XPropertySet > xPropSet( xInterface, UNO_QUERY );
-                        xPropSet->getPropertyValue( OUString::createFromAscii("DefaultContext") ) >>= xComponentContext;
-
-                        // gets the service manager from the office
-                        Reference< XMultiComponentFactory > xMultiComponentFactoryServer( xComponentContext->getServiceManager() );
-
-
-                        // gets the TreeDataModel
-                        Reference< XMutableTreeDataModel > xTreeDataModel;
-
-                        xTreeDataModel = Reference< XMutableTreeDataModel >(
-                         xMultiComponentFactoryServer->createInstanceWithContext(
-                        OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.tree.MutableTreeDataModel" ) ), xComponentContext ), UNO_QUERY_THROW );
-
-                        // now fill it with some sample data
-                        const OUString sRoot( RTL_CONSTASCII_USTRINGPARAM( "Root" ) );
-
-                        Reference< XMutableTreeNode > xNode( mxTreeDataModel->createNode( sRoot, false ), UNO_QUERY_THROW );
-                        xNode->setDataValue( sRoot );
-                        xNode->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) );
-                        xNode->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) );
-
-                        const OUString sNode_1( RTL_CONSTASCII_USTRINGPARAM( "Node_1" ) );
-
-                        Reference< XMutableTreeNode > xChildNode_1( mxTreeDataModel->createNode( sNode_1, true ), UNO_QUERY_THROW );
-                        xChildNode_1->setDataValue( sNode_1 );
-                        xChildNode_1->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) );
-                        xChildNode_1->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) );
-
-                        xNode->appendChild( xChildNode_1 );
-
-                        const OUString sNode_1_1( RTL_CONSTASCII_USTRINGPARAM( "Node_1_1" ) );
-
-                        Reference< XMutableTreeNode > xChildNode_1_1( mxTreeDataModel->createNode( sNode_1_1, false ), UNO_QUERY_THROW );
-                        xChildNode_1_1->setDataValue( sNode_1_1 );
-                        xChildNode_1_1->setExpandedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_down.png" ) ) );
-                        xChildNode_1_1->setCollapsedGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:graphicrepository/sd/res/triangle_right.png" ) ) );
-
-                        xChildNode_1->appendChild( xChildNode_1_1 );
-
-                        const OUString sNode_1_1( RTL_CONSTASCII_USTRINGPARAM( "Node_2" ) );
-
-                        Reference< XMutableTreeNode > xChildNode_2( mxTreeDataModel->createNode( sNode_2, false ), UNO_QUERY_THROW );
-                        xChildNode_2->setDataValue( sNode_2 );
-                        xChildNode_2->setNodeGraphicURL( OUString( RTL_CONSTASCII_USTRINGPARAM("private:graphicrepository/sw/imglst/nc20010.png") ) );
-                        xNode->appendChild( xChildNode_2 );
-
-                        xTreeDataModel->setRoot( xNode );
-
-
-                        const OUString sDataModel( RTL_CONSTASCII_USTRINGPARAM( "DataModel" ) );
-
-                        xPSet->setPropertyValue( sDataModel, xTreeDataModel );
-                    }
-                 }
-                 catch(...)
-                 {
-                 }*/
                  break;
         }
     }
@@ -265,6 +195,4 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
     return 0;
 }
 
-//----------------------------------------------------------------------------
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index d210482a8ef5..8d98b1f11cbe 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -75,13 +75,9 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::comphelper;
 
-//============================================================================
-// PropBrwMgr
-//============================================================================
 
 SFX_IMPL_FLOATINGWINDOW(PropBrwMgr, SID_SHOW_PROPERTYBROWSER)
 
-//----------------------------------------------------------------------------
 
 PropBrwMgr::PropBrwMgr( Window* _pParent, sal_uInt16 nId,
                         SfxBindings *pBindings, SfxChildWinInfo* pInfo)
@@ -103,7 +99,7 @@ PropBrwMgr::PropBrwMgr( Window* _pParent, sal_uInt16 nId,
     ((PropBrw*)pWindow)->Update( pShell );
 }
 
-//----------------------------------------------------------------------------
+
 void PropBrw::Update( const SfxViewShell* _pShell )
 {
     const BasicIDEShell* pBasicIDEShell = dynamic_cast< const BasicIDEShell* >( _pShell );
@@ -122,7 +118,6 @@ void PropBrw::Update( const SfxViewShell* _pShell )
     }
 }
 
-//----------------------------------------------------------------------------
 
 const long STD_WIN_SIZE_X = 300;
 const long STD_WIN_SIZE_Y = 350;
@@ -136,15 +131,9 @@ const long WIN_BORDER = 2;
 const long MIN_WIN_SIZE_X = 50;
 const long MIN_WIN_SIZE_Y = 50;
 
-//----------------------------------------------------------------------------
-
-//============================================================================
-// PropBrw
-//============================================================================
 
 DBG_NAME(PropBrw)
 
-//----------------------------------------------------------------------------
 
 PropBrw::PropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBindings* _pBindings, PropBrwMgr* _pMgr, Window* _pParent,
             const Reference< XModel >& _rxContextDocument )
@@ -179,7 +168,6 @@ PropBrw::PropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBindings* _
     ImplReCreateController();
 }
 
-//----------------------------------------------------------------------------
 
 void PropBrw::ImplReCreateController()
 {
@@ -265,7 +253,6 @@ void PropBrw::ImplReCreateController()
     Resize();
 }
 
-//----------------------------------------------------------------------------
 
 PropBrw::~PropBrw()
 {
@@ -275,7 +262,6 @@ PropBrw::~PropBrw()
     DBG_DTOR(PropBrw,NULL);
 }
 
-//----------------------------------------------------------------------------
 
 void PropBrw::ImplDestroyController()
 {
@@ -300,7 +286,6 @@ void PropBrw::ImplDestroyController()
     m_xBrowserController.clear();
 }
 
-//----------------------------------------------------------------------------
 
 sal_Bool PropBrw::Close()
 {
@@ -314,7 +299,7 @@ sal_Bool PropBrw::Close()
     return bClose;
 }
 
-//----------------------------------------------------------------------------
+
 Sequence< Reference< XInterface > >
     PropBrw::CreateMultiSelectionSequence( const SdrMarkList& _rMarkList )
 {
@@ -359,7 +344,7 @@ Sequence< Reference< XInterface > >
     return aSeq;
 }
 
-//----------------------------------------------------------------------------
+
 void PropBrw::implSetNewObjectSequence
     ( const Sequence< Reference< XInterface > >& _rObjectSeq )
 {
@@ -374,7 +359,6 @@ void PropBrw::implSetNewObjectSequence
     }
 }
 
-//----------------------------------------------------------------------------
 
 void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
 {
@@ -390,7 +374,6 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
     }
 }
 
-//----------------------------------------------------------------------------
 
 ::rtl::OUString PropBrw::GetHeadlineName( const Reference< XPropertySet >& _rxObject )
 {
@@ -510,14 +493,12 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
     return aName;
 }
 
-//----------------------------------------------------------------------------
 
 void PropBrw::FillInfo( SfxChildWinInfo& rInfo ) const
 {
     rInfo.bVisible = sal_False;
 }
 
-//----------------------------------------------------------------------------
 
 void PropBrw::Resize()
 {
@@ -536,7 +517,6 @@ void PropBrw::Resize()
     }
 }
 
-//----------------------------------------------------------------------------
 
 void PropBrw::ImplUpdate( const Reference< XModel >& _rxContextDocument, SdrView* pNewView )
 {
@@ -619,6 +599,4 @@ void PropBrw::ImplUpdate( const Reference< XModel >& _rxContextDocument, SdrView
     }
 }
 
-//----------------------------------------------------------------------------
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */