[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - svx/source
Tor Lillqvist
tml at collabora.com
Mon Oct 20 09:50:39 PDT 2014
svx/source/gallery2/gallery1.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit debaf1a8d5f51b484e336f350923c9ee4c7daca5
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Oct 8 19:08:22 2014 +0300
Fix thinko. Thanks to vmiklos for noticing
Change-Id: Id4e65908cc73978205bc0858a3a809b882864b62
(cherry picked from commit d61f8185e660a6820351b8cea3ac51d344f0ab3e)
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index cd95038..067acbd 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -19,7 +19,7 @@
#include <config_features.h>
-#if defined(MACOSX) && defined(HAVE_FEATURE_READONLY_INSTALLSET)
+#if defined(MACOSX) && HAVE_FEATURE_READONLY_INSTALLSET
#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
#include <premac.h>
#include <Foundation/Foundation.h>
@@ -244,7 +244,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO
uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
-#if defined(MACOSX) && defined(HAVE_FEATURE_READONLY_INSTALLSET)
+#if defined(MACOSX) && HAVE_FEATURE_READONLY_INSTALLSET
if( rBaseURL.GetProtocol() == INET_PROT_FILE )
{
const char *appBundle = [[[NSBundle mainBundle] bundlePath] UTF8String];
More information about the Libreoffice-commits
mailing list