diff options
141 files changed, 0 insertions, 424 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx index 5ab160535aa0..bbf796198270 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -30,9 +30,7 @@ #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#ifndef ACCESSIBILITY_EXT_BROWSE_BOX_CELL_HXX #include "accessibility/extended/accessiblebrowseboxcell.hxx" -#endif #include <cppuhelper/implbase2.hxx> #include <vcl/wintypes.hxx> // ============================================================================ diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx index cb2c4f6628c8..cb2c4f6628c8 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx index c6a26d8c4548..c6a26d8c4548 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx index 90306435bd4b..90306435bd4b 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx index 0672ca28a151..0672ca28a151 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx index bee42d85e2a2..bee42d85e2a2 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx index dd44927d7fc1..dd44927d7fc1 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx index 10c6520b6a3d..10c6520b6a3d 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx diff --git a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx index a38877d5aeae..5be82c0009e1 100644 --- a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx +++ b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx @@ -27,9 +27,7 @@ #ifndef ACCESSIBILITY_EXT_ACCESSIBILEEDITBROWSEBOXTABLECELL_HXX #define ACCESSIBILITY_EXT_ACCESSIBILEEDITBROWSEBOXTABLECELL_HXX -#ifndef ACCESSIBILITY_EXT_BROWSE_BOX_CELL_HXX #include "accessiblebrowseboxcell.hxx" -#endif #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleEventListener.hpp> #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> diff --git a/accessibility/inc/accessibility/helper/accresmgr.hxx b/accessibility/inc/accessibility/helper/accresmgr.hxx index add0aaced7e3..934f6d2a72de 100644 --- a/accessibility/inc/accessibility/helper/accresmgr.hxx +++ b/accessibility/inc/accessibility/helper/accresmgr.hxx @@ -28,9 +28,7 @@ #ifndef ACCESSIBILITY_HELPER_TKARESMGR_HXX #define ACCESSIBILITY_HELPER_TKARESMGR_HXX -#ifndef _RTL_USTRING_HXX #include <rtl/ustring.hxx> -#endif class SimpleResMgr; diff --git a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx index 25fb3ac121b3..880b328a402e 100644 --- a/accessibility/inc/accessibility/helper/characterattributeshelper.hxx +++ b/accessibility/inc/accessibility/helper/characterattributeshelper.hxx @@ -28,9 +28,7 @@ #ifndef ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX #define ACCESSIBILITY_HELPER_CHARACTERATTRIBUTESHELPER_HXX -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX #include <com/sun/star/uno/Sequence.hxx> -#endif #include <com/sun/star/beans/PropertyValue.hpp> #include <vcl/font.hxx> diff --git a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx index 4555c91ebf75..cd098584ab54 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx @@ -32,9 +32,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/awt/Point.hpp> #include <comphelper/accessiblecomponenthelper.hxx> -#ifndef _CPPUHELPER_IMPLBASE2_HXX #include <cppuhelper/implbase2.hxx> -#endif #include <tools/link.hxx> #include <vector> diff --git a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx index 8450be8f3a49..7a69b68ca3af 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx @@ -30,9 +30,7 @@ #include <accessibility/standard/accessiblemenubasecomponent.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#ifndef _CPPUHELPER_IMPLBASE1_HXX #include <cppuhelper/implbase1.hxx> -#endif // ---------------------------------------------------- diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx index 123016f070bd..29e0a130db8d 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx @@ -30,13 +30,9 @@ #include <map> #include <accessibility/standard/vclxaccessibleedit.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_STANDARD_ACCESSIBLEROLE_HPP_ #include <com/sun/star/accessibility/AccessibleRole.hpp> -#endif #include <com/sun/star/accessibility/XAccessibleKeyBinding.hpp> -#ifndef _CPPUHELPER_IMPLBASE2_HXX #include <cppuhelper/implbase2.hxx> -#endif typedef ::cppu::ImplHelper2< diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx index 76e8b3da9343..e4e4468ff6c7 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx @@ -30,14 +30,10 @@ #include <accessibility/standard/vclxaccessibletextcomponent.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_ #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#endif #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#ifndef _CPPUHELPER_IMPLBASE2_HXX #include <cppuhelper/implbase2.hxx> -#endif // ---------------------------------------------------- diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx index a876a236455c..f1ec85215fcc 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx @@ -30,14 +30,10 @@ #include <accessibility/standard/vclxaccessibletextcomponent.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_ #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#endif #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#ifndef _CPPUHELPER_IMPLBASE2_HXX #include <cppuhelper/implbase2.hxx> -#endif // ---------------------------------------------------- diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx index ce62ea845b5c..773f78278376 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx @@ -30,12 +30,8 @@ #include <map> #include <accessibility/standard/vclxaccessiblebox.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_STANDARD_ACCESSIBLEROLE_HPP_ #include <com/sun/star/accessibility/AccessibleRole.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX #include <cppuhelper/implbase1.hxx> -#endif /** The accessible combobox has two children. The first is the text field diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx index 6f54ede32d21..aad46a93fe5d 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx @@ -29,17 +29,11 @@ #define ACCESSIBILITY_STANDARD_VCLXACCESSIBLEDROPDOWNCOMBOBOX_HXX #include <accessibility/standard/vclxaccessiblebox.hxx> -#ifndef ACCESSIBILITY_STANDARD_VCLXACCESSIBLETEXTEDIT_HXX #include <accessibility/standard/vclxaccessibleedit.hxx> -#endif #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#ifndef _CPPUHELPER_IMPLBASE1_HXX #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _CPPUHELPER_WEAKREF_HXX #include <cppuhelper/weakref.hxx> -#endif /** The accessible drop down combobox has two children. The first is the diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx index 72289f210aa2..bed9ddfa7351 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx @@ -31,12 +31,8 @@ #include <accessibility/standard/vclxaccessiblebox.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#ifndef _CPPUHELPER_IMPLBASE1_HXX #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _CPPUHELPER_WEAKREF_HXX #include <cppuhelper/weakref.hxx> -#endif /** The accessible drop down combobox has two children. The first is the diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx index 1e5bb36ec03d..f3eecfe51d8c 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx @@ -30,13 +30,9 @@ #include <accessibility/standard/vclxaccessibletextcomponent.hxx> #include <com/sun/star/accessibility/XAccessibleEditableText.hpp> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_ #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE2_HXX #include <cppuhelper/implbase2.hxx> -#endif // ---------------------------------------------------- diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx index dfebec17b4e9..ec7677457e15 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx @@ -32,15 +32,11 @@ #include <functional> #include "accessibility/standard/vclxaccessiblelistitem.hxx" #include <accessibility/standard/vclxaccessibleedit.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_STANDARD_ACCESSIBLEROLE_HPP_ #include <com/sun/star/accessibility/AccessibleRole.hpp> -#endif #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#ifndef _CPPUHELPER_IMPLBASE2_HXX #include <cppuhelper/implbase2.hxx> -#endif typedef ::cppu::ImplHelper2< ::com::sun::star::accessibility::XAccessible, diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx index 9a266d78bb05..543b48b39d6d 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx @@ -31,15 +31,9 @@ #include <accessibility/standard/vclxaccessiblelist.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#ifndef _COMPHELPER_BROADCASTHELPER_HXX #include <comphelper/broadcasthelper.hxx> -#endif -#ifndef _COMPHELPER_UNO3_HXX #include <comphelper/uno3.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX #include <cppuhelper/implbase1.hxx> -#endif typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessibleSelection > VCLXAccessibleListBoxList_BASE; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx index ec07745bb0d4..b0cb55bf4efb 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx @@ -35,12 +35,8 @@ #include <com/sun/star/accessibility/XAccessibleText.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#ifndef _CPPUHELPER_COMPBASE6_HXX #include <cppuhelper/compbase6.hxx> -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX #include <comphelper/broadcasthelper.hxx> -#endif #include <comphelper/accessibletexthelper.hxx> // forward --------------------------------------------------------------- diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx index 35851788853b..19f186708f26 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx @@ -31,9 +31,7 @@ #include <accessibility/standard/vclxaccessiblemenuitem.hxx> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#ifndef _CPPUHELPER_IMPLBASE1_HXX #include <cppuhelper/implbase1.hxx> -#endif // ---------------------------------------------------- diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx index e2e430d9300b..b579f8a4879d 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx @@ -30,14 +30,10 @@ #include <accessibility/standard/accessiblemenuitemcomponent.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_ #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#endif #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#ifndef _CPPUHELPER_IMPLBASE3_HXX #include <cppuhelper/implbase3.hxx> -#endif #include <comphelper/accessibletexthelper.hxx> diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx index 615ed08ca2da..24123a2ec71b 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx @@ -30,14 +30,10 @@ #include <accessibility/standard/vclxaccessibletextcomponent.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_ #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#endif #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#ifndef _CPPUHELPER_IMPLBASE2_HXX #include <cppuhelper/implbase2.hxx> -#endif // ---------------------------------------------------- diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx index 063204214a19..de5fe8754d08 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx @@ -30,14 +30,10 @@ #include <toolkit/awt/vclxaccessiblecomponent.hxx> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_ #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#endif #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#ifndef _CPPUHELPER_IMPLBASE2_HXX #include <cppuhelper/implbase2.hxx> -#endif // ---------------------------------------------------- diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx index 442645c6d88f..f9fdecdc3406 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx @@ -31,9 +31,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/accessibletexthelper.hxx> -#ifndef _CPPUHELPER_IMPLBASE2_HXX #include <cppuhelper/implbase2.hxx> -#endif class StatusBar; diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx index ed47ce9f0e94..8b61adcc0c55 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx @@ -31,9 +31,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/accessibletexthelper.hxx> -#ifndef _CPPUHELPER_IMPLBASE2_HXX #include <cppuhelper/implbase2.hxx> -#endif class TabControl; diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx index 70d35acb305a..ee88528545ef 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx @@ -30,9 +30,7 @@ #include <accessibility/standard/vclxaccessibletextcomponent.hxx> -#ifndef _CPPUHELPER_IMPLBASE1_HXX #include <cppuhelper/implbase1.hxx> -#endif typedef ::cppu::ImplHelper1< ::com::sun::star::accessibility::XAccessible diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx index 4e2073a47a89..5c4dd8939465 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx @@ -28,9 +28,7 @@ #define ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX #include <com/sun/star/accessibility/XAccessible.hpp> -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_ #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#endif #include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleStateSet.hpp> @@ -38,9 +36,7 @@ #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#ifndef _CPPUHELPER_IMPLBASE4_HXX #include <cppuhelper/implbase4.hxx> -#endif #include <comphelper/accessibletexthelper.hxx> #include <tools/solar.h> diff --git a/accessibility/source/inc/floatingwindowaccessible.hxx b/accessibility/source/inc/floatingwindowaccessible.hxx index 2d5e0e603f5a..750c104083c8 100644 --- a/accessibility/source/inc/floatingwindowaccessible.hxx +++ b/accessibility/source/inc/floatingwindowaccessible.hxx @@ -28,9 +28,7 @@ #ifndef ACCESSIBILITY_FLOATINGWINDOWACCESSIBLE_HXX #define ACCESSIBILITY_FLOATINGWINDOWACCESSIBLE_HXX -#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_ #include <toolkit/awt/vclxaccessiblecomponent.hxx> -#endif class FloatingWindowAccessible : public VCLXAccessibleComponent { diff --git a/automation/source/miniapp/editwin.hxx b/automation/source/miniapp/editwin.hxx index 8fbf04227382..2252fc244661 100644 --- a/automation/source/miniapp/editwin.hxx +++ b/automation/source/miniapp/editwin.hxx @@ -27,9 +27,7 @@ #ifndef _editwin #define _editwin -#ifndef _BASIC_TTRESHLP_HXX #include <basic/ttstrhlp.hxx> -#endif #include <vcl/floatwin.hxx> #include <svtools/svmedit.hxx> diff --git a/automation/source/miniapp/servres.hxx b/automation/source/miniapp/servres.hxx index 848779a39fa7..70c44ce45632 100644 --- a/automation/source/miniapp/servres.hxx +++ b/automation/source/miniapp/servres.hxx @@ -25,33 +25,15 @@ * ************************************************************************/ #include <svtools/svmedit.hxx> -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif class ModalDialogGROSSER_TEST_DLG : public ModalDialog { diff --git a/automation/source/miniapp/testapp.hxx b/automation/source/miniapp/testapp.hxx index 31a480a0173e..908633e0c73f 100644 --- a/automation/source/miniapp/testapp.hxx +++ b/automation/source/miniapp/testapp.hxx @@ -28,33 +28,15 @@ #define _TESTAPP_HXX #include <vcl/svapp.hxx> -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _MENU_HXX //autogen #include <vcl/menu.hxx> -#endif -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif #include <svl/poolitem.hxx> diff --git a/automation/source/server/editwin.hxx b/automation/source/server/editwin.hxx index 021982333d39..9b6aba1e715d 100644 --- a/automation/source/server/editwin.hxx +++ b/automation/source/server/editwin.hxx @@ -29,13 +29,9 @@ #if OSL_DEBUG_LEVEL > 1 -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <svtools/svmedit.hxx> -#endif class ImpWorkWindow; diff --git a/automation/source/testtool/comm_bas.hxx b/automation/source/testtool/comm_bas.hxx index d39f0895eefd..9f72c479612a 100644 --- a/automation/source/testtool/comm_bas.hxx +++ b/automation/source/testtool/comm_bas.hxx @@ -29,9 +29,7 @@ #define _COMM_BAS_HXX #include <basic/sbxfac.hxx> -#ifndef __SBX_SBXVARIABLE_HXX //autogen #include <basic/sbxvar.hxx> -#endif #include <basic/sbxobj.hxx> class CommunicationManagerClientViaSocket; diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index bb44f8d15f7e..f2cacc96beb2 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -42,9 +42,7 @@ #include "com/sun/star/resource/XStringResourcePersistence.hpp" #include "com/sun/star/script/XLibraryContainer.hpp" #include "com/sun/star/script/XLibraryContainerPassword.hpp" -#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER2_HPP_ #include "com/sun/star/script/XLibraryContainer2.hpp" -#endif #include "com/sun/star/task/XStatusIndicator.hpp" #include "com/sun/star/task/XStatusIndicatorFactory.hpp" #include "com/sun/star/ui/dialogs/XFilePicker.hpp" diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 280bb6ee3ab6..12a510aea1b8 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -40,9 +40,7 @@ class SvxSearchItem; #include <svtools/svtabbx.hxx> #include <svtools/headbar.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <basic/sbmod.hxx> #include <vcl/split.hxx> #include "svl/lstner.hxx" diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx index 8e8f6cb2f9e4..c6e1d4f07354 100644 --- a/basctl/source/basicide/brkdlg.hxx +++ b/basctl/source/basicide/brkdlg.hxx @@ -32,9 +32,7 @@ #include <bastypes.hxx> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/field.hxx> #include <vcl/fixed.hxx> diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index b610b2041b50..14fdeef1f7c9 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -35,9 +35,7 @@ #include <sfx2/basedlgs.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #define MACRO_CLOSE 10 #define MACRO_OK_RUN 11 diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index f9efa779357e..69e6aad39d60 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -33,9 +33,7 @@ #include <bastype2.hxx> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <svtools/svtabbx.hxx> #include <vcl/tabdlg.hxx> diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index bb1705178a80..6c69c66d546b 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -35,9 +35,7 @@ #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> -#ifndef _COM_SUN_STAR_SCRIPT_XLIBRYARYCONTAINER_HPP_ #include <com/sun/star/script/XLibraryContainer.hpp> -#endif class Printer; class StarBASIC; diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 07bc2dfa3149..a4ff65dd9c7a 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -33,18 +33,12 @@ #include "doceventnotifier.hxx" #include <sfx2/viewfac.hxx> #include <sfx2/shell.hxx> -#ifndef _SCRBAR_HXX //autogen #include <vcl/scrbar.hxx> -#endif -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include <sfx2/viewsh.hxx> #include <svx/ifaceids.hxx> -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_ #include <com/sun/star/io/XInputStreamProvider.hpp> -#endif #include <com/sun/star/container/XContainerListener.hpp> diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx index d4fa39fcb67d..b3c4a6c4e293 100644 --- a/basctl/source/inc/basobj.hxx +++ b/basctl/source/inc/basobj.hxx @@ -31,9 +31,7 @@ #include <tools/string.hxx> #include <svl/lstner.hxx> -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAMPROVIDER_HXX_ #include <com/sun/star/io/XInputStreamProvider.hpp> -#endif #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/frame/XModel.hpp> diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index 9f1a4d389dc1..3d2f1f3317e7 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -29,15 +29,9 @@ #define _BASCTL_MANAGELANG_HXX #include <vcl/dialog.hxx> -#ifndef _FIXED_HXX #include <vcl/fixed.hxx> -#endif -#ifndef _LSTBOX_HXX #include <vcl/lstbox.hxx> -#endif -#ifndef _BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svx/langbox.hxx> #include <svx/checklbx.hxx> diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index 04d9fbcc58e4..c8421973817b 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.hxx @@ -32,9 +32,7 @@ #include <svtools/stdctrl.hxx> #include <vcl/edit.hxx> #include <svtools/svxbox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/group.hxx> #include <vcl/dialog.hxx> diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index b682c8d0c129..b682c8d0c129 100755..100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index efe7c0763d9d..efe7c0763d9d 100755..100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index cb095a81c31d..cd013ecab7bb 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -61,9 +61,7 @@ public: #ifdef _OFA_AUTOCDLG_CXX #include <vcl/group.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <svtools/svtabbx.hxx> #include <svx/simptabl.hxx> diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 78e545e5e51a..7a0f1276013b 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -29,13 +29,9 @@ // include --------------------------------------------------------------- -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <svtools/stdctrl.hxx> -#ifndef _GRAPH_HXX //autogen #include <vcl/graph.hxx> -#endif #include <svtools/valueset.hxx> #include <svx/dlgctrl.hxx> diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 5f37371db4aa..65cc0926b190 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -35,21 +35,13 @@ #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <vcl/combobox.hxx> #include <vcl/lstbox.hxx> #include <tools/link.hxx> diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index e7f9047af5ca..22851f71342a 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -30,9 +30,7 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/timer.hxx> #include <vcl/dialog.hxx> #include <vcl/group.hxx> diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index 1587dd7baaf5..881281575594 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -5,9 +5,7 @@ #include <vcl/field.hxx> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif //======================================================================== diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index ae7aa832d264..ba7b4487f12a 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -28,18 +28,10 @@ #define _SVX_DLG_NAME_HXX -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif #include <vcl/fixed.hxx> // #i68101# diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 91d6e89e61dd..10d87c0230b5 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -28,15 +28,9 @@ #ifndef _SVX_GRFPAGE_HXX #define _SVX_GRFPAGE_HXX -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif #include <vcl/graph.hxx> #include <sfx2/tabdlg.hxx> diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 615e2e56bdc3..29710e32aa2a 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -30,9 +30,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/svtreebx.hxx> #include "hlmarkwn_def.hxx" //ADD CHINA001 diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 502b212c8a91..502b212c8a91 100755..100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index f4646daf376e..c393a7f15287 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -30,9 +30,7 @@ #include <vcl/tabpage.hxx> #include <vcl/msgbox.hxx> #include <vcl/dialog.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/image.hxx> #include <svtools/ivctrl.hxx> #include <svl/itempool.hxx> diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 95e30d241467..fed9c3b0e600 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -30,15 +30,9 @@ // include --------------------------------------------------------------- -#ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <svtools/valueset.hxx> #include <sfx2/tabdlg.hxx> class SdrView; diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index f6f75ddee89d..a8c7ab2d22f1 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -28,9 +28,7 @@ #ifndef _LINKDLG_HXX #define _LINKDLG_HXX -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 0359a330c1f0..5371397c67e0 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -35,9 +35,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Reference.hxx> #include <svl/macitem.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <rtl/ustring.hxx> #include <hash_map> diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 44e8f15435fc..d6a4239018ba 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -31,9 +31,7 @@ #include <vcl/dialog.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include "radiobtnbox.hxx" diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 3aa1c862e250..352a2b6f24c7 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -36,9 +36,7 @@ #include <vcl/lstbox.hxx> #include <vcl/edit.hxx> #include <vcl/field.hxx> -#ifndef _SVX_NUMDEF_HXX #include <editeng/numdef.hxx> -#endif #include <svtools/ctrlbox.hxx> #include <svl/svarray.hxx> diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 3e13018398b5..4c5f8fb34c58 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -29,9 +29,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/group.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <vcl/edit.hxx> diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 345623c19cff..c04d42a9c5b1 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -32,9 +32,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/group.hxx> #include <vcl/combobox.hxx> #include <vcl/timer.hxx> diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 2ac80aa64094..6a58f26b76d2 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -30,12 +30,8 @@ // include --------------------------------------------------------------- #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #ifdef _SVX_OPTPATH_CXX #include <svtools/headbar.hxx> @@ -44,9 +40,7 @@ class HeaderBar; #endif #include "ControlFocusHelper.hxx" -#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_ #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> -#endif #include <svtools/dialogclosedlistener.hxx> // forward --------------------------------------------------------------- diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 337c9b84da11..337c9b84da11 100755..100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index a1b71e2f751e..73498af9a115 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -28,9 +28,7 @@ #ifndef _PASTEDLG_HXX #define _PASTEDLG_HXX -#ifndef _TABLE_HXX //autogen #include <tools/table.hxx> -#endif #include <sot/formats.hxx> #include <tools/globname.hxx> #include <svtools/transfer.hxx> diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 0a7b92438db4..8d23c55f3d56 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -29,15 +29,9 @@ // include --------------------------------------------------------------- -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif #include <svtools/stdctrl.hxx> #include <sfx2/basedlgs.hxx> #include <svtools/svmedit.hxx> diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index cdb5a2f89eea..fefb95516a97 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -32,9 +32,7 @@ #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexContainer.hpp> diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index e8ce016d7d6f..e40f55cec385 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -31,13 +31,9 @@ #include <svx/dlgctrl.hxx> -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <sfx2/basedlgs.hxx> class SdrView; diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 99b292b560a5..99b292b560a5 100755..100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index d333237f55c7..561212288499 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -31,9 +31,7 @@ #include <svx/dlgctrl.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif // #i75273# #include <basegfx/range/b2drange.hxx> diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 5b494a0448b3..79b373bfe528 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -31,9 +31,7 @@ #include <layout/layout.hxx> #include <sfx2/basedlgs.hxx> -#ifndef _SV_BUTTON_HXX //autogen wg. Radio-/OK-/Cancel-/HelpButton #include <vcl/button.hxx> -#endif #include <vcl/field.hxx> #include <vcl/fixed.hxx> @@ -43,9 +41,7 @@ #define ZOOMBTN_PAGEWIDTH ((USHORT)0x0002) #define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004) */ -#ifndef _SVX_ZOOM_HXX #include "zoom_def.hxx" -#endif // class SvxZoomDialog --------------------------------------------------- /* {k:\svx\prototyp\dialog\zoom.bmp} diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 7cdd536a901d..466f65372841 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -31,9 +31,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <svtools/inettbc.hxx> #include <svtools/urlcontrol.hxx> diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index abf0cf45a2dd..58738dfc83a6 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -36,9 +36,7 @@ // header for ColorLB #include <svx/dlgctrl.hxx> // header for PushButton -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif // header for XColorTable #include <svx/xtable.hxx> diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index b18689d60bc9..d7993244bb9b 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -27,9 +27,7 @@ #ifndef _SVX_OPTCTL_HXX #define _SVX_OPTCTL_HXX -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <sfx2/tabdlg.hxx> diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index e2572e901124..35cb24af6a2d 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -27,12 +27,8 @@ #ifndef _OFA_OPTFLTR_HXX #define _OFA_OPTFLTR_HXX -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif #include <vcl/fixed.hxx> #include <sfx2/tabdlg.hxx> #include <svx/simptabl.hxx> diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index f75ff7d05c44..f75ff7d05c44 100755..100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 6a1c91d42ae9..fd309063349c 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -29,9 +29,7 @@ #define _SVX_OPTJSEARCH_HXX_ #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <sfx2/tabdlg.hxx> class Window; diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 14e42935667b..0381fca237d8 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -31,9 +31,7 @@ // include --------------------------------------------------------------- #include <sfx2/tabdlg.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif #include <com/sun/star/container/XNameReplace.hpp> // class SvxPathTabPage -------------------------------------------------- diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx index ec3efe19d8c0..1c979704759f 100755..100644 --- a/embedserv/source/inc/embeddoc.hxx +++ b/embedserv/source/inc/embeddoc.hxx @@ -40,9 +40,7 @@ #include <hash_map> #include <com/sun/star/uno/Reference.h> -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_H_ #include <com/sun/star/uno/SEQUENCE.h> -#endif #include "embeddocaccess.hxx" #include "docholder.hxx" diff --git a/embedserv/source/inc/servprov.hxx b/embedserv/source/inc/servprov.hxx index 60906fa25c32..7394b8502203 100755..100644 --- a/embedserv/source/inc/servprov.hxx +++ b/embedserv/source/inc/servprov.hxx @@ -37,9 +37,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/XInterface.hpp> -#ifndef __COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_ #include <com/sun/star/lang/XTypeProvider.hpp> -#endif #include <cppuhelper/weak.hxx> diff --git a/extensions/inc/appsettings.hxx b/extensions/inc/appsettings.hxx index 152843af51ca..2283470e1d84 100644 --- a/extensions/inc/appsettings.hxx +++ b/extensions/inc/appsettings.hxx @@ -27,9 +27,7 @@ #ifndef _APPSETTINGS_HXX #define _APPSETTINGS_HXX -#ifndef __STARDIV_UNO_UTIL_CONTAINR_HXX__ #include <stardiv/uno/util/containr.hxx> -#endif #ifdef __cplusplus extern "C" { diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx index 7dcba3d588c1..2d1ec7177812 100644 --- a/extensions/source/abpilot/abspage.hxx +++ b/extensions/source/abpilot/abspage.hxx @@ -30,9 +30,7 @@ #include <svtools/wizardmachine.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#ifndef EXTENSIONS_ABPRESID_HRC #include "abpresid.hrc" -#endif #include "componentmodule.hxx" #include <vcl/fixed.hxx> diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 213ef9755ed8..99b4c1b8cc49 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -34,9 +34,7 @@ #include <com/sun/star/sdbc/XRowSetListener.hpp> #include <svtools/stdctrl.hxx> -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <vcl/group.hxx> #include <svtools/svmedit.hxx> #include <vcl/tabpage.hxx> diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 13920c5978f7..8c19b1caf00b 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -35,15 +35,11 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <vcl/fixed.hxx> #include <vcl/edit.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> #include "dbptypes.hxx" -#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_ #include "dbpresid.hrc" -#endif #include "componentmodule.hxx" #include "wizardcontext.hxx" diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx index bbce935aa98e..a85c43103f62 100644 --- a/extensions/source/ole/servprov.hxx +++ b/extensions/source/ole/servprov.hxx @@ -29,9 +29,7 @@ #define _SERVPROV_HXX #include <com/sun/star/lang/XInitialization.hpp> -#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include <cppuhelper/implbase2.hxx> -#endif #include "ole2uno.hxx" #include "unoconversionutilities.hxx" diff --git a/extensions/source/preload/oemwiz.hxx b/extensions/source/preload/oemwiz.hxx index d6e8b9f276c6..c76709b35bee 100644 --- a/extensions/source/preload/oemwiz.hxx +++ b/extensions/source/preload/oemwiz.hxx @@ -31,9 +31,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <svtools/wizdlg.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/tabpage.hxx> #include <vcl/fixed.hxx> #include <svtools/svmedit.hxx> diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index 7848b387d608..0170797e37df 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -32,9 +32,7 @@ #include <com/sun/star/inspection/XPropertyControl.hpp> /** === end UNO includes === **/ #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif namespace com { namespace sun { namespace star { namespace inspection { namespace PropertyLineElement { diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index edd9d9bd40eb..0b5467ab4bf8 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -29,9 +29,7 @@ #define _EXTENSIONS_PROPCTRLR_BROWSERLISTBOX_HXX_ #include "browserline.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include "pcrcommon.hxx" /** === begin UNO includes === **/ @@ -40,9 +38,7 @@ /** === end UNO includes === **/ #include <vcl/scrbar.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <tools/link.hxx> #include <rtl/ref.hxx> diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index 9605ee622234..1ef3b3efaa26 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -30,9 +30,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif /** === begin UNO includes === **/ #include <com/sun/star/form/XForm.hpp> diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx index 294a43e4a9e7..2bd80dd7f542 100644 --- a/extensions/source/propctrlr/formmetadata.hxx +++ b/extensions/source/propctrlr/formmetadata.hxx @@ -29,9 +29,7 @@ #define _EXTENSIONS_PROPCTRLR_FORMMETADATA_HXX_ #include "propertyinfo.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif #include "enumrepresentation.hxx" #include <comphelper/composedprops.hxx> diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx index c741f1e08945..71cf8a2d76f4 100644 --- a/extensions/source/propctrlr/listselectiondlg.hxx +++ b/extensions/source/propctrlr/listselectiondlg.hxx @@ -30,9 +30,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> /** === begin UNO includes === **/ diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx index 501354c3fcf2..c06add6eb48a 100644 --- a/extensions/source/propctrlr/newdatatype.hxx +++ b/extensions/source/propctrlr/newdatatype.hxx @@ -33,9 +33,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/edit.hxx> #include <set> diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index 4cc77e88c78e..689b78de7f35 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -34,9 +34,7 @@ #include "proplinelistener.hxx" #include "propcontrolobserver.hxx" #include "browserview.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPCR_HXX_ #include "modulepcr.hxx" -#endif #include "propertyinfo.hxx" #include "pcrcomponentcontext.hxx" diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index 073debdccda5..3b0a015d9c9a 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -30,9 +30,7 @@ #include "pcrcomponentcontext.hxx" #include "pcrcommon.hxx" -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPCR_HXX_ #include "modulepcr.hxx" -#endif /** === begin UNO includes === **/ #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 27294a0f9977..345169c6231a 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -30,15 +30,11 @@ #include <vcl/fixed.hxx> #include <svtools/svtreebx.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/image.hxx> #include <vcl/dialog.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_ #include "modulepcr.hxx" -#endif //............................................................................ namespace pcr diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index 392df3f682eb..719eaeba1c88 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -33,22 +33,14 @@ #include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _TOOLS_LIST_HXX #include <tools/list.hxx> -#endif #include <comphelper/uno3.hxx> //............................................................................ diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx index 42791f355493..b583f745a00f 100644 --- a/extensions/source/scanner/grid.hxx +++ b/extensions/source/scanner/grid.hxx @@ -28,9 +28,7 @@ #define _EXTENSIONS_SCANNER_GRID_HXX #include <vcl/window.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/lstbox.hxx> #include <vcl/dialog.hxx> diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index 2ea35ca33c83..303241e90bc9 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -30,9 +30,7 @@ #include <vcl/dialog.hxx> #include <tools/config.hxx> #include <vcl/lstbox.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/fixed.hxx> #include <vcl/group.hxx> #include <vcl/field.hxx> diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx index 3453598974a7..34d0f3e1a82d 100644 --- a/extensions/source/scanner/scanner.hxx +++ b/extensions/source/scanner/scanner.hxx @@ -30,21 +30,15 @@ #include <tools/stream.hxx> #include <vos/mutex.hxx> -#ifndef __RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif #include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> -#ifndef __COM_SUN_STAR_AWT_XBITMAP_HPP #include <com/sun/star/awt/XBitmap.hpp> -#endif #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XEventListener.hpp> -#ifndef __COM_SUN_STAR_LANG_EVENTOBJECT_HPP #include <com/sun/star/lang/EventObject.hpp> -#endif #include <com/sun/star/scanner/XScannerManager.hpp> #include <com/sun/star/scanner/ScannerException.hpp> diff --git a/extensions/source/svg/svgcom.hxx b/extensions/source/svg/svgcom.hxx index 3e593ff3ccf6..5e5f89a8327e 100644 --- a/extensions/source/svg/svgcom.hxx +++ b/extensions/source/svg/svgcom.hxx @@ -29,23 +29,15 @@ #define _SVGCOM_HXX #include <cppuhelper/weak.hxx> -#ifndef __RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif #include <tools/debug.hxx> #include <tools/stream.hxx> #include <tools/string.hxx> #include <tools/urlobj.hxx> #include <tools/stack.hxx> -#ifndef _SALBTYPE_HXX #include <vcl/salbtype.hxx> -#endif -#ifndef _GDIMTF_HXX #include <vcl/gdimtf.hxx> -#endif -#ifndef _METAACT_HXX #include <vcl/metaact.hxx> -#endif #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/RuntimeException.hpp> diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx index bd525853dda1..3121d366a84c 100644 --- a/extensions/source/update/check/updatehdl.hxx +++ b/extensions/source/update/check/updatehdl.hxx @@ -31,9 +31,7 @@ #include "boost/utility.hpp" #include <osl/mutex.hxx> #include "com/sun/star/uno/Any.h" -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include "com/sun/star/uno/Reference.h" -#endif #include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/awt/Rectangle.hpp" #include "com/sun/star/awt/XActionListener.hpp" diff --git a/extensions/source/xmlextract/xmxcom.hxx b/extensions/source/xmlextract/xmxcom.hxx index d5131b4556bf..ed0ec68228f3 100644 --- a/extensions/source/xmlextract/xmxcom.hxx +++ b/extensions/source/xmlextract/xmxcom.hxx @@ -29,9 +29,7 @@ #define _XMXCOM_HXX #include <cppuhelper/weak.hxx> -#ifndef __RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif #include <tools/debug.hxx> #include <tools/stream.hxx> #include <tools/string.hxx> diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index af506aa305d2..a48fd053c138 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -70,9 +70,7 @@ #include <connectivity/filtermanager.hxx> #include <connectivity/warningscontainer.hxx> -#ifndef FORMS_SOURCE_MISC_LISTENERCONTAINERS_HXX #include "listenercontainers.hxx" -#endif #include "ids.hxx" #include <comphelper/propmultiplex.hxx> #include <comphelper/uno3.hxx> diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index 54f59569984f..d366b1ac286a 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -29,9 +29,7 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> -#ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> -#endif #include <vcl/toolbox.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> #include "rtattributes.hxx" diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index be8158c0ba4e..a50d9e202df2 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -33,9 +33,7 @@ #include <com/sun/star/packages/WrongPasswordException.hpp> #include <ByteGrabber.hxx> #include <HashMaps.hxx> -#ifndef _INFLATER_HXX #include <Inflater.hxx> -#endif #include <mutexholder.hxx> diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx index 345fe332b8cc..552f7449393c 100644 --- a/package/inc/ZipOutputStream.hxx +++ b/package/inc/ZipOutputStream.hxx @@ -28,14 +28,10 @@ #define _ZIP_OUTPUT_STREAM_HXX #include <ByteChucker.hxx> -#ifndef _DEFLATER_HXX #include <Deflater.hxx> -#endif #include <CRC32.hxx> #include <rtl/cipher.h> -#ifndef RTL_DIGEST_H_ #include <rtl/digest.h> -#endif #include <vector> diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index e3b8d44be183..296bdedcc8dc 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -35,9 +35,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <HashMaps.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <osl/file.h> diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx index 54876d97bde1..b56abba07ba3 100644 --- a/package/inc/ZipPackageBuffer.hxx +++ b/package/inc/ZipPackageBuffer.hxx @@ -30,9 +30,7 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/XInputStream.hpp> -#ifndef _CPPUHELPER_IMPLBASE3_HXX #include <cppuhelper/implbase3.hxx> -#endif class ZipPackage; diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index f83c8b6c49df..d1348f3265d6 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -29,9 +29,7 @@ #define _MANIFEST_IMPORT_HXX #include <cppuhelper/implbase1.hxx> // helper for implementations -#ifndef _COM_SUN_STAR_XML_SAX_XDUCUMENTHANDLER_HPP_ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#endif #include <vector> #include <HashMaps.hxx> diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx index 92c99587f212..56ccbc4bf577 100644 --- a/package/source/manifest/ManifestReader.hxx +++ b/package/source/manifest/ManifestReader.hxx @@ -29,12 +29,8 @@ #define _MANIFEST_READER_HXX #include <cppuhelper/implbase2.hxx> -#ifndef _COM_SUN_STAR_PACKAGES_MANIFEST_XMANIFESTREADER_HPP #include <com/sun/star/packages/manifest/XManifestReader.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; class XSingleServiceFactory; } diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx index 3c5097e55cb2..66d8c2cbda9e 100644 --- a/package/source/manifest/ManifestWriter.hxx +++ b/package/source/manifest/ManifestWriter.hxx @@ -29,12 +29,8 @@ #define _MANIFEST_WRITER_HXX #include <cppuhelper/implbase2.hxx> -#ifndef _COM_SUN_STAR_PACKAGES_MANIFEST_XMANIFESTWRITER_HPP #include <com/sun/star/packages/manifest/XManifestWriter.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; class XSingleServiceFactory; } diff --git a/package/source/zipapi/EntryInputStream.hxx b/package/source/zipapi/EntryInputStream.hxx index c04a5dc2d33b..fb8153eb11cd 100644 --- a/package/source/zipapi/EntryInputStream.hxx +++ b/package/source/zipapi/EntryInputStream.hxx @@ -32,12 +32,8 @@ #include <com/sun/star/io/XSeekable.hpp> #include <Inflater.hxx> #include <com/sun/star/packages/zip/ZipEntry.hpp> -#ifndef _VOS_REF_H_ #include <vos/ref.hxx> -#endif -#ifndef _ENCRYPTION_DATA_HXX #include <EncryptionData.hxx> -#endif class EntryInputStream : public cppu::WeakImplHelper2< com::sun::star::io::XInputStream, com::sun::star::io::XSeekable > { diff --git a/package/source/zipapi/XFileStream.hxx b/package/source/zipapi/XFileStream.hxx index 0cf82c5f35cd..c89b0b875a62 100644 --- a/package/source/zipapi/XFileStream.hxx +++ b/package/source/zipapi/XFileStream.hxx @@ -31,12 +31,8 @@ #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <cppuhelper/implbase2.hxx> -#ifndef _VOS_REF_H_ #include <vos/ref.hxx> -#endif -#ifndef _INFLATER_HXX #include <Inflater.hxx> -#endif #include <ZipEntry.hxx> namespace com { namespace sun { namespace star { diff --git a/package/source/zippackage/ContentInfo.hxx b/package/source/zippackage/ContentInfo.hxx index 6d88d17e3780..a8d4a6077dd7 100644 --- a/package/source/zippackage/ContentInfo.hxx +++ b/package/source/zippackage/ContentInfo.hxx @@ -28,9 +28,7 @@ #define _CONTENT_INFO_HXX_ #include <com/sun/star/container/XNameContainer.hpp> -#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEl_HPP_ #include <com/sun/star/lang/XUnoTunnel.hpp> -#endif #include <ZipPackageFolder.hxx> #include <ZipPackageStream.hxx> diff --git a/package/source/zippackage/ZipPackageEntry.hxx b/package/source/zippackage/ZipPackageEntry.hxx index 767d84511a12..28bea7b059bc 100644 --- a/package/source/zippackage/ZipPackageEntry.hxx +++ b/package/source/zippackage/ZipPackageEntry.hxx @@ -32,9 +32,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <ZipEntry.hxx> #include <cppuhelper/implbase5.hxx> diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.hxx b/package/source/zippackage/ZipPackageFolderEnumeration.hxx index bea038d684f3..7ca14c7d6855 100644 --- a/package/source/zippackage/ZipPackageFolderEnumeration.hxx +++ b/package/source/zippackage/ZipPackageFolderEnumeration.hxx @@ -29,12 +29,8 @@ #include <cppuhelper/implbase2.hxx> // helper for implementations #include <com/sun/star/container/XEnumeration.hpp> -#ifndef _COM_SUN_STAR_LANG_XPSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _HASH_MAPS_HXX #include <HashMaps.hxx> -#endif class ZipPackageFolderEnumeration : public cppu::WeakImplHelper2 < diff --git a/package/source/zippackage/ZipPackageStream.hxx b/package/source/zippackage/ZipPackageStream.hxx index a0d5fad6e4da..698c6b35f598 100644 --- a/package/source/zippackage/ZipPackageStream.hxx +++ b/package/source/zippackage/ZipPackageStream.hxx @@ -31,13 +31,9 @@ #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/packages/XDataSinkEncrSupport.hpp> #include <ZipPackageEntry.hxx> -#ifndef _VOS_REF_H_ #include <vos/ref.hxx> -#endif #include <EncryptionData.hxx> -#ifndef _CPPUHELPER_IMPLBASE2_HXX #include <cppuhelper/implbase2.hxx> -#endif #include <mutexholder.hxx> #define PACKAGE_STREAM_NOTSET 0 diff --git a/setup_native/source/win32/customactions/reg4msdoc/register.hxx b/setup_native/source/win32/customactions/reg4msdoc/register.hxx index 29b9e8bdae00..c98787231655 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/register.hxx +++ b/setup_native/source/win32/customactions/reg4msdoc/register.hxx @@ -28,9 +28,7 @@ #ifndef _REGISTER_HXX_ #define _REGISTER_HXX_ -#ifndef _CONSTANTS_HXX_ #include "constants.hxx" -#endif #ifdef _MSC_VER #pragma warning(push, 1) /* disable warnings within system headers */ diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.hxx b/setup_native/source/win32/customactions/reg4msdoc/registrar.hxx index 529a39d5c9c8..b675c3da4e29 100644 --- a/setup_native/source/win32/customactions/reg4msdoc/registrar.hxx +++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.hxx @@ -8,9 +8,7 @@ #include "registry.hxx" #include "registrationcontextinformation.hxx" -#ifndef _CONSTANTS_HXX_ #include "constants.hxx" -#endif class Registrar { diff --git a/xmlsecurity/inc/xmlsecurity/biginteger.hxx b/xmlsecurity/inc/xmlsecurity/biginteger.hxx index b77c7c3bb8c6..9c7f8d0dfeab 100644 --- a/xmlsecurity/inc/xmlsecurity/biginteger.hxx +++ b/xmlsecurity/inc/xmlsecurity/biginteger.hxx @@ -31,9 +31,7 @@ #include <sal/config.h> #include <rtl/ustring.hxx> -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.hxx> -#endif #include "com/sun/star/uno/Sequence.h" rtl::OUString bigIntegerToNumericString( ::com::sun::star::uno::Sequence< sal_Int8 > serial ); diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx index 3bf11cd55d92..5f6bad430cd2 100644 --- a/xmlsecurity/source/component/certificatecontainer.hxx +++ b/xmlsecurity/source/component/certificatecontainer.hxx @@ -34,13 +34,9 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/implbase2.hxx> -#ifndef _XCERTIFICATECONTAINER_HPP_ #include <com/sun/star/security/XCertificateContainer.hpp> -#endif -#ifndef _CERTIFICATECONTAINERSTATUS_HPP_ #include <com/sun/star/security/CertificateContainerStatus.hpp> -#endif #include <vector> diff --git a/xmlsecurity/source/framework/encryptorimpl.hxx b/xmlsecurity/source/framework/encryptorimpl.hxx index e80540ee9066..98e00ce3bed0 100644 --- a/xmlsecurity/source/framework/encryptorimpl.hxx +++ b/xmlsecurity/source/framework/encryptorimpl.hxx @@ -30,9 +30,7 @@ #include <com/sun/star/xml/crypto/sax/XEncryptionResultBroadcaster.hpp> #include <com/sun/star/xml/crypto/sax/XEncryptionResultListener.hpp> -#ifndef _COM_SUN_STAR_XML_CRYPTO_SAX_XSIGNATURECOLLECTOR_HPP_ #include <com/sun/star/xml/crypto/sax/XReferenceCollector.hpp> -#endif #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/xmlsecurity/source/framework/signatureengine.hxx b/xmlsecurity/source/framework/signatureengine.hxx index b36cd6aa6442..33b304378f37 100644 --- a/xmlsecurity/source/framework/signatureengine.hxx +++ b/xmlsecurity/source/framework/signatureengine.hxx @@ -30,9 +30,7 @@ #include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.hpp> #include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp> -#ifndef _COM_SUN_STAR_XML_CRYPTO_SAX_XSIGNATURECOLLECTOR_HPP_ #include <com/sun/star/xml/crypto/sax/XReferenceCollector.hpp> -#endif #include <com/sun/star/xml/crypto/sax/XKeyCollector.hpp> #include <com/sun/star/xml/crypto/sax/XMissionTaker.hpp> #include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.hpp> diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx index af2f7ab93028..08aa704dbe23 100644 --- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx @@ -34,14 +34,10 @@ #include <cppuhelper/implbase3.hxx> #include <com/sun/star/uno/Exception.hpp> -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.hxx> -#endif #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp> diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx index c4e33fdfe972..f9761b42d988 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx @@ -34,14 +34,10 @@ #include <cppuhelper/implbase3.hxx> #include <com/sun/star/uno/Exception.hpp> -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.hxx> -#endif #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp> #include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp> diff --git a/xmlsecurity/source/xmlsec/errorcallback.hxx b/xmlsecurity/source/xmlsec/errorcallback.hxx index 8c219a5396fd..c3d124823ae4 100644 --- a/xmlsecurity/source/xmlsec/errorcallback.hxx +++ b/xmlsecurity/source/xmlsec/errorcallback.hxx @@ -28,9 +28,7 @@ #ifndef _ERRORCALLBACK_XMLSECIMPL_HXX_ #define _ERRORCALLBACK_XMLSECIMPL_HXX_ -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.hxx> -#endif #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp> #include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp> diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx index a97c96b6c3d3..6633da26f3bc 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx @@ -42,14 +42,10 @@ #include <cppuhelper/implbase4.hxx> #include <com/sun/star/uno/Exception.hpp> -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.hxx> -#endif #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/security/XCertificate.hpp> diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx index 8acd41dfa539..9cb71fd6b891 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx @@ -29,9 +29,7 @@ #define _SEINITIALIZERIMPL_HXX #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp> -#ifndef _COM_SUN_STAR_XML_CRYPTO_SEINITIALIZER_HPP_ #include <com/sun/star/xml/crypto/XSEInitializer.hpp> -#endif #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx index fdc3d0ff41f8..1b6af5f8f12b 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx @@ -34,14 +34,10 @@ #include <cppuhelper/implbase3.hxx> #include <com/sun/star/uno/Exception.hpp> -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.hxx> -#endif #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/xml/crypto/XXMLEncryption.hpp> #include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp> diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx index 489f265a8d2c..57854c42f7f4 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx @@ -34,14 +34,10 @@ #include <cppuhelper/implbase3.hxx> #include <com/sun/star/uno/Exception.hpp> -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.hxx> -#endif #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx index 5f5178773221..eacce4315277 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx @@ -34,14 +34,10 @@ #include <cppuhelper/implbase3.hxx> #include <com/sun/star/uno/Exception.hpp> -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.hxx> -#endif #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/xml/crypto/XXMLSignature.hpp> #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp> diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index 8b2192a00b1f..60f434bfbe12 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -34,14 +34,10 @@ #include <cppuhelper/implbase4.hxx> #include <com/sun/star/uno/Exception.hpp> -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.hxx> -#endif #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/security/XCertificate.hpp> diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx index 70075adc84e3..0e4f057aad21 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx @@ -29,9 +29,7 @@ #define _SEINITIALIZERIMPL_HXX #include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp> -#ifndef _COM_SUN_STAR_XML_CRYPTO_SEINITIALIZER_HPP_ #include <com/sun/star/xml/crypto/XSEInitializer.hpp> -#endif #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx index 42484532fcae..1d22f0b13a75 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx @@ -34,14 +34,10 @@ #include <cppuhelper/implbase3.hxx> #include <com/sun/star/uno/Exception.hpp> -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.hxx> -#endif #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/xml/crypto/XXMLEncryption.hpp> #include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp> diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx index b75f2d0c0c72..4e326a665a6f 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx @@ -34,14 +34,10 @@ #include <cppuhelper/implbase3.hxx> #include <com/sun/star/uno/Exception.hpp> -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.hxx> -#endif #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx index 44ed88b0a1bf..bd01a7788ff4 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx @@ -34,14 +34,10 @@ #include <cppuhelper/implbase3.hxx> #include <com/sun/star/uno/Exception.hpp> -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.hxx> -#endif #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#ifndef _COM_SUN_STAR_LANG_XSECVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/xml/crypto/XXMLSignature.hpp> #include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp> diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.hxx b/xmlsecurity/source/xmlsec/xmlstreamio.hxx index 3cb2e33528ab..eb0e6de7406c 100644 --- a/xmlsecurity/source/xmlsec/xmlstreamio.hxx +++ b/xmlsecurity/source/xmlsec/xmlstreamio.hxx @@ -28,9 +28,7 @@ #ifndef _XMLSTREAMIO_XMLSECIMPL_HXX_ #define _XMLSTREAMIO_XMLSECIMPL_HXX_ -#ifndef _COM_SUN_STAR_UNO_REFERENCE_HPP_ #include <com/sun/star/uno/Reference.hxx> -#endif #include <com/sun/star/xml/crypto/XUriBinding.hpp> int xmlEnableStreamInputCallbacks( void ) ; |