summaryrefslogtreecommitdiff
path: root/sot/inc
diff options
context:
space:
mode:
authorAshod Nakashian <ashodnakashian@yahoo.com>2015-11-10 16:34:55 -0500
committerMichael Stahl <mstahl@redhat.com>2015-11-10 22:18:45 +0000
commitbf6d72afeac77b791f5770a6bb353d4d133e9e56 (patch)
tree22c24139528cfc49158f1fa177ed162cf70dd109 /sot/inc
parent4db3342e84dbbc80e0cb893b4739f6c617e9c19c (diff)
Missing includes
Restored some missing includes and refactored sot/formats.hxx. Change-Id: I11b7102b06889f426f5e0f3efa3a835c6e774d88 Reviewed-on: https://gerrit.libreoffice.org/19891 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sot/inc')
-rw-r--r--sot/inc/sysformats.hxx36
1 files changed, 36 insertions, 0 deletions
diff --git a/sot/inc/sysformats.hxx b/sot/inc/sysformats.hxx
new file mode 100644
index 000000000000..ccad25210050
--- /dev/null
+++ b/sot/inc/sysformats.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * 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_SOT_SYSFORMATS_HXX
+#define INCLUDED_SOT_SYSFORMATS_HXX
+
+#ifdef WNT
+#ifdef _MSC_VER
+#pragma warning(push, 1)
+#pragma warning(disable: 4917)
+#endif
+#include <shlobj.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#endif
+
+#endif // INCLUDED_SOT_SYSFORMATS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */