diff options
Diffstat (limited to 'xmloff/source/style/xmlimppr.cxx')
| -rw-r--r-- | xmloff/source/style/xmlimppr.cxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 79b2974706e5..cf09b6cdc53c 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,6 +70,8 @@ using ::com::sun::star::lang::WrappedTargetException; using ::com::sun::star::beans::UnknownPropertyException; using ::com::sun::star::beans::PropertyVetoException; +using rtl::OUString; +using rtl::OUStringBuffer; SvXMLImportPropertyMapper::SvXMLImportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper, @@ -341,20 +344,10 @@ void SvXMLImportPropertyMapper::importXML( } finished( rProperties, nStartIdx, nEndIdx ); - - // Have to do if we change from a vector to a list or something like that - /*std::vector <XMLPropertyState>::iterator aItr = rProperties.begin(); - while (aItr != rProperties.end()) - { - if (aItr->mnIndex == -1) - aItr = rProperties.erase(aItr); - else - aItr++; - }*/ } /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */ -sal_Bool SvXMLImportPropertyMapper::handleSpecialItem( +bool SvXMLImportPropertyMapper::handleSpecialItem( XMLPropertyState& rProperty, vector< XMLPropertyState >& rProperties, const OUString& rValue, @@ -592,7 +585,7 @@ typedef pair<const OUString*, const Any* > PropertyPair; typedef vector<PropertyPair> PropertyPairs; struct PropertyPairLessFunctor : - public binary_function<PropertyPair, PropertyPair, bool> + public std::binary_function<PropertyPair, PropertyPair, bool> { bool operator()( const PropertyPair& a, const PropertyPair& b ) const { @@ -782,3 +775,5 @@ void SvXMLImportPropertyMapper::finished( if( mxNextMapper.is() ) mxNextMapper->finished( rProperties, nStartIndex, nEndIndex ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |