[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source

[Fridrich Å trba]

 sc/source/ui/Accessibility/AccessibleDocument.cxx          |   25 +++++++++++++
 sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx |   25 +++++++++++++
 2 files changed, 50 insertions(+)

New commits:
commit 980cb9e125800dc29e0e37ccb6e5817881e640ae
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Aug 26 14:36:23 2013 +0200

    Ugly bad and nasty workaround for some dupplicate symbols issue
    
    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
    Reviewed-on: https://gerrit.libreoffice.org/5633
    Reviewed-by: Thorsten Behrens <tbehrens at suse.com>
    Tested-by: Thorsten Behrens <tbehrens at suse.com>

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index eec20b5..6ce612b 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -17,6 +17,23 @@
  *   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
+#define indices dummy1_indices
+
+#ifdef extents
+#undef extents
+#endif
+#define extents dummy1_extents
+
 #include "AccessibleDocument.hxx"
 #include "AccessibleSpreadsheet.hxx"
 #include "tabvwsh.hxx"
@@ -60,6 +77,14 @@
 #include <list>
 #include <algorithm>
 
+#ifdef indices
+#undef indices
+#endif
+
+#ifdef extents
+#undef extents
+#endif
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 using ::std::for_each;
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
index 12315f1..af8401d 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -17,6 +17,23 @@
  *   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
+#define indices dummy2_indices
+
+#ifdef extents
+#undef extents
+#endif
+#define extents dummy2_extents
+
 #include "scitems.hxx"
 #include <editeng/eeitem.hxx>
 #include <tools/gen.hxx>
@@ -42,6 +59,14 @@
 #include <comphelper/servicehelper.hxx>
 #include <toolkit/helper/convert.hxx>
 
+#ifdef indices
+#undef indices
+#endif
+
+#ifdef extents
+#undef extents
+#endif
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;