Author: damjan
Date: Wed Dec 28 10:56:17 2016
New Revision: 1776262
URL: http://svn.apache.org/viewvc?rev=1776262&view=rev
Log:
Port main/basctl to gbuild.
Patch by: me
Added:
openoffice/trunk/main/basctl/AllLangResTarget_basctl.mk
openoffice/trunk/main/basctl/Library_basctl.mk
openoffice/trunk/main/basctl/Makefile (with props)
openoffice/trunk/main/basctl/Module_basctl.mk
openoffice/trunk/main/basctl/Package_uiconfig.mk
openoffice/trunk/main/basctl/Package_xml.mk
openoffice/trunk/main/basctl/prj/makefile.mk
Removed:
openoffice/trunk/main/basctl/inc/makefile.mk
openoffice/trunk/main/basctl/sdi/makefile.mk
openoffice/trunk/main/basctl/source/accessibility/makefile.mk
openoffice/trunk/main/basctl/source/basicide/makefile.mk
openoffice/trunk/main/basctl/source/dlged/makefile.mk
openoffice/trunk/main/basctl/util/basctl.map
openoffice/trunk/main/basctl/util/makefile.mk
openoffice/trunk/main/basctl/util/makefile.pmk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/basctl/prj/build.lst
openoffice/trunk/main/basctl/prj/d.lst
openoffice/trunk/main/basctl/source/basicide/basidesh.src
openoffice/trunk/main/basctl/source/basicide/brkdlg.src
openoffice/trunk/main/basctl/source/basicide/macrodlg.src
openoffice/trunk/main/basctl/source/basicide/moduldlg.src
openoffice/trunk/main/basctl/source/basicide/moptions.src
openoffice/trunk/main/basctl/source/basicide/objdlg.src
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1776262&r1=1776261&r2=1776262&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Wed Dec 28 10:56:17 2016
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,o
animations \
automation \
avmedia \
+ basctl \
basebmp \
basegfx \
binaryurp \
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1776262&r1=1776261&r2=1776262&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Wed Dec 28 10:56:17 2016
@@ -50,6 +50,7 @@ $(eval $(call gb_Helper_register_librari
avmediaMacAVF \
avmediaQuickTime \
avmediawin \
+ basctl \
basebmp \
basegfx \
canvastools \
Added: openoffice/trunk/main/basctl/AllLangResTarget_basctl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/AllLangResTarget_basctl.mk?rev=1776262&view=auto
==============================================================================
--- openoffice/trunk/main/basctl/AllLangResTarget_basctl.mk (added)
+++ openoffice/trunk/main/basctl/AllLangResTarget_basctl.mk Wed Dec 28 10:56:17
2016
@@ -0,0 +1,49 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,basctl))
+
+$(eval $(call gb_AllLangResTarget_add_srs,basctl,basctl/res))
+
+$(eval $(call gb_SrsTarget_SrsTarget,basctl/res))
+
+$(eval $(call gb_SrsTarget_set_include,basctl/res,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/basctl/inc \
+ -I$(SRCDIR)/basctl/source/inc \
+))
+
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,basctl/res,\
+ basctl/source/basicide/basidesh.src \
+ basctl/source/basicide/macrodlg.src \
+ basctl/source/basicide/moptions.src \
+ basctl/source/basicide/moduldlg.src \
+ basctl/source/basicide/objdlg.src \
+ basctl/source/basicide/brkdlg.src \
+ basctl/source/basicide/basicprint.src \
+ basctl/source/dlged/dlgresid.src \
+ basctl/source/dlged/managelang.src \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/basctl/Library_basctl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/Library_basctl.mk?rev=1776262&view=auto
==============================================================================
--- openoffice/trunk/main/basctl/Library_basctl.mk (added)
+++ openoffice/trunk/main/basctl/Library_basctl.mk Wed Dec 28 10:56:17 2016
@@ -0,0 +1,133 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,basctl))
+
+$(eval $(call
gb_Library_add_precompiled_header,basctl,$(SRCDIR)/basctl/inc/pch/precompiled_basctl))
+
+$(eval $(call gb_Library_add_sdi_headers,basctl,basctl/sdi/basslots))
+
+$(eval $(call gb_Library_set_componentfile,basctl,basctl/util/basctl))
+
+$(eval $(call gb_Library_set_include,basctl,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/basctl/inc \
+ -I$(SRCDIR)/basctl/inc/pch \
+ -I$(SRCDIR)/basctl/source/inc \
+ -I$(WORKDIR)/SdiTarget/basctl/sdi \
+))
+
+$(eval $(call gb_Library_add_api,basctl,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,basctl,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ editeng \
+ fwe \
+ ootk \
+ sal \
+ sb \
+ sfx \
+ sot \
+ stl \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ xcr \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,basctl,\
+ shell \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,basctl,\
+ basctl/source/accessibility/accessibledialogwindow \
+ basctl/source/accessibility/accessibledialogcontrolshape \
+ basctl/source/basicide/basicrenderable \
+ basctl/source/basicide/scriptdocument \
+ basctl/source/basicide/basicbox \
+ basctl/source/basicide/basidesh \
+ basctl/source/basicide/basides1 \
+ basctl/source/basicide/basides2 \
+ basctl/source/basicide/basides3 \
+ basctl/source/basicide/baside2 \
+ basctl/source/basicide/baside3 \
+ basctl/source/basicide/basobj2 \
+ basctl/source/basicide/basobj3 \
+ basctl/source/basicide/bastypes \
+ basctl/source/basicide/bastype2 \
+ basctl/source/basicide/bastype3 \
+ basctl/source/basicide/iderdll \
+ basctl/source/basicide/macrodlg \
+ basctl/source/basicide/moduldlg \
+ basctl/source/basicide/moduldl2 \
+ basctl/source/basicide/unomodel \
+ basctl/source/basicide/register \
+ basctl/source/basicide/basdoc \
+ basctl/source/basicide/tbxctl \
+ basctl/source/basicide/basidectrlr \
+ basctl/source/basicide/localizationmgr \
+ basctl/source/basicide/doceventnotifier \
+ basctl/source/basicide/docsignature \
+ basctl/source/basicide/documentenumeration \
+ basctl/source/dlged/dlged \
+ basctl/source/dlged/dlgedobj \
+ basctl/source/dlged/dlgedfac \
+ basctl/source/dlged/dlgedlist \
+ basctl/source/dlged/dlgedclip \
+ basctl/source/dlged/propbrw \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,basctl,\
+ basctl/source/basicide/baside2b \
+ basctl/source/basicide/brkdlg \
+ basctl/source/basicide/objdlg \
+ basctl/source/dlged/dlgedfunc \
+ basctl/source/dlged/dlgedmod \
+ basctl/source/dlged/dlgedpage \
+ basctl/source/dlged/dlgedview \
+ basctl/source/dlged/managelang \
+))
+
+$(eval $(call gb_SdiTarget_SdiTarget,basctl/sdi/basslots,basctl/sdi/baside))
+
+$(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\
+ -I$(SRCDIR)/basctl/inc \
+ -I$(SRCDIR)/basctl/sdi \
+ $$(INCLUDE) \
+))
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/basctl/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/Makefile?rev=1776262&view=auto
==============================================================================
--- openoffice/trunk/main/basctl/Makefile (added)
+++ openoffice/trunk/main/basctl/Makefile Wed Dec 28 10:56:17 2016
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
Propchange: openoffice/trunk/main/basctl/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/basctl/Module_basctl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/Module_basctl.mk?rev=1776262&view=auto
==============================================================================
--- openoffice/trunk/main/basctl/Module_basctl.mk (added)
+++ openoffice/trunk/main/basctl/Module_basctl.mk Wed Dec 28 10:56:17 2016
@@ -0,0 +1,33 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,basctl))
+
+$(eval $(call gb_Module_add_targets,basctl,\
+ AllLangResTarget_basctl \
+ Library_basctl \
+ Package_uiconfig \
+ Package_xml \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/basctl/Package_uiconfig.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/Package_uiconfig.mk?rev=1776262&view=auto
==============================================================================
--- openoffice/trunk/main/basctl/Package_uiconfig.mk (added)
+++ openoffice/trunk/main/basctl/Package_uiconfig.mk Wed Dec 28 10:56:17 2016
@@ -0,0 +1,33 @@
+###############################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###############################################################
+
+
+
+$(eval $(call gb_Package_Package,basctl_uiconfig,$(SRCDIR)/basctl/uiconfig))
+
+$(eval $(call
gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/menubar/menubar.xml,basicide/menubar/menubar.xml))
+$(eval $(call
gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/dialogbar.xml,basicide/toolbar/dialogbar.xml))
+$(eval $(call
gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/translationbar.xml,basicide/toolbar/translationbar.xml))
+$(eval $(call
gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/macrobar.xml,basicide/toolbar/macrobar.xml))
+$(eval $(call
gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/standardbar.xml,basicide/toolbar/standardbar.xml))
+$(eval $(call
gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/fullscreenbar.xml,basicide/toolbar/fullscreenbar.xml))
+$(eval $(call
gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/toolbar/insertcontrolsbar.xml,basicide/toolbar/insertcontrolsbar.xml))
+$(eval $(call
gb_Package_add_file,basctl_uiconfig,xml/uiconfig/modules/BasicIDE/statusbar/statusbar.xml,basicide/statusbar/statusbar.xml))
Added: openoffice/trunk/main/basctl/Package_xml.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/Package_xml.mk?rev=1776262&view=auto
==============================================================================
--- openoffice/trunk/main/basctl/Package_xml.mk (added)
+++ openoffice/trunk/main/basctl/Package_xml.mk Wed Dec 28 10:56:17 2016
@@ -0,0 +1,26 @@
+###############################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###############################################################
+
+
+
+$(eval $(call gb_Package_Package,basctl_xml,$(SRCDIR)/basctl))
+
+$(eval $(call gb_Package_add_file,basctl_xml,xml/basctl.xml,util/basctl.xml))
Modified: openoffice/trunk/main/basctl/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/prj/build.lst?rev=1776262&r1=1776261&r2=1776262&view=diff
==============================================================================
--- openoffice/trunk/main/basctl/prj/build.lst (original)
+++ openoffice/trunk/main/basctl/prj/build.lst Wed Dec 28 10:56:17 2016
@@ -1,9 +1,2 @@
bc basctl : LIBXSLT:libxslt L10N:l10n svx NULL
-bc basctl
usr1 - all bc_mkout NULL
-bc basctl\inc
nmake - all bc_inc NULL
-bc basctl\source\inc get
- all bc_sinc NULL
-bc basctl\sdi
nmake - all bc_sdi NULL
-bc basctl\source\dlged nmake
- all bc_dlg bc_inc NULL
-bc basctl\source\basicide nmake -
all bc_bide bc_sdi bc_inc NULL
-bc basctl\source\accessibility nmake -
all bc_acc bc_inc NULL
-bc basctl\util
nmake - all bc_util bc_bide bc_dlg bc_acc NULL
+bc basctl\prj
nmake - all bc_prj NULL
Modified: openoffice/trunk/main/basctl/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/prj/d.lst?rev=1776262&r1=1776261&r2=1776262&view=diff
==============================================================================
--- openoffice/trunk/main/basctl/prj/d.lst (original)
+++ openoffice/trunk/main/basctl/prj/d.lst Wed Dec 28 10:56:17 2016
@@ -1,24 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\inc\basslots.ilb %_DEST%\inc%_EXT%\basslots.ilb
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\bin\basctl*.dll %_DEST%\bin%_EXT%\basctl*.dll
-..\%__SRC%\bin\basctl*.res %_DEST%\bin%_EXT%\basctl*.res
-..\%__SRC%\misc\basctl*.map %_DEST%\bin%_EXT%\basctl*.map
-..\%__SRC%\misc\basctl.csv %_DEST%\inc%_EXT%\basctl.csv
-
-mkdir: %_DEST%\inc%_EXT%\basctl
-
-..\util\basctl.xml %_DEST%\xml%_EXT%\basctl.xml
-
-..\uiconfig\basicide\menubar\*.xml
%_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\menubar\*.xml
-..\uiconfig\basicide\toolbar\*.xml
%_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\toolbar\*.xml
-..\uiconfig\basicide\statusbar\*.xml
%_DEST%\xml%_EXT%\uiconfig\modules\BasicIDE\statusbar\*.xml
-..\%__SRC%\misc\basctl.component %_DEST%\xml%_EXT%\basctl.component
Added: openoffice/trunk/main/basctl/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/prj/makefile.mk?rev=1776262&view=auto
==============================================================================
--- openoffice/trunk/main/basctl/prj/makefile.mk (added)
+++ openoffice/trunk/main/basctl/prj/makefile.mk Wed Dec 28 10:56:17 2016
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
$(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/basctl/source/basicide/basidesh.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/basidesh.src?rev=1776262&r1=1776261&r2=1776262&view=diff
==============================================================================
--- openoffice/trunk/main/basctl/source/basicide/basidesh.src (original)
+++ openoffice/trunk/main/basctl/source/basicide/basidesh.src Wed Dec 28
10:56:17 2016
@@ -21,7 +21,7 @@
-#include <baside2.hrc>
+#include "baside2.hrc"
#include <helpid.hrc>
#ifndef _GLOBLMN_HRC
#include <svx/globlmn.hrc>
Modified: openoffice/trunk/main/basctl/source/basicide/brkdlg.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/brkdlg.src?rev=1776262&r1=1776261&r2=1776262&view=diff
==============================================================================
--- openoffice/trunk/main/basctl/source/basicide/brkdlg.src (original)
+++ openoffice/trunk/main/basctl/source/basicide/brkdlg.src Wed Dec 28 10:56:17
2016
@@ -22,7 +22,7 @@
#include "helpid.hrc"
-#include <brkdlg.hrc>
+#include "brkdlg.hrc"
ModalDialog RID_BASICIDE_BREAKPOINTDLG
{
HelpId = "basctl:RID_BASICIDE_BREAKPOINTDLG" ;
Modified: openoffice/trunk/main/basctl/source/basicide/macrodlg.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/macrodlg.src?rev=1776262&r1=1776261&r2=1776262&view=diff
==============================================================================
--- openoffice/trunk/main/basctl/source/basicide/macrodlg.src (original)
+++ openoffice/trunk/main/basctl/source/basicide/macrodlg.src Wed Dec 28
10:56:17 2016
@@ -22,7 +22,7 @@
#include <sfx2/sfx.hrc>
-#include <macrodlg.hrc>
+#include "macrodlg.hrc"
#include <basidesh.hrc>
#include <helpid.hrc>
ModalDialog RID_MACROCHOOSER
Modified: openoffice/trunk/main/basctl/source/basicide/moduldlg.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/moduldlg.src?rev=1776262&r1=1776261&r2=1776262&view=diff
==============================================================================
--- openoffice/trunk/main/basctl/source/basicide/moduldlg.src (original)
+++ openoffice/trunk/main/basctl/source/basicide/moduldlg.src Wed Dec 28
10:56:17 2016
@@ -22,7 +22,7 @@
#include "helpid.hrc"
-#include <moduldlg.hrc>
+#include "moduldlg.hrc"
#include <basidesh.hrc>
TabDialog RID_TD_ORGANIZE
{
Modified: openoffice/trunk/main/basctl/source/basicide/moptions.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/moptions.src?rev=1776262&r1=1776261&r2=1776262&view=diff
==============================================================================
--- openoffice/trunk/main/basctl/source/basicide/moptions.src (original)
+++ openoffice/trunk/main/basctl/source/basicide/moptions.src Wed Dec 28
10:56:17 2016
@@ -22,7 +22,7 @@
#include "helpid.hrc"
-#include <moptions.hrc>
+#include "moptions.hrc"
ModalDialog RID_MACROOPTIONS
{
HelpId = "basctl:ModalDialog:RID_MACROOPTIONS" ;
Modified: openoffice/trunk/main/basctl/source/basicide/objdlg.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/objdlg.src?rev=1776262&r1=1776261&r2=1776262&view=diff
==============================================================================
--- openoffice/trunk/main/basctl/source/basicide/objdlg.src (original)
+++ openoffice/trunk/main/basctl/source/basicide/objdlg.src Wed Dec 28 10:56:17
2016
@@ -21,7 +21,7 @@
-#include <objdlg.hrc>
+#include "objdlg.hrc"
#include <helpid.hrc>
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue
= 0xFFFF; };
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1776262&r1=1776261&r2=1776262&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Wed Dec 28
10:56:17 2016
@@ -47,7 +47,6 @@ my_components = \
stocservices \
abp \
analysis \
- basctl \
basprov \
bib \
cached1 \
@@ -58,6 +57,7 @@ my_components = \
chartview \
component/animations/source/animcore/animcore \
component/avmedia/util/avmedia \
+ component/basctl/util/basctl \
component/binaryurp/source/binaryurp \
component/canvas/source/factory/canvasfactory \
component/canvas/source/simplecanvas/simplecanvas \
