diff options
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/inc/xmloff/PageMasterStyleMap.hxx | 16 | ||||
| -rw-r--r-- | xmloff/source/draw/XMLNumberStyles.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/forms/elementimport.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/forms/elementimport_impl.hxx | 2 |
4 files changed, 13 insertions, 11 deletions
diff --git a/xmloff/inc/xmloff/PageMasterStyleMap.hxx b/xmloff/inc/xmloff/PageMasterStyleMap.hxx index d9cc4c6e61b2..4a89e828680a 100644 --- a/xmloff/inc/xmloff/PageMasterStyleMap.hxx +++ b/xmloff/inc/xmloff/PageMasterStyleMap.hxx @@ -78,14 +78,14 @@ #define CTF_PM_PADDINGRIGHT (XML_PM_CTF_START + 0x000F) #define CTF_PM_TEXTCOLUMNS (XML_PM_CTF_START + 0x0010) #define CTF_PM_REGISTER_STYLE (XML_PM_CTF_START + 0x0011) -#define CTF_PM_PRINT_ANNOTATIONS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0012) -#define CTF_PM_PRINT_CHARTS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0013) -#define CTF_PM_PRINT_DRAWING (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0014) -#define CTF_PM_PRINT_FORMULAS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0015) -#define CTF_PM_PRINT_GRID (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0016) -#define CTF_PM_PRINT_HEADERS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0017) -#define CTF_PM_PRINT_OBJECTS (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0018) -#define CTF_PM_PRINT_ZEROVALUES (CTF_PM_PRINTMASK|XML_PM_CTF_START + 0x0019) +#define CTF_PM_PRINT_ANNOTATIONS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0012)) +#define CTF_PM_PRINT_CHARTS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0013)) +#define CTF_PM_PRINT_DRAWING (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0014)) +#define CTF_PM_PRINT_FORMULAS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0015)) +#define CTF_PM_PRINT_GRID (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0016)) +#define CTF_PM_PRINT_HEADERS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0017)) +#define CTF_PM_PRINT_OBJECTS (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0018)) +#define CTF_PM_PRINT_ZEROVALUES (CTF_PM_PRINTMASK|(XML_PM_CTF_START + 0x0019)) #define CTF_PM_PAGEUSAGE (XML_PM_CTF_START + 0x0031) #define CTF_PM_GRAPHICPOSITION (XML_PM_CTF_START + 0x0032) diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index d9efb5bec28a..ce69e1a9723c 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -716,7 +716,7 @@ void SdXMLNumberFormatImportContext::EndElement() sal_Int16 nIndex2 = nIndex + 1; if( compareStyle( aSdXMLFixedTimeFormats[nTimeFormat], nIndex2 ) ) { - mnKey = nFormat + 2 | ((nTimeFormat + 2) << 4); + mnKey = (nFormat + 2) | ((nTimeFormat + 2) << 4); break; } } diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index d28218615bac..6bb0db20749e 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -1829,8 +1829,8 @@ namespace xmloff m_xMeAsContainer); else if ( token::IsXMLToken(_rLocalName, token::XML_CONNECTION_RESOURCE) ) return new OXMLDataSourceImport(GetImport(), _nPrefix, _rLocalName, _rxAttrList,m_xElement); - else if( token::IsXMLToken(_rLocalName, token::XML_EVENT_LISTENERS) && - (XML_NAMESPACE_OFFICE == _nPrefix) || + else if( (token::IsXMLToken(_rLocalName, token::XML_EVENT_LISTENERS) && + (XML_NAMESPACE_OFFICE == _nPrefix)) || token::IsXMLToken( _rLocalName, token::XML_PROPERTIES) ) return OElementImport::CreateChildContext( _nPrefix, _rLocalName, _rxAttrList ); diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx index a8184c55e8bf..0d89369300dd 100644 --- a/xmloff/source/forms/elementimport_impl.hxx +++ b/xmloff/source/forms/elementimport_impl.hxx @@ -48,6 +48,7 @@ inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( { // maybe it's a sub control if (_rLocalName == m_sWrapperElementName) + { if (m_xMeAsContainer.is()) return implCreateControlWrapper(_nPrefix, _rLocalName); else @@ -55,6 +56,7 @@ inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( OSL_ENSURE(sal_False, "OContainerImport::CreateChildContext: don't have an element!"); return NULL; } + } return BASE::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList); } |