[Libreoffice-commits] core.git: 4 commits - solenv/gbuild svx/source

[Tor Lillqvist]

 solenv/gbuild/platform/IOS_ARM_GCC.mk                     |    9 +++------
 svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx |    4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 160c5846b1762da88d9713cfae0b80cf746bd71d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 15 16:08:54 2014 +0300

    WaE: unused parameter 'rMediaItem'
    
    Change-Id: Ibe4fd981677446badded650ecf616df0a819e572

diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index f2ccab7..5fa946b 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -47,11 +47,11 @@ ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r
         mpMediaWindow->hide();
         executeMediaItem( rMediaItem );
     }
+#else
+    (void) rMediaItem;
 #endif
 }
 
-
-
 ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj()
 {
     delete mpMediaWindow;
commit 0774b5556057809a1b7438bd3a67a6ee3c80c3eb
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 15 15:15:41 2014 +0300

    I doubt we need these switches
    
    Change-Id: If7b1183384c3931efe73a24a894116be4d827807

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 381d01a..27659c4 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -58,11 +58,9 @@ gb_CXXFLAGS := \
 	-fsigned-char \
 	$(CXXFLAGS_CXX11) \
 
-gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch
-
 # These are to get the compiler to switch to Objective-C++ or Objective-C mode
-gb_OBJCXXFLAGS := -x objective-c++ $(gb_OBJC_OBJCXX_COMMON_FLAGS)
-gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
+gb_OBJCXXFLAGS := -x objective-c++
+gb_OBJCFLAGS := -x objective-c
 
 gb_COMPILERDEFS += \
 		-DBOOST_DETAIL_NO_CONTAINER_FWD
commit 29362f51c38a4d1e5d994ea7adf2b6ae2d0a84cf
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 15 15:13:30 2014 +0300

    Move misleading comment
    
    Change-Id: Iaf02671b7d3abc8e096ed817385fc78cead1813c

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index ebc1a90..381d01a 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -58,11 +58,10 @@ gb_CXXFLAGS := \
 	-fsigned-char \
 	$(CXXFLAGS_CXX11) \
 
-# these are to get gcc to switch to Objective-C++ or Objective-C mode
 gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch
 
+# These are to get the compiler to switch to Objective-C++ or Objective-C mode
 gb_OBJCXXFLAGS := -x objective-c++ $(gb_OBJC_OBJCXX_COMMON_FLAGS)
-
 gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
 
 gb_COMPILERDEFS += \
commit 5346a38c1ffaec6d4bf1921a8e24d5f334e3e79d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 15 15:11:10 2014 +0300

    The -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 is surely left here by accident
    
    Change-Id: Ibc36e4795122167585fb653cc1c4e81fd59f3620

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 0d53585..ebc1a90 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -59,7 +59,7 @@ gb_CXXFLAGS := \
 	$(CXXFLAGS_CXX11) \
 
 # these are to get gcc to switch to Objective-C++ or Objective-C mode
-gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300
+gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch
 
 gb_OBJCXXFLAGS := -x objective-c++ $(gb_OBJC_OBJCXX_COMMON_FLAGS)