From c7dd322b3c37d84f6962f9d91a8770d3cb9d4888 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 26 Jul 2013 19:15:40 +0200 Subject: rename SfxObjectShell::Insert / Remove ... ... to something more unique, and use SAL_OVERRIDE. Change-Id: I0f991870974cad42c86d6af162359dafb475c5aa --- sw/source/ui/app/docsh2.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sw/source/ui/app/docsh2.cxx') 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 ); -- cgit