summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sfx2/objsh.hxx4
-rw-r--r--sc/source/ui/docshell/docsh6.cxx5
-rw-r--r--sc/source/ui/inc/docsh.hxx4
-rw-r--r--sfx2/source/doc/objcont.cxx4
-rw-r--r--sw/inc/docsh.hxx8
-rw-r--r--sw/source/ui/app/docsh2.cxx8
6 files changed, 17 insertions, 16 deletions
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 4fbda631db9d..be4a075652d8 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -526,7 +526,7 @@ public:
virtual Bitmap GetStyleFamilyBitmap(SfxStyleFamily eFamily);
- virtual sal_Bool Insert( SfxObjectShell &rSource,
+ virtual sal_Bool InsertStuffWithIndexes( SfxObjectShell &rSource,
sal_uInt16 nSourceIdx1,
sal_uInt16 nSourceIdx2,
sal_uInt16 nSourceIdx3,
@@ -535,7 +535,7 @@ public:
sal_uInt16 &nIdx3,
sal_uInt16 &rIdxDeleted);
- virtual sal_Bool Remove( sal_uInt16 nIdx1,
+ virtual sal_Bool RemoveStuffWithIndexes( sal_uInt16 nIdx1,
sal_uInt16 nIdx2 = INDEX_IGNORE,
sal_uInt16 nIdx3 = INDEX_IGNORE);
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index ecfed5d828e3..9f968b4bf6d7 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -340,11 +340,12 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, bool bReplace, bool bCellS
}
-sal_Bool ScDocShell::Insert( SfxObjectShell &rSource,
+sal_Bool ScDocShell::InsertStuffWithIndexes( SfxObjectShell &rSource,
sal_uInt16 nSourceIdx1, sal_uInt16 nSourceIdx2, sal_uInt16 nSourceIdx3,
sal_uInt16 &nIdx1, sal_uInt16 &nIdx2, sal_uInt16 &nIdx3, sal_uInt16 &rIdxDeleted )
{
- sal_Bool bRet = SfxObjectShell::Insert( rSource, nSourceIdx1, nSourceIdx2, nSourceIdx3,
+ sal_Bool bRet = SfxObjectShell::InsertStuffWithIndexes(
+ rSource, nSourceIdx1, nSourceIdx2, nSourceIdx3,
nIdx1, nIdx2, nIdx3, rIdxDeleted );
if (bRet)
lcl_AdjustPool( GetStyleSheetPool() ); // SetItems anpassen
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index ec2201f65c98..b7f000cb69d8 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -209,9 +209,9 @@ public:
virtual void PrepareReload();
virtual sal_Bool IsInformationLost();
virtual void LoadStyles( SfxObjectShell &rSource );
- virtual sal_Bool Insert( SfxObjectShell &rSource,
+ virtual sal_Bool InsertStuffWithIndexes( SfxObjectShell &rSource,
sal_uInt16 nSourceIdx1, sal_uInt16 nSourceIdx2, sal_uInt16 nSourceIdx3,
- sal_uInt16 &nIdx1, sal_uInt16 &nIdx2, sal_uInt16 &nIdx3, sal_uInt16 &rIdxDeleted );
+ sal_uInt16 &nIdx1, sal_uInt16 &nIdx2, sal_uInt16 &nIdx3, sal_uInt16 &rIdxDeleted ) SAL_OVERRIDE;
virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); // SfxInPlaceObject
virtual sal_Bool DoSaveCompleted( SfxMedium * pNewStor); // SfxObjectShell
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 15c98d9f0fb8..b28e805e5d32 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -419,7 +419,7 @@ Bitmap SfxObjectShell::GetStyleFamilyBitmap(SfxStyleFamily eFamily)
//--------------------------------------------------------------------
-sal_Bool SfxObjectShell::Insert(SfxObjectShell &rSource,
+sal_Bool SfxObjectShell::InsertStuffWithIndexes(SfxObjectShell &rSource,
sal_uInt16 nSourceIdx1,
sal_uInt16 nSourceIdx2,
sal_uInt16 /*nSourceIdx3*/,
@@ -552,7 +552,7 @@ sal_Bool SfxObjectShell::Insert(SfxObjectShell &rSource,
//--------------------------------------------------------------------
-sal_Bool SfxObjectShell::Remove
+sal_Bool SfxObjectShell::RemoveStuffWithIndexes
(
sal_uInt16 nIdx1,
sal_uInt16 nIdx2,
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 08ae99e05275..747576609252 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -200,18 +200,18 @@ public:
virtual SfxStyleSheetBasePool* GetStyleSheetPool();
/// For Organizer.
- virtual sal_Bool Insert(SfxObjectShell &rSource,
+ virtual sal_Bool InsertStuffWithIndexes(SfxObjectShell &rSource,
sal_uInt16 nSourceIdx1,
sal_uInt16 nSourceIdx2,
sal_uInt16 nSourceIdx3,
sal_uInt16& nIdx1,
sal_uInt16& nIdx2,
sal_uInt16& nIdx3,
- sal_uInt16& nRemovedIdx);
+ sal_uInt16& nRemovedIdx) SAL_OVERRIDE;
- virtual sal_Bool Remove(sal_uInt16 nIdx1,
+ virtual sal_Bool RemoveStuffWithIndexes(sal_uInt16 nIdx1,
sal_uInt16 nIdx2 = INDEX_IGNORE,
- sal_uInt16 nIdx3 = INDEX_IGNORE);
+ sal_uInt16 nIdx3 = INDEX_IGNORE) SAL_OVERRIDE;
virtual Bitmap GetStyleFamilyBitmap( SfxStyleFamily eFamily );
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 2123202456ae..87789d1883a5 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -324,7 +324,7 @@ sal_uInt16 SwDocShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing )
}
// Organizer
-sal_Bool SwDocShell::Insert( SfxObjectShell &rSource,
+sal_Bool SwDocShell::InsertStuffWithIndexes( SfxObjectShell &rSource,
sal_uInt16 nSourceIdx1, // SourcePool: uppermost content level (templates/macros)
sal_uInt16 nSourceIdx2, // Index in the content
sal_uInt16 nSourceIdx3, // Index in the content level
@@ -515,7 +515,7 @@ sal_Bool SwDocShell::Insert( SfxObjectShell &rSource,
bRet = sal_True;
}
else
- bRet = SfxObjectShell::Insert( rSource,
+ bRet = SfxObjectShell::InsertStuffWithIndexes( rSource,
nSourceIdx1,
nSourceIdx2,
nSourceIdx3,
@@ -535,7 +535,7 @@ sal_Bool SwDocShell::Insert( SfxObjectShell &rSource,
}
// template Remove
-sal_Bool SwDocShell::Remove(sal_uInt16 nIdx1, // see Insert
+sal_Bool SwDocShell::RemoveStuffWithIndexes(sal_uInt16 nIdx1, // see Insert
sal_uInt16 nIdx2,
sal_uInt16 nIdx3)
{
@@ -589,7 +589,7 @@ sal_Bool SwDocShell::Remove(sal_uInt16 nIdx1, // see Insert
bRet = sal_True;
}
else
- bRet = SfxObjectShell::Remove( nIdx1,
+ bRet = SfxObjectShell::RemoveStuffWithIndexes( nIdx1,
nIdx2,
nIdx3 );
generated by cgit (git 2.34.1) at 2025-02-06 22:32:21 +0000