diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-20 20:04:51 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-09-22 20:52:34 +0200 |
| commit | bb406680cebd6fa1e1bdb9e2de430cd9a1f44da0 (patch) | |
| tree | e9a843090a3b8842792f1b45cb31d6c415e613d8 /include/oox | |
| parent | ca8a4c81a4194cfaa526bd8071a2243aad0f3461 (diff) | |
Put definition of _CRT_RAND_S into bin/update_pch
so it doesn't get removed again from sal/inc/pch/precompiled_sal.hxx
(see commit 4af9612f2be9e023e762831207cbdb1d5f25906f).
Also make necessary changes to some of the files that start to fail
building after running bin/update_pch.sh, so that the patch is
self-contained and leaves the tree in fully functional state.
tools namespace had to be prepended with :: to disambiguate from
drawinglayer::tools
vcl/inc/window.h includes were amended, because ExtTextInputAttr is
from vcl/commandevent.hxx, and enum class ShowTrackFlags is from
vcl/window.hxx
Change-Id: I47179622350754cba2f95d26a1bafd3dfbbc935b
Reviewed-on: https://gerrit.libreoffice.org/42559
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/token/relationship.hxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/oox/token/relationship.hxx b/include/oox/token/relationship.hxx index 18cca8523749..24a34d9ab642 100644 --- a/include/oox/token/relationship.hxx +++ b/include/oox/token/relationship.hxx @@ -7,6 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#ifndef INCLUDED_OOX_TOKEN_RELATIONSHIP_HXX +#define INCLUDED_OOX_TOKEN_RELATIONSHIP_HXX + #include <oox/dllapi.h> #include <rtl/ustring.hxx> @@ -64,4 +67,6 @@ OUString OOX_DLLPUBLIC getRelationship(Relationship eRelationship); } +#endif // INCLUDED_OOX_TOKEN_RELATIONSHIP_HXX + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |