From 359b43e0ba37cde83d5e346bc2cc9cc4b03ba07b Mon Sep 17 00:00:00 2001
From: "Malte Timmermann [mt]" <malte.timmermann@sun.com>
Date: Wed, 3 Mar 2010 21:15:58 +0100
Subject: fixed some rebase issues

---
 editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2 +-
 editeng/source/accessibility/AccessibleHyperlink.cxx        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'editeng')

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 67fb3df6ecc1..2febde11085e 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -76,7 +76,7 @@
 #include <editeng/unolingu.hxx>
 #include <editeng/unopracc.hxx>
 #include "editeng/AccessibleEditableTextPara.hxx"
-#include "editeng/AccessibleHyperlink.hxx"
+#include "AccessibleHyperlink.hxx"
 
 #include <svtools/colorcfg.hxx>
 
diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx
index 5d0e98f0b0d2..52cc796a25cf 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.cxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.cxx
@@ -29,14 +29,14 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
+#include "precompiled_editeng.hxx"
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <comphelper/accessiblekeybindinghelper.hxx>
 
 #include "AccessibleHyperlink.hxx"
-#include "unoedprx.hxx"
+#include "editeng/unoedprx.hxx"
 #include <svx/flditem.hxx>
 #include <vcl/keycodes.hxx>
 
-- 
cgit 


From 16d0fecae46a77e77552b9da01826596279d4d27 Mon Sep 17 00:00:00 2001
From: Oliver-Rainer Wittmann <od@openoffice.org>
Date: Thu, 11 Mar 2010 13:09:35 +0100
Subject: mtaccfixes: adjustments due to merge with DEV300_m73

---
 editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2 +-
 editeng/source/accessibility/AccessibleHyperlink.cxx        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'editeng')

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 2febde11085e..94981dc32e73 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -40,7 +40,7 @@
 #include <vos/mutex.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/awt/Point.hpp>
diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx
index 52cc796a25cf..52c12b08a27b 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.cxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.cxx
@@ -37,7 +37,7 @@
 
 #include "AccessibleHyperlink.hxx"
 #include "editeng/unoedprx.hxx"
-#include <svx/flditem.hxx>
+#include <editeng/flditem.hxx>
 #include <vcl/keycodes.hxx>
 
 using namespace ::com::sun::star;
-- 
cgit