sw/inc/IDocumentContentOperations.hxx | 5 -----
sw/qa/core/layout/layout.cxx | 5 +++--
sw/qa/extras/uiwriter/uiwriter7.cxx | 13 ++++++++-----
sw/qa/extras/unowriter/unowriter.cxx | 5 +++--
sw/qa/uibase/shells/shells.cxx | 5 +++--
sw/source/core/doc/DocumentContentOperationsManager.cxx | 14 --------------
sw/source/core/inc/DocumentContentOperationsManager.hxx | 3 ---
7 files changed, 17 insertions(+), 33 deletions(-)
New commits:
commit 2d9a3f8137e82af4a419441b58f80c027eee51b1
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Dec 8 20:06:15 2022 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Dec 9 07:10:50 2022 +0000
sw: remove unused DocumentContentOperationsManager::InsertGraphicObject()
Only tests called it, migrate those to
DocumentContentOperationsManager::InsertGraphic() instead, which is what
SwFEShell::Insert() and SwXFrame::attachToRange() use.
Change-Id: Ie05b501507f8722bc0a312c2e729ecd76154ce98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143836
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/inc/IDocumentContentOperations.hxx
b/sw/inc/IDocumentContentOperations.hxx
index 5a95d0ba95b8..3294e9869b4c 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -186,11 +186,6 @@ public:
const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet,
SwFrameFormat*) = 0;
- virtual SwFlyFrameFormat* InsertGraphicObject(
- const SwPaM& rRg, const GraphicObject& rGrfObj,
- const SfxItemSet* pFlyAttrSet,
- const SfxItemSet* pGrfAttrSet) = 0;
-
/** Transpose graphic (with undo)
*/
virtual void ReRead(SwPaM&, const OUString& rGrfName, const OUString&
rFltName, const Graphic* pGraphic) = 0;
diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx
index 8479a3a075aa..f95cfcf09bc9 100644
--- a/sw/qa/core/layout/layout.cxx
+++ b/sw/qa/core/layout/layout.cxx
@@ -865,8 +865,9 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest,
testFollowTextFlowWrapInBackground)
aFrameSet.Put(aSize);
SwFormatFollowTextFlow aFlow(true);
aFrameSet.Put(aFlow);
- GraphicObject aGrf;
- rIDCO.InsertGraphicObject(*pWrtShell->GetCursor(), aGrf, &aFrameSet,
&aGrfSet);
+ Graphic aGrf;
+ rIDCO.InsertGraphic(*pWrtShell->GetCursor(), OUString(), OUString(),
&aGrf, &aFrameSet,
+ &aGrfSet, nullptr);
// When laying out that document:
calcLayout();
diff --git a/sw/qa/extras/uiwriter/uiwriter7.cxx
b/sw/qa/extras/uiwriter/uiwriter7.cxx
index 8c14e7184f44..f04c802ea3b0 100644
--- a/sw/qa/extras/uiwriter/uiwriter7.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter7.cxx
@@ -1830,11 +1830,13 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7,
testUndoDelAsCharTdf107512)
pShell->ClearMark();
SwFormatAnchor anchor(RndStdIds::FLY_AS_CHAR);
frameSet.Put(anchor);
- GraphicObject grf;
+ Graphic grf;
pShell->SttEndDoc(true);
- CPPUNIT_ASSERT(rIDCO.InsertGraphicObject(*pShell->GetCursor(), grf,
&frameSet, &grfSet));
+ CPPUNIT_ASSERT(rIDCO.InsertGraphic(*pShell->GetCursor(), OUString(),
OUString(), &grf,
+ &frameSet, &grfSet, nullptr));
pShell->SttEndDoc(false);
- CPPUNIT_ASSERT(rIDCO.InsertGraphicObject(*pShell->GetCursor(), grf,
&frameSet, &grfSet));
+ CPPUNIT_ASSERT(rIDCO.InsertGraphic(*pShell->GetCursor(), OUString(),
OUString(), &grf,
+ &frameSet, &grfSet, nullptr));
CPPUNIT_ASSERT_EQUAL(size_t(2), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
SvxCharHiddenItem hidden(true, RES_CHRATR_HIDDEN);
pShell->SelectTextModel(1, 4);
@@ -2017,8 +2019,9 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testUndoDelAsChar)
SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN,
RES_GRFATR_END - 1>);
SwFormatAnchor anchor(RndStdIds::FLY_AS_CHAR);
frameSet.Put(anchor);
- GraphicObject grf;
- CPPUNIT_ASSERT(rIDCO.InsertGraphicObject(*pShell->GetCursor(), grf,
&frameSet, &grfSet));
+ Graphic grf;
+ CPPUNIT_ASSERT(rIDCO.InsertGraphic(*pShell->GetCursor(), OUString(),
OUString(), &grf,
+ &frameSet, &grfSet, nullptr));
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
pShell->SetMark();
pShell->Left(1, SwCursorSkipMode::Chars);
diff --git a/sw/qa/extras/unowriter/unowriter.cxx
b/sw/qa/extras/unowriter/unowriter.cxx
index 14ffc152d921..61b9b524b399 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -695,8 +695,9 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter,
testDeleteFlyAtCharAtStart)
SfxItemSet grfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN,
RES_GRFATR_END - 1>);
SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR);
frameSet.Put(anchor);
- GraphicObject grf;
- CPPUNIT_ASSERT(rIDCO.InsertGraphicObject(*pWrtShell->GetCursor(), grf,
&frameSet, &grfSet));
+ Graphic grf;
+ CPPUNIT_ASSERT(rIDCO.InsertGraphic(*pWrtShell->GetCursor(), OUString(),
OUString(), &grf,
+ &frameSet, &grfSet, nullptr));
// check fly
CPPUNIT_ASSERT_EQUAL(1, getShapes());
diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx
index a9625ad9a59f..82ad67b8022c 100644
--- a/sw/qa/uibase/shells/shells.cxx
+++ b/sw/qa/uibase/shells/shells.cxx
@@ -58,8 +58,9 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testTdf130179)
SfxItemSet aGrfSet(pDoc->GetAttrPool(), svl::Items<RES_GRFATR_BEGIN,
RES_GRFATR_END - 1>);
SwFormatAnchor aAnchor(RndStdIds::FLY_AT_PARA);
aFrameSet.Put(aAnchor);
- GraphicObject aGrf;
- CPPUNIT_ASSERT(rIDCO.InsertGraphicObject(*pShell->GetCursor(), aGrf,
&aFrameSet, &aGrfSet));
+ Graphic aGrf;
+ CPPUNIT_ASSERT(rIDCO.InsertGraphic(*pShell->GetCursor(), OUString(),
OUString(), &aGrf,
+ &aFrameSet, &aGrfSet, nullptr));
CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF));
SwView* pView = pDoc->GetDocShell()->GetView();
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 94f3baf31907..3ae7f84750c1 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3071,20 +3071,6 @@ SwFlyFrameFormat*
DocumentContentOperationsManager::InsertGraphic(
return pSwFlyFrameFormat;
}
-SwFlyFrameFormat* DocumentContentOperationsManager::InsertGraphicObject(
- const SwPaM &rRg, const GraphicObject& rGrfObj,
- const SfxItemSet* pFlyAttrSet,
- const SfxItemSet* pGrfAttrSet )
-{
- SwFrameFormat* pFrameFormat =
m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool(
RES_POOLFRM_GRAPHIC );
- SwGrfNode* pSwGrfNode = SwNodes::MakeGrfNode(
- m_rDoc.GetNodes().GetEndOfAutotext(),
- rGrfObj, m_rDoc.GetDfltGrfFormatColl() );
- SwFlyFrameFormat* pSwFlyFrameFormat = InsNoTextNode( *rRg.GetPoint(),
pSwGrfNode,
- pFlyAttrSet, pGrfAttrSet, pFrameFormat );
- return pSwFlyFrameFormat;
-}
-
SwFlyFrameFormat* DocumentContentOperationsManager::InsertEmbObject(
const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj,
SfxItemSet* pFlyAttrSet)
diff --git a/sw/source/core/inc/DocumentContentOperationsManager.hxx
b/sw/source/core/inc/DocumentContentOperationsManager.hxx
index 49473930f7fe..e961df8cf8c7 100644
--- a/sw/source/core/inc/DocumentContentOperationsManager.hxx
+++ b/sw/source/core/inc/DocumentContentOperationsManager.hxx
@@ -66,9 +66,6 @@ public:
SwFlyFrameFormat* InsertGraphic(const SwPaM &rRg, const OUString&
rGrfName, const OUString& rFltName, const Graphic* pGraphic,
const SfxItemSet* pFlyAttrSet, const SfxItemSet*
pGrfAttrSet, SwFrameFormat*) override;
- SwFlyFrameFormat* InsertGraphicObject(const SwPaM& rRg, const
GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
- const SfxItemSet* pGrfAttrSet) override;
-
void ReRead(SwPaM&, const OUString& rGrfName, const OUString& rFltName,
const Graphic* pGraphic) override;
SwDrawFrameFormat* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj,
const SfxItemSet& rFlyAttrSet ) override;
