[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - include/xmloff

[Stephan Bergmann]

 include/xmloff/settingsstore.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 082773aa308c854d91b824e414903c296e110d85
Author: Stephan Bergmann 
Date:   Fri Feb 16 23:15:56 2018 +0100

DocumentSettingsSerializer must be SAL_DLLPUBLIC_RTTI for dynamic_cast

...in SdXMLImport::SetConfigurationSettings 
(xmloff/source/draw/sdxmlimp.cxx) to
work with instances of sd::DocumentSettings (defined in
sd/source/ui/unoidl/UnoDocumentSettings.cxx, derived from
DocumentSettingsSerializer), at least on platforms using the strict 
by-address
RTTI equality check form (e.g., macOS).

(Cross-casts like this are not detected by loplugin:dyncastvisibility.)

Change-Id: I3f8712f9c64852cc8cb17c0c25211963360f117c
Reviewed-on: https://gerrit.libreoffice.org/49884
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit ff570b4b58dbf274d3094d21d974f18b613e9b4b)
Reviewed-on: https://gerrit.libreoffice.org/49929
Reviewed-by: Michael Stahl 

diff --git a/include/xmloff/settingsstore.hxx b/include/xmloff/settingsstore.hxx
index e78ae0a82ca3..0878a5ec288f 100644
--- a/include/xmloff/settingsstore.hxx
+++ b/include/xmloff/settingsstore.hxx
@@ -18,7 +18,7 @@
 
 // Scans list of properties for certain URL properties that could refer
 // to internal objects, and initializes from these.
-class DocumentSettingsSerializer {
+class SAL_DLLPUBLIC_RTTI DocumentSettingsSerializer {
 public:
   // Import objects and update properties (eliding URLs)
   virtual css::uno::Sequence
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - include/xmloff xmloff/source

[Mohammed Abdul Azeem]

 include/xmloff/xmltoken.hxx |9 +
 xmloff/source/core/fasttokenhandler.cxx |2 +-
 xmloff/source/core/xmltoken.cxx |9 +
 xmloff/source/token/tokens.txt  |9 +
 4 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit 000fbca705166237645bccf0b1c28164b076c043
Author: Mohammed Abdul Azeem 
Date:   Sat Oct 21 16:24:50 2017 +0530

tdf#110431: Fixed losing listbos entries on opening .ods file

For some reason, XML_TOKEN_INVALID was taking wrong value
in windows, causing to fail imports with unknown entries.

I've also added some of the tokens I found from several
test files to the list.

Change-Id: Idd2e7db165b9b4b5a2d8c7a837786fde252fe938
Reviewed-on: https://gerrit.libreoffice.org/43677
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
(cherry picked from commit 931c84e697dc69745d1c07c40f810638f9f71eda)
Reviewed-on: https://gerrit.libreoffice.org/43710

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index d746ae78c5d0..2fee08b63871 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -266,6 +266,7 @@ namespace xmloff { namespace token {
 XML_AUTHOR_INITIALS,
 XML_AUTHOR_NAME,
 XML_AUTO,
+XML_AUTO_COMPLETE,
 XML_AUTO_GROW_HEIGHT,
 XML_AUTO_GROW_WIDTH,
 XML_AUTO_RELOAD,
@@ -348,6 +349,7 @@ namespace xmloff { namespace token {
 XML_BOTTOM_VALUES,
 XML_BOTTOMARC,
 XML_BOTTOMCIRCLE,
+XML_BOUND_COLUMN,
 XML_BREAK_AFTER,
 XML_BREAK_BEFORE,
 XML_BREAK_INSIDE,
@@ -605,6 +607,7 @@ namespace xmloff { namespace token {
 XML_DEFAULT_STYLE_NAME,
 XML_DEGREE,
 XML_DELAY,
+XML_DELAY_FOR_REPEAT,
 XML_DELETE_COLUMNS,
 XML_DELETE_ROWS,
 XML_DELETION,
@@ -668,6 +671,7 @@ namespace xmloff { namespace token {
 XML_DRAWING,
 XML_DRAWINGS,
 XML_DRAWPOOL,
+XML_DROPDOWN,
 XML_DROP_CAP,
 XML_DYNAMIC,
 XML_EDGE_ROUNDING,
@@ -1135,6 +1139,7 @@ namespace xmloff { namespace token {
 XML_LINENUMBERING_SEPARATOR,
 XML_LINES,
 XML_LINES_USED,
+XML_LINKED_CELL,
 XML_LINK_TO_SOURCE_DATA,
 XML_LIST,
 XML_LIST_BLOCK,
@@ -1145,6 +1150,7 @@ namespace xmloff { namespace token {
 XML_LIST_LEVEL_STYLE_BULLET,
 XML_LIST_LEVEL_STYLE_IMAGE,
 XML_LIST_LEVEL_STYLE_NUMBER,
+XML_LIST_LINKAGE_TYPE,
 XML_LIST_NAME,
 XML_LIST_STYLE,
 XML_LIST_STYLE_NAME,
@@ -1354,6 +1360,7 @@ namespace xmloff { namespace token {
 XML_OPERATION,
 XML_OPERATOR,
 XML_OPTIMAL,
+XML_OPTION,
 XML_OR,
 XML_ORDER,
 XML_ORDERED_LIST,
@@ -1751,6 +1758,7 @@ namespace xmloff { namespace token {
 XML_STDEV,
 XML_STDEVP,
 XML_STEPS,
+XML_STEP_SIZE,
 XML_STOCK,
 XML_STOCK_UPDOWN_BARS,
 XML_STOCK_WITH_VOLUME,
@@ -1830,6 +1838,7 @@ namespace xmloff { namespace token {
 XML_TAN,
 XML_TANH,
 XML_TARGET_CELL_ADDRESS,
+XML_TARGET_FRAME,
 XML_TARGET_FRAME_NAME,
 XML_TARGET_RANGE_ADDRESS,
 XML_TB_RL,
diff --git a/xmloff/source/core/fasttokenhandler.cxx 
b/xmloff/source/core/fasttokenhandler.cxx
index 22a1606b44b1..712555fc9d0c 100644
--- a/xmloff/source/core/fasttokenhandler.cxx
+++ b/xmloff/source/core/fasttokenhandler.cxx
@@ -58,7 +58,7 @@ TokenMap::~TokenMap()
 sal_Int32 TokenMap::getTokenPerfectHash( const char *pStr, sal_Int32 nLength )
 {
 const struct xmltoken *pToken = Perfect_Hash::in_word_set( pStr, nLength );
-return pToken ? pToken->nToken : XML_TOKEN_INVALID;
+return pToken ? pToken->nToken : xmloff::XML_TOKEN_INVALID;
 }
 
 FastTokenHandler::FastTokenHandler() :
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index a7d242b366dd..d19c66de0a08 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -267,6 +267,7 @@ namespace xmloff { namespace token {
 TOKEN( "author-initials", XML_AUTHOR_INITIALS ),
 TOKEN( "author-name", XML_AUTHOR_NAME ),
 TOKEN( "auto",XML_AUTO ),
+TOKEN( "auto-complete",   XML_AUTO_COMPLETE ),
 TOKEN( "auto-grow-height",XML_AUTO_GROW_HEIGHT ),
 TOKEN( "auto-grow-width", XML_AUTO_GROW_WIDTH ),
 TOKEN( "auto-reload", XML_AUTO_RELOAD ),
@@ -349,6 +350,7 @@ namespace xmloff { namespace token {
 TOKEN( "bottom values",   XML_BOTTOM_VALUES ),
 TOKEN( "bottom-arc",  XML_BOTTOMARC ),
 TOKEN( "bottom-circle",