diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-01-30 12:19:11 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-30 12:27:47 +0100 |
| commit | e8bb827571f540ac4af2247cb11239bb96876669 (patch) | |
| tree | 24a7ee39d336a476c88f76f533fb292d5fdd9332 /cui | |
| parent | dc6953f932ffbddd5168f039e58075789b91b98b (diff) | |
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 <value> 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.
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/fontsubs.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 8971cf2bb416..0060757119fe 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -248,7 +248,8 @@ sal_Bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& ) if(aFontNameLB.GetSelectEntryPos()) sFontName = aFontNameLB.GetSelectEntry(); officecfg::Office::Common::Font::SourceViewFont::FontName::set( - comphelper::getProcessComponentContext(), batch, sFontName); + comphelper::getProcessComponentContext(), batch, + boost::optional< rtl::OUString >(sFontName)); batch->commit(); return sal_False; @@ -294,7 +295,8 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet& ) NonPropFontsHdl(&aNonPropFontsOnlyCB); rtl::OUString sFontName( officecfg::Office::Common::Font::SourceViewFont::FontName::get( - comphelper::getProcessComponentContext())); + comphelper::getProcessComponentContext()). + get_value_or(rtl::OUString())); if(!sFontName.isEmpty()) aFontNameLB.SelectEntry(sFontName); else |