diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-05-14 10:35:45 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-05-14 12:09:57 -0400 |
commit | 204555c107ae455b5bf2c84e450b2da37e5b06db (patch) | |
tree | c347a8d7afcc80475e5ea48e03c4a77244faf815 /editeng | |
parent | n#760294 svtools: allow border gap < 1pt (diff) | |
download | core-204555c107ae455b5bf2c84e450b2da37e5b06db.tar.gz core-204555c107ae455b5bf2c84e450b2da37e5b06db.zip |
Renamed FILE to DOCINFO_TITLE, which is more appropriate for this field.
Change-Id: I1267629da8b66fc21c4ae2e78634c2093274aa61
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/inc/editeng/flditem.hxx | 2 | ||||
-rw-r--r-- | editeng/qa/unit/core-test.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/flditem.cxx | 2 | ||||
-rw-r--r-- | editeng/source/uno/unofield.cxx | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/editeng/inc/editeng/flditem.hxx b/editeng/inc/editeng/flditem.hxx index b124762a6c0b..4414b6a585c3 100644 --- a/editeng/inc/editeng/flditem.hxx +++ b/editeng/inc/editeng/flditem.hxx @@ -223,7 +223,7 @@ public: class EDITENG_DLLPUBLIC SvxFileField : public SvxFieldData { public: - SV_DECL_PERSIST1( SvxFileField, SvxFieldData, com::sun::star::text::textfield::Type::FILE ) + SV_DECL_PERSIST1( SvxFileField, SvxFieldData, com::sun::star::text::textfield::Type::DOCINFO_TITLE ) SvxFileField(); virtual SvxFieldData* Clone() const; diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index 5c459328367d..d02cb9303505 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -153,7 +153,7 @@ void Test::testUnoTextFields() { // FILE - SvxUnoTextField aField(text::textfield::Type::FILE); + SvxUnoTextField aField(text::textfield::Type::DOCINFO_TITLE); uno::Sequence<rtl::OUString> aSvcs = aField.getSupportedServiceNames(); bool bGood = includes(aSvcs, "com.sun.star.text.textfield.docinfo.Title"); CPPUNIT_ASSERT_MESSAGE("expected service is not present.", bGood); diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index bcc578de3ae0..5b039dd26f9b 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -122,7 +122,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe return new SvxPageField(); case text::textfield::Type::PAGES: return new SvxPagesField(); - case text::textfield::Type::FILE: + case text::textfield::Type::DOCINFO_TITLE: return new SvxFileField(); case text::textfield::Type::TABLE: { diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index a156c89dc85a..3217e89e42b1 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -442,7 +442,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() pData = new SvxPagesField(); break; - case text::textfield::Type::FILE: + case text::textfield::Type::DOCINFO_TITLE: pData = new SvxFileField(); break; @@ -608,7 +608,7 @@ OUString SAL_CALL SvxUnoTextField::getPresentation( sal_Bool bShowCommand ) return OUString("Pages"); case text::textfield::Type::TIME: return OUString("Time"); - case text::textfield::Type::FILE: + case text::textfield::Type::DOCINFO_TITLE: return OUString("File"); case text::textfield::Type::TABLE: return OUString("Table"); @@ -837,7 +837,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames() pServices[2] = "com.sun.star.text.TextField.DateTime"; pServices[3] = "com.sun.star.text.textfield.DateTime"; break; - case text::textfield::Type::FILE: + case text::textfield::Type::DOCINFO_TITLE: pServices[2] = "com.sun.star.text.TextField.docinfo.Title"; pServices[3] = "com.sun.star.text.textfield.docinfo.Title"; break; @@ -931,7 +931,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const ::rt aFieldType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DocInfo.Title") ) ) { - nId = text::textfield::Type::FILE; + nId = text::textfield::Type::DOCINFO_TITLE; } else if ( aFieldType == "Author" ) { |