sw/inc/charformats.hxx | 2 +- sw/inc/format.hxx | 2 +- sw/inc/frameformats.hxx | 2 +- sw/inc/frmfmt.hxx | 2 +- sw/source/core/attr/format.cxx | 2 +- sw/source/core/doc/DocumentLayoutManager.cxx | 8 ++++---- sw/source/core/doc/DocumentStylePoolManager.cxx | 2 +- sw/source/core/doc/docchart.cxx | 4 ++-- sw/source/core/doc/docfmt.cxx | 6 +++--- sw/source/core/doc/doclay.cxx | 8 ++++---- sw/source/core/doc/tblrwcl.cxx | 2 +- sw/source/core/docnode/ndsect.cxx | 2 +- sw/source/core/docnode/ndtbl.cxx | 2 +- sw/source/core/frmedt/fefly1.cxx | 2 +- sw/source/core/frmedt/feshview.cxx | 2 +- sw/source/core/layout/atrfrm.cxx | 4 ++-- sw/source/core/txtnode/chrfmt.cxx | 2 +- sw/source/core/undo/untbl.cxx | 8 ++++---- sw/source/core/unocore/unodraw.cxx | 2 +- sw/source/core/unocore/unotbl.cxx | 2 +- sw/source/filter/html/htmlgrin.cxx | 2 +- sw/source/filter/html/htmlplug.cxx | 2 +- sw/source/filter/html/htmlsect.cxx | 2 +- sw/source/filter/ww8/ww8graf.cxx | 8 ++++---- sw/source/filter/ww8/ww8graf2.cxx | 2 +- sw/source/filter/xml/xmltbli.cxx | 2 +- sw/source/uibase/app/docstyle.cxx | 6 +++--- sw/source/uibase/shells/basesh.cxx | 2 +- 28 files changed, 46 insertions(+), 46 deletions(-)
New commits: commit 27f9495891d86a21f18d7ef5455829f9163e5942 Author: Michael Stahl <[email protected]> AuthorDate: Fri Jul 29 12:27:23 2022 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Fri Aug 5 10:24:56 2022 +0200 sw: rename to unique name SwFrameFormat::SetFormatName() Change-Id: I3058a3ade6bdedf0575c10783a4811d7768ac183 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137812 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/inc/charformats.hxx b/sw/inc/charformats.hxx index 6540b73e2947..73c4ffeccc59 100644 --- a/sw/inc/charformats.hxx +++ b/sw/inc/charformats.hxx @@ -46,7 +46,7 @@ typedef boost::multi_index_container< class SW_DLLPUBLIC SwCharFormats final : public SwFormatsBase { // function updating ByName index via modify - friend void SwFormat::SetName(const OUString&, bool); + friend void SwFormat::SetFormatName(const OUString&, bool); public: typedef SwCharFormatsBase::nth_index<0>::type ByPos; diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 710a249fa9fc..23acd68f0883 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -130,7 +130,7 @@ public: const OUString& GetName() const { return m_aFormatName; } bool HasName(std::u16string_view rName) const { return m_aFormatName == rName; } - virtual void SetName( const OUString& rNewName, bool bBroadcast=false ); + virtual void SetFormatName( const OUString& rNewName, bool bBroadcast=false ); /// For querying the attribute array. const SwAttrSet& GetAttrSet() const { return m_aSet; } diff --git a/sw/inc/frameformats.hxx b/sw/inc/frameformats.hxx index d73ac5a80e46..4e06efe44b04 100644 --- a/sw/inc/frameformats.hxx +++ b/sw/inc/frameformats.hxx @@ -48,7 +48,7 @@ typedef boost::multi_index_container< class SW_DLLPUBLIC SwFrameFormats final : public SwFormatsBase { // function updating ByName index via modify - friend void SwFrameFormat::SetName(const OUString&, bool); + friend void SwFrameFormat::SetFormatName(const OUString&, bool); public: typedef SwFrameFormatsBase::nth_index<0>::type ByPos; diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 1b40dd012224..eb97de392d15 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -181,7 +181,7 @@ public: void dumpAsXml(xmlTextWriterPtr pWriter) const; - virtual void SetName( const OUString& rNewName, bool bBroadcast=false ) override; + virtual void SetFormatName( const OUString& rNewName, bool bBroadcast=false ) override; void MoveTableBox(SwTableBox& rTableBox, const SwFrameFormat* pOldFormat); }; diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index f0e96e060970..b4eb205db4b2 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -141,7 +141,7 @@ SwFormat &SwFormat::operator=(const SwFormat& rFormat) return *this; } -void SwFormat::SetName( const OUString& rNewName, bool bBroadcast ) +void SwFormat::SetFormatName( const OUString& rNewName, bool bBroadcast ) { OSL_ENSURE( !IsDefault(), "SetName: Defaultformat" ); if( bBroadcast ) diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx index b0559ebd215e..3f49328bf462 100644 --- a/sw/source/core/doc/DocumentLayoutManager.cxx +++ b/sw/source/core/doc/DocumentLayoutManager.cxx @@ -396,14 +396,14 @@ SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat( if( !m_rDoc.IsCopyIsMove() || &m_rDoc != pSrcDoc ) { if( m_rDoc.IsInReading() || m_rDoc.IsInMailMerge() ) - pDest->SetName( OUString() ); + pDest->SetFormatName( OUString() ); else { // Test first if the name is already taken, if so generate a new one. SwNodeType nNdTyp = aRg.aStart.GetNode().GetNodeType(); OUString sOld( pDest->GetName() ); - pDest->SetName( OUString() ); + pDest->SetFormatName( OUString() ); if( m_rDoc.FindFlyByName( sOld, nNdTyp ) ) // found one switch( nNdTyp ) { @@ -412,7 +412,7 @@ SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat( default: sOld = m_rDoc.GetUniqueFrameName(); break; } - pDest->SetName( sOld ); + pDest->SetFormatName( sOld ); } } @@ -468,7 +468,7 @@ SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat( // Format name should have unique name. Let's use object name as a fallback SdrObject *pObj = pDest->FindSdrObject(); if (pObj) - pDest->SetName(pObj->GetName()); + pDest->SetFormatName(pObj->GetName()); } // If the draw format has a TextBox, then copy its fly format as well. diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index a37365186330..83408f17742e 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -602,7 +602,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, OUString aName; SwStyleNameMapper::GetUIName(nId, aName); if (!aName.isEmpty()) - pNewColl->SetName(aName); + pNewColl->SetFormatName(aName); } return pNewColl; diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx index 27d94c09a242..05ebd8fa7956 100644 --- a/sw/source/core/doc/docchart.cxx +++ b/sw/source/core/doc/docchart.cxx @@ -171,9 +171,9 @@ void SwDoc::SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName } if( !bNameFound ) - rTableFormat.SetName( rNewName, true ); + rTableFormat.SetFormatName( rNewName, true ); else - rTableFormat.SetName( GetUniqueTableName(), true ); + rTableFormat.SetFormatName( GetUniqueTableName(), true ); SwStartNode *pStNd; SwNodeIndex aIdx( *GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 ); diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 12268a915872..068a8eed98a7 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -1717,7 +1717,7 @@ bool SwDoc::DontExpandFormat( const SwPosition& rPos, bool bFlag ) SwTableBoxFormat* SwDoc::MakeTableBoxFormat() { SwTableBoxFormat* pFormat = new SwTableBoxFormat( GetAttrPool(), mpDfltFrameFormat.get() ); - pFormat->SetName("TableBox" + OUString::number(reinterpret_cast<sal_IntPtr>(pFormat))); + pFormat->SetFormatName("TableBox" + OUString::number(reinterpret_cast<sal_IntPtr>(pFormat))); getIDocumentState().SetModified(); return pFormat; } @@ -1725,7 +1725,7 @@ SwTableBoxFormat* SwDoc::MakeTableBoxFormat() SwTableLineFormat* SwDoc::MakeTableLineFormat() { SwTableLineFormat* pFormat = new SwTableLineFormat( GetAttrPool(), mpDfltFrameFormat.get() ); - pFormat->SetName("TableLine" + OUString::number(reinterpret_cast<sal_IntPtr>(pFormat))); + pFormat->SetFormatName("TableLine" + OUString::number(reinterpret_cast<sal_IntPtr>(pFormat))); getIDocumentState().SetModified(); return pFormat; } @@ -1937,7 +1937,7 @@ void SwDoc::RenameFormat(SwFormat & rFormat, const OUString & sNewName, if (rFormat.Which() == RES_CHRFMT) mpCharFormatTable->SetFormatNameAndReindex(static_cast<SwCharFormat*>(&rFormat), sNewName); else - rFormat.SetName(sNewName); + rFormat.SetFormatName(sNewName); if (bBroadcast) BroadcastStyleOperation(sNewName, eFamily, SfxHintId::StyleSheetModified); diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 24b2ea408c2e..2e5285fe9c89 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -1437,7 +1437,7 @@ void SwDoc::SetFlyName( SwFlyFrameFormat& rFormat, const OUString& rName ) } sName = lcl_GetUniqueFlyName(*this, pTyp, RES_FLYFRMFMT); } - rFormat.SetName( sName, true ); + rFormat.SetFormatName( sName, true ); getIDocumentState().SetModified(); } @@ -1516,13 +1516,13 @@ void SwDoc::SetAllUniqueFlyNames() switch( GetNodes()[ pIdx->GetIndex() + 1 ]->GetNodeType() ) { case SwNodeType::Grf: - pFlyFormat->SetName( sGrfNm + OUString::number( ++nGrfNum )); + pFlyFormat->SetFormatName( sGrfNm + OUString::number( ++nGrfNum )); break; case SwNodeType::Ole: - pFlyFormat->SetName( sOLENm + OUString::number( ++nOLENum )); + pFlyFormat->SetFormatName( sOLENm + OUString::number( ++nOLENum )); break; default: - pFlyFormat->SetName( sFlyNm + OUString::number( ++nFlyNum )); + pFlyFormat->SetFormatName( sFlyNm + OUString::number( ++nFlyNum )); break; } } diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 3b798262cb62..fb9382938186 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -2126,7 +2126,7 @@ bool SwTable::MakeCopy( SwDoc& rInsDoc, const SwPosition& rPos, // Also copy Names or enforce a new unique one if( bCpyName ) - pNewTable->GetFrameFormat()->SetName( GetFrameFormat()->GetName() ); + pNewTable->GetFrameFormat()->SetFormatName( GetFrameFormat()->GetName() ); CpyTabFrames aCpyFormat; CpyPara aPara( pTableNd, 1, aCpyFormat ); diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 0654bd0abf4e..20b18ef82106 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -196,7 +196,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData & rNewData, } SwSectionFormat* const pFormat = MakeSectionFormat(); - pFormat->SetName(rNewData.GetSectionName()); + pFormat->SetFormatName(rNewData.GetSectionName()); if ( pAttr ) { pFormat->SetFormatAttr( *pAttr ); diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 66eb96484281..9f4ff4cacade 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -3583,7 +3583,7 @@ bool SwNodes::MergeTable( const SwNodeIndex& rPos, bool bWithPrev, rTable.GetFrameFormat()->LockModify(); *rTable.GetFrameFormat() = *rDelTable.GetFrameFormat(); // Also switch the Name - rTable.GetFrameFormat()->SetName( rDelTable.GetFrameFormat()->GetName() ); + rTable.GetFrameFormat()->SetFormatName( rDelTable.GetFrameFormat()->GetName() ); rTable.GetFrameFormat()->UnlockModify(); } diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index d3b9b5a1b565..d5a9f30e7e33 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -990,7 +990,7 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj, if (pFormat) { - pFormat->SetName(rDrawObj.GetName()); + pFormat->SetFormatName(rDrawObj.GetName()); // select drawing object Imp()->GetDrawView()->MarkObj( &rDrawObj, Imp()->GetPageView() ); } diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index d390d29c930d..49e7f99fd562 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -2169,7 +2169,7 @@ bool SwFEShell::ImpEndCreate() text::PositionLayoutDir::PositionInLayoutDirOfAnchor ); // #i44344#, #i44681# - positioning attributes already set pFormat->PosAttrSet(); - pFormat->SetName(rSdrObj.GetName()); + pFormat->SetFormatName(rSdrObj.GetName()); SwDrawContact *pContact = new SwDrawContact( pFormat, &rSdrObj ); // #i35635# diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index adb20c76b244..7015fcb40eac 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2567,7 +2567,7 @@ SwFrameFormat::~SwFrameFormat() m_pOtherTextBoxFormats.reset(); } -void SwFrameFormat::SetName( const OUString& rNewName, bool bBroadcast ) +void SwFrameFormat::SetFormatName( const OUString& rNewName, bool bBroadcast ) { if (m_ffList != nullptr) { SwFrameFormats::iterator it = m_ffList->find( this ); @@ -2587,7 +2587,7 @@ void SwFrameFormat::SetName( const OUString& rNewName, bool bBroadcast ) } } else - SwFormat::SetName( rNewName, bBroadcast ); + SwFormat::SetFormatName( rNewName, bBroadcast ); } bool SwFrameFormat::supportsFullDrawingLayerFillAttributeSet() const diff --git a/sw/source/core/txtnode/chrfmt.cxx b/sw/source/core/txtnode/chrfmt.cxx index d2e01640071d..62544bc3dcfb 100644 --- a/sw/source/core/txtnode/chrfmt.cxx +++ b/sw/source/core/txtnode/chrfmt.cxx @@ -113,7 +113,7 @@ void SwCharFormats::SetFormatNameAndReindex(SwCharFormat* v, const OUString& sNe { auto it = find(v); erase(it); - v->SetName(sNewName); + v->SetFormatName(sNewName); insert(v); } diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 6b0a0f01a4b8..dedb58c2369d 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -317,7 +317,7 @@ void SwUndoInsTable::RedoImpl(::sw::UndoRedoContext & rContext) m_nAdjust, m_pAutoFormat.get(), m_pColumnWidth.get() ); rDoc.GetEditShell()->MoveTable( GotoPrevTable, fnTableStart ); - static_cast<SwFrameFormat*>(pTable->GetFrameFormat())->SetName( m_sTableName ); + static_cast<SwFrameFormat*>(pTable->GetFrameFormat())->SetFormatName( m_sTableName ); SwTableNode* pTableNode = rDoc.GetNodes()[m_nStartNode]->GetTableNode(); if( m_pDDEFieldType ) @@ -811,7 +811,7 @@ void SwUndoTextToTable::RedoImpl(::sw::UndoRedoContext & rContext) SwTable const*const pTable = rContext.GetDoc().TextToTable( m_aInsertTableOpts, rPam, m_cSeparator, m_nAdjust, m_pAutoFormat.get() ); - static_cast<SwFrameFormat*>(pTable->GetFrameFormat())->SetName( m_sTableName ); + static_cast<SwFrameFormat*>(pTable->GetFrameFormat())->SetFormatName( m_sTableName ); } void SwUndoTextToTable::RepeatImpl(::sw::RepeatContext & rContext) @@ -2996,13 +2996,13 @@ void SwUndoMergeTable::UndoImpl(::sw::UndoRedoContext & rContext) if( m_bWithPrev ) { // move name - pNew->GetTable().GetFrameFormat()->SetName( pTable->GetFrameFormat()->GetName() ); + pNew->GetTable().GetFrameFormat()->SetFormatName( pTable->GetFrameFormat()->GetName() ); m_pSaveHdl->RestoreAttr( pNew->GetTable() ); } else pTable = &pNew->GetTable(); - pTable->GetFrameFormat()->SetName( m_aName ); + pTable->GetFrameFormat()->SetFormatName( m_aName ); m_pSaveTable->RestoreAttr( *pTable ); if( m_pHistory ) diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 60a0e2fcdf92..c156969c0a8c 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -711,7 +711,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape) { if (pFormat->GetName().isEmpty()) { - pFormat->SetName(pSvxShape->GetSdrObject()->GetName(), false); + pFormat->SetFormatName(pSvxShape->GetSdrObject()->GetName(), false); } pShape->SetFrameFormat(pFormat); } diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 3a3076e9f155..f28bbd930bb5 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -3006,7 +3006,7 @@ void SwXTextTable::setName(const OUString& rName) } } - pFormat->SetName( rName ); + pFormat->SetFormatName( rName ); SwStartNode *pStNd; SwNodeIndex aIdx( *pFormat->GetDoc()->GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 ); diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 517750c0d51d..4fe39e70a319 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -799,7 +799,7 @@ IMAGE_SETEVENT: if( !sHTMLGrfName.isEmpty() ) { - pFlyFormat->SetName( sHTMLGrfName ); + pFlyFormat->SetFormatName( sHTMLGrfName ); // maybe jump to graphic if( JumpToMarks::Graphic == m_eJumpTo && sHTMLGrfName == m_sJmpMark ) diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 5c119d4a7234..47fadcf6caf5 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -676,7 +676,7 @@ bool SwHTMLParser::InsertEmbed() // set name at FrameFormat if( !aName.isEmpty() ) - pFlyFormat->SetName( aName ); + pFlyFormat->SetFormatName( aName ); // set the alternative text SwNoTextNode *pNoTextNd = diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index b60e0f7883a5..4c5280bbadf5 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -767,7 +767,7 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet, SwFlyFrameFormat* pFlyFormat = m_xDoc->MakeFlySection( eAnchorId, m_pPam->GetPoint(), &rItemSet ); if( !rName.isEmpty() ) - pFlyFormat->SetName( rName ); + pFlyFormat->SetFormatName( rName ); RegisterFlyFrame( pFlyFormat ); diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 01df3d3ea58f..141c5c3260a9 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -166,7 +166,7 @@ void wwFrameNamer::SetUniqueGraphName(SwFrameFormat *pFrameFormat, std::u16strin if (mbIsDisabled || rFixed.empty()) return; - pFrameFormat->SetName(msSeed+OUString::number(++mnImportedGraphicsCount) + ": " + rFixed); + pFrameFormat->SetFormatName(msSeed+OUString::number(++mnImportedGraphicsCount) + ": " + rFixed); } // ReadGrafStart reads object data and if necessary creates an anchor @@ -2838,13 +2838,13 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( tools::Long nGrafAnchorCp ) if (pRetFrameFormat /*#i52825# */) { if (!aObjName.isEmpty()) - pRetFrameFormat->SetName( aObjName ); + pRetFrameFormat->SetFormatName( aObjName ); if (pRetFrameFormat->GetName().isEmpty()) { if (bDrawObj) - pRetFrameFormat->SetName(m_rDoc.GetUniqueDrawObjectName()); + pRetFrameFormat->SetFormatName(m_rDoc.GetUniqueDrawObjectName()); else if (bFrame) - pRetFrameFormat->SetName(m_rDoc.GetUniqueFrameName()); + pRetFrameFormat->SetFormatName(m_rDoc.GetUniqueFrameName()); } } return AddAutoAnchor(pRetFrameFormat); diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index 1e70b91a8ffe..4a229de9097d 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -686,7 +686,7 @@ SwFrameFormat* SwWW8ImplReader::ImportGraf(SdrTextObj const * pTextObj, OUString aObjectName(pObject->GetName()); if (aObjectName.isEmpty() || !m_rDoc.FindFlyByName(aObjectName, GetNodeType(*pRet))) - pRet->SetName(aObjectName); + pRet->SetFormatName(aObjectName); else m_aGrfNameGenerator.SetUniqueGraphName(pRet, aObjectName); diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index c749d6e783ef..bb05b1c14785 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1237,7 +1237,7 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport, m_pTableNode = pTable->GetTableNode(); OSL_ENSURE( m_pTableNode, "table node missing" ); - pTableFrameFormat->SetName( sTableName ); + pTableFrameFormat->SetFormatName( sTableName ); SwTableLine *pLine1 = m_pTableNode->GetTable().GetTabLines()[0U]; m_pBox1 = pLine1->GetTabBoxes()[0U]; diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index c374d4c79767..e64b4e8f48aa 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -1055,7 +1055,7 @@ bool SwDocStyleSheet::SetName(const OUString& rStr, bool bReindexNow) if (!m_pCharFormat->GetName().isEmpty()) m_rDoc.RenameFormat(*m_pCharFormat, rStr); else - m_pCharFormat->SetName(rStr); + m_pCharFormat->SetFormatName(rStr); bChg = true; } @@ -1069,7 +1069,7 @@ bool SwDocStyleSheet::SetName(const OUString& rStr, bool bReindexNow) if (!m_pColl->GetName().isEmpty()) m_rDoc.RenameFormat(*m_pColl, rStr); else - m_pColl->SetName(rStr); + m_pColl->SetFormatName(rStr); bChg = true; } @@ -1083,7 +1083,7 @@ bool SwDocStyleSheet::SetName(const OUString& rStr, bool bReindexNow) if (!m_pFrameFormat->GetName().isEmpty()) m_rDoc.RenameFormat(*m_pFrameFormat, rStr); else - m_pFrameFormat->SetName( rStr ); + m_pFrameFormat->SetFormatName( rStr ); bChg = true; } diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index fe10742bbf0d..c1f1b1ca22d8 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -2860,7 +2860,7 @@ static void InsertTableImpl(SwWrtShell& rSh, rSh.MoveTable( GotoPrevTable, fnTableStart ); if( !aTableName.isEmpty() && !rSh.GetTableStyle( aTableName ) ) - rSh.GetTableFormat()->SetName( aTableName ); + rSh.GetTableFormat()->SetFormatName( aTableName ); if( pTAFormat != nullptr && !aAutoName.isEmpty() && aAutoName != SwViewShell::GetShellRes()->aStrNone )
