MPLv2 subset improvements.

6 files changed, 17 insertions, 4 deletions

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 9178c925d546..94ad19e17aec 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -357,11 +357,13 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 	sc/source/ui/dbgui/csvtablebox \
 	sc/source/ui/dbgui/dbnamdlg \
 	sc/source/ui/dbgui/expftext \
-	sc/source/ui/dbgui/fieldwnd \
+	$(if $(filter TRUE,$(MPL_SUBSET)),, \
+	    sc/source/ui/dbgui/fieldwnd) \
 	sc/source/ui/dbgui/filtdlg \
 	sc/source/ui/dbgui/foptmgr \
 	sc/source/ui/dbgui/imoptdlg \
-	sc/source/ui/dbgui/pvlaydlg \
+	$(if $(filter TRUE,$(MPL_SUBSET)),, \
+	    sc/source/ui/dbgui/pvlaydlg) \
 	sc/source/ui/dbgui/sfiltdlg \
 	sc/source/ui/docshell/arealink \
 	sc/source/ui/docshell/autostyl \
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index 2abc85c3a26d..37010813e658 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -35,6 +35,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  ************************************************************************/
 
+#include <config_lgpl.h>
+
 #include "fieldwnd.hxx"
 
 #include <comphelper/string.hxx>
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index 98d66e289f85..79178c9f3e85 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -35,6 +35,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  ************************************************************************/
 
+#include <config_lgpl.h>
+
 #include "pvlaydlg.hxx"
 #include "dpuiglobal.hxx"
 
diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx
index 89c36b0b0231..59ad13b321be 100644
--- a/sc/source/ui/inc/pvlaydlg.hxx
+++ b/sc/source/ui/inc/pvlaydlg.hxx
@@ -38,6 +38,8 @@
 #ifndef SC_PVLAYDLG_HXX
 #define SC_PVLAYDLG_HXX
 
+#include <config_lgpl.h>
+
 #include <memory>
 #include <vector>
 
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 5f16fb1f81bf..fd953a70d78e 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -48,7 +48,6 @@
 #include "filtdlg.hxx"
 #include "dbnamdlg.hxx"
 #include "reffact.hxx"
-#include "pvlaydlg.hxx"
 #include "validat.hxx"
 #include "scresid.hxx"
 
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 6c70b2a10cf8..f8e7763d35ad 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_mpl.h>
+
 #include "scitems.hxx"
 #include <vcl/msgbox.hxx>
 #include <sfx2/childwin.hxx>
@@ -41,7 +43,9 @@
 #include "consdlg.hxx"
 #include "filtdlg.hxx"
 #include "dbnamdlg.hxx"
-#include "pvlaydlg.hxx"
+#if ! MPL_HAVE_SUBSET
+#  include "pvlaydlg.hxx"
+#endif
 #include "areasdlg.hxx"
 #include "rangeutl.hxx"
 #include "crnrdlg.hxx"
@@ -317,6 +321,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
 
         case SID_OPENDLG_PIVOTTABLE:
         {
+#if ! MPL_HAVE_SUBSET
             //  all settings must be in pDialogDPObject
 
             if( pDialogDPObject )
@@ -329,6 +334,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
                 GetViewData()->SetRefTabNo( GetViewData()->GetTabNo() );
                 pResult = new ScPivotLayoutDlg( pB, pCW, pParent, *pDialogDPObject, pObj == NULL);
             }
+#endif
         }
         break;