diff options
Diffstat (limited to 'framework/inc')
89 files changed, 245 insertions, 242 deletions
diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx index 1956085c1695..b962023f436d 100644 --- a/framework/inc/classes/checkediterator.hxx +++ b/framework/inc/classes/checkediterator.hxx @@ -61,7 +61,7 @@ namespace framework{ @short implement a iterator which support 2 end states! @descr For our search methods we need a "walking" iterator object with special functionality! We must check for 3 different states of an iterator - normal position, exact end, after end. - It's neccessary to detect if we have not found a entry and must return our default or + It's necessary to detect if we have not found a entry and must return our default or default already returned and we must break loop! see using in class FilterCache too for further informations! @@ -114,7 +114,7 @@ class CheckedIterator /*-****************************************************************************************************//** @short initialize instance with valid container - @descr Set new container at an instance of this class. The other member will set automaticly! + @descr Set new container at an instance of this class. The other member will set automatically! m_pPosition = first element in container m_eEndState = BEFOREEND diff --git a/framework/inc/classes/droptargetlistener.hxx b/framework/inc/classes/droptargetlistener.hxx index aaca8e47637e..36f937f5adda 100644 --- a/framework/inc/classes/droptargetlistener.hxx +++ b/framework/inc/classes/droptargetlistener.hxx @@ -59,7 +59,7 @@ class DropTargetListener : private ThreadHelpBase // member private: - /// uno service manager to create neccessary services + /// uno service manager to create necessary services css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; /// weakreference to target frame (Don't use a hard reference. Owner can't delete us then!) css::uno::WeakReference< css::frame::XFrame > m_xTargetFrame; diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx index 9f27b29cccec..f156c4f47f3c 100644 --- a/framework/inc/classes/filtercache.hxx +++ b/framework/inc/classes/filtercache.hxx @@ -83,7 +83,7 @@ namespace framework{ /*-************************************************************************************************************//** @short cache for all filter and type information @descr Frameloader- and filterfactory need some informations about our current registered filters and types. - For better performance its neccessary to cache all needed values. + For better performance its necessary to cache all needed values. @implements - @base ThreadHelpBase diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index f9367f358a76..ea46d659fe30 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -73,7 +73,7 @@ namespace framework{ #define PACKAGENAME_TYPEDETECTION_STANDARD DECLARE_ASCII("Office.TypeDetection" ) /// Names of our configuration files. #define PACKAGENAME_TYPEDETECTION_ADDITIONAL DECLARE_ASCII("Office.TypeDetectionAdditional" ) -#define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// seperator for configuration pathes +#define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// seperator for configuration paths #define PROPERTY_SEPERATOR sal_Unicode(',') /// seperator for own formated property strings of types and filters #define LIST_SEPERATOR sal_Unicode(';') /// seperator for own formated lists as part of our own formated type- or filter-string #define LOCALE_FALLBACK DECLARE_ASCII("en-US" ) /// fallback, if configuration can't give us current set locale ... @@ -469,7 +469,7 @@ class SetNodeHash : public ::std::hash_map< ::rtl::OUString , //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // The only way to free ALL memory realy! + // The only way to free ALL memory really! //--------------------------------------------------------------------------------------------------------- inline void free() { @@ -481,7 +481,7 @@ class SetNodeHash : public ::std::hash_map< ::rtl::OUString , //--------------------------------------------------------------------------------------------------------- // Append changed, added or removed items to special lists - // Neccessary for saving changes + // Necessary for saving changes //--------------------------------------------------------------------------------------------------------- void appendChange( const ::rtl::OUString& sName , EModifyState eState ); @@ -507,7 +507,7 @@ class PerformanceHash : public ::std::hash_map< ::rtl::OUString { public: //--------------------------------------------------------------------------------------------------------- - // try to free all used memory REALY! + // try to free all used memory REALLY! //--------------------------------------------------------------------------------------------------------- inline void free() { @@ -576,7 +576,7 @@ class DataContainer : private ThreadHelpBase /** @short identifies different sets of the TypeDetection configuration package. @descr Most functions on top of this configuration package are the same ... - but must be executed on different places inside ths configuration structures. + but must be executed on different places inside this configuration structures. These enum values can be used ate some interface methods to specify, which configuration set should be used. Further it must be possible to start the same action for more then one cfg type. @@ -778,8 +778,8 @@ class FilterCFGAccess : public ::utl::ConfigItem // member //------------------------------------------------------------------------------------------------------------- private: - EFilterPackage m_ePackage ; // ... not realy used yet! should split configuration in STANDARD and ADDITIONAL filter - sal_Int32 m_nVersion ; // file format version of configuration! (neccessary for "xml2xcd" transformation!) + EFilterPackage m_ePackage ; // ... not really used yet! should split configuration in STANDARD and ADDITIONAL filter + sal_Int32 m_nVersion ; // file format version of configuration! (necessary for "xml2xcd" transformation!) sal_Int32 m_nKeyCountTypes ; // follow key counts present count of configuration properties for types/filters ... and depends from m_nVersion - must be set right! sal_Int32 m_nKeyCountFilters ; sal_Int32 m_nKeyCountDetectors ; @@ -815,7 +815,7 @@ class FilterCFGListener : public css::util::XChangesListener DataContainer* m_pData; // we must know, if we are already registered as listener or not. - // That can be usefull to supress double registration calls ... + // That can be useful to suppress double registration calls ... // which may will force double call backs in our disposing method! // Such superflous calls can be dangerous. sal_Bool m_bListening; diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index a07585d87f89..1665a8eb87d8 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.hxx @@ -99,7 +99,7 @@ class FrameContainer : private ThreadHelpBase /// list to hold all frames TFrameContainer m_aContainer; - /// one container item can be the current active frame. Its neccessary for Desktop or Frame implementation. + /// one container item can be the current active frame. Its necessary for Desktop or Frame implementation. css::uno::Reference< css::frame::XFrame > m_xActiveFrame; /*DEPRECATEME /// indicates using of the automatic async quit feature in case last task will be closed diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index ee727bb5f978..3e2a1e30bf37 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -57,7 +57,7 @@ namespace framework{ #define PACKAGENAME_PROTOCOLHANDLER DECLARE_ASCII("Office.ProtocolHandler" ) /// name of our configuration package -#define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// seperator for configuration pathes +#define CFG_PATH_SEPERATOR DECLARE_ASCII("/" ) /// seperator for configuration paths #define CFG_ENCODING_OPEN DECLARE_ASCII("[\'" ) /// used to start encoding of set names #define CFG_ENCODING_CLOSE DECLARE_ASCII("\']" ) /// used to finish encoding of set names @@ -116,7 +116,7 @@ typedef BaseHash< ProtocolHandler > HandlerHash; - another one maps her registered pattern to her uno names to perform search on such data But this lists a static for all instances of this class. So it's possible to - create new objects without opening configuration twice and free memory automaticly + create new objects without opening configuration twice and free memory automatically if last object will gone. @attention We implement a singleton concept - so we doesn't need any mutex member here. @@ -165,7 +165,7 @@ class FWI_DLLPUBLIC HandlerCache We set a data container pointer for filling or reading ... this class use it temp. After successfuly calling of read(), we can use filled container directly or merge it with an existing one. After successfuly calling of write() all values of given data container are flushed to our configuration - - but current implementation doesn't support writeing realy. + but current implementation doesn't support writeing really. @base ::utl::ConfigItem base mechanism for configuration access diff --git a/framework/inc/classes/servicemanager.hxx b/framework/inc/classes/servicemanager.hxx index cb7feedc3856..299031bc1bd0 100644 --- a/framework/inc/classes/servicemanager.hxx +++ b/framework/inc/classes/servicemanager.hxx @@ -63,7 +63,7 @@ namespace framework{ /*-************************************************************************************************************//** @short create a new global servicemanager - @descr A global servicemanager is neccessary to instanciate UNO-services. To do this, you need + @descr A global servicemanager is necessary to instanciate UNO-services. To do this, you need a factory to create new objects with special type. That's the reason for a servicemanager. @implements - @@ -118,9 +118,9 @@ class ServiceManager @short initialize global uno service manager and return it @descr This method create a new manager only at first call. We confiscate this with a static pointer, which will be initialized only, if it NULL! - Then you can call this method everytime to get a reference to the manager. + Then you can call this method every time to get a reference to the manager. If you will initialize an uno application you must set returned reference in ::comphelper::setProcessServiceFactory()! - The created manager use "applicat.rdb" and "userXX.rdb" automaticly. + The created manager use "applicat.rdb" and "userXX.rdb" automatically. @seealso - @@ -149,7 +149,7 @@ class ServiceManager /*-****************************************************************************************************//** @short return a reference to a uno servicemanager instance which use your specified user registry file @descr This do the same like method before - but instead of "userXX.rdb" we use your file. - These is neccessary, if you will run more then one uno application at the same time in same environment! + These is necessary, if you will run more then one uno application at the same time in same environment! All created servicemanager use the same "applicat.rdb" but different user registries. @ATTENTION Given file name must be a full qualified system file name. If file not already exist we create a new one! @@ -211,7 +211,7 @@ class ServiceManager @param - @return reference to created static own global mutex - @onerror No error should occure. + @onerror No error should occur. *//*-*****************************************************************************************************/ MUTEX& impl_getOwnGlobalMutex(); @@ -224,7 +224,7 @@ class ServiceManager @param "sRegistryFile", file name of user registry. @return A reference to a new initialized servicemanager with a valid registry. - It can be NULL, if an error occured. + It can be NULL, if an error occurred. @onerror Return a NULL-reference. *//*-*****************************************************************************************************/ diff --git a/framework/inc/commands.h b/framework/inc/commands.h index 88843267117b..5333565b5aa8 100644 --- a/framework/inc/commands.h +++ b/framework/inc/commands.h @@ -45,7 +45,7 @@ namespace framework{ #define COMMAND_PLUGIN DECLARE_ASCII("-plugin" ) /// office is plugged into a browser #define COMMAND_HEADLESS DECLARE_ASCII("-headless" ) /// office runs in headless mode for scripting -#define COMMAND_INVISIBLE DECLARE_ASCII("-invisible" ) /// office runs in invisible mode which supress splash screen and first empry document +#define COMMAND_INVISIBLE DECLARE_ASCII("-invisible" ) /// office runs in invisible mode which suppress splash screen and first empry document #define COMMAND_SERVER DECLARE_ASCII("-server" ) /// office runs as server } // namespace framework diff --git a/framework/inc/dispatch/basedispatcher.hxx b/framework/inc/dispatch/basedispatcher.hxx index 0b60fb359a26..82b5325052a5 100644 --- a/framework/inc/dispatch/basedispatcher.hxx +++ b/framework/inc/dispatch/basedispatcher.hxx @@ -153,8 +153,8 @@ struct LoadBinding css::uno::Reference< css::frame::XDispatch > xHandler ; // if handler was used, this reference will be valid css::uno::Reference< css::frame::XFrameLoader > xLoader ; // if loader was used, this reference will be valid css::uno::Reference< css::frame::XFrame > xFrame ; // Target of loading - css::util::URL aURL ; // dispatched URL - neccessary to find listener for status event! - css::uno::Sequence< css::beans::PropertyValue > lDescriptor ; // dispatched arguments - neccessary for "reactForLoadingState()"! + css::util::URL aURL ; // dispatched URL - necessary to find listener for status event! + css::uno::Sequence< css::beans::PropertyValue > lDescriptor ; // dispatched arguments - necessary for "reactForLoadingState()"! css::uno::Any aAsyncInfo ; // superclasses could use them to save her own user specific data for these asynchron call-info css::uno::Reference< css::frame::XDispatchResultListener > xListener; }; @@ -228,7 +228,7 @@ class LoaderThreads : private ::std::vector< LoadBinding > /*-************************************************************************************************************//** @short base class for dispatcher implementations - @descr Most of our dispatch implementations do everytime the same. They try to handle or load + @descr Most of our dispatch implementations do every time the same. They try to handle or load somethinmg into a target ... normaly a frame/task/pluginframe! They must do it synchron or sometimes asynchron. They must wait for callbacks and notify registered listener with right status events. @@ -255,7 +255,7 @@ class BaseDispatcher : // interfaces public css::frame::XNotifyingDispatch , public css::frame::XLoadEventListener , // => XEventListener too! // baseclasses - // Order is neccessary for right initialization! + // Order is necessary for right initialization! protected ThreadHelpBase , protected TransactionBase , public ::cppu::OWeakObject @@ -311,7 +311,7 @@ class BaseDispatcher : // interfaces task if operation failed ...!? By overwriting these pure virtual methods it's possible to do such things. We call you with all available informations ... you should react for it. - BUT - don't send any status events to your listener! We will do it everytime. + BUT - don't send any status events to your listener! We will do it every time. (other listener could be informed as well!) You will called back in: a) "reactForLoadingState()" , if URL was loaded into a frame diff --git a/framework/inc/dispatch/blankdispatcher.hxx b/framework/inc/dispatch/blankdispatcher.hxx index d08dcf9754f6..9879e992df7e 100644 --- a/framework/inc/dispatch/blankdispatcher.hxx +++ b/framework/inc/dispatch/blankdispatcher.hxx @@ -70,7 +70,7 @@ namespace framework{ @threadsafe yes *//*-*************************************************************************************************************/ class BlankDispatcher : // -interfaces ... are supported by our BaseDispatcher! - // -baseclasses ... order is neccessary for right initialization! + // -baseclasses ... order is necessary for right initialization! public BaseDispatcher { //------------------------------------------------------------------------------------------------------------- diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index 205c22a3106a..06e37f51550f 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -65,13 +65,13 @@ namespace framework{ @descr These URLs implements a special functionality to close a document or the whole frame ... and handle the state, it was the last frame or document. Then we create the default backing document which can be used to open new ones using the file open dialog - or some other menu entries. Or we terminate the whole application in case this backing mode shouldnt + or some other menu entries. Or we terminate the whole application in case this backing mode shouldn't be used. */ class CloseDispatcher : public css::lang::XTypeProvider , public css::frame::XNotifyingDispatch // => XDispatch , public css::frame::XDispatchInformationProvider - // baseclasses ... order is neccessary for right initialization! + // baseclasses ... order is necessary for right initialization! , private ThreadHelpBase , public ::cppu::OWeakObject { @@ -205,10 +205,10 @@ class CloseDispatcher : public css::lang::XTypeProvider //--------------------------------------- /** @short prepare m_xCloseFrame so it should be closeable without problems. - @descr Thats needed to be shure, that the document cant disagree + @descr Thats needed to be sure, that the document can't disagree later with e.g. an office termination. The problem: Closing of documents can show UI. If the user - ignores it and open/close other documents, we cant know + ignores it and open/close other documents, we can't know which state the office has after closing of this frame. @param bAllowSuspend @@ -236,8 +236,8 @@ class CloseDispatcher : public css::lang::XTypeProvider before (e.g. by calling implts_closeView()! Otherwhise e.g. the XController->suspend() - call isnt made and no UI warn the user about - loosing document changes. Because the + call isn't made and no UI warn the user about + losing document changes. Because the frame is closed .... @return [bool] @@ -282,7 +282,7 @@ class CloseDispatcher : public css::lang::XTypeProvider directly used as css::frame::DispatchResultState value. @param aResult - not used yet realy ... + not used yet really ... */ void implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, sal_Int16 nState , @@ -290,13 +290,13 @@ class CloseDispatcher : public css::lang::XTypeProvider //--------------------------------------- /** @short try to find the right target frame where this close request - must be realy done. + must be really done. @descr The problem behind: closing some resources depends sometimes from the context where its dispatched. Sometimes the start frame of the dispatch has to be closed itself (target=_self) ... sometimes it's parent frame has to be closed - BUT(!) it means a parent frame containing a top level - window. _top cant be used then for dispatch - because it adress TopFrames + window. _top can't be used then for dispatch - because it address TopFrames not frames containg top level windows. So normaly _magic (which btw does not exists at the moment .-) ) should be used. So we interpret target=<empty> as _magic ! diff --git a/framework/inc/dispatch/createdispatcher.hxx b/framework/inc/dispatch/createdispatcher.hxx index 3450cdfa0b31..fc35f205653b 100644 --- a/framework/inc/dispatch/createdispatcher.hxx +++ b/framework/inc/dispatch/createdispatcher.hxx @@ -77,7 +77,7 @@ namespace framework{ @threadsafe yes *//*-*************************************************************************************************************/ class CreateDispatcher : // -interfaces ... are supported by our BaseDispatcher! - // -baseclasses ... order is neccessary for right initialization! + // -baseclasses ... order is necessary for right initialization! public BaseDispatcher { //------------------------------------------------------------------------------------------------------------- diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx index 78c4c17e946c..05dff041cbda 100644 --- a/framework/inc/dispatch/dispatchprovider.hxx +++ b/framework/inc/dispatch/dispatchprovider.hxx @@ -66,7 +66,7 @@ namespace framework{ //_________________________________________________________________________________________________________________ /** - @descr We know some special dispatch objects with diffrent functionality. + @descr We know some special dispatch objects with different functionality. The can be created internaly by the following DispatchProvider. Here we define some identifier to force creation of the right one. */ @@ -108,7 +108,7 @@ class DispatchProvider : // interfaces public css::lang::XTypeProvider , public css::frame::XDispatchProvider , // baseclasses - // Order is neccessary for right initialization! + // Order is necessary for right initialization! private ThreadHelpBase , private TransactionBase , public ::cppu::OWeakObject diff --git a/framework/inc/dispatch/helpagentdispatcher.hxx b/framework/inc/dispatch/helpagentdispatcher.hxx index cfd4cf448ed5..4487296bee02 100644 --- a/framework/inc/dispatch/helpagentdispatcher.hxx +++ b/framework/inc/dispatch/helpagentdispatcher.hxx @@ -42,7 +42,7 @@ namespace framework // define css alias ... and undefine it at the end of this file !!! #ifdef css - #error "I tried to use css as namespace define inside non exported header ... but it was already defined by somwhere else. .-)" + #error "I tried to use css as namespace define inside non exported header ... but it was already defined by somewhere else. .-)" #else #define css ::com::sun::star #endif diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx index c8bf5eb9c68f..41240ab73b3b 100644 --- a/framework/inc/dispatch/interceptionhelper.hxx +++ b/framework/inc/dispatch/interceptionhelper.hxx @@ -260,7 +260,7 @@ class InterceptionHelper : public css::frame::XDispatchProvider @descr It capsulate more then one queryDispatch() requests and return a lits of dispatch objects as result. Because both lists (in and out) coreespond together, it's not allowed to - pack it - means supress NULL references! + pack it - means suppress NULL references! @param lDescriptor a list of queryDispatch() arguments. diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx index 0f0466ae83fb..ae84635ffba2 100644 --- a/framework/inc/dispatch/mailtodispatcher.hxx +++ b/framework/inc/dispatch/mailtodispatcher.hxx @@ -70,7 +70,7 @@ namespace framework{ /** @short protocol handler for "mailto:" URLs @descr It's a special dispatch object which is used registered for "mailto:*" URLs and - will be automaticly used from the framework dispatch mechanism if such URL occured. + will be automatically used from the framework dispatch mechanism if such URL occurred. @base ThreadHelpBase exports a lock member to guarantee right initialize value of it @@ -87,7 +87,7 @@ class MailToDispatcher : // interfaces public css::frame::XDispatchProvider , public css::frame::XNotifyingDispatch, // => XDispatch // baseclasses - // Order is neccessary for right initialization! + // Order is necessary for right initialization! private ThreadHelpBase , public cppu::OWeakObject { diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx index 89e078e56723..ba7cab46c8f8 100644 --- a/framework/inc/dispatch/menudispatcher.hxx +++ b/framework/inc/dispatch/menudispatcher.hxx @@ -106,7 +106,7 @@ class MenuDispatcher : // interfaces public css::frame::XDispatch , public css::frame::XFrameActionListener , // baseclasses - // Order is neccessary for right initialization! + // Order is necessary for right initialization! public ThreadHelpBase , public cppu::OWeakObject { @@ -122,7 +122,7 @@ class MenuDispatcher : // interfaces /*-****************************************************************************************************//** @short standard ctor - @descr These initialize a new instance of ths class with needed informations for work. + @descr These initialize a new instance of this class with needed informations for work. @seealso using at owner @@ -149,7 +149,7 @@ class MenuDispatcher : // interfaces /*-****************************************************************************************************//** @short dispatch URL with arguments - @descr Every dispatch create a new task. If load of URL failed task will deleted automaticly! + @descr Every dispatch create a new task. If load of URL failed task will deleted automatically! @seealso - @@ -171,7 +171,7 @@ class MenuDispatcher : // interfaces @seealso method loadCancelled() @param "xControl" , css::uno::Reference to a valid listener for state events. - @param "aURL" , URL about listener will be informed, if something occured. + @param "aURL" , URL about listener will be informed, if something occurred. @return - @onerror - diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index 705b557572f4..291cd1e37493 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -139,7 +139,7 @@ class Oxt_Handler : // interfaces , public css::frame::XNotifyingDispatch // => XDispatch , public css::document::XExtendedFilterDetection // baseclasses - // Order is neccessary for right initialization! + // Order is necessary for right initialization! , private ThreadHelpBase , public ::cppu::OWeakObject { diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 29d1570adcba..6a03192e7a99 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -121,7 +121,7 @@ class PopupMenuDispatcher : // interfaces public css::frame::XFrameActionListener , public css::lang::XInitialization , // baseclasses - // Order is neccessary for right initialization! + // Order is necessary for right initialization! public ThreadHelpBase , public cppu::OWeakObject { diff --git a/framework/inc/dispatch/selfdispatcher.hxx b/framework/inc/dispatch/selfdispatcher.hxx index a8dda70246ef..d84a4f16bf7a 100644 --- a/framework/inc/dispatch/selfdispatcher.hxx +++ b/framework/inc/dispatch/selfdispatcher.hxx @@ -72,7 +72,7 @@ namespace framework{ @threadsafe yes *//*-*************************************************************************************************************/ class SelfDispatcher : // -interfaces ... are supported by our BaseDispatcher! - // -baseclasses ... order is neccessary for right initialization! + // -baseclasses ... order is necessary for right initialization! public BaseDispatcher { //------------------------------------------------------------------------------------------------------------- diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx index 8d95dd20ec92..79fd44700ce7 100644 --- a/framework/inc/dispatch/servicehandler.hxx +++ b/framework/inc/dispatch/servicehandler.hxx @@ -70,10 +70,10 @@ namespace framework{ /** @short protocol handler for "service:*" URLs @descr It's a special dispatch/provider object which is registered for such URL pattern and will - be automaticly used by the framework dispatch mechanism if such URL occured. + be automatically used by the framework dispatch mechanism if such URL occurred. His job is to create any registered uno components which must be coded inside dispatched URL (may with some optional given parameters). After that such created - service must be hold his self alive. Such mechanism can be usefull for UI components + service must be hold his self alive. Such mechanism can be useful for UI components (e.g. Dialogs, Wizards) only. @base ThreadHelpBase @@ -91,7 +91,7 @@ class ServiceHandler : // interfaces public css::frame::XDispatchProvider , public css::frame::XNotifyingDispatch, // => XDispatch // baseclasses - // Order is neccessary for right initialization! + // Order is necessary for right initialization! private ThreadHelpBase , public cppu::OWeakObject { diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index 41d9c6e14f4d..8e7c890b4b0e 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -64,7 +64,7 @@ namespace framework{ class StartModuleDispatcher : public css::lang::XTypeProvider , public css::frame::XNotifyingDispatch // => XDispatch , public css::frame::XDispatchInformationProvider - // baseclasses ... order is neccessary for right initialization! + // baseclasses ... order is necessary for right initialization! , private ThreadHelpBase , public ::cppu::OWeakObject { @@ -180,7 +180,7 @@ class StartModuleDispatcher : public css::lang::XTypeProvider directly used as css::frame::DispatchResultState value. @param aResult - not used yet realy ... + not used yet really ... */ void implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, sal_Int16 nState , diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx index 8b8b201aa3a5..39d30066c269 100644 --- a/framework/inc/dispatch/systemexec.hxx +++ b/framework/inc/dispatch/systemexec.hxx @@ -70,7 +70,7 @@ namespace framework{ /** @short protocol handler for "systemexec:*" URLs @descr It's a special dispatch/provider object which is registered for such URL pattern and will - be automaticly used by the framework dispatch mechanism if such URL occured. + be automatically used by the framework dispatch mechanism if such URL occurred. It forwards all URL's to the underlying operating system. So it would e.g. be possible to open HTML files outside the office within a web browser. @@ -87,7 +87,7 @@ class SystemExec : // interfaces public css::frame::XDispatchProvider , public css::frame::XNotifyingDispatch, // => XDispatch // baseclasses - // Order is neccessary for right initialization! + // Order is necessary for right initialization! private ThreadHelpBase , public cppu::OWeakObject { diff --git a/framework/inc/framework/addonmenu.hxx b/framework/inc/framework/addonmenu.hxx index 83b7f2b7243e..6768dc700580 100644 --- a/framework/inc/framework/addonmenu.hxx +++ b/framework/inc/framework/addonmenu.hxx @@ -30,6 +30,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> //_________________________________________________________________________________________________________________ // includes of other projects @@ -92,23 +93,25 @@ class FWE_DLLPUBLIC AddonMenuManager static sal_Bool IsAddonMenuId( sal_uInt16 nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); } // Check if the context string matches the provided xModel context - static sal_Bool IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const rtl::OUString& aContext ); + static sal_Bool IsCorrectContext( const ::rtl::OUString& rModuleIdentifier, const rtl::OUString& aContext ); // Factory method to create different Add-On menu types static PopupMenu* CreatePopupMenuType( MenuType eMenuType, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); // Create the Add-Ons menu - static AddonMenu* CreateAddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); + static AddonMenu* CreateAddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager ); // Merge the Add-Ons help menu items into the given menu bar at a defined pos static void MergeAddonHelpMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, - MenuBar* pMergeMenuBar ); + MenuBar* pMergeMenuBar, + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager ); // Merge the addon popup menus into the given menu bar at the provided pos. static void MergeAddonPopupMenus( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, - const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel, sal_uInt16 nMergeAtPos, - MenuBar* pMergeMenuBar ); + MenuBar* pMergeMenuBar, + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager ); // Returns the next position to insert a menu item/sub menu static sal_uInt16 GetNextPos( sal_uInt16 nPos ); @@ -120,7 +123,7 @@ class FWE_DLLPUBLIC AddonMenuManager sal_uInt16& nUniqueMenuId, com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > aAddonMenuDefinition, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, - const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel ); + const ::rtl::OUString& rModuleIdentifier ); // Retrieve the menu entry property values from a sequence static void GetMenuEntry( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonMenuEntry, diff --git a/framework/inc/framework/addonsoptions.hxx b/framework/inc/framework/addonsoptions.hxx index b53aea694af9..13a9ead43875 100644 --- a/framework/inc/framework/addonsoptions.hxx +++ b/framework/inc/framework/addonsoptions.hxx @@ -41,7 +41,7 @@ /*-************************************************************************************************************//** @descr The method GetAddonsMenu() returns a list of property values. - Use follow defines to seperate values by names. + Use follow defines to separate values by names. *//*-*************************************************************************************************************/ #define ADDONSMENUITEM_STRING_URL "URL" #define ADDONSMENUITEM_STRING_TITLE "Title" @@ -128,7 +128,7 @@ typedef ::std::vector< MergeStatusbarInstruction > MergeStatusbarInstructionCont /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ diff --git a/framework/inc/framework/framelistanalyzer.hxx b/framework/inc/framework/framelistanalyzer.hxx index 7179b22854b7..38dc3fed7684 100644 --- a/framework/inc/framework/framelistanalyzer.hxx +++ b/framework/inc/framework/framelistanalyzer.hxx @@ -46,7 +46,7 @@ namespace framework{ /** analyze and split the current available frame list of a given frames supplier into different parts. - These analyzed informations can be used e.g. to decide if it's neccessary + These analyzed informations can be used e.g. to decide if it's necessary to switch into the backing mode, close the current active frame only or exit the whole application explicitly or implicitly. */ @@ -93,13 +93,13 @@ class FWE_DLLPUBLIC FrameListAnalyzer ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lModelFrames; /** contains all frames, which does not contain the same model like the reference frame. - Filling of it can't be supressed by m_eDetectMode. + Filling of it can't be suppressed by m_eDetectMode. The reference frame is never part of this list! All frames inside this list are visible ones. */ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lOtherVisibleFrames; /** contains all frames, which does not contain the same model like the reference frame. - Filling of it can't be supressed by m_eDetectMode. + Filling of it can't be suppressed by m_eDetectMode. The reference frame is never part of this list! All frames inside this list are hidden ones. */ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > > m_lOtherHiddenFrames; diff --git a/framework/inc/framework/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx index 19f4077c0660..83407b713593 100644 --- a/framework/inc/framework/preventduplicateinteraction.hxx +++ b/framework/inc/framework/preventduplicateinteraction.hxx @@ -189,7 +189,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 @param xSMGR uno service manager for creating services internaly - @threadsafe not neccessary + @threadsafe not necessary */ PreventDuplicateInteraction(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); @@ -225,10 +225,10 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 @short add a new interaction to the list of interactions, which must be handled by this helper. - @descr This method must be called immediatly after a new instance of this helper was + @descr This method must be called immediately after a new instance of this helper was created. Without such list of InteractionRules, this instances does nothing! On the other side there is no possibility to remove rules. - So the same instance cant be used within different transactions. + So the same instance can't be used within different transactions. It's a OneWay-object .-) @param aInteractionInfo diff --git a/framework/inc/general.h b/framework/inc/general.h index d7f9f5bc7d3e..018457b925ea 100644 --- a/framework/inc/general.h +++ b/framework/inc/general.h @@ -29,7 +29,7 @@ #include <macros/generic.hxx> -/* Normaly XInterface isnt used here ... +/* Normaly XInterface isn't used here ... But we need it to be able to define namespace alias css to anything related to ::com::sun::star :-) */ #include <com/sun/star/uno/XInterface.hpp> diff --git a/framework/inc/helper/fixeddocumentproperties.hxx b/framework/inc/helper/fixeddocumentproperties.hxx index 51e450407060..5ee78a616108 100644 --- a/framework/inc/helper/fixeddocumentproperties.hxx +++ b/framework/inc/helper/fixeddocumentproperties.hxx @@ -37,15 +37,15 @@ struct FixedDocumentProperties sal_Bool m_bAutoloadEnabled ; /// Automatic reload enabled/disabled ? sal_Int32 m_nAutoloadSecs ; /// Time cycle for automatic reload ::rtl::OUString m_sAutoloadURL ; /// URL for automatic reload - ::rtl::OUString m_sBlindCopiesTo ; /// Adress for BCC - ::rtl::OUString m_sCopiesTo ; /// Adress CC + ::rtl::OUString m_sBlindCopiesTo ; /// Address for BCC + ::rtl::OUString m_sCopiesTo ; /// Address CC com::sun::star::util::DateTime m_aCreationDate ; /// Time and date of document creation ::rtl::OUString m_sDefaultTarget ; /// Name of default target ::rtl::OUString m_sDescription ; /// Short description and comments sal_Int16 m_nEditingCycles ; /// Document number sal_Int32 m_nEditingDuration ; /// Duration since last edit com::sun::star::uno::Sequence< sal_Int8 > m_seqExtraData ; /// Buffer of bytes for some extra data - ::rtl::OUString m_sInReplyTo ; /// Adress for reply to ... + ::rtl::OUString m_sInReplyTo ; /// Address for reply to ... sal_Bool m_bIsEncrypted ; /// Document is en/decrypted ::rtl::OUString m_sKeywords ; /// Some keywords ::rtl::OUString m_sMIMEType ; /// MIME-type of document @@ -60,7 +60,7 @@ struct FixedDocumentProperties sal_Bool m_bQueryTemplate ; /// Search for template ? ::rtl::OUString m_sRecipient ; /// Name of recipient ::rtl::OUString m_sReferences ; /// Some references to other things - ::rtl::OUString m_sReplyTo ; /// Adress to reply + ::rtl::OUString m_sReplyTo ; /// Address to reply sal_Bool m_bSaveGraphicsCompressed ; /// Compressed/non compressed graphics sal_Bool m_bSaveOriginalGraphics ; /// Include graphics sal_Bool m_bSaveVersionOnClose ; /// Save version on close of document ? diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx index f4c60fac2cc3..a63ef13c9f8f 100644 --- a/framework/inc/helper/ocomponentaccess.hxx +++ b/framework/inc/helper/ocomponentaccess.hxx @@ -83,7 +83,7 @@ namespace framework{ @devstatus ready to use *//*-*************************************************************************************************************/ -class OComponentAccess : private ThreadHelpBase , // Must be the first of baseclasses - Is neccessary for right initialization of objects! +class OComponentAccess : private ThreadHelpBase , // Must be the first of baseclasses - Is necessary for right initialization of objects! public ::cppu::WeakImplHelper1< ::com::sun::star::container::XEnumerationAccess > { //------------------------------------------------------------------------------------------------------------- @@ -199,12 +199,12 @@ class OComponentAccess : private ThreadHelpBase , // M /*-****************************************************************************************************//** @short recursive method (!) to collect all components of all frames from the subtree of given node - @descr This is neccessary to create the enumeration. + @descr This is necessary to create the enumeration. @seealso method createEnumeration @param "xNode" , root of subtree and start point of search - @param "seqComponents", result list of search. We cant use a return value, we search recursive + @param "seqComponents", result list of search. We can't use a return value, we search recursive and must collect all informations. @return - diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx index 46a59172f29a..106ee4e6bf5f 100644 --- a/framework/inc/helper/ocomponentenumeration.hxx +++ b/framework/inc/helper/ocomponentenumeration.hxx @@ -67,7 +67,7 @@ namespace framework{ @short implement a helper for a oneway enumeration of components @descr You can step during this list only for one time! Its a snapshot. Don't forget to release the reference. You are the owner of an instance of this implementation. - You cant use this as a baseclass. Please use it as a dynamical object for return. + You can't use this as a baseclass. Please use it as a dynamical object for return. @implements XInterface XTypeProvider diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index 632c8397ac32..378862f7b422 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -83,7 +83,7 @@ namespace framework{ @devstatus deprecated *//*-*************************************************************************************************************/ -class OFrames : private ThreadHelpBase , // Must be the first of baseclasses - Is neccessary for right initialization of objects! +class OFrames : private ThreadHelpBase , // Must be the first of baseclasses - Is necessary for right initialization of objects! public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFrames > { //------------------------------------------------------------------------------------------------------------- diff --git a/framework/inc/helper/otasksenumeration.hxx b/framework/inc/helper/otasksenumeration.hxx index fe091c945cde..fbbe055b6661 100644 --- a/framework/inc/helper/otasksenumeration.hxx +++ b/framework/inc/helper/otasksenumeration.hxx @@ -68,7 +68,7 @@ namespace framework{ @short implement a helper for a oneway enumeration of tasks @descr You can step during this list only for one time! Its a snapshot. Don't forget to release the reference. You are the owner of an instance of this implementation. - You cant use this as a baseclass. Please use it as a dynamical object for return. + You can't use this as a baseclass. Please use it as a dynamical object for return. @implements XInterface XTypeProvider diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index c56ff204404c..7750b1f84dfe 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -87,7 +87,7 @@ class PersistentWindowState : // interfaces public css::lang::XTypeProvider, public css::lang::XInitialization, public css::frame::XFrameActionListener, // => XEventListener - // baseclasses (order neccessary for right initialization!) + // baseclasses (order necessary for right initialization!) private ThreadHelpBase, public ::cppu::OWeakObject { @@ -177,7 +177,7 @@ class PersistentWindowState : // interfaces @param xWindow must point to the container window of the frame. - We use it VCL part here - because the toolkit doesnt + We use it VCL part here - because the toolkit doesn't provide the right functionality! @return [string] @@ -207,7 +207,7 @@ class PersistentWindowState : // interfaces @param xWindow must point to the container window of the frame. - We use it VCL part here - because the toolkit doesnt + We use it VCL part here - because the toolkit doesn't provide the right functionality! @param sWindowState diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx index 3230f56b7f83..852073394d5e 100644 --- a/framework/inc/helper/statusindicator.hxx +++ b/framework/inc/helper/statusindicator.hxx @@ -70,7 +70,7 @@ namespace framework{ */ class StatusIndicator : public css::lang::XTypeProvider , public css::task::XStatusIndicator - , private ThreadHelpBase // Order of baseclasses is neccessary for right initializaton! + , private ThreadHelpBase // Order of baseclasses is necessary for right initializaton! , public ::cppu::OWeakObject // => XInterface { //------------------------------------------- diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index 4ae0796c88c8..10a7e4ac0f54 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -289,7 +289,7 @@ class StatusIndicatorFactory : public css::lang::XTypeProvider if it's allowed to do so. - @descr By default we show the parent window automaticly + @descr By default we show the parent window automatically if this progress is used. If that isn't a valid operation, the user of this progress can suppress this feature by initializaing diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx index e78f2e46f407..dcba1a86ea54 100644 --- a/framework/inc/helper/tagwindowasmodified.hxx +++ b/framework/inc/helper/tagwindowasmodified.hxx @@ -65,7 +65,7 @@ namespace framework{ /*-************************************************************************************************************//** @short listen for modify events on model and tag frame container window so it can react accordingly - @descr Used e.g. by our MAC port where such state is shown seperately on some controls of the + @descr Used e.g. by our MAC port where such state is shown separately on some controls of the title bar. @base ThreadHelpBase @@ -83,7 +83,7 @@ class TagWindowAsModified : // interfaces public css::lang::XInitialization, public css::frame::XFrameActionListener, // => XEventListener public css::util::XModifyListener, // => XEventListener - // baseclasses (order neccessary for right initialization!) + // baseclasses (order necessary for right initialization!) private ThreadHelpBase, public ::cppu::OWeakObject { diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index f48a947eceac..10c211732cf7 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -121,7 +121,7 @@ class TitleBarUpdate : // interfaces , public css::lang::XInitialization , public css::frame::XTitleChangeListener // => XEventListener , public css::frame::XFrameActionListener // => XEventListener - // baseclasses (order neccessary for right initialization!) + // baseclasses (order necessary for right initialization!) , private ThreadHelpBase , public ::cppu::OWeakObject { @@ -213,7 +213,7 @@ class TitleBarUpdate : // interfaces //____________________________ /** @short set a new icon and title on the title bar of our connected frame window. - @descr It does not check if an update is realy needed. That has to be done outside. + @descr It does not check if an update is really needed. That has to be done outside. It retrieves all needed informations and update the title bar - nothing less - nothing more. */ diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx index 5c7aedd2341e..ff686fe23b95 100644 --- a/framework/inc/helper/vclstatusindicator.hxx +++ b/framework/inc/helper/vclstatusindicator.hxx @@ -69,7 +69,7 @@ class VCLStatusIndicator : public css::task::XStatusIndicator /** shows the progress. - @attention This member isnt synchronized using our own mutex! + @attention This member isn't synchronized using our own mutex! Its guarded by the solarmutex only. Otherwhise we have to lock two of them, which can force a deadlock ... */ diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx index c6dc88cb92d3..0c64226fcf74 100644 --- a/framework/inc/interaction/quietinteraction.hxx +++ b/framework/inc/interaction/quietinteraction.hxx @@ -60,7 +60,7 @@ namespace framework{ /** @short handle interactions non visible - @descr Sometimes it's neccessary to use a non visible interaction handler. + @descr Sometimes it's necessary to use a non visible interaction handler. He can't do anything, which a visible one can handle. But it can be used to intercept problems e.g. during loading of documents. @@ -98,7 +98,7 @@ class QuietInteraction : public css::lang::XTypeProvider @interface XInteractionHandler @short called from outside to handle a problem @descr The only interaction we can handle here is to - decide which of two ambigous filters should be realy used. + decide which of two ambigous filters should be really used. We use the user selected one every time. All other request will be aborted and can break the code, which use this interaction handler. @@ -121,7 +121,7 @@ class QuietInteraction : public css::lang::XTypeProvider @short ctor to guarantee right initialized instances of this class @descr - - @threadsafe not neccessary + @threadsafe not necessary */ QuietInteraction(); @@ -130,7 +130,7 @@ class QuietInteraction : public css::lang::XTypeProvider @short return the handled interaction request @descr We saved any getted interaction request internaly. May the outside user of this class is interessted - on that. Especialy we gotted an unknown interaction + on that. Especially we gotted an unknown interaction and aborted it hard. @return [com.sun.star.uno.Any] diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index d18ae3406017..2bba3053bea5 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -80,7 +80,7 @@ class FWI_DLLPUBLIC ConfigAccess : public ThreadHelpBase /** reference to the uno service manager - It's neccessary to instanciate own needed services. + It's necessary to instanciate own needed services. */ css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx index dfa8a48ab516..60d9f67af674 100644 --- a/framework/inc/jobs/helponstartup.hxx +++ b/framework/inc/jobs/helponstartup.hxx @@ -111,7 +111,7 @@ class HelpOnStartup : private ThreadHelpBase /** @short does nothing real ... @descr But it should exists as virtual function, - so this class cant make trouble + so this class can't make trouble related to inline/symbols etcpp.! */ virtual ~HelpOnStartup(); @@ -158,11 +158,11 @@ class HelpOnStartup : private ThreadHelpBase /** @short tries to locate the open help module and return the url of the currently shown help content. - @descr It returns an empty string, if the help isnt still + @descr It returns an empty string, if the help isn't still open at calling time. @return The URL of the current shown help content; - or an empty value if the help isnt still open. + or an empty value if the help isn't still open. */ ::rtl::OUString its_getCurrentHelpURL(); @@ -180,7 +180,7 @@ class HelpOnStartup : private ThreadHelpBase ::sal_Bool its_isHelpUrlADefaultOne(const ::rtl::OUString& sHelpURL); //--------------------------------------- - /** @short checks, if the help module should be shown automaticly for the + /** @short checks, if the help module should be shown automatically for the currently opened office module. @descr This value is readed from the module configuration. diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx index 129484823aec..9b34456d0b57 100644 --- a/framework/inc/jobs/job.hxx +++ b/framework/inc/jobs/job.hxx @@ -100,7 +100,7 @@ class Job : public css::lang::XTypeProvider private: /** - hold all neccessary informations about this job. + hold all necessary informations about this job. It can be used for both modes: with and without configuration. */ JobData m_aJobCfg; @@ -126,7 +126,7 @@ class Job : public css::lang::XTypeProvider We use it too, to listen for closing events of this ressource. Please note: If m_xFrame is set - m_xModel should be NULL. - Only one environment can be supported realy. + Only one environment can be supported really. */ css::uno::Reference< css::frame::XFrame > m_xFrame; @@ -136,13 +136,13 @@ class Job : public css::lang::XTypeProvider We use it too, to listen for closing events of this ressource. Please note: If m_xModel is set - m_xFrame should be NULL. - Only one environment can be supported realy. + Only one environment can be supported really. */ css::uno::Reference< css::frame::XModel > m_xModel; /** We are registered at this instance to listen for office shutdown events. - It's neccessary supress it (if possible) or to react in the right way. + It's necessary suppress it (if possible) or to react in the right way. */ css::uno::Reference< css::frame::XDesktop > m_xDesktop; @@ -163,7 +163,7 @@ class Job : public css::lang::XTypeProvider /** Holds the state, if we are listen for desktop/frame or model closing events or not. - The used references are not realy enough to detect a valid listener connection. + The used references are not really enough to detect a valid listener connection. Thats why we use this additional information here too. */ sal_Bool m_bListenOnDesktop; @@ -182,7 +182,7 @@ class Job : public css::lang::XTypeProvider indicates in which state the internal job currently exist. We can use this information to throw any suitable veto exception - to prevent the environment against dieing or supress superflous dispose() + to prevent the environment against dieing or suppress superflous dispose() calls at the job. */ ERunState m_eRunState; diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx index 9923d4f3757b..c4f4c5d279dc 100644 --- a/framework/inc/jobs/jobconst.hxx +++ b/framework/inc/jobs/jobconst.hxx @@ -53,7 +53,7 @@ namespace framework{ @descr The protocol between job executor/dispatch and jobs is fix and well defined. But why every implemented job should write such constant values directly into - it's code. Typos can occure or code will be changed by new developers ... + it's code. Typos can occur or code will be changed by new developers ... Shared set of constant values can help to improve the mentainance of this code. */ class FWI_DLLPUBLIC JobConst diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index faea7ffbe40d..08ec01f4f359 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -57,7 +57,7 @@ namespace framework{ // definitions /** - @short holds all neccessary informations about a job and + @short holds all necessary informations about a job and handle it's configuration (if any exist!) @descr It can be used rom different use cases as a container (or proxy) for all config data of a registered job. @@ -145,8 +145,8 @@ class JobData : private ThreadHelpBase /** Some jobs can be registered to "logical events", which are generated on demand if another document event occures. E.g. "onDocumentOpened" in case "OnNew" or "OnLoad" was notified to the JobExecutor instance. And normaly the original event is transported as parameter set to the executed job. But then such job - cant differ between e.g. "OnNew" and "onDocumentOpened". - That's why we must know, for which type of event the job was realy triggered .-) + can't differ between e.g. "OnNew" and "onDocumentOpened". + That's why we must know, for which type of event the job was really triggered .-) The information "sDocEvent" from this struct must be set on the member JobData::m_sEvent from outside user of such Jobdata structure. @@ -198,7 +198,7 @@ class JobData : private ThreadHelpBase /** the alias name of this job. Is used as entry of configuration set for job registration, to find all - neccessary properties of it.. + necessary properties of it.. */ ::rtl::OUString m_sAlias; @@ -232,7 +232,7 @@ class JobData : private ThreadHelpBase css::uno::Sequence< css::beans::NamedValue > m_lArguments; /** - after a job was sucessfully executed (by any outside code using our + after a job was successfully executed (by any outside code using our informations) it can return a result. This member make it part of this container too. So it can be used for further things. We use it also to update our internal state and the configuration diff --git a/framework/inc/jobs/jobexecutor.hxx b/framework/inc/jobs/jobexecutor.hxx index a2497d9a70c5..5aa643c44696 100644 --- a/framework/inc/jobs/jobexecutor.hxx +++ b/framework/inc/jobs/jobexecutor.hxx @@ -64,7 +64,7 @@ namespace framework{ @short implements a job executor, which can be triggered from any code @descr It uses the given trigger event to locate any registered job service inside the configuration and execute it. Of course it controls the - liftime of such jobs too. + lifetime of such jobs too. */ class JobExecutor : public css::lang::XTypeProvider , public css::lang::XServiceInfo diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx index 85a626d3a5f4..0676e4a0f20d 100644 --- a/framework/inc/jobs/jobresult.hxx +++ b/framework/inc/jobs/jobresult.hxx @@ -92,7 +92,7 @@ class JobResult : private ThreadHelpBase /** an user of us must know, which (possible) parts of - a "pure result" was realy set by an executed job. + a "pure result" was really set by an executed job. Means which other members of this class are valid. This mask can be used to find it out. */ diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx index 4a4ac4ecebc2..7a7eb86fe533 100644 --- a/framework/inc/jobs/joburl.hxx +++ b/framework/inc/jobs/joburl.hxx @@ -67,7 +67,7 @@ namespace framework{ @short can be used to parse, validate and work with job URL's @descr Job URLs are specified by the following syntax: vnd.sun.star.job:{[event=<name>]|[alias=<name>]|[service=<name>]} - This class can analyze this structure and seperate it into his different parts. + This class can analyze this structure and separate it into his different parts. After doing that these parts are accessible by the methods of this class. */ class JobURL : private ThreadHelpBase diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx index ef04c7d4417b..149b469fde1c 100644 --- a/framework/inc/jobs/shelljob.hxx +++ b/framework/inc/jobs/shelljob.hxx @@ -92,7 +92,7 @@ class ShellJob : private ThreadHelpBase /** @short does nothing real ... @descr But it should exists as virtual function, - so this class cant make trouble + so this class can't make trouble related to inline/symbols etcpp.! */ virtual ~ShellJob(); diff --git a/framework/inc/loadstate.h b/framework/inc/loadstate.h index d55c0e613abb..1010a26dc2a0 100644 --- a/framework/inc/loadstate.h +++ b/framework/inc/loadstate.h @@ -41,12 +41,12 @@ namespace framework{ /** These enum values specify all possible results of a load request. It doesn't matter, if this load operation used dispatch() or loadComponentFromURL(). - The meaning is everytime the same. + The meaning is every time the same. */ enum ELoadState { E_UNSPECIFIED = 0, // indicates the operation was not already started - E_SUCCESS = 1, // the load request was successfull + E_SUCCESS = 1, // the load request was successful E_IOERROR = 2, // there was an io error internaly E_INTERACTION = 3, // there was an interaction, which couldn't be handled (doesn't include IO interactions => see E_IOERROR before) E_FAILED = 4 // for unknown or unspecified errors diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx index 8f3cd54125a5..8f34d839890c 100644 --- a/framework/inc/macros/debug/assertion.hxx +++ b/framework/inc/macros/debug/assertion.hxx @@ -195,7 +195,7 @@ LOG_EXCEPTION( SMETHOD, SOWNMESSAGE, SEXCEPTIONMESSAGE ) Show some exception info by using current set output mode by define LOGTYPE! - We use a seperated scope {} do protect us against multiple variable definitions. + We use a separated scope {} do protect us against multiple variable definitions. _____________________________________________________________________________________________________________*/ #define LOG_EXCEPTION( SMETHOD, SOWNMESSAGE, SEXCEPTIONMESSAGE ) \ diff --git a/framework/inc/macros/debug/event.hxx b/framework/inc/macros/debug/event.hxx index 1949761c2cb5..c7d0b6c1639f 100644 --- a/framework/inc/macros/debug/event.hxx +++ b/framework/inc/macros/debug/event.hxx @@ -52,7 +52,7 @@ /*_____________________________________________________________________________________________________________ LOG_FRAMEACTIONEVENT( SFRAMETYPE, SFRAMENAME, AFRAMEACTION ) - Use this macro to print debug informations about sending of events to listener for controling right order. + Use this macro to print debug informations about sending of events to listener for controlling right order. ( Use new scope in macro to declare sBuffer more then on time in same "parentscope"! ) _____________________________________________________________________________________________________________*/ diff --git a/framework/inc/macros/debug/filterdbg.hxx b/framework/inc/macros/debug/filterdbg.hxx index 5ef6e920ac6f..f8cb43aac641 100644 --- a/framework/inc/macros/debug/filterdbg.hxx +++ b/framework/inc/macros/debug/filterdbg.hxx @@ -26,7 +26,7 @@ //************************************************************************************************************* // special macros for time measures -// 1) LOGFILE_FILTERDBG used it to define log file for this operations (default will be set automaticly) +// 1) LOGFILE_FILTERDBG used it to define log file for this operations (default will be set automatically) // 4) LOG_FILTERDBG write debug info to log file //************************************************************************************************************* diff --git a/framework/inc/macros/debug/memorymeasure.hxx b/framework/inc/macros/debug/memorymeasure.hxx index 1253154789d1..7d52ed2c15c1 100644 --- a/framework/inc/macros/debug/memorymeasure.hxx +++ b/framework/inc/macros/debug/memorymeasure.hxx @@ -26,7 +26,7 @@ //************************************************************************************************************* // special macros for time measures -// 1) LOGFILE_MEMORYMEASURE used it to define log file for this operations (default will be set automaticly) +// 1) LOGFILE_MEMORYMEASURE used it to define log file for this operations (default will be set automatically) // 2) MAKE_MEMORY_SNAPSHOT make snapshot of currently set memory informations of OS // 3) LOG_MEMORYMEASURE write measured time to logfile //************************************************************************************************************* diff --git a/framework/inc/macros/debug/timemeasure.hxx b/framework/inc/macros/debug/timemeasure.hxx index 012fba83dada..f6dea01ff899 100644 --- a/framework/inc/macros/debug/timemeasure.hxx +++ b/framework/inc/macros/debug/timemeasure.hxx @@ -26,7 +26,7 @@ //************************************************************************************************************* // special macros for time measures -// 1) LOGFILE_TIMEMEASURE used it to define log file for this operations (default will be set automaticly) +// 1) LOGFILE_TIMEMEASURE used it to define log file for this operations (default will be set automatically) // 2) START_TIMEMEASURE start new measure by using given variable names // 3) START_TIMEMEASURE stop current measure by using given variable names and return time // 4) LOG_TIMEMEASURE write measured time to logfile diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index f571ddb33cc2..e9e9d05960cb 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -66,7 +66,7 @@ namespace framework{ 1) DECLARE_XSERVICEINFO => use it to declare XServiceInfo in your header 2) DEFINE_XSERVICEINFO_MULTISERVICE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) => use it to define XServiceInfo for multi service mode 3) DEFINE_XSERVICEINFO_ONEINSTANCESERVICE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) => use it to define XServiceInfo for one instance service mode - 4) DEFINE_INIT_SERVICE( CLASS ) => use it to implement your own impl_initService() method, which is neccessary for initializeing object by using his own reference! + 4) DEFINE_INIT_SERVICE( CLASS ) => use it to implement your own impl_initService() method, which is necessary for initializeing object by using his own reference! _________________________________________________________________________________________________________________*/ diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx index ad8cbf85382c..0b8368566e36 100644 --- a/framework/inc/macros/xtypeprovider.hxx +++ b/framework/inc/macros/xtypeprovider.hxx @@ -314,8 +314,8 @@ ________________________________________________________________________________ // implementation of XTypeProvider //***************************************************************************************************************** // implementation of XTypeProvider without additional interface for getTypes() -// XTypeProvider is used as the only one interface automaticly. -// Following defines don't use XTypeProvider automaticly!!!! +// XTypeProvider is used as the only one interface automatically. +// Following defines don't use XTypeProvider automatically!!!! #define DEFINE_XTYPEPROVIDER_0( CLASS ) \ PRIVATE_DEFINE_XTYPEPROVIDER_PURE( CLASS ) diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h index c886f1d4551a..afa2a0a26a1b 100644 --- a/framework/inc/protocols.h +++ b/framework/inc/protocols.h @@ -41,7 +41,7 @@ namespace framework{ //_______________________________________________________________________ /** some protocols must be checked during loading or dispatching URLs manually - It can be neccessary to decide, if a URL represent a non visible content or + It can be necessary to decide, if a URL represent a non visible content or a real visible component. */ diff --git a/framework/inc/queries.h b/framework/inc/queries.h index 611a532bc2cd..fbc4d7350657 100644 --- a/framework/inc/queries.h +++ b/framework/inc/queries.h @@ -359,7 +359,7 @@ class QueryAnalyzer //--------------------------------------------------------------------------------------------------------- // access to additional parameter values - // Methods return default of realy set values! + // Methods return default of really set values! //--------------------------------------------------------------------------------------------------------- sal_uInt32 getIFlags () const { return m_nIFlags ; } sal_uInt32 getEFlags () const { return m_nEFlags ; } diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx index b226dc07fe41..555342583883 100644 --- a/framework/inc/recording/dispatchrecordersupplier.hxx +++ b/framework/inc/recording/dispatchrecordersupplier.hxx @@ -74,7 +74,7 @@ class DispatchRecorderSupplier : // interfaces public css::lang::XServiceInfo , public css::frame::XDispatchRecorderSupplier , // baseclasses - // Order is neccessary for right initialization! + // Order is necessary for right initialization! private ThreadHelpBase , public ::cppu::OWeakObject { @@ -86,7 +86,7 @@ class DispatchRecorderSupplier : // interfaces //_______________________________________ /** provided dispatch recorder of this supplier instance - @life Is controled from outside. Because this variable is setted + @life Is controlled from outside. Because this variable is setted from there and not created internaly. But we release our reference to it if we die. */ diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx index 91b5cfea10ec..96c1c72b3124 100644 --- a/framework/inc/services/autorecovery.hxx +++ b/framework/inc/services/autorecovery.hxx @@ -117,7 +117,7 @@ struct DispatchParams @descr If our dispatch() method was forced to start the internal operation asynchronous ... we send an event - to start and return immediatly. But we must be shure that + to start and return immediately. But we must be sure that our instance live if the event callback reach us. So we hold an uno reference to ourself. */ @@ -136,7 +136,7 @@ class AutoRecovery : public css::lang::XTypeProvider , public css::document::XEventListener // => css.lang.XEventListener , public css::util::XChangesListener // => css.lang.XEventListener , public css::util::XModifyListener // => css.lang.XEventListener - // attention! Must be the first base class to guarentee right initialize lock ... + // attention! Must be the first base class to guarantee right initialize lock ... , private ThreadHelpBase , public ::cppu::OBroadcastHelper , public ::cppu::OPropertySetHelper // => XPropertySet, XFastPropertySet, XMultiPropertySet @@ -174,9 +174,9 @@ class AutoRecovery : public css::lang::XTypeProvider /* FINAL STATES */ - /// the Auto/Emergency saved document isnt useable any longer + /// the Auto/Emergency saved document isn't useable any longer E_DAMAGED = 64, - /// the Auto/Emergency saved document isnt realy up-to-date (some changes can be missing) + /// the Auto/Emergency saved document isn't really up-to-date (some changes can be missing) E_INCOMPLETE = 128, /// the Auto/Emergency saved document was processed successfully E_SUCCEDED = 512 @@ -198,7 +198,7 @@ class AutoRecovery : public css::lang::XTypeProvider // TODO document me enum ETimerType { - /** the timer shouldnt be used next time */ + /** the timer shouldn't be used next time */ E_DONT_START_TIMER, /** timer (was/must be) started with normal AutoSaveTimeIntervall */ E_NORMAL_AUTOSAVE_INTERVALL, @@ -208,7 +208,7 @@ class AutoRecovery : public css::lang::XTypeProvider /** timer mst be started with a very(!) short time intervall, to poll for the end of an user action, which does not allow saving documents in general */ E_POLL_TILL_AUTOSAVE_IS_ALLOWED, - /** dont start the timer - but calls the same action then before immediatly again! */ + /** dont start the timer - but calls the same action then before immediately again! */ E_CALL_ME_BACK }; @@ -250,7 +250,7 @@ class AutoRecovery : public css::lang::XTypeProvider css::uno::Reference< css::frame::XModel > Document; //------------------------------- - /** @short knows, if the document is realy modified since the last autosave, + /** @short knows, if the document is really modified since the last autosave, or was postponed, because it was an active one etcpp... @descr Because we have no CHANGE TRACKING mechanism, based on office document, @@ -264,7 +264,7 @@ class AutoRecovery : public css::lang::XTypeProvider //------------------------------- /** Because our applications not ready for concurrent save requests at the same time, - we have supress our own AutoSave for the moment, a document will be already saved + we have suppress our own AutoSave for the moment, a document will be already saved by others. */ sal_Bool UsedForSaving; @@ -298,7 +298,7 @@ class AutoRecovery : public css::lang::XTypeProvider ::rtl::OUString AppModule; // e.g. com.sun.star.text.TextDocument - used to identify app module ::rtl::OUString FactoryService; // the service to create a document of the module ::rtl::OUString RealFilter; // real filter, which was used at loading time - ::rtl::OUString DefaultFilter; // supports saving of the default format without loosing data + ::rtl::OUString DefaultFilter; // supports saving of the default format without losing data ::rtl::OUString Extension; // file extension of the default filter ::rtl::OUString Title; // can be used as "DisplayName" on every recovery UI! ::com::sun::star::uno::Sequence< ::rtl::OUString > @@ -398,9 +398,9 @@ class AutoRecovery : public css::lang::XTypeProvider ListenerHash m_lListener; /** @descr This member is used to prevent us against re-entrance problems. - A mutex cant help to prevent us from concurrent using of members + A mutex can't help to prevent us from concurrent using of members inside the same thread. But e.g. our internaly used stl structures - are not threadsafe ... and furthermore they cant be used at the same time + are not threadsafe ... and furthermore they can't be used at the same time for iteration and add/remove requests! So we have to detect such states and ... show a warning. May be there will be a better solution next time ... (copying the cache temp. @@ -561,7 +561,7 @@ class AutoRecovery : public css::lang::XTypeProvider @descr ... but only keys related to the AutoSave mechanism. Means: State and Timer intervall. - E.g. the recovery list isnt adressed here. + E.g. the recovery list isn't addressed here. @throw [com.sun.star.uno.RuntimeException] if config could not be opened or readed successfully! @@ -705,7 +705,7 @@ class AutoRecovery : public css::lang::XTypeProvider /** @short save all current opened documents to a specific backup directory. - @descr Only realy changed documents will be saved here. + @descr Only really changed documents will be saved here. Further this method returns a suggestion, if and how it should be called again. May be some documents was not saved yet @@ -905,7 +905,7 @@ class AutoRecovery : public css::lang::XTypeProvider E.g. our svtools::ConfigItems() has to be flushed explicitly .-( - Note: This method cant fail. Flushing of config entries is an + Note: This method can't fail. Flushing of config entries is an optional feature. Errors can be ignored. */ void impl_flushALLConfigChanges(); @@ -961,14 +961,14 @@ class AutoRecovery : public css::lang::XTypeProvider a) An external progress is provided by our CrashSave or Recovery dialog. b) We must create our own progress e.g. for an AutoSave c) Sometimes our application filters dont use the progress - provided by the MediaDescriptor. They uses the Frame everytime to create + provided by the MediaDescriptor. They uses the Frame every time to create it's own progress. So we implemented a HACK for these and now we set an InterceptedProgress there for the time WE use this frame for loading/storing documents .-) @param xNewFrame must be set only in case WE create a new frame (e.g. for loading documents on session restore or recovery). Then search for a frame using rInfo.Document must - be supressed and xFrame must be preferred instead .-) + be suppressed and xFrame must be preferred instead .-) @param rInfo used e.g. to find the frame corresponding to a document. @@ -989,14 +989,14 @@ class AutoRecovery : public css::lang::XTypeProvider /** try to remove the specified file from disc. Every URL supported by our UCB component can be used here. - Further it doesnt matter if the file realy exists or not. + Further it doesn't matter if the file really exists or not. Because removing a non exsistent 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 feature. If we are not able doing so ... its not a real problem. Ok - users disc place will be samller then ... but we should produce - a crash during crash save because we cant delete a temporary file only ! + a crash during crash save because we can't delete a temporary file only ! @param sURL the url of the file, which should be removed. @@ -1005,10 +1005,10 @@ class AutoRecovery : public css::lang::XTypeProvider //--------------------------------------- /** try to remove ".lock" file from disc if office will be terminated - not using the offical way .-) + not using the official way .-) This method has to be handled "optional". So every error inside - has to be ignored ! This method CANT FAIL ... it can forget something only .-) + has to be ignored ! This method CAN'T FAIL ... it can forget something only .-) */ static void st_impl_removeLockFile(); }; diff --git a/framework/inc/services/backingcomp.hxx b/framework/inc/services/backingcomp.hxx index f2b724c31c04..09bfb440ec56 100644 --- a/framework/inc/services/backingcomp.hxx +++ b/framework/inc/services/backingcomp.hxx @@ -78,7 +78,7 @@ class BackingComp : public css::lang::XTypeProvider , public css::lang::XInitialization , public css::frame::XController // => XComponent , public css::awt::XKeyListener // => XEventListener - // attention! Must be the first base class to guarentee right initialize lock ... + // attention! Must be the first base class to guarantee right initialize lock ... , private ThreadHelpBase , public ::cppu::OWeakObject { diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx index 2760446b3d9e..399e9f6cca8a 100644 --- a/framework/inc/services/contenthandlerfactory.hxx +++ b/framework/inc/services/contenthandlerfactory.hxx @@ -106,7 +106,7 @@ class ContentHandlerFactory : // interfaces public css::container::XNameContainer , // => XNameReplace => XNameAccess => XElementAccess public css::util::XFlushable , // base classes - // Order is neccessary for right initialization of it! + // Order is necessary for right initialization of it! private ThreadHelpBase , private TransactionBase , public ::cppu::OWeakObject diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 0a019f479fe8..812e86f06724 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -144,7 +144,7 @@ class Desktop : // interfaces public css::task::XInteractionHandler , public css::frame::XUntitledNumbers , // base classes - // Order is neccessary for right initialization! + // Order is necessary for right initialization! private ThreadHelpBase , private TransactionBase , public ::cppu::OBroadcastHelper , @@ -186,7 +186,7 @@ class Desktop : // interfaces Btw: Desktop.terminate() was designed in the past to be used within an UI based envrionment. So it's allowed e.g. to - call XController.suspend() here. If UI isnt an option ... please + call XController.suspend() here. If UI isn't an option ... please use XCloseable.close() at these desktop implementation. ... if it will be supported in the future .-)) @@ -411,9 +411,9 @@ class Desktop : // interfaces * * Iterates over all child frames and try to close them. * Given parameter bAllowUI enable/disable showing any UI - * (which mostly occure on calling XController->suspend()). + * (which mostly occur on calling XController->suspend()). * - * These method doesnt stop if one frame could not be closed. + * These method doesn't stop if one frame could not be closed. * It will ignore such frames and try all other ones. * But it returns false in such case - true otherwise. * @@ -426,7 +426,7 @@ class Desktop : // interfaces //------------------------------------------------------------------------------------------------------------- // debug methods - // (should be private everytime!) + // (should be private every time!) //------------------------------------------------------------------------------------------------------------- #ifdef ENABLE_ASSERTIONS private: @@ -442,7 +442,7 @@ class Desktop : // interfaces //------------------------------------------------------------------------------------------------------------- // variables - // (should be private everytime!) + // (should be private every time!) //------------------------------------------------------------------------------------------------------------- private: @@ -476,7 +476,7 @@ class Desktop : // interfaces //--------------------------------------------------------------------- /** special terminate listener which loads images asynchronous for current open documents. - * Because internaly it uses blocking system APIs ... it cant be guaranteed that + * Because internaly it uses blocking system APIs ... it can't be guaranteed that * running jobs can be cancelled successfully if the corressponding document will be closed ... * it will not hinder those documents on closing. Instead it let all jobs running ... * but at least on terminate we have to wait for all those blocked requests. @@ -487,15 +487,15 @@ class Desktop : // interfaces //--------------------------------------------------------------------- /** special terminate listener shuting down the SfxApplication. * Because these desktop instance closes documents and informs listener - * only ... it does not realy shutdown the whole application. + * only ... it does not really shutdown the whole application. * * Btw: That wouldnt be possible by design ... because Desktop.terminate() - * has to return a boolean value about success ... it cant realy shutdown the + * has to return a boolean value about success ... it can't really shutdown the * process .-) * * So we uses a trick: A special listener (exactly these one here) listen for notifyTermination() * and shutdown the process asynchronous. But desktop has to make this special - * notification as realy last one ... Otherwhise it can happen that asynchronous + * notification as really last one ... Otherwise it can happen that asynchronous * shutdown will be faster then all other code around Desktop.terminate() .-)) */ css::uno::Reference< css::frame::XTerminateListener > m_xSfxTerminator; diff --git a/framework/inc/services/detectorfactory.hxx b/framework/inc/services/detectorfactory.hxx index 405fc7514601..96c7de307b37 100644 --- a/framework/inc/services/detectorfactory.hxx +++ b/framework/inc/services/detectorfactory.hxx @@ -93,7 +93,7 @@ class DetectorFactory : // interfaces public css::container::XNameContainer , // => XNameReplace => XNameAccess => XElementAccess public css::util::XFlushable , // base classes - // Order is neccessary for right initialization of it! + // Order is necessary for right initialization of it! private ThreadHelpBase , public ::cppu::OWeakObject { @@ -361,7 +361,7 @@ class DetectorFactory : // interfaces /** @short check if searched entry exist inside this container. @attention In multithreaded environments it's not guaranteed, that a - queried item exist next time realy! It can be deleted by + queried item exist next time really! It can be deleted by another thread ... @param sName @@ -378,7 +378,7 @@ class DetectorFactory : // interfaces /** @short return the uno type, which is used for all container items. - @return Type of sequence< com::sun::star::beans::PropertyValue > everytime - because it's fix. + @return Type of sequence< com::sun::star::beans::PropertyValue > every time - because it's fix. */ virtual css::uno::Type SAL_CALL getElementType() @@ -406,8 +406,8 @@ class DetectorFactory : // interfaces Calling of flush() will do that. At the same time all currently registered flush listener will be informed, so they can update her structures too. - Note: Before all these operations are started realy, all changes will be - verified and if neccessary some corrections will be done. + Note: Before all these operations are started really, all changes will be + verified and if necessary some corrections will be done. In case the cache will be invalid and could not be repaired an exception is thrown! Normaly this container will not work correctly afterwards ... diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx index c03747e51709..72e9061cfdc3 100644 --- a/framework/inc/services/frame.hxx +++ b/framework/inc/services/frame.hxx @@ -94,7 +94,7 @@ namespace framework{ // exported const //_________________________________________________________________________________________________________________ -// This enum can be used to set differnt active states of frames +// This enum can be used to set different active states of frames enum EActiveState { E_INACTIVE , // I'am not a member of active path in tree and i don't have the focus. @@ -152,7 +152,7 @@ class Frame : // interfaces public css::frame::XTitle , public css::frame::XTitleChangeBroadcaster , // base classes - // Order is neccessary for right initialization of this class! + // Order is necessary for right initialization of this class! public ThreadHelpBase , public TransactionBase , public PropertySetHelper , // helper implements ThreadHelpbase, TransactionBase, XPropertySet, XPropertySetInfo diff --git a/framework/inc/services/frameloaderfactory.hxx b/framework/inc/services/frameloaderfactory.hxx index 4ed165c1e173..9ebd6cab93e9 100644 --- a/framework/inc/services/frameloaderfactory.hxx +++ b/framework/inc/services/frameloaderfactory.hxx @@ -248,14 +248,14 @@ class FrameLoaderFactory : public ThreadHelpBase @param - @return A list of well known loader. Is static at runtime! - @onerror No error should occure. + @onerror No error should occur. *//*-*****************************************************************************************************/ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw( css::uno::RuntimeException ); /*-****************************************************************************************************//** @short check if searched frame loader exist in configuration - @descr Normaly nobody need these method realy (use getElementNames() in combination with getByName()). + @descr Normaly nobody needs really these method (use getElementNames() in combination with getByName()). We guarantee correctness of these mechanism. There is no reason to check for existing elements then ... but if you have an unknwon name and has no fun to search it in returned sequence ... you can call these ... @@ -266,7 +266,7 @@ class FrameLoaderFactory : public ThreadHelpBase @param "sName", implementation name of searched frame loader @return sal_True if loader exist, sal_False otherwise. - @onerror No error should occure. + @onerror No error should occur. *//*-*****************************************************************************************************/ virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& sName ) throw( css::uno::RuntimeException ); @@ -277,14 +277,14 @@ class FrameLoaderFactory : public ThreadHelpBase /*-****************************************************************************************************//** @short return the type of retrun value of method XNameAccess::getByName() - @descr In these implementation its a Sequence< PropertyValue > everytime! + @descr In these implementation its a Sequence< PropertyValue > every time! @seealso description of interface XNameAccess @param - @return Type of Sequence< PropertyValue >. - @onerror No error should occure. + @onerror No error should occur. *//*-*****************************************************************************************************/ virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException ); @@ -299,7 +299,7 @@ class FrameLoaderFactory : public ThreadHelpBase @param - @return sal_True if information available, sal_False otherwise. - @onerror No error should occure. + @onerror No error should occur. *//*-*****************************************************************************************************/ virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException ); @@ -329,7 +329,7 @@ class FrameLoaderFactory : public ThreadHelpBase @param "pLoaderInfo" configuration structure of these loader. @return - - @onerror No error should occure. + @onerror No error should occur. *//*-*****************************************************************************************************/ void impl_initializeLoader( css::uno::Reference< css::uno::XInterface >& xLoader, const Loader& pLoaderInfo ); diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index a653ded3873a..287f4fb1d563 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -101,7 +101,7 @@ namespace framework typedef ::comphelper::OPropertyContainer LayoutManager_PBase; class LayoutManager : public LayoutManager_Base , // base classes - // Order is neccessary for right initialization! + // Order is necessary for right initialization! private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::OBroadcastHelper , public ILayoutNotifications , diff --git a/framework/inc/services/license.hxx b/framework/inc/services/license.hxx index 29aacc5db5e9..c0a291bc7d38 100644 --- a/framework/inc/services/license.hxx +++ b/framework/inc/services/license.hxx @@ -68,7 +68,7 @@ namespace framework public css::task::XJob , public css::util::XCloseable , // base classes - // Order is neccessary for right initialization! + // Order is necessary for right initialization! private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. public ::cppu::OWeakObject // => XWeak, XInterface { diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx index 8b9089ff4590..ec025ae082e5 100644 --- a/framework/inc/services/logindialog.hxx +++ b/framework/inc/services/logindialog.hxx @@ -372,7 +372,7 @@ class cIMPL_Dialog : public ModalDialog @descr This dialog need his own ressource. We can't use the global ressource manager! We must use our own. You must give us the ressource language. If no right ressource could be found - - any existing one is used automaticly! + any existing one is used automatically! @seealso method setValues() @@ -445,7 +445,7 @@ class LoginDialog : public XTYPEPROVIDER , public XSERVICEINFO , public XDIALOG , public XFLUSHABLE , - private ThreadHelpBase , // Order of baseclasses is neccessary for right initialization! + private ThreadHelpBase , // Order of baseclasses is necessary for right initialization! public OBROADCASTHELPER , public OPROPERTYSETHELPER , public OWEAKOBJECT @@ -502,7 +502,7 @@ class LoginDialog : public XTYPEPROVIDER , /*-****************************************************************************************************//** @short write changed values to configuration - @descr Normaly the dialog returns with an OK or ERROR value. If OK occure - we flush data + @descr Normaly the dialog returns with an OK or ERROR value. If OK occur - we flush data auomaticly. But otherwise we do nothing. If user of this service wish to use property set only without any UI(!) - he must call "flush()" explicitly to write data! @@ -597,7 +597,7 @@ class LoginDialog : public XTYPEPROVIDER , Don't use this directly! You must try to convert the value of given propertyhandle and return results of this operation. This will be use to ask vetoable - listener. If no listener have a veto, we will change value realy! + listener. If no listener have a veto, we will change value really! ( in method setFastPropertyValue_NoBroadcast(...) ) @seealso class OPropertySetHelper @@ -623,7 +623,7 @@ class LoginDialog : public XTYPEPROVIDER , @descr This method is calling from helperclass "OPropertySetHelper". Don't use this directly! Handle and value are valid everyway! You must set the new value only. - After this, baseclass send messages to all listener automaticly. + After this, baseclass send messages to all listener automatically. @seealso OPropertySetHelper @@ -708,7 +708,7 @@ class LoginDialog : public XTYPEPROVIDER , /*-****************************************************************************************************//** @short helper method to check if a property will change his value - @descr Is neccessary for vetoable listener mechanism of OPropertySethelper. + @descr Is necessary for vetoable listener mechanism of OPropertySethelper. @seealso - @@ -803,9 +803,9 @@ class LoginDialog : public XTYPEPROVIDER , /*-****************************************************************************************************//** @short helper methods to read/write properties from/to ini file - @descr Using of Config-Class isn't easy everytime :-( - Thats the reason for these helper. State of operation isn't realy important .. - but we assert impossible cases or occured errors! + @descr Using of Config-Class isn't easy every time :-( + Thats the reason for these helper. State of operation isn't really important .. + but we assert impossible cases or occurred errors! @seealso - diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx index aa2b8d55cd0e..8a4bbaa83ac5 100644 --- a/framework/inc/services/modulemanager.hxx +++ b/framework/inc/services/modulemanager.hxx @@ -64,7 +64,7 @@ class ModuleManager : public css::lang::XTypeProvider , public css::frame::XModuleManager , public css::container::XNameReplace // => XNameAccess, XElementAccess , public css::container::XContainerQuery - // attention! Must be the first base class to guarentee right initialize lock ... + // attention! Must be the first base class to guarantee right initialize lock ... , private ThreadHelpBase , public ::cppu::OWeakObject { @@ -154,7 +154,7 @@ class ModuleManager : public css::lang::XTypeProvider Note: A writable configuration access must be created explicitly. Otherwise - we cant make sure that broken write requests + we can't make sure that broken write requests wont affect our read access ! @return [com.sun.star.container.XNameAccess] diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx index 5a47393e9df7..a988c703876c 100644 --- a/framework/inc/services/pathsettings.hxx +++ b/framework/inc/services/pathsettings.hxx @@ -67,7 +67,7 @@ class PathSettings : public css::lang::XTypeProvider , public css::lang::XServiceInfo , public css::util::XChangesListener , // => XEventListener // base classes - // Order is neccessary for right initialization! + // Order is necessary for right initialization! private ThreadHelpBase , public ::cppu::OBroadcastHelper , public ::cppu::OPropertySetHelper , // => XPropertySet / XFastPropertySet / XMultiPropertySet @@ -113,7 +113,7 @@ class PathSettings : public css::lang::XTypeProvider , /// this special path is used to generate feature depending content there ::rtl::OUString sWritePath; - /// indicates real single pathes, which uses WritePath property only + /// indicates real single paths, which uses WritePath property only sal_Bool bIsSinglePath; /// simple handling of finalized/mandatory states ... => we know one state READONLY only .-) @@ -164,7 +164,7 @@ class PathSettings : public css::lang::XTypeProvider , public: /** initialize a new instance of this class. - Attention: It's neccessary for right function of this class, that the order of base + Attention: It's necessary for right function of this class, that the order of base classes is the right one. Because we transfer information from one base to another during this ctor runs! */ PathSettings(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); @@ -227,7 +227,7 @@ class PathSettings : public css::lang::XTypeProvider , sal_Bool bReSubst); - /** converts our new string list schema to the old ";" seperated schema ... */ + /** converts our new string list schema to the old ";" separated schema ... */ ::rtl::OUString impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath ) const; OUStringList impl_convertOldStyle2Path(const ::rtl::OUString& sOldStylePath) const; diff --git a/framework/inc/services/pluginframe.hxx b/framework/inc/services/pluginframe.hxx index 555cc19718c5..3673d6df1dcf 100644 --- a/framework/inc/services/pluginframe.hxx +++ b/framework/inc/services/pluginframe.hxx @@ -80,7 +80,7 @@ namespace framework{ class PlugInFrame : public css::lang::XInitialization , public css::mozilla::XPluginInstance , public css::frame::XDispatchResultListener , // => XEVENTLISTENER - public Frame // Order of baseclasses is neccessary for right initialization! + public Frame // Order of baseclasses is necessary for right initialization! { //------------------------------------------------------------------------------------------------------------- // public methods @@ -268,7 +268,7 @@ class PlugInFrame : public css::lang::XInitialization , sal_Bool m_bILoad ; /// PlugInFrame has a valid loader which load the document and wait for finished/cancelled sal_Bool m_bIHaveDocument ; /// We have a document loaded successful. css::uno::Reference< css::frame::XDispatchProvider > m_xPlugInDispatcher ; /// Dispatcher to forward dispatches to browser - static sal_Bool m_bRemoteFactoriesExist ; /// indicates, if remote factories was already registered (neccessary one times only!) + static sal_Bool m_bRemoteFactoriesExist ; /// indicates, if remote factories was already registered (necessary one times only!) SvtCommandOptions m_aCommandOptions ; /// ref counted class to support disabling commands defined by configuration file }; // class PlugInFrame diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index b6234cf7a54f..8604e61dac3c 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -188,7 +188,7 @@ enum PreDefVariable PREDEFVAR_PROGURL, PREDEFVAR_USERURL, PREDEFVAR_WORKDIRURL, - // --> PB 2004-10-27 #i32656# - new variable of hierachy service + // --> PB 2004-10-27 #i32656# - new variable of hierarchy service PREDEFVAR_BASEINSTURL, PREDEFVAR_USERDATAURL, // <-- diff --git a/framework/inc/services/task.hxx b/framework/inc/services/task.hxx index 731e783f83f2..f97cabd1712e 100644 --- a/framework/inc/services/task.hxx +++ b/framework/inc/services/task.hxx @@ -77,7 +77,7 @@ namespace framework{ *//*-*************************************************************************************************************/ class Task : public css::frame::XTask , // => XFrame => XComponent - public Frame // Order of baseclasses is neccessary for right initialization! + public Frame // Order of baseclasses is necessary for right initialization! { //------------------------------------------------------------------------------------------------------------- // public methods @@ -429,7 +429,7 @@ class Task : public css::frame::XTask , // => XFrame => XComponent Don't use this directly! You must try to convert the value of given propertyhandle and return results of this operation. This will be use to ask vetoable - listener. If no listener have a veto, we will change value realy! + listener. If no listener have a veto, we will change value really! ( in method setFastPropertyValue_NoBroadcast(...) ) @seealso OPropertySetHelper @@ -455,7 +455,7 @@ class Task : public css::frame::XTask , // => XFrame => XComponent @descr This method is calling from helperclass "OPropertySetHelper". Don't use this directly! Handle and value are valid everyway! You must set the new value only. - After this, baseclass send messages to all listener automaticly. + After this, baseclass send messages to all listener automatically. @seealso OPropertySetHelper diff --git a/framework/inc/services/taskcreatorsrv.hxx b/framework/inc/services/taskcreatorsrv.hxx index 4533ca542534..d7f8f3015e18 100644 --- a/framework/inc/services/taskcreatorsrv.hxx +++ b/framework/inc/services/taskcreatorsrv.hxx @@ -62,7 +62,7 @@ namespace framework class TaskCreatorService : public css::lang::XTypeProvider , public css::lang::XServiceInfo , public css::lang::XSingleServiceFactory - // attention! Must be the first base class to guarentee right initialize lock ... + // attention! Must be the first base class to guarantee right initialize lock ... , private ThreadHelpBase , public ::cppu::OWeakObject { @@ -99,7 +99,7 @@ class TaskCreatorService : public css::lang::XTypeProvider static const ::rtl::OUString ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE; /** [sal_Bool] enable/disable special mode, where the title bar of our - the new created frame will be updated automaticly. + the new created frame will be updated automatically. Default = ON ! */ static const ::rtl::OUString ARGUMENT_ENABLE_TITLEBARUPDATE; diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index ba1dbc8de6da..72f4a1fb22bc 100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h @@ -104,7 +104,7 @@ struct KeyEventEqualsFunc /** Basic string list based on a std::vector() - It implements some additional funtionality which can be usefull but + It implements some additional funtionality which can be useful but is missing at the normal vector implementation. */ class OUStringList : public ::comphelper::SequenceAsVector< ::rtl::OUString > @@ -128,7 +128,7 @@ class OUStringList : public ::comphelper::SequenceAsVector< ::rtl::OUString > return ::std::find(begin(), end(), sElement); } - // the only way to free used memory realy! + // the only way to free used memory really! void free() { OUStringList().swap( *this ); @@ -139,7 +139,7 @@ class OUStringList : public ::comphelper::SequenceAsVector< ::rtl::OUString > /** Basic string queue based on a std::queue() - It implements some additional funtionality which can be usefull but + It implements some additional funtionality which can be useful but is missing at the normal std implementation. */ typedef ::std::queue< ::rtl::OUString > OUStringQueue; @@ -148,7 +148,7 @@ typedef ::std::queue< ::rtl::OUString > OUStringQueue; /** Basic hash based on a std::hash_map() which provides key=[OUString] and value=[template type] pairs - It implements some additional funtionality which can be usefull but + It implements some additional funtionality which can be useful but is missing at the normal hash implementation. */ template< class TType > @@ -159,7 +159,7 @@ class BaseHash : public ::std::hash_map< ::rtl::OUString , { public: - // the only way to free used memory realy! + // the only way to free used memory really! void free() { BaseHash().swap( *this ); diff --git a/framework/inc/threadhelp/fairrwlock.hxx b/framework/inc/threadhelp/fairrwlock.hxx index 1979e8926d8d..f815c7afe8d7 100644 --- a/framework/inc/threadhelp/fairrwlock.hxx +++ b/framework/inc/threadhelp/fairrwlock.hxx @@ -85,7 +85,7 @@ class FairRWLock : public IRWLock @short standard ctor @descr Initialize instance with right start values for correct working. no reader could exist => m_nReadCount = 0 - don't block first comming writer => m_aWriteCondition.set() + don't block first coming writer => m_aWriteCondition.set() @seealso - @@ -231,7 +231,7 @@ class FairRWLock : public IRWLock @attention 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 really implemented ... because acquiring new access will be the same - there no differences! @seealso - diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx index d081b2e7183d..0a4aad96f83b 100644 --- a/framework/inc/threadhelp/gate.hxx +++ b/framework/inc/threadhelp/gate.hxx @@ -165,7 +165,7 @@ class Gate : public IGate @short open gate for current waiting threads @descr All current waiting threads stand in wait() at line "m_aPassage.wait()" ... With this call you can open the passage for these waiting ones. - The "gap" is closed by any new thread which call wait() automaticly! + The "gap" is closed by any new thread which call wait() automatically! @seealso method wait() @seealso method open() diff --git a/framework/inc/threadhelp/inoncopyable.h b/framework/inc/threadhelp/inoncopyable.h index 7fa18d1e22c4..da05ec905ac4 100644 --- a/framework/inc/threadhelp/inoncopyable.h +++ b/framework/inc/threadhelp/inoncopyable.h @@ -52,8 +52,8 @@ namespace framework{ /*-************************************************************************************************************//** @descr Use this as one of your base classes to disable - all possiblities to copy or assign one object to another one! - We declare neccessary functions private to do so. + all possibilities to copy or assign one object to another one! + We declare necessary functions private to do so. *//*-*************************************************************************************************************/ class INonCopyable { diff --git a/framework/inc/threadhelp/itransactionmanager.h b/framework/inc/threadhelp/itransactionmanager.h index 1ca85c2de4ac..03d966f8be3c 100644 --- a/framework/inc/threadhelp/itransactionmanager.h +++ b/framework/inc/threadhelp/itransactionmanager.h @@ -44,7 +44,7 @@ namespace framework{ /*-************************************************************************************************************//** @descr Describe different states of a feature of following implementation. - During live time of an object different working states occure: + During live time of an object different working states occur: initialization - working - closing - closed If you whish to implement thread safe classes you should use these feature to protect your code against calls at wrong time. e.g. you are not full initialized but somewhere @@ -113,7 +113,7 @@ enum EExceptionMode /*-************************************************************************************************************//** @descr How can you use the transaction manager? Use it in combination with an TransactionGuard, which register your transaction in ctor - and release in dtor automaticly! Follow interface class can be used to make using + and release in dtor automatically! Follow interface class can be used to make using of different manager implmentations possible by using same guard. *//*-*************************************************************************************************************/ class ITransactionManager diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx index d79bd689146c..b6d49e68d683 100644 --- a/framework/inc/threadhelp/lockhelper.hxx +++ b/framework/inc/threadhelp/lockhelper.hxx @@ -79,12 +79,12 @@ enum ELockType @short helper to set right lock in right situation @descr This helper support different types of locking: a) no locks - transparent for user! - This could be usefull for simluation or single threaded environments! + This could be useful for simluation or single threaded environments! b) own mutex - An object use his own osl-mutex to be threadsafe. Usefull for easy and exclusiv locking. + An object use his own osl-mutex to be threadsafe. Useful for easy and exclusiv locking. c) solar mutex An object use our solar mutex and will be a part of a greater safed "threadsafe code block". - Could be usefull for simulation and testing of higher modules! + Could be useful for simulation and testing of higher modules! d) fair rw-lock An object use an implementation of a fair rw-lock. This increase granularity of t hreadsafe mechanism and should be used for high performance threadsafe code! @@ -153,10 +153,10 @@ class FWI_DLLPUBLIC LockHelper : public IMutex // ... or the solarmuex as "m_pSolarMutex" (must be set from outside! because some components must be vcl-free!) // ... but sometimes you need a shareable osl mutex! // In this case you has some problems: i ) If your lock type is set to E_OWNMUTEX => it's easy; you can use your member "m_pOwnMutex" - it's a osl mutex. - // Creation and using of "m_pShareableOslMutex" isn't neccessary! + // Creation and use of "m_pShareableOslMutex" isn't necessary! // ii ) Otherwise you have no osl mutex ... so you must create "m_pShareableOslMutex" and use it twice! - // In this case you must lock two member everytime - "m_pShareableMutex" AND "m_pFairRWLock" or "m_pSolarMutex" or ... - // It isn't realy fine - but the only possible way. + // In this case you must lock two members every time - "m_pShareableMutex" AND "m_pFairRWLock" or "m_pSolarMutex" or ... + // It isn't really fine - but the only possible way. // iii) There exist another special case - E_NOTHING is set! Then we should create this shareable mutex ... // nad you can use it ... but this implmentation ignore it. //------------------------------------------------------------------------------------------------------------- diff --git a/framework/inc/threadhelp/readguard.hxx b/framework/inc/threadhelp/readguard.hxx index 8abd10eb0190..61e943b47da3 100644 --- a/framework/inc/threadhelp/readguard.hxx +++ b/framework/inc/threadhelp/readguard.hxx @@ -63,7 +63,7 @@ namespace framework{ @descr This guard should be used to set a lock for reading object internal member. Nobody can control it but don't use member after successfuly locking for writing! We never need a own mutex to safe our internal member access - because - a guard is used as function-local member only. There exist no multithreaded access to it realy ... + a guard is used as function-local member only. There exists no multithreaded access to it really ... @attention a) To prevent us against wrong using, the default ctor, copy ctor and the =operator are maked private! b) Use interface "IRWLock" of set LockHelper only - because we must support a finer granularity of locking. @@ -111,7 +111,7 @@ class ReadGuard : private INonCopyable /*-****************************************************************************************************//** @short dtor - @descr We unlock the used lock member automaticly if user forget it. + @descr We unlock the used lock member automatically if user forgets it. @seealso - @@ -148,7 +148,7 @@ class ReadGuard : private INonCopyable /*-****************************************************************************************************//** @short unset read lock @descr Call this method to unlock the rw-lock temp.! - Normaly we do it at dtor automaticly for you ... + Normaly we do it at dtor automatically for you ... @seealso method lock() @@ -173,7 +173,7 @@ class ReadGuard : private INonCopyable /*-****************************************************************************************************//** @short disable using of these functions! - @descr It's not allowed to use this methods. Different problem can occure otherwise. + @descr It's not allowed to use this methods. Different problems can occur otherwise. Thats why we disable it by make it private. @seealso other ctor diff --git a/framework/inc/threadhelp/resetableguard.hxx b/framework/inc/threadhelp/resetableguard.hxx index 5dfe0dced88d..556b46f43300 100644 --- a/framework/inc/threadhelp/resetableguard.hxx +++ b/framework/inc/threadhelp/resetableguard.hxx @@ -84,7 +84,7 @@ class ResetableGuard : private INonCopyable /*-****************************************************************************************************//** @short ctors @descr Use these ctor methods to initialize the guard right. - Given lock reference must be valid - otherwise crashes could occure! + Given lock reference must be valid - otherwise crashes could occur! @seealso - @@ -169,7 +169,7 @@ class ResetableGuard : private INonCopyable /*-****************************************************************************************************//** @short disable using of these functions! - @descr It's not allowed to use this methods. Different problem can occure otherwise. + @descr It's not allowed to use this methods. Different problems can occur otherwise. Thats why we disable it by make it private. @seealso other ctor diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx index f62037d293b5..d2a86ae9e9c8 100644 --- a/framework/inc/threadhelp/transactionguard.hxx +++ b/framework/inc/threadhelp/transactionguard.hxx @@ -58,9 +58,9 @@ namespace framework{ @descr If you whish to support non breakable method calls without lockingf any mutex, rw-lock or something like that - you should use this guard implementation. Initialize it at first in your method and don't release it till end of your function! - Your "transaction" is registered in ctor and automaticly released in dtor. + Your "transaction" is registered in ctor and automatically released in dtor. Use set/get of working mode to enable/disable further transactions. - It's possible too, to enable automaticly throwing of some exceptions for illegal + It's possible too, to enable automatically throwing of some exceptions for illegal transaction requests ... e.g. interface call for already disposed objects. @attention To prevent us against wrong using, the default ctor, copy ctor and the =operator are maked private! @@ -80,9 +80,9 @@ class TransactionGuard : private INonCopyable /*-****************************************************************************************************//** @short ctors @descr Use these ctor methods to initialize the guard right. - Given reference must be valid - otherwise crashes could occure! + Given reference must be valid - otherwise crashes could occur! - @attention It's not neccessary to lock any mutex here! Because a ctor should not be called + @attention It's not necessary to lock any mutex here! Because a ctor should not be called from different threads at the same time ... this class use no refcount mechanism! @seealso - @@ -158,7 +158,7 @@ class TransactionGuard : private INonCopyable /*-****************************************************************************************************//** @short disable using of these functions! - @descr It's not allowed to use this methods. Different problem can occure otherwise. + @descr It's not allowed to use this methods. Different problems can occur otherwise. Thats why we disable it by make it private. @seealso other ctor diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx index b363788ea581..d911edf50614 100644 --- a/framework/inc/threadhelp/transactionmanager.hxx +++ b/framework/inc/threadhelp/transactionmanager.hxx @@ -67,7 +67,7 @@ namespace framework{ synchronization like e.g. mutex, rw-lock! That protect your code against wrong calls at wrong time ... e.g. calls after disposing an object! Use combination of EExceptionMode and ERejectReason to detect rejected requests - and react for it. You can enable automaticly throwing of exceptions too. + and react for it. You can enable automatically throwing of exceptions too. @implements ITransactionManager @base INonCopyable diff --git a/framework/inc/threadhelp/writeguard.hxx b/framework/inc/threadhelp/writeguard.hxx index 5fb442dddc92..a8b99460b7bf 100644 --- a/framework/inc/threadhelp/writeguard.hxx +++ b/framework/inc/threadhelp/writeguard.hxx @@ -61,7 +61,7 @@ namespace framework{ @short implement a guard to set write locks @descr This guard should be used to set a lock for reading AND writing object internal member. We never need a own mutex to safe our internal member access - because - a guard is used as function-local member only. There exist no multithreaded access to it realy ... + a guard is used as function-local member only. There exist no multithreaded access to it really ... @attention a) To prevent us against wrong using, the default ctor, copy ctor and the =operator are maked private! b) Use interface "IRWLock" of set LockHelper only - because we must support a finer granularity of locking. @@ -109,7 +109,7 @@ class WriteGuard : private INonCopyable /*-****************************************************************************************************//** @short dtor - @descr We unlock the used lock member automaticly if user forget it. + @descr We unlock the used lock member automatically if user forget it. @seealso - @@ -160,7 +160,7 @@ class WriteGuard : private INonCopyable /*-****************************************************************************************************//** @short unset write lock @descr Call this method to unlock the rw-lock temp.! - Normaly we do it at dtor automaticly for you ... + Normaly we do it at dtor automatically for you ... @seealso method lock() @@ -175,7 +175,7 @@ class WriteGuard : private INonCopyable { case E_READLOCK : { // User has downgraded to a read lock before! - // => There isn't realy a write lock ... + // => There isn't really a write lock ... m_pLock->releaseReadAccess(); m_eMode = E_NOLOCK; } @@ -219,7 +219,7 @@ class WriteGuard : private INonCopyable @param - @return Current set lock mode. - @onerror No error should occure. + @onerror No error should occur. *//*-*****************************************************************************************************/ inline ELockMode getMode() const { @@ -233,7 +233,7 @@ class WriteGuard : private INonCopyable /*-****************************************************************************************************//** @short disable using of these functions! - @descr It's not allowed to use this methods. Different problem can occure otherwise. + @descr It's not allowed to use this methods. Different problem can occur otherwise. Thats why we disable it by make it private. @seealso other ctor diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx index 763ee3357cf1..a5ec9f09dae2 100644 --- a/framework/inc/uifactory/uielementfactorymanager.hxx +++ b/framework/inc/uifactory/uielementfactorymanager.hxx @@ -62,7 +62,7 @@ namespace framework class ConfigurationAccess_FactoryManager : // interfaces // baseclasses - // Order is neccessary for right initialization! + // Order is necessary for right initialization! private ThreadHelpBase , public ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener> { diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx index 172b39e2e8f1..5468b9450ff0 100644 --- a/framework/inc/xml/acceleratorconfigurationreader.hxx +++ b/framework/inc/xml/acceleratorconfigurationreader.hxx @@ -126,7 +126,7 @@ class AcceleratorConfigurationReader : public css::xml::sax::XDocumentHandler /** @short provide informations abou the parsing state. @descr We use it to find out the line and column, where - an error occure. + an error occur. */ css::uno::Reference< css::xml::sax::XLocator > m_xLocator; |