sc/source/ui/Accessibility/AccessibleDocument.cxx | 7 +++++++
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 7 +++++++
2 files changed, 14 insertions(+)
New commits:
commit 2492604c92506043982551755710c78dcecf7c31
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Mon Aug 26 14:36:23 2013 +0200
Document a bit the Ugly bad and nasty workaround
Somehow, under same circumstances, MSVC creates object code for 2
inlined functions. Nobody here uses them, so simply define them away
so that there be no dupplicate symbols anymore.
The symbols extents and indices come from boost::multi_array.
(cherry picked from commit 5b734c8e19ceb38ec2f632b14fbbc753d95de77e)
Change-Id: I7283ecff340d95f16bb3a8d0aae97e166fa5f0e4
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 403dd93..b38c639 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -17,6 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+/* Somehow, under same circumstances, MSVC creates object code for 2
+ * inlined functions. Nobody here uses them, so simply define them away
+ * so that there be no dupplicate symbols anymore.
+
+ * The symbols "extents" and "indices" come from boost::multi_array.
+ */
+
#ifdef indices
#undef indices
#endif
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index 31ad033..1714379 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -17,6 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+/* Somehow, under same circumstances, MSVC creates object code for 2
+ * inlined functions. Nobody here uses them, so simply define them away
+ * so that there be no dupplicate symbols anymore.
+
+ * The symbols "extents" and "indices" come from boost::multi_array.
+ */
+
#ifdef indices
#undef indices
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
