summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Repository.mk1
-rw-r--r--extensions/AllLangResTarget_pcr.mk56
-rw-r--r--extensions/Library_pcr.mk121
-rw-r--r--extensions/Module_extensions.mk2
-rw-r--r--extensions/prj/build.lst3
-rw-r--r--extensions/source/propctrlr/makefile.mk154
-rw-r--r--postprocess/packcomponents/makefile.mk2
7 files changed, 182 insertions, 157 deletions
diff --git a/Repository.mk b/Repository.mk
index 65cb29fcbf55..79aea6c12c24 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -180,6 +180,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
msworks \
odfflatxml \
offacc \
+ pcr \
pdffilter \
placeware \
protocolhandler \
diff --git a/extensions/AllLangResTarget_pcr.mk b/extensions/AllLangResTarget_pcr.mk
new file mode 100644
index 000000000000..d091af1a7ecc
--- /dev/null
+++ b/extensions/AllLangResTarget_pcr.mk
@@ -0,0 +1,56 @@
+# -*- 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.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# 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_AllLangResTarget_AllLangResTarget,pcr))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,pcr,extensions))
+
+$(eval $(call gb_AllLangResTarget_add_srs,pcr,\
+ pcr/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,pcr/res))
+
+$(eval $(call gb_SrsTarget_set_include,pcr/res,\
+ -I$(SRCDIR)/extensions/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,pcr/res,\
+ extensions/source/propctrlr/propres.src \
+ extensions/source/propctrlr/formres.src \
+ extensions/source/propctrlr/pcrmiscres.src \
+ extensions/source/propctrlr/taborder.src \
+ extensions/source/propctrlr/fontdialog.src \
+ extensions/source/propctrlr/selectlabeldialog.src \
+ extensions/source/propctrlr/formlinkdialog.src \
+ extensions/source/propctrlr/listselectiondlg.src \
+ extensions/source/propctrlr/newdatatype.src \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
new file mode 100644
index 000000000000..5d7d5604fbae
--- /dev/null
+++ b/extensions/Library_pcr.mk
@@ -0,0 +1,121 @@
+# -*- 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.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# 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_Library_Library,pcr))
+
+$(eval $(call gb_Library_set_componentfile,pcr,extensions/source/propctrlr/pcr))
+
+$(eval $(call gb_Library_add_api,pcr,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_set_include,pcr,\
+ -I$(SRCDIR)/extensions/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,pcr,\
+ svx \
+ svxcore \
+ editeng \
+ sfx \
+ svt \
+ tk \
+ vcl \
+ svl \
+ utl \
+ tl \
+ dbtools \
+ i18nisolang1 \
+ comphelper \
+ cppuhelper \
+ cppu \
+ sal \
+))
+
+$(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/browserline \
+ extensions/source/propctrlr/genericpropertyhandler \
+ extensions/source/propctrlr/buttonnavigationhandler \
+ extensions/source/propctrlr/handlerhelper \
+ extensions/source/propctrlr/propertyhandler \
+ extensions/source/propctrlr/eventhandler \
+ extensions/source/propctrlr/editpropertyhandler \
+ extensions/source/propctrlr/eformspropertyhandler \
+ extensions/source/propctrlr/cellbindinghandler \
+ extensions/source/propctrlr/submissionhandler \
+ extensions/source/propctrlr/xsdvalidationpropertyhandler \
+ extensions/source/propctrlr/formcomponenthandler \
+ 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/inspectorhelpwindow \
+ extensions/source/propctrlr/defaulthelpprovider \
+ extensions/source/propctrlr/MasterDetailLinkDialog \
+ extensions/source/propctrlr/inspectormodelbase \
+ extensions/source/propctrlr/propertycontrolextender \
+ extensions/source/propctrlr/formgeometryhandler \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index fbbb8cc4d1cd..a5505791b0bf 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -27,10 +27,12 @@
$(eval $(call gb_Module_Module,extensions))
$(eval $(call gb_Module_add_targets,extensions,\
+ AllLangResTarget_pcr \
AllLangResTarget_san \
AllLangResTarget_upd \
AllLangResTarget_updchk \
Configuration_updchk \
+ Library_pcr \
Library_scn \
Library_updatecheckui \
Library_updatefeed \
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index 2a9f47c4fca5..c0cd9aad2870 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -17,14 +17,13 @@ ex extensions\source\plugin\util nmake - all ex_plutil ex_plb
ex extensions\source\macosx\spotlight nmake - u ex_mxspotlight NULL
ex extensions\source\bibliography nmake - all ex_bib ex_inc NULL
ex extensions\source\xmlextract nmake - all ex_xmlextr ex_inc NULL
-ex extensions\source\propctrlr nmake - all ex_propctrlr ex_bib ex_inc NULL
ex extensions\source\dbpilots nmake - all ex_dbpilots ex_inc NULL
ex extensions\source\abpilot nmake - all ex_abpilot ex_inc NULL
ex extensions\source\logging nmake - all ex_logging ex_inc NULL
ex extensions\source\config\ldap nmake - all ex_ldap ex_inc NULL
ex extensions\source\nsplugin\source nmake - u ex_nsplugin ex_inc NULL
ex extensions\source\nsplugin\source nmake - w ex_nsplugin ex_inc NULL
-ex extensions\util nmake - all ex_util ex_abpilot ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib ex_plutil NULL
+ex extensions\util nmake - all ex_util ex_abpilot ex_dbpilots ex_logging ex_ldap ex_bib ex_plutil NULL
ex extensions\prj nmake - all ex_prj NULL
# Fails at the moment
diff --git a/extensions/source/propctrlr/makefile.mk b/extensions/source/propctrlr/makefile.mk
deleted file mode 100644
index ebb629ae39c9..000000000000
--- a/extensions/source/propctrlr/makefile.mk
+++ /dev/null
@@ -1,154 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-PRJINC=..$/inc
-
-PRJNAME=extensions
-TARGET=pcr
-USE_DEFFILE=TRUE
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(SLO)$/controlfontdialog.obj \
- $(SLO)$/fontdialog.obj \
- $(SLO)$/pcrservices.obj \
- $(SLO)$/selectlabeldialog.obj \
- $(SLO)$/propcontroller.obj \
- $(SLO)$/formcontroller.obj \
- $(SLO)$/modulepcr.obj \
- $(SLO)$/cellbindinghelper.obj \
- $(SLO)$/taborder.obj \
- $(SLO)$/pcrunodialogs.obj \
- $(SLO)$/unourl.obj \
- $(SLO)$/formlinkdialog.obj \
- $(SLO)$/listselectiondlg.obj \
- $(SLO)$/browserlistbox.obj \
- $(SLO)$/stringrepresentation.obj \
- $(SLO)$/eformshelper.obj \
- $(SLO)$/xsddatatypes.obj \
- $(SLO)$/xsdvalidationhelper.obj \
- $(SLO)$/pushbuttonnavigation.obj \
- $(SLO)$/sqlcommanddesign.obj \
- $(SLO)$/composeduiupdate.obj \
- $(SLO)$/propertycomposer.obj \
- $(SLO)$/pcrcomponentcontext.obj \
- $(SLO)$/commoncontrol.obj \
- $(SLO)$/standardcontrol.obj \
- $(SLO)$/usercontrol.obj \
- $(SLO)$/browserline.obj \
- $(SLO)$/genericpropertyhandler.obj \
- $(SLO)$/buttonnavigationhandler.obj \
- $(SLO)$/handlerhelper.obj \
- $(SLO)$/propertyhandler.obj \
- $(SLO)$/eventhandler.obj \
- $(SLO)$/editpropertyhandler.obj \
- $(SLO)$/eformspropertyhandler.obj \
- $(SLO)$/cellbindinghandler.obj \
- $(SLO)$/submissionhandler.obj \
- $(SLO)$/xsdvalidationpropertyhandler.obj \
- $(SLO)$/formcomponenthandler.obj \
- $(SLO)$/formmetadata.obj \
- $(SLO)$/defaultforminspection.obj \
- $(SLO)$/formbrowsertools.obj \
- $(SLO)$/browserpage.obj \
- $(SLO)$/propertyeditor.obj \
- $(SLO)$/formstrings.obj \
- $(SLO)$/pcrstrings.obj \
- $(SLO)$/browserview.obj \
- $(SLO)$/pcrcommon.obj \
- $(SLO)$/newdatatype.obj \
- $(SLO)$/propeventtranslation.obj \
- $(SLO)$/objectinspectormodel.obj \
- $(SLO)$/inspectorhelpwindow.obj \
- $(SLO)$/defaulthelpprovider.obj \
- $(SLO)$/MasterDetailLinkDialog.obj \
- $(SLO)$/inspectormodelbase.obj \
- $(SLO)$/propertycontrolextender.obj \
- $(SLO)$/formgeometryhandler.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES= propres.src \
- formres.src \
- pcrmiscres.src \
- taborder.src \
- fontdialog.src \
- selectlabeldialog.src \
- formlinkdialog.src \
- listselectiondlg.src \
- newdatatype.src
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
- $(EDITENGLIB) \
- $(SVXCORELIB) \
- $(SVXLIB) \
- $(SFXLIB) \
- $(SVTOOLLIB)\
- $(TKLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(TOOLSLIB) \
- $(I18NISOLANGLIB) \
- $(DBTOOLSLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(UNOTOOLSLIB) \
- $(SALLIB)
-
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1IMPLIB= i$(TARGET)
-SHL1DEPN= $(SHL1LIBS)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/pcr.component
-
-$(MISC)/pcr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- pcr.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt pcr.component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index d2496ea342dc..2ffa9775cc87 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -173,6 +173,7 @@ my_components += \
component/desktop/source/migration/services/migrationoo3 \
component/desktop/source/offacc/offacc \
component/desktop/source/splash/spl \
+ component/extensions/source/propctrlr/pcr \
component/extensions/source/scanner/scn \
component/extensions/source/update/check/updchk.uno \
component/extensions/source/update/feed/updatefeed \
@@ -181,7 +182,6 @@ my_components += \
fpicker \
fps_office \
log \
- pcr \
res \
syssh \
tvhlp1 \