diff options
| -rw-r--r-- | basctl/Library_basctl.mk | 1 | ||||
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 3 | ||||
| -rw-r--r-- | basctl/source/basicide/textwindowaccessibility.cxx (renamed from vcl/source/accessibility/textwindowaccessibility.cxx) | 7 | ||||
| -rw-r--r-- | basctl/source/basicide/textwindowaccessibility.hxx (renamed from vcl/inc/accessibility/textwindowaccessibility.hxx) | 5 | ||||
| -rw-r--r-- | include/vcl/accessiblefactory.hxx | 3 | ||||
| -rw-r--r-- | solenv/clang-format/excludelist | 4 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 1 | ||||
| -rw-r--r-- | vcl/source/accessibility/acc_factory.cxx | 8 |
8 files changed, 16 insertions, 16 deletions
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index d8e3cb33f0dc..3dfb2f2522f4 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -107,6 +107,7 @@ $(eval $(call gb_Library_add_exception_objects,basctl,\ basctl/source/basicide/ObjectCatalog \ basctl/source/basicide/sbxitem \ basctl/source/basicide/scriptdocument \ + basctl/source/basicide/textwindowaccessibility \ basctl/source/basicide/uiobject \ basctl/source/basicide/unomodel \ basctl/source/dlged/dlgedclip \ diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index a9588d4b2e4a..2e5dd6c7daad 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -69,6 +69,7 @@ #include <vector> #include <com/sun/star/reflection/theCoreReflection.hpp> #include <unotools/charclass.hxx> +#include "textwindowaccessibility.hxx" #include "uiobject.hxx" #include <basegfx/utils/zoomtools.hxx> #include <svl/itemset.hxx> @@ -1705,7 +1706,7 @@ TextWindowPeer::TextWindowPeer(TextView& view) css::uno::Reference<css::accessibility::XAccessibleContext> TextWindowPeer::CreateAccessibleContext() { - return AccessibleFactory::createAccessibleTextWindowContext(GetWindow(), m_rEngine, m_rView); + return new ::accessibility::Document(GetWindow(), m_rEngine, m_rView); } struct WatchItem diff --git a/vcl/source/accessibility/textwindowaccessibility.cxx b/basctl/source/basicide/textwindowaccessibility.cxx index 8bed55efb786..633cb6c1069f 100644 --- a/vcl/source/accessibility/textwindowaccessibility.cxx +++ b/basctl/source/basicide/textwindowaccessibility.cxx @@ -19,7 +19,7 @@ #include <sal/config.h> -#include <accessibility/textwindowaccessibility.hxx> +#include "textwindowaccessibility.hxx" #include <sal/log.hxx> @@ -48,6 +48,9 @@ #include <numeric> #include <vector> +namespace accessibility +{ + void SfxListenerGuard::startListening(::SfxBroadcaster & rNotifier) { assert(m_pNotifier == nullptr && "called more than once"); @@ -2104,4 +2107,6 @@ css::uno::Any Document::mapFontWeight(::FontWeight nWeight) : WEIGHT_BLACK; } +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/accessibility/textwindowaccessibility.hxx b/basctl/source/basicide/textwindowaccessibility.hxx index 6a0ec734c0b2..7ee39ce81545 100644 --- a/vcl/inc/accessibility/textwindowaccessibility.hxx +++ b/basctl/source/basicide/textwindowaccessibility.hxx @@ -46,6 +46,9 @@ class TextEngine; class TextView; +namespace accessibility +{ + class Document; class SfxListenerGuard @@ -541,4 +544,6 @@ private: bool m_bInParagraphNotificationsHandler = false; }; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/accessiblefactory.hxx b/include/vcl/accessiblefactory.hxx index 29cd8c3635c2..71fdc103197c 100644 --- a/include/vcl/accessiblefactory.hxx +++ b/include/vcl/accessiblefactory.hxx @@ -88,9 +88,6 @@ public: createAccessibleContext(FormattedField* pFormattedField); static css::uno::Reference<css::accessibility::XAccessibleContext> createAccessibleContext(vcl::Window* pWindow); - - static css::uno::Reference<css::accessibility::XAccessibleContext> - createAccessibleTextWindowContext(vcl::Window* pWindow, TextEngine& rEngine, TextView& rView); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 86d3141e4e90..52dbb3e2f2a8 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -91,6 +91,8 @@ basctl/source/basicide/moduldlg.cxx basctl/source/basicide/moduldlg.hxx basctl/source/basicide/sbxitem.cxx basctl/source/basicide/scriptdocument.cxx +basctl/source/basicide/textwindowaccessibility.cxx +basctl/source/basicide/textwindowaccessibility.hxx basctl/source/basicide/unomodel.cxx basctl/source/basicide/unomodel.hxx basctl/source/dlged/dlged.cxx @@ -14094,7 +14096,6 @@ vcl/inc/accessibility/accessiblemenuitemcomponent.hxx vcl/inc/accessibility/accessibletablistbox.hxx vcl/inc/accessibility/accessibletablistboxtable.hxx vcl/inc/accessibility/listboxhelper.hxx -vcl/inc/accessibility/textwindowaccessibility.hxx vcl/inc/accessibility/vclxaccessiblebox.hxx vcl/inc/accessibility/vclxaccessiblebutton.hxx vcl/inc/accessibility/vclxaccessiblecheckbox.hxx @@ -14133,7 +14134,6 @@ vcl/source/accessibility/accessiblelistboxentry.cxx vcl/source/accessibility/accessibletablistbox.cxx vcl/source/accessibility/accessibletablistboxtable.cxx vcl/source/accessibility/floatingwindowaccessible.cxx -vcl/source/accessibility/textwindowaccessibility.cxx vcl/source/accessibility/vclxaccessiblebox.cxx vcl/source/accessibility/vclxaccessiblebutton.cxx vcl/source/accessibility/vclxaccessiblecheckbox.cxx diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index a4402914132e..8e5ecb88778c 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -119,7 +119,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/accessibility/accessibletablistbox \ vcl/source/accessibility/accessibletablistboxtable \ vcl/source/accessibility/characterattributeshelper \ - vcl/source/accessibility/textwindowaccessibility \ vcl/source/accessibility/floatingwindowaccessible \ vcl/source/accessibility/IComboListBoxHelper \ vcl/source/accessibility/svtaccessiblenumericfield \ diff --git a/vcl/source/accessibility/acc_factory.cxx b/vcl/source/accessibility/acc_factory.cxx index 8069d2f9e7dc..6cdac506282e 100644 --- a/vcl/source/accessibility/acc_factory.cxx +++ b/vcl/source/accessibility/acc_factory.cxx @@ -42,7 +42,6 @@ #include <accessibility/accessibletablistbox.hxx> #include <accessibility/AccessibleIconView.hxx> #include <accessibility/accessiblelistbox.hxx> -#include <accessibility/textwindowaccessibility.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <vcl/toolkit/lstbox.hxx> #include <vcl/toolkit/combobox.hxx> @@ -180,11 +179,4 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext(Forma return new SVTXAccessibleNumericField(pFormattedField); } -Reference<XAccessibleContext> -AccessibleFactory::createAccessibleTextWindowContext(vcl::Window* pWindow, TextEngine& rEngine, - TextView& rView) -{ - return new Document(pWindow, rEngine, rView ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |