Bin more pointless comments and ASCII graphics

Suggested Easy Hack: Replace all instances of // -------- comments
including surrounding newlines with a single newline.

Another Easy Hack, slightly harder to automate: Remove all the
pointless comments that just tell the class name right before the
declaration of that class.

Change-Id: Ia890ed613b53c5d719988697e20a983d62334123

6 files changed, 1 insertions, 185 deletions

diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index e414453ca191..24a3d6d9bdc8 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -30,10 +30,6 @@
 #include "drawdoc.hxx"
 #include "sdcgmfilter.hxx"
 
-// -----------
-// - Defines -
-// -----------
-
 #define CGM_IMPORT_CGM      0x00000001
 #define CGM_IMPORT_IM       0x00000002
 
@@ -45,19 +41,10 @@
 #define CGM_BIG_ENDIAN      0x00020000
 #define CGM_LITTLE_ENDIAN   0x00040000
 
-// --------------
-// - Namespaces -
-// --------------
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::task;
 using namespace ::com::sun::star::frame;
 
-// ------------
-// - Typedefs -
-// ------------
-
-
 typedef sal_uInt32 ( SAL_CALL *ImportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, sal_uInt32, Reference< XStatusIndicator >& );
 typedef sal_Bool ( SAL_CALL *ExportCGMPointer )( ::rtl::OUString&, Reference< XModel >&, Reference< XStatusIndicator >&, void* );
 
@@ -67,23 +54,15 @@ extern "C" sal_uInt32 ImportCGM( ::rtl::OUString&, Reference< XModel >&, sal_uIn
 
 #endif
 
-// ---------------
-// - SdPPTFilter -
-// ---------------
-
 SdCGMFilter::SdCGMFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) :
     SdFilter( rMedium, rDocShell, bShowProgress )
 {
 }
 
-// -----------------------------------------------------------------------------
-
 SdCGMFilter::~SdCGMFilter()
 {
 }
 
-// -----------------------------------------------------------------------------
-
 sal_Bool SdCGMFilter::Import()
 {
 #ifndef DISABLE_DYNLOADING
@@ -136,8 +115,6 @@ sal_Bool SdCGMFilter::Import()
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
-
 sal_Bool SdCGMFilter::Export()
 {
 #ifdef DISABLE_DYNLOADING
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 0f367f6d36a9..a46761342b21 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -66,10 +66,6 @@
 #include "unomodel.hxx"
 #include <vcl/virdev.hxx>
 
-// --------------
-// - Namespaces -
-// --------------
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
@@ -77,17 +73,9 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::datatransfer::clipboard;
 
-// -----------
-// - Defines -
-// -----------
-
 #define SDTRANSFER_OBJECTTYPE_DRAWMODEL         0x00000001
 #define SDTRANSFER_OBJECTTYPE_DRAWOLE           0x00000002
 
-// ------------------
-// - SdTransferable -
-// ------------------
-
 SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, sal_Bool bInitOnGetData )
 :   mpPageDocShell( NULL )
 ,   mpOLEDataHelper( NULL )
@@ -120,8 +108,6 @@ SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView,
         CreateData();
 }
 
-// -----------------------------------------------------------------------------
-
 SdTransferable::~SdTransferable()
 {
     if( mpSourceDoc )
@@ -160,8 +146,6 @@ SdTransferable::~SdTransferable()
 
 }
 
-// -----------------------------------------------------------------------------
-
 void SdTransferable::CreateObjectReplacement( SdrObject* pObj )
 {
     if( pObj )
@@ -256,8 +240,6 @@ void SdTransferable::CreateObjectReplacement( SdrObject* pObj )
     }
 }
 
-// -----------------------------------------------------------------------------
-
 void SdTransferable::CreateData()
 {
     if( mpSdDrawDocument && !mpSdViewIntern )
@@ -346,8 +328,6 @@ void SdTransferable::CreateData()
     }
 }
 
-// -----------------------------------------------------------------------------
-
 static sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
 {
     sal_Bool bOnlyControls = sal_False;         // default if there are no objects
@@ -378,8 +358,6 @@ static sal_Bool lcl_HasOnlyControls( SdrModel* pModel )
     return bOnlyControls;
 }
 
-// -----------------------------------------------------------------------------
-
 static bool lcl_HasOnlyOneTable( SdrModel* pModel )
 {
     if ( pModel )
@@ -394,8 +372,6 @@ static bool lcl_HasOnlyOneTable( SdrModel* pModel )
     return false;
 }
 
-// -----------------------------------------------------------------------------
-
 void SdTransferable::AddSupportedFormats()
 {
     if( !mbPageTransferable || mbPageTransferablePersistent )
@@ -458,8 +434,6 @@ void SdTransferable::AddSupportedFormats()
     }
 }
 
-// -----------------------------------------------------------------------------
-
 sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor )
 {
     if (SD_MOD()==NULL)
@@ -584,8 +558,6 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor )
     return bOK;
 }
 
-// -----------------------------------------------------------------------------
-
 sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject, sal_uInt32 nObjectType, const DataFlavor& )
 {
     sal_Bool bRet = sal_False;
@@ -668,16 +640,12 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
-
 void SdTransferable::DragFinished( sal_Int8 nDropAction )
 {
     if( mpSdView )
         ( (::sd::View*) mpSdView )->DragFinished( nDropAction );
 }
 
-// -----------------------------------------------------------------------------
-
 void SdTransferable::ObjectReleased()
 {
     if( this == SD_MOD()->pTransferClip )
@@ -690,8 +658,6 @@ void SdTransferable::ObjectReleased()
         SD_MOD()->pTransferSelection = NULL;
 }
 
-// -----------------------------------------------------------------------------
-
 void SdTransferable::SetObjectDescriptor( const TransferableObjectDescriptor& rObjDesc )
 {
     delete mpObjDesc;
@@ -699,8 +665,6 @@ void SdTransferable::SetObjectDescriptor( const TransferableObjectDescriptor& rO
     PrepareOLE( rObjDesc );
 }
 
-// -----------------------------------------------------------------------------
-
 void SdTransferable::SetPageBookmarks( const std::vector<rtl::OUString> &rPageBookmarks, sal_Bool bPersistent )
 {
     if( mpSourceDoc )
@@ -743,8 +707,6 @@ void SdTransferable::SetPageBookmarks( const std::vector<rtl::OUString> &rPageBo
     }
 }
 
-// -----------------------------------------------------------------------------
-
 sal_Int64 SAL_CALL SdTransferable::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException )
 {
     sal_Int64 nRet;
@@ -786,8 +748,6 @@ sal_Int32 SdTransferable::GetUserDataCount (void) const
         return ::boost::shared_ptr<UserData>();
 }
 
-// -----------------------------------------------------------------------------
-
 namespace
 {
     class theSdTransferableUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSdTransferableUnoTunnelId > {};
@@ -798,8 +758,6 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& SdTransferable::getUnoTunnelI
     return theSdTransferableUnoTunnelId::get().getSeq();
 }
 
-// -----------------------------------------------------------------------------
-
 SdTransferable* SdTransferable::getImplementation( const Reference< XInterface >& rxData ) throw()
 {
     try
@@ -813,9 +771,6 @@ SdTransferable* SdTransferable::getImplementation( const Reference< XInterface >
     return NULL;
 }
 
-// -----------------------------------------------------------------------------
-
-// SfxListener
 void SdTransferable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 {
     const SdrHint* pSdrHint = dynamic_cast< const SdrHint* >( &rHint );
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 420c6a35573c..28f4c6633a0e 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -35,16 +35,8 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/metaact.hxx>
 
-// -----------
-// - Defines -
-// -----------
-
 #define VECTORIZE_MAX_EXTENT 512
 
-// ------------------
-// - SdVectorizeDlg -
-// ------------------
-
 SdVectorizeDlg::SdVectorizeDlg(
     Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) :
         ModalDialog     ( pParent, SdResId( DLG_VECTORIZE ) ),
@@ -86,14 +78,10 @@ SdVectorizeDlg::SdVectorizeDlg(
     InitPreviewBmp();
 }
 
-// -----------------------------------------------------------------------------
-
 SdVectorizeDlg::~SdVectorizeDlg()
 {
 }
 
-// -----------------------------------------------------------------------------
-
 Rectangle SdVectorizeDlg::GetRect( const Size& rDispSize, const Size& rBmpSize ) const
 {
     Rectangle aRect;
@@ -124,8 +112,6 @@ Rectangle SdVectorizeDlg::GetRect( const Size& rDispSize, const Size& rBmpSize )
     return aRect;
 }
 
-// -----------------------------------------------------------------------------
-
 void SdVectorizeDlg::InitPreviewBmp()
 {
     const Rectangle aRect( GetRect( aBmpWin.GetSizePixel(), aBmp.GetSizePixel() ) );
@@ -135,8 +121,6 @@ void SdVectorizeDlg::InitPreviewBmp()
     aBmpWin.SetGraphic( aPreviewBmp );
 }
 
-// -----------------------------------------------------------------------------
-
 Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale )
 {
     Bitmap      aNew( rBmp );
@@ -156,8 +140,6 @@ Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale )
     return aNew;
 }
 
-// -----------------------------------------------------------------------------
-
 void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf )
 {
     mpDocSh->SetWaitCursor( sal_True );
@@ -231,8 +213,6 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf )
     mpDocSh->SetWaitCursor( sal_False );
 }
 
