diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-04-22 14:34:47 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-04-22 14:34:47 +0000 |
| commit | 44d6e84a432d18aa998f6827f6b8e659ffa21342 (patch) | |
| tree | 739987d15e18db108569d114cc915664371a228e /ucb | |
| parent | 2de38b44eb27054f6e528812e21428c6701492d6 (diff) | |
INTEGRATION: CWS hr50 (1.9.112); FILE MERGED
2008/03/05 14:02:07 hr 1.9.112.1: #i86574#: fix warning (gcc-4.2.3)
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 993eca0779..933beec7f7 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: hierarchydatasource.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -730,8 +730,9 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes() pReadOnlyTypes = pCollection; } } - else + else { OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); + } } else { @@ -759,8 +760,9 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes() pReadWriteTypes = pCollection; } } - else + else { OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER(); + } } return (*pCollection).getTypes(); |