diff options
Diffstat (limited to 'xmloff/source/style/PageMasterImportPropMapper.cxx')
-rw-r--r-- | xmloff/source/style/PageMasterImportPropMapper.cxx | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx index b408c6a2c261..c6078c0b4d78 100644 --- a/xmloff/source/style/PageMasterImportPropMapper.cxx +++ b/xmloff/source/style/PageMasterImportPropMapper.cxx @@ -85,44 +85,44 @@ bool PageMasterImportPropertyMapper::handleSpecialItem( void PageMasterImportPropertyMapper::finished(std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const { SvXMLImportPropertyMapper::finished(rProperties, nStartIndex, nEndIndex); - XMLPropertyState* pAllPaddingProperty = NULL; - XMLPropertyState* pPadding[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pNewPadding[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pAllBorderProperty = NULL; - XMLPropertyState* pBorders[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pNewBorders[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pAllBorderWidthProperty = NULL; - XMLPropertyState* pBorderWidths[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pAllHeaderPaddingProperty = NULL; - XMLPropertyState* pHeaderPadding[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pHeaderNewPadding[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pAllHeaderBorderProperty = NULL; - XMLPropertyState* pHeaderBorders[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pHeaderNewBorders[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pAllHeaderBorderWidthProperty = NULL; - XMLPropertyState* pHeaderBorderWidths[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pAllFooterPaddingProperty = NULL; - XMLPropertyState* pFooterPadding[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pFooterNewPadding[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pAllFooterBorderProperty = NULL; - XMLPropertyState* pFooterBorders[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pFooterNewBorders[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pAllFooterBorderWidthProperty = NULL; - XMLPropertyState* pFooterBorderWidths[4] = { NULL, NULL, NULL, NULL }; - XMLPropertyState* pHeaderHeight = NULL; - XMLPropertyState* pHeaderMinHeight = NULL; + XMLPropertyState* pAllPaddingProperty = nullptr; + XMLPropertyState* pPadding[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pNewPadding[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pAllBorderProperty = nullptr; + XMLPropertyState* pBorders[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pNewBorders[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pAllBorderWidthProperty = nullptr; + XMLPropertyState* pBorderWidths[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pAllHeaderPaddingProperty = nullptr; + XMLPropertyState* pHeaderPadding[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pHeaderNewPadding[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pAllHeaderBorderProperty = nullptr; + XMLPropertyState* pHeaderBorders[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pHeaderNewBorders[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pAllHeaderBorderWidthProperty = nullptr; + XMLPropertyState* pHeaderBorderWidths[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pAllFooterPaddingProperty = nullptr; + XMLPropertyState* pFooterPadding[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pFooterNewPadding[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pAllFooterBorderProperty = nullptr; + XMLPropertyState* pFooterBorders[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pFooterNewBorders[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pAllFooterBorderWidthProperty = nullptr; + XMLPropertyState* pFooterBorderWidths[4] = { nullptr, nullptr, nullptr, nullptr }; + XMLPropertyState* pHeaderHeight = nullptr; + XMLPropertyState* pHeaderMinHeight = nullptr; std::unique_ptr<XMLPropertyState> xHeaderDynamic; - XMLPropertyState* pFooterHeight = NULL; - XMLPropertyState* pFooterMinHeight = NULL; + XMLPropertyState* pFooterHeight = nullptr; + XMLPropertyState* pFooterMinHeight = nullptr; std::unique_ptr<XMLPropertyState> xFooterDynamic; - XMLPropertyState* pAllMarginProperty = NULL; - XMLPropertyState* pMargins[4] = { NULL, NULL, NULL, NULL }; + XMLPropertyState* pAllMarginProperty = nullptr; + XMLPropertyState* pMargins[4] = { nullptr, nullptr, nullptr, nullptr }; std::unique_ptr<XMLPropertyState> pNewMargins[4]; - XMLPropertyState* pAllHeaderMarginProperty = NULL; - XMLPropertyState* pHeaderMargins[4] = { NULL, NULL, NULL, NULL }; + XMLPropertyState* pAllHeaderMarginProperty = nullptr; + XMLPropertyState* pHeaderMargins[4] = { nullptr, nullptr, nullptr, nullptr }; std::unique_ptr<XMLPropertyState> pNewHeaderMargins[4]; - XMLPropertyState* pAllFooterMarginProperty = NULL; - XMLPropertyState* pFooterMargins[4] = { NULL, NULL, NULL, NULL }; + XMLPropertyState* pAllFooterMarginProperty = nullptr; + XMLPropertyState* pFooterMargins[4] = { nullptr, nullptr, nullptr, nullptr }; std::unique_ptr<XMLPropertyState> pNewFooterMargins[4]; std::vector< XMLPropertyState >::iterator aEnd = rProperties.end(); |