strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS warnings01 (1.4.32); FILE MERGED

Browse source 
2005/10/28 14:48:26 cd 1.4.32.1: #i55991# Warning free code changes for gcc
This commit is contained in:
Jens-Heiner Rechtien 2006-06-19 10:09:05 +00:00
parent 4bdfffd387
commit bdd6d38987
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
framework/inc/xml/imagesdocumenthandler.hxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: imagesdocumenthandler.hxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -33,8 +33,8 @@
* *
************************************************************************/ ************************************************************************/
#ifndef __FRAMEWORK_CLASSES_IMAGEDOCUMENTHANDLER_HXX_ #ifndef __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
#define __FRAMEWORK_CLASSES_IMAGEDOCUMENTHANDLER_HXX_ #define __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
// interface includes // interface includes
@ -48,8 +48,8 @@
// other includes // other includes
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
#ifndef __FRAMEWORK_CLASSES_IMAGESCONFIGURATION_HXX_ #ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
#include <classes/imagesconfiguration.hxx> #include <xml/imagesconfiguration.hxx>
#endif #endif
#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_ #ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_

17
framework/inc/xml/menudocumenthandler.hxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: menudocumenthandler.hxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -76,7 +76,6 @@
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#endif #endif
// #110897#
#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#endif #endif
@ -184,13 +183,11 @@ class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
::com::sun::star::uno::RuntimeException ); ::com::sun::star::uno::RuntimeException );
private: private:
int m_nElementDepth; int m_nElementDepth;
sal_Bool m_bMenuBarMode; sal_Bool m_bMenuBarMode;
com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer; com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > m_xMenuBarContainer;
com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory; com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory;
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
// #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
}; // OReadMenuDocumentHandler }; // OReadMenuDocumentHandler