diff options
Diffstat (limited to 'framework/inc/xml')
| -rw-r--r-- | framework/inc/xml/eventsconfiguration.hxx | 65 | ||||
| -rw-r--r-- | framework/inc/xml/eventsdocumenthandler.hxx | 7 | ||||
| -rw-r--r-- | framework/inc/xml/imagesconfiguration.hxx | 127 | ||||
| -rw-r--r-- | framework/inc/xml/imagesdocumenthandler.hxx | 9 | ||||
| -rw-r--r-- | framework/inc/xml/menuconfiguration.hxx | 125 | ||||
| -rw-r--r-- | framework/inc/xml/menudocumenthandler.hxx | 13 | ||||
| -rw-r--r-- | framework/inc/xml/saxnamespacefilter.hxx | 3 | ||||
| -rw-r--r-- | framework/inc/xml/statusbarconfiguration.hxx | 58 | ||||
| -rw-r--r-- | framework/inc/xml/statusbardocumenthandler.hxx | 7 | ||||
| -rw-r--r-- | framework/inc/xml/toolboxconfiguration.hxx | 38 | ||||
| -rw-r--r-- | framework/inc/xml/toolboxconfigurationdefines.hxx | 26 | ||||
| -rw-r--r-- | framework/inc/xml/toolboxdocumenthandler.hxx | 7 | ||||
| -rw-r--r-- | framework/inc/xml/xmlnamespaces.hxx | 3 |
13 files changed, 55 insertions, 433 deletions
diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/xml/eventsconfiguration.hxx deleted file mode 100644 index e5e1ab474a2a..000000000000 --- a/framework/inc/xml/eventsconfiguration.hxx +++ /dev/null @@ -1,65 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_ -#define __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_ - -#include <svl/svarray.hxx> -#include <tools/string.hxx> -#include <tools/stream.hxx> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> - -// #110897# -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -namespace framework -{ - -struct EventsConfig -{ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aEventNames; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aEventsProperties; -}; - -class EventsConfiguration -{ - public: - // #110897# - static sal_Bool LoadEventsConfig( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - SvStream& rInStream, EventsConfig& aItems ); - - // #110897# - static sal_Bool StoreEventsConfig( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - SvStream& rOutStream, const EventsConfig& aItems ); -}; - -} // namespace framework - -#endif // __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_ diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx index aa5d5ec52e1f..ffce5c1a348b 100644 --- a/framework/inc/xml/eventsdocumenthandler.hxx +++ b/framework/inc/xml/eventsdocumenthandler.hxx @@ -29,7 +29,7 @@ #define __FRAMEWORK_XML_EVENTSDOCUMENTHANDLER_HXX_ #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ -#include <xml/eventsconfiguration.hxx> +#include <framework/eventsconfiguration.hxx> #endif //_________________________________________________________________________________________________________________ @@ -50,6 +50,7 @@ #include <hash_map> #include <stdtypes.h> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ @@ -59,7 +60,7 @@ namespace framework{ //***************************************************************************************************************** // Hash code function for using in all hash maps of follow implementation. -class OReadEventsDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. +class FWE_DLLPUBLIC OReadEventsDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > { public: @@ -149,7 +150,7 @@ class OReadEventsDocumentHandler : private ThreadHelpBase, // Struct for right ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; }; -class OWriteEventsDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. +class FWE_DLLPUBLIC OWriteEventsDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. { public: OWriteEventsDocumentHandler( diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx deleted file mode 100644 index 733822db8beb..000000000000 --- a/framework/inc/xml/imagesconfiguration.hxx +++ /dev/null @@ -1,127 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_ -#define __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_ - -#include <svl/svarray.hxx> -#include <tools/string.hxx> -#include <tools/stream.hxx> -#include <tools/color.hxx> - -// #110897# -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> - -#include <vector> - -namespace framework -{ - -enum ImageMaskMode -{ - ImageMaskMode_Color, - ImageMaskMode_Bitmap -}; - -struct ImageItemDescriptor -{ - ImageItemDescriptor() : nIndex( -1 ) {} - - String aCommandURL; // URL command to dispatch - long nIndex; // index of the bitmap inside the bitmaplist -}; - -struct ExternalImageItemDescriptor -{ - String aCommandURL; // URL command to dispatch - String aURL; // a URL to an external bitmap -}; - -typedef ImageItemDescriptor* ImageItemDescriptorPtr; -SV_DECL_PTRARR_DEL( ImageItemListDescriptor, ImageItemDescriptorPtr, 10, 2) - -typedef ExternalImageItemDescriptor* ExternalImageItemDescriptorPtr; -SV_DECL_PTRARR_DEL( ExternalImageItemListDescriptor, ExternalImageItemDescriptorPtr, 10, 2) - -struct ImageListItemDescriptor -{ - ImageListItemDescriptor() : nMaskMode( ImageMaskMode_Color ), - pImageItemList( 0 ) {} - - ~ImageListItemDescriptor() { delete pImageItemList; } - - String aURL; // an URL to a bitmap with several images inside - Color aMaskColor; // a color used as transparent - String aMaskURL; // an URL to an optional bitmap used as a mask - ImageMaskMode nMaskMode; // an enum to describe the current mask mode - ImageItemListDescriptor* pImageItemList; // an array of ImageItemDescriptors that describes every image - String aHighContrastURL; // an URL to an optional high contrast bitmap with serveral images inside - String aHighContrastMaskURL; // an URL to an optional high contrast bitmap as a mask -}; - -typedef ImageListItemDescriptor* ImageListItemDescriptorPtr; -SV_DECL_PTRARR_DEL( ImageListDescriptor, ImageListItemDescriptorPtr, 10, 2) - -struct ImageListsDescriptor -{ - ImageListsDescriptor() : pImageList( 0 ), - pExternalImageList( 0 ) {} - ~ImageListsDescriptor() { delete pImageList; delete pExternalImageList; } - - ImageListDescriptor* pImageList; - ExternalImageItemListDescriptor* pExternalImageList; -}; - -class ImagesConfiguration -{ - public: - // #110897# - static sal_Bool LoadImages( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - SvStream& rInStream, ImageListsDescriptor& aItems ); - - // #110897# - static sal_Bool StoreImages( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - SvStream& rOutStream, const ImageListsDescriptor& aItems ); - - static sal_Bool LoadImages( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, - ImageListsDescriptor& rItems ); - - static sal_Bool StoreImages( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream, - const ImageListsDescriptor& rItems ); -}; - -} // namespace framework - -#endif // __FRAMEWORK_CLASSES_IMAGES diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index 2ecb63ed1609..59d1e4abdb3a 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -28,6 +28,8 @@ #ifndef __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_ #define __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_ +#include <framework/fwedllapi.h> + //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ @@ -39,7 +41,7 @@ //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#include <xml/imagesconfiguration.hxx> +#include <framework/imagesconfiguration.hxx> #include <threadhelp/threadhelpbase.hxx> #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> @@ -47,6 +49,7 @@ #include <hash_map> #include <stdtypes.h> + //_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ @@ -56,7 +59,7 @@ namespace framework{ //***************************************************************************************************************** // Hash code function for using in all hash maps of follow implementation. -class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. +class FWE_DLLPUBLIC OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > { public: @@ -157,7 +160,7 @@ class OReadImagesDocumentHandler : private ThreadHelpBase, // Struct for right ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; }; -class OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. +class FWE_DLLPUBLIC OWriteImagesDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. { public: OWriteImagesDocumentHandler( diff --git a/framework/inc/xml/menuconfiguration.hxx b/framework/inc/xml/menuconfiguration.hxx deleted file mode 100644 index ad43ee07997d..000000000000 --- a/framework/inc/xml/menuconfiguration.hxx +++ /dev/null @@ -1,125 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __FRAMEWORK_XML_MENUCONFIGURATION_HXX_ -#define __FRAMEWORK_XML_MENUCONFIGURATION_HXX_ - -//_________________________________________________________________________________________________________________ -// interface includes -//_________________________________________________________________________________________________________________ - -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/WrappedTargetException.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> - -//_________________________________________________________________________________________________________________ -// includes of other projects -//_________________________________________________________________________________________________________________ - -#include <cppuhelper/weak.hxx> -#include <vcl/menu.hxx> -#include <vcl/toolbox.hxx> - -#define BOOKMARK_NEWMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_bookmark_new" )) -#define BOOKMARK_WIZARDMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_bookmark_wizard" )) -#define ADDONS_POPUPMENU ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:menu_addons_popup" )) - -// Prepare for inclusion by framework and sfx -// Please consider that there is a corresponding define also in sfxsids.hrc!! (SID_SFX_START)/(SID_ADDONS) -#define FWK_SID_SFX_START 5000 -#define FWK_SID_ADDONS (FWK_SID_SFX_START+1678) -#define FWK_SID_ADDONHELP (FWK_SID_SFX_START+1684) - -const USHORT START_ITEMID_PICKLIST = 4500; -const USHORT END_ITEMID_PICKLIST = 4599; -const USHORT MAX_ITEMCOUNT_PICKLIST = 99; // difference between START_... & END_... for picklist / must be changed too, if these values are changed! -const USHORT START_ITEMID_WINDOWLIST = 4600; -const USHORT END_ITEMID_WINDOWLIST = 4699; -const USHORT ITEMID_ADDONLIST = FWK_SID_ADDONS; -const USHORT ITEMID_ADDONHELP = FWK_SID_ADDONHELP; - -namespace framework -{ - -class MenuConfiguration -{ - public: - struct Attributes - { - Attributes() {} - Attributes( const ::rtl::OUString& aFrame, const ::rtl::OUString& aImageIdStr ) : - aTargetFrame( aFrame ), aImageId( aImageIdStr ) {} - - ::rtl::OUString aTargetFrame; - ::rtl::OUString aImageId; - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProvider > xDispatchProvider; - sal_Int16 nStyle; - }; - - MenuConfiguration( - // #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(); - - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > CreateMenuBarConfigurationFromXML( - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream ) - throw ( ::com::sun::star::lang::WrappedTargetException ); - - PopupMenu* CreateBookmarkMenu( - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::rtl::OUString& aURL ) - throw ( ::com::sun::star::lang::WrappedTargetException ); - - ToolBox* CreateToolBoxFromConfiguration( - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream ) - throw ( ::com::sun::star::lang::WrappedTargetException ); - - void StoreMenuBarConfigurationToXML( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rMenuBarConfiguration, - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream ) - throw ( ::com::sun::star::lang::WrappedTargetException ); - - void StoreToolBox( ToolBox* pToolBox, - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream ) - throw ( ::com::sun::star::lang::WrappedTargetException ); - - static BOOL IsPickListItemId( USHORT nId ); - static BOOL IsWindowListItemId( USHORT nId ); - - private: - // #110897#-1 do not hold the uno reference by reference - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& m_rxServiceManager; -}; - -} - -#endif // __FRAMEWORK_XML_MENUCONFIGURATION_HXX_ diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index fbf1dce837e3..5c6064cdd4f1 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -48,6 +48,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // namespace @@ -55,7 +56,7 @@ namespace framework{ -class ReadMenuDocumentHandlerBase : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses. +class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > { public: @@ -118,7 +119,7 @@ class ReadMenuDocumentHandlerBase : public ThreadHelpBase, // Struct for right }; -class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase +class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase { public: // #110897# @@ -162,7 +163,7 @@ class OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase }; // OReadMenuDocumentHandler -class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase +class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase { public: // #110897# @@ -209,7 +210,7 @@ class OReadMenuBarHandler : public ReadMenuDocumentHandlerBase }; // OReadMenuBarHandler -class OReadMenuHandler : public ReadMenuDocumentHandlerBase +class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase { public: OReadMenuHandler( const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuContainer, @@ -247,7 +248,7 @@ class OReadMenuHandler : public ReadMenuDocumentHandlerBase }; // OReadMenuHandler -class OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase +class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase { public: OReadMenuPopupHandler( const com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rMenuContainer, @@ -290,7 +291,7 @@ class OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase }; // OReadMenuPopupHandler -class OWriteMenuDocumentHandler +class FWE_DLLPUBLIC OWriteMenuDocumentHandler { public: OWriteMenuDocumentHandler( diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx index 7d04dd434441..f4bdfcf677e9 100644 --- a/framework/inc/xml/saxnamespacefilter.hxx +++ b/framework/inc/xml/saxnamespacefilter.hxx @@ -36,6 +36,7 @@ #include <cppuhelper/implbase1.hxx> #include <stack> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // namespace @@ -44,7 +45,7 @@ namespace framework { -class SaxNamespaceFilter : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses. +class FWE_DLLPUBLIC SaxNamespaceFilter : public ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > { public: diff --git a/framework/inc/xml/statusbarconfiguration.hxx b/framework/inc/xml/statusbarconfiguration.hxx deleted file mode 100644 index 8619ae423622..000000000000 --- a/framework/inc/xml/statusbarconfiguration.hxx +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_ -#define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_ - -#include <svl/svarray.hxx> -#include <tools/string.hxx> -#include <tools/stream.hxx> -#include <vcl/status.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> - -namespace framework -{ - -struct StatusBarItemDescriptor -{ - String aURL; // URL command to dispatch - long nItemBits; // properties for this statusbar item (WinBits) - long nWidth; // width of a statusbar item - long nOffset; // offset - - public: - - StatusBarItemDescriptor() : nItemBits( SIB_CENTER | SIB_IN ) - ,nWidth( 0 ) - ,nOffset( STATUSBAR_OFFSET ) {} -}; - -typedef StatusBarItemDescriptor* StatusBarItemDescriptorPtr; -SV_DECL_PTRARR_DEL( StatusBarDescriptor, StatusBarItemDescriptorPtr, 10, 2) - -class StatusBarConfiguration -{ - public: - static sal_Bool LoadStatusBar( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - SvStream& rInStream, StatusBarDescriptor& aItems ); - - static sal_Bool StoreStatusBar( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - SvStream& rOutStream, const StatusBarDescriptor& aItems ); - - static sal_Bool LoadStatusBar( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rStatusbarConfiguration ); - - static sal_Bool StoreStatusBar( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutputStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rStatusbarConfiguration ); -}; - -} // namespace framework - -#endif // __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_ diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 3ce94a872344..82c2d0c55111 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -29,7 +29,7 @@ #define __FRAMEWORK_XML_STATUSBARDOCUMENTHANDLER_HXX_ #ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_ -#include <xml/statusbarconfiguration.hxx> +#include <framework/statusbarconfiguration.hxx> #endif //_________________________________________________________________________________________________________________ @@ -49,6 +49,7 @@ #include <hash_map> #include <stdtypes.h> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // namespace @@ -59,7 +60,7 @@ namespace framework{ //***************************************************************************************************************** // Hash code function for using in all hash maps of follow implementation. -class OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. +class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > { public: @@ -148,7 +149,7 @@ class OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for ri ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; }; -class OWriteStatusBarDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. +class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. { public: OWriteStatusBarDocumentHandler( diff --git a/framework/inc/xml/toolboxconfiguration.hxx b/framework/inc/xml/toolboxconfiguration.hxx deleted file mode 100644 index 924c601ac689..000000000000 --- a/framework/inc/xml/toolboxconfiguration.hxx +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ -#define __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ - -#include <svl/svarray.hxx> -#include <vcl/bitmap.hxx> -#include <tools/string.hxx> -#include <com/sun/star/io/XInputStream.hpp> -#ifndef _COM_SUN_STAR_IO_XOUPUTSTREAM_HPP_ -#include <com/sun/star/io/XOutputStream.hpp> -#endif -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> - -// #110897# -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -namespace framework -{ - -class ToolBoxConfiguration -{ - public: - // #110897# - static sal_Bool LoadToolBox( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rInputStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& rToolbarConfiguration ); - - // #110897# - static sal_Bool StoreToolBox( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rOutputStream, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rToolbarConfiguration ); -}; - -} // namespace framework - -#endif // __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx index c3cd030f6213..0b514b927bc1 100644 --- a/framework/inc/xml/toolboxconfigurationdefines.hxx +++ b/framework/inc/xml/toolboxconfigurationdefines.hxx @@ -1,3 +1,29 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_ #define __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_ diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index 5cb634b2bdc9..d90d91cee036 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -28,7 +28,7 @@ #ifndef __FRAMEWORK_XML_TOOLBOXDOCUMENTHANDLER_HXX_ #define __FRAMEWORK_XML_TOOLBOXDOCUMENTHANDLER_HXX_ -#include <xml/toolboxconfiguration.hxx> +#include <framework/toolboxconfiguration.hxx> //_________________________________________________________________________________________________________________ // interface includes @@ -43,6 +43,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> #include <stdtypes.h> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // namespace @@ -53,7 +54,7 @@ namespace framework{ //***************************************************************************************************************** // Hash code function for using in all hash maps of follow implementation. -class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. +class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses. public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler > { public: @@ -169,7 +170,7 @@ class OReadToolBoxDocumentHandler : private ThreadHelpBase, // Struct for right }; -class OWriteToolBoxDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. +class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler : private ThreadHelpBase // Struct for right initalization of lock member! Must be first of baseclasses. { public: OWriteToolBoxDocumentHandler( diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx index 81b6bb305ee0..bcb9ec4cb5e3 100644 --- a/framework/inc/xml/xmlnamespaces.hxx +++ b/framework/inc/xml/xmlnamespaces.hxx @@ -31,11 +31,12 @@ #include <com/sun/star/xml/sax/SAXException.hpp> #include <map> +#include <framework/fwedllapi.h> namespace framework { -class XMLNamespaces +class FWE_DLLPUBLIC XMLNamespaces { public: XMLNamespaces(); |