summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-08-26 14:36:23 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2013-08-26 14:36:23 +0200
commit5b734c8e19ceb38ec2f632b14fbbc753d95de77e (patch)
treed2b2da262d088c5cf6441015e2fe759cd1e4bac0
parentaaa1bc40bb197968946c39d4c31c13588191bf55 (diff)
Ugly bad and nasty workaround for some dupplicate symbols issue
Change-Id: I7283ecff340d95f16bb3a8d0aae97e166fa5f0e4
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx18
-rw-r--r--sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx18
2 files changed, 36 insertions, 0 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 4801a6d235b0..403dd93c9ef7 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 216d7171787d..31ad0335f327 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;