diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-05-04 23:45:24 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-05-05 11:10:18 -0400 |
| commit | 146a73e243bb54085055271f08156e2cf5dbd3f2 (patch) | |
| tree | 4da15a32959a77f0253fe22d484a96e318c8c60b /filter | |
| parent | 8f555e3be27768a7a9a80b5ce4cba95ea1cd2880 (diff) | |
Use UNO's field type values for the SvxFieldData class IDs too.
Change-Id: I Iae5abcd0936f176b0b8976b6ea50cfe3e18593b4
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/svg/svgexport.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 6c38cedc7c69..efab93d655cc 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -34,6 +34,7 @@ #include "impsvgdialog.hxx" #include <com/sun/star/util/MeasureUnit.hpp> +#include <com/sun/star/text/textfield/Type.hpp> #include <rtl/bootstrap.hxx> #include <svtools/miscopt.hxx> @@ -1772,15 +1773,15 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo ) pCharSetMap = &( mTextFieldCharSets[ mCreateOjectsCurrentMasterPage ] ); } const SvxFieldData* pField = pInfo->GetField().GetField(); - if( bHasCharSetMap && ( pField->GetClassId() == SVX_HEADERFIELD ) && ( pCharSetMap->find( aHeaderId ) != pCharSetMap->end() ) ) + if( bHasCharSetMap && ( pField->GetClassId() == text::textfield::Type::HEADER ) && ( pCharSetMap->find( aHeaderId ) != pCharSetMap->end() ) ) { pCharSet = &( (*pCharSetMap)[ aHeaderId ] ); } - else if( bHasCharSetMap && ( pField->GetClassId() == SVX_FOOTERFIELD ) && ( pCharSetMap->find( aFooterId ) != pCharSetMap->end() ) ) + else if( bHasCharSetMap && ( pField->GetClassId() == text::textfield::Type::FOOTER ) && ( pCharSetMap->find( aFooterId ) != pCharSetMap->end() ) ) { pCharSet = &( (*pCharSetMap)[ aFooterId ] ); } - else if( pField->GetClassId() == SVX_DATEFIMEFIELD ) + else if( pField->GetClassId() == text::textfield::Type::DATE_TIME ) { if( bHasCharSetMap && ( pCharSetMap->find( aDateTimeId ) != pCharSetMap->end() ) ) { @@ -1872,7 +1873,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo ) } } } - else if( pField->GetClassId() == SVX_PAGEFIELD ) + else if( pField->GetClassId() == text::textfield::Type::PAGE ) { switch( mVisiblePagePropSet.nPageNumberingType ) { @@ -1912,20 +1913,20 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo ) if( mVisiblePagePropSet.bAreBackgroundObjectsVisible ) { const SvxFieldData* pField = pInfo->GetField().GetField(); - if( ( pField->GetClassId() == SVX_HEADERFIELD ) && mVisiblePagePropSet.bIsHeaderFieldVisible ) + if( ( pField->GetClassId() == text::textfield::Type::HEADER ) && mVisiblePagePropSet.bIsHeaderFieldVisible ) { aRepresentation += mVisiblePagePropSet.sHeaderText; } - else if( ( pField->GetClassId() == SVX_FOOTERFIELD ) && mVisiblePagePropSet.bIsFooterFieldVisible ) + else if( ( pField->GetClassId() == text::textfield::Type::FOOTER ) && mVisiblePagePropSet.bIsFooterFieldVisible ) { aRepresentation += mVisiblePagePropSet.sFooterText; } - else if( ( pField->GetClassId() == SVX_DATEFIMEFIELD ) && mVisiblePagePropSet.bIsDateTimeFieldVisible ) + else if( ( pField->GetClassId() == text::textfield::Type::DATE_TIME ) && mVisiblePagePropSet.bIsDateTimeFieldVisible ) { // TODO: implement the variable case aRepresentation += mVisiblePagePropSet.sDateTimeText; } - else if( ( pField->GetClassId() == SVX_PAGEFIELD ) && mVisiblePagePropSet.bIsPageNumberFieldVisible ) + else if( ( pField->GetClassId() == text::textfield::Type::PAGE ) && mVisiblePagePropSet.bIsPageNumberFieldVisible ) { sal_Int16 nPageNumber = mVisiblePagePropSet.nPageNumber; switch( mVisiblePagePropSet.nPageNumberingType ) |