Commits

Anonymous committed 80113b4 Merge

calc55: merge with DEV300_m83

Comments (0)

Files changed (1437)

 4c02d2669043bd6f16d57ecbd21061d15745a613 DEV300_m79
 9f08556668b1565f293d735949e3b16d96e78651 DEV300_m80
 d3a11d2d353c2bf49d279018f2a59774484e9b38 DEV300_m81
+a5fb3c4091cbac8324a98bf080c08ef626b32258 DEV300_m82
+23debe0bf2cd63dd34c412ccb0de5e4dcfe62e58 DEV300_m83

automation/source/server/statemnt.cxx

 							{			// Wir fälschen einen Parameter
                                 if ( aUId.HasNumeric() )
                                 {
-								    nParams = PARAM_ULONG_1;
+								    nParams |= PARAM_ULONG_1;
 								    nLNr1 = USHORT( aUId.GetNum() );
 								    DBG_ASSERT( nLNr1 <= 0xFFFF, "ID on ToolBox > 0xFFFF" );
                                 }
                                 else
                                 {
-								    nParams = PARAM_STR_1;
+								    nParams |= PARAM_STR_1;
                                     aString1 = aUId.GetStr();
                                 }
 							}
     BOOL bItemFound = FALSE;\
 	{\
 		SmartId aButtonId;\
-		if( nParams == PARAM_STR_1 )\
+		if( nParams & PARAM_STR_1 )\
 			aButtonId = SmartId( aString1 );\
-		if( nParams == PARAM_ULONG_1 )\
+		if( nParams & PARAM_ULONG_1 )\
 			aButtonId = SmartId( nLNr1 );\
 		for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && !aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos))) &&\
 		                                              !aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos))) ; nItemPos++ ) {}\
 			ReportError( aUId, GEN_RES_STR1( S_HELPID_ON_TOOLBOX_NOT_FOUND, MethodString( nMethodId ) ) );\
 		else\
 		{\
-			if ( !pTB->IsItemEnabled( pTB->GetItemId(nItemPos) ) && nMethodId != _M_IsEnabled )\
+			if ( !pTB->IsItemEnabled( pTB->GetItemId(nItemPos) ) && nMethodId != _M_IsEnabled && nMethodId != M_GetState )\
 			{\
 				ReportError( aUId, GEN_RES_STR1( S_BUTTON_DISABLED_ON_TOOLBOX, MethodString( nMethodId ) ) );\
 				bItemFound = FALSE;\
 			}\
-			else if ( !pTB->IsItemVisible( pTB->GetItemId(nItemPos) ) )\
+			else if ( !pTB->IsItemVisible( pTB->GetItemId(nItemPos) ) && nMethodId != M_GetState )\
 			{\
 				ReportError( aUId, GEN_RES_STR1( S_BUTTON_HIDDEN_ON_TOOLBOX, MethodString( nMethodId ) ) );\
 				bItemFound = FALSE;\
 												    pRet->GenReturn ( RET_Value, aUId, comm_ULONG( pItem->GetButtonFlags() & ~SV_STATE_MASK ));
 												    break;
 											    case M_Check :
-                                                    pItem->SetStateChecked();
-                                                    pTree->CheckButtonHdl();
-                                                    pTree->InvalidateEntry( pThisEntry );
+                                                    if ( !pItem->IsStateChecked() )
+                                                    {
+                                                        pItem->SetStateChecked();
+                                                        pTree->CheckButtonHdl();
+                                                        pTree->InvalidateEntry( pThisEntry );
+                                                    }
 												    break;
 											    case M_UnCheck :
-                                                    pItem->SetStateUnchecked();
-                                                    pTree->CheckButtonHdl();
-                                                    pTree->InvalidateEntry( pThisEntry );
+                                                    if ( pItem->IsStateChecked() || pItem->IsStateTristate() )
+                                                    {
+                                                        pItem->SetStateUnchecked();
+                                                        pTree->CheckButtonHdl();
+                                                        pTree->InvalidateEntry( pThisEntry );
+                                                    }
 												    break;
 											    case M_TriState :
-                                                    pItem->SetStateTristate();
-                                                    pTree->CheckButtonHdl();
-                                                    pTree->InvalidateEntry( pThisEntry );
+                                                    if ( !pItem->IsStateTristate() )
+                                                    {
+                                                        pItem->SetStateTristate();
+                                                        pTree->CheckButtonHdl();
+                                                        pTree->InvalidateEntry( pThisEntry );
+                                                    }
 												    break;
 											    default:
 												    ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );
                                                                 MouseEvent aMEvnt(aPos,1,MOUSE_SIMPLECLICK|MOUSE_SELECT,MOUSE_LEFT,KEY_MOD1);
                                                                 pTC->getSelEngine()->SelMouseButtonDown( aMEvnt );
                                                                 pTC->getSelEngine()->SelMouseButtonUp( aMEvnt );
+                                                                if ( pTC->IsRowSelected( nNr1-1 ) )
+                                                                    pTC->Select();
                                                             }
                                                             else
                                                                 ReportError( aUId, GEN_RES_STR2c2( S_METHOD_FAILED, MethodString( nMethodId ), "find pos" ) );

avmedia/source/framework/makefile.mk

 		$(SLO)$/soundhandler.obj  
 
 EXCEPTIONSFILES = \
