mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kill superfluous vertical whitespace

Browse Source 
Change-Id: Ia1bb2b40c74efb17e655dd6f00d7ba48c16c65ae
This commit is contained in:
Tor Lillqvist 2014-04-06 19:05:49 +03:00
parent be616c26f9
commit 951ed199f1
237 changed files with 0 additions and 2438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
framework/inc/acceleratorconst.h
View File

@ -22,7 +22,6 @@
#include <general.h>
namespace framework{
#define DOCTYPE_ACCELERATORS DECLARE_ASCII("<!DOCTYPE accel:acceleratorlist PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"accelerator.dtd\">")

1
framework/inc/classes/actiontriggercontainer.hxx
View File

@ -29,7 +29,6 @@
#define SERVICENAME_ACTIONTRIGGERCONTAINER "com.sun.star.ui.ActionTriggerContainer"
#define IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.ActionTriggerContainer"
namespace framework
{

5
framework/inc/classes/actiontriggerpropertyset.hxx
View File

@ -74,7 +74,6 @@ class ActionTriggerPropertySet : private cppu::BaseMutex,
const com::sun::star::uno::Any& aValue )
throw( com::sun::star::lang::IllegalArgumentException ) SAL_OVERRIDE;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue )
throw( com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE;
@ -88,10 +87,8 @@ class ActionTriggerPropertySet : private cppu::BaseMutex,
static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
// helper
sal_Bool impl_tryToChangeProperty( const OUString& aCurrentValue ,
const com::sun::star::uno::Any& aNewValue ,
com::sun::star::uno::Any& aOldValue ,
@ -107,10 +104,8 @@ class ActionTriggerPropertySet : private cppu::BaseMutex,
com::sun::star::uno::Any& aOldValue ,
com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException );
// members
OUString m_aCommandURL;
OUString m_aHelpURL;
OUString m_aText;

6
framework/inc/classes/actiontriggerseparatorpropertyset.hxx
View File

@ -33,7 +33,6 @@
#define SERVICENAME_ACTIONTRIGGERSEPARATOR "com.sun.star.ui.ActionTriggerSeparator"
#define IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR "com.sun.star.comp.ui.ActionTriggerSeparator"
namespace framework
{
@ -73,7 +72,6 @@ class ActionTriggerSeparatorPropertySet : private cppu::BaseMutex,
const com::sun::star::uno::Any& aValue )
throw( com::sun::star::lang::IllegalArgumentException ) SAL_OVERRIDE;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& aValue )
throw( com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE;
@ -87,19 +85,15 @@ class ActionTriggerSeparatorPropertySet : private cppu::BaseMutex,
static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
// helper
sal_Bool impl_tryToChangeProperty( sal_Int16 aCurrentValue ,
const com::sun::star::uno::Any& aNewValue ,
com::sun::star::uno::Any& aOldValue ,
com::sun::star::uno::Any& aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException );
// members
sal_Int16 m_nSeparatorType;
};

7
framework/inc/classes/checkediterator.hxx
View File

@ -50,13 +50,10 @@ class CheckedIterator
// public methods
public:
// constructor / destructor
/*-****************************************************************************************************
@short standard constructor
@descr Set default values on members.
@ -77,10 +74,8 @@ class CheckedIterator
{
}
// interface methods
/*-****************************************************************************************************
@short initialize instance with valid container
@descr Set new container at an instance of this class. The other member will set automaticly!
@ -285,10 +280,8 @@ class CheckedIterator
return m_pPosition;
}
// private member
private:
// These enum defines our four states for an iterator position in curent container.

5
framework/inc/classes/filtercache.hxx
View File

@ -65,16 +65,12 @@ class FilterCache : private TransactionBase
{
public:
// public methods
public:
// constructor / destructor
FilterCache( sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION,
sal_Int16 nMode = DEFAULT_FILTERCACHE_MODE );
@ -310,7 +306,6 @@ class FilterCache : private TransactionBase
sal_Bool validateAndRepairLoader();
sal_Bool validateAndRepairHandler();
// private variables
private:

25
framework/inc/classes/filtercachedata.hxx
View File

@ -65,7 +65,6 @@ enum EFilterPackage
E_ADDITIONAL
};
// These struct define a type, which present the type of a file.
// He is used for easy filter detection without file stream detection!
// The internal name is the keyname of an item with these structure in our hash map or our configuration set!
@ -83,7 +82,6 @@ struct FileType
inline FileType& operator= ( const FileType& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
// private methods
private:
@ -113,7 +111,6 @@ struct FileType
return (*this);
}
// public member
public:
@ -128,7 +125,6 @@ struct FileType
OUStringList lExtensions ;
};
// These struct describe a filter which is registered for one type.
// He hold information about services which present the document himself (like a item) and a filter service which
// filter a file in these document.
@ -147,7 +143,6 @@ struct Filter
inline Filter& operator= ( const Filter& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
// private methods
private:
@ -183,7 +178,6 @@ struct Filter
return (*this);
}
// public member
public:
@ -201,7 +195,6 @@ struct Filter
OUString sTemplateName ;
};
// Programmer can register his own services for an content detection of different types.
// The implementation or service name of these is the keyname of an item with these structure
// in our hash map or our configuration set!
@ -219,7 +212,6 @@ struct Detector
inline Detector& operator= ( const Detector& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
// private methods
private:
@ -237,7 +229,6 @@ struct Detector
return (*this);
}
// public member
public:
@ -246,7 +237,6 @@ struct Detector
OUStringList lTypes ;
};
// Programmer can register his own services for loading documents in a frame.
// The implementation or service name of these is the keyname of an item with these structure
// in our hash map or our configuration set!
@ -264,7 +254,6 @@ struct Loader
inline Loader& operator= ( const Loader& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
// private methods
private:
@ -284,7 +273,6 @@ struct Loader
return (*this);
}
// public member
public:
@ -294,7 +282,6 @@ struct Loader
OUStringList lTypes ;
};
// Programmer can register his own services to handle a FileType and intercept dispatches.
// Don't forget: It's not a FrameLoader - it's a ContentHandler! (normaly without any UI)
@ -311,7 +298,6 @@ struct ContentHandler
inline ContentHandler& operator= ( const ContentHandler& rCopy ) { return impl_copy( rCopy ); }
inline void free ( ) { impl_clear(); }
// private methods
private:
@ -329,7 +315,6 @@ struct ContentHandler
return (*this);
}
// public member
public:
@ -338,7 +323,6 @@ struct ContentHandler
OUStringList lTypes ;
};
// We need different hash maps for different tables of our configuration management.
// Follow maps convert <names> to <properties> of type, filter, detector, loader ...
// and could be used in a generic way
@ -364,14 +348,12 @@ class SetNodeHash : public ::boost::unordered_map< OUString ,
lRemovedItems.free();
}
// Append changed, added or removed items to special lists
// Necessary for saving changes
void appendChange( const OUString& sName ,
EModifyState eState );
// member
public:
@ -380,7 +362,6 @@ class SetNodeHash : public ::boost::unordered_map< OUString ,
OUStringList lRemovedItems ;
};
// Use these hashes to implement different tables which assign types to frame loader or detect services.
// It's an optimism to find registered services faster!
// The preferred hash maps file extensions to preferred types to find these ones faster.
@ -399,7 +380,6 @@ class PerformanceHash : public ::boost::unordered_map< OUString
PerformanceHash().swap( *this );
}
// normaly a complete string must match our hash key values ...
// But sometimes we need a search by using these key values as pattern!
// The in/out parameter "pStepper" is used to return a pointer to found element in hash ...
@ -434,7 +414,6 @@ class PerformanceHash : public ::boost::unordered_map< OUString
}
};
// Define easy usable types
typedef SetNodeHash< FileType > FileTypeHash ;
@ -451,7 +430,6 @@ typedef CheckedIterator< PerformanceHash > CheckedPerfo
typedef ::std::vector< FilterHash::const_iterator > FilterQuery ;
// Use private static data container to hold all values of configuration!
class DataContainer
@ -626,7 +604,6 @@ class FilterCFGAccess : public ::utl::ConfigItem
void setProductName ( OUStringHashMap& lUINames );
void resetProductName ( OUStringHashMap& lUINames );
// internal helper
private:
@ -648,7 +625,6 @@ class FilterCFGAccess : public ::utl::ConfigItem
void impl_saveLoaders ( DataContainer& rData );
void impl_saveContentHandlers ( DataContainer& rData );
// debug checks
private:
@ -658,7 +634,6 @@ class FilterCFGAccess : public ::utl::ConfigItem
static sal_Bool implcp_read ( const DataContainer& rData );
static sal_Bool implcp_write( const DataContainer& rData );
// member
private:

1
framework/inc/classes/framecontainer.hxx
View File

@ -67,7 +67,6 @@ class FrameContainer
/// one container item can be the current active frame. Its necessary for Desktop or Frame implementation.
css::uno::Reference< css::frame::XFrame > m_xActiveFrame;
// interface
public:

1
framework/inc/classes/menumanager.hxx
View File

@ -87,7 +87,6 @@ class MenuManager : public ::cppu::WeakImplHelper1< css::frame::XStatusListener
void AddMenu(PopupMenu* _pPopupMenu,const OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren);
sal_uInt16 FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const;
struct MenuItemHandler
{
MenuItemHandler( sal_uInt16 aItemId, MenuManager* pManager, css::uno::Reference< css::frame::XDispatch >& rDispatch ) :

14
framework/inc/classes/propertysethelper.hxx
View File

@ -32,11 +32,8 @@
#include <cppuhelper/weakref.hxx>
#include <fwidllapi.h>
namespace framework{
/** supports the API XPropertySet and XPropertySetInfo.
*
* It must be used as baseclass. The internal list of supported
@ -55,7 +52,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
typedef BaseHash< css::beans::Property > TPropInfoHash;
/* member */
protected:
@ -71,11 +67,9 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
TransactionManager& m_rTransactionManager;
/* native interface */
public:
/** initialize new instance of this helper.
*
* @param pExternalTransactionManager
@ -90,12 +84,10 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
TransactionManager* pExternalTransactionManager ,
sal_Bool bReleaseLockOnCall );
/** free all needed memory.
*/
virtual ~PropertySetHelper();
/** set a new owner for this helper.
*
* This owner is used as source for all broadcasted events.
@ -103,7 +95,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
*/
void impl_setPropertyChangeBroadcaster(const css::uno::Reference< css::uno::XInterface >& xBroadcaster);
/** add a new property info to the set of supported ones.
*
* @param aProperty
@ -121,7 +112,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
throw(css::beans::PropertyExistException,
css::uno::Exception );
/** remove an existing property info from the set of supported ones.
*
* @param sProperty
@ -134,7 +124,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
throw(css::beans::UnknownPropertyException,
css::uno::Exception );
/** mark the object as "useable for working" or "dead".
*
* This correspond to the lifetime handling implemented by the base class TransactionBase.
@ -144,7 +133,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
virtual void SAL_CALL impl_enablePropertySet();
virtual void SAL_CALL impl_disablePropertySet();
/**
*/
virtual void SAL_CALL impl_setPropertyValue(const OUString& sProperty,
@ -154,7 +142,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty,
sal_Int32 nHandle ) = 0;
/* uno interface */
public:
@ -210,7 +197,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& sName)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/* internal helper */
private:

10
framework/inc/classes/protocolhandlercache.hxx
View File

@ -38,8 +38,6 @@ namespace framework{
#define SETNAME_HANDLER DECLARE_ASCII("HandlerSet" ) /// name of configuration set inside package
#define PROPERTY_PROTOCOLS DECLARE_ASCII("Protocols" ) /// properties of a protocol handler
/**
Programmer can register his own services to handle different protocols.
Don't forget: It doesn't mean "handling of documents" ... these services could handle protocols ...
@ -58,8 +56,6 @@ struct FWI_DLLPUBLIC ProtocolHandler
OUStringList m_lProtocols;
};
/**
This hash use registered pattern of all protocol handlers as keys and provide her
uno implementation names as value. Overloading of the index operator makes it possible
@ -73,15 +69,11 @@ class FWI_DLLPUBLIC PatternHash : public BaseHash< OUString >
PatternHash::iterator findPatternKey( const OUString& sURL );
};
/**
This hash holds protocol handler structs by her names.
*/
typedef BaseHash< ProtocolHandler > HandlerHash;
/**
@short this hash makes it easy to find a protocol handler by using his uno implementation name.
@descr It holds two lists of information:
@ -128,8 +120,6 @@ class FWI_DLLPUBLIC HandlerCache
void takeOver(HandlerHash* pHandler, PatternHash* pPattern);
};
/**
@short implements configuration access for handler configuration
@descr We use the ConfigItem mechanism to read/write values from/to configuration.

1
framework/inc/classes/rootactiontriggercontainer.hxx
View File

@ -31,7 +31,6 @@
#define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.RootActionTriggerContainer"
namespace framework
{

2
framework/inc/classes/taskcreator.hxx
View File

@ -48,7 +48,6 @@ class TaskCreator
css::uno::Reference< css::uno::XComponentContext > m_xContext;
// interface
public:
@ -58,7 +57,6 @@ class TaskCreator
css::uno::Reference< css::frame::XFrame > createTask( const OUString& sName ,
sal_Bool bVisible );
// helper
private:

5
framework/inc/classes/wildcard.hxx
View File

@ -42,13 +42,10 @@ class Wildcard
// public methods
public:
// constructor / destructor
/*-****************************************************************************************************
@short standard ctor
@descr We do nothing here.
@ -77,10 +74,8 @@ class Wildcard
virtual ~Wildcard();
// interface
/*-****************************************************************************************************
@short try to find an agreement between given text and searchpattern
@descr You can use wildcards in pattern only!

26
framework/inc/dispatch/closedispatcher.hxx
View File

@ -39,12 +39,10 @@
#include <cppuhelper/implbase2.hxx>
#include <vcl/evntpost.hxx>
class SystemWindow;
namespace framework{
/**
@short helper to dispatch the URLs ".uno:CloseDoc"/".uno:CloseWin"/".uno:CloseFrame"
to close a frame/document or the whole application implicitly in case it was the last frame
@ -64,7 +62,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2<
private:
/** @short describe, which request must be done here.
@descr The incoming URLs {.uno:CloseDoc/CloseWin and CloseFrame
can be classified so and checked later performant.}*/
@ -75,54 +72,44 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2<
E_CLOSE_WIN
};
// member
private:
/** @short reference to an uno service manager,
which can be used to create own needed
uno resources. */
css::uno::Reference< css::uno::XComponentContext > m_xContext;
/** @short reference to the target frame, which should be
closed by this dispatch. */
css::uno::WeakReference< css::frame::XFrame > m_xCloseFrame;
/** @short used for asynchronous callbacks within the main thread.
@descr Internally we work asynchronous. Because our callis
are not aware, that her request can kill its own environment ... */
::vcl::EventPoster m_aAsyncCallback;
/** @short used inside asyncronous callback to decide,
which operation must be executed. */
EOperation m_eOperation;
/** @short for asynchronous operations we must hold us self alive! */
css::uno::Reference< css::uno::XInterface > m_xSelfHold;
/** @short list of registered status listener */
osl::Mutex m_mutex;
ListenerHash m_lStatusListener;
/** @short holded alive for internally asynchronous operations! */
css::uno::Reference< css::frame::XDispatchResultListener > m_xResultListener;
SystemWindow* m_pSysWindow;
// native interface
public:
/** @short connect a new CloseDispatcher instance to its frame.
@descr One CloseDispatcher instance is bound to onw frame only.
That makes an implementation (e.g. of listener support)
@ -142,22 +129,18 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2<
const css::uno::Reference< css::frame::XFrame >& xFrame ,
const OUString& sTarget);
/** @short does nothing real. */
virtual ~CloseDispatcher();
// uno interface
public:
// XNotifyingDispatch
virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDispatch
virtual void SAL_CALL dispatch ( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@ -166,17 +149,14 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2<
virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener ,
const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDispatchInformationProvider
virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups ( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// internal helper
private:
/** @short a callback for asynchronous started operations.
@descr As already mentione, we make internally all operations
@ -185,7 +165,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2<
*/
DECL_LINK( impl_asyncCallback, void* );
/** @short prepare m_xCloseFrame so it should be closeable without problems.
@descr Thats needed to be shure, that the document cant disagree
@ -211,7 +190,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2<
sal_Bool bCloseAllOtherViewsToo,
sal_Bool& bControllerSuspended );
/** @short close the member m_xCloseFrame.
@descr This method does not look for any document
@ -228,7 +206,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2<
*/
sal_Bool implts_closeFrame();
/** @short set the special BackingComponent (now StartModule)
as new component of our m_xCloseFrame.
@ -237,7 +214,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2<
*/
sal_Bool implts_establishBackingMode();
/** @short calls XDesktop->terminate().
@descr No office code has to be called
@ -251,7 +227,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2<
*/
sal_Bool implts_terminateApplication();
/** @short notify a DispatchResultListener.
@descr We check the listener reference before we use it.
@ -271,7 +246,6 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2<
sal_Int16 nState ,
const css::uno::Any& aResult );
/** @short try to find the right target frame where this close request
must be really done.

2
framework/inc/dispatch/dispatchinformationprovider.hxx
View File

@ -47,7 +47,6 @@ class DispatchInformationProvider : public ::cppu::WeakImplHelper1< css::frame:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::WeakReference< css::frame::XFrame > m_xFrame;
// interface
public:
@ -62,7 +61,6 @@ class DispatchInformationProvider : public ::cppu::WeakImplHelper1< css::frame:
virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// helper
private:

18
framework/inc/dispatch/interceptionhelper.hxx
View File

@ -70,8 +70,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3<
css::uno::Sequence< OUString > lURLPattern;
};
/** @short implements a list of items of type InterceptorInfo, and provides some special
functions on it.
@ -82,8 +80,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3<
{
public:
/** @short search for an interceptor inside this list using it's reference.
@param xInterceptor
@ -104,8 +100,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3<
return end();
}
/** @short search for an interceptor inside this list using it's reference.
@param xInterceptor
@ -133,7 +127,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3<
}
};
// member
private:
@ -154,13 +147,10 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3<
The last or the first registered one. */
static sal_Bool m_bPreferrFirstInterceptor;
// native interface
public:
/** @short creates a new interception helper instance.
@param xOwner
@ -174,8 +164,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3<
protected:
/** @short standard destructor.
@descr This method destruct an instance of this class and clear some member.
@ -184,12 +172,10 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3<
*/
virtual ~InterceptionHelper();
// uno interface
public:
// XDispatchProvider
/** @short query for a dispatch, which implements the requested feature.
@ -217,7 +203,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3<
sal_Int32 nSearchFlags )
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDispatchProvider
/** @short implements an optimized queryDispatch() for remote.
@ -234,7 +219,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3<
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches(const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDispatchProviderInterception
/** @short register an interceptor.
@ -253,7 +237,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3<
virtual void SAL_CALL registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDispatchProviderInterception
/** @short release an interceptor.
@ -268,7 +251,6 @@ class InterceptionHelper : public ::cppu::WeakImplHelper3<
*/
virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEventListener
/** @short Is called from our owner frame, in case he will be disposed.

1
framework/inc/dispatch/mailtodispatcher.hxx
View File

@ -37,7 +37,6 @@
#include <cppuhelper/implbase3.hxx>
namespace framework{
/**

17
framework/inc/dispatch/menudispatcher.hxx
View File

@ -55,7 +55,6 @@ namespace framework{
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString ,
OUStringHash > IMPL_ListenerHashContainer;
/*-************************************************************************************************************
@short helper for desktop only(!) to create new tasks on demand for dispatches
@descr Use this class as member only! Never use it as baseclass.
@ -77,13 +76,10 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2<
// public methods
public:
// constructor / destructor
/*-****************************************************************************************************
@short standard ctor
@descr These initialize a new instance of ths class with needed information for work.
@ -100,10 +96,8 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2<
MenuDispatcher( const css::uno::Reference< css::uno::XComponentContext >& rxContext ,
const css::uno::Reference< css::frame::XFrame >& xOwner );
// XDispatch
/*-****************************************************************************************************
@short dispatch URL with arguments
@descr Every dispatch create a new task. If load of URL failed task will deleted automaticly!
@ -154,17 +148,12 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2<
virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl,
const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XFrameActionListener
virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEventListener
/*-****************************************************************************************************
@short dispose current instance
@descr If service helper isn't required any longer call this method to release all used resources.
@ -179,10 +168,8 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2<
void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// protected methods
protected:
/*-****************************************************************************************************
@ -201,10 +188,8 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2<
virtual ~MenuDispatcher();
// private methods
private:
/*-****************************************************************************************************
@ -235,11 +220,9 @@ class MenuDispatcher : public ::cppu::WeakImplHelper2<
void impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel );
// variables
// (should be private everyway!)
private:
css::uno::WeakReference< css::frame::XFrame > m_xOwnerWeak ; /// css::uno::WeakReference to owner (Don't use a hard css::uno::Reference. Owner can't delete us then!)

8
framework/inc/dispatch/oxt_handler.hxx
View File

@ -38,7 +38,6 @@
#include <cppuhelper/implbase3.hxx>
namespace framework{
/*-************************************************************************************************************
@ -62,25 +61,21 @@ class Oxt_Handler : public ::cppu::WeakImplHelper3<
public:
// constructor / destructor
Oxt_Handler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
virtual ~Oxt_Handler( );
// XInterface, XTypeProvider, XServiceInfo
DECLARE_XSERVICEINFO
// XNotifyingDispatch
virtual void SAL_CALL dispatchWithNotification(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XDispatch
virtual void SAL_CALL dispatch ( const css::util::URL& aURL ,
@ -91,7 +86,6 @@ class Oxt_Handler : public ::cppu::WeakImplHelper3<
virtual void SAL_CALL removeStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE {};
// XExtendedFilterDetection
virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
@ -99,12 +93,10 @@ class Oxt_Handler : public ::cppu::WeakImplHelper3<
protected:
// private methods
private:
// variables
// (should be private everyway!)

2
framework/inc/dispatch/popupmenudispatcher.hxx
View File

@ -57,7 +57,6 @@ namespace framework{
typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString ,
OUStringHash > IMPL_ListenerHashContainer;
/*-************************************************************************************************************
@short helper for desktop only(!) to create new tasks on demand for dispatches
@descr Use this class as member only! Never use it as baseclass.
@ -114,7 +113,6 @@ class PopupMenuDispatcher : public ::cppu::WeakImplHelper5<
virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl,
const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XFrameActionListener
virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;

19
framework/inc/dispatch/startmoduledispatcher.hxx
View File

@ -40,10 +40,8 @@
#include <cppuhelper/implbase2.hxx>
#include <vcl/evntpost.hxx>
namespace framework{
/**
@short helper to handle all URLs related to the StartModule
*/
@ -56,31 +54,25 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2<
private:
/** @short reference to an uno service manager,
which can be used to create own needed
uno resources. */
css::uno::Reference< css::uno::XComponentContext > m_xContext;
/** @short our "context" frame. */
css::uno::WeakReference< css::frame::XFrame > m_xOwner;
/** @short the original queryDispatch() target. */
OUString m_sDispatchTarget;
/** @short list of registered status listener */
osl::Mutex m_mutex;
ListenerHash m_lStatusListener;
// native interface
public:
/** @short connect a new StartModuleDispatcher instance to its "owner frame".
@descr Such "owner frame" is used as context for all related operations.
@ -99,24 +91,18 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2<
const css::uno::Reference< css::frame::XFrame >& xFrame ,
const OUString& sTarget);
/** @short does nothing real. */
virtual ~StartModuleDispatcher();
// uno interface
public:
// XNotifyingDispatch
virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDispatch
virtual void SAL_CALL dispatch ( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@ -125,22 +111,18 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2<
virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener ,
const css::util::URL& aURL ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDispatchInformationProvider
virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups ( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// internal helper
private:
/** @short check if StartModule can be shown.
*/
sal_Bool implts_isBackingModePossible();
/** @short open the special BackingComponent (now StartModule)
@return [bool]
@ -148,7 +130,6 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper2<
*/
sal_Bool implts_establishBackingMode();
/** @short notify a DispatchResultListener.
@descr We check the listener reference before we use it.

2
framework/inc/dispatchcommands.h
View File

@ -24,8 +24,6 @@
namespace framework{
#define CMD_UNO_SHOWSTARTMODULE ".uno:ShowStartModule"
} // namespace framework

10
framework/inc/helper/dockingareadefaultacceptor.hxx
View File

@ -33,17 +33,12 @@
namespace framework{
class DockingAreaDefaultAcceptor : public ::cppu::WeakImplHelper1< ::com::sun::star::ui::XDockingAreaAcceptor >
{
public:
// constructor / destructor
/*-****************************************************************************************************
@short constructor to initialize this instance
@descr A docking area acceptor
@ -62,20 +57,15 @@ class DockingAreaDefaultAcceptor : public ::cppu::WeakImplHelper1< ::com::s
DockingAreaDefaultAcceptor( const css::uno::Reference< css::frame::XFrame >& xOwner );
virtual ~DockingAreaDefaultAcceptor();
// XDockingAreaAcceptor
virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// variables
// (should be private everyway!)
private:
css::uno::WeakReference< css::frame::XFrame > m_xOwner ; /// weak reference to our frame object!

4
framework/inc/helper/mischelper.hxx
View File

@ -40,13 +40,11 @@
class SvtLanguageTable;
// flags for script types in use within selection
#define LS_SCRIPT_LATIN 0x0001
#define LS_SCRIPT_ASIAN 0x0002
#define LS_SCRIPT_COMPLEX 0x0004
namespace framework
{
@ -83,7 +81,6 @@ enum LangMenuIDs
MID_LANG_PARA_MORE,
};
inline bool IsScriptTypeMatchingToLanguage( sal_Int16 nScriptType, LanguageType nLang )
{
return 0 != (nScriptType & SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ));
@ -315,7 +312,6 @@ class WeakDocumentEventListener : public ::cppu::WeakImplHelper1<com::sun::star:
}
};
} // namespace framework
#endif // INCLUDED_FRAMEWORK_INC_HELPER_MISCHELPER_HXX

15
framework/inc/helper/ocomponentaccess.hxx
View File

@ -59,13 +59,10 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co
// public methods
public:
// constructor / destructor
/*-****************************************************************************************************
@short constructor to initialize this instance
@descr A desktop will create an enumeration-access-object. An enumeration is a oneway-list and a
@ -83,10 +80,8 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co
OComponentAccess( const css::uno::Reference< css::frame::XDesktop >& xOwner );
// XEnumerationAccess
/*-****************************************************************************************************
@short create a new enumeration of components
@descr You can call this method to get a new snapshot from all components of all tasks of the desktop as an enumeration.
@ -104,10 +99,8 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XElementAccess
/*-****************************************************************************************************
@short get the type of elements in enumeration
@descr -
@ -138,10 +131,8 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co
virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// protected methods
protected:
/*-****************************************************************************************************
@ -161,10 +152,8 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co
virtual ~OComponentAccess();
// private methods
private:
/*-****************************************************************************************************
@ -198,11 +187,9 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co
css::uno::Reference< css::lang::XComponent > impl_getFrameComponent( const css::uno::Reference< css::frame::XFrame >& xFrame ) const;
// debug methods
// (should be private everyway!)
/*-****************************************************************************************************
@short debug-method to check incoming parameter of some other mehods of this class
@descr The following methods are used to check parameters for other methods
@ -221,11 +208,9 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co
static sal_Bool impldbg_checkParameter_OComponentAccessCtor( const css::uno::Reference< css::frame::XDesktop >& xOwner );
// variables
// (should be private everyway!)
private:
css::uno::WeakReference< css::frame::XDesktop > m_xOwner ; /// weak reference to the desktop object!

15
framework/inc/helper/ocomponentenumeration.hxx
View File

@ -55,13 +55,10 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star
// public methods
public:
// constructor / destructor
/*-****************************************************************************************************
@short constructor to initialize this enumeration
@descr An enumeration is a list with oneway-access! You can get every member only for one time.
@ -77,10 +74,8 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star
OComponentEnumeration( const css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents );
// XEventListener
/*-****************************************************************************************************
@short last chance to release all references and free memory
@descr This method is called, if the enumeration is used completely and has no more elements.
@ -96,10 +91,8 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star
virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XEnumeration
/*-****************************************************************************************************
@short check count of accessible elements of enumeration
@descr You can call this method to get information about accessible elements in future.
@ -133,10 +126,8 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star
css::lang::WrappedTargetException ,
css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// protected methods
protected:
/*-****************************************************************************************************
@ -175,17 +166,13 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star
virtual void impl_resetObject();
// private methods
private:
// debug methods
// (should be private everyway!)
/*-****************************************************************************************************
@short debug-method to check incoming parameter of some other mehods of this class
@descr The following methods are used to check parameters for other methods
@ -205,11 +192,9 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star
static sal_Bool impldbg_checkParameter_OComponentEnumerationCtor ( const css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents );
static sal_Bool impldbg_checkParameter_disposing ( const css::lang::EventObject& aEvent );
// variables
// (should be private everyway!)
private:
sal_uInt32 m_nPosition ; /// current position in enumeration

10
framework/inc/helper/persistentwindowstate.hxx
View File

@ -70,33 +70,27 @@ class PersistentWindowState : public ::cppu::WeakImplHelper2<
/// we call SetWindowState one times only for the same frame!
sal_Bool m_bWindowStateAlreadySet;
// interface
public:
// ctor/dtor
PersistentWindowState(const css::uno::Reference< css::uno::XComponentContext >& xContext);
virtual ~PersistentWindowState( );
// XInitialization
virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
throw(css::uno::Exception ,
css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XFrameActionListener
virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEventListener
virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// helper
private:
@ -116,7 +110,6 @@ class PersistentWindowState : public ::cppu::WeakImplHelper2<
static OUString implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::frame::XFrame >& xFrame);
/** @short retrieve the window state from the configuration.
@param rxContext
@ -132,7 +125,6 @@ class PersistentWindowState : public ::cppu::WeakImplHelper2<
static OUString implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext ,
const OUString& sModuleName);
/** @short retrieve the window state from the container window.
@param xWindow
@ -145,7 +137,6 @@ class PersistentWindowState : public ::cppu::WeakImplHelper2<
*/
static OUString implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow);
/** @short restore the position and size on the container window.
@param rxContext
@ -162,7 +153,6 @@ class PersistentWindowState : public ::cppu::WeakImplHelper2<
const OUString& sModuleName ,
const OUString& sWindowState );
/** @short restore the position and size on the container window.
@param xWindow

11
framework/inc/helper/statusindicator.hxx
View File

@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_HELPER_STATUSINDICATOR_HXX
#define INCLUDED_FRAMEWORK_INC_HELPER_STATUSINDICATOR_HXX
// include files of own module
#include <helper/statusindicatorfactory.hxx>
@ -28,20 +27,15 @@
#include <macros/xtypeprovider.hxx>
#include <macros/generic.hxx>
// include UNO interfaces
#include <com/sun/star/task/XStatusIndicator.hpp>
// include all others
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/weakref.hxx>
namespace framework{
/**
@short implement a status indicator object
@ -74,11 +68,9 @@ class StatusIndicator : public ::cppu::WeakImplHelper1< css::task::XStatusIndic
*/
css::uno::WeakReference< css::task::XStatusIndicatorFactory > m_xFactory;
// c++ interface
public:
/** @short initialize new instance of this class.
@param pFactory
@ -86,16 +78,13 @@ class StatusIndicator : public ::cppu::WeakImplHelper1< css::task::XStatusIndic
*/
StatusIndicator(StatusIndicatorFactory* pFactory);
/** @short does nothing real ....
*/
virtual ~StatusIndicator();
// uno interface
public:
// XStatusIndicator
virtual void SAL_CALL start(const OUString& sText ,
sal_Int32 nRange)

19
framework/inc/helper/statusindicatorfactory.hxx
View File

@ -24,7 +24,6 @@
// with solaris headers ...
#include <vector>
// include files of own module
#include <helper/wakeupthread.hxx>
#include <macros/xinterface.hxx>
@ -33,7 +32,6 @@
#include <macros/generic.hxx>
#include <general.h>
// include uno interfaces
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@ -54,11 +52,8 @@
#include <cppuhelper/implbase4.hxx>
#include <osl/thread.hxx>
namespace framework{
/**
@descr This struct hold some information about all currently running progress proccesses.
Because the can be used on a stack, we must cache her states but must paint only
@ -83,11 +78,9 @@ struct IndicatorInfo
/** @short the last set value for this indicator */
sal_Int32 m_nValue;
// interface
public:
/** @short initialize new instance of this class
@param xIndicator
@ -109,7 +102,6 @@ struct IndicatorInfo
m_nValue = 0 ;
}
/** @short Don't forget to free used references!
*/
~IndicatorInfo()
@ -117,7 +109,6 @@ struct IndicatorInfo
m_xIndicator.clear();
}
/** @short Used to locate an info struct inside a stl structure ...
@descr The indicator object itself is used as key. Its values
@ -130,11 +121,9 @@ struct IndicatorInfo
}
};
/** @descr Define a lits of child indicator objects and her data. */
typedef ::std::vector< IndicatorInfo > IndicatorStack;
/** @short implement a factory service to create new status indicator objects
@descr Internally it uses:
@ -201,7 +190,6 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper4<
/** prevent recursive calling of Application::Reschedule(). */
static sal_Int32 m_nInReschedule;
// interface
public:
@ -227,23 +215,19 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper4<
return aSeq;
}
// XInitialization
virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
throw(css::uno::Exception ,
css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XStatusIndicatorFactory
virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL createStatusIndicator()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XUpdatable
virtual void SAL_CALL update()
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// similar (XStatusIndicator)
virtual void start(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
const OUString& sText ,
@ -259,21 +243,18 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper4<
virtual void SAL_CALL setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
sal_Int32 nValue);
// specials
protected:
virtual ~StatusIndicatorFactory();
// helper
private:
/** @short show the parent window of this progress ...
if it's allowed to do so.
@descr By default we show the parent window automaticly
if this progress is used.
If that isn't a valid operation, the user of this

8
framework/inc/helper/tagwindowasmodified.hxx
View File

@ -65,43 +65,35 @@ class TagWindowAsModified : public ::cppu::WeakImplHelper3<
/// we list on the model for modify events
css::uno::WeakReference< css::frame::XModel > m_xModel;
// interface
public:
// ctor/dtor
TagWindowAsModified();
virtual ~TagWindowAsModified( );
// XInterface, XTypeProvider
// XInitialization
virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
throw(css::uno::Exception ,
css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XModifyListener
virtual void SAL_CALL modified(const css::lang::EventObject& aEvent)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XFrameActionListener
virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEventListener
virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
// @todo document me
void impl_update(const css::uno::Reference< css::frame::XFrame >& xFrame);

13
framework/inc/helper/titlebarupdate.hxx
View File

@ -62,7 +62,6 @@ class TitleBarUpdate : public ::cppu::WeakImplHelper3<
::sal_Int32 nIcon;
};
// member
private:
@ -73,46 +72,37 @@ class TitleBarUpdate : public ::cppu::WeakImplHelper3<
/// reference to the frame which was created by the office himself
css::uno::WeakReference< css::frame::XFrame > m_xFrame;
// interface
public:
// ctor/dtor
TitleBarUpdate(const css::uno::Reference< css::uno::XComponentContext >& xContext);
virtual ~TitleBarUpdate( );
// XInterface, XTypeProvider
// XInitialization
virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
throw(css::uno::Exception ,
css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XFrameActionListener
virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XTitleChangeListener
virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent)
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEventListener
virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// helper
private:
/** @short identify the application module, which is used behind the component
of our frame.
@ -130,7 +120,6 @@ class TitleBarUpdate : public ::cppu::WeakImplHelper3<
sal_Bool implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame,
TModuleInfo& rInfo );
/** @short set a new icon and title on the title bar of our connected frame window.
@descr It does not check if an update is really needed. That has to be done outside.
@ -139,7 +128,6 @@ class TitleBarUpdate : public ::cppu::WeakImplHelper3<
*/
void impl_forceUpdate();
/** @short identify the current component (inside the connected frame)
and set the right module icon on the title bar.
@ -149,7 +137,6 @@ class TitleBarUpdate : public ::cppu::WeakImplHelper3<
*/
void impl_updateIcon(const css::uno::Reference< css::frame::XFrame >& xFrame);
/** @short gets the current title from the frame and set it on the window.
@param xFrame

1
framework/inc/helper/uiconfigelementwrapperbase.hxx
View File

@ -103,7 +103,6 @@ class UIConfigElementWrapperBase : private cppu::BaseMutex,
using cppu::OPropertySetHelper::disposing;
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// protected methods
protected:

1
framework/inc/helper/uielementwrapperbase.hxx
View File

@ -83,7 +83,6 @@ class UIElementWrapperBase : private cppu::BaseMutex,
virtual ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0;
// protected methods
protected:

4
framework/inc/helper/vclstatusindicator.hxx
View File

@ -31,10 +31,8 @@
#include <cppuhelper/implbase1.hxx>
#include <vcl/status.hxx>
namespace framework {
// declaration
class VCLStatusIndicator : public ::cppu::WeakImplHelper1< css::task::XStatusIndicator >
@ -65,7 +63,6 @@ class VCLStatusIndicator : public ::cppu::WeakImplHelper1< css::task::XStatusIn
/** knows the current value of the progress. */
sal_Int32 m_nValue;
// interface
public:
@ -93,7 +90,6 @@ class VCLStatusIndicator : public ::cppu::WeakImplHelper1< css::task::XStatusIn
virtual void SAL_CALL setValue(sal_Int32 nValue)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// helper
private:

7
framework/inc/helper/wakeupthread.hxx
View File

@ -20,28 +20,22 @@
#ifndef INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX
#define INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX
// include files of own module
#include <macros/generic.hxx>
#include <general.h>
// include UNO interfaces
#include <com/sun/star/util/XUpdatable.hpp>
// include all others
#include <cppuhelper/weakref.hxx>
#include <osl/thread.hxx>
namespace framework{
/** @short implements a "sleeping" thread, which try to sleep
without a using cpu consumption :-) */
class WakeUpThread : public ::osl::Thread
@ -54,7 +48,6 @@ class WakeUpThread : public ::osl::Thread
waked up. */
css::uno::WeakReference< css::util::XUpdatable > m_xListener;
// interface
public:

5
framework/inc/jobs/configaccess.hxx
View File

@ -30,8 +30,6 @@
namespace framework{
/**
@short implements a simple configuration access
@descr Sometimes it's better to have direct config access
@ -41,7 +39,6 @@ namespace framework{
class FWI_DLLPUBLIC ConfigAccess
{
public:
/** represent the possible modes of the internal wrapped configuration access */
@ -55,7 +52,6 @@ class FWI_DLLPUBLIC ConfigAccess
E_READWRITE
};
// member
private:
@ -76,7 +72,6 @@ class FWI_DLLPUBLIC ConfigAccess
/** represent the current open mode */
EOpenMode m_eMode;
// native interface methods
public:

19
framework/inc/jobs/helponstartup.hxx
View File

@ -33,11 +33,8 @@
#include <com/sun/star/frame/XDesktop2.hpp>
#include <com/sun/star/frame/XModuleManager2.hpp>
namespace framework{
/** @short implements a job component, which handle the special
feature to show a suitable help page for every (visible!)
loaded document.
@ -54,35 +51,28 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS
/** @short reference to an uno service manager. */
css::uno::Reference< css::uno::XComponentContext > m_xContext;
/** @short such module manager is used to classify new opened documents. */
css::uno::Reference< css::frame::XModuleManager2 > m_xModuleManager;
/** @short is needed to locate a might open help frame. */
css::uno::Reference< css::frame::XDesktop2 > m_xDesktop;
/** @short provides read access to the underlying configuration. */
css::uno::Reference< css::container::XNameAccess > m_xConfig;
/** @short knows the current locale of this office session,
which is needed to build complete help URLs.
*/
OUString m_sLocale;
/** @short knows the current operating system of this office session,
which is needed to build complete help URLs.
*/
OUString m_sSystem;
// native interface
public:
/** @short create new instance of this class.
@param xContext
@ -91,7 +81,6 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS
*/
HelpOnStartup(const css::uno::Reference< css::uno::XComponentContext >& xContext);
/** @short does nothing real ...
@descr But it should exists as virtual function,
@ -100,11 +89,9 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS
*/
virtual ~HelpOnStartup();
// uno interface
public:
// css.lang.XServiceInfo
DECLARE_XSERVICEINFO
@ -118,11 +105,9 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS
virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// helper
private:
/** @short analyze the given job arguments, try to locate a model reference
and try to classify this model.
@ -138,7 +123,6 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS
*/
OUString its_getModuleIdFromEnv(const css::uno::Sequence< css::beans::NamedValue >& lArguments);
/** @short tries to locate the open help module and return
the url of the currently shown help content.
@ -150,7 +134,6 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS
*/
OUString its_getCurrentHelpURL();
/** @short checks if the given help url match to a default help url
of any office module.
@ -163,7 +146,6 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS
*/
sal_Bool its_isHelpUrlADefaultOne(const OUString& sHelpURL);
/** @short checks, if the help module should be shown automaticly for the
currently opened office module.
@ -180,7 +162,6 @@ class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XS
*/
OUString its_checkIfHelpEnabledAndGetURL(const OUString& sModule);
/** @short create a help URL for the given parameters.
@param sBaseURL

8
framework/inc/jobs/job.hxx
View File

@ -40,12 +40,8 @@
#include <osl/conditn.hxx>
#include <rtl/ustring.hxx>
namespace framework{
/**
@short it represent a job; execute it and control it's lifetime
@ -75,7 +71,6 @@ class Job : public ::cppu::WeakImplHelper3<
E_DISPOSED
};
// member
private:
@ -168,7 +163,6 @@ class Job : public ::cppu::WeakImplHelper3<
*/
ERunState m_eRunState;
// native interface
public:
@ -192,12 +186,10 @@ class Job : public ::cppu::WeakImplHelper3<
void impl_startListening ( );
void impl_stopListening ( );
// uno interface
public:
// XJobListener
virtual void SAL_CALL jobFinished( const css::uno::Reference< css::task::XAsyncJob >& xJob,
const css::uno::Any& aResult ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;

4
framework/inc/jobs/jobconst.hxx
View File

@ -23,15 +23,11 @@
#include <stdtypes.h>
#include <general.h>
#include <rtl/ustring.hxx>
#include <fwidllapi.h>
namespace framework{
/**
@short defines all constant values used within a job environment.

6
framework/inc/jobs/jobdata.hxx
View File

@ -34,9 +34,6 @@
namespace framework{
/**
@short holds all necessary information about a job and
handle it's configuration (if any exist!)
@ -101,7 +98,6 @@ class JobData
{}
};
// member
private:
@ -178,7 +174,6 @@ class JobData
*/
JobResult m_aLastExecutionResult;
// native interface
public:
@ -216,7 +211,6 @@ class JobData
const OUString& sEvent ,
::comphelper::SequenceAsVector< JobData::TJob2DocEventBinding >& lJobs );
// private helper
private:

5
framework/inc/jobs/jobresult.hxx
View File

@ -28,11 +28,8 @@
#include <rtl/ustring.hxx>
namespace framework{
/**
@short represent a result of a finished job execution
@descr Such result instance transport all neccessarry
@ -62,7 +59,6 @@ class JobResult
E_DISPATCHRESULT = 4
};
// member
private:
@ -104,7 +100,6 @@ class JobResult
*/
css::frame::DispatchResultEvent m_aDispatchResult;
// native interface
public:

7
framework/inc/jobs/joburl.hxx
View File

@ -25,10 +25,8 @@
#include <rtl/ustring.hxx>
namespace framework{
#define JOBURL_PROTOCOL_STR "vnd.sun.star.job:"
#define JOBURL_PROTOCOL_LEN 17
@ -44,7 +42,6 @@ namespace framework{
#define JOBURL_PART_SEPARATOR ';'
#define JOBURL_PARTARGS_SEPARATOR ','
/**
@short can be used to parse, validate and work with job URL's
@descr Job URLs are specified by the following syntax:
@ -76,7 +73,6 @@ class JobURL
E_SERVICE = 4
};
// types
private:
@ -102,7 +98,6 @@ class JobURL
/** holds the service arguments */
OUString m_sServiceArgs;
// native interface
public:
@ -113,7 +108,6 @@ class JobURL
sal_Bool getAlias ( OUString& sAlias ) const;
sal_Bool getService ( OUString& sService ) const;
// private helper
private:
@ -124,7 +118,6 @@ class JobURL
OUString& rPartValue ,
OUString& rPartArguments );
// debug methods!
#ifdef ENABLE_COMPONENT_SELF_CHECK

13
framework/inc/jobs/shelljob.hxx
View File

@ -32,11 +32,8 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/frame/XModuleManager.hpp>
namespace framework{
/** @short implements a job component which can be used
to execute system shell commands.
@ -54,15 +51,12 @@ class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServic
// member
private:
/** @short reference to an uno service manager. */
css::uno::Reference< css::uno::XComponentContext > m_xContext;
// native interface
public:
/** @short create new instance of this class.
@param xContext
@ -71,7 +65,6 @@ class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServic
*/
ShellJob(const css::uno::Reference< css::uno::XComponentContext >& xContext);
/** @short does nothing real ...
@descr But it should exists as virtual function,
@ -80,11 +73,9 @@ class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServic
*/
virtual ~ShellJob();
// uno interface
public:
// css.lang.XServiceInfo
DECLARE_XSERVICEINFO
@ -94,11 +85,9 @@ class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServic
css::uno::Exception ,
css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// helper
private:
/** generate a return value for method execute()
which will force deactivation of this job for further requests.
@ -106,7 +95,6 @@ class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServic
*/
static css::uno::Any impl_generateAnswer4Deactivation();
/** substitute all might existing placeholder variables
within the configured command.
@ -122,7 +110,6 @@ class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServic
*/
OUString impl_substituteCommandVariables(const OUString& sCommand);
/** executes the command.
@param sCommand

2
framework/inc/macros/generic.hxx
View File

@ -23,10 +23,8 @@
#include <rtl/ustring.hxx>
#include <rtl/textenc.h>
// generic macros
/*_________________________________________________________________________________________________________________
DECLARE_ASCII( SASCIIVALUE )

3
framework/inc/macros/registration.hxx
View File

@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_MACROS_REGISTRATION_HXX
#define INCLUDED_FRAMEWORK_INC_MACROS_REGISTRATION_HXX
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@ -36,7 +35,6 @@
_________________________________________________________________________________________________________________*/
// public
// use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES )
@ -50,7 +48,6 @@ ________________________________________________________________________________
xFactory = CLASS::impl_createFactory( xServiceManager ); \
}
// public
// define method to instanciate new services

11
framework/inc/macros/xinterface.hxx
View File

@ -45,7 +45,6 @@ namespace framework{
_________________________________________________________________________________________________________________*/
// private
// implementation of XInterface::aquire()
// XInterface::release()
@ -63,7 +62,6 @@ ________________________________________________________________________________
BASECLASS::release(); \
}
// private
// implementation of XInterface::queryInterface() without any other interfaces!
@ -76,7 +74,6 @@ ________________________________________________________________________________
return BASECLASS::queryInterface( aType ); \
}
// private
// implementation of XInterface::queryInterface() with max. 12 other interfaces!
@ -97,7 +94,6 @@ ________________________________________________________________________________
return aReturn; \
}
// private
// implementation of XInterface::queryInterface() with more then 12 other interfaces!
@ -124,7 +120,6 @@ ________________________________________________________________________________
return aReturn; \
}
// private
// complete implementation of XInterface for different use cases
@ -140,7 +135,6 @@ ________________________________________________________________________________
PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS ) \
PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND )
// private
// help macros to replace INTERFACES in queryInterface() [see before]
@ -195,11 +189,9 @@ ________________________________________________________________________________
PRIVATE_DEFINE_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ), \
INTERFACE11
// public
// help macros for follow XInterface definitions
// Use it as parameter for DEFINE_XINTERFACE_X(), if you CAN use an interface directly in queryInterface()!
#define DIRECT_INTERFACE( INTERFACE ) \
static_cast< INTERFACE* >( this )
@ -209,7 +201,6 @@ ________________________________________________________________________________
#define DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) \
static_cast< BASEINTERFACE* >( static_cast< DERIVEDINTERFACE* >( this ) )
// public
// declaration of XInterface
@ -218,11 +209,9 @@ ________________________________________________________________________________
virtual void SAL_CALL acquire ( ) throw() SAL_OVERRIDE; \
virtual void SAL_CALL release ( ) throw() SAL_OVERRIDE;
// public
// implementation of XInterface
// implementation of XInterface with 0 additional interface for queryInterface()
#define DEFINE_XINTERFACE_0( CLASS, BASECLASS ) \
PRIVATE_DEFINE_XINTERFACE_PURE ( CLASS, \

8
framework/inc/macros/xtypeprovider.hxx
View File

@ -49,7 +49,6 @@ namespace framework{
_________________________________________________________________________________________________________________*/
// private
// implementation of XTypeProvider::getImplementationId()
@ -59,7 +58,6 @@ ________________________________________________________________________________
return css::uno::Sequence<sal_Int8>(); \
}
// private
// implementation of XTypeProvider::getTypes() with max. 12 interfaces!
@ -89,7 +87,6 @@ ________________________________________________________________________________
return pTypeCollection->getTypes(); \
}
// private
// implementation of XTypeProvider::getTypes() with more then 12 interfaces!
@ -141,7 +138,6 @@ ________________________________________________________________________________
return *pTypeCollection; \
}
// private
// implementation of XTypeProvider::getTypes() with using max. 12 interfaces + baseclass!
@ -192,7 +188,6 @@ ________________________________________________________________________________
return *pTypeCollection; \
}
// private
// help macros to replace TYPES in getTypes() [see before]
@ -243,7 +238,6 @@ ________________________________________________________________________________
PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ), \
::getCppuType(( const ::com::sun::star::uno::Reference< TYPE12 >*)NULL )
// private
// complete implementation of XTypeProvider
@ -263,7 +257,6 @@ ________________________________________________________________________________
PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \
PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_BASECLASS( CLASS, BASECLASS, TYPES )
// public
// declaration of XTypeProvider
@ -271,7 +264,6 @@ ________________________________________________________________________________
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes () throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;\
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// public
// implementation of XTypeProvider

