summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-06 20:25:20 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-06 20:27:21 +0300
commitd9701f0ebce5b06212a9361ce753f3bf17510418 (patch)
treee4c035be2e7a4313266164cfcdead0649c1650f6 /framework/inc
parent6d27b176fba61653e74f4179451308b9a7a889a8 (diff)
Typo: s/ouer/our
Change-Id: I0179678c6c5dd6a05b1d7d5038a901e7bf2af3de
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/dispatch/dispatchprovider.hxx2
-rw-r--r--framework/inc/dispatch/interceptionhelper.hxx2
-rw-r--r--framework/inc/dispatch/menudispatcher.hxx2
-rw-r--r--framework/inc/dispatch/popupmenudispatcher.hxx2
-rw-r--r--framework/inc/helper/dockingareadefaultacceptor.hxx2
-rw-r--r--framework/inc/helper/ocomponentaccess.hxx8
-rw-r--r--framework/inc/helper/ocomponentenumeration.hxx2
-rw-r--r--framework/inc/helper/oframes.hxx10
-rw-r--r--framework/inc/queries.h2
-rw-r--r--framework/inc/services/mediatypedetectionhelper.hxx2
-rw-r--r--framework/inc/targets.h2
11 files changed, 18 insertions, 18 deletions
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index 9aa714344415..8f15e13be11a 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -66,7 +66,7 @@ enum EDispatchHelper
- 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 ouer OWNER - not to ouer SUPERCLASS!
+ XInterface will be ambigous and we hold a weakreference to our OWNER - not to our SUPERCLASS!
@base OWeakObject
provides ref count and weak mechanism
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index 06a7c79c9123..199c47e2de4b 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -45,7 +45,7 @@ namespace framework{
master/slave functionality AND using of optional features like registration of URL pattern!
@attention Don't use this class as direct member - use it dynamicly. Do not derive from this class.
- We hold a weakreference to ouer owner not to ouer superclass.
+ We hold a weakreference to our owner not to our superclass.
*/
class InterceptionHelper : public ::cppu::WeakImplHelper3<
css::frame::XDispatchProvider,
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 7bc067103448..48abdd4f8b52 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -58,7 +58,7 @@ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString ,
/*-************************************************************************************************************
@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 ouer OWNER - not to ouer SUPERCLASS!
+ XInterface will be ambigous and we hold a weakcss::uno::Reference to our OWNER - not to our SUPERCLASS!
@implements XInterface
XDispatch
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 518ed3df3930..82b501588d14 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -60,7 +60,7 @@ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString ,
/*-************************************************************************************************************
@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 ouer OWNER - not to our SUPERCLASS!
+ XInterface will be ambigous and we hold a weakcss::uno::Reference to our OWNER - not to our SUPERCLASS!
@implements XInterface
XDispatch
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index 1920a7b766b0..eed6faf3b339 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -47,7 +47,7 @@ class DockingAreaDefaultAcceptor : public ::cppu::WeakImplHelper1< ::com::s
@seealso class Desktop
@seealso class OTasksEnumeration
- @param "xOwner" is a reference to ouer owner and must be the desktop!
+ @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.
*//*-*****************************************************************************************************/
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index de46a8238ca8..82dc392a319a 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -39,8 +39,8 @@ namespace framework{
/*-************************************************************************************************************
@short implement XEnumerationAccess interface as helper to create many oneway enumeration of components
- @descr We share mutex and framecontainer with ouer owner and have full access to his child tasks.
- (Ouer owner can be the Desktop only!) We create oneway enumerations on demand. These "lists"
+ @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"
can be used for one time only. Step during the list from first to last element.
(The type of created enumerations is OComponentEnumeration.)
@@ -72,7 +72,7 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co
@seealso class Desktop
@seealso class OComponentEnumeration
- @param "xOwner" is a reference to ouer owner and must be the desktop!
+ @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.
*//*-*****************************************************************************************************/
@@ -121,7 +121,7 @@ class OComponentAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::co
@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.
- We hold a weakreference to ouer owner and not to ouer superclass!
+ We hold a weakreference to our owner and not to our superclass!
Thats the reason for a protected dtor.
@seealso class Desktop
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index d9a3396b7e59..d05d798af598 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -74,7 +74,7 @@ class OComponentEnumeration : public ::cppu::WeakImplHelper2< ::com::sun::star
/*-****************************************************************************************************
@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 ouer list and release all references to other objects.
+ Then we must destroy our list and release all references to other objects.
@seealso interface XEventListener
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index f9e52d786d0f..010ae1ba4482 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -37,9 +37,9 @@ 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 ouer owner.
+ @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;
- we have the same information as ouer owner. In current implementation we use mutex and lock-mechanism
+ we have the same information as our owner. In current implementation we use mutex and lock-mechanism
to prevent against compete access. In future we plan support of semaphore!
@devstatus deprecated
@@ -50,7 +50,7 @@ namespace framework{
@base OWeakObject
@ATTENTION Don't use this class as direct member - use it dynamicly. Do not derive from this class.
- We hold a weakreference to ouer owner not to ouer superclass.
+ We hold a weakreference to our owner not to our superclass.
@devstatus deprecated
*//*-*************************************************************************************************************/
@@ -62,7 +62,7 @@ class OFrames : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFr
@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 ouer owner. We hold a wekreference to prevent us against cross-references!
+ @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 ,
@@ -72,7 +72,7 @@ class OFrames : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFr
/*-****************************************************************************************************
@short append frame to container
- @descr We share the container with ouer owner. We can do this only, if no lock is set on 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!
@seealso class FrameContainer
diff --git a/framework/inc/queries.h b/framework/inc/queries.h
index 968d0835fcc1..4ba853cf0840 100644
--- a/framework/inc/queries.h
+++ b/framework/inc/queries.h
@@ -30,7 +30,7 @@ namespace framework{
/*-************************************************************************************************************
@short These values describe our supported queries for type, filter ... properties.
- They are used by our FilterFactory or ouer TypeDetection to return
+ They are used by our FilterFactory or our TypeDetection to return
subsets of our cached configuration.
*//*-*************************************************************************************************************/
#define BASE_QUERY_ALL DECLARE_ASCII("_query_all" )
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index a6690bcbb5d7..3c0ca9927718 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -56,7 +56,7 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun::
/*-****************************************************************************************************
@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 ouer owner(!). We can use these to create new uno-services.
+ @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 );
diff --git a/framework/inc/targets.h b/framework/inc/targets.h
index d574e9058cce..a266bc59b9b7 100644
--- a/framework/inc/targets.h
+++ b/framework/inc/targets.h
@@ -28,7 +28,7 @@ namespace framework{
#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.
+#define SPECIALTARGET_ASCII_TOP "_top" // Search at our parents for the first task (if any exist) or a frame without a parent.
#define SPECIALTARGET_ASCII_BLANK "_blank" // Create a new task.
#define SPECIALTARGET_ASCII_DEFAULT "_default" // Create a new task or recycle an existing one
#define SPECIALTARGET_ASCII_BEAMER "_beamer" // special frame in hierarchy