All pastes #819180 Raw Edit

gcc 3.3.5 patches for m239

public diff v1 · immutable
·published 2007-12-16 20:47 UTC
rendered paste body
Index: sc/source/ui/vba/vbachart.cxx===================================================================RCS file: /cvs/sc/sc/source/ui/vba/vbachart.cxx,vretrieving revision 1.3diff -p -u -r1.3 vbachart.cxx--- sc/source/ui/vba/vbachart.cxx	7 Dec 2007 10:45:44 -0000	1.3+++ sc/source/ui/vba/vbachart.cxx	15 Dec 2007 22:49:25 -0000@@ -1003,7 +1003,8 @@ ScVbaChart::getStockUpDownValue(sal_Int3 	} 	catch (uno::Exception& ) 	{-		script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );	+        rtl::OUString aTemp;    // temporary needed for g++ 3.3.5+		script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );	 	} 	return _nNotUpDown; }@@ -1020,7 +1021,8 @@ ScVbaChart::hasMarkers() throw ( script: 	} 	catch ( uno::Exception& ) 	{-		script::BasicErrorException( rtl::OUString(), uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );	+        rtl::OUString aTemp;    // temporary needed for g++ 3.3.5+		script::BasicErrorException( aTemp, uno::Reference< uno::XInterface >(), SbERR_METHOD_FAILED, rtl::OUString() );	 	} 	return bHasMarkers; }Index: sc/source/ui/vba/vbawindow.cxx===================================================================RCS file: /cvs/sc/sc/source/ui/vba/vbawindow.cxx,vretrieving revision 1.3diff -p -u -r1.3 vbawindow.cxx--- sc/source/ui/vba/vbawindow.cxx	7 Dec 2007 11:05:13 -0000	1.3+++ sc/source/ui/vba/vbawindow.cxx	15 Dec 2007 22:49:26 -0000@@ -294,7 +294,8 @@ ScVbaWindow::getCaption() throw (uno::Ru 		if ( ( nCrudLen + nCrudIndex ) == sTitle.getLength() ) 		{ 			sTitle = sTitle.copy( 0, nCrudIndex );-			ScVbaWorkbook workbook( uno::Reference< vba::XHelperInterface >( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );+            uno::Reference< oo::vba::XGlobals > xTemp( ScVbaGlobals::getGlobalsImpl( mxContext )); // temporary needed for g++ 3.3.5+			ScVbaWorkbook workbook( uno::Reference< vba::XHelperInterface >( xTemp->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel ); 			rtl::OUString sName = workbook.getName(); 			// rather bizare hack to make sure the name behavior 			// is like XL@@ -431,7 +432,8 @@ ScVbaWindow::setWindowState( const uno:: void ScVbaWindow::Activate() throw (css::uno::RuntimeException) {-	ScVbaWorkbook workbook( uno::Reference< vba::XHelperInterface >( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );+    uno::Reference< oo::vba::XGlobals > xTemp( ScVbaGlobals::getGlobalsImpl( mxContext )); // temporary needed for g++ 3.3.5+	ScVbaWorkbook workbook( uno::Reference< vba::XHelperInterface >( xTemp->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );  	workbook.Activate(); }@@ -439,7 +441,8 @@ ScVbaWindow::Activate() throw (css::uno: void ScVbaWindow::Close( const uno::Any& SaveChanges, const uno::Any& FileName, const uno::Any& RouteWorkBook ) throw (uno::RuntimeException) {-	ScVbaWorkbook workbook( uno::Reference< vba::XHelperInterface >( ScVbaGlobals::getGlobalsImpl( mxContext )->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel );+    uno::Reference< oo::vba::XGlobals > xTemp( ScVbaGlobals::getGlobalsImpl( mxContext )); // temporary needed for g++ 3.3.5+	ScVbaWorkbook workbook( uno::Reference< vba::XHelperInterface >( xTemp->getApplication(), uno::UNO_QUERY_THROW ), mxContext, m_xModel ); 	workbook.Close(SaveChanges, FileName, RouteWorkBook ); } Index: sc/source/ui/vba/vbawindows.cxx===================================================================RCS file: /cvs/sc/sc/source/ui/vba/vbawindows.cxx,vretrieving revision 1.3diff -p -u -r1.3 vbawindows.cxx--- sc/source/ui/vba/vbawindows.cxx	7 Dec 2007 11:05:39 -0000	1.3+++ sc/source/ui/vba/vbawindows.cxx	15 Dec 2007 22:49:26 -0000@@ -142,7 +142,8 @@ public:	 			{ 				m_windows.push_back( xNext ); 				uno::Reference< frame::XModel > xModel( xNext, uno::UNO_QUERY_THROW ); // that the spreadsheetdocument is a xmodel is a given-				ScVbaWindow window( uno::Reference< vba::XHelperInterface >(),  m_xContext, xModel );+                uno::Reference< vba::XHelperInterface > xTemp;  // temporary needed for g++ 3.3.5+				ScVbaWindow window( xTemp,  m_xContext, xModel ); 				rtl::OUString sCaption; 				window.getCaption() >>= sCaption; 				namesToIndices[ sCaption ] = nIndex++;Index: svtools/source/contnr/svimpbox.cxx===================================================================RCS file: /cvs/util/svtools/source/contnr/svimpbox.cxx,vretrieving revision 1.54diff -p -u -r1.54 svimpbox.cxx--- svtools/source/contnr/svimpbox.cxx	9 Oct 2007 15:04:10 -0000	1.54+++ svtools/source/contnr/svimpbox.cxx	15 Dec 2007 22:49:32 -0000@@ -1103,7 +1103,8 @@ void SvImpLBox::DrawNet()     //so that SvImpLBox::DrawNet() doesn't draw anything too  	if(pView->IsNativeControlSupported( CTRL_LISTNET, PART_ENTIRE_CONTROL)) {         ImplControlValue	aControlValue;-        Region			  aCtrlRegion( Rectangle(Point( 0, 0 ), Size( 0, 0 )) );+        Point aTemp(0,0);   // temporary needed for g++ 3.3.5+        Region			  aCtrlRegion( Rectangle(aTemp, Size( 0, 0 )) );         ControlState		nState = CTRL_STATE_ENABLED;             if( pView->DrawNativeControl( CTRL_LISTNET, PART_ENTIRE_CONTROL, 					aCtrlRegion, nState, aControlValue, rtl::OUString() ) )Index: sw/source/core/unocore/unochart.cxx===================================================================RCS file: /cvs/sw/sw/source/core/unocore/unochart.cxx,vretrieving revision 1.12diff -p -u -r1.12 unochart.cxx--- sw/source/core/unocore/unochart.cxx	12 Nov 2007 16:26:30 -0000	1.12+++ sw/source/core/unocore/unochart.cxx	15 Dec 2007 22:49:35 -0000@@ -1641,7 +1641,8 @@ void SwChartDataProvider::InvalidateTabl         Set_DataSequenceRef_t::iterator aIt( rSet.begin() );         while (aIt != rSet.end())         {-            uno::Reference< util::XModifiable > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );+            uno::Reference< chart2::data::XDataSequence > xTemp(*aIt);  // temporary needed for g++ 3.3.5+            uno::Reference< util::XModifiable > xRef( xTemp, uno::UNO_QUERY );             if (xRef.is())             {                 // mark the sequence as 'dirty' and notify listeners@@ -1674,7 +1675,8 @@ sal_Bool SwChartDataProvider::DeleteBox(             sal_Bool bNowEmpty = sal_False;              // check if weak reference is still valid...-            uno::Reference< chart2::data::XDataSequence > xRef( uno::Reference< chart2::data::XDataSequence>(*aIt), uno::UNO_QUERY );+            uno::Reference< chart2::data::XDataSequence > xTemp(*aIt);  // temporary needed for g++ 3.3.5+            uno::Reference< chart2::data::XDataSequence > xRef( xTemp, uno::UNO_QUERY );             if (xRef.is())             {                 // then delete that table box (check if implementation cursor needs to be adjusted)@@ -1716,7 +1718,8 @@ void SwChartDataProvider::DisposeAllData         Set_DataSequenceRef_t::iterator aEndIt( rSet.end() );         while (aIt != aEndIt)         {-            uno::Reference< lang::XComponent > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );+            uno::Reference< chart2::data::XDataSequence > xTemp(*aIt);  // temporary needed for g++ 3.3.5+            uno::Reference< lang::XComponent > xRef( xTemp, uno::UNO_QUERY );             if (xRef.is())             {                 xRef->dispose();@@ -1793,7 +1796,8 @@ void SwChartDataProvider::AddRowCols( 			Set_DataSequenceRef_t::iterator aIt( rSet.begin() ); 			while (aIt != rSet.end()) 			{-				uno::Reference< chart2::data::XTextualDataSequence > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );+                uno::Reference< chart2::data::XDataSequence > xTemp(*aIt);  // temporary needed for g++ 3.3.5+				uno::Reference< chart2::data::XTextualDataSequence > xRef( xTemp, uno::UNO_QUERY ); 				if (xRef.is()) 				{ 					const sal_Int32 nLen = xRef->getTextualData().getLength();Index: sw/source/core/view/viewsh.cxx===================================================================RCS file: /cvs/sw/sw/source/core/view/viewsh.cxx,vretrieving revision 1.77diff -p -u -r1.77 viewsh.cxx--- sw/source/core/view/viewsh.cxx	26 Nov 2007 14:46:04 -0000	1.77+++ sw/source/core/view/viewsh.cxx	15 Dec 2007 22:49:35 -0000@@ -1446,7 +1446,8 @@ BOOL ViewShell::SmoothScroll( long lXDif 					const bool bMapModeWasEnabledVDev(pVout->IsMapModeEnabled()); 					pVout->EnableMapMode(false); 					const Bitmap aBitmap(pVout->GetBitmap(Point(), pVout->GetOutputSizePixel()));-					SvFileStream aNew(String(ByteString( "c:\\test.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);+                    String aTemp(ByteString( "c:\\test.bmp" ), RTL_TEXTENCODING_UTF8);  // temporary needed for g++ 3.3.5+					SvFileStream aNew(aTemp, STREAM_WRITE|STREAM_TRUNC); 					aNew << aBitmap; 					pVout->EnableMapMode(bMapModeWasEnabledVDev); 				}Index: sw/source/filter/ww8/wrtw8nds.cxx===================================================================RCS file: /cvs/sw/sw/source/filter/ww8/wrtw8nds.cxx,vretrieving revision 1.101diff -p -u -r1.101 wrtw8nds.cxx--- sw/source/filter/ww8/wrtw8nds.cxx	27 Sep 2007 10:01:41 -0000	1.101+++ sw/source/filter/ww8/wrtw8nds.cxx	15 Dec 2007 22:49:36 -0000@@ -1432,7 +1432,8 @@ SvxBrushItem SwWW8Writer::TrueFrameBgBru     if (!pRet)         pRet = GetCurrentPageBgBrush(); -    SvxBrushItem aRet( Color(COL_WHITE), RES_BACKGROUND );+    Color aTemp(COL_WHITE);     // temporary needed for g++ 3.3.5+    SvxBrushItem aRet( aTemp, RES_BACKGROUND );     if (pRet && (pRet->GetGraphic() ||( pRet->GetColor() != COL_TRANSPARENT)))         aRet = *pRet; Index: sw/source/ui/dialog/SwSpellDialogChildWindow.cxx===================================================================RCS file: /cvs/sw/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx,vretrieving revision 1.11diff -p -u -r1.11 SwSpellDialogChildWindow.cxx--- sw/source/ui/dialog/SwSpellDialogChildWindow.cxx	27 Sep 2007 11:36:02 -0000	1.11+++ sw/source/ui/dialog/SwSpellDialogChildWindow.cxx	15 Dec 2007 22:49:37 -0000@@ -456,7 +456,8 @@ svx::SpellPortions SwSpellDialogChildWin 			{ 				LockFocusNotification( true );                 String sInfo(SW_RES(STR_SPELLING_COMPLETED));-                InfoBox(GetWindow(), sInfo ).Execute();+                Window* pTemp = GetWindow();    // temporary needed for g++ 3.3.5+                InfoBox(pTemp, sInfo ).Execute();                 LockFocusNotification( false );                 //take care that the now valid selection is stored                 LoseFocus();