13
framework/inc/properties.h
View File

@ -23,10 +23,8 @@
#include <macros/generic.hxx>
#include <general.h>
namespace framework{
/** properties for "Frame" class */
#define FRAME_PROPNAME_ASCII_DISPATCHRECORDERSUPPLIER "DispatchRecorderSupplier"
@ -52,7 +50,6 @@ namespace framework{
#define FRAME_PROPCOUNT 5
/** properties for "Desktop" class */
#define DESKTOP_PROPNAME_ASCII_ACTIVEFRAME "ActiveFrame"
@ -78,7 +75,6 @@ namespace framework{
#define DESKTOP_PROPCOUNT 5
/** properties for "PathSettings" class */
#define PATHSETTINGS_PROPNAME_ASCII_ADDIN "Addin"
@ -161,7 +157,6 @@ namespace framework{
#define PATHSETTINGS_PROPCOUNT 24
/** properties for "LayoutManager" class */
#define LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER "MenuBarCloser"
@ -185,7 +180,6 @@ namespace framework{
#define LAYOUTMANAGER_PROPHANDLE_LOCKCOUNT 4
#define LAYOUTMANAGER_PROPHANDLE_PRESERVE_CONTENT_SIZE 5
/** properties for "UICommandDescription" class */
#define UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST "private:resource/image/commandimagelist"
#define UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST "private:resource/image/commandrotateimagelist"
@ -199,7 +193,6 @@ namespace framework{
#define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE_ROTATED 4
#define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
/** properties for "AutoRecovery" class */
#define AUTORECOVERY_PROPNAME_ASCII_EXISTS_RECOVERYDATA "ExistsRecoveryData"
@ -216,14 +209,12 @@ namespace framework{
#define AUTORECOVERY_PROPCOUNT 3
/** properties for Filter config */
#define FILTER_PROPNAME_ASCII_DOCUMENTSERVICE "DocumentService"
#define FILTER_PROPNAME_DOCUMENTSERVICE OUString( FILTER_PROPNAME_ASCII_DOCUMENTSERVICE )
/** properties for office module config (Setup.xcu) */
#define OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES "ooSetupFactoryWindowAttributes"
@ -234,7 +225,6 @@ namespace framework{
#define OFFICEFACTORY_PROPNAME_UINAME OUString( OFFICEFACTORY_PROPNAME_ASCII_UINAME )
#define OFFICEFACTORY_PROPNAME_ICON OUString( OFFICEFACTORY_PROPNAME_ASCII_ICON )
/** properties for tab window (old) */
#define TABWINDOW_PROPNAME_ASCII_PARENTWINDOW "ParentWindow"
#define TABWINDOW_PROPNAME_ASCII_TOPWINDOW "TopWindow"
@ -248,15 +238,12 @@ namespace framework{
#define TABWINDOWSERVICE_PROPHANDLE_WINDOW 0
#define TABWINDOWSERVICE_PROPCOUNT 1
/** provides some helper methods to implement property sets. */
class PropHelper
{
public:
/** checks if given property will be changed by this settings.
* We compare the content of the given any values. If they are different we return sal_True - sal_False otherwise.
*

4
framework/inc/protocols.h
View File

@ -26,7 +26,6 @@
namespace framework{
/**
some protocols must be checked during loading or dispatching URLs manually
It can be necessary to decide, if a URL represent a non visible content or
@ -58,7 +57,6 @@ class ProtocolCheck
{
public:
/**
enums for well known protocols
*/
@ -77,7 +75,6 @@ class ProtocolCheck
E_NEWS
};
/**
it checks, if the given URL string match one of the well known protocols.
It returns the right enum value.
@ -120,7 +117,6 @@ class ProtocolCheck
return E_UNKNOWN_PROTOCOL;
}
/**
it checks if given URL match the required protocol only
It should be used instead of specifyProtocol() if only this question

11
framework/inc/queries.h
View File

@ -89,7 +89,6 @@ class QueryBuilder
resetAll();
}
// returns full query as copy of internal set values
OUString getQuery()
@ -99,7 +98,6 @@ class QueryBuilder
return sCopy.makeStringAndClear();
}
// set new or change existing base query part
void setBase( const OUString& sBase )
@ -107,7 +105,6 @@ class QueryBuilder
m_sBase = sBase;
}
// add new parameter (with optional value) to param list
void addParam( const OUString& sParam, const OUString& sValue = OUString() )
@ -121,7 +118,6 @@ class QueryBuilder
}
}
// forget all setted params and start with empty ones
// Attention: base of query isn't changed!
@ -131,7 +127,6 @@ class QueryBuilder
m_sParams.ensureCapacity( 256 );
}
// start with new empty query
void resetAll()
@ -153,7 +148,6 @@ class QueryAnalyzer
{
public:
// it's will not perform to compare strings as query type ...
// so we convert it into these enum values.
// default = E_ALL!
@ -172,7 +166,6 @@ class QueryAnalyzer
E_GRAPHICS
};
// these are valid values for param "sort_prop".
// other ones are not supported!
// default = E_NAME
@ -183,7 +176,6 @@ class QueryAnalyzer
E_UINAME
};
// analyze given query and split it into his different parts; <base>:<param1>:<param2=value>...
QueryAnalyzer(const OUString& sQuery)
@ -320,13 +312,11 @@ class QueryAnalyzer
}
}
// return type of query. User can decide then, which action should be started.
// For faster work we converted query string into corresponding enum value!
EQuery getQueryType() const { return m_eQuery; }
// access to additional parameter values
// Methods return default of really set values!
@ -338,7 +328,6 @@ class QueryAnalyzer
sal_Bool getUseOrder () const { return m_bUseOrder ; }
sal_Bool getDefaultFirst () const { return m_bDefaultFirst ; }
// this method checks if given string match any supported query.
// (ignore additional parameters!)

5
framework/inc/recording/dispatchrecordersupplier.hxx
View File

@ -53,7 +53,6 @@ class DispatchRecorderSupplier : public ::cppu::WeakImplHelper2<
private:
/** provided dispatch recorder of this supplier instance
@life Is controled from outside. Because this variable is setted
@ -62,17 +61,14 @@ class DispatchRecorderSupplier : public ::cppu::WeakImplHelper2<
*/
css::uno::Reference< css::frame::XDispatchRecorder > m_xDispatchRecorder;
// uno interface
public:
// XInterface, XTypeProvider, XServiceInfo
DECLARE_XSERVICEINFO
// XDispatchRecorderSupplier
virtual void SAL_CALL setDispatchRecorder( const css::uno::Reference< css::frame::XDispatchRecorder >& xRecorder ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@ -81,7 +77,6 @@ class DispatchRecorderSupplier : public ::cppu::WeakImplHelper2<
const css::uno::Sequence< css::beans::PropertyValue >& lArguments ,
const css::uno::Reference< css::frame::XDispatch >& xDispatcher ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// native interface
public:

4
framework/inc/services.h
View File

@ -24,10 +24,8 @@
namespace framework{
// used servicenames by framework
#define SERVICENAME_FILTERFACTORY DECLARE_ASCII("com.sun.star.document.FilterFactory" )
#define SERVICENAME_CFGUPDATEACCESS DECLARE_ASCII("com.sun.star.configuration.ConfigurationUpdateAccess") // provides read/write access to the configuration
#define SERVICENAME_CFGREADACCESS DECLARE_ASCII("com.sun.star.configuration.ConfigurationAccess" ) // provides readonly access to the configuration
@ -47,10 +45,8 @@ namespace framework{
#define SERVICENAME_STRINGABBREVIATION DECLARE_ASCII("com.sun.star.util.UriAbbreviation" )
#define SERVICENAME_TABWINDOWSERVICE DECLARE_ASCII("com.sun.star.ui.dialogs.TabContainerWindow" )
// used implementationnames by framework
#define IMPLEMENTATIONNAME_DESKTOP DECLARE_ASCII("com.sun.star.comp.framework.Desktop" )
#define IMPLEMENTATIONNAME_URLTRANSFORMER DECLARE_ASCII("com.sun.star.comp.framework.URLTransformer" )
#define IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER DECLARE_ASCII("com.sun.star.comp.framework.MediaTypeDetectionHelper")

15
framework/inc/services/desktop.hxx
View File

@ -104,7 +104,6 @@ class Desktop : private cppu::BaseMutex,
// internal used types, const etcpp.
private:
/** used temporary to know which listener was already called or not. */
typedef ::std::vector< css::uno::Reference< css::frame::XTerminateListener > > TTerminateListenerList;
@ -137,7 +136,6 @@ class Desktop : private cppu::BaseMutex,
// XTypeProvider
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/**
@interface XDesktop
@ -169,7 +167,6 @@ class Desktop : private cppu::BaseMutex,
virtual sal_Bool SAL_CALL terminate()
throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**
@interface XDesktop
@ -192,7 +189,6 @@ class Desktop : private cppu::BaseMutex,
virtual void SAL_CALL addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener )
throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
/**
@interface XDesktop
@ -322,7 +318,6 @@ class Desktop : private cppu::BaseMutex,
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper ( ) SAL_OVERRIDE;
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo ( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// private methods
private:
@ -330,7 +325,6 @@ class Desktop : private cppu::BaseMutex,
css::uno::Reference< css::lang::XComponent > impl_getFrameComponent ( const css::uno::Reference< css::frame::XFrame >& xFrame ) const;
static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor( );
/** calls queryTermination() on every registered termination listener.
*
* Note: Only normal termination listener (registered in list m_aListenerContainer
@ -351,7 +345,6 @@ class Desktop : private cppu::BaseMutex,
void impl_sendQueryTerminationEvent(TTerminateListenerList& lCalledListener,
sal_Bool& bVeto );
/** calls cancelTermination() on every termination listener
* where queryTermination() was called before.
*
@ -367,7 +360,6 @@ class Desktop : private cppu::BaseMutex,
*/
void impl_sendCancelTerminationEvent(const TTerminateListenerList& lCalledListener);
/** calls notifyTermination() on every registered termination listener.
*
* Note: Only normal termination listener (registered in list m_aListenerContainer
@ -376,7 +368,6 @@ class Desktop : private cppu::BaseMutex,
*/
void impl_sendNotifyTerminationEvent();
/** try to close all open frames.
*
* Iterates over all child frames and try to close them.
@ -394,7 +385,6 @@ class Desktop : private cppu::BaseMutex,
*/
sal_Bool impl_closeFrames(sal_Bool bAllowUI);
// debug methods
// (should be private everytime!)
@ -406,7 +396,6 @@ class Desktop : private cppu::BaseMutex,
sal_Bool m_bIsTerminated ; /// check flag to protect us against dispose before terminate!
/// see dispose() for further information!
// variables
// (should be private everytime!)
@ -426,13 +415,11 @@ class Desktop : private cppu::BaseMutex,
OUString m_sTitle ;
css::uno::Reference< css::frame::XDispatchRecorderSupplier > m_xDispatchRecorderSupplier ;
/** special terminate listener to close pipe and block external requests
* during/after termination process is/was running
*/
css::uno::Reference< css::frame::XTerminateListener > m_xPipeTerminator;
/** special terminate listener shown inside system tray (quick starter)
* Will hinder the office on shutdown ... but wish to allow closing
* of open documents. And because thats different to a normal terminate listener
@ -440,7 +427,6 @@ class Desktop : private cppu::BaseMutex,
*/
css::uno::Reference< css::frame::XTerminateListener > m_xQuickLauncher;
/** special terminate listener which loads images asynchronous for current open documents.
* Because internally it uses blocking system APIs ... it cant be guaranteed that
* running jobs can be cancelled successfully if the corressponding document will be closed ...
@ -450,7 +436,6 @@ class Desktop : private cppu::BaseMutex,
*/
css::uno::Reference< css::frame::XTerminateListener > m_xSWThreadManager;
/** special terminate listener shuting down the SfxApplication.
* Because these desktop instance closes documents and informs listener
* only ... it does not really shutdown the whole application.

7
framework/inc/services/dispatchhelper.hxx
View File

@ -48,7 +48,6 @@ namespace framework{
class DispatchHelper : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo,::com::sun::star::frame::XDispatchHelper,::com::sun::star::frame::XDispatchResultListener >
{
// member
private:
@ -66,23 +65,19 @@ class DispatchHelper : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::X
css::uno::Reference< css::uno::XInterface > m_xBroadcaster;
// interface
public:
// ctor/dtor
DispatchHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~DispatchHelper( );
// XInterface, XTypeProvider, XServiceInfo
DECLARE_XSERVICEINFO
// XDispatchHelper
virtual css::uno::Any SAL_CALL executeDispatch(
const css::uno::Reference< css::frame::XDispatchProvider >& xDispatchProvider ,
@ -92,13 +87,11 @@ class DispatchHelper : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::X
const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDispatchResultListener
virtual void SAL_CALL dispatchFinished(
const css::frame::DispatchResultEvent& aResult )
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEventListener
virtual void SAL_CALL disposing(
const css::lang::EventObject& aEvent )

9
framework/inc/services/layoutmanager.hxx
View File

@ -107,7 +107,6 @@ namespace framework
return aSeq;
}
// XLayoutManager
virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@ -147,7 +146,6 @@ namespace framework
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeMergedMenuBar( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XWindowListener
virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
@ -161,7 +159,6 @@ namespace framework
using cppu::OPropertySetHelper::disposing;
virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XUIConfigurationListener
virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@ -174,7 +171,6 @@ namespace framework
DECL_LINK(MenuBarClose, void *);
DECL_LINK( WindowEventListener, VclSimpleEvent* );
// ILayoutNotifications
virtual void requestLayout( Hint eHint ) SAL_OVERRIDE;
@ -192,8 +188,6 @@ namespace framework
// helper
// menu bar
void impl_clearUpMenuBar();
@ -201,13 +195,11 @@ namespace framework
void implts_updateMenuBarClose();
sal_Bool implts_resetMenuBar();
// locking
void implts_lock();
sal_Bool implts_unlock();
// query
::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_findElement( const OUString& aName );
@ -266,7 +258,6 @@ namespace framework
DECL_LINK( OptionsChanged, void* );
DECL_LINK( SettingsChanged, void* );
// OPropertySetHelper
virtual sal_Bool SAL_CALL convertFastPropertyValue ( com::sun::star::uno::Any& aConvertedValue ,

10
framework/inc/services/mediatypedetectionhelper.hxx
View File

@ -32,7 +32,6 @@
// namespaces
namespace framework{
/*-************************************************************************************************************
@ -53,13 +52,10 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun::
// public methods
public:
// constructor / destructor
/*-****************************************************************************************************
@short standard ctor
@descr These initialize a new instance of this class with all needed information for work.
@ -88,16 +84,12 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun::
virtual ~MediaTypeDetectionHelper();
// XInterface, XTypeProvider, XServiceInfo
DECLARE_XSERVICEINFO
// XStringMapping
/*-****************************************************************************************************
@short -
@descr -
@ -113,11 +105,9 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun::
virtual sal_Bool SAL_CALL mapStrings(css::uno::Sequence< OUString >& seqParameter)
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// variables
// should be private every time
private:
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; /// reference to global servicemanager

12
framework/inc/stdtypes.h
View File

@ -79,8 +79,6 @@ struct KeyEventEqualsFunc
}
};
/**
Basic string list based on a std::vector()
It implements some additional funtionality which can be useful but
@ -114,8 +112,6 @@ class OUStringList : public ::comphelper::SequenceAsVector< OUString >
}
};
/**
Basic string queue based on a std::queue()
It implements some additional funtionality which can be useful but
@ -123,8 +119,6 @@ class OUStringList : public ::comphelper::SequenceAsVector< OUString >
*/
typedef ::std::queue< OUString > OUStringQueue;
/**
Basic hash based on a boost::unordered_map() which provides key=[OUString] and value=[template type] pairs
It implements some additional funtionality which can be useful but
@ -145,16 +139,12 @@ class BaseHash : public ::boost::unordered_map< OUString ,
}
};
/**
Basic OUString hash.
Key and values are OUStrings.
*/
typedef BaseHash< OUString > OUStringHashMap;
/**
It can be used to map names (e.g. of properties) to her corresponding handles.
Our helper class OPropertySetHelper works optimized with handles but sometimes we have only a property name.
@ -162,8 +152,6 @@ typedef BaseHash< OUString > OUStringHashMap;
*/
typedef BaseHash< sal_Int32 > NameToHandleHash;
/**
Sometimes we need this template to implement listener container ...
and we need it at different positions ...

2
framework/inc/tabwin/tabwindow.hxx
View File

@ -72,7 +72,6 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider ,
using ::cppu::OPropertySetHelper::disposing;
using ::cppu::OPropertySetHelper::getFastPropertyValue;
// XInitialization
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@ -91,7 +90,6 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider ,
virtual void SAL_CALL addTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;

2
framework/inc/targets.h
View File

@ -24,10 +24,8 @@
namespace framework{
// Values for special frame search ... sTargetFrameName of findFrame() or queryDispatch() or loadComponentFromURL()
#define SPECIALTARGET_ASCII_SELF "_self" // The frame himself is searched.
#define SPECIALTARGET_ASCII_PARENT "_parent" // The direct parent frame is searched.
#define SPECIALTARGET_ASCII_TOP "_top" // Search at ouer parents for the first task (if any exist) or a frame without a parent.

1
framework/inc/threadhelp/gate.hxx
View File

@ -199,7 +199,6 @@ class Gate : public IGate
return bSuccessful;
}
// private member
private:

2
framework/inc/threadhelp/transactionguard.hxx
View File

@ -122,7 +122,6 @@ class TransactionGuard : private boost::noncopyable
}
}
// private methods
private:
@ -141,7 +140,6 @@ class TransactionGuard : private boost::noncopyable
*//*-*****************************************************************************************************/
TransactionGuard();
// private member
private:

2
framework/inc/threadhelp/transactionmanager.hxx
View File

@ -63,14 +63,12 @@ class FWI_DLLPUBLIC TransactionManager : public ITransactionManager
virtual void registerTransaction ( EExceptionMode eMode, ERejectReason& eReason ) throw( css::uno::RuntimeException, css::lang::DisposedException ) SAL_OVERRIDE;
virtual void unregisterTransaction ( ) throw( css::uno::RuntimeException, css::lang::DisposedException ) SAL_OVERRIDE;
// private methods
private:
void impl_throwExceptions( EExceptionMode eMode, ERejectReason eReason ) const throw( css::uno::RuntimeException, css::lang::DisposedException );
// private member
private:

1
framework/inc/uiconfiguration/imagemanager.hxx
View File

@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGEMANAGER_HXX
#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGEMANAGER_HXX
#include <boost/unordered_map.hpp>
#include <memory>

1
framework/inc/uiconfiguration/moduleimagemanager.hxx
View File

@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX
#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX
/** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
with solaris headers ...
*/

1
framework/inc/uielement/itemcontainer.hxx
View File

@ -48,7 +48,6 @@ class FWI_DLLPUBLIC ItemContainer : public ::cppu::WeakImplHelper1< ::com::sun
ItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemAccessContainer, const ShareableMutex& rMutex );
virtual ~ItemContainer();
// XInterface, XTypeProvider
// XUnoTunnel

2
framework/inc/uielement/menubarmanager.hxx
View File

@ -170,8 +170,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
private:
void Destroy();
struct MenuItemHandler

1
framework/inc/uielement/menubarwrapper.hxx
View File

@ -43,7 +43,6 @@ class MenuBarWrapper : public UIConfigElementWrapperBase,
const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext );
virtual ~MenuBarWrapper();
// XInterface, XTypeProvider
FWK_DECLARE_XINTERFACE

1
framework/inc/uielement/progressbarwrapper.hxx
View File

@ -66,7 +66,6 @@ class ProgressBarWrapper : public UIElementWrapperBase
// XUIElement
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// variables
// (should be private everyway!)

1
framework/inc/uielement/rootitemcontainer.hxx
View File

@ -61,7 +61,6 @@ class RootItemContainer : private cppu::BaseMutex,
FWI_DLLPUBLIC RootItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemAccessContainer );
virtual FWI_DLLPUBLIC ~RootItemContainer();
// XInterface
virtual void SAL_CALL acquire() throw () SAL_OVERRIDE
{ OWeakObject::acquire(); }

1
framework/inc/uielement/statusindicatorinterfacewrapper.hxx
View File

@ -42,7 +42,6 @@ class StatusIndicatorInterfaceWrapper : public ::cppu::WeakImplHelper1< ::com:
StatusIndicatorInterfaceWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rStatusIndicatorImpl );
virtual ~StatusIndicatorInterfaceWrapper();
// XStatusIndicator
virtual void SAL_CALL start ( const OUString& sText ,

1
framework/inc/uielement/toolbarwrapper.hxx
View File

@ -66,7 +66,6 @@ class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener,
using cppu::OPropertySetHelper::disposing;
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// protected methods
protected:

3
framework/inc/uifactory/factoryconfiguration.hxx
View File

@ -34,14 +34,11 @@
#include <cppuhelper/implbase1.hxx>
#include <rtl/ustring.hxx>
// Namespace
namespace framework
{
// Configuration access class for PopupMenuControllerFactory implementation
class ConfigurationAccess_ControllerFactory : // interfaces

18
framework/inc/xml/acceleratorconfigurationreader.hxx
View File

@ -42,7 +42,6 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml:
private:
/** @short classification of XML elements. */
enum EXMLElement
{
@ -50,7 +49,6 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml:
E_ELEMENT_ITEM
};
/** @short classification of XML attributes. */
enum EXMLAttribute
{
@ -62,7 +60,6 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml:
E_ATTRIBUTE_URL
};
/** @short some namespace defines */
enum EAcceleratorXMLNamespace
{
@ -70,31 +67,25 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml:
E_NAMESPACE_XLINK
};
// member
private:
/** @short needed to read the xml configuration. */
css::uno::Reference< css::xml::sax::XDocumentHandler > m_xReader;
/** @short reference to the outside container, where this
reader/writer must work on. */
AcceleratorCache& m_rContainer;
/** @short used to detect if an accelerator list
occurs recursive inside xml. */
sal_Bool m_bInsideAcceleratorList;
/** @short used to detect if an accelerator item
occurs recursive inside xml. */
sal_Bool m_bInsideAcceleratorItem;
/** @short is used to map key codes to its
string representation.
@ -103,7 +94,6 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml:
alive forever ...*/
::salhelper::SingletonRef< KeyMapping > m_rKeyMapping;
/** @short provide information about the parsing state.
@descr We use it to find out the line and column, where
@ -111,12 +101,10 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml:
*/
css::uno::Reference< css::xml::sax::XLocator > m_xLocator;
// interface
public:
/** @short connect this new reader/writer instance
to an outside container, which should be used
flushed to the underlying XML configuration or
@ -127,11 +115,9 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml:
*/
AcceleratorConfigurationReader(AcceleratorCache& rContainer);
/** @short does nothing real ... */
virtual ~AcceleratorConfigurationReader();
// XDocumentHandler
virtual void SAL_CALL startDocument()
throw(css::xml::sax::SAXException,
@ -167,20 +153,16 @@ class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml:
throw(css::xml::sax::SAXException,
css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// helper
private:
/** TODO document me */
static EXMLElement implst_classifyElement(const OUString& sElement);
/** TODO document me */
static EXMLAttribute implst_classifyAttribute(const OUString& sAttribute);
/** TODO document me */
OUString implts_getErrorLineString();
};

9
framework/inc/xml/acceleratorconfigurationwriter.hxx
View File

@ -38,16 +38,13 @@ class AcceleratorConfigurationWriter
private:
/** @short needed to write the xml configuration. */
css::uno::Reference< css::xml::sax::XDocumentHandler > m_xConfig;
/** @short reference to the outside container, where this
writer must work on. */
const AcceleratorCache& m_rContainer;
/** @short is used to map key codes to its
string representation.
@ -56,12 +53,10 @@ class AcceleratorConfigurationWriter
alive forever ...*/
::salhelper::SingletonRef< KeyMapping > m_rKeyMapping;
// interface
public:
/** @short connect this new writer instance
to an outside container, which should be
flushed to the underlying XML configuration.
@ -75,20 +70,16 @@ class AcceleratorConfigurationWriter
AcceleratorConfigurationWriter(const AcceleratorCache& rContainer,
const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig );
/** @short does nothing real ... */
virtual ~AcceleratorConfigurationWriter();
/** @short TODO */
virtual void flush();
// helper
private:
/** @short TODO */
void impl_ts_writeKeyCommandPair(const css::awt::KeyEvent& aKey ,
const OUString& sCommand,

1
framework/inc/xml/imagesdocumenthandler.hxx
View File

@ -33,7 +33,6 @@
namespace framework{
// Hash code function for using in all hash maps of follow implementation.
class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >

5
framework/inc/xml/menudocumenthandler.hxx
View File

@ -96,7 +96,6 @@ class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase :
::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > m_aItemProp;
};
class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBase
{
public:
@ -134,7 +133,6 @@ class FWE_DLLPUBLIC OReadMenuDocumentHandler : public ReadMenuDocumentHandlerBas
com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory;
}; // OReadMenuDocumentHandler
class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
{
public:
@ -173,7 +171,6 @@ class FWE_DLLPUBLIC OReadMenuBarHandler : public ReadMenuDocumentHandlerBase
com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory;
}; // OReadMenuBarHandler
class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase
{
public:
@ -211,7 +208,6 @@ class FWE_DLLPUBLIC OReadMenuHandler : public ReadMenuDocumentHandlerBase
com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > m_xContainerFactory;
}; // OReadMenuHandler
class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
{
public:
@ -254,7 +250,6 @@ class FWE_DLLPUBLIC OReadMenuPopupHandler : public ReadMenuDocumentHandlerBase
NextElementClose m_nNextElementExpected;
}; // OReadMenuPopupHandler
class FWE_DLLPUBLIC OWriteMenuDocumentHandler
{
public:

1
framework/inc/xml/statusbardocumenthandler.hxx
View File

@ -33,7 +33,6 @@
namespace framework{
// Hash code function for using in all hash maps of follow implementation.
class FWE_DLLPUBLIC OReadStatusBarDocumentHandler :

2
framework/inc/xml/toolboxdocumenthandler.hxx
View File

@ -32,7 +32,6 @@
namespace framework{
// Hash code function for using in all hash maps of follow implementation.
class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
@ -150,7 +149,6 @@ class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
OUString m_aCommandURL;
};
class FWE_DLLPUBLIC OWriteToolBoxDocumentHandler
{
public:

13
framework/source/accelerators/acceleratorcache.cxx
View File

@ -30,26 +30,22 @@
namespace framework
{
AcceleratorCache::AcceleratorCache()
{
}
AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy)
{
m_lCommand2Keys = rCopy.m_lCommand2Keys;
m_lKey2Commands = rCopy.m_lKey2Commands;
}
AcceleratorCache::~AcceleratorCache()
{
// Dont save anything automaticly here.
// The user has to do that explicitly!
}
void AcceleratorCache::takeOver(const AcceleratorCache& rCopy)
{
SolarMutexGuard g;
@ -57,28 +53,24 @@ void AcceleratorCache::takeOver(const AcceleratorCache& rCopy)
m_lKey2Commands = rCopy.m_lKey2Commands;
}
AcceleratorCache& AcceleratorCache::operator=(const AcceleratorCache& rCopy)
{
takeOver(rCopy);
return *this;
}
sal_Bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const
{
SolarMutexGuard g;
return (m_lKey2Commands.find(aKey) != m_lKey2Commands.end());
}
sal_Bool AcceleratorCache::hasCommand(const OUString& sCommand) const
{
SolarMutexGuard g;
return (m_lCommand2Keys.find(sCommand) != m_lCommand2Keys.end());
}
AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const
{
SolarMutexGuard g;
@ -97,7 +89,6 @@ AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const
return lKeys;
}
void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey ,
const OUString& sCommand)
{
@ -111,7 +102,6 @@ void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey ,
rKeyList.push_back(aKey);
}
AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const OUString& sCommand) const
{
SolarMutexGuard g;
@ -122,7 +112,6 @@ AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const OUString& sC
return pCommand->second;
}
OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const
{
SolarMutexGuard g;
@ -133,7 +122,6 @@ OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const
return pKey->second;
}
void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey)
{
SolarMutexGuard g;
@ -156,7 +144,6 @@ void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey)
m_lCommand2Keys.erase(sCommand);
}
void AcceleratorCache::removeCommand(const OUString& sCommand)
{
SolarMutexGuard g;

61
framework/source/accelerators/acceleratorconfiguration.cxx
View File

@ -70,7 +70,6 @@ namespace framework
return sKeyBuffer.makeStringAndClear();
}
XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext)
: m_xContext (xContext )
, m_aPresetHandler(xContext )
@ -78,13 +77,11 @@ XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::un
{
}
XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration()
{
SAL_WARN_IF(m_pWriteCache, "fwk", "XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration(): Changes not flushed. Ignore it ...");
}
css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getAllKeyEvents()
throw(css::uno::RuntimeException, std::exception)
{
@ -94,7 +91,6 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
return lKeys.getAsConstList();
}
OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
throw(css::container::NoSuchElementException,
css::uno::RuntimeException, std::exception )
@ -108,7 +104,6 @@ OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const c
return rCache.getCommandByKey(aKeyEvent);
}
void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
const OUString& sCommand )
throw(css::lang::IllegalArgumentException,
@ -136,7 +131,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
rCache.setKeyCommandPair(aKeyEvent, sCommand);
}
void SAL_CALL XMLBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
throw(css::container::NoSuchElementException,
css::uno::RuntimeException, std::exception )
@ -150,7 +144,6 @@ throw(css::container::NoSuchElementException,
rCache.removeKey(aKeyEvent);
}
css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand)
throw(css::lang::IllegalArgumentException ,
css::container::NoSuchElementException,
@ -173,7 +166,6 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
return lKeys.getAsConstList();
}
css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
throw(css::lang::IllegalArgumentException ,
css::uno::RuntimeException, std::exception )
@ -208,7 +200,6 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g
return lPreferredOnes;
}
void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand)
throw(css::lang::IllegalArgumentException ,
css::container::NoSuchElementException,
@ -229,7 +220,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
rCache.removeCommand(sCommand);
}
void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
throw(css::uno::Exception ,
css::uno::RuntimeException, std::exception)
@ -272,7 +262,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
}
}
void SAL_CALL XMLBasedAcceleratorConfiguration::store()
throw(css::uno::Exception ,
css::uno::RuntimeException, std::exception)
@ -300,7 +289,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
m_aPresetHandler.commitUserChanges();
}
void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
throw(css::uno::Exception ,
css::uno::RuntimeException, std::exception)
@ -324,7 +312,6 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
// TODO inform listener about success, so it can flush the root and sub storage of this stream!
}
sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isModified()
throw(css::uno::RuntimeException, std::exception)
{
@ -332,7 +319,6 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isModified()
return (m_pWriteCache != 0);
}
sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly()
throw(css::uno::RuntimeException, std::exception)
{
@ -348,14 +334,12 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly()
return !(xOut.is());
}
void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/)
throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)");
}
sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::hasStorage()
throw(css::uno::RuntimeException, std::exception)
{
@ -363,21 +347,18 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::hasStorage()
return sal_False;
}
void SAL_CALL XMLBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::addConfigurationListener(): implement me");
}
void SAL_CALL XMLBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::removeConfigurationListener(): implement me");
}
void SAL_CALL XMLBasedAcceleratorConfiguration::reset()
throw(css::uno::RuntimeException, std::exception)
{
@ -389,28 +370,24 @@ throw(css::uno::RuntimeException, std::exception)
reload();
}
void SAL_CALL XMLBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::addResetListener(): implement me");
}
void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::removeResetListener(): implement me");
}
// IStorageListener
void XMLBasedAcceleratorConfiguration::changesOccurred(const OUString& /*sPath*/)
{
reload();
}
void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< css::io::XInputStream >& xStream)
{
css::uno::Reference< css::uno::XComponentContext > xContext;
@ -452,7 +429,6 @@ void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< c
xParser->parseStream(aSource);
}
void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< css::io::XOutputStream >& xStream)
{
sal_Bool bChanged;
@ -498,7 +474,6 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c
}
}
AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteAccessRequested)
{
SolarMutexGuard g;
@ -521,7 +496,6 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA
return m_aReadCache;
}
OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
{
OUString sISOLocale = officecfg::Setup::L10N::ooLocale::get();
@ -537,7 +511,6 @@ OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
*
*******************************************************************************/
XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext)
: m_xContext (xContext )
, m_pPrimaryWriteCache(0 )
@ -549,12 +522,10 @@ XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::un
css::uno::UNO_QUERY );
}
XCUBasedAcceleratorConfiguration::~XCUBasedAcceleratorConfiguration()
{
}
css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getAllKeyEvents()
throw(css::uno::RuntimeException, std::exception)
{
@ -572,7 +543,6 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
return lKeys.getAsConstList();
}
OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
throw(css::container::NoSuchElementException,
css::uno::RuntimeException, std::exception )
@ -593,7 +563,6 @@ OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const c
return rSecondaryCache.getCommandByKey(aKeyEvent);
}
void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
const OUString& sCommand )
throw(css::lang::IllegalArgumentException,
@ -676,7 +645,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
}
}
void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
throw(css::container::NoSuchElementException,
css::uno::RuntimeException, std::exception )
@ -716,7 +684,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K
}
}
css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand)
throw(css::lang::IllegalArgumentException ,
css::container::NoSuchElementException,
@ -748,7 +715,6 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
return lKeys.getAsConstList();
}
AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const AcceleratorCache::TKeyList& lKeys)
{
AcceleratorCache::TKeyList::const_iterator pIt;
@ -767,7 +733,6 @@ AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const Accelerator
return lKeys.end();
}
css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
throw(css::lang::IllegalArgumentException ,
css::uno::RuntimeException, std::exception )
@ -806,7 +771,6 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g
return lPreferredOnes;
}
void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand)
throw(css::lang::IllegalArgumentException ,
css::container::NoSuchElementException,
@ -834,7 +798,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
rSecondaryCache.removeCommand(sCommand);
}
void SAL_CALL XCUBasedAcceleratorConfiguration::reload()
throw(css::uno::Exception ,
css::uno::RuntimeException, std::exception)
@ -871,7 +834,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload()
impl_ts_load(bPreferred, xAccess); // load the secondary keys
}
void SAL_CALL XCUBasedAcceleratorConfiguration::store()
throw(css::uno::Exception ,
css::uno::RuntimeException, std::exception)
@ -896,7 +858,6 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::store()
impl_ts_save(bPreferred, xAccess);
}
void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
throw(css::uno::Exception ,
css::uno::RuntimeException, std::exception)
@ -961,28 +922,24 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
aWriter.flush();
}
sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isModified()
throw(css::uno::RuntimeException, std::exception)
{
return sal_False;
}
sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isReadOnly()
throw(css::uno::RuntimeException, std::exception)
{
return sal_False;
}
void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/)
throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)");
}
sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage()
throw(css::uno::RuntimeException, std::exception)
{
@ -990,21 +947,18 @@ sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage()
return sal_False;
}
void SAL_CALL XCUBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::addConfigurationListener(): implement me");
}
void SAL_CALL XCUBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::removeConfigurationListener(): implement me");
}
void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
throw(css::uno::RuntimeException, std::exception)
{
@ -1026,21 +980,18 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
}
}
void SAL_CALL XCUBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::addResetListener(): implement me");
}
void SAL_CALL XCUBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
throw(css::uno::RuntimeException, std::exception)
{
SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::removeResetListener(): implement me");
}
void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util::ChangesEvent& aEvent)
throw(css::uno::RuntimeException, std::exception)
{
@ -1092,34 +1043,29 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util:
}
}
void SAL_CALL XCUBasedAcceleratorConfiguration::disposing(const css::lang::EventObject& /*aSource*/)
throw(css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL XCUBasedAcceleratorConfiguration::dispose()
throw(css::uno::RuntimeException, std::exception)
{
// nop
}
void SAL_CALL XCUBasedAcceleratorConfiguration::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& /*xListener*/ )
throw(css::uno::RuntimeException, std::exception)
{
// nop
}
void SAL_CALL XCUBasedAcceleratorConfiguration::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& /*xListener*/ )
throw(css::uno::RuntimeException, std::exception)
{
// nop
}
void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg )
{
AcceleratorCache aReadCache = AcceleratorCache();
@ -1228,7 +1174,6 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
m_aSecondaryReadCache.takeOver(aReadCache);
}
void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& /*xCfg*/)
{
if (bPreferred)
@ -1281,7 +1226,6 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c
removeKeyFromConfiguration(*pIt, sal_False);
}
for ( pIt = lSecondaryWriteKeys.begin(); pIt != lSecondaryWriteKeys.end(); ++pIt )
{
OUString sCommand = m_pSecondaryWriteCache->getCommandByKey(*pIt);
@ -1311,7 +1255,6 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const sal_Bool bPreferred )
{
css::uno::Reference< css::container::XNameAccess > xAccess;
@ -1358,7 +1301,6 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt:
xCommand->replaceByName(sLocale, css::uno::makeAny(sCommand));
}
void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::awt::KeyEvent& aKeyEvent, const sal_Bool bPreferred )
{
css::uno::Reference< css::container::XNameAccess > xAccess;
@ -1384,7 +1326,6 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw
xContainer->removeByName(sKey);
}
void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySecondary, const OUString& sGlobalModules, const OUString& sModule, const OUString& sKey )
{
css::uno::Reference< css::container::XNameAccess > xAccess;
@ -1455,7 +1396,6 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySe
}
}
AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPreferred, sal_Bool bWriteAccessRequested)
{
SolarMutexGuard g;
@ -1501,7 +1441,6 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer
}
}
OUString XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const
{
OUString sISOLocale = officecfg::Setup::L10N::ooLocale::get();

7
framework/source/accelerators/documentacceleratorconfiguration.cxx
View File

@ -54,7 +54,6 @@ class DocumentAcceleratorConfiguration : public DocumentAcceleratorConfiguration
{
private:
/** points to the root storage of the outside document,
where we can read/save our configuration data. */
css::uno::Reference< css::embed::XStorage > m_xDocumentRoot;
@ -109,7 +108,6 @@ private:
void impl_ts_clearCache();
};
DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration(
const css::uno::Reference< css::uno::XComponentContext >& xContext,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lArguments)
@ -134,13 +132,11 @@ DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration(
impl_ts_fillCache();
}
DocumentAcceleratorConfiguration::~DocumentAcceleratorConfiguration()
{
m_aPresetHandler.removeStorageListener(this);
}
void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
throw(css::uno::RuntimeException, std::exception)
{
@ -160,7 +156,6 @@ void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Refer
impl_ts_fillCache();
}
sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage()
throw(css::uno::RuntimeException, std::exception)
{
@ -168,7 +163,6 @@ sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage()
return m_xDocumentRoot.is();
}
void DocumentAcceleratorConfiguration::impl_ts_fillCache()
{
css::uno::Reference< css::embed::XStorage > xDocumentRoot;
@ -209,7 +203,6 @@ void DocumentAcceleratorConfiguration::impl_ts_fillCache()
{}
}
void DocumentAcceleratorConfiguration::impl_ts_clearCache()
{
m_aPresetHandler.forgetCachedStorages();

2
framework/source/accelerators/globalacceleratorconfiguration.cxx
View File

@ -123,8 +123,6 @@ void GlobalAcceleratorConfiguration::fillCache()
{}
}
// XComponent.dispose(), #i120029#, to release the cyclic reference
void SAL_CALL GlobalAcceleratorConfiguration::dispose()

7
framework/source/accelerators/keymapping.cxx
View File

@ -23,11 +23,9 @@
#include <com/sun/star/awt/Key.hpp>
namespace framework
{
// helper
KeyMapping::KeyIdentifierInfo KeyMapping::KeyIdentifierMap[] =
@ -140,7 +138,6 @@ KeyMapping::KeyIdentifierInfo KeyMapping::KeyIdentifierMap[] =
{0 , "" } // mark the end of this array!
};
KeyMapping::KeyMapping()
{
sal_Int32 i = 0;
@ -156,12 +153,10 @@ KeyMapping::KeyMapping()
}
}
KeyMapping::~KeyMapping()
{
}
sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier)
throw(css::lang::IllegalArgumentException)
{
@ -181,7 +176,6 @@ sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier)
return (sal_uInt16)nCode;
}
OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode)
{
Code2IdentifierHash::const_iterator pIt = m_lCodeHash.find(nCode);
@ -192,7 +186,6 @@ OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode)
return OUString::number(nCode);
}
sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier,
sal_uInt16& rCode )
{

2
framework/source/accelerators/moduleacceleratorconfiguration.cxx
View File

@ -163,8 +163,6 @@ void ModuleAcceleratorConfiguration::fillCache()
{}
}
// XComponent.dispose(), #i120029#, to release the cyclic reference
void SAL_CALL ModuleAcceleratorConfiguration::dispose()

