sw/inc/unomid.h | 1 -
sw/inc/unoprnms.hxx | 1 -
sw/source/core/attr/fmtfollowtextflow.cxx | 15 ---------------
sw/source/core/unocore/unoframe.cxx | 8 +-------
sw/source/core/unocore/unomap.cxx | 1 -
sw/source/core/unocore/unomap1.cxx | 1 -
sw/source/core/unocore/unomapproperties.hxx | 1 -
7 files changed, 1 insertion(+), 27 deletions(-)
New commits:
commit 821079ec987438c13845f253a7dc11627fd2bc23
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Oct 24 08:47:40 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Oct 24 09:27:49 2019 +0200
sw UNO API: remove unused IsLayoutInCell property
This was added just for the DOCX import in commit
c3c80b6b63e998fd3117b5039e65a2ee9df90954 (tdf#115094 Part II: OOXML
Feature: Add layoutInCell to Doc model, 2018-11-14), but was always
undocumented.
Additionally, this is no longer necessary, the DOCX import doesn't set
this property anymore. So better remove it instead of documenting it.
Change-Id: I4ddb2958dcfa836bf637904c0c4b60012cbc7a28
Reviewed-on: https://gerrit.libreoffice.org/81426
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h
index 0a312a70624a..d249b32fc25a 100644
--- a/sw/inc/unomid.h
+++ b/sw/inc/unomid.h
@@ -150,7 +150,6 @@
// SwFormatFollowTextFlow
#define MID_FOLLOW_TEXT_FLOW 0
-#define MID_FTF_LAYOUT_IN_CELL 1
#endif
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index a6246f9d2d36..3afb88e02b0c 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -744,7 +744,6 @@
#define UNO_NAME_IS_SPLIT_ALLOWED "IsSplitAllowed"
#define UNO_NAME_CHAR_HIDDEN "CharHidden"
#define UNO_NAME_IS_FOLLOWING_TEXT_FLOW "IsFollowingTextFlow"
-#define UNO_NAME_IS_LAYOUT_IN_CELL "IsLayoutInCell"
#define UNO_NAME_WIDTH_TYPE "WidthType"
#define UNO_NAME_SCRIPT_URL "ScriptURL"
#define UNO_NAME_RUNTIME_UID "RuntimeUID"
diff --git a/sw/source/core/attr/fmtfollowtextflow.cxx
b/sw/source/core/attr/fmtfollowtextflow.cxx
index 469440cc2ad1..c9f042e01fb0 100644
--- a/sw/source/core/attr/fmtfollowtextflow.cxx
+++ b/sw/source/core/attr/fmtfollowtextflow.cxx
@@ -43,16 +43,6 @@ bool SwFormatFollowTextFlow::PutValue(const css::uno::Any&
rVal, sal_uInt8 aInt)
}
break;
}
- case MID_FTF_LAYOUT_IN_CELL :
- {
- bool bTheValue = bool();
- if (rVal >>= bTheValue)
- {
- mbLayoutInCell = bTheValue;
- return true;
- }
- break;
- }
}
SAL_WARN("sw.ui", "SfxBoolItem::PutValue(): Wrong type");
return false;
@@ -68,11 +58,6 @@ bool SwFormatFollowTextFlow::QueryValue(css::uno::Any& rVal,
sal_uInt8 aInt) con
rVal <<= GetValue();
break;
}
- case MID_FTF_LAYOUT_IN_CELL :
- {
- rVal <<= GetLayoutInCell();
- break;
- }
}
return true;
}
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index 81906e1c4c60..d9db73e540ea 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -920,11 +920,9 @@ bool
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
// #i18732#
const ::uno::Any* pFollowTextFlow = nullptr;
- const ::uno::Any* pLayOutinCell = nullptr;
GetProperty(RES_FOLLOW_TEXT_FLOW, MID_FOLLOW_TEXT_FLOW, pFollowTextFlow);
- GetProperty(RES_FOLLOW_TEXT_FLOW, MID_FTF_LAYOUT_IN_CELL, pLayOutinCell);
- if ( pFollowTextFlow || pLayOutinCell)
+ if (pFollowTextFlow)
{
SwFormatFollowTextFlow aFormatFollowTextFlow;
if( pFollowTextFlow )
@@ -932,10 +930,6 @@ bool
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
aFormatFollowTextFlow.PutValue(*pFollowTextFlow,
MID_FOLLOW_TEXT_FLOW);
}
- if ( pLayOutinCell )
- {
- aFormatFollowTextFlow.PutValue(*pLayOutinCell,
MID_FTF_LAYOUT_IN_CELL);
- }
rToSet.Put(aFormatFollowTextFlow);
}
diff --git a/sw/source/core/unocore/unomap.cxx
b/sw/source/core/unocore/unomap.cxx
index bce1731dc993..4bba72a38fee 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -308,7 +308,6 @@ const SfxItemPropertyMapEntry*
SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ OUString(UNO_NAME_ANCHOR_POSITION), FN_ANCHOR_POSITION,
cppu::UnoType<css::awt::Point>::get(), PropertyAttribute::READONLY, 0},
// #i26791#
{ OUString(UNO_NAME_IS_FOLLOWING_TEXT_FLOW),
RES_FOLLOW_TEXT_FLOW, cppu::UnoType<bool>::get(), PROPERTY_NONE,
MID_FOLLOW_TEXT_FLOW},
- { OUString(UNO_NAME_IS_LAYOUT_IN_CELL),
RES_FOLLOW_TEXT_FLOW, cppu::UnoType<bool>::get(), PROPERTY_NONE,
MID_FTF_LAYOUT_IN_CELL},
// #i28701#
{ OUString(UNO_NAME_WRAP_INFLUENCE_ON_POSITION),
RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE,
MID_WRAP_INFLUENCE},
{ OUString(UNO_NAME_ALLOW_OVERLAP),
RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<bool>::get(), PROPERTY_NONE,
MID_ALLOW_OVERLAP},
diff --git a/sw/source/core/unocore/unomap1.cxx
b/sw/source/core/unocore/unomap1.cxx
index 13fb8f6df1dd..0c0e3e054bcc 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -456,7 +456,6 @@ const SfxItemPropertyMapEntry*
SwUnoPropertyMapProvider::GetFrameStylePropertyM
{ OUString(UNO_NAME_DISPLAY_NAME), FN_UNO_DISPLAY_NAME,
cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
// #i18732#
{ OUString(UNO_NAME_IS_FOLLOWING_TEXT_FLOW), RES_FOLLOW_TEXT_FLOW,
cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_FOLLOW_TEXT_FLOW},
- { OUString(UNO_NAME_IS_LAYOUT_IN_CELL), RES_FOLLOW_TEXT_FLOW,
cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_FTF_LAYOUT_IN_CELL},
// #i28701#
{ OUString(UNO_NAME_WRAP_INFLUENCE_ON_POSITION),
RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE,
MID_WRAP_INFLUENCE},
{ OUString(UNO_NAME_ALLOW_OVERLAP), RES_WRAP_INFLUENCE_ON_OBJPOS,
cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_ALLOW_OVERLAP},
diff --git a/sw/source/core/unocore/unomapproperties.hxx
b/sw/source/core/unocore/unomapproperties.hxx
index 6f772eed1acd..348055c506f4 100644
--- a/sw/source/core/unocore/unomapproperties.hxx
+++ b/sw/source/core/unocore/unomapproperties.hxx
@@ -322,7 +322,6 @@
{ OUString(UNO_NAME_USER_DEFINED_ATTRIBUTES), RES_UNKNOWNATR_CONTAINER,
cppu::UnoType<css::container::XNameContainer>::get(),
PropertyAttribute::MAYBEVOID, 0 },\
{ OUString(UNO_NAME_Z_ORDER), FN_UNO_Z_ORDER,
cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, 0}, \
{ OUString(UNO_NAME_IS_FOLLOWING_TEXT_FLOW), RES_FOLLOW_TEXT_FLOW,
cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_FOLLOW_TEXT_FLOW}, \
- { OUString(UNO_NAME_IS_LAYOUT_IN_CELL), RES_FOLLOW_TEXT_FLOW,
cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_FTF_LAYOUT_IN_CELL}, \
{ OUString(UNO_NAME_PARENT_TEXT), FN_UNO_PARENT_TEXT,
cppu::UnoType<text::XText>::get(), PropertyAttribute::MAYBEVOID |
PropertyAttribute::READONLY, 0 }, \
{ OUString(UNO_NAME_WRAP_INFLUENCE_ON_POSITION),
RES_WRAP_INFLUENCE_ON_OBJPOS, cppu::UnoType<sal_Int8>::get(), PROPERTY_NONE,
MID_WRAP_INFLUENCE}, \
{ OUString(UNO_NAME_ALLOW_OVERLAP), RES_WRAP_INFLUENCE_ON_OBJPOS,
cppu::UnoType<bool>::get(), PROPERTY_NONE, MID_ALLOW_OVERLAP}, \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
