From e8bb827571f540ac4af2247cb11239bb96876669 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 30 Jan 2012 12:19:11 +0100 Subject: Fixed cppheader.xsl nillable treatment. * cppheader.xsl had initially been written under the false assumption that a missing oor:nillable attribute defaults to "false" instead of "true". That has been fixed. * As a result, many places that use the new simplified officecfg/*.hxx headers broke as they did not expect value types to be wrapped boost::optional. To keep the code simple, I decided to change all occurrences in officecfg/registry/schema/ of properties that specify a default and do not explicitly specify oor:nillable="true" to oor:nillable="false". Strictly speaking, this is an incompatible change, but in many cases it should be what was intended, anyway. * Some places that use the new simplified officecfg/*.hxx headers still had to be adapted to boost::optional wrapping. * This showed that unotools/configuration.hxx did not yet work for those wrapped properties and needed fixing, too. --- sw/source/ui/docvw/srcedtw.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sw/source/ui/docvw/srcedtw.cxx') diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index fb874080fd34..07c1c81f8e0d 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -979,7 +979,8 @@ void SwSrcEditWindow::SetFont() { rtl::OUString sFontName( officecfg::Office::Common::Font::SourceViewFont::FontName::get( - comphelper::getProcessComponentContext())); + comphelper::getProcessComponentContext()). + get_value_or(rtl::OUString())); if(sFontName.isEmpty()) { LanguageType aLanguages[5] = -- cgit