28
framework/source/accelerators/presethandler.cxx
View File

@ -39,7 +39,6 @@
#include <rtl/ustrbuf.hxx>
#include <i18nlangtag/languagetag.hxx>
static const ::sal_Int32 ID_CORRUPT_UICONFIG_SHARE = 1;
static const ::sal_Int32 ID_CORRUPT_UICONFIG_USER = 2;
static const ::sal_Int32 ID_CORRUPT_UICONFIG_GENERAL = 3;
@ -47,43 +46,36 @@ static const ::sal_Int32 ID_CORRUPT_UICONFIG_GENERAL = 3;
namespace framework
{
OUString PresetHandler::PRESET_DEFAULT()
{
return OUString("default");
}
OUString PresetHandler::TARGET_CURRENT()
{
return OUString("current");
}
OUString PresetHandler::RESOURCETYPE_MENUBAR()
{
return OUString("menubar");
}
OUString PresetHandler::RESOURCETYPE_TOOLBAR()
{
return OUString("toolbar");
}
OUString PresetHandler::RESOURCETYPE_ACCELERATOR()
{
return OUString("accelerator");
}
OUString PresetHandler::RESOURCETYPE_STATUSBAR()
{
return OUString("statusbar");
}
PresetHandler::PresetHandler(const css::uno::Reference< css::uno::XComponentContext >& xContext)
: m_xContext(xContext)
, m_eConfigType(E_GLOBAL)
@ -93,7 +85,6 @@ PresetHandler::PresetHandler(const css::uno::Reference< css::uno::XComponentCont
{
}
PresetHandler::PresetHandler(const PresetHandler& rCopy)
: m_aLanguageTag( rCopy.m_aLanguageTag)
{
@ -113,7 +104,6 @@ PresetHandler::PresetHandler(const PresetHandler& rCopy)
m_sRelPathUser = rCopy.m_sRelPathUser;
}
PresetHandler::~PresetHandler()
{
m_xWorkingStorageShare.clear();
@ -140,7 +130,6 @@ PresetHandler::~PresetHandler()
m_lDocumentStorages.forgetCachedStorages();
}
void PresetHandler::forgetCachedStorages()
{
SolarMutexGuard g;
@ -253,7 +242,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
return xStorage;
}
css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorageUser()
{
css::uno::Reference< css::embed::XStorage > xRoot = m_aSharedStorages->m_lStoragesUser.getRootStorage();
@ -301,21 +289,18 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
return xStorage;
}
css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageShare()
{
SolarMutexGuard g;
return m_xWorkingStorageShare;
}
css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageUser()
{
SolarMutexGuard g;
return m_xWorkingStorageUser;
}
css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageShare(const css::uno::Reference< css::embed::XStorage >& /*xChild*/)
{
css::uno::Reference< css::embed::XStorage > xWorking;
@ -327,7 +312,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageShare
return m_aSharedStorages->m_lStoragesShare.getParentStorage(xWorking);
}
css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser(const css::uno::Reference< css::embed::XStorage >& /*xChild*/)
{
css::uno::Reference< css::embed::XStorage > xWorking;
@ -339,7 +323,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser(
return m_aSharedStorages->m_lStoragesUser.getParentStorage(xWorking);
}
void PresetHandler::connectToResource( PresetHandler::EConfigType eConfigType ,
const OUString& sResource ,
const OUString& sModule ,
@ -540,7 +523,6 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType
}
}
void PresetHandler::copyPresetToTarget(const OUString& sPreset,
const OUString& sTarget)
{
@ -585,7 +567,6 @@ void PresetHandler::copyPresetToTarget(const OUString& sPreset,
commitUserChanges();
}
css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString& sPreset,
sal_Bool bUseNoLangGlobal)
{
@ -607,7 +588,6 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString
return xStream;
}
css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString& sTarget ,
sal_Bool bCreateIfMissing)
{
@ -648,7 +628,6 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString
return xStream;
}
void PresetHandler::commitUserChanges()
{
css::uno::Reference< css::embed::XStorage > xWorking;
@ -686,7 +665,6 @@ void PresetHandler::commitUserChanges()
}
}
void PresetHandler::addStorageListener(IStorageListener* pListener)
{
OUString sRelPath;
@ -717,7 +695,6 @@ void PresetHandler::addStorageListener(IStorageListener* pListener)
}
}
void PresetHandler::removeStorageListener(IStorageListener* pListener)
{
OUString sRelPath;
@ -748,7 +725,6 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener)
}
}
css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoringErrors(const OUString& sPath ,
sal_Int32 eMode ,
sal_Bool bShare)
@ -768,7 +744,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring
return xPath;
}
::std::vector< OUString >::const_iterator PresetHandler::impl_findMatchingLocalizedValue(
const ::std::vector< OUString >& lLocalizedValues,
OUString& rLanguageTag,
@ -799,7 +774,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring
return pFound;
}
css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPathIgnoringErrors(
OUString& sPath ,
sal_Int32 eMode ,
@ -839,7 +813,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat
return xLocalePath;
}
::std::vector< OUString > PresetHandler::impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder)
{
css::uno::Reference< css::container::XNameAccess > xAccess(xFolder, css::uno::UNO_QUERY);
@ -868,7 +841,6 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat
return lSubFolders;
}
} // namespace framework
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

