diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 18:19:04 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 05:59:38 -0600 |
commit | 2991d2d65bf8b99d82d1f7d209332d0c303dff21 (patch) | |
tree | 3c2fd5215307bb1547e594f423636ad882594523 /desktop/source/pkgchk | |
parent | e74a09929d4771972913a3ebcdd6df042f871fca (diff) |
Remove visual noise from desktop
Change-Id: Ib8ca7794ce6f3e96ee3a9b2896b141635665552c
Reviewed-on: https://gerrit.libreoffice.org/8252
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop/source/pkgchk')
-rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 4 | ||||
-rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 18 | ||||
-rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_shared.h | 28 |
3 files changed, 25 insertions, 25 deletions
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index e7b037325646..7927481106d3 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -50,7 +50,7 @@ using namespace ::unopkg; namespace { -//============================================================================== + class CommandEnvironmentImpl : public ::cppu::WeakImplHelper3< XCommandEnvironment, task::XInteractionHandler, @@ -397,7 +397,7 @@ void CommandEnvironmentImpl::pop() throw (RuntimeException, std::exception) namespace unopkg { -//============================================================================== + Reference< XCommandEnvironment > createCmdEnv( Reference< XComponentContext > const & xContext, OUString const & logFile, diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 97b32ada28d0..c422e4adce10 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -66,7 +66,7 @@ OUString toString( OptionInfo const * info ) return buf.makeStringAndClear(); } -//============================================================================== + OptionInfo const * getOptionInfo( OptionInfo const * list, OUString const & opt, sal_Unicode copt ) @@ -97,7 +97,7 @@ OptionInfo const * getOptionInfo( return 0; } -//============================================================================== + bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex ) { OSL_ASSERT( option_info != 0 ); @@ -128,7 +128,7 @@ bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex ) } return false; } -//============================================================================== + bool isBootstrapVariable(sal_uInt32 * pIndex) { @@ -144,7 +144,7 @@ bool isBootstrapVariable(sal_uInt32 * pIndex) return false; } -//============================================================================== + bool readArgument( OUString * pValue, OptionInfo const * option_info, sal_uInt32 * pIndex ) { @@ -186,19 +186,19 @@ struct ProcessWorkingDir : public rtl::StaticWithInit< }; } // anon namespace -//============================================================================== + OUString const & getExecutableDir() { return ExecutableDir::get(); } -//============================================================================== + OUString const & getProcessWorkingDir() { return ProcessWorkingDir::get(); } -//============================================================================== + OUString makeAbsoluteFileUrl( OUString const & sys_path, OUString const & base_url, bool throw_exc ) { @@ -320,7 +320,7 @@ void printf_unaccepted_licenses( dp_misc::writeConsole("License not accepted\n\n"); } -//============================================================================== + void printf_packages( ::std::vector< Reference<deployment::XPackage> > const & allExtensions, ::std::vector<bool> const & vecUnaccepted, @@ -437,7 +437,7 @@ OUString getLockFilePath() return ret; } -//============================================================================== + Reference<XComponentContext> getUNO( bool verbose, bool shared, bool bGui, Reference<XComponentContext> & out_localContext) diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h index e12a9655b5ae..24e0b6b40704 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_shared.h +++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h @@ -53,23 +53,23 @@ struct LockFileException : public css::uno::Exception css::uno::Exception(sMessage, css::uno::Reference< css::uno::XInterface > ()) {} }; -//============================================================================== + OUString toString( OptionInfo const * info ); -//============================================================================== + OptionInfo const * getOptionInfo( OptionInfo const * list, OUString const & opt, sal_Unicode copt = '\0' ); -//============================================================================== + bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex ); -//============================================================================== + bool readArgument( OUString * pValue, OptionInfo const * option_info, sal_uInt32 * pIndex ); -//============================================================================== + inline bool readOption( bool * flag, OptionInfo const * option_info, sal_uInt32 * pIndex ) { @@ -80,33 +80,33 @@ inline bool readOption( } return false; } -//============================================================================== + /** checks if an argument is a bootstrap variable. These start with -env:. For example -env:UNO_JAVA_JFW_USER_DATA=file:///d:/user */ bool isBootstrapVariable(sal_uInt32 * pIndex); -//============================================================================== + OUString const & getExecutableDir(); -//============================================================================== + OUString const & getProcessWorkingDir(); -//============================================================================== + OUString makeAbsoluteFileUrl( OUString const & sys_path, OUString const & base_url, bool throw_exc = true ); -//############################################################################## -//============================================================================== + + css::uno::Reference<css::ucb::XCommandEnvironment> createCmdEnv( css::uno::Reference<css::uno::XComponentContext> const & xContext, OUString const & logFile, bool option_force_overwrite, bool option_verbose, bool option_suppressLicense); -//============================================================================== + void printf_packages( ::std::vector< css::uno::Reference<css::deployment::XPackage> > const & allExtensions, @@ -114,9 +114,9 @@ void printf_packages( css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv, sal_Int32 level = 0 ); -//############################################################################## -//============================================================================== + + css::uno::Reference<css::uno::XComponentContext> getUNO( bool verbose, bool shared, bool bGui, css::uno::Reference<css::uno::XComponentContext> & out_LocalComponentContext); |