extensions: merge Peter Foley's work in pcr

3 files changed, 82 insertions, 46 deletions

diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
index 5d7d5604fbae..500d2560f8d5 100644
--- a/extensions/Library_pcr.mk
+++ b/extensions/Library_pcr.mk
@@ -60,62 +60,62 @@ $(eval $(call gb_Library_add_linked_libs,pcr,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,pcr,\
-	extensions/source/propctrlr/controlfontdialog \
-	extensions/source/propctrlr/fontdialog \
-	extensions/source/propctrlr/pcrservices \
-	extensions/source/propctrlr/selectlabeldialog \
-	extensions/source/propctrlr/propcontroller \
-	extensions/source/propctrlr/formcontroller \
-	extensions/source/propctrlr/modulepcr \
-	extensions/source/propctrlr/cellbindinghelper \
-	extensions/source/propctrlr/taborder \
-	extensions/source/propctrlr/pcrunodialogs \
-	extensions/source/propctrlr/unourl \
-	extensions/source/propctrlr/formlinkdialog \
-	extensions/source/propctrlr/listselectiondlg \
-	extensions/source/propctrlr/browserlistbox \
-	extensions/source/propctrlr/stringrepresentation \
-	extensions/source/propctrlr/eformshelper \
-	extensions/source/propctrlr/xsddatatypes \
-	extensions/source/propctrlr/xsdvalidationhelper \
-	extensions/source/propctrlr/pushbuttonnavigation \
-	extensions/source/propctrlr/sqlcommanddesign \
-	extensions/source/propctrlr/composeduiupdate \
-	extensions/source/propctrlr/propertycomposer \
-	extensions/source/propctrlr/pcrcomponentcontext \
-	extensions/source/propctrlr/commoncontrol \
-	extensions/source/propctrlr/standardcontrol \
-	extensions/source/propctrlr/usercontrol \
+	extensions/source/propctrlr/MasterDetailLinkDialog \
 	extensions/source/propctrlr/browserline \
-	extensions/source/propctrlr/genericpropertyhandler \
+	extensions/source/propctrlr/browserlistbox \
+	extensions/source/propctrlr/browserpage \
+	extensions/source/propctrlr/browserview \
 	extensions/source/propctrlr/buttonnavigationhandler \
-	extensions/source/propctrlr/handlerhelper \
-	extensions/source/propctrlr/propertyhandler \
-	extensions/source/propctrlr/eventhandler \
+	extensions/source/propctrlr/cellbindinghandler \
+	extensions/source/propctrlr/cellbindinghelper \
+	extensions/source/propctrlr/commoncontrol \
+	extensions/source/propctrlr/composeduiupdate \
+	extensions/source/propctrlr/controlfontdialog \
+	extensions/source/propctrlr/defaultforminspection \
+	extensions/source/propctrlr/defaulthelpprovider \
 	extensions/source/propctrlr/editpropertyhandler \
+	extensions/source/propctrlr/eformshelper \
 	extensions/source/propctrlr/eformspropertyhandler \
-	extensions/source/propctrlr/cellbindinghandler \
-	extensions/source/propctrlr/submissionhandler \
-	extensions/source/propctrlr/xsdvalidationpropertyhandler \
+	extensions/source/propctrlr/eventhandler \
+	extensions/source/propctrlr/fontdialog \
+	extensions/source/propctrlr/formbrowsertools \
 	extensions/source/propctrlr/formcomponenthandler \
+	extensions/source/propctrlr/formcontroller \
+	extensions/source/propctrlr/formgeometryhandler \
+	extensions/source/propctrlr/formlinkdialog \
 	extensions/source/propctrlr/formmetadata \
-	extensions/source/propctrlr/defaultforminspection \
-	extensions/source/propctrlr/formbrowsertools \
-	extensions/source/propctrlr/browserpage \
-	extensions/source/propctrlr/propertyeditor \
 	extensions/source/propctrlr/formstrings \
-	extensions/source/propctrlr/pcrstrings \
-	extensions/source/propctrlr/browserview \
-	extensions/source/propctrlr/pcrcommon \
-	extensions/source/propctrlr/newdatatype \
-	extensions/source/propctrlr/propeventtranslation \
-	extensions/source/propctrlr/objectinspectormodel \
+	extensions/source/propctrlr/genericpropertyhandler \
+	extensions/source/propctrlr/handlerhelper \
 	extensions/source/propctrlr/inspectorhelpwindow \
-	extensions/source/propctrlr/defaulthelpprovider \
-	extensions/source/propctrlr/MasterDetailLinkDialog \
 	extensions/source/propctrlr/inspectormodelbase \
+	extensions/source/propctrlr/listselectiondlg \
+	extensions/source/propctrlr/modulepcr \
+	extensions/source/propctrlr/newdatatype \
+	extensions/source/propctrlr/objectinspectormodel \
+	extensions/source/propctrlr/pcrcommon \
+	extensions/source/propctrlr/pcrcomponentcontext \
+	extensions/source/propctrlr/pcrservices \
+	extensions/source/propctrlr/pcrstrings \
+	extensions/source/propctrlr/pcrunodialogs \
+	extensions/source/propctrlr/propcontroller \
+	extensions/source/propctrlr/propertycomposer \
 	extensions/source/propctrlr/propertycontrolextender \
-	extensions/source/propctrlr/formgeometryhandler \
+	extensions/source/propctrlr/propertyeditor \
+	extensions/source/propctrlr/propertyhandler \
+	extensions/source/propctrlr/propeventtranslation \
+	extensions/source/propctrlr/pushbuttonnavigation \
+	extensions/source/propctrlr/selectlabeldialog \
+	extensions/source/propctrlr/sqlcommanddesign \
+	extensions/source/propctrlr/standardcontrol \
+	extensions/source/propctrlr/stringrepresentation \
+	extensions/source/propctrlr/submissionhandler \
+	extensions/source/propctrlr/taborder \
+	extensions/source/propctrlr/unourl \
+	extensions/source/propctrlr/usercontrol \
+	extensions/source/propctrlr/xsddatatypes \
+	extensions/source/propctrlr/xsdvalidationhelper \
+	extensions/source/propctrlr/xsdvalidationpropertyhandler \
 ))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index a5505791b0bf..d471c76fe663 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_targets,extensions,\
 	Library_updatecheckui \
 	Library_updatefeed \
 	Library_updchk \
+	Package_pcr \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/extensions/Package_pcr.mk b/extensions/Package_pcr.mk
new file mode 100644
index 000000000000..db0d91e549d4
--- /dev/null
+++ b/extensions/Package_pcr.mk
@@ -0,0 +1,35 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Package_Package,pcr,$(SRCDIR)/extensions/source/propctrlr))
+
+$(eval $(call gb_Package_add_file,pcr,xml/pcr.xml,pcr.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: