[Libreoffice-commits] core.git: 2 commits - bridges/source comphelper/source embedserv/source i18npool/source include/comphelper include/svx include/ucbhelper l10ntools/inc odk/examples offapi/com sc/inc sc/source sdext/source sd/source sfx2/classification sfx2/source solenv/bin svx/source vcl/opengl
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jul 23 21:39:21 UTC 2018
bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h | 6 +++---
comphelper/source/misc/mimeconfighelper.cxx | 4 ++--
embedserv/source/embed/syswinwrapper.cxx | 2 +-
i18npool/source/breakiterator/data/README | 2 +-
include/comphelper/componentmodule.hxx | 2 +-
include/svx/svdglev.hxx | 2 +-
include/svx/svdobj.hxx | 2 +-
include/ucbhelper/interceptedinteraction.hxx | 4 ++--
l10ntools/inc/xmlparse.hxx | 2 +-
odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPage.xba | 4 ++--
offapi/com/sun/star/presentation/XSlideShowController.idl | 2 +-
offapi/com/sun/star/sdbc/PreparedStatement.idl | 2 +-
offapi/com/sun/star/sdbc/ResultSet.idl | 2 +-
offapi/com/sun/star/sdbc/Statement.idl | 2 +-
offapi/com/sun/star/ui/XContextChangeEventMultiplexer.idl | 2 +-
sc/inc/dpfilteredcache.hxx | 2 +-
sc/inc/validat.hxx | 4 ++--
sc/source/ui/inc/csvcontrol.hxx | 2 +-
sd/source/core/drawdoc.cxx | 2 +-
sd/source/ui/framework/configuration/ConfigurationUpdater.hxx | 2 +-
sd/source/ui/sidebar/MasterPagesSelector.hxx | 2 +-
sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx | 8 ++++----
sdext/source/presenter/PresenterViewFactory.hxx | 2 +-
sfx2/classification/xAL.xsd | 2 +-
sfx2/source/appl/sfxhelp.cxx | 2 +-
solenv/bin/fix-includes.pl | 2 +-
solenv/bin/modules/installer/windows/idtglobal.pm | 4 ++--
svx/source/unodraw/unoshape.cxx | 2 +-
vcl/opengl/shaders/lineFragmentShader.glsl | 2 +-
29 files changed, 39 insertions(+), 39 deletions(-)
New commits:
commit c7d324a4cb236426849c52005d95a43f1d0c2c1d
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Jul 23 16:30:22 2018 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Jul 23 23:39:10 2018 +0200
Fix typos
Change-Id: I1cc2b1f63326d1d0e1f6e452b93af11e59a2d674
Reviewed-on: https://gerrit.libreoffice.org/57799
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Jenkins
diff --git a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
index 6d6c9dbeb987..ee7066931bfc 100644
--- a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
+++ b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
@@ -87,7 +87,7 @@ struct __cxa_exception
// Stack of exceptions in cleanups.
__cxa_exception* nextPropagatingException;
- // The nuber of active cleanup handlers for this exception.
+ // The number of active cleanup handlers for this exception.
int propagationCount;
#else
// Cache parsed handler data from the personality routine Phase 1
@@ -135,7 +135,7 @@ struct __cxa_dependent_exception
// Stack of exceptions in cleanups.
__cxa_exception* nextPropagatingException;
- // The nuber of active cleanup handlers for this exception.
+ // The number of active cleanup handlers for this exception.
int propagationCount;
#else
// Cache parsed handler data from the personality routine Phase 1
@@ -173,7 +173,7 @@ struct __cxa_eh_globals
extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
extern "C" __cxa_eh_globals *__cxa_get_globals_fast () throw();
-// Allocate memory for the exception plus the thown object.
+// Allocate memory for the exception plus the thrown object.
extern "C" void *__cxa_allocate_exception(size_t thrown_size) throw();
// Free the space allocated for the exception.
diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx
index 1793953aaf49..67818ac3d8a3 100644
--- a/include/comphelper/componentmodule.hxx
+++ b/include/comphelper/componentmodule.hxx
@@ -37,7 +37,7 @@ namespace comphelper
{
- /** factory factory declaration
+ /** factory declaration
*/
typedef css::uno::Reference< css::lang::XSingleComponentFactory > (*FactoryInstantiation)
(
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 5ae96300677d..ee447493ca34 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -320,7 +320,7 @@ private:
// multiple shapes with a unified fill, e.g think about CustomShapes.
// Currently this is *only* used for CustomShapes, but may be developed to get a
// common mechanism - usages for it are easy to be found. The current limitation
- // to CustomShapes allows to to think about these SdrObjects to 'vanish' during the
+ // to CustomShapes allows to think about these SdrObjects to 'vanish' during the
// lifetime of 'this' - the SdrObjects without SdrPage and SdrModel are used as helper
// objects for SdrObjCustomShape and thus their lifetime is limited to the lifetime
// of this local object. For unifying this mechanism, some weak reference of
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index e7e5cbea4194..4e4a09ec1310 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -813,7 +813,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const
}
// If the HTML or no help is installed, but aHelpURL nevertheless references valid help content,
- // that implies that that help content belongs to an extension (and thus would not be available
+ // that implies that this help content belongs to an extension (and thus would not be available
// in neither the offline nor online HTML help); in that case, fall through to the "old-help to
// display" code below:
if (SfxContentHelper::IsHelpErrorDocument(aHelpURL))
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 3ac01d5df9aa..2925e727be6f 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -706,7 +706,7 @@ uno::Any SvxShape::GetBitmap( bool bMetaFile /* = false */ ) const
// tdf#118662 instead of creating an E3dView instance every time to paint
// a single SdrObject, use the existing SdrObject::SingleObjectPainter to
- // use less ressources and runtime
+ // use less resources and runtime
ScopedVclPtrInstance< VirtualDevice > pVDev;
const tools::Rectangle aBoundRect(GetSdrObject()->GetCurrentBoundRect());
commit e1328b89fa87cbb333c096bf229a810317f25bc3
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Jul 23 16:28:03 2018 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Jul 23 23:38:57 2018 +0200
Fix typos
Change-Id: If0d8f4033d9bc20f521d33d732fb349f0df5eeef
Reviewed-on: https://gerrit.libreoffice.org/57822
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Jenkins
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index f0d93a271d6b..08ac2f958f37 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -733,8 +733,8 @@ OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const OUStrin
| SfxFilterFlags::IMPORT );
if ( ( ( nFlags & nRequired ) == nRequired ) && !( nFlags & SfxFilterFlags::TEMPLATEPATH ) )
{
- // if there are more than one filter the preffered one should be used
- // if there is no preffered filter the first one will be used
+ // if there are more than one filter the preferred one should be used
+ // if there is no preferred filter the first one will be used
if ( aResult.isEmpty() || ( nFlags & SfxFilterFlags::PREFERED ) )
aResult = aPropsHM.getUnpackedValueOrDefault( "Name", OUString() );
if ( nFlags & SfxFilterFlags::PREFERED )
diff --git a/embedserv/source/embed/syswinwrapper.cxx b/embedserv/source/embed/syswinwrapper.cxx
index be2416f30086..4c86532be5e8 100644
--- a/embedserv/source/embed/syswinwrapper.cxx
+++ b/embedserv/source/embed/syswinwrapper.cxx
@@ -313,7 +313,7 @@ void CHatchWin::ChildSet(HWND hWndKid)
{
SetParent(hWndKid, m_hWnd);
- //Insure this is visible when the hatch window becomes visible.
+ //Ensure this is visible when the hatch window becomes visible.
ShowWindow(hWndKid, SW_SHOW);
}
diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README
index 50cb6ab0d25a..63f25a1ccd07 100644
--- a/i18npool/source/breakiterator/data/README
+++ b/i18npool/source/breakiterator/data/README
@@ -118,7 +118,7 @@ Date: Wed Sep 5 16:37:28 2007 +0000
INTEGRATION: CWS i18n37 (1.22.6); FILE MERGED
2007/09/03 18:27:39 khong 1.22.6.2: i8132 fixed a problem in skipping space for word breakiterator
- 2007/08/31 21:30:30 khong 1.22.6.1: i81158 fix skiping space problem
+ 2007/08/31 21:30:30 khong 1.22.6.1: i81158 fix skipping space problem
commit d2c2baf1a31d281d20e8b4d4c806dda027b2d5a3
Author: Vladimir Glazounov <vg at openoffice.org>
diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx
index be365e368c7e..e0261b7c0708 100644
--- a/include/svx/svdglev.hxx
+++ b/include/svx/svdglev.hxx
@@ -59,7 +59,7 @@ public:
TriState IsMarkedGluePointsPercent() const;
void SetMarkedGluePointsPercent(bool bOn);
- // bVert=FALSE: check/set hotizontal alignment
+ // bVert=FALSE: check/set horizontal alignment
// SdrAlign::HORZ_CENTER
// SdrAlign::HORZ_LEFT
// SdrAlign::HORZ_RIGHT
diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx
index fc34fb1f4d15..56e29c9cecd1 100644
--- a/include/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
@@ -260,8 +260,8 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
@param xRequest
the interaction request, which should be intercepted.
- @return A identifier, which inidicates if the request was intercepted,
- the continuation was found and selected ... or not.
+ @return A identifier, which indicates if the request was intercepted,
+ the continuation was found and selected... or not.
*/
UCBHELPER_DLLPRIVATE EInterceptionState impl_interceptRequest(const css::uno::Reference< css::task::XInteractionRequest >& xRequest);
};
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index e8e2d203801d..04f150d5d674 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -349,7 +349,7 @@ public:
SimpleXMLParser();
~SimpleXMLParser();
- /// parse a file, returns NULL on criticall errors
+ /// parse a file, returns NULL on critical errors
XMLFile *Execute(
const OString &rFileName, // the file name
XMLFile *pXMLFileIn // the XMLFile
diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPage.xba b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPage.xba
index 8b3af516b549..65f160614d0e 100644
--- a/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPage.xba
+++ b/odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPage.xba
@@ -82,7 +82,7 @@ Sub Initialize()
REM pizzas in list box
oListBox = oDialog.getControl("ListBox1")
- sPizzas = Array("Margarita","Vegeterian","Ham & Pineapple","Mexican","Seafood")
+ sPizzas = Array("Margarita","Vegetarian","Ham & Pineapple","Mexican","Seafood")
oListBox.addItems( sPizzas, 0 )
oListBox.selectItem( sPizzas(0), True )
@@ -300,4 +300,4 @@ Sub SubmitOrder()
End Sub
-</script:module>
\ No newline at end of file
+</script:module>
diff --git a/offapi/com/sun/star/presentation/XSlideShowController.idl b/offapi/com/sun/star/presentation/XSlideShowController.idl
index e4b353474a64..58b8ccf1c462 100644
--- a/offapi/com/sun/star/presentation/XSlideShowController.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowController.idl
@@ -89,7 +89,7 @@ interface XSlideShowController
void gotoNextEffect();
- /** undo the last effects that where triggered by a generic trigger.
+ /** undo the last effects that were triggered by a generic trigger.
<p>If there is no previous effect that can be undone then the
previous slide will be displayed.
*/
diff --git a/offapi/com/sun/star/sdbc/PreparedStatement.idl b/offapi/com/sun/star/sdbc/PreparedStatement.idl
index ae841c50bee5..007f5def80c5 100644
--- a/offapi/com/sun/star/sdbc/PreparedStatement.idl
+++ b/offapi/com/sun/star/sdbc/PreparedStatement.idl
@@ -192,7 +192,7 @@ published service PreparedStatement
This name can then be used in SQL positioned update/delete statements to
identify the current row in the ResultSet generated by this statement. If
the database does not support positioned update/delete, this property is
- a noop. To insure that a cursor has the proper isolation level to support
+ a noop. To ensure that a cursor has the proper isolation level to support
updates, the cursor's SELECT statement should be of the form
"select for update ...". If the "for update" phrase is omitted,
positioned updates may fail.
diff --git a/offapi/com/sun/star/sdbc/ResultSet.idl b/offapi/com/sun/star/sdbc/ResultSet.idl
index 186d70753550..69f1cd617416 100644
--- a/offapi/com/sun/star/sdbc/ResultSet.idl
+++ b/offapi/com/sun/star/sdbc/ResultSet.idl
@@ -170,7 +170,7 @@ published service ResultSet
This name can then be used in SQL positioned update/delete statements to
identify the current row in the ResultSet generated by this statement. If
the database doesn't support positioned update/delete, this property is
- a noop. To insure that a cursor has the proper isolation level to support
+ a noop. To ensure that a cursor has the proper isolation level to support
updates, the cursor's SELECT statement should be of the form
"select for update ...". If the "for update" phrase is omitted,
positioned updates may fail.
diff --git a/offapi/com/sun/star/sdbc/Statement.idl b/offapi/com/sun/star/sdbc/Statement.idl
index 77e598dfb7df..6b7868f78496 100644
--- a/offapi/com/sun/star/sdbc/Statement.idl
+++ b/offapi/com/sun/star/sdbc/Statement.idl
@@ -147,7 +147,7 @@ published service Statement
This name can then be used in SQL positioned update/delete statements to
identify the current row in the ResultSet generated by this statement. If
the database does not support positioned update/delete, this property is
- a noop. To insure that a cursor has the proper isolation level to support
+ a noop. To ensure that a cursor has the proper isolation level to support
updates, the cursor's SELECT statement should be of the form
"select for update ...". If the "for update" phrase is omitted,
positioned updates may fail.
diff --git a/offapi/com/sun/star/ui/XContextChangeEventMultiplexer.idl b/offapi/com/sun/star/ui/XContextChangeEventMultiplexer.idl
index 4c0e5b7d2e98..d768854ab0ab 100644
--- a/offapi/com/sun/star/ui/XContextChangeEventMultiplexer.idl
+++ b/offapi/com/sun/star/ui/XContextChangeEventMultiplexer.idl
@@ -102,7 +102,7 @@ interface XContextChangeEventMultiplexer : ::com::sun::star::uno::XInterface
raises (com::sun::star::lang::IllegalArgumentException);
- /** Call all event listeners that where added for the specified event focus.
+ /** Call all event listeners that were added for the specified event focus.
*/
void broadcastContextChangeEvent (
[in] com::sun::star::ui::ContextChangeEventObject aEvent,
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index dcb43221f5b9..05d482296b7b 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -156,7 +156,7 @@ private:
private:
- /** unique field entires for each field (column). */
+ /** unique field entries for each field (column). */
::std::vector< ::std::vector<SCROW> > maFieldEntries;
/** Rows visible by standard filter query. */
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index a451a999a659..dc694069fca0 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -123,7 +123,7 @@ public:
bool HasSelectionList() const;
/** Tries to fill the passed collection with list validation entries.
@descr Fills the list only, if this is a list validation and IsShowList() is enabled.
- @param rStrings (out-param) The string list to fill with list validation entires.
+ @param rStrings (out-param) The string list to fill with list validation entries.
@return true = rStrings has been filled with at least one entry. */
bool FillSelectionList(std::vector<ScTypedStrData>& rStrings, const ScAddress& rPos) const;
@@ -169,7 +169,7 @@ public:
private:
/** Tries to fill the passed collection with list validation entries.
@descr Fills the list only if it is non-NULL,
- @param pStrings (out-param) Optionally NULL, string list to fill with list validation entires.
+ @param pStrings (out-param) Optionally NULL, string list to fill with list validation entries.
@param pCell can be NULL if it is not necessary to which element in the list is selected.
@param rPos the base address for relative references.
@param rTokArr Formula token array.
diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx
index 34352971f0a5..9c348fa9c2b1 100644
--- a/sc/source/ui/inc/csvcontrol.hxx
+++ b/sc/source/ui/inc/csvcontrol.hxx
@@ -197,7 +197,7 @@ enum ScCsvCmdType
CSVCMD_REMOVEALLSPLITS /// Remove all splits. [-]
};
-/** Data for a CSV control command. The stored position data is aways character based,
+/** Data for a CSV control command. The stored position data is always character based,
it's never a column index (required for internal consistency). */
class ScCsvCmd
{
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index dcd73dde1994..c09b80d9355e 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -811,7 +811,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
sal_uInt16 nPage, nPageCount;
// create missing layout style sheets for broken documents
- // that where created with the 5.2
+ // that were created with the 5.2
nPageCount = GetMasterSdPageCount( PageKind::Standard );
for (nPage = 0; nPage < nPageCount; nPage++)
{
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index 928b15954cf1..1b2c12eed1bb 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -99,7 +99,7 @@ private:
css::drawing::framework::XConfiguration> mxRequestedConfiguration;
/** This flag is set to </sal_True> when an update of the current
- configurtion was requested (because the last request in the queue
+ configuration was requested (because the last request in the queue
was processed) but could not be executed because the
ConfigurationController was locked. A call to UpdateConfiguration()
resets the flag to </sal_False>.
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 05c4461934c1..09090f70ee2d 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -145,7 +145,7 @@ protected:
TokenToValueSetIndex maTokenToValueSetIndex;
ItemList maLockedMasterPages;
- /** Lock master pages in the given list and release locks that where
+ /** Lock master pages in the given list and release locks that were
previously acquired.
*/
void UpdateLocks (const ItemList& rItemList);
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
index 88687d81a6b8..36b728622654 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx
@@ -157,8 +157,8 @@ void SelectionManager::DeleteSelectedNormalPages (const ::std::vector<SdPage*>&
Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier( mrSlideSorter.GetModel().GetDocument()->getUnoModel(), UNO_QUERY_THROW );
Reference<drawing::XDrawPages> xPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW );
- // Iterate over all pages that where seleted when this method was called
- // and delete the draw page the notes page. The iteration is done in
+ // Iterate over all pages that were selected when this method was called
+ // and delete the draw page the notes page. The iteration is done in
// reverse order so that when one slide is not deleted (to avoid an
// empty document) the remaining slide is the first one.
::std::vector<SdPage*>::const_reverse_iterator aI;
@@ -190,8 +190,8 @@ void SelectionManager::DeleteSelectedMasterPages (const ::std::vector<SdPage*>&
Reference<drawing::XMasterPagesSupplier> xDrawPagesSupplier( mrSlideSorter.GetModel().GetDocument()->getUnoModel(), UNO_QUERY_THROW );
Reference<drawing::XDrawPages> xPages( xDrawPagesSupplier->getMasterPages(), UNO_QUERY_THROW );
- // Iterate over all pages that where seleted when this method was called
- // and delete the draw page the notes page. The iteration is done in
+ // Iterate over all pages that were selected when this method was called
+ // and delete the draw page the notes page. The iteration is done in
// reverse order so that when one slide is not deleted (to avoid an
// empty document) the remaining slide is the first one.
::std::vector<SdPage*>::const_reverse_iterator aI;
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx
index 6c944b21354a..7e95372ba0e2 100644
--- a/sdext/source/presenter/PresenterViewFactory.hxx
+++ b/sdext/source/presenter/PresenterViewFactory.hxx
@@ -46,7 +46,7 @@ public:
virtual void ActivatePresenterView();
/** Called when the view is put into a cache. The view must not paint
- itself while being deactive.
+ itself while being deactivated.
*/
virtual void DeactivatePresenterView();
diff --git a/sfx2/classification/xAL.xsd b/sfx2/classification/xAL.xsd
index 982a48b8fa66..13babc61580b 100644
--- a/sfx2/classification/xAL.xsd
+++ b/sfx2/classification/xAL.xsd
@@ -268,7 +268,7 @@
</xs:element>
<xs:element name="Premises" minOccurs="0">
<xs:annotation>
- <xs:documentation>Details of the Premises (could be building(s), site, loaction, property, premise, place) which is a landmark place which has a main address such as large mail user (e.g. Airport, Hospital, University) or could be a building (e.g. apartment, house) or a building or complex of buildings (e.g. an apartment complex or shopping centre) or even a vacant land (e.g. LOT). A premises can have many sub-addresses such as apartments in a building having its own addresses or buildings within an airport having its own addresses including its own thoroughfares</xs:documentation>
+ <xs:documentation>Details of the Premises (could be building(s), site, location, property, premise, place) which is a landmark place which has a main address such as large mail user (e.g. Airport, Hospital, University) or could be a building (e.g. apartment, house) or a building or complex of buildings (e.g. an apartment complex or shopping centre) or even a vacant land (e.g. LOT). Premises can have many sub-addresses such as apartments in a building having its own addresses or buildings within an airport having its own addresses including its own thoroughfares</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:complexContent>
diff --git a/solenv/bin/fix-includes.pl b/solenv/bin/fix-includes.pl
index 6daae9ef3d52..740424dcccdb 100755
--- a/solenv/bin/fix-includes.pl
+++ b/solenv/bin/fix-includes.pl
@@ -73,7 +73,7 @@ sub check_headers
sub check_routine
{
my ($dir) = @_;
- opendir(my $fh, $dir) or die "Program stopping, could't open directory \n";
+ opendir(my $fh, $dir) or die "Program stopping, couldn't open directory \n";
while(my $file = readdir($fh)){
if($file =~ m/\.(cxx|hxx|c|h|hrc|src)$/i ){
check_headers($dir,"$dir/$file", at subdirs);
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index db92aac5bd55..26c8e951c9c9 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -598,9 +598,9 @@ sub write_idt_header
}
##############################################################
-# Returning the name of the rranslation file for a
+# Returning the name of the translation file for a
# given language.
-# Sample: "01" oder "en-US" -> "1033.txt"
+# Sample: "01" order "en-US" -> "1033.txt"
##############################################################
sub get_languagefilename
diff --git a/vcl/opengl/shaders/lineFragmentShader.glsl b/vcl/opengl/shaders/lineFragmentShader.glsl
index 5a01de35656a..c49570be386d 100644
--- a/vcl/opengl/shaders/lineFragmentShader.glsl
+++ b/vcl/opengl/shaders/lineFragmentShader.glsl
@@ -28,7 +28,7 @@ void main()
float alpha = clamp(dist, 0.0, 1.0);
- // modify the alpha chanel only
+ // modify the alpha channel only
vec4 result_color = color;
result_color.a = result_color.a * alpha;
More information about the Libreoffice-commits
mailing list