diff options
| -rw-r--r-- | basctl/Library_basctl.mk | 1 | ||||
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 5 | ||||
| -rw-r--r-- | basctl/source/basicide/textwindowpeer.cxx (renamed from svtools/source/edit/textwindowpeer.cxx) | 6 | ||||
| -rw-r--r-- | basctl/source/basicide/textwindowpeer.hxx (renamed from include/svtools/textwindowpeer.hxx) | 5 | ||||
| -rw-r--r-- | solenv/clang-format/excludelist | 4 | ||||
| -rw-r--r-- | svtools/Library_svt.mk | 1 |
6 files changed, 10 insertions, 12 deletions
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 <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; diff --git a/svtools/source/edit/textwindowpeer.cxx b/basctl/source/basicide/textwindowpeer.cxx index f0291a8a84c7..eb42c896a192 100644 --- a/svtools/source/edit/textwindowpeer.cxx +++ b/basctl/source/basicide/textwindowpeer.cxx @@ -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); diff --git a/include/svtools/textwindowpeer.hxx b/basctl/source/basicide/textwindowpeer.hxx index 6edc665c6b31..c5f87048d88f 100644 --- a/include/svtools/textwindowpeer.hxx +++ b/basctl/source/basicide/textwindowpeer.hxx @@ -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); } diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 93532dfb4d12..bd6df84c5b3d 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -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 diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 0cb98dd8dde7..47c645802000 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -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 \ |