diff options
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 120 | ||||
| -rw-r--r-- | desktop/source/app/cmdlineargs.hxx | 60 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/migration/services/jvmfwk.cxx | 6 |
4 files changed, 32 insertions, 160 deletions
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 7b8726a44996..35e93e66eade 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -610,137 +610,29 @@ void CommandLineArgs::InitParamValues() m_bDocumentArgs = false; } -bool CommandLineArgs::IsMinimized() const -{ - return m_minimized; -} -bool CommandLineArgs::IsInvisible() const -{ - return m_invisible; -} -bool CommandLineArgs::IsNoRestore() const -{ - return m_norestore; -} -bool CommandLineArgs::IsNoDefault() const -{ - return m_nodefault; -} -bool CommandLineArgs::IsHeadless() const -{ - return m_headless; -} -bool CommandLineArgs::IsQuickstart() const -{ - return m_quickstart; -} -bool CommandLineArgs::IsNoQuickstart() const -{ - return m_noquickstart; -} -bool CommandLineArgs::IsTerminateAfterInit() const -{ - return m_terminateafterinit; -} -bool CommandLineArgs::IsNoLogo() const -{ - return m_nologo; -} -bool CommandLineArgs::IsNoLockcheck() const -{ - return m_nolockcheck; -} -bool CommandLineArgs::IsHelp() const -{ - return m_help; -} -bool CommandLineArgs::IsHelpWriter() const -{ - return m_helpwriter; -} -bool CommandLineArgs::IsHelpCalc() const -{ - return m_helpcalc; -} -bool CommandLineArgs::IsHelpDraw() const -{ - return m_helpdraw; -} -bool CommandLineArgs::IsHelpImpress() const -{ - return m_helpimpress; -} -bool CommandLineArgs::IsHelpBase() const -{ - return m_helpbase; -} -bool CommandLineArgs::IsHelpMath() const -{ - return m_helpmath; -} -bool CommandLineArgs::IsHelpBasic() const -{ - return m_helpbasic; -} -bool CommandLineArgs::IsWriter() const -{ - return m_writer; -} -bool CommandLineArgs::IsCalc() const -{ - return m_calc; -} -bool CommandLineArgs::IsDraw() const -{ - return m_draw; -} -bool CommandLineArgs::IsImpress() const -{ - return m_impress; -} -bool CommandLineArgs::IsBase() const -{ - return m_base; -} -bool CommandLineArgs::IsGlobal() const -{ - return m_global; -} -bool CommandLineArgs::IsMath() const -{ - return m_math; -} -bool CommandLineArgs::IsWeb() const -{ - return m_web; -} -bool CommandLineArgs::IsVersion() const -{ - return m_version; -} OUString CommandLineArgs::GetUnknown() const { @@ -753,10 +645,6 @@ bool CommandLineArgs::HasModuleParam() const || m_web || m_base; } -bool CommandLineArgs::HasSplashPipe() const -{ - return m_splashpipe; -} std::vector< OUString > const & CommandLineArgs::GetAccept() const { @@ -832,15 +720,7 @@ OUString CommandLineArgs::GetConversionOut() const return translateExternalUris(m_conversionout); } -bool CommandLineArgs::IsEmpty() const -{ - return m_bEmpty; -} -bool CommandLineArgs::WantsToLoadDocument() const -{ - return m_bDocumentArgs; -} OUString CommandLineArgs::GetPidfileName() const { diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index f7d13fe068e1..faa76f892a7b 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -56,40 +56,40 @@ class CommandLineArgs: private boost::noncopyable boost::optional< OUString > getCwdUrl() const { return m_cwdUrl; } // Access to bool parameters - bool IsMinimized() const; - bool IsInvisible() const; - bool IsNoRestore() const; - bool IsNoDefault() const; - bool IsHeadless() const; - bool IsQuickstart() const; - bool IsNoQuickstart() const; - bool IsTerminateAfterInit() const; - bool IsNoLogo() const; - bool IsNoLockcheck() const; - bool IsHelp() const; - bool IsHelpWriter() const; - bool IsHelpCalc() const; - bool IsHelpDraw() const; - bool IsHelpImpress() const; - bool IsHelpBase() const; - bool IsHelpMath() const; - bool IsHelpBasic() const; - bool IsWriter() const; - bool IsCalc() const; - bool IsDraw() const; - bool IsImpress() const; - bool IsBase() const; - bool IsGlobal() const; - bool IsMath() const; - bool IsWeb() const; - bool IsVersion() const; + bool IsMinimized() const { return m_minimized;} + bool IsInvisible() const { return m_invisible;} + bool IsNoRestore() const { return m_norestore;} + bool IsNoDefault() const { return m_nodefault;} + bool IsHeadless() const { return m_headless;} + bool IsQuickstart() const { return m_quickstart;} + bool IsNoQuickstart() const { return m_noquickstart;} + bool IsTerminateAfterInit() const { return m_terminateafterinit;} + bool IsNoLogo() const { return m_nologo;} + bool IsNoLockcheck() const { return m_nolockcheck;} + bool IsHelp() const { return m_help;} + bool IsHelpWriter() const { return m_helpwriter;} + bool IsHelpCalc() const { return m_helpcalc;} + bool IsHelpDraw() const { return m_helpdraw;} + bool IsHelpImpress() const { return m_helpimpress;} + bool IsHelpBase() const { return m_helpbase;} + bool IsHelpMath() const { return m_helpmath;} + bool IsHelpBasic() const { return m_helpbasic;} + bool IsWriter() const { return m_writer;} + bool IsCalc() const { return m_calc;} + bool IsDraw() const { return m_draw;} + bool IsImpress() const { return m_impress;} + bool IsBase() const { return m_base;} + bool IsGlobal() const { return m_global;} + bool IsMath() const { return m_math;} + bool IsWeb() const { return m_web;} + bool IsVersion() const { return m_version;} bool HasModuleParam() const; - bool WantsToLoadDocument() const; + bool WantsToLoadDocument() const { return m_bDocumentArgs;} OUString GetUnknown() const; // Access to string parameters - bool HasSplashPipe() const; + bool HasSplashPipe() const { return m_splashpipe;} std::vector< OUString > const & GetAccept() const; std::vector< OUString > const & GetUnaccept() const; std::vector< OUString > GetOpenList() const; @@ -108,7 +108,7 @@ class CommandLineArgs: private boost::noncopyable OUString GetPidfileName() const; // Special analyzed states (does not match directly to a command line parameter!) - bool IsEmpty() const; + bool IsEmpty() const { return m_bEmpty;} private: void ParseCommandLine_Impl( Supplier& supplier ); diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 6fcfc3c67b21..82bd1c03ae46 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -151,7 +151,7 @@ public: FileDoesNotExistFilter( const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv); - bool exist(); + bool exist() { return m_bExist;} // XCommandEnvironment virtual css::uno::Reference<css::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -263,10 +263,6 @@ FileDoesNotExistFilter::~FileDoesNotExistFilter() { }; -bool FileDoesNotExistFilter::exist() -{ - return m_bExist; -} // XCommandEnvironment Reference<css::task::XInteractionHandler > FileDoesNotExistFilter::getInteractionHandler() throw (css::uno::RuntimeException, std::exception) diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index e37ab417ca64..25a36260c713 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -64,7 +64,7 @@ public: JavaInfo* pData; CJavaInfo(); ~CJavaInfo(); - operator JavaInfo* () const; + operator JavaInfo* () const { return pData;} }; CJavaInfo::CJavaInfo(): pData(NULL) @@ -76,10 +76,6 @@ CJavaInfo::~CJavaInfo() jfw_freeJavaInfo(pData); } -CJavaInfo::operator JavaInfo*() const -{ - return pData; -} class JavaMigration : public ::cppu::WeakImplHelper4< |