diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-27 13:06:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-27 16:03:01 +0100 |
| commit | d4a8d91abd40dee7f7bd739a678a502a6e34cb59 (patch) | |
| tree | c4751446135b53d0b0d5d1189faa7b8a66fd5978 /sw | |
| parent | 453e30e668454b7b193772b1dffe719d844ac168 (diff) | |
tdf#115432 footnote separator position remain in the left side
regression from
commit 7e9857c2935bb2533806db4e71c6cd1e171c3478
"templatize SvXMLEnumMapEntry"
Change-Id: Id29e7c07be637adcdc7fe624a1673beca9829d4d
Reviewed-on: https://gerrit.libreoffice.org/50420
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/unocore/unomap1.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/uiitems.cxx | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx index fbe12b66844e..522a9bc8610e 100644 --- a/sw/source/core/unocore/unomap1.cxx +++ b/sw/source/core/unocore/unomap1.cxx @@ -58,6 +58,7 @@ #include <com/sun/star/table/TableBorder2.hpp> #include <com/sun/star/table/TableBorderDistances.hpp> #include <com/sun/star/table/XCell.hpp> +#include <com/sun/star/text/HorizontalAdjust.hpp> #include <com/sun/star/text/GraphicCrop.hpp> #include <com/sun/star/text/PageNumberType.hpp> #include <com/sun/star/text/SectionFileLink.hpp> @@ -583,7 +584,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPageStylePropertyMa { OUString(UNO_NAME_FOOTNOTE_LINE_COLOR), FN_PARAM_FTN_INFO, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE , MID_LINE_COLOR}, { OUString(UNO_NAME_FOOTNOTE_LINE_STYLE), FN_PARAM_FTN_INFO, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE , MID_FTN_LINE_STYLE}, { OUString(UNO_NAME_FOOTNOTE_LINE_RELATIVE_WIDTH), FN_PARAM_FTN_INFO, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE , MID_LINE_RELWIDTH }, - { OUString(UNO_NAME_FOOTNOTE_LINE_ADJUST), FN_PARAM_FTN_INFO, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE , MID_LINE_ADJUST }, + { OUString(UNO_NAME_FOOTNOTE_LINE_ADJUST), FN_PARAM_FTN_INFO, cppu::UnoType<css::text::HorizontalAdjust>::get(), PROPERTY_NONE , MID_LINE_ADJUST }, { OUString(UNO_NAME_FOOTNOTE_LINE_TEXT_DISTANCE), FN_PARAM_FTN_INFO, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE , MID_LINE_TEXT_DIST |CONVERT_TWIPS }, { OUString(UNO_NAME_FOOTNOTE_LINE_DISTANCE), FN_PARAM_FTN_INFO, cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE , MID_LINE_FOOTNOTE_DIST|CONVERT_TWIPS}, { OUString(UNO_NAME_WRITING_MODE), RES_FRAMEDIR, cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0 }, diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index 8b3f02a74b8a..eb1d80be738f 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -18,6 +18,7 @@ */ #include <editeng/itemtype.hxx> +#include <o3tl/any.hxx> #include <unosett.hxx> #include <swtypes.hxx> @@ -86,7 +87,7 @@ bool SwPageFootnoteInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const rVal <<= static_cast<sal_Int8>(static_cast<long>(aTmp)); } break; - case MID_LINE_ADJUST : rVal <<= static_cast<sal_Int16>(aFootnoteInfo.GetAdj());break;//text::HorizontalAdjust + case MID_LINE_ADJUST : rVal <<= aFootnoteInfo.GetAdj();break;//text::HorizontalAdjust case MID_LINE_TEXT_DIST : rVal <<= static_cast<sal_Int32>(convertTwipToMm100(aFootnoteInfo.GetTopDist()));break; case MID_LINE_FOOTNOTE_DIST: rVal <<= static_cast<sal_Int32>(convertTwipToMm100(aFootnoteInfo.GetBottomDist()));break; case MID_FTN_LINE_STYLE : @@ -156,12 +157,8 @@ bool SwPageFootnoteInfoItem::PutValue(const Any& rVal, sal_uInt8 nMemberId) break; case MID_LINE_ADJUST : { - sal_Int16 nSet = 0; - rVal >>= nSet; - if(nSet >= 0 && nSet < 3) //text::HorizontalAdjust - aFootnoteInfo.SetAdj(static_cast<css::text::HorizontalAdjust>(nSet)); - else - bRet = false; + text::HorizontalAdjust nSet = *o3tl::forceAccess<text::HorizontalAdjust>(rVal); + aFootnoteInfo.SetAdj(nSet); } break; case MID_FTN_LINE_STYLE: |