diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 16:05:35 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 16:05:35 -0600 |
| commit | 95565916b0f9bc46521bead9ae148f73e6beda61 (patch) | |
| tree | c0f4155d24e6f18c33ab23d92b34a5ec64bfc16c /xmloff/source/core/xmlehelp.cxx | |
| parent | f327d71f9cc07c3a4e384d73d6023792a5151e7a (diff) | |
merge trivial non-conflicting changes to avmedia
Diffstat (limited to 'xmloff/source/core/xmlehelp.cxx')
| -rw-r--r-- | xmloff/source/core/xmlehelp.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xmloff/source/core/xmlehelp.cxx b/xmloff/source/core/xmlehelp.cxx index e51cea4a0c..65ae260bee 100644 --- a/xmloff/source/core/xmlehelp.cxx +++ b/xmloff/source/core/xmlehelp.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. @@ -33,9 +34,7 @@ #include <rtl/ustrbuf.hxx> #include "xmlehelp.hxx" -#ifndef _XMLOFF_XMTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -498,3 +497,5 @@ MapUnit SvXMLExportHelper::GetUnitFromString(const ::rtl::OUString& rString, Map return eRetUnit; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |