From: Michael Ow Date: Tue, 8 Feb 2011 03:48:06 +0000 (+0000) Subject: ICU-8327 Merge r24411 to ICU4C 3.2, 3.4, 3.6, 3.8, and 4.0 maintenance branches X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d803cf0c38fe7781485a7edd4c30d6b694b33782;p=icu ICU-8327 Merge r24411 to ICU4C 3.2, 3.4, 3.6, 3.8, and 4.0 maintenance branches X-SVN-Rev: 29407 --- diff --git a/source/layoutex/ParagraphLayout.cpp b/source/layoutex/ParagraphLayout.cpp index 29fba0b3807..7643a6c9c3b 100644 --- a/source/layoutex/ParagraphLayout.cpp +++ b/source/layoutex/ParagraphLayout.cpp @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (C) 2002-2005, International Business Machines + * Copyright (C) 2002-2011, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** */ @@ -745,7 +745,7 @@ le_int32 ParagraphLayout::getLanguageCode(const Locale *locale) return nullLanguageCode; } -#elif +#else // TODO - dummy implementation for right now... le_int32 ParagraphLayout::getLanguageCode(const Locale *locale)