diff options
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/accelerators/keymapping.cxx | 2 | ||||
| -rw-r--r-- | framework/source/accelerators/presethandler.cxx | 2 | ||||
| -rw-r--r-- | framework/source/dispatch/closedispatcher.cxx | 2 | ||||
| -rw-r--r-- | framework/source/dispatch/dispatchprovider.cxx | 8 | ||||
| -rw-r--r-- | framework/source/fwe/dispatch/interaction.cxx | 2 | ||||
| -rw-r--r-- | framework/source/fwi/jobs/configaccess.cxx | 2 | ||||
| -rw-r--r-- | framework/source/fwi/threadhelp/transactionmanager.cxx | 2 | ||||
| -rw-r--r-- | framework/source/helper/ocomponentenumeration.cxx | 4 | ||||
| -rw-r--r-- | framework/source/helper/oframes.cxx | 2 | ||||
| -rw-r--r-- | framework/source/inc/accelerators/presethandler.hxx | 4 | ||||
| -rw-r--r-- | framework/source/inc/loadenv/loadenv.hxx | 2 | ||||
| -rw-r--r-- | framework/source/jobs/job.cxx | 2 | ||||
| -rw-r--r-- | framework/source/recording/dispatchrecordersupplier.cxx | 2 | ||||
| -rw-r--r-- | framework/source/services/autorecovery.cxx | 20 | ||||
| -rw-r--r-- | framework/source/services/desktop.cxx | 8 | ||||
| -rw-r--r-- | framework/source/services/frame.cxx | 4 |
16 files changed, 34 insertions, 34 deletions
diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index c07231bf2fbd..188609b8eb87 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -197,7 +197,7 @@ bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdent return true; } - // 0 is normaly an error of the called method toInt32() ... + // 0 is normally an error of the called method toInt32() ... // But we must be aware, that the identifier is "0"! rCode = 0; return sIdentifier == "0"; diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index d7548c40760e..0a200e3571aa 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -445,7 +445,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType xShare = impl_openLocalizedPathIgnoringErrors(sLocalizedSharePath, eShareMode, true , aShareLocale, bAllowFallbacks); // The try to locate the right sub dir inside user layer ... without using fallbacks! - // Normaly the corresponding sub dir should be created matching the specified locale. + // Normally the corresponding sub dir should be created matching the specified locale. // Because we allow creation of storages inside user layer by default. OUString aUserLocale( rLanguageTag.getBcp47()); OUString sLocalizedUserPath(sRelPathUser); diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 305e5ed087d4..dda9c32a37f0 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -486,7 +486,7 @@ bool CloseDispatcher::implts_closeFrame() return true; // dont deliver owner ship; our "UI user" will try it again if it failed. - // OK - he will get an empty frame then. But normaly an empty frame + // OK - he will get an empty frame then. But normally an empty frame // should be closeable always :-) if (!fpf::closeIt(xFrame, false)) return false; diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 5de428aa53b5..e46d6fb2c47d 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -181,7 +181,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt // I.I) "_blank" // It's not the right place to create a new task here - because we are queried for a dispatch object // only, which can handle such request. Such dispatcher should create the required task on demand. - // Normaly the functionality for "_blank" is provided by findFrame() - but that would create it directly + // Normally the functionality for "_blank" is provided by findFrame() - but that would create it directly // here. Thats why we must "intercept" here. if (sTargetFrameName==SPECIALTARGET_BLANK) @@ -204,7 +204,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt // I.III) "_self", "", "_top" // The desktop can't load any document - but he can handle some special protocols like "uno", "slot" ... - // Why is "top" here handled too? Because the desktop is the topest frame. Normaly it's superflous + // Why is "top" here handled too? Because the desktop is the topest frame. Normally it's superflous // to use this target - but we can handle it in the same manner then "_self". else if ( @@ -258,7 +258,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame // I.I) "_blank", "_default" // It's not the right place to create a new task here. Only the desktop can do that. - // Normaly the functionality for "_blank" is provided by findFrame() - but that would create it directly + // Normally the functionality for "_blank" is provided by findFrame() - but that would create it directly // here. Thats why we must "intercept" here. if ( @@ -327,7 +327,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame else { css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY ); - // Normaly if isTop() returned sal_False ... the parent frame MUST(!) exist ... + // Normally if isTop() returned sal_False ... the parent frame MUST(!) exist ... // But it seems to be better to check that here to prevent us against an access violation. if (xParent.is()) xDispatcher = xParent->queryDispatch(aURL, SPECIALTARGET_TOP, 0); diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index 3f06725c5b8b..49acb01909da 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -32,7 +32,7 @@ namespace framework{ code user of interaction. @attention This implementation could be used one times only. We don't support a resetable continuation yet! - Why? Normaly interaction should show a filter selection dialog and ask user for his decision. + 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. diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx index e7ba8180369e..bacc8c15b1f8 100644 --- a/framework/source/fwi/jobs/configaccess.cxx +++ b/framework/source/fwi/jobs/configaccess.cxx @@ -55,7 +55,7 @@ ConfigAccess::ConfigAccess( /*IN*/ const css::uno::Reference< css::uno::XCompone /** @short last chance to close an open configuration access point @descr In case our user forgot to close this configuration point - in the right way, normaly he will run into some trouble - + in the right way, normally he will run into some trouble - e.g. losing data. */ ConfigAccess::~ConfigAccess() diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index 521f168c3a18..784266adb039 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -256,7 +256,7 @@ void TransactionManager::impl_throwExceptions( EExceptionMode eMode, ERejectReas // Help programmer to find out, why this exception is thrown! SAL_WARN( "fwk", "TransactionManager...: Owner instance not correctly initialized yet. Call was rejected! Normally it's an algorithm error ... wrong use of class!" ); //ATTENTION: temp. disabled - till all bad code positions are detected and changed! */ - // throw css::uno::RuntimeException( "TransactionManager...\nOwner instance not right initialized yet. Call was rejected! Normaly it's an algorithm error ... wrong usin of class!\n", css::uno::Reference< css::uno::XInterface >() ); + // throw css::uno::RuntimeException( "TransactionManager...\nOwner instance not right initialized yet. Call was rejected! Normally it's an algorithm error ... wrong usin of class!\n", css::uno::Reference< css::uno::XInterface >() ); } break; case E_INCLOSE : if( eMode == E_HARDEXCEPTIONS ) diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index c54a6a800ffe..0fe7cd2f9681 100644 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -103,12 +103,12 @@ void OComponentEnumeration::impl_resetObject() // Attention: // Write this for multiple calls - NOT AT THE SAME TIME - but for more than one call again)! // It exist two ways to call this method. From destructor and from disposing(). - // I can't say, which one is the first. Normaly the disposing-call - but other way .... + // I can't say, which one is the first. Normally the disposing-call - but other way .... // Delete list of components. m_seqComponents.realloc( 0 ); // Reset position in list. - // The list has no elements anymore. m_nPosition is normaly the current position in list for nextElement! + // The list has no elements anymore. m_nPosition is normally the current position in list for nextElement! // But a position of 0 in a list of 0 items is an invalid state. This constellation can't work in future. // End of enumeration is arrived! // (see hasMoreElements() for more details...) diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 16a8a4293f80..e79593a77fe5 100644 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -288,7 +288,7 @@ void OFrames::impl_resetObject() // Attention: // Write this for multiple calls - NOT AT THE SAME TIME - but for more than one call again)! // It exist two ways to call this method. From destructor and from disposing(). - // I can't say, which one is the first. Normaly the disposing-call - but other way .... + // I can't say, which one is the first. Normally the disposing-call - but other way .... // This instance can't work if the weakreference to owner is invalid! // Destroy this to reset this object. diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 156588b68be4..f34be57f2569 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -341,7 +341,7 @@ class PresetHandler and return it. @descr Note: Targets resist inside the user - layer. Normaly they are opened in read/write mode. + layer. Normally they are opened in read/write mode. But it will be opened readonly automatically if that isn't possible (may be the file is write protected on the system ...). @@ -397,7 +397,7 @@ class PresetHandler /** @short try to find the specified locale inside list of possible ones. @descr The lits of possible locale values was e.g. retrieved from the system - (configuration, directory listing etcpp). The locale normaly represent + (configuration, directory listing etcpp). The locale normally represent the current office locale. This method search for a suitable item by using different algorithm. a) exact search diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index f26ff7afef64..7963ac2d1783 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -167,7 +167,7 @@ private: /** @short it indicates, that the old document (which was located inside m_xBaseFrame in combination with the m_sTarget value "_self") was suspended. - Normaly it will be replaced by the new loaded document. But in case + Normally it will be replaced by the new loaded document. But in case loading (not handling!) failed, it must be reactivated. The default value is sal_False! */ diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index 8c38a3e6ad61..28f9e79c1638 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -794,7 +794,7 @@ void SAL_CALL Job::notifyClosing( const css::lang::EventObject& ) throw(css::uno } /** - @short shouldn't be called normaly + @short shouldn't be called normally @descr But it doesn't matter, who called it. We have to kill our internal running processes hardly. diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index 41bebab56b51..848959392c28 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -92,7 +92,7 @@ void SAL_CALL DispatchRecorderSupplier::setDispatchRecorder( const css::uno::Ref /** @short provides access to the dispatch recorder of this supplier @descr Such recorder can be used outside to record dispatches. - But normaly he is used internally only. Of course he must used + But normally he is used internally only. Of course he must used from outside to get the recorded data e.g. for saving it as a script. diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index ac688850b946..8efe331da265 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -128,7 +128,7 @@ public: /** @short can be set from outside and is provided to our internal started operations. - @descr Normaly we use the normal status indicator + @descr Normally we use the normal status indicator of the document windows to show a progress. But in case we are used by any special UI, it can provide its own status indicator object @@ -1739,7 +1739,7 @@ void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent) } // dispose from one of our cached documents ? - // Normaly they should send a OnUnload message ... + // Normally they should send a OnUnload message ... // But some stacktraces shows another possible use case .-) css::uno::Reference< css::frame::XModel > xDocument(aEvent.Source, css::uno::UNO_QUERY); if (xDocument.is()) @@ -2341,7 +2341,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) // The timer must be ignored if AutoSave/Recovery was disabled for this // office session. That can happen if e.g. the command line arguments "--norestore" or "--headless" - // was set. But normaly the timer was disabled if recovery was disabled ... + // was set. But normally the timer was disabled if recovery was disabled ... // But so we are more "safe" .-) /* SAFE */ { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -2458,7 +2458,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame AutoRecovery::TDocumentList::iterator pIt = AutoRecovery::impl_searchDocument(m_lDocCache, xDocument); if (pIt != m_lDocCache.end()) { - // Normaly nothing must be done for this "late" notification. + // Normally nothing must be done for this "late" notification. // But may be the modified state was changed inbetween. // Check it ... implts_updateModifiedState(xDocument); @@ -2871,7 +2871,7 @@ void AutoRecovery::implts_prepareSessionShutdown() #i64599# - Normaly the MediaDescriptor argument NoAutoSave indicates, + Normally the MediaDescriptor argument NoAutoSave indicates, that a document must be ignored for AutoSave and Recovery. But sometimes XModel->getArgs() does not contained this information if implts_registerDocument() was called. @@ -2976,7 +2976,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( bool bAllow // save it after all other documents was saved successfully. That decrease // the chance for a crash inside a crash. // On the other side it's not necessary for documents, which are not modified. - // They can be handled normaly - means we patch the corresponding configuration entry only. + // They can be handled normally - means we patch the corresponding configuration entry only. // iii) For a SessionSave ... ignore it! There is no time to wait for this save operation. // Because the WindowManager will kill the process if it doesn't react immediately. // On the other side we can't risk a concurrent save request ... because we know @@ -3383,7 +3383,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa implts_informListener(eJob, AutoRecovery::implst_createFeatureStateEvent(eJob, OPERATION_UPDATE, &rInfo)); - /* Normaly we listen as XModifyListener on a document to know if a document was changed + /* Normally we listen as XModifyListener on a document to know if a document was changed since our last AutoSave. And we deregister us in case we know this state. But directly after one document as recovered ... we must start listening. Otherwhise the first "modify" doesn't reach us. Because we ourself called setModified() @@ -3730,7 +3730,7 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) // The called method for saving documents runs // during normal AutoSave more than once. Because // it postpone active documents and save it later. - // That is normaly done by recalling it from a timer. + // That is normally done by recalling it from a timer. // Here we must do it immediately! // Of course this method returns the right state - // because it knows, that we are running in ERMERGENCY SAVE mode .-) @@ -3798,7 +3798,7 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) // The called method for saving documents runs // during normal AutoSave more than once. Because // it postpone active documents and save it later. - // That is normaly done by recalling it from a timer. + // That is normally done by recalling it from a timer. // Here we must do it immediately! // Of course this method returns the right state - // because it knows, that we are running in SESSION SAVE mode .-) @@ -4239,7 +4239,7 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& utl::MediaDescriptor::PROP_STATUSINDICATOR(), css::uno::Reference< css::task::XStatusIndicator >() ); - // Normaly a progress is set from outside (e.g. by the CrashSave/Recovery dialog, which uses our dispatch API). + // Normally a progress is set from outside (e.g. by the CrashSave/Recovery dialog, which uses our dispatch API). // But for a normal auto save we dont have such "external progress"... because this function is triggered by our own timer then. // In such case we must create our own progress ! if ( diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 9b59140bd965..bde7706c825f 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -578,7 +578,7 @@ But; Don't forget - you will be the owner of returned object and must release it It can be, that the desktop is dead - but not your tasksaccess-object! Then they will do nothing! You can't create enumerations then. - @attention Normaly we don't need any lock here. We don't work on internal member! + @attention Normally we don't need any lock here. We don't work on internal member! @seealso class TasksAccess @return A reference to an accessobject, which can create enumerations of our childtasks. @@ -963,7 +963,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS } // II.II) TASKS - // This is a special flag. Normaly it regulate search inside tasks and forbid access to parent trees. + // This is a special flag. Normally it regulate search inside tasks and forbid access to parent trees. // 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 @@ -1054,7 +1054,7 @@ void SAL_CALL Desktop::disposing() m_aListenerContainer.disposeAndClear( aEvent ); // Clear our child task container and forget all task references hardly. - // Normaly all open document was already closed by our terminate() function before ... + // Normally all open document was already closed by our terminate() function before ... // New opened frames will have a problem now .-) m_aChildTaskContainer.clear(); @@ -1157,7 +1157,7 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& *//*-*************************************************************************************************************/ void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) { - SAL_WARN( "fwk", "Desktop::disposing(): Algorithm error! Normaly desktop is temp. listener ... not all the time. So this method shouldn't be called." ); + SAL_WARN( "fwk", "Desktop::disposing(): Algorithm error! Normally desktop is temp. listener ... not all the time. So this method shouldn't be called." ); } /*-************************************************************************************************************ diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 4cadd9f0d2bf..621d6ffce871 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -2021,7 +2021,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException, std::exception m_aTransactionManager.setWorkingMode( E_BEFORECLOSE ); // Don't show any dialogs, errors or something else any more! - // If somewhere called dispose() whitout close() before - normaly no dialogs + // If somewhere called dispose() whitout close() before - normally no dialogs // should exist. Otherwhise it's the problem of the outside caller. // Note: // (a) Do it after stopWindowListening(). May that force some active/deactive @@ -2482,7 +2482,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 don't need this information really. But we can use it to + @descr Normally 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 |