[Libreoffice-commits] core.git: oox/source solenv/bin ure/source
Caolán McNamara
caolanm at redhat.com
Wed Jan 18 10:11:37 UTC 2017
oox/source/export/ooxml-export-notes.txt | 38 +++++-----
solenv/bin/modules/installer/epmfile.pm | 4 -
ure/source/README | 116 +++++++++++++++----------------
ure/source/uretest/Makefile.pln | 6 -
ure/source/uretest/README | 2
5 files changed, 83 insertions(+), 83 deletions(-)
New commits:
commit 938e918dedb17f371676c1c0c0306442b620584e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 18 10:07:54 2017 +0000
update approximate install location in README
Change-Id: I6a139d5be193c968c2bf3373b415baa25dc32595
diff --git a/oox/source/export/ooxml-export-notes.txt b/oox/source/export/ooxml-export-notes.txt
index 6129e51..d76c083 100644
--- a/oox/source/export/ooxml-export-notes.txt
+++ b/oox/source/export/ooxml-export-notes.txt
@@ -183,19 +183,19 @@ Old binary filters (export)
- odp export
#0 ZipPackage (this=0x1805e80, xNewFactory=@0x7fffe284e990) at /home/rodo/git/ooxml/package/source/zippackage/ZipPackage.cxx:279
#1 0x00002aaaadd3dc94 in ZipPackage_createInstance (xMgr=@0x7fffe284e990) at /home/rodo/git/ooxml/package/source/zippackage/ZipPackage.cxx:1546
- #2 0x00002b0fca7ab6b3 in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3
- #3 0x00002b0fca7a7fda in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3
- #4 0x00002b0fca7a811e in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3
- #5 0x00002b0fca7aa7cc in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3
- #6 0x00002b0fca7aacbe in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3
- #7 0x00002b0fca7aa035 in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3
- #8 0x00002aaaaadae1b3 in ?? () from /opt/openoffice.org/ure/lib/bootstrap.uno.so
- #9 0x00002aaaaadaa84c in ?? () from /opt/openoffice.org/ure/lib/bootstrap.uno.so
+ #2 0x00002b0fca7ab6b3 in ?? () from /opt/libreoffice/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3
+ #3 0x00002b0fca7a7fda in ?? () from /opt/libreoffice/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3
+ #4 0x00002b0fca7a811e in ?? () from /opt/libreoffice/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3
+ #5 0x00002b0fca7aa7cc in ?? () from /opt/libreoffice/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3
+ #6 0x00002b0fca7aacbe in ?? () from /opt/libreoffice/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3
+ #7 0x00002b0fca7aa035 in ?? () from /opt/libreoffice/program/../basis-link/program/../ure-link/lib/libuno_cppuhelpergcc3.so.3
+ #8 0x00002aaaaadae1b3 in ?? () from /opt/libreoffice/ure/lib/bootstrap.uno.so
+ #9 0x00002aaaaadaa84c in ?? () from /opt/libreoffice/ure/lib/bootstrap.uno.so
#10 0x00002aaab5c7a7e5 in OStorage_Impl::OpenOwnPackage (this=0x185cac0) at /home/rodo/git/ooxml/package/source/xstor/xstorage.cxx:549
#11 0x00002aaab5c7ab3e in OStorage_Impl::ReadContents (this=0x185cac0) at /home/rodo/git/ooxml/package/source/xstor/xstorage.cxx:649
#12 0x00002aaab5c7d32f in OStorage_Impl::FindElement (this=0x185cac0, rName=@0x7fffe284f280) at /home/rodo/git/ooxml/package/source/xstor/xstorage.cxx:1387
#13 0x00002aaab5c7dc45 in OStorage::hasByName (this=0x1808880, aName=@0x7fffe284f280) at /home/rodo/git/ooxml/package/source/xstor/xstorage.cxx:4045
- #14 0x00002aaab1fde8c5 in XMLVersionListPersistence::load () from /opt/openoffice.org3.0/program/../basis-link/program/libxolx.so
+ #14 0x00002aaab1fde8c5 in XMLVersionListPersistence::load () from /opt/libreoffice/program/../basis-link/program/libxolx.so
#15 0x00002b0fcb058bb2 in SfxMedium::GetVersionList (this=0x1750050, _bNoReload=false) at /home/rodo/git/ooxml/sfx2/source/doc/docfile.cxx:3247
#16 0x00002b0fcb0571b5 in SfxMedium::GetStorage (this=0x1750050) at /home/rodo/git/ooxml/sfx2/source/doc/docfile.cxx:1328
#17 0x00002b0fcb05d0d7 in SfxMedium::GetOutputStorage (this=0x1750050) at /home/rodo/git/ooxml/sfx2/source/doc/docfile.cxx:1068
@@ -225,17 +225,17 @@ Old binary filters (export)
#33 0x00002b0fcb1a9773 in SfxHintPoster::Event (this=0x11488e0, pPostedHint=0x1484f20) at /home/rodo/git/ooxml/sfx2/source/notify/hintpost.cxx:98
#34 0x00002b0fcb1a9984 in SfxHintPoster::DoEvent_Impl (this=0x11488e0, pPostedHint=0x1484f20) at /home/rodo/git/ooxml/sfx2/source/notify/hintpost.cxx:88
#35 0x00002b0fcb1a974f in SfxHintPoster::LinkStubDoEvent_Impl (pThis=0x11488e0, pCaller=0x1484f20) at /home/rodo/git/ooxml/sfx2/source/notify/hintpost.cxx:92
- #36 0x00002b0fccef69f8 in ImplWindowFrameProc () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so
- #37 0x00002b0fd3f91f8f in SalDisplay::DispatchInternalEvent () from /opt/openoffice.org/basis3.0/program/libvclplug_genlx.so
- #38 0x00002b0fd0fa4a84 in GtkXLib::userEventFn () from /opt/openoffice.org/basis3.0/program/libvclplug_gtklx.so
+ #36 0x00002b0fccef69f8 in ImplWindowFrameProc () from /opt/libreoffice/program/../basis-link/program/libvcllx.so
+ #37 0x00002b0fd3f91f8f in SalDisplay::DispatchInternalEvent () from /opt/libreoffice/basis3.0/program/libvclplug_genlx.so
+ #38 0x00002b0fd0fa4a84 in GtkXLib::userEventFn () from /opt/libreoffice/basis3.0/program/libvclplug_gtklx.so
#39 0x00002b0fd3cb0204 in g_main_context_dispatch () from /usr/lib64/libglib-2.0.so.0
#40 0x00002b0fd3cb34fd in ?? () from /usr/lib64/libglib-2.0.so.0
#41 0x00002b0fd3cb39ce in g_main_context_iteration () from /usr/lib64/libglib-2.0.so.0
- #42 0x00002b0fd0fa4fd9 in GtkXLib::Yield () from /opt/openoffice.org/basis3.0/program/libvclplug_gtklx.so
- #43 0x00002b0fccd1859e in Application::Yield () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so
- #44 0x00002b0fccd18677 in Application::Execute () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so
- #45 0x00002b0fc86fd803 in ?? () from /opt/openoffice.org3.0/program/../basis-link/program/libsoffice.so
- #46 0x00002b0fccd1da24 in ImplSVMain () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so
- #47 0x00002b0fccd1db15 in SVMain () from /opt/openoffice.org3.0/program/../basis-link/program/libvcllx.so
- #48 0x00002b0fc872fe6c in soffice_main () from /opt/openoffice.org3.0/program/../basis-link/program/libsoffice.so
+ #42 0x00002b0fd0fa4fd9 in GtkXLib::Yield () from /opt/libreoffice/basis3.0/program/libvclplug_gtklx.so
+ #43 0x00002b0fccd1859e in Application::Yield () from /opt/libreoffice/program/../basis-link/program/libvcllx.so
+ #44 0x00002b0fccd18677 in Application::Execute () from /opt/libreoffice/program/../basis-link/program/libvcllx.so
+ #45 0x00002b0fc86fd803 in ?? () from /opt/libreoffice/program/../basis-link/program/libsoffice.so
+ #46 0x00002b0fccd1da24 in ImplSVMain () from /opt/libreoffice/program/../basis-link/program/libvcllx.so
+ #47 0x00002b0fccd1db15 in SVMain () from /opt/libreoffice/program/../basis-link/program/libvcllx.so
+ #48 0x00002b0fc872fe6c in soffice_main () from /opt/libreoffice/program/../basis-link/program/libsoffice.so
#49 0x000000000040114b in main ()
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 3ee2ca0..b7b4bcc 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1504,7 +1504,7 @@ sub contains_extension_dir
my $contains_extension_dir = 0;
- # d none opt/openoffice.org3/share/extensions/
+ # d none opt/libreoffice/share/extensions/
for ( my $i = 0; $i <= $#{$prototypefile}; $i++ )
{
@@ -2478,7 +2478,7 @@ sub analyze_rootpath
if ( $installer::globals::isdebbuild )
{
$$relocatablepathref = "";
- # $$staticpathref is already "/opt/openoffice.org3", no additional $rootpath required.
+ # $$staticpathref is already "/opt/libreoffice", no additional $rootpath required.
}
}
diff --git a/ure/source/README b/ure/source/README
index a15dc7d..8a8a8f0 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -21,63 +21,63 @@ Overview of URE installation
ELF platforms (Linux, Solaris, *BSD):
-/opt/openoffice.org/ure/LICENSE
-/opt/openoffice.org/ure/THIRDPARTYLICENSEREADME.html
-/opt/openoffice.org/ure/README
-/opt/openoffice.org/ure/bin/uno
-/opt/openoffice.org/ure/bin/regmerge
-/opt/openoffice.org/ure/bin/regview
-/opt/openoffice.org/ure/bin/javaldx
-/opt/openoffice.org/ure/lib/libuno_cppu.so.3
-/opt/openoffice.org/ure/lib/libuno_cppuhelpergcc3.so.3
-/opt/openoffice.org/ure/lib/libuno_purpenvhelpergcc3.so.3
-/opt/openoffice.org/ure/lib/libuno_sal.so.3
-/opt/openoffice.org/ure/lib/libuno_salhelpergcc3.so.3
-/opt/openoffice.org/ure/share/java/unoloader.jar
-/opt/openoffice.org/ure/share/java/juh.jar
-/opt/openoffice.org/ure/share/java/jurt.jar
-/opt/openoffice.org/ure/share/java/ridl.jar
-/opt/openoffice.org/ure/share/misc/types.rdb
-/opt/openoffice.org/ure/share/misc/services.rdb
-/opt/openoffice.org/ure/lib/libxml2.so.2 [external]
-/opt/openoffice.org/ure/bin/uno.bin [private]
-/opt/openoffice.org/ure/lib/unorc [private]
-/opt/openoffice.org/ure/lib/libreglo.so [private]
-/opt/openoffice.org/ure/lib/libstorelo.so [private]
-/opt/openoffice.org/ure/lib/libunoidllo.so [private]
-/opt/openoffice.org/ure/lib/libxmlreaderlo.so [private]
-/opt/openoffice.org/ure/lib/libjvmaccesslo.so [private]
-/opt/openoffice.org/ure/lib/libjvmfwklo.so [private]
-/opt/openoffice.org/ure/lib/JREProperties.class [private]
-/opt/openoffice.org/ure/lib/jvmfwk3rc [private]
-/opt/openoffice.org/ure/lib/libgcc3_uno.so [private]
-/opt/openoffice.org/ure/lib/libjava_uno.so [private]
-/opt/openoffice.org/ure/lib/libunsafe_uno_uno.so [private]
-/opt/openoffice.org/ure/lib/libaffine_uno_uno.so [private]
-/opt/openoffice.org/ure/lib/liblog_uno_uno.so [private]
-/opt/openoffice.org/ure/lib/libjpipe.so [private]
-/opt/openoffice.org/ure/lib/libjuh.so [private]
-/opt/openoffice.org/ure/lib/libjuhx.so [private]
-/opt/openoffice.org/ure/lib/libsal_textenclo.so [private]
-/opt/openoffice.org/ure/lib/libacceptorlo.so [private]
-/opt/openoffice.org/ure/lib/libbinaryurplo.so [private]
-/opt/openoffice.org/ure/lib/libbootstraplo.so [private]
-/opt/openoffice.org/ure/lib/libconnectorlo.so [private]
-/opt/openoffice.org/ure/lib/libintrospectionlo.so [private]
-/opt/openoffice.org/ure/lib/libinvocadaptlo.so [private]
-/opt/openoffice.org/ure/lib/libinvocationlo.so [private]
-/opt/openoffice.org/ure/lib/libjavaloaderlo.so [private]
-/opt/openoffice.org/ure/lib/libjavavmlo.so [private]
-/opt/openoffice.org/ure/lib/libnamingservicelo.so [private]
-/opt/openoffice.org/ure/lib/libproxyfaclo.so [private]
-/opt/openoffice.org/ure/lib/libreflectionlo.so [private]
-/opt/openoffice.org/ure/lib/libstreamslo.so [private]
-/opt/openoffice.org/ure/lib/libtextinstreamlo.so [private]
-/opt/openoffice.org/ure/lib/libtextoutstreamlo.so [private]
-/opt/openoffice.org/ure/lib/libstocserviceslo.so [private]
-/opt/openoffice.org/ure/lib/libuuresolverlo.so [private]
-/opt/openoffice.org/ure/share/java/java_uno.jar [private]
-/opt/openoffice.org/ure/share/misc/javavendors.xml [private]
+/opt/libreoffice/ure/LICENSE
+/opt/libreoffice/ure/THIRDPARTYLICENSEREADME.html
+/opt/libreoffice/ure/README
+/opt/libreoffice/ure/bin/uno
+/opt/libreoffice/ure/bin/regmerge
+/opt/libreoffice/ure/bin/regview
+/opt/libreoffice/ure/bin/javaldx
+/opt/libreoffice/ure/lib/libuno_cppu.so.3
+/opt/libreoffice/ure/lib/libuno_cppuhelpergcc3.so.3
+/opt/libreoffice/ure/lib/libuno_purpenvhelpergcc3.so.3
+/opt/libreoffice/ure/lib/libuno_sal.so.3
+/opt/libreoffice/ure/lib/libuno_salhelpergcc3.so.3
+/opt/libreoffice/ure/share/java/unoloader.jar
+/opt/libreoffice/ure/share/java/juh.jar
+/opt/libreoffice/ure/share/java/jurt.jar
+/opt/libreoffice/ure/share/java/ridl.jar
+/opt/libreoffice/ure/share/misc/types.rdb
+/opt/libreoffice/ure/share/misc/services.rdb
+/opt/libreoffice/ure/lib/libxml2.so.2 [external]
+/opt/libreoffice/ure/bin/uno.bin [private]
+/opt/libreoffice/ure/lib/unorc [private]
+/opt/libreoffice/ure/lib/libreglo.so [private]
+/opt/libreoffice/ure/lib/libstorelo.so [private]
+/opt/libreoffice/ure/lib/libunoidllo.so [private]
+/opt/libreoffice/ure/lib/libxmlreaderlo.so [private]
+/opt/libreoffice/ure/lib/libjvmaccesslo.so [private]
+/opt/libreoffice/ure/lib/libjvmfwklo.so [private]
+/opt/libreoffice/ure/lib/JREProperties.class [private]
+/opt/libreoffice/ure/lib/jvmfwk3rc [private]
+/opt/libreoffice/ure/lib/libgcc3_uno.so [private]
+/opt/libreoffice/ure/lib/libjava_uno.so [private]
+/opt/libreoffice/ure/lib/libunsafe_uno_uno.so [private]
+/opt/libreoffice/ure/lib/libaffine_uno_uno.so [private]
+/opt/libreoffice/ure/lib/liblog_uno_uno.so [private]
+/opt/libreoffice/ure/lib/libjpipe.so [private]
+/opt/libreoffice/ure/lib/libjuh.so [private]
+/opt/libreoffice/ure/lib/libjuhx.so [private]
+/opt/libreoffice/ure/lib/libsal_textenclo.so [private]
+/opt/libreoffice/ure/lib/libacceptorlo.so [private]
+/opt/libreoffice/ure/lib/libbinaryurplo.so [private]
+/opt/libreoffice/ure/lib/libbootstraplo.so [private]
+/opt/libreoffice/ure/lib/libconnectorlo.so [private]
+/opt/libreoffice/ure/lib/libintrospectionlo.so [private]
+/opt/libreoffice/ure/lib/libinvocadaptlo.so [private]
+/opt/libreoffice/ure/lib/libinvocationlo.so [private]
+/opt/libreoffice/ure/lib/libjavaloaderlo.so [private]
+/opt/libreoffice/ure/lib/libjavavmlo.so [private]
+/opt/libreoffice/ure/lib/libnamingservicelo.so [private]
+/opt/libreoffice/ure/lib/libproxyfaclo.so [private]
+/opt/libreoffice/ure/lib/libreflectionlo.so [private]
+/opt/libreoffice/ure/lib/libstreamslo.so [private]
+/opt/libreoffice/ure/lib/libtextinstreamlo.so [private]
+/opt/libreoffice/ure/lib/libtextoutstreamlo.so [private]
+/opt/libreoffice/ure/lib/libstocserviceslo.so [private]
+/opt/libreoffice/ure/lib/libuuresolverlo.so [private]
+/opt/libreoffice/ure/share/java/java_uno.jar [private]
+/opt/libreoffice/ure/share/misc/javavendors.xml [private]
Windows:
@@ -198,7 +198,7 @@ For more details, see the "Deploying a URE" section of this README.
Deploying a URE
---------------
-By default, the URE is installed in /opt/openoffice.org/ure on Linux,
+By default, the URE is installed in /opt/libreoffice/ure on Linux,
Solaris, and *BSD, and in Program Files\URE on Windows. If you
want, you can override this location when you install the URE, for example, with
rpm --relocate on Linux. The URE is designed so that multiple instances of the
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index e4879c3..7c4bcdd 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -17,14 +17,14 @@
#
# The following variable must be set (see README):
-#SDK_HOME := /opt/openoffice.org/basis3.1/sdk
+#SDK_HOME := /opt/libreoffice/basis3.1/sdk
# The following variables can be set, if necessary (see README):
-#URE_HOME := /opt/openoffice.org
+#URE_HOME := /opt/libreoffice
#GCCS_COMPAT := LD_PRELOAD=/lib/libgcc_s.so.1
-URE_HOME ?= /opt/openoffice.org
+URE_HOME ?= /opt/libreoffice
.DELETE_ON_ERROR:
diff --git a/ure/source/uretest/README b/ure/source/uretest/README
index 2c611a8..8b4f8dc 100644
--- a/ure/source/uretest/README
+++ b/ure/source/uretest/README
@@ -52,7 +52,7 @@ contains the java, javac, and jar executables. For the minimum version
requirements, see the SDK Installation Guide ($SDK_HOME/docs/install.html).
- URE_HOME (optional)
-Overwrites the default URE location, that is, /opt/openoffice.org.
+Overwrites the default URE location, that is, /opt/libreoffice.
- GCCS_COMPAT (optional)
Fixes incompatibility issues between the GCC that was used to build the URE and
More information about the Libreoffice-commits
mailing list