diff options
author | Vincent LE GARREC <libreoffice@le-garrec.fr> | 2021-03-06 08:21:49 +0100 |
---|---|---|
committer | Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> | 2021-03-23 13:07:09 +0100 |
commit | 90c978f839e5029c69b4acb70f37909ee3016614 (patch) | |
tree | ac5c8cd53cf72ddc2336d53ab3f4b40661e30091 /fpicker | |
parent | 88eb9f73ff32ed5a2cf696de9e076e7dfee36d8d (diff) |
tdf#124176 Use pragma once in f*
filter, forms, fpicker, framework
Change-Id: I55a25ad2dc3749e63465e638e8eeea3c322eabbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112047
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Diffstat (limited to 'fpicker')
43 files changed, 43 insertions, 170 deletions
diff --git a/fpicker/inc/bitmaps.hlst b/fpicker/inc/bitmaps.hlst index 4951ead796f0..b7841db8813e 100644 --- a/fpicker/inc/bitmaps.hlst +++ b/fpicker/inc/bitmaps.hlst @@ -7,14 +7,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_FPICKER_INC_BITMAPS_HRC -#define INCLUDED_FPICKER_INC_BITMAPS_HRC +#pragma once #define RID_BMP_FOLDER_OPEN "res/folderop.png" #define BMP_FILEDLG_PLACE_LOCAL "fpicker/res/fp015.png" #define BMP_FILEDLG_PLACE_REMOTE "fpicker/res/fp016.png" #define RID_BMP_FOLDER "svtools/res/folder.png" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/fpicker/inc/fpsofficeResMgr.hxx b/fpicker/inc/fpsofficeResMgr.hxx index 195af8337c01..13721bb9635a 100644 --- a/fpicker/inc/fpsofficeResMgr.hxx +++ b/fpicker/inc/fpsofficeResMgr.hxx @@ -6,13 +6,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_FPSOFFICERESMGR_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_FPSOFFICERESMGR_HXX +#pragma once #include <unotools/resmgr.hxx> inline OUString FpsResId(const char* pId) { return Translate::get(pId, Translate::Create("fps")); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/inc/strings.hrc b/fpicker/inc/strings.hrc index b175069c05da..6037da706828 100644 --- a/fpicker/inc/strings.hrc +++ b/fpicker/inc/strings.hrc @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_INC_STRINGS_HRC -#define INCLUDED_VCL_INC_STRINGS_HRC +#pragma once #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) @@ -34,6 +33,4 @@ #define STR_SVT_NEW_FOLDER NC_("STR_SVT_NEW_FOLDER", "Folder") #define STR_SVT_NOREMOVABLEDEVICE NC_("STR_SVT_NOREMOVABLEDEVICE", "No removable storage device detected.\nMake sure it is plugged in properly and try again.") -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/aqua/AquaFilePickerDelegate.hxx b/fpicker/source/aqua/AquaFilePickerDelegate.hxx index fb158cd67633..51c34b71bec2 100644 --- a/fpicker/source/aqua/AquaFilePickerDelegate.hxx +++ b/fpicker/source/aqua/AquaFilePickerDelegate.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_AQUA_AQUAFILEPICKERDELEGATE_HXX -#define INCLUDED_FPICKER_SOURCE_AQUA_AQUAFILEPICKERDELEGATE_HXX +#pragma once #include <premac.h> #include <Cocoa/Cocoa.h> @@ -46,6 +45,4 @@ class FilterHelper; @end -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/aqua/CFStringUtilities.hxx b/fpicker/source/aqua/CFStringUtilities.hxx index ca8a84348525..b881081e29cf 100644 --- a/fpicker/source/aqua/CFStringUtilities.hxx +++ b/fpicker/source/aqua/CFStringUtilities.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_AQUA_CFSTRINGUTILITIES_HXX -#define INCLUDED_FPICKER_SOURCE_AQUA_CFSTRINGUTILITIES_HXX +#pragma once #include <premac.h> #include <Carbon/Carbon.h> @@ -39,6 +38,4 @@ OUString FSRefToOUString(FSRef const& fsRef, InfoType info = FULLPATH); OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info); CFStringRef CFStringCreateWithOUString(const OUString& aString); -#endif // INCLUDED_FPICKER_SOURCE_AQUA_CFSTRINGUTILITIES_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx index f984b5281c0f..5da540df61ec 100644 --- a/fpicker/source/aqua/ControlHelper.hxx +++ b/fpicker/source/aqua/ControlHelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_AQUA_CONTROLHELPER_HXX -#define INCLUDED_FPICKER_SOURCE_AQUA_CONTROLHELPER_HXX +#pragma once #include <rtl/ustring.hxx> #include <com/sun/star/uno/Any.hxx> @@ -182,6 +181,4 @@ private: void layoutControls(); }; -#endif // INCLUDED_FPICKER_SOURCE_AQUA_CONTROLHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx index 1cd1ea1fbb50..6cf4aec5996e 100644 --- a/fpicker/source/aqua/FilterHelper.hxx +++ b/fpicker/source/aqua/FilterHelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_AQUA_FILTERHELPER_HXX -#define INCLUDED_FPICKER_SOURCE_AQUA_FILTERHELPER_HXX +#pragma once #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/uno/Sequence.hxx> @@ -121,6 +120,4 @@ private: void ensureFilterList( const OUString& _rInitialCurrentFilter ); }; -#endif // INCLUDED_FPICKER_SOURCE_AQUA_FILTERHELPER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/aqua/NSString_OOoAdditions.hxx b/fpicker/source/aqua/NSString_OOoAdditions.hxx index cd33d959d739..eac18d46f315 100644 --- a/fpicker/source/aqua/NSString_OOoAdditions.hxx +++ b/fpicker/source/aqua/NSString_OOoAdditions.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_AQUA_NSSTRING_OOOADDITIONS_HXX -#define INCLUDED_FPICKER_SOURCE_AQUA_NSSTRING_OOOADDITIONS_HXX +#pragma once #include <premac.h> #import <Cocoa/Cocoa.h> @@ -31,6 +30,4 @@ - (OUString)OUString; @end -#endif // INCLUDED_FPICKER_SOURCE_AQUA_NSSTRING_OOOADDITIONS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.hxx b/fpicker/source/aqua/NSURL_OOoAdditions.hxx index bf1c76bad93a..f4e14e6e89bd 100644 --- a/fpicker/source/aqua/NSURL_OOoAdditions.hxx +++ b/fpicker/source/aqua/NSURL_OOoAdditions.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_AQUA_NSURL_OOOADDITIONS_HXX -#define INCLUDED_FPICKER_SOURCE_AQUA_NSURL_OOOADDITIONS_HXX +#pragma once #include <premac.h> #include <CoreFoundation/CoreFoundation.h> @@ -37,6 +36,4 @@ NSString* resolveAlias(NSString* i_pSystemPath); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/aqua/SalAquaConstants.h b/fpicker/source/aqua/SalAquaConstants.h index f5f03f6f2114..3fd14d53603b 100644 --- a/fpicker/source/aqua/SalAquaConstants.h +++ b/fpicker/source/aqua/SalAquaConstants.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_AQUA_SALAQUACONSTANTS_H -#define INCLUDED_FPICKER_SOURCE_AQUA_SALAQUACONSTANTS_H +#pragma once #define kAppFourCharCode 'LibO' #define kControlPropertyTracking 'Trck' @@ -52,6 +51,4 @@ #define kAquaPopupButtonDefaultHeight (26) -#endif // INCLUDED_FPICKER_SOURCE_AQUA_SALAQUACONSTANTS_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx index 93edde1a5b6f..3cf13fedb871 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.hxx +++ b/fpicker/source/aqua/SalAquaFilePicker.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFILEPICKER_HXX -#define INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFILEPICKER_HXX +#pragma once #include <cppuhelper/compbase.hxx> #include <com/sun/star/lang/XInitialization.hpp> @@ -158,6 +157,4 @@ public: void filterControlChanged(); }; -#endif // INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFILEPICKER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx index becfb3805a18..f563b1983b72 100644 --- a/fpicker/source/aqua/SalAquaFolderPicker.hxx +++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFOLDERPICKER_HXX -#define INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFOLDERPICKER_HXX +#pragma once #include <cppuhelper/implbase.hxx> #include <com/sun/star/util/XCancellable.hpp> @@ -93,6 +92,4 @@ private: SalAquaFolderPicker& operator=( const SalAquaFolderPicker& ) = delete; }; -#endif // INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAFOLDERPICKER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx index 63f76a6055ad..4eab78c52955 100644 --- a/fpicker/source/aqua/SalAquaPicker.hxx +++ b/fpicker/source/aqua/SalAquaPicker.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAPICKER_HXX -#define INCLUDED_FPICKER_SOURCE_AQUA_SALAQUAPICKER_HXX +#pragma once #include <osl/mutex.hxx> @@ -79,6 +78,4 @@ protected: void implInitialize(); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/aqua/resourceprovider.hxx b/fpicker/source/aqua/resourceprovider.hxx index 4e3849ed1de9..ba581389ff19 100644 --- a/fpicker/source/aqua/resourceprovider.hxx +++ b/fpicker/source/aqua/resourceprovider.hxx @@ -18,8 +18,7 @@ */ -#ifndef INCLUDED_FPICKER_SOURCE_AQUA_RESOURCEPROVIDER_HXX -#define INCLUDED_FPICKER_SOURCE_AQUA_RESOURCEPROVIDER_HXX +#pragma once #include <sal/config.h> @@ -44,6 +43,4 @@ NSString* getResString( sal_Int32 aId ); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx index 3495e95aedc3..89e527be2f21 100644 --- a/fpicker/source/office/OfficeControlAccess.hxx +++ b/fpicker/source/office/OfficeControlAccess.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_OFFICECONTROLACCESS_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICECONTROLACCESS_HXX +#pragma once #include <sal/config.h> @@ -133,6 +132,4 @@ namespace svt } // namespace svt -#endif // INCLUDED_FPICKER_SOURCE_OFFICE_OFFICECONTROLACCESS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 877dd15acaa6..b75a3f6368db 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -16,8 +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 . */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HXX +#pragma once #include <cppuhelper/implbase5.hxx> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> @@ -237,6 +236,4 @@ public: getSupportedServiceNames() override; }; -#endif // INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFILEPICKER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx index 6f3863b53157..7b98fb5bf903 100644 --- a/fpicker/source/office/OfficeFolderPicker.hxx +++ b/fpicker/source/office/OfficeFolderPicker.hxx @@ -16,8 +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 . */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFOLDERPICKER_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFOLDERPICKER_HXX +#pragma once #include <cppuhelper/implbase.hxx> #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> @@ -87,6 +86,4 @@ protected: virtual sal_Int16 implExecutePicker( ) override; }; -#endif // INCLUDED_FPICKER_SOURCE_OFFICE_OFFICEFOLDERPICKER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx index 58fae75fae40..ca507e06ae3a 100644 --- a/fpicker/source/office/PlacesListBox.hxx +++ b/fpicker/source/office/PlacesListBox.hxx @@ -6,8 +6,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_PLACESLISTBOX_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_PLACESLISTBOX_HXX +#pragma once #include "iodlg.hxx" @@ -63,6 +62,4 @@ private: DECL_LINK( DoubleClick, weld::TreeView&, bool ); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/QueryFolderName.hxx b/fpicker/source/office/QueryFolderName.hxx index 2a9b80f989a1..81bc4ad105ea 100644 --- a/fpicker/source/office/QueryFolderName.hxx +++ b/fpicker/source/office/QueryFolderName.hxx @@ -16,8 +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 . */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_QUERYFOLDERNAME_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_QUERYFOLDERNAME_HXX +#pragma once #include <vcl/weld.hxx> @@ -37,6 +36,4 @@ public: OUString GetName() const { return m_xNameEdit->get_text(); } }; -#endif // INCLUDED_FPICKER_SOURCE_OFFICE_QUERYFOLDERNAME_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index 64ae56412b5f..55cfa2870d59 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX -#define INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX +#pragma once #include "autocmpledit.hxx" #include <svtools/place.hxx> @@ -184,5 +183,4 @@ private: DECL_LINK( CancelHdl, weld::Button&, void ); }; -#endif // INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx index d644f88946e9..e2bac1208fb1 100644 --- a/fpicker/source/office/asyncfilepicker.hxx +++ b/fpicker/source/office/asyncfilepicker.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_ASYNCFILEPICKER_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_ASYNCFILEPICKER_HXX +#pragma once #include <tools/link.hxx> #include <rtl/ustring.hxx> @@ -91,6 +90,4 @@ namespace svt } // namespace svt -#endif // INCLUDED_FPICKER_SOURCE_OFFICE_ASYNCFILEPICKER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/autocmpledit.hxx b/fpicker/source/office/autocmpledit.hxx index 03ea58c48084..bfb2ee096a63 100644 --- a/fpicker/source/office/autocmpledit.hxx +++ b/fpicker/source/office/autocmpledit.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SVTOOLS_AUTOCMPLEDIT_HXX -#define INCLUDED_SVTOOLS_AUTOCMPLEDIT_HXX +#pragma once #include <vcl/idle.hxx> #include <vcl/weld.hxx> @@ -49,6 +48,4 @@ public: void ClearEntries(); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/breadcrumb.hxx b/fpicker/source/office/breadcrumb.hxx index 5a3f325168fe..5f476010c9d1 100644 --- a/fpicker/source/office/breadcrumb.hxx +++ b/fpicker/source/office/breadcrumb.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SVTOOLS_BREADCRUMB_HXX -#define INCLUDED_SVTOOLS_BREADCRUMB_HXX +#pragma once #include <vcl/weld.hxx> #include <map> @@ -68,6 +67,4 @@ public: void SetMode(SvtBreadcrumbMode eMode); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx index e68de462d9a4..1c24d8eb9e29 100644 --- a/fpicker/source/office/commonpicker.hxx +++ b/fpicker/source/office/commonpicker.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_COMMONPICKER_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_COMMONPICKER_HXX +#pragma once #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> @@ -188,6 +187,4 @@ namespace svt } // namespace svt -#endif // INCLUDED_FPICKER_SOURCE_OFFICE_COMMONPICKER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/contentenumeration.hxx b/fpicker/source/office/contentenumeration.hxx index f6a48c5c3360..9dcfae687883 100644 --- a/fpicker/source/office/contentenumeration.hxx +++ b/fpicker/source/office/contentenumeration.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_SOURCE_CONTNR_CONTENTENUMERATION_HXX -#define INCLUDED_SVTOOLS_SOURCE_CONTNR_CONTENTENUMERATION_HXX +#pragma once #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <salhelper/thread.hxx> @@ -230,6 +229,4 @@ namespace svt } // namespace svt -#endif // INCLUDED_SVTOOLS_SOURCE_CONTNR_CONTENTENUMERATION_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/fileview.hxx b/fpicker/source/office/fileview.hxx index 81b0cc6279c4..d86ee93900e1 100644 --- a/fpicker/source/office/fileview.hxx +++ b/fpicker/source/office/fileview.hxx @@ -16,8 +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 . */ -#ifndef INCLUDED_VCL_FILEVIEW_HXX -#define INCLUDED_VCL_FILEVIEW_HXX +#pragma once #include <memory> #include <com/sun/star/uno/Sequence.h> @@ -181,6 +180,4 @@ struct SvtContentEntry mbIsFolder( bIsFolder ), maURL( rURL ) {} }; -#endif // INCLUDED_VCL_FILEVIEW_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/foldertree.hxx b/fpicker/source/office/foldertree.hxx index 9dc019cdc03e..02381fc0bd58 100644 --- a/fpicker/source/office/foldertree.hxx +++ b/fpicker/source/office/foldertree.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_SVTOOLS_FOLDERTREE_HXX -#define INCLUDED_SVTOOLS_FOLDERTREE_HXX +#pragma once #include <com/sun/star/uno/Sequence.hxx> #include <vcl/weld.hxx> @@ -46,6 +45,4 @@ public: void SetDenyList(const css::uno::Sequence< OUString >& rDenyList); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/fpdialogbase.hxx b/fpicker/source/office/fpdialogbase.hxx index 21a8302549d0..ec9dbb0d5f4a 100644 --- a/fpicker/source/office/fpdialogbase.hxx +++ b/fpicker/source/office/fpdialogbase.hxx @@ -16,8 +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 . */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_FPDIALOGBASE_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_FPDIALOGBASE_HXX +#pragma once #include <vcl/weld.hxx> #include <com/sun/star/beans/StringPair.hpp> @@ -110,6 +109,4 @@ public: #define DIALOG_SIZE_CHANGED 5 -#endif // INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx index fb66488d8f0f..6aac9c18dcb6 100644 --- a/fpicker/source/office/fpinteraction.hxx +++ b/fpicker/source/office/fpinteraction.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_FPINTERACTION_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_FPINTERACTION_HXX +#pragma once #include <cppuhelper/implbase.hxx> #include <com/sun/star/task/XInteractionHandler.hpp> @@ -78,6 +77,4 @@ namespace svt } // namespace svt -#endif // INCLUDED_FPICKER_SOURCE_OFFICE_FPINTERACTION_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx index becb689a1078..5f9d4e32fa92 100644 --- a/fpicker/source/office/fpsmartcontent.hxx +++ b/fpicker/source/office/fpsmartcontent.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_FPSMARTCONTENT_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_FPSMARTCONTENT_HXX +#pragma once #include "fpinteraction.hxx" @@ -193,6 +192,4 @@ namespace svt } // namespace svt -#endif // INCLUDED_FPICKER_SOURCE_OFFICE_FPSMARTCONTENT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 32ff56462151..c53302038bb0 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -16,8 +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 . */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HXX +#pragma once #include <memory> #include <com/sun/star/beans/StringPair.hpp> @@ -302,6 +301,4 @@ inline SvtFileView* SvtFileDialog::GetView() return m_xFileView.get(); } -#endif // INCLUDED_FPICKER_SOURCE_OFFICE_IODLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 0d074f1f610b..7300ab16e5e3 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -16,8 +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 . */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_IODLGIMP_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_IODLGIMP_HXX +#pragma once #include "PlacesListBox.hxx" @@ -203,6 +202,4 @@ public: void SetCurFilter( SvtFileDialogFilter_Impl const * _pFilter, const OUString& rDisplayName ); }; -#endif // INCLUDED_FPICKER_SOURCE_OFFICE_IODLGIMP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/pickercallbacks.hxx b/fpicker/source/office/pickercallbacks.hxx index 9c965f7d37f7..dcc82c0839a1 100644 --- a/fpicker/source/office/pickercallbacks.hxx +++ b/fpicker/source/office/pickercallbacks.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_OFFICE_PICKERCALLBACKS_HXX -#define INCLUDED_FPICKER_SOURCE_OFFICE_PICKERCALLBACKS_HXX +#pragma once #include <sal/types.h> #include <rtl/ustring.hxx> @@ -49,6 +48,4 @@ namespace svt } // namespace svt -#endif // INCLUDED_FPICKER_SOURCE_OFFICE_PICKERCALLBACKS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/FilterContainer.hxx b/fpicker/source/win32/FilterContainer.hxx index f54b10a7f3f0..a1e498cef3f0 100644 --- a/fpicker/source/win32/FilterContainer.hxx +++ b/fpicker/source/win32/FilterContainer.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILTERCONTAINER_HXX -#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_FILTERCONTAINER_HXX +#pragma once #include <sal/types.h> #include <rtl/ustring.hxx> @@ -105,6 +104,4 @@ private: OUString makeWinFilterBuffer( CFilterContainer& aFilterContainer ); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/VistaFilePicker.hxx b/fpicker/source/win32/VistaFilePicker.hxx index 53879c0c8742..026c0e859c09 100644 --- a/fpicker/source/win32/VistaFilePicker.hxx +++ b/fpicker/source/win32/VistaFilePicker.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKER_HXX -#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKER_HXX +#pragma once #include "asyncrequests.hxx" #include "VistaFilePickerImpl.hxx" @@ -228,6 +227,4 @@ public: } // namespace win32 } // namespace fpicker -#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/VistaFilePickerEventHandler.hxx index 3ea47dbd8640..71199cd07b45 100644 --- a/fpicker/source/win32/VistaFilePickerEventHandler.hxx +++ b/fpicker/source/win32/VistaFilePickerEventHandler.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKEREVENTHANDLER_HXX -#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKEREVENTHANDLER_HXX +#pragma once #include <shobjidl.h> @@ -190,6 +189,4 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex } // namespace win32 } // namespace fpicker -#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKEREVENTHANDLER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/VistaFilePickerImpl.hxx b/fpicker/source/win32/VistaFilePickerImpl.hxx index c191330f4f16..ec7d1e2cddf6 100644 --- a/fpicker/source/win32/VistaFilePickerImpl.hxx +++ b/fpicker/source/win32/VistaFilePickerImpl.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKERIMPL_HXX -#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKERIMPL_HXX +#pragma once #include "platform_vista.h" @@ -318,6 +317,4 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex } // namespace win32 } // namespace fpicker -#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTAFILEPICKERIMPL_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/WinImplHelper.hxx b/fpicker/source/win32/WinImplHelper.hxx index 860572415ba1..9f7e16e94ac3 100644 --- a/fpicker/source/win32/WinImplHelper.hxx +++ b/fpicker/source/win32/WinImplHelper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_WIN32_MISC_WINIMPLHELPER_HXX -#define INCLUDED_FPICKER_SOURCE_WIN32_MISC_WINIMPLHELPER_HXX +#pragma once #include <sal/types.h> #include <rtl/ustring.hxx> @@ -47,6 +46,4 @@ OUString SOfficeToWindowsLabel(const OUString& aSOLabel); // '~' -> '~~' OUString WindowsToSOfficeLabel(const OUString& aWinLabel); -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/asyncrequests.hxx b/fpicker/source/win32/asyncrequests.hxx index 5fbd7dde848f..410d4241311e 100644 --- a/fpicker/source/win32/asyncrequests.hxx +++ b/fpicker/source/win32/asyncrequests.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_ASYNCREQUESTS_HXX -#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_ASYNCREQUESTS_HXX +#pragma once #include <cppuhelper/basemutex.hxx> #include <comphelper/sequenceashashmap.hxx> @@ -209,6 +208,4 @@ class AsyncRequests final: private ::cppu::BaseMutex } // namespace win32 } // namespace fpicker -#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_ASYNCREQUESTS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/platform_vista.h b/fpicker/source/win32/platform_vista.h index a6e6d2121dbe..ab3f7c52c213 100644 --- a/fpicker/source/win32/platform_vista.h +++ b/fpicker/source/win32/platform_vista.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PLATFORM_VISTA_H -#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_PLATFORM_VISTA_H +#pragma once #undef _WTL_NO_CSTRING @@ -41,6 +40,4 @@ #endif #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/resourceprovider.hxx b/fpicker/source/win32/resourceprovider.hxx index 722d172294b5..09ae8339ba2a 100644 --- a/fpicker/source/win32/resourceprovider.hxx +++ b/fpicker/source/win32/resourceprovider.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_WIN32_MISC_RESOURCEPROVIDER_HXX -#define INCLUDED_FPICKER_SOURCE_WIN32_MISC_RESOURCEPROVIDER_HXX +#pragma once #include <sal/config.h> @@ -33,6 +32,4 @@ namespace CResourceProvider OUString getResString(sal_Int16 aId); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/shared.hxx b/fpicker/source/win32/shared.hxx index 2e4427f6de9e..4f822b742149 100644 --- a/fpicker/source/win32/shared.hxx +++ b/fpicker/source/win32/shared.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_SHARED_HXX -#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_SHARED_HXX +#pragma once #include <rtl/ustring.hxx> @@ -27,5 +26,4 @@ const OUString FILTER_SEPARATOR("------------------------------------------"); const OUString ALL_FILES_WILDCARD("*.*"); const bool ALLOW_DUPLICATES = true; -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/win32/vistatypes.h b/fpicker/source/win32/vistatypes.h index 5e6c62a439f3..a6a08faa5915 100644 --- a/fpicker/source/win32/vistatypes.h +++ b/fpicker/source/win32/vistatypes.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTATYPES_H -#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTATYPES_H +#pragma once #include <shobjidl.h> #include <systools/win32/comtools.hxx> @@ -41,6 +40,4 @@ typedef sal::systools::COMReference<IFileDialogCustomize> TFileDialogCustomize; } // namespace win32 } // namespace fpicker -#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_VISTATYPES_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |