diff options
Diffstat (limited to 'basctl')
27 files changed, 46 insertions, 52 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/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 e9c6761b9e50..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() @@ -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 685217e337eb..7b7655737ae8 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> @@ -155,7 +155,7 @@ protected: virtual void Command( const CommandEvent& rCEvt ); virtual void LoseFocus(); virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void ConfigurationChanged( utl::ConfigurationBroadcaster* ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); void DoSyntaxHighlight( ULONG nPara ); String GetWordAtCursor(); @@ -447,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: @@ -470,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 56a275b081a2..efebad44adfe 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> @@ -719,7 +719,7 @@ void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) } } -void EditorWindow::ConfigurationChanged( utl::ConfigurationBroadcaster* ) +void EditorWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) { ImplSetFont(); } 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/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/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 e2af9e0346a1..b23f540f2c10 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; |