14 files changed, 2 insertions, 16 deletions
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index cea49c96b25e..d05f438c0073 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -22,7 +22,6 @@
 #include <sfx2/childwin.hxx>
 #include <sfx2/dockwin.hxx>
 #include <svl/lstner.hxx>
-#include <svtools/stdctrl.hxx>
 
 #include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 05a80e8dcf63..f2e2dfa735c6 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -24,7 +24,6 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/morebtn.hxx>
-#include <svtools/stdctrl.hxx>
 #include "global.hxx"
 #include "address.hxx"
 #include "anyrefdg.hxx"
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index 9017ee4fc68a..479d67586b8a 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -22,7 +22,6 @@
 
 #include "anyrefdg.hxx"
 #include "global.hxx"
-#include <svtools/stdctrl.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/group.hxx>
 #include <svtools/svmedit.hxx>
diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx
index 86037048d324..245ad1c34769 100644
--- a/sc/source/ui/inc/linkarea.hxx
+++ b/sc/source/ui/inc/linkarea.hxx
@@ -27,7 +27,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/stdctrl.hxx>
 #include <svtools/inettbc.hxx>
 
 namespace sfx2 { class DocumentInserter; }
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 7a7d08957239..a7d6833c76a2 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -25,7 +25,6 @@
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/idle.hxx>
-#include <svtools/stdctrl.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/lstner.hxx>
 #include <sfx2/childwin.hxx>
@@ -204,9 +203,9 @@ private:
     SfxBindings&        rBindings;      // must be first member
 
     ImageList           aCmdImageList;  // must be before aTbxCmd
-    VclPtr<FixedInfo>        aFtCol;
+    VclPtr<FixedText>        aFtCol;
     VclPtr<ColumnEdit>       aEdCol;
-    VclPtr<FixedInfo>        aFtRow;
+    VclPtr<FixedText>        aFtRow;
     VclPtr<RowEdit>          aEdRow;
     VclPtr<CommandToolBox>   aTbxCmd;
     VclPtr<ScContentTree>    aLbEntries;
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index c3fcdd64d8a1..230109f62052 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_PFILTDLG_HXX
 
 #include <vcl/morebtn.hxx>
-#include <svtools/stdctrl.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/dialog.hxx>
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index 70fe3b65a375..1f58212de130 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -30,7 +30,6 @@
 #include <vcl/button.hxx>
 #include <vcl/morebtn.hxx>
 #include <vcl/field.hxx>
-#include <svtools/stdctrl.hxx>
 #include <svx/checklbx.hxx>
 #include <sfx2/itemconnect.hxx>
 #include "pivot.hxx"
diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx
index 54da7647411a..eeb23c22f458 100644
--- a/sc/source/ui/inc/retypepassdlg.hxx
+++ b/sc/source/ui/inc/retypepassdlg.hxx
@@ -27,7 +27,6 @@
 #include <vcl/layout.hxx>
 #include <vcl/scrbar.hxx>
 #include <svx/checklbx.hxx>
-#include <svtools/stdctrl.hxx>
 
 #include "tabprotection.hxx"
 
diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx
index 48b93e28dafd..c8d83ce030e3 100644
--- a/sc/source/ui/inc/sortkeydlg.hxx
+++ b/sc/source/ui/inc/sortkeydlg.hxx
@@ -21,7 +21,6 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/ctrl.hxx>
-#include <svtools/stdctrl.hxx>
 #include <svx/langbox.hxx>
 
 struct ScSortKeyItem : public VclBuilderContainer
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx
index db34edaf3636..5671f0d4761e 100644
--- a/sc/source/ui/inc/tabpages.hxx
+++ b/sc/source/ui/inc/tabpages.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_TABPAGES_HXX
 
 #include <vcl/group.hxx>
-#include <svtools/stdctrl.hxx>
 #include <sfx2/tabdlg.hxx>
 
 class ScTabPageProtection : public SfxTabPage
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index f0cc0f098e50..4cb10646da01 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -24,7 +24,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
 #include <vcl/group.hxx>
-#include <svtools/stdctrl.hxx>
 #include "editfield.hxx"
 
 class ScDocOptions;
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index 5ce0f55708b0..dba4b2e3071d 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -22,7 +22,6 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <svx/pageitem.hxx>
-#include <svtools/stdctrl.hxx>
 #include <vcl/group.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/timer.hxx>
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 80be8041123e..ca323ddf21cf 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -26,7 +26,6 @@
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
-#include <svtools/stdctrl.hxx>
 #include <svx/langbox.hxx>
 
 #include "sortkeydlg.hxx"
diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx
index a48352320663..9afc120c3ec4 100644
--- a/sc/source/ui/inc/tpstat.hxx
+++ b/sc/source/ui/inc/tpstat.hxx
@@ -22,7 +22,6 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
-#include <svtools/stdctrl.hxx>
 
 class ScDocStatPage: public SfxTabPage
 {