rpms/openoffice.org/devel openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.11, 1.12

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
Log Message:
more of the langfromlocale stuff

openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
 bin/modules/installer/scriptitems.pm                                 |    0 
 com/sun/star/wizards/letter/LetterWizardDialogImpl.java              |    0 
 com/sun/star/wizards/letter/LetterWizardDialogResources.java         |    0 
 desktop/source/app/langselect.cxx                                    |   15 
 desktop/source/app/langselect.hxx                                    |    2 
 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                                         |   66 ++
 solenv/bin/modules/installer/scriptitems.pm                          |    3 
 source/app/langselect.cxx                                            |    0 
 source/app/langselect.hxx                                            |    0 
 source/appl/sfxhelp.cxx                                              |    0 
 source/formwizard/dbwizres.src                                       |    0 
 source/migration/wizard.cxx                                          |    0 
 source/rc/resmgr.cxx                                                 |    0 
 source/services/substitutepathvars.cxx                               |    0 
 source/treeview/tvread.cxx                                           |    0 
 source/ui/misc/glosdoc.cxx                                           |    0 
 svx/source/dialog/optgdlg.cxx                                        |  248 +++++-----
 svx/source/dialog/optgdlg.hxx                                        |    4 
 sw/source/ui/misc/glosdoc.cxx                                        |   14 
 tools/source/rc/resmgr.cxx                                           |   19 
 util/makefile.mk                                                     |    0 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java      |   24 
 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java |    8 
 wizards/source/formwizard/dbwizres.src                               |   11 
 xmlhelp/source/treeview/tvread.cxx                                   |    4 
 30 files changed, 350 insertions(+), 189 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	2 Feb 2006 14:47:01 -0000	1.11
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	22 Feb 2006 11:26:17 -0000	1.12
@@ -863,7 +863,7 @@
  IMPL_LINK(  OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox )
  {
  	DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" );
-@@ -1778,7 +1778,9 @@
+@@ -1778,23 +1778,23 @@
      sal_Bool bCheck = pBox->IsChecked();
  	if ( &aAsianSupportCB == pBox )
  	{
@@ -874,7 +874,9 @@
          bCheck = ( bCheck && !bReadonly );
          aAsianLanguageFT.Enable( bCheck );
      	aAsianLanguageLB.Enable( bCheck );
-@@ -1788,7 +1790,9 @@
+         aAsianLanguageFI.Show(bReadonly);
+-        if( pBox->IsEnabled() )
+-            m_bOldAsian = bCheck;
  	}
  	else if ( &aCTLSupportCB == pBox )
  	{
@@ -885,6 +887,12 @@
          bCheck = ( bCheck && !bReadonly  );
          aComplexLanguageFT.Enable( bCheck );
      	aComplexLanguageLB.Enable( bCheck );
+         aComplexLanguageFI.Show(bReadonly);
+-        if( pBox->IsEnabled() )
+-            m_bOldCtl = bCheck;
+ 	}
+ 	else
+ 	{
 Index: optgdlg.hxx
 ===================================================================
 RCS file: /cvs/graphics/svx/source/dialog/optgdlg.hxx,v