rpms/openoffice.org/devel planned.workspace.defaultdoclang.patch, 1.3, 1.4 workspace.cmcfixes54.patch, 1.1, 1.2

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4366

Modified Files:
	planned.workspace.defaultdoclang.patch 
	workspace.cmcfixes54.patch 
Log Message:
update patchs

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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- planned.workspace.defaultdoclang.patch	24 Feb 2009 23:16:41 -0000	1.3
+++ planned.workspace.defaultdoclang.patch	26 Feb 2009 11:40:59 -0000	1.4
@@ -505,100 +505,6 @@
  
  #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

workspace.cmcfixes54.patch:

Index: workspace.cmcfixes54.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes54.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.cmcfixes54.patch	27 Jan 2009 09:22:12 -0000	1.1
+++ workspace.cmcfixes54.patch	26 Feb 2009 11:40:59 -0000	1.2
@@ -5,18 +5,18 @@
 diff -u -r1.24 NeonPropFindRequest.cxx
 --- openoffice.org.orig/ucb/source/ucp/webdav/NeonPropFindRequest.cxx	10 Apr 2008 15:40:55 -0000	1.24
 +++ openoffice.org/ucb/source/ucp/webdav/NeonPropFindRequest.cxx	20 Jan 2009 16:21:07 -0000
-@@ -103,8 +104,12 @@
+@@ -103,8 +103,12 @@
  			if ( aValue.getLength() )
  			{
                  aValue = aValue.toAsciiLowerCase();
 -				if ( aValue.compareTo(
--						RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 )
-+				if (
-+				    ( aValue.compareTo(
-+						RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 ) ||
-+				    ( aValue.compareTo(
-+						RTL_CONSTASCII_STRINGPARAM( "<dav:collection" ) ) == 0 )
-+				   )
+-					RTL_CONSTASCII_STRINGPARAM( "<dav:collection" ) ) == 0 )
++                if (
++                    ( aValue.compareTo(
++                                RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 ) ||
++                    ( aValue.compareTo(
++                                RTL_CONSTASCII_STRINGPARAM( "<dav:collection" ) ) == 0 )
++                   )
  				{
  					thePropertyValue.Value
  						<<= OUString::createFromAscii( "collection" );