summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
Diffstat (limited to 'basctl')
-rw-r--r--basctl/inc/helpid.hrc2
-rw-r--r--basctl/inc/pch/precompiled_basctl.hxx14
-rw-r--r--basctl/sdi/basslots.sdi8
-rw-r--r--basctl/sdi/makefile.mk8
-rw-r--r--basctl/source/basicide/basicbox.hxx2
-rw-r--r--basctl/source/basicide/baside2.cxx13
-rw-r--r--basctl/source/basicide/baside2.hxx16
-rw-r--r--basctl/source/basicide/baside2b.cxx24
-rw-r--r--basctl/source/basicide/basides1.cxx2
-rw-r--r--basctl/source/basicide/basidesh.cxx2
-rw-r--r--basctl/source/basicide/basobj2.cxx2
-rw-r--r--basctl/source/basicide/basobj3.cxx2
-rw-r--r--basctl/source/basicide/bastype2.hxx2
-rw-r--r--basctl/source/basicide/brkdlg.hrc2
-rw-r--r--basctl/source/basicide/ide_pch.hxx10
-rw-r--r--basctl/source/basicide/iderdll.cxx2
-rw-r--r--basctl/source/basicide/macrodlg.hrc2
-rw-r--r--basctl/source/basicide/moduldl2.cxx2
-rw-r--r--basctl/source/basicide/moduldlg.hrc2
-rw-r--r--basctl/source/basicide/moptions.hrc2
-rw-r--r--basctl/source/basicide/objdlg.hrc2
-rw-r--r--basctl/source/basicide/scriptdocument.cxx2
-rw-r--r--basctl/source/basicide/tbxctl.cxx2
-rw-r--r--basctl/source/basicide/tbxctl.hrc2
-rw-r--r--basctl/source/dlged/dlged.cxx2
-rw-r--r--basctl/source/inc/accessibledialogwindow.hxx2
-rw-r--r--basctl/source/inc/baside3.hxx2
-rw-r--r--basctl/source/inc/basobj.hxx2
-rw-r--r--basctl/source/inc/dlged.hxx4
-rw-r--r--basctl/source/inc/dlgresid.hrc2
-rw-r--r--basctl/source/inc/propbrw.hxx4
-rw-r--r--basctl/source/inc/sbxitem.hxx2
32 files changed, 76 insertions, 71 deletions
diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc
index 0ff13c806a07..00356d2bc5c4 100644
--- a/basctl/inc/helpid.hrc
+++ b/basctl/inc/helpid.hrc
@@ -32,7 +32,7 @@
// include ---------------------------------------------------------------
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
// Help-Ids --------------------------------------------------------------
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index e975d6464194..be1612ea7429 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -77,19 +77,19 @@
#include "vcl/svapp.hxx"
#include "vcl/scrbar.hxx"
-#include "svtools/svarray.hxx"
-#include "svtools/itempool.hxx"
-#include "svtools/itemset.hxx"
-#include "svtools/aeitem.hxx"
-#include "svtools/stritem.hxx"
-#include "svtools/whiter.hxx"
+#include "svl/svarray.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "svl/aeitem.hxx"
+#include "svl/stritem.hxx"
+#include "svl/whiter.hxx"
#include "svtools/langtab.hxx"
#include "svtools/texteng.hxx"
#include "svtools/textview.hxx"
#include "svtools/xtextedt.hxx"
#include "svtools/txtattr.hxx"
#include "svtools/textwindowpeer.hxx"
-#include "svtools/urihelper.hxx"
+#include "svl/urihelper.hxx"
#define _BASIC_TEXTPORTIONS
#include "basic/sbdef.hxx"
diff --git a/basctl/sdi/basslots.sdi b/basctl/sdi/basslots.sdi
index bb9cd1172af9..d2b3cb602ab8 100644
--- a/basctl/sdi/basslots.sdi
+++ b/basctl/sdi/basslots.sdi
@@ -28,8 +28,6 @@
*
************************************************************************/
-import "svxslots.ilb"
-
module
"6706E0E7-FB05-101B-804c-04021c007002"
"6806E0E7-FB05-101B-804c-04021c007002"
@@ -37,10 +35,14 @@ BasicIDE
[
HelpText( "BasicIDE" )
SlotIdFile( "basslots.hrc" )
-TypeLibFile( "basslots.tlb" )
]
{
//=========================================================================
+ include "sfx2/sfxitems.sdi"
+ include "sfx2/sfx.sdi"
+ include "svx/svxitems.sdi"
+ include "svx/xoitems.sdi"
+ include "svx/svx.sdi"
include "baside.sdi"
diff --git a/basctl/sdi/makefile.mk b/basctl/sdi/makefile.mk
index d94921bf9ae2..2244eafcd654 100644
--- a/basctl/sdi/makefile.mk
+++ b/basctl/sdi/makefile.mk
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2008 by Sun Microsystems, Inc.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,11 @@ SDI1EXPORT=basctl
# --- Files --------------------------------------------------------
SVSDI1DEPEND= \
- $(SOLARINCXDIR)$/svxslots.ilb \
+ $(SOLARINCXDIR)$/sfx2/sfx.sdi \
+ $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \
+ $(SOLARINCXDIR)$/svx/svx.sdi \
+ $(SOLARINCXDIR)$/svx/svxitems.sdi \
+ $(SOLARINCXDIR)$/svx/xoitems.sdi \
baside.sdi
# --- Targets -------------------------------------------------------
diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx
index e21a0c9d09c6..25f47c980c5d 100644
--- a/basctl/source/basicide/basicbox.hxx
+++ b/basctl/source/basicide/basicbox.hxx
@@ -32,7 +32,7 @@
#define _BASICBOX_HXX
#include "doceventnotifier.hxx"
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include <svheader.hxx>
#include <sfx2/tbxctrl.hxx>
#include <vcl/lstbox.hxx>
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 030fa5e68e26..e23cd68a75af 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1430,7 +1430,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
m_aSyntaxColors[TT_UNKNOWN] = aColor;
m_aSyntaxColors[TT_WHITESPACE] = aColor;
m_aSyntaxColors[TT_EOL] = aColor;
- StartListening(m_aColorConfig);
+ m_aColorConfig.AddListener(this);
m_aSyntaxColors[TT_IDENTIFIER]
= Color(m_aColorConfig.GetColorValue(svtools::BASICIDENTIFIER).nColor);
m_aSyntaxColors[TT_NUMBER]
@@ -1458,7 +1458,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
ModulWindowLayout::~ModulWindowLayout()
{
- EndListening(m_aColorConfig);
+ m_aColorConfig.RemoveListener(this);
}
void __EXPORT ModulWindowLayout::Resize()
@@ -1602,7 +1602,7 @@ void ModulWindowLayout::DockaWindow( DockingWindow* pDockingWindow )
// evtl. Sonderbehandlung...
ArrangeWindows();
}
-#ifndef PRODUCT
+#ifdef DBG_UTIL
else
DBG_ERROR( "Wer will sich denn hier andocken ?" );
#endif
@@ -1652,13 +1652,8 @@ void ModulWindowLayout::DataChanged(DataChangedEvent const & rDCEvt)
}
// virtual
-void ModulWindowLayout::Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
+void ModulWindowLayout::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
{
- (void)rBc;
-
- if (rHint.ISA(SfxSimpleHint)
- && (static_cast< SfxSimpleHint const & >(rHint).GetId()
- == SFX_HINT_COLORS_CHANGED))
{
Color aColor(m_aColorConfig.GetColorValue(svtools::BASICIDENTIFIER).
nColor);
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 7c9fd764cef0..0c575229411e 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -48,7 +48,7 @@ class SvxSearchItem;
#endif
#include <basic/sbmod.hxx>
#include <vcl/split.hxx>
-#include "svtools/lstner.hxx"
+#include "svl/lstner.hxx"
#include <svtools/colorcfg.hxx>
#include <sfx2/progress.hxx>
@@ -58,6 +58,10 @@ DBG_NAMEEX( ModulWindow )
#define MARKER_NOMARKER 0xFFFF
+namespace utl
+{
+ class SourceViewConfig;
+}
// #108672 Helper functions to get/set text in TextEngine
// using the stream interface (get/setText() only supports
@@ -108,13 +112,13 @@ namespace svt {
class SourceViewConfig;
}
-class EditorWindow : public Window, public SfxListener
+class EditorWindow : public Window, public SfxListener, public utl::ConfigurationListener
{
private:
ExtTextView* pEditView;
ExtTextEngine* pEditEngine;
- svt::SourceViewConfig* pSourceViewConfig;
+ utl::SourceViewConfig* pSourceViewConfig;
long nCurTextWidth;
@@ -151,6 +155,7 @@ protected:
virtual void Command( const CommandEvent& rCEvt );
virtual void LoseFocus();
virtual void RequestHelp( const HelpEvent& rHEvt );
+ virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
void DoSyntaxHighlight( ULONG nPara );
String GetWordAtCursor();
@@ -442,7 +447,7 @@ public:
void SetModule( const ::rtl::OUString& aModule ) { m_aModule = aModule; }
};
-class ModulWindowLayout: public Window, public SfxListener
+class ModulWindowLayout: public Window, public utl::ConfigurationListener
{
private:
@@ -465,8 +470,7 @@ private:
virtual void DataChanged(DataChangedEvent const & rDCEvt);
- using Window::Notify;
- virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint);
+ virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
void updateSyntaxHighlighting();
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 644bd85bcb4d..66065d77f71e 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -32,7 +32,7 @@
#include "precompiled_basctl.hxx"
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#define _BASIC_TEXTPORTIONS
#include <basic/sbdef.hxx>
#include <ide_pch.hxx>
@@ -40,7 +40,7 @@
#include <tools/urlobj.hxx>
#include <unotools/charclass.hxx>
-#include <svtools/urihelper.hxx>
+#include <svl/urihelper.hxx>
#include <basic/sbx.hxx>
#include <vcl/sound.hxx>
#include <svtools/xtextedt.hxx>
@@ -62,7 +62,7 @@
//#ifndef _SFX_HELP_HXX //autogen
//#include <sfx2/sfxhelp.hxx>
//#endif
-#include <svtools/sourceviewconfig.hxx>
+#include <unotools/sourceviewconfig.hxx>
#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_
#include <com/sun/star/script/XLibraryContainer2.hpp>
@@ -172,7 +172,7 @@ EditorWindow::EditorWindow( Window* pParent ) :
pModulWindow = 0;
pEditView = 0;
pEditEngine = 0;
- pSourceViewConfig = new svt::SourceViewConfig;
+ pSourceViewConfig = new utl::SourceViewConfig;
bHighlightning = FALSE;
pProgress = 0;
nCurTextWidth = 0;
@@ -181,15 +181,14 @@ EditorWindow::EditorWindow( Window* pParent ) :
SetPointer( Pointer( POINTER_TEXT ) );
SetHelpId( HID_BASICIDE_EDITORWINDOW );
-
- StartListening( *pSourceViewConfig );
+ pSourceViewConfig->AddListener(this);
}
__EXPORT EditorWindow::~EditorWindow()
{
- EndListening( *pSourceViewConfig );
+ pSourceViewConfig->RemoveListener(this);
delete pSourceViewConfig;
aSyntaxIdleTimer.Stop();
@@ -662,7 +661,7 @@ void EditorWindow::DataChanged(DataChangedEvent const & rDCEvt)
}
}
-void EditorWindow::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if ( rHint.ISA( TextHint ) )
{
@@ -718,10 +717,11 @@ void EditorWindow::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
DoDelayedSyntaxHighlight( rTextHint.GetValue() );
}
}
- else if ( &rBC == pSourceViewConfig )
- {
- ImplSetFont();
- }
+}
+
+void EditorWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
+{
+ ImplSetFont();
}
void EditorWindow::SetScrollBarRanges()
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index b821c7ca51c6..044c61d5cc21 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -36,7 +36,7 @@
#define GLOBALOVERFLOW2
#include <basic/sbx.hxx>
#define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <ide_pch.hxx>
#define _SOLAR__PRIVATE 1
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index e6b147cc46c8..2d2e0f6a5693 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -52,7 +52,7 @@
#define _SOLAR__PRIVATE 1
#include <basic/sbx.hxx>
-#include <svtools/hint.hxx>
+#include <svl/hint.hxx>
#include <tools/diagnose_ex.h>
#include <basidesh.hrc>
#include <basidesh.hxx>
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index e4abb3fad92e..f7ddd62e144a 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -36,7 +36,7 @@
#include <vector>
#include <algorithm>
#include <basic/sbx.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#include <com/sun/star/document/XEmbeddedScripts.hpp>
#include <com/sun/star/document/XScriptInvocationContext.hpp>
#include <basobj.hxx>
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 8ef06af7dc25..a1887e0ea7a0 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -36,7 +36,7 @@
#include <vector>
#include <algorithm>
#include <basic/sbx.hxx>
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#include <iderdll.hxx>
#include <iderdll2.hxx>
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index d10bdbc0e7f2..ce96ca3892a9 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -37,7 +37,7 @@
#define _SVICNVW_HXX
#include <svtools/svtreebx.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <basic/sbstar.hxx>
#include <sbxitem.hxx>
#include "basobj.hxx"
diff --git a/basctl/source/basicide/brkdlg.hrc b/basctl/source/basicide/brkdlg.hrc
index aaf243b5475a..1fcfc9286cff 100644
--- a/basctl/source/basicide/brkdlg.hrc
+++ b/basctl/source/basicide/brkdlg.hrc
@@ -30,7 +30,7 @@
#ifndef _BRKDLG_HRC
#define _BRKDLG_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define RID_BASICIDE_BREAKPOINTDLG ( RID_BASICIDE_START + 80 )
diff --git a/basctl/source/basicide/ide_pch.hxx b/basctl/source/basicide/ide_pch.hxx
index 4029e45fe082..9f294b87577d 100644
--- a/basctl/source/basicide/ide_pch.hxx
+++ b/basctl/source/basicide/ide_pch.hxx
@@ -33,11 +33,11 @@
#include <vcl/msgbox.hxx>
#include <vcl/menu.hxx>
-#include <svtools/svarray.hxx>
-#include <svtools/itemset.hxx>
-#include <svtools/aeitem.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/svarray.hxx>
+#include <svl/itemset.hxx>
+#include <svl/aeitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/whiter.hxx>
#define _BASIC_TEXTPORTIONS
#include <basic/sbdef.hxx>
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index cf8ed498d474..5f2ed2301758 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -41,7 +41,7 @@
#include <sfx2/genlink.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#include <iderdll.hxx>
#include <iderdll2.hxx>
#include <iderid.hxx>
diff --git a/basctl/source/basicide/macrodlg.hrc b/basctl/source/basicide/macrodlg.hrc
index 6702af8febab..23005cddd294 100644
--- a/basctl/source/basicide/macrodlg.hrc
+++ b/basctl/source/basicide/macrodlg.hrc
@@ -30,7 +30,7 @@
#ifndef _MACRODLG_HRC
#define _MACRODLG_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define RID_MACROCHOOSER ( RID_BASICIDE_START + 50 )
#define RID_STR_BTNDEL ( RID_BASICIDE_START + 51 )
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index f0143cc8517b..ea5f7cec9878 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -72,7 +72,7 @@
#include "com/sun/star/ucb/XCommandEnvironment.hpp"
#include <com/sun/star/ucb/NameClash.hpp>
#include "com/sun/star/packages/manifest/XManifestWriter.hpp"
-#include <svtools/pathoptions.hxx>
+#include <unotools/pathoptions.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/util/VetoException.hpp>
diff --git a/basctl/source/basicide/moduldlg.hrc b/basctl/source/basicide/moduldlg.hrc
index 88f167167d42..755e382cf618 100644
--- a/basctl/source/basicide/moduldlg.hrc
+++ b/basctl/source/basicide/moduldlg.hrc
@@ -30,7 +30,7 @@
#ifndef _MODULDLG_HRC
#define _MODULDLG_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define RID_STR_LIB 1
#define RID_TRLBOX 2
diff --git a/basctl/source/basicide/moptions.hrc b/basctl/source/basicide/moptions.hrc
index a03a90c2d59a..ca1e43e080fb 100644
--- a/basctl/source/basicide/moptions.hrc
+++ b/basctl/source/basicide/moptions.hrc
@@ -30,7 +30,7 @@
#ifndef _MOPTIONS_HRC
#define _MOPTIONS_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define RID_MACROOPTIONS ( RID_BASICIDE_START + 55 )
diff --git a/basctl/source/basicide/objdlg.hrc b/basctl/source/basicide/objdlg.hrc
index 7004541ea465..490a38a5c8fd 100644
--- a/basctl/source/basicide/objdlg.hrc
+++ b/basctl/source/basicide/objdlg.hrc
@@ -30,7 +30,7 @@
#ifndef _OBJDLG_HRC
#define _OBJDLG_HRC
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define RID_BASICIDE_OBJCAT ( RID_BASICIDE_START + 70 )
#define RID_FT_MACRODESCR 8
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index b9ffe708e6fa..a87ad521c2f5 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -70,7 +70,7 @@
#include <xmlscript/xmldlg_imexp.hxx>
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <unotools/collatorwrapper.hxx>
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 3ebc749c30aa..bac7e8854cf6 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -42,7 +42,7 @@
#include <tbxctl.hrc>
#include <idetemp.hxx>
#include <sfx2/imagemgr.hxx>
-#include <svtools/aeitem.hxx>
+#include <svl/aeitem.hxx>
#include <vcl/toolbox.hxx>
using namespace ::com::sun::star::uno;
diff --git a/basctl/source/basicide/tbxctl.hrc b/basctl/source/basicide/tbxctl.hrc
index 1811614d9d37..b26570b5b8bf 100644
--- a/basctl/source/basicide/tbxctl.hrc
+++ b/basctl/source/basicide/tbxctl.hrc
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#define RID_TBXCONTROLS ( RID_BASICIDE_START + 65 )
#define RID_TOOLBOX ( RID_BASICIDE_START + 66 )
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 6d1080ed659b..423ef39079a0 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -46,7 +46,7 @@
#include <iderdll.hxx>
#include <vcl/scrbar.hxx>
#include <tools/shl.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
#include <sfx2/viewfrm.hxx>
#ifndef _SVX_SVXIDS_HRC
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx
index 8552f9f09e10..db446d479ead 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -37,7 +37,7 @@
#include <comphelper/accessiblecomponenthelper.hxx>
#include <cppuhelper/implbase3.hxx>
#include <tools/link.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <vector>
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 45eace9f6137..4c361d4545f5 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -36,7 +36,7 @@
#endif
#include <bastypes.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/lstbox.hxx>
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index c917de5a6dee..a2911dcccb8f 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -32,7 +32,7 @@
#include "scriptdocument.hxx"
#include <tools/string.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_
#include <com/sun/star/io/XInputStreamProvider.hpp>
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 908331b0ad63..9a75e80a53e2 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -38,8 +38,8 @@
#include <tools/link.hxx>
#include <tools/gen.hxx>
#include <vcl/timer.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/hint.hxx>
+#include <svl/brdcst.hxx>
#define DLGED_PAGE_WIDTH_MIN 1280
#define DLGED_PAGE_HEIGHT_MIN 1024
diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc
index 928434749862..b92be11b286f 100644
--- a/basctl/source/inc/dlgresid.hrc
+++ b/basctl/source/inc/dlgresid.hrc
@@ -33,7 +33,7 @@
// include -----------------------------------------------------------
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
// Dialog Control Id's -----------------------------------------------------------
diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx
index 8e3fa615d960..f9be90b38b4b 100644
--- a/basctl/source/inc/propbrw.hxx
+++ b/basctl/source/inc/propbrw.hxx
@@ -37,8 +37,8 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <comphelper/composedprops.hxx>
#include <sfx2/basedlgs.hxx>
-#include <svtools/brdcst.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/brdcst.hxx>
+#include <svl/lstner.hxx>
#include <sfx2/childwin.hxx>
#include <svx/svdmark.hxx>
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index 654e283128fb..b1192b51d9bf 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -31,7 +31,7 @@
#define _SBXITEM_HXX
#include "scriptdocument.hxx"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
const USHORT BASICIDE_TYPE_UNKNOWN = 0;
const USHORT BASICIDE_TYPE_SHELL = 1;