diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-16 15:17:06 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-16 15:17:06 +0000 |
| commit | 1790b2995bd1658865c43d10a855ae14ca3026b5 (patch) | |
| tree | cc2171064ab0d1058aa907090f95842fd0443ee1 /sd/source/ui/view/frmview.cxx | |
| parent | 7fc41829db49f2ac7a5bb3363fccd351027a32cb (diff) | |
INTEGRATION: CWS impress15 (1.20.32); FILE MERGED
2004/10/29 16:26:58 af 1.20.32.2: RESYNC: (1.20-1.21); FILE MERGED
2004/10/14 14:49:20 cl 1.20.32.1: #i32214# ignore layer information on load in impress
Diffstat (limited to 'sd/source/ui/view/frmview.cxx')
| -rw-r--r-- | sd/source/ui/view/frmview.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index e2dee9c2a9ad..d4aff4c6701d 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmview.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: pjunck $ $Date: 2004-11-03 08:58:27 $ + * last change: $Author: obo $ $Date: 2004-11-16 16:17:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -949,6 +949,8 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : const sal_Int32 nLength = rSequence.getLength(); if (nLength) { + const bool bImpress = dynamic_cast< SdDrawDocument* >(GetModel())->GetDocumentType() == DOCUMENT_TYPE_IMPRESS; + sal_Bool bBool; sal_Int32 nInt32; sal_Int16 nInt16; @@ -1399,19 +1401,19 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < : { pValue->Value >>= aSnapGridWidthYDom; } - else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleLayers ) ) ) + else if (!bImpress && pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_VisibleLayers ) ) ) { SetOfByte aSetOfBytes; aSetOfBytes.PutValue( pValue->Value ); SetVisibleLayers( aSetOfBytes ); } - else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_PrintableLayers ) ) ) + else if (!bImpress && pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_PrintableLayers ) ) ) { SetOfByte aSetOfBytes; aSetOfBytes.PutValue( pValue->Value ); SetPrintableLayers( aSetOfBytes ); } - else if (pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_LockedLayers ) ) ) + else if (!bImpress && pValue->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_View_LockedLayers ) ) ) { SetOfByte aSetOfBytes; aSetOfBytes.PutValue( pValue->Value ); |