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/xls/commentsbuffer.cxx | |
| parent | cef1ab56b2e955f48bf016e77e7129fab6c85f33 (diff) | |
fix mis-merge in oox
Diffstat (limited to 'oox/source/xls/commentsbuffer.cxx')
| -rw-r--r-- | oox/source/xls/commentsbuffer.cxx | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/oox/source/xls/commentsbuffer.cxx b/oox/source/xls/commentsbuffer.cxx index 8217a0148a0b..34cc33476649 100644 --- a/oox/source/xls/commentsbuffer.cxx +++ b/oox/source/xls/commentsbuffer.cxx @@ -26,6 +26,9 @@ * ************************************************************************/ +#include <oox/token/properties.hxx> +#include <oox/token/tokens.hxx> + #include "oox/xls/commentsbuffer.hxx" #include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp> @@ -36,7 +39,6 @@ #include "oox/vml/vmlshape.hxx" #include "oox/xls/addressconverter.hxx" #include "oox/xls/drawingfragment.hxx" -#include "properties.hxx" #include "svx/sdtaitm.hxx" #include "oox/xls/unitconverter.hxx" @@ -48,6 +50,17 @@ using ::com::sun::star::text::XTextRange; using ::com::sun::star::awt::Size; using ::com::sun::star::awt::Point; +namespace oox { +namespace xls { + +// ============================================================================ + +using namespace ::com::sun::star::drawing; +using namespace ::com::sun::star::sheet; +using namespace ::com::sun::star::table; +using namespace ::com::sun::star::uno; + +using ::rtl::OUString; static sal_Int32 lcl_ToHorizAlign( sal_Int32 nAlign ) { @@ -81,18 +94,6 @@ static sal_Int32 lcl_ToVertAlign( sal_Int32 nAlign ) return SDRTEXTVERTADJUST_TOP; } -namespace oox { -namespace xls { - -// ============================================================================ - -using namespace ::com::sun::star::drawing; -using namespace ::com::sun::star::sheet; -using namespace ::com::sun::star::table; -using namespace ::com::sun::star::uno; - -using ::rtl::OUString; - // ============================================================================ CommentModel::CommentModel() : @@ -268,4 +269,4 @@ void CommentsBuffer::finalizeImport() } // namespace xls } // namespace oox -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |