diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-29 21:32:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-30 09:09:25 +0100 |
| commit | ffbab6ccbd1f6f3014333fc5767b75628c7c91e4 (patch) | |
| tree | 36f5548ca3f1d819885f99891dd38497ce4da29b /extensions/source/propctrlr/editpropertyhandler.cxx | |
| parent | 71e5f262a51d085c0227f84fe112f64d5d52c06c (diff) | |
get this building with gcc 4.6.1
Diffstat (limited to 'extensions/source/propctrlr/editpropertyhandler.cxx')
| -rw-r--r-- | extensions/source/propctrlr/editpropertyhandler.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx index b00b1ceafb55..67b25f1af14b 100644 --- a/extensions/source/propctrlr/editpropertyhandler.cxx +++ b/extensions/source/propctrlr/editpropertyhandler.cxx @@ -248,13 +248,13 @@ namespace pcr ::std::vector< ::rtl::OUString > aSuperseded; if ( implHaveBothScrollBarProperties() ) { - aSuperseded.push_back( PROPERTY_HSCROLL ); - aSuperseded.push_back( PROPERTY_VSCROLL ); + aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_HSCROLL) ); + aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_VSCROLL) ); } if ( implHaveTextTypeProperty() ) { - aSuperseded.push_back( PROPERTY_RICHTEXT ); - aSuperseded.push_back( PROPERTY_MULTILINE ); + aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_RICHTEXT) ); + aSuperseded.push_back( static_cast<const rtl::OUString&>(PROPERTY_MULTILINE) ); } if ( aSuperseded.empty() ) return Sequence< ::rtl::OUString >(); @@ -267,8 +267,8 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); ::std::vector< ::rtl::OUString > aInterestingActuatingProps; if ( implHaveTextTypeProperty() ) - aInterestingActuatingProps.push_back( PROPERTY_TEXTTYPE ); - aInterestingActuatingProps.push_back( PROPERTY_MULTILINE ); + aInterestingActuatingProps.push_back( static_cast<const rtl::OUString&>(PROPERTY_TEXTTYPE) ); + aInterestingActuatingProps.push_back( static_cast<const rtl::OUString&>(PROPERTY_MULTILINE) ); return Sequence< ::rtl::OUString >( &(*aInterestingActuatingProps.begin()), aInterestingActuatingProps.size() );; } |