summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-02-02 22:15:42 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-02-02 22:15:42 +0000
commitff15e924fd3ec98290ec22215abbbb494777f0b8 (patch)
tree09498bc6c053993a35fdf11212e4651007fb1597 /cppuhelper
parentf1f8a965455b80da18bf47d0c91645ac4c69d964 (diff)
INTEGRATION: CWS geordi2q14 (1.11.14); FILE MERGED
2004/01/29 15:10:15 hr 1.11.14.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/source/propshlp.cxx9
1 files changed, 2 insertions, 7 deletions
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index bd7e4a47b551..d70d7f5edade 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: propshlp.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: vg $ $Date: 2003-10-06 12:57:11 $
+ * last change: $Author: hr $ $Date: 2004-02-02 23:15:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -102,11 +102,6 @@ int SAL_CALL compare_OUString_Property_Impl( const void *arg1, const void *arg2
* The class which implements the PropertySetInfo interface.
*/
-#if defined( MACOSX ) && ( __GNUC__ < 3 )
-// Initialize static template data here to break circular reference to libstatic
-ClassData1 WeakImplHelper1< ::com::sun::star::beans::XPropertySetInfo >::s_aCD(1);
-#endif
-
class OPropertySetHelperInfo_Impl
: public WeakImplHelper1< ::com::sun::star::beans::XPropertySetInfo >
{