Kaydet (Commit) 219703ba authored tarafından Markus Mohrhard's avatar Markus Mohrhard

remove last uses of CellVertJustify in our code

please use now only CellVertJustify2
üst 27f50cec
......@@ -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;
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment