[Libreoffice-commits] core.git: basic/source bean/com bridges/source cli_ure/source comphelper/source compilerplugins/clang configmgr/README cppcanvas/qa dbaccess/source desktop/source extensions/source extensions/test filter/source forms/source fpicker/source framework/inc framework/qa framework/source include/basic include/comphelper include/cppuhelper include/desktop include/drawinglayer include/framework include/LibreOfficeKit include/sfx2 include/svtools include/svx include/toolkit include/uno include/unotools include/vbahelper include/vcl ios/LibreOfficeLight javaunohelper/com jurt/com odk/docs odk/examples offapi/com officecfg/registry pyuno/inc pyuno/source reportbuilder/java sax/source sc/inc scripting/java scripting/source sc/source slideshow/source svx/source sw/qa sw/source sysui/desktop udkapi/com unodevtools/source winaccessibility/README writerfilter/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri May 10 12:52:05 UTC 2019


 basic/source/classes/sbunoobj.cxx                                                  |   10 ++++----
 basic/source/inc/sbunoobj.hxx                                                      |    2 -
 basic/source/runtime/runtime.cxx                                                   |    8 +++---
 basic/source/uno/namecont.cxx                                                      |    2 -
 bean/com/sun/star/comp/beans/LocalOfficeConnection.java                            |    2 -
 bean/com/sun/star/comp/beans/LocalOfficeWindow.java                                |    2 -
 bean/com/sun/star/comp/beans/OfficeWindow.java                                     |    2 -
 bridges/source/jni_uno/jni_uno2java.cxx                                            |    2 -
 cli_ure/source/uno_bridge/cli_bridge.h                                             |    2 -
 cli_ure/source/uno_bridge/cli_environment.h                                        |    2 -
 cli_ure/source/uno_bridge/cli_proxy.cxx                                            |    2 -
 comphelper/source/misc/documentinfo.cxx                                            |    2 -
 comphelper/source/property/propertycontainerhelper.cxx                             |    6 ++---
 comphelper/source/property/propertystatecontainer.cxx                              |    2 -
 compilerplugins/clang/plugin.hxx                                                   |    2 -
 compilerplugins/clang/salcall.cxx                                                  |    2 -
 configmgr/README                                                                   |    2 -
 cppcanvas/qa/unit/test.cxx                                                         |    2 -
 dbaccess/source/ui/app/AppController.hxx                                           |    2 -
 dbaccess/source/ui/dlg/DbAdminImpl.hxx                                             |    4 +--
 desktop/source/app/cmdlinehelp.cxx                                                 |    4 +--
 desktop/source/deployment/gui/dp_gui_service.cxx                                   |    2 -
 extensions/source/abpilot/datasourcehandling.hxx                                   |    2 -
 extensions/source/ole/oleobjw.cxx                                                  |    2 -
 extensions/source/ole/oleobjw.hxx                                                  |    4 +--
 extensions/source/ole/servprov.hxx                                                 |    2 -
 extensions/source/ole/unoconversionutilities.hxx                                   |   12 +++++-----
 extensions/source/ole/unoobjw.cxx                                                  |    8 +++---
 extensions/source/ole/unotypewrapper.hxx                                           |    2 -
 extensions/source/propctrlr/eventhandler.cxx                                       |    2 -
 extensions/test/ole/VisualBasic/Module1.vb                                         |    2 -
 extensions/test/ole/callUnoToJava.htm                                              |    2 -
 filter/source/config/cache/configflush.hxx                                         |    2 -
 filter/source/config/cache/contenthandlerfactory.hxx                               |    2 -
 filter/source/config/cache/filterfactory.hxx                                       |    2 -
 filter/source/config/cache/frameloaderfactory.hxx                                  |    2 -
 filter/source/config/cache/typedetection.hxx                                       |    2 -
 forms/source/richtext/richtextcontrol.cxx                                          |    2 -
 fpicker/source/win32/VistaFilePicker.hxx                                           |    2 -
 framework/inc/dispatch/closedispatcher.hxx                                         |    2 -
 framework/inc/dispatch/startmoduledispatcher.hxx                                   |    4 +--
 framework/inc/helper/persistentwindowstate.hxx                                     |    2 -
 framework/inc/helper/statusindicatorfactory.hxx                                    |    8 +++---
 framework/inc/helper/titlebarupdate.hxx                                            |    2 -
 framework/inc/jobs/helponstartup.hxx                                               |    2 -
 framework/inc/jobs/jobdata.hxx                                                     |    2 -
 framework/inc/jobs/shelljob.hxx                                                    |    2 -
 framework/qa/complex/XTitle/CheckXTitle.java                                       |    2 -
 framework/qa/complex/dispatches/checkdispatchapi.java                              |    2 -
 framework/source/accelerators/documentacceleratorconfiguration.cxx                 |    2 -
 framework/source/accelerators/globalacceleratorconfiguration.cxx                   |    2 -
 framework/source/accelerators/moduleacceleratorconfiguration.cxx                   |    2 -
 framework/source/dispatch/closedispatcher.cxx                                      |    2 -
 framework/source/fwi/classes/protocolhandlercache.cxx                              |    2 -
 framework/source/inc/accelerators/presethandler.hxx                                |    2 -
 framework/source/inc/loadenv/loadenv.hxx                                           |    4 +--
 framework/source/inc/loadenv/loadenvexception.hxx                                  |    2 -
 framework/source/jobs/jobdata.cxx                                                  |    2 -
 framework/source/jobs/jobdispatch.cxx                                              |    2 -
 framework/source/loadenv/loadenv.cxx                                               |    2 -
 framework/source/services/autorecovery.cxx                                         |    2 -
 framework/source/services/desktop.cxx                                              |    4 +--
 framework/source/services/frame.cxx                                                |    2 -
 include/LibreOfficeKit/LibreOfficeKit.hxx                                          |    2 -
 include/basic/sbuno.hxx                                                            |    2 -
 include/comphelper/weak.hxx                                                        |    2 -
 include/cppuhelper/weak.hxx                                                        |    2 -
 include/cppuhelper/weakagg.hxx                                                     |    2 -
 include/desktop/exithelper.h                                                       |    2 -
 include/drawinglayer/processor2d/baseprocessor2d.hxx                               |    2 -
 include/framework/undomanagerhelper.hxx                                            |    2 -
 include/sfx2/docmacromode.hxx                                                      |    2 -
 include/svtools/acceleratorexecute.hxx                                             |    2 -
 include/svx/svdouno.hxx                                                            |    2 -
 include/toolkit/awt/vclxdevice.hxx                                                 |    2 -
 include/toolkit/controls/accessiblecontrolcontext.hxx                              |    6 ++---
 include/uno/any2.h                                                                 |    2 -
 include/uno/environment.h                                                          |    6 ++---
 include/uno/mapping.hxx                                                            |    2 -
 include/unotools/sharedunocomponent.hxx                                            |    6 ++---
 include/vbahelper/vbahelper.hxx                                                    |    2 -
 include/vcl/button.hxx                                                             |    2 -
 ios/LibreOfficeLight/LibreOfficeLight/LOKit/Document.swift                         |    2 -
 javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java |    2 -
 javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java                         |    4 +--
 javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java                              |    4 +--
 jurt/com/sun/star/uno/AnyConverter.java                                            |    4 +--
 odk/docs/tools.html                                                                |    4 +--
 odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java      |    2 -
 offapi/com/sun/star/awt/UnoControlButtonModel.idl                                  |    2 -
 offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl                                |    2 -
 offapi/com/sun/star/awt/UnoControlComboBoxModel.idl                                |    2 -
 offapi/com/sun/star/awt/UnoControlContainerModel.idl                               |    2 -
 offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl                           |    2 -
 offapi/com/sun/star/awt/UnoControlDateFieldModel.idl                               |    2 -
 offapi/com/sun/star/awt/UnoControlDialogModel.idl                                  |    2 -
 offapi/com/sun/star/awt/UnoControlEditModel.idl                                    |    2 -
 offapi/com/sun/star/awt/UnoControlFileControlModel.idl                             |    2 -
 offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl                          |    2 -
 offapi/com/sun/star/awt/UnoControlFixedLineModel.idl                               |    2 -
 offapi/com/sun/star/awt/UnoControlFixedTextModel.idl                               |    2 -
 offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl                          |    2 -
 offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl                                |    2 -
 offapi/com/sun/star/awt/UnoControlImageControlModel.idl                            |    2 -
 offapi/com/sun/star/awt/UnoControlListBoxModel.idl                                 |    2 -
 offapi/com/sun/star/awt/UnoControlModel.idl                                        |    2 -
 offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl                            |    2 -
 offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl                            |    2 -
 offapi/com/sun/star/awt/UnoControlProgressBarModel.idl                             |    2 -
 offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl                             |    2 -
 offapi/com/sun/star/awt/UnoControlRoadmapModel.idl                                 |    2 -
 offapi/com/sun/star/awt/UnoControlScrollBarModel.idl                               |    2 -
 offapi/com/sun/star/awt/UnoControlSpinButton.idl                                   |    2 -
 offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl                              |    2 -
 offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl                               |    2 -
 offapi/com/sun/star/deployment/XPackageManager.idl                                 |    8 +++---
 offapi/com/sun/star/deployment/XPackageRegistry.idl                                |    2 -
 offapi/com/sun/star/document/ExtendedTypeDetection.idl                             |    2 -
 offapi/com/sun/star/packages/PackageFolder.idl                                     |    2 -
 officecfg/registry/schema/org/openoffice/Office/Jobs.xcs                           |    4 +--
 officecfg/registry/schema/org/openoffice/Setup.xcs                                 |    2 -
 pyuno/inc/pyuno.hxx                                                                |    2 -
 pyuno/source/module/uno.py                                                         |    2 -
 reportbuilder/java/org/libreoffice/report/pentaho/model/FormattedTextElement.java  |    2 -
 sax/source/fastparser/fastparser.cxx                                               |    2 -
 sc/inc/rangeseq.hxx                                                                |    2 -
 sc/source/core/data/document.cxx                                                   |    2 -
 sc/source/ui/vba/excelvbahelper.hxx                                                |    2 -
 scripting/java/com/sun/star/script/framework/container/Parcel.java                 |    4 +--
 scripting/java/com/sun/star/script/framework/container/ParcelContainer.java        |    6 ++---
 scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java        |    2 -
 scripting/source/provider/MasterScriptProvider.cxx                                 |    2 -
 slideshow/source/inc/unoview.hxx                                                   |    2 -
 svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx         |    2 -
 sw/qa/extras/README                                                                |    2 -
 sw/source/core/ole/ndole.cxx                                                       |    2 -
 sw/source/core/unocore/unoobj2.cxx                                                 |    2 -
 sw/source/core/unocore/unoportenum.cxx                                             |    2 -
 sw/source/filter/ww8/README-rtf.txt                                                |    2 -
 sysui/desktop/man/libreoffice.1                                                    |    4 +--
 udkapi/com/sun/star/bridge/OleBridgeSupplier2.idl                                  |    4 +--
 udkapi/com/sun/star/bridge/UnoUrlResolver.idl                                      |    2 -
 udkapi/com/sun/star/bridge/oleautomation/BridgeSupplier.idl                        |    2 -
 udkapi/com/sun/star/lang/XComponent.idl                                            |    2 -
 udkapi/com/sun/star/reflection/ProxyFactory.idl                                    |    2 -
 udkapi/com/sun/star/reflection/XIdlClass.idl                                       |    2 -
 udkapi/com/sun/star/reflection/XProxyFactory.idl                                   |    2 -
 udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl               |    6 ++---
 udkapi/com/sun/star/script/ArrayWrapper.idl                                        |    2 -
 udkapi/com/sun/star/uno/XAggregation.idl                                           |    2 -
 udkapi/com/sun/star/uno/XInterface.idl                                             |    2 -
 udkapi/com/sun/star/util/BootstrapMacroExpander.idl                                |    2 -
 unodevtools/source/skeletonmaker/skeletonmaker.cxx                                 |    2 -
 winaccessibility/README                                                            |    2 -
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx                           |    2 -
 155 files changed, 202 insertions(+), 202 deletions(-)

New commits:
commit fbc038cc4f4a12f8302ce5b3bd7d739bd66a674e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 10 09:34:10 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 10 14:50:59 2019 +0200

    an uno -> a uno
    
    Change-Id: I538db88f8477dd2d2ad25c372928fec6c11d979d
    Reviewed-on: https://gerrit.libreoffice.org/72105
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 0ece9c2d24ea..0896c8b39ebb 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -108,7 +108,7 @@ static char const ID_DBG_METHODS[] = "Dbg_Methods";
 
 static char const aSeqLevelStr[] = "[]";
 
-// Gets the default property for an uno object. Note: There is some
+// Gets the default property for a uno object. Note: There is some
 // redirection built in. The property name specifies the name
 // of the default property.
 
@@ -2824,7 +2824,7 @@ Any SbUnoObject::getUnoAny()
     return aRetAny;
 }
 
-// help method to create an Uno-Struct per CoreReflection
+// help method to create a Uno-Struct per CoreReflection
 static SbUnoObject* Impl_CreateUnoStruct( const OUString& aClassName )
 {
     // get CoreReflection
@@ -2869,7 +2869,7 @@ SbxObject* SbUnoFactory::CreateObject( const OUString& rClassName )
 
 
 // Provisional interface for the UNO-Connection
-// Deliver a SbxObject, that wrap an Uno-Interface
+// Deliver a SbxObject, that wrap a Uno-Interface
 SbxObjectRef GetSbUnoObject( const OUString& aName, const Any& aUnoObj_ )
 {
     return new SbUnoObject( aName, aUnoObj_ );
@@ -3395,7 +3395,7 @@ SbxVariable* SbUnoClass::Find( const OUString& rName, SbxClassType )
                     }
                 }
 
-                // An UNO service?
+                // A UNO service?
                 if( !pRes )
                 {
                     SbUnoService* pUnoService = findUnoService( aNewName );
@@ -3407,7 +3407,7 @@ SbxVariable* SbUnoClass::Find( const OUString& rName, SbxClassType )
                     }
                 }
 
-                // An UNO singleton?
+                // A UNO singleton?
                 if( !pRes )
                 {
                     SbUnoSingleton* pUnoSingleton = findUnoSingleton( aNewName );
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 8cc966da66fa..1116767e34ca 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -209,7 +209,7 @@ public:
     virtual SbxObject* CreateObject( const OUString& ) override;
 };
 
-// wrapper for an uno-class
+// wrapper for a uno-class
 class SbUnoClass : public SbxObject
 {
     const css::uno::Reference< css::reflection::XIdlClass >   m_xClass;
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 846b6c5765e2..3baba08b2f8a 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1597,8 +1597,8 @@ static bool checkUnoStructCopy( bool bVBA, SbxVariableRef const & refVal, SbxVar
     SbUnoObject* pUnoVal =  dynamic_cast<SbUnoObject*>( xValObj.get() );
     SbUnoStructRefObject* pUnoStructVal = dynamic_cast<SbUnoStructRefObject*>( xValObj.get() );
     Any aAny;
-    // make doubly sure value is either an Uno object or
-    // an uno struct
+    // make doubly sure value is either a Uno object or
+    // a uno struct
     if ( pUnoVal || pUnoStructVal )
         aAny = pUnoVal ? pUnoVal->getUnoAny() : pUnoStructVal->getUnoAny();
     else
@@ -3397,7 +3397,7 @@ SbxVariable* SbiRuntime::FindElement( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt
                     }
                 }
 
-                // #62939 If an uno-class has been found, the wrapper
+                // #62939 If a uno-class has been found, the wrapper
                 // object has to be held, because the uno-class, e. g.
                 // "stardiv", has to be read out of the registry
                 // every time again otherwise
@@ -3782,7 +3782,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
         pPar = pElem->GetParameters();
         if ( pPar )
         {
-            // is it an uno-object?
+            // is it a uno-object?
             SbxBaseRef pObj = pElem->GetObject();
             if( pObj.is() )
             {
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 192da2b017ab..d98b7364bdcd 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -592,7 +592,7 @@ static void createVariableURL( OUString& rStr, const OUString& rLibName,
 void SfxLibraryContainer::init( const OUString& rInitialDocumentURL, const uno::Reference< embed::XStorage >& rxInitialStorage )
 {
     // this might be called from within the ctor, and the impl_init might (indirectly) create
-    // an UNO reference to ourself.
+    // a UNO reference to ourself.
     // Ensure that we're not destroyed while we're in here
     osl_atomic_increment( &m_refCount );
     init_Impl( rInitialDocumentURL, rxInitialStorage );
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index d4f12e70268e..7872d493410a 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -448,7 +448,7 @@ public class LocalOfficeConnection
 
     /**
      * Parses a connection URL.
-     * This method accepts an UNO URL with following format:<br>
+     * This method accepts a UNO URL with following format:<br>
      * <pre>
      * url    := uno:localoffice[,<params>];urp;StarOffice.NamingService
      * params := <path>[,<pipe>]
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
index 67ace100fb5f..1efc99032594 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
@@ -152,7 +152,7 @@ public class LocalOfficeWindow
     }
 
     /**
-     * Retrieves an UNO XWindowPeer object associated with the OfficeWindow.
+     * Retrieves a UNO XWindowPeer object associated with the OfficeWindow.
      *
      * @return The UNO XWindowPeer object associated with the OfficeWindow.
      */
diff --git a/bean/com/sun/star/comp/beans/OfficeWindow.java b/bean/com/sun/star/comp/beans/OfficeWindow.java
index a28489e1959b..806f6b07a5a1 100644
--- a/bean/com/sun/star/comp/beans/OfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/OfficeWindow.java
@@ -38,7 +38,7 @@ public interface OfficeWindow
     Component getAWTComponent();
 
     /**
-     * Retrieves an UNO XWindowPeer object associated with the OfficeWindow.
+     * Retrieves a UNO XWindowPeer object associated with the OfficeWindow.
      *
      * @return The UNO XWindowPeer object associated with the OfficeWindow.
      */
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 510f7e5bb3ac..9b7c45c6185b 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -383,7 +383,7 @@ void Bridge::call_java(
     }
 }
 
-// an UNO proxy wrapping a Java interface
+// a UNO proxy wrapping a Java interface
 struct UNO_proxy : public uno_Interface
 {
     mutable std::atomic<std::size_t>    m_ref;
diff --git a/cli_ure/source/uno_bridge/cli_bridge.h b/cli_ure/source/uno_bridge/cli_bridge.h
index 1f510811c799..95ddb03943d4 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.h
+++ b/cli_ure/source/uno_bridge/cli_bridge.h
@@ -44,7 +44,7 @@ struct Mapping : public uno_Mapping
 };
 
 // The environment will be created in uno_initEnvironment. See also the remarks there
-//Managed cli environment for cli objects an UNO proxies (which are cli
+//Managed cli environment for cli objects a UNO proxies (which are cli
 //objects. The uno_Environment is not used for cli objects.
 ref struct CliEnvHolder {
 static Cli_environment ^ g_cli_env = nullptr;
diff --git a/cli_ure/source/uno_bridge/cli_environment.h b/cli_ure/source/uno_bridge/cli_environment.h
index 46977fa657c7..db220d32d1fc 100644
--- a/cli_ure/source/uno_bridge/cli_environment.h
+++ b/cli_ure/source/uno_bridge/cli_environment.h
@@ -59,7 +59,7 @@ public:
     !Cli_environment();
 
     /**
-       Registers an UNO object as being mapped by this bridge. The resulting
+       Registers a UNO object as being mapped by this bridge. The resulting
        cli object is represents all interfaces of the UNO object. Therefore the
        object can be registered only with its OID; a type is not necessary.
     */
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index 6930cbfbe83b..22c47817748f 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -219,7 +219,7 @@ bool UnoInterfaceProxy::CanCastTo(System::Type^ fromType,
         if (nullptr != findInfo( fromType )) // proxy supports demanded interface
             return true;
 
-        //query an uno interface for the required type
+        //query a uno interface for the required type
 
         // we use the first interface in the list (m_listIfaces) to make
         // the queryInterface call
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index 8d96d5f5e77e..3e0faadbfb8b 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -116,7 +116,7 @@ namespace comphelper {
             // 5. try the last segment of the document URL
             // this formerly was an INetURLObject::getName( LAST_SEGMENT, true, DecodeMechanism::WithCharset ),
             // but since we moved this code to comphelper, we do not have access to an INetURLObject anymore
-            // This heuristics here should be sufficient - finally, we will get an UNO title API in a not
+            // This heuristics here should be sufficient - finally, we will get a UNO title API in a not
             // too distant future (hopefully), then  this complete class is superfluous)
             if ( sDocURL.isEmpty() )
             {
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index 78bdbd6632ef..623ff7bb09eb 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -76,7 +76,7 @@ void OPropertyContainerHelper::registerProperty(const OUString& _rName, sal_Int3
     OSL_ENSURE((_nAttributes & PropertyAttribute::MAYBEVOID) == 0,
         "OPropertyContainerHelper::registerProperty: don't use this for properties which may be void ! There is a method called \"registerMayBeVoidProperty\" for this !");
     OSL_ENSURE(!_rMemberType.equals(cppu::UnoType<Any>::get()),
-        "OPropertyContainerHelper::registerProperty: don't give my the type of an uno::Any ! Really can't handle this !");
+        "OPropertyContainerHelper::registerProperty: don't give my the type of a uno::Any ! Really can't handle this !");
     OSL_ENSURE(_pPointerToMember,
         "OPropertyContainerHelper::registerProperty: you gave me nonsense : the pointer must be non-NULL");
 
@@ -104,7 +104,7 @@ void OPropertyContainerHelper::registerMayBeVoidProperty(const OUString& _rName,
     OSL_ENSURE((_nAttributes & PropertyAttribute::MAYBEVOID) != 0,
         "OPropertyContainerHelper::registerMayBeVoidProperty: why calling this when the attributes say nothing about may-be-void ?");
     OSL_ENSURE(!_rExpectedType.equals(cppu::UnoType<Any>::get()),
-        "OPropertyContainerHelper::registerMayBeVoidProperty: don't give my the type of an uno::Any ! Really can't handle this !");
+        "OPropertyContainerHelper::registerMayBeVoidProperty: don't give my the type of a uno::Any ! Really can't handle this !");
     OSL_ENSURE(_pPointerToMember,
         "OPropertyContainerHelper::registerMayBeVoidProperty: you gave me nonsense : the pointer must be non-NULL");
 
@@ -123,7 +123,7 @@ void OPropertyContainerHelper::registerPropertyNoMember(const OUString& _rName,
         const Type& _rType, css::uno::Any const & _pInitialValue)
 {
     OSL_ENSURE(!_rType.equals(cppu::UnoType<Any>::get()),
-        "OPropertyContainerHelper::registerPropertyNoMember : don't give my the type of an uno::Any ! Really can't handle this !");
+        "OPropertyContainerHelper::registerPropertyNoMember : don't give my the type of a uno::Any ! Really can't handle this !");
     OSL_ENSURE(
         (_pInitialValue.isExtractableTo(_rType)
          || (!_pInitialValue.hasValue()
diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx
index 031ae9193d82..6d2071f90dfb 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.cxx
@@ -35,7 +35,7 @@ namespace comphelper
         {
             // TODO: perhaps it's time to think about resources in the comphelper module?
             // Would be nice to have localized exception strings (a simply resource file containing
-            // strings only would suffice, and could be realized with an UNO service, so we do not
+            // strings only would suffice, and could be realized with a UNO service, so we do not
             // need the dependency to the Tools project)
             OUStringBuffer sMessage;
             sMessage.append( "The property \"" );
diff --git a/compilerplugins/clang/plugin.hxx b/compilerplugins/clang/plugin.hxx
index 19908d8257e5..984bd11cd315 100644
--- a/compilerplugins/clang/plugin.hxx
+++ b/compilerplugins/clang/plugin.hxx
@@ -84,7 +84,7 @@ protected:
     /// to check file names against whitelists, so that it works with preprocessed input too
     StringRef getFileNameOfSpellingLoc(SourceLocation spellingLocation) const;
     /**
-     Checks if the location is inside an UNO file, more specifically, if it forms part of the URE stable interface,
+     Checks if the location is inside a UNO file, more specifically, if it forms part of the URE stable interface,
      which is not allowed to be changed.
     */
     bool isInUnoIncludeFile(SourceLocation spellingLocation) const;
diff --git a/compilerplugins/clang/salcall.cxx b/compilerplugins/clang/salcall.cxx
index 0048b907f552..883f099abc9a 100644
--- a/compilerplugins/clang/salcall.cxx
+++ b/compilerplugins/clang/salcall.cxx
@@ -225,7 +225,7 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl)
             return true;
     }
 
-    // some base classes are overridden by sub-classes which override both the base-class and an UNO class
+    // some base classes are overridden by sub-classes which override both the base-class and a UNO class
     if (recordDecl)
     {
         auto dc = loplugin::DeclCheck(recordDecl);
diff --git a/configmgr/README b/configmgr/README
index 15cc2cf09441..36a1340ed82a 100644
--- a/configmgr/README
+++ b/configmgr/README
@@ -3,7 +3,7 @@ UNO services to access the configuration database
 == Functional Overview ==
 
 This code parses the settings that are described in the [[officecfg]]
-directory, and provides an UNO API that code can use to set and get
+directory, and provides a UNO API that code can use to set and get
 settings.
 
 == Source Overview ==
diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx
index de7d3ef94b91..fb896ddedcc8 100644
--- a/cppcanvas/qa/unit/test.cxx
+++ b/cppcanvas/qa/unit/test.cxx
@@ -75,7 +75,7 @@ void CanvasTest::testComposite()
         aRedTransparent[3] = 0.5; // A
         aDefaultState.DeviceColor = aRedTransparent;
 #if 0
-        // words fail me to describe the sheer beauty of allocating an UNO
+        // words fail me to describe the sheer beauty of allocating a UNO
         // object to represent a polygon, and manually handling the ViewState
         // and there being no public helper for this - to render ... a rectangle.
         XCachedPrimitive    fillPolyPolygon( [in] XPolyPolygon2D xPolyPolygon, [in] ViewState aViewState, [in] RenderState aRenderState )
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 1ba03e847926..53b0ea32fbde 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -270,7 +270,7 @@ namespace dbaui
         */
         void addContainerListener(const css::uno::Reference< css::container::XNameAccess>& _xCollection);
 
-        /** opens an uno dialog with the currently selected data source as initialize argument
+        /** opens a uno dialog with the currently selected data source as initialize argument
             @param  _sServiceName
                 The service name of the dialog to be executed.
         */
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index 559db0e6f10e..8ecc47963a92 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -122,7 +122,7 @@ namespace dbaui
 
         const MapInt2String& getIndirectProperties() const { return m_aIndirectPropTranslator; }
 
-        /** translates properties of an UNO data source into SfxItems
+        /** translates properties of a UNO data source into SfxItems
             @param  _rxSource
                 The data source
             @param  _rDest
@@ -132,7 +132,7 @@ namespace dbaui
                 const css::uno::Reference< css::beans::XPropertySet >& _rxSource,
                 SfxItemSet& _rDest);
 
-        /** translate SfxItems into properties of an UNO data source
+        /** translate SfxItems into properties of a UNO data source
             @param  _rSource
                 The item set to read from.
             @param  _rxDest
diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx
index 95e71998f3fb..eb8c683bd2c4 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -96,11 +96,11 @@ namespace desktop
         "   --safe-mode         Starts in a safe mode, i.e. starts temporarily with a   \n"
         "                       fresh user profile and helps to restore a broken        \n"
         "                       configuration.                                          \n"
-        "   --accept={UNO-URL}  Specifies an UNO-URL connect-string to create an UNO    \n"
+        "   --accept={UNO-URL}  Specifies a UNO-URL connect-string to create a UNO      \n"
         "                       acceptor through which other programs can connect to    \n"
         "                       access the API. Note that API access allows execution   \n"
         "                       of arbitrary commands.                                  \n"
-        "                       The syntax of an UNO-URL connect-string is:             \n"
+        "                       The syntax of a UNO-URL connect-string is:              \n"
         "                   uno:connection-type,params;protocol-name,params;ObjectName  \n"
         "   --unaccept={UNO-URL} Closes an acceptor that was created with --accept. Use \n"
         "                       --unaccept=all to close all open acceptors.             \n"
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 29ae31e28617..a8e0f37b1388 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -162,7 +162,7 @@ ServiceImpl::ServiceImpl( Sequence<Any> const& args,
     : m_xComponentContext(xComponentContext),
       m_bShowUpdateOnly( false )
 {
-    /* if true then this service is running in an unopkg process and not in an office process */
+    /* if true then this service is running in a unopkg process and not in an office process */
     boost::optional<sal_Bool> unopkg;
     boost::optional<OUString> view;
     try {
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index 5a73f5ac6b04..f5037915bdf2 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -90,7 +90,7 @@ namespace abp
     /** a non-UNO wrapper for a data source
         <p>This class allows to access data sources without the need to compile the respective file with
         exception handling enabled (hopefully :).</p>
-        <p>In addition to wrapping an UNO data source, an instance of this class can handle at most
+        <p>In addition to wrapping a UNO data source, an instance of this class can handle at most
         one valid connection, as obtained from the data source.</p>
     */
     class ODataSource
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 76d6d246f377..0d895b2ffbca 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -446,7 +446,7 @@ Any SAL_CALL IUnknownWrapper::getValue( const OUString& aPropertyName )
         // I was going to implement an XServiceInfo interface to allow the type
         // of the automation object to be exposed.. but it seems
         // from looking at comments in the code that it is possible for
-        // this object to actually wrap an UNO object ( I guess if automation is
+        // this object to actually wrap a UNO object ( I guess if automation is
         // used from MSO to create Openoffice objects ) Therefore, those objects
         // will more than likely already have their own XServiceInfo interface.
         // Instead here I chose a name that should be illegal both in COM and
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index 1ba5b8a5ebbf..8bba811ff801 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -51,7 +51,7 @@ typedef std::unordered_map<OUString, pair<DISPID, unsigned short>> DispIdMap;
 typedef std::unordered_multimap<OUString, unsigned int> TLBFuncIndexMap;
 
 // This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object.
-// If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component.
+// If m_TypeDescription is set then this class represents a UNO interface implemented in a COM component.
 // The interface is not a real interface in terms of an abstract class but is realized through IDispatch.
 class IUnknownWrapper : public WeakImplHelper< XBridgeSupplier2, XInitialization, XAutomationObject, XDefaultProperty, XDefaultMethod, XDirectInvocation, XAutomationInvocation >,
 
@@ -214,7 +214,7 @@ protected:
     // wrapper class knows what type it is represting. The member m_TypeDescription holds this
     // information.
     // m_TypeDescription is only useful when an object wraps an IDispatch object that implements
-    // an UNO interface. The value is set during a call to XInitialization::initialize.
+    // a UNO interface. The value is set during a call to XInitialization::initialize.
     Sequence<Type> m_seqTypes;
     CComPtr<IUnknown> m_spUnknown;
     CComPtr<IDispatch> m_spDispatch;
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index 4bd762cc3c54..f8b1704b8339 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -86,7 +86,7 @@ protected:
 // This class realizes the service com.sun.star.bridge.OleBridgeSupplier2 and
 // com.sun.star.bridge.OleBridgeSupplierVar1. The class implements XBridgeSupplier2 which
 // interface does not need a Maschine Id in its createBridge function anymore,
-// If an UNO interface is to be converted then the member m_nUnoWrapperClass determines
+// If a UNO interface is to be converted then the member m_nUnoWrapperClass determines
 // what wrapper class is to be used. There are currently InterfaceOleWrapper and
 // UnoObjectWrapperRemoteOpt. The first is used for the OleBridgeSupplier2 and the
 // latter for OleBridgeSupplierVar1.
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index b987a439b70b..f211d4dbf3fa 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -71,7 +71,7 @@ extern std::unordered_map<sal_uIntPtr, WeakReference<XInterface> > ComPtrToWrapp
 
 // Maps XInterface pointers to a weak reference of its wrapper class (i.e.
 // InterfaceOleWrapper). It is the responsibility of the wrapper to remove the entry when
-// it is being destroyed. It is used to ensure the identity of objects. That is, an UNO interface
+// it is being destroyed. It is used to ensure the identity of objects. That is, a UNO interface
 // is mapped to IDispatch which is kept alive in the COM environment. If the same
 // UNO interface is mapped again to COM then the IDispach of the first mapped instance
 // must be returned.
@@ -1609,10 +1609,10 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny
     }
 
 }
-// The function converts an IUnknown* into an UNO interface or struct. The
+// The function converts an IUnknown* into a UNO interface or struct. The
 // IUnknown pointer can constitute different kind of objects:
-// 1. a wrapper of an UNO struct (the wrapper was created by this bridge)
-// 2. a wrapper of an UNO interface (created by this bridge)
+// 1. a wrapper of a UNO struct (the wrapper was created by this bridge)
+// 2. a wrapper of a UNO interface (created by this bridge)
 // 3. a dispatch object that implements UNO interfaces
 // 4. a dispatch object.
 
@@ -1629,7 +1629,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny
 // SUPPORTED_INTERFACES_PROP, then the INTERFACE_ADAPTER_FACTORY creates an object that
 // implements all these interfaces.
 // This is only done if "pUnknown" is not already a UNO wrapper,
-// that is it is actually NOT an UNO object that was converted to a COM object. If it is an
+// that is it is actually NOT a UNO object that was converted to a COM object. If it is an
 // UNO wrapper than the original UNO object is being extracted, queried for "aType" (if
 // it is no struct) and returned.
 template<class T>
@@ -1695,7 +1695,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
     }
 
 
-    // Check if "spUnknown" is a UNO wrapper, that is an UNO object that has been
+    // Check if "spUnknown" is a UNO wrapper, that is a UNO object that has been
     // passed to COM. Then it supports IUnoObjectWrapper
     // and we extract the original UNO object.
     CComQIPtr<IUnoObjectWrapper> spUno( spUnknown);
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index e6730d75eee9..dfcf493d00b5 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1263,9 +1263,9 @@ STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID /*riid*/,
 // A JScriptValue (ValueObject) object is a COM object in that it implements IDispatch and the
 // IJScriptValue object interface. Such objects are provided by all UNO wrapper
 // objects used within a JScript script. To obtain an instance one has to call
-// "_GetValueObject() or Bridge_GetValueObject()" on an UNO wrapper object (class InterfaceOleWrapper).
+// "_GetValueObject() or Bridge_GetValueObject()" on a UNO wrapper object (class InterfaceOleWrapper).
 // A value object is appropriately initialized within the script and passed as
-// parameter to an UNO object method or property. The convertDispparamsArgs function
+// parameter to a UNO object method or property. The convertDispparamsArgs function
 // can easily find out that a param is such an object by querying for the
 // IJScriptValue interface. By this interface one the type and kind ( out, in/out)
 // can be determined and the right conversion can be applied.
@@ -1517,11 +1517,11 @@ void SAL_CALL InterfaceOleWrapper::initialize( const Sequence< Any >& aArguments
 {
     switch( aArguments.getLength() )
     {
-    case 2: // the object wraps an UNO struct
+    case 2: // the object wraps a UNO struct
         aArguments[0] >>= m_xInvocation;
         aArguments[1] >>= m_defaultValueType;
         break;
-    case 3: // the object wraps an UNO interface
+    case 3: // the object wraps a UNO interface
         aArguments[0] >>= m_xInvocation;
         aArguments[1] >>= m_xOrigin;
         aArguments[2] >>= m_defaultValueType;
diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx
index 4414a654b6bb..89e3dea432c3 100644
--- a/extensions/source/ole/unotypewrapper.hxx
+++ b/extensions/source/ole/unotypewrapper.hxx
@@ -23,7 +23,7 @@
 
 #include "comifaces.hxx"
 
-/* creates an UnoTypWrapper and sets the Name property to the value
+/* creates a UnoTypWrapper and sets the Name property to the value
    specified by sTypeName.
    Returns true if the object could be created and initialized.
  */
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 45a1ce2f7539..65191db05240 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -298,7 +298,7 @@ namespace pcr
 
     typedef ::cppu::WeakImplHelper <   css::container::XNameReplace
                                     >   EventHolder_Base;
-    /* An UNO component holding assigned event descriptions, for use with a SvxMacroAssignDlg */
+    /* A UNO component holding assigned event descriptions, for use with a SvxMacroAssignDlg */
     class EventHolder : public EventHolder_Base
     {
     private:
diff --git a/extensions/test/ole/VisualBasic/Module1.vb b/extensions/test/ole/VisualBasic/Module1.vb
index f4acd19170a6..63b8bbdeb17f 100644
--- a/extensions/test/ole/VisualBasic/Module1.vb
+++ b/extensions/test/ole/VisualBasic/Module1.vb
@@ -523,7 +523,7 @@ Public Sub Main()
 	Function testImplementedInterfaces() As Object
 		'Bridge_ImplementedInterfaces
 		'=================================================
-		' call an UNO function that takes an XEventListener interface
+		' call a UNO function that takes an XEventListener interface
 		'We provide a COM implementation (IDispatch) as EventListener
 		'Open a new empty writer document
 
diff --git a/extensions/test/ole/callUnoToJava.htm b/extensions/test/ole/callUnoToJava.htm
index fff21ad0ea28..3b9bf1b2f552 100644
--- a/extensions/test/ole/callUnoToJava.htm
+++ b/extensions/test/ole/callUnoToJava.htm
@@ -485,7 +485,7 @@ function XSimple_Impl_func( message)
 
 <h2> Object in JScript</h2>
 
-This test passes a XCallback to an UNO function of the UNO test control.
+This test passes a XCallback to a UNO function of the UNO test control.
 XCallback is implemented by the JScript class XCallback_Impl. The function
 XCallback::func1 is then called from the UNO test control.
 <br>
diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx
index 5d0d8de84195..5b2e2a31d270 100644
--- a/filter/source/config/cache/configflush.hxx
+++ b/filter/source/config/cache/configflush.hxx
@@ -87,7 +87,7 @@ class ConfigFlush final : public BaseLock
         virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener) override;
 
 
-        // interface to register/create this instance as an UNO service
+        // interface to register/create this instance as a UNO service
         static OUString impl_getImplementationName();
         static css::uno::Sequence< OUString > impl_getSupportedServiceNames();
         static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx
index 276287eb7e90..e6cdc59b4826 100644
--- a/filter/source/config/cache/contenthandlerfactory.hxx
+++ b/filter/source/config/cache/contenthandlerfactory.hxx
@@ -111,7 +111,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContaine
                     this new instance. It should be passed to the new object
                     so it can be used internally to create own needed uno resources.
 
-            @return The new instance of this service as an uno reference.
+            @return The new instance of this service as a uno reference.
          */
         static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
 
diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx
index 8548a14a7b0e..45a7b5a3d50b 100644
--- a/filter/source/config/cache/filterfactory.hxx
+++ b/filter/source/config/cache/filterfactory.hxx
@@ -169,7 +169,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer
                     this new instance. It should be passed to the new object
                     so it can be used internally to create own needed uno resources.
 
-            @return The new instance of this service as an uno reference.
+            @return The new instance of this service as a uno reference.
          */
         static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
 };
diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx
index 9d803a63890c..7e3c7addcba9 100644
--- a/filter/source/config/cache/frameloaderfactory.hxx
+++ b/filter/source/config/cache/frameloaderfactory.hxx
@@ -111,7 +111,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer
                     this new instance. It should be passed to the new object
                     so it can be used internally to create own needed uno resources.
 
-            @return The new instance of this service as an uno reference.
+            @return The new instance of this service as a uno reference.
          */
         static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
 
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index bbe95a76400e..fe327a3b2c3f 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -366,7 +366,7 @@ public:
                 this new instance. It should be passed to the new object
                 so it can be used internally to create own needed uno resources.
 
-        @return The new instance of this service as an uno reference.
+        @return The new instance of this service as a uno reference.
      */
     static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR);
 };
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index c5f24075225a..7cc7ed037a39 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -592,7 +592,7 @@ namespace frm
             return xReturn;
         }
 
-        // is it an UNO slot?
+        // is it a UNO slot?
         OUString sUnoProtocolPrefix( ".uno:" );
         if ( _rURL.Complete.startsWith( sUnoProtocolPrefix ) )
         {
diff --git a/fpicker/source/win32/VistaFilePicker.hxx b/fpicker/source/win32/VistaFilePicker.hxx
index 8a138cc90f21..71ccfd992ba9 100644
--- a/fpicker/source/win32/VistaFilePicker.hxx
+++ b/fpicker/source/win32/VistaFilePicker.hxx
@@ -56,7 +56,7 @@ typedef ::cppu::WeakComponentImplHelper<
 /** Implements the XFilePicker & friends interface(s)
     for Windows Vista and upcoming versions.
 
-    Note: This will be an UNO wrapper for the real file picker
+    Note: This will be a UNO wrapper for the real file picker
     implementation only. The real implementation is done in class
     VistaFilePickerImpl.
  */
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!
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 534621ec5ac6..70fdab298e86 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -303,7 +303,7 @@ public:
     }
 
     /**
-     * Posts an UNO command to the document.
+     * Posts a UNO command to the document.
      *
      * Example argument string:
      *
diff --git a/include/basic/sbuno.hxx b/include/basic/sbuno.hxx
index 29a9e68c8d6e..4029d9032f99 100644
--- a/include/basic/sbuno.hxx
+++ b/include/basic/sbuno.hxx
@@ -29,7 +29,7 @@ namespace com::sun::star::beans { struct Property; }
 
 class SbxObject;
 
-// Returns a SbxObject that wraps an Uno Interface
+// Returns a SbxObject that wraps a Uno Interface
 // Implementation in basic/source/classes/sbunoobj.cxx
 BASIC_DLLPUBLIC SbxObjectRef GetSbUnoObject( const OUString& aName, const css::uno::Any& aUnoObj_ );
 
diff --git a/include/comphelper/weak.hxx b/include/comphelper/weak.hxx
index 929ecbf495ca..f094225cb32c 100644
--- a/include/comphelper/weak.hxx
+++ b/include/comphelper/weak.hxx
@@ -26,7 +26,7 @@
 
 namespace comphelper
 {
-/** Base class to implement an UNO object supporting types and weak references, i.e. the object can be held
+/** Base class to implement a UNO object supporting types and weak references, i.e. the object can be held
     weakly (by a css::uno::WeakReference).
     This implementation copes with reference counting.  Upon last release(), the virtual dtor
     is called.
diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx
index a6471149c39e..97397cd09a37 100644
--- a/include/cppuhelper/weak.hxx
+++ b/include/cppuhelper/weak.hxx
@@ -32,7 +32,7 @@ namespace cppu
 
 class OWeakConnectionPoint;
 
-/** Base class to implement an UNO object supporting weak references, i.e. the object can be held
+/** Base class to implement a UNO object supporting weak references, i.e. the object can be held
     weakly (by a css::uno::WeakReference).
     This implementation copes with reference counting.  Upon last release(), the virtual dtor
     is called.
diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx
index 3ca7a51cdf85..aca4c4b0c210 100644
--- a/include/cppuhelper/weakagg.hxx
+++ b/include/cppuhelper/weakagg.hxx
@@ -28,7 +28,7 @@
 namespace cppu
 {
 
-/** Base class to implement an UNO object supporting weak references, i.e. the object can be held
+/** Base class to implement a UNO object supporting weak references, i.e. the object can be held
     weakly (by a css::uno::WeakReference) and aggregation, i.e. the object can be
     aggregated by another (delegator).
     This implementation copes with reference counting.  Upon last release(), the virtual dtor
diff --git a/include/desktop/exithelper.h b/include/desktop/exithelper.h
index 4b81c68b895c..fbb37c583233 100644
--- a/include/desktop/exithelper.h
+++ b/include/desktop/exithelper.h
@@ -23,7 +23,7 @@
 enum EExitCodes {
     /* e.g. used to force showing of the command line help */
     EXITHELPER_NO_ERROR = 0,
-    /* an uno exception was caught during startup */
+    /* a uno exception was caught during startup */
     EXITHELPER_FATAL_ERROR = 77,
     /* user force automatic restart after crash */
     EXITHELPER_CRASH_WITH_RESTART = 79,
diff --git a/include/drawinglayer/processor2d/baseprocessor2d.hxx b/include/drawinglayer/processor2d/baseprocessor2d.hxx
index 4ace7d8fa8a1..57beeba4fdcd 100644
--- a/include/drawinglayer/processor2d/baseprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/baseprocessor2d.hxx
@@ -56,7 +56,7 @@ namespace drawinglayer
             The process(..) implementation makes a complete iteration over the given
             sequence of primitives. If the Primitive is not derived from BasePrimitive2D
             and thus not part of the C++ implementations, it converts ViewInformation2D
-            to the corresponding API implementation (an uno::Sequence< beans::PropertyValue >)
+            to the corresponding API implementation (a uno::Sequence< beans::PropertyValue >)
             and recursively calls the method process(..) at the primitive with the decomposition
             derived from that primitive. This is the preparation to handle unknown implementations
             of the css::graphic::XPrimitive2D interface in the future.
diff --git a/include/framework/undomanagerhelper.hxx b/include/framework/undomanagerhelper.hxx
index 82f13cc289b5..07cbdd667a10 100644
--- a/include/framework/undomanagerhelper.hxx
+++ b/include/framework/undomanagerhelper.hxx
@@ -74,7 +74,7 @@ namespace framework
         */
         virtual SfxUndoManager&        getImplUndoManager() = 0;
 
-        /** provides access to an UNO interface for the XUndoManager implementation. Used when throwing exceptions.
+        /** provides access to a UNO interface for the XUndoManager implementation. Used when throwing exceptions.
         */
         virtual css::uno::Reference< css::document::XUndoManager >
                                         getThis() = 0;
diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx
index a1991bcc0e20..efd41f7bdc92 100644
--- a/include/sfx2/docmacromode.hxx
+++ b/include/sfx2/docmacromode.hxx
@@ -95,7 +95,7 @@ namespace sfx2
 
             @todo
                 This probably can also be obtained from the XModel, by calling getURL
-                or getLocation. If both are empty, then we need an UNO way to obtain
+                or getLocation. If both are empty, then we need a UNO way to obtain
                 the URL of the underlying template document - if any. If we have this,
                 we could replace this method with a newly introduced method
                 getDocumentModel and some internal code.
diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx
index 46911c1e7715..34d336ff94ec 100644
--- a/include/svtools/acceleratorexecute.hxx
+++ b/include/svtools/acceleratorexecute.hxx
@@ -130,7 +130,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit
                     will be used inside the new environment.
 
             @param  rxContext
-                    reference to an uno service manager.
+                    reference to a uno service manager.
 
             @param  xEnv
                     if it points to a valid frame it will be used
diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx
index cd47eadef182..40b1d3526ff9 100644
--- a/include/svx/svdouno.hxx
+++ b/include/svx/svdouno.hxx
@@ -96,7 +96,7 @@ public:
         The method GetUnoControl, used to retrieve the XControl whose parent is a given device, only works
         if the SdrUnoObj has already been painted at least once onto this device. However, there are valid
         scenarios where you need certain information on how a control is painted onto a window, without
-        actually painting it. For example, you might be interested in the DeviceInfo of an UNO control.
+        actually painting it. For example, you might be interested in the DeviceInfo of a UNO control.
 
         For those cases, you can contain an XControl which behaves as the control which *would* be used to
         paint onto a window.
diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx
index d47f3816b76f..18dbcbd3b4f3 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -30,7 +30,7 @@
 
 #include <com/sun/star/awt/XUnitConversion.hpp>
 
-/// An UNO wrapper for the VCL OutputDevice
+/// A UNO wrapper for the VCL OutputDevice
 class TOOLKIT_DLLPUBLIC VCLXDevice :
                     public css::awt::XDevice,
                     public css::lang::XTypeProvider,
diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx
index 9123c61e484d..14f0c57947d8 100644
--- a/include/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/include/toolkit/controls/accessiblecontrolcontext.hxx
@@ -42,9 +42,9 @@ namespace toolkit
     typedef ::cppu::ImplHelper1 <   css::lang::XEventListener
                                 >   OAccessibleControlContext_IBase;
 
-    /** class implementing the AccessibleContext for an UNO control - to be used in design mode of the control.
+    /** class implementing the AccessibleContext for a UNO control - to be used in design mode of the control.
         <p><b>life time control<b/><br/>
-        This control should be held weak by the creator (an UNO control), it itself holds a hard reference to the
+        This control should be held weak by the creator (a UNO control), it itself holds a hard reference to the
         control model, and a weak reference to the control. The reference to the model is freed when the model
         is being disposed.</p>
     */
@@ -54,7 +54,7 @@ namespace toolkit
             ,public OAccessibleControlContext_IBase
     {
     public:
-        /** creates an accessible context for an uno control
+        /** creates an accessible context for a uno control
         @param _rxCreator
             the uno control's XAccessible interface. This must be an XControl, from which an XControlModel
             can be retrieved.
diff --git a/include/uno/any2.h b/include/uno/any2.h
index 4493d4c0af96..262f2441d6c1 100644
--- a/include/uno/any2.h
+++ b/include/uno/any2.h
@@ -35,7 +35,7 @@ struct _typelib_TypeDescriptionReference;
 struct _typelib_TypeDescription;
 struct _uno_Mapping;
 
-/** This is the binary specification of an UNO any.
+/** This is the binary specification of a UNO any.
 */
 typedef struct SAL_DLLPUBLIC_RTTI _uno_Any
 {
diff --git a/include/uno/environment.h b/include/uno/environment.h
index b68a0c5041c0..ce09e3ad5b10 100644
--- a/include/uno/environment.h
+++ b/include/uno/environment.h
@@ -36,7 +36,7 @@ struct _typelib_InterfaceTypeDescription;
 #pragma pack(push, 8)
 #endif
 
-/** The binary specification of an UNO environment.
+/** The binary specification of a UNO environment.
 */
 typedef struct SAL_DLLPUBLIC_RTTI _uno_Environment
 {
@@ -128,11 +128,11 @@ typedef void (SAL_CALL * uno_freeProxyFunc)( struct _uno_ExtEnvironment * pEnv,
 */
 typedef void * (SAL_CALL * uno_memAlloc)( sal_Size nBytes );
 
-/** The binary specification of an UNO environment supporting interface registration.
+/** The binary specification of a UNO environment supporting interface registration.
 */
 typedef struct SAL_DLLPUBLIC_RTTI _uno_ExtEnvironment
 {
-    /** inherits all members of an uno_Environment
+    /** inherits all members of a uno_Environment
     */
     uno_Environment aBase;
 
diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx
index 698733840058..a2e0293d641c 100644
--- a/include/uno/mapping.hxx
+++ b/include/uno/mapping.hxx
@@ -326,7 +326,7 @@ inline bool mapToCpp( Reference< C > * ppRet, uno_Interface * pUnoI )
 /** Deprecated. This function DOES NOT WORK with Purpose Environments
     (http://wiki.openoffice.org/wiki/Uno/Binary/Spec/Purpose Environments)
 
-    Maps an UNO interface of the currently used compiler environment to binary C UNO.
+    Maps a UNO interface of the currently used compiler environment to binary C UNO.
 
     @tparam C interface type
     @param ppRet inout returned interface pointer
diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx
index 60685334461d..81e2a253c6de 100644
--- a/include/unotools/sharedunocomponent.hxx
+++ b/include/unotools/sharedunocomponent.hxx
@@ -36,7 +36,7 @@ namespace utl
 
     //= DisposableComponent
 
-    /** is a class which controls lifetime of an UNO component via ->XComponent::dispose
+    /** is a class which controls lifetime of a UNO component via ->XComponent::dispose
 
         You'll usually never use this class directly, but only as parameter for a
         ->SharedUNOComponent class.
@@ -69,7 +69,7 @@ namespace utl
     //= CloseableComponent
 
     class CloseableComponentImpl;
-    /** is a class which controls lifetime of an UNO component via ->XCloseable::close
+    /** is a class which controls lifetime of a UNO component via ->XCloseable::close
 
         You'll usually never use this class directly, but only as parameter for a
         ->SharedUNOComponent class.
@@ -110,7 +110,7 @@ namespace utl
 
     /** is a helper class for sharing ownership of a UNO component
 
-        If you need to share an UNO component, which normally needs a dedicated owner,
+        If you need to share a UNO component, which normally needs a dedicated owner,
         and is lifetime controlled by an explicit disposal action (not necessarily ->XComponent::dispose,
         but <em>any</em> explicit method call, after which the object is considered
         to be disposed), between different classes, ->SharedUNOComponent is what you need.
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index 2017c6ff5e3c..83d627b54351 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -123,7 +123,7 @@ namespace ooo
 
         /// @throws css::uno::RuntimeException
         VBAHELPER_DLLPUBLIC OUString getAnyAsString( const css::uno::Any& pvargItem );
-        VBAHELPER_DLLPUBLIC OUString VBAToRegexp(const OUString &rIn); // needs to be in an uno service ( already this code is duplicated in basic )
+        VBAHELPER_DLLPUBLIC OUString VBAToRegexp(const OUString &rIn); // needs to be in a uno service ( already this code is duplicated in basic )
         VBAHELPER_DLLPUBLIC double getPixelTo100thMillimeterConversionFactor( const css::uno::Reference< css::awt::XDevice >& xDevice, bool bVertical);
         VBAHELPER_DLLPUBLIC double PointsToPixels( const css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, bool bVertical);
         VBAHELPER_DLLPUBLIC double PixelsToPoints( const css::uno::Reference< css::awt::XDevice >& xDevice, double fPixels, bool bVertical);
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 4e420a02cde9..bc82b7c78bd8 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -91,7 +91,7 @@ public:
     void                SetSmallSymbol();
     virtual bool        set_property(const OString &rKey, const OUString &rValue) override;
 
-    /// Sets the button state according to the FeatureStateEvent emitted by an Uno state change.
+    /// Sets the button state according to the FeatureStateEvent emitted by a Uno state change.
     virtual void        statusChanged(const css::frame::FeatureStateEvent& rEvent);
 
     virtual FactoryFunction GetUITestFactory() const override;
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/LOKit/Document.swift b/ios/LibreOfficeLight/LibreOfficeLight/LOKit/Document.swift
index 48cafe44632b..3f94fb470a6e 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight/LOKit/Document.swift
+++ b/ios/LibreOfficeLight/LibreOfficeLight/LOKit/Document.swift
@@ -294,7 +294,7 @@ open class Document
     }
 
     /**
-     * Posts an UNO command to the document.
+     * Posts a UNO command to the document.
      *
      * Example argument string:
      *
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
index 3f6f15325da8..2842e3df05ce 100644
--- a/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
+++ b/javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java
@@ -25,7 +25,7 @@ import com.sun.star.io.XOutputStream;
 import java.io.OutputStream;
 
 /** The <code>OutputStreamToXOutputStreamAdapter</code> wraps
-   an UNO <code>XOutputStream</code> into a Java <code>OutputStream</code>
+   a UNO <code>XOutputStream</code> into a Java <code>OutputStream</code>
    object in a Java.  This allows users to access an <code>OutputStream</code>
    as if it were an <code>XOutputStream</code>.
  */
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index 8838ccee5334..1b1c4b97dde4 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -595,10 +595,10 @@ XMultiPropertySet
      *  intended then use an Any variable rather than an Object.
      *
      *  If a member is an Object or Any and the argument <em>setVal</em> is an Object, other than String or array,
-     *  then it is presumed to be an UNO object and queried for XInterface. If successful, the out-param <em>newVal</em>
+     *  then it is presumed to be a UNO object and queried for XInterface. If successful, the out-param <em>newVal</em>
      *  returns the XInterface.
      *
-     *  If a member is an UNO interface, then <em>setVal</em> is queried for this interface and the result is returned.
+     *  If a member is a UNO interface, then <em>setVal</em> is queried for this interface and the result is returned.
      *  If <em>setVal</em> is null then <em>newVal</em> will be null too after return.
      *  <p>
      *  If a property value is stored using a primitive type the out-parameters
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java b/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
index e3a3a430f6e2..8bb4d26432d9 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java
@@ -24,10 +24,10 @@ import java.util.HashMap;
 /**
  * Object representation and parsing of Uno Urls,
  * which allow to locate a named Uno object in a
- * different process. An Uno Url consists of the
+ * different process. A Uno Url consists of the
  * specification of a connection, protocol and
  * rootOid delimited with a ';'.
- * The syntax of an Uno Url is
+ * The syntax of a Uno Url is
  *
  * <code>
  * [uno:]connection-type,parameters;protocol-name,parameters;objectname";
diff --git a/jurt/com/sun/star/uno/AnyConverter.java b/jurt/com/sun/star/uno/AnyConverter.java
index 69d85c139931..857c842fcc5b 100644
--- a/jurt/com/sun/star/uno/AnyConverter.java
+++ b/jurt/com/sun/star/uno/AnyConverter.java
@@ -430,7 +430,7 @@ public class AnyConverter
 
     /**
      * Converts a UNO object (struct, exception, sequence, enum or interface) or
-     * an Any containing these types into an UNO object of a specified destination
+     * an Any containing these types into a UNO object of a specified destination
      * type.
      *
      * <p> For interfaces, the argument <em>object</em> is queried for the interface
@@ -453,7 +453,7 @@ public class AnyConverter
     }
     /**
      * Converts a UNO object (struct, exception, sequence, enum or interface) or
-     * an Any containing these types into an UNO object of a specified destination
+     * an Any containing these types into a UNO object of a specified destination
      * type.
      *
      * <p>For interfaces, the argument <em>object</em> is queried for the interface
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 27e2ce62c02f..646ca80c1c4e 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -713,7 +713,7 @@ types the specified types depend on.</p>
 		  <table class="table4">
 		  <tr>
             <td class="cell15"><code>-env:INIFILENAME=<url></code></td>
-			<td class="cell85">url specifies a URL to an UNO ini|rc file of an existing UNO environment (URE, office installation).</td>
+			<td class="cell85">url specifies a URL to a UNO ini|rc file of an existing UNO environment (URE, office installation).</td>
           </tr>
 		  <tr>
 		    <td class="cell15"><code>-a, --all</code></td>
@@ -759,7 +759,7 @@ types the specified types depend on.</p>
           </tr>
           <tr>
             <td class="cell15"><code>-t <name></code></td>
-			<td class="cell85">specifies an UNOIDL type name, e.g. com.sun.star.text.XText (can be used more than once).</td>
+			<td class="cell85">specifies a UNOIDL type name, e.g. com.sun.star.text.XText (can be used more than once).</td>
           </tr>
           <tr>
             <td class="cell15"><code>-p <protocol:cmd(s)></code></td>
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
index 1182745bb968..e566ba45ba6e 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
@@ -177,7 +177,7 @@ public class FunctionHelper
      *
      * Note: First mode (creation of a child window) can be reached by two different
      *       ways.
-     *   - pack the required window handle of our java window inside an UNO object
+     *   - pack the required window handle of our java window inside a UNO object
      *     to transport it to the remote office toolkit and get a child office
      *     window.
      *     This is the old way. It's better to use the second one - but to be
diff --git a/offapi/com/sun/star/awt/UnoControlButtonModel.idl b/offapi/com/sun/star/awt/UnoControlButtonModel.idl
index a88af0ce6858..3627b37bd724 100644
--- a/offapi/com/sun/star/awt/UnoControlButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlButtonModel.idl
@@ -30,7 +30,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlButton.
+/** specifies the standard model of a UnoControlButton.
  */
 published service UnoControlButtonModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl b/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
index d82f670bb32b..d880efa05c9c 100644
--- a/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
@@ -29,7 +29,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlCheckBox.
+/** specifies the standard model of a UnoControlCheckBox.
  */
 published service UnoControlCheckBoxModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
index 3a359eb393cc..a3405e181261 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
@@ -30,7 +30,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlComboBox.
+/** specifies the standard model of a UnoControlComboBox.
  */
 published service UnoControlComboBoxModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlContainerModel.idl b/offapi/com/sun/star/awt/UnoControlContainerModel.idl
index 949e0cec6594..b63a37f09984 100644
--- a/offapi/com/sun/star/awt/UnoControlContainerModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlContainerModel.idl
@@ -28,7 +28,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlContainer.
+/** specifies the standard model of a UnoControlContainer.
  */
 published service UnoControlContainerModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
index 0ee3a22d785d..cb2bcc7d5485 100644
--- a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl
@@ -30,7 +30,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlCurrencyField.
+/** specifies the standard model of a UnoControlCurrencyField.
  */
 published service UnoControlCurrencyFieldModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
index 55073a27ad80..46536c59f20d 100644
--- a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl
@@ -31,7 +31,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlDateField.
+/** specifies the standard model of a UnoControlDateField.
  */
 published service UnoControlDateFieldModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlDialogModel.idl b/offapi/com/sun/star/awt/UnoControlDialogModel.idl
index 424230be92a2..b45545b272aa 100644
--- a/offapi/com/sun/star/awt/UnoControlDialogModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlDialogModel.idl
@@ -32,7 +32,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlDialog.
+/** specifies the standard model of a UnoControlDialog.
  */
 published service UnoControlDialogModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlEditModel.idl b/offapi/com/sun/star/awt/UnoControlEditModel.idl
index 7eb54093cc5f..7a0f877222ea 100644
--- a/offapi/com/sun/star/awt/UnoControlEditModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlEditModel.idl
@@ -30,7 +30,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlEdit.
+/** specifies the standard model of a UnoControlEdit.
  */
 published service UnoControlEditModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlFileControlModel.idl b/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
index ca4c2466f870..f8c053abba9a 100644
--- a/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFileControlModel.idl
@@ -30,7 +30,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlFileControl.
+/** specifies the standard model of a UnoControlFileControl.
  */
 published service UnoControlFileControlModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl b/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
index 36eac3f25547..fb4ff2762149 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedHyperlinkModel.idl
@@ -29,7 +29,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlFixedHyperlink.
+/** specifies the standard model of a UnoControlFixedHyperlink.
  */
 service UnoControlFixedHyperlinkModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl b/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
index 728f2c2eb900..3514b3050067 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedLineModel.idl
@@ -28,7 +28,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlFixedLine.
+/** specifies the standard model of a UnoControlFixedLine.
  */
 published service UnoControlFixedLineModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
index a5cbe7f14682..75bff7aec025 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
@@ -29,7 +29,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlFixedText.
+/** specifies the standard model of a UnoControlFixedText.
  */
 published service UnoControlFixedTextModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
index 2fe70957691a..25b75dd1d764 100644
--- a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl
@@ -29,7 +29,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlFormattedField .
+/** specifies the standard model of a UnoControlFormattedField .
  */
 published service UnoControlFormattedFieldModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl b/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
index 15470597a085..414680c39857 100644
--- a/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlGroupBoxModel.idl
@@ -29,7 +29,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlGroupBox.
+/** specifies the standard model of a UnoControlGroupBox.
  */
 published service UnoControlGroupBoxModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
index 1aa89f04b7c2..310039d1a865 100644
--- a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
@@ -28,7 +28,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlImageControl.
+/** specifies the standard model of a UnoControlImageControl.
  */
 published service UnoControlImageControlModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
index 05a102b0591f..e74202e82e96 100644
--- a/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlListBoxModel.idl
@@ -28,7 +28,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlListBox.
+/** specifies the standard model of a UnoControlListBox.
  */
 published service UnoControlListBoxModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlModel.idl b/offapi/com/sun/star/awt/UnoControlModel.idl
index 48470660418b..2e5d830f3fc8 100644
--- a/offapi/com/sun/star/awt/UnoControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlModel.idl
@@ -37,7 +37,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControl
+/** specifies the standard model of a UnoControl
     in the <em>Smalltalk model view controller design</em>.
 
     <p>The interfaces com::sun::star::beans::XPropertySet
diff --git a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
index b4512cb78857..61c5bc61f4ad 100644
--- a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
@@ -30,7 +30,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlNumericField.
+/** specifies the standard model of a UnoControlNumericField.
  */
 published service UnoControlNumericFieldModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
index 678b5824384b..4c0d6069c543 100644
--- a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
@@ -30,7 +30,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlPatternField.
+/** specifies the standard model of a UnoControlPatternField.
  */
 published service UnoControlPatternFieldModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl b/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
index d6dad0389774..fec3c58f8eb7 100644
--- a/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlProgressBarModel.idl
@@ -28,7 +28,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlProgressBar.
+/** specifies the standard model of a UnoControlProgressBar.
  */
 published service UnoControlProgressBarModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl b/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
index 6882e5431797..dd5db1927f4e 100644
--- a/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
@@ -30,7 +30,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlRadioButton.
+/** specifies the standard model of a UnoControlRadioButton.
  */
 published service UnoControlRadioButtonModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl b/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
index 5be5721361b6..cf2d13c4a35f 100644
--- a/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
@@ -29,7 +29,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlContainer.
+/** specifies the standard model of a UnoControlContainer.
  */
 service UnoControlRoadmapModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl b/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
index f3b625dcd3e3..662bf368ca35 100644
--- a/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlScrollBarModel.idl
@@ -27,7 +27,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlScrollBar.
+/** specifies the standard model of a UnoControlScrollBar.
  */
 published service UnoControlScrollBarModel
 {
diff --git a/offapi/com/sun/star/awt/UnoControlSpinButton.idl b/offapi/com/sun/star/awt/UnoControlSpinButton.idl
index 09a046a6f3b6..034943eb114d 100644
--- a/offapi/com/sun/star/awt/UnoControlSpinButton.idl
+++ b/offapi/com/sun/star/awt/UnoControlSpinButton.idl
@@ -29,7 +29,7 @@
 
 /** specifies a spin button control.
 
-    <p>The model of an UnoControlSpinButton control must support
+    <p>The model of a UnoControlSpinButton control must support
     the UnoControlSpinButtonModel service.
  */
 service UnoControlSpinButton
diff --git a/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl b/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
index 4d8aa60afca2..2a1d6e9be989 100644
--- a/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlSpinButtonModel.idl
@@ -27,7 +27,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlSpinButton.
+/** specifies the standard model of a UnoControlSpinButton.
 
     <p>A spin button is a control which has a numeric value associated with it,
     and allows to change this value using two spin buttons.</p>
diff --git a/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl b/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
index bd9da9755a24..7801cd97359a 100644
--- a/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl
@@ -31,7 +31,7 @@
  module com {  module sun {  module star {  module awt {
 
 
-/** specifies the standard model of an UnoControlTimeField.
+/** specifies the standard model of a UnoControlTimeField.
  */
 published service UnoControlTimeFieldModel
 {
diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl
index c22a42b992fc..1db19203e229 100644
--- a/offapi/com/sun/star/deployment/XPackageManager.idl
+++ b/offapi/com/sun/star/deployment/XPackageManager.idl
@@ -39,11 +39,11 @@ module com { module sun { module star { module deployment {
     repository.
     Packages are deployable files, e.g. scripts or UNO components.
     <p>
-    Adding an UNO package means that a copy of the package is stored
+    Adding a UNO package means that a copy of the package is stored
     in the repository.
     </p>
     <p>
-    Removing an UNO package means that the previously added package is
+    Removing a UNO package means that the previously added package is
     removed from the repository.
     </p>
     <p>
@@ -96,7 +96,7 @@ interface XPackageManager
     */
     com::sun::star::task::XAbortChannel createAbortChannel();
 
-    /** adds an UNO package.
+    /** adds a UNO package.
 
         The properties argument is currently only used to suppress the license information
         for shared extensions.
@@ -151,7 +151,7 @@ interface XPackageManager
                 com::sun::star::ucb::CommandAbortedException,
                 com::sun::star::lang::IllegalArgumentException);
 
-    /** removes an UNO package.
+    /** removes a UNO package.
 
         @param identifier
                package identifier
diff --git a/offapi/com/sun/star/deployment/XPackageRegistry.idl b/offapi/com/sun/star/deployment/XPackageRegistry.idl
index 1851564379ff..f2a05197a6c3 100644
--- a/offapi/com/sun/star/deployment/XPackageRegistry.idl
+++ b/offapi/com/sun/star/deployment/XPackageRegistry.idl
@@ -28,7 +28,7 @@
 
 module com { module sun { module star { module deployment {
 
-/** Interface to bind an UNO package.
+/** Interface to bind a UNO package.
 
     @since OOo 2.0
 */
diff --git a/offapi/com/sun/star/document/ExtendedTypeDetection.idl b/offapi/com/sun/star/document/ExtendedTypeDetection.idl
index 44a586e8017b..9008d430b6af 100644
--- a/offapi/com/sun/star/document/ExtendedTypeDetection.idl
+++ b/offapi/com/sun/star/document/ExtendedTypeDetection.idl
@@ -50,7 +50,7 @@ module com { module sun { module star { module document {
         Note that this really means the implementation name of the service.
         Because it's not possible otherwise to distinguish between more than one
         registered detect services in same office installation! But it's possible for
-        the generic type detection to create an UNO service by his implementation name too.
+        the generic type detection to create a UNO service by his implementation name too.
         </li>
         <li>
         A list of <strong>Types</strong> able to be recognized by this service -
diff --git a/offapi/com/sun/star/packages/PackageFolder.idl b/offapi/com/sun/star/packages/PackageFolder.idl
index 58bb9e63f2fb..8b652d3bded1 100644
--- a/offapi/com/sun/star/packages/PackageFolder.idl
+++ b/offapi/com/sun/star/packages/PackageFolder.idl
@@ -53,7 +53,7 @@ published service PackageFolder
     XElementAccess::getElementType returns service PackageStream
     XNameAccess::getByName returns either a PackageFolder or a PackageStream
         as a css::uno::Any
-    XNameAccess::getElementNames returns an uno::Sequence of strings containing
+    XNameAccess::getElementNames returns a uno::Sequence of strings containing
         the names of all children stored in the PackageFolder
     */
     interface com::sun::star::container::XNameContainer;
diff --git a/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs b/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
index 35474f14fd87..b6beb5416e16 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs
@@ -24,11 +24,11 @@
   <templates>
     <group oor:name="Job">
       <info>
-        <desc>Describes an UNO service, which is registered for a special event.</desc>
+        <desc>Describes a UNO service, which is registered for a special event.</desc>
       </info>
       <prop oor:name="Service" oor:type="xs:string">
         <info>
-          <desc>Must contain an UNO implementation(!) name of the implemented job component.</desc>
+          <desc>Must contain a UNO implementation(!) name of the implemented job component.</desc>
         </info>
       </prop>
       <prop oor:name="Context" oor:type="xs:string">
diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs
index c9f8a309a204..1525b24a908b 100644
--- a/officecfg/registry/schema/org/openoffice/Setup.xcs
+++ b/officecfg/registry/schema/org/openoffice/Setup.xcs
@@ -326,7 +326,7 @@
         <!-- OldPath: Common-->
         <!-- OldLocation: soffice.ini -->
         <info>
-          <desc>Specifies the URL for an UNO connection that can be used to
+          <desc>Specifies the URL for a UNO connection that can be used to
           script the office from outside.</desc>
         </info>
         <value/>
diff --git a/pyuno/inc/pyuno.hxx b/pyuno/inc/pyuno.hxx
index a8680b6c4d3a..1d1fa7750879 100644
--- a/pyuno/inc/pyuno.hxx
+++ b/pyuno/inc/pyuno.hxx
@@ -215,7 +215,7 @@ public:
      */
     static bool isInitialized();
 
-    /** converts something contained in an UNO Any to a Python object
+    /** converts something contained in a UNO Any to a Python object
 
         preconditions: python has been initialized before,
         the global interpreter lock is held and pyuno::Runtime
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
index 6d671e620f21..bd894a0eea4e 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -359,7 +359,7 @@ def _uno_import(name, *optargs, **kwargs):
         globals, locals, fromlist = list(optargs)[:3] + [kwargs.get('globals', {}), kwargs.get('locals', {}),
                                                          kwargs.get('fromlist', [])][len(optargs):]
 
-        # from import form only, but skip if an uno lookup has already failed
+        # from import form only, but skip if a uno lookup has already failed
         if not fromlist or hasattr(e, '_uno_import_failed'):
             raise
 
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/model/FormattedTextElement.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/FormattedTextElement.java
index 5e7b268eecda..b6cb58ebc444 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/model/FormattedTextElement.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/FormattedTextElement.java
@@ -23,7 +23,7 @@ import org.jfree.report.expressions.FormulaExpression;
  * A formatted text element takes a formula, evaluates it and formats the
  * given element using some arbitrary style. (As this is totally undocumented,
  * we leave this out for now. Either we'll insert a field there or we call
- * an UNO-component to do the formatting.
+ * a UNO-component to do the formatting.
  *
  * @since 02.03.2007
  */
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index f255147f131b..01557cc608d4 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -609,7 +609,7 @@ void Entity::throwException( const ::rtl::Reference< FastLocatorImpl > &xDocumen
 void Entity::saveException( const Any & e )
 {
     // fdo#81214 - allow the parser to run on after an exception,
-    // unexpectedly some 'startElements' produce an UNO_QUERY_THROW
+    // unexpectedly some 'startElements' produce a UNO_QUERY_THROW
     // for XComponent; and yet expect to continue parsing.
     SAL_WARN("sax", "Unexpected exception from XML parser " << exceptionToString(e));
     osl::MutexGuard g(maSavedExceptionMutex);
diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx
index 6b532aed75ca..f0b1016111cb 100644
--- a/sc/inc/rangeseq.hxx
+++ b/sc/inc/rangeseq.hxx
@@ -63,7 +63,7 @@ class ScApiTypeConversion
 {
 public:
 
-    /** Convert an uno::Any to double if possible, including integer types.
+    /** Convert a uno::Any to double if possible, including integer types.
         @param o_fVal
             Out: the double value on successful conversion.
         @param o_eClass
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index acc436a1b036..b2843303a2ad 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3874,7 +3874,7 @@ void ScDocument::SetDirty( const ScRange& rRange, bool bIncludeEmptyCells )
             if (maTabs[i]) maTabs[i]->SetDirty( rRange,
                     (bIncludeEmptyCells ? ScColumn::BROADCAST_BROADCASTERS : ScColumn::BROADCAST_DATA_POSITIONS));
 
-        /* TODO: this now also notifies conditional formatting and does an UNO

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list