rpms/openoffice.org/devel planned.workspace.defaultdoclang.patch, 1.2, 1.3
Caolan McNamara
caolanm at fedoraproject.org
Tue Feb 24 23:16:41 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23545
Modified Files:
planned.workspace.defaultdoclang.patch
Log Message:
upstream cock-up
planned.workspace.defaultdoclang.patch:
Index: planned.workspace.defaultdoclang.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/planned.workspace.defaultdoclang.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- planned.workspace.defaultdoclang.patch 24 Feb 2009 14:08:11 -0000 1.2
+++ planned.workspace.defaultdoclang.patch 24 Feb 2009 23:16:41 -0000 1.3
@@ -505,6 +505,100 @@
#include <vcl/svapp.hxx>
+@@ -678,7 +679,7 @@
+ aAAPointLimitUnits ( this, SVX_RES( FT_POINTLIMIT_UNIT )),
+ #endif
+ aMenuFL ( this, SVX_RES( FL_MENU ) ),
+- aMenuIconsCB ( this, SVX_RES( CB_MENU_ICONS )),
++ aMenuIconsLB ( this, SVX_RES( LB_MENU_ICONS )),
+ aFontListsFL ( this, SVX_RES( FL_FONTLISTS) ),
+ aFontShowCB ( this, SVX_RES( CB_FONT_SHOW ) ),
+ aFontHistoryCB ( this, SVX_RES( CB_FONT_HISTORY ) ),
+@@ -734,7 +735,7 @@
+ Control* pMiscOptions[] =
+ {
+ &aMenuFL, &aFontShowCB,
+- &aFontListsFL, &aFontHistoryCB, &aMenuIconsCB
++ &aFontListsFL, &aFontHistoryCB, &aMenuIconsLB
+ };
+
+ // temporaryly create the checkbox for the anti aliasing (we need to to determine it's pos)
+@@ -770,11 +771,11 @@
+ switch( Application::GetSettings().GetStyleSettings().GetAutoSymbolsStyle() )
+ {
+ case STYLE_SYMBOLS_DEFAULT: aAutoStr += aIconStyleLB.GetEntry( 1 ); break;
+- case STYLE_SYMBOLS_INDUSTRIAL: aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
+- case STYLE_SYMBOLS_CRYSTAL: aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
+- case STYLE_SYMBOLS_TANGO: aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
+- case STYLE_SYMBOLS_CLASSIC: aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
+- case STYLE_SYMBOLS_HICONTRAST: aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
++ case STYLE_SYMBOLS_HICONTRAST: aAutoStr += aIconStyleLB.GetEntry( 2 ); break;
++ case STYLE_SYMBOLS_INDUSTRIAL: aAutoStr += aIconStyleLB.GetEntry( 3 ); break;
++ case STYLE_SYMBOLS_CRYSTAL: aAutoStr += aIconStyleLB.GetEntry( 4 ); break;
++ case STYLE_SYMBOLS_TANGO: aAutoStr += aIconStyleLB.GetEntry( 5 ); break;
++ case STYLE_SYMBOLS_CLASSIC: aAutoStr += aIconStyleLB.GetEntry( 6 ); break;
+ }
+
+ aIconStyleLB.RemoveEntry( 0 );
+@@ -915,23 +916,18 @@
+ }
+ #endif
+
+- if ( bAppearanceChanged )
+- {
+- pAppearanceCfg->Commit();
+- pAppearanceCfg->SetApplicationDefaults ( GetpApp() );
+- }
+-
+ if ( aFontShowCB.IsChecked() != aFontShowCB.GetSavedValue() )
+ {
+ aFontOpt.EnableFontWYSIWYG( aFontShowCB.IsChecked() );
+ bModified = TRUE;
+ }
+
+- if(aMenuIconsCB.IsChecked() != aMenuIconsCB.GetSavedValue())
++ if(aMenuIconsLB.GetSelectEntryPos() != aMenuIconsLB.GetSavedValue())
+ {
+- aMenuOpt.SetMenuIconsState( aMenuIconsCB.IsChecked() );
++ aMenuOpt.SetMenuIconsState( aMenuIconsLB.GetSelectEntryPos() == 0 ? 2 : aMenuIconsLB.GetSelectEntryPos() - 1);
+ bModified = TRUE;
+ bMenuOptModified = TRUE;
++ bAppearanceChanged = TRUE;
+ }
+
+ if ( aFontHistoryCB.IsChecked() != aFontHistoryCB.GetSavedValue() )
+@@ -984,7 +980,6 @@
+ // Set changed settings to the application instance
+ AllSettings aAllSettings = Application::GetSettings();
+ StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
+- aStyleSettings.SetUseImagesInMenus( aMenuIconsCB.IsChecked() );
+ if( m_aSystemFont.IsEnabled() )
+ aStyleSettings.SetUseSystemUIFonts( m_aSystemFont.IsChecked() );
+ aAllSettings.SetStyleSettings(aStyleSettings);
+@@ -992,6 +987,12 @@
+ Application::SetSettings(aAllSettings);
+ }
+
++ if ( bAppearanceChanged )
++ {
++ pAppearanceCfg->Commit();
++ pAppearanceCfg->SetApplicationDefaults ( GetpApp() );
++ }
++
+ return bModified;
+ }
+
+@@ -1049,8 +1050,8 @@
+ SvtFontOptions aFontOpt;
+ aFontShowCB.Check( aFontOpt.IsFontWYSIWYGEnabled() );
+ SvtMenuOptions aMenuOpt;
+- aMenuIconsCB.Check(aMenuOpt.IsMenuIconsEnabled());
+- aMenuIconsCB.SaveValue();
++ aMenuIconsLB.SelectEntryPos(aMenuOpt.GetMenuIconsState() == 2 ? 0 : aMenuOpt.GetMenuIconsState() + 1);
++ aMenuIconsLB.SaveValue();
+ aFontHistoryCB.Check( aFontOpt.IsFontHistoryEnabled() );
+
+ { // #i95644# HW accel (unified to disable mechanism)
@@ -1201,8 +1202,13 @@
// initialize user interface language selection
@@ -533,12 +627,12 @@
- aLocaleSettingLB .SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, FALSE, FALSE, FALSE);
- aLocaleSettingLB.InsertLanguage( LANGUAGE_SYSTEM );
+ aComplexLanguageLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::COMPLEX );
++
++ aLocaleSettingLB.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, FALSE, FALSE, FALSE);
++ aLocaleSettingLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::WEAK );
- // insert SYSTEM entry, no specific currency
- aCurrencyLB.InsertEntry( aStr );
-+ aLocaleSettingLB.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, FALSE, FALSE, FALSE);
-+ aLocaleSettingLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::WEAK );
-+
+ const NfCurrencyTable& rCurrTab = SvNumberFormatter::GetTheCurrencyTable();
+ const NfCurrencyEntry& rCurr = SvNumberFormatter::GetCurrencyEntry( LANGUAGE_SYSTEM );
+ // insert SYSTEM entry
@@ -552,7 +646,16 @@
USHORT nCurrCount = rCurrTab.Count();
// first entry is SYSTEM, skip it
for ( USHORT j=1; j < nCurrCount; ++j )
-@@ -1495,7 +1509,7 @@
+@@ -1282,7 +1296,7 @@
+ String aStr_( pCurr->GetBankSymbol() );
+ aStr_ += aTwoSpace;
+ aStr_ += pCurr->GetSymbol();
+- aStr = ApplyLreOrRleEmbedding( aStr_ );
++ aStr_ = ApplyLreOrRleEmbedding( aStr_ );
+ aStr_ += aTwoSpace;
+ aStr_ += ApplyLreOrRleEmbedding( pLanguageTable->GetString( pCurr->GetLanguage() ) );
+ USHORT nPos = aCurrencyLB.InsertEntry( aStr_ );
+@@ -1496,7 +1510,7 @@
if(!bCurrentDocCBChecked)
{
Any aValue;
@@ -561,7 +664,7 @@
aValue <<= aLocale;
OUString aPropName( C2U("DefaultLocale") );
pLangConfig->aLinguConfig.SetProperty( aPropName, aValue );
-@@ -1504,7 +1518,8 @@
+@@ -1505,7 +1519,8 @@
}
if(pCurrentDocShell)
{
@@ -571,7 +674,7 @@
bRet = TRUE;
}
}
-@@ -1515,7 +1530,7 @@
+@@ -1516,7 +1531,7 @@
if(!bCurrentDocCBChecked)
{
Any aValue;
@@ -580,7 +683,7 @@
aValue <<= aLocale;
OUString aPropName( C2U("DefaultLocale_CJK") );
pLangConfig->aLinguConfig.SetProperty( aPropName, aValue );
-@@ -1524,7 +1539,8 @@
+@@ -1525,7 +1540,8 @@
}
if(pCurrentDocShell)
{
@@ -590,7 +693,7 @@
bRet = TRUE;
}
}
-@@ -1535,7 +1551,7 @@
+@@ -1536,7 +1552,7 @@
if(!bCurrentDocCBChecked)
{
Any aValue;
@@ -599,7 +702,7 @@
aValue <<= aLocale;
OUString aPropName( C2U("DefaultLocale_CTL") );
pLangConfig->aLinguConfig.SetProperty( aPropName, aValue );
-@@ -1544,7 +1560,8 @@
+@@ -1545,7 +1561,8 @@
}
if(pCurrentDocShell)
{
@@ -609,7 +712,7 @@
bRet = TRUE;
}
}
-@@ -1644,13 +1661,18 @@
+@@ -1645,13 +1662,18 @@
aWestLang = pLangConfig->aLinguConfig.GetProperty(C2U("DefaultLocale"));
Locale aLocale;
aWestLang >>= aLocale;
@@ -631,7 +734,7 @@
}
catch(Exception&)
{
-@@ -1662,13 +1684,25 @@
+@@ -1663,13 +1685,25 @@
aCurrentDocCB.Check(bLanguageCurrentDoc_Impl);
const SfxPoolItem* pLang;
if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, FALSE, &pLang))
More information about the scm-commits
mailing list