diff options
Diffstat (limited to 'framework/source')
35 files changed, 100 insertions, 100 deletions
diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index d4a8a03663dd..5fd1a3b97b5d 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -31,7 +31,7 @@ namespace framework{ @short initialize an empty container @descr The container will be empty then - special features (e.g. the async quit mechanism) are disabled. - @threadsafe not neccessary - its not a singleton + @threadsafe not necessary - its not a singleton *****************************************************************************************************************/ FrameContainer::FrameContainer() // initialize base classes first. @@ -48,7 +48,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. - @threadsafe not neccessary - its not a singleton + @threadsafe not necessary - its not a singleton *****************************************************************************************************************/ FrameContainer::~FrameContainer() { diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index 49aebce58ca1..410aa0ad06a8 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -35,7 +35,7 @@ namespace framework{ /*-****************************************************************************************************//** - @short initialize instance with neccessary information + @short initialize instance with necessary information @descr We need a valid uno service manager to create or instanciate new services. All other information to create frames or tasks come in on right interface methods. diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 8b515189414a..b5f68076a0d2 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -109,7 +109,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher:: { if (nCommandGroup == css::frame::CommandGroup::VIEW) { - /* Attention: Dont add .uno:CloseFrame here. Because its not realy + /* Attention: Dont add .uno:CloseFrame here. Because its not really a configurable feature ... and further it does not have a valid UIName entry inside the GenericCommands.xcu ... */ css::uno::Sequence< css::frame::DispatchInformation > lViewInfos(1); @@ -238,7 +238,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& Now we do the following: - close all views to the same document, if needed and possible - make the current frame empty - ! This step is neccessary to handle errors during closing the + ! This step is necessary to handle errors during closing the document inside the frame. May the document shows a dialog and the user ignore it. Then the state of the office can be changed during we try to close frame and document. @@ -416,7 +416,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) // We reached this method only, by using a reference to ourself :-) // Further this member is used to detect still running and not yet finished // ansynchronous operations. So its time now to release this reference. - // But hold it temp alive. Otherwhise we die before we can finish this method realy :-)) + // But hold it temp alive. Otherwhise we die before we can finish this method really :-)) css::uno::Reference< css::uno::XInterface > xTempHold = m_xSelfHold; m_xSelfHold.clear(); m_xResultListener.clear(); @@ -479,7 +479,7 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc } } - // dont remove the component realy by e.g. calling setComponent(null, null). + // dont 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 sal_True; @@ -596,7 +596,7 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig if (xTopWindowCheck.is()) { // b1) Note: Toolkit interface XTopWindow sometimes is used by real VCL-child-windows also .-) - // Be sure that these window is realy a "top system window". + // Be sure that these window is really a "top system window". // Attention ! Checking Window->GetParent() isnt the right approach here. // Because sometimes VCL create "implicit border windows" as parents even we created // a simple XWindow using the toolkit only .-( diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 3b2627cfb761..7b5c74645ff5 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -86,7 +86,7 @@ DispatchProvider::~DispatchProvider() @short search a dispatcher for given URL @descr If no interceptor is set on owner, we search for right frame and dispatch URL to it. If no frame was found, we do nothing. - But we doesn't do it directly here. We detect the type of our owner frame and calls + But we don't do it directly here. We detect the type of our owner frame and calls specialized queryDispatch() helper dependen from that. Because a Desktop handle some requests in another way then a normal frame. @@ -488,7 +488,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt css::uno::Reference< css::frame::XDispatch > xDispatcher; ProtocolHandler aHandler ; - // This member is threadsafe by himself and lives if we live - we doesn't need any mutex here. + // This member is threadsafe by himself and lives if we live - we don't need any mutex here. if (m_aProtocolHandlerCache.search(aURL,&aHandler)) { /* SAFE { */ @@ -545,7 +545,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt Thats why we implement this method. It return an already existing helper or create a new one otherwise. @attention The parameter sTarget and nSearchFlags are defaulted to "" and 0! - Please use it only, if you can be shure, that the realy given by the outside calli! + Please use it only, if you can be shure, that the really given by the outside calli! Mostly it depends from the parameter eHelper is they are required or not. @param eHelper diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index 7cdfc59df90f..ca358e5e7248 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -64,7 +64,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD // Use first interceptor everytimes. // Note: it doesn't matter, which direction this helper implementation use to ask interceptor objects. // Using of member m_aInterceptorList will starts at the beginning everytimes. - // It depends from the filling operation, in which direction it works realy! + // It depends from the filling operation, in which direction it works really! if (!xInterceptor.is() && m_lInterceptionRegs.size()>0) { pIt = m_lInterceptionRegs.begin(); diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx index 6eb2284a0878..8b0610bcbc0e 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -98,7 +98,7 @@ css::uno::Any LoadDispatcher::impl_dispatch( const css::util::URL& rURL, { if (xListener.is()) xListener->dispatchFinished( - css::frame::DispatchResultEvent(xThis, css::frame::DispatchResultState::DONTKNOW, css::uno::Any())); // DONTKNOW? ... not realy started ... not realy failed :-) + css::frame::DispatchResultEvent(xThis, css::frame::DispatchResultState::DONTKNOW, css::uno::Any())); // DONTKNOW? ... not really started ... not really failed :-) } css::uno::Reference< css::frame::XFrame > xBaseFrame(m_xOwnerFrame.get(), css::uno::UNO_QUERY); diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index e26385a1584f..8f3b28574ac7 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -84,7 +84,7 @@ MailToDispatcher::~MailToDispatcher() be asked by the generic dispatch mechanism inside framework, if he can handle this special URL which match his registration. He can agree by returning of a valid dispatch instance or disagree by returning <NULL/>. - We don't create new dispatch instances here realy - we return THIS as result to handle it + We don't create new dispatch instances here really - we return THIS as result to handle it at the same implementation. */ css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDispatch( const css::util::URL& aURL , @@ -122,7 +122,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail /** @short dispatch URL with arguments @descr We use threadsafe internal method to do so. It returns a state value - but we ignore it. - Because we doesn't support status listener notifications here. Status events are not guaranteed - + Because we don't support status listener notifications here. Status events are not guaranteed - and we call another service internaly which doesn't return any notifications too. @param aURL @@ -193,7 +193,7 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL& @return <TRUE/> if dispatch could be started successfully Note: Our internal used shell executor doesn't return any state value - so we must belive that call was successfully. - <FALSE/> if neccessary resource couldn't be created or an exception was thrown. + <FALSE/> if necessary resource couldn't be created or an exception was thrown. */ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ ) throw( css::uno::RuntimeException ) @@ -231,7 +231,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& /** @short add/remove listener for state events @descr Because we use an external process to forward such mail URLs, and this process doesn't - return any notifications about success or failed state - we doesn't support such status + return any notifications about success or failed state - we don't support such status listener. We have no status to send. @param xListener diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 6af1cb8be911..c659162dc286 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -101,7 +101,7 @@ Oxt_Handler::~Oxt_Handler() @attention We must hold us alive by ourself ... because we use async. vcl sound player ... but playing is started in async interface call "dispatch()" too. And caller forget us immediately. But then our uno ref count will decreased to 0 and will die. The only solution is to use own reference to our implementation. - But we do it for realy started jobs only and release it during call back of vcl. + But we do it for really started jobs only and release it during call back of vcl. @seealso class vcl/Sound @seealso method implts_PlayerNotify() @@ -160,7 +160,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& @attention a) We don't need any mutex here ... because we don't use any member! b) Don't use internal player instance "m_pPlayer" to detect given sound file! - It's not neccessary to do that ... and we can use temp. variable to do the same. + It's not necessary to do that ... and we can use temp. variable to do the same. This way is easy - we don't must synchronize it with currently played sounds! Another reason to do so ... We are a listener on our internal ma_Player object. If you would call "IsSoundFile()" on this instance, he would call us back and @@ -177,7 +177,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ) { - // Our default is "nothing". So we can return it, if detection failed or fily type is realy unknown. + // Our default is "nothing". So we can return it, if detection failed or fily type is really unknown. OUString sTypeName; // Analyze given descriptor to find filename or input stream or ... diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index 342e923cc6f0..65652772f1f4 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -86,7 +86,7 @@ ServiceHandler::~ServiceHandler() be asked by the generic dispatch mechanism inside framework, if he can handle this special URL which match his registration. He can agree by returning of a valid dispatch instance or disagree by returning <NULL/>. - We don't create new dispatch instances here realy - we return THIS as result to handle it + We don't create new dispatch instances here really - we return THIS as result to handle it at the same implementation. */ css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispatch( const css::util::URL& aURL , @@ -124,7 +124,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv /** @short dispatch URL with arguments @descr We use threadsafe internal method to do so. It returns a state value - but we ignore it. - Because we doesn't support status listener notifications here. + Because we don't support status listener notifications here. @param aURL uno URL which should be executed diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index b9c7965059d5..04124b03025f 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -59,7 +59,7 @@ FrameListAnalyzer::~FrameListAnalyzer() We try to get a snapshot of all opened frames, which are part of the desktop frame container. Of course we can't access frames, which stands outside of this tree. - But it's neccessary to collect top frames here only. Otherwhise we interpret closing of last + But it's necessary to collect top frames here only. Otherwhise 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. These frames must be closed then. But all other frames must be untouched. @@ -107,7 +107,7 @@ void FrameListAnalyzer::impl_analyze() } // check, if the reference frame is in hidden mode. - // But look, if this analyze step is realy needed. + // But look, if this analyze step is really needed. css::uno::Reference< css::beans::XPropertySet > xSet(m_xReferenceFrame, css::uno::UNO_QUERY); if ( ((m_eDetectMode & E_HIDDEN) == E_HIDDEN) && @@ -118,7 +118,7 @@ void FrameListAnalyzer::impl_analyze() } // check, if the reference frame includes the backing component. - // But look, if this analyze step is realy needed. + // But look, if this analyze step is really needed. if (((m_eDetectMode & E_BACKINGCOMPONENT) == E_BACKINGCOMPONENT) && m_xReferenceFrame.is() ) { try @@ -138,7 +138,7 @@ void FrameListAnalyzer::impl_analyze() } // check, if the reference frame includes the help module. - // But look, if this analyze step is realy needed. + // But look, if this analyze step is really needed. if ( ((m_eDetectMode & E_HELP) == E_HELP ) && (m_xReferenceFrame.is() ) && @@ -257,7 +257,7 @@ void FrameListAnalyzer::impl_analyze() catch (const css::lang::IndexOutOfBoundsException&) { // stop copying if index seams to be wrong. - // This interface can't realy guarantee its count for multithreaded + // This interface can't really guarantee its count for multithreaded // environments. So it can occur! } diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index b7f56a1ea6de..753f40c5f923 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -549,7 +549,7 @@ void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle) const OUString sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, OUString()); // An UIname property is an optional value ! - // So please add it to the title in case it does realy exists only. + // So please add it to the title in case it does really exists only. if (!sUIName.isEmpty()) { sTitle.appendAscii (" " ); diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index f1e782dd8560..e558cd64a670 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -65,7 +65,7 @@ PatternHash::iterator PatternHash::findPatternKey( const OUString& sURL ) /** @short initialize static member of class HandlerCache @descr We use a singleton pattern to implement this handler cache. - That means it use two static member list to hold all neccessary information + That means it use two static member list to hold all necessary information and a ref count mechanism to create/destroy it on demand. */ HandlerHash* HandlerCache::m_pHandler = NULL; @@ -148,7 +148,7 @@ sal_Bool HandlerCache::search( const OUString& sURL, ProtocolHandler* pReturn ) /** @short search for a registered handler by using an URL struct - @descr We combine neccessary parts of this struct to a valid URL string + @descr We combine necessary parts of this struct to a valid URL string and call our other search method ... It's a helper for outside code. */ diff --git a/framework/source/fwi/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx index 0a05c66b0011..8a7edefc8233 100644 --- a/framework/source/fwi/threadhelp/lockhelper.cxx +++ b/framework/source/fwi/threadhelp/lockhelper.cxx @@ -93,7 +93,7 @@ LockHelper::~LockHelper() we must simulate it as a write access! @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method acquireWriteAccess() @@ -115,7 +115,7 @@ void LockHelper::acquire() we must simulate it as a write access! @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method releaseWriteAccess() @@ -136,7 +136,7 @@ void LockHelper::release() Writing isn't allowed then - but nobody could check it for you! @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method releaseReadAccess() @@ -156,7 +156,7 @@ void LockHelper::acquireReadAccess() @descr A guard should call this method to release read access on your member. @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method acquireReadAccess() @@ -178,7 +178,7 @@ void LockHelper::releaseReadAccess() After successfully calling of this method you are the only writer. @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method releaseWriteAccess() @@ -198,7 +198,7 @@ void LockHelper::acquireWriteAccess() @descr A guard should call this method to release write access on your member. @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method acquireWriteAccess() @@ -223,10 +223,10 @@ void LockHelper::releaseWriteAccess() @attention a) Don't call this method if you are not a writer! Results are not defined then ... - An upgrade can't be implemented realy ... because acquiring new access + An upgrade can't be implemented really ... because acquiring new access will be the same - there no differences! b) Without function ... - because, a mutex don't support it realy. + because, a mutex don't support it really. @seealso - diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index d34e79fc492c..1772515531bd 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -65,7 +65,7 @@ TransactionManager::~TransactionManager() @short set new working mode @descr These implementation knows for states of working: E_INIT, E_WORK, E_CLOSING, E_CLOSE You can step during this ones only from the left to the right side and start at left side again! - (This is neccessary e.g. for refcounted objects!) + (This is necessary e.g. for refcounted objects!) This call will block till all current existing transactions was finished. Following results can occur: E_INIT : All requests on this implementation are refused. diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 08619ba3fc9c..6f9746046d9f 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -251,7 +251,7 @@ void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIn else { // Our stack is empty. No further child exists. - // Se we must "end" our progress realy + // Se we must "end" our progress really if (xProgress.is()) xProgress->end(); // Now hide the progress bar again. diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index aa7e0dea9829..93388d304f34 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -202,7 +202,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase, //--------------------------------------- /** @short return the current office locale. - @descr We does not cache this value, because we are not listen + @descr We do not cache this value, because we are not listen for changes on the configuration layer ... @return OUString @@ -421,7 +421,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase, //--------------------------------------- /** @short return the current office locale. - @descr We does not cache this value, because we are not listen + @descr We do not cache this value, because we are not listen for changes on the configuration layer ... @return OUString diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 8d8ef71a04a8..d73816af181b 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -134,7 +134,7 @@ class KeyMapping if this method returns sal_True! @return [boolean] - sal_True if convertion was successfully. + sal_True if conversion was successfully. */ sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier, sal_uInt16& rCode ); diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index e7d67bb717ba..ef8c28af6dcb 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -392,12 +392,12 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas sal_Bool bCreateIfMissing); //--------------------------------------- - /** @short do anything which is neccessary to flush all changes + /** @short do anything which is necessary to flush all changes back to disk. @descr We have to call commit on all cached sub storages on the path from the root storage upside down to the working storage - (which are not realy used, but required to be holded alive!). + (which are not really used, but required to be holded alive!). */ void commitUserChanges(); diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index a87ea8c010e2..10e41090c58d 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -64,7 +64,7 @@ class LoadDispatcher : private ThreadHelpBase public: - /** @short creates a new instance and initialize it with all neccessary parameters. + /** @short creates a new instance and initialize it with all necessary parameters. @descr Every instance of such LoadDispatcher can be used for the specified context only. That means: It can be used to load any further requested content into tzhe here(!) diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index a2f258ec9b2a..dadef232243d 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -264,7 +264,7 @@ public: passing this information to this LoadEnv instance can supress this might expensive check. That can be useful in case this information is needed outside too, - to decide if its neccessary to create some resources for this load + to decide if its necessary to create some resources for this load request ... or to reject the request imidiatly if it seems to be not loadable in general. @@ -536,7 +536,7 @@ private: @descr Note: Showing of a frame is bound to a special feature ... a) If we recycle any existing frame, we must bring it to front. - Showing of such frame isnt needed realy .. because we recycle + Showing of such frame isnt needed really .. because we recycle visible frames only! b) If the document was already shown (e.g. by our progress implementation) we do nothing here. The reason behind: The document was already shown .. diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 3cca5061f4f5..9493589509f8 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -107,7 +107,7 @@ static ::sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xW if (xTopWindowCheck.is()) { // Note: Toolkit interface XTopWindow sometimes is used by real VCL-child-windows also .-) - // Be sure that these window is realy a "top system window". + // Be sure that these window is really a "top system window". // Attention ! Checking Window->GetParent() isnt the right approach here. // Because sometimes VCL create "implicit border windows" as parents even we created // a simple XWindow using the toolkit only .-( diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index 18ea4ff53d7f..2d0bc573ddc8 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -382,7 +382,7 @@ css::uno::Sequence< css::beans::NamedValue > Job::impl_generateJobArgs( /*IN*/ c } // get the configuration data from the job data container ... if possible - // Means: if this job has any configuration data. Note: only realy + // Means: if this job has any configuration data. Note: only really // filled lists will be set to the return structure at the end of this method. css::uno::Sequence< css::beans::NamedValue > lConfigArgs ; css::uno::Sequence< css::beans::NamedValue > lJobConfigArgs; @@ -737,7 +737,7 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) thro Then we had not throwed a veto exception. But now we must agree with this situation and break all our internal processes. Its not a good idea to mark this instance as non startable any longer inside queryTermination() if no job was unning too. Because that would disable this job and may - the office does not realy shutdownm, because another listener has thrown the suitable exception. + the office does not really shutdownm, because another listener has thrown the suitable exception. @param aEvent describes the broadcaster and must be the desktop instance diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index 3fb1b958baf9..3d7972955a06 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -67,7 +67,7 @@ const sal_Char* JobData::PROP_CONTEXT = "Context" /** @short standard ctor @descr It initialize this new instance. - But for real working it's neccessary to call setAlias() or setService() later. + But for real working it's necessary to call setAlias() or setService() later. Because we need the job data ... @param rxContext @@ -138,7 +138,7 @@ JobData::~JobData() //________________________________ /** @short initalize this instance as a job with configuration - @descr They given alias can be used to address some configuraton data. + @descr They given alias can be used to address some configuration data. We read it and fill our internal structures. Of course old information will be lost doing so. @@ -482,7 +482,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 - directly - an executed job must not have any configuration realy. Such jobs + 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 if such request is valid or not then. @@ -704,7 +704,7 @@ css::uno::Sequence< OUString > JobData::getEnabledJobsForEvent( const css::uno:: But note: that does not set defaults for internal used members, which does not relate to any job property! e.g. the reference to the global uno service manager. Such information is used for internal processes only - and are neccessary for our work. + and are necessary for our work. */ void JobData::impl_reset() { diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index b8f50508dbf0..4b069d93407a 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -251,7 +251,7 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const OUString& // no jobs ... no execution // But a may given listener will know something ... // I think this operaton was finished successfully. - // It's not realy an error, if no registered jobs could be located. + // It's not really an error, if no registered jobs could be located. // Step over all found jobs and execute it int nExecutedJobs=0; for (int j=0; j<lJobs.getLength(); ++j) diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 5c45ca9ab4fa..d972326bf714 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -60,7 +60,7 @@ JobResult::JobResult() <br> The returned list of (for this generic implementation unknown!) properties, will be written directly to the configuration and replace - any old values there. There will no check for changes and we doesn't + any old values there. There will no check for changes and we don't support any mege feature here. They are written only. The job has to modify this list. </li> @@ -151,7 +151,7 @@ JobResult::JobResult( const JobResult& rCopy ) */ JobResult::~JobResult() { - // Nothing realy to do here. + // Nothing really to do here. } //________________________________ @@ -179,7 +179,7 @@ void JobResult::operator=( const JobResult& rCopy ) /** @short checks for existing parts of the analyzed result @descr The internal flag mask was set after analyzing of the pure result. - An user of us can check here, if the required part was realy part + An user of us can check here, if the required part was really part of this result. Otherwhise it would use invalid information ... by using our other members! diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx index b87ed7469bd4..fe46e6075be7 100644 --- a/framework/source/loadenv/targethelper.cxx +++ b/framework/source/loadenv/targethelper.cxx @@ -59,8 +59,8 @@ sal_Bool TargetHelper::matchSpecialTarget(const OUString& sCheckTarget , sal_Bool TargetHelper::isValidNameForFrame(const OUString& sName) { - // some special targets are realy special ones :-) - // E.g. the are realy used to locate one frame inside the frame tree. + // some special targets are really special ones :-) + // E.g. the are really used to locate one frame inside the frame tree. if ( (sName.isEmpty() ) || (TargetHelper::matchSpecialTarget(sName, E_HELPTASK)) || diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index 2f6e65d4c920..f2e4a25fdeac 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -53,7 +53,7 @@ DEFINE_INIT_SERVICE( /** @short standard constructor to create instance @descr Because an instance will be initialized by her interface methods - it's not neccessary to do anything here. + it's not necessary to do anything here. */ DispatchRecorderSupplier::DispatchRecorderSupplier( const css::uno::Reference< css::lang::XMultiServiceFactory >& ) // init baseclasses first! @@ -67,7 +67,7 @@ DispatchRecorderSupplier::DispatchRecorderSupplier( const css::uno::Reference< c //_____________________________________________________________________________ /** @short standard destructor - @descr We are a helper and not a real service. So we doesn't provide + @descr We are a helper and not a real service. So we don't provide dispose() functionality. This supplier dies by ref count mechanism and should release all internal used ones too. */ diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 75595d96d21b..fef85c4b985a 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -774,7 +774,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent /* document saved as copy => mark it as "non used by concurrent save operation". so we can try to create a backup copy if next time AutoSave is started too. Dont remove temp. files or change the modified state of the document! - It was not realy saved to the original file ... + It was not really saved to the original file ... */ else if ( aEvent.EventName == EVENT_ON_SAVETODONE ) { @@ -937,7 +937,7 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf catch(const css::uno::Exception&) { // These config keys are not sooooo important, that - // we are interested on errors here realy .-) + // we are interested on errors here really .-) nMinSpaceDocSave = MIN_DISCSPACE_DOCSAVE; nMinSpaceConfigSave = MIN_DISCSPACE_CONFIGSAVE; } @@ -1697,7 +1697,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame implts_specifyAppModuleAndFactory(aNew); // Hack! Check for "illegal office documents" ... as e.g. the Basic IDE - // Its not realy a full featured office document. It doesn't provide an URL, any filter, a factory URL etcpp. + // Its not really a full featured office document. It doesn't provide an URL, any filter, a factory URL etcpp. // TODO file bug to Basci IDE developers. They must remove the office document API from its service. if ( (aNew.OrgURL.isEmpty()) && @@ -2754,7 +2754,7 @@ void AutoRecovery::implts_generateNewTempURL(const OUString& sBack // This unique name must solve an optimization problem too! // In case we are asked to save unmodified documents too - and one of them // is an empty one (because it was new created using e.g. an URL private:factory/...) - // we should not save it realy. Then we put the information about such "empty document" + // we should not save it really. Then we put the information about such "empty document" // into the configuration and dont create any recovery file on disk. // We use the title of the document to make it unique. OUStringBuffer sUniqueName; @@ -2936,7 +2936,7 @@ void AutoRecovery::implts_resetHandleStates(sal_Bool /*bLoadCache*/) //----------------------------------------------- void AutoRecovery::implts_prepareEmergencySave() { - // Be sure to know all open documents realy .-) + // Be sure to know all open documents really .-) implts_verifyCacheAgainstDesktopDocumentList(); // hide all docs, so the user cant disturb our emergency save .-) @@ -3024,7 +3024,7 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionSave()"); - // Be sure to know all open documents realy .-) + // Be sure to know all open documents really .-) implts_verifyCacheAgainstDesktopDocumentList(); // for all docs, store their current view/names in the configurtion diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 324bd73f1171..2ab1d3a7dcfd 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -347,7 +347,7 @@ sal_Bool SAL_CALL Desktop::terminate() if ( xPipeTerminator.is() ) xPipeTerminator->notifyTermination( aEvent ); - // Must be realy the last listener to be called. + // Must be really the last listener to be called. // Because it shutdown the whole process asynchronous ! if ( xSfxTerminator.is() ) xSfxTerminator->notifyTermination( aEvent ); @@ -728,7 +728,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desk @short supports registration/deregistration of interception objects, which are interested on special dispatches. - @descr Its realy provided by an internal helper, which is used inside the dispatch api too. + @descr Its really provided by an internal helper, which is used inside the dispatch api too. @param xInterceptor the interceptor object, which wish to be (de)registered. @@ -980,7 +980,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS //----------------------------------------------------------------------------------------------------- // 0) Ignore wrong parameter! - // We doesn't support search for following special targets. + // We don't support search for following special targets. // If we reject this requests - we mustnt check for such names // in following code again and again. If we do not so -wrong // search results can occur! @@ -1001,7 +1001,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS // force using of "if() else if() ..." //----------------------------------------------------------------------------------------------------- - // get threadsafe some necessary member which are neccessary for following functionality + // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ ReadGuard aReadLock( m_aLock ); css::uno::Reference< css::uno::XComponentContext> xContext = m_xContext; @@ -1051,7 +1051,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS // But note: Such flags are not valid for the desktop - especialy SIBLINGS or PARENT. //------------------------------------------------------------------------------------------------- - // get threadsafe some necessary member which are neccessary for following functionality + // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ aReadLock.lock(); OUString sOwnName = m_sName; @@ -1077,7 +1077,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS // But the desktop exists outside such task trees. They are our sub trees. So the desktop implement // a special feature: We use it to start search on our direct children only. That means we supress // search on ALL child frames. May that can be useful to get access on opened document tasks - // only without filter out all non realy required sub frames ... + // only without filter out all non really required sub frames ... // Used helper method on our container doesn't create any frame - it's a search only. //------------------------------------------------------------------------------------------------- if ( @@ -1135,7 +1135,7 @@ void SAL_CALL Desktop::dispose() WriteGuard aWriteLock( m_aLock ); // start synchronize // Look for multiple calls of this method! - // If somewhere call dispose() twice - he will be stopped here realy!!! + // If somewhere call dispose() twice - he will be stopped here really!!! TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); // Now - we are alone and its the first call of this method ... @@ -1199,7 +1199,7 @@ void SAL_CALL Desktop::dispose() about our dieing! You must releas ethis listener reference during your own disposing() method. - @attention Our container is threadsafe himeslf. So we doesn't need any lock here. + @attention Our container is threadsafe himeslf. So we don't need any lock here. @seealso - @@ -1275,7 +1275,7 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& /*-************************************************************************************************************//** @interface XEventListener @short not implemented! - @descr We are a status listener ... and so we must be an event listener too ... But we doesn't need it realy! + @descr We are a status listener ... and so we must be an event listener too ... But we don't need it really! We are a temp. listener only and our lifetime isn't smaller then of our temp. used dispatcher. @seealso method loadComponentFromURL() @@ -1382,7 +1382,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio /* SAFE AREA ------------------------------------------------------------------------------------------- */ // Ok now it's time to break yield loop of loadComponentFromURL(). - // But only for realy aborted requests! + // But only for really aborted requests! // For example warnings will be approved and we wait for any success story ... if (bAbort) { @@ -1435,7 +1435,7 @@ OUString SAL_CALL Desktop::getUntitledPrefix() Don't use this directly! You must try to convert the value of given DESKTOP_PROPHANDLE and return results of this operation. This will be used to ask vetoable - listener. If no listener has a veto, we will change value realy! + listener. If no listener has a veto, we will change value really! ( in method setFastPropertyValue_NoBroadcast(...) ) @attention Methods of OPropertySethelper are safed by using our shared osl mutex! (see ctor!) @@ -1667,7 +1667,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropert then we try to become his component. It can be a VCL-component, the model or the controller of founded frame. - @attention We don't work on internal member ... so we doesn't need any lock here. + @attention We don't work on internal member ... so we don't need any lock here. @seealso method getCurrentComponent(); diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 8975463fc449..7cbc89195f27 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -740,7 +740,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr //----------------------------------------------------------------------------------------------------- // 0) Ignore wrong parameter! - // We doesn't support search for following special targets. + // We don't support search for following special targets. // If we reject this requests - we mustnt check for such names // in following code again and again. If we do not so -wrong // search results can occur! @@ -758,7 +758,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr // force using of "if() else if() ..." //----------------------------------------------------------------------------------------------------- - // get threadsafe some necessary member which are neccessary for following functionality + // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ ReadGuard aReadLock( m_aLock ); css::uno::Reference< css::frame::XFrame > xParent ( m_xParent, css::uno::UNO_QUERY ); @@ -850,7 +850,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr // TASK and CREATE are handled special. //------------------------------------------------------------------------------------------------- - // get threadsafe some necessary member which are neccessary for following functionality + // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ aReadLock.lock(); OUString sOwnName = m_sName; @@ -906,7 +906,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr // In such case we must protect us against recursive calls. // Use snapshot of our parent. But don't use queryFrames() of XFrames interface. // Because it's return all siblings and all her children including our children too - // if we call it with the CHILDREN flag. We doesn't need that - we need the direct container + // if we call it with the CHILDREN flag. We don't need that - we need the direct container // items of our parent only to start searches there. So we must use the container interface // XIndexAccess instead of XFrames. //------------------------------------------------------------------------------------------------- @@ -1655,7 +1655,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close void SAL_CALL Frame::addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - // We doesn't need any lock here ... + // We don't need any lock here ... // Container lives if we live and is threadsafe by himself. m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >* ) NULL ), xListener ); } @@ -1665,7 +1665,7 @@ void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util:: { // Use soft exception mode - moslty this method is called during disposing of this frame ... TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS ); - // We doesn't need any lock here ... + // We don't need any lock here ... // Container lives if we live and is threadsafe by himself. m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >* ) NULL ), xListener ); } @@ -1868,7 +1868,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException ) // should exist. Otherwhise it's the problem of the outside caller. // Note: // (a) Do it after stopWindowListening(). May that force some active/deactive - // notifications which we doesn't need here realy. + // notifications which we don't need here really. // (b) Don't forget to save the old value of IsDialogCancelEnabled() to // restore it afterwards (to not kill headless mode). Application::DialogCancelMode old = Application::GetDialogCancelMode(); @@ -1946,7 +1946,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException ) m_bSelfClose = sal_False; m_bIsHidden = sal_True; - // Disable this instance for further working realy! + // Disable this instance for further working really! m_aTransactionManager.setWorkingMode( E_CLOSE ); // Don't forget it restore old value - @@ -2348,7 +2348,7 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css:: /*-****************************************************************************************************//** @short react for a show event for the internal container window - @descr Normaly we doesn't need this information realy. But we can use it to + @descr Normaly we don't need this information really. But we can use it to implement the special feature "trigger first visible task". Algorithm: - first we have to check if we are a top (task) frame @@ -2902,7 +2902,7 @@ void Frame::implts_setIconOnWindow() @short helper to start/stop listeneing for window events on container window @descr If we get a new container window, we must set it on internal member ... and stop listening at old one ... and start listening on new one! - But sometimes (in dispose() call!) it's neccessary to stop listeneing without starting + But sometimes (in dispose() call!) it's necessary to stop listeneing without starting on new connections. So we split this functionality to make it easier at use. @seealso method initialize() diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 15fb3c05e89f..e4e2a5603a13 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -292,7 +292,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) sal_Bool bFinalized = ((aInfo.Attributes & css::beans::PropertyAttribute::READONLY ) == css::beans::PropertyAttribute::READONLY ); // Note: Till we support finalized / mandatory on our API more in detail we handle - // all states simple as READONLY ! But because all realy needed paths are "mandatory" by default + // all states simple as READONLY ! But because all really needed paths are "mandatory" by default // we have to handle "finalized" as the real "readonly" indicator . aPathVal.bIsReadonly = bFinalized; } @@ -332,7 +332,7 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) // remove the whole path from the old configuration ! // Otherwise we cant make sure that the diff between new and old configuration - // on loading time realy represent an user setting !!! + // on loading time really represent an user setting !!! // Check if the given path exists inside the old configuration. // Because our new configuration knows more then the list of old paths ... ! diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index e81b25dd6e83..6ce88a996e63 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -194,7 +194,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai // get toolkit to create task container window css::uno::Reference< css::awt::XToolkit2 > xToolkit = css::awt::Toolkit::create( xContext ); - // Check if child frames can be created realy. We need at least a valid window at the parent frame ... + // Check if child frames can be created really. We need at least a valid window at the parent frame ... css::uno::Reference< css::awt::XWindowPeer > xParentWindowPeer; if ( ! bTopWindow) { diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index be0a75d6e0dd..7a687814e36d 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -236,14 +236,14 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup // for aCmd_Dialog and aCmd_Language sal_Int16 nItemId = 1; // in this control the item id is not important for executing the command - const OUString sAsterix("*"); // multiple languages in current selection + const OUString sAsterisk("*"); // multiple languages in current selection const OUString sEmpty; // 'no language found' from language guessing std::set< OUString >::const_iterator it; for (it = aLangItems.begin(); it != aLangItems.end(); ++it) { const OUString & rStr( *it ); if (rStr != aLanguageTable.GetString( LANGUAGE_NONE ) && - rStr != sAsterix && + rStr != sAsterisk && rStr != sEmpty) { pPopupMenu->InsertItem( nItemId, rStr ); diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index b682c1865880..5a1fe2524442 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -122,7 +122,7 @@ throw (::com::sun::star::uno::RuntimeException) // add first few entries to main menu sal_Int16 nItemId = static_cast< sal_Int16 >(MID_LANG_SEL_1); - const OUString sAsterix("*"); // multiple languages in current selection + const OUString sAsterisk("*"); // multiple languages in current selection const OUString sEmpty; // 'no language found' from language guessing std::map< sal_Int16, OUString > aLangMap; std::set< OUString >::const_iterator it; @@ -130,7 +130,7 @@ throw (::com::sun::star::uno::RuntimeException) { const OUString & rStr( *it ); if ( rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) ) && - rStr != sAsterix && + rStr != sAsterisk && rStr != sEmpty) { DBG_ASSERT( MID_LANG_SEL_1 <= nItemId && nItemId <= MID_LANG_SEL_9, @@ -158,7 +158,7 @@ throw (::com::sun::star::uno::RuntimeException) { const OUString & rStr( *it ); if( rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) )&& - rStr != sAsterix && + rStr != sAsterisk && rStr != sEmpty) { DBG_ASSERT( MID_LANG_PARA_1 <= nItemId && nItemId <= MID_LANG_PARA_9, diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 2040fea5e209..9e1f5a46050c 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -164,7 +164,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& m_rContainer.setKeyCommandPair(aEvent, sCommand); else { - // Attention: Its not realy a reason to throw an exception and kill the office, if the configuration contains + // Attention: Its not really a reason to throw an exception and kill the office, if the configuration contains // multiple registrations for the same key :-) Show a warning ... and ignore the second item. // THROW_PARSEEXCEPTION("Command is registered for the same key more then once.") SAL_INFO("fwk", |