diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-11-11 01:36:45 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-11-13 09:45:38 +0100 |
| commit | 258e06cfffe7ceebb86cefa2413d6af476a972c6 (patch) | |
| tree | a6bbf0709ea6ca0288e6be9eeca0990a0d9b46bd /sdext | |
| parent | 1b83d562fb6774cd416d32232596b10c07fa6d3b (diff) | |
tdf#42949 Fix IWYU warnings in sdext/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I73e11bb945df16d2599b5421b552e155dacdf860
Reviewed-on: https://gerrit.libreoffice.org/82411
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sdext')
101 files changed, 55 insertions, 394 deletions
diff --git a/sdext/IwyuFilter_sdext.yaml b/sdext/IwyuFilter_sdext.yaml new file mode 100644 index 000000000000..36757f2e0f1b --- /dev/null +++ b/sdext/IwyuFilter_sdext.yaml @@ -0,0 +1,19 @@ +--- +assumeFilename: sdext/source/presenter/PresenterSlideSorter.cxx +blacklist: + sdext/source/pdfimport/odf/odfemitter.cxx: + # Actually in use + - com/sun/star/io/XOutputStream.hpp + sdext/source/pdfimport/pdfparse/pdfparse.cxx: + # ignore boost stuff + - boost/spirit/include/classic_core.hpp + - boost/spirit/include/classic_utility.hpp + - boost/spirit/include/classic_error_handling.hpp + - boost/spirit/include/classic_file_iterator.hpp + - boost/bind.hpp + sdext/source/pdfimport/tree/imagecontainer.cxx: + # Actually in use + - com/sun/star/beans/PropertyValue.hpp + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx: + # Actually in use + - vector diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 6dcd0528cde5..0ed089e341a2 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/util/theMacroExpander.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <comphelper/propertysequence.hxx> #include <sal/macros.h> diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx index 64b0f0e30e27..d4d4c4d3f898 100644 --- a/sdext/source/minimizer/configurationaccess.hxx +++ b/sdext/source/minimizer/configurationaccess.hxx @@ -22,13 +22,10 @@ #include <vector> #include "pppoptimizertoken.hxx" -#include <com/sun/star/awt/Size.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertyAccess.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameReplace.hpp> diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx index 2ca2f4ec483d..68f25f77900a 100644 --- a/sdext/source/minimizer/fileopendialog.cxx +++ b/sdext/source/minimizer/fileopendialog.cxx @@ -21,30 +21,15 @@ #include "fileopendialog.hxx" #include <sal/types.h> #include "pppoptimizertoken.hxx" -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> -#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> -#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp> #include <com/sun/star/ui/dialogs/FilePicker.hpp> -#include <com/sun/star/ui/dialogs/ControlActions.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> -#include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp> -#include <com/sun/star/ui/dialogs/XFilePreview.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> -#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XContainerQuery.hpp> #include <com/sun/star/view/XControlAccess.hpp> -#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx index 53b1c14fc412..176fe155e23d 100644 --- a/sdext/source/minimizer/fileopendialog.hxx +++ b/sdext/source/minimizer/fileopendialog.hxx @@ -22,8 +22,6 @@ #define INCLUDED_SDEXT_SOURCE_MINIMIZER_FILEOPENDIALOG_HXX #include <vector> -#include <com/sun/star/beans/StringPair.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx index 5882d0e5034c..c307b04b09a1 100644 --- a/sdext/source/minimizer/graphiccollector.cxx +++ b/sdext/source/minimizer/graphiccollector.cxx @@ -27,8 +27,6 @@ #include <com/sun/star/presentation/XPresentationPage.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> -#include "impoptimizer.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index e801d3816355..c3ad75e68f8f 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -28,9 +28,7 @@ #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/awt/XWindow.hpp> @@ -39,17 +37,11 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/drawing/XMasterPageTarget.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/presentation/XPresentationPage.hpp> #include <com/sun/star/document/XFilter.hpp> -#include <com/sun/star/document/XExporter.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/graphic/GraphicType.hpp> #include <com/sun/star/io/XStream.hpp> diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx index 169c3fdfb834..6a52e94986a4 100644 --- a/sdext/source/minimizer/impoptimizer.hxx +++ b/sdext/source/minimizer/impoptimizer.hxx @@ -20,14 +20,11 @@ #ifndef INCLUDED_SDEXT_SOURCE_MINIMIZER_IMPOPTIMIZER_HXX #define INCLUDED_SDEXT_SOURCE_MINIMIZER_IMPOPTIMIZER_HXX -#include "pppoptimizertoken.hxx" #include "optimizationstats.hxx" #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index c7e136a2345b..d4a489c56079 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -19,11 +19,7 @@ #include "informationdialog.hxx" -#include "optimizationstats.hxx" -#include <com/sun/star/graphic/GraphicProvider.hpp> -#include <com/sun/star/graphic/XGraphicProvider.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/io/TempFile.hpp> +#include <com/sun/star/awt/PushButtonType.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/URLTransformer.hpp> @@ -38,7 +34,6 @@ using namespace ::com::sun::star; -using namespace ::com::sun::star::io; using namespace ::com::sun::star::ui; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index 7569d9c36fd7..274e159895bc 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.hxx @@ -22,18 +22,8 @@ #include "unodialog.hxx" #include "configurationaccess.hxx" -#include "pppoptimizertoken.hxx" -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/awt/XItemListener.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/text/XTextRange.hpp> -#include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/awt/XItemEventBroadcaster.hpp> -#include <com/sun/star/awt/PushButtonType.hpp> -#include <com/sun/star/io/XStream.hpp> #include <cppuhelper/implbase.hxx> OUString InsertFixedText( UnoDialog& rInformationDialog, const OUString& rControlName, const OUString& rLabel, diff --git a/sdext/source/minimizer/optimizationstats.cxx b/sdext/source/minimizer/optimizationstats.cxx index 03fff4dfa93e..deed337c712a 100644 --- a/sdext/source/minimizer/optimizationstats.cxx +++ b/sdext/source/minimizer/optimizationstats.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> -#include <com/sun/star/drawing/XMasterPagesSupplier.hpp> using namespace ::com::sun::star; diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index faf95ef021b8..407bf3939299 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -21,13 +21,15 @@ #include "optimizerdialog.hxx" #include "impoptimizer.hxx" #include "fileopendialog.hxx" +#include <com/sun/star/awt/XItemEventBroadcaster.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/frame/XTitle.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ucb/XSimpleFileAccess.hpp> -#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/IOException.hpp> -#include <com/sun/star/util/XCloseBroadcaster.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <sal/macros.h> #include <osl/time.h> diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index c40a7b9b99c0..4ea28eb7590a 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -23,20 +23,12 @@ #include "unodialog.hxx" #include "optimizationstats.hxx" #include "configurationaccess.hxx" -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/awt/XItemListener.hpp> -#include <com/sun/star/awt/XSpinField.hpp> #include <com/sun/star/awt/XSpinListener.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/awt/XTextListener.hpp> #include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/text/XTextRange.hpp> -#include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/awt/XItemEventBroadcaster.hpp> #include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/awt/PushButtonType.hpp> #include <cppuhelper/implbase.hxx> #define MAX_STEP 4 diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx index b8d4bab949cc..ef193b85a4a5 100644 --- a/sdext/source/minimizer/optimizerdialogcontrols.cxx +++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx @@ -24,6 +24,9 @@ #include "pppoptimizer.hxx" #include "graphiccollector.hxx" #include "pagecollector.hxx" +#include <com/sun/star/awt/PushButtonType.hpp> +#include <com/sun/star/awt/XSpinField.hpp> +#include <com/sun/star/awt/XTextComponent.hpp> #include <com/sun/star/presentation/XCustomPresentationSupplier.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> diff --git a/sdext/source/minimizer/pagecollector.hxx b/sdext/source/minimizer/pagecollector.hxx index e10f7bdc2bc2..f3cf7fd5200e 100644 --- a/sdext/source/minimizer/pagecollector.hxx +++ b/sdext/source/minimizer/pagecollector.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_SDEXT_SOURCE_MINIMIZER_PAGECOLLECTOR_HXX #define INCLUDED_SDEXT_SOURCE_MINIMIZER_PAGECOLLECTOR_HXX +#include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <vector> class PageCollector diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx index e3ab918cb2d5..cf1e5e0f244b 100644 --- a/sdext/source/minimizer/pppoptimizer.hxx +++ b/sdext/source/minimizer/pppoptimizer.hxx @@ -20,12 +20,7 @@ #ifndef INCLUDED_SDEXT_SOURCE_MINIMIZER_PPPOPTIMIZER_HXX #define INCLUDED_SDEXT_SOURCE_MINIMIZER_PPPOPTIMIZER_HXX -#include <cppuhelper/implbase.hxx> -#include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/frame/XController.hpp> +#include <rtl/ustring.hxx> struct PPPOptimizer diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx index 1bd04455a258..168a4bbc26eb 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.cxx +++ b/sdext/source/minimizer/pppoptimizerdialog.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::beans; #define SERVICE_NAME "com.sun.star.comp.PresentationMinimizer" #include <cppuhelper/supportsservice.hxx> -#include <rtl/ustrbuf.hxx> PPPOptimizerDialog::PPPOptimizerDialog( const Reference< XComponentContext > &xContext ) : mxContext( xContext ), diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx index 6c247ecfb66f..5c51c5ad0448 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.hxx +++ b/sdext/source/minimizer/pppoptimizerdialog.hxx @@ -21,13 +21,9 @@ #define INCLUDED_SDEXT_SOURCE_MINIMIZER_PPPOPTIMIZERDIALOG_HXX #include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/document/XExporter.hpp> -#include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XDispatch.hpp> diff --git a/sdext/source/minimizer/pppoptimizertoken.cxx b/sdext/source/minimizer/pppoptimizertoken.cxx index e51045ea5caa..31cb4ecb524a 100644 --- a/sdext/source/minimizer/pppoptimizertoken.cxx +++ b/sdext/source/minimizer/pppoptimizertoken.cxx @@ -21,7 +21,6 @@ #include "pppoptimizertoken.hxx" #include <osl/mutex.hxx> #include <sal/macros.h> -#include <string.h> #include <unordered_map> #include <memory> diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx index 878395e26ec3..0fdd26aa4854 100644 --- a/sdext/source/minimizer/unodialog.cxx +++ b/sdext/source/minimizer/unodialog.cxx @@ -20,15 +20,10 @@ #include "unodialog.hxx" -#include <com/sun/star/awt/MessageBoxButtons.hpp> #include <com/sun/star/awt/Toolkit.hpp> #include <com/sun/star/awt/UnoControlDialog.hpp> -#include <com/sun/star/awt/XMessageBoxFactory.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/text/XTextRange.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/view/XControlAccess.hpp> using namespace ::com::sun::star::awt; diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx index 9d056f88d0fa..3bf908cf15a9 100644 --- a/sdext/source/minimizer/unodialog.hxx +++ b/sdext/source/minimizer/unodialog.hxx @@ -21,12 +21,9 @@ #define INCLUDED_SDEXT_SOURCE_MINIMIZER_UNODIALOG_HXX #include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XControlModel.hpp> @@ -34,19 +31,14 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/awt/XActionListener.hpp> -#include <com/sun/star/awt/XTextListener.hpp> #include <com/sun/star/awt/XButton.hpp> #include <com/sun/star/awt/XCheckBox.hpp> #include <com/sun/star/awt/XComboBox.hpp> -#include <com/sun/star/awt/XTextComponent.hpp> #include <com/sun/star/awt/XRadioButton.hpp> #include <com/sun/star/awt/XListBox.hpp> #include <com/sun/star/awt/XFixedText.hpp> #include <com/sun/star/awt/XUnoControlDialog.hpp> -#include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/awt/XReschedule.hpp> -#include <com/sun/star/awt/XDialog.hpp> -#include <com/sun/star/awt/Size.hpp> class UnoDialog diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 8be4b5b183b3..03931f47edb0 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -25,14 +25,13 @@ #include <osl/file.h> #include <osl/thread.h> #include <rtl/digest.h> -#include <rtl/ref.hxx> #include <sal/log.hxx> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/TempFile.hpp> +#include <com/sun/star/task/XInteractionHandler.hpp> #include <comphelper/fileurl.hxx> #include <comphelper/hash.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx index 995ed5991695..6ed195d3bb03 100644 --- a/sdext/source/pdfimport/filterdet.hxx +++ b/sdext/source/pdfimport/filterdet.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/io/XStream.hpp> -#include <com/sun/star/task/XInteractionHandler.hpp> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> diff --git a/sdext/source/pdfimport/inc/genericelements.hxx b/sdext/source/pdfimport/inc/genericelements.hxx index ff8f4a368285..177533501f3f 100644 --- a/sdext/source/pdfimport/inc/genericelements.hxx +++ b/sdext/source/pdfimport/inc/genericelements.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/range/b2drange.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> diff --git a/sdext/source/pdfimport/inc/imagecontainer.hxx b/sdext/source/pdfimport/inc/imagecontainer.hxx index 2c7af596f441..d21ed7504f63 100644 --- a/sdext/source/pdfimport/inc/imagecontainer.hxx +++ b/sdext/source/pdfimport/inc/imagecontainer.hxx @@ -22,9 +22,7 @@ #include "pdfihelper.hxx" -#include <rtl/ustring.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/awt/XBitmap.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <vector> diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx index 6557ffad8612..b32d439c42d4 100644 --- a/sdext/source/pdfimport/inc/pdfihelper.hxx +++ b/sdext/source/pdfimport/inc/pdfihelper.hxx @@ -27,7 +27,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <com/sun/star/rendering/XColorSpace.hpp> #include <com/sun/star/rendering/PathCapType.hpp> #include <com/sun/star/rendering/PathJoinType.hpp> diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx index a4c16407a39d..89f9d601b7b0 100644 --- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx +++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx @@ -20,24 +20,15 @@ #ifndef INCLUDED_SDEXT_SOURCE_PDFIMPORT_INC_PDFIPROCESSOR_HXX #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_INC_PDFIPROCESSOR_HXX -#include <com/sun/star/util/XStringMapping.hpp> -#include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> -#include <com/sun/star/rendering/XVolatileBitmap.hpp> #include <com/sun/star/geometry/RealSize2D.hpp> -#include <com/sun/star/geometry/RealPoint2D.hpp> #include <com/sun/star/geometry/RealRectangle2D.hpp> #include <com/sun/star/geometry/Matrix2D.hpp> -#include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/range/b2drange.hxx> #include <rtl/ustring.hxx> -#include <rtl/ustrbuf.hxx> -#include <list> #include <memory> #include <unordered_map> diff --git a/sdext/source/pdfimport/inc/treevisiting.hxx b/sdext/source/pdfimport/inc/treevisiting.hxx index 8c950ec97262..120166594af3 100644 --- a/sdext/source/pdfimport/inc/treevisiting.hxx +++ b/sdext/source/pdfimport/inc/treevisiting.hxx @@ -22,7 +22,7 @@ #include <sal/config.h> #include <list> - +#include <memory> namespace pdfi { diff --git a/sdext/source/pdfimport/inc/treevisitorfactory.hxx b/sdext/source/pdfimport/inc/treevisitorfactory.hxx index cd7fcd212f2a..45621b318e5e 100644 --- a/sdext/source/pdfimport/inc/treevisitorfactory.hxx +++ b/sdext/source/pdfimport/inc/treevisitorfactory.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SDEXT_SOURCE_PDFIMPORT_INC_TREEVISITORFACTORY_HXX #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_INC_TREEVISITORFACTORY_HXX -#include "pdfihelper.hxx" #include <memory> namespace pdfi diff --git a/sdext/source/pdfimport/inc/wrapper.hxx b/sdext/source/pdfimport/inc/wrapper.hxx index 0feaaa306eef..932b1009fb14 100644 --- a/sdext/source/pdfimport/inc/wrapper.hxx +++ b/sdext/source/pdfimport/inc/wrapper.hxx @@ -22,6 +22,7 @@ #include "contentsink.hxx" #include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/task/XInteractionHandler.hpp> namespace com { namespace sun { namespace star { namespace uno { diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index 33edc7a3705e..41439cd5ba88 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/task/XInteractionPassword.hpp> #include <com/sun/star/task/DocumentPasswordRequest.hpp> -#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> #include <rtl/ref.hxx> diff --git a/sdext/source/pdfimport/odf/odfemitter.cxx b/sdext/source/pdfimport/odf/odfemitter.cxx index a46d73ac9346..dd5b4e5872b7 100644 --- a/sdext/source/pdfimport/odf/odfemitter.cxx +++ b/sdext/source/pdfimport/odf/odfemitter.cxx @@ -22,8 +22,6 @@ #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> -#include <cppuhelper/exc_hlp.hxx> -#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <comphelper/stl_types.hxx> diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 060795a47762..4d12474f0edf 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -23,21 +23,14 @@ #include <saxemitter.hxx> #include <odfemitter.hxx> #include "inc/wrapper.hxx" -#include "inc/contentsink.hxx" #include <pdfiprocessor.hxx> #include <osl/file.h> -#include <osl/thread.h> #include <sal/log.hxx> -#include <cppuhelper/factory.hxx> -#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <tools/diagnose_ex.h> diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index ef2d4dc671a5..f164ac0a5ae7 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -25,7 +25,6 @@ #include <rtl/strbuf.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> -#include <rtl/alloc.h> #include <rtl/digest.h> #include <rtl/cipher.h> #include <sal/log.hxx> diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx index 388beba4ab3a..0be394d58eb1 100644 --- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx @@ -38,7 +38,6 @@ #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> -#include <rtl/alloc.h> #include <sal/log.hxx> // disable warnings again because someone along the line has enabled them diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx index 48c91811f23d..c880bed6c33f 100644 --- a/sdext/source/pdfimport/sax/emitcontext.cxx +++ b/sdext/source/pdfimport/sax/emitcontext.cxx @@ -24,9 +24,7 @@ #include <rtl/strbuf.hxx> #include <osl/diagnose.h> -#include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/xml/sax/SAXException.hpp> -#include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <xmloff/xmlimp.hxx> #if OSL_DEBUG_LEVEL > 0 diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index 055241102765..410776e5011c 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -23,7 +23,6 @@ #include <treevisitorfactory.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implementationentry.hxx> #include <com/sun/star/lang/XSingleComponentFactory.hpp> using namespace ::com::sun::star; diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index aef522b470bd..0cf64eeec424 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -18,7 +18,6 @@ */ #include <config_features.h> -#include <zlib.h> #include "outputwrap.hxx" #include <contentsink.hxx> @@ -32,20 +31,17 @@ #include <comphelper/sequence.hxx> #include <cppunit/TestAssert.h> -#include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> #include <test/bootstrapfixture.hxx> -#include <com/sun/star/rendering/XCanvas.hpp> -#include <com/sun/star/rendering/XColorSpace.hpp> +#include <com/sun/star/geometry/RealRectangle2D.hpp> +#include <com/sun/star/geometry/RealSize2D.hpp> #include <com/sun/star/rendering/PathJoinType.hpp> #include <com/sun/star/rendering/PathCapType.hpp> #include <com/sun/star/rendering/BlendMode.hpp> -#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/utils/canvastools.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygonclipper.hxx> @@ -53,7 +49,6 @@ #include <unordered_map> #include <vector> -#include <cassert> #include <rtl/ustring.hxx> #include <rtl/ref.hxx> diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index e5037c60944f..b03d5512e504 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -27,11 +27,9 @@ #include <genericelements.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <basegfx/range/b2drange.hxx> #include <osl/diagnose.h> #include <com/sun/star/i18n/BreakIterator.hpp> #include <com/sun/star/i18n/CharacterClassification.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/i18n/DirectionProperty.hpp> diff --git a/sdext/source/pdfimport/tree/genericelements.cxx b/sdext/source/pdfimport/tree/genericelements.cxx index c26f0f816222..3754d811e4ab 100644 --- a/sdext/source/pdfimport/tree/genericelements.cxx +++ b/sdext/source/pdfimport/tree/genericelements.cxx @@ -18,16 +18,13 @@ */ -#include <xmlemitter.hxx> #include <genericelements.hxx> #include <pdfiprocessor.hxx> #include <pdfihelper.hxx> -#include "style.hxx" #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/range/b2drange.hxx> -#include <osl/diagnose.h> #include <sal/log.hxx> namespace pdfi diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx index 0487717c1924..87a831d82ba1 100644 --- a/sdext/source/pdfimport/tree/imagecontainer.cxx +++ b/sdext/source/pdfimport/tree/imagecontainer.cxx @@ -25,10 +25,7 @@ #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> -#include <osl/file.h> -#include <rtl/crc.h> -#include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> using namespace com::sun::star; diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index 15b77b8627b8..c6baa7fee8b2 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -26,26 +26,15 @@ #include "style.hxx" #include <treevisiting.hxx> -#include <rtl/string.hxx> -#include <rtl/strbuf.hxx> #include <sal/log.hxx> #include <comphelper/sequence.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygonclipper.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/utils/canvastools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/range/b2irange.hxx> -#include <basegfx/range/b2drectangle.hxx> -#include <basegfx/matrix/b2dhommatrixtools.hxx> #include <vcl/svapp.hxx> -#include <com/sun/star/rendering/XVolatileBitmap.hpp> -#include <com/sun/star/geometry/RealSize2D.hpp> -#include <com/sun/star/geometry/RealPoint2D.hpp> -#include <com/sun/star/geometry/RealRectangle2D.hpp> - using namespace com::sun::star; diff --git a/sdext/source/pdfimport/tree/style.cxx b/sdext/source/pdfimport/tree/style.cxx index 4b20008ba3cd..8d6f7d3753cd 100644 --- a/sdext/source/pdfimport/tree/style.cxx +++ b/sdext/source/pdfimport/tree/style.cxx @@ -21,7 +21,6 @@ #include "style.hxx" #include <genericelements.hxx> #include <xmlemitter.hxx> -#include <pdfiprocessor.hxx> #include <rtl/ustrbuf.hxx> #include <algorithm> diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx index b6396885704f..91d063e26e79 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.cxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx @@ -27,7 +27,6 @@ #include <genericelements.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> -#include <basegfx/range/b2drange.hxx> #include <osl/diagnose.h> using namespace ::com::sun::star; diff --git a/sdext/source/pdfimport/tree/writertreevisiting.hxx b/sdext/source/pdfimport/tree/writertreevisiting.hxx index c93330d94a1c..1c1507f13349 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.hxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.hxx @@ -22,6 +22,8 @@ #include <treevisiting.hxx> +#include <pdfihelper.hxx> + namespace pdfi { struct DrawElement; diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index abc3447cf973..3d36e77110be 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -33,30 +33,25 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> -#include <rtl/byteseq.hxx> #include <sal/log.hxx> -#include <comphelper/lok.hxx> #include <comphelper/propertysequence.hxx> -#include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/beans/XMaterialHolder.hpp> #include <com/sun/star/rendering/PathCapType.hpp> #include <com/sun/star/rendering/PathJoinType.hpp> -#include <com/sun/star/rendering/XColorSpace.hpp> #include <com/sun/star/rendering/XPolyPolygon2D.hpp> -#include <com/sun/star/rendering/XBitmap.hpp> #include <com/sun/star/geometry/Matrix2D.hpp> #include <com/sun/star/geometry/AffineMatrix2D.hpp> #include <com/sun/star/geometry/RealRectangle2D.hpp> +#include <com/sun/star/geometry/RealSize2D.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/utils/canvastools.hxx> #include <basegfx/utils/unopolypolygon.hxx> #include <vcl/metric.hxx> @@ -68,15 +63,8 @@ #include <string.h> #include <stdlib.h> -#include <rtl/bootstrap.h> - #include <rtl/character.hxx> -#include <vcl/bitmapaccess.hxx> -#include <vcl/graph.hxx> -#include <vcl/pdfread.hxx> -#include <vcl/pngwrite.hxx> - using namespace com::sun::star; namespace pdfi diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 0febc4f41122..14c3c81ede7f 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -24,17 +24,16 @@ #include "PresenterPaneBase.hxx" #include "PresenterPaneContainer.hxx" #include "PresenterPaneFactory.hxx" -#include "PresenterViewFactory.hxx" #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> +#include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> -#include <com/sun/star/accessibility/XAccessibleEditableText.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <com/sun/star/accessibility/XAccessibleText.hpp> -#include <com/sun/star/drawing/framework/ResourceId.hpp> +#include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/drawing/framework/XView.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index fdc858bea399..e0444ca0cf62 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -22,14 +22,8 @@ #include "PresenterPaneContainer.hxx" -#include <com/sun/star/accessibility/AccessibleStateType.hpp> -#include <com/sun/star/accessibility/TextSegment.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/awt/XFocusListener.hpp> -#include <com/sun/star/awt/XWindow2.hpp> -#include <com/sun/star/awt/WindowEvent.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/drawing/framework/XPane2.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index fde12ceb0919..ea2ff23a8759 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -20,11 +20,8 @@ #include "PresenterBitmapContainer.hxx" #include "PresenterConfigurationAccess.hxx" -#include <com/sun/star/deployment/XPackageInformationProvider.hpp> #include <com/sun/star/drawing/XPresenterHelper.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/rendering/XIntegerBitmap.hpp> #include <osl/diagnose.h> using namespace ::com::sun::star; diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index 725cda10c0bc..099a99411d47 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/svapp.hxx> #include "PresenterButton.hxx" #include "PresenterCanvasHelper.hxx" #include "PresenterController.hxx" diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index 9f6a01a6a712..90b8d8544546 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -22,12 +22,9 @@ #include "PresenterBitmapContainer.hxx" #include "PresenterTheme.hxx" -#include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/awt/XPaintListener.hpp> #include <com/sun/star/awt/XMouseListener.hpp> -#include <com/sun/star/awt/XMouseMotionListener.hpp> #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XBitmap.hpp> #include <cppuhelper/basemutex.hxx> diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx index e8ced956af52..115f8304ecd1 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.cxx +++ b/sdext/source/presenter/PresenterCanvasHelper.cxx @@ -19,11 +19,9 @@ #include "PresenterCanvasHelper.hxx" -#include "PresenterController.hxx" #include "PresenterGeometryHelper.hxx" #include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/rendering/TextDirection.hpp> -#include <com/sun/star/rendering/TexturingMode.hpp> +#include <osl/diagnose.h> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx index d07978547cee..fed71db2ae02 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.hxx +++ b/sdext/source/presenter/PresenterCanvasHelper.hxx @@ -20,14 +20,13 @@ #ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERCANVASHELPER_HXX #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERCANVASHELPER_HXX -#include "PresenterTheme.hxx" +#include "PresenterBitmapContainer.hxx" #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/rendering/TextDirection.hpp> #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XCanvasFont.hpp> #include <com/sun/star/rendering/XPolyPolygon2D.hpp> -#include <rtl/ref.hxx> namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index 8a91f7c3ac8f..c83376fab5a8 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -20,7 +20,6 @@ #include "PresenterConfigurationAccess.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/util/XChangesBatch.hpp> diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index ef2301b2eb4f..b26dfc2fb3af 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -26,10 +26,7 @@ #include "PresenterAccessibility.hxx" #include "PresenterCanvasHelper.hxx" #include "PresenterCurrentSlideObserver.hxx" -#include "PresenterFrameworkObserver.hxx" -#include "PresenterHelper.hxx" #include "PresenterScreen.hxx" -#include "PresenterNotesView.hxx" #include "PresenterPaintManager.hxx" #include "PresenterPaneBase.hxx" #include "PresenterPaneContainer.hxx" @@ -38,12 +35,9 @@ #include "PresenterViewFactory.hxx" #include "PresenterWindowManager.hxx" -#include <com/sun/star/accessibility/AccessibleRole.hpp> -#include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/MouseButton.hpp> -#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> @@ -55,7 +49,6 @@ #include <com/sun/star/presentation/AnimationEffect.hpp> #include <com/sun/star/presentation/XPresentation.hpp> #include <com/sun/star/presentation/XPresentationSupplier.hpp> -#include <com/sun/star/rendering/CompositeOperation.hpp> #include <com/sun/star/rendering/TextDirection.hpp> #include <com/sun/star/util/URLTransformer.hpp> diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index 93ee99c197bf..22811fc44c62 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -23,24 +23,19 @@ #include "PresenterAccessibility.hxx" #include "PresenterPaneContainer.hxx" #include "PresenterTheme.hxx" -#include "PresenterSprite.hxx" #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <com/sun/star/awt/FontDescriptor.hpp> -#include <com/sun/star/awt/XFocusListener.hpp> #include <com/sun/star/awt/XKeyListener.hpp> #include <com/sun/star/awt/XMouseListener.hpp> #include <com/sun/star/drawing/XPresenterHelper.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/presentation/XSlideShowController.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/util/Color.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <rtl/ref.hxx> #include <map> diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index 087084e7d1b7..1aa4b3cab8f5 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -21,13 +21,10 @@ #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERCURRENTSLIDEOBSERVER_HXX #include "PresenterController.hxx" -#include <com/sun/star/presentation/XSlideShow.hpp> #include <com/sun/star/presentation/XSlideShowController.hpp> -#include <com/sun/star/frame/XController.hpp> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <rtl/ref.hxx> -#include <salhelper/timer.hxx> namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterGeometryHelper.hxx b/sdext/source/presenter/PresenterGeometryHelper.hxx index d7818ce2a8b2..2e1292bf26be 100644 --- a/sdext/source/presenter/PresenterGeometryHelper.hxx +++ b/sdext/source/presenter/PresenterGeometryHelper.hxx @@ -20,9 +20,7 @@ #ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERGEOMETRYHELPER_HXX #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERGEOMETRYHELPER_HXX -#include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Rectangle.hpp> -#include <com/sun/star/awt/Size.hpp> #include <com/sun/star/rendering/XGraphicDevice.hpp> #include <com/sun/star/rendering/XPolyPolygon2D.hpp> #include <com/sun/star/geometry/RealRectangle2D.hpp> diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index d145eb893c47..70e3f57291c6 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -16,14 +16,12 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/svapp.hxx> + #include <vcl/settings.hxx> #include "PresenterHelpView.hxx" #include "PresenterButton.hxx" #include "PresenterCanvasHelper.hxx" #include "PresenterGeometryHelper.hxx" -#include "PresenterHelper.hxx" -#include "PresenterWindowManager.hxx" #include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx index 3d2a4a25069e..df0cbfb5cfbc 100644 --- a/sdext/source/presenter/PresenterHelpView.hxx +++ b/sdext/source/presenter/PresenterHelpView.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/drawing/framework/XView.hpp> #include <com/sun/star/drawing/framework/XResourceId.hpp> #include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <memory> namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx index 103268990ea1..a177811f6b0f 100644 --- a/sdext/source/presenter/PresenterHelper.cxx +++ b/sdext/source/presenter/PresenterHelper.cxx @@ -19,8 +19,6 @@ #include "PresenterHelper.hxx" -#include <com/sun/star/graphic/XGraphicProvider.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/presentation/XPresentationSupplier.hpp> #include <com/sun/star/presentation/XPresentation2.hpp> diff --git a/sdext/source/presenter/PresenterHelper.hxx b/sdext/source/presenter/PresenterHelper.hxx index 52d07120f0b3..b7e2dfa2ff55 100644 --- a/sdext/source/presenter/PresenterHelper.hxx +++ b/sdext/source/presenter/PresenterHelper.hxx @@ -20,10 +20,8 @@ #ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERHELPER_HXX #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERHELPER_HXX -#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/presentation/XSlideShowController.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 5f85ed07525e..b33cc11fec60 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/svapp.hxx> + #include <vcl/settings.hxx> #include "PresenterNotesView.hxx" #include "PresenterButton.hxx" @@ -29,7 +29,6 @@ #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XPane.hpp> @@ -38,8 +37,6 @@ #include <com/sun/star/rendering/CompositeOperation.hpp> #include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <com/sun/star/text/XTextRange.hpp> -#include <com/sun/star/util/XChangesBatch.hpp> -#include <com/sun/star/container/XChild.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx index d3f0e7ee3b24..1a67a9261f6b 100644 --- a/sdext/source/presenter/PresenterNotesView.hxx +++ b/sdext/source/presenter/PresenterNotesView.hxx @@ -25,11 +25,6 @@ #include "PresenterViewFactory.hxx" #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> -#include <com/sun/star/awt/ActionEvent.hpp> -#include <com/sun/star/awt/XActionListener.hpp> -#include <com/sun/star/awt/XButton.hpp> -#include <com/sun/star/awt/XControl.hpp> -#include <com/sun/star/awt/XTextComponent.hpp> #include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XDrawView.hpp> diff --git a/sdext/source/presenter/PresenterPaintManager.hxx b/sdext/source/presenter/PresenterPaintManager.hxx index d1734a122b8c..16b61fda4b1f 100644 --- a/sdext/source/presenter/PresenterPaintManager.hxx +++ b/sdext/source/presenter/PresenterPaintManager.hxx @@ -27,6 +27,8 @@ #include <functional> +#include "PresenterPaneContainer.hxx" + namespace sdext { namespace presenter { class PresenterPaneContainer; diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index 7299ee267ee8..b7e0436294b8 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -20,10 +20,7 @@ #include "PresenterPane.hxx" #include "PresenterController.hxx" #include "PresenterPaintManager.hxx" -#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/drawing/CanvasFeature.hpp> -#include <com/sun/star/rendering/CompositeOperation.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index 681245389be9..eed0a6d6904d 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -21,14 +21,6 @@ #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANE_HXX #include "PresenterPaneBase.hxx" -#include <com/sun/star/awt/XMouseListener.hpp> -#include <com/sun/star/awt/XMouseMotionListener.hpp> -#include <com/sun/star/awt/XWindowListener.hpp> -#include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/drawing/XPresenterHelper.hpp> -#include <com/sun/star/drawing/framework/XPane.hpp> -#include <com/sun/star/drawing/framework/XPaneBorderPainter.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/rendering/XCanvas.hpp> #include <rtl/ref.hxx> diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index fd8e1ea30cc1..dcd7a651688b 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -18,18 +18,10 @@ */ #include "PresenterPaneBase.hxx" -#include "PresenterCanvasHelper.hxx" #include "PresenterController.hxx" -#include "PresenterGeometryHelper.hxx" #include "PresenterPaintManager.hxx" -#include "PresenterTextView.hxx" #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/XWindow2.hpp> -#include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/drawing/CanvasFeature.hpp> -#include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/rendering/TexturingMode.hpp> using namespace css; using namespace css::uno; diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index c3bb1d93bb72..5449cd0aa04a 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -20,20 +20,14 @@ #ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEBASE_HXX #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEBASE_HXX -#include "PresenterTheme.hxx" #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> -#include <com/sun/star/awt/Point.hpp> -#include <com/sun/star/awt/XMouseListener.hpp> -#include <com/sun/star/awt/XMouseMotionListener.hpp> #include <com/sun/star/awt/XWindowListener.hpp> -#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/drawing/XPresenterHelper.hpp> #include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/drawing/framework/XPaneBorderPainter.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/util/Color.hpp> #include <com/sun/star/rendering/XCanvas.hpp> #include <rtl/ref.hxx> diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 1dbda5128e08..e8ff0a50958d 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -17,24 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/svapp.hxx> #include "PresenterPaneBorderPainter.hxx" #include "PresenterCanvasHelper.hxx" -#include "PresenterConfigurationAccess.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterTheme.hxx" -#include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Rectangle.hpp> -#include <com/sun/star/awt/SimpleFontMetric.hpp> -#include <com/sun/star/awt/XFont.hpp> #include <com/sun/star/drawing/XPresenterHelper.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/graphic/XGraphicRenderer.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> #include <com/sun/star/rendering/FillRule.hpp> #include <com/sun/star/rendering/TextDirection.hpp> -#include <com/sun/star/rendering/XIntegerBitmap.hpp> #include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <map> #include <memory> diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index 467926d5469d..a082254e61da 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -23,10 +23,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/drawing/framework/XPaneBorderPainter.hpp> -#include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/rendering/XCanvas.hpp> -#include <com/sun/star/util/XMacroExpander.hpp> -#include <com/sun/star/awt/XGraphics.hpp> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <memory> diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index 3cef8ac65984..6477d75cb1f3 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -19,10 +19,6 @@ #include "PresenterPaneContainer.hxx" #include "PresenterPaneBase.hxx" -#include <com/sun/star/awt/XGraphics.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/drawing/framework/ResourceId.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx index f951005ab2ad..b9df5e788a51 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -20,16 +20,12 @@ #ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANECONTAINER_HXX #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANECONTAINER_HXX -#include "PresenterTheme.hxx" -#include <com/sun/star/awt/Point.hpp> -#include <com/sun/star/awt/Rectangle.hpp> +#include "PresenterPaneBase.hxx" #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/drawing/XPresenterHelper.hpp> #include <com/sun/star/drawing/framework/XResourceId.hpp> -#include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/drawing/framework/XView.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/util/Color.hpp> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <rtl/ref.hxx> diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 90ee5dec609b..f7e6d3b0106f 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -23,13 +23,8 @@ #include "PresenterPaneBorderPainter.hxx" #include "PresenterPaneContainer.hxx" #include "PresenterSpritePane.hxx" -#include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/drawing/framework/ResourceId.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> -#include <com/sun/star/drawing/framework/XConfigurationController.hpp> -#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 39aae51ccf15..9350bf0d47ac 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -23,8 +23,6 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/drawing/XPresenterHelper.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/drawing/framework/XResourceFactory.hpp> diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 35b528d5ba9e..32739fdd2b1d 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -19,19 +19,11 @@ #include <memory> #include "PresenterProtocolHandler.hxx" -#include "PresenterConfigurationAccess.hxx" #include "PresenterController.hxx" -#include "PresenterHelper.hxx" #include "PresenterNotesView.hxx" #include "PresenterPaneContainer.hxx" -#include "PresenterPaneFactory.hxx" #include "PresenterViewFactory.hxx" #include "PresenterWindowManager.hxx" -#include <com/sun/star/drawing/SlideSorter.hpp> -#include <com/sun/star/drawing/framework/Configuration.hpp> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> -#include <com/sun/star/drawing/framework/ResourceId.hpp> -#include <com/sun/star/drawing/framework/ResourceActivationMode.hpp> #include <cppuhelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <algorithm> diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 7d7139f9161e..a0ddd7fe9b4d 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -28,17 +28,14 @@ #include "PresenterWindowManager.hxx" #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/drawing/framework/Configuration.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/ResourceId.hpp> #include <com/sun/star/drawing/framework/ResourceActivationMode.hpp> -#include <com/sun/star/presentation/XSlideShow.hpp> #include <com/sun/star/presentation/XPresentation2.hpp> #include <com/sun/star/presentation/XPresentationSupplier.hpp> #include <com/sun/star/document/XEventBroadcaster.hpp> #include <cppuhelper/compbase.hxx> -#include <com/sun/star/view/XSelectionSupplier.hpp> #include <vcl/svapp.hxx> #include <sal/log.hxx> diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index 10cb613d83dd..95eace30b40c 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -24,17 +24,15 @@ #include "PresenterPaneContainer.hxx" #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/task/XJob.hpp> -#include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> -#include <com/sun/star/drawing/framework/XView.hpp> -#include <com/sun/star/presentation/XSlideShowController.hpp> #include <com/sun/star/presentation/XPresentation2.hpp> #include <rtl/ref.hxx> +#include <map> + namespace sdext { namespace presenter { class PresenterController; diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 2d7eb268713b..ba171aa6152c 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -25,11 +25,8 @@ #include "PresenterTimer.hxx" #include "PresenterUIPainter.hxx" #include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/awt/XToolkit.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/rendering/TexturingMode.hpp> #include <com/sun/star/rendering/XPolyPolygon2D.hpp> #include <algorithm> diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index cf46420b186c..5867528ef96c 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERSCROLLBAR_HXX #include "PresenterBitmapContainer.hxx" -#include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/drawing/XPresenterHelper.hpp> #include <com/sun/star/rendering/XCanvas.hpp> diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index b1f0b137a3e4..0cf39bfcbeee 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -21,14 +21,8 @@ #include "PresenterCanvasHelper.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterPaintManager.hxx" -#include "PresenterScrollBar.hxx" #include "PresenterBitmapContainer.hxx" -#include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/drawing/framework/XConfigurationController.hpp> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> -#include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> using namespace ::com::sun::star; diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx index 2df1d56c9981..d14a18e7ca82 100644 --- a/sdext/source/presenter/PresenterSlidePreview.hxx +++ b/sdext/source/presenter/PresenterSlidePreview.hxx @@ -22,8 +22,6 @@ #include "PresenterController.hxx" -#include <com/sun/star/awt/XBitmap.hpp> -#include <com/sun/star/awt/XDisplayBitmap.hpp> #include <com/sun/star/awt/XPaintListener.hpp> #include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> @@ -31,7 +29,6 @@ #include <com/sun/star/drawing/XSlideRenderer.hpp> #include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/drawing/framework/XView.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index d9d20909ebb0..2a74192875b8 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -19,7 +19,6 @@ */ #include "PresenterSlideShowView.hxx" -#include <vcl/svapp.hxx> #include "PresenterCanvasHelper.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterHelper.hxx" @@ -30,10 +29,7 @@ #include <com/sun/star/awt/Toolkit.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/drawing/CanvasFeature.hpp> #include <com/sun/star/drawing/XPresenterHelper.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index b7a3e76a6158..e6505bb19414 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -35,9 +35,7 @@ #include <com/sun/star/presentation/XSlideShowController.hpp> #include <com/sun/star/rendering/XPolyPolygon2D.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/util/Color.hpp> #include <cppuhelper/compbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/basemutex.hxx> namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 9231627b264b..82c9bf8dbf81 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -17,31 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include "PresenterSlideSorter.hxx" #include "PresenterButton.hxx" #include "PresenterCanvasHelper.hxx" #include "PresenterGeometryHelper.hxx" -#include "PresenterHelper.hxx" #include "PresenterPaintManager.hxx" #include "PresenterPaneBase.hxx" #include "PresenterScrollBar.hxx" #include "PresenterUIPainter.hxx" #include "PresenterWindowManager.hxx" -#include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/drawing/XSlideSorterBase.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/rendering/XBitmapCanvas.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> #include <com/sun/star/rendering/TextDirection.hpp> -#include <com/sun/star/rendering/XPolyPolygon2D.hpp> -#include <com/sun/star/util/Color.hpp> #include <algorithm> #include <math.h> diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx index 24010e38e88a..3f5fb298ad7b 100644 --- a/sdext/source/presenter/PresenterSlideSorter.hxx +++ b/sdext/source/presenter/PresenterSlideSorter.hxx @@ -36,8 +36,6 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/geometry/RealRectangle2D.hpp> #include <com/sun/star/rendering/XPolyPolygon2D.hpp> -#include <com/sun/star/rendering/XSprite.hpp> -#include <com/sun/star/rendering/XSpriteCanvas.hpp> namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index 197e2dbf5aa9..b1e09018265e 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -18,9 +18,7 @@ */ #include "PresenterSpritePane.hxx" -#include "PresenterGeometryHelper.hxx" #include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/rendering/CompositeOperation.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx index 767e6656a5ba..a713e03e6f09 100644 --- a/sdext/source/presenter/PresenterSpritePane.hxx +++ b/sdext/source/presenter/PresenterSpritePane.hxx @@ -22,19 +22,9 @@ #include "PresenterPaneBase.hxx" #include "PresenterSprite.hxx" -#include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/awt/XMouseListener.hpp> -#include <com/sun/star/awt/XMouseMotionListener.hpp> -#include <com/sun/star/awt/XWindowListener.hpp> -#include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/drawing/XPresenterHelper.hpp> -#include <com/sun/star/drawing/framework/XPane.hpp> -#include <com/sun/star/drawing/framework/XPaneBorderPainter.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XSpriteCanvas.hpp> -#include <cppuhelper/basemutex.hxx> #include <rtl/ref.hxx> #include <memory> diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 166d56cf5123..583e11d7fbe5 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -26,14 +26,10 @@ #include <cmath> #include <numeric> -#include <sal/log.hxx> - #include <com/sun/star/accessibility/AccessibleTextType.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/i18n/BreakIterator.hpp> -#include <com/sun/star/i18n/CharType.hpp> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> -#include <com/sun/star/i18n/CTLScriptType.hpp> #include <com/sun/star/i18n/ScriptDirection.hpp> #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index edd818cc385c..f149bd01e40e 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -21,17 +21,16 @@ #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERTEXTVIEW_HXX #include "PresenterTheme.hxx" -#include <com/sun/star/accessibility/XAccessibleText.hpp> +#include <com/sun/star/accessibility/TextSegment.hpp> +#include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/geometry/RealPoint2D.hpp> #include <com/sun/star/geometry/RealSize2D.hpp> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/XScriptTypeDetector.hpp> #include <com/sun/star/rendering/XCanvas.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/basemutex.hxx> #include <functional> diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 1e40213aba8b..cd82d1dcd90d 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -21,15 +21,8 @@ #include "PresenterBitmapContainer.hxx" #include "PresenterCanvasHelper.hxx" #include "PresenterConfigurationAccess.hxx" -#include "PresenterHelper.hxx" -#include <com/sun/star/awt/Point.hpp> -#include <com/sun/star/beans/UnknownPropertyException.hpp> -#include <com/sun/star/deployment/XPackageInformationProvider.hpp> #include <com/sun/star/drawing/XPresenterHelper.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/rendering/PanoseWeight.hpp> -#include <com/sun/star/rendering/XBitmap.hpp> -#include <com/sun/star/util/Color.hpp> #include <osl/diagnose.h> #include <map> #include <numeric> diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index 95548c212b5b..0ec3488a975b 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -25,8 +25,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XCanvasFont.hpp> -#include <com/sun/star/rendering/XIntegerBitmap.hpp> -#include <com/sun/star/util/Color.hpp> #include <memory> namespace sdext { namespace presenter { diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index 88accf971f47..55916b1bae38 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -20,11 +20,9 @@ #include "PresenterTimer.hxx" #include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> -#include <osl/doublecheckedlocking.h> #include <osl/thread.hxx> #include <osl/conditn.hxx> diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index e6e19f03e908..c62448e0521a 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include "PresenterToolBar.hxx" @@ -25,29 +24,21 @@ #include "PresenterCanvasHelper.hxx" #include "PresenterGeometryHelper.hxx" #include "PresenterPaintManager.hxx" -#include "PresenterPaneBase.hxx" -#include "PresenterPaneFactory.hxx" #include "PresenterTimer.hxx" #include "PresenterWindowManager.hxx" #include <cppuhelper/compbase.hxx> -#include <com/sun/star/awt/FontDescriptor.hpp> -#include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/deployment/XPackageInformationProvider.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/geometry/AffineMatrix2D.hpp> -#include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> #include <com/sun/star/rendering/RenderState.hpp> #include <com/sun/star/rendering/TextDirection.hpp> #include <com/sun/star/rendering/ViewState.hpp> #include <com/sun/star/rendering/XSpriteCanvas.hpp> -#include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/util/Color.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> #include <rtl/ustrbuf.hxx> using namespace ::com::sun::star; diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index 84c97911f41d..c93d0c53abf3 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -25,20 +25,12 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> -#include <com/sun/star/awt/ActionEvent.hpp> -#include <com/sun/star/awt/XActionListener.hpp> -#include <com/sun/star/awt/XButton.hpp> -#include <com/sun/star/awt/XControl.hpp> -#include <com/sun/star/awt/XControlContainer.hpp> -#include <com/sun/star/awt/XFixedText.hpp> #include <com/sun/star/awt/XMouseListener.hpp> #include <com/sun/star/awt/XMouseMotionListener.hpp> #include <com/sun/star/awt/XPaintListener.hpp> #include <com/sun/star/awt/XWindowListener.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XDrawView.hpp> -#include <com/sun/star/drawing/XPresenterHelper.hpp> #include <com/sun/star/drawing/framework/XView.hpp> #include <com/sun/star/drawing/framework/XResourceId.hpp> #include <com/sun/star/frame/XController.hpp> diff --git a/sdext/source/presenter/PresenterUIPainter.cxx b/sdext/source/presenter/PresenterUIPainter.cxx index 190cc9158c43..75ef2838879a 100644 --- a/sdext/source/presenter/PresenterUIPainter.cxx +++ b/sdext/source/presenter/PresenterUIPainter.cxx @@ -23,10 +23,8 @@ #include "PresenterUIPainter.hxx" -#include "PresenterCanvasHelper.hxx" #include "PresenterGeometryHelper.hxx" #include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/rendering/XPolyPolygon2D.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sdext/source/presenter/PresenterUIPainter.hxx b/sdext/source/presenter/PresenterUIPainter.hxx index 1b5ef18332fc..89c5aad8e816 100644 --- a/sdext/source/presenter/PresenterUIPainter.hxx +++ b/sdext/source/presenter/PresenterUIPainter.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERUIPAINTER_HXX #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERUIPAINTER_HXX -#include "PresenterTheme.hxx" #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XBitmap.hpp> diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index c5f07f75b88e..71b3a24e0625 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -19,20 +19,13 @@ #include "PresenterViewFactory.hxx" #include "PresenterPaneContainer.hxx" -#include "PresenterHelper.hxx" #include "PresenterHelpView.hxx" #include "PresenterNotesView.hxx" #include "PresenterSlideShowView.hxx" #include "PresenterSlidePreview.hxx" #include "PresenterSlideSorter.hxx" #include "PresenterToolBar.hxx" -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/drawing/framework/ResourceId.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> -#include <com/sun/star/drawing/framework/XConfigurationController.hpp> -#include <com/sun/star/drawing/XDrawPages.hpp> -#include <com/sun/star/drawing/XDrawPagesSupplier.hpp> -#include <com/sun/star/drawing/XSlideSorterBase.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 7e95372ba0e2..301ba952f180 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -23,7 +23,6 @@ #include "PresenterController.hxx" #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XResourceFactory.hpp> #include <com/sun/star/drawing/framework/XView.hpp> diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 5f04037c04a5..b4b262c1f761 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -17,37 +17,25 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include "PresenterWindowManager.hxx" #include "PresenterController.hxx" #include "PresenterGeometryHelper.hxx" -#include "PresenterHelper.hxx" #include "PresenterPaintManager.hxx" -#include "PresenterPaneBase.hxx" #include "PresenterPaneBorderPainter.hxx" #include "PresenterPaneContainer.hxx" #include "PresenterPaneFactory.hxx" -#include "PresenterSprite.hxx" #include "PresenterToolBar.hxx" #include "PresenterViewFactory.hxx" #include "PresenterTheme.hxx" #include <com/sun/star/awt/InvalidateStyle.hpp> #include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/awt/SystemPointer.hpp> -#include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/awt/WindowAttribute.hpp> -#include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/drawing/framework/ResourceId.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> #include <com/sun/star/rendering/FillRule.hpp> -#include <com/sun/star/rendering/PathCapType.hpp> -#include <com/sun/star/rendering/PathJoinType.hpp> #include <com/sun/star/rendering/Texture.hpp> #include <com/sun/star/rendering/TexturingMode.hpp> -#include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <math.h> using namespace ::com::sun::star; diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index bb765094869f..55ca7adb7553 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -22,19 +22,14 @@ #include "PresenterPaneContainer.hxx" #include "PresenterTheme.hxx" -#include <com/sun/star/awt/Point.hpp> +#include <com/sun/star/awt/Size.hpp> #include <com/sun/star/awt/XFocusListener.hpp> -#include <com/sun/star/awt/XGraphics.hpp> -#include <com/sun/star/awt/XMouseMotionListener.hpp> #include <com/sun/star/awt/XPaintListener.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XWindowListener.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/rendering/XBitmap.hpp> -#include <com/sun/star/rendering/XSprite.hpp> -#include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> |