[Libreoffice-commits] core.git: dtrans/source dtrans/test
George Bateman (via logerrit)
logerrit at kemper.freedesktop.org
Sun Sep 13 15:52:03 UTC 2020
dtrans/source/cnttype/mcnttfactory.hxx | 5 +----
dtrans/source/cnttype/mcnttype.hxx | 5 +----
dtrans/source/generic/clipboardmanager.hxx | 5 +----
dtrans/source/generic/generic_clipboard.hxx | 5 +----
dtrans/source/inc/DtObjFactory.hxx | 5 +----
dtrans/source/inc/WinClip.hxx | 5 +----
dtrans/source/win32/clipb/APNDataObject.hxx | 5 +----
dtrans/source/win32/clipb/MtaOleClipb.hxx | 5 +----
dtrans/source/win32/clipb/WinClipbImpl.hxx | 5 +----
dtrans/source/win32/clipb/WinClipboard.hxx | 5 +----
dtrans/source/win32/dnd/globals.hxx | 5 +----
dtrans/source/win32/dnd/idroptarget.hxx | 4 +---
dtrans/source/win32/dnd/source.hxx | 5 +----
dtrans/source/win32/dnd/sourcecontext.hxx | 5 +----
dtrans/source/win32/dnd/target.hxx | 5 +----
dtrans/source/win32/dnd/targetdragcontext.hxx | 5 +----
dtrans/source/win32/dnd/targetdropcontext.hxx | 4 +---
dtrans/source/win32/dtobj/APNDataObject.hxx | 5 +----
dtrans/source/win32/dtobj/DOTransferable.hxx | 5 +----
dtrans/source/win32/dtobj/DTransHelper.hxx | 5 +----
dtrans/source/win32/dtobj/DataFmtTransl.hxx | 5 +----
dtrans/source/win32/dtobj/Fetc.hxx | 5 +----
dtrans/source/win32/dtobj/FetcList.hxx | 5 +----
dtrans/source/win32/dtobj/FmtFilter.hxx | 5 +----
dtrans/source/win32/dtobj/MimeAttrib.hxx | 5 +----
dtrans/source/win32/dtobj/TxtCnvtHlp.hxx | 5 +----
dtrans/source/win32/dtobj/XNotifyingDataObject.hxx | 5 +----
dtrans/source/win32/dtobj/XTDataObject.hxx | 5 +----
dtrans/source/win32/ftransl/ftransl.hxx | 5 +----
dtrans/source/win32/misc/ImplHelper.hxx | 5 +----
dtrans/source/win32/workbench/XTDo.hxx | 5 +----
dtrans/test/win32/dnd/atlwindow.hxx | 5 +----
dtrans/test/win32/dnd/sourcelistener.hxx | 5 +----
dtrans/test/win32/dnd/targetlistener.hxx | 5 +----
dtrans/test/win32/dnd/transferable.hxx | 5 +----
35 files changed, 35 insertions(+), 138 deletions(-)
New commits:
commit 3dbc14db0aad072844b30e873c2d53978ea8e1c3
Author: George Bateman <george.bateman16 at gmail.com>
AuthorDate: Sun Sep 13 12:14:02 2020 +0000
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sun Sep 13 17:51:26 2020 +0200
tdf#124176 Use #pragma once in dtrans
This commit was carried out by a Python script, source of which
is at https://bugs.documentfoundation.org/show_bug.cgi?id=124176#c97.
Change-Id: I8a16d58b4adec5aa0d35a2c50e088039fa6e5148
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102575
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx
index 06d671c6bb1a..c9bd3518cdf3 100644
--- a/dtrans/source/cnttype/mcnttfactory.hxx
+++ b/dtrans/source/cnttype/mcnttfactory.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTFACTORY_HXX
-#define INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTFACTORY_HXX
+#pragma once
#include <rtl/ustring.hxx>
#include <sal/types.h>
@@ -47,6 +46,4 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx
index 6b2dd4c8e925..c4053066b733 100644
--- a/dtrans/source/cnttype/mcnttype.hxx
+++ b/dtrans/source/cnttype/mcnttype.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTYPE_HXX
-#define INCLUDED_DTRANS_SOURCE_CNTTYPE_MCNTTYPE_HXX
+#pragma once
#include <cppuhelper/implbase.hxx>
#include <rtl/ustring.hxx>
@@ -56,6 +55,4 @@ private:
std::map< OUString, OUString > m_ParameterMap;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx
index 2750b61246cb..56e69617dc5f 100644
--- a/dtrans/source/generic/clipboardmanager.hxx
+++ b/dtrans/source/generic/clipboardmanager.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_GENERIC_CLIPBOARDMANAGER_HXX
-#define INCLUDED_DTRANS_SOURCE_GENERIC_CLIPBOARDMANAGER_HXX
+#pragma once
#include <cppuhelper/compbase.hxx>
@@ -88,6 +87,4 @@ namespace dtrans
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx
index f23a0cc9a120..3c9126bcc535 100644
--- a/dtrans/source/generic/generic_clipboard.hxx
+++ b/dtrans/source/generic/generic_clipboard.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_GENERIC_GENERIC_CLIPBOARD_HXX
-#define INCLUDED_DTRANS_SOURCE_GENERIC_GENERIC_CLIPBOARD_HXX
+#pragma once
#include <cppuhelper/compbase.hxx>
@@ -99,6 +98,4 @@ namespace dtrans
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/inc/DtObjFactory.hxx b/dtrans/source/inc/DtObjFactory.hxx
index be8bf8dbcb3e..b5d5f5007589 100644
--- a/dtrans/source/inc/DtObjFactory.hxx
+++ b/dtrans/source/inc/DtObjFactory.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_INC_DTOBJFACTORY_HXX
-#define INCLUDED_DTRANS_SOURCE_INC_DTOBJFACTORY_HXX
+#pragma once
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -31,6 +30,4 @@ namespace CDTransObjFactory
const css::uno::Reference< css::datatransfer::XTransferable >& refXTransferable );
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/inc/WinClip.hxx b/dtrans/source/inc/WinClip.hxx
index 69d4c500c242..f90d5eea063f 100644
--- a/dtrans/source/inc/WinClip.hxx
+++ b/dtrans/source/inc/WinClip.hxx
@@ -17,13 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_INC_WINCLIP_HXX
-#define INCLUDED_DTRANS_SOURCE_INC_WINCLIP_HXX
+#pragma once
#include <sal/types.h>
const sal_Int32 CF_INVALID = 0;
-#endif // INCLUDED_DTRANS_SOURCE_INC_WINCLIP_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/clipb/APNDataObject.hxx b/dtrans/source/win32/clipb/APNDataObject.hxx
index c48d14117ef7..6937babc0dee 100644
--- a/dtrans/source/win32/clipb/APNDataObject.hxx
+++ b/dtrans/source/win32/clipb/APNDataObject.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_APNDATAOBJECT_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_APNDATAOBJECT_HXX
+#pragma once
/*
an APartment Neutral dataobject wrapper; this wrapper of an IDataObject
@@ -67,6 +66,4 @@ private:
CAPNDataObject& operator=( const CAPNDataObject& theOther );
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.hxx b/dtrans/source/win32/clipb/MtaOleClipb.hxx
index bf71ac26e8f8..c406f81aafd3 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.hxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_MTAOLECLIPB_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_MTAOLECLIPB_HXX
+#pragma once
#include <sal/types.h>
#include <osl/mutex.hxx>
@@ -112,6 +111,4 @@ private:
friend LRESULT CALLBACK mtaOleReqWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx
index cd5878e6b794..9fd2fb894a8c 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.hxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_WINCLIPBIMPL_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_WINCLIPBIMPL_HXX
+#pragma once
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -101,6 +100,4 @@ private:
friend class CXNotifyingDataObject;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx
index db3f1ab188ed..a00375926456 100644
--- a/dtrans/source/win32/clipb/WinClipboard.hxx
+++ b/dtrans/source/win32/clipb/WinClipboard.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_WINCLIPBOARD_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_CLIPB_WINCLIPBOARD_HXX
+#pragma once
#include <rtl/ustring.hxx>
#include <sal/types.h>
@@ -118,6 +117,4 @@ private:
friend class CWinClipbImpl;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx
index 6c1a31f84a7f..824c56a5aa73 100644
--- a/dtrans/source/win32/dnd/globals.hxx
+++ b/dtrans/source/win32/dnd/globals.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_DTRANS_SOURCE_WIN32_DND_GLOBALS_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DND_GLOBALS_HXX
+#pragma once
#include <sal/config.h>
@@ -70,6 +69,4 @@ struct MutexDummy
extern css::uno::Reference<css::datatransfer::XTransferable> g_XTransferable;
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dnd/idroptarget.hxx b/dtrans/source/win32/dnd/idroptarget.hxx
index a86739f87cdd..8bb2216aae4c 100644
--- a/dtrans/source/win32/dnd/idroptarget.hxx
+++ b/dtrans/source/win32/dnd/idroptarget.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_DTRANS_SOURCE_WIN32_DND_IDROPTARGET_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DND_IDROPTARGET_HXX
+#pragma once
#include "target.hxx"
@@ -62,6 +61,5 @@ public:
/* [out][in] */ DWORD __RPC_FAR *pdwEffect) override;
};
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx
index 8ec0162c3ace..876f5895224a 100644
--- a/dtrans/source/win32/dnd/source.hxx
+++ b/dtrans/source/win32/dnd/source.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_SOURCE_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DND_SOURCE_HXX
+#pragma once
#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
@@ -122,6 +121,4 @@ public:
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dnd/sourcecontext.hxx b/dtrans/source/win32/dnd/sourcecontext.hxx
index 81b1682ebff9..60609559a121 100644
--- a/dtrans/source/win32/dnd/sourcecontext.hxx
+++ b/dtrans/source/win32/dnd/sourcecontext.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_DTRANS_SOURCE_WIN32_DND_SOURCECONTEXT_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DND_SOURCECONTEXT_HXX
+#pragma once
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
#include <cppuhelper/compbase.hxx>
@@ -65,6 +64,4 @@ public:
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx
index 3f266b24033b..8f4a13f13ac9 100644
--- a/dtrans/source/win32/dnd/target.hxx
+++ b/dtrans/source/win32/dnd/target.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_DTRANS_SOURCE_WIN32_DND_TARGET_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGET_HXX
+#pragma once
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
@@ -172,6 +171,4 @@ protected:
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dnd/targetdragcontext.hxx b/dtrans/source/win32/dnd/targetdragcontext.hxx
index a8f48cad193e..c55a8fe673e9 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdragcontext.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDRAGCONTEXT_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDRAGCONTEXT_HXX
+#pragma once
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
@@ -47,6 +46,4 @@ public:
virtual void SAL_CALL rejectDrag( ) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dnd/targetdropcontext.hxx b/dtrans/source/win32/dnd/targetdropcontext.hxx
index b7db849fe4e1..8584c581db0a 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdropcontext.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDROPCONTEXT_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DND_TARGETDROPCONTEXT_HXX
+#pragma once
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp>
@@ -49,6 +48,5 @@ public:
// XDropTargetDropContext (inherits XDropTargetDragContext)
virtual void SAL_CALL dropComplete( sal_Bool success ) override;
};
-#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/APNDataObject.hxx b/dtrans/source/win32/dtobj/APNDataObject.hxx
index 2c1d9718ec2f..69f5c9bd313a 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.hxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_APNDATAOBJECT_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_APNDATAOBJECT_HXX
+#pragma once
#include <systools/win32/comtools.hxx>
@@ -69,6 +68,4 @@ private:
CAPNDataObject& operator=( const CAPNDataObject& theOther );
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx
index f45e18c4f85a..af2d2008cf37 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.hxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DOTRANSFERABLE_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DOTRANSFERABLE_HXX
+#pragma once
#include <com/sun/star/datatransfer/XTransferable.hpp>
@@ -91,6 +90,4 @@ private:
CDOTransferable& operator=( const CDOTransferable& );
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx
index d677184fb0ee..9ec202c11d07 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.hxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DTRANSHELPER_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DTRANSHELPER_HXX
+#pragma once
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
@@ -165,6 +164,4 @@ private:
LPVOID m_pGlobMem;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
index 3fad9bbdc89a..3d748751b79c 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DATAFMTTRANSL_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_DATAFMTTRANSL_HXX
+#pragma once
#include <com/sun/star/datatransfer/XDataFormatTranslator.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
@@ -62,6 +61,4 @@ private:
css::uno::Reference< css::datatransfer::XDataFormatTranslator > m_XDataFormatTranslator;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/Fetc.hxx b/dtrans/source/win32/dtobj/Fetc.hxx
index 5ec3e4b9459e..e0880acd645d 100644
--- a/dtrans/source/win32/dtobj/Fetc.hxx
+++ b/dtrans/source/win32/dtobj/Fetc.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FETC_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FETC_HXX
+#pragma once
#include <sal/types.h>
@@ -74,6 +73,4 @@ private:
bool operator==( const CFormatEtc& lhs, const CFormatEtc& rhs );
bool operator!=( const CFormatEtc& lhs, const CFormatEtc& rhs );
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/FetcList.hxx b/dtrans/source/win32/dtobj/FetcList.hxx
index cf7697e1ba1e..2df28ff5758e 100644
--- a/dtrans/source/win32/dtobj/FetcList.hxx
+++ b/dtrans/source/win32/dtobj/FetcList.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FETCLIST_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FETCLIST_HXX
+#pragma once
#include <sal/types.h>
#include <com/sun/star/datatransfer/XTransferable.hpp>
@@ -137,6 +136,4 @@ private:
CFormatRegistrar& operator=( const CFormatRegistrar& );
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/FmtFilter.hxx b/dtrans/source/win32/dtobj/FmtFilter.hxx
index 1c2325851208..3c05c953c95d 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.hxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FMTFILTER_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_FMTFILTER_HXX
+#pragma once
#include <sal/types.h>
@@ -82,6 +81,4 @@ css::uno::Sequence< sal_Int8 > TextHtmlToHTMLFormat( css::uno::Sequence< sal_Int
*/
css::uno::Sequence< sal_Int8 > CF_HDROPToFileList(HGLOBAL hGlobal);
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/MimeAttrib.hxx b/dtrans/source/win32/dtobj/MimeAttrib.hxx
index eb57ba750ea1..dc8c3ef86fbb 100644
--- a/dtrans/source/win32/dtobj/MimeAttrib.hxx
+++ b/dtrans/source/win32/dtobj/MimeAttrib.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_MIMEATTRIB_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_MIMEATTRIB_HXX
+#pragma once
#include <rtl/ustring.hxx>
@@ -29,6 +28,4 @@ const OUString PRE_OEM_CODEPAGE ("cp");
const OUString CHARSET_UTF16 ("utf-16");
const OUString CHARSET_UNICODE ("unicode");
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
index 9f8d47209d9c..70bd4e32ab67 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
+++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_TXTCNVTHLP_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_TXTCNVTHLP_HXX
+#pragma once
#include <com/sun/star/datatransfer/DataFlavor.hpp>
@@ -39,6 +38,4 @@ int WideCharToMultiByteEx( UINT cp_dest,
CStgTransferHelper& refDTransHelper,
BOOL bEnsureTrailingZero = TRUE );
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
index 0d72c760f4c2..2fb3025a03fa 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_XNOTIFYINGDATAOBJECT_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_XNOTIFYINGDATAOBJECT_HXX
+#pragma once
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
@@ -83,6 +82,4 @@ private:
friend class CWinClipbImpl;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx
index ca30bbea2434..77f8c53f2925 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_XTDATAOBJECT_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_DTOBJ_XTDATAOBJECT_HXX
+#pragma once
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
@@ -132,6 +131,4 @@ private:
typedef CEnumFormatEtc *PCEnumFormatEtc;
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx
index 71d8038d2b23..a5c7466ae138 100644
--- a/dtrans/source/win32/ftransl/ftransl.hxx
+++ b/dtrans/source/win32/ftransl/ftransl.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_FTRANSL_FTRANSL_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_FTRANSL_FTRANSL_HXX
+#pragma once
#include <rtl/ustring.hxx>
#include <sal/types.h>
@@ -57,6 +56,4 @@ private:
const css::uno::Reference< css::uno::XComponentContext > m_xContext;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/misc/ImplHelper.hxx b/dtrans/source/win32/misc/ImplHelper.hxx
index 2d39e0727551..fbe2c7ae70e5 100644
--- a/dtrans/source/win32/misc/ImplHelper.hxx
+++ b/dtrans/source/win32/misc/ImplHelper.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_MISC_IMPLHELPER_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_MISC_IMPLHELPER_HXX
+#pragma once
#include <sal/types.h>
#include <rtl/ustring.hxx>
@@ -72,6 +71,4 @@ bool IsOEMCP( sal_uInt32 codepage );
OUString cptostr( sal_uInt32 codepage );
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/workbench/XTDo.hxx b/dtrans/source/win32/workbench/XTDo.hxx
index 50f8425593e4..095987a49d0a 100644
--- a/dtrans/source/win32/workbench/XTDo.hxx
+++ b/dtrans/source/win32/workbench/XTDo.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_SOURCE_WIN32_WORKBENCH_XTDO_HXX
-#define INCLUDED_DTRANS_SOURCE_WIN32_WORKBENCH_XTDO_HXX
+#pragma once
#if defined _MSC_VER
#pragma warning(push,1)
@@ -109,6 +108,4 @@ private:
typedef CEnumFormatEtc *PCEnumFormatEtc;
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/test/win32/dnd/atlwindow.hxx b/dtrans/test/win32/dnd/atlwindow.hxx
index 378407274b56..047acf6769b1 100644
--- a/dtrans/test/win32/dnd/atlwindow.hxx
+++ b/dtrans/test/win32/dnd/atlwindow.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_DTRANS_TEST_WIN32_DND_ATLWINDOW_HXX
-#define INCLUDED_DTRANS_TEST_WIN32_DND_ATLWINDOW_HXX
+#pragma once
#include <atlbase.h>
extern CComModule _Module;
#include <atlcom.h>
@@ -85,6 +84,4 @@ public:
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/test/win32/dnd/sourcelistener.hxx b/dtrans/test/win32/dnd/sourcelistener.hxx
index 686d95c11025..0fc051399042 100644
--- a/dtrans/test/win32/dnd/sourcelistener.hxx
+++ b/dtrans/test/win32/dnd/sourcelistener.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_TEST_WIN32_DND_SOURCELISTENER_HXX
-#define INCLUDED_DTRANS_TEST_WIN32_DND_SOURCELISTENER_HXX
+#pragma once
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
@@ -54,6 +53,4 @@ public:
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/test/win32/dnd/targetlistener.hxx b/dtrans/test/win32/dnd/targetlistener.hxx
index 153dc64eead5..f42fac33aec5 100644
--- a/dtrans/test/win32/dnd/targetlistener.hxx
+++ b/dtrans/test/win32/dnd/targetlistener.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DTRANS_TEST_WIN32_DND_TARGETLISTENER_HXX
-#define INCLUDED_DTRANS_TEST_WIN32_DND_TARGETLISTENER_HXX
+#pragma once
#if defined _MSC_VER
#pragma warning(push,1)
@@ -62,6 +61,4 @@ public:
throw(RuntimeException);
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/test/win32/dnd/transferable.hxx b/dtrans/test/win32/dnd/transferable.hxx
index 1323a2cd5aaa..fef9cda50635 100644
--- a/dtrans/test/win32/dnd/transferable.hxx
+++ b/dtrans/test/win32/dnd/transferable.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_DTRANS_TEST_WIN32_DND_TRANSFERABLE_HXX
-#define INCLUDED_DTRANS_TEST_WIN32_DND_TRANSFERABLE_HXX
+#pragma once
#include <cppuhelper/servicefactory.hxx>
#include <com/sun/star/datatransfer/XTransferable.hpp>
@@ -87,6 +86,4 @@ private:
OUString m_Data;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list