diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-12 14:03:59 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-12 14:03:59 +0000 |
| commit | 20cea29aa241c198cfbd6cdda9f4cf198e6933bd (patch) | |
| tree | 16b877dc84dbf8eff62614606d8f145d8cc2e9d7 | |
| parent | bbef3ea39fc3fe0bed5bc6307e396fd434e02296 (diff) | |
CWS-TOOLING: integrate CWS fwk99
2009-01-20 17:39:31 +0100 pb r266605 : fix: #i98280# new 'More templates'-URL
2009-01-15 20:17:58 +0100 mst r266391 : #i95702# convert wizards to DocumentProperties (partially based on patch by cmc)
2009-01-12 07:35:44 +0100 pb r266131 : fix: #i96851# HID_PASTE_DLG and HID_LINKDLG_TABLB added
2009-01-09 10:40:48 +0100 pb r266061 : fix: #i97386# Execute_Impl() while sub-dialog is open this could be deleted; #i68415# patch from cmc
2009-01-09 10:35:24 +0100 pb r266059 : fix: #i97386# struct Deleted added
2009-01-09 10:05:17 +0100 pb r266057 : fix: #i97365# ModalDialog RID_SVXPAGE_IMPROVEMENT removed
2009-01-09 10:02:39 +0100 pb r266056 : fix: #i97841# new: set InfoURL and HandleHyperLink()
2009-01-09 09:59:13 +0100 pb r266053 : fix: #i97391# MinWidth re-calculated; #i97365# SvxImprovementDialog2 removed
2009-01-09 09:55:00 +0100 pb r266051 : fix: #i97841# new: HandleHyperLink(); #i97365# SvxImprovementDialog2 removed
2009-01-06 14:24:24 +0100 cd r265921 : #i96831# Fix build problem with gcc 4.3.2 using the return value of link correctly.
2009-01-06 12:18:41 +0100 cd r265907 : #i96831# Fix build problem with gcc 4.3.2
2009-01-06 12:02:59 +0100 mst r265905 : fix #i97775#
- xmloff/source/core/nmspmap.cxx:
+ SvXMLNamespaceMap::GetQNameByKey does not handle default namespace
correctly
17 files changed, 123 insertions, 138 deletions
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java index 91b78f52855a..c37f99fe0cac 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java @@ -41,6 +41,7 @@ import com.sun.star.beans.PropertyValue; import com.sun.star.container.NoSuchElementException; import com.sun.star.container.XIndexAccess; import com.sun.star.container.XNamed; +import com.sun.star.document.XDocumentProperties; import com.sun.star.frame.XComponentLoader; import com.sun.star.frame.XTerminateListener; import com.sun.star.i18n.NumberFormatIndex; @@ -189,7 +190,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data /** * used to set the document title property (step 6). */ - private Object docInfo; + private XDocumentProperties m_xDocProps; /** * loads the given template, and analyze its structure. @@ -282,7 +283,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data */ synchronized void setTemplateTitle(String newTitle) { - Helper.setUnoPropertyValue(docInfo, "Title", newTitle); + m_xDocProps.setTitle(newTitle); } /** @@ -476,9 +477,9 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data } /* - * get the document info object. + * get the document properties object. */ - docInfo = OfficeDocument.getDocumentInfo(document); + m_xDocProps = OfficeDocument.getDocumentProperties(document); initItemsCache(); initializeItems(); diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java index bf664c7f8ba6..a18365f5fe0b 100644 --- a/wizards/com/sun/star/wizards/common/Desktop.java +++ b/wizards/com/sun/star/wizards/common/Desktop.java @@ -29,9 +29,6 @@ ************************************************************************/ package com.sun.star.wizards.common; -import java.util.Date; - -import com.sun.star.awt.XToolkit; import com.sun.star.beans.PropertyValue; import com.sun.star.frame.XDesktop; import com.sun.star.frame.XFrame; diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java index ffa23b51baae..229778b61ada 100644 --- a/wizards/com/sun/star/wizards/common/FileAccess.java +++ b/wizards/com/sun/star/wizards/common/FileAccess.java @@ -48,6 +48,8 @@ import com.sun.star.ucb.*; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import com.sun.star.util.DateTime; +import com.sun.star.beans.PropertyValue; +import com.sun.star.document.XDocumentProperties; /** * This class delivers static convenience methods @@ -76,9 +78,7 @@ public class FileAccess // As there are several conventions about the look of Url (e.g. with " " or with "%20") you cannot make a // simple String comparison to find out, if a path is already in "ResultPath" String[] PathList = JavaTools.ArrayoutofString(ResultPath, ";"); - boolean badd = false; int MaxIndex = PathList.length - 1; - int iPos; String CompCurPath; // sAddPath.replace(null, (char) 47); String CompAddPath = JavaTools.replaceSubString(sAddPath, "", "/"); @@ -607,8 +607,8 @@ public class FileAccess java.util.Vector TitleVector = null; java.util.Vector NameVector = null; - XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.StandaloneDocumentInfo"); - com.sun.star.document.XStandaloneDocumentInfo xDocInfo = (com.sun.star.document.XStandaloneDocumentInfo) UnoRuntime.queryInterface(com.sun.star.document.XStandaloneDocumentInfo.class, xDocInterface); + XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.DocumentProperties"); + XDocumentProperties xDocProps = (XDocumentProperties) UnoRuntime.queryInterface(XDocumentProperties.class, xDocInterface); XInterface xInterface = (XInterface) xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"); com.sun.star.ucb.XSimpleFileAccess xSimpleFileAccess = (com.sun.star.ucb.XSimpleFileAccess) UnoRuntime.queryInterface(com.sun.star.ucb.XSimpleFileAccess.class, xInterface); @@ -621,17 +621,16 @@ public class FileAccess FilterName = FilterName == null || FilterName.equals("") ? null : FilterName + "-"; String fileName = ""; + PropertyValue[] noArgs = { }; for (int i = 0; i < nameList.length; i++) { fileName = getFilename(nameList[i]); if (FilterName == null || fileName.startsWith(FilterName)) { - - xDocInfo.loadFromURL(nameList[i]); + xDocProps.loadFromMedium(nameList[i], noArgs); NameVector.addElement(nameList[i]); - TitleVector.addElement(com.sun.star.uno.AnyConverter.toString(Helper.getUnoPropertyValue(xDocInterface, "Title"))); - + TitleVector.addElement(xDocProps.getTitle()); } } String[] LocNameList = new String[NameVector.size()]; @@ -715,11 +714,11 @@ public class FileAccess String sTitle = ""; try { - XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.StandaloneDocumentInfo"); - com.sun.star.document.XStandaloneDocumentInfo xDocInfo = (com.sun.star.document.XStandaloneDocumentInfo) UnoRuntime.queryInterface(com.sun.star.document.XStandaloneDocumentInfo.class, xDocInterface); - - xDocInfo.loadFromURL(_sFile); - sTitle = com.sun.star.uno.AnyConverter.toString(Helper.getUnoPropertyValue(xDocInterface, "Title")); + XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.DocumentProperties"); + XDocumentProperties xDocProps = (XDocumentProperties) UnoRuntime.queryInterface(XDocumentProperties.class, xDocInterface); + PropertyValue[] noArgs = { }; + xDocProps.loadFromMedium(_sFile, noArgs); + sTitle = xDocProps.getTitle(); } catch (Exception e) { diff --git a/wizards/com/sun/star/wizards/common/Helper.java b/wizards/com/sun/star/wizards/common/Helper.java index 2498d1a962aa..ddde8f07f277 100644 --- a/wizards/com/sun/star/wizards/common/Helper.java +++ b/wizards/com/sun/star/wizards/common/Helper.java @@ -36,10 +36,8 @@ import java.util.Calendar; import com.sun.star.beans.Property; import com.sun.star.beans.PropertyValue; import com.sun.star.beans.XPropertySet; -import com.sun.star.i18n.NumberFormatIndex; import com.sun.star.lang.Locale; import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.uno.Any; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.RuntimeException; import com.sun.star.uno.UnoRuntime; diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java index df8141cbe4b1..8dc513de0e9d 100644 --- a/wizards/com/sun/star/wizards/document/OfficeDocument.java +++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java @@ -33,7 +33,8 @@ import com.sun.star.lang.IllegalArgumentException; import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.container.XNameAccess; -import com.sun.star.document.XDocumentInfoSupplier; +import com.sun.star.document.XDocumentProperties; +import com.sun.star.document.XDocumentPropertiesSupplier; import com.sun.star.document.XEventsSupplier; import com.sun.star.document.XTypeDetection; import com.sun.star.drawing.XDrawPagesSupplier; @@ -425,10 +426,10 @@ public class OfficeDocument return xDrawPagesSupplier.getDrawPages().getCount(); } - public static Object getDocumentInfo(Object document) + public static XDocumentProperties getDocumentProperties(Object document) { - XDocumentInfoSupplier xDocumentInfoSupplier = (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class, document); - return xDocumentInfoSupplier.getDocumentInfo(); + XDocumentPropertiesSupplier xDocumentPropertiesSupplier = (XDocumentPropertiesSupplier) UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, document); + return xDocumentPropertiesSupplier.getDocumentProperties(); } public static int showMessageBox(XMultiServiceFactory xMSF, String windowServiceName, int windowAttribute, String MessageText) diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java index ad1fdbddf330..311a97f362ed 100644 --- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java @@ -41,8 +41,8 @@ import com.sun.star.awt.XTextComponent; import com.sun.star.awt.XWindow; import com.sun.star.awt.XWindowPeer; import com.sun.star.beans.PropertyValue; -import com.sun.star.document.XDocumentInfo; -import com.sun.star.document.XDocumentInfoSupplier; +import com.sun.star.document.XDocumentProperties; +import com.sun.star.document.XDocumentPropertiesSupplier; import com.sun.star.graphic.XGraphicProvider; import com.sun.star.graphic.XGraphic; import com.sun.star.uno.AnyConverter; @@ -594,10 +594,10 @@ public class FaxWizardDialogImpl extends FaxWizardDialog public void txtTemplateNameTextChanged() { - XDocumentInfoSupplier xDocInfoSuppl = (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDocument); - XDocumentInfo xDocInfo = xDocInfoSuppl.getDocumentInfo(); + XDocumentPropertiesSupplier xDocPropsSuppl = (XDocumentPropertiesSupplier) UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument); + XDocumentProperties xDocProps = xDocPropsSuppl.getDocumentProperties(); String TitleName = txtTemplateName.getText(); - Helper.setUnoPropertyValue(xDocInfo, "Title", TitleName); + xDocProps.setTitle(TitleName); } public void optSenderPlaceholderItemChanged() diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java index aac291740eda..4a58311751ef 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java @@ -46,8 +46,8 @@ import com.sun.star.awt.XWindowPeer; import com.sun.star.beans.PropertyValue; import com.sun.star.container.NoSuchElementException; import com.sun.star.document.MacroExecMode; -import com.sun.star.document.XDocumentInfo; -import com.sun.star.document.XDocumentInfoSupplier; +import com.sun.star.document.XDocumentProperties; +import com.sun.star.document.XDocumentPropertiesSupplier; import com.sun.star.ucb.CommandAbortedException; import com.sun.star.uno.AnyConverter; import com.sun.star.uno.Exception; @@ -910,10 +910,10 @@ public class LetterWizardDialogImpl extends LetterWizardDialog public void txtTemplateNameTextChanged() { - XDocumentInfoSupplier xDocInfoSuppl = (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDocument); - XDocumentInfo xDocInfo = xDocInfoSuppl.getDocumentInfo(); + XDocumentPropertiesSupplier xDocPropsSuppl = (XDocumentPropertiesSupplier) UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument); + XDocumentProperties xDocProps = xDocPropsSuppl.getDocumentProperties(); String TitleName = txtTemplateName.getText(); - Helper.setUnoPropertyValue(xDocInfo, "Title", TitleName); + xDocProps.setTitle(TitleName); } public void chkUseSalutationItemChanged() diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java index 6feda9d5f63f..ad85ccc5bd77 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java +++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java @@ -223,7 +223,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen public void updateReportTitle(String _sTitleName) { - Helper.setUnoPropertyValue(xDocInfo, "Title", _sTitleName); + m_xDocProps.setTitle(_sTitleName); } public void getReportPageStyles() diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java index 229e30751bac..bdf193e8963b 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.java +++ b/wizards/com/sun/star/wizards/text/TextDocument.java @@ -34,8 +34,8 @@ import java.util.GregorianCalendar; import com.sun.star.container.NoSuchElementException; import com.sun.star.container.XNameAccess; -import com.sun.star.document.XDocumentInfo; -import com.sun.star.document.XDocumentInfoSupplier; +import com.sun.star.document.XDocumentProperties; +import com.sun.star.document.XDocumentPropertiesSupplier; import com.sun.star.frame.XController; import com.sun.star.frame.XComponentLoader; import com.sun.star.frame.XDesktop; @@ -87,7 +87,7 @@ public class TextDocument public XComponent xComponent; public com.sun.star.text.XTextDocument xTextDocument; public com.sun.star.util.XNumberFormats NumberFormats; - public com.sun.star.document.XDocumentInfo xDocInfo; + public com.sun.star.document.XDocumentProperties m_xDocProps; public com.sun.star.task.XStatusIndicator xProgressBar; public com.sun.star.frame.XFrame xFrame; public XText xText; @@ -222,8 +222,8 @@ public class TextDocument xMSFDoc = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); xNumberFormatsSupplier = (XNumberFormatsSupplier) UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); - XDocumentInfoSupplier xDocInfoSuppl = (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDocument); - xDocInfo = xDocInfoSuppl.getDocumentInfo(); + XDocumentPropertiesSupplier xDocPropsSuppl = (XDocumentPropertiesSupplier) UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument); + m_xDocProps = xDocPropsSuppl.getDocumentProperties(); CharLocale = (Locale) Helper.getUnoStructValue((Object) xComponent, "CharLocale"); xText = xTextDocument.getText(); } @@ -233,8 +233,8 @@ public class TextDocument xWindowPeer = (XWindowPeer) UnoRuntime.queryInterface(XWindowPeer.class, xFrame.getComponentWindow()); xMSFDoc = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); xNumberFormatsSupplier = (XNumberFormatsSupplier) UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); - XDocumentInfoSupplier xDocInfoSuppl = (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDocument); - xDocInfo = xDocInfoSuppl.getDocumentInfo(); + XDocumentPropertiesSupplier xDocPropsSuppl = (XDocumentPropertiesSupplier) UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument); + m_xDocProps = xDocPropsSuppl.getDocumentProperties(); CharLocale = (Locale) Helper.getUnoStructValue((Object) xComponent, "CharLocale"); xStorable = (XStorable) UnoRuntime.queryInterface(XStorable.class, xTextDocument); xText = xTextDocument.getText(); @@ -333,8 +333,8 @@ public class TextDocument xMSFDoc = (XMultiServiceFactory) UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); xNumberFormatsSupplier = (XNumberFormatsSupplier) UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); - XDocumentInfoSupplier xDocInfoSuppl = (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDocument); - xDocInfo = xDocInfoSuppl.getDocumentInfo(); + XDocumentPropertiesSupplier xDocPropsSuppl = (XDocumentPropertiesSupplier) UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument); + m_xDocProps = xDocPropsSuppl.getDocumentProperties(); CharLocale = (Locale) Helper.getUnoStructValue((Object) xComponent, "CharLocale"); } @@ -418,15 +418,15 @@ public class TextDocument int ff = du.getFormat(NumberFormatIndex.DATE_SYS_DDMMYY); String myDate = du.format(ff, currentDate); - XDocumentInfoSupplier xDocInfoSuppl = (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class, xTextDocument); - XDocumentInfo xDocInfo2 = xDocInfoSuppl.getDocumentInfo(); - Helper.setUnoPropertyValue(xDocInfo2, "Author", fullname); - Helper.setUnoPropertyValue(xDocInfo2, "ModifiedBy", fullname); - String description = (String) Helper.getUnoPropertyValue(xDocInfo2, "Description"); + XDocumentPropertiesSupplier xDocPropsSuppl = (XDocumentPropertiesSupplier) UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument); + XDocumentProperties xDocProps2 = xDocPropsSuppl.getDocumentProperties(); + xDocProps2.setAuthor(fullname); + xDocProps2.setModifiedBy(fullname); + String description = xDocProps2.getDescription(); description = description + " " + TemplateDescription; description = JavaTools.replaceSubString(description, WizardName, "<wizard_name>"); description = JavaTools.replaceSubString(description, myDate, "<current_date>"); - Helper.setUnoPropertyValue(xDocInfo2, "Description", description); + xDocProps2.setDescription(description); } catch (NoSuchElementException e) { diff --git a/wizards/com/sun/star/wizards/web/data/CGDocument.java b/wizards/com/sun/star/wizards/web/data/CGDocument.java index 8268bac5250d..81beb4a05bfc 100644 --- a/wizards/com/sun/star/wizards/web/data/CGDocument.java +++ b/wizards/com/sun/star/wizards/web/data/CGDocument.java @@ -38,8 +38,8 @@ import com.sun.star.beans.Property; import com.sun.star.beans.PropertyValue; import com.sun.star.document.MacroExecMode; import com.sun.star.document.UpdateDocMode; -import com.sun.star.document.XDocumentInfoSupplier; -import com.sun.star.document.XStandaloneDocumentInfo; +import com.sun.star.document.XDocumentProperties; +import com.sun.star.document.XDocumentPropertiesSupplier; import com.sun.star.frame.XComponentLoader; import com.sun.star.frame.XDesktop; import com.sun.star.lang.XComponent; @@ -170,38 +170,31 @@ public class CGDocument extends ConfigSetItem implements XMLProvider * We try to open the document to get some properties */ - //first get the info object which is a DocumentInfo service. - Object info = null; - if (isSODocument) - {//for SO documents, use StandaloneDocumentInfo service. - info = xmsf.createInstance("com.sun.star.document.StandaloneDocumentInfo"); - ((XStandaloneDocumentInfo) UnoRuntime.queryInterface(XStandaloneDocumentInfo.class, info)).loadFromURL(cp_URL); - } + XDocumentProperties xProps = null; task.advance(true); //3 - if (!isSODocument && isSOOpenable) - { //for other documents which are openable through SO, use DocumentInfo service. + if (isSOOpenable) + { // for documents which are openable through SO, use DocumentProperties service. XDesktop desktop = Desktop.getDesktop(xmsf); PropertyValue[] props = new PropertyValue[3]; props[0] = Properties.createProperty("Hidden", Boolean.TRUE); props[1] = Properties.createProperty("MacroExecutionMode", new Short(MacroExecMode.NEVER_EXECUTE)); props[2] = Properties.createProperty("UpdateDocMode", new Short(UpdateDocMode.NO_UPDATE)); XComponent component = ((XComponentLoader) UnoRuntime.queryInterface(XComponentLoader.class, desktop)).loadComponentFromURL(cp_URL, "_default", 0, props); - info = ((XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class, component)).getDocumentInfo(); + xProps = ((XDocumentPropertiesSupplier) UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, component)).getDocumentProperties(); } task.advance(true); //4 //now use the object to read some document properties. - if (isSODocument || isSOOpenable) + if (xProps != null) { - title = (String) Helper.getUnoPropertyValue(info, "Title"); - description = (String) Helper.getUnoPropertyValue(info, "Description"); - author = (String) Helper.getUnoPropertyValue(info, "Author"); - createDate = (DateTime) Helper.getUnoPropertyValue(info, "CreationDate", DateTime.class); - updateDate = (DateTime) Helper.getUnoPropertyValue(info, "ModifyDate", DateTime.class); - //TODO get pages here. + title = xProps.getTitle(); + description = xProps.getDescription(); + author = xProps.getAuthor(); + createDate = xProps.getCreationDate(); + updateDate = xProps.getModificationDate(); } else { //get some information from OS. @@ -238,7 +231,7 @@ public class CGDocument extends ConfigSetItem implements XMLProvider /** * Analyzes a type-detection string, returned from the TypeDetection service, - * and sets the appType, isSOOpenable and isSODocument memebres. + * and sets the appType, isSOOpenable and isSODocument members. */ private void analyzeFileType(PropertyValue[] mediaDesc) { diff --git a/wizards/source/euro/AutoPilotRun.xba b/wizards/source/euro/AutoPilotRun.xba index 052d71c2e27e..6c5adb9ea64a 100644 --- a/wizards/source/euro/AutoPilotRun.xba +++ b/wizards/source/euro/AutoPilotRun.xba @@ -17,7 +17,6 @@ Public DoUnprotect as Integer Public Password as String Public DocIndex as Integer Public oPathSettings as Object -Public oDocInfo as Object Public oUcb as Object Public TotDocCount as Integer Public sTotDocCount as String @@ -30,7 +29,6 @@ Dim oFactoryKey as Object BasicLibraries.LoadLibrary("Tools") BasicLibraries.LoadLibrary("ImportWizard") If InitResources("Euro Converter", "eur") Then - oDocInfo = CreateUnoService("com.sun.star.document.StandaloneDocumentInfo") oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess") oLocale = GetStarOfficeLocale() InitializeConverter(oLocale, 2) @@ -303,7 +301,7 @@ Dim sNoDirMessage as String If bIsValid Then If DialogModel.optSingleFile.State = 1 Then If bCheckFileType Then - sLocMimeType = GetRealFileContent(oDocInfo, sPath) + sLocMimeType = GetRealFileContent(sPath) If DialogModel.chkTextDocuments.State = 1 Then If (Instr(1, sLocMimeType, "text") = 0) And (Instr(1, sLocMimeType, "calc") = 0) Then Msgbox(sMsgFileInvalid, 48, sMsgDLGTITLE) @@ -408,4 +406,4 @@ Sub PreviousStep() DialogModel.cmdGoOn.Label = sGOON DialogModel.cmdCancel.Label = sCANCEL End Sub -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/gimmicks/AutoText.xba b/wizards/source/gimmicks/AutoText.xba index 6950b830eb79..5d3cc18e5e13 100644 --- a/wizards/source/gimmicks/AutoText.xba +++ b/wizards/source/gimmicks/AutoText.xba @@ -25,7 +25,7 @@ Dim n, m, iAutoCount as Integer ' Open a new empty document oDocument = CreateNewDocument("swriter") If Not IsNull(oDocument) Then - oDocument.DocumentInfo.Title = sDocumentTitle + oDocument.DocumentProperties.Title = sDocumentTitle oDocuText = oDocument.Text ' Create The Character-templates @@ -94,4 +94,4 @@ Dim oCellCursor as Object oCellCursor.CharStyleName = sCellStyle oCell.Text.insertString(oCellCursor,sCellString,False) oDocument.CurrentController.Select(oCellCursor) -End Sub</script:module>
\ No newline at end of file +End Sub</script:module> diff --git a/wizards/source/gimmicks/GetTexts.xba b/wizards/source/gimmicks/GetTexts.xba index af3ac041cb1e..c98e7d51f580 100644 --- a/wizards/source/gimmicks/GetTexts.xba +++ b/wizards/source/gimmicks/GetTexts.xba @@ -50,10 +50,10 @@ Dim oCharStyles as Object oHyperCursor.gotoStart(False) oHyperCursor.HyperLinkURL = oDocument.URL oHyperCursor.HyperLinkTarget = oDocument.URL - If oDocument.DocumentInfo.Title <> "" Then - oHyperCursor.HyperlinkName = oDocument.DocumentInfo.Title + If oDocument.DocumentProperties.Title <> "" Then + oHyperCursor.HyperlinkName = oDocument.DocumentProperties.Title End If - oLogText.insertString(oHyperCursor, oDocument.DocumentInfo.Title, False) + oLogText.insertString(oHyperCursor, oDocument.DocumentProperties.Title, False) oLogText.insertControlCharacter(oHyperCursor,com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK,False) oLogCursor = oLogText.createTextCursor() @@ -64,8 +64,8 @@ Dim oCharStyles as Object oLogCursor.SetPropertyToDefault("HyperLinkName") LogIndex = 0 - ' Get the Properties of the document Info - GetDocumentInfo() + ' Get the Properties of the document + GetDocumentProps() Select Case sDocType Case "swriter" @@ -400,18 +400,18 @@ End Sub ' ***********************************************Misc************************************************** -Sub GetDocumentInfo() -Dim oDocuInfo as Object +Sub GetDocumentProps() +Dim oDocuProps as Object MakeLogHeadLine("Document Properties") - oDocuInfo = oDocument.DocumentInfo - WriteStringToLogFile(oDocuInfo.Title) - WriteStringToLogFile(oDocuInfo.Description) - WriteStringToLogFile(oDocuInfo.Theme) - WriteStringToLogFile(oDocuInfo.Author) - WriteStringToLogFile(oDocuInfo.ReplyTo) - WriteStringToLogFile(oDocuInfo.Recipient) - WriteStringToLogFile(oDocuInfo.References) - WriteStringToLogFile(oDocuInfo.Keywords) + oDocuProps = oDocument.DocumentProperties + WriteStringToLogFile(oDocuProps.Title) + WriteStringToLogFile(oDocuProps.Description) + WriteStringToLogFile(oDocuProps.Subject) + WriteStringToLogFile(oDocuProps.Author) +' WriteStringToLogFile(oDocuProps.UserDefinedProperties.ReplyTo) +' WriteStringToLogFile(oDocuProps.UserDefinedProperties.Recipient) +' WriteStringToLogFile(oDocuProps.UserDefinedProperties.References) +' WriteStringToLogFile(oDocuProps.Keywords) End Sub @@ -519,4 +519,4 @@ Sub MakeLogHeadLine(HeadText as String) oLogText.insertControlCharacter(oLogCursor,com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK,False) oLogCursor.CharStyleName = "Log Body" End Sub -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba index e7a09f3a4f63..cb999252b24c 100644 --- a/wizards/source/importwizard/FilesModul.xba +++ b/wizards/source/importwizard/FilesModul.xba @@ -41,7 +41,6 @@ Dim NewContentList() as String Dim XMLTemplateContentString as String Dim ApplIndex as Integer Dim bAssignFileName as Boolean - oDocInfo = CreateUnoService("com.sun.star.document.StandaloneDocumentInfo") bInterruptSearch = False For i = 0 To MaxCollectIndex SearchDir = PathCollection(i,0) @@ -71,7 +70,7 @@ Dim bAssignFileName as Boolean CurFileContent = "" CurFileName = NewList(n,0) If (FieldInList(NewList(n,1), XMLTemplateList())) Then - CurFileContent = GetRealFileContent(oDocInfo, CurFileName) + CurFileContent = GetRealFileContent(CurFileName) t = SearchArrayforPartString(CurFileContent, XMLTemplateContentList()) bAssignFileName = (t > -1) If bAssignFileName Then @@ -822,4 +821,4 @@ Function ConcatComment(sComment as String, AdditionalComment as String) End If ConcatComment = sComment End Function -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/tools/UCB.xba b/wizards/source/tools/UCB.xba index 436fd551b944..524afe60c4d9 100644 --- a/wizards/source/tools/UCB.xba +++ b/wizards/source/tools/UCB.xba @@ -9,6 +9,7 @@ Dim sDirArray(SBMAXDIRCOUNT-1) as String Dim DirIndex As Integer Dim iDirCount as Integer Public bInterruptSearch as Boolean +Public NoArgs()as New com.sun.star.beans.PropertyValue Sub Main() Dim LocsfileContent(0) as String @@ -64,7 +65,7 @@ Dim sFileArray(StartUbound,1) as String End If Else If bcheckFileType Then - RealFileContent = GetRealFileContent(oDocInfo, FileName) + RealFileContent = GetRealFileContent(FileName) Else RealFileContent = GetFileNameExtension(FileName) End If @@ -143,14 +144,14 @@ Dim FileCount As Integer End Sub -Function RetrieveDocTitle(oDocInfo as Object, sFileName as String) As String +Function RetrieveDocTitle(oDocProps as Object, sFileName as String) As String Dim sDocTitle as String On Local Error Goto NOFILE - oDocInfo.Read(sFileName) - sDocTitle = oDocInfo.Title + oDocProps.loadFromMedium(sFileName, NoArgs()) + sDocTitle = oDocProps.Title NOFILE: If Err <> 0 Then - GetRealFileContent = "" + RetrieveDocTitle = "" RESUME CLR_ERROR End If CLR_ERROR: @@ -163,10 +164,10 @@ End Function ' Retrieves The Filecontent of a Document by extracting the content ' from the Header of the document -Function GetRealFileContent(oDocInfo as Object, FileName as String) As String +Function GetRealFileContent(FileName as String) As String On Local Error Goto NOFILE - oDocInfo.Read(FileName) - GetRealFileContent = oDocInfo.MIMEType + oTypeDetect = createUnoService("com.sun.star.document.TypeDetection") + GetRealFileContent = oTypeDetect.queryTypeByURL(FileName) NOFILE: If Err <> 0 Then GetRealFileContent = "" @@ -290,4 +291,4 @@ NOSPACEONDRIVE: End If GOON: End Function -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/tutorials/Functions.xba b/wizards/source/tutorials/Functions.xba index 55420d860a5b..6524ec19338c 100644 --- a/wizards/source/tutorials/Functions.xba +++ b/wizards/source/tutorials/Functions.xba @@ -39,8 +39,8 @@ Sub LoadTutorialDialog(exampleToUse, documentTYP) SetTutorialDocumentPosSize() - documentInfo = ThisComponent.getDocumentInfo() - myDialog.Title = "Tutorials - " & documentInfo.Title + documentProps = ThisComponent.getDocumentProperties() + myDialog.Title = "Tutorials - " & documentProps.Title oTextField = myDialog.GetControl("myTextField") oTextField.setVisible(False) @@ -143,18 +143,16 @@ Sub Init End Sub Sub InitStep - userFieldName = ThisComponent.getDocumentInfo.getUserFieldName(0) - ResultString = InStr (userFieldName, "CurrentStep:") - If ResultString <> 0 Then - TutorStep = Val(ThisComponent.getDocumentInfo.getUserFieldValue(0)) - Else - ThisComponent.getDocumentInfo.setUserFieldName(0, "CurrentStep:") - ThisComponent.getDocumentInfo.setUserFieldValue(0, TutorStep) - End If + udProps = ThisComponent.DocumentProperties.UserDefinedProperties + If udProps.PropertySetInfo.hasPropertyByName("CurrentStep") Then + TutorStep = udProps.CurrentStep + Else + udProps.addProperty("CurrentStep", 0, TutorStep) + End If End Sub Sub setStep - ThisComponent.getDocumentInfo.setUserFieldValue(0, TutorStep) + ThisComponent.DocumentProperties.UserDefinedProperties.CurrentStep = TutorStep End Sub Sub InitAction() @@ -367,4 +365,4 @@ Sub ExitTutorial() msgBox "Error! Cannot close document." End If End Sub -</script:module>
\ No newline at end of file +</script:module> diff --git a/wizards/source/webwizard/HtmlAutoPilotBasic.xba b/wizards/source/webwizard/HtmlAutoPilotBasic.xba index f248b4e6c8b9..00675bbf0c74 100644 --- a/wizards/source/webwizard/HtmlAutoPilotBasic.xba +++ b/wizards/source/webwizard/HtmlAutoPilotBasic.xba @@ -153,11 +153,11 @@ Dim OldWebPageIndex as Integer CurrentNext$ = GraphicsDir + Style(CurWebPageIndex, 3) CurrentHome$ = GraphicsDir + Style(CurWebPageIndex, 4) CurrentTop$ = GraphicsDir + Style(CurWebPageIndex, 5) - With oBaseDocument.DocumentInfo - .GetUserFieldValue(0) = ExtractGraphicNames(CurWebPageIndex,2) - .GetUserFieldValue(1) = ExtractGraphicNames(CurWebPageIndex, 4) - .GetUserFieldValue(2) = Style(CurWebPageIndex, 6) ' Bullet - .GetUserFieldValue(3) = Style(CurWebPageIndex, 7) ' Background + With oBaseDocument.DocumentProperties.UserDefinedProperties + .AutoPilotName1 = ExtractGraphicNames(CurWebPageIndex,2) + .AutoPilotName2 = ExtractGraphicNames(CurWebPageIndex, 4) + .AutoPilotBullet = Style(CurWebPageIndex, 6) + .AutoPilotBackground = Style(CurWebPageIndex, 7) End With SetBulletAndGraphics() CheckControls(oBaseDocument.DrawPage) @@ -235,6 +235,7 @@ Sub CopyGraphics Dim oGraphicObjects as Object Dim oGraphic as Object Dim i as Integer +Dim udProps as Object Dim SavePath as String BasicLibraries.LoadLibrary("Tools") oUcb = createUnoService("com.sun.star.ucb.SimpleFileAccess") @@ -255,12 +256,12 @@ Dim SavePath as String BulletUrlsToSavePath(SavePath) - With oBaseDocument.DocumentInfo - .GetUserFieldValue(0) = "" - .GetUserFieldValue(1) = "" - .GetUserFieldValue(2) = "" - .GetUserFieldValue(3) = "" - End With + udProps = oBaseDocument.DocumentProperties.UserDefinedProperties + udProps.addProperty("AutoPilotName1", 0, "") + udProps.addProperty("AutoPilotName2", 0, "") + udProps.addProperty("AutoPilotBullet", 0, "") + udProps.addProperty("AutoPilotBackground", 0, "") + AttachBasicMacroToEvent(oBaseDocument,"OnSaveDone", "") AttachBasicMacroToEvent(oBaseDocument,"OnSaveAsDone", "") AttachBasicMacroToEvent(oBaseDocument,"OnNew", "") @@ -284,7 +285,7 @@ End Function Function getListBoxArrays(oUcb as Object, sFileFilter as String) -Dim oDocInfo as Object +Dim oDocProps as Object Dim oListboxControl as Object Dim Description as String Dim sField as String @@ -301,10 +302,10 @@ Dim n as Integer Dim s as Integer Dim a as Integer Dim LocMaxIndex as Integer -Dim InfoNames() +Dim Properties() Dim DimCount as Integer Dim sExtension as String - oDocInfo = CreateUnoService("com.sun.star.document.DocumentProperties") + oDocProps = CreateUnoService("com.sun.star.document.DocumentProperties") FilterLen = Len(sFileFilter) bItemFound = False ' It has to be made sure that the TemplatePath <> "" @@ -325,7 +326,7 @@ Dim sExtension as String Dim SortList(LocMaxIndex,1) For i = 0 to LocMaxIndex SortList(i,0) = DirContent(i) - SortList(i,1) = RetrieveDocTitle(oDocInfo, DirContent(i)) + SortList(i,1) = RetrieveDocTitle(oDocProps, DirContent(i)) Next i SortList() = BubbleSortList(SortList(),True) For i = 0 to LocMaxIndex @@ -337,16 +338,15 @@ Dim sExtension as String sExtension = Ucase(GetFileNameExtension(FileName)) If Instr(1,Filename, sFileFilter) And sExtension = "STW" Then bItemFound = True - Description = RetrieveDocTitle(oDocInfo, FileName) - oDocInfo.Read(FileName) - InfoNames = oDocInfo.ElementNames() + Description = RetrieveDocTitle(oDocProps, FileName) + Properties = oDocProps.UserDefinedProperties.PropertyValues List(a,1) = Description If sFileFilter = "/cnt" Then List(a,2) = Filename Else m = 2 For n = 0 To 3 - sField = oDocInfo.GetByName(InfoNames(n)) + sField = Properties(n).Value sFieldList() = ArrayoutofString(sField, " ", MaxIndex) For s = 0 To MaxIndex If m < 6 Then |