diff options
Diffstat (limited to 'vcl')
32 files changed, 0 insertions, 82 deletions
diff --git a/vcl/aqua/inc/aqua11yfocustracker.hxx b/vcl/aqua/inc/aqua11yfocustracker.hxx index 1dbf68c4a5ef..8cd0ec28f7bd 100644 --- a/vcl/aqua/inc/aqua11yfocustracker.hxx +++ b/vcl/aqua/inc/aqua11yfocustracker.hxx @@ -28,9 +28,7 @@ #ifndef _AQUA11YFOCUSTRACKER_HXX_ #define _AQUA11YFOCUSTRACKER_HXX_ -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_ #include <com/sun/star/accessibility/XAccessible.hpp> -#endif #include "keyboardfocuslistener.hxx" diff --git a/vcl/aqua/inc/keyboardfocuslistener.hxx b/vcl/aqua/inc/keyboardfocuslistener.hxx index 71eba2f46c02..ee704cd4bb83 100644 --- a/vcl/aqua/inc/keyboardfocuslistener.hxx +++ b/vcl/aqua/inc/keyboardfocuslistener.hxx @@ -28,9 +28,7 @@ #ifndef _KEYBOARDFOCUSLISTENER_HXX_ #define _KEYBOARDFOCUSLISTENER_HXX_ -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_ #include <com/sun/star/accessibility/XAccessible.hpp> -#endif #include <rtl/ref.hxx> diff --git a/vcl/aqua/inc/salcolorutils.hxx b/vcl/aqua/inc/salcolorutils.hxx index 74ccb69756fd..74ccb69756fd 100755..100644 --- a/vcl/aqua/inc/salcolorutils.hxx +++ b/vcl/aqua/inc/salcolorutils.hxx diff --git a/vcl/aqua/inc/salmathutils.hxx b/vcl/aqua/inc/salmathutils.hxx index 6106dc328740..6106dc328740 100755..100644 --- a/vcl/aqua/inc/salmathutils.hxx +++ b/vcl/aqua/inc/salmathutils.hxx diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx index 863bc59d173f..223631dce0b9 100644 --- a/vcl/aqua/source/a11y/documentfocuslistener.hxx +++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx @@ -28,13 +28,9 @@ #ifndef _DOCUMENTFOCUSLISTENER_HXX_ #define _DOCUMENTFOCUSLISTENER_HXX_ -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEEVENTLISTENER_HPP_ #include <com/sun/star/accessibility/XAccessibleEventListener.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif #include "aqua11yfocustracker.hxx" #include <set> diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx index 6baa8bb69d01..d0294fae25fd 100644 --- a/vcl/aqua/source/dtrans/DropTarget.hxx +++ b/vcl/aqua/source/dtrans/DropTarget.hxx @@ -33,9 +33,7 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETLISTENR_HPP_ #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> -#endif #include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp> diff --git a/vcl/inc/vcl/abstdlg.hxx b/vcl/inc/vcl/abstdlg.hxx index 2fa134af5078..2fa134af5078 100755..100644 --- a/vcl/inc/vcl/abstdlg.hxx +++ b/vcl/inc/vcl/abstdlg.hxx diff --git a/vcl/inc/vcl/dndevdis.hxx b/vcl/inc/vcl/dndevdis.hxx index 5b91bd0713ec..b970a576cd23 100644 --- a/vcl/inc/vcl/dndevdis.hxx +++ b/vcl/inc/vcl/dndevdis.hxx @@ -31,9 +31,7 @@ #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp> -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDRAGESTURERECOGNIZER_HPP_ #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp> -#endif #include <cppuhelper/implbase3.hxx> #include <vcl/window.hxx> diff --git a/vcl/inc/vcl/graphite_adaptors.hxx b/vcl/inc/vcl/graphite_adaptors.hxx index e58881c9f463..f98d3c97d012 100644 --- a/vcl/inc/vcl/graphite_adaptors.hxx +++ b/vcl/inc/vcl/graphite_adaptors.hxx @@ -35,21 +35,13 @@ #include <stdexcept> // Platform -#ifndef _SVWIN_H #include <tools/svwin.h> -#endif -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif -#ifndef _SV_SALGDI_HXX #include <vcl/salgdi.hxx> -#endif -#ifndef _SV_SALLAYOUT_HXX #include <vcl/sallayout.hxx> -#endif // Module #include "vcl/dllapi.h" diff --git a/vcl/inc/vcl/impprn.hxx b/vcl/inc/vcl/impprn.hxx index 954b2340d0c7..36ed136370a0 100644 --- a/vcl/inc/vcl/impprn.hxx +++ b/vcl/inc/vcl/impprn.hxx @@ -30,9 +30,7 @@ #include <vcl/print.hxx> #include <vcl/timer.hxx> -#ifndef _VCL_IMPDEL_HXX #include <vcl/impdel.hxx> -#endif #include <vector> diff --git a/vcl/inc/vcl/longcurr.hxx b/vcl/inc/vcl/longcurr.hxx index 39bd75439ad9..9abf992d0b9d 100644 --- a/vcl/inc/vcl/longcurr.hxx +++ b/vcl/inc/vcl/longcurr.hxx @@ -30,9 +30,7 @@ #include <vcl/dllapi.h> #include <tools/bigint.hxx> -#ifndef _FIELD_HXX #include <vcl/field.hxx> -#endif class LocaleDataWrapper; diff --git a/vcl/inc/vcl/salbmp.hxx b/vcl/inc/vcl/salbmp.hxx index 678b57fbf56f..460c1c54efcd 100644 --- a/vcl/inc/vcl/salbmp.hxx +++ b/vcl/inc/vcl/salbmp.hxx @@ -28,9 +28,7 @@ #ifndef _SV_SALBMP_HXX #define _SV_SALBMP_HXX -#ifndef _TL_GEN_HXX #include <tools/gen.hxx> -#endif #include <vcl/dllapi.h> #include <com/sun/star/rendering/XBitmapCanvas.hpp> diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/vcl/salframe.hxx index 83ef6ae6cc36..5b54d896eeee 100644 --- a/vcl/inc/vcl/salframe.hxx +++ b/vcl/inc/vcl/salframe.hxx @@ -33,9 +33,7 @@ #ifdef __cplusplus -#ifndef _SV_PTRSTYLE_HXX #include <vcl/ptrstyle.hxx> -#endif #include <vcl/sndstyle.hxx> #endif // __cplusplus @@ -44,9 +42,7 @@ #include <tools/gen.hxx> #include <vcl/region.hxx> -#ifndef _VCL_IMPDEL_HXX #include <vcl/impdel.hxx> -#endif #include <rtl/ustring.hxx> #include <vcl/keycod.hxx> diff --git a/vcl/inc/vcl/sallayout.hxx b/vcl/inc/vcl/sallayout.hxx index e23090c42392..e23090c42392 100755..100644 --- a/vcl/inc/vcl/sallayout.hxx +++ b/vcl/inc/vcl/sallayout.hxx diff --git a/vcl/inc/vcl/smartid.hxx b/vcl/inc/vcl/smartid.hxx index 2cc5f347b2cb..2cc5f347b2cb 100755..100644 --- a/vcl/inc/vcl/smartid.hxx +++ b/vcl/inc/vcl/smartid.hxx diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index 8dbbe5221434..fa3b1e35a071 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -28,18 +28,14 @@ #ifndef _SV_SVAPP_HXX #define _SV_SVAPP_HXX -#ifndef _VOS_THREAD_HXX #include <vos/thread.hxx> -#endif #include <tools/string.hxx> #include <tools/link.hxx> #include <tools/unqid.hxx> #include <vcl/sv.h> #include <vcl/dllapi.h> #include <vcl/apptypes.hxx> -#ifndef _VCL_SETTINGS_HXX #include <vcl/settings.hxx> -#endif #include <vcl/vclevent.hxx> class Link; class AllSettings; diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx index 5cc8f32d7ac9..21523fd5fac2 100644 --- a/vcl/inc/vcl/svdata.hxx +++ b/vcl/inc/vcl/svdata.hxx @@ -28,9 +28,7 @@ #ifndef _SV_SVDATA_HXX #define _SV_SVDATA_HXX -#ifndef _VOS_THREAD_HXX #include <vos/thread.hxx> -#endif #include <tools/string.hxx> #include <tools/gen.hxx> #include <tools/shl.hxx> diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 5a3693c85b2e..aaf93ad13a31 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -32,19 +32,13 @@ #include <vcl/dllapi.h> #include <vcl/outdev.hxx> #include <tools/resid.hxx> -#ifndef _SV_POINTR_HXX #include <vcl/pointr.hxx> -#endif #include <vcl/wintypes.hxx> -#ifndef _SV_APPTYPES_HXX #include <vcl/apptypes.hxx> -#endif #include <vcl/inputctx.hxx> #include <vcl/vclevent.hxx> // Only for compatibility - because many people outside haven't included event.hxx -#ifndef _VCL_EVENT_HXX #include <vcl/event.hxx> -#endif #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> #include <rtl/ustring.hxx> diff --git a/vcl/os2/inc/salsound.hxx b/vcl/os2/inc/salsound.hxx index 7ec2aeed1720..bed724557c49 100644 --- a/vcl/os2/inc/salsound.hxx +++ b/vcl/os2/inc/salsound.hxx @@ -32,9 +32,7 @@ #include <sv.h> #include <tools/string.hxx> #include <salframe.hxx> -#ifndef _SV_SALSTYPE_HXX #include <salstype.hxx> -#endif #include <salsound.hxx> // ------------ diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index b081b5cf9615..9b76599e09b9 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -59,9 +59,7 @@ #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp> #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> -#ifndef _COM_SUN_STAR_I18N_XEXTENDEDINPUTSEQUENCECHECKER_HDL_ #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp> -#endif #include <com/sun/star/i18n/InputSequenceCheckMode.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index f1cd779c97cf..f639dddff3f8 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -41,9 +41,7 @@ #include <vcl/unohelp.hxx> #include <com/sun/star/i18n/XCollator.hpp> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HDL_ #include <com/sun/star/accessibility/XAccessible.hpp> -#endif #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 4448164e71c2..a5220407e478 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -73,9 +73,7 @@ #include <vcl/controllayout.hxx> #include <rtl/logfile.hxx> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_HDL_ #include <com/sun/star/beans/PropertyValues.hdl> -#endif #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/linguistic2/XLinguServiceManager.hpp> diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx index 3912977cc9be..5003c0fe1cd6 100644 --- a/vcl/source/glyphs/graphite_textsrc.hxx +++ b/vcl/source/glyphs/graphite_textsrc.hxx @@ -39,21 +39,13 @@ #include <stdexcept> // Platform -#ifndef _SVWIN_H #include <tools/svwin.h> -#endif -#ifndef _SV_SVSYS_HXX #include <svsys.h> -#endif -#ifndef _SV_SALGDI_HXX #include <vcl/salgdi.hxx> -#endif -#ifndef _SV_SALLAYOUT_HXX #include <vcl/sallayout.hxx> -#endif // Module #include "vcl/dllapi.h" diff --git a/vcl/unx/inc/i18n_status.hxx b/vcl/unx/inc/i18n_status.hxx index 7202cf6e0eef..d641c12b852b 100644 --- a/vcl/unx/inc/i18n_status.hxx +++ b/vcl/unx/inc/i18n_status.hxx @@ -32,9 +32,7 @@ #include <tools/link.hxx> #include <tools/gen.hxx> -#ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> -#endif #include <vcl/salimestatus.hxx> #include <vector> diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx index 7e38e0a89bf2..4fbe32934ae7 100644 --- a/vcl/unx/inc/saldata.hxx +++ b/vcl/unx/inc/saldata.hxx @@ -34,9 +34,7 @@ #include <vcl/salframe.hxx> #include <salinst.h> #include <vcl/saldatabasic.hxx> -#ifndef _OSL_MODULE_H #include <osl/module.h> -#endif #include <vcl/dllapi.h> // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx index d359ff4022ac..78de508ed6ef 100644 --- a/vcl/unx/inc/saldisp.hxx +++ b/vcl/unx/inc/saldisp.hxx @@ -37,13 +37,9 @@ class SalXLib; // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #include <salunx.h> #include <vcl/salgtype.hxx> -#ifndef _SV_PTRSTYLE_HXX #include <vcl/ptrstyle.hxx> -#endif #include <sal/types.h> -#ifndef _OSL_MUTEX_H #include <osl/mutex.h> -#endif #include <vector> #include <list> #include <hash_map> diff --git a/vcl/unx/inc/wmadaptor.hxx b/vcl/unx/inc/wmadaptor.hxx index cbedede2cc99..dd28d9eaa255 100644 --- a/vcl/unx/inc/wmadaptor.hxx +++ b/vcl/unx/inc/wmadaptor.hxx @@ -28,9 +28,7 @@ #ifndef _VCL_WMADAPTOR_HXX_ #define _VCL_WMADAPTOR_HXX_ -#ifndef _TL_STRING_HXX #include <tools/string.hxx> -#endif #include <tools/gen.hxx> #include <vcl/dllapi.h> #ifndef _PREX_H diff --git a/vcl/unx/source/dtrans/X11_clipboard.hxx b/vcl/unx/source/dtrans/X11_clipboard.hxx index 21bf547a9cb7..3a4a44cd9f8b 100644 --- a/vcl/unx/source/dtrans/X11_clipboard.hxx +++ b/vcl/unx/source/dtrans/X11_clipboard.hxx @@ -30,13 +30,9 @@ #include <X11_selection.hxx> -#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBAORD_XCLIPBOARDEX_HPP_ #include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp> -#endif -#ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBAORD_XCLIPBOARDNOTIFIER_HPP_ #include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp> -#endif #include <cppuhelper/compbase4.hxx> // ------------------------------------------------------------------------ diff --git a/vcl/unx/source/dtrans/X11_selection.hxx b/vcl/unx/source/dtrans/X11_selection.hxx index 47baa1776d1a..f47ac00f6b6c 100644 --- a/vcl/unx/source/dtrans/X11_selection.hxx +++ b/vcl/unx/source/dtrans/X11_selection.hxx @@ -40,9 +40,7 @@ #include <com/sun/star/frame/XDesktop.hpp> #include <osl/thread.h> -#ifndef _OSL_CONDITION_HXX_ #include <osl/conditn.hxx> -#endif #include <hash_map> #include <list> diff --git a/vcl/unx/source/dtrans/X11_transferable.hxx b/vcl/unx/source/dtrans/X11_transferable.hxx index 57f0d6682cab..a6d579db69ea 100644 --- a/vcl/unx/source/dtrans/X11_transferable.hxx +++ b/vcl/unx/source/dtrans/X11_transferable.hxx @@ -31,9 +31,7 @@ #include <X11_selection.hxx> #include <com/sun/star/datatransfer/XTransferable.hpp> -#ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HDL_ #include <com/sun/star/lang/XEventListener.hpp> -#endif #include <cppuhelper/implbase1.hxx> namespace x11 { diff --git a/vcl/unx/source/gdi/xlfd_extd.hxx b/vcl/unx/source/gdi/xlfd_extd.hxx index 523f87fac477..c63ace707c16 100644 --- a/vcl/unx/source/gdi/xlfd_extd.hxx +++ b/vcl/unx/source/gdi/xlfd_extd.hxx @@ -28,12 +28,8 @@ #define XLFD_EXTENDED_HXX #include <salunx.h> -#ifndef _VCL_VCLENUM_HXX #include <vcl/enum.hxx> -#endif -#ifndef _VCL_OUTFONT_HXX #include <vcl/outfont.hxx> -#endif #include <vector> diff --git a/vcl/win/inc/wincomp.hxx b/vcl/win/inc/wincomp.hxx index 61e04779dbce..8da91d80cadf 100644 --- a/vcl/win/inc/wincomp.hxx +++ b/vcl/win/inc/wincomp.hxx @@ -28,9 +28,7 @@ #ifndef _SV_WINCOMP_HXX #define _SV_WINCOMP_HXX -#ifndef _STRING_H #include <string.h> -#endif #include <vcl/sv.h> // ---------- |