CWS-TOOLING: integrate CWS fillednetchart

2009-07-22 17:48:07 +0200 oc  r274255 : #i103584# new testcase for fillednetchart added
2009-07-22 17:42:41 +0200 oc  r274254 : #i103584# Case 8 set to maximum 4 because of new fillednetchart
2009-07-13 17:29:40 +0200 iha  r273946 : CWS-TOOLING: rebase CWS fillednetchart to trunk@273858 (milestone: DEV300:m52)
2009-07-03 15:04:36 +0200 dr  r273704 : #i102667# import/export of filled radar charts
2009-07-03 09:50:28 +0200 dr  r273680 : #i102677# import filled radar charts from MSOOXML
2009-06-11 18:21:05 +0200 iha  r272896 : #i64752# filled net chart
2009-06-11 17:30:46 +0200 iha  r272892 : #i64752# filled net chart
2009-06-11 17:07:11 +0200 iha  r272889 : #i64752# filled net chart
2009-06-11 16:25:01 +0200 iha  r272883 : #i64752# filled net chart
2009-06-11 16:15:10 +0200 iha  r272878 : #i64752# filled net chart

9 files changed, 46 insertions, 13 deletions

diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index fcc17fefeebc..397527f3ea9d 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -95,6 +95,7 @@ enum eServiceType
     SERVICE_NAME_DONUT_DIAGRAM,
     SERVICE_NAME_LINE_DIAGRAM,
     SERVICE_NAME_NET_DIAGRAM,
+    SERVICE_NAME_FILLED_NET_DIAGRAM,
     SERVICE_NAME_PIE_DIAGRAM,
     SERVICE_NAME_STOCK_DIAGRAM,
     SERVICE_NAME_XY_DIAGRAM,
@@ -124,6 +125,7 @@ tServiceNameMap & lcl_getStaticServiceNameMap()
         ( C2U( "com.sun.star.chart.DonutDiagram" ),                   SERVICE_NAME_DONUT_DIAGRAM )
         ( C2U( "com.sun.star.chart.LineDiagram" ),                    SERVICE_NAME_LINE_DIAGRAM )
         ( C2U( "com.sun.star.chart.NetDiagram" ),                     SERVICE_NAME_NET_DIAGRAM )
+        ( C2U( "com.sun.star.chart.FilledNetDiagram" ),               SERVICE_NAME_FILLED_NET_DIAGRAM )
         ( C2U( "com.sun.star.chart.PieDiagram" ),                     SERVICE_NAME_PIE_DIAGRAM )
         ( C2U( "com.sun.star.chart.StockDiagram" ),                   SERVICE_NAME_STOCK_DIAGRAM )
         ( C2U( "com.sun.star.chart.XYDiagram" ),                      SERVICE_NAME_XY_DIAGRAM )
@@ -1341,6 +1343,14 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
                     bCreateDiagram = true;
                 }
                 break;
+            case SERVICE_NAME_FILLED_NET_DIAGRAM:
+                if( xManagerFact.is())
+                {
+                    xTemplate.set(
+                        xManagerFact->createInstance(
+                            C2U( "com.sun.star.chart2.template.FilledNet" )), uno::UNO_QUERY );
+                    bCreateDiagram = true;
+                }
             case SERVICE_NAME_PIE_DIAGRAM:
                 if( xManagerFact.is())
                 {
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index fe1359aab7f3..4a02d9aa99e5 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -538,6 +538,10 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName )
         if( aName.indexOf( C2U("Scatter") ) != -1 )
             return C2U( "com.sun.star.chart.XYDiagram" );
 
+        // "FilledNet" "StackedFilledNet" "PercentStackedFilledNet"
+        if( aName.indexOf( C2U("FilledNet") ) != -1 )
+            return C2U( "com.sun.star.chart.FilledNetDiagram" );
+
         // "Net" "NetSymbol" "NetLine" "StackedNet" "StackedNetSymbol"
         // "StackedNetLine" "PercentStackedNet" "PercentStackedNetSymbol"
         // "PercentStackedNetLine"
