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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appcfg.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 25ff74c2b866..86d02a620df4 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -401,8 +401,9 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet ) if (rSet.Put( SfxUInt16Item( rPool.GetWhich(SID_INET_PROXY_TYPE), - officecfg::Inet::Settings::ooInetProxyType::get( - comphelper::getProcessComponentContext())))) + (officecfg::Inet::Settings::ooInetProxyType::get( + comphelper::getProcessComponentContext()). + get_value_or(0))))) { bRet = true; } @@ -421,8 +422,9 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet ) if (rSet.Put( SfxInt32Item( rPool.GetWhich(SID_INET_HTTP_PROXY_PORT), - officecfg::Inet::Settings::ooInetHTTPProxyPort::get( - comphelper::getProcessComponentContext())))) + (officecfg::Inet::Settings::ooInetHTTPProxyPort::get( + comphelper::getProcessComponentContext()). + get_value_or(0))))) { bRet = true; } @@ -441,8 +443,9 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet ) if (rSet.Put( SfxInt32Item( rPool.GetWhich(SID_INET_FTP_PROXY_PORT), - officecfg::Inet::Settings::ooInetFTPProxyPort::get( - comphelper::getProcessComponentContext())))) + (officecfg::Inet::Settings::ooInetFTPProxyPort::get( + comphelper::getProcessComponentContext()). + get_value_or(0))))) { bRet = true; } |