summaryrefslogtreecommitdiff
path: root/basic/source/sbx/sbxobj.cxx
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2010-10-13 13:22:42 +0100
committerNoel Power <noel.power@novell.com>2010-10-13 13:22:42 +0100
commitace843304cba4ea36bba8e2d6898be426837ee6c (patch)
tree724620a0dc1b37070a7a592618fd018a32dbb138 /basic/source/sbx/sbxobj.cxx
parent150c9846abeaab2ece2a7b35f61e83695abd5fdd (diff)
parent86423ced17e0444f63e6a8bd5ef779717b11a7ee (diff)
Merge commit 'origin/master'
Conflicts: vbahelper/source/vbahelper/vbadialogbase.cxx
Diffstat (limited to 'basic/source/sbx/sbxobj.cxx')
-rw-r--r--basic/source/sbx/sbxobj.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index a930f710d5..c32f018558 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -1143,3 +1144,4 @@ void SbxObject::GarbageCollection( ULONG nObjects )
bInGarbageCollection = FALSE;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */