[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 2 commits - desktop/Library_sofficeapp.mk include/vcl svx/Library_svxcore.mk

[Stephan Bergmann]

 desktop/Library_sofficeapp.mk |   10 ++++++++++
 include/vcl/scrbar.hxx        |    2 +-
 svx/Library_svxcore.mk        |    4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 1abf893bcbecc3f4a761bee4032d5e63a5d9b724
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 20 13:51:25 2015 +0200

    -Werror,-Winconsistent-missing-override
    
    Change-Id: Ifc2e1159744dcaf5e7b0249ad00610e41cfe4fca

diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index bbe334b..0bc0d22 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -153,7 +153,7 @@ private:
     using Window::ImplInit;
     SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
 
-    virtual void ApplySettings(vcl::RenderContext& rRenderContext);
+    virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
 
 public:
     explicit        ScrollBarBox( vcl::Window* pParent, WinBits nStyle = 0 );
commit 213c2b793979c342eb5276ccbbf7b006ddcd3014
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jun 29 12:35:53 2015 +0200

    Partially revert "svx, canvas, desktop: gb_OBJCXXFLAGS are not needed at all"
    
    This reverts commit 601d7d38628bf93218fba15249c4654ae24e7396.
    
    desktop and svx need these flags in case of OS X sandboxing
    
    Change-Id: Ib811aa53bc2d71839961cdcea0dd4836ebdbc38c

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 91c7a51..467fecc 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -63,12 +63,22 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
 
 ifeq ($(OS),MACOSX)
 
+$(eval $(call gb_Library_add_cxxflags,sofficeapp,\
+    $(gb_OBJCXXFLAGS) \
+))
+
 $(eval $(call gb_Library_use_system_darwin_frameworks,sofficeapp,\
     Foundation \
 ))
 
 endif
 
+ifeq ($(OS),IOS)
+$(eval $(call gb_Library_add_cflags,sofficeapp,\
+    $(gb_OBJCFLAGS) \
+))
+endif
+
 $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
     desktop/source/app/app \
     desktop/source/app/appinit \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index c73b42f..51e2bab 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -91,6 +91,10 @@ $(eval $(call gb_Library_use_externals,svxcore,\
 
 ifeq ($(OS),MACOSX)
 
+$(eval $(call gb_Library_add_cxxflags,svxcore,\
+    $(gb_OBJCXXFLAGS) \
+))
+
 $(eval $(call gb_Library_use_system_darwin_frameworks,svxcore,\
 	Foundation \
 ))