Skip to content

C
core
Kaydet (Commit) 520f9965 authored tarafından Rüdiger Timm's avatar Rüdiger Timm
Dosyalara gözat
Seçenekler

INTEGRATION: CWS binfilter (1.2.22); FILE MERGED 

2004/04/19 09:46:24 aw 1.2.22.1: #110098#
Necessary adaptions to framework after resynching binfilter to SRC680m33
üst 8428c005
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 15 deletions
framework/inc/xml/menuconfiguration.hxx
Dosyayı görüntüle @ 520f9965
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: menuconfiguration.hxx,v $ * $RCSfile: menuconfiguration.hxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: kz $ $Date: 2004-02-25 17:40:07 $ * last change: $Author: rt $ $Date: 2004-05-03 13:18:57 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -129,7 +129,8 @@ class MenuConfiguration ...@@ -129,7 +129,8 @@ class MenuConfiguration
}; };
MenuConfiguration( MenuConfiguration(
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager ); // #110897#-1 use const when giving a uno reference by reference
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager );
virtual ~MenuConfiguration(); virtual ~MenuConfiguration();
...@@ -158,7 +159,8 @@ class MenuConfiguration ...@@ -158,7 +159,8 @@ class MenuConfiguration
static BOOL IsWindowListItemId( USHORT nId ); static BOOL IsWindowListItemId( USHORT nId );
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& m_rxServiceManager; // #110897#-1 do not hold the uno reference by reference
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& m_rxServiceManager;
}; };
} }
......
framework/inc/xml/menudocumenthandler.hxx
Dosyayı görüntüle @ 520f9965
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: menudocumenthandler.hxx,v $ * $RCSfile: menudocumenthandler.hxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: kz $ $Date: 2004-02-25 17:40:19 $ * last change: $Author: rt $ $Date: 2004-05-03 13:19:09 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -102,6 +102,11 @@ ...@@ -102,6 +102,11 @@
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#endif #endif
// #110897#
#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#endif
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
// namespace // namespace
//_________________________________________________________________________________________________________________ //_________________________________________________________________________________________________________________
...@@ -172,9 +177,15 @@ class ReadMenuDocumentHandlerBase : public ::com::sun::star::xml::sax::XDocument ...@@ -172,9 +177,15 @@ class ReadMenuDocumentHandlerBase : public ::com::sun::star::xml::sax::XDocument
class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
{ {
public: public:
OReadMenuDocumentHandler( const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rItemContainer ); // #110897#
OReadMenuDocumentHandler(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& rItemContainer );
virtual ~OReadMenuDocumentHandler(); virtual ~OReadMenuDocumentHandler();
// #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
// XDocumentHandler // XDocumentHandler
virtual void SAL_CALL startDocument(void) virtual void SAL_CALL startDocument(void)
throw ( ::com::sun::star::xml::sax::SAXException, throw ( ::com::sun::star::xml::sax::SAXException,
...@@ -203,16 +214,25 @@ class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase ...@@ -203,16 +214,25 @@ class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
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;
// #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
}; // OReadMenuDocumentHandler }; // OReadMenuDocumentHandler
class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
{ {
public: public:
OReadMenuBarHandler( const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuBarContainer, // #110897#
const com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >& rContainerFactory ); OReadMenuBarHandler(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuBarContainer,
const com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory >& rContainerFactory );
virtual ~OReadMenuBarHandler(); virtual ~OReadMenuBarHandler();
// #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& getServiceFactory();
// XDocumentHandler // XDocumentHandler
virtual void SAL_CALL startDocument(void) virtual void SAL_CALL startDocument(void)
throw ( ::com::sun::star::xml::sax::SAXException, throw ( ::com::sun::star::xml::sax::SAXException,
...@@ -241,6 +261,9 @@ class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase ...@@ -241,6 +261,9 @@ class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
sal_Bool m_bMenuMode; sal_Bool m_bMenuMode;
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;
// #110897#
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& mxServiceFactory;
}; // OReadMenuBarHandler }; // OReadMenuBarHandler
......
framework/inc/xml/statusbarconfiguration.hxx
Dosyayı görüntüle @ 520f9965
...@@ -14,6 +14,11 @@ ...@@ -14,6 +14,11 @@
#include <vcl/status.hxx> #include <vcl/status.hxx>
#endif #endif
// #110897#
#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#endif
namespace framework namespace framework
{ {
...@@ -37,8 +42,15 @@ SV_DECL_PTRARR_DEL( StatusBarDescriptor, StatusBarItemDescriptorPtr, 10, 2) ...@@ -37,8 +42,15 @@ SV_DECL_PTRARR_DEL( StatusBarDescriptor, StatusBarItemDescriptorPtr, 10, 2)
class StatusBarConfiguration class StatusBarConfiguration
{ {
public: public:
static sal_Bool LoadStatusBar( SvStream& rInStream, StatusBarDescriptor& aItems ); // #110897#
static sal_Bool StoreStatusBar( SvStream& rOutStream, const StatusBarDescriptor& aItems ); static sal_Bool LoadStatusBar(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
SvStream& rInStream, StatusBarDescriptor& aItems );
// #110897#
static sal_Bool StoreStatusBar(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
SvStream& rOutStream, const StatusBarDescriptor& aItems );
}; };
} // namespace framework } // namespace framework
......
framework/inc/xml/toolboxconfiguration.hxx
Dosyayı görüntüle @ 520f9965
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
#include <vcl/toolbox.hxx> #include <vcl/toolbox.hxx>
#endif #endif
// #110897#
#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#endif
namespace framework namespace framework
{ {
...@@ -78,10 +82,25 @@ SV_DECL_PTRARR_DEL( ToolBoxLayoutDescriptor, ToolBoxLayoutItemDescriptorPtr, 10, ...@@ -78,10 +82,25 @@ SV_DECL_PTRARR_DEL( ToolBoxLayoutDescriptor, ToolBoxLayoutItemDescriptorPtr, 10,
class ToolBoxConfiguration class ToolBoxConfiguration
{ {
public: public:
static sal_Bool LoadToolBox( SvStream& rInStream, ToolBoxDescriptor& aItems ); // #110897#
static sal_Bool StoreToolBox( SvStream& rOutStream, const ToolBoxDescriptor& aItems ); static sal_Bool LoadToolBox(
static sal_Bool LoadToolBoxLayout( SvStream& rInStream, ToolBoxLayoutDescriptor& aItems ); const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
static sal_Bool StoreToolBoxLayout( SvStream& rOutStream, ToolBoxLayoutDescriptor& aItems ); SvStream& rInStream, ToolBoxDescriptor& aItems );
// #110897#
static sal_Bool StoreToolBox(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
SvStream& rOutStream, const ToolBoxDescriptor& aItems );
// #110897#
static sal_Bool LoadToolBoxLayout(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
SvStream& rInStream, ToolBoxLayoutDescriptor& aItems );
// #110897#
static sal_Bool StoreToolBoxLayout(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
SvStream& rOutStream, ToolBoxLayoutDescriptor& aItems );
}; };
} // namespace framework } // namespace framework
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment