Commits

Anonymous committed 12cca37

CWS-TOOLING: integrate CWS mav42_DEV300

Comments (0)

Files changed (5)

oox/source/docprop/docprophandler.cxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: docprophandler.cxx,v $
- * $Revision: 1.2 $
+ * $Revision: 1.2.22.1 $
  *
  * This file is part of OpenOffice.org.
  *
                         break;
 
                     case XML_revision|NMSP_COREPR:
-                        m_xDocProp->setEditingCycles( (sal_Int16)aChars.toInt32() );
+                        try
+                        {
+                            m_xDocProp->setEditingCycles(
+                                static_cast<sal_Int16>(aChars.toInt32()) );
+                        }
+                        catch (lang::IllegalArgumentException &)
+                        {
+                            // ignore
+                        }
                         break;
 
                     case XML_subject|NMSP_DC:
                         break;
 
                     case XML_TotalTime|NMSP_EXTPR:
-                        m_xDocProp->setEditingDuration( aChars.toInt32() );
+                        try
+                        {
+                            m_xDocProp->setEditingDuration( aChars.toInt32() );
+                        }
+                        catch (lang::IllegalArgumentException &)
+                        {
+                            // ignore
+                        }
                         break;
 
                     case XML_Characters|NMSP_EXTPR:

scp2/source/ooo/file_library_ooo.scp

 
 STD_LIB_FILE( gid_File_Lib_Sax , sax)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Oox , oox)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oox , oox)
 
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sb , sb)
 

sfx2/source/doc/docinf.cxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: docinf.cxx,v $
- * $Revision: 1.54 $
+ * $Revision: 1.54.174.2 $
  *
  * This file is part of OpenOffice.org.
  *
 			i_xDocProps->setPrintDate( aInvalid );
 
         if( xGlobSect->GetStringValue( aStrValue, PROPID_REVNUMBER ) )
-            i_xDocProps->setEditingCycles(
-                static_cast< sal_Int16 >( aStrValue.ToInt32() ) );
+        {
+            sal_Int16 nRevision = static_cast< sal_Int16 >( aStrValue.ToInt32() );
+            if ( nRevision > 0 )
+                i_xDocProps->setEditingCycles( nRevision );
+        }
 
         if( xGlobSect->GetFileTimeValue( aDateTime, PROPID_EDITTIME ) )
         {
             aDateTime.Year  -= 1601;
             aDateTime.Month -= 1;
             aDateTime.Day   -= 1;
-            i_xDocProps->setEditingDuration(
-                aDateTime.Day     * 60*60*24 +
-                aDateTime.Hours   * 60*60    +
-                aDateTime.Minutes * 60       +
-                aDateTime.Seconds            );
+            try
+            {
+                i_xDocProps->setEditingDuration(
+                    aDateTime.Day     * 60*60*24 +
+                    aDateTime.Hours   * 60*60    +
+                    aDateTime.Minutes * 60       +
+                    aDateTime.Seconds            );
+            }
+            catch (lang::IllegalArgumentException &)
+            {
+                // ignore
+            }
         }
     }
 

sfx2/source/doc/objcont.cxx

 	}
 
 	pImp->nTime = aNow;
-	i_xDocProps->setEditingDuration(
-        aOldTime.GetHour()*3600+aOldTime.GetMin()*60+aOldTime.GetSec());
-    i_xDocProps->setEditingCycles(i_xDocProps->getEditingCycles() + 1);
+    try {
+        i_xDocProps->setEditingDuration(
+            aOldTime.GetHour()*3600+aOldTime.GetMin()*60+aOldTime.GetSec());
+        i_xDocProps->setEditingCycles(i_xDocProps->getEditingCycles() + 1);
+    }
+    catch (lang::IllegalArgumentException &)
+    {
+        // ignore overflow
+    }
 }
 
 //--------------------------------------------------------------------

sfx2/source/doc/objmisc.cxx

             xDocProps->setAutoloadURL(
                 aObj.GetMainURL( INetURLObject::NO_DECODE ) );
 		}
-        xDocProps->setAutoloadSecs( nTime );
+        try
+        {
+            xDocProps->setAutoloadSecs( nTime );
+        }
+        catch (lang::IllegalArgumentException &)
+        {
+            // ignore
+        }
 	}
 	else if( rKV.GetKey().CompareIgnoreCaseToAscii( "expires" ) == COMPARE_EQUAL )
 	{