-// -----------------------------------------------------------------------------
-
 void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf,
                               long nPosX, long nPosY, long nWidth, long nHeight )
 {
@@ -273,16 +253,12 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf,
     rMtf.AddAction( new MetaRectAction( aRect ) );
 }
 
-// -----------------------------------------------------------------------------
-
 IMPL_LINK( SdVectorizeDlg, ProgressHdl, void*, pData )
 {
     aPrgs.SetValue( (sal_uInt16)(sal_uLong) pData );
     return 0L;
 }
 
-// -----------------------------------------------------------------------------
-
 IMPL_LINK_NOARG(SdVectorizeDlg, ClickPreviewHdl)
 {
     Calculate( aBmp, aMtf );
@@ -292,8 +268,6 @@ IMPL_LINK_NOARG(SdVectorizeDlg, ClickPreviewHdl)
     return 0L;
 }
 
-// -----------------------------------------------------------------------------
-
 IMPL_LINK_NOARG(SdVectorizeDlg, ClickOKHdl)
 {
     if( aBtnPreview.IsEnabled() )
@@ -305,8 +279,6 @@ IMPL_LINK_NOARG(SdVectorizeDlg, ClickOKHdl)
     return 0L;
 }
 
-// -----------------------------------------------------------------------------
-
 IMPL_LINK( SdVectorizeDlg, ToggleHdl, CheckBox*, pCb )
 {
     if( pCb->IsChecked() )
@@ -325,16 +297,12 @@ IMPL_LINK( SdVectorizeDlg, ToggleHdl, CheckBox*, pCb )
     return 0L;
 }
 
-// -----------------------------------------------------------------------------
-
 IMPL_LINK_NOARG(SdVectorizeDlg, ModifyHdl)
 {
     aBtnPreview.Enable();
     return 0L;
 }
 
