Commits

Anonymous committed 9eb5dcd

CWS-TOOLING: integrate CWS impress163_DEV300

Comments (0)

Files changed (24)

cppcanvas/source/mtfrenderer/implrenderer.cxx

                                     break;
 
                                 case GRADIENT_AXIAL:
+                                    // vcl considers center color as start color
+                                    ::std::swap(aColors[0],aColors[1]);
                                     aTexture.Gradient = xFactory->createAxialHorizontalGradient( aColors,
                                                                                                  aStops );
                                     break;

scp2/source/canvas/canvascommons.scp

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: canvascommons.scp,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.226.1 $
  *
  * This file is part of OpenOffice.org.
  *
     Name = "/registry/data/org/openoffice/Office/Canvas.xcu";
 End 
 
-STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
+STD_LIB_FILE_PATCH(gid_File_Lib_CppCanvas, cppcanvas)
 STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
 
 #ifdef ENABLE_AGG

scp2/source/ooo/file_library_ooo.scp

     Styles = (PACKED,PATCH,UNO_COMPONENT);
 End
 
-STD_UNO_LIB_FILE( gid_File_Lib_Sd , sd)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sd , sd)
 STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
 
 File gid_File_Lib_Slideshow
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT,PATCH);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = gid_Dir_Program;
   #ifdef UNX
 File gid_File_Lib_Vcl
     Name = LIBNAME(vcl);
     TXT_FILE_BODY;
-    Styles = (PACKED,UNO_COMPONENT);
+    Styles = (PACKED,UNO_COMPONENT,PATCH);
     Dir = gid_Dir_Program;
     RegistryID = gid_Starregistry_Services_Rdb;
 End

sd/inc/drawdoc.hxx

 	void	            InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF);
 	void	            DeletePage(USHORT nPgNum);
 	SdrPage*            RemovePage(USHORT nPgNum);
+
+    virtual void     InsertMasterPage(SdrPage* pPage, USHORT nPos=0xFFFF);
+	virtual SdrPage* RemoveMasterPage(USHORT nPgNum);
+
 	void	            RemoveUnnessesaryMasterPages( SdPage* pMaster=NULL, BOOL bOnlyDuplicatePages=FALSE, BOOL bUndo=TRUE );
 	SD_DLLPUBLIC void 	SetMasterPage(USHORT nSdPageNum, const String& rLayoutName,
 					    	          SdDrawDocument* pSourceDoc, BOOL bMaster, BOOL bCheckMasters);

sd/inc/stlpool.hxx

 
 class SdStyleSheetPool : public SdStyleSheetPoolBase, public SfxListener
 {
+    friend class SdDrawDocument;
 public:
 						SdStyleSheetPool(SfxItemPool const& rPool, SdDrawDocument* pDocument);
 
 	using  SfxStyleSheetPool::Create;
 	virtual ~SdStyleSheetPool();
 
-	virtual void 		Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
 	void AddStyleFamily( const SdPage* pPage );
 	void RemoveStyleFamily( const SdPage* pPage );
 

sd/source/core/drawdoc2.cxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: drawdoc2.cxx,v $
- * $Revision: 1.46 $
+ * $Revision: 1.46.76.1 $
  *
  * This file is part of OpenOffice.org.
  *
 	return pPage;
 }
 
+// Warning: This is not called for new master pages created from SdrModel::Merge,
+// you also have to modify code in SdDrawDocument::Merge!
+void SdDrawDocument::InsertMasterPage(SdrPage* pPage, USHORT nPos )
+{
+    FmFormModel::InsertMasterPage( pPage, nPos );
+    if( pPage && pPage->IsMasterPage() && (static_cast<SdPage*>(pPage)->GetPageKind() == PK_STANDARD) )
+    {
+		// new master page created, add its style family
+        SdStyleSheetPool* pStylePool = (SdStyleSheetPool*) GetStyleSheetPool();
+        if( pStylePool )
+            pStylePool->AddStyleFamily( static_cast<SdPage*>(pPage) );
+    }
+}
+
+SdrPage* SdDrawDocument::RemoveMasterPage(USHORT nPgNum)
+{
+    SdPage* pPage = static_cast<SdPage*>(GetMasterPage(nPgNum ));
+    if( pPage && pPage->IsMasterPage() && (pPage->GetPageKind() == PK_STANDARD) )
+    {
+		// master page removed, remove its style family
+		SdStyleSheetPool* pStylePool = (SdStyleSheetPool*) GetStyleSheetPool();
+        if( pStylePool )
+            pStylePool->RemoveStyleFamily( pPage );
+    }
+
+    return FmFormModel::RemoveMasterPage(nPgNum);
+}
+
 /*************************************************************************
 |*
 |* Seiten selektieren

sd/source/core/drawdoc3.cxx

 			   FASTBOOL bMergeMasterPages, FASTBOOL bAllMasterPages,
 			   FASTBOOL bUndo, FASTBOOL bTreadSourceAsConst)
 {
+    sal_uInt16 nMasterPageCount = GetMasterPageCount();
 	SdrModel::Merge( rSourceModel, nFirstPageNum, nLastPageNum, nDestPos, bMergeMasterPages, bAllMasterPages, bUndo, bTreadSourceAsConst );
+
+    // add style family for each new master page
+    for( sal_uInt16 nMaster = nMasterPageCount; nMaster < GetMasterPageCount(); nMaster++ )
+    {
+        SdPage* pPage = static_cast< SdPage* >( GetMasterPage( nMaster ) );
+        if( pPage && pPage->IsMasterPage() && (pPage->GetPageKind() == PK_STANDARD) )
+        {
+		    // new master page created, add its style family
+            SdStyleSheetPool* pStylePool = (SdStyleSheetPool*) GetStyleSheetPool();
+            if( pStylePool )
+                pStylePool->AddStyleFamily( pPage );
+        }
+    }
 }

sd/source/core/stlpool.cxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: stlpool.cxx,v $
- * $Revision: 1.41 $
+ * $Revision: 1.41.68.2 $
  *
  * This file is part of OpenOffice.org.
  *
 		for( sal_uInt16 nPage = 0; nPage < nCount; ++nPage )
 			AddStyleFamily( mpDoc->GetMasterSdPage(nPage,PK_STANDARD) );
 
-		StartListening( *mpDoc );
+//		StartListening( *mpDoc );
 	}
 }
 
 
 void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily )
 {
+    String aHelpFile;
+
 	sal_uInt32 nCount = rSourcePool.aStyles.size();
 
 	std::vector< std::pair< rtl::Reference< SfxStyleSheetBase >, String > > aNewStyles;
                 if( aParent.Len() )
 					aNewStyles.push_back( std::pair< rtl::Reference< SfxStyleSheetBase >, String >( xNewSheet, aParent ) );
 
+                xNewSheet->SetHelpId( aHelpFile, xSheet->GetHelpId( aHelpFile ) );
 				xNewSheet->GetItemSet().Put( xSheet->GetItemSet() );
 			}
 		}
 
 	List* pNameList = CreateLayoutSheetNames(rLayoutName);
 
+    String sEmpty;
 	String* pName = (String*)pNameList->First();
 	while (pName)
 	{
 			{
 				// falls einer mit Methusalem-Doks. ankommt
 				SfxStyleSheetBase& rNewSheet = Make(*pName, SD_STYLE_FAMILY_MASTERPAGE);
+                rNewSheet.SetHelpId( sEmpty, pSourceSheet->GetHelpId( sEmpty ) );
 				rNewSheet.GetItemSet().Put(pSourceSheet->GetItemSet());
 				rCreatedSheets.push_back( SdStyleSheetRef( static_cast< SdStyleSheet* >( &rNewSheet ) ) );
 			}
 
 // --------------------------------------------------------------------
 
-void SdStyleSheetPool::Notify( SfxBroadcaster&, const SfxHint& rHint )
-{
-	const SdrHint* pSdrHint = dynamic_cast< const SdrHint* >( &rHint );
-	if( pSdrHint && pSdrHint->GetKind() == HINT_PAGEORDERCHG )
-	{
-		const SdPage* pPage = static_cast< const SdPage* >( pSdrHint->GetPage() );
-		if( pPage && pPage->IsMasterPage() && (pPage->GetPageKind() == PK_STANDARD) )
-		{
-			if( pPage->IsInserted() )
-			{
-				// new master page created, add its style family
-				AddStyleFamily( pPage );
-			}
-			else
-			{
-				// master page removed, remove its style family
-				RemoveStyleFamily( pPage );
-			}
-		}
-	}
-}
-
-// --------------------------------------------------------------------
-
 void SdStyleSheetPool::AddStyleFamily( const SdPage* pPage )
 {
 	rtl::Reference< SfxStyleSheetPool > xPool( this );
 		{
 		}
 
-		EndListening( *mpDoc );
+//		EndListening( *mpDoc );
 		mpDoc = 0;
 	}
 }

sd/source/filter/xml/sdtransform.cxx

 
 				bool bState = false;
                 const sal_Int16 nDepth = mrOutliner.GetDepth( nPara );
-				if( (nDepth != -1) && getBulletState( aParaSet, mrOutliner.GetStyleSheet( nPara ), bState ) && !bState )
+				if( (nDepth != -1) && (!getBulletState( aParaSet, mrOutliner.GetStyleSheet( nPara ), bState ) || !bState) )
 				{
 					// disable bullet if text::enable-bullet="false" is found
                     if( (nDepth > 0 ) && (rTextShape.GetObjInventor()  == SdrInventor) && (rTextShape.GetObjIdentifier() == OBJ_OUTLINETEXT) )
 				            while(nWhich)
 				            {
 					            if(SFX_ITEM_SET != aParaSet.GetItemState(nWhich, true))
+                                {
 						            aParaSet.Put(rStyleSet.Get(nWhich));
+                                    bItemChange = true;
+                                }
 
 					            nWhich = aIter.NextWhich();
 				            }

sd/source/ui/framework/configuration/ConfigurationController.cxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ConfigurationController.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
     throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard (maMutex);
-    ThrowIfDisposed();
+
+    // Allow unlocking while the ConfigurationController is being disposed
+    // (but not when that is done and the controller is disposed.)
+    if (rBHelper.bDisposed)
+        ThrowIfDisposed();
 
     OSL_ASSERT(mpImplementation->mnLockCount>0);
     --mpImplementation->mnLockCount;

sd/source/ui/func/fuolbull.cxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fuolbull.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.104.1 $
  *
  * This file is part of OpenOffice.org.
  *
 				case RET_OK:
 				{
 					SfxItemSet aSet( *pDlg->GetOutputItemSet() );
-/* i35937
-					if (mpView->ISA(DrawViewShell) )
-					{
-						if( mpView->GetMarkedObjectList().GetMarkCount() == 0)
-						{
-							SfxUInt16Item aBulletState( EE_PARA_BULLETSTATE, 0 );
-							aSet.Put(aBulletState);
-						}
-					}
-*/
+
+	                OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
+
+	                std::auto_ptr< OutlineViewModelChangeGuard > aGuard;
+
+	                if (mpView->ISA(OutlineView))
+	                {
+		                pOLV = static_cast<OutlineView*>(mpView)
+                            ->GetViewByWindow(mpViewShell->GetActiveWindow());
+
+		                aGuard.reset( new OutlineViewModelChangeGuard( static_cast<OutlineView&>(*mpView) ) );
+	                }
+
+                    if( pOLV )
+                        pOLV->EnableBullets();
+
 					rReq.Done( aSet );
 					pArgs = rReq.GetArgs();
 				}

sd/source/ui/func/fuprlout.cxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fuprlout.cxx,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.130.1 $
  *
  * This file is part of OpenOffice.org.
  *
 	}
 }
 
-/*************************************************************************
-|*
-|* Layoutvorlage von einem StyleSheetPool in einen anderen uebertragen
-|*
-\************************************************************************/
-
-void FuPresentationLayout::TransferLayoutTemplate(String aFromName,
-												  String aToName,
-												  SfxStyleSheetBasePool* pFrom,
-												  SfxStyleSheetBasePool* pTo)
-{
-	SfxStyleSheetBase* pHis = pFrom->Find(aFromName,SD_STYLE_FAMILY_MASTERPAGE);
-	SfxStyleSheetBase* pMy	= pTo->Find(aToName, SD_STYLE_FAMILY_MASTERPAGE);
-
-	DBG_ASSERT(pHis, "neue Layoutvorlage nicht gefunden");
-
-	// gibt's noch nicht: neu anlegen
-	if (!pMy)
-	{
-		pMy = &(pTo->Make(aToName, SD_STYLE_FAMILY_MASTERPAGE));
-	}
-
-	// Inhalte neu setzen
-	if (pHis)
-		pMy->GetItemSet().Set(pHis->GetItemSet());
-}
-
-
 } // end of namespace sd

sd/source/ui/inc/fuprlout.hxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fuprlout.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.130.1 $
  *
  * This file is part of OpenOffice.org.
  *
         ::sd::View* pView,
         SdDrawDocument* pDoc, 
         SfxRequest& rReq);
-
-	void TransferLayoutTemplate(String aFromName, String aToName,
-								SfxStyleSheetBasePool* pFrom,
-								SfxStyleSheetBasePool* pTo);
 };
 
 } // end of namespace sd

sd/source/ui/slidesorter/controller/SlideSorterController.cxx

             }
             mbIsContextMenuOpen = false;
             if (pPage == NULL)
+            {
+                // Select slide before the insertion indicator before it is
+                // hidden, so that a pending slide insertion slot finds the
+                // right place to insert a new slide.
+                mpPageSelector->SelectPage(
+                    mrView.GetOverlay().GetInsertionIndicatorOverlay().GetInsertionPageIndex()-1);
                 mrView.GetOverlay().GetInsertionIndicatorOverlay().Hide();
+            }
             bEventHasBeenHandled = true;
         }
         break;

slideshow/source/engine/slideview.cxx

                                                   maTransformation );
 
         basegfx::B2DHomMatrix aMatrix( maTransformation );
-        aMatrix.translate( -basegfx::fround(aTmpRect.getMinX()),
-                           -basegfx::fround(aTmpRect.getMinY()) );
+
+        // Add translation according to the origin of aTmpRect.  Ignore the
+        // translation when aTmpRect was not properly initialized.
+        if ( ! aTmpRect.isEmpty())
+        {
+            aMatrix.translate( -basegfx::fround(aTmpRect.getMinX()),
+                               -basegfx::fround(aTmpRect.getMinY()) );
+        }
 
         return aMatrix;
     }

svx/inc/svx/outliner.hxx

 	*/
 	void        ToggleBullets();
 
+	/** enables numbering for the selected paragraphs that are not enabled and ignore all selected
+		paragraphs that already have numbering enabled.
+	*/
+    void        EnableBullets();
+
 	BOOL        IsCursorAtWrongSpelledWord( BOOL bMarkIfWrong = FALSE );
 	BOOL        IsWrongSpelledWordAtPos( const Point& rPosPixel, BOOL bMarkIfWrong = FALSE );
 	void        SpellIgnoreWord();

svx/source/accessibility/AccessibleContextBase.cxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: AccessibleContextBase.cxx,v $
- * $Revision: 1.28 $
+ * $Revision: 1.28.144.1 $
  *
  * This file is part of OpenOffice.org.
  *
     const uno::Any& rNewValue,
     const uno::Any& rOldValue)
 {
-    AccessibleEventObject aEvent (
-        static_cast<XAccessibleContext*>(this),
-        nEventId,
-        rNewValue,
-        rOldValue);
+    // Do not call FireEvent and do not even create the event object when no
+    // listener has been registered yet.  Creating the event object can
+    // otherwise lead to a crash.  See issue 93419 for details.
+	if (mnClientId != 0)
+    {
+        AccessibleEventObject aEvent (
+            static_cast<XAccessibleContext*>(this),
+            nEventId,
+            rNewValue,
+            rOldValue);
 
-    FireEvent (aEvent);
+        FireEvent (aEvent);
+    }
 }
 
 

svx/source/outliner/outlvw.cxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: outlvw.cxx,v $
- * $Revision: 1.34 $
+ * $Revision: 1.34.150.2 $
  *
  * This file is part of OpenOffice.org.
  *
 	pOwner->UndoActionEnd( OLUNDO_DEPTH );
 }
 
+void OutlinerView::EnableBullets()
+{
+	pOwner->UndoActionStart( OLUNDO_DEPTH );
+
+	ESelection aSel( pEditView->GetSelection() );
+	aSel.Adjust();
+
+	const bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
+	pOwner->pEditEngine->SetUpdateMode( FALSE );
+
+	for ( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+	{
+		Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
+		DBG_ASSERT(pPara, "OutlinerView::ToggleBullets(), illegal selection?");
+
+		if( pPara && (pOwner->GetDepth(nPara) == -1) )
+		{
+			pOwner->SetDepth( pPara, 0 );
+		}
+	}
+
+    USHORT nParaCount = (USHORT) (pOwner->pParaList->GetParagraphCount()-1);
+    pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount );
+    pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) );
+
+	pOwner->pEditEngine->SetUpdateMode( bUpdate );
+
+	pOwner->UndoActionEnd( OLUNDO_DEPTH );
+}
+
+
 void OutlinerView::RemoveAttribsKeepLanguages( BOOL bRemoveParaAttribs )
 {
     RemoveAttribs( bRemoveParaAttribs, 0, TRUE /*keep language attribs*/ );

svx/source/table/cell.cxx

 void Cell::SetOutlinerParaObject( OutlinerParaObject* pTextObject )
 {
 	SdrText::SetOutlinerParaObject( pTextObject );
+    maSelection.nStartPara = 0xffff;
 }
 
 // -----------------------------------------------------------------------------
 
 OUString SAL_CALL Cell::getString(  ) throw (RuntimeException)
 {
+    maSelection.nStartPara = 0xffff;
 	return SvxUnoTextBase::getString();
 }
 

svx/source/table/tablecolumn.hxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tablecolumn.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.264.1 $
  *
  * This file is part of OpenOffice.org.
  *
 class TableColumn : public TableColumnBase
 {
 	friend class TableColumnUndo;
+    friend class TableModel;
 public:
 	TableColumn( const TableModelRef& xTableModel, sal_Int32 nColumn );
 	virtual ~TableColumn();

svx/source/table/tablemodel.cxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tablemodel.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.264.2 $
  *
  * This file is part of OpenOffice.org.
  *
 
 	// remove the rows
 	remove_range<RowVector,RowVector::iterator>( maRows, nIndex, nCount );
+    updateRows();
 	setModified(sal_True);
 }
 
 	for( sal_Int32 nOffset = 0; nOffset < nCount; ++nOffset )
 		maRows[nIndex+nOffset] = aRows[nOffset];
 
+    updateRows();
 	setModified(sal_True);
 }
 
 	sal_Int32 nRows = getRowCountImpl();
 	while( nRows-- )
 		maRows[nRows]->removeColumns( nIndex, nCount );
+
+    updateColumns();
 	setModified(sal_True);
 }
 
 	sal_Int32 nRows = getRowCountImpl();
 	for( sal_Int32 nRow = 0; nRow < nRows; ++nRow )
 		maRows[nRow]->insertColumns( nIndex, nCount, &aIter );
+
+    updateColumns();
 	setModified(sal_True);
 }
 
 		{
 			DBG_ERROR("sdr::table::TableModel::insertColumns(), exception caught!");
 		}
+        updateColumns();
 		setModified(sal_True);
 	}
 }
 			DBG_ERROR("sdr::table::TableModel::removeColumns(), exception caught!");
 		}
 
+        updateColumns();
 		setModified(sal_True);
 	}
 }
 {
 	if( nCount && mpTableObj )
 	{
+    	SdrModel* pModel = mpTableObj->GetModel();
+        bool bBegUndo = false;
 		try
 		{
 			TableModelNotifyGuard aGuard( this );
 				aNewRows[nOffset] = xNewRow;
 			}
 
-			SdrModel* pModel = mpTableObj->GetModel();
 			if( pModel && mpTableObj->IsInserted() )
 			{
 				pModel->BegUndo( ImpGetResStr(STR_TABLE_INSROW) );
 				pModel->AddUndo( pModel->GetSdrUndoFactory().CreateUndoGeoObject(*mpTableObj) );
 				TableModelRef xThis( this );
 				pModel->AddUndo( new InsertRowUndo( xThis, nIndex, aNewRows ) );
+                bBegUndo = true;
 			}
 
 			// check if cells merge over new columns
 					}
 				}
 			}
-
-			if( pModel )
-				pModel->EndUndo();
 		}
 		catch( Exception& )
 		{
 			DBG_ERROR("sdr::table::TableModel::insertRows(), exception caught!");
 		}
+		if( pModel && bBegUndo )
+			pModel->EndUndo();
+
+        updateRows();
 		setModified(sal_True);
 	}
 }
 			DBG_ERROR("sdr::table::TableModel::removeRows(), exception caught!");
 		}
 
+        updateRows();
 		setModified(sal_True);
 	}
 }
 
 // -----------------------------------------------------------------------------
 
+void TableModel::updateRows()
+{
+    sal_Int32 nRow = 0;
+    RowVector::iterator iter = maRows.begin();
+    while( iter != maRows.end() )
+    {
+        (*iter++)->mnRow = nRow++;
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+void TableModel::updateColumns()
+{
+    sal_Int32 nColumn = 0;
+    ColumnVector::iterator iter = maColumns.begin();
+    while( iter != maColumns.end() )
+    {
+        (*iter++)->mnColumn = nColumn++;
+    }
+}
+
+// -----------------------------------------------------------------------------
+
 } }

svx/source/table/tablemodel.hxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tablemodel.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.264.1 $
  *
  * This file is part of OpenOffice.org.
  *
 	TableRowRef getRow( sal_Int32 nRow ) const throw (::com::sun::star::lang::IndexOutOfBoundsException);
 	TableColumnRef getColumn( sal_Int32 nColumn ) const throw (::com::sun::star::lang::IndexOutOfBoundsException);
 
+    void updateRows();
+    void updateColumns();
+
 	RowVector		maRows;
 	ColumnVector	maColumns;
 

svx/source/xml/xmlxtimp.cxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: xmlxtimp.cxx,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.264.1 $
  *
  * This file is part of OpenOffice.org.
  *
 	(void)nPrfx;
 	(void)rLocalName;
 
-	XMLMarkerStyleImport aMarkerStyle( GetImport() );
-	aMarkerStyle.importXML( xAttrList, rAny, rName );
+    try
+    {
+	    XMLMarkerStyleImport aMarkerStyle( GetImport() );
+	    aMarkerStyle.importXML( xAttrList, rAny, rName );
+    }
+    catch( Exception& )
+    {
+        DBG_ERROR("SvxXMLTableImportContext::importMarker(), exception caught!");
+    }
 }
 
 void SvxXMLTableImportContext::importDash( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 	(void)nPrfx;
 	(void)rLocalName;
 
-	XMLDashStyleImport aDashStyle( GetImport() );
-	aDashStyle.importXML( xAttrList, rAny, rName );
+    try
+    {
+    	XMLDashStyleImport aDashStyle( GetImport() );
+	    aDashStyle.importXML( xAttrList, rAny, rName );
+    }
+    catch( Exception& )
+    {
+        DBG_ERROR("SvxXMLTableImportContext::importDash(), exception caught!");
+    }
 }
 
 void SvxXMLTableImportContext::importHatch( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 	(void)nPrfx;
 	(void)rLocalName;
 
-	XMLHatchStyleImport aHatchStyle( GetImport() );
-	aHatchStyle.importXML( xAttrList, rAny, rName );
+    try
+    {
+    	XMLHatchStyleImport aHatchStyle( GetImport() );
+	    aHatchStyle.importXML( xAttrList, rAny, rName );
+    }
+    catch( Exception& )
+    {
+        DBG_ERROR("SvxXMLTableImportContext::importHatch(), exception caught!");
+    }
 }
 
 void SvxXMLTableImportContext::importGradient( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 	(void)nPrfx;
 	(void)rLocalName;
 
-	XMLGradientStyleImport aGradientStyle( GetImport() );
-	aGradientStyle.importXML( xAttrList, rAny, rName );
+    try
+    {
+    	XMLGradientStyleImport aGradientStyle( GetImport() );
+	    aGradientStyle.importXML( xAttrList, rAny, rName );
+    }
+    catch( Exception& )
+    {
+        DBG_ERROR("SvxXMLTableImportContext::importGradient(), exception caught!");
+    }
 }
 
 void SvxXMLTableImportContext::importBitmap( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
 	(void)nPrfx;
 	(void)rLocalName;
 
-	XMLImageStyle aImageStyle;
-	aImageStyle.importXML( xAttrList, rAny, rName, GetImport() );
+	try
+    {
+        XMLImageStyle aImageStyle;
+	    aImageStyle.importXML( xAttrList, rAny, rName, GetImport() );
+    }
+    catch( Exception& )
+    {
+        DBG_ERROR("SvxXMLTableImportContext::importBitmap(), exception caught!");
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////

vcl/win/source/window/salframe.cxx

 
 // -----------------------------------------------------------------------
 
-static void ImplHandleAppCommand( HWND hWnd, LPARAM lParam )
+static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam )
 {
 	sal_Int16 nCommand = 0;
 	switch( GET_APPCOMMAND_LPARAM(lParam) )
 	case APPCOMMAND_VOLUME_UP:					nCommand = MEDIA_COMMAND_VOLUME_UP; break;
 		break;
 	default:
-		return;
+		return false;
 	}
 
     WinSalFrame* pFrame = GetWindowPtr( hWnd );
 		NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt );
 
 		if ( !ImplCallPreNotify( aNCmdEvt ) )
+        {
 			pWindow->Command( aCEvt );
+            return true;
+        }
 	}
+
+    return false;
 }
 
 
             ImplHandleIMENotify( hWnd, wParam );
             break;
         case WM_APPCOMMAND:
-            ImplHandleAppCommand( hWnd, lParam );
+            if( ImplHandleAppCommand( hWnd, lParam ) )
+            {                
+                rDef = false;
+                nRet = 1;
+            }
             break;
 #if WINVER >= 0x0500
         case WM_IME_REQUEST: