aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/openoffice-4/files/patch-vcl_source_glyphs_graphite__layout.cxx14
-rw-r--r--editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx14
2 files changed, 28 insertions, 0 deletions
diff --git a/editors/openoffice-4/files/patch-vcl_source_glyphs_graphite__layout.cxx b/editors/openoffice-4/files/patch-vcl_source_glyphs_graphite__layout.cxx
new file mode 100644
index 000000000000..35a42abb317b
--- /dev/null
+++ b/editors/openoffice-4/files/patch-vcl_source_glyphs_graphite__layout.cxx
@@ -0,0 +1,14 @@
+--- vcl/source/glyphs/graphite_layout.cxx.orig 2014-02-25 08:33:06 UTC
++++ vcl/source/glyphs/graphite_layout.cxx
+@@ -107,9 +107,10 @@ namespace
+ typedef ext_std::pair<gr::GlyphIterator, gr::GlyphIterator> glyph_range_t;
+ typedef ext_std::pair<gr::GlyphSetIterator, gr::GlyphSetIterator> glyph_set_range_t;
+
+- inline long round(const float n) {
++ inline long round_(const float n) {
+ return long(n + (n < 0 ? -0.5 : 0.5));
+ }
++#define round round_
+
+
+ template<typename T>
diff --git a/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx b/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx
new file mode 100644
index 000000000000..35a42abb317b
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-vcl_source_glyphs_graphite__layout.cxx
@@ -0,0 +1,14 @@
+--- vcl/source/glyphs/graphite_layout.cxx.orig 2014-02-25 08:33:06 UTC
++++ vcl/source/glyphs/graphite_layout.cxx
+@@ -107,9 +107,10 @@ namespace
+ typedef ext_std::pair<gr::GlyphIterator, gr::GlyphIterator> glyph_range_t;
+ typedef ext_std::pair<gr::GlyphSetIterator, gr::GlyphSetIterator> glyph_set_range_t;
+
+- inline long round(const float n) {
++ inline long round_(const float n) {
+ return long(n + (n < 0 ? -0.5 : 0.5));
+ }
++#define round round_
+
+
+ template<typename T>