[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/source

[Stanislav Horacek]

 helpcontent2                         |    2 +-
 sw/source/filter/ww8/sortedarray.hxx |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 16b47b7c2aefbda22265646ba43dad07ff805178
Author: Stanislav Horacek <stanislav.horacek at gmail.com>
Date:   Sun Nov 30 22:05:07 2014 +0100

    Updated core
    Project: help  a8a62b8e5bda4526eeb9525509ce7313d14784e3
    
    Image is not in Media submenu anymore
    
    Change-Id: Idf5a1c9c2f6b3ef95a72613aedd15f743280ad95
    Reviewed-on: https://gerrit.libreoffice.org/13223
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/helpcontent2 b/helpcontent2
index 14477a8..a8a62b8 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 14477a85f297b5bbae784789e86e8e9f574fc506
+Subproject commit a8a62b8e5bda4526eeb9525509ce7313d14784e3
commit 0ba5ea1b5b6f80b34a178bc2c84e34b15ed4e77f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 1 09:20:48 2014 +0000

    fix higher level debug build
    
    Change-Id: I6a1f92100c08dd1523fc9b02c070a5039041cb13

diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx
index 8b6817c..0c96060 100644
--- a/sw/source/filter/ww8/sortedarray.hxx
+++ b/sw/source/filter/ww8/sortedarray.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_FILTER_WW8_SORTEDARRAY_HXX
 #define INCLUDED_SW_SOURCE_FILTER_WW8_SORTEDARRAY_HXX
 
+#include <osl/diagnose.h>
 #include <algorithm>
 
 //simple template that manages a static [] array by sorting at construction