include/sfx2/objsh.hxx | 8 -------- lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 5 +++++ sfx2/source/doc/objmisc.cxx | 8 ++++++++ 3 files changed, 13 insertions(+), 8 deletions(-)
New commits: commit 8928a4f6dcacb1357d3b9b1a7a29cc62fede87d9 Author: Tor Lillqvist <t...@collabora.com> Date: Fri May 23 14:29:50 2014 +0300 Try to fix Windows build Change-Id: Ib73cc86f9f14397b296324e14562278b5f8a2144 diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx index 94abeb9..72fd23d 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx @@ -17,6 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#if defined(WNT) +#include <prewin.h> +#include <postwin.h> +#endif + #include <com/sun/star/uno/Reference.h> #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp> commit 43bea0e2f77bb2de9ca4d74f2f1f401e857b7178 Author: Tor Lillqvist <t...@collabora.com> Date: Fri May 23 13:39:15 2014 +0300 Avoid including <config_features.h> in <sfx2/objsh.hxx> Change-Id: I36969367e47c1ed1368ed46638ff9e7768e8a008 diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 79082aa..9c28cc5 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 070703e..0e825c4 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits