ooo-build r11340 - in trunk: . patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Mon Jan 21 14:51:28 2008
New Revision: 11340
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11340&view=rev

Log:
2008-01-21  Petr Mladek  <pmladek suse cz>

	* patches/src680/sw-field-patch.diff: fixes to build sw


Modified:
   trunk/NEWS
   trunk/patches/src680/sw-field-patch.diff

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Jan 21 14:51:28 2008
@@ -1,3 +1,9 @@
+ooo-build-2.3.99.1
+
+    + features:
+    + build bits:
+	+ updated OpenGL slide transitions from CWS (Fridrich)
+
 ooo-build-2.3.99.0
 
     + features:

Modified: trunk/patches/src680/sw-field-patch.diff
==============================================================================
--- trunk/patches/src680/sw-field-patch.diff	(original)
+++ trunk/patches/src680/sw-field-patch.diff	Mon Jan 21 14:51:28 2008
@@ -529,7 +529,7 @@
 + 	pCrsr->GetMark()->nContent++;
 + 
 + 
-+ 	if( pCrsr->IsSelOvr( SELOVER_CHECKNODESSECTION | SELOVER_TOGGLE ) )
++ 	if( pCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE ) )
 + 	{
 + 		pCrsr->DeleteMark();
 + 		pCrsr->RestoreSavePos();
@@ -3295,9 +3295,9 @@
   /*
    * As OS said, we don't have a view when we need to set this, so I have to
 ***************
-*** 683,688 ****
---- 685,696 ----
-              mpDoc->set(IDocumentSettingAccess::USE_OLD_PRINTER_METRICS, bTmp);
+*** 691,696 ****
+--- 693,704 ----
+              mpDoc->set(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT, bTmp);
           }
           break;
 +         case HANDLE_PROTECT_FORM:
@@ -3306,12 +3306,12 @@
 +             mpDoc->set(IDocumentSettingAccess::PROTECT_FORM, bTmp);
 +         }
 +         break;
-  
           default:
   			throw UnknownPropertyException();
+  	}
 ***************
-*** 977,982 ****
---- 985,996 ----
+*** 990,995 ****
+--- 998,1009 ----
               rValue.setValue( &bTmp, ::getBooleanCppuType() );
           }
           break;