[Libreoffice-commits] core.git: framework/inc framework/source

[Tor Lillqvist]

 framework/inc/services/substitutepathvars.hxx    |    2 --
 framework/source/services/substitutepathvars.cxx |   17 +++++------------
 2 files changed, 5 insertions(+), 14 deletions(-)

New commits:
commit b596c6d74d4808f4793df51c81a93b12011314c7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Dec 9 11:26:37 2013 +0200

    Bin pointless micro-optimisation
    
    Change-Id: I87285411001a1535dae5dd921f5cceb1570d5f95

diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index f7a8fe3..ba0e34b 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 ec781f2..ac2dc08 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()