[Libreoffice-commits] .: tools/inc

[Joseph Powers]

 tools/inc/tools/pstm.hxx |   13 ++-----------
 tools/inc/tools/ref.hxx  |    6 ++----
 2 files changed, 4 insertions(+), 15 deletions(-)

New commits:
commit d9ecc206d98fcb09f4306eb4ca1a5de0d1db8159
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Mon Feb 14 21:26:13 2011 -0800

    Merge PRV_SV_DECL_REF_LOCK into SV_DECL_LOCK
    
    Also delete some commented out code.

diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx
index c3ab2cd..ca07f33 100644
--- a/tools/inc/tools/pstm.hxx
+++ b/tools/inc/tools/pstm.hxx
@@ -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
@@ -57,16 +57,7 @@ public:
 };
 
 /************************** S v R t t i B a s e **************************/
-/*
-#if defined (DOS) && defined (STC)
-#ifdef WIN
-#error Fuer Win muss der Kram virtual sein (MM/MH)
-#endif
-class SvRttiBase : public SvRefBase
-#else
-class SvRttiBase : virtual public SvRefBase
-#endif
-*/
+
 class TOOLS_DLLPUBLIC SvRttiBase : public SvRefBase
 {
 public:
diff --git a/tools/inc/tools/ref.hxx b/tools/inc/tools/ref.hxx
index cacf5fe..06c00e8 100644
--- a/tools/inc/tools/ref.hxx
+++ b/tools/inc/tools/ref.hxx
@@ -82,9 +82,6 @@ public:											\
 #define PRV_SV_DECL_REF( ClassName )			\
 PRV_SV_DECL_REF_LOCK( ClassName, Ref )
 
-#define PRV_SV_DECL_LOCK( ClassName )			\
-PRV_SV_DECL_REF_LOCK( ClassName, Lock )
-
 #define SV_DECL_REF( ClassName )				\
 class ClassName;								\
 class ClassName##Ref							\
@@ -96,7 +93,7 @@ class ClassName##Ref							\
 class ClassName;								\
 class ClassName##Lock							\
 {												\
-    PRV_SV_DECL_LOCK( ClassName )				\
+    PRV_SV_DECL_REF_LOCK( ClassName, Lock )     \
 };
 
 #define SV_IMPL_REF( ClassName )								\
@@ -145,6 +142,7 @@ inline void Append( const CN##MemberList & );\
 
 #define SV_DECL_REF_LIST(CN,EN) \
 PRV_SV_DECL_REF_LIST(CN,EN,/* empty */)
+
 #define SV_DECL_REF_LIST_VISIBILITY(CN,EN,vis) \
 PRV_SV_DECL_REF_LIST(CN,EN,vis)