diff options
Diffstat (limited to 'sd/source/ui/docshell')
| -rw-r--r-- | sd/source/ui/docshell/docshel4.cxx | 33 | ||||
| -rw-r--r-- | sd/source/ui/docshell/docshell.cxx | 6 |
2 files changed, 7 insertions, 32 deletions
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index e081eed7cae4..b05d55a4d77c 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -325,7 +325,7 @@ BOOL DrawDocShell::Load( SfxMedium& rMedium ) { UpdateTablePointers(); - // #108451# If we're an embedded OLE object, use tight bounds + // If we're an embedded OLE object, use tight bounds // for our visArea. No point in showing the user lots of empty // space. Had to remove the check for empty VisArea below, // since XML load always sets a VisArea before. @@ -381,31 +381,6 @@ BOOL DrawDocShell::LoadFrom( SfxMedium& rMedium ) BOOL bRet = FALSE; - /* - // #90691# return to old behaviour (before #80365#): construct own medium - SfxMedium aMedium(xStorage); - - // #90691# for having a progress bar nonetheless for XML copy it - // from the local DocShell medium (GetMedium()) to the constructed one - SfxMedium* pLocalMedium = GetMedium(); - if(pLocalMedium) - { - SfxItemSet* pLocalItemSet = pLocalMedium->GetItemSet(); - SfxItemSet* pDestItemSet = aMedium.GetItemSet(); - - if(pLocalItemSet && pDestItemSet) - { - const SfxUnoAnyItem* pItem = static_cast< - const SfxUnoAnyItem*>( - pLocalItemSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL)); - - if(pItem) - { - pDestItemSet->Put(*pItem); - } - } - } */ - mpDoc->NewOrLoadCompleted( NEW_DOC ); mpDoc->CreateFirstPages(); mpDoc->StopWorkStartupDelay(); @@ -571,7 +546,7 @@ BOOL DrawDocShell::Save() if( bRet ) { - // #86834# Call UpdateDocInfoForSave() before export + // Call UpdateDocInfoForSave() before export UpdateDocInfoForSave(); bRet = SdXMLFilter( *GetMedium(), *this, sal_True, SDXMLMODE_Normal, SotStorage::GetVersion( GetMedium()->GetStorage() ) ).Export(); @@ -599,7 +574,7 @@ BOOL DrawDocShell::SaveAs( SfxMedium& rMedium ) if( bRet ) { - // #86834# Call UpdateDocInfoForSave() before export + // Call UpdateDocInfoForSave() before export UpdateDocInfoForSave(); bRet = SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Export(); } @@ -882,7 +857,7 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark) // Make the bookmarked page the current page. This is done // by using the API because this takes care of all the // little things to be done. Especially writing the view - // data to the frame view (see bug #107803#). + // data to the frame view. USHORT nSdPgNum = (nPageNumber - 1) / 2; Reference<drawing::XDrawView> xController (rBase.GetController(), UNO_QUERY); if (xController.is()) diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index b59fb2bfc328..03d4b726c1bb 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -522,8 +522,8 @@ void DrawDocShell::SetModified( BOOL bSet /* = TRUE */ ) { SfxObjectShell::SetModified( bSet ); - // #100237# change model state, too - // #103182# only set the changed state if modification is enabled + // change model state, too + // only set the changed state if modification is enabled if( IsEnableSetModified() ) { if ( mpDoc ) @@ -539,7 +539,7 @@ void DrawDocShell::SetModified( BOOL bSet /* = TRUE */ ) |* \************************************************************************/ -// #91457# ExecuteSpellPopup now handled by DrawDocShell. This is necessary +// ExecuteSpellPopup now handled by DrawDocShell. This is necessary // to get hands on the outliner and the text object. IMPL_LINK(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo*, pInfo) { |