summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorKatarina Behrens <Katarina.Behrens@cib.de>2015-05-15 13:38:07 +0200
committerKatarina Behrens <Katarina.Behrens@cib.de>2015-05-18 16:51:59 +0200
commitb5e16d8dab070cfef908e7b5ca0417da534b82bf (patch)
treea7e46b3f133f44b356eb7e585472c8cb5220e38a /editeng
parent7cb8d59769d7f37157929a4176a8f16f6d4610e8 (diff)
Related tdf#88056: use better-fitting <text:page-name>
Implemented Regina's suggestions: * this is a text field, therefore it belongs to text namespace * page-name (evtl. slide-name) describes much better what this field really contains This (among other changes) reverts commit 6609de8856519e0e9 Change-Id: Idab3b7c291839a9137f80d325a7d3f5ef0ff2636
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/items/flditem.cxx4
-rw-r--r--editeng/source/uno/unofield.cxx12
2 files changed, 8 insertions, 8 deletions
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 72c74520bdd7..5df2649ca3da 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -117,6 +117,8 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
return new SvxPageField();
case text::textfield::Type::PAGES:
return new SvxPagesField();
+ case text::textfield::Type::PAGE_NAME:
+ return new SvxPageTitleField();
case text::textfield::Type::DOCINFO_TITLE:
return new SvxFileField();
case text::textfield::Type::TABLE:
@@ -208,8 +210,6 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
return new SvxFooterField();
case text::textfield::Type::PRESENTATION_DATE_TIME:
return new SvxDateTimeField();
- case text::textfield::Type::PRESENTATION_PAGE_TITLE:
- return new SvxPageTitleField();
default:
;
};
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index a52fb11d9cc3..d5df68a302d2 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -508,7 +508,7 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw()
case text::textfield::Type::PRESENTATION_DATE_TIME:
pData = new SvxDateTimeField();
break;
- case text::textfield::Type::PRESENTATION_PAGE_TITLE:
+ case text::textfield::Type::PAGE_NAME:
pData = new SvxPageTitleField();
break;
};
@@ -613,8 +613,8 @@ OUString SAL_CALL SvxUnoTextField::getPresentation( sal_Bool bShowCommand )
return OUString("Footer");
case text::textfield::Type::PRESENTATION_DATE_TIME:
return OUString("DateTime");
- case text::textfield::Type::PRESENTATION_PAGE_TITLE:
- return OUString("PageTitle");
+ case text::textfield::Type::PAGE_NAME:
+ return OUString("PageName");
default:
return OUString("Unknown");
}
@@ -862,9 +862,9 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames()
pServices[2] = "com.sun.star.presentation.TextField.DateTime";
pServices[3] = "com.sun.star.presentation.textfield.DateTime";
break;
- case text::textfield::Type::PRESENTATION_PAGE_TITLE:
- pServices[2] = "com.sun.star.presentation.TextField.PageTitle";
- pServices[3] = "com.sun.star.presentation.textfield.PageTitle";
+ case text::textfield::Type::PAGE_NAME:
+ pServices[2] = "com.sun.star.text.TextField.PageName";
+ pServices[3] = "com.sun.star.text.textfield.PageName";
break;
default:
aSeq.realloc(0);