# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # # This file incorporates work covered by the following license notice: # # 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 . # $(eval $(call gb_Jar_Jar,table)) $(eval $(call gb_Jar_use_jars,table,\ libreoffice \ java_uno \ commonwizards \ )) $(eval $(call gb_Jar_set_packageroot,table,com)) $(eval $(call gb_Jar_set_manifest,table,$(SRCDIR)/wizards/com/sun/star/wizards/table/MANIFEST.MF)) $(eval $(call gb_Jar_add_sourcefiles,table,\ wizards/com/sun/star/wizards/table/CallTableWizard \ wizards/com/sun/star/wizards/table/CGCategory \ wizards/com/sun/star/wizards/table/CGTable \ wizards/com/sun/star/wizards/table/FieldDescription \ wizards/com/sun/star/wizards/table/FieldFormatter \ wizards/com/sun/star/wizards/table/Finalizer \ wizards/com/sun/star/wizards/table/PrimaryKeyHandler \ wizards/com/sun/star/wizards/table/ScenarioSelector \ wizards/com/sun/star/wizards/table/TableWizard \ )) $(eval $(call gb_Jar_set_componentfile,table,wizards/com/sun/star/wizards/table/table,OOO,services)) # vim: set noet sw=4 ts=4: 1'>distro/cib/libreoffice-6-1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/salhelper
ree/?id=6412a74b35a3e6089b65b4ad04549262e4bf93c8'>34d931f8fb5883b9b30967c5422c361558eb81cc
AgeCommit message (Expand)Author
2021-12-03Rather use ScopeGuard to prevent catch and rethrowStephan Bergmann
2021-12-02Fix clang-cl -Zc:dllexportInlines- buildStephan Bergmann
2021-12-01revert part of "remove counter-productive catch-all blocks"Noel Grandin
2021-11-29remove counter-productive catch-all blocksNoel Grandin
parente195c22533de44cd4f6afab7836c7eb6a613d202 (diff)
Enable STYLEREF flag export/import with ODF
This commit enables exporting the following STYLEREF flags with ODF - Search from bottom to top - Hide non numerical After this commit, the following steps have been implemented - The document model (I7d8f455ffe90cface4f3b1acf6b9bef6a045ed19) - The layout (I7d8f455ffe90cface4f3b1acf6b9bef6a045ed19) - The UI (I7d8f455ffe90cface4f3b1acf6b9bef6a045ed19) - UNO (Ib664fec059aa1f7f130acc76c253d5d298fa59f7) - DOCX/ODF filters (here and Ib664fec059aa1f7f130acc76c253d5d298fa59f7) Change-Id: Iad8e8001807f5ceeaedc9665838672695174a936 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158351 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat
-rw-r--r--include/xmloff/xmltoken.hxx2
-rw-r--r--schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng10
-rw-r--r--xmloff/inc/txtfld.hxx28
-rw-r--r--xmloff/inc/txtflde.hxx9
-rw-r--r--xmloff/inc/txtfldi.hxx2
-rw-r--r--xmloff/source/core/xmltoken.cxx2
-rw-r--r--xmloff/source/text/txtflde.cxx22
-rw-r--r--xmloff/source/text/txtfldi.cxx13
-rw-r--r--xmloff/source/token/tokens.txt2
9 files changed, 87 insertions, 3 deletions
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index d3c1b93ea6e4..066a55960e0b 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1607,6 +1607,8 @@ namespace xmloff::token {
XML_REFERENCE,
XML_REFERENCE_END,
XML_REFERENCE_FORMAT,
+ XML_REFERENCE_FROM_BOTTOM,
+ XML_REFERENCE_HIDE_NON_NUMERICAL,
XML_REFERENCE_MARK,
XML_REFERENCE_MARK_END,
XML_REFERENCE_MARK_START,
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index bf57af9b0be6..b9fbcfc7ce4b 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng