diff options
31 files changed, 52 insertions, 46 deletions
diff --git a/cui/source/factory/cuiexp.cxx b/cui/source/factory/cuiexp.cxx index 7c46eee53c93..3c8f89be234d 100644 --- a/cui/source/factory/cuiexp.cxx +++ b/cui/source/factory/cuiexp.cxx @@ -18,6 +18,7 @@ */ #include <sfx2/basedlgs.hxx> +#include <svx/ucsubset.hxx> #include <cuigaldlg.hxx> #include <hlmarkwn.hxx> #include <srchxtra.hxx> diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index ca48341081fc..d9d818387f3e 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -27,6 +27,7 @@ #include <sal/log.hxx> #include <svx/dialogs.hrc> #include <svx/svxids.hrc> +#include <svx/ucsubset.hxx> #include <numfmt.hxx> #include <splitcelldlg.hxx> #include <dstribut.hxx> diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 7838cd35d816..9b2a98e20584 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -18,6 +18,7 @@ */ #include <i18nutil/unicode.hxx> +#include <vcl/event.hxx> #include <vcl/field.hxx> #include <vcl/keycodes.hxx> #include <vcl/settings.hxx> @@ -40,6 +41,7 @@ #include <svl/eitem.hxx> #include <svl/languageoptions.hxx> #include <svx/SmartTagMgr.hxx> +#include <svx/ucsubset.hxx> #include <com/sun/star/smarttags/XSmartTagRecognizer.hpp> #include <com/sun/star/smarttags/XSmartTagAction.hpp> #include <rtl/strbuf.hxx> diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index de5d7e233013..9236a26a2dbd 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -29,6 +29,7 @@ #include <sfx2/viewfrm.hxx> #include <svx/dialogs.hrc> #include <svx/svxids.hrc> +#include <svx/ucsubset.hxx> #include <svtools/unitconv.hxx> #include <svl/languageoptions.hxx> #include <svx/xtable.hxx> diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index eb4356342a90..8c0ccf671032 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -32,6 +32,7 @@ #include <svx/colorbox.hxx> #include <svx/strarray.hxx> #include <svx/gallery.hxx> +#include <svx/ucsubset.hxx> #include <svl/urihelper.hxx> #include <editeng/brushitem.hxx> #include <svl/intitem.hxx> diff --git a/include/cui/cuicharmap.hxx b/include/cui/cuicharmap.hxx index cfe472e632a9..c03c9a6808df 100644 --- a/include/cui/cuicharmap.hxx +++ b/include/cui/cuicharmap.hxx @@ -26,6 +26,7 @@ #include <svl/itemset.hxx> #include <svx/charmap.hxx> #include <svx/searchcharmap.hxx> +#include <svx/ucsubset.hxx> #include <sfx2/charwin.hxx> #include <cui/cuidllapi.h> diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx index e252ae30cc01..b58463879f55 100644 --- a/include/svx/ShapeTypeHandler.hxx +++ b/include/svx/ShapeTypeHandler.hxx @@ -20,19 +20,19 @@ #ifndef INCLUDED_SVX_SHAPETYPEHANDLER_HXX #define INCLUDED_SVX_SHAPETYPEHANDLER_HXX -#include <svx/AccessibleShapeTreeInfo.hxx> -#include <svx/AccessibleShapeInfo.hxx> -#include <svx/AccessibleShape.hxx> -#include <com/sun/star/accessibility/XAccessible.hpp> -#include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/document/XEventBroadcaster.hpp> #include <svx/svxdllapi.h> +#include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <unordered_map> #include <vector> +namespace accessibility { class AccessibleShape; } +namespace accessibility { class AccessibleShapeInfo; } +namespace accessibility { class AccessibleShapeTreeInfo; } +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::uno { template <typename > class Reference; } + namespace accessibility { /** Use an integer to represent shape type ids. A ShapeTypeId is unique diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx index b3432db5f15c..0f897f7edf40 100644 --- a/include/svx/scene3d.hxx +++ b/include/svx/scene3d.hxx @@ -30,11 +30,6 @@ namespace sdr { namespace properties { class BaseProperties; - class E3dSceneProperties; -}} - -namespace drawinglayer { namespace geometry { - class ViewInformation3D; }} /************************************************************************* diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index b4014bdd8807..9b70de0e8e4b 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -23,13 +23,13 @@ #include <svx/svddef.hxx> #include <svx/sdooitm.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/uno/Any.hxx> #include <rtl/ustring.hxx> #include <svx/svxdllapi.h> -#include <map> #include <unordered_map> +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::uno { class Any; } + class SVX_DLLPUBLIC SdrCustomShapeGeometryItem : public SfxPoolItem { public: diff --git a/include/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx index fd2f23c51a4b..b91ba08ceabe 100644 --- a/include/svx/sdrhittesthelper.hxx +++ b/include/svx/sdrhittesthelper.hxx @@ -21,11 +21,12 @@ #define INCLUDED_SVX_SDRHITTESTHELPER_HXX #include <svx/svxdllapi.h> -#include <tools/gen.hxx> // #i101872# new Object HitTest as View-tooling + +class Point; class SdrObject; class SdrPageView; class SdrLayerIDSet; diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx index a072ed6ba5aa..072c12cfd8fa 100644 --- a/include/svx/sdrmasterpagedescriptor.hxx +++ b/include/svx/sdrmasterpagedescriptor.hxx @@ -24,8 +24,6 @@ #include <svx/svdsob.hxx> #include <memory> -class SdrObject; -class SfxItemSet; class SdrPageProperties; namespace sdr diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx index e43279e31e6c..b95daf0b5afe 100644 --- a/include/svx/sdrpagewindow.hxx +++ b/include/svx/sdrpagewindow.hxx @@ -21,14 +21,14 @@ #define INCLUDED_SVX_SDRPAGEWINDOW_HXX #include <basegfx/range/b2irectangle.hxx> -#include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/svdtypes.hxx> #include <svx/svxdllapi.h> -#include <rtl/ref.hxx> #include <memory> -#include <com/sun/star/awt/XControlContainer.hpp> - +namespace com::sun::star::awt { class XControlContainer; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } +namespace rtl { template <class reference_type> class Reference; } +namespace sdr { namespace overlay { class OverlayManager; } } namespace vcl { class Region; } namespace sdr @@ -40,7 +40,7 @@ namespace sdr } } -namespace basegfx { class B2DRange; class B2IRange; } +namespace basegfx { class B2DRange; } class SdrPaintWindow; class SdrPageView; diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx index f932c91eac1c..60a06bd546c5 100644 --- a/include/svx/sdrundomanager.hxx +++ b/include/svx/sdrundomanager.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SVX_SDRUNDOMANAGER_HXX #include <svx/svxdllapi.h> -#include <sal/types.h> #include <editeng/editund2.hxx> #include <tools/link.hxx> diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index 53198eb9d856..01543290a786 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SVX_SDTFCHIM_HXX #include <svl/eitem.hxx> -#include <svx/svddef.hxx> +#include <svx/svxdllapi.h> class SVX_DLLPUBLIC SdrTextFixedCellHeightItem : public SfxBoolItem { diff --git a/include/svx/searchcharmap.hxx b/include/svx/searchcharmap.hxx index 7cdebe6acf12..f968da5b6cea 100644 --- a/include/svx/searchcharmap.hxx +++ b/include/svx/searchcharmap.hxx @@ -19,36 +19,23 @@ #ifndef INCLUDED_SVX_SEARCHCHARMAP_HXX #define INCLUDED_SVX_SEARCHCHARMAP_HXX -#include <map> #include <memory> #include <sal/types.h> -#include <rtl/ref.hxx> #include <svx/svxdllapi.h> #include <svx/charmap.hxx> -#include <tools/gen.hxx> -#include <tools/link.hxx> -#include <vcl/ctrl.hxx> -#include <vcl/event.hxx> #include <vcl/outdev.hxx> -#include <svx/ucsubset.hxx> -#include <vcl/metric.hxx> #include <vcl/vclptr.hxx> -#include <vcl/window.hxx> -#include <vector> #include <unordered_map> -namespace com { namespace sun { namespace star { - namespace accessibility { class XAccessible; } -} } } - -namespace vcl { class Font; } +namespace svx { struct SvxShowCharSetItem; } +namespace tools { class Rectangle; } +namespace weld { class ScrolledWindow; } #define COLUMN_COUNT 16 #define ROW_COUNT 8 -class CommandEvent; -class ScrollBar; +class Subset; class SVX_DLLPUBLIC SvxSearchCharSet : public SvxShowCharSet { diff --git a/include/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx index 11acdac3cd59..70bdaced27d6 100644 --- a/include/svx/selectioncontroller.hxx +++ b/include/svx/selectioncontroller.hxx @@ -30,7 +30,6 @@ namespace vcl { class Window; } class SfxItemSet; class SfxRequest; class SfxStyleSheet; -class SdrPage; class SdrModel; class Point; class FontList; diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index 818ad4bcacca..bd8a8a9377af 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -22,12 +22,15 @@ #include <svx/svxdllapi.h> #include <svx/shapeproperty.hxx> - -#include <com/sun/star/beans/PropertyChangeEvent.hpp> -#include <com/sun/star/beans/XPropertyChangeListener.hpp> +#include <rtl/ustring.hxx> #include <memory> +namespace com::sun::star::beans { class XPropertyChangeListener; } +namespace com::sun::star::uno { class Any; } +namespace com::sun::star::uno { template <typename > class Reference; } +namespace osl { class Mutex; } + namespace cppu { class OWeakObject; diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx index 25a370a5de89..9fda3d3ddb40 100644 --- a/include/svx/ucsubset.hxx +++ b/include/svx/ucsubset.hxx @@ -25,6 +25,7 @@ #include <vcl/metric.hxx> #include <list> +#include <vector> class FontCharMap; diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 1bc96eb92037..8b660416039d 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -44,6 +44,7 @@ #include <svx/svdobj.hxx> #include <svx/AccessibleTextHelper.hxx> #include <svx/AccessibleShape.hxx> +#include <svx/AccessibleShapeInfo.hxx> #include <svx/IAccessibleParent.hxx> #include <svx/IAccessibleViewForwarder.hxx> #include <svx/ShapeTypeHandler.hxx> diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index 72f2c3568d50..50ea974d143d 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -19,6 +19,7 @@ #include <AccessiblePresentationGraphicShape.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> +#include <com/sun/star/drawing/XShapeDescriptor.hpp> #include <SdShapeTypes.hxx> diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index 1cd03785c20e..2230bc791750 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -19,6 +19,7 @@ #include <AccessiblePresentationOLEShape.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> +#include <com/sun/star/drawing/XShapeDescriptor.hpp> #include <SdShapeTypes.hxx> diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index 2d02e2f50bc7..d87a5986807b 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -26,6 +26,8 @@ #include <svx/DescriptionGenerator.hxx> #include <svx/ShapeTypeHandler.hxx> +#include <com/sun/star/drawing/XShapeDescriptor.hpp> + using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index e4582497a8d3..9c02439fadb5 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -41,6 +41,7 @@ #include <editeng/editeng.hxx> #include <svx/svdoutl.hxx> #include <svx/svxids.hrc> +#include <svx/sdr/overlay/overlaymanager.hxx> #include <sfx2/docfile.hxx> #include <editeng/outlobj.hxx> diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index 4169508d66e9..7aec64ee0154 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -25,6 +25,7 @@ #include <svx/svdmodel.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> +#include <com/sun/star/drawing/XShapeDescriptor.hpp> #include <comphelper/sequence.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 108a06754fd6..7c31aee85a78 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -27,6 +27,7 @@ #include <cppuhelper/queryinterface.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <com/sun/star/drawing/XShapeDescriptor.hpp> using namespace ::accessibility; using namespace ::com::sun::star; diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 444c8e5f642e..1a15f61459db 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/drawing/XShapeDescriptor.hpp> +#include <com/sun/star/document/XEventBroadcaster.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/text/XText.hpp> diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index f3af5cc9e946..bdd5bfaeca33 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/document/XEventBroadcaster.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index e6454389c30f..4899662a0fee 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -23,6 +23,7 @@ #include <svx/AccessibleShapeInfo.hxx> #include <com/sun/star/drawing/XShapeDescriptor.hpp> #include <vcl/svapp.hxx> +#include <svx/AccessibleShape.hxx> #include <svx/dialmgr.hxx> #include <svx/unoshape.hxx> diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx index 5a814a281e91..13be945ae15f 100644 --- a/svx/source/dialog/searchcharmap.cxx +++ b/svx/source/dialog/searchcharmap.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/virdev.hxx> diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index f9f7db118822..4e69d4c207cc 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -22,6 +22,8 @@ #include <o3tl/any.hxx> #include <svx/sdasitm.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> + using namespace ::std; using namespace com::sun::star; diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index a2919d91372f..fedd41e68fae 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -53,6 +53,7 @@ #include <flyfrm.hxx> #include <ndtyp.hxx> #include <IDocumentDrawModelAccess.hxx> +#include <svx/AccessibleShapeInfo.hxx> #include <svx/ShapeTypeHandler.hxx> #include <vcl/svapp.hxx> #include <svx/SvxShapeTypes.hxx> @@ -61,6 +62,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/document/XEventBroadcaster.hpp> #include <cppuhelper/implbase.hxx> #include <comphelper/interfacecontainer2.hxx> #include <pagepreviewlayout.hxx> |