[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-2.0.3.ooo65519.printing.samba.patch, NONE, 1.1 openoffice.org.spec, 1.742, 1.743



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29770

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.ooo65519.printing.samba.patch 
Log Message:
samba printing fix

openoffice.org-2.0.3.ooo65519.printing.samba.patch:
 sfx2/source/doc/objmisc.cxx  |    3 +++
 tools/inc/urlobj.hxx         |    6 ++++--
 tools/source/fsys/urlobj.cxx |    6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-2.0.3.ooo65519.printing.samba.patch ---
diff -rup sfx2/source/doc/objmisc.cxx sfx2/source/doc/objmisc.cxx
--- openoffice.org.org.orig/sfx2/source/doc/objmisc.cxx	2006-05-18 09:48:27.000000000 +0200
+++ openoffice.org/sfx2/source/doc/objmisc.cxx	2006-05-18 09:49:19.000000000 +0200
@@ -857,6 +857,9 @@ String SfxObjectShell::GetTitle
 		// ggf. Titel aus Dateiname generieren
 		if ( !pImp->aTitle.Len() )
 			pImp->aTitle = aURL.GetBase();
+
+		if ( !pImp->aTitle.Len() )
+			pImp->aTitle = aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET );
 	}
 
 	// ganzer Titel
diff -rup tools/inc/urlobj.hxx tools/inc/urlobj.hxx
--- openoffice.org.orig/tools/inc/urlobj.hxx	2006-05-18 09:47:10.000000000 +0200
+++ openoffice.org/tools/inc/urlobj.hxx	2006-05-18 09:47:18.000000000 +0200
@@ -105,6 +105,7 @@ namespace com { namespace sun { namespac
 #define INET_DB_SCHEME "db:"
 #define INET_BUGID_SCHEME "bugid:"
 #define INET_TELNET_SCHEME "telnet://";
+#define INET_SAMBA_SCHEME "smb://"
 
 #define URL_PREFIX_PRIV_SOFFICE "private:"
 enum
@@ -162,8 +163,9 @@ enum INetProtocol
     INET_PROT_TELNET = 28,
     INET_PROT_VND_SUN_STAR_EXPAND = 29,
     INET_PROT_VND_SUN_STAR_TDOC = 30,
-    INET_PROT_GENERIC = 31,
-	INET_PROT_END = 32
+	INET_PROT_SAMBA = 31,
+    INET_PROT_GENERIC = 32,
+	INET_PROT_END = 33
 };
 
 //============================================================================
diff -rup tools/source/fsys/urlobj.cxx tools/source/fsys/urlobj.cxx
--- openoffice.org.orig/tools/source/fsys/urlobj.cxx	2006-05-18 09:47:10.000000000 +0200
+++ openoffice.org/tools/source/fsys/urlobj.cxx	2006-05-18 09:47:18.000000000 +0200
@@ -288,6 +288,8 @@ using namespace com::sun;
    vnd-sun-star-tdoc-url = "VND.SUN.STAR.TDOC:/" segment *("/" segment)
    segment = *pchar
 
+   ; private (http://ubiqx.org/cifs/Appendix-D.html)
+   samba-url = smb://[[[authdomain;]user ]host[:port][/share[/path][/name]]][?context]
 
    ; private
    unknown-url = scheme ":" 1*uric
@@ -452,6 +454,8 @@ static INetURLObject::SchemeInfo const a
 		  false, false, false, false, false },
         { "vnd.sun.star.tdoc", "vnd.sun.star.tdoc:", 0, false, false, false,
           false, false, false, true, false },
+		{ "smb", "smb://", 139, true, true, false, true, true, true, true,
+		  false },
         { "", "", 0, false, false, false, false, false, false, false, false } };
 
 // static
@@ -2086,6 +2090,7 @@ INetURLObject::getPrefix(sal_Unicode con
 			  INET_PROT_PRIV_SOFFICE, PrefixInfo::INTERNAL },
 			{ "slot:", "staroffice.slot:", INET_PROT_SLOT,
 			  PrefixInfo::INTERNAL },
+			{ "smb:", 0, INET_PROT_SAMBA, PrefixInfo::OFFICIAL },
 			{ "staroffice.component:", ".component:", INET_PROT_COMPONENT,
 			  PrefixInfo::EXTERNAL },
 			{ "staroffice.db:", "db:", INET_PROT_DB, PrefixInfo::EXTERNAL },
@@ -2472,6 +2477,7 @@ bool INetURLObject::parsePath(INetProtoc
 			return false;
 
 		case INET_PROT_FTP:
+		case INET_PROT_SAMBA:
 		case INET_PROT_IMAP:
 			if (pPos < pEnd && *pPos != '/')
 				return false;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.742
retrieving revision 1.743
diff -u -r1.742 -r1.743
--- openoffice.org.spec	22 Jun 2006 21:06:32 -0000	1.742
+++ openoffice.org.spec	26 Jun 2006 16:07:01 -0000	1.743
@@ -104,6 +104,7 @@
 Patch38: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
 Patch39: openoffice.org.2.0.3.ooo66067.embeddedobj.crash.patch
 Patch40: openoffice.org.2.0.3.ooo66018.linguistic.vorcrash.patch
+Patch41: openoffice.org-2.0.3.ooo65519.printing.samba.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -835,6 +836,7 @@
 %patch38 -p1 -b .rh192588.officecfg.defaultcairooff.patch
 %patch39 -p1 -b .ooo66067.embeddedobj.crash.patch
 %patch40 -p1 -b .ooo66018.linguistic.vorcrash.patch
+%patch41 -p1 -b .ooo65519.printing.samba.patch
 
 tar xzf %{SOURCE1}
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]