diff options
25 files changed, 40 insertions, 40 deletions
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx index cbc476731078..3896cf7bacee 100644 --- a/UnoControls/source/base/basecontainercontrol.cxx +++ b/UnoControls/source/base/basecontainercontrol.cxx @@ -375,7 +375,7 @@ void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) WindowDescriptor* BaseContainerControl::impl_getWindowDescriptor ( const Reference< XWindowPeer > & rParentPeer ) { - // - used from "createPeer()" to set the values of an WindowDescriptor!!! + // - used from "createPeer()" to set the values of a WindowDescriptor!!! // - if you will change the descriptor-values, you must override this virtual function // - the caller must release the memory for this dynamical descriptor!!! diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index 221dd742b3d3..ff5ddbde89eb 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -235,7 +235,7 @@ namespace accessibility m_pBrowseBox = nullptr; m_xControlAccessible.clear(); m_aContext.clear(); - // NO dispose of the inner object there: it is the css::accessibility::XAccessible of an window, and disposing + // NO dispose of the inner object there: it is the css::accessibility::XAccessible of a window, and disposing // it would delete the respective VCL window } } // namespace accessibility diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index d0a414e03693..eec18f7a8952 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -145,7 +145,7 @@ void SAL_CALL ODBTable::disposing() void ODBTable::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const { if ((PROPERTY_ID_PRIVILEGES == _nHandle) && (-1 == m_nPrivileges)) - { // somebody is asking for the privileges an we do not know them, yet + { // somebody is asking for the privileges and we do not know them, yet const_cast<ODBTable*>(this)->m_nPrivileges = ::dbtools::getTablePrivileges(getMetaData(),m_CatalogName,m_SchemaName, m_Name); } diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index 75fffbff1718..51caf74e8e4d 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -47,7 +47,7 @@ namespace dbaui { - // TODO : replace this class if MM provides an WeakSubObject in cppu + // TODO : replace this class if MM provides a WeakSubObject in cppu class OSbaWeakSubObject : public ::cppu::OWeakObject { protected: diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 9c7ad0b3062e..f361ca0b125d 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -1268,7 +1268,7 @@ bool OJoinTableView::PreNotify(NotifyEvent& rNEvt) // the last win is active and we're travelling forward -> select the first conn pNextConn = m_vTableConnection.begin()->get(); if ((aIter == m_aTableMap.begin()) && !bForward) - // the first win is active an we're traveling backward -> select the last conn + // the first win is active and we're traveling backward -> select the last conn pNextConn = m_vTableConnection.rbegin()->get(); } diff --git a/extensions/qa/integration/extensions/ConsoleWait.java b/extensions/qa/integration/extensions/ConsoleWait.java index bda281d2902b..34fdaa7c0602 100644 --- a/extensions/qa/integration/extensions/ConsoleWait.java +++ b/extensions/qa/integration/extensions/ConsoleWait.java @@ -70,7 +70,7 @@ public class ConsoleWait implements com.sun.star.lang.XEventListener /** creates a ConsoleWait instance * @param _disposable * a component whose disposal should be monitored. When this component dies, - * the ConsoleWait also returns from an waitForConsole call, even if the user + * the ConsoleWait also returns from a waitForConsole call, even if the user * did not yet press the enter key */ public ConsoleWait( Object _disposable ) @@ -117,4 +117,4 @@ public class ConsoleWait implements com.sun.star.lang.XEventListener } } } -}
\ No newline at end of file +} diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 82db02739223..fc5b87d6814c 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6031,7 +6031,7 @@ bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt, sal_uInt8 nVer;sal_uInt16 nInst;sal_uInt16 nFbt;sal_uInt32 nLength; long nStartShapeGroupCont = rSt.Tell(); // We are now in a shape group container (conditionally multiple per page) - // an we now have to iterate through all contained shape containers + // and we now have to iterate through all contained shape containers bool bFirst = !bPatriarch; sal_uLong nReadSpGrCont = 0; do diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx index ef74d8f182a7..870ec7aa52dd 100644 --- a/fpicker/source/win32/folderpicker/FolderPicker.cxx +++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx @@ -93,7 +93,7 @@ sal_Int16 SAL_CALL CFolderPicker::execute( ) // we should not block in this call else // in the case of an event the client can'tgetPImplFromHandle( hWnd ) - // call another function an we run into a + // call another function and we run into a // deadlock !!!!! return m_pFolderPickerImpl->execute( ); } diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java index cbea395c9492..f78115854b1d 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java @@ -226,11 +226,11 @@ class StatusListener implements com.sun.star.frame.XStatusListener, /** - * This is the callback method for the status we listen for an wish to show it - * on our UI control. Of course it's a oneway method ... but we don't call back + * This is the callback method for the status we listen for and wish to show it + * on our UI control. Of course it's a oneway method... but we don't call back * to the office synchronously here. We update our UI only. So we don't leave this * java process. In such case it's not necessary to use threads to decouple it. - * Do it here and now ... + * Do it here and now... * * @param aEvent * describes the status, we can use to update our UI control diff --git a/offapi/com/sun/star/graphic/EmfTools.idl b/offapi/com/sun/star/graphic/EmfTools.idl index f96874bd8c78..f4c2023e97dd 100644 --- a/offapi/com/sun/star/graphic/EmfTools.idl +++ b/offapi/com/sun/star/graphic/EmfTools.idl @@ -27,7 +27,7 @@ module com { module sun { module star { module graphic /** Service that describes the necessary interfaces and properties to handle emf files. - Parses an WMF/EMF/EMF+ file to a sequence of B2DPrimitives for internal usage + Parses a WMF/EMF/EMF+ file to a sequence of B2DPrimitives for internal usage @since LibreOffice 6.0 */ diff --git a/offapi/com/sun/star/graphic/XEmfParser.idl b/offapi/com/sun/star/graphic/XEmfParser.idl index fdfd2901ded9..1c2fd10d7fff 100644 --- a/offapi/com/sun/star/graphic/XEmfParser.idl +++ b/offapi/com/sun/star/graphic/XEmfParser.idl @@ -29,7 +29,7 @@ interface XPrimitive2D; /** XEmfParser interface - This interface allows to parse an WMF/EMF/EMF+ stream in form of a sequence of bytes + This interface allows to parse a WMF/EMF/EMF+ stream in form of a sequence of bytes to be parsed into a sequence of XPrimitive2Ds @since LibreOffice 6.0 diff --git a/offapi/com/sun/star/ucb/SimpleFileAccess.idl b/offapi/com/sun/star/ucb/SimpleFileAccess.idl index 1aa80f638848..5ed9bd63ef2c 100644 --- a/offapi/com/sun/star/ucb/SimpleFileAccess.idl +++ b/offapi/com/sun/star/ucb/SimpleFileAccess.idl @@ -26,7 +26,7 @@ module com { module sun { module star { module ucb { /** Offers a simple access to resources, like files and folders located in a -local file system or on an WebDAV server. +local file system or on a WebDAV server. @author Andreas Bregas @version 1.0 07/25/2000 diff --git a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl index 7134e6ca984d..3203cefd704b 100644 --- a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl +++ b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl @@ -31,7 +31,7 @@ module com { module sun { module star { module ucb { */ interface XWebDAVCommandEnvironment : XCommandEnvironment { - /** This method gets called while assembling an WebDAV/HTTP request. + /** This method gets called while assembling a WebDAV/HTTP request. The returned headername-headervalue pairs will be appended to the list of request headers before the request is dispatched. diff --git a/officecfg/registry/schema/org/openoffice/Office/Addons.xcs b/officecfg/registry/schema/org/openoffice/Office/Addons.xcs index 38496934f97d..bfcc5f34c61a 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Addons.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Addons.xcs @@ -183,7 +183,7 @@ </prop> <prop oor:name="ControlType" oor:type="xs:string"> <info> - <desc>A property to define the control type of the toolbar item. An will be interpreted as OpenOffice.org default toggle button.</desc> + <desc>A property to define the control type of the toolbar item. It will be interpreted as OpenOffice.org default toggle button.</desc> </info> </prop> <prop oor:name="Width" oor:type="xs:long"> diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java index a28592c543a3..15b489ca46ec 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java @@ -654,7 +654,7 @@ public class _XAccessibleText extends MultiMethodTest { } /** - * Calls the method with invalid parameters an with valid parameters. + * Calls the method with invalid parameters and with valid parameters. * Has OK status if exception was thrown for invalid parameters, * if exception wasn't thrown for valid parameters. * The following method tests are to be executed before: @@ -743,7 +743,7 @@ public class _XAccessibleText extends MultiMethodTest { } /** - * Calls the method with invalid parameters an with valid parameters, + * Calls the method with invalid parameters and with valid parameters, * checks returned values. * Has OK status if exception was thrown for invalid parameters, * if exception wasn't thrown for valid parameters and if returned values @@ -845,7 +845,7 @@ public class _XAccessibleText extends MultiMethodTest { } /** - * Calls the method with invalid parameters an with valid parameters, + * Calls the method with invalid parameters and with valid parameters, * checks returned values. * Has OK status if exception was thrown for invalid parameters, * if exception wasn't thrown for valid parameters and if returned values @@ -919,7 +919,7 @@ public class _XAccessibleText extends MultiMethodTest { } /** - * Calls the method with invalid parameters an with valid parameters, + * Calls the method with invalid parameters and with valid parameters, * checks returned values. * Has OK status if exception was thrown for invalid parameters, * if exception wasn't thrown for valid parameters and if returned values @@ -1014,7 +1014,7 @@ public class _XAccessibleText extends MultiMethodTest { } /** - * Calls the method with invalid parameters an with valid parameters, + * Calls the method with invalid parameters and with valid parameters, * checks returned values. * Has OK status if exception was thrown for invalid parameters, * if exception wasn't thrown for valid parameters and if returned values @@ -1104,7 +1104,7 @@ public class _XAccessibleText extends MultiMethodTest { } /** - * Calls the method with invalid parameters an with valid parameter, + * Calls the method with invalid parameters and with valid parameter, * checks returned values. * Has OK status if exception was thrown for invalid parameters, * if exception wasn't thrown for valid parameter and if returned value for diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 94f5e1b52e0d..7f3ad5a68a39 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -1427,7 +1427,7 @@ void SdTiledRenderingTest::testPostKeyEventInvalidation() Scheduler::ProcessEventsToIdle(); CPPUNIT_ASSERT(pView2->GetTextEditObject()); - // Now go left with the cursor in the second view an watch for + // Now go left with the cursor in the second view and watch for // invalidations. aView2.m_bTilesInvalidated = false; pXImpressDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_LEFT); diff --git a/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java index e4154db87220..7c42cdf1f303 100644 --- a/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java +++ b/sfx2/qa/complex/sfx2/GlobalEventBroadcaster.java @@ -132,7 +132,7 @@ public class GlobalEventBroadcaster { proveExpectation(expected)); System.out.println("... done"); - System.out.println("opening an writer doc via Window-New Window"); + System.out.println("opening a writer doc via Window-New Window"); notifyEvents.clear(); { XTextDocument xTextDoc = wHelper.openFromDialog(".uno:NewWindow", "", false); @@ -140,7 +140,7 @@ public class GlobalEventBroadcaster { util.utils.waitForEventIdle(m_xMSF); expected = new String[] { "OnUnfocus", "OnCreate", "OnViewCreated", "OnFocus", "OnUnfocus", "OnViewCreated", "OnFocus", }; - assertTrue("Wrong events fired when opening an writer doc via Window-New Window", + assertTrue("Wrong events fired when opening a writer doc via Window-New Window", proveExpectation(expected)); System.out.println("... done"); diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 76552c8e7006..89851efb54a7 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -997,7 +997,7 @@ namespace sdr { namespace contact { // We once had a situation where this was called reentrantly, which lead to all kind of strange effects. All // those affected the grid control, which is the only control so far which is visible in design mode (and // not only in alive mode). - // Creating the control triggered an Window::Update on some of its child windows, which triggered a + // Creating the control triggered a Window::Update on some of its child windows, which triggered a // Paint on parent of the grid control (e.g. the SwEditWin), which triggered a reentrant call to this method, // which it is not really prepared for. diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 1172caf8be1b..c1d94eda7f6c 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -1140,7 +1140,7 @@ bool WW8AttributeOutput::StartURL( const OUString &rUrl, const OUString &rTarget else if ( eProto != INetProtocol::NotValid ) { // version 2 (simple url) - // an write some data to the data stream, but don't ask + // and write some data to the data stream, but don't ask // what the data mean, except for the URL. // The First piece is the WW8_PIC structure. static sal_uInt8 MAGIC_B[] = { diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 3505d8f641e3..250aea6fcf8f 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -2048,7 +2048,7 @@ bool WW8_WrPlcSubDoc::WriteGenericText( WW8Export& rWrt, sal_uInt8 nTTyp, if( aContent[ i ] != nullptr ) { - // is it an writer or sdr - textbox? + // is it a writer or sdr - textbox? const SdrObject& rObj = *static_cast<SdrObject const *>(aContent[ i ]); if (rObj.GetObjInventor() == SdrInventor::FmForm) { @@ -2304,7 +2304,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt, sal_uInt8 nTTyp, for ( sal_uInt16 i = 0; i < nLen; ++i ) { // write textbox story - FTXBXS - // is it an writer or sdr - textbox? + // is it a writer or sdr - textbox? const SdrObject* pObj = static_cast<SdrObject const *>(aContent[ i ]); sal_Int32 nCnt = 1; if (pObj && dynamic_cast< const SdrTextObj *>( pObj ) == nullptr ) diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java index 575d569c805d..3861a071de10 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java @@ -496,7 +496,7 @@ public class _XAccessibleText { } /** - * Calls the method with invalid parameters an with valid parameters. + * Calls the method with invalid parameters and with valid parameters. * Has OK status if exception was thrown for invalid parameters, * if exception wasn't thrown for valid parameters. * The following method tests are to be executed before: @@ -583,7 +583,7 @@ public class _XAccessibleText { } /** - * Calls the method with invalid parameters an with valid parameters, + * Calls the method with invalid parameters and with valid parameters, * checks returned values. * Has OK status if exception was thrown for invalid parameters, * if exception wasn't thrown for valid parameters and if returned values @@ -675,7 +675,7 @@ public class _XAccessibleText { } /** - * Calls the method with invalid parameters an with valid parameters, + * Calls the method with invalid parameters and with valid parameters, * checks returned values. * Has OK status if exception was thrown for invalid parameters, * if exception wasn't thrown for valid parameters and if returned values @@ -746,7 +746,7 @@ public class _XAccessibleText { } /** - * Calls the method with invalid parameters an with valid parameters, + * Calls the method with invalid parameters and with valid parameters, * checks returned values. * Has OK status if exception was thrown for invalid parameters, * if exception wasn't thrown for valid parameters and if returned values @@ -833,7 +833,7 @@ public class _XAccessibleText { } /** - * Calls the method with invalid parameters an with valid parameters, + * Calls the method with invalid parameters and with valid parameters, * checks returned values. * Has OK status if exception was thrown for invalid parameters, * if exception wasn't thrown for valid parameters and if returned values @@ -921,7 +921,7 @@ public class _XAccessibleText { } /** - * Calls the method with invalid parameters an with valid parameter, + * Calls the method with invalid parameters and with valid parameter, * checks returned values. * Has OK status if exception was thrown for invalid parameters, * if exception wasn't thrown for valid parameter and if returned value for diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h index 36e4a041c955..48afedf3b715 100644 --- a/vcl/inc/win/salframe.h +++ b/vcl/inc/win/salframe.h @@ -57,7 +57,7 @@ public: bool mbBorder; // has window a border bool mbFixBorder; // has window a fixed border bool mbSizeBorder; // has window a sizeable border - bool mbNoIcon; // is an window without an icon + bool mbNoIcon; // is a window without an icon bool mbFloatWin; // is a FloatingWindow bool mbFullScreen; // TRUE: in full screen mode bool mbPresentation; // TRUE: Presentation Mode running diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 963f311ae2aa..5b5c55198d9a 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -445,7 +445,7 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, return nullptr; } - // If we have an Window with an Caption Bar and without + // If we have a Window with an Caption Bar and without // an MaximizeBox, we change the SystemMenu if ( (nSysStyle & (WS_CAPTION | WS_MAXIMIZEBOX)) == (WS_CAPTION) ) { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java index 506b754b3a7c..e48ad8257812 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java @@ -168,7 +168,7 @@ public final class Driver { docOut.write(fos); fos.flush(); } catch (Exception writeExcept) { - System.out.println("\nThere was an writing out file <" + + System.out.println("\nThere was a writing out file <" + fileName + ">"); writeExcept.printStackTrace(); } finally { diff --git a/xmlsecurity/source/helper/documentsignaturemanager.cxx b/xmlsecurity/source/helper/documentsignaturemanager.cxx index c287b5234063..8d6f2b3f6ed1 100644 --- a/xmlsecurity/source/helper/documentsignaturemanager.cxx +++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx @@ -381,7 +381,7 @@ bool DocumentSignatureManager::add( // We open a signature stream in which the existing and the new //signature is written. ImplGetSignatureInformation (later in this function) will - //then read the stream an will fill maCurrentSignatureInformations. The final signature + //then read the stream and fill maCurrentSignatureInformations. The final signature //is written when the user presses OK. Then only maCurrentSignatureInformation and //a sax writer are used to write the information. SignatureStreamHelper aStreamHelper |