sw/inc/fmtfollowtextflow.hxx | 18 ---------
sw/source/core/attr/fmtfollowtextflow.cxx | 41 ---------------------
sw/source/core/inc/environmentofanchoredobject.hxx | 3 -
sw/source/uibase/utlui/attrdesc.cxx | 1
4 files changed, 63 deletions(-)
New commits:
commit aa394fd920b75f8901ec4056504fa68703b6926d
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Nov 4 08:35:20 2019 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Nov 4 09:15:35 2019 +0100
sw: remove dead SwFormatFollowTextFlow::mbLayoutInCell
Now that the UNO API doesn't write it and the layout doesn't read it.
Change-Id: I0c9bb6aca8f3642f06cb25b9857738a751520702
Reviewed-on: https://gerrit.libreoffice.org/81980
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index c13b678f1c6c..fdb0a5d755ed 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -28,21 +28,12 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFormatFollowTextFlow : public SfxBoolItem
{
-private:
- bool mbLayoutInCell = false;
-
public:
SwFormatFollowTextFlow( bool bFlag = false )
: SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag )
{}
- SwFormatFollowTextFlow( bool bFlag, bool _bLayoutInCell )
- : SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag )
- , mbLayoutInCell( _bLayoutInCell )
- {}
-
-
/// "pure virtual methods" of SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const
override;
virtual bool GetPresentation( SfxItemPresentation ePres,
@@ -51,16 +42,7 @@ public:
OUString &rText,
const IntlWrapper& rIntl ) const override;
- bool GetLayoutInCell() const { return mbLayoutInCell; }
-
-
- bool PutValue(const css::uno::Any& rVal, sal_uInt8 aInt) override;
-
- bool QueryValue(css::uno::Any& rVal, sal_uInt8 aInt = 0) const override;
-
void dumpAsXml(xmlTextWriterPtr pWriter) const override;
-
- bool operator==(const SfxPoolItem& rItem) const override;
};
inline const SwFormatFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP)
const
diff --git a/sw/source/core/attr/fmtfollowtextflow.cxx
b/sw/source/core/attr/fmtfollowtextflow.cxx
index c9f042e01fb0..f979fd27d499 100644
--- a/sw/source/core/attr/fmtfollowtextflow.cxx
+++ b/sw/source/core/attr/fmtfollowtextflow.cxx
@@ -22,50 +22,9 @@
#include <sal/log.hxx>
-
SfxPoolItem* SwFormatFollowTextFlow::Clone( SfxItemPool * ) const
{
return new SwFormatFollowTextFlow(*this);
}
-
-bool SwFormatFollowTextFlow::PutValue(const css::uno::Any& rVal, sal_uInt8
aInt)
-{
- switch( aInt )
- {
- case MID_FOLLOW_TEXT_FLOW :
- {
- bool bTheValue = bool();
- if (rVal >>= bTheValue)
- {
- SetValue( bTheValue );
- return true;
- }
- break;
- }
- }
- SAL_WARN("sw.ui", "SfxBoolItem::PutValue(): Wrong type");
- return false;
-}
-
-
-bool SwFormatFollowTextFlow::QueryValue(css::uno::Any& rVal, sal_uInt8 aInt)
const
-{
- switch( aInt )
- {
- case MID_FOLLOW_TEXT_FLOW :
- {
- rVal <<= GetValue();
- break;
- }
- }
- return true;
-}
-
-bool SwFormatFollowTextFlow::operator==(const SfxPoolItem& rItem) const
-{
- return SfxBoolItem::operator==(rItem)
- && mbLayoutInCell == static_cast<SwFormatFollowTextFlow
const*>(&rItem)->mbLayoutInCell;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx
b/sw/source/core/inc/environmentofanchoredobject.hxx
index f7c604e5da4c..aa3d5a2a5be5 100644
--- a/sw/source/core/inc/environmentofanchoredobject.hxx
+++ b/sw/source/core/inc/environmentofanchoredobject.hxx
@@ -36,9 +36,6 @@ namespace objectpositioning
@param _bFollowTextFlow
input parameter - indicates, if the anchored object, for which
this environment is instantiated, follow the text flow or not
- @param _bLayoutInCell
- input parameter - indicates, if the anchored object should be
- laid out within a (table) cell
*/
SwEnvironmentOfAnchoredObject( const bool _bFollowTextFlow );
diff --git a/sw/source/uibase/utlui/attrdesc.cxx
b/sw/source/uibase/utlui/attrdesc.cxx
index 7c5d9bee918e..44c278a6e750 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -840,7 +840,6 @@ void SwFormatFollowTextFlow::dumpAsXml(xmlTextWriterPtr
pWriter) const
xmlTextWriterStartElement(pWriter, BAD_CAST("SwFormatFollowTextFlow"));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"),
BAD_CAST(OString::number(Which()).getStr()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"),
BAD_CAST(OString::boolean(GetValue()).getStr()));
- xmlTextWriterWriteAttribute(pWriter, BAD_CAST("layoutInCell"),
BAD_CAST(OString::boolean(GetLayoutInCell()).getStr()));
xmlTextWriterEndElement(pWriter);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
