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 | ace843304cba4ea36bba8e2d6898be426837ee6c (patch) | |
| tree | 724620a0dc1b37070a7a592618fd018a32dbb138 /formula/source/ui/dlg/parawin.cxx | |
| parent | 150c9846abeaab2ece2a7b35f61e83695abd5fdd (diff) | |
| parent | 86423ced17e0444f63e6a8bd5ef779717b11a7ee (diff) | |
Merge commit 'origin/master'
Conflicts:
vbahelper/source/vbahelper/vbadialogbase.cxx
Diffstat (limited to 'formula/source/ui/dlg/parawin.cxx')
| -rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 0de42f971e..a193750b8c 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.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. @@ -598,3 +599,5 @@ IMPL_LINK( ParaWin, ModifyHdl, ArgInput*, pPtr ) } // formula + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |