controllayout.hxx can be a toolkit-only header
Change-Id: I4ad08decf432a890cdf7acf475d15210ba813f76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92903 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
parent
d26d1da82f
commit
f924658e45
10 changed files with 13 additions and 9 deletions
|
@ -24,7 +24,7 @@
|
|||
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
|
||||
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
|
||||
#include <vcl/svapp.hxx>
|
||||
#include <vcl/controllayout.hxx>
|
||||
#include <vcl/toolkit/controllayout.hxx>
|
||||
#include <vcl/settings.hxx>
|
||||
#include <toolkit/helper/convert.hxx>
|
||||
#include <unotools/accessiblestatesethelper.hxx>
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
|
||||
#include <i18nlangtag/languagetag.hxx>
|
||||
#include <vcl/svapp.hxx>
|
||||
#include <vcl/controllayout.hxx>
|
||||
#include <vcl/toolkit/controllayout.hxx>
|
||||
#include <vcl/settings.hxx>
|
||||
#include <toolkit/helper/convert.hxx>
|
||||
#include <unotools/accessiblestatesethelper.hxx>
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include <vcl/svapp.hxx>
|
||||
#include <vcl/unohelp2.hxx>
|
||||
#include <vcl/status.hxx>
|
||||
#include <vcl/controllayout.hxx>
|
||||
#include <vcl/toolkit/controllayout.hxx>
|
||||
#include <vcl/settings.hxx>
|
||||
#include <i18nlangtag/languagetag.hxx>
|
||||
|
||||
|
|
|
@ -20,6 +20,10 @@
|
|||
#ifndef INCLUDED_VCL_CONTROLLAYOUT_HXX
|
||||
#define INCLUDED_VCL_CONTROLLAYOUT_HXX
|
||||
|
||||
#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) && !defined(VCL_INTERNALS)
|
||||
#error "don't use this in new code"
|
||||
#endif
|
||||
|
||||
#include <rtl/ustring.hxx>
|
||||
#include <tools/gen.hxx>
|
||||
#include <vector>
|
|
@ -7350,7 +7350,6 @@ include/vcl/checksum.hxx
|
|||
include/vcl/combobox.hxx
|
||||
include/vcl/commandevent.hxx
|
||||
include/vcl/commandinfoprovider.hxx
|
||||
include/vcl/controllayout.hxx
|
||||
include/vcl/ctrl.hxx
|
||||
include/vcl/cursor.hxx
|
||||
include/vcl/cvtgrf.hxx
|
||||
|
@ -7467,6 +7466,7 @@ include/vcl/textview.hxx
|
|||
include/vcl/threadex.hxx
|
||||
include/vcl/timer.hxx
|
||||
include/vcl/toolbox.hxx
|
||||
include/vcl/toolkit/controllayout.hxx
|
||||
include/vcl/toolkit/dialog.hxx
|
||||
include/vcl/toolkit/field.hxx
|
||||
include/vcl/toolkit/fixedhyper.hxx
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#define INCLUDED_VCL_INC_CONTROLDATA_HXX
|
||||
|
||||
#include <memory>
|
||||
#include <vcl/controllayout.hxx>
|
||||
#include <vcl/toolkit/controllayout.hxx>
|
||||
|
||||
namespace vcl
|
||||
{
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#define INCLUDED_VCL_INC_TOOLBOX_H
|
||||
|
||||
#include <vcl/toolbox.hxx>
|
||||
#include <vcl/controllayout.hxx>
|
||||
#include <vcl/toolkit/controllayout.hxx>
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include <vcl/button.hxx>
|
||||
#include <vcl/tabpage.hxx>
|
||||
#include <vcl/tabctrl.hxx>
|
||||
#include <vcl/controllayout.hxx>
|
||||
#include <vcl/toolkit/controllayout.hxx>
|
||||
#include <vcl/layout.hxx>
|
||||
#include <vcl/lstbox.hxx>
|
||||
#include <vcl/settings.hxx>
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include <vcl/virdev.hxx>
|
||||
#include <vcl/sysdata.hxx>
|
||||
#include <vcl/unohelp.hxx>
|
||||
#include <vcl/controllayout.hxx>
|
||||
#include <vcl/toolkit/controllayout.hxx>
|
||||
#ifdef MACOSX
|
||||
# include <vcl/opengl/OpenGLHelper.hxx>
|
||||
#endif
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include <vcl/decoview.hxx>
|
||||
#include <vcl/menu.hxx>
|
||||
#include <vcl/taskpanelist.hxx>
|
||||
#include <vcl/controllayout.hxx>
|
||||
#include <vcl/toolkit/controllayout.hxx>
|
||||
#include <vcl/settings.hxx>
|
||||
#include <vcl/commandinfoprovider.hxx>
|
||||
|
||||
|
|
Loading…
Reference in a new issue