summaryrefslogtreecommitdiff
path: root/vos
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2006-06-02 11:37:38 +0000
committerVladimir Glazounov <vg@openoffice.org>2006-06-02 11:37:38 +0000
commit9b2e1a97fb1bf8919c2b270434438d2affe79134 (patch)
treef45513ea22fd539f27d1eb64c4e6172440abd2c1 /vos
parent0919a61de755b308795ab8896c6e9adce65273e0 (diff)
INTEGRATION: CWS vgcleanupmacros (1.4.12); FILE MERGED
2006/05/17 11:23:17 vg 1.4.12.1: #i65486# cleanup:remove obsolete macros
Diffstat (limited to 'vos')
-rw-r--r--vos/inc/vos/object.hxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/vos/inc/vos/object.hxx b/vos/inc/vos/object.hxx
index 5cdb2963bbe3..79b258575579 100644
--- a/vos/inc/vos/object.hxx
+++ b/vos/inc/vos/object.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: object.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: hr $ $Date: 2005-12-28 17:33:29 $
+ * last change: $Author: vg $ $Date: 2006-06-02 12:37:38 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -44,10 +44,8 @@
# include <vos/macros.hxx>
#endif
-#ifdef _USE_NAMESPACE
namespace vos
{
-#endif
// ***************************************
// Object super class
@@ -201,9 +199,7 @@ public: \
VOS_NAMESPACE(OObject, vos)* class_name::createObject(const VOS_NAMESPACE(OCreateParam, vos)& rParam) \
{ return new class_name(rParam); }
-#ifdef _USE_NAMESPACE
}
-#endif
#endif // _VOS_OBJECT_HXX_