diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2009-11-30 12:56:04 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2009-11-30 12:56:04 +0100 |
| commit | 9786bb7321344142cc2da2b4a75a9fa4df26842f (patch) | |
| tree | 609906586a658e097210602715b6906b4cacf5ee /sfx2/source/appl/appopen.cxx | |
| parent | 4c9f7ba5ee4bef7615a0b086c846ae7d554c7b5d (diff) | |
[CWS autorecovery] merged SfxTopViewFrame into SfxViewFrame
SfxTopViewFrame was the only class deriving from the abstract class SfxViewFrame, so both
can effectively be treated as one class.
This change was done to make subsequent refactorings easier.
Diffstat (limited to 'sfx2/source/appl/appopen.cxx')
| -rw-r--r-- | sfx2/source/appl/appopen.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index f9af1c5add..a2c3e09e19 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -104,7 +104,7 @@ #include "sfxresid.hxx" #include <sfx2/viewsh.hxx> #include "app.hrc" -#include <sfx2/topfrm.hxx> +#include <sfx2/viewfrm.hxx> #include <sfx2/sfxuno.hxx> #include <sfx2/objface.hxx> #include <sfx2/filedlghelper.hxx> @@ -196,7 +196,7 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded // Vergleiche anhand der URLs INetURLObject aUrl( xDoc->GetMedium()->GetName() ); if ( !aUrl.HasError() && aUrl == aUrlToFind && - (!bForbidVisible || !SfxViewFrame::GetFirst( xDoc, 0, TRUE )) && + (!bForbidVisible || !SfxViewFrame::GetFirst( xDoc, TRUE )) && !xDoc->IsLoading()) { break; @@ -213,12 +213,10 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded DBG_ASSERT( !bForbidVisible, "Unsichtbares kann nicht aktiviert werden" ); - SfxTopViewFrame *pFrame; - for( pFrame = (SfxTopViewFrame*) - SfxViewFrame::GetFirst( xDoc, TYPE(SfxTopViewFrame) ); + SfxViewFrame* pFrame; + for( pFrame = SfxViewFrame::GetFirst( xDoc ); pFrame && !pFrame->IsVisible_Impl(); - pFrame = (SfxTopViewFrame*) - SfxViewFrame::GetNext( *pFrame, xDoc, TYPE(SfxTopViewFrame) ) ) ; + pFrame = SfxViewFrame::GetNext( *pFrame, xDoc ) ) ; if ( pFrame ) { SfxViewFrame *pCur = SfxViewFrame::Current(); |