[Libreoffice-commits] core.git: 2 commits - editeng/source include/editeng offapi/com sd/source
Katarina Behrens
Katarina.Behrens at cib.de
Tue Apr 21 02:00:14 PDT 2015
editeng/source/items/flditem.cxx | 4 ++--
editeng/source/uno/unofield.cxx | 10 +++++-----
include/editeng/flditem.hxx | 2 +-
offapi/com/sun/star/text/textfield/Type.idl | 8 ++++----
sd/source/ui/app/sdmod2.cxx | 2 ++
sd/source/ui/app/strings.src | 5 +++++
sd/source/ui/inc/strings.hrc | 1 +
7 files changed, 20 insertions(+), 12 deletions(-)
New commits:
commit 502a700877f6ed10d81f541de35e53f9f1508b3c
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Tue Apr 21 10:49:49 2015 +0200
Related tdf#88056: Placeholder needed for ODF export/import
Change-Id: I8f232f5bf90401ec3ab4362eb8cc80e0c8d58717
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index a5faccb..5d36c8f 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -268,6 +268,8 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
{
aRepresentation = pPage->GetName();
}
+ else
+ aRepresentation = SdResId(STR_FIELD_PLACEHOLDER_PAGETITLE).toString();
pInfo->SetRepresentation( aRepresentation );
}
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 4743c45..2f31991 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -1076,6 +1076,11 @@ String STR_FIELD_PLACEHOLDER_COUNT
Text [ en-US ] = "<count>" ;
};
+String STR_FIELD_PLACEHOLDER_PAGETITLE
+{
+ Text [ en-US ] = "<title>" ;
+};
+
String STR_PLACEHOLDER_DESCRIPTION_NOTES
{
Text [ en-US ] = "Notes Area";
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index bbc6a45..f713b83 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -372,6 +372,7 @@
#define STR_UNDO_HANGULHANJACONVERSION (RID_APP_START+696)
#define STR_FIELD_PLACEHOLDER_COUNT (RID_APP_START+697)
+#define STR_FIELD_PLACEHOLDER_PAGETITLE (RID_APP_START+698)
#define STR_LEFT_PANE_DRAW_TITLE (RID_APP_START+700)
#define STR_LEFT_PANE_IMPRESS_TITLE (RID_APP_START+701)
commit 6609de8856519e0e9ec8456ca0969004a8214346
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Tue Apr 21 10:41:31 2015 +0200
Related tdf#88056: this guy's better off in presentation namespace
no use for it outside Impress really ...
Change-Id: I419ce252ec1b32a7ef225fefc02ec5dd87ba402a
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 8a643fa..72c7452 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -117,8 +117,6 @@ 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_TITLE:
- return new SvxPageTitleField();
case text::textfield::Type::DOCINFO_TITLE:
return new SvxFileField();
case text::textfield::Type::TABLE:
@@ -210,6 +208,8 @@ 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 21b0ef5..a52fb11 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::PAGE_TITLE:
+ case text::textfield::Type::PRESENTATION_PAGE_TITLE:
pData = new SvxPageTitleField();
break;
};
@@ -613,7 +613,7 @@ 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::PAGE_TITLE:
+ case text::textfield::Type::PRESENTATION_PAGE_TITLE:
return OUString("PageTitle");
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::PAGE_TITLE:
- pServices[2] = "com.sun.star.text.TextField.PageTitle";
- pServices[3] = "com.sun.star.text.textfield.PageTitle";
+ case text::textfield::Type::PRESENTATION_PAGE_TITLE:
+ pServices[2] = "com.sun.star.presentation.TextField.PageTitle";
+ pServices[3] = "com.sun.star.presentation.textfield.PageTitle";
break;
default:
aSeq.realloc(0);
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index 13f7773..5ad726b 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -194,7 +194,7 @@ public:
class EDITENG_DLLPUBLIC SvxPageTitleField : public SvxFieldData
{
public:
- SV_DECL_PERSIST1( SvxPageTitleField, SvxFieldData, com::sun::star::text::textfield::Type::PAGE_TITLE )
+ SV_DECL_PERSIST1( SvxPageTitleField, SvxFieldData, com::sun::star::text::textfield::Type::PRESENTATION_PAGE_TITLE )
SvxPageTitleField();
virtual SvxFieldData* Clone() const SAL_OVERRIDE;
diff --git a/offapi/com/sun/star/text/textfield/Type.idl b/offapi/com/sun/star/text/textfield/Type.idl
index 42fcb8b..48d4215 100644
--- a/offapi/com/sun/star/text/textfield/Type.idl
+++ b/offapi/com/sun/star/text/textfield/Type.idl
@@ -39,10 +39,10 @@ constants Type
const long DOCINFO_TITLE = 10;
- const long PRESENTATION_HEADER = 11;
- const long PRESENTATION_FOOTER = 12;
- const long PRESENTATION_DATE_TIME = 13;
- const long PAGE_TITLE = 14;
+ const long PRESENTATION_HEADER = 11;
+ const long PRESENTATION_FOOTER = 12;
+ const long PRESENTATION_DATE_TIME = 13;
+ const long PRESENTATION_PAGE_TITLE = 14;
};
}; }; }; }; };
More information about the Libreoffice-commits
mailing list