rpms/openoffice.org/devel openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
Log Message:
rh#166755# avoid confusing set and be reset lingu options

openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
 com/sun/star/wizards/letter/LetterWizardDialogImpl.java              |    0 
 com/sun/star/wizards/letter/LetterWizardDialogResources.java         |    0 
 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/dialog/optgdlg.cxx                                            |    0 
 source/formwizard/dbwizres.src                                       |    0 
 source/migration/wizard.cxx                                          |    0 
 source/services/substitutepathvars.cxx                               |    0 
 source/ui/misc/glosdoc.cxx                                           |    0 
 svx/source/dialog/optgdlg.cxx                                        |    9 
 sw/source/ui/misc/glosdoc.cxx                                        |   14 -
 util/makefile.mk                                                     |    0 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java      |   28 ++-
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java |   20 +-
 wizards/source/formwizard/dbwizres.src                               |   11 +
 26 files changed, 212 insertions(+), 77 deletions(-)

Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	13 Jul 2005 12:47:38 -0000	1.2
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	25 Aug 2005 12:33:28 -0000	1.3
@@ -594,3 +594,54 @@
  
  // ============================================================================
  // ============================						  ======================
+Index: source/dialog/optgdlg.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/dialog/optgdlg.cxx,v
+retrieving revision 1.23
+diff -u -p -u -r1.23 optgdlg.cxx
+--- openoffice.org.orig/svx/source/dialog/optgdlg.cxx	1 Apr 2005 12:25:23 -0000	1.23
++++ openoffice.org/svx/source/dialog/optgdlg.cxx	25 Aug 2005 12:31:20 -0000
+@@ -1646,6 +1646,7 @@ void OfaLanguagesTabPage::Reset( const S
+ 	SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
+     //collect the configuration values first
+     aCurrentDocCB.Enable(FALSE);
++    aCurrentDocCB.Hide();
+     //
+     Any aWestLang;
+     Any aCJKLang;
+@@ -1669,7 +1670,7 @@ void OfaLanguagesTabPage::Reset( const S
+     //overwrite them by the values provided by the DocShell
+     if(pCurrentDocShell)
+ 	{
+-        aCurrentDocCB.Enable(TRUE);
++        aCurrentDocCB.Enable(FALSE);
+         aCurrentDocCB.Check(bLanguageCurrentDoc_Impl);
+ 		const SfxPoolItem* pLang;
+ 		if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, FALSE, &pLang))
+@@ -1701,7 +1702,7 @@ void OfaLanguagesTabPage::Reset( const S
+ 	aComplexLanguageLB.SaveValue();
+ 	aCurrentDocCB.SaveValue();
+ 
+-    sal_Bool bEnable = !pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale") );
++    sal_Bool bEnable = sal_False;
+     aWesternLanguageFT.Enable( bEnable );
+     aWesternLanguageLB.Enable( bEnable );
+     aWesternLanguageFI.Show(!bEnable);
+@@ -1727,7 +1728,7 @@ IMPL_LINK(  OfaLanguagesTabPage, Support
+     sal_Bool bCheck = pBox->IsChecked();
+ 	if ( &aAsianSupportCB == pBox )
+ 	{
+-        sal_Bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale_CJK"));
++        sal_Bool bReadonly = sal_True;
+         bCheck = ( bCheck && !bReadonly );
+         aAsianLanguageFT.Enable( bCheck );
+     	aAsianLanguageLB.Enable( bCheck );
+@@ -1737,7 +1738,7 @@ IMPL_LINK(  OfaLanguagesTabPage, Support
+ 	}
+ 	else if ( &aCTLSupportCB == pBox )
+ 	{
+-        sal_Bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale_CTL"));
++        sal_Bool bReadonly = sal_True;
+         bCheck = ( bCheck && !bReadonly  );
+         aComplexLanguageFT.Enable( bCheck );
+     	aComplexLanguageLB.Enable( bCheck );