diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-07-26 19:15:40 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-07-27 00:45:19 +0200 |
| commit | c7dd322b3c37d84f6962f9d91a8770d3cb9d4888 (patch) | |
| tree | eeb1f82931249cbc356eab624222522632ab8433 /sc | |
| parent | 8fb210a2ddc0b09288316cf459bebfe196ea94fb (diff) | |
rename SfxObjectShell::Insert / Remove ...
... to something more unique, and use SAL_OVERRIDE.
Change-Id: I0f991870974cad42c86d6af162359dafb475c5aa
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/docshell/docsh6.cxx | 5 | ||||
| -rw-r--r-- | sc/source/ui/inc/docsh.hxx | 4 |
2 files changed, 5 insertions, 4 deletions
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 |