diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-10 15:52:22 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-08-13 18:05:02 +0200 |
| commit | de63d48f9b8be0f5099f054e0978f3e0d3750864 (patch) | |
| tree | ccfc60445291e0d2a12295047cbce74e1bc5e089 /framework | |
| parent | Page Break: don't show if mouse is gone and button is still invisible (fdo#46... (diff) | |
| download | core-de63d48f9b8be0f5099f054e0978f3e0d3750864.tar.gz core-de63d48f9b8be0f5099f054e0978f3e0d3750864.zip | |
Related fdo#51252: No more prereg, no more unopkg sync
Now that 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
share/prereg/bundled to avoid startup crashes" removed the use of share/prereg,
there is no longer need to generate it in the first place (by calling "unopkg
sync" at build or installation time), and so no need for the "unopkg sync" sub-
command, either. This also allows to simplify some of the jvmfwk code that was
only there so that "unopkg sync" (which can require a JVM) can work in "hostile"
environments (during build and installation).
Conflicts:
setup_native/prj/d.lst
Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f
Signed-off-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 42f27f7b1f96..4449f1e272ea 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -1181,8 +1181,9 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable ::rtl::OUString sVal ; aState = utl::Bootstrap::locateUserData( sVal ); - //There can be the valid case that there is no user installation. For example, "unopkg sync" - //is currently (OOo3.4) run as part of the setup. Then no user installation is required. + //There can be the valid case that there is no user installation. + //TODO: Is that still the case? (With OOo 3.4, "unopkg sync" was run as part + // of the setup. Then no user installation was required.) //Therefore we do not assert here. if( aState == ::utl::Bootstrap::PATH_EXISTS ) { aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ] = ConvertOSLtoUCBURL( sVal ); |