diff options
Diffstat (limited to 'framework/source')
23 files changed, 36 insertions, 36 deletions
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index a2bc6b2310f1..dfff2340ae28 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -125,8 +125,8 @@ void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const css: SolarMutexClearableGuard aWriteLock; // a) no interceptor at all - set this instance as master for given interceptor - // and set our slave as it's slave - and put this interceptor to the list. - // It's place there doesn matter. Because this list is currently empty. + // and set our slave as its slave - and put this interceptor to the list. + // Its place there doesn't matter. Because this list is currently empty. if (m_lInterceptionRegs.empty()) { xInterceptor->setMasterDispatchProvider(xThis ); @@ -175,7 +175,7 @@ void SAL_CALL InterceptionHelper::releaseDispatchProviderInterceptor(const css:: // search this interceptor ... // If it could be located inside cache - - // use it's slave/master relations to update the interception list; + // use its slave/master relations to update the interception list; // set empty references for it as new master and slave; // and relase it from out cache. InterceptorList::iterator pIt = m_lInterceptionRegs.findByReference(xInterceptor); diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index af6cbf904d45..6533ef25d81c 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -1056,7 +1056,7 @@ bool AddonsOptions_Impl::ReadStatusBarItem( aStatusbarItem[ OFFSET_STATUSBARITEM_TITLE ].Value <<= aStatusbarItemNodePropValues[ OFFSET_STATUSBARITEM_TITLE ]; aStatusbarItem[ OFFSET_STATUSBARITEM_CONTEXT ].Value <<= aStatusbarItemNodePropValues[ OFFSET_STATUSBARITEM_CONTEXT ]; aStatusbarItem[ OFFSET_STATUSBARITEM_ALIGN ].Value <<= aStatusbarItemNodePropValues[ OFFSET_STATUSBARITEM_ALIGN ]; - aStatusbarItem[ OFFSET_STATUSBARITEM_AUTOSIZE ].Value <<= aStatusbarItemNodePropValues[ OFFSET_STATUSBARITEM_AUTOSIZE ];; + aStatusbarItem[ OFFSET_STATUSBARITEM_AUTOSIZE ].Value <<= aStatusbarItemNodePropValues[ OFFSET_STATUSBARITEM_AUTOSIZE ]; aStatusbarItem[ OFFSET_STATUSBARITEM_OWNERDRAW ].Value <<= aStatusbarItemNodePropValues[ OFFSET_STATUSBARITEM_OWNERDRAW ]; // Configuration uses hyper for long. Therefore transform into sal_Int32 diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index e7c88e926a88..0feddc396127 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -223,7 +223,7 @@ void FrameListAnalyzer::impl_analyze() } // d) Or is it the a task, which use another or no model at all? - // Add it to the list of "other frames". But look for it's + // Add it to the list of "other frames". But look for its // visible state ... if it's allowed to do so. bool bHidden = false; diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index 1a0aabeaa207..a792ceb972db 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -31,7 +31,7 @@ namespace framework{ to ask user for his decision. These continuation transport selected filter by user to code user of interaction. - @attention This implementation could be used one times only. We don't support a resetable continuation yet! + @attention This implementation could be used one times only. We don't support a resettable 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 selected by handler to diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 91a7e44ba4da..ebdd5446cf3f 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -583,7 +583,7 @@ namespace framework size_t nContextElements = 0; - const bool isHiddenContext = m_aContextVisibilities.top();; + const bool isHiddenContext = m_aContextVisibilities.top(); m_aContextVisibilities.pop(); const bool bHadRedoActions = ( rUndoManager.GetRedoActionCount( IUndoManager::TopLevel ) > 0 ); diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index 9ef121591c58..8321bec19053 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -73,7 +73,7 @@ class LoadDispatcher : public ::cppu::WeakImplHelper< css::frame::XNotifyingDis will be used to create own needed services on demand. @param xOwnerFrame - used as startpoit to locate the right target frame. + used as startpoint to locate the right target frame. @param sTargetName the name or the target frame for loading or a special qualifier diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 7e1bff77403d..d754e1ae85bd 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -77,7 +77,7 @@ public: @descr The load environment must know, if a content is related to a target frame or not. Only "visible" - components, which fullfil the requirements of the + components, which fullfill the requirements of the model-controller-view paradigm can be loaded into a frame. Such contents are classified as E_CAN_BE_LOADED. diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx index c5e6d31c6e26..ed7dda9d70ae 100644 --- a/framework/source/inc/loadenv/loadenvexception.hxx +++ b/framework/source/inc/loadenv/loadenvexception.hxx @@ -82,7 +82,7 @@ class LoadEnvException */ ID_STILL_RUNNING, - /** @short sometiems we can't specify the reason for an error, because we + /** @short sometimes we can't specify the reason for an error, because we was interrupted by an called code in an unexpected way ... */ ID_GENERAL_ERROR diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index 9c4a094d8f1e..8980495651b2 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -471,7 +471,7 @@ void Job::impl_reactForJobResult( /*IN*/ const css::uno::Any& aResult ) /** @short starts listening for office shutdown and closing of our given target frame (if it's a valid reference) - @descr We will reghister ourself as terminate listener + @descr We will register ourself as terminate listener at the global desktop instance. That will hold us alive and additional we get the information, if the office wish to shutdown. If then an internal job diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index d5b120b2581a..907681f8f47e 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -533,7 +533,7 @@ css::uno::Sequence< OUString > JobData::getEnabledJobsForEvent( const css::uno:: return css::uno::Sequence< OUString >(); // get all alias names of jobs, which are part of this job list - // But Some of them can be disabled by it's time stamp values. + // But Some of them can be disabled by its time stamp values. // We create an additional job name list with the same size, then the original list ... // step over all job entries ... check her time stamps ... and put only job names to the // destination list, which represent an enabled job. diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index 07fcef45e691..3488b77bc539 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -157,7 +157,7 @@ JobDispatch::~JobDispatch() } /** - @short implementation of XInitalization + @short implementation of XInitialization @descr A protocol handler can provide this functionality, if it wish to get additional information about the context it runs. In this case the frame reference would be given by the outside code. @@ -247,7 +247,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL JobD @short implementation of XNotifyingDispatch::dispatchWithNotification() @descr It creates the job service implementation and call execute on it. Further it starts the life time control of it. (important for async job) - For synchonrous job we react for the returned result directly ... for asynchronous + For synchronous job we react for the returned result directly ... for asynchronous ones we do it later inside our callback method. But we use the same impl method doing that to share the code. (see impl_finishJob()) diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index e8a0b87d86ef..59afdfaf988b 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -31,7 +31,7 @@ namespace framework{ /** @short special ctor - @descr It initialize this new instance with a (hopyfully) valid job URL. + @descr It initialize this new instance with a (hopefully) valid job URL. This URL will be parsed. After that we set our members right, so other interface methods of this class can be used to get all items of this URL. Of course it will be possible to know, @@ -308,7 +308,7 @@ void JobURL::impldbg_checkIt() /** @short helper debug method @descr It uses the given parameter to create a new instance of a JobURL. - They results will be compared with the exepected ones. + They results will be compared with the expected ones. The a log will be written, which contains some detailed information for this sub test. diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index eb66efea6e51..a3cd70ccdfaa 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2803,7 +2803,7 @@ throw( RuntimeException, std::exception ) setDockingAreaAcceptor( Reference< ui::XDockingAreaAcceptor >() ); - // destroy all elements, it's possible that dettaching is NOT called! + // destroy all elements, it's possible that detaching is NOT called! implts_destroyElements(); impl_clearUpMenuBar(); m_xMenuBar.clear(); diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 26e174a0007c..f52a5cfa1ef6 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -108,7 +108,7 @@ namespace { @descr Because some operations are forced to be executed asynchronously (e.g. requested by our CreashSave/Recovery dialog) ... we must make sure - that these information wont be set as "normal" members of our AtoRecovery + that these information wont be set as "normal" members of our AutoRecovery instance. Otherwise they can disturb our normal AutoSave-timer handling. e.g. it can be unclear then, which progress has to be used for storing documents ... */ @@ -662,7 +662,7 @@ private: @param bStopListening sal_False: must be used in case this method is called within disposing() of the document, where it make no sense to deregister our listener. The container dies... - sal_True : must be used in case this method is used on "dergistration" of this document, where + sal_True : must be used in case this method is used on "deregistration" of this document, where we must deregister our listener .-) @threadsafe @@ -988,7 +988,7 @@ private: Every URL supported by our UCB component can be used here. Further it doesn't matter if the file really exists or not. - Because removing a non exsistent file will have the same + Because removing a non existent file will have the same result at the end... a non existing file .-) On the other side removing of files from disc is an optional @@ -3728,7 +3728,7 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) // 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 .-) + // because it knows, that we are running in EMERGENCY SAVE mode .-) bool bAllowUserIdleLoop = false; // not allowed to change that .-) AutoRecovery::ETimerType eSuggestedTimer = AutoRecovery::E_DONT_START_TIMER; @@ -4145,7 +4145,7 @@ void AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList() // insert model into cache ... // If the model is already well known inside cache // it's information set will be updated by asking the - // model again for it's new states. + // model again for its new states. implts_registerDocument(xModel); } } diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index edbadd89ea16..35e93c97aa8f 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -674,7 +674,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desk } /*-************************************************************************************************************ - @interface XDipsatchProviderInterception + @interface XDispatchProviderInterception @short supports registration/deregistration of interception objects, which are interested on special dispatches. @@ -1198,7 +1198,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio // get packed request and work on it first // Attention: Don't set it on internal member BEFORE interaction is finished - because // "loadComponentFromURL()" yield tills this member is changed. If we do it before - // interaction finish we can't guarantee right functionality. May be we cancel load process to earliear... + // interaction finish we can't guarantee right functionality. May be we cancel load process to earlier... css::uno::Any aRequest = xRequest->getRequest(); // extract continuations from request diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index bcd12d4cc6bb..163a247a936c 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -3218,7 +3218,7 @@ void Frame::impl_checkMenuCloser() // debug methods -// Its allowed to reset the active frame membervariable with a NULL-css::uno::Reference but not with a NULL-pointer! +// Its allowed to reset the active frame member variable with a NULL-css::uno::Reference but not with a NULL-pointer! // And we accept frames only! No tasks and desktops! bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) { diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 34602232e151..f26591517ba0 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -732,7 +732,7 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XComponentCon { if (( i != PREDEFVAR_WORKDIRURL ) && ( i != PREDEFVAR_PATH )) { - // Special path variables, don't include into automatic resubstituion search! + // Special path variables, don't include into automatic resubstitution search! // $(workdirurl) is not allowed to resubstitute! This variable is the value of path settings entry // and it could be possible that it will be resubstituted by itself!! // Example: WORK_PATH=c:\test, $(workdirurl)=WORK_PATH => WORK_PATH=$(workdirurl) and this cannot be substituted! @@ -800,7 +800,7 @@ OUString SubstitutePathVariables::GetWorkVariableValue() const if (!x) { // fallback to $HOME in case platform dependent config layer does not return - // an usuable work dir value. + // an usable work dir value. osl::Security aSecurity; aSecurity.getHomeDir( aWorkPath ); } @@ -917,7 +917,7 @@ throw ( NoSuchElementException, RuntimeException ) bWorkDirURLRetrieved = true; } - // Check preconditions to substitue path variables. + // Check preconditions to substitute path variables. // 1. A path variable can only be substituted if it follows a ';'! // 2. It's located exactly at the start of the string being substituted! if (( aFixedVarTable[ int( nIndex ) ].bAbsPath && (( nPosition == 0 ) || (( nPosition > 0 ) && ( aWorkText[nPosition-1] == ';')))) || @@ -1121,7 +1121,7 @@ throw ( RuntimeException ) } } - // This part can be iteratered more than one time as variables can contain variables again! + // This part can be iterated more than one time as variables can contain variables again! for (ReSubstUserVarOrderVector::const_iterator i( m_aReSubstUserVarOrder.begin()); i != m_aReSubstUserVarOrder.end(); ++i) diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 21b43b4e5bd2..6ff1450e3d88 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -163,7 +163,7 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css // in framework! aURL.Protocol = aProtocol; aURL.Main = aURL.Complete; - aURL.Path = aURL.Complete.copy( nURLIndex+1 );; + aURL.Path = aURL.Complete.copy( nURLIndex+1 ); // Return "URL is parsed". return sal_True; diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 74172fe1d74b..1c055743a670 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -254,7 +254,7 @@ IMPL_LINK_TYPED( TabWindow, Deactivate, TabControl*, pTabControl, bool ) return true; } -// XInitilization +// XInitialization void SAL_CALL TabWindow::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 90f95ab91bdb..620462b71fdc 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -320,7 +320,7 @@ class Toolbarmenu : public ::PopupMenu Toolbarmenu::Toolbarmenu() { - SAL_INFO("fwk.uielement", "contstructing Toolbarmenu " << this); + SAL_INFO("fwk.uielement", "constructing Toolbarmenu " << this); } Toolbarmenu::~Toolbarmenu() diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx index 22c75144bd14..c33bd04b10bf 100644 --- a/framework/source/uielement/statusbaritem.cxx +++ b/framework/source/uielement/statusbaritem.cxx @@ -162,7 +162,7 @@ throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) - m_pStatusBar->SetItemText( m_nId, rText );; + m_pStatusBar->SetItemText( m_nId, rText ); } OUString SAL_CALL StatusbarItem::getHelpText() @@ -180,7 +180,7 @@ throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( m_pStatusBar ) - m_pStatusBar->SetHelpText( m_nId, rHelpText );; + m_pStatusBar->SetHelpText( m_nId, rHelpText ); } OUString SAL_CALL StatusbarItem::getQuickHelpText() diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 77849d534fc9..16d1c3183f66 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -187,7 +187,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext, idx++; // will become 0 if '/' not found: use full string OString aHelpIdAsString( HELPID_PREFIX_TESTTOOL ); OUString aToolbarName = rResourceName.copy( idx ); - aHelpIdAsString += OUStringToOString( aToolbarName, RTL_TEXTENCODING_UTF8 );; + aHelpIdAsString += OUStringToOString( aToolbarName, RTL_TEXTENCODING_UTF8 ); m_pToolBar->SetHelpId( aHelpIdAsString ); m_aAsyncUpdateControllersTimer.SetTimeout( 50 ); diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index ebbc036317c6..ae36fd68abdb 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -161,7 +161,7 @@ throw (uno::Exception, uno::RuntimeException, std::exception) OUString aImplementationName; uno::Reference< uno::XInterface > xHolder( static_cast<cppu::OWeakObject*>(this), uno::UNO_QUERY ); - // Detetmine the implementation name of the window content factory dependent on the + // Determine the implementation name of the window content factory dependent on the // module identifier, user interface element type and name { // SAFE osl::MutexGuard g(rBHelper.rMutex); |