summaryrefslogtreecommitdiff
path: root/sw/source/ui/app/docsh2.cxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-07-26 19:15:40 +0200
committerMichael Stahl <mstahl@redhat.com>2013-07-27 00:45:19 +0200
commitc7dd322b3c37d84f6962f9d91a8770d3cb9d4888 (patch)
treeeeb1f82931249cbc356eab624222522632ab8433 /sw/source/ui/app/docsh2.cxx
parent8fb210a2ddc0b09288316cf459bebfe196ea94fb (diff)
rename SfxObjectShell::Insert / Remove ...
... to something more unique, and use SAL_OVERRIDE. Change-Id: I0f991870974cad42c86d6af162359dafb475c5aa
Diffstat (limited to 'sw/source/ui/app/docsh2.cxx')
-rw-r--r--sw/source/ui/app/docsh2.cxx8
1 files changed, 4 insertions, 4 deletions
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 );