[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch, NONE, 1.1 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, NONE, 1.1 openoffice.org.spec, 1.281, 1.282 openoffice.org-1.9.87.rh151357.patch, 1.10, NONE



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28724

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch 
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
Removed Files:
	openoffice.org-1.9.87.rh151357.patch 
Log Message:
dump extraneous audio support

openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch:
 config/ssolar.cmn              |    0 
 config/ssrc680.ini             |    0 
 config_office/configure.in     |   10 +++++++++-
 config_office/set_soenv.in     |    1 +
 solenv/config/ssolar.cmn       |    1 +
 solenv/config/ssrc680.ini      |    2 ++
 unx/source/app/makefile.mk     |    0 
 unx/source/app/vsound.hxx      |    0 
 util/makefile.mk               |    0 
 vcl/unx/source/app/makefile.mk |    8 ++++++++
 vcl/unx/source/app/vsound.hxx  |    4 ----
 vcl/util/makefile.mk           |    2 ++
 12 files changed, 23 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch ---
Index: configure.in
===================================================================
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.126
diff -u -r1.126 configure.in
--- openoffice.org.orig/config_office/configure.in	21 Jun 2005 10:13:47 -0000	1.126
+++ openoffice.org/config_office/configure.in	7 Jul 2005 17:54:17 -0000
@@ -176,6 +176,9 @@
                           distributions where the myspell dictionaries are
                           installed from other sources
 ],,)
+AC_ARG_WITH(nas,
+[  --without-nas           Removes nas support
+],,)
 AC_ARG_WITH(system-libs,
 [  --with-system-libs      Use libs already on system -- enables all
                           --with-system-* flags except mozilla, python and
@@ -3006,13 +3012,18 @@
     )
     AC_CHECK_LIB(audio, AuOpenServer, [],
         [AC_MSG_ERROR(nas not found or functional)], [-L$XLIB -lXt])
-else
+    ENABLE_NAS=YES
+elif test -z "$with_nas"; then
     AC_MSG_RESULT([internal])
     SYSTEM_NAS=NO
+    ENABLE_NAS=YES
     BUILD_TYPE="$BUILD_TYPE NAS"
+else
+    AC_MSG_RESULT([none])
 fi
 AC_SUBST(SYSTEM_NAS)
 AC_SUBST(NAS_INCLUDES)
+AC_SUBST(ENABLE_NAS)
 
 AC_MSG_CHECKING([whether to enable portaudio/sndfile support])
 if test "$_os" != "WINNT" && \
Index: set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.68
diff -u -r1.68 set_soenv.in
--- openoffice.org.orig/config_office/set_soenv.in	20 Jun 2005 15:18:00 -0000	1.68
+++ openoffice.org/config_office/set_soenv.in	7 Jul 2005 17:54:29 -0000
@@ -1741,6 +1741,7 @@
 ToFile( "SYSTEM_BOOST",      "@SYSTEM_BOOST@",     "e" );
 ToFile( "SYSTEM_NAS",        "@SYSTEM_NAS@",       "e" );
 ToFile( "NAS_INCLUDES",      "@NAS_INCLUDES@",     "e" );
+ToFile( "ENABLE_NAS",        "@ENABLE_NAS@",       "e" );
 ToFile( "ENABLE_PASF",       "@ENABLE_PASF@",      "e" );
 ToFile( "SYSTEM_SNDFILE",    "@SYSTEM_SNDFILE@",   "e" );
 ToFile( "SYSTEM_PORTAUDIO",  "@SYSTEM_PORTAUDIO@", "e" );
Index: config/ssolar.cmn
===================================================================
RCS file: /cvs/tools/solenv/config/ssolar.cmn,v
retrieving revision 1.51
diff -u -r1.51 ssolar.cmn
--- openoffice.org.orig/solenv/config/ssolar.cmn	18 Mar 2005 16:39:40 -0000	1.51
+++ openoffice.org/solenv/config/ssolar.cmn	7 Jul 2005 17:52:25 -0000
@@ -70,6 +70,7 @@
         ENABLE_GTK
         ENABLE_GNOMEVFS
         ENABLE_PASF
+        ENABLE_NAS
 		ENABLEUNICODE
         HAVE_GCC_VISIBILITY_FEATURE
 		GCRINC
Index: config/ssrc680.ini
===================================================================
RCS file: /cvs/tools/solenv/config/ssrc680.ini,v
retrieving revision 1.71
diff -u -r1.71 ssrc680.ini
--- openoffice.org.orig/solenv/config/ssrc680.ini	18 Apr 2005 12:02:37 -0000	1.71
+++ openoffice.org/solenv/config/ssrc680.ini	7 Jul 2005 17:52:48 -0000
@@ -2064,6 +2064,7 @@
 		COPYALL
 		GXX_INCLUDE_PATH
         ENABLE_PASF
+        ENABLE_NAS
 	}
 	restore
 	{
@@ -2230,6 +2231,7 @@
 			CPUNAME INTEL
 			DLLSUFFIX li
             ENABLE_PASF TRUE
+            ENABLE_NAS TRUE
 			INPATH unxlngi6%PROEXT%
 			GVERDIR unxlngi6%PROEXT%
 			OUTPATH unxlngi6
Index: unx/source/app/makefile.mk
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/makefile.mk,v
retrieving revision 1.20
diff -u -r1.20 makefile.mk
--- openoffice.org.orig/vcl/unx/source/app/makefile.mk	18 Mar 2005 10:31:27 -0000	1.20
+++ openoffice.org/vcl/unx/source/app/makefile.mk	7 Jul 2005 17:56:44 -0000
@@ -108,6 +108,14 @@
 			$(SLO)$/rptpsound.obj		\
 			$(SLO)$/nassound.obj		
 
+
+
+.IF "$(ENABLE_NAS)" != ""
+.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
+CFLAGS+=-DUSE_NAS
+.ENDIF
+.ENDIF
+
 .IF "$(ENABLE_PASF)" != ""
 CFLAGS+=-DUSE_PASF
 SLOFILES+=$(SLO)$/pasfsound.obj
Index: unx/source/app/vsound.hxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/vsound.hxx,v
retrieving revision 1.8
diff -u -r1.8 vsound.hxx
--- openoffice.org.orig/vcl/unx/source/app/vsound.hxx	9 Nov 2004 16:49:10 -0000	1.8
+++ openoffice.org/vcl/unx/source/app/vsound.hxx	7 Jul 2005 17:57:05 -0000
@@ -69,10 +69,6 @@
 #define USE_DEVAUDIO
 #endif
 
-#if defined (LINUX) || defined(FREEBSD) || defined (SOLARIS)
-#define USE_NAS
-#endif
-
 #if STLPORT_VERSION>=321
 #include <cstdarg>
 #endif
Index: util/makefile.mk
===================================================================
RCS file: /cvs/gsl/vcl/util/makefile.mk,v
retrieving revision 1.69
diff -u -r1.69 makefile.mk
--- openoffice.org.orig/vcl/util/makefile.mk	17 Jun 2005 09:29:14 -0000	1.69
+++ openoffice.org/vcl/util/makefile.mk	7 Jul 2005 17:57:38 -0000
@@ -325,6 +325,7 @@
 SHL2STDLIBS += -lsndfile -lportaudio
 .ENDIF # ENABLE_PASF
 
+.IF "$(ENABLE_NAS)" != ""
 .IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
 SHL2STDLIBS += -laudio
 .IF "$(OS)"=="SOLARIS"
@@ -332,6 +333,7 @@
 SHL2STDLIBS += -ldl -lnsl -lsocket
 .ENDIF # SOLARIS
 .ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD"
+.ENDIF
 
 .IF "$(GUIBASE)"=="unx"
 

openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
 desktop/source/app/langselect.cxx                          |   10 -
 desktop/source/app/langselect.hxx                          |    2 
 desktop/source/app/userinstall.cxx                         |   15 --
 desktop/source/migration/wizard.cxx                        |   19 --
 framework/source/services/substitutepathvars.cxx           |   93 +++++++++++++
 framework/util/makefile.mk                                 |    1 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |    8 -
 registry/schema/org/openoffice/Office/Common.xcs           |    0 
 sfx2/source/appl/sfxhelp.cxx                               |   59 +++++++-
 source/app/langselect.cxx                                  |    0 
 source/app/langselect.hxx                                  |    0 
 source/app/userinstall.cxx                                 |    0 
 source/appl/sfxhelp.cxx                                    |    0 
 source/migration/wizard.cxx                                |    0 
 source/services/substitutepathvars.cxx                     |    0 
 source/ui/misc/glosdoc.cxx                                 |    0 
 sw/source/ui/misc/glosdoc.cxx                              |   14 -
 util/makefile.mk                                           |    0 
 18 files changed, 161 insertions(+), 60 deletions(-)

--- NEW FILE openoffice.org-1.9.87.rh151357.setlangtolocale.patch ---
Index: source/app/langselect.cxx
===================================================================
RCS file: /cvs/framework/desktop/source/app/langselect.cxx,v
retrieving revision 1.14
diff -u -p -r1.14 langselect.cxx
--- openoffice.org.orig/desktop/source/app/langselect.cxx	11 Mar 2005 10:47:45 -0000	1.14
+++ openoffice.org/desktop/source/app/langselect.cxx	29 Mar 2005 09:01:28 -0000
@@ -118,7 +118,7 @@ Locale LanguageSelection::IsoStringToLoc
 bool LanguageSelection::prepareLanguage()
 {
     // get the selected UI language as string
-    OUString aLocaleString = getLanguageString();
+    OUString aLocaleString = getLanguageString(true);
     if ( aLocaleString.getLength() > 0 )
     {
         OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
@@ -199,7 +199,7 @@ void LanguageSelection::setDefaultLocale
     }
 }
 
-OUString LanguageSelection::getLanguageString()
+OUString LanguageSelection::getLanguageString(bool bAllowUnInstalled)
 {
     // did we already find a language?
     if (bFoundLanguage)
@@ -208,7 +208,7 @@ OUString LanguageSelection::getLanguageS
     OUString aUserLanguage = getUserLanguage();
     if (aUserLanguage.getLength() > 0 )
     {
-        if (isInstalledLanguage(aUserLanguage))
+        if (bAllowUnInstalled || isInstalledLanguage(aUserLanguage))
         {
             // all is well
             bFoundLanguage = sal_True;
@@ -225,7 +225,7 @@ OUString LanguageSelection::getLanguageS
     aUserLanguage = getSystemLanguage();
     if (aUserLanguage.getLength() > 0 )
     {
-        if (isInstalledLanguage(aUserLanguage, sal_False))
+        if (bAllowUnInstalled || isInstalledLanguage(aUserLanguage, sal_False))
         {
             // great, system default language is available
             bFoundLanguage = sal_True;
@@ -235,7 +235,7 @@ OUString LanguageSelection::getLanguageS
     }
     // fallback 1: en-US
     OUString usFB = usFallbackLanguage;
-    if (isInstalledLanguage(usFB))
+    if (bAllowUnInstalled || isInstalledLanguage(usFB))
     {
         bFoundLanguage = sal_True;
         aFoundLanguage = usFallbackLanguage;
Index: source/app/langselect.hxx
===================================================================
RCS file: /cvs/framework/desktop/source/app/langselect.hxx,v
retrieving revision 1.8
diff -u -p -r1.8 langselect.hxx
--- openoffice.org.orig/desktop/source/app/langselect.hxx	11 Mar 2005 10:47:59 -0000	1.8
+++ openoffice.org/desktop/source/app/langselect.hxx	29 Mar 2005 09:01:28 -0000
@@ -96,7 +96,7 @@ private:
 
 public:
     static com::sun::star::lang::Locale IsoStringToLocale(const rtl::OUString& str);
-    static rtl::OUString getLanguageString();
+    static rtl::OUString getLanguageString(bool bAllowUnInstalled=false);
     static bool prepareLanguage();
 };
 
Index: source/migration/wizard.cxx
===================================================================
RCS file: /cvs/framework/desktop/source/migration/wizard.cxx,v
retrieving revision 1.3
diff -u -p -r1.3 wizard.cxx
--- openoffice.org.orig/desktop/source/migration/wizard.cxx	11 Mar 2005 10:50:09 -0000	1.3
+++ openoffice.org/desktop/source/migration/wizard.cxx	29 Mar 2005 09:01:44 -0000
@@ -590,25 +590,8 @@ OUString FirstStartWizard::getLicensePat
         // yuck! no license :/
     }
 
-    // determine the filename of the license to show
-	OUString  aLangString;
-    ::com::sun::star::lang::Locale aLocale;
-    OString aMgrName = OString("dkt") + OString::valueOf((sal_Int32)SUPD, 10);
-    AllSettings aSettings(Application::GetSettings());
-    aLocale = aSettings.GetUILocale();
-    ResMgr* pResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);    
+    OUString aLangString(OUString::createFromAscii("en-US"));
 
-    aLangString = aLocale.Language;
-    if ( aLocale.Country.getLength() != 0 )
-    {
-        aLangString += OUString::createFromAscii("-");
-        aLangString += aLocale.Country;
-	    if ( aLocale.Variant.getLength() != 0 )
-        {
-	        aLangString += OUString::createFromAscii("-");
-	        aLangString += aLocale.Variant;
-        }
-    }
 #ifdef WNT
     aLicensePath = 
         aBaseInstallPath + OUString::createFromAscii(szLicensePath)
Index: source/appl/sfxhelp.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/appl/sfxhelp.cxx,v
retrieving revision 1.64
diff -u -p -u -r1.64 sfxhelp.cxx
--- openoffice.org.orig/sfx2/source/appl/sfxhelp.cxx	9 Jun 2005 13:54:45 -0000	1.64
+++ openoffice.org/sfx2/source/appl/sfxhelp.cxx	10 Jun 2005 17:02:29 -0000
@@ -125,6 +125,9 @@
 #ifndef _URLOBJ_HXX
 #include <tools/urlobj.hxx>
 #endif
+#ifndef _ISOLANG_HXX
+#include <tools/isolang.hxx>
+#endif
 #ifndef _UTL_CONFIGMGR_HXX_
 #include <unotools/configmgr.hxx>
 #endif
@@ -135,6 +138,11 @@
 #include <svtools/pathoptions.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/process.h>
+#include <osl/file.hxx>
+#ifndef _UTL_BOOTSTRAP_HXX
+#include <unotools/bootstrap.hxx>
+#endif
+
 #include <rtl/uri.hxx>
 #include <vcl/msgbox.hxx>
 #include <svtools/ehdl.hxx>
@@ -191,16 +199,50 @@ void NoHelpErrorBox::RequestHelp( const 
 
 #define STARTERLIST 0
 
+rtl::OUString HelpLocaleString()
+{
+	static rtl::OUString aLocaleStr;
+	if (!aLocaleStr.getLength())
+	{
+		// detect installed locale
+		Any aLocale =
+			::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( 
+			   ::utl::ConfigManager::LOCALE );
+		bool bOk = (aLocale >>= aLocaleStr);
+		if ( bOk )
+		{
+			rtl::OUString aBaseInstallPath;
+			utl::Bootstrap::PathStatus aBaseLocateResult =
+				utl::Bootstrap::locateBaseInstallation(aBaseInstallPath);
+			static const char *szHelpPath = "/help/";
+
+			rtl::OUString sHelpPath = aBaseInstallPath +
+				rtl::OUString::createFromAscii(szHelpPath) + aLocaleStr;
+			osl::DirectoryItem aDirItem;
+			if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None)
+			{
+				String sLang(aLocaleStr);
+				xub_StrLen nSepPos = sLang.Search( '-' );     
+				if (nSepPos != STRING_NOTFOUND)
+				{
+        			sLang = sLang.Copy( 0, nSepPos );
+					sHelpPath = aBaseInstallPath +
+						rtl::OUString::createFromAscii(szHelpPath) + sLang;
+					if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None)
+						bOk = false;
+				}
+			}
+		}
+		if (!bOk)
+			aLocaleStr = rtl::OUString( DEFINE_CONST_UNICODE("en") );
+	}
+	return aLocaleStr;
+}
+
+
 void AppendConfigToken_Impl( String& rURL, sal_Bool bQuestionMark )
 {
-	// this completes a help url with the system parameters "Language" and "System"
-	// detect installed locale
-	Any aLocale =
-		::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( ::utl::ConfigManager::LOCALE );
-    ::rtl::OUString aLocaleStr;
-	if ( !( aLocale >>= aLocaleStr ) )
-		// fallback is english
-		aLocaleStr = ::rtl::OUString( DEFINE_CONST_UNICODE("en") );
+	::rtl::OUString aLocaleStr(HelpLocaleString());
 
 	// query part exists?
 	if ( bQuestionMark )
@@ -215,6 +257,7 @@ void AppendConfigToken_Impl( String& rUR
 	rURL += String( aLocaleStr );
 	rURL += DEFINE_CONST_UNICODE("&System=");
 	rURL += SvtHelpOptions().GetSystem();
+
 }
 
 // -----------------------------------------------------------------------
Index: source/app/userinstall.cxx
===================================================================
RCS file: /cvs/framework/desktop/source/app/userinstall.cxx,v
retrieving revision 1.16
diff -u -p -u -r1.16 userinstall.cxx
--- openoffice.org.orig/desktop/source/app/userinstall.cxx	11 Mar 2005 10:48:28 -0000	1.16
+++ openoffice.org/desktop/source/app/userinstall.cxx	9 Jun 2005 08:27:23 -0000
@@ -330,27 +330,20 @@ namespace desktop {
             OUString aDefaultLocale( OUString::createFromAscii("DefaultLocale") );
             OUString aDefaultLocale_CJK( OUString::createFromAscii("DefaultLocale_CJK") );
             OUString aTmp;
-            if (aUserLanguage.equalsAscii("ja") || aUserLanguage.equalsAscii("ko")
-                || aUserLanguage.equalsAscii("zh-CN") || aUserLanguage.equalsAscii("zh-TW"))
+            if (aLocale.Language.equalsAscii("ja") || aLocale.Language.equalsAscii("ko")
+                || aLocale.Language.equalsAscii("zh"))
             {
                 // only set the locales if there is not already a value set
                 // (inititially there is no value set in the configuration)
                 pset->getPropertyValue(aDefaultLocale) >>= aTmp;
                 if (!aTmp.getLength())
                     pset->setPropertyValue(aDefaultLocale, makeAny(OUString::createFromAscii("en-US")));
-                pset->getPropertyValue(aDefaultLocale_CJK) >>= aTmp;
-                if (!aTmp.getLength())
-                    pset->setPropertyValue(aDefaultLocale_CJK, makeAny(aUserLanguage));
+                pset->setPropertyValue(aDefaultLocale_CJK, makeAny(aUserLanguage));
             } else
             {
-                // only set the locales if there is not already a value set
-                // (inititially there is no value set in the configuration)
-                pset->getPropertyValue(aDefaultLocale) >>= aTmp;
-                if (!aTmp.getLength())
-                    pset->setPropertyValue(aDefaultLocale, makeAny(aUserLanguage));
+                pset->setPropertyValue(aDefaultLocale, makeAny(aUserLanguage));
             }
             Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges();
-
             v.Value = makeAny(OUString::createFromAscii("org.openoffice.Setup"));
             theArgs[0] <<= v;
             Reference< XHierarchicalPropertySet> hpset(
Index: source/services/substitutepathvars.cxx
===================================================================
RCS file: /cvs/framework/framework/source/services/substitutepathvars.cxx,v
retrieving revision 1.10
diff -u -p -r1.10 substitutepathvars.cxx
--- openoffice.org.orig/framework/source/services/substitutepathvars.cxx	13 Jan 2005 19:14:36 -0000	1.10
+++ openoffice.org/framework/source/services/substitutepathvars.cxx	29 Jun 2005 10:45:59 -0000
@@ -151,6 +151,14 @@
 #include <rtl/ustrbuf.hxx>
 #endif
 
+#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
+#include <com/sun/star/container/XNameAccess.hpp>
+#endif
+
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
+#endif
+
 //_________________________________________________________________________________________________________________
 //	Defines
 //_________________________________________________________________________________________________________________
@@ -1215,6 +1223,88 @@ throw ( NoSuchElementException, RuntimeE
 	return rtl::OUString();
 }
 
+using rtl::OUString;
+using rtl::OString;
+
+Reference< XNameAccess > getConfigAccess(const sal_Char* pPath, sal_Bool bUpdate)
+{
+    Reference< XNameAccess > xNameAccess;
+    try{
+        OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
+        OUString sAccessSrvc;
+        if (bUpdate)
+            sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess");
+        else
+            sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess");
+
+        OUString sConfigURL = OUString::createFromAscii(pPath);
+
+        // get configuration provider
+        Reference< XMultiServiceFactory > theMSF = comphelper::getProcessServiceFactory();
+        if (theMSF.is()) {
+            Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory > (
+                theMSF->createInstance( sConfigSrvc ),UNO_QUERY_THROW );
+
+            // access the provider
+            Sequence< Any > theArgs(1);
+            theArgs[ 0 ] <<= sConfigURL;
+            xNameAccess = Reference< XNameAccess > (
+                theConfigProvider->createInstanceWithArguments(
+                    sAccessSrvc, theArgs ), UNO_QUERY_THROW );
+        }
+    } catch (com::sun::star::uno::Exception& e)
+    {
+        OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
+        OSL_ENSURE(sal_False, aMsg.getStr());
+    }
+    return xNameAccess;
+}
+
+void getInstallMapping(OUString& usLocale)
+{
+    Sequence< OUString > seqLanguages;
+    Reference< XNameAccess > xAccess = 
+		getConfigAccess(
+			"org.openoffice.Setup/Office/InstalledLocales", sal_False);    
+    if (xAccess.is())
+    	seqLanguages = xAccess->getElementNames();
+
+    for (sal_Int32 i=0; i<seqLanguages.getLength(); i++)
+    {
+        if (usLocale.equals(seqLanguages[i]))
+			return;
+    }
+
+    // try fallback locales
+    if (usLocale.equalsAscii("zh-HK")) 
+	{
+		OUString sTemp = OUString::createFromAscii("zh-TW");
+    	for (sal_Int32 i=0; i<seqLanguages.getLength(); i++)
+    	{
+        	if (sTemp.equals(seqLanguages[i]))
+			{
+                usLocale = sTemp;
+				return;
+			}
+    	}
+	}
+
+    // no exact match was found, well try to find a substitute
+    OUString aInstalledLocale;
+    for (sal_Int32 i=0; i<seqLanguages.getLength(); i++)
+    {
+        if (usLocale.indexOf(seqLanguages[i]) == 0)
+        {
+            // requested locale starts with the installed locale
+            // (i.e. installed locale has index 0 in requested locale)
+            usLocale = seqLanguages[i];
+	    return;
+            break;
+        }
+    }
+    usLocale = OUString::createFromAscii("en-US");
+}
+
 void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariables& aPreDefPathVariables )
 {
 	utl::ConfigManager* pCfgMgr = utl::ConfigManager::GetConfigManager();
@@ -1278,7 +1368,10 @@ void SubstitutePathVariables::SetPredefi
 	Any aLocale = utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE );
 	rtl::OUString aLocaleStr;
 	if ( aLocale >>= aLocaleStr )
+	{
+		getInstallMapping(aLocaleStr);
 		aPreDefPathVariables.m_eLanguageType = ConvertIsoStringToLanguage( aLocaleStr );
+	}
 	else
 	{
 		LOG_ERROR( "SubstitutePathVariables::SetPredefinedPathVariables", "Wrong Any type for language!" );
Index: util/makefile.mk
===================================================================
RCS file: /cvs/framework/framework/util/makefile.mk,v
retrieving revision 1.96
diff -u -p -r1.96 makefile.mk
--- openoffice.org.orig/framework/util/makefile.mk	22 Apr 2005 11:36:59 -0000	1.96
+++ openoffice.org/framework/util/makefile.mk	29 Jun 2005 10:45:59 -0000
@@ -212,6 +212,7 @@ SHL3STDLIBS=	\
 				$(CPPUHELPERLIB)					\
 				$(CPPULIB)							\
 				$(VOSLIB)							\
+				$(COMPHELPERLIB)						\
 				$(SALLIB)
 
 SHL3DEF=        $(MISC)$/$(SHL3TARGET).def
Index: source/ui/misc/glosdoc.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/misc/glosdoc.cxx,v
retrieving revision 1.19
diff -u -p -r1.19 glosdoc.cxx
--- openoffice.org.orig/sw/source/ui/misc/glosdoc.cxx	11 Jan 2005 12:42:19 -0000	1.19
+++ openoffice.org/sw/source/ui/misc/glosdoc.cxx	29 Jun 2005 11:02:03 -0000
@@ -577,19 +577,7 @@ void SwGlossaries::UpdateGlosPath(sal_Bo
 		}
 		aDirArr.DeleteAndDestroy(0, aDirArr.Count());
 
-		if(!nTokenCount ||
-			sErrPath.Len() && (bPathChanged || sOldErrPath != sErrPath) )
-		{
-			sOldErrPath = sErrPath;
-			// Falscher Pfad, d.h. AutoText-Verzeichnis existiert nicht
-
-			ErrorHandler::HandleError( *new StringErrorInfo(
-									ERR_AUTOPATH_ERROR, sErrPath,
-									ERRCODE_BUTTON_OK | ERRCODE_MSG_ERROR ));
-			bError = sal_True;
-		}
-		else
-			bError = sal_False;
+		bError = sal_False;
 
 		if(pGlosArr)
 		{
Index: registry/schema/org/openoffice/Office/Common.xcs
===================================================================
RCS file: /cvs/util/officecfg/registry/schema/org/openoffice/Office/Common.xcs,v
retrieving revision 1.107
diff -u -p -u -r1.107 Common.xcs
--- openoffice.org.orig/officecfg/registry/schema/org/openoffice/Office/Common.xcs	2 Feb 2005 16:41:38 -0000	1.107
+++ openoffice.org/officecfg/registry/schema/org/openoffice/Office/Common.xcs	29 Jun 2005 11:08:26 -0000
@@ -1288,7 +1288,7 @@ Dymamic border coloring means that when 
 						<author>OS</author>
 						<desc>Contains the directory which contains the AutoText modules.</desc>
 					</info>
-					<value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(userurl)/autotext</value>
+					<value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(insturl)/share/autotext/en-US:$(userurl)/autotext</value>
 				</prop>
 				<prop oor:name="Backup" oor:type="xs:string">
 					<info>
@@ -1408,7 +1408,7 @@ Dymamic border coloring means that when 
 						<author>MBA</author>
 						<desc>Specifies the templates originate from these folders and sub-folders.</desc>
 					</info>
-					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(userurl)/template</value>
+					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template/en-US:$(userurl)/template</value>
 				</prop>
 				<prop oor:name="UIConfig" oor:type="oor:string-list">
 					<info>
@@ -1460,7 +1460,7 @@ Dymamic border coloring means that when 
 					<info>
 						<desc>Specifies the default directory where the AutoText modules are located.</desc>
 					</info>
-					<value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(userurl)/autotext</value>
+					<value oor:separator=":">$(insturl)/share/autotext/$(vlang):$(insturl)/share/autotext/en-US:$(userurl)/autotext</value>
 				</prop>
 				<prop oor:name="Backup" oor:type="xs:string">
 					<info>
@@ -1556,7 +1556,7 @@ Dymamic border coloring means that when 
 					<info>
 						<desc>Specifies the default directory where all provided templates are located in folders and sub-folders.</desc>
 					</info>
-					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(userurl)/template</value>
+					<value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template/en-US:$(userurl)/template</value>
 				</prop>
 				<prop oor:name="UIConfig" oor:type="oor:string-list">
 					<info>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -r1.281 -r1.282
--- openoffice.org.spec	7 Jul 2005 16:14:23 -0000	1.281
+++ openoffice.org.spec	7 Jul 2005 20:30:48 -0000	1.282
@@ -1,5 +1,5 @@
 %define ooo2ver 115
-%define ooo_rpm_release 1
+%define ooo_rpm_release 2
 %define build_fc4 0
 %define build_fc5 1
 
@@ -70,7 +70,7 @@
 Patch7:  openoffice.org-1.9.84.ooo45162.svxcasting2.patch
 Patch8:  openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
 Patch9:  openoffice.org-1.9.87.warnnoterroronmissing.patch
-Patch10: openoffice.org-1.9.87.rh151357.patch
+Patch10: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
 Patch11: openoffice.org-1.9.88.rh133741.alwaysgtk.patch
 Patch12: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
 Patch13: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
@@ -102,9 +102,9 @@
 Patch39: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
 Patch40: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
 Patch41: openoffice.org-1.9.110.oooXXXXX.psprintfriend.patch
-Patch42: openoffice.org-1.9.111.ooo51091.exportgcjsymbolname.jvmaccess.patch
+#Patch42: openoffice.org-1.9.111.ooo51091.exportgcjsymbolname.jvmaccess.patch
 Patch43: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
-Patch44: openoffice.org-1.9.112.oooXXXXX.testtools.patch
+#Patch44: openoffice.org-1.9.112.oooXXXXX.testtools.patch
 Patch45: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
 Patch46: openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch
 Patch47: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
@@ -114,6 +114,7 @@
 Patch51: openoffice.org-1.9.114.ooo51638.mailmerge.patch
 Patch52: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
 Patch53: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
+Patch54: openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -703,7 +704,7 @@
 %patch7  -p1 -b .ooo45162.svxcasting2.patch
 %patch8  -p1 -b .usetwodotzeropath.patch
 %patch9  -p1 -b .warnnoterroronmissing.patch
-%patch10 -p1 -b .rh151357.patch
+%patch10 -p1 -b .rh151357.setlangtolocale.patch
 %patch11 -p1 -b .rh133741.alwaysgtk.patch
 %patch12 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
 %patch13 -p1 -b .ooo35627.parallel.cppumaker.patch
@@ -735,9 +736,9 @@
 %patch39 -p1 -b .NONE.gcc3gcj4.patch
 %patch40 -p1 -b .ooo9290.goodies.epstoepdf.patch
 %patch41 -p1 -b .oooXXXXX.psprintfriend.patch
-%patch42 -p1 -b .ooo51091.exportgcjsymbolname.jvmaccess.patch
+#%patch42 -p1 -b .ooo51091.exportgcjsymbolname.jvmaccess.patch
 %patch43 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
-%patch44 -p1 -b .oooXXXXX.testtools.patch
+#%patch44 -p1 -b .oooXXXXX.testtools.patch
 %patch45 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
 %patch46 -p1 -b .ooo43430.cvskk.np_sdk.patch
 %patch47 -p1 -b .ooo51385.bridges.stack.patch
@@ -747,19 +748,20 @@
 %patch51 -p1 -b .ooo51638.mailmerge.patch
 %patch52 -p1 -b .oooXXXXX.nostlport.patch
 %patch53 -p1 -b .ooo51673.printing.checkerror.patch
+%patch54 -p1 -b .oooXXXXX.audio.withoutnas.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
-#libxmlsec/portaudio/sndfile/db4 then this needs to be modified/dropped
+#libxmlsec/db4 then this needs to be modified/dropped
 find_provides="%{__find_provides}"
 echo "#!/bin/sh" > find-provides
-echo "$find_provides | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_" >> find-provides
+echo "$find_provides | grep -v libxmlsec1 | grep -v libdb- | grep -v libdb_" >> find-provides
 echo "exit 0" >> find-provides
 chmod +x find-provides
 %define __find_provides %{_builddir}/SRC680_m%{ooo2ver}/find-provides
 
 find_requires="%{__find_requires}"
 echo "#!/bin/sh" > find-requires
-echo "$find_requires | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_ | grep -v \(" >> find-requires
+echo "$find_requires | grep -v libxmlsec1 | grep -v libdb- | grep -v libdb_ | grep -v \(" >> find-requires
 echo "exit 0" >> find-requires
 chmod +x find-requires
 %define __find_requires %{_builddir}/SRC680_m%{ooo2ver}/find-requires
@@ -779,7 +781,7 @@
 fi
 cd config_office
 autoconf
-%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --disable-fontooo --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-nas --without-system-sndfile --without-system-portaudio --without-system-db --without-fonts --without-stlport4 %{withlang}
+%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --disable-fontooo --disable-nas --disable-pasf --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-stlport4 %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -2031,8 +2033,6 @@
 %{instdir}/program/libitg680*.so
 %{instdir}/program/libiti680*.so
 %{instdir}/program/libofficebean.so
-%{instdir}/program/libportaudio.so*
-%{instdir}/program/libsndfile.so*
 %{instdir}/program/libfile680*.so
 %{instdir}/program/libfileacc.so
 %{instdir}/program/libfilterconfig1.so
@@ -2925,6 +2925,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Jul 07 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.115-2
+- add openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch
+  and disable worthless nas/portaudio/sndfile stuff
+
 * Thu Jul 07 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.115-1
 - bump to next version
 - add openoffice.org-1.9.115.ooo51673.printing.checkerror.patch


--- openoffice.org-1.9.87.rh151357.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]