mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed FILE to DOCINFO_TITLE, which is more appropriate for this field.

Browse Source 
Change-Id: I1267629da8b66fc21c4ae2e78634c2093274aa61
This commit is contained in:
Kohei Yoshida 2012-05-14 10:35:45 -04:00
parent 82b0450450
commit 204555c107
8 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editeng/inc/editeng/flditem.hxx
View File

@ -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;

2
editeng/qa/unit/core-test.cxx
View File

@ -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);

2
editeng/source/items/flditem.cxx
View File

@ -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:
{

8
editeng/source/uno/unofield.cxx
View File

@ -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" )
{

13
offapi/com/sun/star/text/textfield/Type.idl
View File

@ -50,12 +50,13 @@ constants Type
const long PAGE = 2;
const long PAGES = 3;
const long TIME = 4;
const long FILE = 5;
const long TABLE = 6;
const long EXTENDED_TIME = 7;
const long EXTENDED_FILE = 8;
const long AUTHOR = 9;
const long MEASURE = 10;
const long TABLE = 5;
const long EXTENDED_TIME = 6;
const long EXTENDED_FILE = 7;
const long AUTHOR = 8;
const long MEASURE = 9;
const long DOCINFO_TITLE = 10;
const long PRESENTATION_HEADER = 11;
const long PRESENTATION_FOOTER = 12;

4
sc/source/core/tool/editutil.cxx
View File

@ -670,7 +670,7 @@ String ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
case text::textfield::Type::TIME:
aRet = ScGlobal::pLocaleData->getTime(aData.aTime);
break;
case text::textfield::Type::FILE:
case text::textfield::Type::DOCINFO_TITLE:
aRet = aData.aTitle;
break;
case text::textfield::Type::EXTENDED_FILE:
@ -766,7 +766,7 @@ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
aRet = ScGlobal::pLocaleData->getDate(aDate);
}
break;
case text::textfield::Type::FILE:
case text::textfield::Type::DOCINFO_TITLE:
{
SfxObjectShell* pDocShell = mpDoc->GetDocumentShell();
aRet = pDocShell->getDocProperties()->getTitle();

8
sc/source/ui/unoobj/fielduno.cxx
View File

@ -693,7 +693,7 @@ SvxFieldData* ScEditFieldObj::getData()
mpData.reset(new SvxExtTimeField);
}
break;
case text::textfield::Type::FILE:
case text::textfield::Type::DOCINFO_TITLE:
mpData.reset(new SvxFileField);
break;
case text::textfield::Type::URL:
@ -1156,7 +1156,7 @@ ScEditFieldObj::ScEditFieldObj(
{
switch (meType)
{
case text::textfield::Type::FILE:
case text::textfield::Type::DOCINFO_TITLE:
pPropSet = getEmptyPropertySet();
break;
case text::textfield::Type::EXTENDED_FILE:
@ -1349,7 +1349,7 @@ void SAL_CALL ScEditFieldObj::setPropertyValue(
case text::textfield::Type::TABLE:
setPropertyValueSheet(aPropertyName, aValue);
break;
case text::textfield::Type::FILE:
case text::textfield::Type::DOCINFO_TITLE:
default:
throw beans::UnknownPropertyException();
}
@ -1397,7 +1397,7 @@ uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const rtl::OUString& aProper
case text::textfield::Type::TIME:
case text::textfield::Type::EXTENDED_TIME:
return getPropertyValueDateTime(aPropertyName);
case text::textfield::Type::FILE:
case text::textfield::Type::DOCINFO_TITLE:
default:
throw beans::UnknownPropertyException();
}

2
sc/source/ui/unoobj/servuno.cxx
View File

@ -441,7 +441,7 @@ sal_Int32 getFieldType(sal_uInt16 nOldType)
case SC_SERVICE_EXT_TIMEFIELD:
return text::textfield::Type::EXTENDED_TIME;
case SC_SERVICE_TITLEFIELD:
return text::textfield::Type::FILE;
return text::textfield::Type::DOCINFO_TITLE;
case SC_SERVICE_FILEFIELD:
return text::textfield::Type::EXTENDED_FILE;
case SC_SERVICE_SHEETFIELD: