[Libreoffice-commits] core.git: sfx2/source

[Tor Lillqvist]

 sfx2/source/doc/docfile.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b9a07c37557b70ff6df39798d64ce79c1e59d492
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Jun 23 21:52:12 2013 +0300

    Fix linking error of app for iOS in optimized build
    
    ShowLockedDocumentDialog uses the DocumentLockFile API which is not
    compiled for non-desktop OSes (see svl/Library_svl.mk). This leads to
    an undefined reference to svt::DocumentLockFile::m_bAllowInteraction.
    As ShowLockedDocumentDialog isn't used anyway without
    HAVE_FEATURE_MULTIUSER_ENVIRONMENT, put it inside such an #if, too.
    
    Thanks to Tsahi Glik <tsahi.glik at cloudon.com> for noticing.
    
    Change-Id: I45d2179395b44709c52ab1871866a2bd5720c8b6

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 711718f..e44449f 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -872,6 +872,8 @@ void SfxMedium::SetEncryptionDataToStorage_Impl()
     }
 }
 
+#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
+
 //------------------------------------------------------------------
 sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock )
 {
@@ -983,16 +985,16 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< OUString >& a
 
 namespace
 {
-#if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
     bool isSuitableProtocolForLocking(const String & rLogicName)
     {
         INetURLObject aUrl( rLogicName );
         INetProtocol eProt = aUrl.GetProtocol();
         return eProt == INET_PROT_FILE || eProt == INET_PROT_SFTP;
     }
-#endif
 }
 
+#endif
+
 // returns true if the document can be opened for editing ( even if it should be a copy )
 // otherwise the document should be opened readonly
 // if user cancel the loading the ERROR_ABORT is set