You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/10/15 11:47:48 UTC
[openoffice] branch AOO42X updated: Fixed typos (ouer -> our) and
some more
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 6b5a962 Fixed typos (ouer -> our) and some more
6b5a962 is described below
commit 6b5a962bdc79fa32183f6a2d11a360e4f77e4056
Author: mseidel <ms...@apache.org>
AuthorDate: Thu Oct 15 13:45:48 2020 +0200
Fixed typos (ouer -> our) and some more
(cherry picked from commit b12a77c9de73410d92ad280a3c79a4e8692534ea)
---
main/avmedia/source/framework/soundhandler.cxx | 4 +-
main/framework/inc/dispatch/blankdispatcher.hxx | 2 +-
main/framework/inc/dispatch/createdispatcher.hxx | 2 +-
main/framework/inc/dispatch/dispatchprovider.hxx | 2 +-
main/framework/inc/dispatch/menudispatcher.hxx | 2 +-
.../framework/inc/dispatch/popupmenudispatcher.hxx | 2 +-
main/framework/inc/dispatch/selfdispatcher.hxx | 2 +-
.../inc/helper/dockingareadefaultacceptor.hxx | 2 +-
main/framework/inc/helper/ocomponentaccess.hxx | 10 ++--
.../framework/inc/helper/ocomponentenumeration.hxx | 4 +-
main/framework/inc/helper/oframes.hxx | 12 ++--
main/framework/inc/helper/otasksaccess.hxx | 8 +--
main/framework/inc/helper/otasksenumeration.hxx | 2 +-
main/framework/inc/queries.h | 2 +-
main/framework/inc/services/frameloaderfactory.hxx | 2 +-
.../inc/services/mediatypedetectionhelper.hxx | 2 +-
main/framework/inc/targets.h | 2 +-
main/framework/source/application/framework.cxx | 4 +-
main/framework/source/dispatch/closedispatcher.cxx | 2 +-
main/framework/source/dispatch/menudispatcher.cxx | 2 +-
.../framework/source/fwe/classes/addonsoptions.cxx | 16 ++---
main/framework/source/helper/oframes.cxx | 16 ++---
main/framework/source/services/desktop.cxx | 16 ++---
main/framework/source/services/frame.cxx | 20 +++----
.../OfficeDev/DesktopEnvironment/IOnewayLink.java | 4 +-
.../DesktopEnvironment/OnewayExecutor.java | 4 +-
.../DesktopEnvironment/StatusListener.java | 2 +-
.../schema/org/openoffice/TypeDetection/Types.xcs | 2 +-
main/sfx2/source/sidebar/DeckLayouter.cxx | 38 ++++++------
main/sfx2/source/sidebar/SidebarController.cxx | 68 +++++++++++-----------
main/svtools/source/config/menuoptions.cxx | 32 +++++-----
main/svtools/source/config/miscopt.cxx | 20 +++----
main/svtools/source/config/optionsdrawinglayer.cxx | 12 ++--
main/svtools/source/config/printoptions.cxx | 18 +++---
main/svx/source/svdraw/svdview.cxx | 2 +-
main/unotools/inc/unotools/historyoptions.hxx | 2 +-
main/unotools/inc/unotools/securityoptions.hxx | 2 +-
main/unotools/source/config/cacheoptions.cxx | 12 ++--
main/unotools/source/config/cmdoptions.cxx | 20 +++----
main/unotools/source/config/compatibility.cxx | 10 ++--
main/unotools/source/config/dynamicmenuoptions.cxx | 18 +++---
.../source/config/extendedsecurityoptions.cxx | 14 ++---
main/unotools/source/config/fontoptions.cxx | 18 +++---
main/unotools/source/config/historyoptions.cxx | 10 ++--
main/unotools/source/config/internaloptions.cxx | 12 ++--
.../unotools/source/config/localisationoptions.cxx | 18 +++---
main/unotools/source/config/moduleoptions.cxx | 4 +-
.../unotools/source/config/printwarningoptions.cxx | 10 ++--
main/unotools/source/config/securityoptions.cxx | 12 ++--
main/unotools/source/config/startoptions.cxx | 20 +++----
main/unotools/source/config/workingsetoptions.cxx | 20 +++----
51 files changed, 273 insertions(+), 269 deletions(-)
diff --git a/main/avmedia/source/framework/soundhandler.cxx b/main/avmedia/source/framework/soundhandler.cxx
index 3227240..354401e 100644
--- a/main/avmedia/source/framework/soundhandler.cxx
+++ b/main/avmedia/source/framework/soundhandler.cxx
@@ -114,7 +114,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL SoundHandler::getImplementationId() thro
{
/* Ready for multithreading; get global mutex for first call of this method only! see before */
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- /* Control these pointer again ... it can be, that another instance will be faster then these! */
+ /* Control these pointer again ... it can be, that another instance will be faster than these! */
if ( pID == NULL )
{
/* Create a new static ID ... */
@@ -138,7 +138,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs
{
/* Ready for multithreading; get global mutex for first call of this method only! see before */
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- /* Control these pointer again ... it can be, that another instance will be faster then these! */
+ /* Control these pointer again ... it can be, that another instance will be faster than these! */
if ( pTypeCollection == NULL )
{
/* Create a static typecollection ... */
diff --git a/main/framework/inc/dispatch/blankdispatcher.hxx b/main/framework/inc/dispatch/blankdispatcher.hxx
index 62aa583..537d84d 100644
--- a/main/framework/inc/dispatch/blankdispatcher.hxx
+++ b/main/framework/inc/dispatch/blankdispatcher.hxx
@@ -55,7 +55,7 @@ namespace framework{
/*-************************************************************************************************************//**
@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 weakreference to ouer OWNER - not to ouer SUPERCLASS!
+ XInterface will be ambiguous and we hold a weakreference to our OWNER - not to our SUPERCLASS!
@implements XInterface
XDispatch
diff --git a/main/framework/inc/dispatch/createdispatcher.hxx b/main/framework/inc/dispatch/createdispatcher.hxx
index 92a444a..f535fd0 100644
--- a/main/framework/inc/dispatch/createdispatcher.hxx
+++ b/main/framework/inc/dispatch/createdispatcher.hxx
@@ -63,7 +63,7 @@ namespace framework{
Then we wait for our own dispose and do nothing.
@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 ambiguous and we hold a weakreference to our OWNER - not to our SUPERCLASS!
@implements XInterface
XDispatch
diff --git a/main/framework/inc/dispatch/dispatchprovider.hxx b/main/framework/inc/dispatch/dispatchprovider.hxx
index bc747b4..4a17513 100644
--- a/main/framework/inc/dispatch/dispatchprovider.hxx
+++ b/main/framework/inc/dispatch/dispatchprovider.hxx
@@ -93,7 +93,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 ambiguous and we hold a weakreference to our OWNER - not to our SUPERCLASS!
@base ThreadHelpBase
supports threadsafe mechanism
diff --git a/main/framework/inc/dispatch/menudispatcher.hxx b/main/framework/inc/dispatch/menudispatcher.hxx
index c4b0371..a2c2867 100644
--- a/main/framework/inc/dispatch/menudispatcher.hxx
+++ b/main/framework/inc/dispatch/menudispatcher.hxx
@@ -89,7 +89,7 @@ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::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 ambiguous and we hold a weakcss::uno::Reference to our OWNER - not to our SUPERCLASS!
@implements XInterface
XDispatch
diff --git a/main/framework/inc/dispatch/popupmenudispatcher.hxx b/main/framework/inc/dispatch/popupmenudispatcher.hxx
index 060599a..25ab174 100644
--- a/main/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/main/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -101,7 +101,7 @@ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::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 ambiguous and we hold a weakcss::uno::Reference to our OWNER - not to our SUPERCLASS!
@implements XInterface
XDispatch
diff --git a/main/framework/inc/dispatch/selfdispatcher.hxx b/main/framework/inc/dispatch/selfdispatcher.hxx
index 2b154e4..18024bc 100644
--- a/main/framework/inc/dispatch/selfdispatcher.hxx
+++ b/main/framework/inc/dispatch/selfdispatcher.hxx
@@ -57,7 +57,7 @@ namespace framework{
@descr You should use it as dispatcher for "_self", flag::SELF ... cases, to load a document into an
owner frame without creation of a new one.
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 ambiguous and we hold a weakreference to our OWNER - not to our SUPERCLASS!
@implements XInterface
XDispatch
diff --git a/main/framework/inc/helper/dockingareadefaultacceptor.hxx b/main/framework/inc/helper/dockingareadefaultacceptor.hxx
index a066dd7..f68088b 100644
--- a/main/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/main/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -73,7 +73,7 @@ class DockingAreaDefaultAcceptor : private ThreadHelpBase
@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.
@return -
diff --git a/main/framework/inc/helper/ocomponentaccess.hxx b/main/framework/inc/helper/ocomponentaccess.hxx
index 1ff5215..098df1a 100644
--- a/main/framework/inc/helper/ocomponentaccess.hxx
+++ b/main/framework/inc/helper/ocomponentaccess.hxx
@@ -67,8 +67,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.)
@@ -105,7 +105,7 @@ class OComponentAccess : private ThreadHelpBase , // Must
@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!
@return -
@onerror Do nothing and reset this object to default with an empty list.
@@ -177,8 +177,8 @@ class OComponentAccess : private ThreadHelpBase , // Must
/*-****************************************************************************************************//**
@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!
+ Don't use an instance of this class as normal member. Use it dynamically with a pointer.
+ We hold a weakreference to our owner and not to our superclass!
That's the reason for a protected dtor.
@seealso class Desktop
diff --git a/main/framework/inc/helper/ocomponentenumeration.hxx b/main/framework/inc/helper/ocomponentenumeration.hxx
index b07d4ed..ecf0ad2 100644
--- a/main/framework/inc/helper/ocomponentenumeration.hxx
+++ b/main/framework/inc/helper/ocomponentenumeration.hxx
@@ -115,8 +115,8 @@ class OComponentEnumeration : public ThreadHelpBase ,
/*-****************************************************************************************************//**
@short last chance to release all references and free memory
- @descr This method is called, if the enumeration is used completly and has no more elements.
- Then we must destroy ouer list and release all references to other objects.
+ @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.
@seealso interface XEventListener
diff --git a/main/framework/inc/helper/oframes.hxx b/main/framework/inc/helper/oframes.hxx
index 99de779..fcc3347 100644
--- a/main/framework/inc/helper/oframes.hxx
+++ b/main/framework/inc/helper/oframes.hxx
@@ -65,9 +65,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
@@ -78,7 +78,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
*//*-*************************************************************************************************************/
@@ -103,8 +103,8 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
@seealso -
- @param "xFactory" , reference to factory which has created ouer owner(!). We can use these to create new uno-services.
- @param "xOwner" , reference to ouer owner. We hold a wekreference to prevent us against cross-references!
+ @param "xFactory" , reference to factory which has created our owner(!). We can use these to create new uno-services.
+ @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!
@return -
@@ -121,7 +121,7 @@ class OFrames : private ThreadHelpBase , // Must be the first of base
/*-****************************************************************************************************//**
@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/main/framework/inc/helper/otasksaccess.hxx b/main/framework/inc/helper/otasksaccess.hxx
index 7d7333c..66eddfa 100644
--- a/main/framework/inc/helper/otasksaccess.hxx
+++ b/main/framework/inc/helper/otasksaccess.hxx
@@ -65,8 +65,8 @@ namespace framework{
/*-************************************************************************************************************//**
@short implement XEnumerationAccess interface as helper to create many oneway enumeration of tasks
- @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 OTasksEnumeration.)
@@ -103,7 +103,7 @@ class OTasksAccess : public css::lang::XTypeProvider ,
@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.
@return -
@@ -185,7 +185,7 @@ class OTasksAccess : public css::lang::XTypeProvider ,
@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!
That's the reason for a protected dtor.
@seealso class Desktop
diff --git a/main/framework/inc/helper/otasksenumeration.hxx b/main/framework/inc/helper/otasksenumeration.hxx
index b5a1e62..c5883a8 100644
--- a/main/framework/inc/helper/otasksenumeration.hxx
+++ b/main/framework/inc/helper/otasksenumeration.hxx
@@ -126,7 +126,7 @@ class OTasksEnumeration : public css::lang::XTypeProvider ,
/*-****************************************************************************************************//**
@short last chance to release all references and free memory
@descr This method is called, if the enumeration is used completly 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/main/framework/inc/queries.h b/main/framework/inc/queries.h
index 521debb..e2c21f4 100644
--- a/main/framework/inc/queries.h
+++ b/main/framework/inc/queries.h
@@ -49,7 +49,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/main/framework/inc/services/frameloaderfactory.hxx b/main/framework/inc/services/frameloaderfactory.hxx
index 020e3e5..fbc1076 100644
--- a/main/framework/inc/services/frameloaderfactory.hxx
+++ b/main/framework/inc/services/frameloaderfactory.hxx
@@ -131,7 +131,7 @@ class FrameLoaderFactory : public ThreadHelpBase , // Struct for right in
/*-****************************************************************************************************//**
@short standard destructor to delete instance
- @descr We use it to clear ouer cache.
+ @descr We use it to clear our cache.
@seealso class RegistryCache
diff --git a/main/framework/inc/services/mediatypedetectionhelper.hxx b/main/framework/inc/services/mediatypedetectionhelper.hxx
index 26a8834..9149588 100644
--- a/main/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/main/framework/inc/services/mediatypedetectionhelper.hxx
@@ -85,7 +85,7 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper2< ::com::sun::sta
@seealso -
- @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.
@return -
@onerror -
diff --git a/main/framework/inc/targets.h b/main/framework/inc/targets.h
index f9ca1a9..4081e81 100644
--- a/main/framework/inc/targets.h
+++ b/main/framework/inc/targets.h
@@ -42,7 +42,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
diff --git a/main/framework/source/application/framework.cxx b/main/framework/source/application/framework.cxx
index 56f0e81..bcf96df 100644
--- a/main/framework/source/application/framework.cxx
+++ b/main/framework/source/application/framework.cxx
@@ -195,7 +195,7 @@ void FrameWork::impl_analyzeCommandArguments()
void FrameWork::Main()
{
//-------------------------------------------------------------------------------------------------------------
- // a) Initialize ouer application
+ // a) Initialize our application
// Analyze command arguments.
impl_analyzeCommandArguments();
@@ -210,7 +210,7 @@ void FrameWork::Main()
setProcessServiceFactory( xGlobalServiceManager );
//---------------------------------------------------------------------------------------------------------
- // b) Create root of ouer frame tree
+ // b) Create root of our frame tree
// Create top of frame hierarchy - the desktop.
Reference< XDesktop > xDesktop( xGlobalServiceManager->createInstance( SERVICENAME_DESKTOP ), UNO_QUERY );
diff --git a/main/framework/source/dispatch/closedispatcher.cxx b/main/framework/source/dispatch/closedispatcher.cxx
index b5950e8..673e62f 100644
--- a/main/framework/source/dispatch/closedispatcher.cxx
+++ b/main/framework/source/dispatch/closedispatcher.cxx
@@ -249,7 +249,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
//-----------------------------------------------
/**
@short asynchronous callback
- @descr We start all actions inside this object asnychronoue.
+ @descr We start all actions inside this object asynchronous.
(see comments there).
Now we do the following:
- close all views to the same document, if needed and possible
diff --git a/main/framework/source/dispatch/menudispatcher.cxx b/main/framework/source/dispatch/menudispatcher.cxx
index 1abe7f7..eae4b6f 100644
--- a/main/framework/source/dispatch/menudispatcher.cxx
+++ b/main/framework/source/dispatch/menudispatcher.cxx
@@ -114,7 +114,7 @@ MenuDispatcher::MenuDispatcher( const uno::Reference< XMultiServiceFactory >
, m_pMenuManager ( NULL )
{
// Safe impossible cases
- // We need valid informations about ouer ownerfor work.
+ // We need valid informations about our owner for work.
LOG_ASSERT( impldbg_checkParameter_MenuDispatcher( xFactory, xOwner ), "MenuDispatcher::MenuDispatcher()\nInvalid parameter detected!\n" )
m_bActivateListener = sal_True;
diff --git a/main/framework/source/fwe/classes/addonsoptions.cxx b/main/framework/source/fwe/classes/addonsoptions.cxx
index c83063c..b063cdb 100644
--- a/main/framework/source/fwe/classes/addonsoptions.cxx
+++ b/main/framework/source/fwe/classes/addonsoptions.cxx
@@ -342,7 +342,7 @@ class AddonsOptions_Impl : public ConfigItem
};
/*-****************************************************************************************************//**
- @short return list of key names of our configuration management which represent oue module tree
+ @short return list of key names of our configuration management which represent our module tree
@descr These methods return the current list of key names! We need it to get needed values from our
configuration management!
@@ -501,8 +501,8 @@ AddonsOptions_Impl::AddonsOptions_Impl()
ReadConfigurationData();
- // Enable notification mechanism of ouer baseclass.
- // We need it to get information about changes outside these class on ouer used configuration keys!
+ // Enable notification mechanism of our baseclass.
+ // We need it to get information about changes outside these class on our used configuration keys!
Sequence< rtl::OUString > aNotifySeq( 1 );
aNotifySeq[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AddonUI" ));
EnableNotification( aNotifySeq );
@@ -1932,9 +1932,9 @@ AddonsOptions::AddonsOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already exist!
+ // ... and initialize our data container only if it not already exist!
if( m_pDataContainer == NULL )
{
m_pDataContainer = new AddonsOptions_Impl;
@@ -1948,10 +1948,10 @@ AddonsOptions::~AddonsOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -2096,7 +2096,7 @@ Mutex& AddonsOptions::GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/framework/source/helper/oframes.cxx b/main/framework/source/helper/oframes.cxx
index 3fa8961..c21c655 100644
--- a/main/framework/source/helper/oframes.cxx
+++ b/main/framework/source/helper/oframes.cxx
@@ -122,8 +122,8 @@ void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) thr
// Set owner of this instance as parent of the new frame in container!
xFrame->setCreator( xOwner );
}
- // Else; Do nothing! Ouer owner is dead.
- LOG_ASSERT( !(xOwner.is()==sal_False), "OFrames::append()\nOuer owner is dead - you can't append any frames ...!\n" )
+ // Else; Do nothing! Our owner is dead.
+ LOG_ASSERT( !(xOwner.is()==sal_False), "OFrames::append()\nOur owner is dead - you can't append any frames ...!\n" )
}
//*****************************************************************************************************************
@@ -149,8 +149,8 @@ void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) thr
// This must do the caller of this method himself.
// See documentation of interface XFrames for further informations.
}
- // Else; Do nothing! Ouer owner is dead.
- LOG_ASSERT( !(xOwner.is()==sal_False), "OFrames::remove()\nOuer owner is dead - you can't remove any frames ...!\n" )
+ // Else; Do nothing! Our owner is dead.
+ LOG_ASSERT( !(xOwner.is()==sal_False), "OFrames::remove()\nOur owner is dead - you can't remove any frames ...!\n" )
}
//*****************************************************************************************************************
@@ -256,8 +256,8 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int
}
}
}
- // Else; Do nothing! Ouer owner is dead.
- LOG_ASSERT( !(xOwner.is()==sal_False), "OFrames::queryFrames()\nOuer owner is dead - you can't query for frames ...!\n" )
+ // Else; Do nothing! Our owner is dead.
+ LOG_ASSERT( !(xOwner.is()==sal_False), "OFrames::queryFrames()\nOur owner is dead - you can't query for frames ...!\n" )
// Resturn result of this operation.
return seqFrames;
@@ -428,8 +428,8 @@ void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFrame > >&
//*****************************************************************************************************************
// An instance of this class can only work with valid initialization.
-// We share the mutex with ouer owner class, need a valid factory to instanciate new services and
-// use the access to ouer owner for some operations.
+// We share the mutex with our owner class, need a valid factory to instanciate new services and
+// use the access to our owner for some operations.
sal_Bool OFrames::impldbg_checkParameter_OFramesCtor( const css::uno::Reference< XMultiServiceFactory >& xFactory ,
const css::uno::Reference< XFrame >& xOwner ,
FrameContainer* pFrameContainer )
diff --git a/main/framework/source/services/desktop.cxx b/main/framework/source/services/desktop.cxx
index c556776..7ea5ed3 100644
--- a/main/framework/source/services/desktop.cxx
+++ b/main/framework/source/services/desktop.cxx
@@ -599,7 +599,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() th
// Register transaction and reject wrong calls.
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
- // Start search with ouer direct active frame (if it exist!).
+ // Start search with our direct active frame (if it exists!).
// Search on his children for other active frames too.
// Stop if no one could be found and return last of found ones.
css::uno::Reference< css::frame::XFramesSupplier > xLast = css::uno::Reference< css::frame::XFramesSupplier >( getActiveFrame(), css::uno::UNO_QUERY );
@@ -657,7 +657,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFrom
/*-************************************************************************************************************//**
@interface XTasksSupplier
- @short get access to create enumerations of ouer taskchilds
+ @short get access to create enumerations of our taskchilds
@descr Direct childs of desktop are tasks every time.
Call these method to could create enumerations of it.
@@ -671,7 +671,7 @@ But; Don't forget - you will be the owner of returned object and must release it
@seealso class TasksAccess
@param -
- @return A reference to an accessobject, which can create enumerations of ouer childtasks.
+ @return A reference to an accessobject, which can create enumerations of our childtasks.
@onerror A null reference is returned.
@threadsafe yes
@@ -691,18 +691,18 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getT
/*-************************************************************************************************************//**
@interface XTasksSupplier
- @short return current active task of ouer direct childs
+ @short return current active task of our direct childs
@descr Desktop childs are tasks only ! If we have an active path from desktop
as top to any frame on bottom, we must have an active direct child. His reference is returned here.
- @attention a) Do not confuse it with getCurrentFrame()! The current frame don't must one of ouer direct childs.
+ @attention a) Do not confuse it with getCurrentFrame()! The current frame don't must one of our direct childs.
It can be every frame in subtree and must have the focus (Is the last one of an active path!).
b) We don't need any lock here. Our container is threadsafe himself and live, if we live!
@seealso method getCurrentFrame()
@param -
- @return A reference to ouer current active taskchild.
+ @return A reference to our current active taskchild.
@onerror A null reference is returned.
@threadsafe yes
@@ -834,7 +834,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw(
@interface XFramesSupplier
@short set/get the current active child frame
@descr It must be a task. Direct childs of desktop are tasks only! No frames are accepted.
- We don't save this information directly in this class. We use ouer container-helper
+ We don't save this information directly in this class. We use our container-helper
to do that.
@attention Helper is threadsafe himself. So we don't need any lock here.
@@ -842,7 +842,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw(
@seealso class OFrameContainer
@param "xFrame", new active frame (must be valid!)
- @return A reference to ouer current active childtask, if anyone exist.
+ @return A reference to our current active childtask, if anyone exist.
@onerror A null reference is returned.
@threadsafe yes
diff --git a/main/framework/source/services/frame.cxx b/main/framework/source/services/frame.cxx
index a875af8..a5d341d 100644
--- a/main/framework/source/services/frame.cxx
+++ b/main/framework/source/services/frame.cxx
@@ -397,21 +397,21 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames() throw( cs
ReadGuard aReadLock( m_aLock );
// Return access to all child frames to caller.
- // Ouer childframe container is implemented in helper class OFrames and used as a reference m_xFramesHelper!
+ // Our childframe container is implemented in helper class OFrames and used as a reference m_xFramesHelper!
return m_xFramesHelper;
}
/*-****************************************************************************************************//**
@short get the current active child frame
@descr It must be a frameto. Direct childs of a frame are frames only! No task or desktop is accepted.
- We don't save this information directly in this class. We use ouer container-helper
+ We don't save this information directly in this class. We use our container-helper
to do that.
@seealso class OFrameContainer
@seealso method setActiveFrame()
@param -
- @return A reference to ouer current active childframe, if anyone exist.
+ @return A reference to our current active childframe, if anyone exist.
@return A null reference, if nobody is active.
@onerror A null reference is returned.
@@ -433,7 +433,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw
/*-****************************************************************************************************//**
@short set the new active direct child frame
@descr It must be a frame to. Direct childs of frame are frames only! No task or desktop is accepted.
- We don't save this information directly in this class. We use ouer container-helper
+ We don't save this information directly in this class. We use our container-helper
to do that.
@seealso class OFrameContainer
@@ -1082,7 +1082,7 @@ sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException )
ReadGuard aReadLock( m_aLock );
// This information is set in setCreator().
- // We are top, if ouer parent is a task or the desktop or if no parent exist!
+ // We are top, if our parent is a task on the desktop or if no parent exist!
return m_bIsFrameTop;
}
@@ -1159,7 +1159,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException )
//_________________________________________________________________________________________________________
// 2) I was active before or current activated and there is a path from here to bottom, who CAN be active.
- // But ouer direct child of path is not active yet.
+ // But our direct child of path is not active yet.
// (It can be, if activation occur in the middle of a current path!)
// In these case we activate path to bottom to set focus on right frame!
if (
@@ -1261,14 +1261,14 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException )
// 4) If there is a path from here to my parent ...
// ... I'am on the top or in the middle of deactivated subtree and action was started here.
// I must deactivate all frames from here to top, which are members of current path.
- // Stop, if THESE frame not the active frame of ouer parent!
+ // Stop, if THESE frame not the active frame of our parent!
if (
( xParent.is() == sal_True ) &&
( xParent->getActiveFrame() == xThis )
)
{
- // We MUST break the path - otherwise we will get the focus - not ouer parent! ...
- // Attention: Ouer parent don't call us again - WE ARE NOT ACTIVE YET!
+ // We MUST break the path - otherwise we will get the focus - not our parent! ...
+ // Attention: Our parent don't call us again - WE ARE NOT ACTIVE YET!
// [ see step 3 and condition "if ( m_eActiveState!=INACTIVE ) ..." in this method! ]
xParent->deactivate();
}
@@ -2344,7 +2344,7 @@ aEvent
void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css::uno::RuntimeException )
{
/* #i62088#
- Some interceptor objects intercept our "internally asynchronoues implemented" dispatch call.
+ Some interceptor objects intercept our "internally asynchronous implemented" dispatch call.
And they close this frame directly (means synchronous then).
Means: Frame::windowClosing()->Frame::close()
In such situation it's not a good idea to hold this transaction count alive .-)
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java
index c220eb6..a04e3ce 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java
@@ -28,9 +28,9 @@ import java.util.Vector;
/**
* We need a generic interface to forward any oneway uno interface method
* by using threads to the original object. Reason:
- * It's not allowed to call synchronoues back to the office if a java object
+ * It's not allowed to call synchronous back to the office if a java object
* was called in a oneway declared interface method. Then it must be
- * executed asynchronoues. To do so - a thread can be created which use this
+ * executed asynchronous. To do so - a thread can be created which use this
* interface. It get the object, which whis to be called back and the type and
* parameter of the original request.
*
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java
index d1dc199..3171770 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java
@@ -26,7 +26,7 @@ import java.util.Vector;
// __________ Implementation __________
/**
- * It's not allowed to call synchronoues back inside an oneway interface call.
+ * It's not allowed to call synchronous back inside an oneway interface call.
* (see IOnewayLink too). So we start a thread (implemented by this class), which
* gets all necessary parameters from the original called object and
* call it back later inside his run() method. So the execution of such oneway call
@@ -111,7 +111,7 @@ class OnewayExecutor extends Thread
* implements the thread function
* Here we call the internal set link object back and
* give it all necessary parameters.
- * After that we die by ouerself ...
+ * After that we die by ourself ...
*/
public void run()
{
diff --git a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
index f9a6e83..cc19379 100644
--- a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
+++ b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
@@ -45,7 +45,7 @@ import java.util.Vector;
* internal holded dispatch object automatically.
*
* Another reason for such extra class for listening:
- * Most listener callbacks are asynchronoues [oneay] requests.
+ * Most listener callbacks are asynchronous [oneway] requests.
* And it's not allowed to call back synchronously there.
* So we must start threads for updating something internally.
*
diff --git a/main/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs b/main/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
index c7c93b2..027756b 100644
--- a/main/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
+++ b/main/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
@@ -51,7 +51,7 @@
<value/>
</prop>
<prop oor:name="Preferred" oor:type="xs:boolean">
- <info><desc>In case of ambigoues registrations (e.g. for extensions doc/txt) it specify the prefererred type.</desc></info>
+ <info><desc>In case of ambiguous registrations (e.g. for extensions doc/txt) it specify the prefererred type.</desc></info>
<value>false</value>
</prop>
<prop oor:name="PreferredFilter" oor:type="xs:string">
diff --git a/main/sfx2/source/sidebar/DeckLayouter.cxx b/main/sfx2/source/sidebar/DeckLayouter.cxx
index cf6124f..bdc7cad 100644
--- a/main/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/main/sfx2/source/sidebar/DeckLayouter.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
+
#include "precompiled_sfx2.hxx"
#include "DeckLayouter.hxx"
@@ -62,7 +64,7 @@ void DeckLayouter::LayoutDeck (
if (aContentArea.GetWidth()<=0 || aContentArea.GetHeight()<=0)
return;
Rectangle aBox (PlaceDeckTitle(rDeckTitleBar, aContentArea));
-
+
if ( ! rPanels.empty())
{
// Prepare the layout item container.
@@ -101,7 +103,7 @@ Rectangle DeckLayouter::LayoutPanels (
// const sal_Int32 nPanelTitleBarHeight (Theme::GetInteger(Theme::Int_PanelTitleBarHeight));
// Prepare the separators, horizontal lines above and below the
- // panel titels.
+ // panel titles.
// const sal_Int32 nDeckSeparatorHeight (Theme::GetInteger(Theme::Int_DeckSeparatorHeight));
// Get the requested heights of the panels and the available
@@ -121,7 +123,7 @@ Rectangle DeckLayouter::LayoutPanels (
nTotalMinimumHeight += iItem->maLayoutSize.Minimum;
nTotalPreferredHeight += iItem->maLayoutSize.Preferred;
}
-
+
if (nTotalMinimumHeight > nAvailableHeight
&& ! bShowVerticalScrollBar)
{
@@ -136,13 +138,13 @@ Rectangle DeckLayouter::LayoutPanels (
rVerticalScrollBar,
true);
}
-
+
// We are now in one of three modes.
// - The preferred height fits into the available size:
- // Use the preferred size, distribute the remaining height bei
+ // Use the preferred size, distribute the remaining height by
// enlarging panels.
// - The total minimum height fits into the available size:
- // Use the minimum size, distribute the remaining height bei
+ // Use the minimum size, distribute the remaining height by
// enlarging panels.
// - The total minimum height does not fit into the available
// size:
@@ -159,7 +161,7 @@ Rectangle DeckLayouter::LayoutPanels (
if (eMode != Preferred)
{
const sal_Int32 nTotalHeight (eMode==MinimumOrLarger ? nTotalMinimumHeight : nTotalPreferredHeight);
-
+
DistributeHeights(
rLayoutItems,
nAvailableHeight-nTotalHeight,
@@ -168,7 +170,7 @@ Rectangle DeckLayouter::LayoutPanels (
}
// Set position and size of the mpScrollClipWindow to the available
- // size. Its child, the mpScrollContainer, may have a bigger
+ // size. Its child, the mpScrollContainer, may have a bigger
// height.
rScrollClipWindow.SetPosSizePixel(aBox.Left(), aBox.Top(), aBox.GetWidth(), aBox.GetHeight());
@@ -220,7 +222,7 @@ sal_Int32 DeckLayouter::PlacePanels (
// Separator above the panel title bar.
aSeparators.push_back(nY);
nY += nDeckSeparatorHeight;
-
+
// Place the title bar.
PanelTitleBar* pTitleBar = rPanel.GetTitleBar();
if (pTitleBar != NULL)
@@ -240,7 +242,7 @@ sal_Int32 DeckLayouter::PlacePanels (
if (rPanel.IsExpanded())
{
rPanel.Show();
-
+
// Determine the height of the panel depending on layout
// mode and distributed heights.
sal_Int32 nPanelHeight (0);
@@ -263,7 +265,7 @@ sal_Int32 DeckLayouter::PlacePanels (
// Place the panel.
rPanel.SetPosSizePixel(0, nY, nWidth, nPanelHeight);
rPanel.Invalidate();
-
+
nY += nPanelHeight;
}
else
@@ -322,7 +324,7 @@ void DeckLayouter::GetRequestedSizes (
rAvailableHeight -= nPanelTitleBarHeight;
rAvailableHeight -= nDeckSeparatorHeight;
}
-
+
if (iItem->mpPanel->IsExpanded())
{
Reference<ui::XSidebarPanel> xPanel (iItem->mpPanel->GetPanelComponent());
@@ -360,7 +362,7 @@ void DeckLayouter::DistributeHeights (
continue;
if (iItem->maLayoutSize.Maximum < 0)
++nNoMaximumCount;
-
+
const sal_Int32 nBaseHeight (
bMinimumHeightIsBase
? iItem->maLayoutSize.Minimum
@@ -371,7 +373,7 @@ void DeckLayouter::DistributeHeights (
nTotalWeight += iItem->mnWeight;
}
}
-
+
if (nTotalWeight == 0)
return;
diff --git a/main/sfx2/source/sidebar/SidebarController.cxx b/main/sfx2/source/sidebar/SidebarController.cxx
index 946ad89..758ed8d 100644
--- a/main/sfx2/source/sidebar/SidebarController.cxx
+++ b/main/sfx2/source/sidebar/SidebarController.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
+
#include "precompiled_sfx2.hxx"
#include "SidebarController.hxx"
@@ -204,7 +206,7 @@ void SAL_CALL SidebarController::disposing (void)
SidebarControllerContainer::iterator iEntry (maSidebarControllerContainer.find(mxFrame));
if (iEntry != maSidebarControllerContainer.end())
maSidebarControllerContainer.erase(iEntry);
-
+
maFocusManager.Clear();
cssu::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
@@ -282,7 +284,7 @@ void SAL_CALL SidebarController::propertyChange (const css::beans::PropertyChang
throw(cssu::RuntimeException)
{
(void)rEvent;
-
+
maPropertyChangeForwarder.RequestCall();
}
@@ -340,17 +342,17 @@ void SidebarController::NotifyResize (void)
OSL_ASSERT( bool(mpTabBar));
return;
}
-
+
Window* pParentWindow = mpTabBar->GetParent();
-
+
const sal_Int32 nWidth (pParentWindow->GetSizePixel().Width());
const sal_Int32 nHeight (pParentWindow->GetSizePixel().Height());
mbIsDeckOpen = (nWidth > TabBar::GetDefaultWidth());
-
+
if (mnSavedSidebarWidth <= 0)
mnSavedSidebarWidth = nWidth;
-
+
bool bIsDeckVisible;
if (mbCanDeckBeOpened)
{
@@ -364,7 +366,7 @@ void SidebarController::NotifyResize (void)
}
else
bIsDeckVisible = false;
-
+
// Place the deck.
if (mpCurrentDeck)
{
@@ -403,14 +405,14 @@ void SidebarController::ProcessNewWidth (const sal_Int32 nNewWidth)
if (mbIsDeckRequestedOpen.get())
{
- // Deck became large enough to be shown. Show it.
+ // Deck became large enough to be shown. Show it.
mnSavedSidebarWidth = nNewWidth;
RequestOpenDeck();
}
else
{
- // Deck became too small. Close it completely.
- // If window is wider than the tab bar then mark the deck as being visible, even when it its not.
+ // Deck became too small. Close it completely.
+ // If window is wider than the tab bar then mark the deck as being visible, even when it's not.
// This is to trigger an adjustment of the width to the width of the tab bar.
mbIsDeckOpen = true;
RequestCloseDeck();
@@ -441,8 +443,8 @@ void SidebarController::UpdateConfigurations (void)
// Notify the tab bar about the updated set of decks.
mpTabBar->SetDecks(aDecks);
- // Find the new deck. By default that is the same as the old
- // one. If that is not set or not enabled, then choose the
+ // Find the new deck. By default that is the same as the old
+ // one. If that is not set or not enabled, then choose the
// first enabled deck.
OUString sNewDeckId;
for (ResourceManager::DeckContextDescriptorContainer::const_iterator
@@ -473,7 +475,7 @@ void SidebarController::UpdateConfigurations (void)
// Tell the tab bar to highlight the button associated
// with the deck.
mpTabBar->HighlightDeck(sNewDeckId);
-
+
SwitchToDeck(
*ResourceManager::Instance().GetDeckDescriptor(sNewDeckId),
maCurrentContext);
@@ -583,7 +585,7 @@ void SidebarController::SwitchToDeck (
mpParentWindow,
::boost::bind(&SidebarController::RequestCloseDeck, this)));
msCurrentDeckTitle = rDeckDescriptor.msTitle;
-
+
}
if ( ! mpCurrentDeck)
return;
@@ -617,7 +619,7 @@ void SidebarController::SwitchToDeck (
SharedPanelContainer::const_iterator iPanel;
if (bForceNewPanels)
{
- // All panels have to be created in any case. There is no
+ // All panels have to be created in any case. There is no
// point in searching already existing panels.
iPanel = rCurrentPanels.end();
}
@@ -630,7 +632,7 @@ void SidebarController::SwitchToDeck (
}
if (iPanel != rCurrentPanels.end())
{
- // Panel already exists in current deck. Reuse it.
+ // Panel already exists in current deck. Reuse it.
aNewPanels[nWriteIndex] = *iPanel;
aNewPanels[nWriteIndex]->SetExpanded(rPanelContexDescriptor.mbIsInitiallyVisible);
}
@@ -754,10 +756,10 @@ Reference<ui::XUIElement> SidebarController::CreateUIElement (
{
Reference<rendering::XSpriteCanvas> xCanvas (VCLUnoHelper::GetWindow(rxWindow)->GetSpriteCanvas());
aCreationArguments.put("Canvas", makeAny(xCanvas));
- }
+ }
aCreationArguments.put("ApplicationName", makeAny(rContext.msApplication));
aCreationArguments.put("ContextName", makeAny(rContext.msContext));
-
+
Reference<ui::XUIElement> xUIElement(
xUIElementFactory->createUIElement(
rsImplementationURL,
@@ -806,11 +808,11 @@ IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent*, pEvent)
maAsynchronousDeckSwitch.CancelRequest();
maContextChangeUpdate.RequestCall();
break;
-
+
case SFX_HINT_DYING:
dispose();
break;
-
+
case VCLEVENT_WINDOW_PAINT:
OSL_TRACE("Paint");
break;
@@ -852,7 +854,7 @@ void SidebarController::ShowPopupMenu (
{
::boost::shared_ptr<PopupMenu> pMenu = CreatePopupMenu(rMenuData);
pMenu->SetSelectHdl(LINK(this, SidebarController, OnMenuItemSelected));
-
+
// pass toolbox button rect so the menu can stay open on button up
Rectangle aBox (rButtonBox);
aBox.Move(mpTabBar->GetPosPixel().X(), 0);
@@ -896,7 +898,7 @@ void SidebarController::ShowDetailMenu (const ::rtl::OUString& rsMenuCommand) co
PopupMenu* pCustomizationMenu = new PopupMenu();
SidebarResource aLocalResource;
-
+
// Add one entry for every tool panel element to individually make
// them visible or hide them.
sal_Int32 nIndex (0);
@@ -935,12 +937,12 @@ void SidebarController::ShowDetailMenu (const ::rtl::OUString& rsMenuCommand) co
pCustomizationMenu->InsertSeparator();
pCustomizationMenu->InsertItem(MID_RESTORE_DEFAULT, String(SfxResId(STRING_RESTORE)));
-
+
pMenu->InsertItem(MID_CUSTOMIZATION, String(SfxResId(STRING_CUSTOMIZATION)));
pMenu->SetPopupMenu(MID_CUSTOMIZATION, pCustomizationMenu);
pMenu->RemoveDisabledEntries(sal_False, sal_False);
-
+
return pMenu;
}
@@ -970,7 +972,7 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu)
case MID_RESTORE_DEFAULT:
mpTabBar->RestoreHideFlags();
break;
-
+
default:
{
try
@@ -1132,7 +1134,7 @@ SfxSplitWindow* SidebarController::GetSplitWindow (void)
mpSplitWindow->RemoveEventListener(LINK(this, SidebarController, WindowEventHandler));
mpSplitWindow = pSplitWindow;
-
+
if (mpSplitWindow != NULL)
mpSplitWindow->AddEventListener(LINK(this, SidebarController, WindowEventHandler));
}
@@ -1162,7 +1164,7 @@ void SidebarController::UpdateCloseIndicator (const bool bCloseAfterDrag)
pFixedImage->SetSizePixel(aImage.GetSizePixel());
pFixedImage->SetBackground(Theme::GetWallpaper(Theme::Paint_DeckBackground));
}
-
+
// Place and show the indicator.
const Size aWindowSize (mpParentWindow->GetSizePixel());
const Size aImageSize (mpCloseIndicator->GetSizePixel());
@@ -1187,10 +1189,10 @@ void SidebarController::UpdateTitleBarIcons (void)
{
if ( ! mpCurrentDeck)
return;
-
+
const bool bIsHighContrastModeActive (Theme::IsHighContrastMode());
const ResourceManager& rResourceManager (ResourceManager::Instance());
-
+
// Update the deck icon.
const DeckDescriptor* pDeckDescriptor = rResourceManager.GetDeckDescriptor(mpCurrentDeck->GetId());
if (pDeckDescriptor != NULL && mpCurrentDeck->GetTitleBar())
diff --git a/main/svtools/source/config/menuoptions.cxx b/main/svtools/source/config/menuoptions.cxx
index c8445b4..6aebb7e 100644
--- a/main/svtools/source/config/menuoptions.cxx
+++ b/main/svtools/source/config/menuoptions.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -113,7 +113,7 @@ class SvtMenuOptions_Impl : public ConfigItem
/*-****************************************************************************************************//**
@short called for notify of configmanager
- @descr These method is called from the ConfigManager before application ends or from the
+ @descr This method is called from the ConfigManager before application ends or from the
PropertyChangeListener if the sub tree broadcasts changes. You must update your
internal values.
@@ -129,7 +129,7 @@ class SvtMenuOptions_Impl : public ConfigItem
/*-****************************************************************************************************//**
@short write changes to configuration
- @descr These method writes the changed values into the sub tree
+ @descr This method writes the changed values into the sub tree
and should always called in our destructor to guarantee consistency of config data.
@seealso baseclass ConfigItem
@@ -148,7 +148,7 @@ class SvtMenuOptions_Impl : public ConfigItem
/*-****************************************************************************************************//**
@short access method to get internal values
- @descr These method gives us a chance to regulate access to our internal values.
+ @descr This method gives us a chance to regulate access to our internal values.
It's not used in the moment - but it's possible for the future!
@seealso -
@@ -202,7 +202,7 @@ class SvtMenuOptions_Impl : public ConfigItem
private:
/*-****************************************************************************************************//**
- @short return list of fix key names of ouer configuration management which represent oue module tree
+ @short return list of fix key names of our configuration management which represent our module tree
@descr These methods return a static const list of key names. We need it to get needed values from our
configuration management.
@@ -244,7 +244,7 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
sal_Bool bMenuIcons = true;
sal_Bool bSystemMenuIcons = true;
- // Copy values from list in right order to ouer internal member.
+ // Copy values from list in right order to our internal member.
sal_Int32 nPropertyCount = seqValues.getLength() ;
sal_Int32 nProperty = 0 ;
for( nProperty=0; nProperty<nPropertyCount; ++nProperty )
@@ -410,7 +410,7 @@ Sequence< OUString > SvtMenuOptions_Impl::impl_GetPropertyNames()
PROPERTYNAME_SHOWICONSINMENUES ,
PROPERTYNAME_SYSTEMICONSINMENUES
};
- // Initialize return sequence with these list ...
+ // Initialize return sequence with this list ...
static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT );
// ... and return it.
return seqPropertyNames;
@@ -448,9 +448,9 @@ SvtMenuOptions::SvtMenuOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already!
+ // ... and initialize our data container only if it not already!
if( m_pDataContainer == NULL )
{
RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtMenuOptions_Impl::ctor()");
@@ -467,10 +467,10 @@ SvtMenuOptions::~SvtMenuOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -539,13 +539,13 @@ Mutex& SvtMenuOptions::GetOwnStaticMutex()
{
// Initialize static mutex only for one time!
static Mutex* pMutex = NULL;
- // If these method first called (Mutex not already exist!) ...
+ // If this method is first called (Mutex not already exist!) ...
if( pMutex == NULL )
{
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/svtools/source/config/miscopt.cxx b/main/svtools/source/config/miscopt.cxx
index 1aa150d..7f9c5bb 100644
--- a/main/svtools/source/config/miscopt.cxx
+++ b/main/svtools/source/config/miscopt.cxx
@@ -231,7 +231,7 @@ class SvtMiscOptions_Impl : public ConfigItem
private:
/*-****************************************************************************************************//**
- @short return list of key names of ouer configuration management which represent oue module tree
+ @short return list of key names of our configuration management which represent our module tree
@descr These methods return a static const list of key names. We need it to get needed values from our
configuration management.
@@ -280,7 +280,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
// Follow assignment use order of values in relation to our list of key names!
DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtMiscOptions_Impl::SvtMiscOptions_Impl()\nI miss some values of configuration keys!\n" );
- // Copy values from list in right order to ouer internal member.
+ // Copy values from list in right order to our internal member.
sal_Int32 nPropertyCount = seqValues.getLength();
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
@@ -354,8 +354,8 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
}
}
- // Enable notification mechanism of ouer baseclass.
- // We need it to get information about changes outside these class on ouer used configuration keys!
+ // Enable notification mechanism of our baseclass.
+ // We need it to get information about changes outside these class on our used configuration keys!
EnableNotification( seqNames );
}
@@ -398,7 +398,7 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
// Follow assignment use order of values in relation to our list of key names!
DBG_ASSERT( !(rPropertyNames.getLength()!=seqValues.getLength()), "SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()\nI miss some values of configuration keys!\n" );
- // Copy values from list in right order to ouer internal member.
+ // Copy values from list in right order to our internal member.
sal_Int32 nPropertyCount = seqValues.getLength();
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
@@ -644,9 +644,9 @@ SvtMiscOptions::SvtMiscOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetInitMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already exist!
+ // ... and initialize our data container only if it not already exist!
if( m_pDataContainer == NULL )
{
RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtMiscOptions_Impl::ctor()");
@@ -662,10 +662,10 @@ SvtMiscOptions::~SvtMiscOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetInitMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -804,7 +804,7 @@ Mutex & SvtMiscOptions::GetInitMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/svtools/source/config/optionsdrawinglayer.cxx b/main/svtools/source/config/optionsdrawinglayer.cxx
index 1f28b9b..a888855 100644
--- a/main/svtools/source/config/optionsdrawinglayer.cxx
+++ b/main/svtools/source/config/optionsdrawinglayer.cxx
@@ -382,7 +382,7 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl()\nI miss some values of configuration keys!\n" );
- // Copy values from list in right order to ouer internal member.
+ // Copy values from list in right order to our internal member.
sal_Int32 nPropertyCount = seqValues.getLength();
sal_Int32 nProperty = 0;
@@ -1245,9 +1245,9 @@ SvtOptionsDrawinglayer::SvtOptionsDrawinglayer()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already!
+ // ... and initialize our data container only if it not already!
if( m_pDataContainer == NULL )
{
m_pDataContainer = new SvtOptionsDrawinglayer_Impl();
@@ -1261,10 +1261,10 @@ SvtOptionsDrawinglayer::~SvtOptionsDrawinglayer()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -1714,7 +1714,7 @@ Mutex& SvtOptionsDrawinglayer::GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/svtools/source/config/printoptions.cxx b/main/svtools/source/config/printoptions.cxx
index 97f0c28..5236a25 100644
--- a/main/svtools/source/config/printoptions.cxx
+++ b/main/svtools/source/config/printoptions.cxx
@@ -561,7 +561,7 @@ Mutex& SvtBasePrintOptions::GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
@@ -792,9 +792,9 @@ SvtPrinterOptions::SvtPrinterOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already!
+ // ... and initialize our data container only if it not already!
if( m_pStaticDataContainer == NULL )
{
OUString aRootPath( ROOTNODE_START );
@@ -812,10 +812,10 @@ SvtPrinterOptions::~SvtPrinterOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pStaticDataContainer;
@@ -832,9 +832,9 @@ SvtPrintFileOptions::SvtPrintFileOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already!
+ // ... and initialize our data container only if it not already!
if( m_pStaticDataContainer == NULL )
{
OUString aRootPath( ROOTNODE_START );
@@ -853,10 +853,10 @@ SvtPrintFileOptions::~SvtPrintFileOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pStaticDataContainer;
diff --git a/main/svx/source/svdraw/svdview.cxx b/main/svx/source/svdraw/svdview.cxx
index 1e51588..7864695 100644
--- a/main/svx/source/svdraw/svdview.cxx
+++ b/main/svx/source/svdraw/svdview.cxx
@@ -798,7 +798,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
if (bMouseLeft) aDragStat.SetMouseDown(sal_True);
} else if (bMouseUp) {
if (bMouseLeft) aDragStat.SetMouseDown(sal_False);
- } else { // ansonsten MoueMove
+ } else { // else MouseMove
aDragStat.SetMouseDown(bMouseLeft);
}
diff --git a/main/unotools/inc/unotools/historyoptions.hxx b/main/unotools/inc/unotools/historyoptions.hxx
index 6e36ab1..7b98654 100644
--- a/main/unotools/inc/unotools/historyoptions.hxx
+++ b/main/unotools/inc/unotools/historyoptions.hxx
@@ -50,7 +50,7 @@
#define HISTORY_PROPERTYNAME_PASSWORD ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password" ))
/*-************************************************************************************************************//**
- @descr You can use these enum values to specify right history if you call ouer interface methods.
+ @descr You can use these enum values to specify right history if you call our interface methods.
*//*-*************************************************************************************************************/
enum EHistoryType
diff --git a/main/unotools/inc/unotools/securityoptions.hxx b/main/unotools/inc/unotools/securityoptions.hxx
index b11b131..2fa21e1 100644
--- a/main/unotools/inc/unotools/securityoptions.hxx
+++ b/main/unotools/inc/unotools/securityoptions.hxx
@@ -214,7 +214,7 @@ class UNOTOOLS_DLLPUBLIC SvtSecurityOptions: public utl::detail::Options
sal_Bool IsMacroDisabled ( ) const ;
/*-****************************************************************************************************//**
- @short special method to check an URL and his referer corresponding to ouer internal security cessation
+ @short special method to check an URL and his referer corresponding to our internal security cessation
@descr Give us an URL and his referer and we will say you if these url can be scripted or not!
@seealso -
diff --git a/main/unotools/source/config/cacheoptions.cxx b/main/unotools/source/config/cacheoptions.cxx
index 94178e8..ea945e0 100644
--- a/main/unotools/source/config/cacheoptions.cxx
+++ b/main/unotools/source/config/cacheoptions.cxx
@@ -146,7 +146,7 @@ SvtCacheOptions_Impl::SvtCacheOptions_Impl() :
DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtCacheOptions_Impl::SvtCacheOptions_Impl()\nI miss some values of configuration keys!\n" );
- // Copy values from list in right order to ouer internal member.
+ // Copy values from list in right order to our internal member.
sal_Int32 nPropertyCount = seqValues.getLength();
sal_Int32 nProperty = 0;
@@ -365,9 +365,9 @@ SvtCacheOptions::SvtCacheOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already!
+ // ... and initialize our data container only if it is not already!
if( m_pDataContainer == NULL )
{
m_pDataContainer = new SvtCacheOptions_Impl();
@@ -381,10 +381,10 @@ SvtCacheOptions::~SvtCacheOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -495,7 +495,7 @@ Mutex& SvtCacheOptions::GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/unotools/source/config/cmdoptions.cxx b/main/unotools/source/config/cmdoptions.cxx
index 0264042..2c9dd8a 100644
--- a/main/unotools/source/config/cmdoptions.cxx
+++ b/main/unotools/source/config/cmdoptions.cxx
@@ -237,7 +237,7 @@ class SvtCommandOptions_Impl : public ConfigItem
private:
/*-****************************************************************************************************//**
- @short return list of key names of our configuration management which represent oue module tree
+ @short return list of key names of our configuration management which represent our module tree
@descr These methods return the current list of key names! We need it to get needed values from our
configuration management and support dynamical menu item lists!
@@ -282,7 +282,7 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl()
// Follow assignment use order of values in relation to our list of key names!
DBG_ASSERT( !(lNames.getLength()!=lValues.getLength()), "SvtCommandOptions_Impl::SvtCommandOptions_Impl()\nI miss some values of configuration keys!\n" );
- // Copy values from list in right order to ouer internal member.
+ // Copy values from list in right order to our internal member.
// Attention: List for names and values have an internal construction pattern!
sal_Int32 nItem = 0 ;
OUString sCmd ;
@@ -299,8 +299,8 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl()
}
/*TODO: Not used in the moment! see Notify() ...
- // Enable notification mechanism of ouer baseclass.
- // We need it to get information about changes outside these class on ouer used configuration keys! */
+ // Enable notification mechanism of our baseclass.
+ // We need it to get information about changes outside these class on our used configuration keys! */
Sequence< OUString > aNotifySeq( 1 );
aNotifySeq[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Disabled" ));
EnableNotification( aNotifySeq, sal_True );
@@ -333,7 +333,7 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& )
// Follow assignment use order of values in relation to our list of key names!
DBG_ASSERT( !(lNames.getLength()!=lValues.getLength()), "SvtCommandOptions_Impl::SvtCommandOptions_Impl()\nI miss some values of configuration keys!\n" );
- // Copy values from list in right order to ouer internal member.
+ // Copy values from list in right order to our internal member.
// Attention: List for names and values have an internal construction pattern!
sal_Int32 nItem = 0 ;
OUString sCmd ;
@@ -516,9 +516,9 @@ SvtCommandOptions::SvtCommandOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already exist!
+ // ... and initialize our data container only if it not already exist!
if( m_pDataContainer == NULL )
{
m_pDataContainer = new SvtCommandOptions_Impl;
@@ -533,10 +533,10 @@ SvtCommandOptions::~SvtCommandOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -611,7 +611,7 @@ Mutex& SvtCommandOptions::GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/unotools/source/config/compatibility.cxx b/main/unotools/source/config/compatibility.cxx
index fbb3b5b..8416a9b 100644
--- a/main/unotools/source/config/compatibility.cxx
+++ b/main/unotools/source/config/compatibility.cxx
@@ -639,9 +639,9 @@ SvtCompatibilityOptions::SvtCompatibilityOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already exist!
+ // ... and initialize our data container only if it not already exist!
if( m_pDataContainer == NULL )
{
m_pDataContainer = new SvtCompatibilityOptions_Impl;
@@ -656,10 +656,10 @@ SvtCompatibilityOptions::~SvtCompatibilityOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -786,7 +786,7 @@ Mutex& SvtCompatibilityOptions::GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/unotools/source/config/dynamicmenuoptions.cxx b/main/unotools/source/config/dynamicmenuoptions.cxx
index afd82a9..da67fe5 100644
--- a/main/unotools/source/config/dynamicmenuoptions.cxx
+++ b/main/unotools/source/config/dynamicmenuoptions.cxx
@@ -329,7 +329,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
private:
/*-****************************************************************************************************//**
- @short return list of key names of our configuration management which represent oue module tree
+ @short return list of key names of our configuration management which represent our module tree
@descr These methods return the current list of key names! We need it to get needed values from our
configuration management and support dynamical menu item lists!
@@ -425,7 +425,7 @@ SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl()
// Follow assignment use order of values in relation to our list of key names!
DBG_ASSERT( !(lNames.getLength()!=lValues.getLength()), "SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl()\nI miss some values of configuration keys!\n" );
- // Copy values from list in right order to ouer internal member.
+ // Copy values from list in right order to our internal member.
// Attention: List for names and values have an internal construction pattern!
//
// first "New" menu ...
@@ -511,8 +511,8 @@ SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl()
}
/*TODO: Not used in the moment! see Notify() ...
- // Enable notification mechanism of ouer baseclass.
- // We need it to get information about changes outside these class on ouer used configuration keys!
+ // Enable notification mechanism of our baseclass.
+ // We need it to get information about changes outside these class on our used configuration keys!
EnableNotification( lNames );
*/
}
@@ -831,9 +831,9 @@ SvtDynamicMenuOptions::SvtDynamicMenuOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already exist!
+ // ... and initialize our data container only if it not already exist!
if( m_pDataContainer == NULL )
{
m_pDataContainer = new SvtDynamicMenuOptions_Impl;
@@ -848,10 +848,10 @@ SvtDynamicMenuOptions::~SvtDynamicMenuOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -903,7 +903,7 @@ Mutex& SvtDynamicMenuOptions::GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/unotools/source/config/extendedsecurityoptions.cxx b/main/unotools/source/config/extendedsecurityoptions.cxx
index d0d66a4..b119ec7 100644
--- a/main/unotools/source/config/extendedsecurityoptions.cxx
+++ b/main/unotools/source/config/extendedsecurityoptions.cxx
@@ -173,7 +173,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem
private:
/*-****************************************************************************************************//**
- @short return list of key names of ouer configuration management which represent oue module tree
+ @short return list of key names of our configuration management which represent our module tree
@descr These methods return a static const list of key names. We need it to get needed values from our
configuration management.
@@ -261,7 +261,7 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl()
}
// Enable notification mechanism of our baseclass.
- // We need it to get information about changes outside these class on ouer used configuration keys!
+ // We need it to get information about changes outside these class on our used configuration keys!
Sequence< OUString > seqNotifyNames( 1 );
seqNotifyNames[0] = m_aSecureExtensionsSetName;
EnableNotification( seqNotifyNames );
@@ -435,9 +435,9 @@ SvtExtendedSecurityOptions::SvtExtendedSecurityOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetInitMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already exist!
+ // ... and initialize our data container only if it not already exist!
if( m_pDataContainer == NULL )
{
RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtExtendedSecurityOptions_Impl::ctor()");
@@ -454,10 +454,10 @@ SvtExtendedSecurityOptions::~SvtExtendedSecurityOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetInitMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -521,7 +521,7 @@ Mutex& SvtExtendedSecurityOptions::GetInitMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/unotools/source/config/fontoptions.cxx b/main/unotools/source/config/fontoptions.cxx
index 37b995c..b6d09a2 100644
--- a/main/unotools/source/config/fontoptions.cxx
+++ b/main/unotools/source/config/fontoptions.cxx
@@ -152,7 +152,7 @@ class SvtFontOptions_Impl : public ConfigItem
private:
/*-****************************************************************************************************//**
- @short return list of key names of ouer configuration management which represent oue module tree
+ @short return list of key names of our configuration management which represent our module tree
@descr These methods return a static const list of key names. We need it to get needed values from our
configuration management.
@@ -201,7 +201,7 @@ SvtFontOptions_Impl::SvtFontOptions_Impl()
// Follow assignment use order of values in relation to our list of key names!
DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nI miss some values of configuration keys!\n" );
- // Copy values from list in right order to ouer internal member.
+ // Copy values from list in right order to our internal member.
sal_Int32 nPropertyCount = seqValues.getLength();
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
@@ -228,8 +228,8 @@ SvtFontOptions_Impl::SvtFontOptions_Impl()
}
}
- // Enable notification mechanism of ouer baseclass.
- // We need it to get information about changes outside these class on ouer used configuration keys!
+ // Enable notification mechanism of our baseclass.
+ // We need it to get information about changes outside these class on our used configuration keys!
EnableNotification( seqNames );
}
@@ -397,9 +397,9 @@ SvtFontOptions::SvtFontOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( impl_GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already exist!
+ // ... and initialize our data container only if it not already exist!
if( m_pDataContainer == NULL )
{
RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtFontOptions_Impl::ctor()");
@@ -416,10 +416,10 @@ SvtFontOptions::~SvtFontOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( impl_GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -494,7 +494,7 @@ Mutex& SvtFontOptions::impl_GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/unotools/source/config/historyoptions.cxx b/main/unotools/source/config/historyoptions.cxx
index 88c4c56..5b3adf0 100644
--- a/main/unotools/source/config/historyoptions.cxx
+++ b/main/unotools/source/config/historyoptions.cxx
@@ -636,9 +636,9 @@ SvtHistoryOptions::SvtHistoryOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already exist!
+ // ... and initialize our data container only if it not already exist!
if( m_pDataContainer == NULL )
{
RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtHistoryOptions_Impl::ctor()");
@@ -655,10 +655,10 @@ SvtHistoryOptions::~SvtHistoryOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -728,7 +728,7 @@ Mutex& SvtHistoryOptions::GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/unotools/source/config/internaloptions.cxx b/main/unotools/source/config/internaloptions.cxx
index 7884f3a..56191d0 100644
--- a/main/unotools/source/config/internaloptions.cxx
+++ b/main/unotools/source/config/internaloptions.cxx
@@ -236,7 +236,7 @@ class SvtInternalOptions_Impl : public ConfigItem
private:
/*-****************************************************************************************************//**
- @short return list of fix key names of ouer configuration management which represent oue module tree
+ @short return list of fix key names of our configuration management which represent our module tree
@descr These methods return a static const list of key names. We need it to get needed values from our
configuration management. We return well known key names only - because the "UserData" node
is handled in a special way!
@@ -502,9 +502,9 @@ SvtInternalOptions::SvtInternalOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already!
+ // ... and initialize our data container only if it is not already!
if( m_pDataContainer == NULL )
{
RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtInternalOptions_Impl::ctor()");
@@ -521,10 +521,10 @@ SvtInternalOptions::~SvtInternalOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -611,7 +611,7 @@ Mutex& SvtInternalOptions::GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/unotools/source/config/localisationoptions.cxx b/main/unotools/source/config/localisationoptions.cxx
index 3fcee63..ff45e00 100644
--- a/main/unotools/source/config/localisationoptions.cxx
+++ b/main/unotools/source/config/localisationoptions.cxx
@@ -148,7 +148,7 @@ class SvtLocalisationOptions_Impl : public ConfigItem
private:
/*-****************************************************************************************************//**
- @short return list of key names of ouer configuration management which represent oue module tree
+ @short return list of key names of our configuration management which represent our module tree
@descr These methods return a static const list of key names. We need it to get needed values from our
configuration management.
@@ -195,7 +195,7 @@ SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()
// Follow assignment use order of values in relation to our list of key names!
DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()\nI miss some values of configuration keys!\n" );
- // Copy values from list in right order to ouer internal member.
+ // Copy values from list in right order to our internal member.
sal_Int32 nPropertyCount = seqValues.getLength();
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
@@ -218,8 +218,8 @@ SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()
}
}
- // Enable notification mechanism of ouer baseclass.
- // We need it to get information about changes outside these class on ouer used configuration keys!
+ // Enable notification mechanism of our baseclass.
+ // We need it to get information about changes outside these class on our used configuration keys!
EnableNotification( seqNames );
}
@@ -362,9 +362,9 @@ SvtLocalisationOptions::SvtLocalisationOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already exist!
+ // ... and initialize our data container only if it not already exists!
if( m_pDataContainer == NULL )
{
RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtLocalisationOptions_Impl::ctor()");
@@ -381,10 +381,10 @@ SvtLocalisationOptions::~SvtLocalisationOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -441,7 +441,7 @@ Mutex& SvtLocalisationOptions::GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/unotools/source/config/moduleoptions.cxx b/main/unotools/source/config/moduleoptions.cxx
index 925ebd5..82dfea2 100644
--- a/main/unotools/source/config/moduleoptions.cxx
+++ b/main/unotools/source/config/moduleoptions.cxx
@@ -860,7 +860,7 @@ void SvtModuleOptions_Impl::SetFactoryDefaultFilter( SvtModuleOptions::EFa
}
/*-************************************************************************************************************//**
- @short return list of key names of ouer configuration management which represent our module tree
+ @short return list of key names of our configuration management which represent our module tree
@descr You give use a list of current existing set node names .. and we expand it for all
well known properties which are necessary for this implementation.
These full expanded list should be used to get values of this properties.
@@ -1342,7 +1342,7 @@ sal_uInt32 SvtModuleOptions::GetFeatures() const
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/unotools/source/config/printwarningoptions.cxx b/main/unotools/source/config/printwarningoptions.cxx
index 36821a9..bf48940 100644
--- a/main/unotools/source/config/printwarningoptions.cxx
+++ b/main/unotools/source/config/printwarningoptions.cxx
@@ -276,9 +276,9 @@ SvtPrintWarningOptions::SvtPrintWarningOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already!
+ // ... and initialize our data container only if it not already!
if( m_pDataContainer == NULL )
{
m_pDataContainer = new SvtPrintWarningOptions_Impl();
@@ -293,10 +293,10 @@ SvtPrintWarningOptions::~SvtPrintWarningOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -404,7 +404,7 @@ Mutex& SvtPrintWarningOptions::GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/unotools/source/config/securityoptions.cxx b/main/unotools/source/config/securityoptions.cxx
index 0a76e78..ad25d20 100644
--- a/main/unotools/source/config/securityoptions.cxx
+++ b/main/unotools/source/config/securityoptions.cxx
@@ -209,7 +209,7 @@ class SvtSecurityOptions_Impl : public ConfigItem
private:
/*-****************************************************************************************************//**
- @short return list of key names of ouer configuration management which represent our module tree
+ @short return list of key names of our configuration management which represents our module tree
@descr These methods return a static const list of key names. We need it to get needed values from our
configuration management.
@@ -1061,9 +1061,9 @@ SvtSecurityOptions::SvtSecurityOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetInitMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already exist!
+ // ... and initialize our data container only if it not already exist!
if( m_pDataContainer == NULL )
{
RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtSecurityOptions_Impl::ctor()");
@@ -1077,10 +1077,10 @@ SvtSecurityOptions::~SvtSecurityOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetInitMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -1177,7 +1177,7 @@ Mutex& SvtSecurityOptions::GetInitMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be faster then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/unotools/source/config/startoptions.cxx b/main/unotools/source/config/startoptions.cxx
index fdac3f3..fe5185d 100644
--- a/main/unotools/source/config/startoptions.cxx
+++ b/main/unotools/source/config/startoptions.cxx
@@ -128,8 +128,8 @@ class SvtStartOptions_Impl : public ConfigItem
/*-****************************************************************************************************//**
@short access method to get internal values
- @descr These method give us a chance to regulate access to ouer internal values.
- It's not used in the moment - but it's possible for the feature!
+ @descr This method gives us a chance to regulate access to our internal values.
+ It's not used in the moment - but it's possible for the future!
@seealso -
@@ -151,7 +151,7 @@ class SvtStartOptions_Impl : public ConfigItem
private:
/*-****************************************************************************************************//**
- @short return list of fix key names of ouer configuration management which represent oue module tree
+ @short return list of fix key names of our configuration management which represents our module tree
@descr These methods return a static const list of key names. We need it to get needed values from our
configuration management. We return well known key names only - because the "UserData" node
is handled in a special way!
@@ -198,7 +198,7 @@ SvtStartOptions_Impl::SvtStartOptions_Impl()
// Follow assignment use order of values in relation to our list of key names!
DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtStartOptions_Impl::SvtStartOptions_Impl()\nI miss some values of configuration keys!\n" );
- // Copy values from list in right order to ouer internal member.
+ // Copy values from list in right order to our internal member.
sal_Int32 nPropertyCount = seqValues.getLength() ;
sal_Int32 nProperty = 0 ;
for( nProperty=0; nProperty<nPropertyCount; ++nProperty )
@@ -222,7 +222,7 @@ SvtStartOptions_Impl::SvtStartOptions_Impl()
}
}
- // Don't enable notification mechanism of ouer baseclass!
+ // Don't enable notification mechanism of our baseclass!
// We support readonly variables in the moment.
}
@@ -362,9 +362,9 @@ SvtStartOptions::SvtStartOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already!
+ // ... and initialize our data container only if it not already!
if( m_pDataContainer == NULL )
{
RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtStartOptions_Impl::ctor()");
@@ -381,10 +381,10 @@ SvtStartOptions::~SvtStartOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -441,7 +441,7 @@ Mutex& SvtStartOptions::GetOwnStaticMutex()
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.
diff --git a/main/unotools/source/config/workingsetoptions.cxx b/main/unotools/source/config/workingsetoptions.cxx
index ee65ac0..c5296c4 100644
--- a/main/unotools/source/config/workingsetoptions.cxx
+++ b/main/unotools/source/config/workingsetoptions.cxx
@@ -142,7 +142,7 @@ class SvtWorkingSetOptions_Impl : public ConfigItem
private:
/*-****************************************************************************************************//**
- @short return list of key names of ouer configuration management which represent oue module tree
+ @short return list of key names of our configuration management which represent our module tree
@descr These methods return a static const list of key names. We need it to get needed values from our
configuration management.
@@ -187,7 +187,7 @@ SvtWorkingSetOptions_Impl::SvtWorkingSetOptions_Impl()
// Follow assignment use order of values in relation to our list of key names!
DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtWorkingSetOptions_Impl::SvtWorkingSetOptions_Impl()\nI miss some values of configuration keys!\n" );
- // Copy values from list in right order to ouer internal member.
+ // Copy values from list in right order to our internal member.
sal_Int32 nPropertyCount = seqValues.getLength();
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
@@ -204,8 +204,8 @@ SvtWorkingSetOptions_Impl::SvtWorkingSetOptions_Impl()
}
}
- // Enable notification mechanism of ouer baseclass.
- // We need it to get information about changes outside these class on ouer used configuration keys!
+ // Enable notification mechanism of our baseclass.
+ // We need it to get information about changes outside these class on our used configuration keys!
EnableNotification( seqNames );
}
@@ -317,9 +317,9 @@ SvtWorkingSetOptions::SvtWorkingSetOptions()
{
// Global access, must be guarded (multithreading!).
MutexGuard aGuard( GetOwnStaticMutex() );
- // Increase ouer refcount ...
+ // Increase our refcount ...
++m_nRefCount;
- // ... and initialize ouer data container only if it not already exist!
+ // ... and initialize our data container only if it not already exist!
if( m_pDataContainer == NULL )
{
m_pDataContainer = new SvtWorkingSetOptions_Impl;
@@ -334,10 +334,10 @@ SvtWorkingSetOptions::~SvtWorkingSetOptions()
{
// Global access, must be guarded (multithreading!)
MutexGuard aGuard( GetOwnStaticMutex() );
- // Decrease ouer refcount.
+ // Decrease our refcount.
--m_nRefCount;
// If last instance was deleted ...
- // we must destroy ouer static data container!
+ // we must destroy our static data container!
if( m_nRefCount <= 0 )
{
delete m_pDataContainer;
@@ -370,13 +370,13 @@ Mutex& SvtWorkingSetOptions::GetOwnStaticMutex()
{
// Initialize static mutex only for one time!
static Mutex* pMutex = NULL;
- // If these method first called (Mutex not already exist!) ...
+ // If this method first called (Mutex not already exist!) ...
if( pMutex == NULL )
{
// ... we must create a new one. Protect follow code with the global mutex -
// It must be - we create a static variable!
MutexGuard aGuard( Mutex::getGlobalMutex() );
- // We must check our pointer again - because it can be that another instance of ouer class will be fastr then these!
+ // We must check our pointer again - because it can be that another instance of our class will be faster than these!
if( pMutex == NULL )
{
// Create the new mutex and set it for return on static variable.