From 660e82ee8c97a2ad9b31fdcc817ce9543119ec09 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 17 Aug 2020 20:26:51 +0100 Subject: move TextWindowPeer to its only user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I16cc2f75c3e639915c90edc626829e455bda4383 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100889 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- basctl/Library_basctl.mk | 1 + basctl/source/basicide/baside2b.cxx | 5 +-- basctl/source/basicide/textwindowpeer.cxx | 71 +++++++++++++++++++++++++++++++ basctl/source/basicide/textwindowpeer.hxx | 41 ++++++++++++++++++ 4 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 basctl/source/basicide/textwindowpeer.cxx create mode 100644 basctl/source/basicide/textwindowpeer.hxx (limited to 'basctl') diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index 98f04c83e31c..f874dfe9cc54 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -96,6 +96,7 @@ $(eval $(call gb_Library_add_exception_objects,basctl,\ basctl/source/basicide/ObjectCatalog \ basctl/source/basicide/sbxitem \ basctl/source/basicide/scriptdocument \ + basctl/source/basicide/textwindowpeer \ 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 7771b8acff3e..44ee68bfa38b 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -55,16 +55,15 @@ #include #include #include -#include #include #include #include #include #include #include +#include "textwindowpeer.hxx" #include "uiobject.hxx" - namespace basctl { @@ -2053,7 +2052,7 @@ EditorWindow::GetComponentInterface(bool bCreate) if (!pEditEngine) CreateEditEngine(); - xPeer = svt::createTextWindowPeer(*GetEditView()); + xPeer = createTextWindowPeer(*GetEditView()); SetComponentInterface(xPeer); } return xPeer; diff --git a/basctl/source/basicide/textwindowpeer.cxx b/basctl/source/basicide/textwindowpeer.cxx new file mode 100644 index 000000000000..eb42c896a192 --- /dev/null +++ b/basctl/source/basicide/textwindowpeer.cxx @@ -0,0 +1,71 @@ +/* -*- 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 . + */ + +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include "textwindowpeer.hxx" + +namespace { + +class TextWindowPeer final : public VCLXWindow { +public: + explicit TextWindowPeer(TextView & view); + + TextWindowPeer(const TextWindowPeer&) = delete; + TextWindowPeer& operator=(const TextWindowPeer&) = delete; + +private: + virtual css::uno::Reference + CreateAccessibleContext() override; + + TextEngine & m_rEngine; + TextView & m_rView; + vcl::AccessibleFactoryAccess m_aFactoryAccess; +}; + +TextWindowPeer::TextWindowPeer(TextView & view): + m_rEngine(*view.GetTextEngine()), m_rView(view) +{ + SetWindow(view.GetWindow()); +} + +css::uno::Reference +TextWindowPeer::CreateAccessibleContext() { + return m_aFactoryAccess.getFactory().createAccessibleTextWindowContext( + this, m_rEngine, m_rView); +} + +} + +css::uno::Reference basctl::createTextWindowPeer( + TextView & view) +{ + return new TextWindowPeer(view); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/basicide/textwindowpeer.hxx b/basctl/source/basicide/textwindowpeer.hxx new file mode 100644 index 000000000000..c5f87048d88f --- /dev/null +++ b/basctl/source/basicide/textwindowpeer.hxx @@ -0,0 +1,41 @@ +/* -*- 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 . + */ + +#ifndef INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX +#define INCLUDED_SVTOOLS_TEXTWINDOWPEER_HXX + +#include + +#include + +namespace com::sun::star::awt { + class XWindowPeer; +} +class TextView; + +namespace basctl { + +css::uno::Reference createTextWindowPeer( + TextView & view); + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit