Better names for presentation specific field item types.

Change-Id: Ib9bea60e05f1dcdd9501a3320f3b1185d5890d17

3 files changed, 15 insertions, 16 deletions

diff --git a/editeng/inc/editeng/flditem.hxx b/editeng/inc/editeng/flditem.hxx
index 40ba0e28b126..b124762a6c0b 100644
--- a/editeng/inc/editeng/flditem.hxx
+++ b/editeng/inc/editeng/flditem.hxx
@@ -387,7 +387,7 @@ public:
 class EDITENG_DLLPUBLIC SvxHeaderField : public SvxFieldData
 {
 public:
-    SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData, com::sun::star::text::textfield::Type::HEADER )
+    SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData, com::sun::star::text::textfield::Type::PRESENTATION_HEADER )
     SvxHeaderField();
 
     virtual SvxFieldData*   Clone() const;
@@ -399,7 +399,7 @@ public:
 class EDITENG_DLLPUBLIC SvxFooterField : public SvxFieldData
 {
 public:
-    SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, com::sun::star::text::textfield::Type::FOOTER )
+    SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, com::sun::star::text::textfield::Type::PRESENTATION_FOOTER )
     SvxFooterField();
     virtual SvxFieldData*   Clone() const;
     virtual int             operator==( const SvxFieldData& ) const;
@@ -410,7 +410,7 @@ public:
 class EDITENG_DLLPUBLIC SvxDateTimeField : public SvxFieldData
 {
 public:
-    SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData, com::sun::star::text::textfield::Type::DATE_TIME )
+    SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData, com::sun::star::text::textfield::Type::PRESENTATION_DATE_TIME )
     SvxDateTimeField();
 
     static rtl::OUString    GetFormatted( Date& rDate, Time& rTime, int eFormat, SvNumberFormatter& rFormatter, LanguageType eLanguage );
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 36ba686a9960..d5aec5b8d541 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -208,11 +208,11 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
 
             return new SdrMeasureField(eKind);
         }
-        case text::textfield::Type::HEADER:
+        case text::textfield::Type::PRESENTATION_HEADER:
             return new SvxHeaderField();
-        case text::textfield::Type::FOOTER:
+        case text::textfield::Type::PRESENTATION_FOOTER:
             return new SvxFooterField();
-        case text::textfield::Type::DATE_TIME:
+        case text::textfield::Type::PRESENTATION_DATE_TIME:
             return new SvxDateTimeField();
         default:
             ;
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index dd3f56abbfae..83cad2d25de4 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -160,7 +160,6 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet( sal_Int32 mnId )
         return &aAuthorFieldPropertySet_Impl;
     case text::textfield::Type::MEASURE:
         return &aMeasureFieldPropertySet_Impl;
-    case text::textfield::Type::DATE_TIME:
     default:
         return &aEmptyPropertySet_Impl;
     }
@@ -515,13 +514,13 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw()
         pData = new SdrMeasureField( eKind);
         break;
     }
-    case text::textfield::Type::HEADER:
+    case text::textfield::Type::PRESENTATION_HEADER:
         pData = new SvxHeaderField();
         break;
-    case text::textfield::Type::FOOTER:
+    case text::textfield::Type::PRESENTATION_FOOTER:
         pData = new SvxFooterField();
         break;
-    case text::textfield::Type::DATE_TIME:
+    case text::textfield::Type::PRESENTATION_DATE_TIME:
         pData = new SvxDateTimeField();
         break;
     };
@@ -625,11 +624,11 @@ OUString SAL_CALL SvxUnoTextField::getPresentation( sal_Bool bShowCommand )
                 return OUString("Author");
             case text::textfield::Type::MEASURE:
                 return OUString("Measure");
-            case text::textfield::Type::HEADER:
+            case text::textfield::Type::PRESENTATION_HEADER:
                 return OUString("Header");
-            case text::textfield::Type::FOOTER:
+            case text::textfield::Type::PRESENTATION_FOOTER:
                 return OUString("Footer");
-            case text::textfield::Type::DATE_TIME:
+            case text::textfield::Type::PRESENTATION_DATE_TIME:
                 return OUString("DateTime");
             case text::textfield::Type::EXTENDED_DATE:
                 return OUString("ExtDate");
@@ -868,15 +867,15 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames()
             pServices[2] = "com.sun.star.text.TextField.Measure";
             pServices[3] = "com.sun.star.text.textfield.Measure";
         break;
-        case text::textfield::Type::HEADER:
+        case text::textfield::Type::PRESENTATION_HEADER:
             pServices[2] = "com.sun.star.presentation.TextField.Header";
             pServices[3] = "com.sun.star.presentation.textfield.Header";
         break;
-        case text::textfield::Type::FOOTER:
+        case text::textfield::Type::PRESENTATION_FOOTER:
             pServices[2] = "com.sun.star.presentation.TextField.Footer";
             pServices[3] = "com.sun.star.presentation.textfield.Footer";
         break;
-        case text::textfield::Type::DATE_TIME:
+        case text::textfield::Type::PRESENTATION_DATE_TIME:
             pServices[2] = "com.sun.star.presentation.TextField.DateTime";
             pServices[3] = "com.sun.star.presentation.textfield.DateTime";
         break;