From bdd6d38987a7d94eefcd68c61b7b73d87b4d7ea3 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Mon, 19 Jun 2006 10:09:05 +0000
Subject: [PATCH] INTEGRATION: CWS warnings01 (1.4.32); FILE MERGED 2005/10/28
 14:48:26 cd 1.4.32.1: #i55991# Warning free code changes for gcc

---
 framework/inc/xml/imagesdocumenthandler.hxx | 12 ++++++------
 framework/inc/xml/menudocumenthandler.hxx   | 17 +++++++----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 4bc070595470..bccc368bd612 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: imagesdocumenthandler.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 00:52:52 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 11:08:52 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,8 +33,8 @@
  *
  ************************************************************************/
 
-#ifndef __FRAMEWORK_CLASSES_IMAGEDOCUMENTHANDLER_HXX_
-#define __FRAMEWORK_CLASSES_IMAGEDOCUMENTHANDLER_HXX_
+#ifndef __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
+#define __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
 
 //_________________________________________________________________________________________________________________
 //  interface includes
@@ -48,8 +48,8 @@
 //  other includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __FRAMEWORK_CLASSES_IMAGESCONFIGURATION_HXX_
-#include <classes/imagesconfiguration.hxx>
+#ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
+#include <xml/imagesconfiguration.hxx>
 #endif
 
 #ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index 98e2f9cb08f2..8b919bc08f9d 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: menudocumenthandler.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 00:53:24 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 11:09:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -76,7 +76,6 @@
 #include <cppuhelper/weak.hxx>
 #endif
 
-// #110897#
 #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #endif
@@ -184,13 +183,11 @@ class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
                 ::com::sun::star::uno::RuntimeException );
 
     private:
-        int         m_nElementDepth;
-        sal_Bool    m_bMenuBarMode;
-        com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer;
-        com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory;
-
-        // #110897#
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
+          int       m_nElementDepth;
+          sal_Bool  m_bMenuBarMode;
+          com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer;
+          com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory;
+          const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
 };  // OReadMenuDocumentHandler