patches/dev300/sfx-check-real-help-path.diff | 73 --------------------------- 1 file changed, 73 deletions(-)
New commits: commit e165ab7c2daed295a1d947cd81de1bb65c8dba59 Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Wed Nov 16 18:37:12 2011 +0100 remove patches/dev300/sfx-check-real-help-path.diff, obsolete as per original author (pmladek) diff --git a/patches/dev300/sfx-check-real-help-path.diff b/patches/dev300/sfx-check-real-help-path.diff deleted file mode 100644 index 131b6d2..0000000 --- a/patches/dev300/sfx-check-real-help-path.diff +++ /dev/null @@ -1,73 +0,0 @@ ---- - sfx2/source/appl/sfxhelp.cxx | 19 +++++++++---------- - unotools/source/config/pathoptions.cxx | 6 +++++- - 2 files changed, 14 insertions(+), 11 deletions(-) - -diff --git sfx2/source/appl/sfxhelp.cxx sfx2/source/appl/sfxhelp.cxx -index d5e6f24..df94b19 100644 ---- sfx2/source/appl/sfxhelp.cxx -+++ sfx2/source/appl/sfxhelp.cxx -@@ -53,10 +53,10 @@ - #include <com/sun/star/system/SystemShellExecuteFlags.hpp> - #include <unotools/configmgr.hxx> - #include <unotools/configitem.hxx> -+#include <unotools/localfilehelper.hxx> - #include <svtools/helpopt.hxx> - #include <unotools/moduleoptions.hxx> - #include <tools/urlobj.hxx> --#include <unotools/configmgr.hxx> - #include <ucbhelper/content.hxx> - #include <unotools/pathoptions.hxx> - #include <rtl/ustring.hxx> -@@ -126,13 +126,13 @@ rtl::OUString HelpLocaleString() - aLocaleStr = aEnglish; - else - { -- rtl::OUString aBaseInstallPath; -- // utl::Bootstrap::PathStatus aBaseLocateResult = -- utl::Bootstrap::locateBaseInstallation(aBaseInstallPath); -- static const char *szHelpPath = "/help/"; -+ String sBaseHelpPathString; -+ ::utl::LocalFileHelper::ConvertPhysicalNameToURL( SvtPathOptions().GetHelpPath(), sBaseHelpPathString ); -+ -+ rtl::OUString sBaseHelpPath( sBaseHelpPathString ); -+ sBaseHelpPath += rtl::OUString::createFromAscii("/"); - -- rtl::OUString sHelpPath = aBaseInstallPath + -- rtl::OUString::createFromAscii(szHelpPath) + aLocaleStr; -+ rtl::OUString sHelpPath = sBaseHelpPath + aLocaleStr; - osl::DirectoryItem aDirItem; - - if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None) -@@ -143,9 +143,8 @@ rtl::OUString HelpLocaleString() - if (nSepPos != STRING_NOTFOUND) - { - bOk = true; -- sLang = sLang.Copy( 0, nSepPos ); -- sHelpPath = aBaseInstallPath + -- rtl::OUString::createFromAscii(szHelpPath) + sLang; -+ sLang = sLang.Copy( 0, nSepPos ); -+ sHelpPath = sBaseHelpPath + sLang; - if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None) - bOk = false; - } -diff --git unotools/source/config/pathoptions.cxx unotools/source/config/pathoptions.cxx -index b02f912..f16e68f 100644 ---- unotools/source/config/pathoptions.cxx -+++ unotools/source/config/pathoptions.cxx -@@ -299,7 +299,11 @@ const String& SvtPathOptions_Impl::GetPath( SvtPathOptions::Pathes ePath ) - { - // These office paths have to be converted to system pathes - utl::LocalFileHelper::ConvertURLToPhysicalName( aPathValue, aResult ); -- aPathValue = aResult; -+ // FIXME: The initial value (not modified by SetPath) is just a path, so the URL-conversion fails. -+ // The best solution is to fix the module xmlhelp to accept the URL. Then we could remove -+ // all these ugly conversions. -+ if ( aResult.Len() != 0 ) -+ aPathValue = aResult; - } - - m_aPathArray[ ePath ] = aPathValue; --- -1.7.0.1 - _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits