[Libreoffice-commits] core.git: include/xmloff xmloff/source

[Markus Mohrhard]

 include/xmloff/xmlstyle.hxx      |    3 ---
 xmloff/source/style/xmlstyle.cxx |   12 ------------
 2 files changed, 15 deletions(-)

New commits:
commit 198fabe0f2dcfa920eb975da11e9b45d010dcb3a
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Sep 24 13:08:02 2016 +0200

    soon is now
    
    Change-Id: Ib4b8b949f00609149f9134fb2f286cd7e0dc0255
    Reviewed-on: https://gerrit.libreoffice.org/29254
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 0e7e516..975aa0c 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -67,9 +67,6 @@ class XMLOFF_DLLPUBLIC SvXMLStyleContext : public SvXMLImportContext
     OUString     maFollow;    // Will be moved to XMLPropStyle soon!!!!
     bool         mbHidden;
 
-    OUString     maHelpFile;  // Will be removed very soon!!!!
-
-    sal_uInt32   mnHelpId;    // Will be removed very soon!!!!
     sal_uInt16   mnFamily;
 
     bool         mbValid : 1; // Set this to false in CreateAndInsert
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index a7b861e..0c25d38 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -123,17 +123,6 @@ void SvXMLStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
         {
             maFollow = rValue;
         }
-        else if( IsXMLToken( rLocalName, XML_HELP_FILE_NAME ) )
-        {
-            maHelpFile = rValue;
-        }
-        else if( IsXMLToken( rLocalName, XML_HELP_ID ) )
-        {
-            sal_Int32 nTmp = rValue.toInt32();
-            mnHelpId =
-                (nTmp < 0L) ? 0U : ( (nTmp > USHRT_MAX) ? USHRT_MAX
-                                                        : (sal_uInt16)nTmp );
-        }
         else if( IsXMLToken( rLocalName, XML_HIDDEN ) )
         {
             mbHidden = rValue.toBoolean();
@@ -149,7 +138,6 @@ SvXMLStyleContext::SvXMLStyleContext(
         sal_uInt16 nFam, bool bDefault ) :
     SvXMLImportContext( rImp, nPrfx, rLName ),
     mbHidden( false ),
-    mnHelpId( UCHAR_MAX ),
     mnFamily( nFam ),
     mbValid( true ),
     mbNew( true ),