@@ -591,6 +595,9 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap()
         ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.ScatterChartType" )
         , ::rtl::OUString::createFromAscii( "com.sun.star.chart.XYDiagram" ) )
 
+        ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.FilledNetChartType" )
+        , ::rtl::OUString::createFromAscii( "com.sun.star.chart.FilledNetDiagram" ) )
+
         ( ::rtl::OUString::createFromAscii( "com.sun.star.chart2.NetChartType" )
         , ::rtl::OUString::createFromAscii( "com.sun.star.chart.NetDiagram" ) )
 
diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc
index 07ed2eeec0d5..8823b582a28e 100644
--- a/chart2/source/controller/dialogs/Bitmaps.hrc
+++ b/chart2/source/controller/dialogs/Bitmaps.hrc
@@ -173,8 +173,8 @@
 #define BMP_NET_SYMB_STACK (RID_APP_START + 77)
 #define BMP_NET_LINESYMB (RID_APP_START + 78)
 #define BMP_NET_LINESYMB_STACK (RID_APP_START + 79)
-#define BMP_NET_FILLED (RID_APP_START + 80)
-#define BMP_NET_FILLED_STACKED (RID_APP_START + 81)
+#define BMP_NET_FILL (RID_APP_START + 80)
+#define BMP_NET_FILL_STACK (RID_APP_START + 81)
 
 //----------------------
 // Stock Chart Subtypes
diff --git a/chart2/source/controller/dialogs/Bitmaps.src b/chart2/source/controller/dialogs/Bitmaps.src
index 35a897848fb1..67d8588897d8 100644
--- a/chart2/source/controller/dialogs/Bitmaps.src
+++ b/chart2/source/controller/dialogs/Bitmaps.src
@@ -359,13 +359,13 @@ Bitmap BMP_NET_LINESYMB_STACK
 {
     File = "netlinepointstack_52x60.png" ;
 };
-Bitmap BMP_NET_FILLED
+Bitmap BMP_NET_FILL
 {
-    File = "net_52x60.png" ;
+    File = "netfill_52x60.png" ;
 };
-Bitmap BMP_NET_FILLED_STACKED
+Bitmap BMP_NET_FILL_STACK
 {
-    File = "netstack_52x60.png" ;
+    File = "netstackfill_52x60.png" ;
 };
 //---------------------
 Bitmap BMP_PYRAMIDQ_3D_1
diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.hrc b/chart2/source/controller/dialogs/Bitmaps_HC.hrc
index 84a23ba426bc..8dd4acaffd15 100644
--- a/chart2/source/controller/dialogs/Bitmaps_HC.hrc
+++ b/chart2/source/controller/dialogs/Bitmaps_HC.hrc
@@ -173,8 +173,8 @@
 #define BMP_NET_SYMB_STACK_HC (RID_SCH_START + 77)
 #define BMP_NET_LINESYMB_HC (RID_SCH_START + 78)
 #define BMP_NET_LINESYMB_STACK_HC (RID_SCH_START + 79)
-#define BMP_NET_FILLED_HC (RID_SCH_START + 80)
-#define BMP_NET_FILLED_STACKED_HC (RID_SCH_START + 81)
+#define BMP_NET_FILL_HC (RID_SCH_START + 80)
+#define BMP_NET_FILL_STACK_HC (RID_SCH_START + 81)
 
 //----------------------
 // Stock Chart Subtypes
diff --git a/chart2/source/controller/dialogs/Bitmaps_HC.src b/chart2/source/controller/dialogs/Bitmaps_HC.src
index 0fb7ef5e5a1a..a82893273ae2 100644
--- a/chart2/source/controller/dialogs/Bitmaps_HC.src
+++ b/chart2/source/controller/dialogs/Bitmaps_HC.src
@@ -359,13 +359,13 @@ Bitmap BMP_NET_LINESYMB_STACK_HC
 {
     File = "netlinepointstack_52x60_h.png" ;
 };
-Bitmap BMP_NET_FILLED_HC
+Bitmap BMP_NET_FILL_HC
 {
-    File = "net_52x60_h.png" ;
+    File = "netfill_52x60_h.png" ;
 };
