Formatting changes across all modules

+ Removed comment cruft
+ Tab formatting in number of files
+ Some commented out code removed
+ Tab characters replaced with spaces
+ Newline cleanup in quite a few files
+ Tweak header guard #endifs

Change-Id: I3208ff2f047da890edcc49b73389aca22442f5fc
Reviewed-on: https://gerrit.libreoffice.org/22221
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

2 files changed, 62 insertions, 86 deletions

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index d1c50a11566a..dfb8297db435 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -51,11 +51,6 @@
 #include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
 
-
-
-// - Namespaces -
-
-
 using namespace ::ucbhelper;
 using namespace ::cppu;
 using namespace ::com::sun::star::lang;
@@ -65,9 +60,6 @@ using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::uno;
 
 
-// - SearchThread -
-
-
 SearchThread::SearchThread( SearchProgress* pProgess,
                             TPGalleryThemeProperties* pBrowser,
                             const INetURLObject& rStartURL ) :
@@ -79,13 +71,11 @@ SearchThread::SearchThread( SearchProgress* pProgess,
 }
 
 
-
 SearchThread::~SearchThread()
 {
 }
 
 
-
 void SearchThread::execute()
 {
     const OUString aFileType( mpBrowser->m_pCbbFileType->GetText() );
@@ -114,7 +104,6 @@ void SearchThread::execute()
 }
 
 
-
 void SearchThread::ImplSearch( const INetURLObject& rStartURL,
                                const ::std::vector< OUString >& rFormats,
                                bool bRecursive )
@@ -200,9 +189,6 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
 }
 
 
-// - SearchProgress -
-
-
 SearchProgress::SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL )
     : ModalDialog(pParent, "GallerySearchProgress", "cui/ui/gallerysearchprogress.ui")
     , parent_(pParent)
@@ -215,11 +201,13 @@ SearchProgress::SearchProgress( vcl::Window* pParent, const INetURLObject& rStar
     m_pBtnCancel->SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) );
 }
 
+
 SearchProgress::~SearchProgress()
 {
     disposeOnce();
 }
 
+
 void SearchProgress::dispose()
 {
     m_pFtSearchDir.clear();
@@ -237,14 +225,12 @@ void SearchProgress::Terminate()
 }
 
 
-
 IMPL_LINK_NOARG_TYPED(SearchProgress, ClickCancelBtn, Button*, void)
 {
     Terminate();
 }
 
 
-
 IMPL_LINK_NOARG_TYPED(SearchProgress, CleanUpHdl, void*, void)
 {
     if (maSearchThread.is())
@@ -256,7 +242,6 @@ IMPL_LINK_NOARG_TYPED(SearchProgress, CleanUpHdl, void*, void)
 }
 
 
-
 short SearchProgress::Execute()
 {
     OSL_FAIL( "SearchProgress cannot be executed via Dialog::Execute!\n"
@@ -266,7 +251,6 @@ short SearchProgress::Execute()
 }
 
 
-
 void SearchProgress::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl )
 {
     assert(!maSearchThread.is());
@@ -277,9 +261,6 @@ void SearchProgress::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl
 }
 
 
-// - TakeThread -
-
-
 TakeThread::TakeThread(
     TakeProgress* pProgess,
     TPGalleryThemeProperties* pBrowser,
@@ -293,13 +274,11 @@ TakeThread::TakeThread(
 }
 
 
-
 TakeThread::~TakeThread()
 {
 }
 
 
-
 void TakeThread::execute()
 {
     sal_Int32           nEntries;
@@ -340,7 +319,7 @@ void TakeThread::execute()
     Application::PostUserEvent( LINK( mpProgress, TakeProgress, CleanUpHdl ), nullptr, true );
 }
 
-// - TakeProgress -
+
 TakeProgress::TakeProgress(vcl::Window* pWindow)
     : ModalDialog(pWindow, "GalleryApplyProgress",
         "cui/ui/galleryapplyprogress.ui")
@@ -352,11 +331,13 @@ TakeProgress::TakeProgress(vcl::Window* pWindow)
     m_pBtnCancel->SetClickHdl( LINK( this, TakeProgress, ClickCancelBtn ) );
 }
 
+
 TakeProgress::~TakeProgress()
 {
     disposeOnce();
 }
 
+
 void TakeProgress::dispose()
 {
     m_pFtTakeFile.clear();
@@ -365,17 +346,20 @@ void TakeProgress::dispose()
     ModalDialog::dispose();
 }
 
+
 void TakeProgress::Terminate()
 {
     if (maTakeThread.is())
         maTakeThread->terminate();
 }
 
+
 IMPL_LINK_NOARG_TYPED(TakeProgress, ClickCancelBtn, Button*, void)
 {
     Terminate();
 }
 
+
 IMPL_LINK_NOARG_TYPED(TakeProgress, CleanUpHdl, void*, void)
 {
     if (maTakeThread.is())
@@ -428,7 +412,6 @@ IMPL_LINK_NOARG_TYPED(TakeProgress, CleanUpHdl, void*, void)
 }
 
 
-
 short TakeProgress::Execute()
 {
     OSL_FAIL( "TakeProgress cannot be executed via Dialog::Execute!\n"
@@ -438,7 +421,6 @@ short TakeProgress::Execute()
 }
 
 
-
 void TakeProgress::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl )
 {
     assert(!maTakeThread.is());
@@ -449,7 +431,6 @@ void TakeProgress::StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl )
 }
 
 
-// - ActualizeProgress -
 ActualizeProgress::ActualizeProgress(vcl::Window* pWindow, GalleryTheme* pThm)
     : ModalDialog(pWindow, "GalleryUpdateProgress",
         "cui/ui/galleryupdateprogress.ui")
@@ -461,11 +442,13 @@ ActualizeProgress::ActualizeProgress(vcl::Window* pWindow, GalleryTheme* pThm)
     m_pBtnCancel->SetClickHdl( LINK( this, ActualizeProgress, ClickCancelBtn ) );
 }
 
+
 ActualizeProgress::~ActualizeProgress()
 {
     disposeOnce();
 }
 
+
 void ActualizeProgress::dispose()
 {
     m_pFtActualizeFile.clear();
@@ -473,6 +456,7 @@ void ActualizeProgress::dispose()
     ModalDialog::dispose();
 }
 
+
 short ActualizeProgress::Execute()
 {
     short nRet;
@@ -488,7 +472,6 @@ short ActualizeProgress::Execute()
 }
 
 
-
 IMPL_LINK_NOARG_TYPED(ActualizeProgress, ClickCancelBtn, Button*, void)
 {
     pTheme->AbortActualize();
@@ -496,7 +479,6 @@ IMPL_LINK_NOARG_TYPED(ActualizeProgress, ClickCancelBtn, Button*, void)
 }
 
 
-
 IMPL_LINK_TYPED( ActualizeProgress, TimeoutHdl, Idle*, _pTimer, void)
 {
     if ( _pTimer )
@@ -510,7 +492,6 @@ IMPL_LINK_TYPED( ActualizeProgress, TimeoutHdl, Idle*, _pTimer, void)
 }
 
 
-
 IMPL_LINK_TYPED( ActualizeProgress, ActualizeHdl, const INetURLObject&, rURL, void )
 {
     for( long i = 0; i < 128; i++ )
@@ -522,6 +503,7 @@ IMPL_LINK_TYPED( ActualizeProgress, ActualizeHdl, const INetURLObject&, rURL, vo
     m_pFtActualizeFile->Flush();
 }
 
+
 TitleDialog::TitleDialog(vcl::Window* pParent, const OUString& rOldTitle)
     : ModalDialog(pParent, "GalleryTitleDialog", "cui/ui/gallerytitledialog.ui")
 {
@@ -530,11 +512,13 @@ TitleDialog::TitleDialog(vcl::Window* pParent, const OUString& rOldTitle)
     m_pEdit->GrabFocus();
 }
 
+
 TitleDialog::~TitleDialog()
 {
     disposeOnce();
 }
 
+
 void TitleDialog::dispose()
 {
     m_pEdit.clear();
@@ -542,9 +526,6 @@ void TitleDialog::dispose()
 }
 
 
-// - GalleryIdDialog -
-
-
 GalleryIdDialog::GalleryIdDialog( vcl::Window* pParent, GalleryTheme* _pThm )
     : ModalDialog(pParent, "GalleryThemeIDDialog", "cui/ui/gallerythemeiddialog.ui")
     , pThm(_pThm )
@@ -562,11 +543,13 @@ GalleryIdDialog::GalleryIdDialog( vcl::Window* pParent, GalleryTheme* _pThm )
     m_pBtnOk->SetClickHdl( LINK( this, GalleryIdDialog, ClickOkHdl ) );
 }
 
