openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1457157 - in /openoffice/branches/l10n: ./ ext_libraries/serf/ ext_libraries/serf/win/ test/ test/testcommon/source/org/openoffice/test/vcl/ test/testuno/source/testlib/uno/
Date Fri, 15 Mar 2013 23:05:03 GMT
Author: jani
Date: Fri Mar 15 23:05:03 2013
New Revision: 1457157

URL: http://svn.apache.org/r1457157
Log:
forgot to be in l10n when merging from trunk

Removed:
    openoffice/branches/l10n/ext_libraries/serf/serf-1.1.0.ldl.patch
    openoffice/branches/l10n/ext_libraries/serf/serf-1.1.0.libs.patch
Modified:
    openoffice/branches/l10n/   (props changed)
    openoffice/branches/l10n/ext_libraries/serf/makefile.mk
    openoffice/branches/l10n/ext_libraries/serf/serf_version.mk
    openoffice/branches/l10n/ext_libraries/serf/win/Library_serf.mk
    openoffice/branches/l10n/ext_libraries/serf/win/Package_inc.mk
    openoffice/branches/l10n/test/   (props changed)
    openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/vcl/   (props changed)
    openoffice/branches/l10n/test/testuno/source/testlib/uno/SWUtil.java

Propchange: openoffice/branches/l10n/
------------------------------------------------------------------------------
  Merged /incubator/ooo/branches/AOO34:r1348914,1358991,1359004,1359010,1359024,1359546-1359547,1359553,1359555-1359556,1360552,1368968
  Merged /openoffice/trunk:r1443137-1456676

Modified: openoffice/branches/l10n/ext_libraries/serf/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/ext_libraries/serf/makefile.mk?rev=1457157&r1=1457156&r2=1457157&view=diff
==============================================================================
--- openoffice/branches/l10n/ext_libraries/serf/makefile.mk (original)
+++ openoffice/branches/l10n/ext_libraries/serf/makefile.mk Fri Mar 15 23:05:03 2013
@@ -44,7 +44,7 @@ LIBSERFVERSION=$(SERF_MAJOR).$(SERF_MINO
 TARFILE_NAME=$(PRJNAME)-$(LIBSERFVERSION)
 # This is the SHA1 checksum, not MD5 but tg_ext.mk does not now about this and,
 # thankfully, does not care.
-TARFILE_MD5=231af70b7567a753b49df4216743010c193884b7
+TARFILE_MD5=30b29bd9214d50887abcc20cf82096aaaf5d1d61
 
 PATCH_FILES=
 
@@ -76,6 +76,12 @@ PATCH_FILES+=$(TARFILE_NAME).libs.patch
 PATCH_FILES+=$(TARFILE_NAME).ldl.patch
 .ENDIF
 
+# Export ENABLE_SERF_LOGGING=YES to enable serf logging
+.IF "$(ENABLE_SERF_LOGGING)" == "YES"
+PATCH_FILES+=$(TARFILE_NAME).logging.patch
+CDEFS+=-DENABLE_SERF_VERBOSE -DSERF_VERBOSE
+.ENDIF
+
 CONFIGURE_DIR=
 CONFIGURE_ACTION=autoconf && .$/configure
 

Modified: openoffice/branches/l10n/ext_libraries/serf/serf_version.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/ext_libraries/serf/serf_version.mk?rev=1457157&r1=1457156&r2=1457157&view=diff
==============================================================================
--- openoffice/branches/l10n/ext_libraries/serf/serf_version.mk (original)
+++ openoffice/branches/l10n/ext_libraries/serf/serf_version.mk Fri Mar 15 23:05:03 2013
@@ -20,5 +20,5 @@
 #**************************************************************
 
 SERF_MAJOR=1
-SERF_MINOR=1
+SERF_MINOR=2
 SERF_MICRO=0

Modified: openoffice/branches/l10n/ext_libraries/serf/win/Library_serf.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/ext_libraries/serf/win/Library_serf.mk?rev=1457157&r1=1457156&r2=1457157&view=diff
==============================================================================
--- openoffice/branches/l10n/ext_libraries/serf/win/Library_serf.mk (original)
+++ openoffice/branches/l10n/ext_libraries/serf/win/Library_serf.mk Fri Mar 15 23:05:03 2013
@@ -59,31 +59,33 @@ $(eval $(call gb_Library_add_linked_libs
 ))
 
 $(eval $(call gb_Library_add_cobjects,serf,\
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/aggregate_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/request_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/simple_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/file_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/mmap_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/socket_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/response_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/headers_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/allocator \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/dechunk_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/deflate_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/limit_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/ssl_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/barrier_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/chunk_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/bwtp_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/buckets/iovec_buckets \
-	serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth \
-	serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth_basic \
-	serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth_digest \
-	serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth_kerb \
-	serf/$(INPATH)/misc/build/serf-1.1.0/auth/auth_kerb_gss \
-	serf/$(INPATH)/misc/build/serf-1.1.0/context \
-	serf/$(INPATH)/misc/build/serf-1.1.0/incoming \
-	serf/$(INPATH)/misc/build/serf-1.1.0/outgoing \
-	serf/$(INPATH)/misc/build/serf-1.1.0/ssltunnel \
+	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth \
+	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_basic \
+	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_digest \
+	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb \
+	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb_gss \
+	serf/$(INPATH)/misc/build/serf-1.2.0/auth/auth_kerb_sspi \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/aggregate_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/allocator \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/barrier_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/bwtp_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/chunk_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/dechunk_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/deflate_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/file_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/headers_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/iovec_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/limit_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/mmap_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/request_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/response_body_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/response_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/simple_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/socket_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/buckets/ssl_buckets \
+	serf/$(INPATH)/misc/build/serf-1.2.0/context \
+	serf/$(INPATH)/misc/build/serf-1.2.0/incoming \
+	serf/$(INPATH)/misc/build/serf-1.2.0/outgoing \
+	serf/$(INPATH)/misc/build/serf-1.2.0/ssltunnel \
 ))

Modified: openoffice/branches/l10n/ext_libraries/serf/win/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/ext_libraries/serf/win/Package_inc.mk?rev=1457157&r1=1457156&r2=1457157&view=diff
==============================================================================
--- openoffice/branches/l10n/ext_libraries/serf/win/Package_inc.mk (original)
+++ openoffice/branches/l10n/ext_libraries/serf/win/Package_inc.mk Fri Mar 15 23:05:03 2013
@@ -19,7 +19,7 @@
 # * 
 # *************************************************************/
 
-$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(INPATH)/misc/build/serf-1.1.0))
+$(eval $(call gb_Package_Package,serf_inc,$(EXT_LIBRARIES)/serf/$(INPATH)/misc/build/serf-1.2.0))
 $(eval $(call gb_Package_add_files, serf_inc, inc/serf,        \
        serf.h                                                  \
        serf_bucket_types.h                                     \

Propchange: openoffice/branches/l10n/test/
------------------------------------------------------------------------------
  Merged /openoffice/trunk/test:r1443137-1456676

Propchange: openoffice/branches/l10n/test/testcommon/source/org/openoffice/test/vcl/
------------------------------------------------------------------------------
  Merged /openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1443137-1456676

Modified: openoffice/branches/l10n/test/testuno/source/testlib/uno/SWUtil.java
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n/test/testuno/source/testlib/uno/SWUtil.java?rev=1457157&r1=1457156&r2=1457157&view=diff
==============================================================================
--- openoffice/branches/l10n/test/testuno/source/testlib/uno/SWUtil.java (original)
+++ openoffice/branches/l10n/test/testuno/source/testlib/uno/SWUtil.java Fri Mar 15 23:05:03
2013
@@ -29,8 +29,8 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNameContainer;
 import com.sun.star.container.XNamed;
-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.XStorable;
 import com.sun.star.io.IOException;
 import com.sun.star.lang.XComponent;
@@ -119,18 +119,23 @@ public class SWUtil {
 	}
 	
 	/**
-	 * Set document properties. such as subject, title etc
+	 * Set document properties. Only supported: subject, title, author
 	 * @param document - set document information on this document
-	 * @param prop - document information, including "Subject" ,"Title", "Author", "Title",
"KeyWords"
+	 * @param prop - document information, including "Subject" ,"Title", "Author"
 	 * @param propValue - value you want to set for prop
 	 * @throws Exception
 	 */
 	public static void setDocumentProperty(XTextDocument document, String prop, String propValue)
throws Exception {
-		XDocumentInfoSupplier docInfoSupplier = (XDocumentInfoSupplier) UnoRuntime.queryInterface(XDocumentInfoSupplier.class,
document);
-		XDocumentInfo docInfo = docInfoSupplier.getDocumentInfo();
-		XPropertySet propsDocInfo = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class,
docInfo);
-		propsDocInfo.setPropertyValue(prop, propValue);
-	}
+       XDocumentPropertiesSupplier docPropsSupplier = UnoRuntime.queryInterface(
+            XDocumentPropertiesSupplier.class, document);
+       XDocumentProperties docProps = docPropsSupplier.getDocumentProperties();
+        if ( prop.equals("Title"))
+            docProps.setTitle(propValue);
+        else if ( prop.equals("Author"))
+            docProps.setAuthor(propValue);
+        else if ( prop.equals("Subject"))
+            docProps.setSubject(propValue);
+    }
 	
 
 	/**



Mime
View raw message