diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-01-29 14:29:06 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-01-30 02:21:07 +0100 |
| commit | d2676f3c1ab75e192e67eb3edffae11863041274 (patch) | |
| tree | 2d58a54ee8fced72dee8f29a71fa4da157aa0a7c /sc | |
| parent | 36d99c6cb26938a7cbeae77e64fcef5bd250025a (diff) | |
no user of nVisibleTab inside ScDocument anymore
Change-Id: I1ee09c7be958b0231f99df2ebadb0dc6a3a20246
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/document.hxx | 3 | ||||
| -rw-r--r-- | sc/source/core/data/documen3.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh6.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsh4.cxx | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 79b87656a531..4795986512b6 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -559,8 +559,7 @@ public: void SetEmbedded( const ScRange& rRange ); void ResetEmbedded(); Rectangle GetEmbeddedRect() const; // 1/100 mm - void SetEmbedded( const Rectangle& rRect ); // from VisArea (1/100 mm) - void SnapVisArea( Rectangle& rRect ) const; // 1/100 mm + void SetEmbedded( SCTAB nTab, const Rectangle& rRect ); // from VisArea (1/100 mm) static SC_DLLPUBLIC bool ValidTabName( const rtl::OUString& rName ); diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index fd505d6c49d2..3e6484710d06 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -1772,10 +1772,10 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect ) const return ScRange( nX1,nY1,nTab, nX2,nY2,nTab ); } -void ScDocument::SetEmbedded( const Rectangle& rRect ) // aus VisArea (1/100 mm) +void ScDocument::SetEmbedded( SCTAB nTab, const Rectangle& rRect ) // aus VisArea (1/100 mm) { bIsEmbedded = true; - aEmbedRange = GetRange( nVisibleTab, rRect ); + aEmbedRange = GetRange( nTab, rRect ); } ScDocProtection* ScDocument::GetDocProtection() const diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index c9eec1c1a0a6..6cd076c56b83 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -162,7 +162,7 @@ void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, sal_Bool bModifySt { ScRange aOld; aDocument.GetEmbedded( aOld); - aDocument.SetEmbedded( aArea ); + aDocument.SetEmbedded( aDocument.GetVisibleTab(), aArea ); ScRange aNew; aDocument.GetEmbedded( aNew); if (aOld != aNew) diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 70868b3cc3bd..4f9681d0f373 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1545,7 +1545,7 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) pDocSh->SetInplace( false ); GetViewData()->RefreshZoom(); // recalculate PPT if (!pDoc->IsEmbedded()) - pDoc->SetEmbedded( aVisArea ); // VisArea markieren + pDoc->SetEmbedded( pDoc->GetVisibleTab(), aVisArea ); // VisArea markieren } } |