diff options
| author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2020-08-31 15:46:04 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2020-09-01 08:49:55 +0200 |
| commit | 25304f8cd3d70860550a5fe9a0dbc40dd0abff03 (patch) | |
| tree | 65b2ae9309093e2bc997f0b21b998e361375a4bb | |
| parent | b866b71e2419c8011d969f316a28bd820c56fb5a (diff) | |
Fix typo in code
It passed "make check" on Linux
Change-Id: I9f3d98df05495e7d655a93c5cd5bbd41db6a9bea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101788
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
| -rw-r--r-- | compilerplugins/clang/unusedenumconstants.writeonly.results | 4 | ||||
| -rw-r--r-- | include/xmloff/families.hxx | 4 | ||||
| -rw-r--r-- | xmloff/source/draw/ximppage.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpstyl.cxx | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/compilerplugins/clang/unusedenumconstants.writeonly.results b/compilerplugins/clang/unusedenumconstants.writeonly.results index 23472d504263..46c5cdcd7bc9 100644 --- a/compilerplugins/clang/unusedenumconstants.writeonly.results +++ b/compilerplugins/clang/unusedenumconstants.writeonly.results @@ -2913,9 +2913,9 @@ include/vcl/window.hxx:381 include/xmloff/families.hxx:75 enum XmlStyleFamily TABLE_TEMPLATE_ID include/xmloff/families.hxx:83 - enum XmlStyleFamily SD_PAGEMASTERCONEXT_ID + enum XmlStyleFamily SD_PAGEMASTERCONTEXT_ID include/xmloff/families.hxx:84 - enum XmlStyleFamily SD_PAGEMASTERSTYLECONEXT_ID + enum XmlStyleFamily SD_PAGEMASTERSTYLECONTEXT_ID include/xmloff/families.hxx:85 enum XmlStyleFamily SD_PRESENTATIONPAGELAYOUT_ID include/xmloff/families.hxx:91 diff --git a/include/xmloff/families.hxx b/include/xmloff/families.hxx index 13aee189e44e..253472220168 100644 --- a/include/xmloff/families.hxx +++ b/include/xmloff/families.hxx @@ -80,8 +80,8 @@ enum class XmlStyleFamily SD_PRESENTATION_ID = 301, // families for derived from SvXMLStyleContext - SD_PAGEMASTERCONEXT_ID = 302, - SD_PAGEMASTERSTYLECONEXT_ID = 306, + SD_PAGEMASTERCONTEXT_ID = 302, + SD_PAGEMASTERSTYLECONTEXT_ID = 306, SD_PRESENTATIONPAGELAYOUT_ID = 303, // family for draw pool SD_POOL_ID = 304, diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index dacf059a5182..0fc1eb3a473e 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -517,7 +517,7 @@ void SdXMLGenericPageContext::SetPageMaster( OUString const & rsPageMasterName ) // #80012# GetStylesContext() replaced with GetAutoStylesContext() const SvXMLStylesContext* pAutoStyles = GetSdImport().GetShapeImport()->GetAutoStylesContext(); - const SvXMLStyleContext* pStyle = pAutoStyles ? pAutoStyles->FindStyleChildContext(XmlStyleFamily::SD_PAGEMASTERCONEXT_ID, rsPageMasterName) : nullptr; + const SvXMLStyleContext* pStyle = pAutoStyles ? pAutoStyles->FindStyleChildContext(XmlStyleFamily::SD_PAGEMASTERCONTEXT_ID, rsPageMasterName) : nullptr; const SdXMLPageMasterContext* pPageMaster = dynamic_cast<const SdXMLPageMasterContext*>(pStyle); if (!pPageMaster) diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index a707a1a723cd..4115de5ea24b 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -280,7 +280,7 @@ SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext( SdXMLImport& rImport, sal_Int32 /*nElement*/, const uno::Reference< xml::sax::XFastAttributeList>& xAttrList) -: SvXMLStyleContext(rImport, XmlStyleFamily::SD_PAGEMASTERSTYLECONEXT_ID), +: SvXMLStyleContext(rImport, XmlStyleFamily::SD_PAGEMASTERSTYLECONTEXT_ID), mnBorderBottom( 0 ), mnBorderLeft( 0 ), mnBorderRight( 0 ), @@ -362,7 +362,7 @@ SdXMLPageMasterContext::SdXMLPageMasterContext( SdXMLImport& rImport, sal_Int32 /*nElement*/, const uno::Reference< xml::sax::XFastAttributeList>& /*xAttrList*/) -: SvXMLStyleContext(rImport, XmlStyleFamily::SD_PAGEMASTERCONEXT_ID) +: SvXMLStyleContext(rImport, XmlStyleFamily::SD_PAGEMASTERCONTEXT_ID) { // set family to something special at SvXMLStyleContext // for differences in search-methods |