summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 18:16:42 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 08:18:05 +0000
commita238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch)
tree083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /desktop
parent538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff)
Remove excess newlines
A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/app.cxx2
-rw-r--r--desktop/source/app/appinit.cxx1
-rw-r--r--desktop/source/app/dispatchwatcher.cxx6
-rw-r--r--desktop/source/app/officeipcthread.cxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx3
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.cxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx5
-rw-r--r--desktop/source/deployment/gui/license_dialog.cxx5
-rw-r--r--desktop/source/deployment/manager/dp_commandenvironments.cxx1
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx2
-rw-r--r--desktop/source/deployment/manager/dp_informationprovider.cxx5
-rw-r--r--desktop/source/deployment/manager/dp_manager.cxx3
-rw-r--r--desktop/source/deployment/manager/dp_properties.hxx4
-rw-r--r--desktop/source/deployment/misc/dp_misc.cxx3
-rw-r--r--desktop/source/deployment/misc/dp_update.cxx1
-rw-r--r--desktop/source/deployment/misc/lockfile.cxx7
-rw-r--r--desktop/source/deployment/registry/component/dp_compbackenddb.hxx1
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx3
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configuration.cxx2
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx1
-rw-r--r--desktop/source/deployment/registry/dp_backend.cxx2
-rw-r--r--desktop/source/deployment/registry/dp_registry.cxx1
-rw-r--r--desktop/source/deployment/registry/executable/dp_executable.cxx2
-rw-r--r--desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx1
-rw-r--r--desktop/source/deployment/registry/help/dp_helpbackenddb.hxx1
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx2
-rw-r--r--desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx1
-rw-r--r--desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx1
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx1
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_sfwk.cxx1
-rw-r--r--desktop/source/migration/services/basicmigration.cxx11
-rw-r--r--desktop/source/migration/services/basicmigration.hxx2
-rw-r--r--desktop/source/migration/services/jvmfwk.cxx3
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.cxx6
-rw-r--r--desktop/source/migration/services/oo3extensionmigration.hxx1
-rw-r--r--desktop/source/migration/services/wordbookmigration.cxx13
-rw-r--r--desktop/source/migration/services/wordbookmigration.hxx2
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx1
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_misc.cxx1
-rw-r--r--desktop/win32/source/guiloader/genericloader.cxx3
-rw-r--r--desktop/win32/source/officeloader/officeloader.cxx3
42 files changed, 0 insertions, 118 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 6f48c8ba090b..d5e5c2c6ebe6 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -328,7 +328,6 @@ void DoRestartActionsIfNecessary(bool quickstart) {
}
-
ResMgr* Desktop::GetDesktopResManager()
{
if ( !Desktop::pResMgr )
@@ -1873,7 +1872,6 @@ IMPL_STATIC_LINK_TYPED(Desktop, AsyncInitFirstRun, Timer *, /*unused*/, void)
}
-
class ExitTimer : public Timer
{
public:
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index f8b09575dcbc..4f5b284d184e 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -66,7 +66,6 @@ namespace desktop
{
-
static void configureUcb()
{
// For backwards compatibility, in case some code still uses plain
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 67a6a144c576..38cd63620289 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -783,10 +783,4 @@ void SAL_CALL DispatchWatcher::dispatchFinished( const DispatchResultEvent& ) th
}
-
-
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 1ead4e26f50a..70213f238ada 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -322,7 +322,6 @@ oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSign
}
-
// The OfficeIPCThreadController implementation is a bookkeeper for all pending requests
// that were created by the OfficeIPCThread. The requests are waiting to be processed by
// our framework loadComponentFromURL function (e.g. open/print request).
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 2f25386dbca7..c5b0dcd74276 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -78,7 +78,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::system;
-
namespace dp_gui {
#define TOP_OFFSET 5
@@ -237,7 +236,6 @@ void ExtBoxWithBtns_Impl::RecalcAll()
}
-
//This function may be called with nPos < 0
void ExtBoxWithBtns_Impl::selectEntry( const long nPos )
{
@@ -962,7 +960,6 @@ IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleCloseBtn, Button*, void)
}
-
IMPL_LINK_TYPED( ExtMgrDialog, startProgress, void*, _bLockInterface, void )
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 63bb21b7c018..7e62952655bd 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -111,7 +111,6 @@ OUString getVersion( const uno::Reference< deployment::XPackage > &rPackage )
namespace dp_gui {
-
class ProgressCmdEnv
: public ::cppu::WeakImplHelper< ucb::XCommandEnvironment,
task::XInteractionHandler,
@@ -324,7 +323,6 @@ ProgressCmdEnv::~ProgressCmdEnv()
}
-
// XCommandEnvironment
uno::Reference< task::XInteractionHandler > ProgressCmdEnv::getInteractionHandler()
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index e739a3833cc4..58a2dc82e78b 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -42,7 +42,6 @@ using namespace ::com::sun::star;
namespace dp_gui {
-
::rtl::Reference< TheExtensionManager > TheExtensionManager::s_ExtMgr;
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index dd4fac0ff9c9..329459e56502 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -192,8 +192,6 @@ struct UpdateDialog::Index
};
-
-
class UpdateDialog::Thread: public salhelper::Thread {
public:
Thread(
@@ -696,8 +694,6 @@ void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos )
}
-
-
sal_uInt16 UpdateDialog::insertItem( UpdateDialog::Index *pEntry, SvLBoxButtonKind kind )
{
m_pUpdates->InsertEntry( pEntry->m_aName, TREELIST_APPEND, static_cast< void * >( pEntry ), kind );
@@ -1141,7 +1137,6 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore,
}
-
IMPL_LINK_NOARG_TYPED(UpdateDialog, selectionHandler, SvTreeListBox*, void)
{
OUStringBuffer b;
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 09327822d78e..7a1570a5a26d 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -200,7 +200,6 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
-
LicenseDialogImpl::LicenseDialogImpl(
vcl::Window * pParent,
const OUString & sExtensionName,
@@ -291,10 +290,6 @@ IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, EndReachedHdl, LicenseView&, void)
}
-
-
-
-
LicenseDialog::LicenseDialog( Sequence<Any> const& args,
Reference<XComponentContext> const& )
{
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index a062ea69efe6..1f7aa09079dd 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -208,7 +208,6 @@ void LicenseCommandEnv::handle(
}
-
NoLicenseCommandEnv::NoLicenseCommandEnv(
css::uno::Reference< css::task::XInteractionHandler> const & handler):
BaseCommandEnv(handler)
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 3d5000da0894..9e9d95ea404e 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -160,7 +160,6 @@ ExtensionRemoveGuard::~ExtensionRemoveGuard()
namespace dp_manager {
-
//ToDo: bundled extension
ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& xContext) :
::cppu::WeakComponentImplHelper< css::deployment::XExtensionManager >(getMutex()),
@@ -175,7 +174,6 @@ ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& x
}
-
ExtensionManager::~ExtensionManager()
{
}
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index 7bbc04857215..49e284290087 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -85,7 +85,6 @@ private:
};
-
PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XComponentContext > const& xContext) :
mxContext( xContext ),
mxUpdateInformation( deployment::UpdateInformationProvider::create( xContext ) )
@@ -93,7 +92,6 @@ PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XCo
}
-
PackageInformationProvider::~PackageInformationProvider()
{
}
@@ -134,7 +132,6 @@ OUString PackageInformationProvider::getPackageLocation(
}
-
OUString SAL_CALL
PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId )
throw ( uno::RuntimeException, std::exception )
@@ -324,8 +321,6 @@ uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider::
}
-
-
namespace sdecl = comphelper::service_decl;
sdecl::class_<PackageInformationProvider> servicePIP;
extern sdecl::ServiceDecl const serviceDecl(
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 2db22a5a03c0..46d327febff6 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1122,8 +1122,6 @@ PackageManagerImpl::getDeployedPackages(
}
-
-
//ToDo: the function must not call registerPackage, do this in
//XExtensionManager.reinstallDeployedExtensions
void PackageManagerImpl::reinstallDeployedPackages(
@@ -1560,7 +1558,6 @@ sal_Int32 PackageManagerImpl::checkPrerequisites(
}
-
PackageManagerImpl::CmdEnvWrapperImpl::~CmdEnvWrapperImpl()
{
}
diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx
index b8f059fa7043..c1850cf31595 100644
--- a/desktop/source/deployment/manager/dp_properties.hxx
+++ b/desktop/source/deployment/manager/dp_properties.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_PROPERTIES_HXX
-
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <boost/optional.hpp>
@@ -30,7 +29,6 @@
namespace dp_manager {
-
/**
*/
@@ -65,8 +63,6 @@ public:
}
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 4749537cab15..949d76211b4f 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -239,7 +239,6 @@ bool needToSyncRepository(OUString const & name)
} // anon namespace
-
namespace {
inline OUString encodeForRcFile( OUString const & str )
{
@@ -306,8 +305,6 @@ OUString makeURLAppendSysPathSegment( OUString const & baseURL, OUString const &
}
-
-
OUString expandUnoRcTerm( OUString const & term_ )
{
OUString term(term_);
diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx
index fd183ace4af2..891e1537cd48 100644
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
@@ -332,7 +332,6 @@ extension(ext)
}
-
UpdateInfoMap getOnlineUpdateInfos(
Reference<uno::XComponentContext> const &xContext,
Reference<deployment::XExtensionManager> const & xExtMgr,
diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx
index 93895d41ff5a..197ce6a49b0a 100644
--- a/desktop/source/deployment/misc/lockfile.cxx
+++ b/desktop/source/deployment/misc/lockfile.cxx
@@ -204,11 +204,4 @@ namespace desktop {
}
-
-
-
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
index 2fa6172e428f..71b859866001 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
@@ -94,7 +94,6 @@ public:
};
-
}
}
}
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index b52b0df77a70..61bba1def6a1 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -337,7 +337,6 @@ public:
};
-
BackendImpl::ComponentPackageImpl::ComponentPackageImpl(
::rtl::Reference<PackageRegistryBackend> const & myBackend,
OUString const & url, OUString const & name,
@@ -390,7 +389,6 @@ BackendImpl * BackendImpl::ComponentPackageImpl::getMyBackend() const
}
-
void BackendImpl::ComponentPackageImpl::disposing()
{
Package::disposing();
@@ -747,7 +745,6 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
}
-
void BackendImpl::unorc_verify_init(
Reference<XCommandEnvironment> const & xCmdEnv )
{
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 4dc4f8da904b..b8e68bb2ca8b 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -279,7 +279,6 @@ bool BackendImpl::activateEntry(OUString const & url)
}
-
// XPackageRegistry
Sequence< Reference<deployment::XPackageTypeInfo> >
@@ -357,7 +356,6 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
}
-
void BackendImpl::configmgrini_verify_init(
Reference<XCommandEnvironment> const & xCmdEnv )
{
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
index e38b3885dc15..88dd77640d9d 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
@@ -74,7 +74,6 @@ public:
};
-
}
}
}
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 17abf4a40db2..4e3e2aeeb987 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -302,7 +302,6 @@ void PackageRegistryBackend::deleteUnusedFolders(
}
-
Package::~Package()
{
}
@@ -456,7 +455,6 @@ sal_Bool Package::checkDependencies(
}
-
Sequence< Reference<deployment::XPackage> > Package::getBundle(
Reference<task::XAbortChannel> const &,
Reference<XCommandEnvironment> const & )
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index 62e6737beaed..4c072281cda4 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -170,7 +170,6 @@ OUString normalizeMediaType( OUString const & mediaType )
}
-
void PackageRegistryImpl::packageRemoved(
OUString const & url, OUString const & mediaType)
throw (css::deployment::DeploymentException,
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 68a876547faa..b0719d61196b 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -191,7 +191,6 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
}
-
// Package
BackendImpl * BackendImpl::ExecutablePackageImpl::getMyBackend() const
{
@@ -309,7 +308,6 @@ bool BackendImpl::ExecutablePackageImpl::getFileAttributes(sal_uInt64& out_Attri
}
-
} // anon namespace
namespace sdecl = comphelper::service_decl;
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
index da5ff6cf7099..050b758dd025 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx
@@ -58,7 +58,6 @@ public:
};
-
}
}
}
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
index 191e1a54d293..2dd822a0c197 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
@@ -73,7 +73,6 @@ public:
};
-
}
}
}
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 899cee3e137c..51fc2ea6bd73 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -158,7 +158,6 @@ class BackendImpl : public ImplBaseT
virtual void SAL_CALL disposing() override;
-
public:
PackageImpl(
::rtl::Reference<PackageRegistryBackend> const & myBackend,
@@ -472,7 +471,6 @@ void BackendImpl::revokeEntryFromDb(OUString const & url)
}
-
BackendImpl::PackageImpl::PackageImpl(
::rtl::Reference<PackageRegistryBackend> const & myBackend,
OUString const & url,
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
index 7adc9a2a8668..8c288d9b5755 100644
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
@@ -66,7 +66,6 @@ OUString ScriptBackendDb::getKeyElementName()
}
-
} // namespace executable
} // namespace backend
} // namespace dp_registry
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
index c1a6024f4d86..aee78da3642b 100644
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx
@@ -56,7 +56,6 @@ public:
};
-
}
}
}
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
index 238153cb3630..4b283fc61838 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
@@ -21,7 +21,6 @@
#include "dp_parceldesc.hxx"
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index df0fe2239ed0..1e578a370098 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -179,7 +179,6 @@ BackendImpl::BackendImpl(
}
-
// XPackageRegistry
Sequence< Reference<deployment::XPackageTypeInfo> >
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index 26b0ca391f34..ed454096a874 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -27,12 +27,10 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-
namespace migration
{
-
#define sSourceUserBasic "/user/basic"
#define sTargetUserBasic "/user/__basic_80"
@@ -46,7 +44,6 @@ namespace migration
}
-
Sequence< OUString > BasicMigration_getSupportedServiceNames()
{
Sequence< OUString > aNames { "com.sun.star.migration.Basic" };
@@ -62,13 +59,11 @@ namespace migration
}
-
BasicMigration::~BasicMigration()
{
}
-
TStringVectorPtr BasicMigration::getFiles( const OUString& rBaseURL ) const
{
TStringVectorPtr aResult( new TStringVector );
@@ -105,7 +100,6 @@ namespace migration
}
-
void BasicMigration::checkAndCreateDirectory( INetURLObject& rDirURL )
{
::osl::FileBase::RC aResult = ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) );
@@ -119,7 +113,6 @@ namespace migration
}
-
void BasicMigration::copyFiles()
{
OUString sTargetDir;
@@ -163,7 +156,6 @@ namespace migration
}
-
sal_Bool BasicMigration::supportsService(OUString const & ServiceName)
throw (css::uno::RuntimeException, std::exception)
{
@@ -171,7 +163,6 @@ namespace migration
}
-
Sequence< OUString > BasicMigration::getSupportedServiceNames() throw (RuntimeException, std::exception)
{
return BasicMigration_getSupportedServiceNames();
@@ -228,8 +219,6 @@ namespace migration
}
-
-
} // namespace migration
diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx
index 02600c1d95f7..784d7f972da1 100644
--- a/desktop/source/migration/services/basicmigration.hxx
+++ b/desktop/source/migration/services/basicmigration.hxx
@@ -33,7 +33,6 @@
class INetURLObject;
-
namespace migration
{
@@ -44,7 +43,6 @@ namespace migration
css::uno::Reference< css::uno::XComponentContext > const & xContext );
-
// class BasicMigration
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index ac9b39bd1467..d18c8e1825a1 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -77,7 +77,6 @@ CJavaInfo::~CJavaInfo()
}
-
class JavaMigration : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo,
css::lang::XInitialization,
@@ -190,8 +189,6 @@ public:
css::lang::WrappedTargetException, std::exception ) override;
-
-
virtual ~JavaMigration();
private:
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index e1e0f3880a17..414df39f06f9 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -59,7 +59,6 @@ OUString OO3ExtensionMigration_getImplementationName()
}
-
Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames()
{
return Sequence< OUString > { "com.sun.star.migration.Extensions" };
@@ -75,7 +74,6 @@ m_ctx(ctx)
}
-
OO3ExtensionMigration::~OO3ExtensionMigration()
{
}
@@ -292,7 +290,6 @@ void OO3ExtensionMigration::migrateExtension( const OUString& sSourceDir )
}
-
// XServiceInfo
@@ -302,7 +299,6 @@ OUString OO3ExtensionMigration::getImplementationName() throw (RuntimeException,
}
-
sal_Bool OO3ExtensionMigration::supportsService(OUString const & ServiceName)
throw (css::uno::RuntimeException, std::exception)
{
@@ -310,7 +306,6 @@ sal_Bool OO3ExtensionMigration::supportsService(OUString const & ServiceName)
}
-
Sequence< OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (RuntimeException, std::exception)
{
return OO3ExtensionMigration_getSupportedServiceNames();
@@ -459,7 +454,6 @@ Reference< XInterface > SAL_CALL OO3ExtensionMigration_create(
}
-
} // namespace migration
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx
index b049c166da7c..b2c14bf11bc4 100644
--- a/desktop/source/migration/services/oo3extensionmigration.hxx
+++ b/desktop/source/migration/services/oo3extensionmigration.hxx
@@ -52,7 +52,6 @@ namespace migration
css::uno::Reference< css::uno::XComponentContext > const & xContext );
-
// class ExtensionMigration
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 621b65ebf752..fa84fe35f36d 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -27,17 +27,14 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-
namespace migration
{
-
static const char sSourceSubDir[] = "/user/wordbook";
static const char sTargetSubDir[] = "/user/wordbook";
-
// component operations
@@ -47,7 +44,6 @@ namespace migration
}
-
Sequence< OUString > WordbookMigration_getSupportedServiceNames()
{
return Sequence< OUString > { "com.sun.star.migration.Wordbooks" };
@@ -62,13 +58,11 @@ namespace migration
}
-
WordbookMigration::~WordbookMigration()
{
}
-
TStringVectorPtr WordbookMigration::getFiles( const OUString& rBaseURL ) const
{
TStringVectorPtr aResult( new TStringVector );
@@ -105,7 +99,6 @@ namespace migration
}
-
void WordbookMigration::checkAndCreateDirectory( INetURLObject& rDirURL )
{
::osl::FileBase::RC aResult = ::osl::Directory::create( rDirURL.GetMainURL( INetURLObject::DECODE_TO_IURI ) );
@@ -157,8 +150,6 @@ bool IsUserWordbook( const OUString& rFile )
}
-
-
void WordbookMigration::copyFiles()
{
OUString sTargetDir;
@@ -205,7 +196,6 @@ bool IsUserWordbook( const OUString& rFile )
}
-
sal_Bool WordbookMigration::supportsService(OUString const & ServiceName)
throw (css::uno::RuntimeException, std::exception)
{
@@ -213,7 +203,6 @@ bool IsUserWordbook( const OUString& rFile )
}
-
Sequence< OUString > WordbookMigration::getSupportedServiceNames() throw (RuntimeException, std::exception)
{
return WordbookMigration_getSupportedServiceNames();
@@ -270,8 +259,6 @@ bool IsUserWordbook( const OUString& rFile )
}
-
-
} // namespace migration
diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx
index 49c997c9c3d1..d9266f693ba1 100644
--- a/desktop/source/migration/services/wordbookmigration.hxx
+++ b/desktop/source/migration/services/wordbookmigration.hxx
@@ -33,7 +33,6 @@
class INetURLObject;
-
namespace migration
{
@@ -44,7 +43,6 @@ namespace migration
css::uno::Reference< css::uno::XComponentContext > const & xContext );
-
// class WordbookMigration
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index 417791ca66c5..86ae42221ed8 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -94,7 +94,6 @@ public:
};
-
CommandEnvironmentImpl::CommandEnvironmentImpl(
Reference<XComponentContext> const & xComponentContext,
OUString const & log_file,
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 81e9e720a599..3b73159cb1c4 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -346,7 +346,6 @@ void printf_packages(
}
-
namespace {
diff --git a/desktop/win32/source/guiloader/genericloader.cxx b/desktop/win32/source/guiloader/genericloader.cxx
index 4c3d94883e6d..76ee748de1a4 100644
--- a/desktop/win32/source/guiloader/genericloader.cxx
+++ b/desktop/win32/source/guiloader/genericloader.cxx
@@ -41,7 +41,6 @@
#include "../loader.hxx"
-
static int GenericMain()
{
TCHAR szTargetFileName[MAX_PATH];
@@ -143,7 +142,6 @@ static int GenericMain()
}
-
#ifdef __MINGW32__
int WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR, int )
#else
@@ -154,7 +152,6 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
}
-
#ifdef __MINGW32__
int __cdecl main()
#else
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index e782c90c94b0..99404488b753 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -117,8 +117,6 @@ BOOL WINAPI ConvertSidToStringSid( PSID pSid, LPTSTR* StringSid )
}
-
-
static LPTSTR *GetCommandArgs( int *pArgc )
{
#ifdef UNICODE
@@ -130,7 +128,6 @@ static LPTSTR *GetCommandArgs( int *pArgc )
}
-
namespace {
bool writeArgument(HANDLE pipe, char prefix, WCHAR const * argument) {