23
framework/source/accelerators/storageholder.cxx
View File

@ -37,28 +37,23 @@
#include <com/sun/star/io/XSeekable.hpp>
#define PATH_SEPARATOR_ASCII "/"
#define PATH_SEPARATOR_UNICODE ((sal_Unicode)'/')
#define PATH_SEPARATOR OUString(PATH_SEPARATOR_ASCII)
namespace framework
{
StorageHolder::StorageHolder()
{
}
StorageHolder::~StorageHolder()
{
// TODO implement me
// dispose/clear etcpp.
}
void StorageHolder::forgetCachedStorages()
{
osl::MutexGuard g(m_mutex);
@ -74,21 +69,18 @@ void StorageHolder::forgetCachedStorages()
m_lStorages.clear();
}
void StorageHolder::setRootStorage(const css::uno::Reference< css::embed::XStorage >& xRoot)
{
osl::MutexGuard g(m_mutex);
m_xRoot = xRoot;
}
css::uno::Reference< css::embed::XStorage > StorageHolder::getRootStorage() const
{
osl::MutexGuard g(m_mutex);
return m_xRoot;
}
css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUString& sPath ,
sal_Int32 nOpenMode)
{
@ -173,7 +165,6 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri
return xChild;
}
StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sPath)
{
OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
@ -213,7 +204,6 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sP
return lStoragesOfPath;
}
void StorageHolder::commitPath(const OUString& sPath)
{
StorageHolder::TStorageList lStorages = getAllPathStorages(sPath);
@ -240,7 +230,6 @@ void StorageHolder::commitPath(const OUString& sPath)
xCommit->commit();
}
void StorageHolder::closePath(const OUString& rPath)
{
OUString sNormedPath = StorageHolder::impl_st_normPath(rPath);
@ -286,7 +275,6 @@ void StorageHolder::closePath(const OUString& rPath)
}
}
void StorageHolder::notifyPath(const OUString& sPath)
{
OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
@ -309,7 +297,6 @@ void StorageHolder::notifyPath(const OUString& sPath)
}
}
void StorageHolder::addStorageListener( IStorageListener* pListener,
const OUString& sPath )
{
@ -327,7 +314,6 @@ void StorageHolder::addStorageListener( IStorageListener* pListener,
rInfo.Listener.push_back(pListener);
}
void StorageHolder::removeStorageListener( IStorageListener* pListener,
const OUString& sPath )
{
@ -345,7 +331,6 @@ void StorageHolder::removeStorageListener( IStorageListener* pListener,
rInfo.Listener.erase(pIt2);
}
OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
{
osl::MutexGuard g(m_mutex);
@ -366,14 +351,12 @@ OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::
return pIt->first;
}
css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild)
{
OUString sChildPath = getPathOfStorage(xChild);
return getParentStorage(sChildPath);
}
css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const OUString& sChildPath)
{
// normed path = "a/b/c/" ... we search for "a/b/"
@ -417,7 +400,6 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons
return css::uno::Reference< css::embed::XStorage >();
}
void StorageHolder::operator=(const StorageHolder& rCopy)
{
osl::MutexGuard g(m_mutex);
@ -425,7 +407,6 @@ void StorageHolder::operator=(const StorageHolder& rCopy)
m_lStorages = rCopy.m_lStorages;
}
css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage ,
const OUString& sSubStorage ,
sal_Int32 eOpenMode ,
@ -465,7 +446,6 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal
return css::uno::Reference< css::embed::XStorage >();
}
css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage ,
const OUString& sSubStream ,
sal_Int32 eOpenMode ,
@ -505,7 +485,6 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback
return css::uno::Reference< css::io::XStream >();
}
OUString StorageHolder::impl_st_normPath(const OUString& sPath)
{
// path must start without "/" but end with "/"!
@ -527,7 +506,6 @@ OUString StorageHolder::impl_st_normPath(const OUString& sPath)
return sNormedPath;
}
OUStringList StorageHolder::impl_st_parsePath(const OUString& sPath)
{
OUStringList lToken;
@ -542,7 +520,6 @@ OUStringList StorageHolder::impl_st_parsePath(const OUString& sPath)
return lToken;
}
} // namespace framework
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

34
framework/source/classes/fwktabwindow.cxx
View File

@ -55,8 +55,6 @@ FwkTabControl::FwkTabControl( Window* pParent, const ResId& rResId ) :
{
}
void FwkTabControl::BroadcastEvent( sal_uLong nEvent )
{
if ( VCLEVENT_TABPAGE_ACTIVATE == nEvent || VCLEVENT_TABPAGE_DEACTIVATE == nEvent )
@ -83,16 +81,12 @@ FwkTabPage::FwkTabPage(
{
}
FwkTabPage::~FwkTabPage()
{
Hide();
DeactivatePage();
}
void FwkTabPage::CreateDialog()
{
try
@ -130,8 +124,6 @@ void FwkTabPage::CreateDialog()
}
}
sal_Bool FwkTabPage::CallMethod( const OUString& rMethod )
{
sal_Bool bRet = sal_False;
@ -149,8 +141,6 @@ sal_Bool FwkTabPage::CallMethod( const OUString& rMethod )
return bRet;
}
void FwkTabPage::ActivatePage()
{
TabPage::ActivatePage();
@ -165,8 +155,6 @@ void FwkTabPage::ActivatePage()
}
}
void FwkTabPage::DeactivatePage()
{
TabPage::DeactivatePage();
@ -175,8 +163,6 @@ void FwkTabPage::DeactivatePage()
m_xPage->setVisible( sal_False );
}
void FwkTabPage::Resize()
{
if ( m_xPage.is () )
@ -204,15 +190,11 @@ FwkTabWindow::FwkTabWindow( Window* pParent ) :
m_aTabCtrl.Show();
}
FwkTabWindow::~FwkTabWindow()
{
ClearEntryList();
}
void FwkTabWindow::ClearEntryList()
{
TabEntryList::const_iterator pIt;
@ -226,8 +208,6 @@ void FwkTabWindow::ClearEntryList()
m_TabList.clear();
}
bool FwkTabWindow::RemoveEntry( sal_Int32 nIndex )
{
TabEntryList::iterator pIt;
@ -249,7 +229,6 @@ bool FwkTabWindow::RemoveEntry( sal_Int32 nIndex )
return false;
}
TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const
{
TabEntry* pEntry = NULL;
@ -269,8 +248,6 @@ TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const
return pEntry;
}
IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl)
{
const sal_uInt16 nId = m_aTabCtrl.GetCurPageId();
@ -293,16 +270,12 @@ IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl)
return 1;
}
IMPL_LINK_NOARG(FwkTabWindow, DeactivatePageHdl)
{
m_aTabCtrl.BroadcastEvent( VCLEVENT_TABPAGE_DEACTIVATE );
return 1;
}
void FwkTabWindow::AddEventListener( const Link& rEventListener )
{
m_aTabCtrl.AddEventListener( rEventListener );
@ -313,8 +286,6 @@ void FwkTabWindow::RemoveEventListener( const Link& rEventListener )
m_aTabCtrl.RemoveEventListener( rEventListener );
}
FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< beans::NamedValue >& rProperties )
{
OUString sTitle, sToolTip, sPageURL;
@ -356,16 +327,12 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
return pEntry->m_pPage;
}
void FwkTabWindow::ActivatePage( sal_Int32 nIndex )
{
m_aTabCtrl.SetCurPageId( static_cast< sal_uInt16 >( nIndex ) );
ActivatePageHdl( &m_aTabCtrl );
}
void FwkTabWindow::RemovePage( sal_Int32 nIndex )
{
TabEntry* pEntry = FindEntry(nIndex);
@ -377,7 +344,6 @@ void FwkTabWindow::RemovePage( sal_Int32 nIndex )
}
}
void FwkTabWindow::Resize()
{
Size aPageSize = GetSizePixel();

3
framework/source/classes/fwlresid.cxx
View File

@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "classes/fwlresid.hxx"
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
@ -41,8 +40,6 @@ ResMgr* FwlResId::GetResManager()
return pResMgr;
}
FwlResId::FwlResId( sal_uInt16 nId ) :
ResId( nId, *FwlResId::GetResManager() )
{

15
framework/source/classes/menumanager.cxx
View File

@ -121,7 +121,6 @@ MenuManager::MenuManager(
sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
sal_uInt16 nItemCount = pMenu->GetItemCount();
m_aMenuItemHandlerVector.reserve(nItemCount);
OUString aItemCommand;
@ -203,7 +202,6 @@ MenuManager::MenuManager(
AddMenu(pSubMenu,OUString(),nItemId,sal_True,sal_False);
if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
{
Image aImage = GetImageFromURL( rFrame, aItemCommand, false );
@ -260,7 +258,6 @@ MenuManager::MenuManager(
SetHdl();
}
void MenuManager::SetHdl()
{
m_pVCLMenu->SetHighlightHdl( LINK( this, MenuManager, Highlight ));
@ -288,7 +285,6 @@ MenuManager::~MenuManager()
delete m_pVCLMenu;
}
MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( sal_uInt16 nItemId )
{
SolarMutexGuard g;
@ -304,7 +300,6 @@ MenuManager::MenuItemHandler* MenuManager::GetMenuItemHandler( sal_uInt16 nItemI
return 0;
}
void SAL_CALL MenuManager::statusChanged( const FeatureStateEvent& Event )
throw ( RuntimeException, std::exception )
{
@ -365,7 +360,6 @@ throw ( RuntimeException, std::exception )
}
}
void MenuManager::RemoveListener()
{
SolarMutexGuard g;
@ -402,7 +396,6 @@ void MenuManager::ClearMenuDispatch(const EventObject& Source,bool _bRemoveOnly)
}
}
void SAL_CALL MenuManager::disposing( const EventObject& Source ) throw ( RuntimeException, std::exception )
{
if ( Source.Source == m_xFrame )
@ -443,7 +436,6 @@ void SAL_CALL MenuManager::disposing( const EventObject& Source ) throw ( Runtim
}
}
void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
{
// update picklist
@ -676,7 +668,6 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XCompone
}
}
void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList, const MenuItemHandler* pMenuItemHandler )
{
int NUM_OF_PICKLIST_ARGS = 3;
@ -715,11 +706,8 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList,
aArgsList[NUM_OF_PICKLIST_ARGS-1].Value = a;
}
// vcl handler
IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
{
if ( pMenu == m_pVCLMenu )
@ -820,7 +808,6 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
return 1;
}
IMPL_LINK( MenuManager, Deactivate, Menu *, pMenu )
{
if ( pMenu == m_pVCLMenu )
@ -829,7 +816,6 @@ IMPL_LINK( MenuManager, Deactivate, Menu *, pMenu )
return 1;
}
IMPL_LINK( MenuManager, Select, Menu *, pMenu )
{
URL aTargetURL;
@ -903,7 +889,6 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
return 1;
}
IMPL_LINK_NOARG(MenuManager, Highlight)
{
return 0;

17
framework/source/dispatch/closedispatcher.cxx
View File

@ -40,7 +40,6 @@
#include <unotools/moduleoptions.hxx>
#include <comphelper/processfactory.hxx>
using namespace com::sun::star;
namespace framework{
@ -54,8 +53,6 @@ const char URL_CLOSEDOC[] = ".uno:CloseDoc";
const char URL_CLOSEWIN[] = ".uno:CloseWin";
const char URL_CLOSEFRAME[] = ".uno:CloseFrame";
CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext ,
const css::uno::Reference< css::frame::XFrame >& xFrame ,
const OUString& sTarget)
@ -78,12 +75,10 @@ CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponent
}
}
CloseDispatcher::~CloseDispatcher()
{
}
void SAL_CALL CloseDispatcher::dispatch(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
throw(css::uno::RuntimeException, std::exception)
@ -91,7 +86,6 @@ void SAL_CALL CloseDispatcher::dispatch(const css::util::URL&
dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
}
css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGroups()
throw(css::uno::RuntimeException, std::exception)
{
@ -101,7 +95,6 @@ css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGro
return lGroups;
}
css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher::getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
throw(css::uno::RuntimeException, std::exception)
{
@ -126,21 +119,18 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher::
return css::uno::Sequence< css::frame::DispatchInformation >();
}
void SAL_CALL CloseDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
const css::util::URL& /*aURL*/ )
throw(css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL CloseDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
const css::util::URL& /*aURL*/ )
throw(css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
@ -228,7 +218,6 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
m_aAsyncCallback.Post(0);
}
/**
@short asynchronous callback
@descr We start all actions inside this object asnychronoue.
@ -426,7 +415,6 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
return 0;
}
sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame ,
sal_Bool bAllowSuspend ,
sal_Bool bCloseAllOtherViewsToo,
@ -479,7 +467,6 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc
return sal_True;
}
sal_Bool CloseDispatcher::implts_closeFrame()
{
css::uno::Reference< css::frame::XFrame > xFrame;
@ -506,7 +493,6 @@ sal_Bool CloseDispatcher::implts_closeFrame()
return sal_True;
}
sal_Bool CloseDispatcher::implts_establishBackingMode()
{
css::uno::Reference< css::uno::XComponentContext > xContext;
@ -538,7 +524,6 @@ sal_Bool CloseDispatcher::implts_establishBackingMode()
return sal_True;
}
sal_Bool CloseDispatcher::implts_terminateApplication()
{
css::uno::Reference< css::uno::XComponentContext > xContext;
@ -552,7 +537,6 @@ sal_Bool CloseDispatcher::implts_terminateApplication()
return xDesktop->terminate();
}
void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener,
sal_Int16 nState ,
const css::uno::Any& aResult )
@ -568,7 +552,6 @@ void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css
xListener->dispatchFinished(aEvent);
}
css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRightTargetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame ,
const OUString& sTarget)
{

6
framework/source/dispatch/dispatchinformationprovider.cxx
View File

@ -25,12 +25,10 @@
#include <com/sun/star/frame/CommandGroup.hpp>
#include <com/sun/star/frame/AppDispatchProvider.hpp>
#include <comphelper/sequenceasvector.hxx>
namespace framework{
DispatchInformationProvider::DispatchInformationProvider(const css::uno::Reference< css::uno::XComponentContext >& xContext ,
const css::uno::Reference< css::frame::XFrame >& xFrame)
: m_xContext (xContext )
@ -38,12 +36,10 @@ DispatchInformationProvider::DispatchInformationProvider(const css::uno::Referen
{
}
DispatchInformationProvider::~DispatchInformationProvider()
{
}
css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupportedCommandGroups()
throw (css::uno::RuntimeException, std::exception)
{
@ -75,7 +71,6 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport
return lGroups.getAsConstList();
}
css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformationProvider::getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
throw (css::uno::RuntimeException, std::exception)
{
@ -125,7 +120,6 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati
return lReturn;
}
css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > DispatchInformationProvider::implts_getAllSubProvider()
{
css::uno::Reference< css::frame::XFrame > xFrame(m_xFrame);

25
framework/source/dispatch/dispatchprovider.cxx
View File

@ -176,11 +176,8 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
return NULL;
}
// I) handle special cases which not right for using findFrame() first
// I.I) "_blank"
// It's not the right place to create a new task here - because we are queried for a dispatch object
// only, which can handle such request. Such dispatcher should create the required task on demand.
@ -193,7 +190,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
xDispatcher = implts_getOrCreateDispatchHelper( E_BLANKDISPATCHER, xDesktop );
}
// I.II) "_default"
// This is a combination of search an empty task for recycling - or create a new one.
@ -206,7 +202,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
xDispatcher = implts_getOrCreateDispatchHelper( E_STARTMODULEDISPATCHER, xDesktop );
}
// I.III) "_self", "", "_top"
// The desktop can't load any document - but he can handle some special protocols like "uno", "slot" ...
// Why is "top" here handled too? Because the desktop is the topest frame. Normaly it's superflous
@ -221,7 +216,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
xDispatcher = implts_searchProtocolHandler(aURL);
}
// I.IV) no further special targets exist
// Now we have to search for the right target frame by calling findFrame() - but should provide our code
// against creation of a new task if no frame could be found.
@ -248,8 +242,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
return xDispatcher;
}
css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrameDispatch( const css::uno::Reference< css::frame::XFrame > xFrame ,
const css::util::URL& aURL ,
const OUString& sTargetFrameName ,
@ -257,18 +249,13 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
{
css::uno::Reference< css::frame::XDispatch > xDispatcher;
// 0) Some URLs are dispatched in a generic way (e.g. by the menu) using the default target "".
// But they are specified to use her own fix target. Detect such URLs here and use the correct target.
OUString sTargetName = sTargetFrameName;
// I) handle special cases which not right for using findFrame() first
// I.I) "_blank", "_default"
// It's not the right place to create a new task here. Only the desktop can do that.
// Normaly the functionality for "_blank" is provided by findFrame() - but that would create it directly
@ -284,7 +271,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
xDispatcher = xParent->queryDispatch(aURL, sTargetName, 0); // it's a special target - ignore search flags
}
// I.II) "_menubar"
// Special mode on frame or task to receive the local menu. Not supported by findFrame()
@ -293,7 +279,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
xDispatcher = implts_getOrCreateDispatchHelper( E_MENUDISPATCHER, xFrame );
}
// I.IV) "_beamer"
// Special sub frame of a top frame only. Search or create it. ... OK it's currently a little bit HACKI.
// Only the sfx (means the controller) can create it it.
@ -315,7 +300,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
}
}
// I.V) "_parent"
// Our parent frame (if it exist) should handle this URL.
@ -327,7 +311,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
xDispatcher = xParent->queryDispatch(aURL, SPECIALTARGET_SELF, 0);
}
// I.VI) "_top"
// This request must be forwarded to any parent frame, till we reach a top frame.
// If no parent exist, we can handle itself.
@ -351,7 +334,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
}
}
// I.VII) "_self", ""
// Our owner frame should handle this URL. But we can't do it for all of them.
// So we ask the internal setted controller first. If he disagree we try to find a registered
@ -412,7 +394,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
}
}
// I.VI) no further special handlings exist
// Now we have to search for the right target frame by calling findFrame() - but should provide our code
// against creation of a new task if no frame could be found.
@ -458,8 +439,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
return xDispatcher;
}
/**
@short search for a registered protocol handler and ask him for a dispatch object
@descr Wes earch a suitable handler inside our cfg package org.openoffice.Office.ProtocolHandler.
@ -524,8 +503,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt
return xDispatcher;
}
/**
@short get or create new dispatch helper
@descr Sometimes we need some helper implementations to support dispatching of special URLs or commands.
@ -626,8 +603,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
return xDispatchHelper;
}
/**
@short check URL for support by our used loader or handler
@descr If we must return our own dispatch helper implementations (self, blank, create dispatcher!)

4
framework/source/dispatch/interceptionhelper.cxx
View File

@ -23,14 +23,10 @@
#include <vcl/svapp.hxx>
namespace framework{
sal_Bool InterceptionHelper::m_bPreferrFirstInterceptor = sal_True;
InterceptionHelper::InterceptionHelper(const css::uno::Reference< css::frame::XFrame >& xOwner,
const css::uno::Reference< css::frame::XDispatchProvider >& xSlave)
: m_xOwnerWeak (xOwner )

19
framework/source/dispatch/mailtodispatcher.cxx
View File

@ -29,7 +29,6 @@
namespace framework{
// XInterface, XTypeProvider, XServiceInfo
DEFINE_XSERVICEINFO_MULTISERVICE_2(MailToDispatcher ,
@ -47,8 +46,6 @@ DEFINE_INIT_SERVICE(MailToDispatcher,
}
)
/**
@short standard ctor
@descr These initialize a new instance of ths class with needed information for work.
@ -61,8 +58,6 @@ MailToDispatcher::MailToDispatcher( const css::uno::Reference< css::uno::XCompon
{
}
/**
@short standard dtor
@descr -
@ -71,8 +66,6 @@ MailToDispatcher::~MailToDispatcher()
{
}
/**
@short decide if this dispatch implementation can be used for requested URL or not
@descr A protocol handler is registerd for an URL pattern inside configuration and will
@ -92,8 +85,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDis
return xDispatcher;
}
/**
@short do the same like dispatch() but for multiple requests at the same time
@descr -
@ -112,8 +103,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail
return lDispatcher;
}
/**
@short dispatch URL with arguments
@descr We use threadsafe internal method to do so. It returns a state value - but we ignore it.
@ -135,8 +124,6 @@ void SAL_CALL MailToDispatcher::dispatch( const css::util::URL&
// No notification for status listener!
}
/**
@short dispatch with guaranteed notifications about success
@descr We use threadsafe internal method to do so. Return state of this function will be used
@ -172,8 +159,6 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL&
}
}
/**
@short threadsafe helper for dispatch calls
@descr We support two interfaces for the same process - dispatch URLs. That the reason for this internal
@ -215,8 +200,6 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL&
return bSuccess;
}
/**
@short add/remove listener for state events
@descr Because we use an external process to forward such mail URLs, and this process doesn't
@ -234,8 +217,6 @@ void SAL_CALL MailToDispatcher::addStatusListener( const css::uno::Reference< cs
// not supported yet
}
void SAL_CALL MailToDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception )
{

11
framework/source/dispatch/menudispatcher.cxx
View File

@ -84,7 +84,6 @@ MenuDispatcher::MenuDispatcher( const uno::Reference< XComponentContext >&
xOwner->addFrameActionListener( uno::Reference< XFrameActionListener >( (OWeakObject *)this, UNO_QUERY ));
}
// destructor
MenuDispatcher::~MenuDispatcher()
@ -94,7 +93,6 @@ MenuDispatcher::~MenuDispatcher()
// and a dtor isn't the best place to do that!
}
// XDispatch
void SAL_CALL MenuDispatcher::dispatch( const URL& /*aURL*/ ,
@ -102,7 +100,6 @@ void SAL_CALL MenuDispatcher::dispatch( const URL& /
{
}
// XDispatch
void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStatusListener >& xControl,
@ -116,7 +113,6 @@ void SAL_CALL MenuDispatcher::addStatusListener( const uno::Reference< XStat
m_aListenerContainer.addInterface( aURL.Complete, xControl );
}
// XDispatch
void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< XStatusListener >& xControl,
@ -130,10 +126,8 @@ void SAL_CALL MenuDispatcher::removeStatusListener( const uno::Reference< X
m_aListenerContainer.removeInterface( aURL.Complete, xControl );
}
// XFrameActionListener
void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException, std::exception )
{
SolarMutexResettableGuard aGuard;
@ -169,7 +163,6 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro
}
}
// XEventListener
void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeException, std::exception )
{
@ -206,7 +199,6 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce
}
}
// private method
void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel )
@ -226,7 +218,6 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce
}
}
// private method
sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromResource )
@ -306,7 +297,6 @@ static sal_Bool impldbg_checkParameter_MenuDispatcher( const uno::Reference<
return xContext.is() && xOwner.is();
}
// We need a valid URL. What is meaning with "register for nothing"?!
// xControl must correct to - nobody can advised otherwise!
static sal_Bool impldbg_checkParameter_addStatusListener( const uno::Reference< XStatusListener >& xControl,
@ -327,7 +317,6 @@ static sal_Bool impldbg_checkParameter_addStatusListener( const uno::Reference
return bOK ;
}
// The same goes for these case! We have added valid listener for correct URL only.
// We can't remove invalid listener for nothing!
static sal_Bool impldbg_checkParameter_removeStatusListener( const uno::Reference< XStatusListener >& xControl,

2
framework/source/dispatch/oxt_handler.cxx
View File

@ -31,10 +31,8 @@
namespace framework{
// XInterface, XTypeProvider, XServiceInfo
DEFINE_XSERVICEINFO_MULTISERVICE ( Oxt_Handler ,
::cppu::OWeakObject ,
SERVICENAME_CONTENTHANDLER ,

19
framework/source/dispatch/servicehandler.cxx
View File

@ -31,7 +31,6 @@ namespace framework{
#define PROTOCOL_VALUE "service:"
#define PROTOCOL_LENGTH 8
// XInterface, XTypeProvider, XServiceInfo
DEFINE_XSERVICEINFO_MULTISERVICE(ServiceHandler ,
@ -49,8 +48,6 @@ DEFINE_INIT_SERVICE(ServiceHandler,
}
)
/**
@short standard ctor
@descr These initialize a new instance of ths class with needed information for work.
@ -63,8 +60,6 @@ ServiceHandler::ServiceHandler( const css::uno::Reference< css::lang::XMultiServ
{
}
/**
@short standard dtor
@descr -
@ -73,8 +68,6 @@ ServiceHandler::~ServiceHandler()
{
}
/**
@short decide if this dispatch implementation can be used for requested URL or not
@descr A protocol handler is registerd for an URL pattern inside configuration and will
@ -94,8 +87,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispa
return xDispatcher;
}
/**
@short do the same like dispatch() but for multiple requests at the same time
@descr -
@ -114,8 +105,6 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv
return lDispatcher;
}
/**
@short dispatch URL with arguments
@descr We use threadsafe internal method to do so. It returns a state value - but we ignore it.
@ -136,8 +125,6 @@ void SAL_CALL ServiceHandler::dispatch( const css::util::URL&
// No notification for status listener!
}
/**
@short dispatch with guaranteed notifications about success
@descr We use threadsafe internal method to do so. Return state of this function will be used
@ -174,8 +161,6 @@ void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL&
}
}
/**
@short threadsafe helper for dispatch calls
@descr We support two interfaces for the same process - dispatch URLs. That the reason for this internal
@ -245,8 +230,6 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con
return xService;
}
/**
@short add/remove listener for state events
@descr We use an internal container to hold such registered listener. This container lives if we live.
@ -264,8 +247,6 @@ void SAL_CALL ServiceHandler::addStatusListener( const css::uno::Reference< css:
// not supported yet
}
void SAL_CALL ServiceHandler::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception )
{

14
framework/source/dispatch/startmoduledispatcher.cxx
View File

@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <dispatch/startmoduledispatcher.hxx>
#include <pattern/frame.hxx>
@ -42,7 +41,6 @@
#include <unotools/moduleoptions.hxx>
#include <comphelper/processfactory.hxx>
namespace framework{
#ifdef fpf
@ -50,8 +48,6 @@ namespace framework{
#endif
namespace fpf = ::framework::pattern::frame;
StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
const css::uno::Reference< css::frame::XFrame >& xFrame ,
const OUString& sTarget)
@ -62,12 +58,10 @@ StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno
{
}
StartModuleDispatcher::~StartModuleDispatcher()
{
}
void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
throw(css::uno::RuntimeException, std::exception)
@ -75,7 +69,6 @@ void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL&
dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
}
void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
@ -95,35 +88,30 @@ void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::U
implts_notifyResultListener(xListener, nResult, css::uno::Any());
}
css::uno::Sequence< ::sal_Int16 > SAL_CALL StartModuleDispatcher::getSupportedCommandGroups()
throw(css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence< ::sal_Int16 >();
}
css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL StartModuleDispatcher::getConfigurableDispatchInformation(::sal_Int16 /*nCommandGroup*/)
throw(css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence< css::frame::DispatchInformation >();
}
void SAL_CALL StartModuleDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
const css::util::URL& /*aURL*/ )
throw(css::uno::RuntimeException, std::exception)
{
}
void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
const css::util::URL& /*aURL*/ )
throw(css::uno::RuntimeException, std::exception)
{
}
sal_Bool StartModuleDispatcher::implts_isBackingModePossible ()
{
if ( ! SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE))
@ -151,7 +139,6 @@ sal_Bool StartModuleDispatcher::implts_isBackingModePossible ()
return bIsPossible;
}
sal_Bool StartModuleDispatcher::implts_establishBackingMode()
{
css::uno::Reference< css::frame::XDesktop2> xDesktop = css::frame::Desktop::create( m_xContext );
@ -167,7 +154,6 @@ sal_Bool StartModuleDispatcher::implts_establishBackingMode()
return sal_True;
}
void StartModuleDispatcher::implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener,
::sal_Int16 nState ,
const css::uno::Any& aResult )

19
framework/source/dispatch/systemexec.cxx
View File

@ -35,7 +35,6 @@ namespace framework{
#define PROTOCOL_VALUE "systemexecute:"
#define PROTOCOL_LENGTH 14
// XInterface, XTypeProvider, XServiceInfo
DEFINE_XSERVICEINFO_MULTISERVICE_2(SystemExec ,
@ -53,21 +52,15 @@ DEFINE_INIT_SERVICE(SystemExec,
}
)
SystemExec::SystemExec( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
: m_xContext ( rxContext )
{
}
SystemExec::~SystemExec()
{
}
css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( const css::util::URL& aURL ,
const OUString&,
sal_Int32 ) throw( css::uno::RuntimeException, std::exception )
@ -78,8 +71,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch(
return xDispatcher;
}
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL SystemExec::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException, std::exception )
{
sal_Int32 nCount = lDescriptor.getLength();
@ -94,16 +85,12 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Syst
return lDispatcher;
}
void SAL_CALL SystemExec::dispatch( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
{
dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
}
void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& aURL ,
const css::uno::Sequence< css::beans::PropertyValue >&,
const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
@ -136,24 +123,18 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL&
}
}
void SAL_CALL SystemExec::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >&,
const css::util::URL& ) throw( css::uno::RuntimeException, std::exception )
{
// not supported yet
}
void SAL_CALL SystemExec::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >&,
const css::util::URL& ) throw( css::uno::RuntimeException, std::exception )
{
// not supported yet
}
void SystemExec::impl_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener,
const sal_Int16 nState )
{

Some files were not shown because too many files have changed in this diff Show More