fdo#66477 Add sampling feature to calc

Initial implementation of SamplingDialog.

Change-Id: If26e8561705229f83777fb50d53c86b9fe056ffa

5 files changed, 32 insertions, 63 deletions

diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 05d55f4dee3e..489763953595 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -172,6 +172,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
             break;
             case FID_FILL_SERIES:       // fill block
             case SID_OPENDLG_RANDOM_NUMBER_GENERATOR:
+            case SID_SAMPLING_DIALOG:
             case SID_OPENDLG_TABOP:     // multiple-cell operations, are at least 2 cells marked?
                 if (pDoc->GetChangeTrack()!=NULL &&nWhich ==SID_OPENDLG_TABOP)
                     bDisable = sal_True;
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index daac7ec9ca4b..15953b3f3e2f 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -905,7 +905,16 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
             break;
         case SID_OPENDLG_RANDOM_NUMBER_GENERATOR:
             {
-                sal_uInt16          nId  = ScRandomNumberGeneratorDialogWrapper::GetChildWindowId();
+                sal_uInt16 nId  = ScRandomNumberGeneratorDialogWrapper::GetChildWindowId();
+                SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
+                SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
+
+                pScMod->SetRefDialog( nId, pWnd ? false : sal_True );
+            }
+            break;
+        case SID_SAMPLING_DIALOG:
+            {
+                sal_uInt16 nId  = ScSamplingDialogWrapper::GetChildWindowId();
                 SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame();
                 SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId );
 
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index cf7e796af408..65adb74eac06 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -52,6 +52,7 @@ SFX_IMPL_MODELESSDIALOG_WITHID(ScHighlightChgDlgWrapper, FID_CHG_SHOW )
 SFX_IMPL_MODELESSDIALOG_WITHID(ScSimpleRefDlgWrapper, WID_SIMPLE_REF )
 
 SFX_IMPL_MODELESSDIALOG_WITHID(ScRandomNumberGeneratorDialogWrapper, SID_OPENDLG_RANDOM_NUMBER_GENERATOR )
+SFX_IMPL_MODELESSDIALOG_WITHID(ScSamplingDialogWrapper, SID_SAMPLING_DIALOG )
 
 SFX_IMPL_CHILDWINDOW_WITHID(ScValidityRefChildWin, SID_VALIDITY_REFERENCE)
 
@@ -71,7 +72,10 @@ SfxChildWinInfo ScValidityRefChildWin::GetInfo() const
     return anInfo;
 }
 
-namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); }
+namespace
+{
+    ScTabViewShell* lcl_GetTabViewShell( SfxBindings* pBindings );
+}
 
 #define IMPL_CHILD_CTOR(Class,sid) \
     Class::Class( Window*               pParentP,                   \
@@ -96,101 +100,47 @@ namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); }
             pViewShell->GetViewFrame()->SetChildWindow( nId, false );           \
     }
 
-
-//=========================================================================
-
-//-------------------------------------------------------------------------
-// ScNameDlgWrapper
-//-------------------------------------------------------------------------
-
 IMPL_CHILD_CTOR( ScNameDlgWrapper, FID_DEFINE_NAME )
 
-//-------------------------------------------------------------------------
-// ScNameDlgWrapper
-//-------------------------------------------------------------------------
-
 IMPL_CHILD_CTOR( ScNameDefDlgWrapper, FID_ADD_NAME )
 
-//-------------------------------------------------------------------------
-// ScSolverDlgWrapper
-//-------------------------------------------------------------------------
-
 IMPL_CHILD_CTOR( ScSolverDlgWrapper, SID_OPENDLG_SOLVE )
 
-//-------------------------------------------------------------------------
-// ScOptSolverDlgWrapper
-//-------------------------------------------------------------------------
-
 IMPL_CHILD_CTOR( ScOptSolverDlgWrapper, SID_OPENDLG_OPTSOLVER )
 
-IMPL_CHILD_CTOR(ScXMLSourceDlgWrapper, SID_MANAGE_XML_SOURCE)
-
-//-------------------------------------------------------------------------
-// ScPivotLayoutWrapper
-//-------------------------------------------------------------------------
+IMPL_CHILD_CTOR( ScXMLSourceDlgWrapper, SID_MANAGE_XML_SOURCE)
 
 IMPL_CHILD_CTOR( ScPivotLayoutWrapper, SID_OPENDLG_PIVOTTABLE )
 
