diff options
author | Noel Power <noel.power@novell.com> | 2010-10-13 13:22:42 +0100 |
---|---|---|
committer | Noel Power <noel.power@novell.com> | 2010-10-13 13:22:42 +0100 |
commit | 50a13b7f4166ec2b305226cc81520ccc6010ff69 (patch) | |
tree | c3ef2cb9f135003cecc60d1373f59dca34475b8c /scripting/source/vbaevents | |
parent | 4e7e749fc2306995eaab3411c0cfc4c8785a5172 (diff) | |
parent | a7458f68ae3b7a5c07e5c4455f44d2509ddd63bc (diff) |
Merge commit 'origin/master'
Conflicts:
vbahelper/source/vbahelper/vbadialogbase.cxx
Diffstat (limited to 'scripting/source/vbaevents')
-rw-r--r-- | scripting/source/vbaevents/eventhelper.cxx | 3 | ||||
-rw-r--r-- | scripting/source/vbaevents/service.cxx | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 4556d3235cd8..b75c6d61e7b2 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.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. @@ -1240,3 +1241,5 @@ namespace ooevtdescgen return Sequence< ::rtl::OUString >( &strName, 1 ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx index 9f38acb7e2a6..c5808b8a8d9f 100644 --- a/scripting/source/vbaevents/service.cxx +++ b/scripting/source/vbaevents/service.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. @@ -129,3 +130,5 @@ extern "C" pImplName, pServiceManager, pRegistryKey, s_component_entries ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |