[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - extras/Package_tplofficorr.mk extras/source

[heiko tietze]

 dev/null                                                               |binary
 extras/Package_tplofficorr.mk                                          |    2 +-
 extras/source/templates/officorr/Modern_business_letter_sans_serif.ott |binary
 extras/source/templates/officorr/Modern_business_letter_serif.ott      |binary
 4 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 98caff29c736b2a22f0efe7af1711600a25ecb41
Author: heiko tietze <tietze.heiko at gmail.com>
Date:   Fri Aug 4 09:37:12 2017 +0200

    tdf#111331 Rename Moderate template
    
    Files renamed, template's title property adjusted
    
    Change-Id: Ifca9a740417c0c7563e7d97f8d08de9f69e8f7ff
    Reviewed-on: https://gerrit.libreoffice.org/40758
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 8a150beab270f53943014ba9f6b5507ec6231227)
    Reviewed-on: https://gerrit.libreoffice.org/40759

diff --git a/extras/Package_tplofficorr.mk b/extras/Package_tplofficorr.mk
index 15329e6fff48..dc79d8790cc1 100644
--- a/extras/Package_tplofficorr.mk
+++ b/extras/Package_tplofficorr.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_Package_Package,extras_tplofficorr,$(SRCDIR)/extras/source/templates/officorr))
 
 $(eval $(call gb_Package_add_files,extras_tplofficorr,$(LIBO_SHARE_FOLDER)/template/common/officorr,\
-	Moderate_business_letter_sans_serif.ott \
+	Modern_business_letter_sans_serif.ott \
 	Modern_business_letter_serif.ott \
 ))
 
diff --git a/extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott b/extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott
deleted file mode 100644
index 4f897cc2c8c3..000000000000
Binary files a/extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott and /dev/null differ
diff --git a/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott b/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott
new file mode 100644
index 000000000000..f8fbc40b6517
Binary files /dev/null and b/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott differ
diff --git a/extras/source/templates/officorr/Modern_business_letter_serif.ott b/extras/source/templates/officorr/Modern_business_letter_serif.ott
index 217aca4d4a17..db218f304581 100644
Binary files a/extras/source/templates/officorr/Modern_business_letter_serif.ott and b/extras/source/templates/officorr/Modern_business_letter_serif.ott differ