-// -----------------------------------------------------------------------------
-
 void SdVectorizeDlg::LoadSettings()
 {
     SvStorageStreamRef  xIStm( SD_MOD()->GetOptionStream(
@@ -366,8 +334,6 @@ void SdVectorizeDlg::LoadSettings()
     ToggleHdl( &aCbFillHoles );
 }
 
-// -----------------------------------------------------------------------------
-
 void SdVectorizeDlg::SaveSettings() const
 {
     SvStorageStreamRef xOStm( SD_MOD()->GetOptionStream(
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index bd56aba73b20..5473ead9e8ea 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -28,9 +28,7 @@
 #include <svx/dlgutil.hxx>
 #include "sddllapi.h"
 
-// -----------------
-// - Option ranges -
-// -----------------
+// Option ranges
 
 #define SD_OPTIONS_NONE     0x00000000
 #define SD_OPTIONS_ALL      0xffffffff
@@ -43,20 +41,12 @@
 #define SD_OPTIONS_GRID     0x00000020
 #define SD_OPTIONS_PRINT    0x00000040
 
-// ------------
-// - Forwards -
-// ------------
-
 class SdOptions;
 
 namespace sd {
 class FrameView;
 }
 
-// -----------------
-// - SdOptionsItem -
-// -----------------
-
 class SdOptionsGeneric;
 
 class SD_DLLPUBLIC SdOptionsItem : public ::utl::ConfigItem
@@ -82,10 +72,6 @@ public:
     void                    SetModified();
 };
 
-// --------------------
-// - SdOptionsGeneric -
-// --------------------
-
 class SD_DLLPUBLIC SdOptionsGeneric
 {
 friend class SdOptionsItem;
@@ -128,10 +114,6 @@ public:
     static bool             isMetricSystem();
 };
 
-// -------------------
-// - SdOptionsLayout -
-// -------------------
-
 class SD_DLLPUBLIC SdOptionsLayout : public SdOptionsGeneric
 {
 private:
@@ -173,8 +155,6 @@ public:
     void    SetDefTab( sal_uInt16 nTab ) { if( nDefTab != nTab ) { OptionsChanged(); nDefTab = nTab; } }
 };
 
-// -----------------------------------------------------------------------------
-
 class SD_DLLPUBLIC SdOptionsLayoutItem : public SfxPoolItem
 {
 public:
@@ -192,10 +172,6 @@ private:
     SdOptionsLayout maOptionsLayout;
 };
 
-// ---------------------
-// - SdOptionsContents -
-// ---------------------
-
 class SD_DLLPUBLIC SdOptionsContents : public SdOptionsGeneric
 {
 private:
@@ -213,8 +189,6 @@ public:
     sal_Bool    operator==( const SdOptionsContents& rOpt ) const;
 };
 
-// -----------------------------------------------------------------------------
-
 class SD_DLLPUBLIC SdOptionsContentsItem : public SfxPoolItem
 {
 public:
@@ -231,10 +205,6 @@ private:
     SdOptionsContents       maOptionsContents;
 };
 
-// -----------------
-// - SdOptionsMisc -
-// -----------------
-
 class SD_DLLPUBLIC SdOptionsMisc : public SdOptionsGeneric
 {
 private:
@@ -364,8 +334,6 @@ public:
     void    SetShowComments( sal_Bool bShow )  { if( bShowComments != bShow ) { OptionsChanged(); bShowComments = bShow; } }
 };
 
-// -----------------------------------------------------------------------------
-
 class SD_DLLPUBLIC SdOptionsMiscItem : public SfxPoolItem
 {
 public:
@@ -384,10 +352,6 @@ private:
     SdOptionsMisc           maOptionsMisc;
 };
 
-// -----------------
-// - SdOptionsSnap -
-// -----------------
-
 class SD_DLLPUBLIC SdOptionsSnap : public SdOptionsGeneric
 {
 private:
@@ -439,8 +403,6 @@ public:
     void    SetEliminatePolyPointLimitAngle( sal_Int16 nIn ) { if( nBezAngle != nIn ) { OptionsChanged(); nBezAngle = nIn; } }
 };
 
-// -----------------------------------------------------------------------------
-
 class SD_DLLPUBLIC SdOptionsSnapItem : public SfxPoolItem
 {
 public:
@@ -458,10 +420,6 @@ private:
     SdOptionsSnap           maOptionsSnap;
 };
 
-// -----------------
-// - SdOptionsZoom -
-// -----------------
-
 class SdOptionsZoom : public SdOptionsGeneric
 {
 private:
@@ -486,12 +444,6 @@ public:
     void    SetScale( sal_Int32 nInX, sal_Int32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } }
 };
 
-// -----------------------------------------------------------------------------
-
-// -----------------
-// - SdOptionsGrid -
-// -----------------
-
 class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid
 {
 protected:
@@ -531,8 +483,6 @@ public:
     void    SetEqualGrid( sal_Bool bSet ) { if( bSet != SvxOptionsGrid::GetEqualGrid() ) { OptionsChanged(); SvxOptionsGrid::SetEqualGrid( bSet ); } }
 };
 
-// -----------------------------------------------
-
 class SdOptionsGridItem : public SvxGridItem
 {
 
@@ -542,10 +492,6 @@ public:
     void                    SetOptions( SdOptions* pOpts ) const;
 };
 
-// ------------------
-// - SdOptionsPrint -
-// ------------------
-
 class SD_DLLPUBLIC SdOptionsPrint : public SdOptionsGeneric
 {
 private:
@@ -630,8 +576,6 @@ public:
     void    SetHandoutPages( sal_uInt16 nHandoutPages ) { if( nHandoutPages != mnHandoutPages ) { OptionsChanged(); mnHandoutPages = nHandoutPages; } }
 };
 
-// -----------------------------------------------------------------------------
-
 class SD_DLLPUBLIC SdOptionsPrintItem : public SfxPoolItem
 {
 public:
@@ -650,10 +594,6 @@ private:
     SdOptionsPrint  maOptionsPrint;
 };
 
-// -------------
-// - SdOptions -
-// -------------
-
 class SdOptions : public SdOptionsLayout, public SdOptionsContents,
                   public SdOptionsMisc, public SdOptionsSnap,
                   public SdOptionsZoom, public SdOptionsGrid,
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 8b2e77e48378..ec354360aea8 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -19,10 +19,6 @@
 #include "sfx2/sfx.hrc"
 #include "cfgids.hxx"
 
-// -----------
-// - Defines -
-// -----------
-
 #define IMAGE_MASK_STDCOLOR Color{ Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
 
 // Bitmaps for Tree-ListBox in Effects-TabDialog
@@ -41,13 +37,10 @@
 
 // Bitmaps for ValueSet in EffectWindow
 
-// -----------------------------------------------------------------------------
-
 #define BMP_FOIL_NONE                       RID_APP_START+120
 #define BMP_GROUP                           RID_APP_START+121
 #define BMP_WAIT_ICON                       RID_APP_START+124
 
-// -----------------------------------------------------------------------------
 // additional effects
 
 #define BMP_FADE_EFFECT_INDICATOR           RID_SD_START+331
@@ -192,8 +185,6 @@
 #define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL (RID_SD_START+589)
 #define BMP_PRESENTERSCREEN_VIEW_BACKGROUND (RID_SD_START+590)
 
-// -----------------------------------------------------------------------------
-
 // ResourceIDs for Popup-Menus do not need a dummy string!!!
 
 #define RID_DRAW_TEXTOBJ_POPUP              RID_APP_START+43
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index cfbd6be98a9c..e90f36200ddc 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -29,25 +29,12 @@
 
 #include "slideshowimpl.hxx"
 
-// ----------------
-// - SdShowWindow -
-// ----------------
-
-
 namespace sd {
 
 class SlideshowImpl;
 
-// -----------
-// - Defines -
-// -----------
-
 #define SLIDE_NO_TIMEOUT SAL_MAX_INT32
 
-// ---------
-// - Enums -
-// ---------
-
 enum ShowWindowMode
 {
     SHOWWINDOWMODE_NORMAL = 0,