diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-07-05 20:18:35 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-07-06 20:29:14 +0100 |
| commit | e2799d253b1dc62967693aa5bccd7360a9520967 (patch) | |
| tree | e4946b34da78907603a88e2203620b6536b4a272 /framework | |
| parent | daba604186e3a819c0fdd8c3d1dec7c604259c10 (diff) | |
re-base on ALv2 code. Includes:
Patches contributed by Mathias Bauer:
cws mba34issues01: #i117713#: remove superfluous assertions about field unit fallbacks
http://svn.apache.org/viewvc?view=revision&revision=1172341
cws mba34issues01: #i117718#: provide filter name in case
storage of medium does not allow to detect one
cws mba34issues01: #i117712#: fix several resource errors introduced by IAccessible2 implementation
http://svn.apache.org/viewvc?view=revision&revision=1172343
http://svn.apache.org/viewvc?view=revision&revision=1172350
cws mba34issues01: #i117708#: status indicator for inactive documents
http://svn.apache.org/viewvc?view=revision&revision=1172358
cws mba34issues01: #i116025#: fix typo and add missing treatment of new parameter
http://svn.apache.org/viewvc?view=revision&revision=1172359
cws mba34issues01: #i117024#: rework parameter conversion for load/save slots
http://svn.apache.org/viewvc?view=revision&revision=1172360
cws mba34issues01: #i116803#: possible crash on Linux when
dispatch.cxx is compiled with optimization
http://svn.apache.org/viewvc?view=revision&revision=1172367
cws mba34issues01: #i114600#: fix compiler warning for name clash found on Solaris
http://svn.apache.org/viewvc?view=revision&revision=1172371
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/frame.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index cc081c6f08ca..55f418d70572 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -2846,8 +2846,8 @@ void Frame::implts_setIconOnWindow() try { css::uno::Reference< css::beans::XPropertySetInfo > const xPSI( xSet->getPropertySetInfo(), css::uno::UNO_SET_THROW ); - if ( xPSI->hasPropertyByName( CONTROLLER_PROPNAME_ICONID ) ) - xSet->getPropertyValue( CONTROLLER_PROPNAME_ICONID ) >>= nIcon; + if ( xPSI->hasPropertyByName( "IconId" ) ) + xSet->getPropertyValue( "IconId" ) >>= nIcon; } catch( css::uno::Exception& ) { |