summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/classes/framelistanalyzer.hxx25
-rw-r--r--framework/inc/filterflags.h172
-rw-r--r--framework/inc/framework.hrc8
-rw-r--r--framework/inc/helpid.hrc22
-rw-r--r--framework/inc/macros/debug/memorymeasure.hxx2
-rw-r--r--framework/inc/macros/debug/registration.hxx21
-rw-r--r--framework/inc/macros/registration.hxx96
-rw-r--r--framework/inc/queries.h1
-rw-r--r--framework/inc/threadhelp/transactionmanager.hxx1
-rw-r--r--framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx1
-rw-r--r--framework/inc/uielement/commandinfo.hxx2
-rw-r--r--framework/inc/uielement/toolbarmerger.hxx1
-rw-r--r--framework/inc/uielement/toolbarsmenucontroller.hxx2
13 files changed, 27 insertions, 327 deletions
diff --git a/framework/inc/classes/framelistanalyzer.hxx b/framework/inc/classes/framelistanalyzer.hxx
index 64a0f8c97d86..e0b89ab32217 100644
--- a/framework/inc/classes/framelistanalyzer.hxx
+++ b/framework/inc/classes/framelistanalyzer.hxx
@@ -29,13 +29,6 @@
#define __FRAMEWORK_CLASSES_FRAMELISTANALYZER_HXX_
//_______________________________________________
-// my own includes
-
-#include <threadhelp/threadhelpbase.hxx>
-#include <macros/debug.hxx>
-#include <general.h>
-
-//_______________________________________________
// interface includes
#include <com/sun/star/frame/XFrame.hpp>
@@ -88,10 +81,10 @@ class FrameListAnalyzer
public:
/** provides access to the frame container, which should be analyzed. */
- const css::uno::Reference< css::frame::XFramesSupplier >& m_xSupplier;
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier >& m_xSupplier;
/** hold the reference frame, which is used e.g. to detect other frames with the same model. */
- const css::uno::Reference< css::frame::XFrame >& m_xReferenceFrame;
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& m_xReferenceFrame;
/** enable/disable some special analyzing steps.
see impl_analyze() for further informations. */
@@ -100,19 +93,19 @@ class FrameListAnalyzer
/** contains all frames, which uses the same model like the reference frame.
Will be filled only if m_eDetectMode has set the flag E_MODEL.
The reference frame is never part of this list! */
- css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > m_lModelFrames;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lModelFrames;
/** contains all frames, which does not contain the same model like the reference frame.
Filling of it can't be supressed by m_eDetectMode.
The reference frame is never part of this list!
All frames inside this list are visible ones. */
- css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > m_lOtherVisibleFrames;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lOtherVisibleFrames;
/** contains all frames, which does not contain the same model like the reference frame.
Filling of it can't be supressed by m_eDetectMode.
The reference frame is never part of this list!
All frames inside this list are hidden ones. */
- css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > m_lOtherHiddenFrames;
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lOtherHiddenFrames;
/** points to the help frame.
Will be set only, if any other frame (means different from the reference frame)
@@ -137,7 +130,7 @@ class FrameListAnalyzer
Analyzing of the help frame ignores the visible state of any frame.
But note: a hidden help frame indicates a wrong state!
*/
- css::uno::Reference< css::frame::XFrame > m_xHelp;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xHelp;
/** points to the frame, which contains the backing component.
Will be set only, if any other frame (means different from the reference frame)
@@ -163,7 +156,7 @@ class FrameListAnalyzer
Analyzing of the help frame ignores the visible state of any frame.
But note: a hidden backing mode frame indicates a wrong state!
*/
- css::uno::Reference< css::frame::XFrame > m_xBackingComponent;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xBackingComponent;
/** is set to true only, if the reference frame is a hidden one.
This value is undefined if m_eDetectMode doesn't have set the flag E_HIDDEN! */
@@ -200,8 +193,8 @@ class FrameListAnalyzer
analyze steps. Note: Some member values will be undefined, if
an analyze step will be disabled.
*/
- FrameListAnalyzer( const css::uno::Reference< css::frame::XFramesSupplier >& xSupplier ,
- const css::uno::Reference< css::frame::XFrame >& xReferenceFrame ,
+ FrameListAnalyzer( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFramesSupplier >& xSupplier ,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xReferenceFrame ,
sal_uInt32 eDetectMode );
virtual ~FrameListAnalyzer();
diff --git a/framework/inc/filterflags.h b/framework/inc/filterflags.h
deleted file mode 100644
index 1061c21f5d79..000000000000
--- a/framework/inc/filterflags.h
+++ /dev/null
@@ -1,172 +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_FILTERFLAGS_H_
-#define __FRAMEWORK_FILTERFLAGS_H_
-
-namespace framework{
-
-/*-************************************************************************************************************//**
- @short These values describe our supported filter flags.
- @attention Don't change flag values without reason - we must support old functionality and position
- in flag combined values!
-*//*-*************************************************************************************************************/
-
-#define FILTERFLAGNAME_IMPORT DECLARE_ASCII("Import" ) // x
-#define FILTERFLAGNAME_EXPORT DECLARE_ASCII("Export" ) // x
-#define FILTERFLAGNAME_TEMPLATE DECLARE_ASCII("Template" ) // x
-#define FILTERFLAGNAME_INTERNAL DECLARE_ASCII("Internal" ) // x
-#define FILTERFLAGNAME_TEMPLATEPATH DECLARE_ASCII("TemplatePath" ) // x
-#define FILTERFLAGNAME_OWN DECLARE_ASCII("Own" ) // x
-#define FILTERFLAGNAME_ALIEN DECLARE_ASCII("Alien" ) // x
-#define FILTERFLAGNAME_USESOPTIONS DECLARE_ASCII("UsesOptions" ) // x
-#define FILTERFLAGNAME_DEFAULT DECLARE_ASCII("Default" ) // x
-#define FILTERFLAGNAME_EXECUTABLE DECLARE_ASCII("Executable" ) // deprecated
-#define FILTERFLAGNAME_SUPPORTSSELECTION DECLARE_ASCII("SupportsSelection") // x
-#define FILTERFLAGNAME_MAPTOAPPPLUG DECLARE_ASCII("MapToAppPlug" ) // deprecated
-#define FILTERFLAGNAME_NOTINFILEDIALOG DECLARE_ASCII("NotInFileDialog" ) // x
-#define FILTERFLAGNAME_NOTINCHOOSER DECLARE_ASCII("NotInChooser" ) // x
-#define FILTERFLAGNAME_ASYNCHRON DECLARE_ASCII("Asynchron" ) // x
-#define FILTERFLAGNAME_CREATOR DECLARE_ASCII("Creator" ) // deprecated
-#define FILTERFLAGNAME_READONLY DECLARE_ASCII("Readonly" ) // x
-#define FILTERFLAGNAME_NOTINSTALLED DECLARE_ASCII("NotInstalled" ) // deprecated
-#define FILTERFLAGNAME_CONSULTSERVICE DECLARE_ASCII("ConsultService" ) // deprecated
-#define FILTERFLAGNAME_3RDPARTYFILTER DECLARE_ASCII("3rdPartyFilter" ) // x
-#define FILTERFLAGNAME_PACKED DECLARE_ASCII("Packed" ) // x
-#define FILTERFLAGNAME_SILENTEXPORT DECLARE_ASCII("SilentExport" ) // x
-#define FILTERFLAGNAME_BROWSERPREFERED DECLARE_ASCII("BrowserPrefered" ) // deprecated
-#define FILTERFLAGNAME_PREFERED DECLARE_ASCII("Prefered" ) // x
-
-#define FILTERFLAG_IMPORT 0x00000001L // 1
-#define FILTERFLAG_EXPORT 0x00000002L // 2
-#define FILTERFLAG_TEMPLATE 0x00000004L // 4
-#define FILTERFLAG_INTERNAL 0x00000008L // 8
-#define FILTERFLAG_TEMPLATEPATH 0x00000010L // 16
-#define FILTERFLAG_OWN 0x00000020L // 32
-#define FILTERFLAG_ALIEN 0x00000040L // 64
-#define FILTERFLAG_USESOPTIONS 0x00000080L // 128
-#define FILTERFLAG_DEFAULT 0x00000100L // 256
-#define FILTERFLAG_EXECUTABLE 0x00000200L // 512
-#define FILTERFLAG_SUPPORTSSELECTION 0x00000400L // 1024
-#define FILTERFLAG_MAPTOAPPPLUG 0x00000800L // 2048
-#define FILTERFLAG_NOTINFILEDIALOG 0x00001000L // 4096
-#define FILTERFLAG_NOTINCHOOSER 0x00002000L // 8192
-#define FILTERFLAG_ASYNCHRON 0x00004000L // 16384
-#define FILTERFLAG_CREATOR 0x00008000L // 32768
-#define FILTERFLAG_READONLY 0x00010000L // 65536
-#define FILTERFLAG_NOTINSTALLED 0x00020000L // 131072
-#define FILTERFLAG_CONSULTSERVICE 0x00040000L // 262144
-#define FILTERFLAG_3RDPARTYFILTER 0x00080000L // 524288
-#define FILTERFLAG_PACKED 0x00100000L // 1048576
-#define FILTERFLAG_SILENTEXPORT 0x00200000L // 2097152
-#define FILTERFLAG_BROWSERPREFERED 0x00400000L // 4194304
-//FREE! ... 0x00800000L
-#define FILTERFLAG_PREFERED 0x10000000L // 268435456
-
-class FlagCheck
-{
- public:
-
- //___________________________________________
-
- /** @short checks if the given flag mask is set.
-
- @param nFlags the flag field, which should be checked.
- @param nMask this mask field is searched inside parameter nFlags.
-
- @return sal_True if mask match to the given flag field.
- */
- static sal_Bool isMaskSet( sal_Int32 nFlags, sal_Int32 nMask )
- {
- return((nFlags & nMask) == nMask);
- }
-
- //___________________________________________
-
- /** @short checks if the given flag field contains unknown flags.
-
- @descr Of course it can work only, if not the whole range of an int32
- is used!
-
- @param nFlags the flag field, which should be checked.
-
- @return sal_True if only well known flags are set.
- */
- static sal_Bool isValid( sal_Int32 nFlags )
- {
- sal_Int32 nCheck = nFlags;
- nCheck &= ~FILTERFLAG_IMPORT;
- nCheck &= ~FILTERFLAG_EXPORT;
- nCheck &= ~FILTERFLAG_TEMPLATE;
- nCheck &= ~FILTERFLAG_INTERNAL;
- nCheck &= ~FILTERFLAG_TEMPLATEPATH;
- nCheck &= ~FILTERFLAG_OWN;
- nCheck &= ~FILTERFLAG_ALIEN;
- nCheck &= ~FILTERFLAG_USESOPTIONS;
- nCheck &= ~FILTERFLAG_DEFAULT;
- nCheck &= ~FILTERFLAG_EXECUTABLE;
- nCheck &= ~FILTERFLAG_SUPPORTSSELECTION;
- nCheck &= ~FILTERFLAG_MAPTOAPPPLUG;
- nCheck &= ~FILTERFLAG_NOTINFILEDIALOG;
- nCheck &= ~FILTERFLAG_NOTINCHOOSER;
- nCheck &= ~FILTERFLAG_ASYNCHRON;
- nCheck &= ~FILTERFLAG_CREATOR;
- nCheck &= ~FILTERFLAG_READONLY;
- nCheck &= ~FILTERFLAG_NOTINSTALLED;
- nCheck &= ~FILTERFLAG_CONSULTSERVICE;
- nCheck &= ~FILTERFLAG_3RDPARTYFILTER;
- nCheck &= ~FILTERFLAG_PACKED;
- nCheck &= ~FILTERFLAG_SILENTEXPORT;
- nCheck &= ~FILTERFLAG_BROWSERPREFERED;
- nCheck &= ~FILTERFLAG_PREFERED;
- return(nCheck == 0);
- }
-
- //___________________________________________
-
- /** @short checks if the given flag field uses deprecated flag values.
-
- @param nFlags the flag field, which should be checked.
-
- @return sal_True if one deprecated flag item could be found.
- */
- static sal_Bool useDeprecated( sal_Int32 nFlags )
- {
- return(
- isMaskSet(nFlags, FILTERFLAG_EXECUTABLE ) ||
- isMaskSet(nFlags, FILTERFLAG_MAPTOAPPPLUG ) ||
- isMaskSet(nFlags, FILTERFLAG_CREATOR ) ||
- isMaskSet(nFlags, FILTERFLAG_NOTINSTALLED ) ||
- isMaskSet(nFlags, FILTERFLAG_CONSULTSERVICE ) ||
- isMaskSet(nFlags, FILTERFLAG_BROWSERPREFERED )
- );
- }
-};
-
-} // namespace framework
-
-#endif // #ifndef __FRAMEWORK_FILTERFLAGS_H_
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index eea91edeaa07..1817b60d90e9 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -35,9 +35,9 @@
#define RID_GROUPS_OFFSET 32000
#define RID_GROUPS_END 32767
-#define RID_FWK_DIALOG_START (RID_FWK_START + 2048)
+#define RID_FWK_DIALOG_START_CORRECT (RID_FWK_START + 2048)
-#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START + 0)
+#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START_CORRECT + 0)
#define STR_FILTER_DOWNLOAD (RID_FWK_START+0)
#define STR_FILTER_CHOOSER (RID_FWK_START+1)
@@ -45,7 +45,7 @@
#define STR_FILTER_ZIPPED (RID_FWK_START+3)
// ResIds for BackingWindow
-#define DLG_BACKING (RID_FWK_DIALOG_START+100)
+#define DLG_BACKING (RID_FWK_DIALOG_START_CORRECT+100)
#define STR_BACKING_WELCOME 1
#define STR_BACKING_WELCOMEPRODUCT 2
#define STR_BACKING_CREATE 3
@@ -78,7 +78,7 @@
#define BMP_BACKING_OPENTEMPLATE 17
// Ids of TabWindow
-#define WIN_TABWINDOW (RID_FWK_DIALOG_START+101)
+#define WIN_TABWINDOW (RID_FWK_DIALOG_START_CORRECT+101)
#define TC_TABCONTROL 1
#endif
diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc
index f40d5fcaaa2d..b5cd1f6a4ac1 100644
--- a/framework/inc/helpid.hrc
+++ b/framework/inc/helpid.hrc
@@ -27,23 +27,11 @@
#ifndef _FRAMEWORK_HELPID_HRC
#define _FRAMEWORK_HELPID_HRC
-// include ------------------------------------------------------------------
-
-#include <svl/solar.hrc>
-
-// Help-Ids -----------------------------------------------------------------
-
-#define HID_BACKINGWINDOW (HID_FRAMEWORK_START + 0)
-#define HID_LICENSEDIALOG (HID_FRAMEWORK_START + 1)
-#define HID_STATUSBAR (HID_FRAMEWORK_START + 2)
-
-#define ACT_FRAMEWORK_HID_END HID_BACKINGWINDOW
-
-// "Uberlaufpr"ufung --------------------------------------------------------
-
-#if ACT_FRAMEWORK_HID_END > HID_FRAMEWORK_END
-#error Resource-Ueberlauf in #line, #file
-#endif
+#define HID_BACKINGWINDOW "FWK_HID_BACKINGWINDOW"
+#define HID_LICENSEDIALOG "FWK_HID_LICENSEDIALOG"
+#define HID_STATUSBAR "FWK_HID_STATUSBAR"
+#define HID_SVX_COMMON_MACRO_ORGANIZER "FWK_HID_SVX_COMMON_MACRO_ORGANIZER"
+#define HID_SVX_BASIC_MACRO_ORGANIZER "FWK_HID_SVX_BASIC_MACRO_ORGANIZER"
#endif // #ifndef _FRAMEWORK_HELPID_HRC
diff --git a/framework/inc/macros/debug/memorymeasure.hxx b/framework/inc/macros/debug/memorymeasure.hxx
index 06bd9305adeb..0c5be0d237c9 100644
--- a/framework/inc/macros/debug/memorymeasure.hxx
+++ b/framework/inc/macros/debug/memorymeasure.hxx
@@ -37,7 +37,7 @@
#ifdef ENABLE_MEMORYMEASURE
- #if !defined( WIN ) && !defined( WNT )
+ #if !defined( WNT )
#error "Macros to measure memory access not available under platforms different from windows!"
#endif
diff --git a/framework/inc/macros/debug/registration.hxx b/framework/inc/macros/debug/registration.hxx
index e8ea5a0bafe6..afb359348349 100644
--- a/framework/inc/macros/debug/registration.hxx
+++ b/framework/inc/macros/debug/registration.hxx
@@ -53,26 +53,6 @@
"registration.log"
#endif
- /*_____________________________________________________________________________________________________________
- LOG_REGISTRATION_WRITEINFO( SINFOTEXT )
-
- Write informations for component_writeInfo() in log file.
- _____________________________________________________________________________________________________________*/
-
- #define LOG_REGISTRATION_WRITEINFO( SINFOTEXT ) \
- { \
- ::rtl::OStringBuffer sOut( 1024 ); \
- sOut.append( "component_writeInfo():" ); \
- sOut.append( SINFOTEXT ); \
- WRITE_LOGFILE( LOGFILE_REGISTRATION, sOut.makeStringAndClear() ) \
- }
-
- /*_____________________________________________________________________________________________________________
- LOG_REGISTRATION_WRITEINFO( SINFOTEXT )
-
- Write informations for component_getFactory() in log file.
- _____________________________________________________________________________________________________________*/
-
#define LOG_REGISTRATION_GETFACTORY( SINFOTEXT ) \
{ \
::rtl::OStringBuffer sOut( 1024 ); \
@@ -88,7 +68,6 @@
_____________________________________________________________________________________________________________*/
#undef LOGFILE_REGISTRATION
- #define LOG_REGISTRATION_WRITEINFO( SINFOTEXT )
#define LOG_REGISTRATION_GETFACTORY( SINFOTEXT )
#endif // #ifdef ENABLE_REGISTRATIONDEBUG
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index 3db6761abc15..11f7c297c645 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -37,10 +37,8 @@
//_________________________________________________________________________________________________________________
// interface includes
//_________________________________________________________________________________________________________________
-#include <com/sun/star/registry/XRegistryKey.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/InvalidRegistryException.hpp>
//_________________________________________________________________________________________________________________
// other includes
@@ -57,67 +55,14 @@
macros for registration of services
Please use follow public macros only!
- 1) COMPONENTINFO( CLASS ) => use it as parameter for COMPONENT_WRITEINFO( INFOS )
- 2) IFFACTORY( CLASS ) => use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES )
- 3) COMPONENTGETIMPLEMENTATIONENVIRONMENT => use it to define exported function component_getImplementationEnvironment()
- 4) COMPONENTWRITEINFO( INFOS ) => use it to define exported function component_writeInfo()
- 5) COMPONENTGETFACTORY( IFFACTORIES ) => use it to define exported function component_getFactory()
+ IFFACTORY( CLASS ) => use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES )
+ COMPONENTGETIMPLEMENTATIONENVIRONMENT => use it to define exported function component_getImplementationEnvironment()
+ COMPONENTGETFACTORY( IFFACTORIES ) => use it to define exported function component_getFactory()
_________________________________________________________________________________________________________________*/
//*****************************************************************************************************************
// public
-// use it as parameter for COMPONENT_WRITEINFO( INFOS )
-//*****************************************************************************************************************
-
-#define COMPONENTINFO( CLASS ) \
- try \
- { \
- /* Set default result of follow operations !!! */ \
- bReturn = sal_False; \
- /* Do the follow only, if given key is valid ! */ \
- if ( xKey.is() == sal_True ) \
- { \
- LOG_REGISTRATION_WRITEINFO( "\t\t\txKey is valid ...\n" ) \
- /* Build new keyname */ \
- sKeyName = DECLARE_ASCII( "/" ); \
- sKeyName += CLASS::impl_getStaticImplementationName(); \
- sKeyName += DECLARE_ASCII( "/UNO/SERVICES" ); \
- LOG_REGISTRATION_WRITEINFO( "\t\t\tcreate key \"" ) \
- LOG_REGISTRATION_WRITEINFO( U2B( sKeyName ) ) \
- LOG_REGISTRATION_WRITEINFO( "\" ...\n" ) \
- /* Create new key with new name. */ \
- xNewKey = xKey->createKey( sKeyName ); \
- /* If this new key valid ... */ \
- if ( xNewKey.is() == sal_True ) \
- { \
- LOG_REGISTRATION_WRITEINFO( "\t\t\t\ttsuccessful ...\n" ) \
- /* Get information about supported services. */ \
- seqServiceNames = CLASS::impl_getStaticSupportedServiceNames() ; \
- pArray = seqServiceNames.getArray() ; \
- nLength = seqServiceNames.getLength() ; \
- nCounter = 0 ; \
- /* Then set this information on this key. */ \
- for ( nCounter = 0; nCounter < nLength; ++nCounter ) \
- { \
- LOG_REGISTRATION_WRITEINFO( "\t\t\t\twrite key \"" ) \
- LOG_REGISTRATION_WRITEINFO( U2B( pArray[nCounter] ) ) \
- LOG_REGISTRATION_WRITEINFO( "\" to registry ...\n" ) \
- xNewKey->createKey( pArray[nCounter] ); \
- } \
- /* Result of this operations = OK. */ \
- bReturn = sal_True ; \
- } \
- } \
- } \
- catch( ::com::sun::star::registry::InvalidRegistryException& ) \
- { \
- LOG_REGISTRATION_WRITEINFO( "\n\nERROR:\nInvalidRegistryException detected\n\n" ) \
- bReturn = sal_False ; \
- }
-
-//*****************************************************************************************************************
-// public
// use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES )
//*****************************************************************************************************************
#define IFFACTORY( CLASS ) \
@@ -144,41 +89,6 @@ ________________________________________________________________________________
//*****************************************************************************************************************
// public
-// define registration of service
-//*****************************************************************************************************************
-#define COMPONENTWRITEINFO( INFOS ) \
- extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/ , \
- void* pRegistryKey ) \
- { \
- LOG_REGISTRATION_WRITEINFO( "\t[start]\n" ) \
- /* Set default return value for this operation - if it failed. */ \
- sal_Bool bReturn = sal_False ; \
- if ( pRegistryKey != NULL ) \
- { \
- LOG_REGISTRATION_WRITEINFO( "\t\tpRegistryKey is valid ...\n" ) \
- /* Define variables for following helper macros! */ \
- /* bReturn will set automaticly. */ \
- ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xKey ; \
- ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xNewKey ; \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > seqServiceNames ; \
- const ::rtl::OUString* pArray ; \
- sal_Int32 nLength ; \
- sal_Int32 nCounter ; \
- ::rtl::OUString sKeyName ; \
- xKey = reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pRegistryKey ); \
- /* This parameter will expand to */ \
- /* "COMPONENT_INFO(a) */ \
- /* ... */ \
- /* COMPONENT_INFO(z)" */ \
- INFOS \
- } \
- LOG_REGISTRATION_WRITEINFO( "\t[end]\n" ) \
- /* Return with result of this operation. */ \
- return bReturn ; \
- }
-
-//*****************************************************************************************************************
-// public
// define method to instanciate new services
//*****************************************************************************************************************
#define COMPONENTGETFACTORY( IFFACTORIES ) \
diff --git a/framework/inc/queries.h b/framework/inc/queries.h
index ce190a796dcb..b8d122118abf 100644
--- a/framework/inc/queries.h
+++ b/framework/inc/queries.h
@@ -32,7 +32,6 @@
// own includes
//_________________________________________________________________________________________________________________
-#include <filterflags.h>
#include <general.h>
//_________________________________________________________________________________________________________________
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index a3ce7e67ea8a..eca13d63103c 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -93,7 +93,6 @@ class TransactionManager : public ITransactionManager
virtual sal_Bool isCallRejected ( ERejectReason& eReason ) const;
virtual void registerTransaction ( EExceptionMode eMode, ERejectReason& eReason ) throw( css::uno::RuntimeException, css::lang::DisposedException );
virtual void unregisterTransaction ( ) throw( css::uno::RuntimeException, css::lang::DisposedException );
- static TransactionManager& getGlobalTransactionManager ( );
//-------------------------------------------------------------------------------------------------------------
// private methods
diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
index 9c5f9c89afe6..856746139b68 100644
--- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
@@ -219,6 +219,7 @@ namespace framework
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener
com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xModuleImageManager;
+ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > m_xModuleAcceleratorManager;
};
}
diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx
index 6968cbda5f2d..016cee039796 100644
--- a/framework/inc/uielement/commandinfo.hxx
+++ b/framework/inc/uielement/commandinfo.hxx
@@ -47,11 +47,13 @@ namespace framework
struct CommandInfo
{
CommandInfo() : nId( 0 ),
+ nWidth( 0 ),
nImageInfo( 0 ),
bMirrored( false ),
bRotated( false ) {}
sal_uInt16 nId;
+ sal_uInt16 nWidth;
::std::vector< sal_uInt16 > aIds;
sal_Int16 nImageInfo;
sal_Bool bMirrored : 1,
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index 8016bbb620b8..12301f170f26 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -145,6 +145,7 @@ class ToolBarMerger
const ::rtl::OUString& rControlType );
static void CreateToolbarItem( ToolBox* pToolbox,
+ CommandToInfoMap& rCommandMap,
sal_uInt16 nPos,
sal_uInt16 nItemId,
const AddonToolbarItem& rAddonToolbarItem );
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 5a604cf237fb..169923b00e47 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -105,7 +105,7 @@ namespace framework
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > getLayoutManagerToolbars( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& rLayoutManager );
rtl::OUString getUINameFromCommand( const rtl::OUString& rCommandURL );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const rtl::OUString& rCommandURL );
- void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, sal_uInt16 nHelpId, const rtl::OUString& aLabel );
+ void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OUString& aLabel );
sal_Bool isContextSensitiveToolbarNonVisible();
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState;
generated by cgit (git 2.34.1) at 2024-07-17 23:28:54 +0000