+		$(SLO)$/mediatoolbox.obj \
 		$(SLO)$/soundhandler.obj
 
 # --- Targets ----------------------------------

basctl/source/basicide/makefile.mk

 
 EXCEPTIONSFILES=$(SLO)$/basicrenderable.obj  \
                 $(SLO)$/scriptdocument.obj  \
+                $(SLO)$/basicbox.obj	\
                 $(SLO)$/basidesh.obj	\
 				$(SLO)$/basides1.obj	\
 				$(SLO)$/basides2.obj	\
                 $(SLO)$/documentenumeration.obj
 
 SLOFILES =  $(EXCEPTIONSFILES) \
-            $(SLO)$/basicbox.obj	\
             $(SLO)$/baside2b.obj	\
             $(SLO)$/brkdlg.obj	\
             $(SLO)$/objdlg.obj	\

basegfx/source/polygon/b2dpolygoncutandtouch.cxx

 										if(fTools::moreOrEqual(fCutB, fZero) && fTools::less(fCutB, fOne))
 										{
 											// cut is in both ranges. Add points for A and B
-											if(fTools::equalZero(fCutA))
+                                            // #i111715# use fTools::equal instead of fTools::equalZero for better accuracy
+											if(fTools::equal(fCutA, fZero))
 											{
 												// ignore for start point in first edge; this is handled
 												// by outer methods and would just produce a double point
 												rTempPointsA.push_back(temporaryPoint(aCutPoint, a, fCutA));
 											}
 
-											if(fTools::equalZero(fCutB))
+                                            // #i111715# use fTools::equal instead of fTools::equalZero for better accuracy
+											if(fTools::equal(fCutB, fZero))
 											{
 												// ignore for start point in first edge; this is handled
 												// by outer methods and would just produce a double point

basic/source/runtime/methods.cxx

File contents unchanged.

basic/source/runtime/runtime.cxx

 	{
 		// TEST, has to be vb here always
 #ifdef DBG_UTIL
-		SbError nTmp = StarBASIC::GetSfxFromVBError( nError );
+		SbError nTmp = StarBASIC::GetSfxFromVBError( USHORT( nError ) );
 		DBG_ASSERT( nTmp, "No VB error!" );
 #endif
 
 ch	chart2\source\controller\main				nmake	-	all	ch_source_controller_main ch_inc NULL
 ch	chart2\source\controller\menus				nmake	-	all	ch_source_controller_menus ch_inc NULL
 ch	chart2\prj									get		-	all	ch_prj NULL
+ch  chart2\qa\unoapi                            nmake   -   all ch_qa_unoapi NULL

chart2/qa/unoapi/knownissues.xcl

 #i83851
 sch.ChXChartDocument::com::sun::star::frame::XModel
-#i83832
-sch.ChXChartDocument::com::sun::star::beans::XPropertySet
 #i83833
 sch.ChXChartDocument::com::sun::star::chart::XChartDocument
 #i83834
 
 #i83855
 sch.ChXDiagram::com::sun::star::chart::LineDiagram
-#i83857
-sch.ChXDiagram::com::sun::star::drawing::XShape
 #i83853
 sch.ChXDiagram::com::sun::star::beans::XPropertySet
 #i83854
 #i83856
 sch.ChXDiagram::com::sun::star::chart::StockDiagram
 
-#i83706
-sch.ChartLegend::com::sun::star::drawing::LineProperties
-sch.ChartLegend::com::sun::star::drawing::FillProperties
-sch.ChartLegend::com::sun::star::chart::ChartLegend
-sch.ChartLegend::com::sun::star::style::CharacterProperties
 sch.ChartLegend::com::sun::star::drawing::XShape
-
 #i83830
 sch.ChartTitle::com::sun::star::drawing::XShape
-#i83831
-sch.ChartTitle::com::sun::star::style::CharacterProperties
-#i83827
-sch.ChartTitle::com::sun::star::chart::ChartTitle
 
 #i78867
 sch.ChXChartDocument::com::sun::star::xml::UserDefinedAttributeSupplier
 
 #i83865
 sch.ChXDataPoint::com::sun::star::drawing::LineProperties
-
-#i83866  	
-sch.ChXDataPoint::com::sun::star::chart::Chart3DBarProperties
-
-#i87138
-sch.ChXDiagram
-# -> disabled in sch.sce
-
-### i87295 ###
-sch.ChXChartAxis::com::sun::star::beans::XPropertySet
+#112078
 sch.ChartLegend::com::sun::star::beans::XPropertySet

chart2/qa/unoapi/sch.sce

 -o sch.ChXChartData
 -o sch.ChXChartDataArray
 -o sch.ChXChartView
-#i83867 -o sch.ChXDataPoint 
+-o sch.ChXDataPoint 
 #i83868 -o sch.ChXDataRow
-#i87138 -o sch.ChXDiagram
+-o sch.ChXDiagram
 -o sch.ChartArea
 -o sch.ChartGrid
 -o sch.ChartLegend

chart2/qa/unoapi/testdocuments/TransparencyChart.sxs

Binary file modified.

chart2/source/controller/chartapiwrapper/AxisWrapper.cxx

         Property( C2U( "AutoMax" ),
                   PROP_AXIS_AUTO_MAX,
                   ::getBooleanCppuType(),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT ));
+                  //#i111967# no PropertyChangeEvent is fired on change so far