oox/source/token/tokens.txt | 2 - sal/inc/sal/mathconf.h | 2 - solenv/gbuild/platform/macosx.mk | 23 +++++++------- stlport/systemstl/hash_map | 14 -------- stlport/systemstl/hash_set | 14 -------- vcl/aqua/source/gdi/ctlayout.cxx | 7 ++++ vcl/inc/aqua/salfontutils.hxx | 62 --------------------------------------- 7 files changed, 21 insertions(+), 103 deletions(-)
New commits: commit 4899f54a8b39d66884ebd7afd1946af27c1c878b Author: Herbert Dürr <h...@apache.org> Date: Wed Jan 22 14:01:11 2014 +0000 #i123951# remove aqua/salfontutils.hxx header which is and was unused by by both CoreText and ATSUI diff --git a/vcl/inc/aqua/salfontutils.hxx b/vcl/inc/aqua/salfontutils.hxx deleted file mode 100644 index 694149b..0000000 --- a/vcl/inc/aqua/salfontutils.hxx +++ /dev/null @@ -1,62 +0,0 @@ -/************************************************************** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - *************************************************************/ - - - - -#ifndef _SV_SALFONTUTILS_HXX -#define _SV_SALFONTUTILS_HXX - -#include "vcl/outfont.hxx" - -static const char *kFontWeightThin1 = "Thin"; -static const char *kFontWeightThin2 = "thin"; - -static const char *kFontWeightLight1 = "Light"; -static const char *kFontWeightLight2 = "light"; - -static const char *kFontWeightBold1 = "Bold"; -static const char *kFontWeightBold2 = "bold"; - -static const char *kFontWeightUltra1 = "Ultra"; -static const char *kFontWeightUltra2 = "ultra"; - -static const char *kFontWeightSemi1 = "Semi"; -static const char *kFontWeightSemi2 = "semi"; - -static const char *kFontWeightNormal1 = "Normal"; -static const char *kFontWeightNormal2 = "normal"; - -static const char *kFontWeightMedium1 = "Medium"; -static const char *kFontWeightMedium2 = "medium"; - -static const char *kFontWeightBlack1 = "Black"; -static const char *kFontWeightBlack2 = "black"; - -static const char *kFontWeightRoman1 = "Roman"; -static const char *kFontWeightRoman2 = "roman"; - -static const char *kFontWeightRegular1 = "Regular"; -static const char *kFontWeightRegular2 = "regular"; - - -#endif // _SV_SALFONTUTILS_HXX - commit ec1150aaa09eb3afdd6ce2f0fcd387d70c3a25d8 Author: Herbert Dürr <h...@apache.org> Date: Wed Jan 22 13:46:38 2014 +0000 #i122195# extend macosx gbuild makefile for clang-compiler diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 43e5b7e2..073b191 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -58,13 +58,15 @@ gb_OSDEFS := \ gb_COMPILERDEFS := \ -D$(COM) \ -DHAVE_GCC_VISIBILITY_FEATURE \ - -DCPPU_ENV=gcc3 \ + -DCPPU_ENV=$(COMID) \ -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \ ifeq ($(CPUNAME),POWERPC) gb_CPUDEFS := -DPOWERPC -DPPC -else +else ifeq ($(CPUNAME),INTEL) gb_CPUDEFS := -DX86 +else ifeq ($(CPUNAME),X86_64) +gb_CPUDEFS := -DX86_64 endif ifeq ($(strip $(SYSBASE)),) @@ -98,11 +100,7 @@ gb_CXXFLAGS := \ -fno-common \ -fno-strict-aliasing \ -fsigned-char \ - -malign-natural \ - -pipe \ - #-Wshadow \ break in compiler headers already - #-fsigned-char \ might be removed? - #-malign-natural \ might be removed? + -pipe # these are to get g++ to switch to Objective-C++ mode # (see toolkit module for a case where it is necessary to do it this way) @@ -115,12 +113,15 @@ endif gb_LinkTarget_EXCEPTIONFLAGS := \ -DEXCEPTIONS_ON \ - -fexceptions \ - -fno-enforce-eh-specs \ + -fexceptions + +ifeq ($(COM),GCC) + gb_LinkTarget_EXCEPTIONFLAGS += -fno-enforce-eh-specs +endif gb_LinkTarget_NOEXCEPTIONFLAGS := \ -DEXCEPTIONS_OFF \ - -fno-exceptions \ + -fno-exceptions gb_LinkTarget_LDFLAGS := \ -Wl,-syslibroot,$(gb_SDKDIR) \ @@ -302,7 +303,7 @@ gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module gb_Library_SYSPRE := lib gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_ gb_Library_PLAINEXT := .dylib -gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT) +gb_Library_RTEXT := $(COMID)$(gb_Library_PLAINEXT) gb_Library_OOOEXT := $(gb_Library_PLAINEXT) gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT) commit 269a448fa67f1e66c4a7ceb78550b45c2499ea95 Author: Herbert Dürr <h...@apache.org> Date: Wed Jan 22 13:09:14 2014 +0000 #i123951# fix CoreText justification of an all-whitespace text diff --git a/vcl/aqua/source/gdi/ctlayout.cxx b/vcl/aqua/source/gdi/ctlayout.cxx index 1353fb8..11df073 100644 --- a/vcl/aqua/source/gdi/ctlayout.cxx +++ b/vcl/aqua/source/gdi/ctlayout.cxx @@ -166,6 +166,13 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs ) nPixelWidth = rArgs.mpDXArray[ mnCharCount - 1 - mnTrailingSpaces ]; } + // short-circuit when justifying an all-whitespace string + if( mnTrailingSpaces >= mnCharCount) + { + mfCachedWidth = mfTrailingSpaceWidth = nPixelWidth / mfFontScale; + return; + } + // in RTL-layouts trailing spaces are leftmost // TODO: use BiDi-algorithm to thoroughly check this assumption if( rArgs.mnFlags & SAL_LAYOUT_BIDI_RTL) commit 14b36850240678d6306849f331634db2392ab2ee Author: Herbert Dürr <h...@apache.org> Date: Wed Jan 22 12:31:43 2014 +0000 #i122208# the std::isfinite() workaround is only needed for GCC and not for Clang (even if it quite compatible with GCC). Also clang doesn't support GCC's __builtin_isfinite() function. diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h index dfeffdc..f960ddd 100644 --- a/sal/inc/sal/mathconf.h +++ b/sal/inc/sal/mathconf.h @@ -55,7 +55,7 @@ extern "C" { /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */ -#if defined(__GNUC__) // workaround gcc bug 14608 +#if defined(__GNUC__) && !defined(__clang__) // workaround gcc bug 14608 #if (__GNUC_MINOR__ >= 3) // gcc>=4.3 has a builtin #define SAL_MATH_FINITE(d) __builtin_isfinite(d) #else commit d663922ca231800e593a7b6a34c98053af6c8e02 Author: Oliver-Rainer Wittmann <o...@apache.org> Date: Wed Jan 22 12:07:06 2014 +0000 123723: correct sorting of XML token list diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt index 643e661..cefe2d9 100644 --- a/oox/source/token/tokens.txt +++ b/oox/source/token/tokens.txt @@ -144,6 +144,7 @@ EnhancedMetaFile Extend Extension External +Fallback False FieldCodes FileBinding @@ -2109,7 +2110,6 @@ factor fade fadeDir fallback -Fallback false family fans commit c9f0dafd9c6e22d5031b7e813c7335a6667af42f Author: Herbert Dürr <h...@apache.org> Date: Wed Jan 22 12:06:51 2014 +0000 #i123817# remove workaround obsoleted by the boost-1.55 update boost>=1.49 fixes the quirks of unordered containers for compilers that don't support rvalue references diff --git a/stlport/systemstl/hash_map b/stlport/systemstl/hash_map index 27ad691..198b055 100644 --- a/stlport/systemstl/hash_map +++ b/stlport/systemstl/hash_map @@ -64,13 +64,6 @@ public: hash_map( void) {} hash_map( size_t n) : _super( n) {} -#ifdef BOOST_TR1_UNORDERED_MAP_INCLUDED // workaround pre-BOOST_UNORDERED_USE_MOVE problem - // in derived classes the copy assignment operator can only be declared implicitly if - // its base class's assignment operator has the canonical signature. - // boost's assignment operators don't have this canonical signature when move-semantics are enabled - hash_map& operator=( const hash_map& r) { hash_map c(r); this->swap(c); return *this; } -#endif - private: // setting the hasher dynamically is not supported in the emulation! hash_map( size_t, const __H&, const __E& rE=__E(), const __A& rA=__A()); // not implemented @@ -92,13 +85,6 @@ public: hash_multimap( void) {} hash_multimap( size_t n) : _super( n) {} -#ifdef BOOST_TR1_UNORDERED_MAP_INCLUDED // workaround pre-BOOST_UNORDERED_USE_MOVE problem - // in derived classes the copy assignment operator can only be declared implicitly if - // its base class's assignment operator has the canonical signature. - // boost's assignment operators don't have this canonical signature when move-semantics are enabled - hash_multimap& operator=( const hash_multimap& r) { hash_multimap c(r); this->swap(c); return *this; } -#endif - private: // setting the hasher dynamically is not supported in the emulation! hash_multimap( size_t, const __H&, const __E& rE=__E(), const __A& rA=__A()); // not implemented diff --git a/stlport/systemstl/hash_set b/stlport/systemstl/hash_set index 3bffc11..a6bc33c 100644 --- a/stlport/systemstl/hash_set +++ b/stlport/systemstl/hash_set @@ -61,13 +61,6 @@ public: hash_set( void) {} hash_set( size_t n) : _super(n) {} -#ifdef BOOST_TR1_UNORDERED_SET_INCLUDED // workaround pre-BOOST_UNORDERED_USE_MOVE problem - // in derived classes the copy assignment operator can only be declared implicitly if - // its base class's assignment operator has the canonical signature. - // boost's assignment operators don't have this canonical signature when move-semantics are enabled - hash_set& operator=( const hash_set& r) { hash_set c(r); this->swap(c); return *this; } -#endif - private: // setting the hasher dynamically is not supported in the emulation! hash_set( size_t, const __H&, const __E& rE=__E(), const __A& rA=__A()); // not implemented @@ -86,13 +79,6 @@ public: hash_multiset( void) {} hash_multiset( size_t n) : _super( n) {} -#ifdef BOOST_TR1_UNORDERED_SET_INCLUDED // workaround pre-BOOST_UNORDERED_USE_MOVE problem - // in derived classes the copy assignment operator can only be declared implicitly if - // its base class's assignment operator has the canonical signature. - // boost's assignment operators don't have this canonical signature when move-semantics are enabled - hash_multiset& operator=( const hash_multiset& r) { hash_multiset c(r); this->swap(c); return *this; } -#endif - private: // setting the hasher dynamically is not supported in the emulation! hash_multiset( size_t, const __H&, const __E& rE=__E(), const __A& rA=__A()); // not implemented
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits