diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-12-05 21:29:49 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-12-05 23:08:25 +0100 |
| commit | 219703ba3bd991f20a445e9b34439815a5659509 (patch) | |
| tree | 0cd601e6e16a599f072e5234c54a7736db954832 /oox | |
| parent | 27f50cecdc3c4b36dc61b05b3d8de6e69518d967 (diff) | |
remove last uses of CellVertJustify in our code
please use now only CellVertJustify2
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/oox/xls/stylesbuffer.hxx | 5 | ||||
| -rw-r--r-- | oox/source/xls/stylesbuffer.cxx | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/oox/inc/oox/xls/stylesbuffer.hxx b/oox/inc/oox/xls/stylesbuffer.hxx index 0d960e7fe9a5..0ab97dd7e072 100644 --- a/oox/inc/oox/xls/stylesbuffer.hxx +++ b/oox/inc/oox/xls/stylesbuffer.hxx @@ -32,7 +32,7 @@ #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/table/CellHoriJustify.hpp> #include <com/sun/star/table/CellOrientation.hpp> -#include <com/sun/star/table/CellVertJustify.hpp> +#include <com/sun/star/table/CellVertJustify2.hpp> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/util/CellProtection.hpp> #include "oox/drawingml/color.hxx" @@ -809,8 +809,7 @@ private: XfModel maModel; /// Cell XF or style XF model data. Alignment maAlignment; /// Cell alignment data. Protection maProtection; /// Cell protection data. - ::com::sun::star::table::CellVertJustify - meRotationRef; /// Rotation reference dependent on border. + sal_Int32 meRotationRef; /// Rotation reference dependent on border. }; typedef ::boost::shared_ptr< Xf > XfRef; diff --git a/oox/source/xls/stylesbuffer.cxx b/oox/source/xls/stylesbuffer.cxx index df6d93c3f53c..cc48ad578adb 100644 --- a/oox/source/xls/stylesbuffer.cxx +++ b/oox/source/xls/stylesbuffer.cxx @@ -2267,7 +2267,7 @@ Xf::Xf( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), maAlignment( rHelper ), maProtection( rHelper ), - meRotationRef( ::com::sun::star::table::CellVertJustify_STANDARD ) + meRotationRef( ::com::sun::star::table::CellVertJustify2::STANDARD ) { } @@ -2488,7 +2488,7 @@ void Xf::finalizeImport() sal_Int32 nBorderId = maModel.mbBorderUsed ? maModel.mnBorderId : (pStyleXf ? pStyleXf->maModel.mnBorderId : -1); if( const Border* pBorder = rStyles.getBorder( nBorderId ).get() ) if( (pAlignment->getApiData().mnRotation != 0) && pBorder->getApiData().hasAnyOuterBorder() ) - meRotationRef = ::com::sun::star::table::CellVertJustify_BOTTOM; + meRotationRef = ::com::sun::star::table::CellVertJustify2::BOTTOM; } } @@ -2527,9 +2527,9 @@ void Xf::writeToPropertyMap( PropertyMap& rPropMap ) const if( maModel.mbAlignUsed || maModel.mbBorderUsed ) rPropMap[ PROP_RotateReference ] <<= meRotationRef; - ::com::sun::star::table::CellVertJustify eRotRef = ::com::sun::star::table::CellVertJustify_STANDARD; + sal_Int32 eRotRef = ::com::sun::star::table::CellVertJustify2::STANDARD; if (maModel.mbBorderUsed && rStyles.hasBorder(maModel.mnBorderId) && maAlignment.getApiData().mnRotation) - eRotRef = ::com::sun::star::table::CellVertJustify_BOTTOM; + eRotRef = ::com::sun::star::table::CellVertJustify2::BOTTOM; rPropMap[ PROP_RotateReference ] <<= eRotRef; } |