convert the last two lonely FixedInfos to FixedText

Change-Id: Ia6ed5f71931a6141efb3d5e5eb329149d6850342

27 files changed, 2 insertions, 27 deletions

diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index b6d0cd2e7397..c25da7b24e26 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -22,7 +22,6 @@
 #include <mailconfigpage.hxx>
 #include <sfx2/imgmgr.hxx>
 #include <svtools/svmedit.hxx>
-#include <svtools/stdctrl.hxx>
 #include <svtools/svtabbx.hxx>
 #include <svtools/headbar.hxx>
 #include <mmconfigitem.hxx>
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index 818a754228dd..2269fb353acf 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_SOURCE_UI_DBUI_ADDRESSLISTDIALOG_HXX
 
 #include <sfx2/basedlgs.hxx>
-#include <svtools/stdctrl.hxx>
 #include <vcl/button.hxx>
 #include <svtools/svtabbx.hxx>
 #include <svtools/headbar.hxx>
diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx
index 3bd61463008e..a50e585b4606 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.hxx
@@ -22,8 +22,8 @@
 #include <sfx2/basedlgs.hxx>
 
 #include <vcl/button.hxx>
-#include <svtools/stdctrl.hxx>
 #include <vcl/field.hxx>
+#include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <vector>
 
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
index 9ce17611ad20..aaf120f71c4f 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
@@ -21,7 +21,6 @@
 #include <sfx2/basedlgs.hxx>
 
 #include <vcl/button.hxx>
-#include <svtools/stdctrl.hxx>
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
 
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
index 6d217eba41e6..faf89f7ec1b9 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
@@ -20,8 +20,8 @@
 #define INCLUDED_SW_SOURCE_UI_DBUI_DBTABLEPREVIEWDIALOG_HXX
 
 #include <sfx2/basedlgs.hxx>
-#include <svtools/stdctrl.hxx>
 #include <vcl/button.hxx>
+#include <vcl/fixed.hxx>
 #include <com/sun/star/uno/Sequence.h>
 
 namespace com{ namespace sun{ namespace star{
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index e69390f9918b..d66ef383fe33 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -21,7 +21,6 @@
 
 #include <svtools/wizardmachine.hxx>
 #include <vcl/button.hxx>
-#include <svtools/stdctrl.hxx>
 #include <mailmergehelper.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <vcl/edit.hxx>
diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx
index b5322c3e127d..3eafb73b817f 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hxx
+++ b/sw/source/ui/dbui/mmdocselectpage.hxx
@@ -23,7 +23,6 @@
 #include <mailmergehelper.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
-#include <svtools/stdctrl.hxx>
 class SwMailMergeWizard;
 
 class SwMailMergeDocSelectPage : public svt::OWizardPage
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index 44c7ac8e4960..bfbf365d4bb9 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -24,7 +24,6 @@
 #include <vcl/button.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
-#include <svtools/stdctrl.hxx>
 #include <mailmergehelper.hxx>
 #include <svtools/svmedit.hxx>
 
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 41b04063b6bc..e75a48cfda45 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -22,7 +22,6 @@
 #include <svtools/wizardmachine.hxx>
 #include <mailmergehelper.hxx>
 #include <vcl/button.hxx>
-#include <svtools/stdctrl.hxx>
 #include <vcl/field.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx
index 961153a3c530..99a4e4185068 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.hxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.hxx
@@ -21,7 +21,6 @@
 
 #include <svtools/wizardmachine.hxx>
 #include <vcl/button.hxx>
-#include <svtools/stdctrl.hxx>
 #include <mailmergehelper.hxx>
 class SwMailMergeWizard;
 
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index 09eab399cf70..cfd94f6381a4 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_UI_ENVELP_ENVFMT_HXX
 #define INCLUDED_SW_SOURCE_UI_ENVELP_ENVFMT_HXX
 
-#include <svtools/stdctrl.hxx>
 #include <vcl/field.hxx>
 #include <vcl/menubtn.hxx>
 #include <vcl/group.hxx>
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 0a71355316ab..f9d1b18354fa 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -26,7 +26,6 @@
 #include <vcl/fixed.hxx>
 #include <vcl/group.hxx>
 #include <vcl/button.hxx>
-#include <svtools/stdctrl.hxx>
 
 #include "envimg.hxx"
 #include "envlop.hxx"
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 8d494e8b3795..027edf34b75b 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -23,7 +23,6 @@
 #include <vcl/field.hxx>
 #include <vcl/group.hxx>
 #include <vcl/layout.hxx>
-#include <svtools/stdctrl.hxx>
 #include <sfx2/tabdlg.hxx>
 
 class SwLabDlg;
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 26b3dc063f3a..bba5bd67cbc7 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/stdctrl.hxx>
 #include <vcl/msgbox.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index 8d6e55b4e35a..031fc382b053 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -21,7 +21,6 @@
 #include <svtools/wizardmachine.hxx>
 #include <vcl/button.hxx>
 #include <vcl/layout.hxx>
-#include <svtools/stdctrl.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 85fc4988feb3..c6255e87b5cb 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -19,7 +19,6 @@
 
 #include <swtypes.hxx>
 #include <mailmergehelper.hxx>
-#include <svtools/stdctrl.hxx>
 #include <mmconfigitem.hxx>
 #include <docsh.hxx>
 #include <sfx2/filedlghelper.hxx>
diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx
index 0696c1ff456f..49f57594f866 100644
--- a/sw/source/uibase/inc/changedb.hxx
+++ b/sw/source/uibase/inc/changedb.hxx
@@ -22,7 +22,6 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
-#include <svtools/stdctrl.hxx>
 #include <svtools/treelistbox.hxx>
 #include <svx/stddlg.hxx>
 #include "dbtree.hxx"
diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx
index a238c1c2b7f1..f3e532798c35 100644
--- a/sw/source/uibase/inc/docstdlg.hxx
+++ b/sw/source/uibase/inc/docstdlg.hxx
@@ -22,7 +22,6 @@
 #include <sfx2/tabdlg.hxx>
 
 #include <vcl/fixed.hxx>
-#include <svtools/stdctrl.hxx>
 
 #include "docstat.hxx"
 
diff --git a/sw/source/uibase/inc/labimp.hxx b/sw/source/uibase/inc/labimp.hxx
index ff1dbe54cfde..f1ba628ff8ee 100644
--- a/sw/source/uibase/inc/labimp.hxx
+++ b/sw/source/uibase/inc/labimp.hxx
@@ -24,7 +24,6 @@
 #include <vcl/fixed.hxx>
 #include <svtools/svmedit.hxx>
 #include <vcl/field.hxx>
-#include <svtools/stdctrl.hxx>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/text/XWordCursor.hpp>
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index 11f5c00ded6e..223171de1f0d 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGEHELPER_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGEHELPER_HXX
 
-#include <svtools/stdctrl.hxx>
 #include <unotools/configitem.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/mail/XAuthenticator.hpp>
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index d2a9d2bc2856..77036d086b01 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -27,7 +27,6 @@
 
 #include <vcl/fixed.hxx>
 #include <vcl/edit.hxx>
-#include <svtools/stdctrl.hxx>
 
 #include <vcl/lstbox.hxx>
 #include <com/sun/star/uno/Sequence.h>
diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx
index 2d69df0f18af..e8068e1d5cb5 100644
--- a/sw/source/uibase/inc/multmrk.hxx
+++ b/sw/source/uibase/inc/multmrk.hxx
@@ -22,7 +22,6 @@
 
 #include <svx/stddlg.hxx>
 #include <vcl/fixed.hxx>
-#include <svtools/stdctrl.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
 
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index a93d2095692e..0f7eaec04d74 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -24,7 +24,6 @@
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/layout.hxx>
-#include <svtools/stdctrl.hxx>
 #include <vcl/button.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index 0c8701f455aa..27a5459337a5 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -24,7 +24,6 @@
 #include <vcl/menu.hxx>
 
 #include <vcl/button.hxx>
-#include <svtools/stdctrl.hxx>
 
 #include <vcl/fixed.hxx>
 
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index 06687dd029be..609e2d1b8c14 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -34,7 +34,6 @@
 
 #include <sfx2/childwin.hxx>
 #include "toxe.hxx"
-#include <svtools/stdctrl.hxx>
 #include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
 
 class SwWrtShell;
diff --git a/sw/source/uibase/inc/wordcountdialog.hxx b/sw/source/uibase/inc/wordcountdialog.hxx
index da92684a728a..6a2bdd66333a 100644
--- a/sw/source/uibase/inc/wordcountdialog.hxx
+++ b/sw/source/uibase/inc/wordcountdialog.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WORDCOUNTDIALOG_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_WORDCOUNTDIALOG_HXX
 #include <sfx2/basedlgs.hxx>
-#include <svtools/stdctrl.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/button.hxx>
 struct SwDocStat;
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index afc83927b7fe..3133b696652d 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -21,7 +21,6 @@
 
 #include <sfx2/tbxctrl.hxx>
 #include <vcl/toolbox.hxx>
-#include <svtools/stdctrl.hxx>
 #include <vcl/button.hxx>
 
 class PopupMenu;