summaryrefslogtreecommitdiff
path: root/sfx2/util
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-07-05 20:18:35 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-07-06 20:29:14 +0100
commite2799d253b1dc62967693aa5bccd7360a9520967 (patch)
treee4946b34da78907603a88e2203620b6536b4a272 /sfx2/util
parentdaba604186e3a819c0fdd8c3d1dec7c604259c10 (diff)
re-base on ALv2 code. Includes:
Patches contributed by Mathias Bauer: cws mba34issues01: #i117713#: remove superfluous assertions about field unit fallbacks http://svn.apache.org/viewvc?view=revision&revision=1172341 cws mba34issues01: #i117718#: provide filter name in case storage of medium does not allow to detect one cws mba34issues01: #i117712#: fix several resource errors introduced by IAccessible2 implementation http://svn.apache.org/viewvc?view=revision&revision=1172343 http://svn.apache.org/viewvc?view=revision&revision=1172350 cws mba34issues01: #i117708#: status indicator for inactive documents http://svn.apache.org/viewvc?view=revision&revision=1172358 cws mba34issues01: #i116025#: fix typo and add missing treatment of new parameter http://svn.apache.org/viewvc?view=revision&revision=1172359 cws mba34issues01: #i117024#: rework parameter conversion for load/save slots http://svn.apache.org/viewvc?view=revision&revision=1172360 cws mba34issues01: #i116803#: possible crash on Linux when dispatch.cxx is compiled with optimization http://svn.apache.org/viewvc?view=revision&revision=1172367 cws mba34issues01: #i114600#: fix compiler warning for name clash found on Solaris http://svn.apache.org/viewvc?view=revision&revision=1172371
Diffstat (limited to 'sfx2/util')
-rwxr-xr-xsfx2/util/make_tco.btm1
-rw-r--r--sfx2/util/sfx.component43
-rw-r--r--sfx2/util/sfx.xml18
3 files changed, 34 insertions, 28 deletions
diff --git a/sfx2/util/make_tco.btm b/sfx2/util/make_tco.btm
deleted file mode 100755
index d25dad24a692..000000000000
--- a/sfx2/util/make_tco.btm
+++ /dev/null
@@ -1 +0,0 @@
-nmake product=full TCV_CORE=t
diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component
index 22ed1e4a9c12..b05a67302e0a 100644
--- a/sfx2/util/sfx.component
+++ b/sfx2/util/sfx.component
@@ -1,30 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org. If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-**********************************************************************-->
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * 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 http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
<component loader="com.sun.star.loader.SharedLibrary" prefix="sfx"
xmlns="http://openoffice.org/2010/uno-components">
diff --git a/sfx2/util/sfx.xml b/sfx2/util/sfx.xml
index 971981cc5171..660744547876 100644
--- a/sfx2/util/sfx.xml
+++ b/sfx2/util/sfx.xml
@@ -1,6 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * 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 http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
<module-name> sfx </module-name>