diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:23:21 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:23:21 +0200 |
| commit | 5847d2ab92aa35223e03e1adab486d7c73e2349c (patch) | |
| tree | 66781e290f2adf8d25ca68681b1e95b93435ac81 /cppu/inc/typelib/uik.h | |
| parent | b8867927e2fee37ed60b1b8773bcc0dc7e2b91cd (diff) | |
recreated tag libreoffice-3.3.3.1 which had these commits:
commit dc53bbdbf2e1d0cbb53bb4619188955698f8a5c2 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue May 31 17:39:09 2011 +0200
Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)
commit e4601251b90e2555b032eadbdaa56dcfb91b5aae
Author: Noel Power <noel.power@novell.com>
Date: Wed Apr 13 18:52:58 2011 +0100
fix for fdo#35108 allow dot net clients to bootstrap libreoffice
Signed-off-by: Petr Mladek <pmladek@suse.cz>
cli_ure/source/native/native_bootstrap.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 1818bf1dbc330974c749ca17b4d7b79796587fae
Author: Jani Monoses <jani.monoses@canonical.com>
Date: Mon Mar 14 19:10:04 2011 +0100
prefer gcc __sync functions over pthread
Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
sal/osl/unx/interlck.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
Notes
split repo tag: ure_libreoffice-3.3.3.1
split repo tag: ure_libreoffice-3.3.4.1
Diffstat (limited to 'cppu/inc/typelib/uik.h')
| -rw-r--r-- | cppu/inc/typelib/uik.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cppu/inc/typelib/uik.h b/cppu/inc/typelib/uik.h index 026d376da9f2..d8ed652e4737 100644 --- a/cppu/inc/typelib/uik.h +++ b/cppu/inc/typelib/uik.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,15 +40,15 @@ */ typedef struct _typelib_Uik { - sal_uInt32 m_Data1; - sal_uInt16 m_Data2; - sal_uInt16 m_Data3; - sal_uInt32 m_Data4; - sal_uInt32 m_Data5; + sal_uInt32 m_Data1; + sal_uInt16 m_Data2; + sal_uInt16 m_Data3; + sal_uInt32 m_Data4; + sal_uInt32 m_Data5; } typelib_Uik; #if defined( SAL_W32) || defined(SAL_OS2) -# pragma pack(pop) +# pragma pack(pop) #endif #endif |