[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 6 commits - fpicker/Library_fps.mk fpicker/WinResTarget_fpicker.mk icc/source jurt/com LICENSE NOTICE postprocess/packconfig README sal/inc sal/rtl solenv/bin solenv/inc store/inc store/source store/workben
Damjan Jovanovic
damjan at apache.org
Sun Dec 25 02:08:11 UTC 2016
LICENSE | 2
NOTICE | 2
README | 2
fpicker/Library_fps.mk | 2
fpicker/WinResTarget_fpicker.mk | 6 +-
icc/source/create_sRGB_profile/create_sRGB_profile.cpp | 38 ++++++++---------
jurt/com/sun/star/comp/loader/JavaLoader.java | 2
jurt/com/sun/star/comp/urlresolver/UrlResolver.java | 2
postprocess/packconfig/packconfig.pl | 2
sal/inc/rtl/cipher.h | 2
sal/inc/rtl/crc.h | 2
sal/inc/rtl/digest.h | 2
sal/inc/rtl/random.h | 2
sal/rtl/source/cipher.c | 2
sal/rtl/source/crc.c | 2
sal/rtl/source/digest.c | 2
sal/rtl/source/random.c | 2
solenv/bin/build.pl | 2
solenv/bin/deliver.pl | 2
solenv/bin/packimages.pl | 2
solenv/bin/zipdep.pl | 2
solenv/inc/libs.mk | 2
store/inc/store/store.h | 2
store/inc/store/types.h | 2
store/source/storbase.hxx | 2
store/source/storcach.hxx | 2
store/source/storlckb.hxx | 2
store/source/storpage.hxx | 2
store/source/stortree.hxx | 2
store/workben/t_store.cxx | 2
30 files changed, 55 insertions(+), 45 deletions(-)
New commits:
commit 13f4a1ab1e1311a039ad5e6062e68dc9f7f560b2
Author: Damjan Jovanovic <damjan at apache.org>
Date: Sat Dec 24 16:48:58 2016 +0000
Fix a serious fpicker regression on Windows, where
the "open file" button / menu option does nothing,
caused by the resouce file not getting linked to
fps.dll after the port to gbuild. Also use "fps"
instead of "fpicker" in the WinResTarget file, since
it has to match the library name, not the module
name.
Patch by: me
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index d09a3a0..045c68f 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -103,4 +103,6 @@ $(eval $(call gb_Library_add_cxxobjects,fps,\
))
endif
+$(eval $(call gb_Library_add_nativeres,fps,src))
+
# vim: set noet sw=4 ts=4:
diff --git a/fpicker/WinResTarget_fpicker.mk b/fpicker/WinResTarget_fpicker.mk
index e3aff40..1954609 100644
--- a/fpicker/WinResTarget_fpicker.mk
+++ b/fpicker/WinResTarget_fpicker.mk
@@ -21,13 +21,13 @@
-$(eval $(call gb_WinResTarget_WinResTarget,fpicker/src))
+$(eval $(call gb_WinResTarget_WinResTarget,fps/src))
-$(eval $(call gb_WinResTarget_set_include,fpicker/src,\
+$(eval $(call gb_WinResTarget_set_include,fps/src,\
$$(INCLUDE) \
-I$(SRCDIR)/fpicker/inc \
))
-$(eval $(call gb_WinResTarget_add_file,fpicker/src,\
+$(eval $(call gb_WinResTarget_add_file,fps/src,\
fpicker/source/win32/filepicker/Fps \
))
commit e57236a1d3a5ecdf047187c6bc061e24b598d2fe
Author: Pedro Giffuni <pfg at apache.org>
Date: Sat Dec 24 16:19:20 2016 +0000
More use of the Date svn keyword.
This was also missed in r1775849.
commit 4886cbf5943e21b63ae0b7e20b312eed599b68c5
Author: Pedro Giffuni <pfg at apache.org>
Date: Sat Dec 24 16:11:32 2016 +0000
More use of the Date svn keyword.
These were missed in r1775849.
diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java b/jurt/com/sun/star/comp/loader/JavaLoader.java
index 21ff1d4..67c2e78 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoader.java
+++ b/jurt/com/sun/star/comp/loader/JavaLoader.java
@@ -58,7 +58,7 @@ import com.sun.star.uno.AnyConverter;
* service. Therefor the <code>JavaLoader</code> activates external UNO components which are implemented in Java.
* The loader is used by the <code>ServiceManger</code>.
* <p>
- * @version $Revision: 1.16 $ $ $Date: 2008-04-11 11:10:31 $
+ * @version $Revision: 1.16 $ $ $Date$
* @author Markus Herzog
* @see com.sun.star.loader.XImplementationLoader
* @see com.sun.star.loader.Java
diff --git a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
index 7e6ae08..a80ef46 100644
--- a/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
+++ b/jurt/com/sun/star/comp/urlresolver/UrlResolver.java
@@ -47,7 +47,7 @@ import com.sun.star.uno.UnoRuntime;
/**
* This component gives a factory for an <code>UnoUrlResolver</code> service.
* <p>
- * @version $Revision: 1.6 $ $ $Date: 2008-04-11 11:12:25 $
+ * @version $Revision: 1.6 $ $ $Date$
* @author Kay Ramme
* @see com.sun.star.brige.XBrideFactory
* @see com.sun.star.connection.Connector
commit 94d9bb4c0306e9b85603b00169d729898f16483f
Author: Pedro Giffuni <pfg at apache.org>
Date: Sat Dec 24 16:00:46 2016 +0000
Make use of the HeadURL svn keyword.
Using these in notable files, especially the LICENSE, NOTICE and
README files improves the visibility of the repository and provides a
good reference for developers that may be looking for updates.
diff --git a/LICENSE b/LICENSE
index e724dd0..3becfa3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,5 @@
+$HeadURL$
+
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
diff --git a/NOTICE b/NOTICE
index 45f9255..ab6cfe8 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +1,5 @@
+$HeadURL$
+
Apache OpenOffice (http://www.openoffice.org)
Copyright 2011, 2016 The Apache Software Foundation
diff --git a/README b/README
index 179872d..9ea34c5 100644
--- a/README
+++ b/README
@@ -1,3 +1,5 @@
+$HeadURL$
+
Apache OpenOffice (AOO)
=======================
commit 5bcbb166eb8e950d98d1aba0440e5f35bedcb8b0
Author: Pedro Giffuni <pfg at apache.org>
Date: Sat Dec 24 15:48:25 2016 +0000
Add some "Revision" svn keywords.
Revisions were used within the tree, perhaps inherited by previous
CVS/Subversion usage. Re-use them now since we have been lazy about
updating them manually and because they can be useful for bug reports.
diff --git a/postprocess/packconfig/packconfig.pl b/postprocess/packconfig/packconfig.pl
index a95e84b..37a7b0d 100755
--- a/postprocess/packconfig/packconfig.pl
+++ b/postprocess/packconfig/packconfig.pl
@@ -48,7 +48,7 @@ my $do_rebuild = 0; # is rebuilding zipfile required?
( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
my $script_rev;
-my $id_str = ' $Revision: 1.3.24.2 $ ';
+my $id_str = ' $Revision$ ';
$id_str =~ /Revision:\s+(\S+)\s+\$/
? ($script_rev = $1) : ($script_rev = "-");
diff --git a/sal/inc/rtl/cipher.h b/sal/inc/rtl/cipher.h
index 8ff185b..dd04583 100644
--- a/sal/inc/rtl/cipher.h
+++ b/sal/inc/rtl/cipher.h
@@ -22,7 +22,7 @@
#ifndef _RTL_CIPHER_H_
-#define _RTL_CIPHER_H_ "$Revision: 1.7 $"
+#define _RTL_CIPHER_H_ "$Revision$"
#include <sal/types.h>
diff --git a/sal/inc/rtl/crc.h b/sal/inc/rtl/crc.h
index 50c7530..4d0e407 100644
--- a/sal/inc/rtl/crc.h
+++ b/sal/inc/rtl/crc.h
@@ -22,7 +22,7 @@
#ifndef _RTL_CRC_H_
-#define _RTL_CRC_H_ "$Revision: 1.4 $"
+#define _RTL_CRC_H_ "$Revision$"
#include <sal/types.h>
diff --git a/sal/inc/rtl/digest.h b/sal/inc/rtl/digest.h
index 67ae11e..fbf5c9d 100644
--- a/sal/inc/rtl/digest.h
+++ b/sal/inc/rtl/digest.h
@@ -22,7 +22,7 @@
#ifndef _RTL_DIGEST_H_
-#define _RTL_DIGEST_H_ "$Revision: 1.8 $"
+#define _RTL_DIGEST_H_ "$Revision$"
#include <sal/types.h>
diff --git a/sal/inc/rtl/random.h b/sal/inc/rtl/random.h
index 3ca3da8..b4e21db 100644
--- a/sal/inc/rtl/random.h
+++ b/sal/inc/rtl/random.h
@@ -22,7 +22,7 @@
#ifndef _RTL_RANDOM_H_
-#define _RTL_RANDOM_H_ "$Revision: 1.7 $"
+#define _RTL_RANDOM_H_ "$Revision$"
#include <sal/types.h>
diff --git a/sal/rtl/source/cipher.c b/sal/rtl/source/cipher.c
index 65473cf..521ec73 100644
--- a/sal/rtl/source/cipher.c
+++ b/sal/rtl/source/cipher.c
@@ -21,7 +21,7 @@
-#define _RTL_CIPHER_C_ "$Revision: 1.5 $"
+#define _RTL_CIPHER_C_ "$Revision$"
#include <sal/types.h>
#include <rtl/alloc.h>
diff --git a/sal/rtl/source/crc.c b/sal/rtl/source/crc.c
index 3c77f52..3314b2c 100644
--- a/sal/rtl/source/crc.c
+++ b/sal/rtl/source/crc.c
@@ -21,7 +21,7 @@
-#define _RTL_CRC_C_ "$Revision: 1.3 $"
+#define _RTL_CRC_C_ "$Revision$"
#include <sal/types.h>
#include <rtl/crc.h>
diff --git a/sal/rtl/source/digest.c b/sal/rtl/source/digest.c
index fafec90..5829e89 100644
--- a/sal/rtl/source/digest.c
+++ b/sal/rtl/source/digest.c
@@ -21,7 +21,7 @@
-#define _RTL_DIGEST_C_ "$Revision: 1.9 $"
+#define _RTL_DIGEST_C_ "$Revision$"
#include <sal/types.h>
#include <sal/macros.h>
diff --git a/sal/rtl/source/random.c b/sal/rtl/source/random.c
index d967c63..d248c10 100644
--- a/sal/rtl/source/random.c
+++ b/sal/rtl/source/random.c
@@ -21,7 +21,7 @@
-#define _RTL_RANDOM_C_ "$Revision: 1.6 $"
+#define _RTL_RANDOM_C_ "$Revision$"
#include <sal/types.h>
#include <osl/thread.h>
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index c82b57c..d0c4823 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -69,7 +69,7 @@
#### script id #####
( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
- my $id_str = ' $Revision: 275224 $ ';
+ my $id_str = ' $Revision$ ';
my $script_rev = 0;
$id_str =~ /Revision:\s+(\S+)\s+\$/
? ($script_rev = $1) : ($script_rev = "-");
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 4341d88..aca476e 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -39,7 +39,7 @@ use File::Spec;
( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-$id_str = ' $Revision: 275594 $ ';
+$id_str = ' $Revision$ ';
$id_str =~ /Revision:\s+(\S+)\s+\$/
? ($script_rev = $1) : ($script_rev = "-");
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 1de1ea4..71ee178 100755
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -56,7 +56,7 @@ my @custom_list;
( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
my $script_rev;
-my $id_str = ' $Revision: 1.17 $ ';
+my $id_str = ' $Revision$ ';
$id_str =~ /Revision:\s+(\S+)\s+\$/
? ($script_rev = $1) : ($script_rev = "-");
diff --git a/solenv/bin/zipdep.pl b/solenv/bin/zipdep.pl
index afba7ed..077d33b 100755
--- a/solenv/bin/zipdep.pl
+++ b/solenv/bin/zipdep.pl
@@ -33,7 +33,7 @@ use Cwd;
( $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
-$id_str = ' $Revision: 1.12 $ ';
+$id_str = ' $Revision$ ';
$id_str =~ /Revision:\s+(\S+)\s+\$/
? ($script_rev = $1) : ($script_rev = "-");
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index f9382be..7d12c79 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -19,7 +19,7 @@
#
#**************************************************************
-LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
+LIBSMKREV!:="$$Revision$$"
.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
diff --git a/store/inc/store/store.h b/store/inc/store/store.h
index 1c5b55a..1cecdd8 100644
--- a/store/inc/store/store.h
+++ b/store/inc/store/store.h
@@ -22,7 +22,7 @@
#ifndef _STORE_STORE_H_
-#define _STORE_STORE_H_ "$Revision: 1.6 $"
+#define _STORE_STORE_H_ "$Revision$"
#include <store/types.h>
diff --git a/store/inc/store/types.h b/store/inc/store/types.h
index c3d13a5..a24ad83 100644
--- a/store/inc/store/types.h
+++ b/store/inc/store/types.h
@@ -22,7 +22,7 @@
#ifndef _STORE_TYPES_H_
-#define _STORE_TYPES_H_ "$Revision: 1.8 $"
+#define _STORE_TYPES_H_ "$Revision$"
#include <sal/types.h>
#include <rtl/ustring.h>
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index 7b807ae..bd9f05a 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -22,7 +22,7 @@
#ifndef _STORE_STORBASE_HXX_
-#define _STORE_STORBASE_HXX_ "$Revision: 1.10.8.4 $"
+#define _STORE_STORBASE_HXX_ "$Revision$"
#include "sal/types.h"
diff --git a/store/source/storcach.hxx b/store/source/storcach.hxx
index 28d2953..23ca9a5 100644
--- a/store/source/storcach.hxx
+++ b/store/source/storcach.hxx
@@ -22,7 +22,7 @@
#ifndef _STORE_STORCACH_HXX
-#define _STORE_STORCACH_HXX "$Revision: 1.6.8.2 $"
+#define _STORE_STORCACH_HXX "$Revision$"
#include "sal/types.h"
#include "rtl/ref.hxx"
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index a7e6026..87020d6 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -22,7 +22,7 @@
#ifndef _STORE_STORLCKB_HXX_
-#define _STORE_STORLCKB_HXX_ "$Revision: 1.6.8.1 $"
+#define _STORE_STORLCKB_HXX_ "$Revision$"
#include "sal/types.h"
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index 941597b..dd44f53 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -22,7 +22,7 @@
#ifndef _STORE_STORPAGE_HXX_
-#define _STORE_STORPAGE_HXX_ "$Revision: 1.6.8.2 $"
+#define _STORE_STORPAGE_HXX_ "$Revision$"
#include "sal/types.h"
diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx
index 4e14c49..2c5a9c5 100644
--- a/store/source/stortree.hxx
+++ b/store/source/stortree.hxx
@@ -22,7 +22,7 @@
#ifndef _STORE_STORTREE_HXX
-#define _STORE_STORTREE_HXX "$Revision: 1.6.8.2 $"
+#define _STORE_STORTREE_HXX "$Revision$"
#include "sal/types.h"
diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx
index 2724987..46432c2 100644
--- a/store/workben/t_store.cxx
+++ b/store/workben/t_store.cxx
@@ -24,7 +24,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_store.hxx"
-#define _T_STORE_CXX "$Revision: 1.7.8.2 $"
+#define _T_STORE_CXX "$Revision$"
#include <sal/types.h>
#include <osl/diagnose.h>
#include <osl/thread.h>
commit 7bb93885087fd15cad80e61302906cc46fedcd7c
Author: Pedro Giffuni <pfg at apache.org>
Date: Sat Dec 24 15:42:59 2016 +0000
Cleanop license/copyright for the generated ICC header.
In particular follow the guidelines from:
https://www.apache.org/legal/src-headers.html
diff --git a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
index c1460eb..7359f6d 100644
--- a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
+++ b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
@@ -89,15 +89,15 @@ const char * const this_file_name_and_location =" * icc/source/create_sRGB_profi
const char* const description = "sRGB IEC61966-2.1";
//const char* const devicemanufact = "IEC http://www.iec.ch"; not used, device manufactured by OOo seems funny...
const char* const devicemodel = "IEC 61966-2.1 Default RGB colour space - sRGB";
-const char* const copyright = "Licensed under the Apache License, Version 2.0; you may not use this file except in compliance with the License.";
+const char* const copyright = "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. ";
// the creation date is fixed, corresponds to the last time this file has been changed
// NOTE: change this date values whenever the data inside the profile are changed.
-const int data_last_changed_year = 2011;
-const int data_last_changed_month = 10;
-const int data_last_day = 16;
-const int data_last_changed_hour = 18;
-const int data_last_changed_minute = 55;
+const int data_last_changed_year = 2016;
+const int data_last_changed_month = 12;
+const int data_last_day = 24;
+const int data_last_changed_hour = 43;
+const int data_last_changed_minute = 00;
// the following string array it's the standard OOo header format
const char * const TheHeader1[] =
@@ -115,20 +115,22 @@ const char * const TheHeader1[] =
const char * const TheHeader2[] =
{
" *",
- " * Copyright 2012, 2011 Apache OpenOffice.",
+ " * Licensed to the Apache Software Foundation (ASF) under one",
+ " * or more contributor license agreements. See the NOTICE file",
+ " * distributed with this work for additional information",
+ " * regarding copyright ownership. The ASF licenses this file",
+ " * to you under the Apache License, Version 2.0 (the",
+ " * \"License\"); you may not use this file except in compliance",
+ " * with the License. You may obtain a copy of the License at",
" *",
- " * Licensed under the Apache License, Version 2.0 (the \"License\");",
- " * you may not use this file except in compliance with the License.",
- " * You may obtain a copy of the License at",
- " *",
- " * http://www.apache.org/licenses/LICENSE-2.0",
- " *",
- " * Unless required by applicable law or agreed to in writing, software",
- " * distributed under the License is distributed on an \"AS IS\" BASIS,",
- " * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
- " * See the License for the specific language governing permissions and",
- " * limitations under the License.",
+ " * http://www.apache.org/licenses/LICENSE-2.0",
" *",
+ " * Unless required by applicable law or agreed to in writing,",
+ " * software distributed under the License is distributed on an",
+ " * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY",
+ " * KIND, either express or implied. See the License for the",
+ " * specific language governing permissions and limitations",
+ " * under the License.",
" ************************************************************************/",
"",
"#ifndef INCLUDED_ICC_SRGB_IEC61966_2_1_H",
More information about the Libreoffice-commits
mailing list