diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-12-09 11:26:37 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-12-09 11:26:37 +0200 |
| commit | b596c6d74d4808f4793df51c81a93b12011314c7 (patch) | |
| tree | 7e133a9a759099ca44e76fe25c6cec04de5192f3 | |
| parent | 02ce734450559c9353ca7f42b2519239220dd265 (diff) | |
Bin pointless micro-optimisation
Change-Id: I87285411001a1535dae5dd921f5cceb1570d5f95
| -rw-r--r-- | framework/inc/services/substitutepathvars.hxx | 2 | ||||
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 17 |
2 files changed, 5 insertions, 14 deletions
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index f7a8fe39f499..ba0e34b37a82 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -146,8 +146,6 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem OUString m_aNTDomain; bool m_bHostRetrieved; OUString m_aHost; - bool m_bOSRetrieved; - OperatingSystem m_eOSType; Link m_aListenerNotify; const OUString m_aSharePointsNodeName; diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index ec781f2b8a06..ac2dc08784df 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -230,7 +230,6 @@ SubstitutePathVariables_Impl::SubstitutePathVariables_Impl( const Link& aNotifyL m_bDNSDomainRetrieved( false ), m_bNTDomainRetrieved( false ), m_bHostRetrieved( false ), - m_bOSRetrieved( false ), m_aListenerNotify( aNotifyLink ), m_aSharePointsNodeName( OUString( "SharePoints" )), m_aDirPropertyName( OUString( "/Directory" )), @@ -300,23 +299,17 @@ void SubstitutePathVariables_Impl::Commit() OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystem() { - if ( !m_bOSRetrieved ) - { #ifdef SOLARIS - m_eOSType = OS_SOLARIS; + return OS_SOLARIS; #elif defined LINUX - m_eOSType = OS_LINUX; + return OS_LINUX; #elif defined WIN32 - m_eOSType = OS_WINDOWS; + return OS_WINDOWS; #elif defined UNIX - m_eOSType = OS_UNIX; + return OS_UNIX; #else - m_eOSType = OS_UNKNOWN; + return OS_UNKNOWN; #endif - m_bOSRetrieved = sal_True; - } - - return m_eOSType; } const OUString& SubstitutePathVariables_Impl::GetYPDomainName() |