6 files changed, 112 insertions, 4 deletions
diff --git a/editeng/inc/AccessibleStringWrap.hxx b/editeng/inc/AccessibleStringWrap.hxx
new file mode 100644
index 000000000000..022c63086b24
--- /dev/null
+++ b/editeng/inc/AccessibleStringWrap.hxx
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <editeng/editengdllapi.h>
+#include <sal/types.h>
+#include <rtl/ustring.hxx>
+
+class OutputDevice;
+class SvxFont;
+namespace tools { class Rectangle; }
+class Point;
+
+
+// AccessibleStringWrap declaration
+
+
+class AccessibleStringWrap
+{
+public:
+
+    AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const OUString& rText );
+
+    void GetCharacterBounds( sal_Int32 nIndex, tools::Rectangle& rRect );
+    sal_Int32 GetIndexAtPoint( const Point& rPoint );
+
+private:
+
+    OutputDevice&       mrDev;
+    SvxFont&            mrFont;
+    OUString            maText;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/inc/unopracc.hxx b/editeng/inc/unopracc.hxx
new file mode 100644
index 000000000000..7617bed0a86e
--- /dev/null
+++ b/editeng/inc/unopracc.hxx
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <editeng/unotext.hxx>
+
+
+class SvxEditSource;
+
+/** Wraps SvxUnoTextRangeBase and provides us with the text properties
+
+    Inherits from SvxUnoTextRangeBase and provides XPropertySet and
+    XMultiPropertySet interfaces. Just set the selection to the
+    required text range and return a reference to a XPropertySet.
+ */
+class SvxAccessibleTextPropertySet final : public SvxUnoTextRangeBase,
+                                     public css::lang::XTypeProvider,
+                                     public ::cppu::OWeakObject
+{
+public:
+    SvxAccessibleTextPropertySet( const SvxEditSource*, const SvxItemPropertySet* );
+    virtual ~SvxAccessibleTextPropertySet() throw() override;
+
+    // XTextRange
+    virtual css::uno::Reference< css::text::XText > SAL_CALL getText() override;
+
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
+    virtual void SAL_CALL acquire() throw() override;
+    virtual void SAL_CALL release() throw() override;
+
+    // lang::XServiceInfo
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ) override;
+
+    // lang::XTypeProvider
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 352557c85e8a..55f7940e5b10 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -63,7 +63,7 @@
 
 #include <com/sun/star/beans/PropertyState.hpp>
 
-#include <editeng/unopracc.hxx>
+#include <unopracc.hxx>
 #include <editeng/AccessibleEditableTextPara.hxx>
 #include "AccessibleHyperlink.hxx"
 #include "AccessibleImageBullet.hxx"
diff --git a/editeng/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx
index 63a2fca3ef34..ccc4546e04df 100644
--- a/editeng/source/accessibility/AccessibleStringWrap.cxx
+++ b/editeng/source/accessibility/AccessibleStringWrap.cxx
@@ -23,7 +23,7 @@
 #include <vcl/outdev.hxx>
 
 #include <editeng/svxfont.hxx>
-#include <editeng/AccessibleStringWrap.hxx>
+#include <AccessibleStringWrap.hxx>
 
 
 // AccessibleStringWrap implementation
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 2eabe3e6e0c5..46561a761345 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -36,7 +36,7 @@
 #include <editeng/unoedprx.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
-#include <editeng/AccessibleStringWrap.hxx>
+#include <AccessibleStringWrap.hxx>
 #include <editeng/outliner.hxx>
 
 using namespace ::com::sun::star;
diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx
index 6b2e5b42c376..2262bdd9fcab 100644
--- a/editeng/source/uno/unopracc.cxx
+++ b/editeng/source/uno/unopracc.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <editeng/unopracc.hxx>
+#include <unopracc.hxx>
 #include <editeng/unoedsrc.hxx>
 
 using namespace ::com::sun::star;