[Libreoffice-commits] .: Branch 'libreoffice-3-4' - extensions/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Wed Oct 5 04:35:16 PDT 2011
extensions/source/propctrlr/editpropertyhandler.cxx | 12 +--
extensions/source/propctrlr/formcomponenthandler.cxx | 44 +++++------
extensions/source/propctrlr/xsdvalidationhelper.cxx | 2
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx | 36 ++++-----
4 files changed, 47 insertions(+), 47 deletions(-)
New commits:
commit 242f1bee6e0df3c58c257178058d61a1c349c2ed
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 29 21:32:08 2011 +0100
get this building with gcc 4.6.1
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index a1693ae..363f685 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() );;
}
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 48d0bbe..a006ab5 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -947,28 +947,28 @@ namespace pcr
{
::osl::MutexGuard aGuard( m_aMutex );
::std::vector< ::rtl::OUString > aInterestingProperties;
- aInterestingProperties.push_back( PROPERTY_DATASOURCE );
- aInterestingProperties.push_back( PROPERTY_COMMAND );
- aInterestingProperties.push_back( PROPERTY_COMMANDTYPE );
- aInterestingProperties.push_back( PROPERTY_LISTSOURCE );
- aInterestingProperties.push_back( PROPERTY_LISTSOURCETYPE );
- aInterestingProperties.push_back( PROPERTY_SUBMIT_ENCODING );
- aInterestingProperties.push_back( PROPERTY_REPEAT );
- aInterestingProperties.push_back( PROPERTY_TABSTOP );
- aInterestingProperties.push_back( PROPERTY_BORDER );
- aInterestingProperties.push_back( PROPERTY_CONTROLSOURCE );
- aInterestingProperties.push_back( PROPERTY_DROPDOWN );
- aInterestingProperties.push_back( PROPERTY_IMAGE_URL );
- aInterestingProperties.push_back( PROPERTY_TARGET_URL );
- aInterestingProperties.push_back( PROPERTY_STRINGITEMLIST );
- aInterestingProperties.push_back( PROPERTY_BUTTONTYPE );
- aInterestingProperties.push_back( PROPERTY_ESCAPE_PROCESSING );
- aInterestingProperties.push_back( PROPERTY_TRISTATE );
- aInterestingProperties.push_back( PROPERTY_DECIMAL_ACCURACY );
- aInterestingProperties.push_back( PROPERTY_SHOWTHOUSANDSEP );
- aInterestingProperties.push_back( PROPERTY_FORMATKEY );
- aInterestingProperties.push_back( PROPERTY_EMPTY_IS_NULL );
- aInterestingProperties.push_back( PROPERTY_TOGGLE );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATASOURCE) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_COMMAND) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_COMMANDTYPE) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCE) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCETYPE) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_SUBMIT_ENCODING) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_REPEAT) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TABSTOP) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_BORDER) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_CONTROLSOURCE) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DROPDOWN) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_IMAGE_URL) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TARGET_URL) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_STRINGITEMLIST) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_BUTTONTYPE) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_ESCAPE_PROCESSING) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TRISTATE) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DECIMAL_ACCURACY) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_SHOWTHOUSANDSEP) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_FORMATKEY) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_EMPTY_IS_NULL) );
+ aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TOGGLE) );
return Sequence< ::rtl::OUString >( &(*aInterestingProperties.begin()), aInterestingProperties.size() );
}
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx
index 4ade7c5..54338a3 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.cxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx
@@ -271,7 +271,7 @@ namespace pcr
Reference< XPropertySet > xNewType( getDataType( _rName ), UNO_QUERY );
// fire any changes in the properties which result from this new type
- std::set< ::rtl::OUString > aFilter; aFilter.insert( PROPERTY_NAME );
+ std::set< ::rtl::OUString > aFilter; aFilter.insert( static_cast<const rtl::OUString&>(PROPERTY_NAME) );
firePropertyChanges( xOldType, xNewType, aFilter );
// fire the change in the Data Type property
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index b9ca345..31c6ba2 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -247,27 +247,27 @@ namespace pcr
::std::vector< ::rtl::OUString > aSuperfluous;
if ( m_pHelper.get() )
{
- aSuperfluous.push_back( PROPERTY_CONTROLSOURCE );
- aSuperfluous.push_back( PROPERTY_EMPTY_IS_NULL );
- aSuperfluous.push_back( PROPERTY_FILTERPROPOSAL );
- aSuperfluous.push_back( PROPERTY_LISTSOURCETYPE );
- aSuperfluous.push_back( PROPERTY_LISTSOURCE );
- aSuperfluous.push_back( PROPERTY_BOUNDCOLUMN );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_CONTROLSOURCE) );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EMPTY_IS_NULL) );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_FILTERPROPOSAL) );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCETYPE) );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_LISTSOURCE) );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_BOUNDCOLUMN) );
bool bAllowBinding = m_pHelper->canBindToAnyDataType();
if ( bAllowBinding )
{
- aSuperfluous.push_back( PROPERTY_MAXTEXTLEN );
- aSuperfluous.push_back( PROPERTY_VALUEMIN );
- aSuperfluous.push_back( PROPERTY_VALUEMAX );
- aSuperfluous.push_back( PROPERTY_DECIMAL_ACCURACY );
- aSuperfluous.push_back( PROPERTY_TIMEMIN );
- aSuperfluous.push_back( PROPERTY_TIMEMAX );
- aSuperfluous.push_back( PROPERTY_DATEMIN );
- aSuperfluous.push_back( PROPERTY_DATEMAX );
- aSuperfluous.push_back( PROPERTY_EFFECTIVE_MIN );
- aSuperfluous.push_back( PROPERTY_EFFECTIVE_MAX );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_MAXTEXTLEN) );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_VALUEMIN) );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_VALUEMAX) );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DECIMAL_ACCURACY) );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_TIMEMIN) );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_TIMEMAX) );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATEMIN) );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATEMAX) );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EFFECTIVE_MIN) );
+ aSuperfluous.push_back( static_cast<const rtl::OUString&>(PROPERTY_EFFECTIVE_MAX) );
}
}
@@ -283,8 +283,8 @@ namespace pcr
::std::vector< ::rtl::OUString > aInterestedInActuations( 2 );
if ( m_pHelper.get() )
{
- aInterestedInActuations.push_back( PROPERTY_XSD_DATA_TYPE );
- aInterestedInActuations.push_back( PROPERTY_XML_DATA_MODEL );
+ aInterestedInActuations.push_back( static_cast<const rtl::OUString&>(PROPERTY_XSD_DATA_TYPE) );
+ aInterestedInActuations.push_back( static_cast<const rtl::OUString&>(PROPERTY_XML_DATA_MODEL) );
}
if ( aInterestedInActuations.empty() )
return Sequence< ::rtl::OUString >();
More information about the Libreoffice-commits
mailing list