[Libreoffice-commits] core.git: sc/source

Fridrich Å trba fridrich.strba at bluewin.ch
Mon Aug 26 05:37:10 PDT 2013


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

New commits:
commit 5b734c8e19ceb38ec2f632b14fbbc753d95de77e
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
    
    Change-Id: I7283ecff340d95f16bb3a8d0aae97e166fa5f0e4

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 4801a6d..403dd93 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -17,6 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#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 +70,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 216d717..31ad033 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx
@@ -17,6 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#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 +52,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;
 


More information about the Libreoffice-commits mailing list