sw/source/core/unocore/unomap1.cxx | 3 +--
sw/source/uibase/utlui/uiitems.cxx | 11 +++++++----
xmloff/source/style/XMLFootnoteSeparatorExport.cxx | 3 +--
3 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 2407c183092d6559771738891d57d6375c4212ab
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Mar 6 14:16:48 2018 +0100
Revert "tdf#115432 footnote separator position remain in the left side"
This reverts commit d4a8d91abd40dee7f7bd739a678a502a6e34cb59.
because it changes the type of an UNO property defined in a published IDL
file
Change-Id: I4d3db3532b27552a30f34fcd4201856565eb0a3b
Reviewed-on: https://gerrit.libreoffice.org/50825
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/unocore/unomap1.cxx
b/sw/source/core/unocore/unomap1.cxx
index 522a9bc8610e..fbe12b66844e 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -58,7 +58,6 @@
#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>
@@ -584,7 +583,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<css::text::HorizontalAdjust>::get(), PROPERTY_NONE ,
MID_LINE_ADJUST },
+ { 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_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 eb1d80be738f..8b3f02a74b8a 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -18,7 +18,6 @@
*/
#include <editeng/itemtype.hxx>
-#include <o3tl/any.hxx>
#include <unosett.hxx>
#include <swtypes.hxx>
@@ -87,7 +86,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 <<=
aFootnoteInfo.GetAdj();break;//text::HorizontalAdjust
+ case MID_LINE_ADJUST : rVal <<=
static_cast<sal_Int16>(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 :
@@ -157,8 +156,12 @@ bool SwPageFootnoteInfoItem::PutValue(const Any& rVal,
sal_uInt8 nMemberId)
break;
case MID_LINE_ADJUST :
{
- text::HorizontalAdjust nSet =
*o3tl::forceAccess<text::HorizontalAdjust>(rVal);
- aFootnoteInfo.SetAdj(nSet);
+ sal_Int16 nSet = 0;
+ rVal >>= nSet;
+ if(nSet >= 0 && nSet < 3) //text::HorizontalAdjust
+
aFootnoteInfo.SetAdj(static_cast<css::text::HorizontalAdjust>(nSet));
+ else
+ bRet = false;
}
break;
case MID_FTN_LINE_STYLE:
diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
index edf57dd3a6bd..5446398e5e72 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
@@ -31,7 +31,6 @@
#include <xmloff/PageMasterStyleMap.hxx>
#include <com/sun/star/text/HorizontalAdjust.hpp>
#include <rtl/ustrbuf.hxx>
-#include <o3tl/any.hxx>
using namespace ::com::sun::star;
@@ -76,7 +75,7 @@ void XMLFootnoteSeparatorExport::exportXML(
switch (rMapper->GetEntryContextId(rState.mnIndex))
{
case CTF_PM_FTN_LINE_ADJUST:
- eLineAdjust =
*o3tl::forceAccess<text::HorizontalAdjust>(rState.maValue);
+ rState.maValue >>= eLineAdjust;
break;
case CTF_PM_FTN_LINE_COLOR:
rState.maValue >>= nLineColor;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
