diff options
| author | Noel Power <noel.power@novell.com> | 2010-10-13 12:41:26 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-10-13 12:41:26 +0100 |
| commit | 65389fcbb71197b3f97f5d4c80c18f827c9466d0 (patch) | |
| tree | 7acdc097aae615b0fa67185bfcbd1d3013c8db59 /sc/source/ui/drawfunc/drawsh2.cxx | |
| parent | 731a807e6b9dec1822c710508cefd944941853ff (diff) | |
| parent | 63bb42ab7d85470453ec233f6f90ee1d2c2d4782 (diff) | |
Merge commit 'origin/master' fix conflicts and more trailing ws
Conflicts:
sc/source/ui/undo/undodat.cxx
sc/source/ui/vba/excelvbahelper.cxx
sc/source/ui/vba/vbadialog.cxx
sc/source/ui/vba/vbahelper.cxx
sc/source/ui/vba/vbapagesetup.cxx
Diffstat (limited to 'sc/source/ui/drawfunc/drawsh2.cxx')
| -rw-r--r-- | sc/source/ui/drawfunc/drawsh2.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 67e3114976c1..0a5b5ad7c21f 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.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. @@ -393,3 +394,4 @@ BOOL ScDrawShell::AreAllObjectsOnLayer(USHORT nLayerNo,const SdrMarkList& rMark) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |