diff options
| -rw-r--r-- | xmloff/dtd/drawing.mod | 5 | ||||
| -rw-r--r-- | xmloff/source/draw/layerexp.cxx | 22 | ||||
| -rw-r--r-- | xmloff/source/draw/layerimp.cxx | 29 |
3 files changed, 5 insertions, 51 deletions
diff --git a/xmloff/dtd/drawing.mod b/xmloff/dtd/drawing.mod index 88173d5bd3df..b319d0275c8a 100644 --- a/xmloff/dtd/drawing.mod +++ b/xmloff/dtd/drawing.mod @@ -1,5 +1,5 @@ <!-- - $Id: drawing.mod,v 1.47 2001-05-09 12:30:34 mib Exp $ + $Id: drawing.mod,v 1.48 2001-05-11 07:36:26 cl Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -725,9 +725,6 @@ <!ELEMENT draw:layer EMPTY> <!ATTLIST draw:layer draw:name %layerName; #REQUIRED> -<!ATTLIST draw:layer draw:locked %boolean; #IMPLIED> -<!ATTLIST draw:layer draw:printable %boolean; #IMPLIED> -<!ATTLIST draw:layer draw:visible %boolean; #IMPLIED> <!-- events --> <!ELEMENT presentation:event (presentation:sound)?> diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx index ee4143249389..e2ef5bf811c4 100644 --- a/xmloff/source/draw/layerexp.cxx +++ b/xmloff/source/draw/layerexp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: layerexp.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: cl $ $Date: 2001-01-19 16:33:27 $ + * last change: $Author: cl $ $Date: 2001-05-11 07:38:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -120,9 +120,6 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport ) return; Reference< XPropertySet> xLayer; - const OUString strIsLocked( RTL_CONSTASCII_USTRINGPARAM( "IsLocked" ) ); - const OUString strIsPrintable( RTL_CONSTASCII_USTRINGPARAM( "IsPrintable" ) ); - const OUString strIsVisible( RTL_CONSTASCII_USTRINGPARAM( "IsVisible" ) ); const OUString strName( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ); OUStringBuffer sTmp; @@ -142,21 +139,6 @@ void SdXMLayerExporter::exportLayer( SvXMLExport& rExport ) rExport.AddAttribute( XML_NAMESPACE_DRAW, sXML_name, aName ); } - if( xLayer->getPropertyValue( strIsLocked ) >>= bBool ) - { - rExport.AddAttributeASCII( XML_NAMESPACE_DRAW, sXML_locked, bBool ? sXML_true : sXML_false ); - } - - if( xLayer->getPropertyValue( strIsPrintable ) >>= bBool ) - { - rExport.AddAttributeASCII( XML_NAMESPACE_DRAW, sXML_printable, bBool ? sXML_true : sXML_false ); - } - - if( xLayer->getPropertyValue( strIsVisible ) >>= bBool ) - { - rExport.AddAttributeASCII( XML_NAMESPACE_DRAW, sXML_visible, bBool ? sXML_true : sXML_false ); - } - SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, sXML_layer, sal_True, sal_True ); } } diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index fb317dab98ad..47be200c355d 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: layerimp.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2001-05-04 11:18:03 $ + * last change: $Author: cl $ $Date: 2001-05-11 07:38:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -133,15 +133,9 @@ SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( USHORT nPrefix, c { if( mxLayerManager.is() ) { - const OUString strIsLocked( RTL_CONSTASCII_USTRINGPARAM( "IsLocked" ) ); - const OUString strIsPrintable( RTL_CONSTASCII_USTRINGPARAM( "IsPrintable" ) ); - const OUString strIsVisible( RTL_CONSTASCII_USTRINGPARAM( "IsVisible" ) ); const OUString strName( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ); OUString aName; - sal_Bool bIsLocked = sal_False; - sal_Bool bIsPrintable = sal_False; - sal_Bool bIsVisible = sal_False; const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for(sal_Int16 i=0; i < nAttrCount; i++) @@ -155,18 +149,6 @@ SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( USHORT nPrefix, c { aName = sValue; } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_locked ) ) ) - { - bIsLocked = sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ); - } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_printable ) ) ) - { - bIsPrintable = sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ); - } - else if( aLocalName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_visible ) ) ) - { - bIsVisible = sValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sXML_true ) ); - } } } @@ -194,13 +176,6 @@ SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( USHORT nPrefix, c xLayer->setPropertyValue( strName, aAny ); } } - - if( xLayer.is() ) - { - xLayer->setPropertyValue( strIsLocked, Any( &bIsLocked, ::getCppuBooleanType() ) ); - xLayer->setPropertyValue( strIsPrintable, Any( &bIsPrintable, ::getCppuBooleanType() ) ); - xLayer->setPropertyValue( strIsVisible, Any( &bIsVisible, ::getCppuBooleanType() ) ); - } } } |