diff options
15 files changed, 32 insertions, 32 deletions
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java index 648be5f7ffb7..0bc8fcef483b 100644 --- a/framework/qa/complex/XUserInputInterception/EventTest.java +++ b/framework/qa/complex/XUserInputInterception/EventTest.java @@ -56,7 +56,7 @@ import static org.junit.Assert.*; * This <CODE>ComplexTest</CODE> checks the interface * <CODE>XUserInputInterception</CODE>. Therefore it creates a document, * adds a mouse and a key listener onto the interface and fire the - * correspond events. If all listener works as expected the test resluts in + * correspond events. If all listener works as expected the test results in * <CODE>OK</CODE> status. * @short Check the interface XUserInputIntercaption * @descr checks is a simple way the interface XUserInputInteraction @@ -307,8 +307,8 @@ public class EventTest { xUII.removeMouseClickHandler(mouseListener); } - /** - * returns the <CODE>XUserInputInterception</CODE> from the <CODE>XMdoel</CODE> + /* + * returns the <CODE>XUserInputInterception</CODE> from the <CODE>XModel</CODE> * @param xModel the XModel of a document * @return the <CODE>XUserInputInterception</CODE> of the document */ diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java index febef2bc3048..c1b52b225370 100644 --- a/framework/qa/complex/dispatches/checkdispatchapi.java +++ b/framework/qa/complex/dispatches/checkdispatchapi.java @@ -355,14 +355,14 @@ public class checkdispatchapi { // Error fail("At least one DispatchInformation item does not match the requested group.\n\trequested group=[" + nGroup - + "] returned groupd=[" + aInfo.GroupId + "] command=\"" + aInfo.Command + "\""); // true => dont break this test + + "] returned groupd=[" + aInfo.GroupId + "] command=\"" + aInfo.Command + "\""); // true => don't break this test continue; } if (aCheckMap.containsKey(aInfo.Command)) { // Error - fail("Found a duplicate item: group=[" + aInfo.GroupId + "] command=\"" + aInfo.Command + "\""); // true => dont break this test + fail("Found a duplicate item: group=[" + aInfo.GroupId + "] command=\"" + aInfo.Command + "\""); // true => don't break this test continue; } diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java index c682c4f82362..7a5be6607e9a 100644 --- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java +++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java @@ -129,10 +129,10 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator - /** + /* * Internal helper to show the status. * Currently it's implement as normal text out on stdout. - * But of course other thimngs are possible here too. + * But of course other things are possible here too. * e.g. a dialog */ private void impl_show() diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 6a37c39d6128..59c6a93ead13 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -178,7 +178,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g sal_Int32 i = 0; sal_Int32 c = lCommandList.getLength(); - css::uno::Sequence< css::uno::Any > lPreferredOnes (c); // dont pack list! + css::uno::Sequence< css::uno::Any > lPreferredOnes (c); // don't pack list! AcceleratorCache& rCache = impl_getCFG(); for (i=0; i<c; ++i) @@ -746,7 +746,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g sal_Int32 i = 0; sal_Int32 c = lCommandList.getLength(); - css::uno::Sequence< css::uno::Any > lPreferredOnes (c); // dont pack list! + css::uno::Sequence< css::uno::Any > lPreferredOnes (c); // don't pack list! AcceleratorCache& rCache = impl_getCFG(true); for (i=0; i<c; ++i) diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 41e315f840e2..f69cc429f732 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -176,7 +176,7 @@ void DocumentAcceleratorConfiguration::fillCache() if (!xDocumentRoot.is()) return; - // get current office locale ... but dont cache it. + // get current office locale ... but don't cache it. // Otherwise we must be listener on the configuration layer // which seems to superflous for this small implementation .-) LanguageTag aLanguageTag( impl_ts_getLocale()); diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index 3569194ee742..3b1c3b3bba45 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -99,7 +99,7 @@ void GlobalAcceleratorConfiguration::fillCache() /** read all data into the cache. */ #if 0 - // get current office locale ... but dont cache it. + // get current office locale ... but don't cache it. // Otherwise we must be listener on the configuration layer // which seems to superflous for this small implementation .-) // XXX: what is this good for? it was a comphelper::Locale but unused diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 5ceaa744c895..674bb280bded 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -138,7 +138,7 @@ void ModuleAcceleratorConfiguration::fillCache() } #if 0 - // get current office locale ... but dont cache it. + // get current office locale ... but don't cache it. // Otherwise we must be listener on the configuration layer // which seems to superflous for this small implementation .-) // XXX: what is this good for? it was a comphelper::Locale but unused diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 9510cf6675d9..0b23294cf93d 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -493,7 +493,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType void PresetHandler::copyPresetToTarget(const OUString& sPreset, const OUString& sTarget) { - // dont check our preset list, if element exists + // don't check our preset list, if element exists // We try to open it and forward all errors to the user! css::uno::Reference< css::embed::XStorage > xWorkingShare; @@ -638,7 +638,7 @@ void PresetHandler::addStorageListener(IStorageListener* pListener) EConfigType eCfgType; { SolarMutexGuard g; - sRelPath = m_sRelPathUser; // use user path ... because we dont work directly on the share layer! + sRelPath = m_sRelPathUser; // use user path ... because we don't work directly on the share layer! eCfgType = m_eConfigType; } @@ -668,7 +668,7 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener) EConfigType eCfgType; { SolarMutexGuard g; - sRelPath = m_sRelPathUser; // use user path ... because we dont work directly on the share layer! + sRelPath = m_sRelPathUser; // use user path ... because we don't work directly on the share layer! eCfgType = m_eConfigType; } diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index d81850d079b6..0dd139ba3cbb 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -157,7 +157,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri sRelPath += sChild + PATH_SEPARATOR; } - // TODO think about return last storage as working storage ... but dont caching it inside this holder! + // TODO think about return last storage as working storage ... but don't caching it inside this holder! // => otherwise the same storage is may be commit more than once. return xChild; @@ -426,7 +426,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal throw exResult; // c) try it readonly - // dont catch exception here! Outside code wish to know, if operation failed or not. + // don't catch exception here! Outside code wish to know, if operation failed or not. // Otherwhise they work on NULL references ... sal_Int32 eNewMode = (eOpenMode & ~css::embed::ElementModes::WRITE); css::uno::Reference< css::embed::XStorage > xSubStorage = xBaseStorage->openStorageElement(sSubStorage, eNewMode); @@ -465,7 +465,7 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback throw exResult; // c) try it readonly - // dont catch exception here! Outside code wish to know, if operation failed or not. + // don't catch exception here! Outside code wish to know, if operation failed or not. // Otherwhise they work on NULL references ... sal_Int32 eNewMode = (eOpenMode & ~css::embed::ElementModes::WRITE); css::uno::Reference< css::io::XStream > xSubStream = xBaseStorage->openStreamElement(sSubStream, eNewMode); diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index bd83d57db55a..1b45a82dabcf 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -41,7 +41,7 @@ FrameContainer::FrameContainer() /**-*************************************************************************************************************** @short deinitialize may a filled container - @descr Special features (if the currently are running) will be dsiabled and we free all used other resources. + @descr Special features (if the currently are running) will be disabled and we free all used other resources. @threadsafe not necessary - its not a singleton *****************************************************************************************************************/ diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 9e7b29f5af19..b409735f330e 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -281,7 +281,7 @@ IMPL_LINK_NOARG_TYPED(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void) // Analyze the environment a first time. // If we found some special cases, we can - // make some decisions erlier! + // make some decisions earlier! css::uno::Reference< css::frame::XFramesSupplier > xDesktop( css::frame::Desktop::create(xContext), css::uno::UNO_QUERY_THROW); FrameListAnalyzer aCheck1(xDesktop, xCloseFrame, FrameListAnalyzer::E_HELP | FrameListAnalyzer::E_BACKINGCOMPONENT); @@ -430,7 +430,7 @@ bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< c return true; // Close all views to the same document ... if forced to do so. - // But dont touch our own frame here! + // But don't touch our own frame here! // We must do so ... because the may be following controller->suspend() // will show the "save/discard/cancel" dialog for the last view only! if (bCloseAllOtherViewsToo) @@ -458,7 +458,7 @@ bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< c if (bAllowSuspend) { css::uno::Reference< css::frame::XController > xController = xFrame->getController(); - if (xController.is()) // some views dont uses a controller .-( (e.g. the help window) + if (xController.is()) // some views don't uses a controller .-( (e.g. the help window) { bControllerSuspended = xController->suspend(sal_True); if (! bControllerSuspended) @@ -466,7 +466,7 @@ bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< c } } - // dont remove the component really by e.g. calling setComponent(null, null). + // don't remove the component really by e.g. calling setComponent(null, null). // It's enough to suspend the controller. // If we close the frame later this controller doesn't show the same dialog again. return true; @@ -484,7 +484,7 @@ bool CloseDispatcher::implts_closeFrame() if ( ! xFrame.is() ) return true; - // dont deliver ownership; our "UI user" will try it again if it failed. + // don't deliver ownership; our "UI user" will try it again if it failed. // OK - he will get an empty frame then. But normally an empty frame // should be closeable always :-) if (!fpf::closeIt(xFrame, false)) diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 32bd408ebdec..5dda8e56e9cf 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -219,7 +219,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt // I.IV) no further special targets exist // Now we have to search for the right target frame by calling findFrame() - but should provide our code // against creation of a new task if no frame could be found. - // I said it b efore - it's allowed for dispatch() only. + // I said it before - it's allowed for dispatch() only. else { @@ -234,7 +234,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt xDispatcher = xProvider->queryDispatch(aURL,SPECIALTARGET_SELF,0); } // if it couldn't be found - but creation was allowed - // use special dispatcher for creatio or froward it to the browser + // use special dispatcher for creation or forwarding to the browser else if (nSearchFlags & css::frame::FrameSearchFlag::CREATE) xDispatcher = implts_getOrCreateDispatchHelper( E_CREATEDISPATCHER, xDesktop, sTargetFrameName, nSearchFlags ); } diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index 97975a1f4b96..98d60fd06bce 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -97,7 +97,7 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL& { // convert "systemexec:file:///c:/temp/test.html" => "file:///c:/temp/test.html" sal_Int32 c = aURL.Complete.getLength()-PROTOCOL_LENGTH; - if (c<1) // we dont check for valid URLs here! The system will show an error message ... + if (c<1) // we don't check for valid URLs here! The system will show an error message ... { impl_notifyResultListener(xListener, css::frame::DispatchResultState::FAILURE); return; diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index 708281fd500a..b13797182e30 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -59,10 +59,10 @@ FrameListAnalyzer::~FrameListAnalyzer() Of course we can't access frames, which stands outside of this tree. But it's necessary to collect top frames here only. Otherwise we interpret closing of last frame wrong. Further we analyze this list and split into different parts. - E.g. for "CloseDoc" we must know, which frames of the given list referr to the same model. + E.g. for "CloseDoc" we must know, which frames of the given list refer to the same model. These frames must be closed then. But all other frames must be untouched. In case the request was "CloseWin" these splitted lists can be used too, to decide if the last window - or document was closed. Then we have to initialize the backing window ... + or document was closed. Then we have to initialize the backing window... Last but not least we must know something about our special help frame. It must be handled separately. And last but not least - the backing component frame must be detected too. */ diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index cf0f3a93cccc..07d9b9aeb542 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -33,9 +33,9 @@ namespace framework{ @attention This implementation could be used one times only. We don't support a resetable continuation yet! Why? Normally interaction should show a filter selection dialog and ask user for his decision. - He can select any filter - then instances of these class will be called by handler ... or user - close dialog without any selection. Then another continuation should be slected by handler to - abort continuations ... Retrying isn't very useful here ... I think. + He can select any filter - then instances of these class will be called by handler... or user + close dialog without any selection. Then another continuation should be selected by handler to + abort continuations... Retrying isn't very useful here... I think. @implements XInteractionFilterSelect |