summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r--sc/source/ui/inc/AccessibilityHints.hxx4
-rw-r--r--sc/source/ui/inc/AccessibleContextBase.hxx2
-rw-r--r--sc/source/ui/inc/DrawModelBroadcaster.hxx2
-rw-r--r--sc/source/ui/inc/acredlin.hxx2
-rw-r--r--sc/source/ui/inc/csvgrid.hxx9
-rw-r--r--sc/source/ui/inc/dwfunctr.hxx2
-rw-r--r--sc/source/ui/inc/formula.hxx2
-rw-r--r--sc/source/ui/inc/funcpage.hxx2
-rw-r--r--sc/source/ui/inc/inputwin.hxx2
-rw-r--r--sc/source/ui/inc/msgpool.hxx6
-rw-r--r--sc/source/ui/inc/navipi.hxx4
-rw-r--r--sc/source/ui/inc/parawin.hxx2
-rw-r--r--sc/source/ui/inc/servobj.hxx4
-rw-r--r--sc/source/ui/inc/target.hxx2
-rw-r--r--sc/source/ui/inc/tbzoomsliderctrl.hxx2
-rw-r--r--sc/source/ui/inc/ui_pch.hxx48
-rw-r--r--sc/source/ui/inc/uiitems.hxx2
-rw-r--r--sc/source/ui/inc/undobase.hxx2
-rw-r--r--sc/source/ui/inc/undodraw.hxx2
-rw-r--r--sc/source/ui/inc/undotab.hxx4
-rw-r--r--sc/source/ui/inc/viewfunc.hxx4
21 files changed, 53 insertions, 56 deletions
diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx
index 8448654014c7..e89069ade49a 100644
--- a/sc/source/ui/inc/AccessibilityHints.hxx
+++ b/sc/source/ui/inc/AccessibilityHints.hxx
@@ -33,8 +33,8 @@
#include "viewdata.hxx"
#include <com/sun/star/uno/XInterface.hpp>
-#include <svtools/smplhint.hxx>
-#include <svtools/hint.hxx>
+#include <svl/smplhint.hxx>
+#include <svl/hint.hxx>
#define SC_HINT_ACC_SIMPLE_START SFX_HINT_USER00
#define SC_HINT_ACC_TABLECHANGED SC_HINT_ACC_SIMPLE_START + 1
diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx
index 8d312a0d13d9..98f2afc8e88d 100644
--- a/sc/source/ui/inc/AccessibleContextBase.hxx
+++ b/sc/source/ui/inc/AccessibleContextBase.hxx
@@ -50,7 +50,7 @@
#include <cppuhelper/interfacecontainer.h>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <cppuhelper/compbase5.hxx>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/servicehelper.hxx>
diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx
index 7bb71854443c..fac00ea550e4 100644
--- a/sc/source/ui/inc/DrawModelBroadcaster.hxx
+++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx
@@ -32,7 +32,7 @@
#define _SC_DRAWMODELBROADCASTER_HXX
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/document/XEventBroadcaster.hpp>
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 7986935ae9c3..cdde064fc588 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -55,7 +55,7 @@
#ifndef _SVARRAY_HXX
#define _SVARRAY_HXX
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#endif
#include "chgtrack.hxx"
#include "chgviset.hxx"
diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx
index c8c633060852..583c4fd2c414 100644
--- a/sc/source/ui/inc/csvgrid.hxx
+++ b/sc/source/ui/inc/csvgrid.hxx
@@ -34,10 +34,8 @@
#define _SC_CSVGRID_HXX
#include <vcl/virdev.hxx>
-#ifndef _MENU_HXX
#include <vcl/menu.hxx>
-#endif
-#include <svtools/lstner.hxx>
+#include <unotools/options.hxx>
#include <vector>
#include <memory>
@@ -100,7 +98,7 @@ typedef ::std::vector< ScCsvColState > ScCsvColStateVec;
/** A data grid control for the CSV import dialog. The design of this control
simulates a Calc spreadsheet with row and column headers. */
-class SC_DLLPUBLIC ScCsvGrid : public ScCsvControl, public SfxListener
+class SC_DLLPUBLIC ScCsvGrid : public ScCsvControl, public utl::ConfigurationListener
{
private:
typedef ::std::auto_ptr< ScEditEngineDefaulter > ScEditEnginePtr;
@@ -299,8 +297,7 @@ protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- using Control::Notify;
- virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+ virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 );
// painting ---------------------------------------------------------------
protected:
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index 068a05d57711..6a468a415b44 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -32,7 +32,7 @@
#include <sfx2/childwin.hxx>
#include <sfx2/dockwin.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <svtools/stdctrl.hxx>
#ifndef _LSTBOX_HXX //autogen
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index b25811eb9220..d490e37b93ca 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -44,7 +44,7 @@
#ifndef _SVSTDARR_STRINGS
#define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#endif
#include "compiler.hxx"
diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx
index 753000e290ab..fc8f1813be56 100644
--- a/sc/source/ui/inc/funcpage.hxx
+++ b/sc/source/ui/inc/funcpage.hxx
@@ -44,7 +44,7 @@
#ifndef _SVSTDARR_STRINGS
#define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#endif
#include <vcl/tabctrl.hxx>
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 48a2a41b0fbc..99d03f2bfa2c 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -36,7 +36,7 @@
#include <vcl/toolbox.hxx>
#endif
#include <sfx2/childwin.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
#endif
diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx
index 954d0d7a5d47..44514766601d 100644
--- a/sc/source/ui/inc/msgpool.hxx
+++ b/sc/source/ui/inc/msgpool.hxx
@@ -35,9 +35,9 @@
#include <svx/srchitem.hxx>
-#include <svtools/itempool.hxx>
-#include <svtools/stritem.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/itempool.hxx>
+#include <svl/stritem.hxx>
+#include <svl/eitem.hxx>
//#include <dbitems.hxx>
#include "uiitems.hxx"
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 54434427d459..b14e668fabd0 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -36,8 +36,8 @@
#include <vcl/field.hxx>
#include <vcl/lstbox.hxx>
#include <svtools/stdctrl.hxx>
-#include <svtools/poolitem.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/lstner.hxx>
#include <sfx2/childwin.hxx>
#include "content.hxx"
#include <svtools/svmedit.hxx>
diff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxx
index 3835f94157ca..087c8937de9d 100644
--- a/sc/source/ui/inc/parawin.hxx
+++ b/sc/source/ui/inc/parawin.hxx
@@ -44,7 +44,7 @@
#ifndef _SVSTDARR_STRINGS
#define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#endif
#include <vcl/tabctrl.hxx>
diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx
index 0eca2cfafaf1..7cd6c04bc91e 100644
--- a/sc/source/ui/inc/servobj.hxx
+++ b/sc/source/ui/inc/servobj.hxx
@@ -31,8 +31,8 @@
#ifndef SC_SERVOBJ_HXX
#define SC_SERVOBJ_HXX
-#include <svtools/lstner.hxx>
-#include <svtools/listener.hxx>
+#include <svl/lstner.hxx>
+#include <svl/listener.hxx>
#include <sfx2/linksrc.hxx>
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxx
index eb3b5f346ccb..1e65821915f3 100644
--- a/sc/source/ui/inc/target.hxx
+++ b/sc/source/ui/inc/target.hxx
@@ -31,7 +31,7 @@
#ifndef SC_TARGET_HXX
#define SC_TARGET_HXX
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
class ScTabViewShell;
diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx
index 0132ec844233..ba1370b1960f 100644
--- a/sc/source/ui/inc/tbzoomsliderctrl.hxx
+++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx
@@ -39,7 +39,7 @@
#include <vcl/window.hxx>
#endif
#ifndef _SFXPOOLITEM_HXX //autogen
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
#endif
#ifndef _SFXTBXCTRL_HXX //autogen
#include <sfx2/tbxctrl.hxx>
diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx
index 335f7e917505..d9b21fd2f0d4 100644
--- a/sc/source/ui/inc/ui_pch.hxx
+++ b/sc/source/ui/inc/ui_pch.hxx
@@ -43,7 +43,7 @@
#include <tools/solar.h>
#include <tools/string.hxx>
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
#include <tools/rtti.hxx>
#include <string.h>
#include <tools/contnr.hxx>
@@ -53,9 +53,9 @@
#include <tools/link.hxx>
#include <i18npool/lang.h>
#include <sfx2/sfx.hrc>
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
#include <sfx2/sfxsids.hrc>
-#include <svtools/cntwids.hrc>
+#include <svl/cntwids.hrc>
#include <tools/resid.hxx>
#include <tools/rc.hxx>
#include <tools/resmgr.hxx>
@@ -95,28 +95,28 @@
#include <global.hxx>
#include <vcl/syswin.hxx>
#include <tools/debug.hxx>
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#include <vcl/ctrl.hxx>
-#include <svtools/hint.hxx>
-#include <svtools/poolitem.hxx>
+#include <svl/hint.hxx>
+#include <svl/poolitem.hxx>
#include <vcl/image.hxx>
#include <vcl/timer.hxx>
#include <tools/unqidx.hxx>
#include <vcl/symbol.hxx>
#include <vcl/fixed.hxx>
-#include <svtools/brdcst.hxx>
+#include <svl/brdcst.hxx>
#include <vcl/timer.hxx>
#include <sc.hrc>
#include <stdarg.h>
#include <svx/dialogs.hrc>
#include <basic/sbxdef.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <sfx2/shell.hxx>
#include <vcl/window.hxx>
#include <vcl/group.hxx>
#include <tools/unqid.hxx>
#include <tools/table.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <rangelst.hxx>
@@ -127,15 +127,15 @@
#include <vcl/spinfld.hxx>
#include <vcl/combobox.hxx>
#include <tools/pstm.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/eitem.hxx>
+#include <svl/itempool.hxx>
#include <sfx2/tabdlg.hxx>
#include <vcl/tabdlg.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/tabctrl.hxx>
#include <shellids.hxx>
#include <vcl/event.hxx>
-#include <svtools/intitem.hxx>
+#include <svl/intitem.hxx>
#include <svtools/confitem.hxx>
#include <markdata.hxx>
#include <svx/optgrid.hxx>
@@ -150,7 +150,7 @@
#include <column.hxx>
#include <markarr.hxx>
#include <vcl/mapmod.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
#include <vcl/seleng.hxx>
#include <rsc/rscsfx.hxx>
#include <svx/zoomitem.hxx>
@@ -165,23 +165,23 @@
#include <sfx2/module.hxx>
#include <dbfunc.hxx>
#include <vcl/accel.hxx>
-#include <svtools/smplhint.hxx>
+#include <svl/smplhint.hxx>
#include <sfx2/viewfac.hxx>
#include <sot/storage.hxx>
#include <sfx2/objsh.hxx>
#include <target.hxx>
#include <tabvwsh.hxx>
-#include <svtools/inethist.hxx>
-#include <svtools/inetdef.hxx>
+#include <svl/inethist.hxx>
+#include <svl/inetdef.hxx>
#include <sfx2/sfxdefs.hxx>
-#include <svtools/cancel.hxx>
+#include <svl/cancel.hxx>
#include <svtools/compat.hxx>
-#include <svtools/inetmsg.hxx>
+#include <svl/inetmsg.hxx>
#include <sfx2/app.hxx>
#include <tools/urlobj.hxx>
#include <scdll.hxx>
#include <sfx2/msg.hxx>
-#include <svtools/ownlist.hxx>
+#include <svl/ownlist.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/frame.hxx>
@@ -207,9 +207,9 @@
#include <svx/svdtypes.hxx>
#include <vcl/btndlg.hxx>
#include <vcl/svapp.hxx>
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <vcl/edit.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/stritem.hxx>
#include <collect.hxx>
#include <svx/svdsob.hxx>
#include <vcl/imagebtn.hxx>
@@ -300,7 +300,7 @@
#include <cell.hxx>
#include <stddef.h>
#include <tools/mempool.hxx>
-#include <svtools/style.hrc>
+#include <svl/style.hrc>
#include <drawview.hxx>
#include <svx/view3d.hxx>
#include <svx/def3d.hxx>
@@ -310,7 +310,7 @@
#include <svx/svxenum.hxx>
#include <svx/xtextit0.hxx>
#include <svx/svdtrans.hxx>
-#include <svtools/style.hxx>
+#include <svl/style.hxx>
#include <reffact.hxx>
#include <svx/svdotext.hxx>
#include <svx/svdoattr.hxx>
@@ -326,7 +326,7 @@
#include <vcl/button.hxx>
#include <svx/srchitem.hxx>
#include <svx/svdorect.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
#include <stlpool.hxx>
#include <svx/eeitem.hxx>
#include <inputhdl.hxx>
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index 868e772a2e68..bfa1603adb80 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.hxx
@@ -35,7 +35,7 @@
#include "conditio.hxx"
#include "sortparam.hxx"
#include "paramisc.hxx"
-#include <svtools/poolitem.hxx>
+#include <svl/poolitem.hxx>
class ScEditEngineDefaulter;
class EditTextObject;
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 2d3ee1d14dd7..8398b030ed68 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -31,7 +31,7 @@
#ifndef SC_UNDOBASE_HXX
#define SC_UNDOBASE_HXX
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx
index 7b5d59fbb620..5ded731d5105 100644
--- a/sc/source/ui/inc/undodraw.hxx
+++ b/sc/source/ui/inc/undodraw.hxx
@@ -31,7 +31,7 @@
#ifndef SC_UNDODRAW_HXX
#define SC_UNDODRAW_HXX
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
class ScDocShell;
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index a7cf0d094d6b..40177a31e68e 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -39,14 +39,14 @@
#ifndef _SVSTDARR_SHORTS
#define _SVSTDARR_SHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#endif
#ifndef _SVSTDARR_STRINGS
#define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#endif
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 066aadca817a..82ddc0bad026 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -34,14 +34,14 @@
#ifndef _SVSTDARR_SHORTS
#define _SVSTDARR_SHORTS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#endif
#ifndef _SVSTDARR_STRINGS
#define _SVSTDARR_STRINGS
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#endif
#include <com/sun/star/embed/XEmbeddedObject.hpp>