summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-05-09 16:34:33 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-05-10 10:01:13 +0200
commit1156f981ac4557737dd915e89e11abaa61e29f14 (patch)
tree86e847ba365f478bb74d3fc4e3785689d8b45c6f /framework
parent0dc47739176493ded49b665c5fdfe0fe8fff39c1 (diff)
an is used before a vowel sound
not before vowels with a consonant sound so its a url not an url Change-Id: Ic27ff3bee67469284d460c31ced6f63cb3633db2 Reviewed-on: https://gerrit.libreoffice.org/72062 Reviewed-by: Jens Carl <j.carl43@gmx.de> 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/xml/imagesconfiguration.hxx8
-rw-r--r--framework/qa/complex/dispatches/checkdispatchapi.java2
-rw-r--r--framework/source/dispatch/mailtodispatcher.cxx2
-rw-r--r--framework/source/dispatch/servicehandler.cxx2
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx2
-rw-r--r--framework/source/fwi/classes/protocolhandlercache.cxx2
-rw-r--r--framework/source/jobs/jobdispatch.cxx4
-rw-r--r--framework/source/services/autorecovery.cxx4
8 files changed, 13 insertions, 13 deletions
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index 1ead958915cc..330c023707da 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -62,14 +62,14 @@ struct ImageListItemDescriptor
{
ImageListItemDescriptor() : nMaskMode( ImageMaskMode_Color ) {}
- OUString aURL; // an URL to a bitmap with several images inside
+ OUString aURL; // a URL to a bitmap with several images inside
Color aMaskColor; // a color used as transparent
- OUString aMaskURL; // an URL to an optional bitmap used as a mask
+ OUString aMaskURL; // a URL to an optional bitmap used as a mask
ImageMaskMode nMaskMode; // an enum to describe the current mask mode
std::unique_ptr<ImageItemListDescriptor>
pImageItemList; // an array of ImageItemDescriptors that describes every image
- OUString aHighContrastURL; // an URL to an optional high contrast bitmap with several images inside
- OUString aHighContrastMaskURL; // an URL to an optional high contrast bitmap as a mask
+ OUString aHighContrastURL; // a URL to an optional high contrast bitmap with several images inside
+ OUString aHighContrastMaskURL; // a URL to an optional high contrast bitmap as a mask
};
typedef std::vector<std::unique_ptr<ImageListItemDescriptor> > ImageListDescriptor;
diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java
index cceabb4f436c..11ca5baa06c8 100644
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
@@ -267,7 +267,7 @@ public class checkdispatchapi
impl_closeFrame(xFrame);
}
- /** @short load an URL into the current test frame.
+ /** @short load a URL into the current test frame.
*/
private void impl_loadIntoFrame(XFrame xFrame, String sURL, PropertyValue args[]) throws Exception
{
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index 696291e20f9f..81186506a33a 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -69,7 +69,7 @@ MailToDispatcher::~MailToDispatcher()
/**
@short decide if this dispatch implementation can be used for requested URL or not
- @descr A protocol handler is registered for an URL pattern inside configuration and will
+ @descr A protocol handler is registered for a URL pattern inside configuration and will
be asked by the generic dispatch mechanism inside framework, if he can handle this
special URL which match his registration. He can agree by returning of a valid dispatch
instance or disagree by returning <NULL/>.
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index 05b20432cd60..35ef7daa70c9 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -71,7 +71,7 @@ ServiceHandler::~ServiceHandler()
/**
@short decide if this dispatch implementation can be used for requested URL or not
- @descr A protocol handler is registered for an URL pattern inside configuration and will
+ @descr A protocol handler is registered for a URL pattern inside configuration and will
be asked by the generic dispatch mechanism inside framework, if he can handle this
special URL which match his registration. He can agree by returning of a valid dispatch
instance or disagree by returning <NULL/>.
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 59013a750c89..f8f23ac94853 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -735,7 +735,7 @@ void AddonsOptions_Impl::ReadImages( ImageManager& aImageManager )
Sequence< Any > aAddonImageItemNodeValues = GetProperties( aAddonImageItemNodePropNames );
- // An user-defined image entry must have an URL. As "ImageIdentifier" has a higher priority
+ // An user-defined image entry must have a URL. As "ImageIdentifier" has a higher priority
// we also check if we already have an images association.
if (( aAddonImageItemNodeValues[0] >>= aURL ) &&
!aURL.isEmpty() &&
diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx
index e39555328362..9b7984a234de 100644
--- a/framework/source/fwi/classes/protocolhandlercache.cxx
+++ b/framework/source/fwi/classes/protocolhandlercache.cxx
@@ -141,7 +141,7 @@ bool HandlerCache::search( const OUString& sURL, ProtocolHandler* pReturn ) cons
}
/**
- @short search for a registered handler by using an URL struct
+ @short search for a registered handler by using a URL struct
@descr We combine necessary parts of this struct to a valid URL string
and call our other search method ...
It's a helper for outside code.
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index 3840630ccea6..c363bb7f60c4 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -48,7 +48,7 @@ namespace {
/**
@short implements a dispatch object for jobs
@descr Such dispatch object will be used by the generic dispatch mechanism if
- an URL "vnd.sun.star.job:alias=<name>" occurs.
+ a URL "vnd.sun.star.job:alias=<name>" occurs.
Then an instance of this class will be created and used.
This new instance will be called within his method
dispatch() or dispatchWithNotification() for executing the
@@ -185,7 +185,7 @@ void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any >
/**
@short implementation of XDispatchProvider::queryDispatches()
- @descr Every protocol handler will be asked for his agreement, if an URL was queried
+ @descr Every protocol handler will be asked for his agreement, if a URL was queried
for which this handler is registered. It's the chance for this handler to validate
the given URL and return a dispatch object (may be itself) or not.
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 2f0922c02f09..11935ae655e9 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2422,7 +2422,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
implts_specifyAppModuleAndFactory(aNew);
// Hack! Check for "illegal office documents"... as e.g. the Basic IDE
- // It's not really a full featured office document. It doesn't provide an URL, any filter, a factory URL etcpp.
+ // It's not really a full featured office document. It doesn't provide a URL, any filter, a factory URL etcpp.
// TODO file bug to Basic IDE developers. They must remove the office document API from its service.
if (
(aNew.OrgURL.isEmpty()) &&
@@ -3423,7 +3423,7 @@ void AutoRecovery::implts_generateNewTempURL(const OUString& sBack
// and define a unique name, so we can locate it later.
// This unique name must solve an optimization problem too!
// In case we are asked to save unmodified documents too - and one of them
- // is an empty one (because it was new created using e.g. an URL private:factory/...)
+ // is an empty one (because it was new created using e.g. a URL private:factory/...)
// we should not save it really. Then we put the information about such "empty document"
// into the configuration and don't create any recovery file on disk.
// We use the title of the document to make it unique.