extras/source/templates/presnt/Blueprint_Plans/styles.xml | 96 +++++++------- sc/qa/unit/data/ods/tdf170670-Blank-width-char.ods |binary sc/qa/unit/subsequent_export_test4.cxx | 10 + xmloff/source/style/xmlnumfi.cxx | 7 - 4 files changed, 62 insertions(+), 51 deletions(-)
New commits: commit 65fb77dc2c469370bd8486da662d8651f01ada15 Author: Laurent Balland <[email protected]> AuthorDate: Fri Feb 13 08:01:06 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Feb 20 08:41:56 2026 +0100 tdf#170670 NumberFormat: fix blank width string treatment In case of 2 characters string text, with a delimiter as text and a blank width string like "-"_) the delimiter is now treated as text Add qa test with format of bug report: [>0]#,##0_);[<0](#,##0);"-"_) Change-Id: Idd4542bd186c6b6b348f6716bee2fd5055f2c83f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199314 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> (cherry picked from commit fb07ca38af165b1e367aea04aa626e073b341c8f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199416 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sc/qa/unit/data/ods/tdf170670-Blank-width-char.ods b/sc/qa/unit/data/ods/tdf170670-Blank-width-char.ods new file mode 100644 index 000000000000..50918deb662f Binary files /dev/null and b/sc/qa/unit/data/ods/tdf170670-Blank-width-char.ods differ diff --git a/sc/qa/unit/subsequent_export_test4.cxx b/sc/qa/unit/subsequent_export_test4.cxx index c55b8a339fb7..56ef9454bc26 100644 --- a/sc/qa/unit/subsequent_export_test4.cxx +++ b/sc/qa/unit/subsequent_export_test4.cxx @@ -1684,6 +1684,16 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testBlankWidthCharacter) // save to XLSX and reload saveAndReload(TestFilter::XLSX); lcl_TestNumberFormat(*getScDoc(), u"_-?0;-?0;_-?0;@"_ustr); + + createScDoc("ods/tdf170670-Blank-width-char.ods"); + + // save to ODS and reload + saveAndReload(TestFilter::ODS); + lcl_TestNumberFormat(*getScDoc(), u"[>0]#,##0_);[<0](#,##0);\"-\"_)"_ustr); + + // save to XLSX and reload + saveAndReload(TestFilter::XLSX); + lcl_TestNumberFormat(*getScDoc(), u"#,##0_);\(#,##0\);-_)"_ustr); } CPPUNIT_TEST_FIXTURE(ScExportTest4, testEmbeddedTextInDecimal) diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 2343e5d99e55..2ed570fb330e 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -527,13 +527,13 @@ static bool lcl_ValidChar( sal_Unicode cChar, const SvXMLNumFormatContext& rPare return false; } -static void lcl_EnquoteIfNecessary( OUStringBuffer& rContent, const SvXMLNumFormatContext& rParent ) +static void lcl_EnquoteIfNecessary( OUStringBuffer& rContent, const SvXMLNumFormatContext& rParent, const bool bIsBlankWidthStringEmpty = true ) { bool bQuote = true; sal_Int32 nLength = rContent.getLength(); const SvXMLStylesTokens nFormatType = rParent.GetType(); - if (nFormatType != SvXMLStylesTokens::BOOLEAN_STYLE && + if (nFormatType != SvXMLStylesTokens::BOOLEAN_STYLE && bIsBlankWidthStringEmpty && ((nLength == 1 && lcl_ValidChar( rContent[0], rParent)) || (nLength == 2 && ((rContent[0] == ' ' && rContent[1] == '-') || @@ -544,6 +544,7 @@ static void lcl_EnquoteIfNecessary( OUStringBuffer& rContent, const SvXMLNumForm // Or space followed by minus (used in currency formats) that would // lead to almost duplicated formats with built-in formats just with // the difference of quotes. + // tdf#170670: except if it is inside a blank width string bQuote = false; } else if ( nFormatType == SvXMLStylesTokens::PERCENTAGE_STYLE && nLength > 1 ) @@ -971,7 +972,7 @@ void SvXMLNumFmtElementContext::endFastElement(sal_Int32 ) } if ( !aContent.isEmpty() ) { - lcl_EnquoteIfNecessary( aContent, rParent ); + lcl_EnquoteIfNecessary( aContent, rParent, sBlankWidthString.isEmpty() ); if ( !sBlankWidthString.isEmpty() ) { lcl_InsertBlankWidthChars( sBlankWidthString, aContent ); commit 07ddb33faf7f39e2db9ef5113173222076c6e27d Author: Laurent Balland <[email protected]> AuthorDate: Sat Feb 14 17:33:19 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Feb 20 08:41:46 2026 +0100 tdf#170786 Blueprint Plans correct master slide names Previous Master slide names were containing a '-' "Blueprint Plans-4:3" and "Standard-43" This was generating numerous warning with debug build and prevents using these styles of the masters: erroneous font size were used for outlines for instance Change-Id: I9048021051c63c96c64a674ba6f5bab162944662 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199412 Tested-by: Jenkins Reviewed-by: Laurent Balland <[email protected]> (cherry picked from commit 785dba1cf27c10c2056b0e820c9fd3f8dea7d8ab) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199422 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/extras/source/templates/presnt/Blueprint_Plans/styles.xml b/extras/source/templates/presnt/Blueprint_Plans/styles.xml index 9632deba7466..2a2781d54c22 100644 --- a/extras/source/templates/presnt/Blueprint_Plans/styles.xml +++ b/extras/source/templates/presnt/Blueprint_Plans/styles.xml @@ -351,22 +351,22 @@ <style:paragraph-properties fo:text-align="center"/> <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#ffffff" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="44pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-size-asian="44pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="44pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> </style:style> - <style:style style:name="Blueprint_20_Plans-4_3a_3-background" style:display-name="Blueprint Plans-4:3-background" style:family="presentation"> + <style:style style:name="Blueprint_20_Plans_20_4_3a_3-background" style:display-name="Blueprint Plans 4:3-background" style:family="presentation"> <style:graphic-properties draw:stroke="none" draw:fill="none"/> <style:text-properties style:letter-kerning="true"/> </style:style> - <style:style style:name="Blueprint_20_Plans-4_3a_3-backgroundobjects" style:display-name="Blueprint Plans-4:3-backgroundobjects" style:family="presentation"> + <style:style style:name="Blueprint_20_Plans_20_4_3a_3-backgroundobjects" style:display-name="Blueprint Plans 4:3-backgroundobjects" style:family="presentation"> <style:graphic-properties draw:textarea-horizontal-align="justify" draw:shadow="hidden" draw:shadow-offset-x="0.2cm" draw:shadow-offset-y="0.2cm" draw:shadow-color="#808080"/> <style:text-properties style:letter-kerning="true"/> </style:style> - <style:style style:name="Blueprint_20_Plans-4_3a_3-notes" style:display-name="Blueprint Plans-4:3-notes" style:family="presentation"> + <style:style style:name="Blueprint_20_Plans_20_4_3a_3-notes" style:display-name="Blueprint Plans 4:3-notes" style:family="presentation"> <style:graphic-properties draw:stroke="none" draw:fill="none"/> <style:paragraph-properties fo:margin-left="0.6cm" fo:margin-right="0cm" fo:text-indent="-0.6cm"/> <style:text-properties fo:font-variant="normal" fo:text-transform="none" style:use-window-font-color="true" loext:opacity="0%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="20pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-size-asian="20pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="20pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> </style:style> - <style:style style:name="Blueprint_20_Plans-4_3a_3-outline1" style:display-name="Blueprint Plans-4:3-outline1" style:family="presentation"> + <style:style style:name="Blueprint_20_Plans_20_4_3a_3-outline1" style:display-name="Blueprint Plans 4:3-outline1" style:family="presentation"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:auto-grow-height="false" draw:fit-to-size="false" style:shrink-to-fit="true"> - <text:list-style style:name="Blueprint_20_Plans-4_3a_3-outline1" style:display-name="Blueprint Plans-4:3-outline1"> + <text:list-style style:name="Blueprint_20_Plans_20_4_3a_3-outline1" style:display-name="Blueprint Plans 4:3-outline1"> <text:list-level-style-bullet text:level="1" text:bullet-char="●"> <style:list-level-properties text:space-before="0.3cm" text:min-label-width="0.9cm"/> <style:text-properties fo:font-family="StarSymbol" fo:color="#ffffff" fo:font-size="45%"/> @@ -412,28 +412,28 @@ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.499cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/> <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#ffffff" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="32pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-size-asian="32pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="32pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> </style:style> - <style:style style:name="Blueprint_20_Plans-4_3a_3-outline2" style:display-name="Blueprint Plans-4:3-outline2" style:family="presentation" style:parent-style-name="Blueprint_20_Plans-4_3a_3-outline1"> + <style:style style:name="Blueprint_20_Plans_20_4_3a_3-outline2" style:display-name="Blueprint Plans 4:3-outline2" style:family="presentation" style:parent-style-name="Blueprint_20_Plans_20_4_3a_3-outline1"> <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.4cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/> <style:text-properties fo:font-size="24pt" style:font-size-asian="24pt" style:font-size-complex="24pt"/> </style:style> - <style:style style:name="Blueprint_20_Plans-4_3a_3-outline3" style:display-name="Blueprint Plans-4:3-outline3" style:family="presentation" style:parent-style-name="Blueprint_20_Plans-4_3a_3-outline2"> + <style:style style:name="Blueprint_20_Plans_20_4_3a_3-outline3" style:display-name="Blueprint Plans 4:3-outline3" style:family="presentation" style:parent-style-name="Blueprint_20_Plans_20_4_3a_3-outline2"> <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.3cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/> <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/> </style:style> - <style:style style:name="Blueprint_20_Plans-4_3a_3-outline4" style:display-name="Blueprint Plans-4:3-outline4" style:family="presentation" style:parent-style-name="Blueprint_20_Plans-4_3a_3-outline3"> + <style:style style:name="Blueprint_20_Plans_20_4_3a_3-outline4" style:display-name="Blueprint Plans 4:3-outline4" style:family="presentation" style:parent-style-name="Blueprint_20_Plans_20_4_3a_3-outline3"> <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.2cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/> <style:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/> </style:style> - <style:style style:name="Blueprint_20_Plans-4_3a_3-outline5" style:display-name="Blueprint Plans-4:3-outline5" style:family="presentation" style:parent-style-name="Blueprint_20_Plans-4_3a_3-outline4"> + <style:style style:name="Blueprint_20_Plans_20_4_3a_3-outline5" style:display-name="Blueprint Plans 4:3-outline5" style:family="presentation" style:parent-style-name="Blueprint_20_Plans_20_4_3a_3-outline4"> <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.1cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/> </style:style> - <style:style style:name="Blueprint_20_Plans-4_3a_3-outline6" style:display-name="Blueprint Plans-4:3-outline6" style:family="presentation" style:parent-style-name="Blueprint_20_Plans-4_3a_3-outline5"/> - <style:style style:name="Blueprint_20_Plans-4_3a_3-outline7" style:display-name="Blueprint Plans-4:3-outline7" style:family="presentation" style:parent-style-name="Blueprint_20_Plans-4_3a_3-outline6"/> - <style:style style:name="Blueprint_20_Plans-4_3a_3-outline8" style:display-name="Blueprint Plans-4:3-outline8" style:family="presentation" style:parent-style-name="Blueprint_20_Plans-4_3a_3-outline7"/> - <style:style style:name="Blueprint_20_Plans-4_3a_3-outline9" style:display-name="Blueprint Plans-4:3-outline9" style:family="presentation" style:parent-style-name="Blueprint_20_Plans-4_3a_3-outline8"/> - <style:style style:name="Blueprint_20_Plans-4_3a_3-subtitle" style:display-name="Blueprint Plans-4:3-subtitle" style:family="presentation"> + <style:style style:name="Blueprint_20_Plans_20_4_3a_3-outline6" style:display-name="Blueprint Plans 4:3-outline6" style:family="presentation" style:parent-style-name="Blueprint_20_Plans_20_4_3a_3-outline5"/> + <style:style style:name="Blueprint_20_Plans_20_4_3a_3-outline7" style:display-name="Blueprint Plans 4:3-outline7" style:family="presentation" style:parent-style-name="Blueprint_20_Plans_20_4_3a_3-outline6"/> + <style:style style:name="Blueprint_20_Plans_20_4_3a_3-outline8" style:display-name="Blueprint Plans 4:3-outline8" style:family="presentation" style:parent-style-name="Blueprint_20_Plans_20_4_3a_3-outline7"/> + <style:style style:name="Blueprint_20_Plans_20_4_3a_3-outline9" style:display-name="Blueprint Plans 4:3-outline9" style:family="presentation" style:parent-style-name="Blueprint_20_Plans_20_4_3a_3-outline8"/> + <style:style style:name="Blueprint_20_Plans_20_4_3a_3-subtitle" style:display-name="Blueprint Plans 4:3-subtitle" style:family="presentation"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle"> - <text:list-style style:name="Blueprint_20_Plans-4_3a_3-subtitle" style:display-name="Blueprint Plans-4:3-subtitle"> + <text:list-style style:name="Blueprint_20_Plans_20_4_3a_3-subtitle" style:display-name="Blueprint Plans 4:3-subtitle"> <text:list-level-style-bullet text:level="1" text:bullet-char="●"> <style:list-level-properties text:min-label-width="0.6cm"/> <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> @@ -479,9 +479,9 @@ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="center" fo:text-indent="0cm"/> <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#ffffff" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="32pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-size-asian="32pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="32pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> </style:style> - <style:style style:name="Blueprint_20_Plans-4_3a_3-title" style:display-name="Blueprint Plans-4:3-title" style:family="presentation"> + <style:style style:name="Blueprint_20_Plans_20_4_3a_3-title" style:display-name="Blueprint Plans 4:3-title" style:family="presentation"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle"> - <text:list-style style:name="Blueprint_20_Plans-4_3a_3-title" style:display-name="Blueprint Plans-4:3-title"> + <text:list-style style:name="Blueprint_20_Plans_20_4_3a_3-title" style:display-name="Blueprint Plans 4:3-title"> <text:list-level-style-bullet text:level="1" text:bullet-char="●"> <style:list-level-properties text:min-label-width="0.6cm"/> <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> @@ -703,22 +703,22 @@ <style:paragraph-properties fo:text-align="center"/> <style:text-properties fo:font-variant="normal" fo:text-transform="none" style:use-window-font-color="true" loext:opacity="0%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="33pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-size-asian="33pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="33pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> </style:style> - <style:style style:name="Standard-43-background" style:family="presentation"> + <style:style style:name="Standard_20_4_3a_3-background" style:display-name="Standard 4:3-background" style:family="presentation"> <style:graphic-properties draw:stroke="none" draw:fill="none"/> <style:text-properties style:letter-kerning="true"/> </style:style> - <style:style style:name="Standard-43-backgroundobjects" style:family="presentation"> + <style:style style:name="Standard_20_4_3a_3-backgroundobjects" style:display-name="Standard 4:3-backgroundobjects" style:family="presentation"> <style:graphic-properties draw:textarea-horizontal-align="justify" draw:shadow="hidden" draw:shadow-offset-x="0.2cm" draw:shadow-offset-y="0.2cm" draw:shadow-color="#808080"/> <style:text-properties style:letter-kerning="true"/> </style:style> - <style:style style:name="Standard-43-notes" style:family="presentation"> + <style:style style:name="Standard_20_4_3a_3-notes" style:display-name="Standard 4:3-notes" style:family="presentation"> <style:graphic-properties draw:stroke="none" draw:fill="none"/> <style:paragraph-properties fo:margin-left="0.6cm" fo:margin-right="0cm" fo:text-indent="-0.6cm"/> <style:text-properties fo:font-variant="normal" fo:text-transform="none" style:use-window-font-color="true" loext:opacity="0%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="20pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-size-asian="20pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="20pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> </style:style> - <style:style style:name="Standard-43-outline1" style:family="presentation"> + <style:style style:name="Standard_20_4_3a_3-outline1" style:display-name="Standard 4:3-outline1" style:family="presentation"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:auto-grow-height="false" draw:fit-to-size="false" style:shrink-to-fit="true"> - <text:list-style style:name="Standard-43-outline1"> + <text:list-style style:name="Standard_20_4_3a_3-outline1" style:display-name="Standard 4:3-outline1"> <text:list-level-style-bullet text:level="1" text:bullet-char="●"> <style:list-level-properties text:space-before="0.3cm" text:min-label-width="0.9cm"/> <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> @@ -764,28 +764,28 @@ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.374cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/> <style:text-properties fo:font-variant="normal" fo:text-transform="none" style:use-window-font-color="true" loext:opacity="0%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="24pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-size-asian="24pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="24pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> </style:style> - <style:style style:name="Standard-43-outline2" style:family="presentation" style:parent-style-name="Standard-43-outline1"> + <style:style style:name="Standard_20_4_3a_3-outline2" style:display-name="Standard 4:3-outline2" style:family="presentation" style:parent-style-name="Standard_20_4_3a_3-outline1"> <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.3cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/> <style:text-properties fo:font-size="21pt" style:font-size-asian="21pt" style:font-size-complex="21pt"/> </style:style> - <style:style style:name="Standard-43-outline3" style:family="presentation" style:parent-style-name="Standard-43-outline2"> + <style:style style:name="Standard_20_4_3a_3-outline3" style:display-name="Standard 4:3-outline3" style:family="presentation" style:parent-style-name="Standard_20_4_3a_3-outline2"> <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.225cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/> <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/> </style:style> - <style:style style:name="Standard-43-outline4" style:family="presentation" style:parent-style-name="Standard-43-outline3"> + <style:style style:name="Standard_20_4_3a_3-outline4" style:display-name="Standard 4:3-outline4" style:family="presentation" style:parent-style-name="Standard_20_4_3a_3-outline3"> <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.15cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/> <style:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/> </style:style> - <style:style style:name="Standard-43-outline5" style:family="presentation" style:parent-style-name="Standard-43-outline4"> + <style:style style:name="Standard_20_4_3a_3-outline5" style:display-name="Standard 4:3-outline5" style:family="presentation" style:parent-style-name="Standard_20_4_3a_3-outline4"> <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.075cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/> </style:style> - <style:style style:name="Standard-43-outline6" style:family="presentation" style:parent-style-name="Standard-43-outline5"/> - <style:style style:name="Standard-43-outline7" style:family="presentation" style:parent-style-name="Standard-43-outline6"/> - <style:style style:name="Standard-43-outline8" style:family="presentation" style:parent-style-name="Standard-43-outline7"/> - <style:style style:name="Standard-43-outline9" style:family="presentation" style:parent-style-name="Standard-43-outline8"/> - <style:style style:name="Standard-43-subtitle" style:family="presentation"> + <style:style style:name="Standard_20_4_3a_3-outline6" style:display-name="Standard 4:3-outline6" style:family="presentation" style:parent-style-name="Standard_20_4_3a_3-outline5"/> + <style:style style:name="Standard_20_4_3a_3-outline7" style:display-name="Standard 4:3-outline7" style:family="presentation" style:parent-style-name="Standard_20_4_3a_3-outline6"/> + <style:style style:name="Standard_20_4_3a_3-outline8" style:display-name="Standard 4:3-outline8" style:family="presentation" style:parent-style-name="Standard_20_4_3a_3-outline7"/> + <style:style style:name="Standard_20_4_3a_3-outline9" style:display-name="Standard 4:3-outline9" style:family="presentation" style:parent-style-name="Standard_20_4_3a_3-outline8"/> + <style:style style:name="Standard_20_4_3a_3-subtitle" style:display-name="Standard 4:3-subtitle" style:family="presentation"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle"> - <text:list-style style:name="Standard-43-subtitle"> + <text:list-style style:name="Standard_20_4_3a_3-subtitle" style:display-name="Standard 4:3-subtitle"> <text:list-level-style-bullet text:level="1" text:bullet-char="●"> <style:list-level-properties text:min-label-width="0.6cm"/> <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> @@ -831,9 +831,9 @@ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="center" fo:text-indent="0cm"/> <style:text-properties fo:font-variant="normal" fo:text-transform="none" style:use-window-font-color="true" loext:opacity="0%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="32pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-size-asian="32pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="32pt" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/> </style:style> - <style:style style:name="Standard-43-title" style:family="presentation"> + <style:style style:name="Standard_20_4_3a_3-title" style:display-name="Standard 4:3-title" style:family="presentation"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle"> - <text:list-style style:name="Standard-43-title"> + <text:list-style style:name="Standard_20_4_3a_3-title" style:display-name="Standard 4:3-title"> <text:list-level-style-bullet text:level="1" text:bullet-char="●"> <style:list-level-properties text:min-label-width="0.6cm"/> <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/> @@ -947,22 +947,22 @@ <style:style style:name="Mpr6" style:family="presentation" style:parent-style-name="Standard-backgroundobjects"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:textarea-vertical-align="bottom" draw:auto-grow-height="false" fo:min-height="1.485cm"/> </style:style> - <style:style style:name="Mpr7" style:family="presentation" style:parent-style-name="Blueprint_20_Plans-4_3a_3-backgroundobjects"> + <style:style style:name="Mpr7" style:family="presentation" style:parent-style-name="Blueprint_20_Plans_20_4_3a_3-backgroundobjects"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:auto-grow-height="false" fo:min-height="1.086cm"/> </style:style> - <style:style style:name="Mpr8" style:family="presentation" style:parent-style-name="Blueprint_20_Plans-4_3a_3-backgroundobjects"> + <style:style style:name="Mpr8" style:family="presentation" style:parent-style-name="Blueprint_20_Plans_20_4_3a_3-backgroundobjects"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:auto-grow-height="false" fo:min-height="1.485cm"/> </style:style> - <style:style style:name="Mpr9" style:family="presentation" style:parent-style-name="Blueprint_20_Plans-4_3a_3-backgroundobjects"> + <style:style style:name="Mpr9" style:family="presentation" style:parent-style-name="Blueprint_20_Plans_20_4_3a_3-backgroundobjects"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:textarea-vertical-align="bottom" draw:auto-grow-height="false" fo:min-height="1.485cm"/> </style:style> - <style:style style:name="Mpr10" style:family="presentation" style:parent-style-name="Standard-43-backgroundobjects"> + <style:style style:name="Mpr10" style:family="presentation" style:parent-style-name="Standard_20_4_3a_3-backgroundobjects"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:auto-grow-height="false" fo:min-height="1.449cm"/> </style:style> - <style:style style:name="Mpr11" style:family="presentation" style:parent-style-name="Standard-43-backgroundobjects"> + <style:style style:name="Mpr11" style:family="presentation" style:parent-style-name="Standard_20_4_3a_3-backgroundobjects"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:auto-grow-height="false" fo:min-height="1.485cm"/> </style:style> - <style:style style:name="Mpr12" style:family="presentation" style:parent-style-name="Standard-43-backgroundobjects"> + <style:style style:name="Mpr12" style:family="presentation" style:parent-style-name="Standard_20_4_3a_3-backgroundobjects"> <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:textarea-vertical-align="bottom" draw:auto-grow-height="false" fo:min-height="1.485cm"/> </style:style> <style:style style:name="MP2" style:family="paragraph"> @@ -1179,7 +1179,7 @@ </draw:frame> </presentation:notes> </style:master-page> - <style:master-page style:name="Blueprint_20_Plans-4_3a_3" style:display-name="Blueprint Plans-4:3" style:page-layout-name="PM1" draw:style-name="Mdp4"> + <style:master-page style:name="Blueprint_20_Plans_20_4_3a_3" style:display-name="Blueprint Plans 4:3" style:page-layout-name="PM1" draw:style-name="Mdp4"> <draw:frame draw:style-name="Mgr1" draw:layer="backgroundobjects" svg:width="28cm" svg:height="15.75cm" svg:x="0cm" svg:y="0cm"> <draw:image xlink:href="Pictures/Blueprint_Plans-first-bg-4-3.svg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> </draw:frame> @@ -1211,8 +1211,8 @@ </draw:text-box> </draw:frame> <presentation:notes style:page-layout-name="PM0"> - <draw:page-thumbnail presentation:style-name="Blueprint_20_Plans-4_3a_3-title" draw:layer="backgroundobjects" svg:width="17cm" svg:height="9.56cm" svg:x="2cm" svg:y="2.5cm" presentation:class="page"/> - <draw:frame presentation:style-name="Blueprint_20_Plans-4_3a_3-notes" draw:layer="backgroundobjects" svg:width="17cm" svg:height="14cm" svg:x="2cm" svg:y="13cm" presentation:class="notes" presentation:placeholder="true"> + <draw:page-thumbnail presentation:style-name="Blueprint_20_Plans_20_4_3a_3-title" draw:layer="backgroundobjects" svg:width="17cm" svg:height="9.56cm" svg:x="2cm" svg:y="2.5cm" presentation:class="page"/> + <draw:frame presentation:style-name="Blueprint_20_Plans_20_4_3a_3-notes" draw:layer="backgroundobjects" svg:width="17cm" svg:height="14cm" svg:x="2cm" svg:y="13cm" presentation:class="notes" presentation:placeholder="true"> <draw:text-box/> </draw:frame> <draw:frame presentation:style-name="Mpr8" draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header"> @@ -1245,14 +1245,14 @@ </draw:frame> </presentation:notes> </style:master-page> - <style:master-page style:name="Standard-43" style:page-layout-name="PM1" draw:style-name="Mdp5"> + <style:master-page style:name="Standard_20_4_3a_3" style:display-name="Standard 4:3" style:page-layout-name="PM1" draw:style-name="Mdp5"> <draw:frame draw:style-name="Mgr1" draw:layer="backgroundobjects" svg:width="28cm" svg:height="15.75cm" svg:x="0cm" svg:y="0cm"> <draw:image xlink:href="Pictures/Blueprint_Plans-second-bg-4-3.svg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/> </draw:frame> - <draw:frame presentation:style-name="Standard-43-title" draw:layer="backgroundobjects" svg:width="25.2cm" svg:height="2.63cm" svg:x="1.4cm" svg:y="0.627cm" presentation:class="title" presentation:placeholder="true"> + <draw:frame presentation:style-name="Standard_20_4_3a_3-title" draw:layer="backgroundobjects" svg:width="25.2cm" svg:height="2.63cm" svg:x="1.4cm" svg:y="0.627cm" presentation:class="title" presentation:placeholder="true"> <draw:text-box/> </draw:frame> - <draw:frame presentation:style-name="Standard-43-outline1" draw:layer="backgroundobjects" svg:width="25.2cm" svg:height="9.134cm" svg:x="1.4cm" svg:y="3.685cm" presentation:class="outline" presentation:placeholder="true"> + <draw:frame presentation:style-name="Standard_20_4_3a_3-outline1" draw:layer="backgroundobjects" svg:width="25.2cm" svg:height="9.134cm" svg:x="1.4cm" svg:y="3.685cm" presentation:class="outline" presentation:placeholder="true"> <draw:text-box/> </draw:frame> <draw:frame presentation:style-name="Mpr10" draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="6.523cm" svg:height="1.086cm" svg:x="1.4cm" svg:y="14.348cm" presentation:class="date-time"> @@ -1277,8 +1277,8 @@ </draw:text-box> </draw:frame> <presentation:notes style:page-layout-name="PM0"> - <draw:page-thumbnail presentation:style-name="Standard-43-title" draw:layer="backgroundobjects" svg:width="17cm" svg:height="9.56cm" svg:x="2cm" svg:y="2.5cm" presentation:class="page"/> - <draw:frame presentation:style-name="Standard-43-notes" draw:layer="backgroundobjects" svg:width="17cm" svg:height="14cm" svg:x="2cm" svg:y="13cm" presentation:class="notes" presentation:placeholder="true"> + <draw:page-thumbnail presentation:style-name="Standard_20_4_3a_3-title" draw:layer="backgroundobjects" svg:width="17cm" svg:height="9.56cm" svg:x="2cm" svg:y="2.5cm" presentation:class="page"/> + <draw:frame presentation:style-name="Standard_20_4_3a_3-notes" draw:layer="backgroundobjects" svg:width="17cm" svg:height="14cm" svg:x="2cm" svg:y="13cm" presentation:class="notes" presentation:placeholder="true"> <draw:text-box/> </draw:frame> <draw:frame presentation:style-name="Mpr11" draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
