diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-05-10 20:31:36 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-05-11 01:54:40 -0400 |
| commit | 17b900c657cac6a510ed63e0ff8eb74a33dcc8db (patch) | |
| tree | de4a7b0e271d0773e119a2856a74f3a085883a17 /editeng | |
| parent | 328be2536f5911dabb2ae504dc2f4fc348fc994e (diff) | |
Added UNSPECIFIED to textfield::Type.
Change-Id: I28fbab54ba71f01b989a47ab357583113e85fccb
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/inc/editeng/flditem.hxx | 2 | ||||
| -rw-r--r-- | editeng/source/items/flditem.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/uno/unofield.cxx | 10 |
3 files changed, 6 insertions, 8 deletions
diff --git a/editeng/inc/editeng/flditem.hxx b/editeng/inc/editeng/flditem.hxx index 03a2cacbe074..40ba0e28b126 100644 --- a/editeng/inc/editeng/flditem.hxx +++ b/editeng/inc/editeng/flditem.hxx @@ -57,7 +57,7 @@ public: static SvxFieldData* Create(const com::sun::star::uno::Reference<com::sun::star::text::XTextContent>& xContent); - SV_DECL_PERSIST1( SvxFieldData, SvPersistBase, UNKNOWN_FIELD) + SV_DECL_PERSIST1( SvxFieldData, SvPersistBase, com::sun::star::text::textfield::Type::UNSPECIFIED) SvxFieldData(); virtual ~SvxFieldData(); diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 0290ad4f56dc..36ba686a9960 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -49,8 +49,6 @@ using namespace com::sun::star; #define FRAME_MARKER (sal_uInt32)0x21981357 #define CHARSET_MARKER (FRAME_MARKER+1) -const sal_Int32 SvxFieldData::UNKNOWN_FIELD = -1; - SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTextContent) { uno::Reference<beans::XPropertySet> xPropSet(xTextContent, uno::UNO_QUERY); diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 975ab1506ee5..f08a820f90ca 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -313,7 +313,7 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > xAnchor, co : OComponentHelper( getMutex() ) , mxAnchor( xAnchor ) , mpPropSet(NULL) -, mnServiceId(SvxFieldData::UNKNOWN_FIELD) +, mnServiceId(text::textfield::Type::UNSPECIFIED) , mpImpl( new SvxUnoFieldData_Impl ) { DBG_ASSERT(pData, "pFieldData == NULL! [CL]" ); @@ -323,8 +323,8 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference< text::XTextRange > xAnchor, co if(pData) { mnServiceId = pData->GetClassId(); - DBG_ASSERT(mnServiceId != SvxFieldData::UNKNOWN_FIELD, "unknown SvxFieldData! [CL]"); - if (mnServiceId != SvxFieldData::UNKNOWN_FIELD) + DBG_ASSERT(mnServiceId != text::textfield::Type::UNSPECIFIED, "unknown SvxFieldData! [CL]"); + if (mnServiceId != text::textfield::Type::UNSPECIFIED) { // extract field properties from data class switch( mnServiceId ) @@ -911,7 +911,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rt { OUString aFieldType( ServiceSpecifier.copy( aTextFieldPrexit.getLength() ) ); - sal_Int32 nId = SvxFieldData::UNKNOWN_FIELD; + sal_Int32 nId = text::textfield::Type::UNSPECIFIED; if ( aFieldType == "DateTime" ) { @@ -953,7 +953,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rt nId = text::textfield::Type::MEASURE; } - if (nId != SvxFieldData::UNKNOWN_FIELD) + if (nId != text::textfield::Type::UNSPECIFIED) xRet = (::cppu::OWeakObject * )new SvxUnoTextField( nId ); } |