diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 09:47:44 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-08 09:49:04 +0200 |
commit | 338358b0ca75b4965c7b3e70afd9c88cd9c9d222 (patch) | |
tree | f7fbdaed200753ffed29e51dd354c52cc709e777 /xmloff | |
parent | 97c77805d2becdc79c3cd0d62c9d023c2cf36d60 (diff) |
XMLTransformerActionInit parameters are generically of type sal_uInt32
Change-Id: Ic36339fbb78a6ac3233f3d75a1309cf1b0642fe0
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/forms/elementexport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/OOo2Oasis.cxx | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 954a0db3ff23..bce1ef76ed78 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -580,7 +580,7 @@ namespace xmloff PROPERTY_READONLY, PROPERTY_DEFAULT_STATE, PROPERTY_TABSTOP, PROPERTY_ENABLEVISIBLE }; - static const sal_Bool nBooleanPropertyAttrFlags[] = + static const sal_Int8 nBooleanPropertyAttrFlags[] = { // attribute defaults BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE | BOOLATTR_INVERSE_SEMANTICS, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_VOID, BOOLATTR_DEFAULT_FALSE }; diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 79fb4fe909d3..07382bcf4124 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -585,7 +585,7 @@ static XMLTransformerActionInit aStyleActionTable[] = ENTRY0( SVG, HEIGHT, XML_ATACTION_SVG_WIDTH_HEIGHT_OOO ), ENTRY0( DRAW, START, XML_ATACTION_NEG_PERCENT ), ENTRY0( DRAW, END, XML_ATACTION_NEG_PERCENT ), - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_True ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; @@ -695,7 +695,7 @@ static XMLTransformerActionInit aStyleRefActionTable[] = ENTRY0( DRAW, MASTER_PAGE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), ENTRY0( PRESENTATION, PRESENTATION_PAGE_LAYOUT_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_False ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(false) ), ENTRY1( TEXT, CONDITION, XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_OOOW ), ENTRY1( TEXT, FORMULA, XML_ATACTION_ADD_NAMESPACE_PREFIX, @@ -738,7 +738,7 @@ static XMLTransformerActionInit aShapeActionTable[] = ENTRY0( DR3D, FOCAL_LENGTH, XML_ATACTION_INCH2IN ), ENTRY1Q( FORM, ID, XML_ATACTION_RENAME, XML_NAMESPACE_DRAW, XML_CONTROL ), - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_True ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ), // BM: needed by chart:legend. The legend needs also the draw actions. As // there is no merge mechanism, all actions have to be in the same table @@ -770,7 +770,7 @@ static XMLTransformerActionInit aConnectorActionTable[] = ENTRY0( PRESENTATION, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ), ENTRY1Q( FORM, ID, XML_ATACTION_RENAME, XML_NAMESPACE_DRAW, XML_CONTROL ), - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_True ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ), ENTRY0( DRAW, ID, XML_ATACTION_SHAPEID ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; @@ -906,7 +906,7 @@ static XMLTransformerActionInit aBackgroundImageActionTable[] = { ENTRY1Q( DRAW, TRANSPARENCY, XML_ATACTION_RENAME_NEG_PERCENT, XML_NAMESPACE_DRAW, XML_OPACITY ), - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_True ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; @@ -917,7 +917,7 @@ static XMLTransformerActionInit aBackgroundImageActionTable[] = static XMLTransformerActionInit aWriterBackgroundImageActionTable[] = { ENTRY1Q( DRAW, TRANSPARENCY, XML_ATACTION_WRITER_BACK_GRAPHIC_TRANSPARENCY, XML_NAMESPACE_DRAW, XML_OPACITY ), - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_True ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; @@ -936,7 +936,7 @@ static XMLTransformerActionInit aFormControlActionTable[] = XML_ATACTION_RENAME_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_FORM, XML_CONTROL_IMPLEMENTATION, XML_NAMESPACE_OOO ), - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_False ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(false) ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; @@ -964,7 +964,7 @@ static XMLTransformerActionInit aFormPropActionTable[] = // OOO_XLINK_ACTIONS static XMLTransformerActionInit aXLinkActionTable[] = { - ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_False ), + ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(false) ), ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT ) }; |