Rebased ref, commits from common ancestor:
commit d980e0735c123fd5595b7cadbb3275807cf4dd15
Author: Douglas Mencken <dougmenc...@gmail.com>
Date: Fri Apr 15 19:59:49 2016 -0400
peaceful lexis : change wording on framework
rename framework/inc/targets.h to recipients.h
rename framework/source/inc/loadenv/targethelper.hxx to deliveryhelper.hxx
rename framework/source/loadenv/targethelper.cxx to deliveryhelper.cxx
eke simplify framework a bit
+++ reduce visual noise from ascii fences +++
Change-Id: I402dc2370ffdb25b3073418f62712226cb7362b8
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index ab6518a..3fc110f 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -100,7 +100,7 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/layoutmanager/toolbarlayoutmanager \
framework/source/layoutmanager/uielement \
framework/source/loadenv/loadenv \
- framework/source/loadenv/targethelper \
+ framework/source/loadenv/deliveryhelper \
framework/source/services/ContextChangeEventMultiplexer \
framework/source/services/autorecovery \
framework/source/services/desktop \
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx
b/framework/inc/classes/actiontriggerpropertyset.hxx
index a1cddc6..6286dd1 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -106,7 +106,7 @@ class ActionTriggerPropertySet : private cppu::BaseMutex,
// members
- OUString m_aCommandURL;
+ OUString m_aActionURL;
OUString m_aHelpURL;
OUString m_aText;
css::uno::Reference< css::awt::XBitmap > m_xBitmap;
diff --git a/framework/inc/classes/framecontainer.hxx
b/framework/inc/classes/framecontainer.hxx
index 838d1e1..32ad5b9 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -41,7 +41,7 @@ namespace framework{
typedef ::std::vector< css::uno::Reference< css::frame::XFrame > >
TFrameContainer;
-/*-************************************************************************************************************
+/*
@short implement a container to hold children of frame, task or
desktop
@descr Every object of frame, task or desktop hold reference to
his children. These container is used as helper
to do this. Some helper-classes like OFrames or
OTasksAccess use it to. They hold a pointer to an instance
@@ -51,12 +51,10 @@ typedef ::std::vector< css::uno::Reference<
css::frame::XFrame > > TFrameContai
@devstatus ready to use
@threadsafe yes
-*//*-*************************************************************************************************************/
+*/
class FrameContainer
{
- // member
-
private:
/// list to hold all frames
@@ -68,7 +66,6 @@ class FrameContainer
public:
- /// constructor / destructor
FrameContainer();
virtual ~FrameContainer();
@@ -76,14 +73,14 @@ class FrameContainer
void append ( const
css::uno::Reference< css::frame::XFrame >& xFrame );
void remove ( const
css::uno::Reference< css::frame::XFrame >& xFrame );
void setActive ( const
css::uno::Reference< css::frame::XFrame >& xFrame );
- css::uno::Reference< css::frame::XFrame > getActive (
) const;
+ css::uno::Reference< css::frame::XFrame > getActive ( ) const;
/// checks and free memory
- bool exist ( const css::uno::Reference< css::frame::XFrame >&
xFrame ) const;
- void clear (
);
+ bool exist ( const css::uno::Reference< css::frame::XFrame >& xFrame )
const;
+ void clear ( );
- /// deprecated IndexAccess!
- sal_uInt32 getCount (
) const;
+ /// deprecated IndexAccess
+ sal_uInt32 getCount ( ) const;
css::uno::Reference< css::frame::XFrame > operator[]( sal_uInt32
nIndex ) const;
/// replacement for deprecated index access
@@ -93,9 +90,9 @@ class FrameContainer
css::uno::Reference< css::frame::XFrame > searchOnAllChildrens (
const OUString& sName ) const;
css::uno::Reference< css::frame::XFrame > searchOnDirectChildrens(
const OUString& sName ) const;
-}; // class FrameContainer
+};
-} // namespace framework
+}
#endif // INCLUDED_FRAMEWORK_INC_CLASSES_FRAMECONTAINER_HXX
diff --git a/framework/inc/classes/taskcreator.hxx
b/framework/inc/classes/taskcreator.hxx
index 295fb21..1a410a0 100644
--- a/framework/inc/classes/taskcreator.hxx
+++ b/framework/inc/classes/taskcreator.hxx
@@ -30,15 +30,15 @@
namespace framework{
-/*-************************************************************************************************************
- @short a helper to create new tasks or sub frames for "_blank" or
FrameSearchFlag::CREATE
- @descr There are different places to create new (task)frames. Its
not easy to service this code!
- Thats the reason for this helper. He capsulate
asynchronous/synchronous creation by calling
+/*
+ @short a helper to create new tasks or sub frames for "_blank" or
FrameSearchOption::Create
+ @descr There are different places to create new (task)frames. Its
not easy to service this code.
+ Thats the reason for this helper. He capsulates
asynchronous/synchronous creation by calling
a simple interface.
@devstatus ready to use
@threadsafe yes
-*//*-*************************************************************************************************************/
+*/
class TaskCreator
{
diff --git a/framework/inc/dispatch/closedispatcher.hxx
b/framework/inc/dispatch/closedispatcher.hxx
index b7b65fa..b88bec1 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -82,8 +82,8 @@ class CloseDispatcher : public ::cppu::WeakImplHelper<
uno resources. */
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- /** @short reference to the target frame, which should be
- closed by this dispatch. */
+ /** @short reference to the frame which is going to be closed
+ by this dispatch */
css::uno::WeakReference< css::frame::XFrame > m_xCloseFrame;
/** @short used for asynchronous callbacks within the main thread.
@@ -119,12 +119,12 @@ class CloseDispatcher : public ::cppu::WeakImplHelper<
@param xFrame
the frame where the corresponding dispatch was started.
- @param sTarget
- help us to find the right target for this close operation.
+ @param sRecipient
+ help us to find the recipient for this close dispatch.
*/
CloseDispatcher(const css::uno::Reference< css::uno::XComponentContext
>& rxContext ,
const css::uno::Reference< css::frame::XFrame >&
xFrame ,
- const OUString&
sTarget);
+ const OUString& sRecipient );
/** @short does nothing real. */
virtual ~CloseDispatcher();
@@ -243,27 +243,26 @@ class CloseDispatcher : public ::cppu::WeakImplHelper<
sal_Int16
nState ,
const css::uno::Any&
aResult );
- /** @short try to find the right target frame where this close request
- must be really done.
+ /** @short try to find the recipient frame where this close request
+ is going to be really done.
@descr The problem behind: closing some resources depends
sometimes from the
context where its dispatched. Sometimes the start frame of
the dispatch
- has to be closed itself (target=_self) ... sometimes its
parent frame
+ has to be closed itself (recipient=_self) ... sometimes
its parent frame
has to be closed - BUT(!) it means a parent frame
containing a top level
window. _top can't be used then for dispatch - because it
address TopFrames
not frames containg top level windows. So normally _magic
(which btw does not
- exists at the moment .-) ) should be used. So we interpret
target=<empty>
+ exists at the moment .-) ) should be used. So we interpret
recipient=<empty>
as _magic !
@param xFrame
start point for search of right dispatch frame.
- @param sTarget
- give us an idea how this target frame must be searched.
+ @param sRecipient
+ give us an idea how this recipient frame is going to be
searched.
*/
-
- static css::uno::Reference< css::frame::XFrame >
static_impl_searchRightTargetFrame(const css::uno::Reference<
css::frame::XFrame >& xFrame ,
-
const OUString& sTarget);
+ static css::uno::Reference< css::frame::XFrame >
impl_lookForRecipientFrame( const css::uno::Reference< css::frame::XFrame >&
xFrame ,
+
const OUString& sRecipient );
}; // class CloseDispatcher
diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx
b/framework/inc/dispatch/dispatchinformationprovider.hxx
index 169e289..50acbca 100644
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -34,9 +34,9 @@
namespace framework{
-/*-************************************************************************************************************
+/*
@short a helper to merge dispatch information of different
sources together.
-*//*-*************************************************************************************************************/
+*/
class DispatchInformationProvider : public ::cppu::WeakImplHelper<
css::frame::XDispatchInformationProvider >
{
@@ -65,9 +65,9 @@ class DispatchInformationProvider : public
::cppu::WeakImplHelper< css::frame::
css::uno::Sequence< css::uno::Reference<
css::frame::XDispatchInformationProvider > > implts_getAllSubProvider();
-}; // class DispatchInformationProvider
+};
-} // namespace framework
+}
#endif // INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX
diff --git a/framework/inc/dispatch/dispatchprovider.hxx
b/framework/inc/dispatch/dispatchprovider.hxx
index 945fbaa..8417b7b 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -62,8 +62,8 @@ enum EDispatchHelper
- a task can have a beamer as direct child
- a normal frame never can create a new one by
himself
- @attention Use this class as member only! Never use it as baseclass.
- XInterface will be ambigous and we hold a weakreference to
our OWNER - not to our SUPERCLASS!
+ @attention Use this class as a member only, not as a parent.
+ XInterface will be ambigous and we hold a weakreference to
OWNER - not to SUPERCLASS
@base OWeakObject
provides ref count and weak mechanism
@@ -88,31 +88,30 @@ class DispatchProvider: public ::cppu::WeakImplHelper<
css::frame::XDispatchProv
DispatchProvider( const css::uno::Reference<
css::uno::XComponentContext >& xContext ,
const css::uno::Reference< css::frame::XFrame >&
xFrame );
- virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL
queryDispatch ( const css::util::URL&
aURL ,
-
const OUString&
sTargetFrameName ,
-
sal_Int32
nSearchFlags ) throw( css::uno::RuntimeException, std::exception
) override;
+ virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL
queryDispatch ( const css::util::URL& aURL ,
+
const OUString& sRecipientFrameName ,
+
sal_Int32 nSearchOptions ) throw( css::uno::RuntimeException,
std::exception ) override;
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch
> > SAL_CALL queryDispatches( const css::uno::Sequence<
css::frame::DispatchDescriptor >& lDescriptions ) throw(
css::uno::RuntimeException, std::exception ) override;
/* helper */
protected:
- // Let him protected! So nobody can use us as base ...
virtual ~DispatchProvider();
private:
- css::uno::Reference< css::frame::XDispatch >
implts_getOrCreateDispatchHelper ( EDispatchHelper
eHelper ,
-
const css::uno::Reference< css::frame::XFrame >& xOwner
,
-
const OUString& sTarget = OUString() ,
-
sal_Int32 nSearchFlags = 0
);
- bool implts_isLoadableContent
( const css::util::URL& aURL
);
- css::uno::Reference< css::frame::XDispatch >
implts_queryDesktopDispatch ( const css::uno::Reference<
css::frame::XFrame >& xDesktop ,
-
const css::util::URL& aURL
,
-
const OUString& sTargetFrameName
,
-
sal_Int32 nSearchFlags
);
- css::uno::Reference< css::frame::XDispatch > implts_queryFrameDispatch
( const css::uno::Reference< css::frame::XFrame >& xFrame
,
-
const css::util::URL& aURL
,
-
const OUString& sTargetFrameName
,
-
sal_Int32 nSearchFlags
);
- css::uno::Reference< css::frame::XDispatch >
implts_searchProtocolHandler ( const css::util::URL&
aURL );
+ css::uno::Reference< css::frame::XDispatch >
implts_getOrCreateDispatchHelper ( EDispatchHelper eHelper ,
+
const css::uno::Reference< css::frame::XFrame >& xOwner ,
+
const OUString& sRecipient = OUString() ,
+
sal_Int32 nSearchOptions = 0 );
+ bool implts_isLoadableContent
( const css::util::URL& aURL );
+ css::uno::Reference< css::frame::XDispatch >
implts_queryDesktopDispatch ( const css::uno::Reference<
css::frame::XFrame >& xDesktop ,
+
const css::util::URL& aURL ,
+
const OUString& sRecipientFrameName ,
+
sal_Int32 nSearchOptions );
+ css::uno::Reference< css::frame::XDispatch > implts_queryFrameDispatch
( const css::uno::Reference< css::frame::XFrame >& xFrame ,
+
const css::util::URL& aURL ,
+
const OUString& sRecipientFrameName ,
+
sal_Int32 nSearchOptions );
+ css::uno::Reference< css::frame::XDispatch >
implts_searchProtocolHandler ( const css::util::URL& aURL );
}; // class DispatchProvider
diff --git a/framework/inc/dispatch/interceptionhelper.hxx
b/framework/inc/dispatch/interceptionhelper.hxx
index 7a67b70..bef540e 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -182,32 +182,31 @@ class InterceptionHelper : public ::cppu::WeakImplHelper<
@param aURL
describes the requested dispatch functionality.
- @param sTargetFrameName
- the name of the target frame or a special name like
"_blank", "_top" ...
+ @param sRecipientFrameName
+ the name of the recipient frame or a special name like
"_blank", "_top" ...
Won't be used here ... but may by one of our
registered interceptor objects
or our slave.
- @param nSearchFlags
- optional search parameter for targeting, if
sTargetFrameName isn't a special one.
+ @param nSearchOptions
+ optional parameter to look if sRecipientFrameName is a
special one
@return A valid dispatch object, if any interceptor or at least
our slave is interested on the given URL;
or NULL otherwise.
*/
- virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL
queryDispatch(const css::util::URL& aURL ,
-
const OUString& sTargetFrameName,
-
sal_Int32 nSearchFlags )
+ virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL
queryDispatch(const css::util::URL& aURL,
+
const OUString& sRecipientFrameName,
+
sal_Int32 nSearchOptions )
throw(css::uno::RuntimeException, std::exception) override;
// XDispatchProvider
/** @short implements an optimized queryDispatch() for remote.
- @descr It capsulate more than one queryDispatch() requests and
return a lits of dispatch objects
- as result. Because both lists (in and out) correspond
together, it's not allowed to
- pack it - means suppress NULL references!
+ @descr It capsulates more than one queryDispatch() requests and
return a lits of dispatch objects.
+ Because both lists (in and out) correspond together, it
wouldn't pack them - means suppress null-references
@param lDescriptor
- a list of queryDispatch() arguments.
+ a list of queryDispatch() arguments
@return A list of dispatch objects.
*/
@@ -219,15 +218,13 @@ class InterceptionHelper : public ::cppu::WeakImplHelper<
/** @short register an interceptor.
@descr Somebody can register himself to intercept all or some
special dispatches.
- It's depend from his supported interfaces. If he
implement XInterceptorInfo
- he his called for some special URLs only - otherwise
we call it for every request!
-
- @attention We don't check for double registrations here!
+ It depends on its supported interfaces. If it
implements XInterceptorInfo
+ it is called for special URLs only and otherwise for
every one
@param xInterceptor
reference to interceptor, which wish to be registered
here.
- @throw A RuntimeException if the given reference is NULL!
+ @throw A RuntimeException if the given reference is null
*/
virtual void SAL_CALL registerDispatchProviderInterceptor(const
css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
throw(css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx
b/framework/inc/dispatch/mailtodispatcher.hxx
index f3fb8ed..29d21e3 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -71,8 +71,8 @@ class MailToDispatcher : public ::cppu::WeakImplHelper<
// XDispatchProvider
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL
queryDispatch ( const css::util::URL&
aURL ,
-
const OUString&
sTarget ,
-
sal_Int32
nFlags ) throw( css::uno::RuntimeException, std::exception )
override;
+
const OUString&
sRecipient ,
+
sal_Int32
nOptions ) throw( css::uno::RuntimeException, std::exception )
override;
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 ) override;
// XNotifyingDispatch
diff --git a/framework/inc/dispatch/oxt_handler.hxx
b/framework/inc/dispatch/oxt_handler.hxx
index 96920ad..a0e2eba 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -39,17 +39,15 @@
namespace framework{
-/*-************************************************************************************************************
- @short handler to detect and play sounds ("wav" and "au" only!)
- @descr Register this implementation as a content handler to
detect and/or play wav- and au-sounds.
- It doesn't depend from the target platform. But one
instance of this class
- can play one sound at the same time only. Means every new
dispatch request will stop the
- might still running one. So we support one operation/one
URL/one listener at the same time
- only.
+/*
+ @short handler to detect and play sounds (only "wav" and "au" yet)
+ @descr Register this implementation as a content handler to
detect and/or play wav and au sounds.
+ One instance of this class can play one sound at the same
time only.
+ Means every new dispatch request will stop the still
running one.
@devstatus ready
@threadsafe yes
-*//*-*************************************************************************************************************/
+*/
class Oxt_Handler : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo,
css::frame::XNotifyingDispatch, // =>
XDispatch
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx
b/framework/inc/dispatch/popupmenudispatcher.hxx
index fcd5718..a63f292 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -52,7 +52,7 @@ namespace framework{
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
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.
XInterface will be ambigous and we hold a
weakcss::uno::Reference to our OWNER - not to our SUPERCLASS!
@@ -65,7 +65,7 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
@base OWeakObject
@devstatus ready to use
-*//*-*************************************************************************************************************/
+*/
class PopupMenuDispatcher : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo,
css::frame::XDispatchProvider,
@@ -90,8 +90,8 @@ class PopupMenuDispatcher : public
::cppu::WeakImplHelper<
// XDispatchProvider
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL
queryDispatch(
const css::util::URL& aURL ,
- const OUString& sTarget ,
- sal_Int32 nFlags )
+ const OUString& sRecipient ,
+ sal_Int32 nOptions )
throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch
> > SAL_CALL queryDispatches(
@@ -133,9 +133,9 @@ class PopupMenuDispatcher : public
::cppu::WeakImplHelper<
bool
m_bAlreadyDisposed; /// Protection against multiple disposing calls.
bool
m_bActivateListener; /// dispatcher is listener for frame activation
-}; // class PopupMenuDispatcher
+};
-} // namespace framework
+}
#endif // INCLUDED_FRAMEWORK_INC_DISPATCH_POPUPMENUDISPATCHER_HXX
diff --git a/framework/inc/dispatch/servicehandler.hxx
b/framework/inc/dispatch/servicehandler.hxx
index bd75de8..7fd1bc4 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -75,8 +75,8 @@ class ServiceHandler : public ::cppu::WeakImplHelper<
// XDispatchProvider
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL
queryDispatch ( const css::util::URL&
aURL ,
-
const OUString&
sTarget ,
-
sal_Int32
nFlags ) throw( css::uno::RuntimeException, std::exception )
override;
+
const OUString&
sRecipient ,
+
sal_Int32
nOptions ) throw( css::uno::RuntimeException, std::exception )
override;
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 ) override;
// XNotifyingDispatch
diff --git a/framework/inc/dispatch/systemexec.hxx
b/framework/inc/dispatch/systemexec.hxx
index b14d4ff..3fe2846 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -73,8 +73,8 @@ class SystemExec : public ::cppu::WeakImplHelper<
// XDispatchProvider
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL
queryDispatch ( const css::util::URL&
aURL ,
-
const OUString&
sTarget ,
-
sal_Int32
nFlags ) throw( css::uno::RuntimeException, std::exception )
override;
+
const OUString&
sRecipient ,
+
sal_Int32
nOptions ) throw( css::uno::RuntimeException, std::exception )
override;
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 ) override;
// XNotifyingDispatch
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx
b/framework/inc/helper/dockingareadefaultacceptor.hxx
index 0fd863a..68507e5 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -36,9 +36,7 @@ class DockingAreaDefaultAcceptor : public
::cppu::WeakImplHelper< css::ui::
{
public:
- // constructor / destructor
-
-
/*-****************************************************************************************************
+ /*
@short constructor to initialize this instance
@descr A docking area acceptor
But we need a instance to create more than one
enumerations to the same tasklist!
@@ -49,7 +47,7 @@ class DockingAreaDefaultAcceptor : public
::cppu::WeakImplHelper< css::ui::
@param "xOwner" is a reference to our owner and must be the
desktop!
@param "pTasks" is a pointer to the taskcontainer of the
desktop. We need it to create a new enumeration.
@onerror Do nothing and reset this object to default with an
empty list.
-
*//*-*****************************************************************************************************/
+ */
DockingAreaDefaultAcceptor( const css::uno::Reference<
css::frame::XFrame >& xOwner );
virtual ~DockingAreaDefaultAcceptor();
@@ -60,15 +58,12 @@ class DockingAreaDefaultAcceptor : public
::cppu::WeakImplHelper< css::ui::
virtual sal_Bool SAL_CALL requestDockingAreaSpace( const
css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL setDockingAreaSpace( const css::awt::Rectangle&
BorderSpace ) throw (css::uno::RuntimeException, std::exception) override;
- // variables
- // (should be private everyway!)
-
private:
- css::uno::WeakReference< css::frame::XFrame > m_xOwner; ///
weak reference to our frame object!
+ css::uno::WeakReference< css::frame::XFrame > m_xOwner; ///
weak reference to our frame object
};
-} // namespace framework
+}
#endif // INCLUDED_FRAMEWORK_INC_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX
diff --git a/framework/inc/helper/ocomponentaccess.hxx
b/framework/inc/helper/ocomponentaccess.hxx
index 9f7c88d..3963530 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -37,7 +37,7 @@
namespace framework{
-/*-************************************************************************************************************
+/*
@short implement XEnumerationAccess interface as helper to create
many oneway enumeration of components
@descr We share mutex and framecontainer with our owner and have
full access to his child tasks.
(Our owner can be the Desktop only!) We create oneway
enumerations on demand. These "lists"
@@ -52,7 +52,7 @@ namespace framework{
@base OWeakObject
@devstatus ready to use
-*//*-*************************************************************************************************************/
+*/
class OComponentAccess : public ::cppu::WeakImplHelper<
css::container::XEnumerationAccess >
{
@@ -63,7 +63,7 @@ class OComponentAccess : public ::cppu::WeakImplHelper<
css::container::XEnum
// 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
snapshot of the components of current tasks under the
desktop.
@@ -74,13 +74,13 @@ class OComponentAccess : public ::cppu::WeakImplHelper<
css::container::XEnum
@param "xOwner" is a reference to our owner and must be the
desktop!
@onerror Do nothing and reset this object to default with an
empty list.
-
*//*-*****************************************************************************************************/
+ */
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.
@@ -89,27 +89,27 @@ class OComponentAccess : public ::cppu::WeakImplHelper<
css::container::XEnum
@seealso class Desktop
@return If the desktop and some components exist => a valid
reference to an enumeration<BR>
An NULL-reference, other way.
-
*//*-*****************************************************************************************************/
+ */
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
createEnumeration() throw( css::uno::RuntimeException, std::exception )
override;
// XElementAccess
-
/*-****************************************************************************************************
+ /*
@short get the type of elements in enumeration
@seealso interface XElementAccess
@seealso class OComponentEnumeration
@return The uno-type XComponent.
-
*//*-*****************************************************************************************************/
+ */
virtual css::uno::Type SAL_CALL getElementType() throw(
css::uno::RuntimeException, std::exception ) override;
-
/*-****************************************************************************************************
+ /*
@short get state of componentlist of enumeration.
@seealso interface XElementAccess
@return sal_True ,if more than 0 elements exist.
@return sal_False ,otherwise.
-
*//*-*****************************************************************************************************/
+ */
virtual sal_Bool SAL_CALL hasElements() throw(
css::uno::RuntimeException, std::exception ) override;
@@ -117,7 +117,7 @@ class OComponentAccess : public ::cppu::WeakImplHelper<
css::container::XEnum
protected:
-
/*-****************************************************************************************************
+ /*
@short standard destructor
@descr This method destruct an instance of this class and
clear some member.
Don't use an instance of this class as normal member.
Use it dynamicly with a pointer.
@@ -125,14 +125,14 @@ class OComponentAccess : public
::cppu::WeakImplHelper< css::container::XEnum
Thats the reason for a protected dtor.
@seealso class Desktop
-
*//*-*****************************************************************************************************/
+ */
virtual ~OComponentAccess();
private:
-
/*-****************************************************************************************************
+ /*
@short recursive method (!) to collect all components of all
frames from the subtree of given node
@descr This is necessary to create the enumeration.
@@ -141,12 +141,12 @@ class OComponentAccess : public
::cppu::WeakImplHelper< css::container::XEnum
@param "xNode" , root of subtree and start point of
search
@param "seqComponents", result list of search. We can't use a
return value, we search recursive
and must collect all information.
-
*//*-*****************************************************************************************************/
+ */
void impl_collectAllChildComponents( const css::uno::Reference<
css::frame::XFramesSupplier >& xNode ,
std::vector<
css::uno::Reference< css::lang::XComponent > >& seqComponents );
-
/*-****************************************************************************************************
+ /*
@short get the component of a frame
@descr The component of a frame can be the window, the
controller or the model.
@@ -156,39 +156,17 @@ class OComponentAccess : public
::cppu::WeakImplHelper< css::container::XEnum
@return A reference to the component of given frame.
@onerror A null reference is returned.
-
*//*-*****************************************************************************************************/
+ */
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
- of this class. The return value is used directly for
an ASSERT(...).
-
- @seealso ASSERTs in implementation!
-
- @param references to checking variables
- @return sal_False ,on invalid parameter.
- @return sal_True ,otherwise
-
*//*-*****************************************************************************************************/
-
- private:
-
- static 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!
+ css::uno::WeakReference< css::frame::XDesktop > m_xOwner; ///
weak reference to the desktop object
-}; // class OComponentAccess
+};
-} // namespace framework
+}
#endif // INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTACCESS_HXX
diff --git a/framework/inc/helper/ocomponentenumeration.hxx
b/framework/inc/helper/ocomponentenumeration.hxx
index 8e0c144..b11bf01 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -33,7 +33,7 @@
namespace framework{
-/*-************************************************************************************************************
+/*
@short implement a helper for a oneway enumeration of components
@descr You can step during this list only for one time! Its a
snapshot.
Don't forget to release the reference. You are the owner
of an instance of this implementation.
@@ -48,7 +48,7 @@ namespace framework{
@devstatus ready to use
@threadsafe yes
-*//*-*************************************************************************************************************/
+*/
class OComponentEnumeration : public ::cppu::WeakImplHelper<
css::container::XEnumeration,css::lang::XEventListener >
{
@@ -59,19 +59,19 @@ class OComponentEnumeration : public
::cppu::WeakImplHelper< css::container::X
// 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.
This method allow to initialize this oneway list with
values.
@param "seqComponents" is a sequence of interfaces, which are
components.
@onerror Do nothing and reset this object to default with an
empty list.
-
*//*-*****************************************************************************************************/
+ */
OComponentEnumeration( const std::vector< 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.
Then we must destroy our list and release all
references to other objects.
@@ -79,13 +79,13 @@ class OComponentEnumeration : public
::cppu::WeakImplHelper< css::container::X
@seealso interface XEventListener
@param "aEvent" describe the source of this event.
-
*//*-*****************************************************************************************************/
+ */
virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent
) throw( css::uno::RuntimeException, std::exception ) override;
// XEnumeration
-
/*-****************************************************************************************************
+ /*
@short check count of accessible elements of enumeration
@descr You can call this method to get information about
accessible elements in future.
Elements you have already gotten are not accessible!
@@ -96,11 +96,11 @@ class OComponentEnumeration : public
::cppu::WeakImplHelper< css::container::X
@onerror sal_False<BR>
(List is emtpy and there no accessible elements ...)
-
*//*-*****************************************************************************************************/
+ */
virtual sal_Bool SAL_CALL hasMoreElements() throw(
css::uno::RuntimeException, std::exception ) override;
-
/*-****************************************************************************************************
+ /*
@short give the next element, if some exist
@descr If a call "hasMoreElements()" return true, you can get
the next element of list.
@@ -108,7 +108,7 @@ class OComponentEnumeration : public
::cppu::WeakImplHelper< css::container::X
@return A Reference to a component, safed in an Any-structure.
@onerror If end of enumeration is arrived or there are no
elements in list => a NoSuchElementException is thrown.
-
*//*-*****************************************************************************************************/
+ */
virtual css::uno::Any SAL_CALL nextElement() throw(
css::container::NoSuchElementException ,
css::lang::WrappedTargetException ,
@@ -118,16 +118,16 @@ class OComponentEnumeration : public
::cppu::WeakImplHelper< css::container::X
protected:
-
/*-****************************************************************************************************
+ /*
@short standard destructor
@descr This method destruct an instance of this class and
clear some member.
We make it protected, because its not supported to use
this class as normal instance!
You must create it dynamical in memory and use a
pointer.
-
*//*-*****************************************************************************************************/
+ */
virtual ~OComponentEnumeration();
-
/*-****************************************************************************************************
+ /*
@short reset instance to default values
@descr There are two ways to delete an instance of this
class.<BR>
@@ -137,7 +137,7 @@ class OComponentEnumeration : public
::cppu::WeakImplHelper< css::container::X
@seealso method dispose()
@seealso destructor ~TaskEnumeration()
-
*//*-*****************************************************************************************************/
+ */
void impl_resetObject();
@@ -147,7 +147,7 @@ class OComponentEnumeration : public
::cppu::WeakImplHelper< css::container::X
// 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
of this class. The return value is used directly for
an ASSERT(...).
@@ -157,7 +157,7 @@ class OComponentEnumeration : public
::cppu::WeakImplHelper< css::container::X
@param references to checking variables
@return sal_False on invalid parameter<BR>
sal_True otherway
-
*//*-*****************************************************************************************************/
+ */
private:
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 63f2d91..c2e9a26 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -34,7 +34,7 @@
namespace framework{
-/*-************************************************************************************************************
+/*
@short implement XFrames, XIndexAccess and XElementAccess
interfaces as helper for services
@descr Use this class as helper for these interfaces. We share
mutex and framecontainer with our owner.
The framecontainer is a member of it from type
"FrameContainer". That means;
@@ -52,24 +52,24 @@ namespace framework{
We hold a weakreference to our owner not to our superclass.
@devstatus deprecated
-*//*-*************************************************************************************************************/
+*/
class OFrames : public ::cppu::WeakImplHelper< css::frame::XFrames >
{
public:
-
/*-****************************************************************************************************
+ /*
@short standard ctor
@descr These initialize a new instance of this class with all
needed information for work.
We share framecontainer with owner implementation!
It's a threadsafe container.
@param xOwner , reference to our owner. We hold a
wekreference to prevent us against cross-references!
@param pFrameContainer , pointer to shared framecontainer
of owner. It's valid only, if weakreference is valid!
-
*//*-*****************************************************************************************************/
+ */
OFrames( const css::uno::Reference< css::frame::XFrame >&
xOwner ,
FrameContainer*
pFrameContainer );
// XFrames
-
/*-****************************************************************************************************
+ /*
@short append frame to container
@descr We share the container with our owner. We can do this
only, if no lock is set on container.
Valid references are accepted only!
@@ -78,10 +78,10 @@ class OFrames : public ::cppu::WeakImplHelper<
css::frame::XFrames >
@param "xFrame", reference to an existing frame to append.
@onerror We do nothing in release or throw an assert in debug
version.
-
*//*-*****************************************************************************************************/
+ */
virtual void SAL_CALL append( const css::uno::Reference<
css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException,
std::exception ) override;
-
/*-****************************************************************************************************
+ /*
@short remove frame from container
@descr This is the companion to append(). We only accept
valid references and don't work, if
a lock is set.
@@ -90,22 +90,22 @@ class OFrames : public ::cppu::WeakImplHelper<
css::frame::XFrames >
@param "xFrame", reference to an existing frame to remove.
@onerror We do nothing in release or throw an assert in debug
version.
-
*//*-*****************************************************************************************************/
+ */
virtual void SAL_CALL remove( const css::uno::Reference<
css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException,
std::exception ) override;
-
/*-****************************************************************************************************
- @short return list of all applicable frames for given flags
- @descr Call these to get a list of all frames, which are
match with given search flags.
- @param "nSearchFlag", flags to search right frames.
- @return A list of founded frames.
+ /*
+ @short return list of all applicable frames for given options
+ @param nSearchOptions
+ @return list of found frames
@onerror An empty list is returned.
-
*//*-*****************************************************************************************************/
- virtual css::uno::Sequence< css::uno::Reference< css::frame::XFrame >
> SAL_CALL queryFrames( sal_Int32 nSearchFlags ) throw(
css::uno::RuntimeException, std::exception ) override;
+ */
+ virtual css::uno::Sequence< css::uno::Reference< css::frame::XFrame >
> SAL_CALL queryFrames( sal_Int32 nSearchOptions )
+ throw( css::uno::RuntimeException, std::exception )
override;
// XIndexAccess
-
/*-****************************************************************************************************
+ /*
@short get count of all current frames in container
@descr This is the beginning of full index-access. With a
count you can step over all items in container.
Next call should be getByIndex(). But these mechanism
works only, if no lock in container is set!
@@ -115,10 +115,10 @@ class OFrames : public ::cppu::WeakImplHelper<
css::frame::XFrames >
@return Count of current items in container.
@onerror If a lock is set, we return 0 for prevent further
access!
-
*//*-*****************************************************************************************************/
+ */
virtual sal_Int32 SAL_CALL getCount() throw(
css::uno::RuntimeException, std::exception ) override;
-
/*-****************************************************************************************************
+ /*
@short get specified container item by index
@descr If you called getCount() successful - this method
return the specified element as an Any.
You must observe the range from 0 to count-1!
Otherwise an IndexOutOfBoundsException is thrown.
@@ -131,22 +131,22 @@ class OFrames : public ::cppu::WeakImplHelper<
css::frame::XFrames >
@onerror If a lock is set, we return an empty Any!
@onerror If index out of range, an IndexOutOfBoundsException is
thrown.
-
*//*-*****************************************************************************************************/
+ */
virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw(
css::lang::IndexOutOfBoundsException ,
css::lang::WrappedTargetException ,
css::uno::RuntimeException, std::exception ) override;
// XElementAccess
-
/*-****************************************************************************************************
+ /*
@short get uno-type of all container items
@descr In current implementation type is fixed to XFrame!
(container-lock is ignored)
@return A uno-type descriptor.
-
*//*-*****************************************************************************************************/
+ */
virtual css::uno::Type SAL_CALL getElementType() throw(
css::uno::RuntimeException, std::exception ) override;
-
/*-****************************************************************************************************
+ /*
@short get fill state of current container
@descr Call these to get information about, if items exist in
container or not.
(container-lock is ignored)
@@ -154,34 +154,28 @@ class OFrames : public ::cppu::WeakImplHelper<
css::frame::XFrames >
@return sal_False, otherwise.
@onerror We return sal_False.
-
*//*-*****************************************************************************************************/
+ */
virtual sal_Bool SAL_CALL hasElements() throw(
css::uno::RuntimeException, std::exception ) override;
protected:
-
/*-****************************************************************************************************
- @short standard destructor
- @descr This method destruct an instance of this class and
clear some member.
- This method is protected, because its not allowed to
use this class as a member!
- You MUST use a dynamical instance (pointer). That's
the reason for a protected dtor.
-
*//*-*****************************************************************************************************/
virtual ~OFrames();
-
/*-****************************************************************************************************
+ /*
@short reset instance to default values
@descr There are two ways to delete an instance of this
class.<BR>
1) delete with destructor<BR>
2) dispose from parent or factory ore ...<BR>
This method do the same for both ways! It free used
memory and release references ...
- @seealso method dispose() (if it exist!)
+ @seealso method dispose() if it exists
@seealso destructor ~TaskEnumeration()
-
*//*-*****************************************************************************************************/
+ */
void impl_resetObject();
private:
-
/*-****************************************************************************************************
+ /*
@short append one sequence to another
@descr There is no operation to add to sequences! Use this
helper-method to do this.
@@ -190,39 +184,14 @@ class OFrames : public ::cppu::WeakImplHelper<
css::frame::XFrames >
@param "seqDestination", reference to sequence on which
operation will append the other sequence.
@param "seqSource" , reference to sequence for append.
@return "seqDestination" is parameter AND return value at the
same time.
-
*//*-*****************************************************************************************************/
+ */
void impl_appendSequence( css::uno::Sequence<
css::uno::Reference< css::frame::XFrame > >& seqDestination ,
const css::uno::Sequence<
css::uno::Reference< css::frame::XFrame > >& seqSource );
- // 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
- of this class. The return value is used directly for
an ASSERT(...).
-
- @seealso ASSERTs in implementation!
-
- @param references to checking variables
- @return sal_False ,on invalid parameter
- @return sal_True ,otherwise
-
*//*-*****************************************************************************************************/
-
- private:
- static bool impldbg_checkParameter_OFramesCtor ( const
css::uno::Reference< css::frame::XFrame >& xOwner ,
-
FrameContainer* pFrameContainer );
- static bool impldbg_checkParameter_append ( const
css::uno::Reference< css::frame::XFrame >& xFrame );
- static bool impldbg_checkParameter_remove ( const
css::uno::Reference< css::frame::XFrame >& xFrame );
- static bool impldbg_checkParameter_queryFrames ( sal_Int32
nSearchFlags );
-
- // variables
- // (should be private everyway!)
-
private:
- css::uno::WeakReference< css::frame::XFrame > m_xOwner;
/// reference to owner of this instance (Hold no hard reference!)
- FrameContainer*
m_pFrameContainer; /// with owner shared list to hold all direct children of
an XFramesSupplier
- bool
m_bRecursiveSearchProtection; /// flag to protect against recursive searches
of frames at parents
+ css::uno::WeakReference< css::frame::XFrame > m_xOwner; // reference
to owner of this instance (Hold no hard reference)
+ FrameContainer* m_pFrameContainer; // with owner shared list to hold
all direct children of an XFramesSupplier
+ bool m_bRecursiveSearchLock; // used to tune recursive searches of
frames at parents
};
diff --git a/framework/inc/helper/persistentwindowstate.hxx
b/framework/inc/helper/persistentwindowstate.hxx
index b129d32..ea3af1b 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -36,7 +36,7 @@
namespace framework{
-/*-************************************************************************************************************
+/*
@short listener for closing document frames to make her window
state persistent
@descr It's a feature of our office. If a document window was
created by ourself (and not from
any external process e.g. the office bean) we save and
restore the window state of it
@@ -51,7 +51,7 @@ namespace framework{
@devstatus ready
@threadsafe yes
-*//*-*************************************************************************************************************/
+*/
class PersistentWindowState : public ::cppu::WeakImplHelper<
css::lang::XInitialization,
css::frame::XFrameActionListener >
// => XEventListener
diff --git a/framework/inc/helper/tagwindowasmodified.hxx
b/framework/inc/helper/tagwindowasmodified.hxx
index edf9d15..1364a8f 100644
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -35,9 +35,9 @@
namespace framework{
-/*-************************************************************************************************************
+/*
@short listen for modify events on model and tag frame container
window so it can react accordingly
- @descr Used e.g. by our MAC port where such state is shown
separately on some controls of the
+ @descr Used e.g. by our mac os x port where such state is shown
separately on some controls of the
title bar.
@base OWeakObject
@@ -45,7 +45,7 @@ namespace framework{
@devstatus draft
@threadsafe yes
-*//*-*************************************************************************************************************/
+*/
class TagWindowAsModified : public ::cppu::WeakImplHelper<
css::lang::XInitialization,
css::frame::XFrameActionListener, //
=> XEventListener
@@ -69,9 +69,8 @@ class TagWindowAsModified : public ::cppu::WeakImplHelper<
public:
- // ctor/dtor
TagWindowAsModified();
- virtual ~TagWindowAsModified(
);
+ virtual ~TagWindowAsModified();
// XInterface, XTypeProvider
diff --git a/framework/inc/helper/titlebarupdate.hxx
b/framework/inc/helper/titlebarupdate.hxx
index f085ba6..dcb5a39 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -36,12 +36,12 @@
namespace framework{
-/*-************************************************************************************************************
+/*
@short helps our frame on setting title/icon on the titlebar
(including updates)
@devstatus draft
@threadsafe yes
-*//*-*************************************************************************************************************/
+*/
class TitleBarUpdate : public ::cppu::WeakImplHelper<
css::lang::XInitialization
, css::frame::XTitleChangeListener // =>
XEventListener
diff --git a/framework/inc/recipients.h b/framework/inc/recipients.h
new file mode 100644
index 0000000..e9540e0
--- /dev/null
+++ b/framework/inc/recipients.h
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_FRAMEWORK_INC_RECIPIENTS_H
+#define INCLUDED_FRAMEWORK_INC_RECIPIENTS_H
+
+namespace framework {
+
+// Values for special frame search ... sName of findFrame() or
queryDispatch() or loadComponentFromURL()
+
+#define SPECIAL_SELF "_self" // The
frame himself is searched.
+#define SPECIAL_PARENT "_parent" // The
direct parent frame is searched.
+#define SPECIAL_TOP "_top" // Search
at our parents for the first task (if any exist) or a frame without a parent.
+#define SPECIAL_BLANK "_blank" // Create
a new task.
+#define SPECIAL_DEFAULT "_default" // Create
a new task or recycle an existing one
+#define SPECIAL_BEAMER "_beamer" // special
frame in hierarchy
+#define SPECIAL_HELPTASK "OFFICE_HELP_TASK" // special
name for our help task
+
+} // namespace framework
+
+#endif // INCLUDED_FRAMEWORK_INC_RECIPIENTS_H
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/desktop.hxx
b/framework/inc/services/desktop.hxx
index e8fd001..4a2580d 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -66,7 +66,7 @@ enum ELoadState
E_INTERACTION
};
-/*-************************************************************************************************************
+/*
@short implement the topframe of frame tree
@descr This is the root of the frame tree. The desktop has no window,
is not visible but he is the logical
"masternode" to build the hierarchy.
@@ -90,7 +90,7 @@ enum ELoadState
@devstatus ready to use
@threadsafe yes
-*//*-*************************************************************************************************************/
+*/
typedef cppu::WeakComponentImplHelper<
css::lang::XServiceInfo ,
css::frame::XDesktop2 ,
@@ -219,8 +219,8 @@ class Desktop : private cppu::BaseMutex,
// XComponentLoader
virtual css::uno::Reference< css::lang::XComponent >
SAL_CALL loadComponentFromURL ( const OUString&
sURL ,
-
const OUString&
sTargetFrameName ,
-
sal_Int32
nSearchFlags ,
+
const OUString&
sRecipientFrameName ,
+
sal_Int32
nSearchOptions ,
const css::uno::Sequence<
css::beans::PropertyValue >& lArguments ) throw(
css::io::IOException ,
css::lang::IllegalArgumentException ,
css::uno::RuntimeException,
std::exception ) override;
@@ -231,8 +231,8 @@ class Desktop : private cppu::BaseMutex,
// XDispatchProvider
virtual css::uno::Reference< css::frame::XDispatch >
SAL_CALL queryDispatch ( const css::util::URL&
aURL ,
-
const OUString&
sTargetFrameName ,
-
sal_Int32
nSearchFlags ) throw( css::uno::RuntimeException,
std::exception ) override;
+
const OUString&
sRecipientFrameName ,
+
sal_Int32
nSearchOptions ) throw(
css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch
> > SAL_CALL queryDispatches ( const css::uno::Sequence<
css::frame::DispatchDescriptor >& lQueries ) throw(
css::uno::RuntimeException, std::exception ) override;
// XDispatchProviderInterception
@@ -246,8 +246,8 @@ class Desktop : private cppu::BaseMutex,
// XFrame
// Attention: findFrame() is implemented only! Other methods make no
sense for our desktop!
- virtual css::uno::Reference< css::frame::XFrame >
SAL_CALL findFrame ( const OUString&
sTargetFrameName ,
-
sal_Int32
nSearchFlags ) throw( css::uno::RuntimeException,
std::exception ) override;
+ virtual css::uno::Reference< css::frame::XFrame >
SAL_CALL findFrame ( const OUString&
sRecipientFrameName ,
+
sal_Int32
nSearchOptions ) throw(
css::uno::RuntimeException, std::exception ) override;
virtual void
SAL_CALL initialize ( const css::uno::Reference<
css::awt::XWindow >& xWindow ) throw(
css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Reference< css::awt::XWindow >
SAL_CALL getContainerWindow (
) throw( css::uno::RuntimeException,
std::exception ) override;
virtual void
SAL_CALL setCreator ( const css::uno::Reference<
css::frame::XFramesSupplier >& xCreator ) throw(
css::uno::RuntimeException, std::exception ) override;
@@ -408,7 +408,7 @@ class Desktop : private cppu::BaseMutex,
css::uno::Reference< css::frame::XFrames >
m_xFramesHelper; /// helper for XFrames, XIndexAccess, XElementAccess
and implementation of a childcontainer!
css::uno::Reference< css::frame::XDispatchProvider >
m_xDispatchHelper; /// helper to dispatch something for new tasks,
created by "_blank"!
ELoadState
m_eLoadState; /// hold information about state of asynchron loading
of component for loadComponentFromURL()!
- css::uno::Reference< css::frame::XFrame >
m_xLastFrame; /// last target of "loadComponentFromURL()"!
+ css::uno::Reference< css::frame::XFrame >
m_xLastFrame; /// last frame of loadComponentFromURL()
css::uno::Any
m_aInteractionRequest;
bool
m_bSuspendQuickstartVeto; /// don't ask quickstart for a veto
std::unique_ptr<SvtCommandOptions>
m_xCommandOptions; /// ref counted class to support disabling commands
defined by configuration file
diff --git a/framework/inc/services/dispatchhelper.hxx
b/framework/inc/services/dispatchhelper.hxx
index de8e972..2691153 100644
--- a/framework/inc/services/dispatchhelper.hxx
+++ b/framework/inc/services/dispatchhelper.hxx
@@ -81,8 +81,8 @@ class DispatchHelper : public ::cppu::WeakImplHelper<
css::lang::XServiceInfo,cs
virtual css::uno::Any SAL_CALL executeDispatch(
const css::uno::Reference<
css::frame::XDispatchProvider >& xDispatchProvider ,
const OUString&
sURL ,
- const OUString&
sTargetFrameName ,
- sal_Int32
nSearchFlags ,
+ const OUString&
sRecipientFrameName ,
+ sal_Int32
nSearchOptions ,
const css::uno::Sequence<
css::beans::PropertyValue >& lArguments )
throw(css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx
b/framework/inc/services/mediatypedetectionhelper.hxx
index e19923a..d39824f 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -33,7 +33,7 @@
namespace framework{
-/*-************************************************************************************************************
+/*
@implements XInterface
XTypeProvider
XServiceInfo
@@ -41,29 +41,27 @@ namespace framework{
@base OWeakObject
@devstatus deprecated
-*//*-*************************************************************************************************************/
+*/
class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper<
css::util::XStringMapping, css::lang::XServiceInfo>
{
- // public methods
-
public:
// constructor / destructor
-
/*-****************************************************************************************************
+ /*
@short standard ctor
@descr These initialize a new instance of this class with all
needed information for work.
@param "xFactory", reference to factory which has created our
owner(!). We can use these to create new uno-services.
-
*//*-*****************************************************************************************************/
+ */
MediaTypeDetectionHelper( const css::uno::Reference<
css::lang::XMultiServiceFactory >& xFactory );
-
/*-****************************************************************************************************
+ /*
@short standard destructor
@descr This method destruct an instance of this class and
clear some member.
-
*//*-*****************************************************************************************************/
+ */
virtual ~MediaTypeDetectionHelper();
@@ -73,9 +71,6 @@ class MediaTypeDetectionHelper : public
::cppu::WeakImplHelper< css::util::XS
// XStringMapping
-
/*-****************************************************************************************************
-
*//*-*****************************************************************************************************/
-
virtual sal_Bool SAL_CALL mapStrings(css::uno::Sequence< OUString >&
seqParameter)
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/targets.h b/framework/inc/targets.h
deleted file mode 100644
index a15db1e..0000000
--- a/framework/inc/targets.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_FRAMEWORK_INC_TARGETS_H
-#define INCLUDED_FRAMEWORK_INC_TARGETS_H
-
-namespace framework{
-
-// Values for special frame search ... sTargetFrameName of findFrame() or
queryDispatch() or loadComponentFromURL()
-
-#define SPECIALTARGET_SELF "_self" //
The frame himself is searched.
-#define SPECIALTARGET_PARENT "_parent" //
The direct parent frame is searched.
-#define SPECIALTARGET_TOP "_top" //
Search at our parents for the first task (if any exist) or a frame without a
parent.
-#define SPECIALTARGET_BLANK "_blank" //
Create a new task.
-#define SPECIALTARGET_DEFAULT "_default" //
Create a new task or recycle an existing one
-#define SPECIALTARGET_BEAMER "_beamer" //
special frame in hierarchy
-#define SPECIALTARGET_HELPTASK "OFFICE_HELP_TASK" //
special name for our help task
-
-} // namespace framework
-
-#endif // INCLUDED_FRAMEWORK_INC_TARGETS_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/gate.hxx
b/framework/inc/threadhelp/gate.hxx
index 0c04660..7ff4489 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -26,16 +26,14 @@
namespace framework{
-/*-************************************************************************************************************
+/*
@short implement a gate to block multiple threads at same time or
unblock all
@descr A gate can be used as a negative-condition! You can open a
"door" - wait() will not block ...
or you can close it - wait() blocks till open() is called
again.
Then all currently waiting threads are running immediately
- but new ones are blocked!
@attention To prevent us against wrong using, the default ctor, copy
ctor and the =operator are marked private!
-
- @devstatus ready to use
-*//*-*************************************************************************************************************/
+*/
class Gate
{
@@ -43,43 +41,45 @@ class Gate
public:
-
/*-****************************************************************************************************
+ /*
@short ctor
@descr These initialize the object right as an open gate.
-
*//*-*****************************************************************************************************/
+ */
inline Gate()
: m_bClosed ( false )
{
open();
}
-
/*-****************************************************************************************************
+ /*
@short dtor
@descr Is user forget it - we open the gate ...
blocked threads can running ... but I don't know
if it's right - we are destroyed yet!?
-
*//*-*****************************************************************************************************/
+ */
inline ~Gate()
{
open();
}
-
/*-****************************************************************************************************
+
+ /*
@short copy-ctor
@descr Forbid copy construction
-
*//*-*****************************************************************************************************/
+ */
Gate(const Gate&) = delete;
-
/*-****************************************************************************************************
+
+ /*
@short copy-assignment
@descr Forbid copy assiging
-
*//*-*****************************************************************************************************/
+ */
Gate& operator=(const Gate&) = delete;
-
/*-****************************************************************************************************
+ /*
@short open the gate
@descr A wait() call will not block then.
@seealso method close()
-
*//*-*****************************************************************************************************/
+ */
void open()
{
// We must safe access to our internal member!
@@ -91,12 +91,12 @@ class Gate
m_bClosed = !m_aPassage.check();
}
-
/*-****************************************************************************************************
+ /*
@short close the gate
@descr A wait() call will block then.
@seealso method open()
-
*//*-*****************************************************************************************************/
+ */
void close()
{
// We must safe access to our internal member!
@@ -108,7 +108,7 @@ class Gate
m_bClosed = !m_aPassage.check();
}
-
/*-****************************************************************************************************
+ /*
@short must be called to pass the gate
@descr If gate "open" => wait() will not block.
If gate "closed" => wait() will block till somewhere
open it again.
@@ -116,7 +116,7 @@ class Gate
@seealso method wait()
@seealso method open()
-
*//*-*****************************************************************************************************/
+ */
void wait()
{
// We must safe access to our internal member!
diff --git a/framework/inc/threadhelp/transactionbase.hxx
b/framework/inc/threadhelp/transactionbase.hxx
index ada6202..426107f 100644
--- a/framework/inc/threadhelp/transactionbase.hxx
+++ b/framework/inc/threadhelp/transactionbase.hxx
@@ -24,19 +24,17 @@
namespace framework{
-/*-************************************************************************************************************
+/*
@short make it possible to instanciate a transacion manager as
first member!
@descr If you use a transaction manager as a member of your class
and wish to use it earlier then other ones
you should have a look on this implementation. You must
use it as the first base class
of your implementation - because base classes are
initialized by his order and before your
member! Thats why ist a good place to declare this member.
@devstatus ready to use
-*//*-*************************************************************************************************************/
+*/
struct TransactionBase
{
- // public member
-
public:
mutable TransactionManager m_aTransactionManager; /// "your"
public manager-member!
diff --git a/framework/inc/threadhelp/transactionmanager.hxx
b/framework/inc/threadhelp/transactionmanager.hxx
index a4a6e9d..c46bfc8 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -31,7 +31,7 @@
namespace framework{
-/*-************************************************************************************************************
+/*
@descr Describe different states of a feature of following
implementation.
During lifetime of an object different working states
occur:
initialization - working - closing - closed
@@ -40,7 +40,7 @@ namespace framework{
call an interface method (initialize phase means startup
time from creating object till
calling specified first method e.g.
XInitialization::initialze()!) then you should refuse
this call. The same for closing/disposing the object!
-*//*-*************************************************************************************************************/
+*/
enum EWorkingMode
{
E_INIT , // We stand in a init method -> some calls are accepted
- some one are rejected
@@ -49,7 +49,7 @@ enum EWorkingMode
E_CLOSE // Object is dead! -> all calls are rejected!
};
-/*-************************************************************************************************************
+/*
@descr A transaction object should support throwing exceptions if
user used it at wrong working mode.
e.g. We can throw a DisposedException if user try to work
and our mode is E_CLOSE!
But sometimes he doesn't need this feature - will handle
it by himself.
@@ -78,14 +78,14 @@ enum EWorkingMode
Normally (if E_HARDEXCEPTIONS
was used!) creation of guard
will throw an exception ...
but using of E_SOFTEXCEPTIONS suppress it
and member "A" can be set.
-*//*-*************************************************************************************************************/
+*/
enum EExceptionMode
{
E_HARDEXCEPTIONS,
E_SOFTEXCEPTIONS
};
-/*-************************************************************************************************************
+/*
@short implement a transaction manager to support non breakable
interface methods
@descr Use it to support non breakable interface methods without
using any thread
synchronization like e.g. mutex, rw-lock!
@@ -94,7 +94,7 @@ enum EExceptionMode
and react for it. You can enable automatically throwing of
exceptions too.
@devstatus draft
-*//*-*************************************************************************************************************/
+*/
class FWI_DLLPUBLIC TransactionManager
{
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx
b/framework/inc/uiconfiguration/imagemanager.hxx
index 8c46073..822c48b 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -87,11 +87,11 @@ namespace framework
css::uno::RuntimeException,
std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getAllImageNames(
::sal_Int16 nImageType ) throw (css::uno::RuntimeException, std::exception)
override;
- virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const
OUString& aCommandURL ) throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::uno::Reference<
css::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const
css::uno::Sequence< OUString >& aCommandURLSequence ) throw
(css::lang::IllegalArgumentException, css::uno::RuntimeException,
std::exception) override;
- virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const
css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence<
css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw
(css::lang::IllegalArgumentException, css::lang::IllegalAccessException,
css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const
OUString& aActionURL ) throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Reference<
css::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const
css::uno::Sequence< OUString >& aActionURLSequence ) throw
(css::lang::IllegalArgumentException, css::uno::RuntimeException,
std::exception) override;
+ virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const
css::uno::Sequence< OUString >& aActionURLSequence, const css::uno::Sequence<
css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw
(css::lang::IllegalArgumentException, css::lang::IllegalAccessException,
css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const
css::uno::Sequence< OUString >& aResourceURLSequence ) throw
(css::lang::IllegalArgumentException, css::lang::IllegalAccessException,
css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const
css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence<
css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw
(css::container::ElementExistException, css::lang::IllegalArgumentException,
css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const
css::uno::Sequence< OUString >& aActionURLSequence, const css::uno::Sequence<
css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw
(css::container::ElementExistException, css::lang::IllegalArgumentException,
css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
override;
// XUIConfiguration
virtual void SAL_CALL addConfigurationListener( const
css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw
(css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx
b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index e3009a8..3dcef86 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -72,11 +72,11 @@ namespace framework
css::uno::RuntimeException,
std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getAllImageNames(
::sal_Int16 nImageType ) throw (css::uno::RuntimeException, std::exception)
override;
- virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const
OUString& aCommandURL ) throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::uno::Reference<
css::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const
css::uno::Sequence< OUString >& aCommandURLSequence ) throw
(css::lang::IllegalArgumentException, css::uno::RuntimeException,
std::exception) override;
- virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const
css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence<
css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw
(css::lang::IllegalArgumentException, css::lang::IllegalAccessException,
css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const
OUString& aActionURL ) throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Reference<
css::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const
css::uno::Sequence< OUString >& aActionURLSequence ) throw
(css::lang::IllegalArgumentException, css::uno::RuntimeException,
std::exception) override;
+ virtual void SAL_CALL replaceImages( ::sal_Int16 nImageType, const
css::uno::Sequence< OUString >& aActionURLSequence, const css::uno::Sequence<
css::uno::Reference< css::graphic::XGraphic > >& aGraphicsSequence ) throw
(css::lang::IllegalArgumentException, css::lang::IllegalAccessException,
css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeImages( ::sal_Int16 nImageType, const
css::uno::Sequence< OUString >& aResourceURLSequence ) throw
(css::lang::IllegalArgumentException, css::lang::IllegalAccessException,
css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const
css::uno::Sequence< OUString >& aCommandURLSequence, const css::uno::Sequence<
css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw
(css::container::ElementExistException, css::lang::IllegalArgumentException,
css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL insertImages( ::sal_Int16 nImageType, const
css::uno::Sequence< OUString >& aActionURLSequence, const css::uno::Sequence<
css::uno::Reference< css::graphic::XGraphic > >& aGraphicSequence ) throw
(css::container::ElementExistException, css::lang::IllegalArgumentException,
css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception)
override;
// XUIConfiguration
virtual void SAL_CALL addConfigurationListener( const
css::uno::Reference< css::ui::XUIConfigurationListener >& Listener ) throw
(css::uno::RuntimeException, std::exception) override;
diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx
b/framework/inc/uielement/buttontoolbarcontroller.hxx
index 01ffc85..f6234dd 100644
--- a/framework/inc/uielement/buttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/buttontoolbarcontroller.hxx
@@ -87,7 +87,7 @@ class ButtonToolbarController : public
css::frame::XStatusListener,
private:
bool m_bInitialized
: 1,
m_bDisposed : 1;
- OUString m_aCommandURL;
+ OUString m_aActionURL;
css::uno::Reference< css::frame::XFrame > m_xFrame;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::util::XURLTransformer >
m_xURLTransformer;
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx
b/framework/inc/uielement/complextoolbarcontroller.hxx
index a20e4b7..f690317 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -59,10 +59,10 @@ class ComplexToolbarController : public
svt::ToolboxController
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
