diff --git a/ePublishing/PageConfig.xdl b/ePublishing/PageConfig.xdl index 934b5eb..ea8c7d4 100644 --- a/ePublishing/PageConfig.xdl +++ b/ePublishing/PageConfig.xdl @@ -5,7 +5,6 @@ - @@ -18,11 +17,12 @@ - + - + + - + \ No newline at end of file diff --git a/ePublishing/PageStyles.xba b/ePublishing/PageStyles.xba index a7445ac..37bcf42 100644 --- a/ePublishing/PageStyles.xba +++ b/ePublishing/PageStyles.xba @@ -8,27 +8,47 @@ Dim pageStyles As Object Dim pageStyleNames() As String Dim imageURL As String + Dim pageStyle As Object oStyles = ThisComponent.StyleFamilies pageStyles = oStyles.getByName(oStyles.elementNames(2)) pageStyleNames = pageStyles.getElementNames - + Dim displayPageStyleNames(Ubound(pageStyleNames)) + For i = LBound(displayPageStyleNames) To Ubound(displayPageStyleNames) + pageStyle = pageStyles.getByName(pageStyleNames(i)) + displayPageStyleNames(i) = pageStyle.displayName + Next i + subShellSort(displayPageStyleNames) + dialog = CreateUnoDialog( DialogLibraries.ePublishing.PageConfig ) - ' Globalscope.BasicLibraries.LoadLibrary( "MRILib" ) - a = dialog.getControl("ImageControl1") - + Globalscope.BasicLibraries.LoadLibrary( "MRILib" ) imageURL = convertToURL(getExtensionPath() + "/images/panel.svg") dialog.getControl("ImageControl1").model.imageURL = imageURL + dialog.getControl("description").setText(getTranslation("PageConfigDialogTranslations")) + dialog.getControl("pageHeight").setText("") + dialog.getControl("pageWidth").setText("") + dialog.getControl("leftPageMargin").setText("") + dialog.getControl("topPageMargin").setText("") + dialog.getControl("rightPageMargin").setText("") + dialog.getControl("bottomPageMargin").setText("") + dialog.getControl("headerHeight").setText("") + dialog.getControl("headerOffset").setText("") + dialog.getControl("footerHeight").setText("") + dialog.getControl("footerOffset").setText("") + dialog.getControl("footnoteAreaHeight").setText("") + dialog.getControl("footnoteAreaOffset").setText("") + dialog.getControl("Cancel").Label = getTranslation("PageConfigDialogCancelButton") + dialog.getControl("Ok").Label = getTranslation("PageConfigDialogOkButton") listBox = dialog.getControl("pageStyles") - listBox.addItems(pageStyleNames , 0) - dialog.Title = getTranslation("batchChangePageStyleProperties") + listBox.addItems(displayPageStyleNames, 0) + dialog.Title = getTranslation("PageConfigDialogTitle") dialog.Execute() End Sub Function getExtensionPath As String Dim extensionIdentifier As String Dim pip As Object - extensionIdentifier = "pro.litvinovg.Redaction" + extensionIdentifier = "pro.litvinovg.epublishing" pip = GetDefaultContext.getByName("/singletons/com.sun.star.deployment.PackageInformationProvider") getExtensionPath = pip.getPackageLocation(extensionIdentifier) End Function diff --git a/ePublishing/journals.xba b/ePublishing/journals.xba index b984e9c..68fbab9 100644 --- a/ePublishing/journals.xba +++ b/ePublishing/journals.xba @@ -1,6 +1,6 @@ -Private sub journalsMark15 +Private sub journalsMark16 End sub Dim templateName As String diff --git a/translations.ods b/translations.ods index 5ab7d2f..8a69ce6 100644 Binary files a/translations.ods and b/translations.ods differ