From 43bea0e2f77bb2de9ca4d74f2f1f401e857b7178 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Fri, 23 May 2014 13:39:15 +0300
Subject: Avoid including <config_features.h> in <sfx2/objsh.hxx>

Change-Id: I36969367e47c1ed1368ed46638ff9e7768e8a008
---
 include/sfx2/objsh.hxx      | 8 --------
 sfx2/source/doc/objmisc.cxx | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 79082aaf72b2..9c28cc503941 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SFX2_OBJSH_HXX
 #define INCLUDED_SFX2_OBJSH_HXX
 
-#include <config_features.h>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
@@ -256,7 +255,6 @@ public:
     virtual bool                AcceptStateUpdate() const;
     bool                        IsHelpDocument() const;
 
-#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
     bool                        IsDocShared() const;
     OUString                    GetSharedFileURL() const;
     bool                        SwitchToShared( bool bShared, bool bSave );
@@ -265,12 +263,6 @@ public:
     SAL_DLLPRIVATE void         DoNotCleanShareControlFile();
     void                        SetSharedXMLFlag( bool bFlag ) const;
     bool                        HasSharedXMLFlagSet() const;
-#else
-    bool                        IsDocShared() const
-        { return sal_False; };
-    OUString             GetSharedFileURL() const
-        { return OUString(); };
-#endif
 
     SAL_DLLPRIVATE void SetModalMode_Impl(bool bModal=true);
     SAL_DLLPRIVATE void SetMacroMode_Impl(bool bModal=true);
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 070703e1a36e..0e825c4351cc 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -673,14 +673,22 @@ bool SfxObjectShell::HasSharedXMLFlagSet() const
 
 bool SfxObjectShell::IsDocShared() const
 {
+#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
     return ( !pImp->m_aSharedFileURL.isEmpty() );
+#else
+    return false;
+#endif
 }
 
 
 
 OUString SfxObjectShell::GetSharedFileURL() const
 {
+#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
     return pImp->m_aSharedFileURL;
+#else
+    return OUString();
+#endif
 }
 
 #endif
-- 
cgit