diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-16 15:17:53 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-16 15:17:53 +0000 |
| commit | 79dac4c5048223c48332d760a5bacd0524280eba (patch) | |
| tree | d1df4e6ce296d94a858fe794a69d4d72521747d2 /sd/source | |
| parent | ca4876a3e57c0d111e5be4d0dbce1c15a409ad3c (diff) | |
INTEGRATION: CWS impress15 (1.31.8); FILE MERGED
2004/11/01 09:57:41 af 1.31.8.1: #i31283# The exported view id is taken from the view shell in the center pane.
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 2844444831d7..408bc35401e8 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewshe2.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: pjunck $ $Date: 2004-10-28 13:35:51 $ + * last change: $Author: obo $ $Date: 2004-11-16 16:17:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,6 +62,9 @@ #include "ViewShell.hxx" #include "ViewShellHint.hxx" +#include "ViewShellImplementation.hxx" +#include "FactoryIds.hxx" + #ifndef _SVXIDS_HRC #include <svx/svxids.hrc> #endif @@ -1197,7 +1200,12 @@ void ViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < rSequence.realloc( nIndex + 1 ); OSL_ASSERT (GetViewShell()!=NULL); - sal_uInt16 nViewID(GetViewShell()->GetViewFrame()->GetCurViewId()); + // Get the view id from the view shell in the center pane. This will + // usually be the called view shell, but to be on the safe side we call + // the main view shell explicitly. + sal_uInt16 nViewID (IMPRESS_FACTORY_ID); + if (GetViewShellBase().GetMainViewShell() != NULL) + nViewID = GetViewShellBase().GetMainViewShell()->mpImpl->GetViewId(); rSequence[nIndex].Name = rtl::OUString ( RTL_CONSTASCII_USTRINGPARAM( sUNO_View_ViewId ) ); rtl::OUStringBuffer sBuffer ( |