diff options
| author | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
|---|---|---|
| committer | Xiaofei Zhang <Zhangxiaofei@openoffice.org> | 2010-11-10 13:50:33 +0800 |
| commit | fa1f3c352c6126b24ab5af87ea4ebea742c546c2 (patch) | |
| tree | 5a5240e4969fee626bb060bd386fceb957081f90 /xmloff/source/draw/ximpbody.cxx | |
| parent | d0097a3f35e5e2c68d293d604a2f6f51b2d822a5 (diff) | |
| parent | 3c21373571fd0cf89391502aa132c5f420cd75c6 (diff) | |
removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework
Diffstat (limited to 'xmloff/source/draw/ximpbody.cxx')
| -rw-r--r-- | xmloff/source/draw/ximpbody.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index af5fef0ff9dc..dbd0eeaac601 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -56,7 +56,7 @@ using namespace ::com::sun::star; ////////////////////////////////////////////////////////////////////////////// SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, - USHORT nPrfx, const OUString& rLocalName, + sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes) : SdXMLGenericPageContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ) @@ -71,7 +71,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, { OUString sAttrName = xAttrList->getNameByIndex( i ); OUString aLocalName; - USHORT nPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + sal_uInt16 nPrefix = GetSdImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); OUString sValue = xAttrList->getValueByIndex( i ); const SvXMLTokenMap& rAttrTokenMap = GetSdImport().GetDrawPageAttrTokenMap(); @@ -166,7 +166,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, if(xDrawPage.is() && xMasterPages.is()) { - sal_Bool bDone(FALSE); + sal_Bool bDone(sal_False); OUString sDisplayName( rImport.GetStyleDisplayName( XML_STYLE_FAMILY_MASTER_PAGE, maMasterPageName ) ); @@ -186,7 +186,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, sMasterPageName.equals(sDisplayName)) { xDrawPage->setMasterPage(xMasterPage); - bDone = TRUE; + bDone = sal_True; } } } @@ -231,7 +231,7 @@ SdXMLDrawPageContext::~SdXMLDrawPageContext() ////////////////////////////////////////////////////////////////////////////// -SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( USHORT nPrefix, +SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -304,7 +304,7 @@ void SdXMLDrawPageContext::EndElement() ////////////////////////////////////////////////////////////////////////////// SdXMLBodyContext::SdXMLBodyContext( SdXMLImport& rImport, - USHORT nPrfx, const OUString& rLocalName ) + sal_uInt16 nPrfx, const OUString& rLocalName ) : SvXMLImportContext( rImport, nPrfx, rLocalName ) { } @@ -318,7 +318,7 @@ SdXMLBodyContext::~SdXMLBodyContext() ////////////////////////////////////////////////////////////////////////////// SvXMLImportContext *SdXMLBodyContext::CreateChildContext( - USHORT nPrefix, + sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) { |