diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 17:52:30 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 06:42:45 -0600 |
commit | a67c2a12bccef06f1fb17d8fbae08e44f44c4392 (patch) | |
tree | 354b2448d2aa8259a05ceb4e82605f8e37176528 /comphelper/source/officeinstdir | |
parent | 65453d5aebdf851034632d5593f0a1023f7015fe (diff) |
Remove visual noise from comphelper
Change-Id: I7e5512b43240beee05404cff9d49a87d0217ea89
Reviewed-on: https://gerrit.libreoffice.org/8242
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'comphelper/source/officeinstdir')
-rw-r--r-- | comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 46 | ||||
-rw-r--r-- | comphelper/source/officeinstdir/officeinstallationdirectories.hxx | 2 |
2 files changed, 24 insertions, 24 deletions
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index 4e7bc4f3c43c..24c3d34f4370 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -38,11 +38,11 @@ using namespace com::sun::star; using namespace comphelper; -//========================================================================= + // helpers -//========================================================================= -//========================================================================= + + static bool makeCanonicalFileURL( OUString & rURL ) { OSL_ENSURE( rURL.matchAsciiL( "file:", sizeof( "file:" ) - 1 , 0 ) , @@ -81,13 +81,13 @@ static bool makeCanonicalFileURL( OUString & rURL ) return false; } -//========================================================================= -//========================================================================= -// + + + // OfficeInstallationDirectories Implementation. -// -//========================================================================= -//========================================================================= + + + OfficeInstallationDirectories::OfficeInstallationDirectories( const uno::Reference< uno::XComponentContext > & xCtx ) @@ -100,7 +100,7 @@ OfficeInstallationDirectories::OfficeInstallationDirectories( { } -//========================================================================= + // virtual OfficeInstallationDirectories::~OfficeInstallationDirectories() { @@ -108,9 +108,9 @@ OfficeInstallationDirectories::~OfficeInstallationDirectories() delete m_pUserDir; } -//========================================================================= + // util::XOfficeInstallationDirectories -//========================================================================= + // virtual OUString SAL_CALL @@ -121,7 +121,7 @@ OfficeInstallationDirectories::getOfficeInstallationDirectoryURL() return OUString( *m_pOfficeBrandDir ); } -//========================================================================= + // virtual OUString SAL_CALL OfficeInstallationDirectories::getOfficeUserDataDirectoryURL() @@ -132,7 +132,7 @@ OfficeInstallationDirectories::getOfficeUserDataDirectoryURL() } -//========================================================================= + // virtual OUString SAL_CALL OfficeInstallationDirectories::makeRelocatableURL( const OUString& URL ) @@ -168,7 +168,7 @@ OfficeInstallationDirectories::makeRelocatableURL( const OUString& URL ) return OUString( URL ); } -//========================================================================= + // virtual OUString SAL_CALL OfficeInstallationDirectories::makeAbsoluteURL( const OUString& URL ) @@ -203,9 +203,9 @@ OfficeInstallationDirectories::makeAbsoluteURL( const OUString& URL ) return OUString( URL ); } -//========================================================================= + // lang::XServiceInfo -//========================================================================= + // virtual OUString SAL_CALL @@ -231,7 +231,7 @@ OfficeInstallationDirectories::getSupportedServiceNames() return getSupportedServiceNames_static(); } -//========================================================================= + // static OUString SAL_CALL OfficeInstallationDirectories::getImplementationName_static() @@ -239,7 +239,7 @@ OfficeInstallationDirectories::getImplementationName_static() return OUString("com.sun.star.comp.util.OfficeInstallationDirectories"); } -//========================================================================= + // static uno::Sequence< OUString > SAL_CALL OfficeInstallationDirectories::getSupportedServiceNames_static() @@ -248,14 +248,14 @@ OfficeInstallationDirectories::getSupportedServiceNames_static() return uno::Sequence< OUString >( &aServiceName, 1 ); } -//========================================================================= + // static OUString SAL_CALL OfficeInstallationDirectories::getSingletonName_static() { return OUString("com.sun.star.util.theOfficeInstallationDirectories"); } -//========================================================================= + // static uno::Reference< uno::XInterface > SAL_CALL OfficeInstallationDirectories::Create( @@ -265,9 +265,9 @@ OfficeInstallationDirectories::Create( new OfficeInstallationDirectories( rxContext ) ); } -//========================================================================= + // non-UNO -//========================================================================= + void OfficeInstallationDirectories::initDirs() { diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index d631f1f0d54e..1f8e34bc4374 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx @@ -29,7 +29,7 @@ namespace comphelper { -//========================================================================= + typedef cppu::WeakImplHelper2< com::sun::star::util::XOfficeInstallationDirectories, |