summaryrefslogtreecommitdiff
path: root/cppcanvas
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-11-22 10:08:35 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-11-22 10:08:35 +0000
commitc411de82a7fc90714a8da3c0fbd0bb2321c511ab (patch)
treea308d56cf7d3fee2d1e0613f46a00c95916b5a0c /cppcanvas
parentc135d302d341db2307fcf7896d9f56da63dafc34 (diff)
INTEGRATION: CWS jw2 (1.15.2); FILE MERGED
2006/11/09 02:02:02 sparcmoz 1.15.2.1: #i71226#: remove warning for gcc 4.1.2
Diffstat (limited to 'cppcanvas')
-rw-r--r--cppcanvas/source/mtfrenderer/textaction.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 31c42122274f..af8b3865e7f1 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: textaction.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: vg $ $Date: 2006-11-01 17:48:18 $
+ * last change: $Author: vg $ $Date: 2006-11-22 11:08:35 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -2308,7 +2308,7 @@ namespace cppcanvas
}
}
#if defined __GNUC__
-#if __GNUC__ == 4 && __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 1
+#if __GNUC__ == 4 && __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ <= 2
// Unreachable; to avoid bogus warning:
return ActionSharedPtr();
#endif