+
 GalleryIdDialog::~GalleryIdDialog()
 {
     disposeOnce();
 }
 
+
 void GalleryIdDialog::dispose()
 {
     m_pBtnOk.clear();
@@ -574,6 +557,7 @@ void GalleryIdDialog::dispose()
     ModalDialog::dispose();
 }
 
+
 IMPL_LINK_NOARG_TYPED(GalleryIdDialog, ClickOkHdl, Button*, void)
 {
     Gallery*    pGal = pThm->GetParent();
@@ -604,10 +588,6 @@ IMPL_LINK_NOARG_TYPED(GalleryIdDialog, ClickOkHdl, Button*, void)
 }
 
 
-
-// - GalleryThemeProperties -
-
-
 GalleryThemeProperties::GalleryThemeProperties(vcl::Window* pParent,
     ExchangeData* _pData, SfxItemSet* pItemSet)
     : SfxTabDialog( pParent, "GalleryThemeDialog",
@@ -632,6 +612,7 @@ GalleryThemeProperties::GalleryThemeProperties(vcl::Window* pParent,
     SetText( aText );
 }
 
+
 void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
     if (nId == m_nGeneralPageId)
@@ -640,7 +621,7 @@ void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
         static_cast<TPGalleryThemeProperties&>( rPage ).SetXChgData( pData );
 }
 
-// - TPGalleryThemeGeneral -
+
 TPGalleryThemeGeneral::TPGalleryThemeGeneral(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "GalleryGeneralPage",
         "cui/ui/gallerygeneralpage.ui", &rSet)
@@ -654,11 +635,13 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral(vcl::Window* pParent, const SfxItem
     get(m_pFtMSShowChangeDate, "modified");
 }
 
+
 TPGalleryThemeGeneral::~TPGalleryThemeGeneral()
 {
     disposeOnce();
 }
 
+
 void TPGalleryThemeGeneral::dispose()
 {
     m_pFiMSImage.clear();
@@ -670,6 +653,7 @@ void TPGalleryThemeGeneral::dispose()
     SfxTabPage::dispose();
 }
 
+
 void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
 {
     pData = _pData;
@@ -727,7 +711,6 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
 }
 
 
-
 bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
 {
     pData->aEditedTitle = m_pEdtMSName->GetText();
@@ -735,13 +718,12 @@ bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
 }
 
 
-
 VclPtr<SfxTabPage> TPGalleryThemeGeneral::Create( vcl::Window* pParent, const SfxItemSet* rSet )
 {
     return VclPtr<TPGalleryThemeGeneral>::Create( pParent, *rSet );
 }
 
-// - TPGalleryThemeProperties -
+
 TPGalleryThemeProperties::TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet )
     : SfxTabPage(pWindow, "GalleryFilesPage", "cui/ui/galleryfilespage.ui", &rSet)
     , pData(nullptr)
@@ -768,6 +750,7 @@ TPGalleryThemeProperties::TPGalleryThemeProperties( vcl::Window* pWindow, const
     xDialogListener->SetDialogClosedLink( LINK( this, TPGalleryThemeProperties, DialogClosedHdl ) );
 }
 
+
 void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData )
 {
     pData = _pData;
@@ -793,7 +776,6 @@ void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData )
 }
 
 
-
 void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult )
 {
     if ( RET_OK == _nDlgResult )
@@ -807,12 +789,12 @@ void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, sh
 }
 
 
-
 TPGalleryThemeProperties::~TPGalleryThemeProperties()
 {
     disposeOnce();
 }
 
+
 void TPGalleryThemeProperties::dispose()
 {
     xMediaPlayer.clear();
@@ -833,11 +815,13 @@ void TPGalleryThemeProperties::dispose()
     SfxTabPage::dispose();
 }
 
+
 VclPtr<SfxTabPage> TPGalleryThemeProperties::Create( vcl::Window* pParent, const SfxItemSet* rSet )
 {
     return VclPtr<TPGalleryThemeProperties>::Create( pParent, *rSet );
 }
 
+
 OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText, const OUString& _rExtension )
 {
     OUString sAllFilter( "(*.*)" );
@@ -856,7 +840,6 @@ OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText,
 }
 
 
-
 void TPGalleryThemeProperties::FillFilterList()
 {
     GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter();
@@ -996,7 +979,6 @@ void TPGalleryThemeProperties::FillFilterList()
 }
 
 
-
 IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFileTypeHdl, ComboBox&, void)
 {
     OUString aText( m_pCbbFileType->GetText() );
@@ -1011,7 +993,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFileTypeHdl, ComboBox&, vo
 }
 
 
-
 void TPGalleryThemeProperties::SearchFiles()
 {
     SearchProgress* pProgress = VclPtr<SearchProgress>::Create( this, aURL );
@@ -1027,7 +1008,6 @@ void TPGalleryThemeProperties::SearchFiles()
 }
 
 
-
 IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickSearchHdl, Button*, void)
 {
     if( bInputAllowed )
@@ -1066,7 +1046,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickSearchHdl, Button*, void)
 }
 
 
-
 void TPGalleryThemeProperties::TakeFiles()
 {
     if( m_pLbxFound->GetSelectEntryCount() || ( bTakeAll && bEntriesFound ) )
@@ -1081,7 +1060,6 @@ void TPGalleryThemeProperties::TakeFiles()
 }
 
 
-
 IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickPreviewHdl, Button*, void)
 {
     if ( bInputAllowed )
@@ -1101,7 +1079,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickPreviewHdl, Button*, void)
 }
 
 
-
 void TPGalleryThemeProperties::DoPreview()
 {
     OUString aString( m_pLbxFound->GetSelectEntry() );
@@ -1130,7 +1107,6 @@ void TPGalleryThemeProperties::DoPreview()
 }
 
 
-
 IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeHdl, Button*, void)
 {
     if( bInputAllowed )
@@ -1155,7 +1131,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeHdl, Button*, void)
 }
 
 
-
 IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeAllHdl, Button*, void)
 {
     if( bInputAllowed )
@@ -1167,7 +1142,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, ClickTakeAllHdl, Button*, void)
 }
 
 
-
 IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFoundHdl, ListBox&, void)
 {
     if( bInputAllowed )
@@ -1198,7 +1172,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFoundHdl, ListBox&, void)
 }
 
 
-
 IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, DClickFoundHdl, ListBox&, void)
 {
     if( bInputAllowed )
@@ -1211,7 +1184,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, DClickFoundHdl, ListBox&, void)
 }
 
 
-
 IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, PreviewTimerHdl, Timer *, void)
 {
     aPreviewTimer.Stop();
@@ -1219,7 +1191,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, PreviewTimerHdl, Timer *, void)
 }
 
 
-
 IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, EndSearchProgressHdl, Dialog&, void)
 {
   if( !aFoundList.empty() )
@@ -1239,7 +1210,6 @@ IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, EndSearchProgressHdl, Dialog&, v
 }
 
 
-
 IMPL_LINK_TYPED( TPGalleryThemeProperties, DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, pEvt, void )
 {
     DBG_ASSERT( xFolderPicker.is(), "TPGalleryThemeProperties::DialogClosedHdl(): no folder picker" );
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 66d9d1f920c6..2a9964b76a0f 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -28,6 +28,7 @@
 #include <cuires.hrc>
 #include <svx/dialogs.hrc>
 
+
 GraphicPreviewWindow::GraphicPreviewWindow(vcl::Window* pParent,
     const WinBits nStyle)
     : Control(pParent, nStyle)
@@ -37,6 +38,7 @@ GraphicPreviewWindow::GraphicPreviewWindow(vcl::Window* pParent,
 {
 }
 
+
 VCL_BUILDER_DECL_FACTORY(GraphicPreviewWindow)
 {
     WinBits nWinBits = WB_TABSTOP;
@@ -48,11 +50,13 @@ VCL_BUILDER_DECL_FACTORY(GraphicPreviewWindow)
     rRet = VclPtr<GraphicPreviewWindow>::Create(pParent, nWinBits);
 }
 
+
 Size GraphicPreviewWindow::GetOptimalSize() const
 {
     return LogicToPixel(Size(81, 73), MAP_APPFONT);
 }
 
+
 void GraphicPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
 {
     Control::Paint(rRenderContext, rRect);
@@ -75,12 +79,14 @@ void GraphicPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const Recta
     }
 }
 
+
 void GraphicPreviewWindow::SetPreview(const Graphic& rGraphic)
 {
     maPreview = rGraphic;
     Invalidate();
 }
 
+
 void GraphicPreviewWindow::ScaleImageToFit()
 {
     if (!mpOrigGraphic)
@@ -126,6 +132,7 @@ void GraphicPreviewWindow::ScaleImageToFit()
     maModifyHdl.Call(nullptr);
 }
 
+
 void GraphicPreviewWindow::Resize()
 {
     Control::Resize();
@@ -149,11 +156,13 @@ GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent,
     mpPreview->init(&rGraphic, maModifyHdl);
 }
 
+
 GraphicFilterDialog::~GraphicFilterDialog()
 {
     disposeOnce();
 }
 
+
 void GraphicFilterDialog::dispose()
 {
     mpPreview.clear();
@@ -169,7 +178,6 @@ IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void)
 }
 
 
-
 IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void)
 {
     if (bIsBitmap)
@@ -180,9 +188,6 @@ IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplModifyHdl, LinkParamNone*, void)
 }
 
 
-// - FilterMosaic -
-
-
 GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& rGraphic,
                                           sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges )
     : GraphicFilterDialog(pParent, "MosaicDialog",
@@ -206,21 +211,25 @@ GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& r
     mpMtrWidth->GrabFocus();
 }
 
+
 IMPL_LINK_NOARG_TYPED(GraphicFilterMosaic, CheckBoxModifyHdl, CheckBox&, void)
 {
     GetModifyHdl().Call(nullptr);
 }
 
+
 IMPL_LINK_NOARG_TYPED(GraphicFilterMosaic, EditModifyHdl, Edit&, void)
 {
     GetModifyHdl().Call(nullptr);
 }
 
+
 GraphicFilterMosaic::~GraphicFilterMosaic()
 {
     disposeOnce();
 }
 
+
 void GraphicFilterMosaic::dispose()
 {
     mpMtrWidth.clear();
@@ -229,6 +238,7 @@ void GraphicFilterMosaic::dispose()
     GraphicFilterDialog::dispose();
 }
 
+
 Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
                                                  double fScaleX, double fScaleY )
 {
@@ -266,9 +276,6 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
 }
 
 
-// - GraphicFilterSmooth -
-
-
 GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& rGraphic, double nRadius)
     : GraphicFilterDialog(pParent, "SmoothDialog",
         "cui/ui/smoothdialog.ui", rGraphic)
@@ -280,16 +287,19 @@ GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& r
     mpMtrRadius->GrabFocus();
 }
 
+
 IMPL_LINK_NOARG_TYPED(GraphicFilterSmooth, EditModifyHdl, Edit&, void)
 {
     GetModifyHdl().Call(nullptr);
 }
 
+
 GraphicFilterSmooth::~GraphicFilterSmooth()
 {
     disposeOnce();
 }
 
+
 void GraphicFilterSmooth::dispose()
 {
     mpMtrRadius.clear();
@@ -297,7 +307,7 @@ void GraphicFilterSmooth::dispose()
 }
 
 
-Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ )
+Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double, double )
 {
     Graphic         aRet;
     BmpFilterParam  aParam( GetRadius() );
@@ -325,9 +335,6 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double
 }
 
 
-// - GraphicFilterSolarize -
-
-
 GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphic& rGraphic,
                                               sal_uInt8 cGreyThreshold, bool bInvert )
     : GraphicFilterDialog(pParent, "SolarizeDialog",
@@ -343,20 +350,25 @@ GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphi
     mpCbxInvert->SetToggleHdl( LINK(this, GraphicFilterSolarize, CheckBoxModifyHdl) );
 }
 
+
 IMPL_LINK_NOARG_TYPED(GraphicFilterSolarize, CheckBoxModifyHdl, CheckBox&, void)
 {
     GetModifyHdl().Call(nullptr);
 }
+
+
 IMPL_LINK_NOARG_TYPED(GraphicFilterSolarize, EditModifyHdl, Edit&, void)
 {
     GetModifyHdl().Call(nullptr);
 }
 
+
 GraphicFilterSolarize::~GraphicFilterSolarize()
 {
     disposeOnce();
 }
 
+
 void GraphicFilterSolarize::dispose()
 {
     mpMtrThreshold.clear();
@@ -365,8 +377,7 @@ void GraphicFilterSolarize::dispose()
 }
 
 
-Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
-                                                   double /*fScaleX*/, double /*fScaleY*/ )
+Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, double, double )
 {
     Graphic         aRet;
     BmpFilterParam  aParam( GetGreyThreshold() );
@@ -399,10 +410,6 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
     return aRet;
 }
 
-
-// - GraphicFilterSepia -
-
-
 GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic,
                                         sal_uInt16 nSepiaPercent )
     : GraphicFilterDialog(pParent, "AgingDialog",
@@ -431,8 +438,7 @@ void GraphicFilterSepia::dispose()
 }
 
 
-Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
-                                                double /*fScaleX*/, double /*fScaleY*/ )
+Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, double, double )
 {
     Graphic         aRet;
     BmpFilterParam  aParam( GetSepiaPercent() );
@@ -456,9 +462,6 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
 }
 
 
-// - GraphicFilterPoster -
-
-
 GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rGraphic,
                                           sal_uInt16 nPosterCount)
     : GraphicFilterDialog(pParent, "PosterDialog",
@@ -472,16 +475,19 @@ GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rG
     mpNumPoster->SetModifyHdl( LINK(this, GraphicFilterPoster, EditModifyHdl) );
 }
 
+
 IMPL_LINK_NOARG_TYPED(GraphicFilterPoster, EditModifyHdl, Edit&, void)
 {
     GetModifyHdl().Call(nullptr);
 }
 
+
 GraphicFilterPoster::~GraphicFilterPoster()
 {
     disposeOnce();
 }
 
+
 void GraphicFilterPoster::dispose()
 {
     mpNumPoster.clear();
@@ -489,8 +495,7 @@ void GraphicFilterPoster::dispose()
 }
 
 
-Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic,
-                                                 double /*fScaleX*/, double /*fScaleY*/ )
+Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic, double, double )
 {
     Graphic         aRet;
     const sal_uInt16    nPosterCount = GetPosterColorCount();
@@ -514,9 +519,6 @@ Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic,
 }
 
 
-// - GraphicFilterEmboss -
-
-
 void EmbossControl::MouseButtonDown( const MouseEvent& rEvt )
 {
     const RECT_POINT eOldRP = GetActualRP();
@@ -527,13 +529,16 @@ void EmbossControl::MouseButtonDown( const MouseEvent& rEvt )
         maModifyHdl.Call( nullptr );
 }
 
+
 Size EmbossControl::GetOptimalSize() const
 {
     return LogicToPixel(Size(77, 60), MAP_APPFONT);
 }
 
+
 VCL_BUILDER_FACTORY(EmbossControl)
 
+
 GraphicFilterEmboss::GraphicFilterEmboss(vcl::Window* pParent,
     const Graphic& rGraphic, RECT_POINT eLightSource)
     : GraphicFilterDialog (pParent, "EmbossDialog",
@@ -545,11 +550,13 @@ GraphicFilterEmboss::GraphicFilterEmboss(vcl::Window* pParent,
     mpCtlLight->GrabFocus();
 }
 
+
 GraphicFilterEmboss::~GraphicFilterEmboss()
 {
     disposeOnce();
 }
 
+
 void GraphicFilterEmboss::dispose()
 {
     mpCtlLight.clear();
@@ -557,8 +564,7 @@ void GraphicFilterEmboss::dispose()
 }
 
 
-Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic,
-                                                 double /*fScaleX*/, double /*fScaleY*/ )
+Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, double, double )
 {
     Graphic aRet;
     sal_uInt16  nAzim, nElev;