Skip to content

C
core
Kaydet (Commit) 0e1d027f authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

use comphelper::containerToSequence and fix some casting 

Change-Id: Ic476204e9db8a0cd1164002a4a8b55f90aef515e
üst 37a04c46
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 27 deletions
extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
Dosyayı görüntüle @ 0e1d027f
...@@ -220,9 +220,7 @@ namespace pcr ...@@ -220,9 +220,7 @@ namespace pcr
} }
} }
if ( aProperties.empty() ) return comphelper::containerToSequence( aProperties );
return Sequence< Property >();
return Sequence< Property >( &(*aProperties.begin()), aProperties.size() );
} }
...@@ -233,33 +231,31 @@ namespace pcr ...@@ -233,33 +231,31 @@ namespace pcr
::std::vector< OUString > aSuperfluous; ::std::vector< OUString > aSuperfluous;
if ( m_pHelper.get() ) if ( m_pHelper.get() )
{ {
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_CONTROLSOURCE) ); aSuperfluous.push_back( OUString(PROPERTY_CONTROLSOURCE) );
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_EMPTY_IS_NULL) ); aSuperfluous.push_back( OUString(PROPERTY_EMPTY_IS_NULL) );
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_FILTERPROPOSAL) ); aSuperfluous.push_back( OUString(PROPERTY_FILTERPROPOSAL) );
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_LISTSOURCETYPE) ); aSuperfluous.push_back( OUString(PROPERTY_LISTSOURCETYPE) );
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_LISTSOURCE) ); aSuperfluous.push_back( OUString(PROPERTY_LISTSOURCE) );
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_BOUNDCOLUMN) ); aSuperfluous.push_back( OUString(PROPERTY_BOUNDCOLUMN) );
bool bAllowBinding = m_pHelper->canBindToAnyDataType(); bool bAllowBinding = m_pHelper->canBindToAnyDataType();
if ( bAllowBinding ) if ( bAllowBinding )
{ {
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_MAXTEXTLEN) ); aSuperfluous.push_back( OUString(PROPERTY_MAXTEXTLEN) );
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_VALUEMIN) ); aSuperfluous.push_back( OUString(PROPERTY_VALUEMIN) );
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_VALUEMAX) ); aSuperfluous.push_back( OUString(PROPERTY_VALUEMAX) );
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_DECIMAL_ACCURACY) ); aSuperfluous.push_back( OUString(PROPERTY_DECIMAL_ACCURACY) );
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_TIMEMIN) ); aSuperfluous.push_back( OUString(PROPERTY_TIMEMIN) );
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_TIMEMAX) ); aSuperfluous.push_back( OUString(PROPERTY_TIMEMAX) );
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_DATEMIN) ); aSuperfluous.push_back( OUString(PROPERTY_DATEMIN) );
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_DATEMAX) ); aSuperfluous.push_back( OUString(PROPERTY_DATEMAX) );
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_EFFECTIVE_MIN) ); aSuperfluous.push_back( OUString(PROPERTY_EFFECTIVE_MIN) );
aSuperfluous.push_back( static_cast<const OUString&>(PROPERTY_EFFECTIVE_MAX) ); aSuperfluous.push_back( OUString(PROPERTY_EFFECTIVE_MAX) );
} }
} }
if ( aSuperfluous.empty() ) return comphelper::containerToSequence( aSuperfluous );
return Sequence< OUString >();
return Sequence< OUString >( &(*aSuperfluous.begin()), aSuperfluous.size() );
} }
...@@ -269,12 +265,10 @@ namespace pcr ...@@ -269,12 +265,10 @@ namespace pcr
::std::vector< OUString > aInterestedInActuations( 2 ); ::std::vector< OUString > aInterestedInActuations( 2 );
if ( m_pHelper.get() ) if ( m_pHelper.get() )
{ {
aInterestedInActuations.push_back( static_cast<const OUString&>(PROPERTY_XSD_DATA_TYPE) ); aInterestedInActuations.push_back( OUString(PROPERTY_XSD_DATA_TYPE) );
aInterestedInActuations.push_back( static_cast<const OUString&>(PROPERTY_XML_DATA_MODEL) ); aInterestedInActuations.push_back( OUString(PROPERTY_XML_DATA_MODEL) );
} }
if ( aInterestedInActuations.empty() ) return comphelper::containerToSequence( aInterestedInActuations );
return Sequence< OUString >();
return Sequence< OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment