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 | b381c6c5072b260069ee8ab497c19a19a320d5c6 (patch) | |
| tree | 59c5dc6a47b0293d4747b9a2e2ca69c3297c7a5e /sc/source/ui/dbgui/subtdlg.cxx | |
| parent | 4e63e44c55f3c0ab6fa38ad62c5b0ab7fbbd09f0 (diff) | |
| parent | 7eabce1eea341ab1d29fb01010fddb1cce2b7a9b (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/dbgui/subtdlg.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/subtdlg.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index b2b36ac31..97f7e2e8d 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.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. @@ -67,3 +68,4 @@ IMPL_LINK_INLINE_START( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn ) } IMPL_LINK_INLINE_END( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |