[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - svx/source

[Szymon KÅ‚os (via logerrit)]

 svx/source/xoutdev/xattr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7f27f0559bc1101441dcebd9af6d4ac9a0b0f11e
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Jul 3 14:59:28 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Jul 3 15:18:14 2020 +0200

    Fix redefinition of StringMap
    
    Noticed in tinderbox windows build
    
    Change-Id: I525e1c8ef1b25d0e13844b43865c317514c6e434
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97857
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 10795e34f54a..682396b0de5e 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -90,12 +90,12 @@
 #include <vcl/gradient.hxx>
 #include <svx/svxids.hrc>
 #include <string>
+#include <vcl/uitest/uiobject.hxx>
 
 #include <libxml/xmlwriter.h>
 
 using namespace ::com::sun::star;
 
-typedef std::map<OUString, OUString> StringMap;
 
 static long ScaleMetricValue( long nVal, long nMul, long nDiv )
 {