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/PropertySetMerger.cxx | |
| parent | f327d71f9cc07c3a4e384d73d6023792a5151e7a (diff) | |
merge trivial non-conflicting changes to avmedia
Diffstat (limited to 'xmloff/source/core/PropertySetMerger.cxx')
| -rw-r--r-- | xmloff/source/core/PropertySetMerger.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx index 2028f7306b..584c924c57 100644 --- a/xmloff/source/core/PropertySetMerger.cxx +++ b/xmloff/source/core/PropertySetMerger.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. @@ -37,9 +38,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase3.hxx> -#endif class SvXMLAttrContainerItem_Impl; @@ -265,3 +264,5 @@ Reference< XPropertySet > PropertySetMerger_CreateInstance( Reference< XProperty { return new PropertySetMergerImpl( rPropSet1, rPropSet2 ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |