sw floattable: remove now unused FloattableNomargins compat flag

This was noop since commit 626fe9ab5ebebc4ef36e35f4aa597c03a3564d22
(tdf#157573 sw floattable: fix incorrect lack of left margin after
table, 2023-10-18).

Change-Id: I89a197313ac4ffbcff9bbff534e5411085282ac8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158237
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

5 files changed, 0 insertions, 27 deletions

diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index b8077ea9ad56..b8088440163d 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -106,7 +106,6 @@ enum class DocumentSettingId
     KERN_ASIAN_PUNCTUATION,
     MATH_BASELINE_ALIGNMENT,
     STYLES_NODEFAULT,
-    FLOATTABLE_NOMARGINS,
     EMBED_FONTS,
     EMBED_USED_FONTS,
     EMBED_LATIN_SCRIPT_FONTS,
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx
index 86aa3ede7e81..ebe116c68276 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -62,7 +62,6 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc)
     mbUseHiResolutionVirtualDevice(true),
     mbMathBaselineAlignment(false), // default for *old* documents is 'off'
     mbStylesNoDefault(false),
-    mbFloattableNomargins(false),
     mEmbedFonts(false),
     mEmbedUsedFonts(false),
     mEmbedLatinScriptFonts(true),
@@ -230,7 +229,6 @@ bool sw::DocumentSettingManager::get(/*[in]*/ DocumentSettingId id) const
         case DocumentSettingId::DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT: return mbDoNotResetParaAttrsForNumFont;
         case DocumentSettingId::MATH_BASELINE_ALIGNMENT: return mbMathBaselineAlignment;
         case DocumentSettingId::STYLES_NODEFAULT: return mbStylesNoDefault;
-        case DocumentSettingId::FLOATTABLE_NOMARGINS: return mbFloattableNomargins;
         case DocumentSettingId::EMBED_FONTS: return mEmbedFonts;
         case DocumentSettingId::EMBED_USED_FONTS: return mEmbedUsedFonts;
         case DocumentSettingId::EMBED_LATIN_SCRIPT_FONTS: return mEmbedLatinScriptFonts;
@@ -509,9 +507,6 @@ void sw::DocumentSettingManager::set(/*[in]*/ DocumentSettingId id, /*[in]*/ boo
         case DocumentSettingId::STYLES_NODEFAULT:
             mbStylesNoDefault  = value;
             break;
-        case DocumentSettingId::FLOATTABLE_NOMARGINS:
-            mbFloattableNomargins = value;
-            break;
         case DocumentSettingId::EMBED_FONTS:
             mEmbedFonts = value;
             break;
@@ -700,7 +695,6 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
     mbConsiderWrapOnObjPos = rSource.mbConsiderWrapOnObjPos;
     mbMathBaselineAlignment = rSource.mbMathBaselineAlignment;
     mbStylesNoDefault = rSource.mbStylesNoDefault;
-    mbFloattableNomargins = rSource.mbFloattableNomargins;
     mbOldNumbering = rSource.mbOldNumbering;
     mbIgnoreFirstLineIndentInNumbering = rSource.mbIgnoreFirstLineIndentInNumbering;
     mbDoNotJustifyLinesWithManualBreak = rSource.mbDoNotJustifyLinesWithManualBreak;
@@ -875,11 +869,6 @@ void sw::DocumentSettingManager::dumpAsXml(xmlTextWriterPtr pWriter) const
                                 BAD_CAST(OString::boolean(mbStylesNoDefault).getStr()));
     (void)xmlTextWriterEndElement(pWriter);
 
-    (void)xmlTextWriterStartElement(pWriter, BAD_CAST("mbFloattableNomargins"));
-    (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"),
-                                BAD_CAST(OString::boolean(mbFloattableNomargins).getStr()));
-    (void)xmlTextWriterEndElement(pWriter);
-
     (void)xmlTextWriterStartElement(pWriter, BAD_CAST("mbOldNumbering"));
     (void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"),
                                 BAD_CAST(OString::boolean(mbOldNumbering).getStr()));
