2 files changed, 43 insertions, 1 deletions
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index b7709294b7c4..aa29c7ee24ea 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -188,7 +188,7 @@ public:
     void            ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd );
 
     bool            MergeCells( const ScCellMergeOption& rOption, bool bContents,
-                                        bool bRecord, bool bApi );
+                                        bool bRecord, bool bApi, bool bEmptyMergedCells = false );
     bool            UnmergeCells( const ScRange& rRange, bool bRecord );
     bool            UnmergeCells( const ScCellMergeOption& rOption, bool bRecord );
 
diff --git a/sc/source/ui/inc/mergecellsdialog.hxx b/sc/source/ui/inc/mergecellsdialog.hxx
new file mode 100644
index 000000000000..3d230740dbb6
--- /dev/null
+++ b/sc/source/ui/inc/mergecellsdialog.hxx
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#ifndef INCLUDED_SC_SOURCE_UI_INC_MERGECELLSDIALOG_HXX
+#define INCLUDED_SC_SOURCE_UI_INC_MERGECELLSDIALOG_HXX
+
+#include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/fixed.hxx>
+
+enum ScMergeCellsOption
+{
+    MoveContentHiddenCells,
+    KeepContentHiddenCells,
+    EmptyContentHiddenCells
+};
+
+class ScMergeCellsDialog : public ModalDialog
+{
+    VclPtr<RadioButton> mpRBMoveContent;
+    VclPtr<RadioButton> mpRBKeepContent;
+    VclPtr<RadioButton> mpRBEmptyContent;
+
+public:
+    ScMergeCellsDialog( vcl::Window * pParent );
+    virtual ~ScMergeCellsDialog();
+    virtual void dispose() override;
+
+    ScMergeCellsOption GetMergeCellsOption();
+};
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */