/************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: numpages.hrc,v $ * * $Revision: 1.5 $ * * last change: $Author: obo $ $Date: 2006-10-12 12:19:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * * * GNU Lesser General Public License Version 2.1 * ============================================= * Copyright 2005 by Sun Microsystems, Inc. * 901 San Antonio Road, Palo Alto, CA 94303, USA * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License version 2.1, as published by the Free Software Foundation. * * This library 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 for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * ************************************************************************/ #define FT_ALIGN 50 #define LB_ALIGN 51 #define FT_DIST_BORDER 52 #define MF_DIST_BORDER 53 #define FT_DIST_NUM 54 #define MF_DIST_NUM 55 #define GB_POS 56 #define LB_FMT_CHAR 60 #define FT_FMT_CHAR 61 #define FT_WIDTH 67 #define FI_URL 68 #define FT_HEIGHT 70 #define MN_STD_NUMBER 120 #define MD_DEL_NUMBER 121 #define MN_STD_BULLET 122 #define MN_DEL_BULLET 123 #define STR_BULLET 200 //#define STR_NUMFMT_1 201 //#define STR_NUMFMT_2 202 //#define STR_NUMFMT_3 203 //#define STR_NUMFMT_4 204 //#define STR_NUMFMT_5 205 //#define STR_NUMFMT_6 206 //#define STR_NUMFMT_7 207 //#define STR_NUMFMT_8 208 //#define STR_NUMFMT_7_HTML 209 #define LB_FORM 210 #define ED_FORM 211 #define GB_FORM 212 #define BT_BULLET 213 #define FL_VALUES 220 #define VS_VALUES 221 #define ST_CUSTOMIZE 222 #define FT_ERROR 223 #define CB_LINKED 224 #define FT_LEVEL 151 #define LB_LEVEL 152 #define FL_FORMAT 153 #define FL_POSITION 154 #define FT_PREFIX 155 #define ED_PREFIX 156 #define FT_FMT 157 #define LB_FMT 158 #define FT_SUFFIX 159 #define ED_SUFFIX 160 #define FT_BORDERDIST 161 #define MF_BORDERDIST 162 #define FT_NUMDIST 163 #define MF_NUMDIST 164 #define FT_INDENT 165 #define MF_INDENT 166 #define FT_CHARFMT 167 #define LB_CHARFMT 168 #define NF_ALL_LEVEL 169 #define FT_START 170 #define ED_START 171 #define FT_BULLET 172 #define PB_BULLET 173 #define WIN_PREVIEW 174 #define FT_BITMAP 175 #define PB_SEARCH 176 #define CB_RATIO 177 #define FT_SIZE 178 #define MF_WIDTH 179 #define FT_MULT 180 #define MF_HEIGHT 181 #define FT_ORIENT 182 #define LB_ORIENT 183 #define MB_BITMAP 184 #define CB_RELATIVE 185 #define FT_ALL_LEVEL 186 #define PB_STANDARD 187 #define CB_SAME_LEVEL 188 #define FL_SAME_LEVEL 189 #define FT_BUL_COLOR 190 #define LB_BUL_COLOR 191 #define FT_BUL_REL_SIZE 192 #define MF_BUL_REL_SIZE 193 // 194 removed #define ST_POPUP_EMPTY_ENTRY 195 #define MN_GRAPHIC_DLG 1 #define MN_GALLERY 2 #define MN_GALLERY_ENTRY 100 option value='distro/collabora/cp-4.1'>distro/collabora/cp-4.1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/xmerge
AgeCommit message (Collapse)Author
2020-02-04tdf#117331 Merge jurt and unoil into ridlSamuel Mehrbrodt
jurt.jar and unoil.jar are kept as effectively empty jars, each with a Class-Path: ridl.jar in their meta-inf/manifest.mf, so that 3rd-party code loading them (with or without also loading ridl.jar) will still have access to their content. Conceptually, the UNOIDL entities in unoil.jar (corresponding to module offapi) are not part of the URE, but are now made available by URE's ridl.jar. This should probably not cause problems in practice. At least for now, we seal exactly those packages in ridl.jar that were originally sealed in jurt.jar. Ideally, all of ridl.jar could be sealed now, but that would be mildly incompatible, as it would prevent 3rd-party code from introducing additional UNOIDL entities in the relevant namespaces (even if that is something we do not want 3rd-party code to do anyway). However, some JunitTest_jurt_* define classes in those sealed packages. In the past they got away with that by using gb_JunitTest_use_jar_classset,*,jurt. Instead they now need to gb_JunitTest_use_jar_classset,*,ridl and drop the gb_JunitTest_use_jar,*,ridl. But the former only makes available the classes that are specified in ridljar/Jar_ridl.mk with gb_Jar_add_sourcefiles, not the UNOIDL entities specified via gb_Jar_add_packagedirs. But the tests need the udkapi UNOIDL entities, so introduce gb_JunitTest_add_classpath to let the tests get them explicitly. (Curiously, JunitTest_jurt_uno and JnitTest_jurt_util use gb_JunitTest_use_jar_classset,*,jurt but don't seem to acutally need it; lets leave that for a follow-up clean up.) As a follow-up clean up, relevant files could be moved from jurt/ to ridljar/. Change-Id: I836f4e7bb47fb41f1306e3f223da90dba988eb9a Co-authored-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84946 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-12-05Fix typoAndrea Gelmini
Change-Id: I2edcb779a31f5e9a968222ed1d08bde9401e1a27 Reviewed-on: https://gerrit.libreoffice.org/84499 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-12-05Fix typoAndrea Gelmini
Change-Id: If61ec79ef2953a708aa786b78eeaac0e19676910 Reviewed-on: https://gerrit.libreoffice.org/84498 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-08-20Fix typosAndrea Gelmini
Change-Id: I62577ca57b90d6575bfcf722ac2487e057a95715 Reviewed-on: https://gerrit.libreoffice.org/77767 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-08-16Fix typosAndrea Gelmini
Change-Id: I8ab75eb5cd54d14fda42bcdb1a251e9e2b6fefdf Reviewed-on: https://gerrit.libreoffice.org/77612 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-08-02Fix typosAndrea Gelmini
Change-Id: I8e2f3104f3ae9d20e520d357e61c02afde0cedf4 Reviewed-on: https://gerrit.libreoffice.org/76858 Tested-by: Jenkins Reviewed-by: Andrea Gelmini <andrea.gelmini@gelma.net>
2019-07-24Fix typosAndrea Gelmini
Change-Id: Ib778a6598f3797fe871a25b56b7b4b7761889296 Reviewed-on: https://gerrit.libreoffice.org/76269 Tested-by: Jenkins Reviewed-by: Andrea Gelmini <andrea.gelmini@gelma.net>
2019-05-04Fix typoAndrea Gelmini
Change-Id: Ib04fe75d60647c938225700dd25a3e7e031437dd Reviewed-on: https://gerrit.libreoffice.org/71781 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
2018-07-22Fix typosAndrea Gelmini
Change-Id: I326827c394347cbe9fad242e9da5702cba7a4d95 Reviewed-on: https://gerrit.libreoffice.org/57761 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
2018-04-16Fix typosAndrea Gelmini
Change-Id: Ife28cd9399cfcb375bad764dac7424eda50d430d Reviewed-on: https://gerrit.libreoffice.org/52198 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-04-02use https links for api.libreoffice.org and opengrokdennisroczek
Change-Id: I74dd0142562cb8698f19b2715fa1d514f82bd749 Reviewed-on: https://gerrit.libreoffice.org/52262 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>