diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-22 10:17:04 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-08 15:42:15 +0200 |
| commit | 8fa6adb0273cbef499d1f3444eb46777efd40e3d (patch) | |
| tree | 2a9dbef4d21d158962d966729741485014e213bc /writerfilter | |
| parent | 897c1626ce534c9d820bae95bef7a162059d5ad6 (diff) | |
Avoid reserved identifiers
(cherry picked from commit fa72b7fd719eefdbf4f12535f1ee7fbf232360e3)
Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.cxx
Change-Id: Ie1830e7645b8bb8b8020fdb384471801a1aaca31
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 12 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.hxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 75aee7381b7e..5b7ad99166ea 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1166,7 +1166,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) uno::Reference<beans::XPropertySet> xPageStyle (rDM_Impl.GetPageStyles()->getByName(aName), uno::UNO_QUERY_THROW); HandleMarginsHeaderFooter(rDM_Impl); if (rDM_Impl.IsNewDoc()) - _ApplyProperties(xPageStyle); + ApplyProperties_(xPageStyle); } catch( const uno::Exception& ) { @@ -1300,7 +1300,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) } if (rDM_Impl.IsNewDoc()) - _ApplyProperties( xFollowPageStyle ); + ApplyProperties_( xFollowPageStyle ); //todo: creating a "First Page" style depends on HasTitlePage und _fFacingPage_ if( m_bTitlePage ) @@ -1310,7 +1310,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl ) uno::Reference< beans::XPropertySet > xFirstPageStyle = GetPageStyle( rDM_Impl.GetPageStyles(), rDM_Impl.GetTextFactory(), true ); if (rDM_Impl.IsNewDoc()) - _ApplyProperties( xFirstPageStyle ); + ApplyProperties_( xFirstPageStyle ); sal_Int32 nPaperBin = m_nFirstPaperBin >= 0 ? m_nFirstPaperBin : m_nPaperBin >= 0 ? m_nPaperBin : 0; if( nPaperBin ) @@ -1414,7 +1414,7 @@ public: bool operator() (beans::PropertyValue& aVal) { return aVal.Name == m_aName; } }; -void SectionPropertyMap::_ApplyProperties( +void SectionPropertyMap::ApplyProperties_( uno::Reference< beans::XPropertySet > const& xStyle) { uno::Reference<beans::XMultiPropertySet> const xMultiSet(xStyle, @@ -1462,7 +1462,7 @@ void SectionPropertyMap::_ApplyProperties( } catch( const uno::Exception& ) { - OSL_FAIL( "Exception in SectionPropertyMap::_ApplyProperties"); + OSL_FAIL( "Exception in SectionPropertyMap::ApplyProperties_"); } return; } @@ -1475,7 +1475,7 @@ void SectionPropertyMap::_ApplyProperties( } catch( const uno::Exception& ) { - OSL_FAIL( "Exception in SectionPropertyMap::_ApplyProperties"); + OSL_FAIL( "Exception in SectionPropertyMap::ApplyProperties_"); } } } diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx index 90e71f6f70ad..75508008d5e8 100644 --- a/writerfilter/source/dmapper/PropertyMap.hxx +++ b/writerfilter/source/dmapper/PropertyMap.hxx @@ -245,7 +245,7 @@ class SectionPropertyMap : public PropertyMap bool m_bEvenPageFooterLinkToPrevious; bool m_bFirstPageFooterLinkToPrevious; - void _ApplyProperties(css::uno::Reference<css::beans::XPropertySet> const& xStyle); + void ApplyProperties_(css::uno::Reference<css::beans::XPropertySet> const& xStyle); css::uno::Reference<css::text::XTextColumns> ApplyColumnProperties(css::uno::Reference<css::beans::XPropertySet> const& xFollowPageStyle, DomainMapper_Impl& rDM_Impl); void CopyLastHeaderFooter( bool bFirstPage, DomainMapper_Impl& rDM_Impl ); |