summaryrefslogtreecommitdiff
path: root/fpicker
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2010-10-04 16:59:40 +0200
committerPetr Mladek <pmladek@suse.cz>2010-10-05 18:11:20 +0200
commitfacd86ef9cdac2f0acab13a8b525f0bfb99cac28 (patch)
treeb20099418ed50ea373d131c15835efd3946fab41 /fpicker
parent30afa21872109ef351ece5d0f0ad14e29d5e790e (diff)
remove include guards using fixguard.py
Diffstat (limited to 'fpicker')
-rw-r--r--fpicker/source/aqua/SalAquaFilePicker.cxx4
-rw-r--r--fpicker/source/aqua/SalAquaFolderPicker.cxx2
-rw-r--r--fpicker/source/aqua/SalAquaPicker.cxx4
-rw-r--r--fpicker/source/aqua/resourceprovider.cxx4
-rw-r--r--fpicker/source/generic/fpicker.cxx4
-rw-r--r--fpicker/source/office/OfficeControlAccess.cxx2
-rw-r--r--fpicker/source/office/OfficeFilePicker.cxx2
-rw-r--r--fpicker/source/office/fps_office.cxx2
-rw-r--r--fpicker/source/office/iodlg.cxx10
-rw-r--r--fpicker/source/unx/gnome/SalGtkFilePicker.cxx2
-rw-r--r--fpicker/source/unx/gnome/SalGtkFolderPicker.cxx2
-rw-r--r--fpicker/source/win32/filepicker/FilePicker.cxx2
-rw-r--r--fpicker/source/win32/filepicker/WinFileOpenImpl.cxx2
-rw-r--r--fpicker/source/win32/filepicker/dibpreview.cxx4
-rw-r--r--fpicker/source/win32/filepicker/previewadapter.cxx2
-rw-r--r--fpicker/source/win32/filepicker/previewbase.cxx2
-rw-r--r--fpicker/source/win32/filepicker/workbench/Test_fps.cxx2
-rw-r--r--fpicker/source/win32/folderpicker/FolderPicker.cxx2
-rw-r--r--fpicker/source/win32/folderpicker/Fopentry.cxx4
-rw-r--r--fpicker/source/win32/folderpicker/WinFOPImpl.cxx4
-rw-r--r--fpicker/source/win32/folderpicker/workbench/Test_fops.cxx6
-rw-r--r--fpicker/source/win32/misc/resourceprovider.cxx2
-rw-r--r--fpicker/test/svdem.cxx2
23 files changed, 0 insertions, 72 deletions
diff --git a/fpicker/source/aqua/SalAquaFilePicker.cxx b/fpicker/source/aqua/SalAquaFilePicker.cxx
index 699997bd2dbe..5e7783a0b92d 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.cxx
+++ b/fpicker/source/aqua/SalAquaFilePicker.cxx
@@ -43,14 +43,10 @@
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
-#ifndef _TOOLS_URLOBJ_HXX
#include <tools/urlobj.hxx>
-#endif
#include "resourceprovider.hxx"
-#ifndef _SV_RC_H
#include <tools/rc.hxx>
-#endif
#include <osl/file.hxx>
#include "CFStringUtilities.hxx"
#include "NSString_OOoAdditions.hxx"
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.cxx b/fpicker/source/aqua/SalAquaFolderPicker.cxx
index 60857e47c6c3..d57a0b2f26fe 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.cxx
+++ b/fpicker/source/aqua/SalAquaFolderPicker.cxx
@@ -49,9 +49,7 @@
#include "resourceprovider.hxx"
-#ifndef _SV_RC_H
#include <tools/rc.hxx>
-#endif
#include <osl/file.hxx>
#include "CFStringUtilities.hxx"
diff --git a/fpicker/source/aqua/SalAquaPicker.cxx b/fpicker/source/aqua/SalAquaPicker.cxx
index 1a4132f23ea5..02dee945a039 100644
--- a/fpicker/source/aqua/SalAquaPicker.cxx
+++ b/fpicker/source/aqua/SalAquaPicker.cxx
@@ -37,17 +37,13 @@
#include <FPServiceInfo.hxx>
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
-#ifndef _SALAQUAPICKER_HXX_
#include "SalAquaPicker.hxx"
-#endif
#include <tools/urlobj.hxx>
#include <osl/file.hxx>
#include "CFStringUtilities.hxx"
#include "NSString_OOoAdditions.hxx"
-#ifndef _NSURL_OOOADDITIONS_HXX_
#include "NSURL_OOoAdditions.hxx"
-#endif
#include "SalAquaFilePicker.hxx"
diff --git a/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx
index 51985208c7ed..658f0c37a0dc 100644
--- a/fpicker/source/aqua/resourceprovider.cxx
+++ b/fpicker/source/aqua/resourceprovider.cxx
@@ -37,13 +37,9 @@
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#ifndef _SVTOOLS_SVTOOLS_HRC_
#include <svtools/svtools.hrc>
-#endif
-#ifndef _SVTOOLS_FILEDLG2_HRC_
#include <svtools/filedlg2.hrc>
-#endif
#include "NSString_OOoAdditions.hxx"
#include "resourceprovider.hxx"
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index bcbfb2b2d70b..7c607e6ae06f 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -30,9 +30,7 @@
#include "sal/types.h"
#include "rtl/ustring.hxx"
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include "cppuhelper/implementationentry.hxx"
-#endif
#include "com/sun/star/lang/XMultiComponentFactory.hpp"
#ifdef WNT
@@ -44,9 +42,7 @@
#include "svtools/miscopt.hxx"
#include "svl/pickerhistoryaccess.hxx"
-#ifndef _SV_APP_HXX
#include "vcl/svapp.hxx"
-#endif
namespace css = com::sun::star;
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index e0b5d259302d..fa5d0cda0d8c 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -33,9 +33,7 @@
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ControlActions.hpp>
#include <vcl/lstbox.hxx>
-#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HPP_
#include <com/sun/star/uno/Sequence.hxx>
-#endif
#include <algorithm>
#include <functional>
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 516c62fe7580..307d73c51257 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -59,9 +59,7 @@
#include <comphelper/sequence.hxx>
#include <cppuhelper/typeprovider.hxx>
#include "vos/mutex.hxx"
-#ifndef _SV_APP_HXX
#include "vcl/svapp.hxx"
-#endif
// define ----------------------------------------------------------------
diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx
index 52659e1f76f5..06aeee0e7f08 100644
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -30,9 +30,7 @@
#include "precompiled_fpicker.hxx"
#include "sal/types.h"
-#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
#include "cppuhelper/implementationentry.hxx"
-#endif
#include "OfficeFilePicker.hxx"
#include "OfficeFolderPicker.hxx"
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index b9d7fac3aa3b..9d89ab1fe38b 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -56,24 +56,16 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <unotools/localfilehelper.hxx>
-#ifndef _SVTOOLS_HRC
#include "svtools/svtools.hrc"
-#endif
-#ifndef _SVT_HELPID_HRC
#include "svtools/helpid.hrc"
-#endif
-#ifndef _SVTOOLS_IODLGIMPL_HRC
#include "iodlg.hrc"
-#endif
#include "rtl/instance.hxx"
#include "asyncfilepicker.hxx"
#include "iodlgimp.hxx"
#include "svtools/inettbc.hxx"
#include "unotools/syslocale.hxx"
#include "svtools/QueryFolderName.hxx"
-#ifndef _RTL_USTRING_HXX
#include <rtl/ustring.hxx>
-#endif
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ucb/XContentProviderManager.hpp>
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
@@ -89,9 +81,7 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
#include <comphelper/processfactory.hxx>
-#endif
#include <osl/file.h>
#include <vcl/waitobj.hxx>
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
index c6b0acd6a33f..7983a932e290 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
@@ -53,9 +53,7 @@
#include <iostream>
#include <algorithm>
#include "resourceprovider.hxx"
-#ifndef _SV_RC_H
#include <tools/rc.hxx>
-#endif
//------------------------------------------------------------------------
// namespace directives
diff --git a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
index f9c78d76639c..a49b7cf2b63a 100644
--- a/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
+++ b/fpicker/source/unx/gnome/SalGtkFolderPicker.cxx
@@ -50,9 +50,7 @@
#include <iostream>
#include "resourceprovider.hxx"
-#ifndef _SV_RC_H
#include <tools/rc.hxx>
-#endif
//------------------------------------------------------------------------
// namespace directives
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index a3191ce77580..649a7a481c33 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -37,9 +37,7 @@
#include <cppuhelper/interfacecontainer.h>
#include <osl/diagnose.h>
-#ifndef _FILEPICKER_HXX_
#include "filepicker.hxx"
-#endif
#include "WinFileOpenImpl.hxx"
#include "FPServiceInfo.hxx"
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index d5bcce4707f4..f57da48ef4cd 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -44,9 +44,7 @@
#include <com/sun/star/ui/dialogs/ListBoxControlActions.hpp>
#include "..\misc\WinImplHelper.hxx"
-#ifndef _FILEPICKER_HXX_
#include "filepicker.hxx"
-#endif
#include "controlaccess.hxx"
#include <rtl/ustrbuf.hxx>
#include <rtl/string.hxx>
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index fcc369972ff8..982fdd69dd3d 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -36,13 +36,9 @@
#include "dibpreview.hxx"
#include <osl/diagnose.h>
-#ifndef _COM_SUN_STAR_UI_DIALOG_FILEPREVIEWIMAGEFORMATS_HPP_
#include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp>
-#endif
-#ifndef _USTRING_HXX_
#include <rtl/ustring.hxx>
-#endif
#include <stdexcept>
#include <string>
diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx
index d8fee2044115..37ca335126f7 100644
--- a/fpicker/source/win32/filepicker/previewadapter.cxx
+++ b/fpicker/source/win32/filepicker/previewadapter.cxx
@@ -31,9 +31,7 @@
#include <tchar.h>
#include "previewadapter.hxx"
-#ifndef _COM_SUN_STAR_UI_DIALOG_FILEPREVIEWIMAGEFORMATS_HPP_
#include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp>
-#endif
#include "dibpreview.hxx"
#include "../misc/WinImplHelper.hxx"
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index 4e778e4fc011..b3976bbee13c 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -29,9 +29,7 @@
#include "precompiled_fpicker.hxx"
#include "previewbase.hxx"
-#ifndef _COM_SUN_STAR_UI_DIALOG_FILEPREVIEWIMAGEFORMATS_HPP_
#include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp>
-#endif
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index 8db37cefd34c..7c39d5d4a3aa 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -49,9 +49,7 @@
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#ifndef _COM_SUN_STAR_UI_DIALOGS_FILEDIALOGRESULTS_HPP_
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#endif
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index acfe310e1cc6..87bd5a05aea1 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -33,9 +33,7 @@
//------------------------------------------------------------------------
#include <osl/diagnose.h>
-#ifndef _FOLDERPICKER_HXX_
#include "folderpicker.hxx"
-#endif
#include <com/sun/star/lang/DisposedException.hpp>
#include "WinFOPImpl.hxx"
diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx b/fpicker/source/win32/folderpicker/Fopentry.cxx
index 717359ba511a..74dc3eb0612a 100644
--- a/fpicker/source/win32/folderpicker/Fopentry.cxx
+++ b/fpicker/source/win32/folderpicker/Fopentry.cxx
@@ -35,13 +35,9 @@
#include <com/sun/star/container/XSet.hpp>
#include <osl/diagnose.h>
-#ifndef _FILEPICKER_HXX_
#include "folderpicker.hxx"
-#endif
-#ifndef _FPSERVICEINFO_HXX_
#include "FOPServiceInfo.hxx"
-#endif
#include "WinFOPImpl.hxx"
//-----------------------------------------------------------------------
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index 1aac4f5f8c53..dde413a76a8b 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -32,15 +32,11 @@
// includes
//------------------------------------------------------------------------
-#ifndef _WINDIRBROWSEIMPL_HXX_
#include "WinFOPImpl.hxx"
-#endif
#include <osl/diagnose.h>
#include <com/sun/star/lang/EventObject.hpp>
-#ifndef _COM_SUN_STAR_UI_FILEDIALOGRESULTS_HPP_
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#endif
#include "FopEvtDisp.hxx"
#include <osl/file.hxx>
#include "FolderPicker.hxx"
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index 472562194566..1e21a6544a83 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -47,20 +47,14 @@
#include <sal/types.h>
#include <osl/diagnose.h>
-#ifndef _COM_SUN_STAR_UI_XFOLDERPICKER_HPP_
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UI_FILEDIALOGRESULTS_HPP_
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#endif
#include <cppuhelper/implbase1.hxx>
#include <stdio.h>
-#ifndef _FPSERVICEINFO_HXX_
#include "..\FOPServiceInfo.hxx"
-#endif
#include <osl/file.hxx>
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index b5448a93008c..8a9373bfd7e6 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -37,9 +37,7 @@
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
-#ifndef _TOOLS_SIMPLERESMGR_HXX
#include <tools/simplerm.hxx>
-#endif
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index f9fdd8ba3b19..9a8507a32419 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -47,9 +47,7 @@
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#ifndef _COM_SUN_STAR_UI_DIALOGS_FILEDIALOGRESULTS_HPP_
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#endif
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>