diff --git a/sw/source/core/inc/DocumentSettingManager.hxx b/sw/source/core/inc/DocumentSettingManager.hxx
index 34b26c476e28..284dccf9cf37 100644
--- a/sw/source/core/inc/DocumentSettingManager.hxx
+++ b/sw/source/core/inc/DocumentSettingManager.hxx
@@ -122,7 +122,6 @@ class DocumentSettingManager final :
                                                     // attribute 'WrapInfluenceOnObjPos'.
     bool mbMathBaselineAlignment            : 1;    // TL  2010-10-29 #i972#
     bool mbStylesNoDefault                  : 1;
-    bool mbFloattableNomargins              : 1; //< If paragraph margins next to a floating table should be ignored.
     bool mEmbedFonts                        : 1;  //< Whether to embed fonts when saving.
     bool mEmbedUsedFonts                    : 1;  //< Whether to embed fonts that are used by the document when saving.
     bool mEmbedLatinScriptFonts             : 1;  //< Whether to embed latin script fonts when saving.
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index 4901501d9398..18ad84fa8834 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -125,7 +125,6 @@ enum SwDocumentSettingsPropertyHandles
     HANDLE_TAB_OVERFLOW,
     HANDLE_UNBREAKABLE_NUMBERINGS,
     HANDLE_STYLES_NODEFAULT,
-    HANDLE_FLOATTABLE_NOMARGINS,
     HANDLE_CLIPPED_PICTURES,
     HANDLE_BACKGROUND_PARA_OVER_DRAWINGS,
     HANDLE_EMBED_FONTS,
@@ -230,7 +229,6 @@ static rtl::Reference<MasterPropertySetInfo> lcl_createSettingsInfo()
         { OUString("TabOverflow"), HANDLE_TAB_OVERFLOW, cppu::UnoType<bool>::get(), 0},
         { OUString("UnbreakableNumberings"), HANDLE_UNBREAKABLE_NUMBERINGS, cppu::UnoType<bool>::get(), 0},
         { OUString("StylesNoDefault"), HANDLE_STYLES_NODEFAULT, cppu::UnoType<bool>::get(), 0},
-        { OUString("FloattableNomargins"), HANDLE_FLOATTABLE_NOMARGINS, cppu::UnoType<bool>::get(), 0},
         { OUString("ClippedPictures"), HANDLE_CLIPPED_PICTURES, cppu::UnoType<bool>::get(), 0},
         { OUString("BackgroundParaOverDrawings"), HANDLE_BACKGROUND_PARA_OVER_DRAWINGS, cppu::UnoType<bool>::get(), 0},
         { OUString("EmbedFonts"), HANDLE_EMBED_FONTS, cppu::UnoType<bool>::get(), 0},
@@ -852,12 +850,6 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
             mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::STYLES_NODEFAULT, bTmp);
         }
         break;
-        case HANDLE_FLOATTABLE_NOMARGINS:
-        {
-            bool bTmp = *o3tl::doAccess<bool>(rValue);
-            mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::FLOATTABLE_NOMARGINS, bTmp);
-        }
-        break;
         case HANDLE_CLIPPED_PICTURES:
         {
             bool bTmp = *o3tl::doAccess<bool>(rValue);
@@ -1507,11 +1499,6 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
             rValue <<= mpDoc->getIDocumentSettingAccess().get( DocumentSettingId::STYLES_NODEFAULT );
         }
         break;
-        case HANDLE_FLOATTABLE_NOMARGINS:
-        {
-            rValue <<= mpDoc->getIDocumentSettingAccess().get( DocumentSettingId::FLOATTABLE_NOMARGINS );
-        }
-        break;
         case HANDLE_CLIPPED_PICTURES:
         {
             rValue <<= mpDoc->getIDocumentSettingAccess().get( DocumentSettingId::CLIPPED_PICTURES );
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index 739db5271c91..58e7cf113c7f 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -322,7 +322,6 @@ void WriterFilter::setTargetDocument(const uno::Reference<lang::XComponent>& xDo
     xSettings->setPropertyValue("TabOverSpacing", uno::Any(true));
     xSettings->setPropertyValue("UnbreakableNumberings", uno::Any(true));
 
-    xSettings->setPropertyValue("FloattableNomargins", uno::Any(true));
     xSettings->setPropertyValue("ClippedPictures", uno::Any(true));
     xSettings->setPropertyValue("BackgroundParaOverDrawings", uno::Any(true));
     xSettings->setPropertyValue("TreatSingleColumnBreakAsPageBreak", uno::Any(true));