strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move TextWindowPeer to its only user

Browse source 
Change-Id: I16cc2f75c3e639915c90edc626829e455bda4383
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100889
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2020-08-17 20:26:51 +01:00
parent 643d62d603
commit 660e82ee8c
6 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
basctl/Library_basctl.mk
View file

@ -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 \

5
basctl/source/basicide/baside2b.cxx
View file

@ -55,16 +55,15 @@
#include <vcl/ptrstyle.hxx>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <svtools/textwindowpeer.hxx>
#include <vcl/taskpanelist.hxx>
#include <vcl/help.hxx>
#include <cppuhelper/implbase.hxx>
#include <vector>
#include <com/sun/star/reflection/theCoreReflection.hpp>
#include <unotools/charclass.hxx>
#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;

6
svtools/source/edit/textwindowpeer.cxx → basctl/source/basicide/textwindowpeer.cxx
View file

@ -25,14 +25,14 @@
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <svtools/textwindowpeer.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <vcl/texteng.hxx>
#include <vcl/textview.hxx>
#include "textwindowpeer.hxx"
namespace {
class TextWindowPeer: public VCLXWindow {
class TextWindowPeer final : public VCLXWindow {
public:
explicit TextWindowPeer(TextView & view);
@ -62,7 +62,7 @@ TextWindowPeer::CreateAccessibleContext() {
}
css::uno::Reference<css::awt::XWindowPeer> svt::createTextWindowPeer(
css::uno::Reference<css::awt::XWindowPeer> basctl::createTextWindowPeer(
TextView & view)
{
return new TextWindowPeer(view);

5
include/svtools/textwindowpeer.hxx → basctl/source/basicide/textwindowpeer.hxx
View file

@ -23,16 +23,15 @@
#include <sal/config.h>
#include <com/sun/star/uno/Reference.hxx>
#include <svtools/svtdllapi.h>
namespace com::sun::star::awt {
class XWindowPeer;
}
class TextView;
namespace svt {
namespace basctl {
css::uno::Reference<css::awt::XWindowPeer> SVT_DLLPUBLIC createTextWindowPeer(
css::uno::Reference<css::awt::XWindowPeer> createTextWindowPeer(
TextView & view);
}

4
solenv/clang-format/excludelist
View file

@ -264,6 +264,8 @@ basctl/source/basicide/moduldlg.hxx
basctl/source/basicide/register.cxx
basctl/source/basicide/sbxitem.cxx
basctl/source/basicide/scriptdocument.cxx
basctl/source/basicide/textwindowpeer.hxx
basctl/source/basicide/textwindowpeer.cxx
basctl/source/basicide/unomodel.cxx
basctl/source/basicide/unomodel.hxx
basctl/source/dlged/dlged.cxx
@ -6617,7 +6619,6 @@ include/svtools/svparser.hxx
include/svtools/svtdllapi.h
include/svtools/tabbar.hxx
include/svtools/templatefoldercache.hxx
include/svtools/textwindowpeer.hxx
include/svtools/toolbarmenu.hxx
include/svtools/toolboxcontroller.hxx
include/svtools/unitconv.hxx
@ -13021,7 +13022,6 @@ svtools/source/dialogs/insdlg.cxx
svtools/source/dialogs/prnsetup.cxx
svtools/source/dialogs/restartdialog.cxx
svtools/source/edit/editsyntaxhighlighter.cxx
svtools/source/edit/textwindowpeer.cxx
svtools/source/filter/DocumentToGraphicRenderer.cxx
svtools/source/filter/SvFilterOptionsDialog.cxx
svtools/source/filter/exportdialog.cxx

1
svtools/Library_svt.mk
View file

@ -112,7 +112,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/dialogs/restartdialog \
svtools/source/dialogs/ServerDetailsControls \
svtools/source/edit/editsyntaxhighlighter \
svtools/source/edit/textwindowpeer \
svtools/source/filter/SvFilterOptionsDialog \
svtools/source/filter/DocumentToGraphicRenderer \
svtools/source/filter/exportdialog \