diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-13 05:36:33 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-13 05:36:33 -0500 |
| commit | 84660a54284fe27d294daa11490edbaa81b32376 (patch) | |
| tree | 23b1eaf949c2774faa72df8371094598a65d5a08 /oox/source/helper/propertymap.cxx | |
| parent | cef1ab56b2e955f48bf016e77e7129fab6c85f33 (diff) | |
fix mis-merge in oox
Diffstat (limited to 'oox/source/helper/propertymap.cxx')
| -rw-r--r-- | oox/source/helper/propertymap.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 221799a41c53..e54b02919d4d 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -32,6 +32,8 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/container/XIndexReplace.hpp> +#include <com/sun/star/drawing/TextHorizontalAdjust.hpp> +#include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <cppuhelper/implbase2.hxx> #include <osl/mutex.hxx> #include "oox/token/propertynames.hxx" @@ -43,8 +45,6 @@ using ::com::sun::star::container::XIndexReplace; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; -#include <com/sun/star/drawing/TextHorizontalAdjust.hpp> -#include <com/sun/star/drawing/TextVerticalAdjust.hpp> using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::uno; using ::com::sun::star::drawing::TextHorizontalAdjust; @@ -349,4 +349,4 @@ void PropertyMap::dump() } // namespace oox -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |