summaryrefslogtreecommitdiff
path: root/xmloff/source/draw/ximpshap.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/draw/ximpshap.cxx')
-rw-r--r--xmloff/source/draw/ximpshap.cxx40
1 files changed, 20 insertions, 20 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 34590cbd95de..552c731230af 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -161,9 +161,9 @@ SdXMLShapeContext::SdXMLShapeContext(
, mxAttrList(xAttrList)
, mbListContextPushed( false )
, mnStyleFamily(XML_STYLE_FAMILY_SD_GRAPHICS_ID)
-, mbIsPlaceholder(FALSE)
+, mbIsPlaceholder(sal_False)
, mbClearDefaultAttributes( true )
-, mbIsUserTransformed(FALSE)
+, mbIsUserTransformed(sal_False)
, mnZOrder(-1)
, maSize(1, 1)
, maPosition(0, 0)
@@ -180,7 +180,7 @@ SdXMLShapeContext::~SdXMLShapeContext()
//////////////////////////////////////////////////////////////////////////////
-SvXMLImportContext *SdXMLShapeContext::CreateChildContext( USHORT p_nPrefix,
+SvXMLImportContext *SdXMLShapeContext::CreateChildContext( sal_uInt16 p_nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
{
@@ -312,7 +312,7 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute
}
else if( IsXMLToken( aLocalName, XML_ALIGN ) )
{
- USHORT eKind;
+ sal_uInt16 eKind;
if( SvXMLUnitConverter::convertEnum( eKind, sValue, aXML_GlueAlignment_EnumMap ) )
{
aGluePoint.PositionAlignment = (drawing::Alignment)eKind;
@@ -321,7 +321,7 @@ void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttribute
}
else if( IsXMLToken( aLocalName, XML_ESCAPE_DIRECTION ) )
{
- USHORT eKind;
+ sal_uInt16 eKind;
if( SvXMLUnitConverter::convertEnum( eKind, sValue, aXML_GlueEscapeDirection_EnumMap ) )
{
aGluePoint.Escape = (drawing::EscapeDirection)eKind;
@@ -613,13 +613,13 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */)
break;
const SvXMLStyleContext* pStyle = 0L;
- sal_Bool bAutoStyle(FALSE);
+ sal_Bool bAutoStyle(sal_False);
if(GetImport().GetShapeImport()->GetAutoStylesContext())
pStyle = GetImport().GetShapeImport()->GetAutoStylesContext()->FindStyleChildContext(mnStyleFamily, maDrawStyleName);
if(pStyle)
- bAutoStyle = TRUE;
+ bAutoStyle = sal_True;
if(!pStyle && GetImport().GetShapeImport()->GetStylesContext())
pStyle = GetImport().GetShapeImport()->GetStylesContext()->FindStyleChildContext(mnStyleFamily, maDrawStyleName);
@@ -1187,7 +1187,7 @@ void SdXMLEllipseShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl
{
if( IsXMLToken( rLocalName, XML_KIND ) )
{
- USHORT eKind;
+ sal_uInt16 eKind;
if( SvXMLUnitConverter::convertEnum( eKind, rValue, aXML_CircleKind_EnumMap ) )
{
meKind = eKind;
@@ -1355,7 +1355,7 @@ SdXMLPathShapeContext::SdXMLPathShapeContext(
uno::Reference< drawing::XShapes >& rShapes,
sal_Bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
- mbClosed( TRUE )
+ mbClosed( sal_True )
{
}
@@ -1576,7 +1576,7 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
// XmlShapeTypePresTitleTextShape
pService = "com.sun.star.presentation.TitleTextShape";
}
- bIsPresShape = TRUE;
+ bIsPresShape = sal_True;
}
}
@@ -1740,7 +1740,7 @@ SdXMLConnectorShapeContext::SdXMLConnectorShapeContext(
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
maStart(0,0),
maEnd(1,1),
- mnType( (USHORT)drawing::ConnectorType_STANDARD ),
+ mnType( (sal_uInt16)drawing::ConnectorType_STANDARD ),
mnStartGlueId(-1),
mnEndGlueId(-1),
mnDelta1(0),
@@ -2139,7 +2139,7 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib
{
if(bIsPresentation && !IsXMLToken( maPresentationClass, XML_PRESENTATION_PAGE ) )
{
- bIsPresentation = FALSE;
+ bIsPresentation = sal_False;
}
if(bIsPresentation)
@@ -2423,7 +2423,7 @@ void SdXMLGraphicObjectShapeContext::EndElement()
//////////////////////////////////////////////////////////////////////////////
SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext(
- USHORT nPrefix, const ::rtl::OUString& rLocalName,
+ sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext* pContext = NULL;
@@ -2560,7 +2560,7 @@ void SdXMLChartShapeContext::Characters( const ::rtl::OUString& rChars )
mpChartContext->Characters( rChars );
}
-SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName,
+SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
if( mpChartContext )
@@ -2724,7 +2724,7 @@ void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl:
}
SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext(
- USHORT nPrefix, const ::rtl::OUString& rLocalName,
+ sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList )
{
// #100592#
@@ -2890,7 +2890,7 @@ void SdXMLAppletShapeContext::EndElement()
SdXMLShapeContext::EndElement();
}
-SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( USHORT p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) )
{
@@ -3162,7 +3162,7 @@ void SdXMLPluginShapeContext::EndElement()
SdXMLShapeContext::EndElement();
}
-SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( USHORT p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
+SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList )
{
if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) )
{
@@ -3326,7 +3326,7 @@ SdXMLFrameShapeContext::~SdXMLFrameShapeContext()
{
}
-SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( USHORT nPrefix,
+SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList>& xAttrList )
{
@@ -3595,7 +3595,7 @@ void SdXMLCustomShapeContext::EndElement()
//////////////////////////////////////////////////////////////////////////////
SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext(
- USHORT nPrefix, const ::rtl::OUString& rLocalName,
+ sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList )
{
SvXMLImportContext* pContext = NULL;
@@ -3761,7 +3761,7 @@ void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const ::rtl::
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList )
+SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList )
{
if( mxTableImportContext.Is() && (nPrefix == XML_NAMESPACE_TABLE) )
return mxTableImportContext->CreateChildContext(nPrefix, rLocalName, xAttrList);
generated by cgit (git 2.34.1) at 2025-03-21 15:43:54 +0000