diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2010-10-13 23:21:02 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2010-10-13 23:21:02 -0400 |
| commit | 1708b3497f767b0298ec93518b14614180c096bc (patch) | |
| tree | 9fbc7bad4c9b0bab013e8252510f03905ea67ee4 /sc/source/ui/view/olkact.cxx | |
| parent | 2be03e2ec720cbe9aa04f7e463c7e19944347d96 (diff) | |
| parent | 167c1f3a9566fdb4d197675b520b690326d8eaa9 (diff) | |
Merge branch 'master' into feature/calc-key-binding-compat
Conflicts:
sc/source/ui/attrdlg/scdlgfact.cxx
Diffstat (limited to 'sc/source/ui/view/olkact.cxx')
| -rw-r--r-- | sc/source/ui/view/olkact.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx index 248777f4e473..a5f63f5a15bd 100644 --- a/sc/source/ui/view/olkact.cxx +++ b/sc/source/ui/view/olkact.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. @@ -280,3 +281,4 @@ void DeActivateOlk( ScViewData* /* pViewData */ ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |