[Libreoffice-commits] .: svtools/inc svtools/source

[Miklos Vajna]

 svtools/inc/rtfkeywd.hxx          |    1 +
 svtools/inc/rtftoken.h            |    2 +-
 svtools/source/svrtf/rtfkey2.cxx  |    1 +
 svtools/source/svrtf/rtfkeywd.cxx |    1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 8ab5695e8aebf0070704ff5bbf855447dbed2746
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sun Nov 14 02:16:27 2010 +0100

    RTF: port last changes from CWS

diff --git a/svtools/inc/rtfkeywd.hxx b/svtools/inc/rtfkeywd.hxx
index e646e71..b701c3a 100644
--- a/svtools/inc/rtfkeywd.hxx
+++ b/svtools/inc/rtfkeywd.hxx
@@ -1124,6 +1124,7 @@
 #define OOO_STRING_SVTOOLS_RTF_SHP "\\shp"
 #define OOO_STRING_SVTOOLS_RTF_SN "\\sn"
 #define OOO_STRING_SVTOOLS_RTF_SV "\\sv"
+#define OOO_STRING_SVTOOLS_RTF_SP "\\sp"
 
 // Support for overline attributes
 #define OOO_STRING_SVTOOLS_RTF_OL "\\ol"
diff --git a/svtools/inc/rtftoken.h b/svtools/inc/rtftoken.h
index 0d8dac0..56db78b 100644
--- a/svtools/inc/rtftoken.h
+++ b/svtools/inc/rtftoken.h
@@ -1257,7 +1257,7 @@ enum RTF_TOKEN_IDS {
     RTF_SOUTLVL,
 
 // shapes
-    RTF_SHP, RTF_SN, RTF_SV
+	RTF_SHP, RTF_SN, RTF_SV, RTF_SP
 /*
     RTF_SHPLEFT, 
     RTF_SHPTOP, 
diff --git a/svtools/source/svrtf/rtfkey2.cxx b/svtools/source/svrtf/rtfkey2.cxx
index 0151660..f294865 100644
--- a/svtools/source/svrtf/rtfkey2.cxx
+++ b/svtools/source/svrtf/rtfkey2.cxx
@@ -1127,6 +1127,7 @@ sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SOUTLVL, "\\soutlvl" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHP, "\\shp" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SN, "\\sn" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SV, "\\sv" );
+sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SP, "\\sp" );
 /*
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPLEFT, "\\shpleft" );
 sal_Char const SVTOOLS_CONSTASCII_DEF( sRTF_SHPTOP, "\\shptop" );
diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx
index 5d2b9c0..9f78fb9 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.cxx
@@ -1159,6 +1159,7 @@ static RTF_TokenEntry __FAR_DATA aRTFTokenTab[] = {
         */
         {{OOO_STRING_SVTOOLS_RTF_SN},       RTF_SN},
         {{OOO_STRING_SVTOOLS_RTF_SV},       RTF_SV},
+        {{OOO_STRING_SVTOOLS_RTF_SP},       RTF_SP},
 
 // Support for overline attributes
         {{OOO_STRING_SVTOOLS_RTF_OL}, 			RTF_OL},