-Bitmap BMP_NET_FILLED_STACKED_HC
+Bitmap BMP_NET_FILL_STACK_HC
 {
-    File = "netstack_52x60_h.png" ;
+    File = "netstackfill_52x60_h.png" ;
 };
 //---------------------
 Bitmap BMP_PYRAMIDQ_3D_1_HC
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index de57e82e58da..fa51d17a03d8 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -1000,6 +1000,10 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla
     ( C2U( "com.sun.star.chart2.template.NetLine" ),                ChartTypeParameter(3,false,false,GlobalStackMode_NONE,false,true) )
     ( C2U( "com.sun.star.chart2.template.StackedNetLine" ),         ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y,false,true) )
     ( C2U( "com.sun.star.chart2.template.PercentStackedNetLine" ),  ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT,false,true) )
+
+    ( C2U( "com.sun.star.chart2.template.FilledNet" ),            ChartTypeParameter(4,false,false,GlobalStackMode_NONE,false,false) )
+    ( C2U( "com.sun.star.chart2.template.StackedFilledNet" ),     ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y,false,false) )
+    ( C2U( "com.sun.star.chart2.template.PercentStackedFilledNet" ),ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y_PERCENT,false,false) )
     ;
     return m_aTemplateMap;
 }
@@ -1012,17 +1016,20 @@ void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, bool bIs
         rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_NET_SYMB ) );
         rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_NET_LINESYMB ) );
         rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_NET ) );
+        rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_NET_FILL ) );
     }
     else
     {
         rSubTypeList.InsertItem( 1, SELECT_BITMAP( BMP_NET_SYMB_STACK ) );
         rSubTypeList.InsertItem( 2, SELECT_BITMAP( BMP_NET_LINESYMB_STACK ) );
         rSubTypeList.InsertItem( 3, SELECT_BITMAP( BMP_NET_STACK ) );
+        rSubTypeList.InsertItem( 4, SELECT_BITMAP( BMP_NET_FILL_STACK ) );
     }
 
     rSubTypeList.SetItemText( 1, String( SchResId( STR_POINTS_ONLY )) );
     rSubTypeList.SetItemText( 2, String( SchResId( STR_POINTS_AND_LINES )) );
     rSubTypeList.SetItemText( 3, String( SchResId( STR_LINES_ONLY )) );
+    rSubTypeList.SetItemText( 4, String( SchResId( STR_FILLED )) );
 }
 void NetChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter )
 {
@@ -1040,6 +1047,10 @@ void NetChartDialogController::adjustParameterToSubType( ChartTypeParameter& rPa
             rParameter.bSymbols = false;
             rParameter.bLines = true;
             break;
+        case 4:
+            rParameter.bSymbols = false;
+            rParameter.bLines = false;
+            break;
         default:
             rParameter.bSymbols = true;
             rParameter.bLines = false;
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 0a9b58758de6..56ef98b159ba 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -413,7 +413,8 @@ Image SeriesHeader::GetChartTypeImage(
     {
         aResult = SELECT_IMAGE( IMG_TYPE_PIE, bHC );
     }
-    else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_NET ))
+    else if( aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_NET )
+          || aChartTypeName.equals( CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ) )
     {
         aResult = SELECT_IMAGE( IMG_TYPE_NET, bHC );
     }
diff --git a/chart2/source/controller/dialogs/Strings_ChartTypes.src b/chart2/source/controller/dialogs/Strings_ChartTypes.src
index 2234f04a3fcd..f2731b2971c2 100644
--- a/chart2/source/controller/dialogs/Strings_ChartTypes.src
+++ b/chart2/source/controller/dialogs/Strings_ChartTypes.src
@@ -139,6 +139,10 @@ String STR_DEEP
 {
     Text [ en-US ] = "Deep" ;
 };
+String STR_FILLED
+{
+    Text [ en-US ] = "Filled" ;
+};
 //-----------------------------------------------------------------------------
 String STR_TYPE_BUBBLE
 {