summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-05-10 09:34:10 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-05-10 14:50:59 +0200
commitfbc038cc4f4a12f8302ce5b3bd7d739bd66a674e (patch)
treed6cc189748e5980420cc0611b44b28ec4183ea25 /framework
parent8ccffe4e7fb6abf6fa3ba9187007e9d8af116baf (diff)
an uno -> a uno
Change-Id: I538db88f8477dd2d2ad25c372928fec6c11d979d Reviewed-on: https://gerrit.libreoffice.org/72105 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/dispatch/closedispatcher.hxx2
-rw-r--r--framework/inc/dispatch/startmoduledispatcher.hxx4
-rw-r--r--framework/inc/helper/persistentwindowstate.hxx2
-rw-r--r--framework/inc/helper/statusindicatorfactory.hxx8
-rw-r--r--framework/inc/helper/titlebarupdate.hxx2
-rw-r--r--framework/inc/jobs/helponstartup.hxx2
-rw-r--r--framework/inc/jobs/jobdata.hxx2
-rw-r--r--framework/inc/jobs/shelljob.hxx2
-rw-r--r--framework/qa/complex/XTitle/CheckXTitle.java2
-rw-r--r--framework/qa/complex/dispatches/checkdispatchapi.java2
-rw-r--r--framework/source/accelerators/documentacceleratorconfiguration.cxx2
-rw-r--r--framework/source/accelerators/globalacceleratorconfiguration.cxx2
-rw-r--r--framework/source/accelerators/moduleacceleratorconfiguration.cxx2
-rw-r--r--framework/source/dispatch/closedispatcher.cxx2
-rw-r--r--framework/source/fwi/classes/protocolhandlercache.cxx2
-rw-r--r--framework/source/inc/accelerators/presethandler.hxx2
-rw-r--r--framework/source/inc/loadenv/loadenv.hxx4
-rw-r--r--framework/source/inc/loadenv/loadenvexception.hxx2
-rw-r--r--framework/source/jobs/jobdata.cxx2
-rw-r--r--framework/source/jobs/jobdispatch.cxx2
-rw-r--r--framework/source/loadenv/loadenv.cxx2
-rw-r--r--framework/source/services/autorecovery.cxx2
-rw-r--r--framework/source/services/desktop.cxx4
-rw-r--r--framework/source/services/frame.cxx2
24 files changed, 30 insertions, 30 deletions
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index c6556259818f..dd44a110b3f9 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -76,7 +76,7 @@ class CloseDispatcher : public ::cppu::WeakImplHelper<
private:
- /** @short reference to an uno service manager,
+ /** @short reference to a uno service manager,
which can be used to create own needed
uno resources. */
css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index 8c5dc34dace6..37812a79589e 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -50,7 +50,7 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper<
private:
- /** @short reference to an uno service manager,
+ /** @short reference to a uno service manager,
which can be used to create own needed
uno resources. */
css::uno::Reference< css::uno::XComponentContext > m_xContext;
@@ -64,7 +64,7 @@ class StartModuleDispatcher : public ::cppu::WeakImplHelper<
@descr Such "owner frame" is used as context for all related operations.
@param xContext
- an UNO service manager, which is needed to create UNO resource
+ a UNO service manager, which is needed to create UNO resource
internally.
@param xFrame
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index 0699f59beb2c..e0e86226c7ef 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -60,7 +60,7 @@ class PersistentWindowState : public ::cppu::WeakImplHelper<
private:
- /// may we need an uno service manager to create own services
+ /// may we need a uno service manager to create own services
css::uno::Reference< css::uno::XComponentContext > m_xContext;
/// reference to the frame which was created by the office himself
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index cfa6c8439e40..d343fe35395e 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -120,7 +120,7 @@ typedef ::std::vector< IndicatorInfo > IndicatorStack;
@descr Internally it uses:
- a vcl based
- - or an uno based and by the frame layouted
+ - or a uno based and by the frame layouted
progress implementation.
This factory create different indicators and control his access
@@ -252,21 +252,21 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper<
/** @short creates a new internal used progress.
@descr This factory does not paint the progress itself.
It uses helper for that. They can be vcl based or
- layouted by the frame and provided as an uno interface.
+ layouted by the frame and provided as a uno interface.
*/
void impl_createProgress();
/** @short shows the internal used progress.
@descr This factory does not paint the progress itself.
It uses helper for that. They can be vcl based or
- layouted by the frame and provided as an uno interface.
+ layouted by the frame and provided as a uno interface.
*/
void impl_showProgress();
/** @short hides the internal used progress.
@descr This factory does not paint the progress itself.
It uses helper for that. They can be vcl based or
- layouted by the frame and provided as an uno interface.
+ layouted by the frame and provided as a uno interface.
*/
void impl_hideProgress();
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index f835b915d89f..ac2d97533d17 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -62,7 +62,7 @@ class TitleBarUpdate : public ::cppu::WeakImplHelper<
private:
- /// may we need an uno service manager to create own services
+ /// may we need a uno service manager to create own services
css::uno::Reference< css::uno::XComponentContext > m_xContext;
/// reference to the frame which was created by the office himself
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index 641e89e299d1..6dac6f9f344b 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -43,7 +43,7 @@ class HelpOnStartup : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css
private:
osl::Mutex m_mutex;
- /** @short reference to an uno service manager. */
+ /** @short reference to a uno service manager. */
css::uno::Reference< css::uno::XComponentContext > m_xContext;
/** @short such module manager is used to classify new opened documents. */
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index 5f36411463c5..5a8f9ce12d9d 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -113,7 +113,7 @@ class JobData final
- as a configured job
- as a job without any configuration
First mode is triggered by an alias, which points to the
- configuration entries. Second mode is specified by an uno service
+ configuration entries. Second mode is specified by a uno service
or implementation name. Then we do the same things (use the same interfaces)
but don't handle any configuration data.
The effect: This mode can be detected by this member.
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index a25eb448ceb8..b1408858819b 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -45,7 +45,7 @@ class ShellJob : public ::cppu::WeakImplHelper< css::lang::XServiceInfo,css::tas
// member
private:
- /** @short reference to an uno service manager. */
+ /** @short reference to a uno service manager. */
css::uno::Reference< css::uno::XComponentContext > m_xContext;
// native interface
diff --git a/framework/qa/complex/XTitle/CheckXTitle.java b/framework/qa/complex/XTitle/CheckXTitle.java
index 2e982fab586f..e20697eba974 100644
--- a/framework/qa/complex/XTitle/CheckXTitle.java
+++ b/framework/qa/complex/XTitle/CheckXTitle.java
@@ -134,7 +134,7 @@ public class CheckXTitle
}
- // prepare an uno URL query and dispatch it
+ // prepare a uno URL query and dispatch it
private void prepareQueryAndDispatch(XDispatchProvider xDisProv, String unoURL)
{
XDispatch xDispatcher = null;
diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java
index 11ca5baa06c8..851b467daeb7 100644
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
@@ -285,7 +285,7 @@ public class checkdispatchapi
}
}
- /** @short create an uno implementation directly.
+ /** @short create a uno implementation directly.
*/
private Object impl_createUNOComponent(String sName)
{
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index d6160e19d4d2..bb7461aa17a8 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -64,7 +64,7 @@ public:
/** initialize this instance and fill the internal cache.
@param xSMGR
- reference to an uno service manager, which is used internally.
+ reference to a uno service manager, which is used internally.
*/
DocumentAcceleratorConfiguration(
const css::uno::Reference< css::uno::XComponentContext >& xContext,
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 2a05887f7c98..8c60e7c4574f 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -51,7 +51,7 @@ public:
/** initialize this instance and fill the internal cache.
@param xSMGR
- reference to an uno service manager, which is used internally.
+ reference to a uno service manager, which is used internally.
*/
explicit GlobalAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext);
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 65534a31a1e2..6cdf214ad013 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -61,7 +61,7 @@ public:
/** initialize this instance and fill the internal cache.
@param xSMGR
- reference to an uno service manager, which is used internally.
+ reference to a uno service manager, which is used internally.
*/
ModuleAcceleratorConfiguration(
const css::uno::Reference< css::uno::XComponentContext >& xContext,
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index f6ac18d400ab..1b9af10a8afc 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -199,7 +199,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
// Do it asynchronous everytimes!
// But don't forget to hold ourselves alive.
- // We are called back from an environment, which doesn't know an uno reference.
+ // We are called back from an environment, which doesn't know a uno reference.
// They call us back by using our c++ interface.
m_xResultListener = xListener;
diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx
index 9b7984a234de..8a27747bcb48 100644
--- a/framework/source/fwi/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -38,7 +38,7 @@ namespace framework{
/**
@short overloaded index operator of hash map to support pattern key search
- @descr All keys inside this hash map are URL pattern which points to an uno
+ @descr All keys inside this hash map are URL pattern which points to a uno
implementation name of a protocol handler service which is registered
for this pattern. This operator makes it easy to find such registered
handler by using a full qualified URL and compare it with all pattern
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 55532b8a2a3f..9425115fadfe 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -119,7 +119,7 @@ class PresetHandler
/** @short does nothing real.
@param xContext
- points to an uno service manager, which is used internally
+ points to a uno service manager, which is used internally
to create own needed uno resources.
*/
PresetHandler(const css::uno::Reference< css::uno::XComponentContext >& xContext);
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 4c8c148e41e9..040f41d1e06c 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -103,7 +103,7 @@ public:
private:
mutable osl::Mutex m_mutex;
- /** @short reference to an uno service manager, which must be used
+ /** @short reference to a uno service manager, which must be used
to created on needed services on demand.
*/
css::uno::Reference< css::uno::XComponentContext > m_xContext;
@@ -197,7 +197,7 @@ public:
/** @short initialize a new instance of this load environment.
@param xContext
- reference to an uno service manager, which can be used internally
+ reference to a uno service manager, which can be used internally
to create on needed services on demand.
@throw Currently there is no reason to throw such exception!
diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx
index 8bf0e2f36008..72669cc59691 100644
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
@@ -50,7 +50,7 @@ class LoadEnvException
should be thrown, if a required item does not exists. */
ID_INVALID_MEDIADESCRIPTOR,
- /** @short Its similar to an uno::RuntimeException ....
+ /** @short Its similar to a uno::RuntimeException ....
@descr But such runtime exception can break the whole office code.
So its capsulated to this specialized load environment only.
Mostly it indicates a missing but needed resource ... e.g the
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 8984d618a1bc..aacaf6c97fe8 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -359,7 +359,7 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const
/**
@short return information, if this job is part of the global configuration package
org.openoffice.Office.Jobs
- @descr Because jobs can be executed by the dispatch framework using an uno service name
+ @descr Because jobs can be executed by the dispatch framework using a uno service name
directly - an executed job must not have any configuration really. Such jobs
must provide the right interfaces only! But after finishing jobs can return
some information (e.g. for updating her configuration ...). We must know
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index c363bb7f60c4..59ba3a0ec2b4 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -360,7 +360,7 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const OUString&
/**
@short dispatch a service
@descr We use the given name only to create and if possible to initialize
- it as an uno service. It can be useful for creating (caching?)
+ it as a uno service. It can be useful for creating (caching?)
of e.g. one instance services.
@param sService
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index e70f771eb053..2ddfd34492d0 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -722,7 +722,7 @@ void LoadEnv::impl_detectTypeAndFilter()
// SAFE ->
osl::ClearableMutexGuard aReadLock(m_mutex);
- // Attention: Because our stl media descriptor is a copy of an uno sequence
+ // Attention: Because our stl media descriptor is a copy of a uno sequence
// we can't use as an in/out parameter here. Copy it before and don't forget to
// update structure afterwards again!
css::uno::Sequence< css::beans::PropertyValue > lDescriptor = m_lMediaDescriptor.getAsConstPropertyValueList();
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 11935ae655e9..da3db64cb68f 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -152,7 +152,7 @@ public:
internal operation asynchronous... we send an event
to start and return immediately. But we must be sure that
our instance live if the event callback reach us.
- So we hold an uno reference to ourself.
+ So we hold a uno reference to ourself.
*/
css::uno::Reference< css::uno::XInterface > m_xHoldRefForAsyncOpAlive;
};
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 56d0b6886e3e..b3af82593e66 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -140,7 +140,7 @@ void Desktop::constructorInit()
@descr This constructor initialize a new instance of this class by valid factory,
and will be set valid values on his member and baseclasses.
- @attention a) Don't use your own reference during an UNO-Service-ctor! There is no guarantee, that you
+ @attention a) Don't use your own reference during a UNO-Service-ctor! There is no guarantee, that you
will get over this. (e.g. using of your reference as parameter to initialize some member)
Do such things in DEFINE_INIT_SERVICE() method, which is called automatically after your ctor!!!
b) Baseclass OBroadcastHelper is a typedef in namespace cppu!
@@ -1709,7 +1709,7 @@ bool Desktop::impl_closeFrames(bool bAllowUI)
{
css::uno::Reference< css::frame::XFrame > xFrame = lFrames[i];
- // XController.suspend() will show an UI ...
+ // XController.suspend() will show a UI ...
// Use it in case it was allowed from outside only.
bool bSuspended = false;
css::uno::Reference< css::frame::XController > xController( xFrame->getController(), css::uno::UNO_QUERY );
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index ec44c24efd33..80f0f6bc59df 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -439,7 +439,7 @@ private:
@descr This constructor initialize a new instance of this class by valid factory,
and will be set valid values on his member and baseclasses.
- @attention a) Don't use your own reference during an UNO-Service-ctor! There is no guarantee, that you
+ @attention a) Don't use your own reference during a UNO-Service-ctor! There is no guarantee, that you
will get over this. (e.g. using of your reference as parameter to initialize some member)
Do such things in DEFINE_INIT_SERVICE() method, which is called automatically after your ctor!!!
b) Baseclass OBroadcastHelper is a typedef in namespace cppu!