[Libreoffice-commits] core.git: xmlhelp/source

[Stephan Bergmann]

 xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx |   43 +--------------
 xmlhelp/source/cxxhelp/inc/qe/Query.hxx                  |    7 --
 xmlhelp/source/cxxhelp/provider/databases.cxx            |   12 ----
 xmlhelp/source/cxxhelp/provider/databases.hxx            |    6 --
 4 files changed, 8 insertions(+), 60 deletions(-)

New commits:
commit e1b30d688105afa28c8d927d78e137b85662a79b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 7 09:14:33 2015 +0200

    -Werror,-Wunused-private-field
    
    Change-Id: I80da554ab15450ff6aa13575784ee8f64ca506db

diff --git a/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx b/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx
index fedfae3..c3eea1f 100644
--- a/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx
+++ b/xmlhelp/source/cxxhelp/inc/excep/XmlSearchExceptions.hxx
@@ -28,60 +28,27 @@ namespace xmlsearch {
 
 
         class XmlSearchException
-        {
-        public:
-            XmlSearchException( const OUString& message )
-                : _message( message )
-            {
-            }
-
-        private:
-            OUString _message;
-        };
+        {};
 
 
         class IOException
             : public virtual XmlSearchException
-        {
-        public:
-            IOException( const OUString& message )
-                : XmlSearchException( message )
-            {
-            }
-        };
+        {};
 
 
         class NoFactoryException
             : public virtual XmlSearchException
-        {
-        public:
-            NoFactoryException( const OUString& message )
-                : XmlSearchException( message )
-            {
-            }
-        };
+        {};
 
 
         class NoSuchBlock
             : public virtual XmlSearchException
-        {
-        public:
-            NoSuchBlock( const OUString& message )
-                : XmlSearchException( message )
-            {
-            }
-        };
+        {};
 
 
         class IllegalIndexException
             : public virtual XmlSearchException
-        {
-        public:
-            IllegalIndexException( const OUString& message )
-                : XmlSearchException( message )
-            {
-            }
-        };
+        {};
 
     }
 }
diff --git a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
index 986b568..dab5d38 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/Query.hxx
@@ -52,15 +52,12 @@ namespace xmlsearch {
         class QueryHitData
         {
         public:
-            QueryHitData( const OUString& document, OUString* terms )
-                : document_( document ),
-                  terms_( terms )      { }
+            QueryHitData( OUString* terms )
+                : terms_( terms )      { }
 
             ~QueryHitData() { delete[] terms_; }
 
         private:
-            const OUString document_;
-
             OUString* terms_;
 
         };  // end class QueryHitData
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 865528a..908fdab 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -459,7 +459,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const OUStrin
             cfgFile.close();
 
             const sal_Unicode* str = fileContent.getStr();
-            OUString current,lang_,program,startid,title,heading,fulltext;
+            OUString current,lang_,program,startid,title;
             OUString order( "1" );
 
             for( sal_Int32 i = 0;i < fileContent.getLength();i++ )
@@ -487,14 +487,6 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const OUStrin
                         {
                             program = current.copy( current.indexOf('=') + 1 );
                         }
-                        else if( current.startsWith("Heading") )
-                        {
-                            heading = current.copy( current.indexOf('=') + 1 );
-                        }
-                        else if( current.startsWith("FullText") )
-                        {
-                            fulltext = current.copy( current.indexOf('=') + 1 );
-                        }
                         else if( current.startsWith("Order") )
                         {
                             order = current.copy( current.indexOf('=') + 1 );
@@ -509,8 +501,6 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const OUStrin
             it->second = new StaticModuleInformation( title,
                                                       startid,
                                                       program,
-                                                      heading,
-                                                      fulltext,
                                                       order );
         }
     }
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index b5ff8f2..9e33a98 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -59,8 +59,6 @@ namespace chelp {
         OUString m_aStartId;
         OUString m_aProgramSwitch;
         OUString m_aTitle;
-        OUString m_aHeading;
-        OUString m_aFulltext;
         int m_nOrder;
 
     public:
@@ -68,14 +66,10 @@ namespace chelp {
         StaticModuleInformation( const OUString& aTitle,
                                  const OUString& aStartId,
                                  const OUString& aProgramSwitch,
-                                 const OUString& aHeading,
-                                 const OUString& aFulltext,
                                  const OUString& aOrder )
             : m_aStartId( aStartId ),
               m_aProgramSwitch( aProgramSwitch ),
               m_aTitle( aTitle ),
-              m_aHeading( aHeading ),
-              m_aFulltext( aFulltext ),
               m_nOrder( aOrder.toInt32() )
         {
         }