rpms/openoffice.org/devel openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch, NONE, 1.1 openoffice.org.spec, 1.1755, 1.1756

Caolan McNamara caolanm at fedoraproject.org
Thu Jan 15 12:15:55 UTC 2009 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27017

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch 
Log Message:
Resolves: rhbz#480117 openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch

openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch:

--- NEW FILE openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch ---
diff -ru wizards.orig/com/sun/star/wizards/common/Desktop.java wizards/com/sun/star/wizards/common/Desktop.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/common/Desktop.java	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/com/sun/star/wizards/common/Desktop.java	2009-01-15 10:50:33.000000000 +0000
@@ -28,9 +28,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 -ru wizards.orig/com/sun/star/wizards/common/FileAccess.java wizards/com/sun/star/wizards/common/FileAccess.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/common/FileAccess.java	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/com/sun/star/wizards/common/FileAccess.java	2009-01-15 10:51:48.000000000 +0000
@@ -49,6 +49,7 @@
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 import com.sun.star.util.DateTime;
+import com.sun.star.beans.PropertyValue;
 
 /**
  * This class delivers static convenience methods
@@ -75,9 +76,7 @@
         // 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, "", "/");
@@ -568,8 +567,8 @@
             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");
+            com.sun.star.document.XDocumentProperties xDocInfo = (com.sun.star.document.XDocumentProperties) UnoRuntime.queryInterface(com.sun.star.document.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);
@@ -582,12 +581,13 @@
             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]);
+                    xDocInfo.loadFromMedium(nameList[i], noArgs);
                     NameVector.addElement(nameList[i]);
                     TitleVector.addElement(com.sun.star.uno.AnyConverter.toString(Helper.getUnoPropertyValue(xDocInterface, "Title")));
                     
@@ -673,10 +673,10 @@
         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);
+            XInterface xDocInterface = (XInterface) xMSF.createInstance("com.sun.star.document.DocumentProperties");
+            com.sun.star.document.XDocumentProperties xDocInfo = (com.sun.star.document.XDocumentProperties) UnoRuntime.queryInterface(com.sun.star.document.XDocumentProperties.class, xDocInterface);
+            PropertyValue[] noArgs = { };
+            xDocInfo.loadFromMedium(_sFile, noArgs);
             sTitle = com.sun.star.uno.AnyConverter.toString(Helper.getUnoPropertyValue(xDocInterface, "Title"));
         }
         catch (Exception e)
diff -ru wizards.orig/com/sun/star/wizards/common/Helper.java wizards/com/sun/star/wizards/common/Helper.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/common/Helper.java	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/com/sun/star/wizards/common/Helper.java	2009-01-15 10:52:25.000000000 +0000
@@ -35,10 +35,8 @@
 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 -ru wizards.orig/com/sun/star/wizards/web/data/CGDocument.java wizards/com/sun/star/wizards/web/data/CGDocument.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/web/data/CGDocument.java	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/com/sun/star/wizards/web/data/CGDocument.java	2009-01-15 10:46:13.000000000 +0000
@@ -38,7 +38,7 @@
 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.frame.XComponentLoader;
 import com.sun.star.frame.XDesktop;
 import com.sun.star.lang.XComponent;
@@ -174,9 +174,10 @@
         
         //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);
+        if (isSODocument) {//for SO documents
+            PropertyValue[] noArgs = { };
+            info = xmsf.createInstance("com.sun.star.document.DocumentProperties");
+            ((XDocumentProperties)UnoRuntime.queryInterface(XDocumentProperties.class, info)).loadFromMedium(cp_URL, noArgs);
         }
         
         task.advance(true); //3
diff -ru wizards.orig/source/euro/AutoPilotRun.xba wizards/source/euro/AutoPilotRun.xba
--- openoffice.org.orig/wizards/source/euro/AutoPilotRun.xba	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/source/euro/AutoPilotRun.xba	2009-01-15 11:46:57.000000000 +0000
@@ -17,7 +17,6 @@
 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 @@
 	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 @@
 	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 @@
 	DialogModel.cmdGoOn.Label =  sGOON
 	DialogModel.cmdCancel.Label = sCANCEL
 End Sub
-</script:module>
\ No newline at end of file
+</script:module>
diff -ru wizards.orig/source/importwizard/FilesModul.xba wizards/source/importwizard/FilesModul.xba
--- openoffice.org.orig/wizards/source/importwizard/FilesModul.xba	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/source/importwizard/FilesModul.xba	2009-01-15 12:06:26.000000000 +0000
@@ -41,7 +41,6 @@
 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 @@
 						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 @@
 	End If				
 	ConcatComment = sComment
 End Function
-</script:module>
\ No newline at end of file
+</script:module>
diff -ru wizards.orig/source/tools/UCB.xba wizards/source/tools/UCB.xba
--- openoffice.org.orig/wizards/source/tools/UCB.xba	2009-01-15 10:26:05.000000000 +0000
+++ openoffice.org/wizards/source/tools/UCB.xba	2009-01-15 12:05:38.000000000 +0000
@@ -9,6 +9,7 @@
 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 @@
 						End If
 					Else
 						If bcheckFileType Then
-							RealFileContent  = GetRealFileContent(oDocInfo, FileName)
+							RealFileContent = GetRealFileContent(FileName)
 						Else
 							RealFileContent = GetFileNameExtension(FileName)
 						End If
@@ -146,11 +147,11 @@
 Function RetrieveDocTitle(oDocInfo as Object, sFileName as String) As String
 Dim sDocTitle as String
 	On Local Error Goto NOFILE
-	oDocInfo.Read(sFileName)
+	oDocInfo.loadFromMedium(sFileName, NoArgs())
 	sDocTitle = oDocInfo.Title
 	NOFILE:
 	If Err <> 0 Then
-		GetRealFileContent = ""
+		RetrieveDocTitle = ""
 		RESUME CLR_ERROR
 	End If
 	CLR_ERROR:
@@ -163,10 +164,10 @@
 
 ' 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 @@
 	End If
 GOON:
 End Function
-</script:module>
\ No newline at end of file
+</script:module>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1755
retrieving revision 1.1756
diff -u -r1.1755 -r1.1756
--- openoffice.org.spec	14 Jan 2009 23:13:54 -0000	1.1755
+++ openoffice.org.spec	15 Jan 2009 12:15:24 -0000	1.1756
@@ -136,6 +136,7 @@
 Patch63: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
 Patch64: openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 Patch65: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch66: openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1419,6 +1420,7 @@
 %patch63 -p1 -b .ooo97488.sw.ww8toc.patch
 %patch64 -p1 -b .ooo98024.vcl.emboldenoverlap.patch
 %patch65 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch66 -p1 -b .ooo95702.wizardsdocinfo.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3828,11 +3830,12 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Jan 14 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
+* Tue Jan 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
 - Resolves: rhbz#479624 add
   openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 - add hyphen-uk, hyphen-pt dependency
 - Resolves: rhbz#479163 openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+- Resolves: rhbz#480117 openoffice.org-3.0.1.ooo95702.wizardsdocinfo.patch
 
 * Mon Jan 12 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - next milestone

More information about the fedora-extras-commits mailing list