From d98ac11f3962f39efb1418588c609d03fb7cc37c Mon Sep 17 00:00:00 2001 From: Matus Kukan Date: Sun, 3 Jul 2011 13:59:22 +0200 Subject: Remove component_getImplementationEnvironment --- basctl/source/basicide/register.cxx | 8 -------- basctl/util/basctl.map | 1 - 2 files changed, 9 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx index 2ba82fca818a..1b79a3c6bf99 100644 --- a/basctl/source/basicide/register.cxx +++ b/basctl/source/basicide/register.cxx @@ -45,14 +45,6 @@ using namespace ::com::sun::star::lang; extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char** ppEnvironmentTypeName, - uno_Environment** ppEnvironment ) -{ - (void)ppEnvironment; - *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; -} - SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey ) diff --git a/basctl/util/basctl.map b/basctl/util/basctl.map index 83193fe176fa..3677a07670ed 100755 --- a/basctl/util/basctl.map +++ b/basctl/util/basctl.map @@ -3,7 +3,6 @@ UDK_3_0_0 { basicide_choose_macro; basicide_macro_organizer; basicide_handle_basic_error; - component_getImplementationEnvironment; component_getFactory; local: *; -- cgit From de6f1b0ad43046eb3cb94dcd2e8793bb2a0cff10 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 26 Jul 2011 23:58:16 +0200 Subject: findbar: Show the "Search and Replace" button in the FindBar by default. --- basctl/uiconfig/basicide/toolbar/findbar.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'basctl') diff --git a/basctl/uiconfig/basicide/toolbar/findbar.xml b/basctl/uiconfig/basicide/toolbar/findbar.xml index 0338d3156195..c2e10c2a7f41 100644 --- a/basctl/uiconfig/basicide/toolbar/findbar.xml +++ b/basctl/uiconfig/basicide/toolbar/findbar.xml @@ -4,5 +4,5 @@ - + -- cgit From 9b6b889821c8afc235db4faffe99c1bd81983b0c Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Wed, 27 Jul 2011 19:36:46 +0200 Subject: Convert basctl to gbuild --- basctl/AllLangResTarget_basctl.mk | 54 +++++++++++++ basctl/Library_basctl.mk | 134 ++++++++++++++++++++++++++++++++ basctl/Makefile | 38 +++++++++ basctl/Module_basctl.mk | 36 +++++++++ basctl/Package_xml.mk | 41 ++++++++++ basctl/inc/makefile.mk | 47 ----------- basctl/prj/build.lst | 8 +- basctl/prj/d.lst | 24 ------ basctl/prj/makefile.mk | 40 ++++++++++ basctl/sdi/makefile.mk | 53 ------------- basctl/source/accessibility/makefile.mk | 48 ------------ basctl/source/basicide/makefile.mk | 99 ----------------------- basctl/source/dlged/makefile.mk | 63 --------------- basctl/util/basctl.map | 9 --- basctl/util/hidother.hrc | 27 ------- basctl/util/hidother.src | 44 ----------- basctl/util/makefile.mk | 112 -------------------------- 17 files changed, 344 insertions(+), 533 deletions(-) create mode 100644 basctl/AllLangResTarget_basctl.mk create mode 100644 basctl/Library_basctl.mk create mode 100644 basctl/Makefile create mode 100644 basctl/Module_basctl.mk create mode 100644 basctl/Package_xml.mk delete mode 100644 basctl/inc/makefile.mk create mode 100644 basctl/prj/makefile.mk delete mode 100644 basctl/sdi/makefile.mk delete mode 100644 basctl/source/accessibility/makefile.mk delete mode 100644 basctl/source/basicide/makefile.mk delete mode 100644 basctl/source/dlged/makefile.mk delete mode 100755 basctl/util/basctl.map delete mode 100644 basctl/util/hidother.hrc delete mode 100644 basctl/util/hidother.src delete mode 100644 basctl/util/makefile.mk (limited to 'basctl') diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk new file mode 100644 index 000000000000..5bb333b66754 --- /dev/null +++ b/basctl/AllLangResTarget_basctl.mk @@ -0,0 +1,54 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 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,\ + -I$(realpath $(SRCDIR)/basctl/inc) \ + -I$(realpath $(SRCDIR)/basctl/source/inc) \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_SrsTarget_add_files,basctl/res,\ + basctl/source/basicide/basicprint.src \ + basctl/source/basicide/basidesh.src \ + basctl/source/basicide/brkdlg.src \ + basctl/source/basicide/macrodlg.src \ + basctl/source/basicide/moduldlg.src \ + basctl/source/basicide/moptions.src \ + basctl/source/basicide/objdlg.src \ + basctl/source/dlged/dlgresid.src \ + basctl/source/dlged/managelang.src \ +)) + +# vim: set noet sw=4: diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk new file mode 100644 index 000000000000..73e12a812a8a --- /dev/null +++ b/basctl/Library_basctl.mk @@ -0,0 +1,134 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 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_precompiled_header,basctl,$(SRCDIR)/basctl/source/basicide/ide_pch)) + +$(eval $(call gb_Library_set_componentfile,basctl,basctl/util/basctl)) + +$(eval $(call gb_Library_set_include,basctl,\ + -I$(realpath $(SRCDIR)/basctl/inc) \ + -I$(realpath $(SRCDIR)/basctl/inc/pch) \ + -I$(realpath $(SRCDIR)/basctl/sdi) \ + -I$(realpath $(SRCDIR)/basctl/source/inc) \ + $$(INCLUDE) \ + -I$(WORKDIR)/SdiTarget/basctl/sdi \ +)) + +$(eval $(call gb_Library_add_api,basctl,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,basctl,\ + comphelper \ + cppu \ + cppuhelper \ + editeng \ + fwe \ + sal \ + sb \ + sfx \ + sot \ + svl \ + svt \ + svx \ + svxcore \ + tk \ + tl \ + utl \ + ucbhelper \ + vcl \ + xcr \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,basctl,\ + basctl/source/accessibility/accessibledialogcontrolshape \ + basctl/source/accessibility/accessibledialogwindow \ + basctl/source/basicide/basdoc \ + basctl/source/basicide/basicbox \ + basctl/source/basicide/basicrenderable \ + basctl/source/basicide/baside2b \ + basctl/source/basicide/baside2 \ + basctl/source/basicide/baside3 \ + basctl/source/basicide/basidectrlr \ + basctl/source/basicide/basides1 \ + basctl/source/basicide/basides2 \ + basctl/source/basicide/basides3 \ + basctl/source/basicide/basidesh \ + basctl/source/basicide/basobj2 \ + basctl/source/basicide/basobj3 \ + basctl/source/basicide/bastype2 \ + basctl/source/basicide/bastype3 \ + basctl/source/basicide/bastypes \ + basctl/source/basicide/brkdlg \ + basctl/source/basicide/doceventnotifier \ + basctl/source/basicide/docsignature \ + basctl/source/basicide/documentenumeration \ + basctl/source/basicide/iderdll \ + basctl/source/basicide/localizationmgr \ + basctl/source/basicide/macrodlg \ + basctl/source/basicide/moduldl2 \ + basctl/source/basicide/moduldlg \ + basctl/source/basicide/objdlg \ + basctl/source/basicide/register \ + basctl/source/basicide/scriptdocument \ + basctl/source/basicide/tbxctl \ + basctl/source/basicide/unomodel \ + basctl/source/dlged/dlgedclip \ + basctl/source/dlged/dlged \ + basctl/source/dlged/dlgedfac \ + basctl/source/dlged/dlgedfunc \ + basctl/source/dlged/dlgedlist \ + basctl/source/dlged/dlgedmod \ + basctl/source/dlged/dlgedobj \ + basctl/source/dlged/dlgedpage \ + basctl/source/dlged/dlgedview \ + basctl/source/dlged/managelang \ + basctl/source/dlged/propbrw \ +)) + +$(eval $(call gb_Library_add_sdi_headers,basctl,basctl/sdi/basslots)) + +$(eval $(call gb_SdiTarget_SdiTarget,basctl/sdi/basslots,basctl/sdi/baside)) + +$(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\ + $$(INCLUDE) \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,basctl,\ + advapi32 \ + gdi32 \ + shell32 \ +)) +endif + +# vim: set noet sw=4: diff --git a/basctl/Makefile b/basctl/Makefile new file mode 100644 index 000000000000..5bedaf0b9dcf --- /dev/null +++ b/basctl/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 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: diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk new file mode 100644 index 000000000000..1ab09c494a0d --- /dev/null +++ b/basctl/Module_basctl.mk @@ -0,0 +1,36 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,basctl)) + +$(eval $(call gb_Module_add_targets,basctl,\ + AllLangResTarget_basctl \ + Library_basctl \ + Package_xml \ +)) + +# vim: set noet sw=4: diff --git a/basctl/Package_xml.mk b/basctl/Package_xml.mk new file mode 100644 index 000000000000..9630050f8549 --- /dev/null +++ b/basctl/Package_xml.mk @@ -0,0 +1,41 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,basctl_xml,$(SRCDIR)/basctl)) + +$(eval $(call gb_Package_add_file,basctl_xml,xml/basctl.xml,util/basctl.xml)) +$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/menubar/menubar.xml,uiconfig/basicide/menubar/menubar.xml)) +$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/statusbar/statusbar.xml,uiconfig/basicide/statusbar/statusbar.xml)) +$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/dialogbar.xml,uiconfig/basicide/toolbar/dialogbar.xml)) +$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/findbar.xml,uiconfig/basicide/toolbar/findbar.xml)) +$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/fullscreenbar.xml,uiconfig/basicide/toolbar/fullscreenbar.xml)) +$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/insertcontrolsbar.xml,uiconfig/basicide/toolbar/insertcontrolsbar.xml)) +$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/macrobar.xml,uiconfig/basicide/toolbar/macrobar.xml)) +$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/standardbar.xml,uiconfig/basicide/toolbar/standardbar.xml)) +$(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/translationbar.xml,uiconfig/basicide/toolbar/translationbar.xml)) + +# vim: set noet sw=4: diff --git a/basctl/inc/makefile.mk b/basctl/inc/makefile.mk deleted file mode 100644 index 894c77722abc..000000000000 --- a/basctl/inc/makefile.mk +++ /dev/null @@ -1,47 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=basctl -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" diff --git a/basctl/prj/build.lst b/basctl/prj/build.lst index 507edfec14bd..a92b34691792 100644 --- a/basctl/prj/build.lst +++ b/basctl/prj/build.lst @@ -1,9 +1,3 @@ bc basctl : LIBXSLT:libxslt TRANSLATIONS:translations 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 diff --git a/basctl/prj/d.lst b/basctl/prj/d.lst index 6446d60274e7..e69de29bb2d1 100644 --- a/basctl/prj/d.lst +++ b/basctl/prj/d.lst @@ -1,24 +0,0 @@ -mkdir: %COMMON_DEST%\bin\hid -mkdir: %_DEST%\xml\uiconfig -mkdir: %_DEST%\xml\uiconfig\modules -mkdir: %_DEST%\xml\uiconfig\modules\BasicIDE -mkdir: %_DEST%\xml\uiconfig\modules\BasicIDE\menubar -mkdir: %_DEST%\xml\uiconfig\modules\BasicIDE\toolbar -mkdir: %_DEST%\xml\uiconfig\modules\BasicIDE\statusbar - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid -..\%__SRC%\inc\basslots.ilb %_DEST%\inc\basslots.ilb -..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.* -..\%__SRC%\bin\basctl*.dll %_DEST%\bin\basctl*.dll -..\%__SRC%\bin\basctl*.res %_DEST%\bin\basctl*.res -..\%__SRC%\misc\basctl*.map %_DEST%\bin\basctl*.map -..\%__SRC%\misc\basctl.csv %_DEST%\inc\basctl.csv - -mkdir: %_DEST%\inc\basctl - -..\util\basctl.xml %_DEST%\xml\basctl.xml - -..\uiconfig\basicide\menubar\*.xml %_DEST%\xml\uiconfig\modules\BasicIDE\menubar\*.xml -..\uiconfig\basicide\toolbar\*.xml %_DEST%\xml\uiconfig\modules\BasicIDE\toolbar\*.xml -..\uiconfig\basicide\statusbar\*.xml %_DEST%\xml\uiconfig\modules\BasicIDE\statusbar\*.xml -..\%__SRC%\misc\basctl.component %_DEST%\xml\basctl.component diff --git a/basctl/prj/makefile.mk b/basctl/prj/makefile.mk new file mode 100644 index 000000000000..d30ff8a47e6b --- /dev/null +++ b/basctl/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/basctl/sdi/makefile.mk b/basctl/sdi/makefile.mk deleted file mode 100644 index d334ad7f86d0..000000000000 --- a/basctl/sdi/makefile.mk +++ /dev/null @@ -1,53 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=basctl -TARGET=basslots - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -SDI1NAME=$(TARGET) -SDI1EXPORT=basctl - -# --- Files -------------------------------------------------------- - -SVSDI1DEPEND= \ - $(SOLARINCXDIR)$/sfx2/sfx.sdi \ - $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \ - $(SOLARINCXDIR)$/svx/svx.sdi \ - $(SOLARINCXDIR)$/svx/svxitems.sdi \ - $(SOLARINCXDIR)$/svx/xoitems.sdi \ - baside.sdi - -# --- Targets ------------------------------------------------------- -.ENDIF -.INCLUDE : target.mk - diff --git a/basctl/source/accessibility/makefile.mk b/basctl/source/accessibility/makefile.mk deleted file mode 100644 index ec899b893944..000000000000 --- a/basctl/source/accessibility/makefile.mk +++ /dev/null @@ -1,48 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=basctl -TARGET=accessibility -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/accessibledialogwindow.obj \ - $(SLO)$/accessibledialogcontrolshape.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk deleted file mode 100644 index 210d0db3df3e..000000000000 --- a/basctl/source/basicide/makefile.mk +++ /dev/null @@ -1,99 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=basctl -TARGET=basicide -VISIBILITY_HIDDEN=TRUE - -PROJECTPCH4DLL=TRUE -PROJECTPCH=ide_pch -PROJECTPCHSOURCE=ide_pch - -# --- Settings ----------------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(basicdebug)" != "" || "$(BASICDEBUG)" != "" -CDEFS+=-DBASICDEBUG -.ENDIF - -# --- Allgemein ---------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/basdoc.obj \ - $(SLO)$/basicbox.obj \ - $(SLO)$/basicrenderable.obj \ - $(SLO)$/baside2.obj \ - $(SLO)$/baside2b.obj \ - $(SLO)$/baside3.obj \ - $(SLO)$/basidectrlr.obj \ - $(SLO)$/basides1.obj \ - $(SLO)$/basides2.obj \ - $(SLO)$/basides3.obj \ - $(SLO)$/basidesh.obj \ - $(SLO)$/basobj2.obj \ - $(SLO)$/basobj3.obj \ - $(SLO)$/bastype2.obj \ - $(SLO)$/bastype3.obj \ - $(SLO)$/bastypes.obj \ - $(SLO)$/brkdlg.obj \ - $(SLO)$/doceventnotifier.obj \ - $(SLO)$/docsignature.obj \ - $(SLO)$/documentenumeration.obj \ - $(SLO)$/iderdll.obj \ - $(SLO)$/localizationmgr.obj \ - $(SLO)$/macrodlg.obj \ - $(SLO)$/moduldl2.obj \ - $(SLO)$/moduldlg.obj \ - $(SLO)$/objdlg.obj \ - $(SLO)$/register.obj \ - $(SLO)$/scriptdocument.obj \ - $(SLO)$/tbxctl.obj \ - $(SLO)$/unomodel.obj - -SLOFILES = $(EXCEPTIONSFILES) - -SRS1NAME=$(TARGET) -SRC1FILES= basidesh.src macrodlg.src moptions.src moduldlg.src objdlg.src brkdlg.src basicprint.src - -.INCLUDE : target.mk - -$(INCCOM)$/dllname.hxx: makefile.mk -.IF "$(GUI)"=="UNX" - $(RM) $@ - echo \#define DLL_NAME \"libbasctl$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.ELSE - echo \#define DLL_NAME \"basctl$(DLLPOSTFIX)$(DLLPOST)\" >$@ -.ENDIF - -$(SLO)$/basiclib.obj : $(INCCOM)$/dllname.hxx - -$(INCCOM)$/basicide.hrc: basidesh.hrc - @-$(COPY) basidesh.hrc $@ - diff --git a/basctl/source/dlged/makefile.mk b/basctl/source/dlged/makefile.mk deleted file mode 100644 index 6eacc9c2dd1e..000000000000 --- a/basctl/source/dlged/makefile.mk +++ /dev/null @@ -1,63 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=basctl -TARGET=dlged -AUTOSEG=true -VISIBILITY_HIDDEN=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES= \ - $(SLO)$/dlged.obj \ - $(SLO)$/dlgedclip.obj \ - $(SLO)$/dlgedfac.obj \ - $(SLO)$/dlgedfunc.obj \ - $(SLO)$/dlgedlist.obj \ - $(SLO)$/dlgedmod.obj \ - $(SLO)$/dlgedobj.obj \ - $(SLO)$/dlgedpage.obj \ - $(SLO)$/dlgedview.obj \ - $(SLO)$/managelang.obj \ - $(SLO)$/propbrw.obj - -SLOFILES= $(EXCEPTIONSFILES) - -SRS1NAME=$(TARGET) -SRC1FILES= dlgresid.src \ - managelang.src - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/basctl/util/basctl.map b/basctl/util/basctl.map deleted file mode 100755 index 3677a07670ed..000000000000 --- a/basctl/util/basctl.map +++ /dev/null @@ -1,9 +0,0 @@ -UDK_3_0_0 { - global: - basicide_choose_macro; - basicide_macro_organizer; - basicide_handle_basic_error; - component_getFactory; - local: - *; -}; diff --git a/basctl/util/hidother.hrc b/basctl/util/hidother.hrc deleted file mode 100644 index 68bb57a274b3..000000000000 --- a/basctl/util/hidother.hrc +++ /dev/null @@ -1,27 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#define HID_INTERFACE_BASIDE_VIEWSH 451 diff --git a/basctl/util/hidother.src b/basctl/util/hidother.src deleted file mode 100644 index ce2607b3296d..000000000000 --- a/basctl/util/hidother.src +++ /dev/null @@ -1,44 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#include "../inc/helpid.hrc" // HID_XXX - -hidspecial HID_BASICIDE_PROP_BROWSER_LBOX { HelpID = HID_BASICIDE_PROP_BROWSER_LBOX; }; -hidspecial HID_BASICIDE_PROP_BROWSER { HelpID = HID_BASICIDE_PROP_BROWSER; }; -hidspecial HID_BASICIDE_OBJCAT_SHOW { HelpID = HID_BASICIDE_OBJCAT_SHOW; }; -hidspecial HID_BASICIDE_OBJCAT_PROPS { HelpID = HID_BASICIDE_OBJCAT_PROPS; }; -hidspecial HID_BASICIDE_OBJCAT_HELP { HelpID = HID_BASICIDE_OBJCAT_HELP; }; -hidspecial HID_BASICIDE_MODULWINDOW { HelpID = HID_BASICIDE_MODULWINDOW; }; -hidspecial HID_BASICIDE_DIALOGWINDOW { HelpID = HID_BASICIDE_DIALOGWINDOW; }; -hidspecial HID_BASICIDE_EDITORWINDOW { HelpID = HID_BASICIDE_EDITORWINDOW; }; -hidspecial HID_BASICIDE_BREAKPOINTWINDOW { HelpID = HID_BASICIDE_BREAKPOINTWINDOW; }; -hidspecial HID_BASICIDE_WATCHWINDOW { HelpID = HID_BASICIDE_WATCHWINDOW; }; -hidspecial HID_BASICIDE_STACKWINDOW { HelpID = HID_BASICIDE_STACKWINDOW; }; -hidspecial HID_BASICIDE_TABBAR { HelpID = HID_BASICIDE_TABBAR; }; -hidspecial HID_BASICIDE_WATCHWINDOW_LIST { HelpID = HID_BASICIDE_WATCHWINDOW_LIST; }; -hidspecial HID_BASICIDE_STACKWINDOW_LIST { HelpID = HID_BASICIDE_STACKWINDOW_LIST; }; -hidspecial HID_BASICIDE_ADDNEW_LANGUAGE { HelpID = HID_BASICIDE_ADDNEW_LANGUAGE; }; - diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk deleted file mode 100644 index 1719a7c9c078..000000000000 --- a/basctl/util/makefile.mk +++ /dev/null @@ -1,112 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=basctl -TARGET=basctl -#svx.hid generieren -GEN_HID=TRUE -GEN_HID_OTHER=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein ---------------------------------------------------- - -# --- Basctl - DLL ---------- - -.IF "$(header)" == "" - -HELPIDFILES= ..$/inc$/helpid.hrc - -SHL1TARGET= basctl$(DLLPOSTFIX) -SHL1IMPLIB= basctl -SHL1BASE = 0x1d800000 -SHL1STDLIBS= \ - $(EDITENGLIB) \ - $(SVXCORELIB) \ - $(SVXLIB) \ - $(SFX2LIB) \ - $(FWELIB) \ - $(BASICLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(XMLSCRIPTLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(UCBHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -.IF "$(GUI)"=="WNT" -SHL1STDLIBS+= $(SHELLLIB) -.ENDIF # WNT - - -SHL1LIBS= $(SLB)$/basctl.lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -SHL1VERSIONMAP=basctl.map - -DEF1NAME =$(SHL1TARGET) - -LIB1TARGET =$(SLB)$/basctl.lib -LIB1FILES = \ - $(LIBPRE) $(SLB)$/basicide.lib \ - $(LIBPRE) $(SLB)$/dlged.lib \ - $(LIBPRE) $(SLB)$/accessibility.lib - -SRSFILELIST=\ - $(SRS)$/basicide.srs \ - $(SRS)$/dlged.srs - -RESLIB1NAME=basctl -RESLIB1IMAGES =$(PRJ)$/res -RESLIB1SRSFILES= $(SRSFILELIST) - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.ENDIF # "$(header)" == "" - - -ALLTAR : $(MISC)/basctl.component - -$(MISC)/basctl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - basctl.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt basctl.component -- cgit From 6aedd6ca268478c17b3644b12be25f2533c7c63e Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 28 Jul 2011 13:06:21 +0200 Subject: fix include paths --- basctl/AllLangResTarget_basctl.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'basctl') diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk index 5bb333b66754..d7def50bb583 100644 --- a/basctl/AllLangResTarget_basctl.mk +++ b/basctl/AllLangResTarget_basctl.mk @@ -36,6 +36,8 @@ $(eval $(call gb_SrsTarget_SrsTarget,basctl/res)) $(eval $(call gb_SrsTarget_set_include,basctl/res,\ -I$(realpath $(SRCDIR)/basctl/inc) \ -I$(realpath $(SRCDIR)/basctl/source/inc) \ + -I$(realpath $(SRCDIR)/basctl/source/basicide) \ + -I$(realpath $(SRCDIR)/basctl/source/dlged) \ $$(INCLUDE) \ )) -- cgit From 499a46c030bf0250c585ed6cde56fc017a9c73fc Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Thu, 28 Jul 2011 17:39:47 +0200 Subject: callcatcher: remove unused methods --- basctl/inc/iderdll.hxx | 1 - basctl/source/basicide/iderdll.cxx | 14 -------------- 2 files changed, 15 deletions(-) (limited to 'basctl') diff --git a/basctl/inc/iderdll.hxx b/basctl/inc/iderdll.hxx index 6b48b37f50c4..02e2c75bb014 100644 --- a/basctl/inc/iderdll.hxx +++ b/basctl/inc/iderdll.hxx @@ -46,7 +46,6 @@ public: BasicIDEShell* GetShell() const { return pShell; } BasicIDEData* GetExtraData(); static void Init(); - static void Exit(); static BasicIDEDLL* GetDLL(); }; diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index 54b648402cd3..ea882751e178 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -115,20 +115,6 @@ void BasicIDEDLL::Init() PropBrwMgr::RegisterChildWindow(); } -/************************************************************************* -|* -|* Deinitialisierung -|* -\************************************************************************/ -void BasicIDEDLL::Exit() -{ - // the BasicIDEModule must be destroyed - BasicIDEModule** ppShlPtr = (BasicIDEModule**) GetAppData(SHL_IDE); - delete (*ppShlPtr); - (*ppShlPtr) = NULL; - DELETEZ( pBasicIDEDLL ); -} - BasicIDEData* BasicIDEDLL::GetExtraData() { if ( !pExtraData ) -- cgit From 48b31fa84708254f8217b348dc49d39288672f8e Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Fri, 29 Jul 2011 15:10:01 +0200 Subject: findbar: Add seporator between the Prev/Next and Serch & Replace --- basctl/uiconfig/basicide/toolbar/findbar.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'basctl') diff --git a/basctl/uiconfig/basicide/toolbar/findbar.xml b/basctl/uiconfig/basicide/toolbar/findbar.xml index c2e10c2a7f41..49e483e178a3 100644 --- a/basctl/uiconfig/basicide/toolbar/findbar.xml +++ b/basctl/uiconfig/basicide/toolbar/findbar.xml @@ -4,5 +4,6 @@ + -- cgit From f900be1d53705174a26befe2c47fb24a4e44f2f3 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 30 Jul 2011 23:01:27 +0300 Subject: Add consistent Emacs and vim mode lines --- basctl/AllLangResTarget_basctl.mk | 3 ++- basctl/Library_basctl.mk | 3 ++- basctl/Module_basctl.mk | 3 ++- basctl/Package_xml.mk | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'basctl') diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk index d7def50bb583..ed9c4d5a0fc4 100644 --- a/basctl/AllLangResTarget_basctl.mk +++ b/basctl/AllLangResTarget_basctl.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,4 +54,4 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\ basctl/source/dlged/managelang.src \ )) -# vim: set noet sw=4: +# vim: set noet sw=4 ts=4: diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index 73e12a812a8a..61ea991e116f 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,4 +132,4 @@ $(eval $(call gb_Library_add_linked_libs,basctl,\ )) endif -# vim: set noet sw=4: +# vim: set noet sw=4 ts=4: diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk index 1ab09c494a0d..57ab3293f541 100644 --- a/basctl/Module_basctl.mk +++ b/basctl/Module_basctl.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,4 +34,4 @@ $(eval $(call gb_Module_add_targets,basctl,\ Package_xml \ )) -# vim: set noet sw=4: +# vim: set noet sw=4 ts=4: diff --git a/basctl/Package_xml.mk b/basctl/Package_xml.mk index 9630050f8549..c20b7a87e332 100644 --- a/basctl/Package_xml.mk +++ b/basctl/Package_xml.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,4 +39,4 @@ $(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolb $(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/standardbar.xml,uiconfig/basicide/toolbar/standardbar.xml)) $(eval $(call gb_Package_add_file,basctl_xml,xml/uiconfig/modules/BasicIDE/toolbar/translationbar.xml,uiconfig/basicide/toolbar/translationbar.xml)) -# vim: set noet sw=4: +# vim: set noet sw=4 ts=4: -- cgit From 370ce3185082b976a6c8de8d4aea07273907a8ff Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 3 Aug 2011 22:25:28 +0100 Subject: callcatcher: remove unused methods --- basctl/source/basicide/basides1.cxx | 36 ------------------------------------ basctl/source/inc/basidesh.hxx | 1 - 2 files changed, 37 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index e3dbc568ffd6..4fecf6e79683 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -1396,40 +1396,4 @@ void BasicIDEShell::Deactivate( sal_Bool bMDI ) } } - -IMPL_LINK( BasicIDEShell, AccelSelectHdl, Accelerator*, pAccel ) -{ - sal_Bool bDone = sal_True; - SfxViewFrame* pViewFrame = GetViewFrame(); - SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL; - if( !pDispatcher ) - return sal_False; - switch ( pAccel->GetCurKeyCode().GetCode() ) - { - case KEY_F5: - if ( pAccel->GetCurKeyCode().IsShift() ) - pDispatcher->Execute( SID_BASICSTOP, SFX_CALLMODE_SYNCHRON ); - else - pDispatcher->Execute( SID_BASICRUN, SFX_CALLMODE_SYNCHRON ); - break; - case KEY_F7: - pDispatcher->Execute( SID_BASICIDE_ADDWATCH, SFX_CALLMODE_SYNCHRON ); - break; - case KEY_F8: - if ( pAccel->GetCurKeyCode().IsShift() ) - pDispatcher->Execute( SID_BASICSTEPOVER, SFX_CALLMODE_SYNCHRON ); - else - pDispatcher->Execute( SID_BASICSTEPINTO, SFX_CALLMODE_SYNCHRON ); - break; - case KEY_F9: - if ( pAccel->GetCurKeyCode().IsShift() ) - pDispatcher->Execute( SID_BASICIDE_TOGGLEBRKPNTENABLED, SFX_CALLMODE_SYNCHRON ); - else - pDispatcher->Execute( SID_BASICIDE_TOGGLEBRKPNT, SFX_CALLMODE_SYNCHRON ); - break; - default: bDone = sal_False; - } - return bDone; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 20f2f1543a4c..b7b7c114926d 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -122,7 +122,6 @@ friend class ContainerListenerImpl; void ImplStartListening( StarBASIC* pBasic ); DECL_LINK( TabBarHdl, TabBar* ); - DECL_LINK( AccelSelectHdl, Accelerator* ); DECL_LINK( ObjectDialogCancelHdl, ObjectCatalog * ); DECL_LINK( TabBarSplitHdl, TabBar * ); #endif -- cgit From 09c28c78d0779abe57945b37d503d10c92ed1c82 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Fri, 5 Aug 2011 10:57:08 +0900 Subject: Emacs modeline compatible with vim's one --- basctl/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'basctl') diff --git a/basctl/Makefile b/basctl/Makefile index 5bedaf0b9dcf..3abf1ae8b6bb 100644 --- a/basctl/Makefile +++ b/basctl/Makefile @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -- cgit From da41ba97d3ac0eb751dfc4b716bd594d1670c77e Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Tue, 9 Aug 2011 00:17:54 +0200 Subject: Some cppcheck cleaning --- basctl/source/dlged/dlgedobj.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'basctl') diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 315b4a4b7c37..cff3e08bd594 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -1531,7 +1531,7 @@ void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt ) nPageHeightIn = aPageSize.Height(); if ( TransformSdrToControlCoordinates( nPageXIn, nPageYIn, nPageWidthIn, nPageHeightIn, nPageX, nPageY, nPageWidth, nPageHeight ) ) { - for ( aIter = aChildList.begin(); aIter != aChildList.end(); aIter++ ) + for ( aIter = aChildList.begin(); aIter != aChildList.end(); ++aIter ) { Reference< beans::XPropertySet > xPSet( (*aIter)->GetUnoControlModel(), UNO_QUERY ); if ( xPSet.is() ) @@ -1578,7 +1578,7 @@ void DlgEdForm::PositionAndSizeChange( const beans::PropertyChangeEvent& evt ) } } - for ( aIter = aChildList.begin(); aIter != aChildList.end(); aIter++ ) + for ( aIter = aChildList.begin(); aIter != aChildList.end(); ++aIter ) { (*aIter)->SetRectFromProps(); } @@ -1780,7 +1780,7 @@ void DlgEdForm::NbcMove( const Size& rSize ) // set geometry properties of all childs ::std::vector::iterator aIter; - for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; aIter++ ) + for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter ) { (*aIter)->EndListening(sal_False); (*aIter)->SetPropsFromRect(); @@ -1804,7 +1804,7 @@ void DlgEdForm::NbcResize(const Point& rRef, const Fraction& xFract, const Fract // set geometry properties of all childs ::std::vector::iterator aIter; - for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; aIter++ ) + for ( aIter = pChilds.begin() ; aIter != pChilds.end() ; ++aIter ) { (*aIter)->EndListening(sal_False); (*aIter)->SetPropsFromRect(); -- cgit From b2bd33ea253952ad3f8b4bfe4bd54c4af16cb86e Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Wed, 10 Aug 2011 02:12:48 +0900 Subject: prefer makefile-gmake-mode to plain makefile-mode --- basctl/AllLangResTarget_basctl.mk | 2 +- basctl/Library_basctl.mk | 2 +- basctl/Module_basctl.mk | 2 +- basctl/Package_xml.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'basctl') diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk index ed9c4d5a0fc4..1611f9a506e2 100644 --- a/basctl/AllLangResTarget_basctl.mk +++ b/basctl/AllLangResTarget_basctl.mk @@ -1,4 +1,4 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index 61ea991e116f..c8069807dbf2 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -1,4 +1,4 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk index 57ab3293f541..7ff2a7e117d8 100644 --- a/basctl/Module_basctl.mk +++ b/basctl/Module_basctl.mk @@ -1,4 +1,4 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. diff --git a/basctl/Package_xml.mk b/basctl/Package_xml.mk index c20b7a87e332..c420e5391767 100644 --- a/basctl/Package_xml.mk +++ b/basctl/Package_xml.mk @@ -1,4 +1,4 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -- cgit From 9124003eb1e398957a85c5c009ac5eddf5e6f28e Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 14 Aug 2011 01:37:52 +0100 Subject: ByteString::IsNumericAscii->comphelper::string::isAsciiDecimalString shrink ByteString api, remove need for intermediate OString/ByteString with random-ish encoding solely for check --- basctl/source/basicide/baside2b.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'basctl') diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 28df6b14ccea..e6cf7b1b0c0e 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -60,6 +60,7 @@ #include #include +#include using namespace ::com::sun::star; @@ -268,7 +269,7 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt ) TextPaM aCursor = GetEditView()->GetTextEngine()->GetPaM( aDocPos, sal_False ); TextPaM aStartOfWord; String aWord = GetEditView()->GetTextEngine()->GetWord( aCursor, &aStartOfWord ); - if ( aWord.Len() && !ByteString( aWord, RTL_TEXTENCODING_UTF8 ).IsNumericAscii() ) + if ( aWord.Len() && !comphelper::string::isAsciiDecimalString(aWord) ) { sal_uInt16 nLastChar =aWord.Len()-1; if ( strchr( cSuffixes, aWord.GetChar( nLastChar ) ) ) -- cgit From d64bbd6bf8d41604e3f14f911f2169f4295e4d99 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Fri, 19 Aug 2011 18:29:07 -0500 Subject: detect gmake 3.81 and limit to -j1 unless num-cpu is explicitly set --- basctl/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'basctl') diff --git a/basctl/prj/makefile.mk b/basctl/prj/makefile.mk index d30ff8a47e6b..85b25665cc83 100644 --- a/basctl/prj/makefile.mk +++ b/basctl/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog -- cgit