[Libreoffice-commits] core.git: chart2/source cui/source extensions/source filter/source formula/source include/sfx2 include/svtools include/svx sc/source sd/source sfx2/source svtools/Library_svt.mk svtools/source svx/source sw/source uui/source xmlsecurity/inc xmlsecurity/source
Caolán McNamara
caolanm at redhat.com
Wed Oct 5 15:05:34 UTC 2016
chart2/source/controller/inc/dlg_DataEditor.hxx | 1
cui/source/inc/SpellDialog.hxx | 1
cui/source/inc/backgrnd.hxx | 1
cui/source/inc/chardlg.hxx | 1
cui/source/inc/cuisrchdlg.hxx | 1
cui/source/inc/page.hxx | 1
cui/source/inc/postdlg.hxx | 1
cui/source/options/certpath.cxx | 1
cui/source/options/optinet2.hxx | 1
cui/source/options/optsave.cxx | 1
cui/source/options/securityoptions.cxx | 1
cui/source/options/webconninfo.hxx | 3 -
extensions/source/bibliography/general.hxx | 1
filter/source/flash/impswfdialog.hxx | 1
filter/source/svg/impsvgdialog.hxx | 1
formula/source/ui/dlg/formula.cxx | 1
formula/source/ui/dlg/funcpage.hxx | 1
formula/source/ui/dlg/parawin.hxx | 2 -
formula/source/ui/dlg/structpg.hxx | 1
include/sfx2/dinfdlg.hxx | 1
include/svtools/prnsetup.hxx | 1
include/svtools/stdctrl.hxx | 36 -----------------------
include/svx/float3d.hxx | 1
include/svx/srchdlg.hxx | 1
include/svx/tabline.hxx | 1
sc/source/ui/dbgui/foptmgr.cxx | 2 -
sc/source/ui/inc/dwfunctr.hxx | 1
sc/source/ui/inc/filtdlg.hxx | 1
sc/source/ui/inc/formula.hxx | 1
sc/source/ui/inc/linkarea.hxx | 1
sc/source/ui/inc/navipi.hxx | 5 +--
sc/source/ui/inc/pfiltdlg.hxx | 1
sc/source/ui/inc/pvfundlg.hxx | 1
sc/source/ui/inc/retypepassdlg.hxx | 1
sc/source/ui/inc/sortkeydlg.hxx | 1
sc/source/ui/inc/tabpages.hxx | 1
sc/source/ui/inc/tpcalc.hxx | 1
sc/source/ui/inc/tphfedit.hxx | 1
sc/source/ui/inc/tpsort.hxx | 1
sc/source/ui/inc/tpstat.hxx | 1
sc/source/ui/navipi/navipi.cxx | 4 +-
sd/source/ui/inc/BreakDlg.hxx | 1
sd/source/ui/inc/animobjs.hxx | 1
sd/source/ui/inc/tpoption.hxx | 1
sfx2/source/inc/documentfontsdialog.hxx | 2 -
svtools/Library_svt.mk | 1
svtools/source/control/stdctrl.cxx | 28 -----------------
svx/source/tbxctrls/lboxctrl.cxx | 1
sw/source/ui/config/mailconfigpage.cxx | 1
sw/source/ui/dbui/addresslistdialog.hxx | 1
sw/source/ui/dbui/createaddresslistdialog.hxx | 2 -
sw/source/ui/dbui/customizeaddresslistdialog.hxx | 1
sw/source/ui/dbui/dbtablepreviewdialog.hxx | 2 -
sw/source/ui/dbui/mmaddressblockpage.hxx | 1
sw/source/ui/dbui/mmdocselectpage.hxx | 1
sw/source/ui/dbui/mmgreetingspage.hxx | 1
sw/source/ui/dbui/mmlayoutpage.hxx | 1
sw/source/ui/dbui/mmoutputtypepage.hxx | 1
sw/source/ui/envelp/envfmt.hxx | 1
sw/source/ui/envelp/envprt.hxx | 1
sw/source/ui/envelp/labprt.hxx | 1
sw/source/ui/fldui/changedb.cxx | 1
sw/source/ui/inc/mmresultdialogs.hxx | 1
sw/source/uibase/dbui/mailmergehelper.cxx | 1
sw/source/uibase/inc/changedb.hxx | 1
sw/source/uibase/inc/docstdlg.hxx | 1
sw/source/uibase/inc/labimp.hxx | 1
sw/source/uibase/inc/mailmergehelper.hxx | 1
sw/source/uibase/inc/mailmrge.hxx | 1
sw/source/uibase/inc/multmrk.hxx | 1
sw/source/uibase/inc/num.hxx | 1
sw/source/uibase/inc/outline.hxx | 1
sw/source/uibase/inc/swuiidxmrk.hxx | 1
sw/source/uibase/inc/wordcountdialog.hxx | 1
sw/source/uibase/inc/workctrl.hxx | 1
uui/source/logindlg.hxx | 1
uui/source/masterpasscrtdlg.hxx | 1
uui/source/masterpassworddlg.hxx | 1
uui/source/passworddlg.hxx | 1
uui/source/secmacrowarnings.cxx | 1
uui/source/secmacrowarnings.hxx | 1
xmlsecurity/inc/certificateviewer.hxx | 1
xmlsecurity/inc/digitalsignaturesdialog.hxx | 1
xmlsecurity/inc/macrosecurity.hxx | 1
xmlsecurity/source/dialogs/resourcemanager.cxx | 1
xmlsecurity/source/dialogs/resourcemanager.hxx | 1
86 files changed, 8 insertions(+), 154 deletions(-)
New commits:
commit 306add13e1d9f70e1111acde8362aea6c169a97d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 5 15:57:25 2016 +0100
convert the last two lonely FixedInfos to FixedText
Change-Id: Ia6ed5f71931a6141efb3d5e5eb329149d6850342
diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx
index b2e9009..f372f4d 100644
--- a/chart2/source/controller/inc/dlg_DataEditor.hxx
+++ b/chart2/source/controller/inc/dlg_DataEditor.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATAEDITOR_HXX
#include <svl/lstner.hxx>
-#include <svtools/stdctrl.hxx>
#include <vcl/toolbox.hxx>
#include <comphelper/stl_types.hxx>
#include <vcl/dialog.hxx>
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index affdf32f..0dc32c1 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -23,7 +23,6 @@
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
#include <vcl/lstbox.hxx>
-#include <svtools/stdctrl.hxx>
#include <vcl/button.hxx>
#include <vcl/menubtn.hxx>
#include <vcl/group.hxx>
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 9a4d254..18ec128 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_CUI_SOURCE_INC_BACKGRND_HXX
#include <vcl/group.hxx>
-#include <svtools/stdctrl.hxx>
#include <vcl/graph.hxx>
#include <svx/SvxColorValueSet.hxx>
#include <svx/dlgctrl.hxx>
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 1dbda94..876e6f13 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_CUI_SOURCE_INC_CHARDLG_HXX
#include <svtools/ctrlbox.hxx>
-#include <svtools/stdctrl.hxx>
#include <sfx2/tabdlg.hxx>
#include <svx/fntctrl.hxx>
#include <svx/checklbx.hxx>
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index 8284d73..c3d6649 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_CUI_SOURCE_INC_CUISRCHDLG_HXX
#define INCLUDED_CUI_SOURCE_INC_CUISRCHDLG_HXX
-#include <svtools/stdctrl.hxx>
#include <vcl/combobox.hxx>
#include <vcl/edit.hxx>
#include <vcl/lstbox.hxx>
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index c0cd030..e4b739c 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -24,7 +24,6 @@
#include <vcl/fixed.hxx>
#include <vcl/group.hxx>
#include <vcl/lstbox.hxx>
-#include <svtools/stdctrl.hxx>
#include <svx/pagectrl.hxx>
#include <svx/papersizelistbox.hxx>
#include <svx/frmdirlbox.hxx>
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 9c351b1..23c9ca1 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -23,7 +23,6 @@
#include <vcl/edit.hxx>
#include <vcl/group.hxx>
#include <vcl/layout.hxx>
-#include <svtools/stdctrl.hxx>
#include <sfx2/basedlgs.hxx>
#include <svtools/svmedit.hxx>
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index f853ce3..08c6470 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -11,7 +11,6 @@
#include <osl/file.hxx>
#include <osl/security.hxx>
#include <osl/thread.h>
-#include <svtools/stdctrl.hxx>
#include "svtools/treelistentry.hxx"
#include <unotools/securityoptions.hxx>
#include <cuires.hrc>
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index fd08508..378a071 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -24,7 +24,6 @@
#include <vcl/group.hxx>
#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
-#include <svtools/stdctrl.hxx>
#include <svtools/svtabbx.hxx>
#include <sfx2/tabdlg.hxx>
#include <unotools/configitem.hxx>
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index de06da1..09d5a92 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -37,7 +37,6 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/util/XFlushable.hpp>
#include <sfx2/docfilt.hxx>
-#include <svtools/stdctrl.hxx>
#include <vcl/fixed.hxx>
#include <unotools/configitem.hxx>
#include <unotools/optionsdlg.hxx>
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index a7b7881..30452a9 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -18,7 +18,6 @@
*/
#include <unotools/securityoptions.hxx>
-#include <svtools/stdctrl.hxx>
#include <dialmgr.hxx>
#include <cuires.hrc>
#include "securityoptions.hxx"
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index 24c29aa..792d66c 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -23,8 +22,6 @@
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
#include <svtools/simptabl.hxx>
-#include <svtools/stdctrl.hxx>
-
namespace svx
{
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 3700584..c50323a 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -24,7 +24,6 @@
#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/form/XBoundComponent.hpp>
#include <com/sun/star/sdbc/XRowSetListener.hpp>
-#include <svtools/stdctrl.hxx>
#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx
index 325f4b1..adf3a34 100644
--- a/filter/source/flash/impswfdialog.hxx
+++ b/filter/source/flash/impswfdialog.hxx
@@ -22,7 +22,6 @@
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <svtools/stdctrl.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx
index 4cc661c..205a341 100644
--- a/filter/source/svg/impsvgdialog.hxx
+++ b/filter/source/svg/impsvgdialog.hxx
@@ -25,7 +25,6 @@
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
#include <vcl/FilterConfigItem.hxx>
-#include <svtools/stdctrl.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 913106c..4947a36 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -30,7 +30,6 @@
#include <vcl/layout.hxx>
#include <vcl/idle.hxx>
-#include <svtools/stdctrl.hxx>
#include <svtools/svmedit.hxx>
#include <svtools/treelistbox.hxx>
#include <svl/stritem.hxx>
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index b47c641..b47a6d9 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FORMULA_SOURCE_UI_DLG_FUNCPAGE_HXX
#define INCLUDED_FORMULA_SOURCE_UI_DLG_FUNCPAGE_HXX
-#include <svtools/stdctrl.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/group.hxx>
#include <svtools/svmedit.hxx>
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index e6d4a65..8c41581 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -20,9 +20,9 @@
#ifndef INCLUDED_FORMULA_SOURCE_UI_DLG_PARAWIN_HXX
#define INCLUDED_FORMULA_SOURCE_UI_DLG_PARAWIN_HXX
-#include <svtools/stdctrl.hxx>
#include <svtools/svmedit.hxx>
#include <vcl/lstbox.hxx>
+#include <vcl/fixed.hxx>
#include <vcl/group.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/tabctrl.hxx>
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 873655c..f15d72a 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FORMULA_SOURCE_UI_DLG_STRUCTPG_HXX
#define INCLUDED_FORMULA_SOURCE_UI_DLG_STRUCTPG_HXX
-#include <svtools/stdctrl.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/group.hxx>
#include <svtools/svmedit.hxx>
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index e4a74d7..684dd6c 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -30,7 +30,6 @@
#include <svl/zforlist.hxx>
#include <svtools/headbar.hxx>
-#include <svtools/stdctrl.hxx>
#include <svtools/svmedit.hxx>
#include <unotools/syslocale.hxx>
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 4a05a62..33b8cff 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -28,7 +28,6 @@
#include <vcl/group.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/timer.hxx>
-#include <svtools/stdctrl.hxx>
class Printer;
class QueueInfo;
diff --git a/include/svtools/stdctrl.hxx b/include/svtools/stdctrl.hxx
deleted file mode 100644
index 38c548c..0000000
--- a/include/svtools/stdctrl.hxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVTOOLS_STDCTRL_HXX
-#define INCLUDED_SVTOOLS_STDCTRL_HXX
-
-#include <svtools/svtdllapi.h>
-
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-
-class SVT_DLLPUBLIC FixedInfo : public FixedText
-{
-public:
- FixedInfo( vcl::Window* pParent, const ResId& rResId );
-};
-
-#endif // INCLUDED_SVTOOLS_STDCTRL_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index 4cd2b49..d385b1f 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -25,7 +25,6 @@
#include <vcl/field.hxx>
#include <sfx2/dockwin.hxx>
#include <vcl/button.hxx>
-#include <svtools/stdctrl.hxx>
#include <svx/svxdllapi.h>
#include <svx/f3dchild.hxx>
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 8a598a6..5b5f7ae 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SVX_SRCHDLG_HXX
#define INCLUDED_SVX_SRCHDLG_HXX
-#include <svtools/stdctrl.hxx>
#include <vcl/combobox.hxx>
#include <vcl/edit.hxx>
#include <vcl/button.hxx>
diff --git a/include/svx/tabline.hxx b/include/svx/tabline.hxx
index 9c71cc2..c26f54d 100644
--- a/include/svx/tabline.hxx
+++ b/include/svx/tabline.hxx
@@ -21,7 +21,6 @@
#include <vcl/button.hxx>
#include <vcl/group.hxx>
-#include <svtools/stdctrl.hxx>
#include <svx/svdpage.hxx>
#include <svx/xlineit0.hxx>
#include <svx/xlineit.hxx>
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 018330b..f495b9b 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svtools/stdctrl.hxx>
-
#include "anyrefdg.hxx"
#include "rangeutl.hxx"
#include "dbdata.hxx"
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index cea49c9..d05f438 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 05a80e8..f2e2dfa 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 9017ee4..479d675 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 86037048..245ad1c 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 7a7d089..a7d6833 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 c3fcdd6..230109f 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 70fe3b6..1f58212 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 54da764..eeb23c2 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 48b93e2..c8d83ce 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 db34eda..5671f0d 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 f0cc0f0..4cb1064 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 5ce0f55..dba4b2e 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 80be804..ca323dd 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 a483523..9afc120 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
{
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 4e56e96..828885f 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -538,9 +538,9 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl
Window( pParent, ScResId(RID_SCDLG_NAVIGATOR) ),
rBindings ( *pB ), // is used in CommandToolBox ctor
aCmdImageList( ScResId( IL_CMD ) ),
- aFtCol ( VclPtr<FixedInfo>::Create( this, ScResId( FT_COL ) ) ),
+ aFtCol ( VclPtr<FixedText>::Create( this, ScResId( FT_COL ) ) ),
aEdCol ( VclPtr<ColumnEdit>::Create( this, ScResId( ED_COL ) ) ),
- aFtRow ( VclPtr<FixedInfo>::Create( this, ScResId( FT_ROW ) ) ),
+ aFtRow ( VclPtr<FixedText>::Create( this, ScResId( FT_ROW ) ) ),
aEdRow ( VclPtr<RowEdit>::Create( this, ScResId( ED_ROW ) ) ),
aTbxCmd ( VclPtr<CommandToolBox>::Create( this, ScResId( TBX_CMD ) ) ),
aLbEntries ( VclPtr<ScContentTree>::Create( this, ScResId( LB_ENTRIES ) ) ),
diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx
index 7028e4a..e333ea3 100644
--- a/sd/source/ui/inc/BreakDlg.hxx
+++ b/sd/source/ui/inc/BreakDlg.hxx
@@ -27,7 +27,6 @@
#include <vcl/fixed.hxx>
#include <vcl/prgsbar.hxx>
#include <vcl/edit.hxx>
-#include <svtools/stdctrl.hxx>
#include <sfx2/basedlgs.hxx>
#include <vcl/idle.hxx>
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index 039e5bf..31bd639 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -22,7 +22,6 @@
#include <sfx2/dockwin.hxx>
#include <vcl/fixed.hxx>
-#include <svtools/stdctrl.hxx>
#include <tools/fract.hxx>
#include <vcl/group.hxx>
#include <sfx2/ctrlitem.hxx>
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index 0c4e906..11ecd30 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -25,7 +25,6 @@
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
#include <vcl/button.hxx>
-#include <svtools/stdctrl.hxx>
#include <sfx2/tabdlg.hxx>
#include <svx/optgrid.hxx>
diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx
index ce601fa..4e1b12d 100644
--- a/sfx2/source/inc/documentfontsdialog.hxx
+++ b/sfx2/source/inc/documentfontsdialog.hxx
@@ -20,9 +20,7 @@
#define INCLUDED_SFX2_SOURCE_INC_DOCUMENTFONTSDIALOG_HXX
#include <sfx2/tabdlg.hxx>
-
#include <vcl/fixed.hxx>
-#include <svtools/stdctrl.hxx>
/**
Tab page for document font settings in the document properties dialog.
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index fccfae5..f778453 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -126,7 +126,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/control/ruler \
svtools/source/control/scriptedtext \
svtools/source/control/scrwin \
- svtools/source/control/stdctrl \
svtools/source/control/tabbar \
svtools/source/control/toolbarmenu \
svtools/source/control/toolbarmenuacc \
diff --git a/svtools/source/control/stdctrl.cxx b/svtools/source/control/stdctrl.cxx
deleted file mode 100644
index 4e3b03c..0000000
--- a/svtools/source/control/stdctrl.cxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svtools/stdctrl.hxx>
-
-FixedInfo::FixedInfo( vcl::Window* pParent, const ResId& rResId ) :
- FixedText( pParent, rResId )
-{
- SetStyle( GetStyle() | WB_INFO );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 7dcd54c..cb81b3d 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -31,7 +31,6 @@
#include <sfx2/viewsh.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
-#include <svtools/stdctrl.hxx>
#include <svl/slstitm.hxx>
#include <svl/stritem.hxx>
#include <svx/dialmgr.hxx>
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index b6d0cd2..c25da7b 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 818a754..2269fb3 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 3bd6146..a50e585 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 9ce1761..aaf120f 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 6d217eb..faf89f7 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 e69390f..d66ef38 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 b5322c3..3eafb73 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 44c7ac8..bfbf365 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 41b0406..e75a48c 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 961153a..99a4e41 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 09eab39..cfd94f6 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 0a71355..f9d1b18 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 8d494e8..027edf3 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 26b3dc0..bba5bd6 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 8d6e55b..031fc38 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 85fc498..c6255e8 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 0696c1f..49f5759 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 a238c1c..f3e5327 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 ff1dbe5..f1ba628 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 11f5c00..223171d 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 d2a9d2bc..77036d0 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 2d69df0..e8068e1 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 a93d209..0f7eaec 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 0c8701f..27a5459 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 06687dd..609e2d1 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 da92684..6a2bdd6 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 afc8392..3133b69 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;
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index ecef81e..01bd2d8 100644
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_UUI_SOURCE_LOGINDLG_HXX
#define INCLUDED_UUI_SOURCE_LOGINDLG_HXX
-#include <svtools/stdctrl.hxx>
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx
index 38efbcb..01931eb 100644
--- a/uui/source/masterpasscrtdlg.hxx
+++ b/uui/source/masterpasscrtdlg.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_UUI_SOURCE_MASTERPASSCRTDLG_HXX
#include <com/sun/star/task/PasswordRequestMode.hpp>
-#include <svtools/stdctrl.hxx>
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx
index 7dcc810..525d588 100644
--- a/uui/source/masterpassworddlg.hxx
+++ b/uui/source/masterpassworddlg.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_UUI_SOURCE_MASTERPASSWORDDLG_HXX
#include <com/sun/star/task/PasswordRequestMode.hpp>
-#include <svtools/stdctrl.hxx>
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index 34627b9..dc63370 100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_UUI_SOURCE_PASSWORDDLG_HXX
#include <com/sun/star/task/PasswordRequestMode.hpp>
-#include <svtools/stdctrl.hxx>
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <vcl/edit.hxx>
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 17bbc16..cea5868 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -25,6 +25,7 @@
#include <comphelper/processfactory.hxx>
#include <sal/macros.h>
+#include <vcl/fixed.hxx>
#include <vcl/msgbox.hxx>
#include <com/sun/star/security/NoPasswordException.hpp>
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index fec9a51..ea8ff82 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_UUI_SOURCE_SECMACROWARNINGS_HXX
#include <vcl/dialog.hxx>
-#include <svtools/stdctrl.hxx>
#include <unotools/securityoptions.hxx>
#include <vcl/button.hxx>
diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx
index 03f8b89..20eb6e9 100644
--- a/xmlsecurity/inc/certificateviewer.hxx
+++ b/xmlsecurity/inc/certificateviewer.hxx
@@ -27,7 +27,6 @@
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include <svtools/simptabl.hxx>
-#include <svtools/stdctrl.hxx>
#include <svtools/svmedit.hxx>
namespace com {
diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx
index 1422aca..f58dccf 100644
--- a/xmlsecurity/inc/digitalsignaturesdialog.hxx
+++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx
@@ -24,7 +24,6 @@
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <svtools/simptabl.hxx>
-#include <svtools/stdctrl.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <documentsignaturehelper.hxx>
diff --git a/xmlsecurity/inc/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx
index 19da1e7..0c3d177 100644
--- a/xmlsecurity/inc/macrosecurity.hxx
+++ b/xmlsecurity/inc/macrosecurity.hxx
@@ -27,7 +27,6 @@
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include <svtools/simptabl.hxx>
-#include <svtools/stdctrl.hxx>
#include <unotools/securityoptions.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 28d0ba2..5700619 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -22,7 +22,6 @@
#include <vcl/svapp.hxx>
#include <vcl/fixed.hxx>
-#include <svtools/stdctrl.hxx>
#include <svl/solar.hrc>
#include <unotools/syslocale.hxx>
#include <rtl/ustring.h>
diff --git a/xmlsecurity/source/dialogs/resourcemanager.hxx b/xmlsecurity/source/dialogs/resourcemanager.hxx
index 4b30549..f2352a9 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.hxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.hxx
@@ -28,7 +28,6 @@
#include <vector>
class FixedImage;
-class FixedInfo;
class Control;
class LocaleDataWrapper;
More information about the Libreoffice-commits
mailing list