svtools/source/control/ctrlbox.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
New commits: commit 171586cc4df4a9470251e50ce51338c2d53acf9b Author: Caolán McNamara <[email protected]> Date: Thu Jul 28 21:30:55 2016 +0100 Resolves: tdf#94940 don't load font history if option is disabled Change-Id: I70348b4e4bb85850331044e901c03aabb0d22ef8 diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index e64b0a5..20fdb89 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -30,6 +30,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <unotools/charclass.hxx> +#include <unotools/fontoptions.hxx> #include <svtools/sampletext.hxx> #include <svtools/svtresid.hxx> @@ -982,7 +983,11 @@ void FontNameBox::SaveMRUEntries( const OUString& aFontMRUEntriesFile ) const void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile ) { - if( aFontMRUEntriesFile.isEmpty() ) + if (aFontMRUEntriesFile.isEmpty()) + return; + + SvtFontOptions aFontOpt; + if (!aFontOpt.IsFontHistoryEnabled()) return; SvFileStream aStream( aFontMRUEntriesFile, StreamMode::READ );
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
