forked from amazingfate/loongoffice
54599383a2
Follow-up to 100c914d44ae8f362924fe567d7d41d0033ae8ad
which added the initial id preservation for DOCX.
adding DOCX block SDT grabbaging, ODF import/export
[content controls can't exist in DOC format]
The ID field is CRITICAL to preserve for VBA purposes.
This patch adjusts BlockSDT to also round-trip the id
instead of just creating a random one.
m_nRunSdtPrToken <never equals> FSNS(XML_w, XML_id) since 2021
with 5f3af56b2c0ef6c628a7cfe5ce6e86f8e1765f5f,
so I removed that part of the clause.
I had thought about changing the ID to use a string instead of an int,
but then the integer version was adopted to fix a regression
in the commit mentioned earlier.
I think it is AWFUL to have a number as the identifier
when it will be used in StarBASIC. The VBA guys have to deal
with it, but it would be nice to do something reasonable
for LO native access to content controls.
However, the concern would be if we allow VBA macro content created in LO
to be exported to DOCX format - that would cause problems converting
from a string ID to a number ID. VBA editing already is happening to
some extent, and mmeeks seems interested in enabling it.
So over-all it seems best to just stick with an integer ID.
I used the commits for <w:alias> and <w:tag> to compose this patch.
XML_ID already existed in include/xmloff/xmltoken.hxx
and "id" already exists in xmloff/source/token/tokens.txt
The ID can be used in VBA to select a specific control.
The id (which is a positive or negative integer in DOCX)
specifies a unique control - either by passing the number as a string
(of the UNSIGNED value) or by passing as a float (specified with #).
For example:
msgbox ActiveDocument.ContentControls(2587720202#).ID
msgbox ActiveDocument.ContentControls("2587720202").ID
but not as an integer since that is used for index access.
dim index as integer
index = 1
msgbox ActiveDocument.ContentControls(index).ID
make CppunitTest_writerfilter_dmapper CPPUNIT_TEST_NAME=testSdtRunRichText
make CppunitTest_sw_ooxmlexport17 CPPUNIT_TEST_NAME=testDateContentControlExport
make CppunitTest_sw_ooxmlexport18 CPPUNIT_TEST_NAME=testTdf151912
make CppunitTest_sw_core_unocore CPPUNIT_TEST_NAME=testContentControlDate
make CppunitTest_xmloff_text CPPUNIT_TEST_NAME=testAliasContentControlExport
make CppunitTest_xmloff_text CPPUNIT_TEST_NAME=testAliasContentControlImport
Change-Id: I5c4022dc932d941fad9da6d75ce899ee1ff66ff5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142818
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
93 lines
3.0 KiB
C++
93 lines
3.0 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* 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 .
|
|
*/
|
|
#pragma once
|
|
|
|
#include <xmloff/xmlictxt.hxx>
|
|
|
|
#include <vector>
|
|
|
|
#include <com/sun/star/text/XTextContent.hpp>
|
|
#include <com/sun/star/beans/PropertyValues.hpp>
|
|
|
|
class XMLHints_Impl;
|
|
|
|
/// Imports <loext:content-control>.
|
|
class XMLContentControlContext : public SvXMLImportContext
|
|
{
|
|
XMLHints_Impl& m_rHints;
|
|
|
|
bool& m_rIgnoreLeadingSpace;
|
|
|
|
css::uno::Reference<css::text::XTextRange> m_xStart;
|
|
|
|
bool m_bShowingPlaceHolder = false;
|
|
|
|
bool m_bCheckbox = false;
|
|
bool m_bChecked = false;
|
|
OUString m_aCheckedState;
|
|
OUString m_aUncheckedState;
|
|
std::vector<css::beans::PropertyValues> m_aListItems;
|
|
bool m_bPicture = false;
|
|
bool m_bDate = false;
|
|
OUString m_aDateFormat;
|
|
OUString m_aDateLanguage;
|
|
OUString m_aCurrentDate;
|
|
bool m_bPlainText = false;
|
|
bool m_bComboBox = false;
|
|
bool m_bDropDown = false;
|
|
OUString m_aAlias;
|
|
OUString m_aTag;
|
|
sal_Int32 m_nId = 0;
|
|
sal_uInt32 m_nTabIndex = 0;
|
|
OUString m_aLock;
|
|
|
|
public:
|
|
XMLContentControlContext(SvXMLImport& rImport, sal_Int32 nElement, XMLHints_Impl& rHints,
|
|
bool& rIgnoreLeadingSpace);
|
|
|
|
void SAL_CALL startFastElement(
|
|
sal_Int32 nElement,
|
|
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList) override;
|
|
|
|
void SAL_CALL endFastElement(sal_Int32 nElement) override;
|
|
|
|
css::uno::Reference<css::xml::sax::XFastContextHandler> SAL_CALL createFastChildContext(
|
|
sal_Int32 nElement,
|
|
const css::uno::Reference<css::xml::sax::XFastAttributeList>& rAttrList) override;
|
|
|
|
void SAL_CALL characters(const OUString& rChars) override;
|
|
|
|
void AppendListItem(const css::beans::PropertyValues& rListItem);
|
|
};
|
|
|
|
/// Imports <loext:list-item> inside <loext:content-control>.
|
|
class XMLListItemContext : public SvXMLImportContext
|
|
{
|
|
XMLContentControlContext& m_rContentControl;
|
|
|
|
public:
|
|
XMLListItemContext(SvXMLImport& rImport, XMLContentControlContext& rContentControl);
|
|
|
|
void SAL_CALL startFastElement(
|
|
sal_Int32 nElement,
|
|
const css::uno::Reference<css::xml::sax::XFastAttributeList>& xAttrList) override;
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|