include/svl/hint.hxx | 2 -
svl/source/items/style.cxx | 2 -
svx/source/sdr/properties/attributeproperties.cxx | 8 ----
sw/inc/doc.hxx | 17 +++-----
sw/source/core/doc/DocumentStylePoolManager.cxx | 2 -
sw/source/core/doc/docdesc.cxx | 6 ---
sw/source/core/doc/docfmt.cxx | 43 +++++-----------------
sw/source/core/doc/docnum.cxx | 5 --
sw/source/core/docnode/ndtbl.cxx | 5 --
sw/source/core/undo/SwUndoFmt.cxx | 20 +++++-----
sw/source/core/undo/SwUndoPageDesc.cxx | 4 +-
sw/source/core/undo/untbl.cxx | 4 +-
sw/source/core/unocore/unosett.cxx | 2 -
sw/source/filter/ww8/ww8par.cxx | 2 -
sw/source/filter/ww8/ww8par2.cxx | 4 +-
sw/source/filter/ww8/ww8par3.cxx | 2 -
sw/source/uibase/app/docst.cxx | 9 ----
sw/source/uibase/app/docstyle.cxx | 4 +-
sw/source/uibase/uiview/view2.cxx | 2 -
19 files changed, 43 insertions(+), 100 deletions(-)
New commits:
commit 75936266771bda85c8e9c49e796bbca2167f4ef8
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri Oct 18 19:51:46 2024 +0200
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Oct 21 16:25:33 2024 +0200
drop StyleSheetCreated
the only place that references it, effectively ignores it.
I cant find anything that really uses it, as far back in the
git history as
commit 59bb5ba445352f88e3ac2d00a5dc3f9bb872326a
Author: Vladimir Glazounov <v...@openoffice.org>
Date: Wed Apr 11 18:36:28 2007 +0000
INTEGRATION: CWS hedaburemove01 (1.1.2); FILE ADDED
when it was introduced.
Removing this removes a bunch of expensive broadcast operations.
a similar mega-master-page scenario as reported in tdf#158773
20s -> 17s
Change-Id: I84ee269aa0ea96e9f77601b01d4795edd3294044
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175175
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index bad64aa212fc..7fb28c5588de 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -148,7 +148,6 @@ enum class SfxHintId {
SdViewShell,
// SFX stylesheet
- StyleSheetCreated, // new
StyleSheetModified, // changed (used by the SfxStyleSheetHint class)
StyleSheetModifiedExtended, // changed (used by the
SfxStyleSheetModifiedHint class)
StyleSheetChanged, // erased and re-created (replaced)
@@ -300,7 +299,6 @@ inline std::basic_ostream<charT, traits> & operator <<(
case SfxHintId::ScAccLeaveEditMode: return stream << "ScAccLeaveEditMode";
case SfxHintId::ScAccMakeDrawLayer: return stream << "ScAccMakeDrawLayer";
case SfxHintId::ScAccWindowResized: return stream << "ScAccWindowResized";
- case SfxHintId::StyleSheetCreated: return stream << "StyleSheetCreated";
case SfxHintId::StyleSheetModified: return stream << "StyleSheetModified";
case SfxHintId::StyleSheetModifiedExtended: return stream <<
"StyleSheetModifiedExtended";
case SfxHintId::StyleSheetChanged: return stream << "StyleSheetChanged";
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index b9aa5c2cf533..73c0c0cdbd98 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -650,7 +650,6 @@ SfxStyleSheetBase& SfxStyleSheetBasePool::Make( const
OUString& rName, SfxStyleF
{
xStyle = Create( rName, eFam, mask );
StoreStyleSheet(xStyle);
- Broadcast(SfxStyleSheetHint(SfxHintId::StyleSheetCreated, *xStyle));
}
return *xStyle;
}
@@ -770,7 +769,6 @@ void SfxStyleSheetBasePool::Insert( SfxStyleSheetBase* p )
}
#endif
StoreStyleSheet(rtl::Reference< SfxStyleSheetBase >( p ) );
- Broadcast( SfxStyleSheetHint( SfxHintId::StyleSheetCreated, *p ) );
}
void SfxStyleSheetBasePool::Clear()
diff --git a/svx/source/sdr/properties/attributeproperties.cxx
b/svx/source/sdr/properties/attributeproperties.cxx
index 4b010ba978c3..3094eb01a1de 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -419,8 +419,7 @@ namespace sdr::properties
bool bHintUsed(false);
SfxHintId id = rHint.GetId();
- if (id == SfxHintId::StyleSheetCreated
- || id == SfxHintId::StyleSheetChanged
+ if (id == SfxHintId::StyleSheetChanged
|| id == SfxHintId::StyleSheetErased
|| id == SfxHintId::StyleSheetModified
|| id == SfxHintId::StyleSheetInDestruction
@@ -435,11 +434,6 @@ namespace sdr::properties
switch(id)
{
- case SfxHintId::StyleSheetCreated :
- {
- // cannot happen, nothing to do
- break;
- }
case SfxHintId::StyleSheetModified :
case SfxHintId::StyleSheetModifiedExtended:
case SfxHintId::StyleSheetChanged :
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 8c3adf65c6ec..1dc75f7f352c 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -779,12 +779,11 @@ public:
void RemoveAllFormatLanguageDependencies();
SW_DLLPUBLIC SwFrameFormat* MakeFrameFormat(const OUString &rFormatName,
SwFrameFormat *pDerivedFrom,
- bool bBroadcast = false, bool bAuto = true);
+ bool bAuto = true);
SW_DLLPUBLIC void DelFrameFormat( SwFrameFormat *pFormat, bool bBroadcast
= false );
SwFrameFormat* FindFrameFormatByName( const OUString& rName ) const;
- SW_DLLPUBLIC SwCharFormat *MakeCharFormat(const OUString &rFormatName,
SwCharFormat *pDerivedFrom,
- bool bBroadcast = false );
+ SW_DLLPUBLIC SwCharFormat *MakeCharFormat(const OUString &rFormatName,
SwCharFormat *pDerivedFrom);
void DelCharFormat(size_t nFormat, bool bBroadcast = false);
void DelCharFormat(SwCharFormat const * pFormat, bool bBroadcast =
false);
SwCharFormat* FindCharFormatByName( const OUString& rName ) const
@@ -797,11 +796,9 @@ public:
const SwTextFormatColls *GetTextFormatColls() const { return
mpTextFormatCollTable.get(); }
SwTextFormatColls *GetTextFormatColls() { return
mpTextFormatCollTable.get(); }
SW_DLLPUBLIC SwTextFormatColl *MakeTextFormatColl( const OUString
&rFormatName,
- SwTextFormatColl *pDerivedFrom,
- bool bBroadcast = false);
+ SwTextFormatColl *pDerivedFrom);
SwConditionTextFormatColl* MakeCondTextFormatColl( const OUString
&rFormatName,
- SwTextFormatColl *pDerivedFrom,
- bool bBroadcast = false);
+ SwTextFormatColl *pDerivedFrom);
void DelTextFormatColl(size_t nFormat, bool bBroadcast = false);
void DelTextFormatColl( SwTextFormatColl const * pColl, bool bBroadcast =
false );
/** Add 4th optional parameter <bResetListAttrs>.
@@ -927,8 +924,7 @@ public:
void DelPageDesc( size_t i, bool bBroadcast = false );
void PreDelPageDesc(SwPageDesc const * pDel);
SW_DLLPUBLIC SwPageDesc* MakePageDesc(const OUString &rName, const
SwPageDesc* pCpy = nullptr,
- bool bRegardLanguage = true,
- bool bBroadcast = false);
+ bool bRegardLanguage = true);
void BroadcastStyleOperation(const OUString& rName, SfxStyleFamily eFamily,
SfxHintId nOp);
@@ -1105,7 +1101,6 @@ public:
// add optional parameter <eDefaultNumberFormatPositionAndSpaceMode>
SW_DLLPUBLIC sal_uInt16 MakeNumRule( const OUString &rName,
const SwNumRule* pCpy = nullptr,
- bool bBroadcast = false,
const SvxNumberFormat::SvxNumPositionAndSpaceMode
eDefaultNumberFormatPositionAndSpaceMode =
SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
sal_uInt16 FindNumRule( std::u16string_view rName ) const;
@@ -1277,7 +1272,7 @@ public:
/// Counts table styles without triggering lazy-load of them.
bool HasTableStyles() const { return m_pTableStyles != nullptr; }
// Create a new table style. Tracked by Undo.
- SW_DLLPUBLIC SwTableAutoFormat* MakeTableStyle(const OUString& rName, bool
bBroadcast = false);
+ SW_DLLPUBLIC SwTableAutoFormat* MakeTableStyle(const OUString& rName);
// Delete table style named rName. Tracked by undo.
SW_DLLPUBLIC std::unique_ptr<SwTableAutoFormat> DelTableStyle(const
OUString& rName, bool bBroadcast = false);
// Change (replace) a table style named rName. Tracked by undo.
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 22c85a8e7779..d6b05b84c99d 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -1960,7 +1960,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool(
sal_uInt16 nId )
{
bool bIsModified = m_rDoc.getIDocumentState().IsModified();
- sal_uInt16 n = m_rDoc.MakeNumRule( aNm, nullptr, false,
eNumberFormatPositionAndSpaceMode );
+ sal_uInt16 n = m_rDoc.MakeNumRule( aNm, nullptr,
eNumberFormatPositionAndSpaceMode );
pNewRule = m_rDoc.GetNumRuleTable()[ n ];
pNewRule->SetPoolFormatId( nId );
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 92b1de4e9cf4..0400a34c586d 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -772,7 +772,7 @@ void SwDoc::DelPageDesc( size_t i, bool bBroadcast )
}
SwPageDesc* SwDoc::MakePageDesc(const OUString &rName, const SwPageDesc *pCpy,
- bool bRegardLanguage, bool bBroadcast)
+ bool bRegardLanguage)
{
SwPageDesc *pNew;
if( pCpy )
@@ -805,10 +805,6 @@ SwPageDesc* SwDoc::MakePageDesc(const OUString &rName,
const SwPageDesc *pCpy,
std::pair<SwPageDescs::const_iterator, bool> res = m_PageDescs.push_back(
pNew );
SAL_WARN_IF(!res.second, "sw", "MakePageDesc called with existing name" );
- if (bBroadcast)
- BroadcastStyleOperation(rName, SfxStyleFamily::Page,
- SfxHintId::StyleSheetCreated);
-
if (GetIDocumentUndoRedo().DoesUndo())
{
GetIDocumentUndoRedo().AppendUndo(std::make_unique<SwUndoPageDescCreate>(pNew,
this));
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 8116bb80b424..bb1ef4788b84 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -817,7 +817,7 @@ SwTableFormat* SwDoc::MakeTableFrameFormat( const OUString
&rFormatName,
SwFrameFormat *SwDoc::MakeFrameFormat(const OUString &rFormatName,
SwFrameFormat *pDerivedFrom,
- bool bBroadcast, bool bAuto)
+ bool bAuto)
{
SwFrameFormat *pFormat = new SwFrameFormat( GetAttrPool(), rFormatName,
pDerivedFrom );
@@ -831,27 +831,20 @@ SwFrameFormat *SwDoc::MakeFrameFormat(const OUString
&rFormatName,
std::make_unique<SwUndoFrameFormatCreate>(pFormat, pDerivedFrom,
*this));
}
- if (bBroadcast)
- {
- BroadcastStyleOperation(rFormatName, SfxStyleFamily::Frame,
- SfxHintId::StyleSheetCreated);
- }
-
return pFormat;
}
SwFormat *SwDoc::MakeFrameFormat_(const OUString &rFormatName,
SwFormat *pDerivedFrom,
- bool bBroadcast, bool bAuto)
+ bool /*bBroadcast*/, bool bAuto)
{
SwFrameFormat *pFrameFormat = dynamic_cast<SwFrameFormat*>(pDerivedFrom);
- pFrameFormat = MakeFrameFormat( rFormatName, pFrameFormat, bBroadcast,
bAuto );
+ pFrameFormat = MakeFrameFormat( rFormatName, pFrameFormat, bAuto );
return pFrameFormat;
}
SwCharFormat *SwDoc::MakeCharFormat( const OUString &rFormatName,
- SwCharFormat *pDerivedFrom,
- bool bBroadcast )
+ SwCharFormat *pDerivedFrom )
{
SwCharFormat *pFormat = new SwCharFormat( GetAttrPool(), rFormatName,
pDerivedFrom );
mpCharFormatTable->insert( pFormat );
@@ -864,28 +857,21 @@ SwCharFormat *SwDoc::MakeCharFormat( const OUString
&rFormatName,
std::make_unique<SwUndoCharFormatCreate>(pFormat, pDerivedFrom,
*this));
}
- if (bBroadcast)
- {
- BroadcastStyleOperation(rFormatName, SfxStyleFamily::Char,
- SfxHintId::StyleSheetCreated);
- }
-
return pFormat;
}
SwFormat *SwDoc::MakeCharFormat_(const OUString &rFormatName,
SwFormat *pDerivedFrom,
- bool bBroadcast, bool /*bAuto*/)
+ bool /*bBroadcast*/, bool /*bAuto*/)
{
SwCharFormat *pCharFormat = dynamic_cast<SwCharFormat*>(pDerivedFrom);
- pCharFormat = MakeCharFormat( rFormatName, pCharFormat, bBroadcast );
+ pCharFormat = MakeCharFormat( rFormatName, pCharFormat );
return pCharFormat;
}
/// Create the FormatCollections
SwTextFormatColl* SwDoc::MakeTextFormatColl( const OUString &rFormatName,
- SwTextFormatColl *pDerivedFrom,
- bool bBroadcast)
+ SwTextFormatColl *pDerivedFrom)
{
SwTextFormatColl *pFormatColl = new SwTextFormatColl( GetAttrPool(),
rFormatName,
pDerivedFrom );
@@ -900,25 +886,20 @@ SwTextFormatColl* SwDoc::MakeTextFormatColl( const
OUString &rFormatName,
*this));
}
- if (bBroadcast)
- BroadcastStyleOperation(rFormatName, SfxStyleFamily::Para,
- SfxHintId::StyleSheetCreated);
-
return pFormatColl;
}
SwFormat *SwDoc::MakeTextFormatColl_(const OUString &rFormatName,
SwFormat *pDerivedFrom,
- bool bBroadcast, bool /*bAuto*/)
+ bool /*bBroadcast*/, bool /*bAuto*/)
{
SwTextFormatColl *pTextFormatColl =
dynamic_cast<SwTextFormatColl*>(pDerivedFrom);
- pTextFormatColl = MakeTextFormatColl( rFormatName, pTextFormatColl,
bBroadcast );
+ pTextFormatColl = MakeTextFormatColl( rFormatName, pTextFormatColl );
return pTextFormatColl;
}
SwConditionTextFormatColl* SwDoc::MakeCondTextFormatColl( const OUString
&rFormatName,
- SwTextFormatColl
*pDerivedFrom,
- bool bBroadcast)
+ SwTextFormatColl
*pDerivedFrom)
{
SwConditionTextFormatColl*pFormatColl = new SwConditionTextFormatColl(
GetAttrPool(),
rFormatName, pDerivedFrom
);
@@ -933,10 +914,6 @@ SwConditionTextFormatColl* SwDoc::MakeCondTextFormatColl(
const OUString &rForma
*this));
}
- if (bBroadcast)
- BroadcastStyleOperation(rFormatName, SfxStyleFamily::Para,
- SfxHintId::StyleSheetCreated);
-
return pFormatColl;
}
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 6c0d2c84dc58..a415c7247d5c 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2573,7 +2573,6 @@ void SwDoc::AddNumRule(SwNumRule * pRule)
sal_uInt16 SwDoc::MakeNumRule( const OUString &rName,
const SwNumRule* pCpy,
- bool bBroadcast,
const SvxNumberFormat::SvxNumPositionAndSpaceMode
eDefaultNumberFormatPositionAndSpaceMode )
{
SwNumRule* pNew;
@@ -2608,10 +2607,6 @@ sal_uInt16 SwDoc::MakeNumRule( const OUString &rName,
std::make_unique<SwUndoNumruleCreate>(pNew, *this));
}
- if (bBroadcast)
- BroadcastStyleOperation(pNew->GetName(), SfxStyleFamily::Pseudo,
- SfxHintId::StyleSheetCreated);
-
return nRet;
}
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index b4c348d92e1b..15cd4b39fbe1 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -4621,7 +4621,7 @@ bool SwDoc::HasTableAnyProtection( const SwPosition* pPos,
return bHasProtection;
}
-SwTableAutoFormat* SwDoc::MakeTableStyle(const OUString& rName, bool
bBroadcast)
+SwTableAutoFormat* SwDoc::MakeTableStyle(const OUString& rName)
{
SwTableAutoFormat aTableFormat(rName);
GetTableStyles().AddAutoFormat(aTableFormat);
@@ -4635,9 +4635,6 @@ SwTableAutoFormat* SwDoc::MakeTableStyle(const OUString&
rName, bool bBroadcast)
std::make_unique<SwUndoTableStyleMake>(rName, *this));
}
- if (bBroadcast)
- BroadcastStyleOperation(rName, SfxStyleFamily::Table,
SfxHintId::StyleSheetCreated);
-
return pTableFormat;
}
diff --git a/sw/source/core/undo/SwUndoFmt.cxx
b/sw/source/core/undo/SwUndoFmt.cxx
index 3493ad56f31e..e90fbdc3f22d 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -196,7 +196,7 @@ SwUndoTextFormatCollCreate::SwUndoTextFormatCollCreate
SwFormat * SwUndoTextFormatCollCreate::Create(SwFormat * pDerivedFrom)
{
- return m_rDoc.MakeTextFormatColl(m_sNewName, static_cast<SwTextFormatColl
*>(pDerivedFrom), true);
+ return m_rDoc.MakeTextFormatColl(m_sNewName, static_cast<SwTextFormatColl
*>(pDerivedFrom));
}
void SwUndoTextFormatCollCreate::Delete()
@@ -217,7 +217,7 @@
SwUndoTextFormatCollDelete::SwUndoTextFormatCollDelete(SwTextFormatColl const *
SwFormat * SwUndoTextFormatCollDelete::Create(SwFormat * pDerivedFrom)
{
- return m_rDoc.MakeTextFormatColl(m_sOldName, static_cast<SwTextFormatColl
*>(pDerivedFrom), true);
+ return m_rDoc.MakeTextFormatColl(m_sOldName, static_cast<SwTextFormatColl
*>(pDerivedFrom));
}
void SwUndoTextFormatCollDelete::Delete(SwFormat * pOld)
@@ -238,7 +238,7 @@
SwUndoCondTextFormatCollCreate::SwUndoCondTextFormatCollCreate(SwConditionTextFo
SwFormat * SwUndoCondTextFormatCollCreate::Create(SwFormat * pDerivedFrom)
{
- return m_rDoc.MakeCondTextFormatColl(m_sNewName,
static_cast<SwTextFormatColl *>(pDerivedFrom), true);
+ return m_rDoc.MakeCondTextFormatColl(m_sNewName,
static_cast<SwTextFormatColl *>(pDerivedFrom));
}
SwUndoCondTextFormatCollDelete::SwUndoCondTextFormatCollDelete(SwTextFormatColl
const * _pOld,
@@ -249,7 +249,7 @@
SwUndoCondTextFormatCollDelete::SwUndoCondTextFormatCollDelete(SwTextFormatColl
SwFormat * SwUndoCondTextFormatCollDelete::Create(SwFormat * pDerivedFrom)
{
- return m_rDoc.MakeCondTextFormatColl(m_sOldName,
static_cast<SwTextFormatColl *>(pDerivedFrom), true);
+ return m_rDoc.MakeCondTextFormatColl(m_sOldName,
static_cast<SwTextFormatColl *>(pDerivedFrom));
}
SwUndoRenameFormatColl::SwUndoRenameFormatColl(const OUString & sInitOldName,
@@ -273,7 +273,7 @@ SwUndoCharFormatCreate::SwUndoCharFormatCreate(SwCharFormat
* pNewFormat,
SwFormat * SwUndoCharFormatCreate::Create(SwFormat * pDerivedFrom)
{
- return m_rDoc.MakeCharFormat(m_sNewName, static_cast<SwCharFormat
*>(pDerivedFrom), true);
+ return m_rDoc.MakeCharFormat(m_sNewName, static_cast<SwCharFormat
*>(pDerivedFrom));
}
void SwUndoCharFormatCreate::Delete()
@@ -293,7 +293,7 @@ SwUndoCharFormatDelete::SwUndoCharFormatDelete(SwCharFormat
const * pOld, SwDoc&
SwFormat * SwUndoCharFormatDelete::Create(SwFormat * pDerivedFrom)
{
- return m_rDoc.MakeCharFormat(m_sOldName, static_cast<SwCharFormat
*>(pDerivedFrom), true);
+ return m_rDoc.MakeCharFormat(m_sOldName, static_cast<SwCharFormat
*>(pDerivedFrom));
}
void SwUndoCharFormatDelete::Delete(SwFormat * pFormat)
@@ -327,7 +327,7 @@
SwUndoFrameFormatCreate::SwUndoFrameFormatCreate(SwFrameFormat * pNewFormat,
SwFormat * SwUndoFrameFormatCreate::Create(SwFormat * pDerivedFrom)
{
- return m_rDoc.MakeFrameFormat(m_sNewName, static_cast<SwFrameFormat
*>(pDerivedFrom), true, m_pNew->IsAuto());
+ return m_rDoc.MakeFrameFormat(m_sNewName, static_cast<SwFrameFormat
*>(pDerivedFrom), m_pNew->IsAuto());
}
void SwUndoFrameFormatCreate::Delete()
@@ -347,7 +347,7 @@
SwUndoFrameFormatDelete::SwUndoFrameFormatDelete(SwFrameFormat const * pOld, SwD
SwFormat * SwUndoFrameFormatDelete::Create(SwFormat * pDerivedFrom)
{
- return m_rDoc.MakeFrameFormat(m_sOldName, static_cast<SwFrameFormat
*>(pDerivedFrom), true);
+ return m_rDoc.MakeFrameFormat(m_sOldName, static_cast<SwFrameFormat
*>(pDerivedFrom));
}
void SwUndoFrameFormatDelete::Delete(SwFormat * pFormat)
@@ -392,7 +392,7 @@ void SwUndoNumruleCreate::UndoImpl(::sw::UndoRedoContext &)
void SwUndoNumruleCreate::RedoImpl(::sw::UndoRedoContext &)
{
- m_rDoc.MakeNumRule(m_aNew.GetName(), &m_aNew, true);
+ m_rDoc.MakeNumRule(m_aNew.GetName(), &m_aNew);
}
SwRewriter SwUndoNumruleCreate::GetRewriter() const
@@ -418,7 +418,7 @@ SwUndoNumruleDelete::SwUndoNumruleDelete(const SwNumRule &
rRule,
void SwUndoNumruleDelete::UndoImpl(::sw::UndoRedoContext &)
{
- m_rDoc.MakeNumRule(m_aOld.GetName(), &m_aOld, true);
+ m_rDoc.MakeNumRule(m_aOld.GetName(), &m_aOld);
}
void SwUndoNumruleDelete::RedoImpl(::sw::UndoRedoContext &)
diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx
b/sw/source/core/undo/SwUndoPageDesc.cxx
index eec1300d5e67..c97318d2030e 100644
--- a/sw/source/core/undo/SwUndoPageDesc.cxx
+++ b/sw/source/core/undo/SwUndoPageDesc.cxx
@@ -281,7 +281,7 @@ void SwUndoPageDescCreate::UndoImpl(::sw::UndoRedoContext &)
void SwUndoPageDescCreate::DoImpl()
{
SwPageDesc aPageDesc = m_aNew;
- m_pDoc->MakePageDesc(m_aNew.GetName(), &aPageDesc, false, true);
+ m_pDoc->MakePageDesc(m_aNew.GetName(), &aPageDesc, false);
}
void SwUndoPageDescCreate::RedoImpl(::sw::UndoRedoContext &)
@@ -321,7 +321,7 @@ SwUndoPageDescDelete::~SwUndoPageDescDelete()
void SwUndoPageDescDelete::UndoImpl(::sw::UndoRedoContext &)
{
SwPageDesc aPageDesc = m_aOld;
- m_pDoc->MakePageDesc(m_aOld.GetName(), &aPageDesc, false, true);
+ m_pDoc->MakePageDesc(m_aOld.GetName(), &aPageDesc, false);
}
void SwUndoPageDescDelete::DoImpl()
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index fcbeb2b99ff5..c037c4c2b34f 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -3123,7 +3123,7 @@ void SwUndoTableStyleMake::RedoImpl(::sw::UndoRedoContext
& rContext)
{
if (m_pAutoFormat)
{
- SwTableAutoFormat* pFormat = rContext.GetDoc().MakeTableStyle(m_sName,
true);
+ SwTableAutoFormat* pFormat = rContext.GetDoc().MakeTableStyle(m_sName);
if (pFormat)
{
*pFormat = *m_pAutoFormat;
@@ -3150,7 +3150,7 @@ SwUndoTableStyleDelete::~SwUndoTableStyleDelete()
void SwUndoTableStyleDelete::UndoImpl(::sw::UndoRedoContext & rContext)
{
- SwTableAutoFormat* pNewFormat =
rContext.GetDoc().MakeTableStyle(m_pAutoFormat->GetName(), true);
+ SwTableAutoFormat* pNewFormat =
rContext.GetDoc().MakeTableStyle(m_pAutoFormat->GetName());
*pNewFormat = *m_pAutoFormat;
for (size_t i=0; i < m_rAffectedTables.size(); i++)
m_rAffectedTables[i]->SetTableStyleName(m_pAutoFormat->GetName());
diff --git a/sw/source/core/unocore/unosett.cxx
b/sw/source/core/unocore/unosett.cxx
index 99f6e0ac1754..9c3ada9f2d6e 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1064,7 +1064,7 @@ SwXNumberingRules::SwXNumberingRules(SwDoc& rDoc) :
{
m_pImpl->StartListening(GetPageDescNotifier(&rDoc));
m_sCreatedNumRuleName = rDoc.GetUniqueNumRuleName();
- rDoc.MakeNumRule( m_sCreatedNumRuleName, nullptr, false,
+ rDoc.MakeNumRule( m_sCreatedNumRuleName, nullptr,
// #i89178#
numfunc::GetDefaultPositionAndSpaceMode() );
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 0d36189dd034..caa6b750d5fe 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3735,7 +3735,7 @@ bool SwWW8ImplReader::ReadChar(tools::Long nPosCp,
tools::Long nCpOfs)
else if (m_bSpec)
{
SwFrameFormat* pAsCharFlyFormat =
- m_rDoc.MakeFrameFormat(OUString(),
m_rDoc.GetDfltFrameFormat());
+ m_rDoc.MakeFrameFormat(OUString(),
m_rDoc.GetDfltFrameFormat(), true);
SwFormatAnchor aAnchor(RndStdIds::FLY_AS_CHAR);
pAsCharFlyFormat->SetFormatAttr(aAnchor);
pResult = ImportGraf(nullptr, pAsCharFlyFormat);
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index f70889dd2720..5317eb775023 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -733,7 +733,7 @@ SwNumRule* SwWW8ImplReader::GetStyRule()
const OUString aName( m_rDoc.GetUniqueNumRuleName( &aBaseName, false) );
// #i86652#
- sal_uInt16 nRul = m_rDoc.MakeNumRule( aName, nullptr, false,
+ sal_uInt16 nRul = m_rDoc.MakeNumRule( aName, nullptr,
SvxNumberFormat::LABEL_ALIGNMENT );
m_xStyles->mpStyRule = m_rDoc.GetNumRuleTable()[nRul];
// Auto == false-> numbering style
@@ -956,7 +956,7 @@ void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13)
{
// #i86652#
pNumRule = m_rDoc.GetNumRuleTable()[
- m_rDoc.MakeNumRule( sNumRule, nullptr, false,
+ m_rDoc.MakeNumRule( sNumRule, nullptr,
SvxNumberFormat::LABEL_ALIGNMENT
) ];
}
if (m_xTableDesc)
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 94ea2e754a90..7ac03cd85787 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1110,7 +1110,7 @@ SwNumRule* WW8ListManager::CreateNextRule(bool bSimple)
const OUString sPrefix("WW8Num" + OUString::number(m_nUniqueList++));
// #i86652#
sal_uInt16 nRul =
- m_rDoc.MakeNumRule( m_rDoc.GetUniqueNumRuleName(&sPrefix),
nullptr, false,
+ m_rDoc.MakeNumRule( m_rDoc.GetUniqueNumRuleName(&sPrefix), nullptr,
SvxNumberFormat::LABEL_ALIGNMENT );
SwNumRule* pMyNumRule = m_rDoc.GetNumRuleTable()[nRul];
pMyNumRule->SetAutoRule(false);
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 65bf850b5b0a..d6be439d4259 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -712,9 +712,7 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl, LinkParamNone*, void)
if(SfxStyleFamily::Page == m_nFamily)
pView->InvalidateRulerPos();
- if( m_bNew )
- m_xBasePool->Broadcast(SfxStyleSheetHint(SfxHintId::StyleSheetCreated,
*m_xTmp));
- else
+ if( !m_bNew )
m_xBasePool->Broadcast(SfxStyleSheetHint(SfxHintId::StyleSheetModified,
*m_xTmp));
pDoc->getIDocumentState().SetModified();
@@ -1134,9 +1132,6 @@ void SwDocShell::Edit(
if(SfxStyleFamily::Page == nFamily)
m_pView->InvalidateRulerPos();
- if( bNew )
-
m_xBasePool->Broadcast(SfxStyleSheetHint(SfxHintId::StyleSheetCreated, *xTmp));
-
m_xDoc->getIDocumentState().SetModified();
if( !bModified ) // Bug 57028
{
@@ -1613,8 +1608,6 @@ void SwDocShell::MakeByExample( const OUString &rName,
SfxStyleFamily nFamily,
default: break;
}
-
- m_xDoc->BroadcastStyleOperation(rName, nFamily,
SfxHintId::StyleSheetCreated);
}
sfx::AccessibilityIssueCollection SwDocShell::runAccessibilityCheck()
diff --git a/sw/source/uibase/app/docstyle.cxx
b/sw/source/uibase/app/docstyle.cxx
index e4f5a0a49e7f..ea256a2668e3 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -2319,7 +2319,7 @@ void SwDocStyleSheet::Create()
case SfxStyleFamily::Frame:
m_pFrameFormat = lcl_FindFrameFormat( m_rDoc, aName );
if( !m_pFrameFormat )
- m_pFrameFormat = m_rDoc.MakeFrameFormat(aName,
m_rDoc.GetDfltFrameFormat(), false, false);
+ m_pFrameFormat = m_rDoc.MakeFrameFormat(aName,
m_rDoc.GetDfltFrameFormat(), false);
break;
@@ -2337,7 +2337,7 @@ void SwDocStyleSheet::Create()
{
const OUString sTmpNm( aName.isEmpty() ?
m_rDoc.GetUniqueNumRuleName() : aName );
SwNumRule* pRule = m_rDoc.GetNumRuleTable()[
- m_rDoc.MakeNumRule( sTmpNm, nullptr, false,
+ m_rDoc.MakeNumRule( sTmpNm, nullptr,
// #i89178#
numfunc::GetDefaultPositionAndSpaceMode() ) ];
pRule->SetAutoRule( false );
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index b172f4557841..0df8e979a356 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -558,7 +558,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
if(!pFormat)
pFormat = pDoc->MakeFrameFormat(sGraphicFormat,
pDocShell->GetDoc()->GetDfltFrameFormat(),
- true, false);
+ false);
rSh.SetFrameFormat( pFormat );
}
