summaryrefslogtreecommitdiff
path: root/ucb/source
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2008-04-22 14:34:34 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2008-04-22 14:34:34 +0000
commit994a34b3abb72fa04200865021cabb9821d80338 (patch)
treea4690a304d71092690f523dd5c5411208de4b615 /ucb/source
parent6894f5315dc69e572f6811168172da7ba21ea1d5 (diff)
INTEGRATION: CWS hr50 (1.28.66); FILE MERGED
2008/03/05 14:02:07 hr 1.28.66.1: #i86574#: fix warning (gcc-4.2.3)
Diffstat (limited to 'ucb/source')
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontent.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 14e0f8865cb6..b3dfaba1fbb8 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: hierarchycontent.cxx,v $
- * $Revision: 1.30 $
+ * $Revision: 1.31 $
*
* This file is part of OpenOffice.org.
*
@@ -262,8 +262,9 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes()
pFolderTypes = pCollection;
}
}
- else
+ else {
OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+ }
}
else
{
@@ -293,8 +294,9 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes()
pDocumentTypes = pCollection;
}
}
- else
+ else {
OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
+ }
}
return (*pCollection).getTypes();