Remove commented code in libs-core/desktop

40 files changed, 5 insertions, 73 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 6058c22c9a89..22ac1988636b 100755
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -280,15 +280,12 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg )
 
 //=============================================================================
 // shows a simple error box with the given message ... but exits from these process !
-//
 // Fatal errors cant be solved by the process ... nor any recovery can help.
 // Mostly the installation was damaged and must be repaired manually .. or by calling
 // setup again.
-//
 // On the other side we must make sure that no further actions will be possible within
 // the current office process ! No pipe requests, no menu/toolbar/shortuct actions
 // are allowed. Otherwise we will force a "crash inside a crash".
-//
 // Thats why we have to use a special native message box here which does not use yield :-)
 //=============================================================================
 void FatalError(const ::rtl::OUString& sMessage)
@@ -1690,7 +1687,7 @@ int Desktop::Main()
         SetSplashScreenProgress(40);
         RTL_LOGFILE_CONTEXT_TRACE( aLog, "} create SvtPathOptions and SvtLanguageOptions" );
 
-        // Check special env variable #111015#
+        // Check special env variable
         std::vector< String > aUnrestrictedFolders;
         svt::getUnrestrictedFolders( aUnrestrictedFolders );
 
@@ -2970,7 +2967,6 @@ String GetURL_Impl(
 
     // Use the provided parameters for smartRel2Abs to support the usage of '%' in system paths.
     // Otherwise this char won't get encoded and we are not able to load such files later,
-    // see #110156#
     bool bWasAbsolute;
     INetURLObject aURL     = aObj.smartRel2Abs( rName, bWasAbsolute, false, INetURLObject::WAS_ENCODED,
                                                 RTL_TEXTENCODING_UTF8, true );
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index bae9c5a12c73..38d425ed703c 100755
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -152,7 +152,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
                         cb->getContentProviderManagerInterface();
 
 
-            // Workaround for P1 #124597#.  Instanciate GNOME-VFS-UCP in the thread that initialized
+            //Instanciate GNOME-VFS-UCP in the thread that initialized
              // GNOME in order to avoid a deadlock that may occure in case UCP gets initialized from
             // a different thread. The latter may happen when calling the Office remotely via UNO.
             // THIS IS NOT A FIX, JUST A WORKAROUND!
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 54adffc91faf..fbc5136518c3 100755
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -220,8 +220,6 @@ void SilentCommandEnv::pop() throw (uno::RuntimeException)
 } // end namespace
 
 //-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 static const OUString sConfigSrvc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ) );
 static const OUString sAccessSrvc( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" ) );
 //------------------------------------------------------------------------------
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 998f414c6887..6885021718bc 100755
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -171,7 +171,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
         {
             break;
         }
-        // convert file URLs to internal form #112849#
+        // convert file URLs to internal form
         if (aArg.indexOfAsciiL(RTL_CONSTASCII_STRINGPARAM("file:"))==0 &&
             xTranslator.is())
         {
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
index 7a4bf00671b2..16ef67f3b3d7 100755
--- a/desktop/source/app/configinit.cxx
+++ b/desktop/source/app/configinit.cxx
@@ -176,7 +176,6 @@ uno::Reference< lang::XMultiServiceFactory > CreateApplicationConfigurationProvi
 
 
 // ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
 // ConfigurationErrorHandler
 // ----------------------------------------------------------------------------
 
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 8c1e6744ac5a..10a9b3b9f0e7 100755
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -364,7 +364,6 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
             }
 
             // if we are called in viewmode, open document read-only
-            // #95425#
             if(aDispatchRequest.aRequestType == REQUEST_VIEW) {
                 sal_Int32 nIndex = aArgs.getLength();
                 aArgs.realloc(nIndex+1);
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 36db7bc429bc..13421d3cde7d 100755
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -286,7 +286,6 @@ bool LanguageSelection::prepareLanguage()
 void LanguageSelection::setDefaultLanguage(const OUString& sLocale)
 {
     // #i32939# setting of default document language
-    //
     // See #i42730# for rules for determining source of settings
 
     // determine script type of locale
diff --git a/desktop/source/app/lockfile.cxx b/desktop/source/app/lockfile.cxx
index b07196cc5b36..577efd4edb5c 100755
--- a/desktop/source/app/lockfile.cxx
+++ b/desktop/source/app/lockfile.cxx
@@ -100,7 +100,7 @@ namespace desktop {
         int tmpByte = 0;
         for (int i = 0; i<nIdBytes; i++) {
             tmpByte = rand( ) % 0xFF;
-            sprintf( tmpId+i*2, "%02X", tmpByte ); // #100211# - checked
+            sprintf( tmpId+i*2, "%02X", tmpByte );
         }
         tmpId[nIdBytes*2]=0x00;
         m_aId = OUString::createFromAscii( tmpId );
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 6088ee383022..652d4c8dd416 100755
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -562,7 +562,6 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
         aStreamPipe.write( aArguments.GetBuffer(), aArguments.Len() );
         aStreamPipe.write( "\0", 1 );
 
-        // wait for confirmation #95361# #95425#
         ByteString aToken(sc_aConfirmationSequence);
         char *aReceiveBuffer = new char[aToken.Len()+1];
         int n = aStreamPipe.read( aReceiveBuffer, aToken.Len() );
@@ -595,7 +594,6 @@ void OfficeIPCThread::DisableOfficeIPCThread()
         // this is done so the subsequent join will not hang
         // because the thread hangs in accept of pipe
         osl::StreamPipe aPipe ( pOfficeIPCThread->maPipeIdent, osl_Pipe_OPEN, Security::get() );
-        //Pipe.send( TERMINATION_SEQUENCE, TERMINATION_LENGTH );
         if (aPipe.is())
         {
             aPipe.send( sc_aTerminationSequence, sc_nTSeqLength+1 ); // also send 0-byte
@@ -662,8 +660,6 @@ void SAL_CALL OfficeIPCThread::run()
 
         if( nError == osl_Pipe_E_None )
         {
-
-            // #111143# and others:
             // if we receive a request while the office is displaying some dialog or error during
             // bootstrap, that dialogs event loop might get events that are dispatched by this thread
             // we have to wait for cReady to be set by the real main loop.
@@ -693,7 +689,7 @@ void SAL_CALL OfficeIPCThread::run()
             }
             // don't close pipe ...
 
-            // #90717# Is this a lookup message from another application? if so, ignore
+            // Is this a lookup message from another application? if so, ignore
             if ( aArguments.Len() == 0 )
                 continue;
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 785601c5599f..e564fade8e5e 100755
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -210,8 +210,6 @@ ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl()
 }
 
 //------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
 const Size ExtBoxWithBtns_Impl::GetMinOutputSizePixel() const
 {
     Size aMinSize( ExtensionBox_Impl::GetMinOutputSizePixel() );
@@ -960,7 +958,6 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker()
 //------------------------------------------------------------------------------
 IMPL_LINK( ExtMgrDialog, HandleCancelBtn, void*, EMPTYARG )
 {
-    // m_dialog->m_cmdEnv->m_aborted = true;
     if ( m_xAbortChannel.is() )
     {
         try
@@ -1375,7 +1372,6 @@ bool UpdateRequiredDialog::enablePackage( const uno::Reference< deployment::XPac
 //------------------------------------------------------------------------------
 IMPL_LINK( UpdateRequiredDialog, HandleCancelBtn, void*, EMPTYARG )
 {
-    // m_dialog->m_cmdEnv->m_aborted = true;
     if ( m_xAbortChannel.is() )
     {
         try
@@ -1824,8 +1820,6 @@ sal_Int16 UpdateRequiredDialogService::execute() throw ( uno::RuntimeException )
 }
 
 //------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
 SelectedPackage::~SelectedPackage() {}
 
 } //namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 4b514a4b39fc..2e85cea27bfb 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -1108,8 +1108,6 @@ OUString ExtensionCmdQueue::Thread::searchAndReplaceAll( const OUString &rSource
 
 
 //------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
 ExtensionCmdQueue::ExtensionCmdQueue( DialogHelper * pDialogHelper,
                                       TheExtensionManager *pManager,
                                       const uno::Reference< uno::XComponentContext > &rContext )
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index eed7226ab48f..7b00c4ede248 100755
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -352,7 +352,6 @@ void ExtensionBox_Impl::select( const rtl::OUString & sName )
 }
 
 //------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
 // Title + description
 void ExtensionBox_Impl::CalcActiveHeight( const long nPos )
 {
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 0853f9995d09..915470108fb6 100755
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -85,7 +85,6 @@ int MyApp::Main()
     return EXIT_SUCCESS;
 }
 
-//##############################################################################
 
 namespace
 {
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 928561ff9d0b..696c2fe3ef0c 100755
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -487,8 +487,6 @@ void UpdateInstallDialog::Thread::installExtensions()
              }
             m_dialog.m_ft_extension_name.SetText(i->aInstalledPackage->getDisplayName());
         }
-//         TimeValue v = {1, 0};
-//       osl::Thread::wait(v);
         bool bError = false;
         bool bLicenseDeclined = false;
         cssu::Reference<css::deployment::XPackage> xExtension;
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index 78448cfa1726..f8237f35499f 100755
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -223,7 +223,6 @@ void LicenseCommandEnv::handle(
 }
 
 //================================================================================
-//================================================================================
 
 NoLicenseCommandEnv::NoLicenseCommandEnv(
     css::uno::Reference< css::task::XInteractionHandler> const & handler):
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 8bff15a1c6ef..3bfad74a3f32 100755
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -1499,8 +1499,6 @@ sal_Bool ExtensionManager::isReadOnlyRepository(::rtl::OUString const & reposito
     return getPackageManager(repository)->isReadOnly();
 }
 //------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
 
 namespace sdecl = comphelper::service_decl;
 sdecl::class_<ExtensionManager> servicePIP;
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 1988b2498e31..0786e7d84fa3 100755
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -150,8 +150,6 @@ rtl::OUString PackageInformationProvider::getPackageLocation(
 }
 
 //------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
 
 rtl::OUString SAL_CALL
 PackageInformationProvider::getPackageLocation( const rtl::OUString& _sExtensionId )
@@ -333,8 +331,6 @@ uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL PackageInformationProvi
 
 
 //------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
 
 namespace sdecl = comphelper::service_decl;
 sdecl::class_<PackageInformationProvider> servicePIP;
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 2c790d047520..680dbf855d9d 100755
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1619,7 +1619,6 @@ sal_Int32 PackageManagerImpl::checkPrerequisites(
     }
 }
 
-//##############################################################################
 
 //______________________________________________________________________________
 PackageManagerImpl::CmdEnvWrapperImpl::~CmdEnvWrapperImpl()
diff --git a/desktop/source/deployment/misc/db.cxx b/desktop/source/deployment/misc/db.cxx
index 6ba2c25bc92c..909f12f79e18 100755
--- a/desktop/source/deployment/misc/db.cxx
+++ b/desktop/source/deployment/misc/db.cxx
@@ -152,7 +152,6 @@ int Db::del(Dbt *key, u_int32_t flags)
     if ((err = db->del(db, 0, key, flags)) != 0) {
         // DB_NOTFOUND is a "normal" return, so should not be
         // thrown as an error
-        //
         if (err != DB_NOTFOUND) {
             db_internal::check_error(err, "Db::del");
             return (err);
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 90592c645c93..3c6d21fe6dc6 100755
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -167,7 +167,6 @@ class FileDoesNotExistFilter
                                       css::task::XInteractionHandler >
 
 {
-    //css::uno::Reference<css::task::XInteractionHandler> m_xHandler;
     bool m_bExist;
     css::uno::Reference< css::ucb::XCommandEnvironment > m_xCommandEnv;
 
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 323f8e5d3afd..4591ff4fd101 100755
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -448,7 +448,6 @@ BackendImpl * BackendImpl::ComponentPackageImpl::getMyBackend() const
 //______________________________________________________________________________
 void BackendImpl::ComponentPackageImpl::disposing()
 {
-//    m_xRemoteContext.clear();
     Package::disposing();
 }
 
@@ -877,7 +876,6 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         static_cast<sal_Int16>(-1) );
 }
 
-//##############################################################################
 
 //______________________________________________________________________________
 void BackendImpl::unorc_verify_init(
@@ -1653,7 +1651,6 @@ void BackendImpl::ComponentPackageImpl::processPackage_(
     }
 }
 
-//##############################################################################
 BackendImpl::TypelibraryPackageImpl::TypelibraryPackageImpl(
     ::rtl::Reference<PackageRegistryBackend> const & myBackend,
     OUString const & url, OUString const & name,
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 2401a5e858fc..bcf44d359b23 100755
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -355,7 +355,6 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         static_cast<sal_Int16>(-1) );
 }
 
-//##############################################################################
 
 //______________________________________________________________________________
 void BackendImpl::configmgrini_verify_init(
@@ -519,7 +518,6 @@ bool BackendImpl::removeFromConfigmgrIni(
     return true;
 }
 
-//##############################################################################
 
 // Package
 //______________________________________________________________________________
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 6de731f76e75..cbb0bf53abad 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -313,7 +313,6 @@ void PackageRegistryBackend::deleteUnusedFolders(
 
 }
 
-//##############################################################################
 
 //______________________________________________________________________________
 Package::~Package()
@@ -772,7 +771,6 @@ sal_Bool Package::isRemoved()
     return m_bRemoved;
 }
 
-//##############################################################################
 
 //______________________________________________________________________________
 Package::TypeInfo::~TypeInfo()
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 5e59a6fd8fc9..3579695ce81a 100755
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -204,7 +204,6 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
     return Reference<deployment::XPackage>();
 }
 
-//##############################################################################
 
 
 // Package
@@ -326,7 +325,6 @@ bool BackendImpl::ExecutablePackageImpl::getFileAttributes(sal_uInt64& out_Attri
     return bSuccess;
 }
 
-//##############################################################################
 
 
 } // anon namespace
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index b7129bc43955..053e193729dc 100755
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -67,8 +67,6 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     {
         BackendImpl * getMyBackend() const;
 
-//        HelpBackendDb::Data m_dbData;
-
         // Package
         virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_(
             ::osl::ResettableMutexGuard & guard,
@@ -258,7 +256,6 @@ bool BackendImpl::activateEntry(OUString const & url)
 }
 
 
-//##############################################################################
 BackendImpl::PackageImpl::PackageImpl(
     ::rtl::Reference<PackageRegistryBackend> const & myBackend,
     OUString const & url, OUString const & name,
@@ -384,8 +381,6 @@ beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL()
     return beans::Optional<OUString>(true, OUString());
 }
 
-//##############################################################################
-
 static rtl::OUString aSlash(RTL_CONSTASCII_USTRINGPARAM("/"));
 static rtl::OUString aHelpStr(RTL_CONSTASCII_USTRINGPARAM("help"));
 
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 10377e502029..f28269411703 100755
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -484,7 +484,6 @@ void BackendImpl::revokeEntryFromDb(OUString const & url)
 }
 
 
-//##############################################################################
 
 BackendImpl::PackageImpl::PackageImpl(
     ::rtl::Reference<PackageRegistryBackend> const & myBackend,
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 959140f35641..c9d3b19a5309 100755
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -296,7 +296,6 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         static_cast<sal_Int16>(-1) );
 }
 
-//##############################################################################
 
 // Package
 BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 539e1c844e99..a93069465435 100755
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -292,7 +292,6 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         static_cast<sal_Int16>(-1) );
 }
 