-//-------------------------------------------------------------------------
-// ScTabOpDlgWrapper
-//-------------------------------------------------------------------------
-
 IMPL_CHILD_CTOR( ScTabOpDlgWrapper, SID_OPENDLG_TABOP )
 
-//-------------------------------------------------------------------------
-// ScFilterDlgWrapper
-//-------------------------------------------------------------------------
-
 IMPL_CHILD_CTOR( ScFilterDlgWrapper, SID_FILTER )
 
-//-------------------------------------------------------------------------
-// ScSpecialFilterDlgWrapper
-//-------------------------------------------------------------------------
-
 IMPL_CHILD_CTOR( ScSpecialFilterDlgWrapper, SID_SPECIAL_FILTER )
 
-//-------------------------------------------------------------------------
-// ScDbNameDlgWrapper
-//-------------------------------------------------------------------------
-
 IMPL_CHILD_CTOR( ScDbNameDlgWrapper, SID_DEFINE_DBNAME )
 
-//-------------------------------------------------------------------------
-// ScColRowNameRangesDlgWrapper
-//-------------------------------------------------------------------------
-
 IMPL_CHILD_CTOR( ScColRowNameRangesDlgWrapper, SID_DEFINE_COLROWNAMERANGES )
 
-//-------------------------------------------------------------------------
-// ScConsolidateDlgWrapper
-//-------------------------------------------------------------------------
-
 IMPL_CHILD_CTOR( ScConsolidateDlgWrapper, SID_OPENDLG_CONSOLIDATE )
 
-//-------------------------------------------------------------------------
-// ScPrintAreasDlgWrapper
-//-------------------------------------------------------------------------
-
 IMPL_CHILD_CTOR( ScPrintAreasDlgWrapper, SID_OPENDLG_EDIT_PRINTAREA )
 
-//-------------------------------------------------------------------------
-// ScFormulaDlgWrapper
-//-------------------------------------------------------------------------
-
 IMPL_CHILD_CTOR( ScFormulaDlgWrapper, SID_OPENDLG_FUNCTION )
 
-
 IMPL_CHILD_CTOR( ScRandomNumberGeneratorDialogWrapper, SID_OPENDLG_RANDOM_NUMBER_GENERATOR )
 
+IMPL_CHILD_CTOR( ScSamplingDialogWrapper, SID_SAMPLING_DIALOG )
+
 //-------------------------------------------------------------------------
 // ScSimpleRefDlgWrapper
 //-------------------------------------------------------------------------
 
 static sal_Bool     bScSimpleRefFlag;
-static long     nScSimpleRefHeight;
-static long     nScSimpleRefWidth;
-static long     nScSimpleRefX;
-static long     nScSimpleRefY;
+static long         nScSimpleRefHeight;
+static long         nScSimpleRefWidth;
+static long         nScSimpleRefX;
+static long         nScSimpleRefY;
 static sal_Bool     bAutoReOpen=sal_True;
 
 ScSimpleRefDlgWrapper::ScSimpleRefDlgWrapper( Window* pParentP,
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index c53bf66f0e84..699a29df406a 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -82,6 +82,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
     SFX_CHILDWINDOW_REGISTRATION(ScValidityRefChildWin::GetChildWindowId());
 
     SFX_CHILDWINDOW_REGISTRATION(ScRandomNumberGeneratorDialogWrapper::GetChildWindowId());
+    SFX_CHILDWINDOW_REGISTRATION(ScSamplingDialogWrapper::GetChildWindowId());
 }
 
 SFX_IMPL_NAMED_VIEWFACTORY( ScTabViewShell, "Default" )
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index a613c77b30d8..0b169bfd5feb 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -62,6 +62,7 @@
 #include "xmlsourcedlg.hxx"
 
 #include "RandomNumberGeneratorDialog.hxx"
+#include "SamplingDialog.hxx"
 
 //------------------------------------------------------------------
 
@@ -320,6 +321,13 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
         }
         break;
 
+        case SID_SAMPLING_DIALOG:
+        {
+            ScViewData*  pViewData  = GetViewData();
+            pResult = new ScSamplingDialog( pB, pCW, pParent, pViewData );
+        }
+        break;
+
         case SID_OPENDLG_OPTSOLVER:
         {
             ScViewData* pViewData = GetViewData();