-//##############################################################################
 
 void BackendImpl::PackageImpl:: initPackageHandler()
 {
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index aa4704031741..1ed91e906886 100755
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -454,7 +454,6 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio
     {
         // get current migration step
         theNameAccess->getByName(seqMigrations[i]) >>= tmpAccess;
-        // tmpStepPtr = new migration_step();
         migration_step tmpStep;
         tmpStep.name = seqMigrations[i];
 
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index d58bda4fe07b..5411e40a91ca 100755
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -222,7 +222,6 @@ void disposeBridges(Reference<css::uno::XComponentContext> ctx)
     }
 }
 
-//##############################################################################
 extern "C" int unopkg_main()
 {
     tools::extendApplicationEnvironment();
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 0d5e57318e36..2021e7698b9b 100755
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -177,7 +177,6 @@ bool readArgument(
     return false;
 }
 
-//##############################################################################
 
 namespace {
 struct ExecutableDir : public rtl::StaticWithInit<
@@ -256,7 +255,6 @@ OUString makeAbsoluteFileUrl(
         ? abs.copy( 0, abs.getLength() -1 ) : abs;
 }
 
-//##############################################################################
 
 namespace {
 
@@ -369,7 +367,6 @@ void printf_packages(
 }
 
 
-//##############################################################################
 
 namespace {
 
diff --git a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
index 6f9cc022d223..ff762d202e35 100755
--- a/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/LinuxSystemEnvironment.java
@@ -156,7 +156,6 @@ class LinuxSystemEnvironment extends SystemEnvironment {
 
     // reads from dmidecode with the given type and target
     // returns an empty string if nothing was found or an error occurred
-    //
     // Sample output segment:
     // Handle 0x0001
     //         DMI type 1, 25 bytes.
diff --git a/desktop/source/registration/com/sun/star/servicetag/Registry.java b/desktop/source/registration/com/sun/star/servicetag/Registry.java
index 932b0d7e1cb5..1415a75fd28a 100755
--- a/desktop/source/registration/com/sun/star/servicetag/Registry.java
+++ b/desktop/source/registration/com/sun/star/servicetag/Registry.java
@@ -157,7 +157,6 @@ public class Registry {
             // $JAVA_HOME/bin/java -cp $TEST_DIR \
             //    -Dstclient.registry.path=$TEST_DIR/registry.xml \
             //    SvcTagClient
-            //
             // On Windows, the JAVA_HOME and TEST_DIR path could contain
             // space e.g. c:\Program Files\Java\jdk1.6.0_05\bin\java.
             // The SVCTAG_STCLIENT_CMD must be set with a list of
diff --git a/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java b/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
index fa98580fd6b5..4a5a980938e1 100755
--- a/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SolarisSystemEnvironment.java
@@ -309,7 +309,6 @@ class SolarisSystemEnvironment extends SystemEnvironment {
     // Sample smbios output segment:
     // ID    SIZE TYPE
     // 1     150  SMB_TYPE_SYSTEM (system information)
-    //
     //   Manufacturer: Sun Microsystems
     //   Product: Sun Fire X4600
     //   Version: To Be Filled By O.E.M.
diff --git a/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java b/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
index ca0a16858670..362136cc6f46 100755
--- a/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
+++ b/desktop/source/registration/com/sun/star/servicetag/SysnetRegistryHelper.java
@@ -113,7 +113,6 @@ public class SysnetRegistryHelper {
             // $JAVA_HOME/bin/java -cp $TEST_DIR \
             //    -Dstclient.registry.path=$TEST_DIR/registry.xml \
             //    SvcTagClient
-            //
             // On Windows, the JAVA_HOME and TEST_DIR path could contain
             // space e.g. c:\Program Files\Java\jdk1.6.0_05\bin\java.
             // The SVCTAG_STCLIENT_CMD must be set with a list of
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index bdcda986a08f..42e1dfd51c0d 100755
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -263,7 +263,6 @@ IMPL_LINK( SplashScreen, AppEventListenerHdl, VclWindowEvent *, inEvent )
 {
     if ( inEvent != 0 )
     {
-        // Paint( Rectangle() );
         switch ( inEvent->GetId() )
         {
             case VCLEVENT_WINDOW_SHOW:
diff --git a/desktop/win32/source/applauncher/launcher.cxx b/desktop/win32/source/applauncher/launcher.cxx
index 4ea164d2eeed..a7a17b59a215 100755
--- a/desktop/win32/source/applauncher/launcher.cxx
+++ b/desktop/win32/source/applauncher/launcher.cxx
@@ -72,7 +72,6 @@ extern "C" int APIENTRY _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
 
     ppArguments = GetArgv( &nArguments );
 
-    // if ( 1 == nArguments )
     {
         lpCommandLine = (LPTSTR)_alloca( sizeof(_TCHAR) * (_tcslen(lpCommandLine) + _tcslen(APPLICATION_SWITCH) + 2) );
 
diff --git a/desktop/win32/source/extendloaderenvironment.hxx b/desktop/win32/source/extendloaderenvironment.hxx
index b9b262bb13ed..ace91b1a913d 100755
--- a/desktop/win32/source/extendloaderenvironment.hxx
+++ b/desktop/win32/source/extendloaderenvironment.hxx
@@ -79,12 +79,10 @@ inline WCHAR * commandLineAppendEncoded(WCHAR * buffer, WCHAR const * text) {
 
 // Set the PATH environment variable in the current (loader) process, so that a
 // following CreateProcess has the necessary environment:
-//
 // @param binPath
 // Must point to an array of size at least MAX_PATH.  Is filled with the null
 // terminated full path to the "bin" file corresponding to the current
 // executable.
-//
 // @param iniDirectory
 // Must point to an array of size at least MAX_PATH.  Is filled with the null
 // terminated full directory path (ending in "\") to the "ini" file
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index d3335c80a560..6375e5662b69 100755
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -115,7 +115,6 @@ BOOL WINAPI ConvertSidToStringSid( PSID pSid, LPTSTR* StringSid )
     }
 
     // Add SID subauthorities to the string.
-    //
     for (dwCounter=0 ; dwCounter < dwSubAuthorities ; dwCounter++)
     {
         dwSidSize+=wsprintf(*StringSid + dwSidSize, TEXT("-%lu"),
diff --git a/desktop/win32/source/setup/setup_main.cxx b/desktop/win32/source/setup/setup_main.cxx
index d99b671ba04c..0fb9aac2533e 100755
--- a/desktop/win32/source/setup/setup_main.cxx
+++ b/desktop/win32/source/setup/setup_main.cxx
@@ -75,8 +75,6 @@ SetupApp::~SetupApp()
 }
 
 //--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
 
 extern "C" int __stdcall WinMain( HINSTANCE hInst, HINSTANCE, LPSTR, int )
 {