diff options
Diffstat (limited to 'framework')
204 files changed, 833 insertions, 809 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; diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java index daa0d586e397..dda68f17fdc2 100644 --- a/framework/qa/complex/XUserInputInterception/EventTest.java +++ b/framework/qa/complex/XUserInputInterception/EventTest.java @@ -415,7 +415,7 @@ public class EventTest { return true; } /** - * This event does nothing usefull + * This event does nothing useful * @param oEvent refers to the object that fired the event. */ public void disposing( EventObject oEvent ){ @@ -451,7 +451,7 @@ public class EventTest { return true; } /** - * This event does nothing usefull + * This event does nothing useful * @param oEvent refers to the object that fired the event. */ public void disposing( EventObject oEvent ){ diff --git a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java index 953e7b0c5ac5..77da45516894 100644 --- a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java +++ b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java @@ -123,7 +123,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor } catch (com.sun.star.uno.Exception ex) { - // something strange has happend! + // something strange has happened! } catch (java.lang.Throwable ex) { diff --git a/framework/qa/complex/dispatches/Interceptor.java b/framework/qa/complex/dispatches/Interceptor.java index c4fb088a2a7c..d41b6ba59dee 100644 --- a/framework/qa/complex/dispatches/Interceptor.java +++ b/framework/qa/complex/dispatches/Interceptor.java @@ -90,7 +90,7 @@ public class Interceptor implements XDispatchProvider, /** counts calls of setSlave...(). So the outside API test can use this value to know if this interceptor - was realy added to the interceptor chain of OOo. + was really added to the interceptor chain of OOo. */ private int m_nRegistrationCount = 0; @@ -260,7 +260,7 @@ public class Interceptor implements XDispatchProvider, // ____________________ /** set a new list of URL's, which should be used on registration time - (that's why it's neccessary to call this impl-method before the interceptor + (that's why it's necessary to call this impl-method before the interceptor is used at the OOo API!) to optimize the interception chain. */ public synchronized void setURLs4InterceptionInfo(String[] lURLs) @@ -271,7 +271,7 @@ public class Interceptor implements XDispatchProvider, // ____________________ /** set a new list of URL's, which should be blocked by this interceptor. - (that's why it's neccessary to call this impl-method before the interceptor + (that's why it's necessary to call this impl-method before the interceptor is used at the OOo API!) */ public synchronized void setURLs4URLs4Blocking(String[] lURLs) diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java index fd93a8029841..270a89fffbbc 100644 --- a/framework/qa/complex/dispatches/checkdispatchapi.java +++ b/framework/qa/complex/dispatches/checkdispatchapi.java @@ -125,7 +125,7 @@ public class checkdispatchapi } catch (java.lang.Throwable ex) { - fail("Cant initialize test environment."); + fail("Can't initialize test environment."); } } @@ -258,7 +258,7 @@ public class checkdispatchapi public void checkInterceptorLifeTime() { // Note: It's important for the following test, that aInterceptor will be hold alive by the uno reference - // xInterceptor. Otherwhise we cant check some internal states of aInterceptor at the end of this method, because + // xInterceptor. Otherwise we can't check some internal states of aInterceptor at the end of this method, because // it was already killed .-) Interceptor aInterceptor = new Interceptor(); @@ -283,7 +283,7 @@ public class checkdispatchapi if (bIsRegistered) { - fail("Interceptor was not deregistered automaticly on closing the corresponding frame."); + fail("Interceptor was not deregistered automatically on closing the corresponding frame."); } System.out.println("Destruction of interception chain works as designed .-)"); diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java index 2bd97f45bea6..8b3da1a541b7 100644 --- a/framework/qa/complex/framework/autosave/AutoSave.java +++ b/framework/qa/complex/framework/autosave/AutoSave.java @@ -317,7 +317,7 @@ public class AutoSave { m_aLog.log(Protocol.TYPE_WARNING , "got IOException on calling doc.store()." ); m_aLog.log(Protocol.TYPE_WARNING_INFO, "Please check the reason for that more in detail." ); - m_aLog.log(Protocol.TYPE_WARNING_INFO, "A message like \"Concurrent save requests are not allowed.\" was intended and doesnt show an error!"); + m_aLog.log(Protocol.TYPE_WARNING_INFO, "A message like \"Concurrent save requests are not allowed.\" was intended and doesn't show an error!"); m_aLog.log(Protocol.TYPE_WARNING_INFO, "Message of the original exception:" ); m_aLog.log(Protocol.TYPE_WARNING_INFO, exIO.getMessage()); } @@ -351,14 +351,14 @@ public class AutoSave } else { - m_aLog.log(Protocol.TYPE_ERROR, "closeDoc() = ERROR. Doc doesnt provide needed interface!"); + m_aLog.log(Protocol.TYPE_ERROR, "closeDoc() = ERROR. Doc doesn't provide needed interface!"); } } catch(com.sun.star.util.CloseVetoException exVeto) { m_aLog.log(Protocol.TYPE_WARNING , "got CloseVetoException on calling doc.close()." ); m_aLog.log(Protocol.TYPE_WARNING_INFO, "Please check the reason for that more in detail." ); - m_aLog.log(Protocol.TYPE_WARNING_INFO, "A message like \"Cant close while saving.\" was intended and doesnt show an error!"); + m_aLog.log(Protocol.TYPE_WARNING_INFO, "A message like \"Can't close while saving.\" was intended and doesn't show an error!"); m_aLog.log(Protocol.TYPE_WARNING_INFO, exVeto.getMessage()); } diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java index 271d4bdf977e..2196ce3d30c8 100644 --- a/framework/qa/complex/framework/autosave/Protocol.java +++ b/framework/qa/complex/framework/autosave/Protocol.java @@ -59,10 +59,10 @@ import java.sql.*; /** * Implements a log mechanism to create a protocol of all steps of e.g. an api test * It provides the possibility to write the logged meesages to a file and/or - * to stdout/stderr (if neccessary at the same time!). + * to stdout/stderr (if necessary at the same time!). * * TODO - * - implement filter, which e.g. supress showing of INFO data + * - implement filter, which e.g. suppress showing of INFO data */ public class Protocol extends JComponent { @@ -195,7 +195,7 @@ public class Protocol extends JComponent private int m_nType; /// of course, we have to know the logged message too :-) private String m_sMessage; - /// and it can be usefull to know the current time, when this line was created + /// and it can be useful to know the current time, when this line was created private Timestamp m_aStamp; /** ctor for fast initializing of such line */ @@ -502,7 +502,7 @@ public class Protocol extends JComponent // ____________________ /** - * For some modes it's neccessary, that we write some additional + * For some modes it's necessary, that we write some additional * informations to the log. E.g. for html we must generate close targets. */ public synchronized void finish() @@ -524,7 +524,7 @@ public class Protocol extends JComponent /** * log an unspecified message. * - * Sometimes it's not neccessary to set a special type for an message. + * Sometimes it's not necessary to set a special type for an message. * The pure message seams to be enough. The type of such "pure messages" * will be set to INFO. * @@ -635,7 +635,7 @@ public class Protocol extends JComponent ++m_nLine; - // it's neccessary to open scopes before creatig the protocol line + // it's necessary to open scopes before creatig the protocol line // to guarantee right tab handling for new scope value! if ((nType & TYPE_SCOPE_OPEN) == TYPE_SCOPE_OPEN) ++m_nScope; @@ -645,7 +645,7 @@ public class Protocol extends JComponent String sAsciiLog = aLine.toString(); String sHTMLLog = aLine.toHTML(); - // it's neccessary to close scope after creatig the protocol line + // it's necessary to close scope after creatig the protocol line // to guarantee right tab handling for old scope value! if ( ( m_nScope > 0 ) && @@ -671,7 +671,7 @@ public class Protocol extends JComponent System.err.print(sAsciiLog); // no else - it's a bit field of possible reactions! // But these both conditions must be handled together. - // Because we cant generate different types of log contents to the same log file. + // Because we can't generate different types of log contents to the same log file. // We preferr HTML if both types are set. if ( ((m_nMode & MODE_HTML ) == MODE_HTML ) || @@ -757,7 +757,7 @@ public class Protocol extends JComponent * returns a generic html header for generating html log files * * It's used from the method finish() to generate a valid html formated file. - * For that its neccessary to open some special html targets like e.g. <html>. + * For that its necessary to open some special html targets like e.g. <html>. * * @return A string, which includes the whole header. * diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java index 58c530a2d7fb..98ec2390bbaa 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTest.java +++ b/framework/qa/complex/framework/recovery/RecoveryTest.java @@ -584,7 +584,7 @@ public class RecoveryTest extends ComplexTestCase { } String tempURL = utils.getOfficeTempDir(xMSF); - log.println("the destination for saveing is: " + tempURL); + log.println("the destination for saving is: " + tempURL); try{ oUITools.setTextEditFiledText("Save to", tempURL); } catch (java.lang.Exception e){ @@ -603,7 +603,7 @@ public class RecoveryTest extends ComplexTestCase { /** * This function gets the current screen size and calculate the first - * quarter of it. This qaurter was used to postion to Office windows. + * quarter of it. This qaurter was used to position to Office windows. * Further this function calculates the maximum window size so the window * is visible if it placed on extreme position. */ @@ -725,7 +725,7 @@ public class RecoveryTest extends ComplexTestCase { try{ xMathDoc = SOF.createMathDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating math document '"+frameName+"':"); + log.println("Exception occurred while creating math document '"+frameName+"':"); failed("Couldn't create test environment"); } return xMathDoc; @@ -739,16 +739,16 @@ public class RecoveryTest extends ComplexTestCase { try { xPS.setPropertyValue("Formula", expFormula); } catch(com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while filling math document with content."); + log.println("Exception occurred while filling math document with content."); failed("Couldn't create test environment"); } catch(com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occured while filling math document with content."); + log.println("Exception occurred while filling math document with content."); failed("Couldn't create test environment"); } catch(com.sun.star.beans.PropertyVetoException e) { - log.println("Exception occured while filling math document with content."); + log.println("Exception occurred while filling math document with content."); failed("Couldn't create test environment"); } catch(com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception occured while filling math document with content."); + log.println("Exception occurred while filling math document with content."); failed("Couldn't create test environment"); } } @@ -758,7 +758,7 @@ public class RecoveryTest extends ComplexTestCase { try{ xImpressDoc = SOF.createImpressDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating impress document '"+frameName+"':"); + log.println("Exception occurred while creating impress document '"+frameName+"':"); failed("Couldn't create test environment"); } return xImpressDoc; @@ -809,7 +809,7 @@ public class RecoveryTest extends ComplexTestCase { try{ xDrawDoc = SOF.createDrawDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating draw document '"+frameName+"':"); + log.println("Exception occurred while creating draw document '"+frameName+"':"); failed("Couldn't create test environment"); } return xDrawDoc; @@ -861,16 +861,16 @@ public class RecoveryTest extends ComplexTestCase { new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); oShapeProps.setPropertyValue("ZOrder", new Integer(1)); } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while setting or getting property value while filling draw document with content."); + log.println("Exception occurred while setting or getting property value while filling draw document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception occured while setting or getting property value while filling draw document with content."); + log.println("Exception occurred while setting or getting property value while filling draw document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occured while setting or getting property value while filling draw document with content."); + log.println("Exception occurred while setting or getting property value while filling draw document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.beans.PropertyVetoException e) { - log.println("Exception occured while setting or getting property value while filling draw document with content."); + log.println("Exception occurred while setting or getting property value while filling draw document with content."); failed("Couldn't create test environment"); } } @@ -888,7 +888,7 @@ public class RecoveryTest extends ComplexTestCase { try { xTextDoc = SOF.createTextDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating text document '"+frameName+"':"); + log.println("Exception occurred while creating text document '"+frameName+"':"); failed("Couldn't create test environment"); } return xTextDoc; @@ -915,10 +915,10 @@ public class RecoveryTest extends ComplexTestCase { oCursor, ControlCharacter.LINE_BREAK, false ); } } catch ( com.sun.star.lang.IllegalArgumentException e ){ - log.println("Exception occured while filling text document with content."); + log.println("Exception occurred while filling text document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while filling text document with content."); + log.println("Exception occurred while filling text document with content."); failed("Couldn't create test environment"); } } @@ -930,7 +930,7 @@ public class RecoveryTest extends ComplexTestCase { try { xSheetDoc = SOF.createCalcDoc(frameName); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while creating calc document '"+frameName+"':"); + log.println("Exception occurred while creating calc document '"+frameName+"':"); failed("Couldn't create test environment"); } return xSheetDoc; @@ -956,19 +956,19 @@ public class RecoveryTest extends ComplexTestCase { oSheet.getCellByPosition(3, 2).setFormula("xTextDoc"); oSheet.getCellByPosition(3, 3).setFormula("xTextDoc"); } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } catch (com.sun.star.uno.Exception e) { - log.println("Exception occured while filling calc document with content."); + log.println("Exception occurred while filling calc document with content."); failed("Couldn't create test environment"); } } diff --git a/framework/qa/complex/imageManager/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java index 0337c6a160b4..78e21c82dd79 100644 --- a/framework/qa/complex/imageManager/_XInitialization.java +++ b/framework/qa/complex/imageManager/_XInitialization.java @@ -71,7 +71,7 @@ public class _XInitialization { } } catch (com.sun.star.uno.Exception e) { - System.out.println("Exception occured while method calling.") ; + System.out.println("Exception occurred while method calling.") ; result = false ; } diff --git a/framework/qa/complex/imageManager/_XTypeProvider.java b/framework/qa/complex/imageManager/_XTypeProvider.java index f25571ac8992..27356488e96d 100644 --- a/framework/qa/complex/imageManager/_XTypeProvider.java +++ b/framework/qa/complex/imageManager/_XTypeProvider.java @@ -54,7 +54,7 @@ public class _XTypeProvider { /** * Just calls the method.<p> - * Has <b>OK</b> status if no runtime exceptions occured. + * Has <b>OK</b> status if no runtime exceptions occurred. */ public boolean _getImplementationId() { boolean result = true; diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java index 6495ccab97c1..e9e9f77d6863 100644 --- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java +++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java @@ -71,7 +71,7 @@ import static org.junit.Assert.*; The parameters for this have to be "ftp_access" and "http_access". If they are not given, tests for ftp and http will fail. - @todo We need a further test for accessing UNC pathes on windows! + @todo We need a further test for accessing UNC paths on windows! */ public class CheckXComponentLoader { @@ -185,7 +185,7 @@ public class CheckXComponentLoader // define default loader for testing // TODO think about using of bot loader instances! m_xLoader = UnoRuntime.queryInterface(XComponentLoader.class, m_xDesktop); - assertNotNull("Desktop service doesnt support needed component loader interface.", m_xLoader); + assertNotNull("Desktop service doesn't support needed component loader interface.", m_xLoader); // get temp path for this environment final String tempDirURL = util.utils.getOfficeTemp/*Dir*/(getMSF()); @@ -529,7 +529,7 @@ public class CheckXComponentLoader // loadURL(m_xLoader, RESULT_ILLEGALARGUMENTEXCEPTION, sEmptyDocs, "_blank", 0, // lProps); // -// System.out.println("check case senstive URLs"); +// System.out.println("check case sensitive URLs"); // // sIllegalArgs = new String[] { // "sLot:5000", "sloT:10909", ".unO:SaveAs", ".uno:OPEN", diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java index e16e3221affb..5c5e069cbe38 100644 --- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java +++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java @@ -53,7 +53,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator /** * @const SHOWSTATUS_NO don't show the status - but save information about using of this indicator object - * @const SHOWSTATUS_LOG the possible set protocol object will be used (it covers STDOUT, STDERR automaticly too) + * @const SHOWSTATUS_LOG the possible set protocol object will be used (it covers STDOUT, STDERR automatically too) * @const SHOWSTATUS_DIALOG the status will be shown inside a java dialog * @const SHOWSTATUS_LINK the status will be notified to interested listener (one listener only!) */ diff --git a/framework/qa/complex/loadAllDocuments/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/StreamSimulator.java index 340ddc6dd5e8..52556f0cd0dd 100644 --- a/framework/qa/complex/loadAllDocuments/StreamSimulator.java +++ b/framework/qa/complex/loadAllDocuments/StreamSimulator.java @@ -75,7 +75,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , * @throw com.sun.star.io.NotConnectedException * in case the internal streams to the file on disk couldn't * be established. - * They are neccessary. Otherwhise this simulator can't + * They are necessary. Otherwise this simulator can't * really work. */ public StreamSimulator(XMultiServiceFactory xMSF, @@ -121,7 +121,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , /** * following methods simulates the XInputStream. * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal + * and try to map all necessary functions to the internal * open in-stream. */ public int readBytes(byte[][] lData, int nBytesToRead ) @@ -275,7 +275,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , /** * following methods simulates the XOutputStream. * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal + * and try to map all necessary functions to the internal * open out-stream. */ public void writeBytes(byte[] lData) @@ -369,7 +369,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , /** * following methods simulates the XSeekable. * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal + * and try to map all necessary functions to the internal * open stream. */ public void seek(long nLocation ) diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java index 043df0356d63..48e5d13e34ee 100644 --- a/framework/qa/complex/path_settings/PathSettingsTest.java +++ b/framework/qa/complex/path_settings/PathSettingsTest.java @@ -198,7 +198,7 @@ public class PathSettingsTest } /** - * Simple existance test, if this fails, the Lists must update + * Simple existence test, if this fails, the Lists must update */ @Test public void checkInternalListConsistence() @@ -909,7 +909,7 @@ public class PathSettingsTest */ private String changeToCorrectValue(String path) { - // the simplest possiblity + // the simplest possibility if (path == null || path.equals("")) { String sTempDir = System.getProperty("java.io.tmpdir"); diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx index 467e35967ae4..13bf1bc802ea 100644 --- a/framework/source/accelerators/acceleratorcache.cxx +++ b/framework/source/accelerators/acceleratorcache.cxx @@ -69,7 +69,7 @@ AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy) //----------------------------------------------- AcceleratorCache::~AcceleratorCache() { - // Dont save anything automaticly here. + // Dont save anything automatically here. // The user has to do that explicitly! } diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 5396622fa326..71c8b16bf05b 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -587,7 +587,7 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c css::uno::Reference< css::io::XTruncate > xClearable(xStream, css::uno::UNO_QUERY_THROW); xClearable->truncate(); - // TODO can be removed if seek(0) is done by truncate() automaticly! + // TODO can be removed if seek(0) is done by truncate() automatically! css::uno::Reference< css::io::XSeekable > xSeek(xStream, css::uno::UNO_QUERY); if (xSeek.is()) xSeek->seek(0); @@ -637,7 +637,7 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA } // in case, we have a writeable cache, we use it for reading too! - // Otherwhise the API user cant find its own changes ... + // Otherwise the API user can't find its own changes ... if (m_pWriteCache) return *m_pWriteCache; else @@ -1255,7 +1255,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util: // Only path of form "PrimaryKeys/Modules/Module['<module_name>']/Key['<command_url>']/Command[<locale>]" will // be interesting for use. Sometimes short path values are given also by the broadcaster ... but they must be ignored :-) - // So we try to split the path into 3 parts (module isnt important here, because we already know it ... because + // So we try to split the path into 3 parts (module isn't important here, because we already know it ... because // these instance is bound to a specific module configuration ... or it''s the global configuration where no module is given at all. ::rtl::OUString sOrgPath ; @@ -1680,7 +1680,7 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer } // in case, we have a writeable cache, we use it for reading too! - // Otherwhise the API user cant find its own changes ... + // Otherwise the API user can't find its own changes ... if (m_pPrimaryWriteCache) return *m_pPrimaryWriteCache; else @@ -1700,7 +1700,7 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer } // in case, we have a writeable cache, we use it for reading too! - // Otherwhise the API user cant find its own changes ... + // Otherwise the API user can't find its own changes ... if (m_pSecondaryWriteCache) return *m_pSecondaryWriteCache; else diff --git a/framework/source/accelerators/acceleratorexecute.cxx b/framework/source/accelerators/acceleratorexecute.cxx index c14bf14f7ffc..96502750384e 100644 --- a/framework/source/accelerators/acceleratorexecute.cxx +++ b/framework/source/accelerators/acceleratorexecute.cxx @@ -174,7 +174,7 @@ void AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey) { ::rtl::OUString sCommand = impl_ts_findCommand(aAWTKey); - // No Command found? Do nothing! User isnt interested on any error handling .-) + // No Command found? Do nothing! User isn't interested on any error handling .-) if (!sCommand.getLength()) return; diff --git a/framework/source/accelerators/acceleratorexecute.hxx b/framework/source/accelerators/acceleratorexecute.hxx index 90dccefa5023..de3a0797e2a3 100644 --- a/framework/source/accelerators/acceleratorexecute.hxx +++ b/framework/source/accelerators/acceleratorexecute.hxx @@ -93,7 +93,7 @@ struct TMutexInit Because exceution of an accelerator command can be dangerous (in case it force an office shutdown for key "ALT+F4"!) all internal dispatches are done asynchronous. - Menas that the trigger call doesnt wait till the dispatch + Menas that the trigger call doesn't wait till the dispatch is finished. You can call very often. All requests will be queued internal and dispatched ASAP. diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index 5f6a8ba98716..7d32ebe6303e 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -187,7 +187,7 @@ sal_uInt16 KeyMapping::mapIdentifierToCode(const ::rtl::OUString& sIdentifier) sal_uInt16 nCode = 0; if (!KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(sIdentifier, nCode)) throw css::lang::IllegalArgumentException( - DECLARE_ASCII("Cant map given identifier to a valid key code value."), + DECLARE_ASCII("Can't map given identifier to a valid key code value."), css::uno::Reference< css::uno::XInterface >(), 0); diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index a3df27e28915..d0aea1799f41 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -277,7 +277,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag /* // TODO remove me! // Attention: This is temp. workaround ... We create a temp. storage file - // based of a sytem directory. This must be used so, till the storage implementation + // based of a system directory. This must be used so, till the storage implementation // can work on directories too. */ css::uno::Sequence< css::uno::Any > lArgs(2); @@ -445,7 +445,7 @@ void PresetHandler::connectToResource( PresetHandler::EConfigType // a) inside share layer we should not create any new structures ... We jave to use // existing ones only! - // b) inside user layer we can (SOFT mode!) but sometimes we shouldnt (HARD mode!) + // b) inside user layer we can (SOFT mode!) but sometimes we shouldn't (HARD mode!) // create new empty structures. We should preferr using of any existing structure. sal_Int32 eShareMode = (css::embed::ElementModes::READ | css::embed::ElementModes::NOCREATE); sal_Int32 eUserMode = (css::embed::ElementModes::READWRITE ); @@ -879,7 +879,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat ) return css::uno::Reference< css::embed::XStorage >(); - // it doesnt matter, if there is a locale fallback or not + // it doesn't matter, if there is a locale fallback or not // If creation of storages is allowed, we do it anyway. // Otherwhise we have no acc config at all, which can make other trouble. ::rtl::OUString sLocalizedPath; diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index 86860c00c21a..17a5745e1340 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -201,7 +201,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl: /* TODO URGENT! in case we found some "already existing storages" on the path before and increased its UseCount ... and now we will get an exception on creating a new sub storage ... - we must decrease all UseCounts, which was touched before. Otherwise these storages cant be closed! + we must decrease all UseCounts, which was touched before. Otherwise these storages can't be closed! Idea: Using of another structure member "PossibleUseCount" as vector of unique numbers. Every thread use another unique number to identify all "owned candidates". @@ -257,7 +257,7 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const ::rtl::OUStr if (pCheck == m_lStorages.end()) { // at least one path element was not found - // Seems that this path isnt open ... + // Seems that this path isn't open ... lStoragesOfPath.clear(); return lStoragesOfPath; } @@ -308,7 +308,7 @@ void StorageHolder::closePath(const ::rtl::OUString& rPath) ::rtl::OUString sNormedPath = StorageHolder::impl_st_normPath(rPath); OUStringList lFolders = StorageHolder::impl_st_parsePath(sNormedPath); - /* convert list of pathes in the following way: + /* convert list of paths in the following way: [0] = "path_1" => "path_1 [1] = "path_2" => "path_1/path_2" [2] = "path_3" => "path_1/path_2/path_3" diff --git a/framework/source/application/framework.cxx b/framework/source/application/framework.cxx index 42edd1e990c4..73d2c45d618e 100644 --- a/framework/source/application/framework.cxx +++ b/framework/source/application/framework.cxx @@ -175,7 +175,7 @@ void FrameWork::impl_analyzeCommandArguments() sal_uInt32 nCount = aInfo.getCommandArgCount(); for ( sal_uInt32 nArgument=0; nArgument<nCount; ++nArgument ) { - // If extraction of current argument successfull ... + // If extraction of current argument successful ... if ( aInfo.getCommandArg( nArgument, sArgument ) == osl_Process_E_None ) { // ... search for matching with supported values. diff --git a/framework/source/application/login.cxx b/framework/source/application/login.cxx index cdcea2444d0c..31980fce9533 100644 --- a/framework/source/application/login.cxx +++ b/framework/source/application/login.cxx @@ -63,8 +63,8 @@ //_________________________________________________________________________________________________________________ #define TEMPFILE_ENCODING RTL_TEXTENCODING_UTF8 // encoding of written temp. ascii file -#define LOGIN_RDB DECLARE_ASCII("login.rdb") // name of our own registry file - neccessary to create own servicemanager -#define SEPERATOR "\n" // used to seperate parts in temp. file +#define LOGIN_RDB DECLARE_ASCII("login.rdb") // name of our own registry file - necessary to create own servicemanager +#define SEPERATOR "\n" // used to separate parts in temp. file #define MINARGUMENTCOUNT 1 // count of min. required arguments #define ARGUMENTFOUND 0 // OUString::compareTo returns 0 if searched string match given one @@ -99,7 +99,7 @@ using namespace ::com::sun::star::beans ; @descr We need this temp. file to share informations between our dialog and different processes, which can't use vcl directly. Caller of this executable give us the file name as an argument - we save all informations in it - caller can read it and MUST delete temp. file. - This is neccessary for example; to hide the password! + This is necessary for example; to hide the password! @implements - @@ -149,7 +149,7 @@ void LoginApplication::Main() impl_parseCommandline(); LOG_ASSERT( !(m_sTempFile.getLength()<1), "LoginApplication::Main()\nWrong or missing argument for temp. file detected!\n" ) - // Try to get neccessary dialog service. + // Try to get necessary dialog service. // By the way - cast it to interface XPropertySet too - we need it later. // (define SERVICENAME... comes from defines.hxx!) Reference< XDialog > xLoginDialog( xServiceManager->createInstance( SERVICENAME_LOGINDIALOG ), UNO_QUERY ); @@ -200,7 +200,7 @@ void LoginApplication::Main() } // Build string for output. - // At this point it doesnt matter if information exist or not! + // At this point it doesn't matter if information exist or not! // Format of output: "<decision> [0|1] SEPERATOR // <username> [string] SEPERATOR // <password> [string] SEPERATOR @@ -229,8 +229,8 @@ void LoginApplication::Main() sBuffer.appendAscii ( SEPERATOR ); // Write informations in temp. file. - // If given file name isnt valid ... caller will have a problem!!! - // If fil already exist (That's out of specification!!!) we overwrite it everytime. + // If given file name isn't valid ... caller will have a problem!!! + // If fil already exist (That's out of specification!!!) we overwrite it every time. FILE* pFile = fopen( m_sTempFile.getStr(), "w" ); LOG_ASSERT( !(pFile==NULL), "LoginApplication::Main()\nCould not open file!\n" ); if( pFile != NULL ) @@ -257,7 +257,7 @@ void LoginApplication::impl_parseCommandline() OUString sArgument ; OUString sValue ; - // Warn programmer if argument count isnt ok! + // Warn programmer if argument count isn't ok! LOG_ASSERT( !(nCount!=MINARGUMENTCOUNT), "LoginApplication::impl_parseCommandline()\nWrong argument count detected!\n" ) // Reset all possible argument variables to defaults if someone is missing. diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index 7700a9976a23..5f10cc264a38 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -73,12 +73,12 @@ namespace framework{ @short initialize an empty container @descr The container will be empty then - special features (e.g. the async quit mechanism) are disabled. - @threadsafe not neccessary - its not a singleton + @threadsafe not necessary - its not a singleton @modified 01.07.2002 14:42,as96863 *****************************************************************************************************************/ FrameContainer::FrameContainer() // initialize base classes first. - // Order is neccessary for right initilization of his and OUR member ... m_aLock + // Order is necessary for right initilization of his and OUR member ... m_aLock : ThreadHelpBase ( &Application::GetSolarMutex() ) /*DEPRECATEME , m_bAsyncQuit ( sal_False ) // default must be "disabled"! @@ -91,7 +91,7 @@ FrameContainer::FrameContainer() @short deinitialize may a filled container @descr Special features (if the currently are running) will be dsiabled and we free all used other ressources. - @threadsafe not neccessary - its not a singleton + @threadsafe not necessary - its not a singleton @modified 01.07.2002 14:43,as96863 *****************************************************************************************************************/ FrameContainer::~FrameContainer() @@ -139,7 +139,7 @@ void FrameContainer::append( const css::uno::Reference< css::frame::XFrame >& xF void FrameContainer::remove( const css::uno::Reference< css::frame::XFrame >& xFrame ) { /* SAFE { */ - // write lock neccessary for follwing erase()! + // write lock necessary for follwing erase()! WriteGuard aWriteLock( m_aLock ); TFrameIterator aSearchedItem = ::std::find( m_aContainer.begin(), m_aContainer.end(), xFrame ); @@ -244,7 +244,7 @@ sal_uInt32 FrameContainer::getCount() const So it will be marked as deprecated and should be replaced by "getAllElements()". @param nIndex - a valud between 0 and (getCount()-1) to adress one container item + a valud between 0 and (getCount()-1) to address one container item @return a reference to a frame inside the container, which match with given index @@ -278,7 +278,7 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::operator[]( sal_uInt32 @short returns a snapshot of all currently existing frames inside this container @descr Should be used to replace the deprecated functions getCount()/operator[]! - @return a list of all frame refrences inside this container + @return a list of all frame references inside this container @threadsafe yes @modified 01.07.2002 15:09,as96863 diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index d33c5d3917d4..d95df5544428 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -192,7 +192,7 @@ MenuManager::MenuManager( AddonMenuManager::HasAddonMenuElements() ) { sal_uInt16 nCount = 0; - AddonMenu* pSubMenu = AddonMenuManager::CreateAddonMenu( rFrame ); + AddonMenu* pSubMenu = AddonMenuManager::CreateAddonMenu( rFrame, xServiceFactory ); if ( pSubMenu && ( pSubMenu->GetItemCount() > 0 )) { if ( pPopupMenu->GetItemType( nCount-1 ) != MENUITEM_SEPARATOR ) @@ -907,7 +907,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu ) ::rtl::OUString aCommand( m_aMenuItemCommand ); if ( m_aMenuItemCommand.matchIgnoreAsciiCase( UNO_COMMAND, 0 )) { - // Remove protocol part from command so we can use an easier comparision method + // Remove protocol part from command so we can use an easier comparison method aCommand = aCommand.copy( UNO_COMMAND.getLength() ); } diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index 672275578e3b..bf8420a9b76f 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -68,7 +68,7 @@ namespace framework{ //_________________________________________________________________________________________________________________ /*-****************************************************************************************************//** - @short initialize instance with neccessary informations + @short initialize instance with necessary informations @descr We need a valid uno service manager to create or instanciate new services. All other informations to create frames or tasks come in on right interface methods. @@ -129,7 +129,7 @@ css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const ::rtl:: catch(const css::uno::Exception&) {} - // no catch here ... without an task creator service we cant open ANY document window within the office. + // no catch here ... without an task creator service we can't open ANY document window within the office. // Thats IMHO not a good idea. Then we should accept the stacktrace showing us the real problem. // BTW: The used fallback creator service (IMPLEMENTATIONNAME_FWK_TASKCREATOR) is implemented in the same // library then these class here ... Why we should not be able to create it ? diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index a7f8aed73a24..8fab1bff5da6 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -129,7 +129,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher:: { if (nCommandGroup == css::frame::CommandGroup::VIEW) { - /* Attention: Dont add .uno:CloseFrame here. Because its not realy + /* Attention: Dont add .uno:CloseFrame here. Because its not really a configurable feature ... and further it does not have a valid UIName entry inside the GenericCommands.xcu ... */ css::uno::Sequence< css::frame::DispatchInformation > lViewInfos(1); @@ -215,13 +215,13 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& } // OK - URLs are the right ones. - // But we cant execute synchronously :-) + // But we can't execute synchronously :-) // May we are called from a generic key-input handler, - // which isnt aware that this call kill its own environment ... + // which isn't aware that this call kill its own environment ... // Do it asynchronous everytimes! // But dont forget to hold usself alive. - // We are called back from an environment, which doesnt know an uno reference. + // We are called back from an environment, which doesn't know an uno reference. // They call us back by using our c++ interface. m_xResultListener = xListener; @@ -254,7 +254,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& Now we do the following: - close all views to the same document, if needed and possible - make the current frame empty - ! This step is neccessary to handle errors during closing the + ! This step is necessary to handle errors during closing the document inside the frame. May the document shows a dialog and the user ignore it. Then the state of the office can be changed during we try to close frame and document. @@ -306,7 +306,7 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG ) FrameListAnalyzer aCheck1(xDesktop, xCloseFrame, FrameListAnalyzer::E_HELP | FrameListAnalyzer::E_BACKINGCOMPONENT); // a) If the curent frame (where the close dispatch was requested for) does not have - // any parent frame ... it will close this frame only. Such frame isnt part of the + // any parent frame ... it will close this frame only. Such frame isn't part of the // global desktop tree ... and such frames are used as "implementation details" only. // E.g. the live previews of our wizards doing such things. And then the owner of the frame // is responsible for closing the application or accepting closing of the application @@ -315,9 +315,9 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG ) bCloseFrame = sal_True; else - // b) The help window cant disagree with any request. - // Because it doesnt implement a controller - it uses a window only. - // Further t cant be the last open frame - if we do all other things + // b) The help window can't disagree with any request. + // Because it doesn't implement a controller - it uses a window only. + // Further t can't be the last open frame - if we do all other things // right inside this CloseDispatcher implementation. // => close it! if (aCheck1.m_bReferenceIsHelp) @@ -326,7 +326,7 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG ) // c) If we are already in "backing mode", we have to terminate // the application, if this special frame is closed. - // It doesnt matter, how many other frames (can be the help or hidden frames only) + // It doesn't matter, how many other frames (can be the help or hidden frames only) // are open then. // => terminate the application! if (aCheck1.m_bReferenceIsBacking) @@ -436,7 +436,7 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG ) // We reached this method only, by using a reference to ourself :-) // Further this member is used to detect still running and not yet finished // ansynchronous operations. So its time now to release this reference. - // But hold it temp alive. Otherwhise we die before we can finish this method realy :-)) + // But hold it temp alive. Otherwise we die before we can finish this method really :-)) css::uno::Reference< css::uno::XInterface > xTempHold = m_xSelfHold; m_xSelfHold.clear(); m_xResultListener.clear(); @@ -500,9 +500,9 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc } } - // dont remove the component realy by e.g. calling setComponent(null, null). + // dont remove the component really by e.g. calling setComponent(null, null). // It's enough to suspend the controller. - // If we close the frame later this controller doesnt show the same dialog again. + // If we close the frame later this controller doesn't show the same dialog again. return sal_True; } @@ -621,8 +621,8 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig if (xTopWindowCheck.is()) { // b1) Note: Toolkit interface XTopWindow sometimes is used by real VCL-child-windows also .-) - // Be sure that these window is realy a "top system window". - // Attention ! Checking Window->GetParent() isnt the right approach here. + // Be sure that these window is really a "top system window". + // Attention ! Checking Window->GetParent() isn't the right approach here. // Because sometimes VCL create "implicit border windows" as parents even we created // a simple XWindow using the toolkit only .-( ::vos::OGuard aSolarLock(&Application::GetSolarMutex()); diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index 6d4a64dfe779..50fbba156b83 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -85,7 +85,7 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport for (i1=0; i1<c1; ++i1) { - // ignore controller, which doesnt implement the right interface + // ignore controller, which doesn't implement the right interface css::uno::Reference< css::frame::XDispatchInformationProvider > xProvider = lProvider[i1]; if (!xProvider.is()) continue; @@ -119,7 +119,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati { try { - // ignore controller, which doesnt implement the right interface + // ignore controller, which doesn't implement the right interface css::uno::Reference< css::frame::XDispatchInformationProvider > xProvider = lProvider[i1]; if (!xProvider.is()) continue; diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index eff34eb56e8d..76707461c70b 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -100,7 +100,7 @@ DEFINE_XTYPEPROVIDER_2( DispatchProvider , /** @short standard ctor/dtor - @descr These initialize a new instance of tihs class with needed informations for work. + @descr These initialize a new instance of this class with needed informations for work. We hold a weakreference to our owner frame which start dispatches at us. We can't use a normal reference because he hold a reference of us too ... nobody can die so ...! @@ -388,7 +388,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame { // Don''t use findFrame() here - because it's not possible to find // a top lebel frame without knowing his name. And a frame with name - // "" can't be realy searched! That's why forward query to any parent + // "" can't be really searched! That's why forward query to any parent // explicitly. css::uno::Reference< css::frame::XDispatchProvider > xProvider( xFrame->getCreator(), css::uno::UNO_QUERY ); if (xProvider.is()) @@ -428,7 +428,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame { css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY ); if (xParent.is()) - // SELF => we must adress the parent directly... and not his parent or any other parent! + // SELF => we must address the parent directly... and not his parent or any other parent! xDispatcher = xParent->queryDispatch(aURL, SPECIALTARGET_SELF, 0); } @@ -509,7 +509,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame // Not for controller - not for protocol handler // It should be a loadable content - may be a file. Check it ... - // This check is neccessary to found out, that + // This check is necessary to found out, that // support for some protocols isn't installed by user. May be // "ftp" isn't available. So we suppress creation of our self dispatcher. // The result will be clear. He can't handle it - but he would try it. @@ -606,7 +606,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt } catch(css::uno::Exception&) {} - // look if initialization is neccessary + // look if initialization is necessary css::uno::Reference< css::lang::XInitialization > xInit( xHandler, css::uno::UNO_QUERY ); if (xInit.is()) { @@ -646,7 +646,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt Thats why we implement this method. It return an already existing helper or create a new one otherwise. @attention The parameter sTarget and nSearchFlags are defaulted to "" and 0! - Please use it only, if you can be shure, that the realy given by the outside calli! + Please use it only, if you can be sure, that the really given by the outside calli! Mostly it depends from the parameter eHelper is they are required or not. @param eHelper diff --git a/framework/source/dispatch/helpagentdispatcher.cxx b/framework/source/dispatch/helpagentdispatcher.cxx index 31f848cd152b..c1c4e5c9e50b 100644 --- a/framework/source/dispatch/helpagentdispatcher.cxx +++ b/framework/source/dispatch/helpagentdispatcher.cxx @@ -217,7 +217,7 @@ void HelpAgentDispatcher::implts_acceptCurrentURL() aWriteLock.unlock(); // <- SAFE - // We must make sure that this URL isnt marked as ignored by the user. + // We must make sure that this URL isn't marked as ignored by the user. // Otherwhise the user wont see the corresponding help content in the future. SvtHelpOptions().resetAgentIgnoreURLCounter(sAcceptedURL); @@ -285,7 +285,7 @@ void HelpAgentDispatcher::implts_startTimer() // SAFE -> // Timer uses pointer to this help agent dispatcher ... // But normaly we are ref counted. So we must make sure that this - // dispatcher isnt killed during the timer runs .-) + // dispatcher isn't killed during the timer runs .-) WriteGuard aWriteLock(m_aLock); m_xSelfHold = css::uno::Reference< css::uno::XInterface >(static_cast< css::frame::XDispatch* >(this), css::uno::UNO_QUERY_THROW); aWriteLock.unlock(); diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index 672c41106655..104bf50348f6 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -97,7 +97,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD ReadGuard aReadLock(m_aLock); // a) first search an interceptor, which match to this URL by it's URL pattern registration - // Note: if it return NULL - it does not mean an empty interceptor list automaticly! + // Note: if it return NULL - it does not mean an empty interceptor list automatically! css::uno::Reference< css::frame::XDispatchProvider > xInterceptor; InterceptorList::const_iterator pIt = m_lInterceptionRegs.findByPattern(aURL.Complete); if (pIt != m_lInterceptionRegs.end()) @@ -107,7 +107,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD // Use first interceptor everytimes. // Note: it doesn't matter, which direction this helper implementation use to ask interceptor objects. // Using of member m_aInterceptorList will starts at the beginning everytimes. - // It depends from the filling operation, in which direction it works realy! + // It depends from the filling operation, in which direction it works really! if (!xInterceptor.is() && m_lInterceptionRegs.size()>0) { pIt = m_lInterceptionRegs.begin(); @@ -300,7 +300,7 @@ void SAL_CALL InterceptionHelper::disposing(const css::lang::EventObject& aEvent css::uno::Reference< css::frame::XDispatchProvider > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY_THROW); // We need a full copy of all currently registered interceptor objects. - // Otherwhise we cant iterate over this vector without the risk, that our iterator will be invalid. + // Otherwise we can't iterate over this vector without the risk, that our iterator will be invalid. // Because this vetor will be influenced by every deregistered interceptor. InterceptionHelper::InterceptorList aCopy = m_lInterceptionRegs; diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx index a7f179128678..c5638b4f23cd 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -128,7 +128,7 @@ css::uno::Any LoadDispatcher::impl_dispatch( const css::util::URL& rURL, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) { // Attention: May be nobody outside hold such temp. dispatch object alive (because - // the container in which we resists isnt implemented threadsafe but updated by a timer + // the container in which we resists isn't implemented threadsafe but updated by a timer // and clear our reference ...) we should hold us self alive! css::uno::Reference< css::uno::XInterface > xThis(static_cast< css::frame::XNotifyingDispatch* >(this), css::uno::UNO_QUERY); @@ -144,7 +144,7 @@ css::uno::Any LoadDispatcher::impl_dispatch( const css::util::URL& rURL, { if (xListener.is()) xListener->dispatchFinished( - css::frame::DispatchResultEvent(xThis, css::frame::DispatchResultState::DONTKNOW, css::uno::Any())); // DONTKNOW? ... not realy started ... not realy failed :-) + css::frame::DispatchResultEvent(xThis, css::frame::DispatchResultState::DONTKNOW, css::uno::Any())); // DONTKNOW? ... not really started ... not really failed :-) } css::uno::Reference< css::frame::XFrame > xBaseFrame(m_xOwnerFrame.get(), css::uno::UNO_QUERY); diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index e7b03f0f8ba0..2a60ab8cf858 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -103,7 +103,7 @@ DEFINE_INIT_SERVICE(MailToDispatcher, /** @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. @param xContext reference to uno component context @@ -140,7 +140,7 @@ MailToDispatcher::~MailToDispatcher() be asked by the generic dispatch mechanism inside framework, if he can handle this special URL wich match his registration. He can agree by returning of a valid dispatch instance or disagree by returning <NULL/>. - We don't create new dispatch instances here realy - we return THIS as result to handle it + We don't create new dispatch instances here really - we return THIS as result to handle it at the same implementation. @modified 02.05.2002 15:25, as96863 @@ -195,7 +195,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail void SAL_CALL MailToDispatcher::dispatch( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ) { - // dispatch() is an [oneway] call ... and may our user release his reference to us immediatly. + // dispatch() is an [oneway] call ... and may our user release his reference to us immediately. // So we should hold us self alive till this call ends. css::uno::Reference< css::frame::XNotifyingDispatch > xSelfHold(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); implts_dispatch(aURL,lArguments); @@ -222,7 +222,7 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL& const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException ) { - // This class was designed to die by reference. And if user release his reference to us immediatly after calling this method + // This class was designed to die by reference. And if user release his reference to us immediately after calling this method // we can run into some problems. So we hold us self alive till this method ends. // Another reason: We can use this reference as source of sending event at the end too. css::uno::Reference< css::frame::XNotifyingDispatch > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); @@ -256,8 +256,8 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL& @return <TRUE/> if dispatch could be started successfully Note: Our internal used shell executor doesn't return any state value - so we must - belive that call was successfully. - <FALSE/> if neccessary ressource couldn't be created or an exception was thrown. + believe that call was successfully. + <FALSE/> if necessary ressource couldn't be created or an exception was thrown. @modified 30.04.2002 14:49, as96863 */ @@ -306,7 +306,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& @param xListener reference to a valid listener for state events @param aURL - URL about listener will be informed, if something occured + URL about listener will be informed, if something occurred @modified 30.04.2002 14:49, as96863 */ diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 2eef9101cf0a..d06f4c49d659 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -344,10 +344,10 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR xModel = uno::Reference< XModel >( xController->getModel(), UNO_QUERY ); // retrieve addon popup menus and add them to our menu bar - AddonMenuManager::MergeAddonPopupMenus( xFrame, xModel, nPos, pMenuBar ); + AddonMenuManager::MergeAddonPopupMenus( xFrame, nPos, pMenuBar, m_xFactory ); // retrieve addon help menu items and add them to our help menu - AddonMenuManager::MergeAddonHelpMenu( xFrame, pMenuBar ); + AddonMenuManager::MergeAddonHelpMenu( xFrame, pMenuBar, m_xFactory ); } // set new menu on our system window and create new menu manager @@ -411,7 +411,7 @@ IMPL_LINK( MenuDispatcher, Close_Impl, void*, EMPTYARG ) ATTENTION - If you miss a test for one of this parameters, contact the autor or add it himself !(?) + If you miss a test for one of this parameters, contact the author or add it himself !(?) But ... look for right testing! See using of this methods! -----------------------------------------------------------------------------------------------------------------*/ diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 0307f2e9aae4..da9d539b4e33 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -175,12 +175,12 @@ Oxt_Handler::~Oxt_Handler() @short try to load audio file @descr This method try to load given audio file by URL and play it. We use vcl/Sound class to do that. - Playing of sound is asynchron everytime. + Playing of sound is asynchron every time. @attention We must hold us alive by ourself ... because we use async. vcl sound player ... but playing is started in async interface call "dispatch()" too. And caller forget us imediatly. But then our uno ref count will decreased to 0 and will die. The only solution is to use own reference to our implementation. - But we do it for realy started jobs only and release it during call back of vcl. + But we do it for really started jobs only and release it during call back of vcl. @seealso class vcl/Sound @seealso method implts_PlayerNotify() @@ -250,7 +250,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& @attention a) We don't need any mutex here ... because we don't use any member! b) Dont' use internal player instance "m_pPlayer" to detect given sound file! - It's not neccessary to do that ... and we can use temp. variable to do the same. + It's not necessary to do that ... and we can use temp. variable to do the same. This way is easy - we don't must synchronize it with currently played sounds! Another reason to do so ... We are a listener on our internal ma_Player object. If you would call "IsSoundFile()" on this instance, he would call us back and @@ -267,7 +267,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& ::rtl::OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ) { - // Our default is "nothing". So we can return it, if detection failed or fily type is realy unknown. + // Our default is "nothing". So we can return it, if detection failed or fily type is really unknown. ::rtl::OUString sTypeName; // Analyze given descriptor to find filename or input stream or ... diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index 7b214da8e1ac..c806fa016c7d 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -102,7 +102,7 @@ DEFINE_INIT_SERVICE(ServiceHandler, /** @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. @param xFactory reference to uno servicemanager for creation of new services @@ -139,7 +139,7 @@ ServiceHandler::~ServiceHandler() be asked by the generic dispatch mechanism inside framework, if he can handle this special URL wich match his registration. He can agree by returning of a valid dispatch instance or disagree by returning <NULL/>. - We don't create new dispatch instances here realy - we return THIS as result to handle it + We don't create new dispatch instances here really - we return THIS as result to handle it at the same implementation. @modified 02.05.2002 15:25, as96863 @@ -193,7 +193,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv void SAL_CALL ServiceHandler::dispatch( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ) { - // dispatch() is an [oneway] call ... and may our user release his reference to us immediatly. + // dispatch() is an [oneway] call ... and may our user release his reference to us immediately. // So we should hold us self alive till this call ends. css::uno::Reference< css::frame::XNotifyingDispatch > xSelfHold(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); implts_dispatch(aURL,lArguments); @@ -220,7 +220,7 @@ void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL& const css::uno::Sequence< css::beans::PropertyValue >& lArguments, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException ) { - // This class was designed to die by reference. And if user release his reference to us immediatly after calling this method + // This class was designed to die by reference. And if user release his reference to us immediately after calling this method // we can run into some problems. So we hold us self alive till this method ends. // Another reason: We can use this reference as source of sending event at the end too. css::uno::Reference< css::frame::XNotifyingDispatch > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); @@ -292,7 +292,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con if (!sServiceName.getLength()) return css::uno::Reference< css::uno::XInterface >(); - // If a service doesnt support an optional job executor interface - he can't get + // If a service doesn't support an optional job executor interface - he can't get // any given parameters! // Because we can't know if we must call createInstanceWithArguments() or XJobExecutor::trigger() ... @@ -326,7 +326,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con @param xListener reference to a valid listener for state events @param aURL - URL about listener will be informed, if something occured + URL about listener will be informed, if something occurred @modified 30.04.2002 14:49, as96863 */ diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx b/framework/source/fwe/classes/actiontriggerpropertyset.cxx index 78437de31817..1dcc71be10d7 100644 --- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx @@ -310,7 +310,7 @@ void SAL_CALL ActionTriggerPropertySet::getFastPropertyValue( if( pInfoHelper == NULL ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". - // "impl_getStaticPropertyDescriptor" is a non exported and static funtion, who will define a static propertytable. + // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. static OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); pInfoHelper = &aInfoHelper; diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx index 23215dbbf84f..eaf5445d1195 100644 --- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx +++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx @@ -254,7 +254,7 @@ void SAL_CALL ActionTriggerSeparatorPropertySet::getFastPropertyValue( if( pInfoHelper == NULL ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". - // "impl_getStaticPropertyDescriptor" is a non exported and static funtion, who will define a static propertytable. + // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. static OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); pInfoHelper = &aInfoHelper; diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index e0b45bfc062e..dc6823b93838 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -33,6 +33,7 @@ #include <macros/debug/assertion.hxx> #include <framework/imageproducer.hxx> #include <framework/menuconfiguration.hxx> +#include <services.h> //_________________________________________________________________________________________________________________ // interface includes @@ -40,7 +41,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/frame/XModuleManager.hpp> //_________________________________________________________________________________________________________________ // includes of other projects @@ -108,18 +109,21 @@ AddonPopupMenu::~AddonPopupMenu() // ------------------------------------------------------------------------ -static Reference< XModel > GetModelFromFrame( const Reference< XFrame >& rFrame ) +static ::rtl::OUString GetModuleIdentifier( const Reference< XMultiServiceFactory >& rServiceManager, + const Reference< XFrame >& rFrame ) { - // Query for the model to get check the context information - Reference< XModel > xModel; - if ( rFrame.is() ) + Reference< XModuleManager > xModuleManager( rServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY ); + if ( xModuleManager.is() ) { - Reference< XController > xController( rFrame->getController(), UNO_QUERY ); - if ( xController.is() ) - xModel = xController->getModel(); + try + { + return xModuleManager->identify( rFrame ); + } + catch ( Exception& ) + { + } } - - return xModel; + return ::rtl::OUString(); } // ------------------------------------------------------------------------ @@ -146,7 +150,8 @@ PopupMenu* AddonMenuManager::CreatePopupMenuType( MenuType eMenuType, const Refe } // Create the Add-Ons menu -AddonMenu* AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& rFrame ) +AddonMenu* AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& rFrame, + const Reference< XMultiServiceFactory >& rServiceManager ) { AddonsOptions aOptions; AddonMenu* pAddonMenu = NULL; @@ -156,8 +161,8 @@ AddonMenu* AddonMenuManager::CreateAddonMenu( const Reference< XFrame >& rFrame if ( rAddonMenuEntries.getLength() > 0 ) { pAddonMenu = (AddonMenu *)AddonMenuManager::CreatePopupMenuType( ADDON_MENU, rFrame ); - Reference< XModel > xModel = GetModelFromFrame( rFrame ); - AddonMenuManager::BuildMenu( pAddonMenu, ADDON_MENU, MENU_APPEND, nUniqueMenuId, rAddonMenuEntries, rFrame, xModel ); + ::rtl::OUString aModuleIdentifier = GetModuleIdentifier( rServiceManager, rFrame ); + AddonMenuManager::BuildMenu( pAddonMenu, ADDON_MENU, MENU_APPEND, nUniqueMenuId, rAddonMenuEntries, rFrame, aModuleIdentifier ); // Don't return an empty Add-On menu if ( pAddonMenu->GetItemCount() == 0 ) @@ -194,7 +199,9 @@ static sal_uInt16 FindMenuId( Menu* pMenu, const String aCommand ) // Merge the Add-Ons help menu items into the given menu bar at a defined pos -void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, MenuBar* pMergeMenuBar ) +void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, + MenuBar* pMergeMenuBar, + const Reference< XMultiServiceFactory >& rServiceManager ) { if ( pMergeMenuBar ) { @@ -245,8 +252,8 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me if ( nInsPos < nItemCount && pHelpMenu->GetItemType( nInsPos ) != MENUITEM_SEPARATOR ) nInsSepAfterPos = nInsPos; - Reference< XModel > xModel = GetModelFromFrame( rFrame ); - AddonMenuManager::BuildMenu( pHelpMenu, ADDON_MENU, nInsPos, nUniqueMenuId, rAddonHelpMenuEntries, rFrame, xModel ); + ::rtl::OUString aModuleIdentifier = GetModuleIdentifier( rServiceManager, rFrame ); + AddonMenuManager::BuildMenu( pHelpMenu, ADDON_MENU, nInsPos, nUniqueMenuId, rAddonHelpMenuEntries, rFrame, aModuleIdentifier ); if ( pHelpMenu->GetItemCount() > nItemCount ) { @@ -267,9 +274,9 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me // Merge the addon popup menus into the given menu bar at the provided pos. void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame, - const Reference< XModel >& rModel, sal_uInt16 nMergeAtPos, - MenuBar* pMergeMenuBar ) + MenuBar* pMergeMenuBar, + const Reference< XMultiServiceFactory >& rServiceManager ) { if ( pMergeMenuBar ) { @@ -283,6 +290,7 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame, ::rtl::OUString aContext; Sequence< Sequence< PropertyValue > > aAddonSubMenu; sal_uInt16 nUniqueMenuId = ADDONMENU_ITEMID_START; + ::rtl::OUString aModuleIdentifier = GetModuleIdentifier( rServiceManager, rFrame ); const Sequence< Sequence< PropertyValue > >& rAddonMenuEntries = aAddonsOptions.GetAddonsMenuBarPart(); for ( sal_Int32 i = 0; i < rAddonMenuEntries.getLength(); i++ ) @@ -297,12 +305,12 @@ void AddonMenuManager::MergeAddonPopupMenus( const Reference< XFrame >& rFrame, if ( aTitle.getLength() > 0 && aURL.getLength() > 0 && aAddonSubMenu.getLength() > 0 && - AddonMenuManager::IsCorrectContext( rModel, aContext )) + AddonMenuManager::IsCorrectContext( aModuleIdentifier, aContext )) { sal_uInt16 nId = nUniqueMenuId++; AddonPopupMenu* pAddonPopupMenu = (AddonPopupMenu *)AddonMenuManager::CreatePopupMenuType( ADDON_POPUPMENU, rFrame ); - AddonMenuManager::BuildMenu( pAddonPopupMenu, ADDON_MENU, MENU_APPEND, nUniqueMenuId, aAddonSubMenu, rFrame, rModel ); + AddonMenuManager::BuildMenu( pAddonPopupMenu, ADDON_MENU, MENU_APPEND, nUniqueMenuId, aAddonSubMenu, rFrame, aModuleIdentifier ); if ( pAddonPopupMenu->GetItemCount() > 0 ) { @@ -327,7 +335,7 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent sal_uInt16& nUniqueMenuId, Sequence< Sequence< PropertyValue > > aAddonMenuDefinition, const Reference< XFrame >& rFrame, - const Reference< XModel >& rModel ) + const ::rtl::OUString& rModuleIdentifier ) { Sequence< Sequence< PropertyValue > > aAddonSubMenu; sal_Bool bInsertSeparator = sal_False; @@ -346,7 +354,7 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent { GetMenuEntry( aAddonMenuDefinition[i], aTitle, aURL, aTarget, aImageId, aContext, aAddonSubMenu ); - if ( !IsCorrectContext( rModel, aContext ) || ( !aTitle.getLength() && !aURL.getLength() )) + if ( !IsCorrectContext( rModuleIdentifier, aContext ) || ( !aTitle.getLength() && !aURL.getLength() )) continue; if ( aURL == ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:separator" ))) @@ -357,7 +365,7 @@ void AddonMenuManager::BuildMenu( PopupMenu* pCurrent if ( aAddonSubMenu.getLength() > 0 ) { pSubMenu = AddonMenuManager::CreatePopupMenuType( nSubMenuType, rFrame ); - AddonMenuManager::BuildMenu( pSubMenu, nSubMenuType, MENU_APPEND, nUniqueMenuId, aAddonSubMenu, rFrame, rModel ); + AddonMenuManager::BuildMenu( pSubMenu, nSubMenuType, MENU_APPEND, nUniqueMenuId, aAddonSubMenu, rFrame, rModuleIdentifier ); // Don't create a menu item for an empty sub menu if ( pSubMenu->GetItemCount() == 0 ) @@ -426,26 +434,18 @@ void AddonMenuManager::GetMenuEntry( const Sequence< PropertyValue >& rAddonMenu } // Check if the context string matches the provided xModel context -sal_Bool AddonMenuManager::IsCorrectContext( const Reference< XModel >& rModel, const ::rtl::OUString& aContext ) +sal_Bool AddonMenuManager::IsCorrectContext( const ::rtl::OUString& rModuleIdentifier, const ::rtl::OUString& aContext ) { - if ( rModel.is() ) - { - Reference< com::sun::star::lang::XServiceInfo > xServiceInfo( rModel, UNO_QUERY ); - if ( xServiceInfo.is() ) - { - sal_Int32 nIndex = 0; - do - { - ::rtl::OUString aToken = aContext.getToken( 0, ',', nIndex ); + if ( aContext.isEmpty() ) + return sal_True; - if ( xServiceInfo->supportsService( aToken )) - return sal_True; - } - while ( nIndex >= 0 ); - } + if ( !rModuleIdentifier.isEmpty() ) + { + sal_Int32 nIndex = aContext.indexOf( rModuleIdentifier ); + return ( nIndex >= 0 ); } - return ( aContext.getLength() == 0 ); + return sal_False; } } diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index b30bda183b40..460d09bb1bb3 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -90,7 +90,7 @@ FrameListAnalyzer::~FrameListAnalyzer() We try to get a snapshot of all opened frames, which are part of the desktop frame container. Of course we can't access frames, which stands outside of this tree. - But it's neccessary to collect top frames here only. Otherwhise we interpret closing of last + But it's necessary to collect top frames here only. Otherwise we interpret closing of last frame wrong. Further we analyze this list and split into different parts. E.g. for "CloseDoc" we must know, which frames of the given list referr to the same model. These frames must be closed then. But all other frames must be untouched. @@ -126,7 +126,7 @@ void FrameListAnalyzer::impl_analyze() // ask for the model of the given reference frame. // It must be compared with the model of every frame of the container // to sort it into the list of frames with the same model. - // Supress this step, if right detect mode isn't set. + // Suppress this step, if right detect mode isn't set. css::uno::Reference< css::frame::XModel > xReferenceModel; if ((m_eDetectMode & E_MODEL) == E_MODEL ) { @@ -138,7 +138,7 @@ void FrameListAnalyzer::impl_analyze() } // check, if the reference frame is in hidden mode. - // But look, if this analyze step is realy needed. + // But look, if this analyze step is really needed. css::uno::Reference< css::beans::XPropertySet > xSet(m_xReferenceFrame, css::uno::UNO_QUERY); if ( ((m_eDetectMode & E_HIDDEN) == E_HIDDEN) && @@ -149,7 +149,7 @@ void FrameListAnalyzer::impl_analyze() } // check, if the reference frame includes the backing component. - // But look, if this analyze step is realy needed. + // But look, if this analyze step is really needed. if (((m_eDetectMode & E_BACKINGCOMPONENT) == E_BACKINGCOMPONENT) && m_xReferenceFrame.is() ) { try @@ -169,7 +169,7 @@ void FrameListAnalyzer::impl_analyze() } // check, if the reference frame includes the help module. - // But look, if this analyze step is realy needed. + // But look, if this analyze step is really needed. if ( ((m_eDetectMode & E_HELP) == E_HELP ) && (m_xReferenceFrame.is() ) && @@ -210,7 +210,7 @@ void FrameListAnalyzer::impl_analyze() // ------------------------------------------------- // a) Is it the special help task? - // Return it seperated from any return list. + // Return it separated from any return list. if ( ((m_eDetectMode & E_HELP) == E_HELP ) && (xFrame->getName()==SPECIALTARGET_HELPTASK) @@ -222,7 +222,7 @@ void FrameListAnalyzer::impl_analyze() // ------------------------------------------------- // b) Or is includes this task the special backing component? - // Return it seperated from any return list. + // Return it separated from any return list. // But check if the reference task itself is the backing frame. // Our user mst know it to decide right. if ((m_eDetectMode & E_BACKINGCOMPONENT) == E_BACKINGCOMPONENT) @@ -289,8 +289,8 @@ void FrameListAnalyzer::impl_analyze() catch(css::lang::IndexOutOfBoundsException) { // stop copying if index seams to be wrong. - // This interface can't realy guarantee its count for multithreaded - // environments. So it can occure! + // This interface can't really guarantee its count for multithreaded + // environments. So it can occur! } // Pack both lists by using the actual step positions. diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index 9b4cd8c98e1f..d68a1677e417 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -45,7 +45,7 @@ namespace framework{ Why? Normaly interaction should show a filter selection dialog and ask user for his decision. He can select any filter - then instances of these class will be called by handler ... or user close dialog without any selection. Then another continuation should be slected by handler to - abort continuations ... Retrying isn't very usefull here ... I think. + abort continuations ... Retrying isn't very useful here ... I think. @implements XInteractionFilterSelect @@ -116,7 +116,7 @@ private: }; //--------------------------------------------------------------------------------------------------------- -// initialize instance with all neccessary informations +// initialize instance with all necessary informations // We use it without any further checks on our member then ...! //--------------------------------------------------------------------------------------------------------- RequestFilterSelect_Impl::RequestFilterSelect_Impl( const ::rtl::OUString& sURL ) @@ -261,7 +261,7 @@ uno::Reference < task::XInteractionRequest > RequestAmbigousFilter::GetRequest() } //--------------------------------------------------------------------------------------------------------- -// initialize instance with all neccessary informations +// initialize instance with all necessary informations // We use it without any further checks on our member then ...! //--------------------------------------------------------------------------------------------------------- RequestAmbigousFilter_Impl::RequestAmbigousFilter_Impl( const ::rtl::OUString& sURL , diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index cfeb3fbb745e..0afda09133ee 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -596,7 +596,7 @@ void TitleHelper::impl_appendModuleName (::rtl::OUStringBuffer& sTitle) const ::rtl::OUString sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, ::rtl::OUString()); // An UIname property is an optional value ! - // So please add it to the title in case it does realy exists only. + // So please add it to the title in case it does really exists only. if (sUIName.getLength() > 0) { sTitle.appendAscii (" " ); diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx index 2a828ce8eeb7..4e640f47dba9 100644 --- a/framework/source/fwe/helper/undomanagerhelper.cxx +++ b/framework/source/fwe/helper/undomanagerhelper.cxx @@ -187,7 +187,7 @@ namespace framework void cancel( const Reference< XInterface >& i_context ) { m_caughtException <<= RuntimeException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Concurrency error: an ealier operation on the stack failed." ) ), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Concurrency error: an earlier operation on the stack failed." ) ), i_context ); m_finishCondition.set(); diff --git a/framework/source/fwe/xml/eventsdocumenthandler.cxx b/framework/source/fwe/xml/eventsdocumenthandler.cxx index f5f06639435e..cd03dbd63c99 100644 --- a/framework/source/fwe/xml/eventsdocumenthandler.cxx +++ b/framework/source/fwe/xml/eventsdocumenthandler.cxx @@ -192,7 +192,7 @@ throw( SAXException, RuntimeException ) if ( m_bEventsStartFound ) { ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'event:events' cannot be embeded into 'event:events'!" )); + aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'event:events' cannot be embedded into 'event:events'!" )); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -205,7 +205,7 @@ throw( SAXException, RuntimeException ) if ( !m_bEventsStartFound ) { ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'event:event' must be embeded into element 'event:events'!" )); + aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'event:event' must be embedded into element 'event:events'!" )); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx index 578d6bc3f703..d6572b29d652 100644 --- a/framework/source/fwe/xml/saxnamespacefilter.cxx +++ b/framework/source/fwe/xml/saxnamespacefilter.cxx @@ -98,7 +98,7 @@ void SAL_CALL SaxNamespaceFilter::startElement( try { - // apply namespaces to all remaing attributes + // apply namespaces to all remaining attributes for ( ::std::vector< sal_Int16 >::const_iterator i( aAttributeIndexes.begin()); i != aAttributeIndexes.end(); ++i ) diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index b77d6bf33ddf..1c142c4a865e 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -242,7 +242,7 @@ throw( SAXException, RuntimeException ) if ( m_bStatusBarStartFound ) { ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'statusbar:statusbar' cannot be embeded into 'statusbar:statusbar'!" )); + aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'statusbar:statusbar' cannot be embedded into 'statusbar:statusbar'!" )); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -255,7 +255,7 @@ throw( SAXException, RuntimeException ) if ( !m_bStatusBarStartFound ) { ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'statusbar:statusbaritem' must be embeded into element 'statusbar:statusbar'!" )); + aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'statusbar:statusbaritem' must be embedded into element 'statusbar:statusbar'!" )); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 950b98a3f667..bb63446b5cf0 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -251,7 +251,7 @@ throw( SAXException, RuntimeException ) if ( m_bToolBarStartFound ) { ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'toolbar:toolbar' cannot be embeded into 'toolbar:toolbar'!" )); + aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'toolbar:toolbar' cannot be embedded into 'toolbar:toolbar'!" )); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } else @@ -300,7 +300,7 @@ throw( SAXException, RuntimeException ) if ( !m_bToolBarStartFound ) { ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'toolbar:toolbaritem' must be embeded into element 'toolbar:toolbar'!" )); + aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'toolbar:toolbaritem' must be embedded into element 'toolbar:toolbar'!" )); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -401,7 +401,7 @@ throw( SAXException, RuntimeException ) case TB_ATTRIBUTE_STYLE: { - // read space seperated item style list + // read space separated item style list ::rtl::OUString aTemp = xAttribs->getValueByIndex( n ); sal_Int32 nIndex = 0; diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index cb6dcc0971ff..c80762648e74 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -99,7 +99,7 @@ PatternHash::iterator PatternHash::findPatternKey( const ::rtl::OUString& sURL ) /** @short initialize static member of class HandlerCache @descr We use a singleton pattern to implement this handler cache. - That means it use two static member list to hold all neccessary informations + That means it use two static member list to hold all necessary informations and a ref count mechanism to create/destroy it on demand. @modified 30.04.2002 11:13, as96863 @@ -113,7 +113,7 @@ HandlerCFGAccess* HandlerCache::m_pConfig = NULL; /** @short ctor of the cache of all registered protoco handler - @descr It tries to open the right configuration package automaticly + @descr It tries to open the right configuration package automatically and fill the internal structures. After that the cache can be used for read access on this data and perform some search operations on it. @@ -198,7 +198,7 @@ sal_Bool HandlerCache::search( const ::rtl::OUString& sURL, ProtocolHandler* pRe /** @short search for a registered handler by using an URL struct - @descr We combine neccessary parts of this struct to a valid URL string + @descr We combine necessary parts of this struct to a valid URL string and call our other search method ... It's a helper for outside code. @@ -247,7 +247,7 @@ void HandlerCache::takeOver(HandlerHash* pHandler, PatternHash* pPattern) /** @short dtor of the config access class - @descr It opens the configuration package automaticly by using base class mechanism. + @descr It opens the configuration package automatically by using base class mechanism. After that "read()" method of this class should be called to use it. @param sPackage diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx index 66c9306583fe..97d4a176b74a 100644 --- a/framework/source/fwi/jobs/configaccess.cxx +++ b/framework/source/fwi/jobs/configaccess.cxx @@ -214,7 +214,7 @@ void ConfigAccess::close() @descr It's not allowed to safe this c++ (!) reference outside. You have to use it directly. Further you must use our public lock member m_aLock to synchronize your code with our internal structures and our interface - methods. Acquire it before you call cfg() and release it afterwards immediatly. + methods. Acquire it before you call cfg() and release it afterwards immediately. E.g.: ConfigAccess aAccess(...); ReadGuard aReadLock(aAccess.m_aLock); diff --git a/framework/source/fwi/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx index cb52285f087a..6574ced494be 100644 --- a/framework/source/fwi/threadhelp/lockhelper.cxx +++ b/framework/source/fwi/threadhelp/lockhelper.cxx @@ -163,7 +163,7 @@ LockHelper::~LockHelper() we must simulate it as a write access! @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method acquireWriteAccess() @@ -200,7 +200,7 @@ void LockHelper::acquire() we must simulate it as a write access! @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method releaseWriteAccess() @@ -237,7 +237,7 @@ void LockHelper::release() We use m_eLockType to differ between all possible "lock-member"!!! @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method releaseReadAccess() @@ -273,7 +273,7 @@ void LockHelper::acquireReadAccess() We use m_eLockType to differ between all possible "lock-member"!!! @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method acquireReadAccess() @@ -311,7 +311,7 @@ void LockHelper::releaseReadAccess() We use m_eLockType to differ between all possible "lock-member"!!! @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method releaseWriteAccess() @@ -347,7 +347,7 @@ void LockHelper::acquireWriteAccess() We use m_eLockType to differ between all possible "lock-member"!!! @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method acquireWriteAccess() @@ -388,10 +388,10 @@ void LockHelper::releaseWriteAccess() @attention a) Don't call this method if you are not a writer! Results are not defined then ... - An upgrade can't be implemented realy ... because acquiring new access + An upgrade can't be implemented really ... because acquiring new access will be the same - there no differences! b) Without function if m_eLockTyp is different from E_FAIRRWLOCK(!) ... - because, a mutex don't support it realy. + because, a mutex don't support it really. @seealso - diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index da3a43c9a287..2cda4d422a53 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -102,7 +102,7 @@ TransactionManager::~TransactionManager() @short set new working mode @descr These implementation knows for states of working: E_INIT, E_WORK, E_CLOSING, E_CLOSE You can step during this ones only from the left to the right side and start at left side again! - (This is neccessary e.g. for refcounted objects!) + (This is necessary e.g. for refcounted objects!) This call will block till all current existing transactions was finished. Follow results occure: E_INIT : All requests on this implementation are refused. @@ -146,7 +146,7 @@ void TransactionManager::setWorkingMode( EWorkingMode eMode ) } // Wait for current existing transactions then! - // (Only neccessary for changing to E_BEFORECLOSE or E_CLOSE! ... + // (Only necessary for changing to E_BEFORECLOSE or E_CLOSE! ... // otherwise; if you wait at setting E_WORK another thrad could finish a acquire-call during our unlock() and wait() call // ... and we will wait forever here!!!) // Don't forget to release access mutex before. @@ -213,7 +213,7 @@ EWorkingMode TransactionManager::getWorkingMode() const @seealso method unregisterTransaction() - @param "eMode" ,used to enable/disable throwing exceptions automaticly for rejected calls + @param "eMode" ,used to enable/disable throwing exceptions automatically for rejected calls @param "eReason" ,reason for rejected calls if eMode=E_NOEXCEPTIONS @return - @@ -317,7 +317,7 @@ sal_Bool TransactionManager::isCallRejected( ERejectReason& eReason ) const /*-****************************************************************************************************//** @short throw any exceptions for rejected calls - @descr If user whish to use our automaticly exception mode we use this impl-method. + @descr If user whish to use our automatically exception mode we use this impl-method. We check all combinations of eReason and eExceptionMode and throw right exception with some descriptions for recipient of it. diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 3c0c5c92a06f..c5330a4965dc 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -434,7 +434,7 @@ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang if( pInfoHelper == NULL ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". - // "impl_getStaticPropertyDescriptor" is a non exported and static funtion, who will define a static propertytable. + // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); pInfoHelper = &aInfoHelper; diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index c19aeb365578..a8df8b64215d 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -402,7 +402,7 @@ void SAL_CALL RootItemContainer::getFastPropertyValue( com::sun::star::uno::Any& if( pInfoHelper == NULL ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". - // "impl_getStaticPropertyDescriptor" is a non exported and static funtion, who will define a static propertytable. + // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); pInfoHelper = &aInfoHelper; diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx index c24ba52c73c4..5343f8559349 100755 --- a/framework/source/helper/ocomponentaccess.cxx +++ b/framework/source/helper/ocomponentaccess.cxx @@ -230,7 +230,7 @@ css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( cons ATTENTION - If you miss a test for one of this parameters, contact the autor or add it himself !(?) + If you miss a test for one of this parameters, contact the author or add it himself !(?) But ... look for right testing! See using of this methods! -----------------------------------------------------------------------------------------------------------------*/ diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx index 6619319e5ef9..a5cdc03362d9 100755 --- a/framework/source/helper/ocomponentenumeration.cxx +++ b/framework/source/helper/ocomponentenumeration.cxx @@ -188,7 +188,7 @@ void OComponentEnumeration::impl_resetObject() ATTENTION - If you miss a test for one of this parameters, contact the autor or add it himself !(?) + If you miss a test for one of this parameters, contact the author or add it himself !(?) But ... look for right testing! See using of this methods! -----------------------------------------------------------------------------------------------------------------*/ diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx index 2f9b833d1e7f..b3d96e40d935 100755 --- a/framework/source/helper/oframes.cxx +++ b/framework/source/helper/oframes.cxx @@ -420,7 +420,7 @@ void OFrames::impl_appendSequence( Sequence< css::uno::Reference< XFram ATTENTION - If you miss a test for one of this parameters, contact the autor or add it himself !(?) + If you miss a test for one of this parameters, contact the author or add it himself !(?) But ... look for right testing! See using of this methods! -----------------------------------------------------------------------------------------------------------------*/ diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 003039477054..b3c806efee21 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -288,7 +288,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere ::vos::OClearableGuard aSolarLock(Application::GetSolarMutex()); Window* pWindow = VCLUnoHelper::GetWindow(xWindow); - // check for system window is neccessary to guarantee correct pointer cast! + // check for system window is necessary to guarantee correct pointer cast! if ( (pWindow ) && (pWindow->IsSystemWindow()) @@ -326,7 +326,7 @@ void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Refere if (!pWindow) return; - // check for system and work window - its neccessary to guarantee correct pointer cast! + // check for system and work window - its necessary to guarantee correct pointer cast! sal_Bool bSystemWindow = pWindow->IsSystemWindow(); sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index d086f414f82d..05d38dcd00bf 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -269,7 +269,7 @@ void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIn else { // Our stack is empty. No further child exists. - // Se we must "end" our progress realy + // Se we must "end" our progress really if (xProgress.is()) xProgress->end(); // Now hide the progress bar again. @@ -367,7 +367,7 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() xParentWindow = xPluggWindow; // dont disturb user in case he put the loading document into the background! - // Supress any setVisible() or toFront() call in case the initial show was + // Suppress any setVisible() or toFront() call in case the initial show was // already made. css::uno::Reference< css::awt::XWindow2 > xVisibleCheck(xParentWindow, css::uno::UNO_QUERY); sal_Bool bIsVisible = sal_False; @@ -394,11 +394,11 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() } } - // Ok the window should be made visible ... becuase it isnt currently visible. + // Ok the window should be made visible ... because it isn't currently visible. // BUT ..! // We need a Hack for our applications: They get her progress from the frame directly // on saving documents. Because there is no progress set on the MediaDescriptor. - // But that's wrong. In case the document was opened hidden, they shouldnt use any progress .-( + // But that's wrong. In case the document was opened hidden, they shouldn't use any progress .-( // They only possible workaround: dont show the parent window here, if the document was opened hidden. sal_Bool bHiddenDoc = sal_False; if (xFrame.is()) @@ -421,7 +421,7 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed() return; // OK: The document was not opened in hidden mode ... - // and the window isnt already visible. + // and the window isn't already visible. // Show it and bring it to front. // But before we have to be sure, that our internal used helper progress // is visible too. diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index 8c068d84a1f3..f251626a7973 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -432,7 +432,7 @@ void SAL_CALL UIConfigElementWrapperBase::getFastPropertyValue( com::sun::star:: if( pInfoHelper == NULL ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". - // "impl_getStaticPropertyDescriptor" is a non exported and static funtion, who will define a static propertytable. + // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); pInfoHelper = &aInfoHelper; diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index 1295a208555e..a6957000d874 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -220,7 +220,7 @@ void SAL_CALL UIElementWrapperBase::getFastPropertyValue( com::sun::star::uno::A if( pInfoHelper == NULL ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". - // "impl_getStaticPropertyDescriptor" is a non exported and static funtion, who will define a static propertytable. + // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); pInfoHelper = &aInfoHelper; diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 025e360699a5..db1b578a554d 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -67,7 +67,7 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::lang::XMu { if (!m_xParentWindow.is()) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Cant work without a parent window!"), + ::rtl::OUString::createFromAscii("Can't work without a parent window!"), static_cast< css::task::XStatusIndicator* >(this)); } diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index c5710feba3cd..cddec3f3a73e 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -58,7 +58,7 @@ namespace framework copy-on-write ... How? Do the following: */ -class AcceleratorCache : public ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... +class AcceleratorCache : public ThreadHelpBase // attention! Must be the first base class to guarantee right initialize lock ... { //______________________________________ // const, types diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index ea0dcefbe1f0..792031248938 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -87,7 +87,7 @@ typedef PresetHandler AcceleratorPresets; /** implements a read/write access to the accelerator configuration. */ -class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... +class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase // attention! Must be the first base class to guarantee right initialize lock ... , public IStorageListener , public ::cppu::OWeakObject , public css::lang::XTypeProvider @@ -305,7 +305,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase }; -class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... +class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase // attention! Must be the first base class to guarantee right initialize lock ... , public ::cppu::OWeakObject , public css::lang::XTypeProvider , public css::util::XChangesListener diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 4d696d124620..eafefd069eac 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -147,7 +147,7 @@ class KeyMapping if this method returns sal_True! @return [boolean] - sal_True if convertion was successfully. + sal_True if conversion was successfully. */ sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const ::rtl::OUString& sIdentifier, sal_uInt16& rCode ); diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 6e6f2c5ab3b3..242c75d40dde 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -71,7 +71,7 @@ namespace framework "menubar" "default" "menubar" */ -class PresetHandler : private ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... +class PresetHandler : private ThreadHelpBase // attention! Must be the first base class to guarantee right initialize lock ... { //------------------------------------------- // const @@ -109,7 +109,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas //--------------------------------------- /** @short because a concurrent access to the same storage from different implementations - isnt supported, we have to share it with others. + isn't supported, we have to share it with others. @descr This struct makes it possible to use any shared storage in combination with a SingletonRef<> template ... @@ -176,7 +176,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas ::salhelper::SingletonRef< TSharedStorages > m_aSharedStorages; //--------------------------------------- - /** @short if we run in document mode, we cant use the global root storages! + /** @short if we run in document mode, we can't use the global root storages! We have to use a special document storage explicitly. */ StorageHolder m_lDocumentStorages; @@ -245,7 +245,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @descr Because this class should be useable in combination with ::salhelper::SingletonRef template this ctor - cant have any special parameters! + can't have any special parameters! @param xSMGR points to an uno service manager, which is used internaly @@ -337,7 +337,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas and we use e.g. "/en-US/default.xml" internaly. If no localization exists for this preset set, this class - will work in default mode - means "no locale" - automaticly. + will work in default mode - means "no locale" - automatically. e.g. "/default.xml" @throw com::sun::star::uno::RuntimeException(!) @@ -397,7 +397,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas @descr Note: Targets resist inside the user layer. Normaly they are opened in read/write mode. - But it will be opened readonly automaticly if that isnt possible + But it will be opened readonly automatically if that isn't possible (may be the file is write protected on the system ...). @param sTarget @@ -414,12 +414,12 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas sal_Bool bCreateIfMissing); //--------------------------------------- - /** @short do anything which is neccessary to flush all changes + /** @short do anything which is necessary to flush all changes back to disk. @descr We have to call commit on all cached sub storages on the path from the root storage upside down to the working storage - (which are not realy used, but required to be holded alive!). + (which are not really used, but required to be holded alive!). */ void commitUserChanges(); diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index c3a4392e2641..29418c7425c5 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -66,7 +66,7 @@ namespace framework /** TODO document me */ -class StorageHolder : private ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ... +class StorageHolder : private ThreadHelpBase // attention! Must be the first base class to guarantee right initialize lock ... { //------------------------------------------- // types @@ -207,7 +207,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas @descr First this method try to open the requested sub element using the given open mode. If it failed there is second step, which tries to do the same again ... but removing a might existing - WRITE flag from the open mode. The user can supress this fallback + WRITE flag from the open mode. The user can suppress this fallback handling by setting the parameter bAllowFallback to sal_False. @param xBaseStorage diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index 4f8c68e181af..e37cd44eab70 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -87,7 +87,7 @@ class LoadDispatcher : private ThreadHelpBase public: - /** @short creates a new instance and initialize it with all neccessary parameters. + /** @short creates a new instance and initialize it with all necessary parameters. @descr Every instance of such LoadDispatcher can be used for the specified context only. That means: It can be used to load any further requested content into tzhe here(!) @@ -104,7 +104,7 @@ class LoadDispatcher : private ThreadHelpBase which define such target. @param nSearchFlags - used in case sTargetFrame isnt a special one. + used in case sTargetFrame isn't a special one. */ LoadDispatcher(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xOwnerFrame , diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 0b73ef4c24cc..d3a45adef022 100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -92,7 +92,7 @@ class WindowCommandDispatch : private ThreadHelpBase /// knows the frame, where we dispatch our commands as weak reference css::uno::WeakReference< css::frame::XFrame > m_xFrame; - /// knows the VCL window (where the hard coded commands occured) as weak XWindow reference + /// knows the VCL window (where the hard coded commands occurred) as weak XWindow reference css::uno::WeakReference< css::awt::XWindow > m_xWindow; //___________________________________________ diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index 421a6876cd24..47f72d98e150 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -77,7 +77,7 @@ class ActionLockGuard : private ThreadHelpBase //--------------------------------------- /** @short default ctor to initialize a "non working guard". - @descr That can be usefull in cases, where no resource still exists, + @descr That can be useful in cases, where no resource still exists, but will be available next time. Then this guard can be used in a mode "use guard for more then one resources". */ @@ -88,7 +88,7 @@ class ActionLockGuard : private ThreadHelpBase } //--------------------------------------- - /** @short initialize new guard instance and lock the given resource immediatly. + /** @short initialize new guard instance and lock the given resource immediately. @param xLock points to the outside resource, which should be locked. diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index d1929ddfe67b..07c7d4cb8b0e 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -210,7 +210,7 @@ class LoadEnv : private ThreadHelpBase /** @short holds the information about the finished load process. - @descr The content of m_xTargetFrame cant be used as valid indicator, + @descr The content of m_xTargetFrame can't be used as valid indicator, (in case the micht existing old document was reactivated) we must hold the result of the load process explicitly. */ @@ -241,7 +241,7 @@ class LoadEnv : private ThreadHelpBase @throw Currently there is no reason to throw such exception! @throw A RuntimeException in case any internal process indicates, that - the whole runtime cant be used any longer. + the whole runtime can't be used any longer. */ LoadEnv(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR) throw(LoadEnvException, css::uno::RuntimeException); @@ -303,10 +303,10 @@ class LoadEnv : private ThreadHelpBase This value is set to a default value "UNKNWON_CONTENT", which force an internal check, if this content is loadable or not. But may this check was already made by the caller of this method and - passing this information to this LoadEnv instance can supress this + passing this information to this LoadEnv instance can suppress this might expensive check. - That can be usefull in case this information is needed outside too, - to decide if its neccessary to create some resources for this load + That can be useful in case this information is needed outside too, + to decide if its necessary to create some resources for this load request ... or to reject the request imidiatly if it seems to be not loadable in general. @@ -315,7 +315,7 @@ class LoadEnv : private ThreadHelpBase The real reason, a suitable message and ID will be given here immidiatly. @throw A RuntimeException in case any internal process indicates, that - the whole runtime cant be used any longer. + the whole runtime can't be used any longer. */ virtual void initializeLoading(const ::rtl::OUString& sURL , const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor, @@ -335,7 +335,7 @@ class LoadEnv : private ThreadHelpBase a frame with a controller/model inside can be possible. For loading of a "non visible component" only an information about a successfully start can be provided. - Further it cant be guranteed, that the internal process runs synchronous. + Further it can't be guaranteed, that the internal process runs synchronous. Thats why we preferr using of specialized methods afterwards e.g. to: - wait till the internal job will be finished and get the results @@ -346,7 +346,7 @@ class LoadEnv : private ThreadHelpBase The reason, a suitable message and ID will be given here immidiatly. @throw A RuntimeException in case any internal process indicates, that - the whole runtime cant be used any longer. + the whole runtime can't be used any longer. */ virtual void startLoading() throw(LoadEnvException, css::uno::RuntimeException); @@ -371,7 +371,7 @@ class LoadEnv : private ThreadHelpBase @throw ... currently not used :-) @throw A RuntimeException in case any internal process indicates, that - the whole runtime cant be used any longer. + the whole runtime can't be used any longer. */ virtual sal_Bool waitWhileLoading(sal_uInt32 nTimeout = 0) throw(LoadEnvException, css::uno::RuntimeException); @@ -477,7 +477,7 @@ class LoadEnv : private ThreadHelpBase In such cases a RuntimeException would be to hard for the outside code :-) @throw A RuntimeException in case any internal process indicates, that - the whole runtime cant be used any longer. + the whole runtime can't be used any longer. */ void impl_reactForLoadingState() throw(LoadEnvException, css::uno::RuntimeException); @@ -498,12 +498,12 @@ class LoadEnv : private ThreadHelpBase @attention Not all types we know, are supported by filters. So it does not indicates an error, if no suitable filter(loader etcpp will be found for a type. But a type must be detected for the specified content. - Otherwhise its an error and loading cant be finished successfully. + Otherwise its an error and loading can't be finished successfully. @throw A LoadEnvException if detection failed. @throw A RuntimeException in case any internal process indicates, that - the whole runtime cant be used any longer. + the whole runtime can't be used any longer. */ void impl_detectTypeAndFilter() throw(LoadEnvException, css::uno::RuntimeException); @@ -531,7 +531,7 @@ class LoadEnv : private ThreadHelpBase for the detected content type (must be done before by calling impl_detectTypeAndFilter()). Because such handler does not depend from a real target frame, location of such frame will be - supressed here. + suppressed here. In case handle failed all new created resources will be removed before a suitable exception is thrown. (Excepting a RuntimeException occure!) @@ -541,7 +541,7 @@ class LoadEnv : private ThreadHelpBase @throw A LoadEnvException if handling failed. @throw A RuntimeException in case any internal process indicates, that - the whole runtime cant be used any longer. + the whole runtime can't be used any longer. */ sal_Bool impl_handleContent() throw(LoadEnvException, css::uno::RuntimeException); @@ -562,7 +562,7 @@ class LoadEnv : private ThreadHelpBase @throw A LoadEnvException if loading failed. @throw A RuntimeException in case any internal process indicates, that - the whole runtime cant be used any longer. + the whole runtime can't be used any longer. */ sal_Bool impl_loadContent() throw(LoadEnvException, css::uno::RuntimeException); @@ -590,7 +590,7 @@ class LoadEnv : private ThreadHelpBase In such cases a RuntimeException would be to hard for the outside code :-) @throw A RuntimeException in case any internal process indicates, that - the whole runtime cant be used any longer. + the whole runtime can't be used any longer. */ css::uno::Reference< css::frame::XFrame > impl_searchAlreadyLoaded() throw(LoadEnvException, css::uno::RuntimeException); @@ -623,7 +623,7 @@ class LoadEnv : private ThreadHelpBase In such cases a RuntimeException would be to hard for the outside code :-) @throw A RuntimeException in case any internal process indicates, that - the whole runtime cant be used any longer. + the whole runtime can't be used any longer. */ css::uno::Reference< css::frame::XFrame > impl_searchRecycleTarget() throw(LoadEnvException, css::uno::RuntimeException); @@ -631,11 +631,11 @@ class LoadEnv : private ThreadHelpBase //_______________________________________ /** @short because showing of a frame is needed more then once ... - it's implemented as an seperate method .-) + it's implemented as an separate method .-) @descr Note: Showing of a frame is bound to a special feature ... a) If we recycle any existing frame, we must bring it to front. - Showing of such frame isnt needed realy .. because we recycle + Showing of such frame isn't needed really .. because we recycle visible frames only! b) If the document was already shown (e.g. by our progress implementation) we do nothing here. The reason behind: The document was already shown .. @@ -662,7 +662,7 @@ class LoadEnv : private ThreadHelpBase /** @short checks weather a frame is already used for another load request or not. - @descr Such frames cant be used for our "recycle feature"! + @descr Such frames can't be used for our "recycle feature"! @param xFrame the frame, which should be checked. diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx index cd416e8a382a..8cb5d1c84512 100644 --- a/framework/source/inc/loadenv/loadenvexception.hxx +++ b/framework/source/inc/loadenv/loadenvexception.hxx @@ -53,7 +53,7 @@ namespace css = ::com::sun::star; load environment only. @descr Of course outside code must wrapp it, to transport - the occured information to its caller. + the occurred information to its caller. @author as96863 */ @@ -106,11 +106,11 @@ class LoadEnvException ID_COULD_NOT_REACTIVATE_CONTROLLER, /** @short inidcates an already running load operation. Of yourse the same - instance cant be used for multiple load requests at the same time. + instance can't be used for multiple load requests at the same time. */ ID_STILL_RUNNING, - /** @short sometiems we cant specify the reason for an error, because we + /** @short sometiems we can't specify the reason for an error, because we was interrupted by an called code in an unexpected way ... */ ID_GENERAL_ERROR @@ -128,7 +128,7 @@ class LoadEnvException /** @short An ID, which make this exception unique among others. */ sal_Int32 m_nID; - /** @short Contains the original exception, if any occured. */ + /** @short Contains the original exception, if any occurred. */ css::uno::Any m_exOriginal; /** TODO @@ -144,7 +144,7 @@ class LoadEnvException /** @short initialize a new instance with an ID. @descr Some other items of this exception (e.g. a suitable message) will be generated - automaticly. + automatically. @param nID One of the defined const IDs of this class. @@ -160,7 +160,7 @@ class LoadEnvException an wrap a detected exception into this one. @descr Some other items of this exception (e.g. a suitable message) will be generated - automaticly. + automatically. @param nID One of the defined const IDs of this class. diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index 00b2416263b0..ad940f31f48b 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -72,8 +72,8 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un @descr It try to close the given resource first. Delegating of the ownership can be influenced from - outside. If closing isnt possible (because the - needed interface isnt available) dispose() is tried instead. + outside. If closing isn't possible (because the + needed interface isn't available) dispose() is tried instead. Al possible exception are handled inside. So the user of this method has to look for the return value only. @@ -111,10 +111,10 @@ inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xReso catch(const css::lang::DisposedException&) {} // disposed is closed is ... catch(const css::uno::RuntimeException&) - { throw; } // shouldnt be suppressed! + { throw; } // shouldn't be suppressed! catch(const css::uno::Exception&) { return sal_False; } // ??? We defined to return a boolen value instead of throwing exceptions ... - // (OK: RuntimeExceptions shouldnt be catched inside the core ..) + // (OK: RuntimeExceptions shouldn't be catched inside the core ..) return sal_True; } diff --git a/framework/source/inc/pattern/storages.hxx b/framework/source/inc/pattern/storages.hxx index 2ee2bb92996a..f34369dd5053 100644 --- a/framework/source/inc/pattern/storages.hxx +++ b/framework/source/inc/pattern/storages.hxx @@ -62,7 +62,7 @@ css::uno::Reference< css::embed::XStorage > createTempStorageBasedOnFolder(const const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , sal_Bool bReadOnly) { - // error during opening the temp file isnt realy a runtime error -> handle it gracefully + // error during opening the temp file isn't really a runtime error -> handle it gracefully css::uno::Reference< css::io::XOutputStream > xTempFile(xSMGR->createInstance(SERVICENAME_TEMPFILE), css::uno::UNO_QUERY); if (!xTempFile.is()) return css::uno::Reference< css::embed::XStorage >(); diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index b188159f32eb..b7f491b70016 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -74,7 +74,7 @@ static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWind ByteString sWindowState; Window* pWindow = VCLUnoHelper::GetWindow(xWindow); - // check for system window is neccessary to guarantee correct pointer cast! + // check for system window is necessary to guarantee correct pointer cast! if (pWindow!=NULL && pWindow->IsSystemWindow()) { sal_uLong nMask = WINDOWSTATE_MASK_ALL; @@ -102,7 +102,7 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex()); Window* pWindow = VCLUnoHelper::GetWindow(xWindow); - // check for system window is neccessary to guarantee correct pointer cast! + // check for system window is necessary to guarantee correct pointer cast! if ( (pWindow ) && (pWindow->IsSystemWindow()) && @@ -128,8 +128,8 @@ static ::sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xW if (xTopWindowCheck.is()) { // Note: Toolkit interface XTopWindow sometimes is used by real VCL-child-windows also .-) - // Be sure that these window is realy a "top system window". - // Attention ! Checking Window->GetParent() isnt the right approach here. + // Be sure that these window is really a "top system window". + // Attention ! Checking Window->GetParent() isn't the right approach here. // Because sometimes VCL create "implicit border windows" as parents even we created // a simple XWindow using the toolkit only .-( ::vos::OGuard aSolarLock(&Application::GetSolarMutex()); diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index dbf823a17175..24fbd14a1c02 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -94,7 +94,7 @@ QuietInteraction::QuietInteraction() void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException ) { - // safe the request for outside analyzing everytime! + // safe the request for outside analyzing every time! css::uno::Any aRequest = xRequest->getRequest(); /* SAFE { */ WriteGuard aWriteLock(m_aLock); @@ -138,7 +138,7 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI { if (xFilter.is()) { - // user selected filter wins everytime! + // user selected filter wins every time! xFilter->setFilter( aAmbigousFilterRequest.SelectedFilter ); xFilter->select(); } diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index a6d6ad282d91..5c8799b336ce 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -166,7 +166,7 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea return css::uno::Any(); // check current state of the help module - // a) help isnt open => show default page for the detected module + // a) help isn't open => show default page for the detected module // b) help shows any other default page(!) => show default page for the detected module // c) help shows any other content => do nothing (user travelled to any other content and leaved the set of default pages) ::rtl::OUString sCurrentHelpURL = its_getCurrentHelpURL(); @@ -227,7 +227,7 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent) // check for right environment. // If its not a DocumentEvent, which triggered this job, - // we cant work correctly! => return immediatly and do nothing + // we can't work correctly! => return immediately and do nothing ::rtl::OUString sEnvType = lEnvironment.getUnpackedValueOrDefault(PROP_ENVTYPE, ::rtl::OUString()); if (!sEnvType.equals(ENVTYPE_DOCUMENTEVENT)) return ::rtl::OUString(); diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index b9f7d483dfba..bbe212da67d0 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -226,7 +226,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD css::uno::Reference< css::task::XJob > xSJob; css::uno::Sequence< css::beans::NamedValue > lJobArgs = impl_generateJobArgs(lDynamicArgs); - // It's neccessary to hold us self alive! + // It's necessary to hold us self alive! // Otherwhise we might die by ref count ... css::uno::Reference< css::task::XJobListener > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY); @@ -426,7 +426,7 @@ css::uno::Sequence< css::beans::NamedValue > Job::impl_generateJobArgs( /*IN*/ c } // get the configuration data from the job data container ... if possible - // Means: if this job has any configuration data. Note: only realy + // Means: if this job has any configuration data. Note: only really // filled lists will be set to the return structure at the end of this method. css::uno::Sequence< css::beans::NamedValue > lConfigArgs ; css::uno::Sequence< css::beans::NamedValue > lJobConfigArgs; @@ -477,8 +477,8 @@ css::uno::Sequence< css::beans::NamedValue > Job::impl_generateJobArgs( /*IN*/ c @short analyze the given job result and change the job configuration @descr Note: Some results can be handled only, if this job has a valid configuration! For "not configured jobs" (means pure services) they can be ignored. - But these cases are handled by our JobData member. We can call it everytime. - It does the right things automaticly. E.g. if the job has no configuration ... + But these cases are handled by our JobData member. We can call it every time. + It does the right things automatically. E.g. if the job has no configuration ... it does nothing during setJobConfig()! @param aResult @@ -546,7 +546,7 @@ void Job::impl_reactForJobResult( /*IN*/ const css::uno::Any& aResult ) at the global desktop instance. That will hold us alive and additional we get the information, if the office whish to shutdown. If then an internal job - is running we will have the chance to supress that + is running we will have the chance to suppress that by throwing a veto exception. If our internal wrapped job finished his work, we can release this listener connection. @@ -707,7 +707,7 @@ void SAL_CALL Job::jobFinished( /*IN*/ const css::uno::Reference< css::task::XAs /* SAFE { */ WriteGuard aWriteLock(m_aLock); - // It's neccessary to check this. + // It's necessary to check this. // May this job was cancelled by any other reason // some milliseconds before. :-) if (m_xJob.is() && m_xJob==xJob) @@ -722,7 +722,7 @@ void SAL_CALL Job::jobFinished( /*IN*/ const css::uno::Reference< css::task::XAs } // And let the start method "execute()" finishing it's job. - // But do it everytime. So any outside blocking code can finish + // But do it every time. So any outside blocking code can finish // his work too. m_aAsyncWait.set(); @@ -787,7 +787,7 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) thro Then we had not throwed a veto exception. But now we must agree with this situation and break all our internal processes. Its not a good idea to mark this instance as non startable any longer inside queryTermination() if no job was unning too. Because that would disable this job and may - the office does not realy shutdownm, because another listener has thrown the suitable exception. + the office does not really shutdownm, because another listener has thrown the suitable exception. @param aEvent describes the broadcaster and must be the desktop instance diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index defdf4fff0a6..85d422a36f0f 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -88,7 +88,7 @@ const sal_Char* JobData::PROP_CONTEXT = "Context" /** @short standard ctor @descr It initialize this new instance. - But for real working it's neccessary to call setAlias() or setService() later. + But for real working it's necessary to call setAlias() or setService() later. Because we need the job data ... @param xSMGR @@ -159,7 +159,7 @@ JobData::~JobData() //________________________________ /** @short initalize this instance as a job with configuration - @descr They given alias can be used to adress some configuraton data. + @descr They given alias can be used to address some configuraton data. We read it and fill our internal structures. Of course old informations will be lost doing so. @@ -255,7 +255,7 @@ void JobData::setService( const ::rtl::OUString& sService ) //________________________________ /** @short initialize this instance with new job values. - @descr It reads automaticly all properties of the specified + @descr It reads automatically all properties of the specified job (using it's alias name) and "register it" for the given event. This registration will not be validated against the underlying configuration! (That must be done from outside. @@ -312,7 +312,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >& if (m_eMode==E_ALIAS) { // It doesn't matter if this config object was already opened before. - // It doesn nothing here then ... or it change the mode automaticly, if + // It doesn nothing here then ... or it change the mode automatically, if // it was opened using another one before. ::rtl::OUString sKey; sKey = ::rtl::OUString::createFromAscii(JOBCFG_ROOT); @@ -377,7 +377,7 @@ void JobData::setResult( const JobResult& aResult ) //________________________________ /** @short set a new environment descriptor for this job - @descr It must(!) be done everytime this container is initialized + @descr It must(!) be done every time this container is initialized with new job datas e.g.: setAlias()/setEvent()/setService() ... Otherwhise the environment will be unknown! */ @@ -505,7 +505,7 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const @short return information, if this job is part of the global configuration package org.openoffice.Office.Jobs @descr Because jobs can be executed by the dispatch framework using an uno service name - directly - an executed job must not have any configuration realy. Such jobs + directly - an executed job must not have any configuration really. Such jobs must provide the right interfaces only! But after finishing jobs can return some informations (e.g. for updating her configuration ...). We must know if such request is valid or not then. @@ -527,9 +527,9 @@ sal_Bool JobData::hasConfig() const And there exist two of them: one for an administrator ... and one for the current user. We change it for the user layer only. So this JobDispatch can't be started any more ... till the administrator change his timestamp. - That can be usefull for post setup scenarios, which must run one time only. + That can be useful for post setup scenarios, which must run one time only. - Note: This method don't do anything, if ths represented job doesn't have a configuration! + Note: This method don't do anything, if this represented job doesn't have a configuration! */ void JobData::disableJob() { @@ -542,7 +542,7 @@ void JobData::disableJob() // update the configuration // It doesn't matter if this config object was already opened before. - // It doesn nothing here then ... or it change the mode automaticly, if + // It doesn nothing here then ... or it change the mode automatically, if // it was opened using another one before. ::rtl::OUStringBuffer sKey(256); sKey.appendAscii(JobData::EVENTCFG_ROOT ); @@ -675,7 +675,7 @@ css::uno::Sequence< ::rtl::OUString > JobData::getEnabledJobsForEvent( const css // get all alias names of jobs, which are part of this job list // But Some of them can be disabled by it's time stamp values. - // We create an additional job name list iwth the same size, then the original list ... + // We create an additional job name list with the same size, then the original list ... // step over all job entries ... check her time stamps ... and put only job names to the // destination list, which represent an enabled job. css::uno::Sequence< ::rtl::OUString > lAllJobs = xJobList->getElementNames(); @@ -726,7 +726,7 @@ css::uno::Sequence< ::rtl::OUString > JobData::getEnabledJobsForEvent( const css But note: that does not set defaults for internal used members, which does not relate to any job property! e.g. the reference to the global uno service manager. Such informations are used for internal processes only - and are neccessary for our work. + and are necessary for our work. */ void JobData::impl_reset() { diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index c9be11d13356..28d76978a6f3 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -230,9 +230,9 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL JobD If a job is already running, (it can only occure for asynchronous jobs) don't start the same job a second time. Queue in the given dispatch parameter - and return immediatly. If the current running job call us back, we will start this + and return immediately. If the current running job call us back, we will start this new dispatch request. - If no job is running - queue the parameter too! But then start the new job immediatly. + If no job is running - queue the parameter too! But then start the new job immediately. We have to queue it every time - because it hold us alive by ref count! @param aURL @@ -298,7 +298,7 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const ::rtl::OUString& // no jobs ... no execution // But a may given listener will know something ... // I think this operaton was finished successfully. - // It's not realy an error, if no registered jobs could be located. + // It's not really an error, if no registered jobs could be located. // Step over all found jobs and execute it int nExecutedJobs=0; for (int j=0; j<lJobs.getLength(); ++j) @@ -329,7 +329,7 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const ::rtl::OUString& // Special mode for listener. // We dont notify it directly here. We delegate that // to the job implementation. But we must set ourself there too. - // Because this job must fake the source adress of the event. + // Because this job must fake the source address of the event. // Otherwhise the listener may will ignore it. if (xListener.is()) pJob->setDispatchResultFake(xListener, xThis); @@ -391,7 +391,7 @@ void JobDispatch::impl_dispatchService( /*IN*/ const ::rtl::OUString& // Special mode for listener. // We dont notify it directly here. We delegate that // to the job implementation. But we must set ourself there too. - // Because this job must fake the source adress of the event. + // Because this job must fake the source address of the event. // Otherwhise the listener may will ignore it. if (xListener.is()) pJob->setDispatchResultFake(xListener, xThis); @@ -442,7 +442,7 @@ void JobDispatch::impl_dispatchAlias( /*IN*/ const ::rtl::OUString& // Special mode for listener. // We dont notify it directly here. We delegate that // to the job implementation. But we must set ourself there too. - // Because this job must fake the source adress of the event. + // Because this job must fake the source address of the event. // Otherwhise the listener may will ignore it. if (xListener.is()) pJob->setDispatchResultFake(xListener, xThis); diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index 6d3b66e5bb9b..21c6245b009d 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -160,7 +160,7 @@ JobExecutor::~JobExecutor() /** @short implementation of XJobExecutor interface @descr We use the given event to locate any registered job inside our configuration - and execute it. Further we control the lifetime of it and supress + and execute it. Further we control the lifetime of it and suppress shutdown of the office till all jobs was finished. @param sEvent @@ -175,7 +175,7 @@ void SAL_CALL JobExecutor::trigger( const ::rtl::OUString& sEvent ) throw(css::u // Optimization! // Check if the given event name exist inside configuration and reject wrong requests. - // This optimization supress using of the cfg api for getting event and job descriptions ... + // This optimization suppress using of the cfg api for getting event and job descriptions ... if (m_lEvents.find(sEvent) == m_lEvents.end()) return; @@ -232,7 +232,7 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent // Optimization! // Check if the given event name exist inside configuration and reject wrong requests. - // This optimization supress using of the cfg api for getting event and job descriptions. + // This optimization suppress using of the cfg api for getting event and job descriptions. // see using of m_lEvents.find() below ... // retrieve event context from event source diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 33e2785abdc2..fdf04a39c50d 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -69,7 +69,7 @@ JobResult::JobResult() { // reset the flag mask! // It will reset the accessible state of this object. - // That can be usefull if something will fail here ... + // That can be useful if something will fail here ... m_eParts = E_NOPART; } @@ -126,7 +126,7 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult ) // reset the flag mask! // It will reset the accessible state of this object. - // That can be usefull if something will fail here ... + // That can be useful if something will fail here ... m_eParts = E_NOPART; // analyze the result and update our other members @@ -182,7 +182,7 @@ JobResult::JobResult( const JobResult& rCopy ) */ JobResult::~JobResult() { - // Nothing realy to do here. + // Nothing really to do here. } //________________________________ @@ -210,7 +210,7 @@ void JobResult::operator=( const JobResult& rCopy ) /** @short checks for existing parts of the analyzed result @descr The internal flag mask was set after analyzing of the pure result. - An user of us can check here, if the required part was realy part + An user of us can check here, if the required part was really part of this result. Otherwhise it would use invalid informations ... by using our other members! diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index 360bb8419a70..0cafa64beee4 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -82,7 +82,7 @@ JobURL::JobURL( /*IN*/ const ::rtl::OUString& sURL ) sal_Int32 t = JOBURL_PROTOCOL_LEN; do { - // seperate all token of "{[event=<name>],[alias=<name>],[service=<name>]}" + // separate all token of "{[event=<name>],[alias=<name>],[service=<name>]}" ::rtl::OUString sToken = sURL.getToken(0, JOBURL_PART_SEPERATOR, t); ::rtl::OUString sPartValue ; ::rtl::OUString sPartArguments; @@ -155,7 +155,7 @@ sal_Bool JobURL::isValid() const @return <TRUE/> if an event part of the job URL exist and the out parameter sEvent was filled. - @attention The out parameter will be reseted everytime. Don't use it if method returns <FALSE/>! + @attention The out parameter will be reseted every time. Don't use it if method returns <FALSE/>! */ sal_Bool JobURL::getEvent( /*OUT*/ ::rtl::OUString& sEvent ) const { @@ -188,7 +188,7 @@ sal_Bool JobURL::getEvent( /*OUT*/ ::rtl::OUString& sEvent ) const @return <TRUE/> if an alias part of the job URL exist and the out parameter sAlias was filled. - @attention The out parameter will be reseted everytime. Don't use it if method returns <FALSE/>! + @attention The out parameter will be reseted every time. Don't use it if method returns <FALSE/>! */ sal_Bool JobURL::getAlias( /*OUT*/ ::rtl::OUString& sAlias ) const { @@ -221,7 +221,7 @@ sal_Bool JobURL::getAlias( /*OUT*/ ::rtl::OUString& sAlias ) const @return <TRUE/> if an service part of the job URL exist and the out parameter sService was filled. - @attention The out parameter will be reseted everytime. Don't use it if method returns <FALSE/>! + @attention The out parameter will be reseted every time. Don't use it if method returns <FALSE/>! */ sal_Bool JobURL::getService( /*OUT*/ ::rtl::OUString& sService ) const { @@ -278,7 +278,7 @@ sal_Bool JobURL::implst_split( /*IN*/ const ::rtl::OUString& sPart , // Otherwhise we do nothing and return sal_False. if (bPartFound) { - // But may the part has optional arguments - seperated by a "?". + // But may the part has optional arguments - separated by a "?". // Do so - we set the return value with the whole part string. // Arguments will be set to an empty string as default. // If we detect the right sign - we split the arguments and overwrite the default. @@ -321,7 +321,7 @@ void JobURL::impldbg_checkIt() JobURL::impldbg_checkURL("vnd.sun.star.job:service=;" , E_UNKNOWN, "" , "" , "" , NULL, NULL, NULL); // check combinations - // Note: No additional spaces or tabs are allowed after a seperator occured. + // Note: No additional spaces or tabs are allowed after a seperator occurred. // Tab and spaces before a seperator will be used as value! JobURL::impldbg_checkURL("vnd.sun.star.job:event=onMyEvent;alias=myAlias;service=css.Service" , E_EVENT | E_ALIAS | E_SERVICE , "onMyEvent", "myAlias", "css.Service" , NULL, NULL, NULL); JobURL::impldbg_checkURL("vnd.sun.star.job:service=css.Service;alias=myAlias" , E_ALIAS | E_SERVICE , "" , "myAlias", "css.Service" , NULL, NULL, NULL); diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index fdbe5850004b..9dbb5eab8694 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -54,19 +54,19 @@ namespace framework{ //_______________________________________________ // definitions -/** adress job configuration inside argument set provided on method execute(). */ +/** address job configuration inside argument set provided on method execute(). */ static const ::rtl::OUString PROP_JOBCONFIG = ::rtl::OUString::createFromAscii("JobConfig"); -/** adress job configuration property "Command". */ +/** address job configuration property "Command". */ static const ::rtl::OUString PROP_COMMAND = ::rtl::OUString::createFromAscii("Command"); -/** adress job configuration property "Arguments". */ +/** address job configuration property "Arguments". */ static const ::rtl::OUString PROP_ARGUMENTS = ::rtl::OUString::createFromAscii("Arguments"); -/** adress job configuration property "DeactivateJobIfDone". */ +/** address job configuration property "DeactivateJobIfDone". */ static const ::rtl::OUString PROP_DEACTIVATEJOBIFDONE = ::rtl::OUString::createFromAscii("DeactivateJobIfDone"); -/** adress job configuration property "CheckExitCode". */ +/** address job configuration property "CheckExitCode". */ static const ::rtl::OUString PROP_CHECKEXITCODE = ::rtl::OUString::createFromAscii("CheckExitCode"); //----------------------------------------------- @@ -116,7 +116,7 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N ::rtl::OUString sRealCommand = impl_substituteCommandVariables(sCommand); // Command is required as minimum. - // If it does not exists ... we cant do our job. + // If it does not exists ... we can't do our job. // Deactivate such miss configured job silently .-) if (sRealCommand.getLength() < 1) return ShellJob::impl_generateAnswer4Deactivation(); diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 54b0c79d012c..04d5afe170c2 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -940,7 +940,7 @@ void LayoutManager::implts_backupProgressBarWrapper() return; // safe a backup copy of the current progress! - // This copy will be used automaticly inside createProgressBar() which is called + // This copy will be used automatically inside createProgressBar() which is called // implictly from implts_doLayout() .-) m_xProgressBarBackup = m_aProgressBarElement.m_xUIElement; diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index ce01521d865f..a2ab45041ea9 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -332,6 +332,12 @@ Rectangle ToolbarLayoutManager::implts_calcDockingArea() // Note: For each docking area row resp. column only the size of largest UIElement is collected. for ( UIElementVector::const_iterator pConstIter = m_aUIElements.begin(); pConstIter != m_aUIElements.end(); ++pConstIter ) { + if ( !pConstIter->m_bVisible + || pConstIter->m_bMasterHide ) + { + continue; + } + uno::Reference< ui::XUIElement > xUIElement( pConstIter->m_xUIElement, uno::UNO_QUERY ); if ( xUIElement.is() ) { @@ -340,7 +346,8 @@ Rectangle ToolbarLayoutManager::implts_calcDockingArea() if ( xWindow.is() && xDockWindow.is() ) { Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); - if ( pWindow && !xDockWindow->isFloating() && pConstIter->m_bVisible ) + if ( pWindow != NULL + && !xDockWindow->isFloating() ) { const awt::Rectangle aPosSize = xWindow->getPosSize(); insertDockingAreaSize( @@ -572,9 +579,6 @@ bool ToolbarLayoutManager::implts_setToolbarVisibility( { implts_setLayoutDirty(); } - aUIElement.m_bVisible = bVisible; - implts_writeWindowStateData( aUIElement ); - implts_setToolbar( aUIElement ); bRet = true; } @@ -586,6 +590,9 @@ bool ToolbarLayoutManager::showToolbar( const ::rtl::OUString& rResourceURL ) { UIElement aUIElement = implts_findToolbar( rResourceURL ); const bool bRet = implts_setToolbarVisibility( true, aUIElement ); + aUIElement.m_bVisible = true; + implts_writeWindowStateData( aUIElement ); + implts_setToolbar( aUIElement ); implts_sortUIElements(); return bRet; } @@ -594,6 +601,9 @@ bool ToolbarLayoutManager::hideToolbar( const ::rtl::OUString& rResourceURL ) { UIElement aUIElement = implts_findToolbar( rResourceURL ); const bool bRet = implts_setToolbarVisibility( false, aUIElement ); + aUIElement.m_bVisible = false; + implts_writeWindowStateData( aUIElement ); + implts_setToolbar( aUIElement ); implts_sortUIElements(); return bRet; } @@ -662,8 +672,9 @@ void ToolbarLayoutManager::setVisible( bool bVisible ) UIElementVector::iterator pIter; for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) { - pIter->m_bMasterHide = !bVisible; implts_setToolbarVisibility( bVisible, *pIter ); + pIter->m_bMasterHide = !bVisible; + implts_setToolbar( *pIter ); } implts_sortUIElements(); @@ -758,16 +769,18 @@ bool ToolbarLayoutManager::dockAllToolbars() { std::vector< ::rtl::OUString > aToolBarNameVector; - ::rtl::OUString aElementType; - ::rtl::OUString aElementName; - ReadGuard aReadLock( m_aLock ); UIElementVector::iterator pIter; for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) { - if ( pIter->m_aType.equalsAscii( "toolbar" ) && pIter->m_xUIElement.is() && - pIter->m_bFloating && pIter->m_bVisible ) + if ( pIter->m_aType.equalsAscii( "toolbar" ) + && pIter->m_xUIElement.is() + && pIter->m_bFloating + && pIter->m_bVisible + && !pIter->m_bMasterHide ) + { aToolBarNameVector.push_back( pIter->m_aName ); + } } aReadLock.unlock(); @@ -1212,7 +1225,7 @@ void ToolbarLayoutManager::implts_reparentToolbars() uno::Reference< awt::XWindow > xWindow; try { - // We have to retreive the window reference with try/catch as it is + // We have to retrieve the window reference with try/catch as it is // possible that all elements have been disposed! xWindow = uno::Reference< awt::XWindow >( xUIElement->getRealInterface(), uno::UNO_QUERY ); } @@ -1222,7 +1235,7 @@ void ToolbarLayoutManager::implts_reparentToolbars() Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) { - // Reparent our child windows acording to their current state. + // Reparent our child windows according to their current state. if ( pIter->m_bFloating ) pWindow->SetParent( pContainerWindow ); else @@ -1371,7 +1384,7 @@ uno::Reference< ui::XUIElement > ToolbarLayoutManager::implts_createElement( con void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno::Reference< awt::XDockableWindow >& rDockWindow ) { ReadGuard aReadLock( m_aLock ); - bool bShowElement( rElement.m_bVisible && !rElement.m_bMasterHide && implts_isParentWindowVisible() ); + const bool bShowElement( rElement.m_bVisible && !rElement.m_bMasterHide && implts_isParentWindowVisible() ); aReadLock.unlock(); uno::Reference< awt::XDockableWindow > xDockWindow( rDockWindow ); @@ -2012,7 +2025,10 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfos( ui::DockingArea eD UIElementVector::iterator pIter; for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) { - if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea && pIter->m_bVisible && !pIter->m_bFloating ) + if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea + && pIter->m_bVisible + && !pIter->m_bMasterHide + && !pIter->m_bFloating ) { uno::Reference< ui::XUIElement > xUIElement( pIter->m_xUIElement ); if ( xUIElement.is() ) @@ -2196,7 +2212,10 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D UIElementVector::iterator pEnd = m_aUIElements.end(); for ( pIter = m_aUIElements.begin(); pIter != pEnd; pIter++ ) { - if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea ) + if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea + && pIter->m_bVisible + && !pIter->m_bMasterHide + && !pIter->m_bFloating ) { bool bSameRowCol = bHorzDockArea ? ( pIter->m_aDockedData.m_aPos.Y() == nRowCol ) : ( pIter->m_aDockedData.m_aPos.X() == nRowCol ); uno::Reference< ui::XUIElement > xUIElement( pIter->m_xUIElement ); @@ -2209,8 +2228,11 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY ); - if ( pWindow && pIter->m_bVisible && xDockWindow.is() && !pIter->m_bFloating ) + if ( pWindow != NULL + && xDockWindow.is() ) + { aWindowVector.push_back( *pIter ); // docked windows + } } } } diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index a7bf1e5605da..530621d90310 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -280,9 +280,9 @@ void LoadEnv::initializeLoading(const ::rtl::OUString& m_bReactivateControllerOnError = sal_False ; m_bLoaded = sal_False ; - // try to find out, if its realy a content, which can be loaded or must be "handled" + // try to find out, if its really a content, which can be loaded or must be "handled" // We use a default value for this in-parameter. Then we have to start a complex check method - // internaly. But if this check was already done outside it can be supressed to perform + // internaly. But if this check was already done outside it can be suppressed to perform // the load request. We take over the result then! if (m_eContentType == E_UNSUPPORTED_CONTENT) { @@ -292,7 +292,7 @@ void LoadEnv::initializeLoading(const ::rtl::OUString& } // make URL part of the MediaDescriptor - // It doesnt mater, if its already an item of it. + // It doesn't mater, if its already an item of it. // It must be the same value ... so we can overwrite it :-) m_lMediaDescriptor[::comphelper::MediaDescriptor::PROP_URL()] <<= sURL; @@ -311,8 +311,8 @@ void LoadEnv::initializeLoading(const ::rtl::OUString& if (pIt != m_lMediaDescriptor.end()) m_lMediaDescriptor.erase(pIt); - // patch the MediaDescriptor, so it fullfill the outside requirements - // Means especialy items like e.g. UI InteractionHandler, Status Indicator, + // patch the MediaDescriptor, so it fulfill the outside requirements + // Means especially items like e.g. UI InteractionHandler, Status Indicator, // MacroExecutionMode etcpp. /*TODO progress is bound to a frame ... How can we set it here? */ @@ -432,7 +432,7 @@ void LoadEnv::startLoading() bStarted = impl_loadContent(); // not started => general error - // We cant say - what was the reason for. + // We can't say - what was the reason for. if (!bStarted) throw LoadEnvException(LoadEnvException::ID_GENERAL_ERROR); } @@ -447,8 +447,8 @@ sal_Bool LoadEnv::waitWhileLoading(sal_uInt32 nTimeout) throw(LoadEnvException, css::uno::RuntimeException) { // Because its not a good idea to block the main thread - // (and we cant be shure that we are currently not used inside the - // main thread!), we cant use conditions here realy. We must yield + // (and we can't be sure that we are currently not used inside the + // main thread!), we can't use conditions here really. We must yield // in an intellegent manner :-) sal_Int32 nTime = nTimeout; @@ -504,14 +504,14 @@ void LoadEnv::cancelLoading() /* Attention: After returning from any cancel/dispose call, neither the frame nor weself may be called back. Because only we can cancel this job, we already know - the result! => Thats why its not usefull nor neccessary to wait for any + the result! => Thats why its not useful nor necessary to wait for any asynchronous listener notification. */ m_bLoaded = sal_False; m_xAsynchronousJob.clear(); } - // or may be its a content handler? Such handler cant be cancelled in its running - // operation :-( And we cant deregister us there again :-( + // or may be its a content handler? Such handler can't be cancelled in its running + // operation :-( And we can't deregister us there again :-( // => The only chance is an exception :-) else throw LoadEnvException(LoadEnvException::ID_STILL_RUNNING); @@ -653,7 +653,7 @@ void LoadEnv::impl_setResult(sal_Bool bResult) impl_reactForLoadingState(); // clearing of this reference will unblock waitWhileLoading()! - // So we must be shure, that loading process was realy finished. + // So we must be sure, that loading process was really finished. // => do it as last operation of this method ... m_xAsynchronousJob.clear(); @@ -701,7 +701,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const ::rtl::OUString& // all needed resources. If they are missing - the following // load request will fail. - /* Attention: The following code cant work on such special URLs! + /* Attention: The following code can't work on such special URLs! It should not break the office .. but it make no sense to start expensive object creations and complex search algorithm if its clear, that such URLs must be handled @@ -832,7 +832,7 @@ void LoadEnv::impl_detectTypeAndFilter() ReadGuard aReadLock(m_aLock); // Attention: Because our stl media descriptor is a copy of an uno sequence - // we cant use as an in/out parameter here. Copy it before and dont forget to + // we can't use as an in/out parameter here. Copy it before and dont forget to // update structure afterwards again! css::uno::Sequence< css::beans::PropertyValue > lDescriptor = m_lMediaDescriptor.getAsConstPropertyValueList(); css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; @@ -862,7 +862,7 @@ void LoadEnv::impl_detectTypeAndFilter() aWriteLock.unlock(); // <- SAFE - // But the type isnt enough. For loading sometimes we need more informations. + // But the type isn't enough. For loading sometimes we need more informations. // E.g. for our "_default" feature, where we recylce any frame which contains // and "Untitled" document, we must know if the new document is based on a template! // But this information is available as a filter property only. @@ -895,7 +895,7 @@ void LoadEnv::impl_detectTypeAndFilter() // Then we have to add the property "AsTemplate". // We need this information to decide afterwards if we can use a "recycle frame" // for target "_default" or has to create a new one everytimes. - // On the other side we have to supress that, if this property already exists + // On the other side we have to suppress that, if this property already exists // and should trigger a special handling. Then the outside calli of this method here, // has to know, what he is doing .-) @@ -944,7 +944,7 @@ sal_Bool LoadEnv::impl_handleContent() m_lMediaDescriptor >> lDescriptor; css::util::URL aURL = m_aURL; - // get neccessary container to query for a handler object + // get necessary container to query for a handler object css::uno::Reference< css::lang::XMultiServiceFactory > xFactory(m_xSMGR->createInstance(SERVICENAME_CONTENTHANDLERFACTORY), css::uno::UNO_QUERY); css::uno::Reference< css::container::XContainerQuery > xQuery (xFactory , css::uno::UNO_QUERY); @@ -1146,7 +1146,7 @@ sal_Bool LoadEnv::impl_loadContent() // if it will be run out of scope. // Note further: ignore if this internal guard already contains a resource. - // Might impl_searchRecylcTarget() set it before. But incase this impl-method wasnt used + // Might impl_searchRecylcTarget() set it before. But incase this impl-method wasn't used // and the target frame was new created ... this lock here must be set! css::uno::Reference< css::document::XActionLockable > xTargetLock(xTargetFrame, css::uno::UNO_QUERY); m_aTargetLock.setResource(xTargetLock); @@ -1242,7 +1242,7 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader() // Otherwhise ... // We need this type information to locate an registered frame loader - // Without such information we cant work! + // Without such information we can't work! ::rtl::OUString sType = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TYPENAME(), ::rtl::OUString()); if (!sType.getLength()) throw LoadEnvException(LoadEnvException::ID_INVALID_MEDIADESCRIPTOR); @@ -1340,7 +1340,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() } // check URL - // May its not usefull to start expensive document search, if it + // May its not useful to start expensive document search, if it // can fail only .. because we load from a stream or model directly! if ( (ProtocolCheck::isProtocol(m_aURL.Complete, ProtocolCheck::E_PRIVATE_STREAM )) || @@ -1360,7 +1360,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() return css::uno::Reference< css::frame::XFrame >(); // task list can be empty! // Note: To detect if a document was alrady loaded before - // we check URLs here only. But might the existing and the requred + // we check URLs here only. But might the existing and the required // document has different versions! Then its URLs are the same ... sal_Int16 nNewVersion = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_VERSION(), (sal_Int16)(-1)); @@ -1406,7 +1406,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() } // get the original load arguments from the current document - // and decide if its realy the same then the one will be. + // and decide if its really the same then the one will be. // It must be visible and must use the same file revision ... // or must not have any file revision set (-1 == -1!) ::comphelper::MediaDescriptor lOldDocDescriptor(xModel->getArgs()); @@ -1641,7 +1641,7 @@ void LoadEnv::impl_reactForLoadingState() { ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex()); Window* pWindow = VCLUnoHelper::GetWindow(xWindow); - // check for system window is neccessary to guarantee correct pointer cast! + // check for system window is necessary to guarantee correct pointer cast! if (pWindow && pWindow->IsSystemWindow()) ((WorkWindow*)pWindow)->Minimize(); } @@ -1661,7 +1661,7 @@ void LoadEnv::impl_reactForLoadingState() { ::rtl::OUString sFrameName; pFrameName->second >>= sFrameName; - // Check the name again. e.g. "_default" isnt allowed. + // Check the name again. e.g. "_default" isn't allowed. // On the other side "_beamer" is a valid name :-) if (TargetHelper::isValidNameForFrame(sFrameName)) m_xTargetFrame->setName(sFrameName); diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx index 42e9fa335d20..6a2d889cd1a7 100644 --- a/framework/source/loadenv/targethelper.cxx +++ b/framework/source/loadenv/targethelper.cxx @@ -88,8 +88,8 @@ sal_Bool TargetHelper::matchSpecialTarget(const ::rtl::OUString& sCheckTarget , -----------------------------------------------*/ sal_Bool TargetHelper::isValidNameForFrame(const ::rtl::OUString& sName) { - // some special targets are realy special ones :-) - // E.g. the are realy used to locate one frame inside the frame tree. + // some special targets are really special ones :-) + // E.g. the are really used to locate one frame inside the frame tree. if ( (!sName.getLength() ) || (TargetHelper::matchSpecialTarget(sName, E_HELPTASK)) || diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index 7ec1ac1e0178..43663ba459a6 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -90,7 +90,7 @@ DEFINE_INIT_SERVICE( /** @short standard constructor to create instance @descr Because an instance will be initialized by her interface methods - it's not neccessary to do anything here. + it's not necessary to do anything here. */ DispatchRecorderSupplier::DispatchRecorderSupplier( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) // init baseclasses first! diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 15896d076d61..287af8706bbf 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -225,7 +225,7 @@ static const sal_Int32 GIVE_UP_RETRY = 1; // in // enable the following defines in case you whish to simulate a full disc for debug purposes .-) -// this define throws everytime a document is stored or a configuration change +// this define throws every time a document is stored or a configuration change // should be flushed an exception ... so the special error handler for this scenario is triggered // #define TRIGGER_FULL_DISC_CHECK @@ -624,10 +624,10 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL& ::comphelper::SequenceAsHashMap lArgs(lArguments); // check if somewhere wish to disable recovery temp. for this office session - // This can be done immediatly ... must not been done asynchronous. + // This can be done immediately ... must not been done asynchronous. if ((eNewJob & AutoRecovery::E_DISABLE_AUTORECOVERY) == AutoRecovery::E_DISABLE_AUTORECOVERY) { - // it's important to set a flag internaly, so AutoRecovery will be supressed - even if it's requested. + // it's important to set a flag internaly, so AutoRecovery will be suppressed - even if it's requested. m_eJob |= eNewJob; implts_stopTimer(); implts_stopListening(); @@ -873,8 +873,8 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent implts_updateModifiedState(xDocument); } /* at least one document starts saving process => - Our application code isnt ready for multiple save requests - at the same time. So we have to supress our AutoSave feature + Our application code isn't ready for multiple save requests + at the same time. So we have to suppress our AutoSave feature for the moment, till this other save requests will be finished. */ else @@ -899,7 +899,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent /* document saved as copy => mark it as "non used by concurrent save operation". so we can try to create a backup copy if next time AutoSave is started too. Dont remove temp. files or change the modified state of the document! - It was not realy saved to the original file ... + It was not really saved to the original file ... */ else if (aEvent.EventName.equals(EVENT_ON_SAVETODONE)) @@ -978,7 +978,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven // Note: This call stops the timer and starts it again. // But it checks the different timer states internaly and - // may be supress the restart! + // may be suppress the restart! implts_updateTimer(); } @@ -1063,7 +1063,7 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf catch(const css::uno::Exception&) { // These config keys are not sooooo important, that - // we are interested on errors here realy .-) + // we are interested on errors here really .-) nMinSpaceDocSave = MIN_DISCSPACE_DOCSAVE; nMinSpaceConfigSave = MIN_DISCSPACE_CONFIGSAVE; } @@ -1211,7 +1211,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume if (!rInfo.AppModule.getLength()) { throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Cant find out the default filter and its extension, if no application module is known!"), + ::rtl::OUString::createFromAscii("Can't find out the default filter and its extension, if no application module is known!"), static_cast< css::frame::XDispatch* >(this)); } @@ -1271,7 +1271,7 @@ void AutoRecovery::implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo { ENSURE_OR_THROW2( rInfo.AppModule.getLength() || rInfo.Document.is(), - "Cant find out the application module nor its factory URL, if no application module (or a suitable) document is known!", + "Can't find out the application module nor its factory URL, if no application module (or a suitable) document is known!", *this ); // SAFE -> ---------------------------------- @@ -1427,7 +1427,7 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn catch(const css::uno::Exception& ex) { // a) FULL DISC seams to be the problem behind => show error and retry it forever (e.g. retry=300) - // b) unknown problem (may be locking problem) => reset RETRY value to more usefull value(!) (e.g. retry=3) + // b) unknown problem (may be locking problem) => reset RETRY value to more useful value(!) (e.g. retry=3) // c) unknown problem (may be locking problem) + 1..2 repeating operations => throw the original exception to force generation of a stacktrace ! // SAFE -> @@ -1682,7 +1682,7 @@ IMPL_LINK(AutoRecovery, implts_timerExpired, void*, EMPTYARG) sal_Bool bAllowUserIdleLoop = sal_True; AutoRecovery::ETimerType eSuggestedTimer = implts_saveDocs(bAllowUserIdleLoop, sal_False); - // If timer isnt used for "short callbacks" (means polling + // If timer isn't used for "short callbacks" (means polling // for special states) ... reset the handle state of all // cache items. Such handle state indicates, that a document // was already saved during the THIS(!) AutoSave session. @@ -1803,7 +1803,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame implts_specifyAppModuleAndFactory(aNew); // Hack! Check for "illegal office documents" ... as e.g. the Basic IDE - // Its not realy a full featured office document. It doesnt provide an URL, any filter, a factory URL etcpp. + // Its not really a full featured office document. It doesn't provide an URL, any filter, a factory URL etcpp. // TODO file bug to Basci IDE developers. They must remove the office document API from its service. if ( (!aNew.OrgURL.getLength() ) && @@ -1881,7 +1881,7 @@ void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::fra aCacheLock.unlock(); // Sometimes we close documents by ourself. - // And these documents cant be deregistered. + // And these documents can't be deregistered. // Otherwhise we loos our configuration data ... but need it ! // see SessionSave ! if (aInfo.IgnoreClosing) @@ -1899,7 +1899,7 @@ void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::fra /* This method is called within disposing() of the document too. But there it's not a good idea to deregister us as listener. Furter it make no sense - because the broadcaster dies. - So we supress deregistration in such case ... + So we suppress deregistration in such case ... */ if (bStopListening) implts_stopModifyListeningOnDoc(aInfo); @@ -2200,7 +2200,7 @@ void AutoRecovery::implts_prepareSessionShutdown() So we have to check a second time, if this property is set .... Best place doing so is to check it immeditaly before saving and supressingd saving the document then. - Of course removing the corresponding cache entry isnt an option. + Of course removing the corresponding cache entry isn't an option. Because it would disturb iteration over the cache ! So we ignore such documents only ... Hopefully next time they are not inserted in our cache. @@ -2304,11 +2304,11 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( sal_Bool bAl // ii) For a CrashSave ... add it to the list of dangerous documents and // save it after all other documents was saved successfully. That decrease // the chance for a crash inside a crash. - // On the other side it's not neccessary for documents, which are not modified. + // On the other side it's not necessary for documents, which are not modified. // They can be handled normaly - means we patch the corresponding configuration entry only. // iii) For a SessionSave ... ignore it! There is no time to wait for this save operation. - // Because the WindowManager will kill the process if it doesnt react immediatly. - // On the other side we cant risk a concurrent save request ... because we know + // Because the WindowManager will kill the process if it doesn't react immediately. + // On the other side we can't risk a concurrent save request ... because we know // that it will produce a crash. // Attention: Because eJob is used as a flag field, you have to check for the worst case first. @@ -2460,7 +2460,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString& bError = sal_True; // a) FULL DISC seams to be the problem behind => show error and retry it forever (e.g. retry=300) - // b) unknown problem (may be locking problem) => reset RETRY value to more usefull value(!) (e.g. retry=3) + // b) unknown problem (may be locking problem) => reset RETRY value to more useful value(!) (e.g. retry=3) // c) unknown problem (may be locking problem) + 1..2 repeating operations => throw the original exception to force generation of a stacktrace ! // SAFE -> @@ -2500,12 +2500,12 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString& rInfo.DocumentState |= AutoRecovery::E_INCOMPLETE; } - // make sure the progress isnt referred any longer + // make sure the progress isn't referred any longer impl_forgetProgress(rInfo, lNewArgs, css::uno::Reference< css::frame::XFrame >()); // try to remove the old temp file. // Ignore any error here. We have a new temp file, which is up to date. - // The only thing is: we fill the disk with temp files, if we cant remove old ones :-) + // The only thing is: we fill the disk with temp files, if we can't remove old ones :-) ::rtl::OUString sRemoveFile = rInfo.OldTempURL; rInfo.OldTempURL = rInfo.NewTempURL; rInfo.NewTempURL = ::rtl::OUString(); @@ -2700,7 +2700,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa /* Normaly we listen as XModifyListener on a document to know if a document was changed since our last AutoSave. And we deregister us in case we know this state. But directly after one document as recovered ... we must start listening. - Otherwhise the first "modify" doesnt reach us. Because we ourself called setModified() + Otherwise the first "modify" doesn't reach us. Because we ourselves called setModified() on the document via API. And currently we dont listen for any events (not at the GlobalEventBroadcaster nor at any document!). */ @@ -2853,7 +2853,7 @@ void AutoRecovery::implts_generateNewTempURL(const ::rtl::OUString& // This unique name must solve an optimization problem too! // In case we are asked to save unmodified documents too - and one of them // is an empty one (because it was new created using e.g. an URL private:factory/...) - // we should not save it realy. Then we put the information about such "empty document" + // we should not save it really. Then we put the information about such "empty document" // into the configuration and dont create any recovery file on disk. // We use the title of the document to make it unique. ::rtl::OUStringBuffer sUniqueName; @@ -3053,10 +3053,10 @@ void AutoRecovery::implts_resetHandleStates(sal_Bool /*bLoadCache*/) //----------------------------------------------- void AutoRecovery::implts_prepareEmergencySave() { - // Be sure to know all open documents realy .-) + // Be sure to know all open documents really .-) implts_verifyCacheAgainstDesktopDocumentList(); - // hide all docs, so the user cant disturb our emergency save .-) + // hide all docs, so the user can't disturb our emergency save .-) implts_changeAllDocVisibility(sal_False); } @@ -3081,7 +3081,7 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) // during normal AutoSave more then once. Because // it postpone active documents and save it later. // That is normaly done by recalling it from a timer. - // Here we must do it immediatly! + // Here we must do it immediately! // Of course this method returns the right state - // because it knows, that we are running in ERMERGENCY SAVE mode .-) @@ -3141,7 +3141,7 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) { LOG_RECOVERY("AutoRecovery::implts_doSessionSave()") - // Be sure to know all open documents realy .-) + // Be sure to know all open documents really .-) implts_verifyCacheAgainstDesktopDocumentList(); // for all docs, store their current view/names in the configurtion @@ -3151,7 +3151,7 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) // during normal AutoSave more then once. Because // it postpone active documents and save it later. // That is normaly done by recalling it from a timer. - // Here we must do it immediatly! + // Here we must do it immediately! // Of course this method returns the right state - // because it knows, that we are running in SESSION SAVE mode .-) @@ -3377,7 +3377,7 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue , sal_Bool bRecoveryData = ((sal_Bool)(m_lDocCache.size()>0)); - // exists session data ... => then we cant say, that these + // exists session data ... => then we can't say, that these // data are valid for recovery. So we have to return sal_False then! if (bSessionData) bRecoveryData = sal_False; @@ -3590,7 +3590,7 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& // for loading documents into this frame)! // But if no frame exists ... we can try to locate it using any frame bound to the provided // document. Of course we must live without any frame in case the document does not exists at this - // point. But this state shouldnt occure. In such case xNewFrame should be valid ... hopefully .-) + // point. But this state shouldn't occure. In such case xNewFrame should be valid ... hopefully .-) css::uno::Reference< css::frame::XFrame > xFrame = xNewFrame; if ( (!xFrame.is() ) && @@ -3629,7 +3629,7 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& // So we use a two step mechanism: // 1) we set the progress inside the MediaDescriptor, which will be provided to the filter // 2) and we set a special Frame property, which overwrites the normal behaviour of Frame::createStatusIndicator .-) - // But we supress 2) in case we uses an internal progress. Because then it doesnt matter + // But we suppress 2) in case we uses an internal progress. Because then it doesn't matter // if our applications make it wrong. In such case the internal progress resists at the same frame // and there is no need to forward progress activities to e.g. an outside dialog .-) if ( @@ -3656,7 +3656,7 @@ void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo& // for loading documents into this frame)! // But if no frame exists ... we can try to locate it using any frame bound to the provided // document. Of course we must live without any frame in case the document does not exists at this - // point. But this state shouldnt occure. In such case xNewFrame should be valid ... hopefully .-) + // point. But this state shouldn't occure. In such case xNewFrame should be valid ... hopefully .-) css::uno::Reference< css::frame::XFrame > xFrame = xNewFrame; if ( (!xFrame.is() ) && diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index d9b3bc144034..e1952e4f3e3d 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -376,7 +376,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL BackingComp::impl_createIns /** returns a new factory instance for instances of this class. It uses a helper class of the cppuhelper project as factory. - It will be initialized with all neccessary informations and + It will be initialized with all necessary informations and will be able afterwards to create instance of this class. This factory call us back inside our method impl_createInstance(). So we can create and initialize ourself. Only filtering of creation @@ -405,7 +405,7 @@ css::uno::Reference< css::lang::XSingleServiceFactory > BackingComp::impl_create attach this component to a target frame. We has to use the container window of this frame as parent window of our own component window. - But it's not allowed to work with it realy. May another component used it too. + But it's not allowed to work with it really. May another component used it too. Currently we need it only to create our child component window and support it's interfaces inside our queryInterface() method. The user of us must have e.g. the XWindow interface of it to be able to call setComponent(xWindow,xController) at the @@ -542,7 +542,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f This component does not know any model. It will be represented by a window and it's controller only. - return <FALSE/> everytime. + return <FALSE/> every time. */ sal_Bool SAL_CALL BackingComp::attachModel( /*IN*/ const css::uno::Reference< css::frame::XModel >& ) @@ -642,7 +642,7 @@ sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool ) and inform us. We must release its reference only here. Of course we check the given reference here and reject callback from unknown sources. - Note: deregistration as listener isnt neccessary here. The broadcaster do it automaticly. + Note: deregistration as listener isn't necessary here. The broadcaster do it automatically. @param aEvent describe the broadcaster of this callback @@ -764,7 +764,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c /** not supported. - Because registration is not supported too, we must do nothing here. Nobody can call this method realy. + Because registration is not supported too, we must do nothing here. Nobody can call this method really. @param xListener not used. @@ -783,7 +783,7 @@ void SAL_CALL BackingComp::removeEventListener( /*IN*/ const css::uno::Reference Inside attachFrame() we created our component window. But it was not allowed there, to initialitze it. E.g. the menu must be set at the container window of the frame, which is our parent window. But may at that time another component used it. - That's why our creator has to inform us, when it's time to initialize us realy. + That's why our creator has to inform us, when it's time to initialize us really. Currently only calling of this method must be done. But further implementatoins can use special in parameter to configure this initialization ... diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index b7cb95a47cce..df5f01926d0f 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -482,7 +482,7 @@ void BackingWindow::initControls() nYPos += (maProductSize.Height()*3)/2; - // set a slighly larger font than normal labels on the texts + // set a slightly larger font than normal labels on the texts maTextFont.SetSize( Size( 0, 11 ) ); maTextFont.SetWeight( WEIGHT_NORMAL ); diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 6b3271349cc7..006389388b0a 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -221,7 +221,7 @@ DEFINE_INIT_SERVICE ( Desktop, @attention a) Don't use your own reference during an UNO-Service-ctor! There is no guarantee, that you will get over this. (e.g. using of your reference as parameter to initialize some member) - Do such things in DEFINE_INIT_SERVICE() method, which is called automaticly after your ctor!!! + Do such things in DEFINE_INIT_SERVICE() method, which is called automatically after your ctor!!! b) Baseclass OBroadcastHelper is a typedef in namespace cppu! The microsoft compiler has some problems to handle it right BY using namespace explicitly ::cppu::OBroadcastHelper. If we write it without a namespace or expand the typedef to OBrodcastHelperVar<...> -> it will be OK!? @@ -416,7 +416,7 @@ sal_Bool SAL_CALL Desktop::terminate() if ( xPipeTerminator.is() ) xPipeTerminator->notifyTermination( aEvent ); - // Must be realy the last listener to be called. + // Must be really the last listener to be called. // Because it shutdown the whole process asynchronous ! if ( xSfxTerminator.is() ) xSfxTerminator->notifyTermination( aEvent ); @@ -579,7 +579,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentCompone /*-************************************************************************************************************//** @interface XDesktop @short return the current active frame in hierarchy - @descr There can be more then one different active pathes in our frame hierarchy. But only one of them + @descr There can be more then one different active paths in our frame hierarchy. But only one of them could be the most active frame (normal he has the focus). Don't mix it with getActiveFrame()! That will return our current active frame, which must be a direct child of us and should be a part(!) of an active path. @@ -658,7 +658,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFrom /*-************************************************************************************************************//** @interface XTasksSupplier @short get access to create enumerations of ouer taskchilds - @descr Direct childs of desktop are tasks everytime. + @descr Direct childs of desktop are tasks every time. Call these method to could create enumerations of it. But; Don't forget - you will be the owner of returned object and must release it! @@ -779,7 +779,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desk @short supports registration/deregistration of interception objects, which are interested on special dispatches. - @descr Its realy provided by an internal helper, which is used inside the dispatch api too. + @descr Its really provided by an internal helper, which is used inside the dispatch api too. @param xInterceptor the interceptor object, which wish to be (de)registered. @@ -857,7 +857,7 @@ void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XF // If nothing will change - do nothing! // Otherwise set new active frame ... // and deactivate last frame. - // It's neccessary for our FrameActionEvent listener on a frame! + // It's necessary for our FrameActionEvent listener on a frame! css::uno::Reference< css::frame::XFrame > xLastActiveChild = m_aChildTaskContainer.getActive(); if( xLastActiveChild != xFrame ) { @@ -1053,7 +1053,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r // force using of "if() else if() ..." //----------------------------------------------------------------------------------------------------- - // get threadsafe some neccessary member which are neccessary for following functionality + // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ ReadGuard aReadLock( m_aLock ); css::uno::Reference< css::lang::XMultiServiceFactory > xFactory = m_xFactory; @@ -1063,7 +1063,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r //----------------------------------------------------------------------------------------------------- // I.I) "_blank" // create a new task as child of this desktop instance - // Note: Used helper TaskCreator use us automaticly ... + // Note: Used helper TaskCreator use us automatically ... //----------------------------------------------------------------------------------------------------- if ( sTargetFrameName==SPECIALTARGET_BLANK ) { @@ -1102,10 +1102,10 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r // But we ust break further searches if target was already found. // Order of using flags is fix: SELF - CHILDREN - SIBLINGS - PARENT // TASK and CREATE are handled special. - // But note: Such flags are not valid for the desktop - especialy SIBLINGS or PARENT. + // But note: Such flags are not valid for the desktop - especially SIBLINGS or PARENT. //------------------------------------------------------------------------------------------------- - // get threadsafe some neccessary member which are neccessary for following functionality + // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ aReadLock.lock(); ::rtl::OUString sOwnName = m_sName; @@ -1129,9 +1129,9 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r // II.II) TASKS // This is a special flag. Normaly it regulate search inside tasks and forbid access to parent trees. // But the desktop exists outside such task trees. They are our sub trees. So the desktop implement - // a special feature: We use it to start search on our direct childrens only. That means we supress - // search on ALL child frames. May that can be usefull to get access on opened document tasks - // only without filter out all non realy required sub frames ... + // a special feature: We use it to start search on our direct childrens only. That means we suppress + // search on ALL child frames. May that can be useful to get access on opened document tasks + // only without filter out all non really required sub frames ... // Used helper method on our container doesn't create any frame - its a search only. //------------------------------------------------------------------------------------------------- if ( @@ -1160,7 +1160,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r //------------------------------------------------------------------------------------------------- // II.IV) CREATE // If we haven't found any valid target frame by using normal flags - but user allowed us to create - // a new one ... we should do that. Used TaskCreator use us automaticly as parent! + // a new one ... we should do that. Used TaskCreator use us automatically as parent! //------------------------------------------------------------------------------------------------- if ( ( ! xTarget.is() ) && @@ -1187,12 +1187,12 @@ void SAL_CALL Desktop::dispose() WriteGuard aWriteLock( m_aLock ); // Look for multiple calls of this method! - // If somewhere call dispose() twice - he will be stopped here realy!!! + // If somewhere call dispose() twice - he will be stopped here really!!! TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); // Now - we are alone and its the first call of this method ... // otherwise call before had thrown a DisposedException / hopefully .-) - // But we dont use the transaction object created before ... we reset it immediatly ... + // But we dont use the transaction object created before ... we reset it immediately ... // two lines of code ... for what ? // The answer: We wished to synchronize concurrent dispose() calls -> OK // But next line will wait for all currently running transaction (even if they @@ -1211,7 +1211,7 @@ void SAL_CALL Desktop::dispose() // Following lines of code can be called outside a synchronized block ... // Because our transaction manager will block all new requests to this object. // So nobody can use us any longer. - // Exception: Only removing of listener will work ... and this code cant be dangerous. + // Exception: Only removing of listener will work ... and this code can't be dangerous. // First we has to kill all listener connections. // They might rely on our member and can hinder us on releasing them. @@ -1328,7 +1328,7 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& /*-************************************************************************************************************//** @interface XEventListener @short not implemented! - @descr We are a status listener ... and so we must be an event listener too ... But we doesn't need it realy! + @descr We are a status listener ... and so we must be an event listener too ... But we doesn't need it really! We are a temp. listener only and our lifetime isn't smaller then of our temp. used dispatcher. @seealso method loadComponentFromURL() @@ -1346,7 +1346,7 @@ void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::un /*-************************************************************************************************************//** @interface XInteractionHandler - @short callback for loadComponentFromURL for detected exceptions during load proccess + @short callback for loadComponentFromURL for detected exceptions during load process @descr In this case we must cancel loading and throw these detected exception again as result of our own called method. @@ -1437,7 +1437,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio /* SAFE AREA ------------------------------------------------------------------------------------------- */ // Ok now it's time to break yield loop of loadComponentFromURL(). - // But only for realy aborted requests! + // But only for really aborted requests! // For example warnings will be approved and we wait for any success story ... if (bAbort) { @@ -1490,7 +1490,7 @@ void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css Don't use this directly! You must try to convert the value of given DESKTOP_PROPHANDLE and return results of this operation. This will be used to ask vetoable - listener. If no listener has a veto, we will change value realy! + listener. If no listener has a veto, we will change value really! ( in method setFastPropertyValue_NoBroadcast(...) ) @attention Methods of OPropertySethelper are safed by using our shared osl mutex! (see ctor!) @@ -1555,7 +1555,7 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue( css::uno::Any& aCon @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 class OPropertySetHelper @@ -1658,7 +1658,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue , if( pInfoHelper == NULL ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". - // "impl_getStaticPropertyDescriptor" is a non exported and static funtion, who will define a static propertytable. + // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); pInfoHelper = &aInfoHelper; @@ -1956,7 +1956,7 @@ void Desktop::impl_sendNotifyTerminationEvent() // Reactivate controller. // It can happen that XController.suspend() returned true ... but a registered close listener // throwed these veto exception. Then the controller has to be reactivated. Otherwise - // these document doesnt work any more. + // these document doesn't work any more. if ( (bSuspended ) && (xController.is()) diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 92800cc61ff4..e48fbbc84f64 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -257,7 +257,7 @@ DEFINE_INIT_SERVICE ( Frame, @attention a) Don't use your own reference during an UNO-Service-ctor! There is no guarantee, that you will get over this. (e.g. using of your reference as parameter to initialize some member) - Do such things in DEFINE_INIT_SERVICE() method, which is called automaticly after your ctor!!! + Do such things in DEFINE_INIT_SERVICE() method, which is called automatically after your ctor!!! b) Baseclass OBroadcastHelper is a typedef in namespace cppu! The microsoft compiler has some problems to handle it right BY using namespace explicitly ::cppu::OBroadcastHelper. If we write it without a namespace or expand the typedef to OBrodcastHelperVar<...> -> it will be OK!? @@ -426,7 +426,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw ReadGuard aReadLock( m_aLock ); // Return current active frame. - // This information is avaliable on the container. + // This information is available on the container. return m_aChildFrameContainer.getActive(); } @@ -455,7 +455,7 @@ void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFra /* SAFE AREA ----------------------------------------------------------------------------------------------- */ WriteGuard aWriteLock( m_aLock ); - // Copy neccessary member for threadsafe access! + // Copy necessary member for threadsafe access! // m_aChildFrameContainer is threadsafe himself and he live if we live!!! // ...and our transaction is non breakable too ... css::uno::Reference< css::frame::XFrame > xActiveChild = m_aChildFrameContainer.getActive(); @@ -572,7 +572,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& if ( m_xContainerWindow.is() ) throw css::uno::RuntimeException( - ::rtl::OUString::createFromAscii("Frame::initialized() is called more then once, which isnt usefull nor allowed."), + ::rtl::OUString::createFromAscii("Frame::initialized() is called more then once, which isn't useful nor allowed."), static_cast< css::frame::XFrame* >(this)); // Look for rejected calls first! @@ -816,7 +816,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl // force using of "if() else if() ..." //----------------------------------------------------------------------------------------------------- - // get threadsafe some neccessary member which are neccessary for following functionality + // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ ReadGuard aReadLock( m_aLock ); css::uno::Reference< css::frame::XFrame > xParent ( m_xParent, css::uno::UNO_QUERY ); @@ -829,7 +829,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl //----------------------------------------------------------------------------------------------------- // I.I) "_blank" // Not allowed for a normal frame - but for the desktop. - // Use helper class to do so. It use the desktop automaticly. + // Use helper class to do so. It use the desktop automatically. //----------------------------------------------------------------------------------------------------- if ( sTargetFrameName==SPECIALTARGET_BLANK ) { @@ -914,7 +914,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl // TASK and CREATE are handled special. //------------------------------------------------------------------------------------------------- - // get threadsafe some neccessary member which are neccessary for following functionality + // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ aReadLock.lock(); ::rtl::OUString sOwnName = m_sName; @@ -964,7 +964,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl //------------------------------------------------------------------------------------------------- // II.III.I) SIBLINGS // Search on all our direct siblings - means all childrens of our parent. - // Use this flag in combination with TASK. We must supress such upper search if + // Use this flag in combination with TASK. We must suppress such upper search if // user has not set it and if we are a top frame. // // Attention: Don't forward this request to our parent as a findFrame() call. @@ -1040,7 +1040,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl //------------------------------------------------------------------------------------------------- // II.IV) CREATE // If we haven't found any valid target frame by using normal flags - but user allowed us to create - // a new one ... we should do that. Used TaskCreator use Desktop instance automaticly as parent! + // a new one ... we should do that. Used TaskCreator use Desktop instance automatically as parent! //------------------------------------------------------------------------------------------------- if ( ( ! xTarget.is() ) && @@ -1088,7 +1088,7 @@ sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException ) /*-****************************************************************************************************//** @short activate frame in hierarchy - @descr This feature is used to mark active pathes in our frame hierarchy. + @descr This feature is used to mark active paths in our frame hierarchy. You can be a listener for this event to react for it ... change some internal states or something else. @seealso method deactivate() @@ -1110,8 +1110,8 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException ) /* SAFE AREA ----------------------------------------------------------------------------------------------- */ WriteGuard aWriteLock( m_aLock ); - // Copy neccessary member and free the lock. - // It's not neccessary for m_aChildFrameContainer ... because + // Copy necessary member and free the lock. + // It's not necessary for m_aChildFrameContainer ... because // he is threadsafe himself and live if we live. // We use a registered transaction to prevent us against // breaks during this operation! @@ -1136,7 +1136,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException ) // Deactivate sibling path and forward activation to parent ... if any parent exist! if( xParent.is() == sal_True ) { - // Everytime set THIS frame as active child of parent and activate it. + // Every time set THIS frame as active child of parent and activate it. // We MUST have a valid path from bottom to top as active path! // But we must deactivate the old active sibling path first. @@ -1151,7 +1151,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException ) // But we do nothing then! We are already activated. xParent->activate(); } - // Its neccessary to send event NOW - not before. + // Its necessary to send event NOW - not before. // Activation goes from bottom to top! // Thats the reason to activate parent first and send event now. implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_ACTIVATED ); @@ -1188,7 +1188,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException ) /*-****************************************************************************************************//** @short deactivate frame in hierarchy - @descr This feature is used to deactive pathes in our frame hierarchy. + @descr This feature is used to deactive paths in our frame hierarchy. You can be a listener for this event to react for it ... change some internal states or something else. @seealso method activate() @@ -1210,7 +1210,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException ) /* SAFE AREA ----------------------------------------------------------------------------------------------- */ WriteGuard aWriteLock( m_aLock ); - // Copy neccessary member and free the lock. + // Copy necessary member and free the lock. css::uno::Reference< css::frame::XFrame > xActiveChild = m_aChildFrameContainer.getActive() ; css::uno::Reference< css::frame::XFramesSupplier > xParent ( m_xParent, css::uno::UNO_QUERY ) ; css::uno::Reference< css::frame::XFrame > xThis ( static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY ); @@ -1893,7 +1893,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException ) // should exist. Otherwhise it's the problem of the outside caller. // Note: // (a) Do it after stopWindowListening(). May that force some active/deactive - // notifications which we doesn't need here realy. + // notifications which we doesn't need here really. // (b) Don't forget to save the old value of IsDialogCancelEnabled() to // restore it afterwards. We cannot call EnableDialogCancel( sal_False ) // as we would kill the headless mode! @@ -1972,7 +1972,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException ) m_bSelfClose = sal_False; m_bIsHidden = sal_True; - // Disable this instance for further working realy! + // Disable this instance for further working really! m_aTransactionManager.setWorkingMode( E_CLOSE ); // Don't forget it restore old value - @@ -2042,7 +2042,7 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusI /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ReadGuard aReadLock( m_aLock ); - // Make snapshot of neccessary member and define default return value. + // Make snapshot of necessary member and define default return value. css::uno::Reference< css::task::XStatusIndicator > xExternal(m_xIndicatorInterception.get(), css::uno::UNO_QUERY); css::uno::Reference< css::task::XStatusIndicatorFactory > xFactory = m_xIndicatorFactoryHelper; @@ -2388,7 +2388,7 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css:: /*-****************************************************************************************************//** @short react for a show event for the internal container window - @descr Normaly we doesn't need this information realy. But we can use it to + @descr Normaly we doesn't need this information really. But we can use it to implement the special feature "trigger first visible task". Algorithm: - first we have to check if we are a top (task) frame @@ -2483,7 +2483,7 @@ void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent ) throw( cs if( aEvent.Source == m_xContainerWindow ) { - // NECCESSARY: Impl-method is threadsafe by himself! + // NECESSARY: Impl-method is threadsafe by himself! aWriteLock.unlock(); implts_stopWindowListening(); aWriteLock.lock(); @@ -2858,7 +2858,7 @@ void Frame::implts_setIconOnWindow() TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - // Make snapshot of neccessary members and release lock. + // Make snapshot of necessary members and release lock. ReadGuard aReadLock( m_aLock ); css::uno::Reference< css::awt::XWindow > xContainerWindow( m_xContainerWindow, css::uno::UNO_QUERY ); css::uno::Reference< css::frame::XController > xController ( m_xController , css::uno::UNO_QUERY ); @@ -2937,9 +2937,9 @@ void Frame::implts_setIconOnWindow() /*-************************************************************************************************************//** @short helper to start/stop listeneing for window events on container window - @descr If we get a new container window, we must set it on internal memeber ... + @descr If we get a new container window, we must set it on internal member ... and stop listening at old one ... and start listening on new one! - But sometimes (in dispose() call!) it's neccessary to stop listeneing without starting + But sometimes (in dispose() call!) it's necessary to stop listeneing without starting on new connections. So we split this functionality to make it easier at use. @seealso method initialize() @@ -2957,7 +2957,7 @@ void Frame::implts_startWindowListening() TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - // Make snapshot of neccessary member! + // Make snapshot of necessary member! ReadGuard aReadLock( m_aLock ); css::uno::Reference< css::awt::XWindow > xContainerWindow = m_xContainerWindow ; css::uno::Reference< css::lang::XMultiServiceFactory > xFactory = m_xFactory ; @@ -3000,7 +3000,7 @@ void Frame::implts_stopWindowListening() TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS ); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ - // Make snapshot of neccessary member! + // Make snapshot of necessary member! ReadGuard aReadLock( m_aLock ); css::uno::Reference< css::awt::XWindow > xContainerWindow = m_xContainerWindow ; css::uno::Reference< css::lang::XMultiServiceFactory > xFactory = m_xFactory ; @@ -3061,7 +3061,7 @@ void Frame::implts_checkSuicide() aReadLock.unlock(); /* } SAFE */ // force close and deliver owner ship to source of possible throwed veto exception - // Attention: Because this method isn't designed to throw such exception we must supress + // Attention: Because this method isn't designed to throw such exception we must suppress // it for outside code! try { @@ -3089,7 +3089,7 @@ void Frame::implts_checkSuicide() void Frame::impl_setCloser( /*IN*/ const css::uno::Reference< css::frame::XFrame >& xFrame , /*IN*/ sal_Bool bState ) { - // Note: If start module isnt installed - no closer has to be shown! + // Note: If start module isn't installed - no closer has to be shown! if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE)) return; @@ -3124,7 +3124,7 @@ void Frame::impl_checkMenuCloser() ReadGuard aReadLock(m_aLock); // only top frames, which are part of our desktop hierarchy, can - // do so! By the way - we need the desktop instance to have acess + // do so! By the way - we need the desktop instance to have access // to all other top level frames too. css::uno::Reference< css::frame::XDesktop > xDesktop (m_xParent, css::uno::UNO_QUERY); css::uno::Reference< css::frame::XFramesSupplier > xTaskSupplier(xDesktop , css::uno::UNO_QUERY); @@ -3150,7 +3150,7 @@ void Frame::impl_checkMenuCloser() // If there exist ate least one other frame - there are two frames currently open. // But we can enable this closer only, if one of these two tasks includes the help module. // The "other frame" couldn't be the help. Because then it wouldn't be part of this "other list". - // In such case it will be seperated to the reference aAnalyzer.m_xHelp! + // In such case it will be separated to the reference aAnalyzer.m_xHelp! // But we must check, if weself includes the help ... // Check aAnalyzer.m_bReferenceIsHelp! if ( @@ -3180,7 +3180,7 @@ void Frame::impl_checkMenuCloser() xNewCloserFrame = this; } - // Look for neccessary actions ... + // Look for necessary actions ... // Only if the closer state must be moved from one frame to another one // or must be enabled/disabled at all. /* STATIC SAFE { */ diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx index 294c299b622a..9a34e17a6b7b 100644 --- a/framework/source/services/modulemanager.cxx +++ b/framework/source/services/modulemanager.cxx @@ -171,7 +171,7 @@ ModuleManager::~ModuleManager() if (sModule.getLength() < 1) throw css::frame::UnknownModuleException( - ::rtl::OUString::createFromAscii("Cant find suitable module for the given component."), + ::rtl::OUString::createFromAscii("Can't find suitable module for the given component."), static_cast< ::cppu::OWeakObject* >(this)); return sModule; @@ -205,7 +205,7 @@ void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName , // get access to the element // Note: Dont use impl_getConfig() method here. Because it creates a readonly access only, further // it cache it as a member of this module manager instance. If we change some props there ... but dont - // flush changes (because an error occured) we will read them later. If we use a different config access + // flush changes (because an error occurred) we will read them later. If we use a different config access // we can close it without a flush ... and our read data wont be affected .-) css::uno::Reference< css::uno::XInterface > xCfg = ::comphelper::ConfigurationHelper::openConfig( xSMGR, diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 532a916cbc7a..f6f8cb959890 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -300,7 +300,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString& s //sal_Bool bMandatory = ((aInfo.Attributes & css::beans::PropertyAttribute::REMOVEABLE) != css::beans::PropertyAttribute::REMOVEABLE); // Note: Till we support finalized / mandatory on our API more in detail we handle - // all states simple as READONLY ! But because all realy needed pathes are "mandatory" by default + // all states simple as READONLY ! But because all really needed paths are "mandatory" by default // we have to handle "finalized" as the real "readonly" indicator . aPathVal.bIsReadonly = bFinalized; } @@ -318,8 +318,8 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) css::uno::Reference< css::container::XNameAccess > xCfgOld = fa_getCfgOld(); // try to replace path-parts with well known and uspported variables. - // So an office can be moved easialy to another location without loosing - // it's related pathes. + // So an office can be moved easialy to another location without losing + // it's related paths. PathInfo aResubstPath(aPath); impl_subst(aResubstPath, sal_True); @@ -340,11 +340,11 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) ::comphelper::ConfigurationHelper::flush(xCfgNew); // remove the whole path from the old configuration ! - // Otherwise we cant make sure that the diff between new and old configuration - // on loading time realy represent an user setting !!! + // Otherwise we can't make sure that the diff between new and old configuration + // on loading time really represent an user setting !!! // Check if the given path exists inside the old configuration. - // Because our new configuration knows more then the list of old pathes ... ! + // Because our new configuration knows more then the list of old paths ... ! if (xCfgOld->hasByName(aResubstPath.sPathName)) { css::uno::Reference< css::beans::XPropertySet > xProps(xCfgOld, css::uno::UNO_QUERY_THROW); @@ -404,7 +404,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const ::rtl::OUString& sPa aPath = impl_readNewFormat(sPath); aPath.sPathName = sPath; // replace all might existing variables with real values - // Do it before these old pathes will be compared against the + // Do it before these old paths will be compared against the // new path configuration. Otherwise some striungs uses different variables ... but substitution // will produce strings with same content (because some variables are redundant!) impl_subst(aPath, sal_False); @@ -423,7 +423,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const ::rtl::OUString& sPa // can be disabled for a new major OUStringList lOldVals = impl_readOldFormat(sPath); // replace all might existing variables with real values - // Do it before these old pathes will be compared against the + // Do it before these old paths will be compared against the // new path configuration. Otherwise some striungs uses different variables ... but substitution // will produce strings with same content (because some variables are redundant!) impl_subst(lOldVals, fa_getSubstitution(), sal_False); @@ -433,7 +433,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const ::rtl::OUString& sPa { throw exRun; } // Normal(!) exceptions can be ignored! // E.g. in case an addon installs a new path, which was not well known for an OOo 1.x installation - // we cant find a value for it inside the "old" configuration. So a NoSuchElementException + // we can't find a value for it inside the "old" configuration. So a NoSuchElementException // will be normal .-) catch(const css::uno::Exception&) {} @@ -509,8 +509,8 @@ css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const ::rt // Why ? // The outside code must fire N events for every changed property. // And the knowing about packaging of variables of the structure PathInfo - // follow these group IDs ! But if such ID isnt in the range of [0..IDGROUP_COUNT] - // the outside cant determine the right group ... and cant fire the right events .-) + // follow these group IDs ! But if such ID isn't in the range of [0..IDGROUP_COUNT] + // the outside can't determine the right group ... and can't fire the right events .-) css::uno::Sequence< sal_Int32 > lIDs(IDGROUP_COUNT); lIDs[0] = IDGROUP_OLDSTYLE ; @@ -889,7 +889,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , ::rtl::OUStringBuffer sMsg(256); sMsg.appendAscii("The path '" ); sMsg.append (aChangePath.sPathName); - sMsg.appendAscii("' is defined as SINGLE_PATH. It's sub set of internal pathes cant be set."); + sMsg.appendAscii("' is defined as SINGLE_PATH. It's sub set of internal paths can't be set."); throw css::uno::Exception(sMsg.makeStringAndClear(), static_cast< ::cppu::OWeakObject* >(this)); } @@ -909,7 +909,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , ::rtl::OUStringBuffer sMsg(256); sMsg.appendAscii("The path '" ); sMsg.append (aChangePath.sPathName); - sMsg.appendAscii("' is defined as SINGLE_PATH. It's sub set of internal pathes cant be set."); + sMsg.appendAscii("' is defined as SINGLE_PATH. It's sub set of internal paths can't be set."); throw css::uno::Exception(sMsg.makeStringAndClear(), static_cast< ::cppu::OWeakObject* >(this)); } @@ -975,7 +975,7 @@ sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const sal_Bool PathSettings::impl_isValidPath(const ::rtl::OUString& sPath) const { // allow empty path to reset a path. -// idea by LLA to support empty pathes +// idea by LLA to support empty paths // if (sPath.getLength() == 0) // { // return sal_True; @@ -1102,7 +1102,7 @@ css::uno::Reference< css::util::XStringSubstitution > PathSettings::fa_getSubsti { // create the needed substitution service. // We must replace all used variables inside readed path values. - // In case we can't do so ... the whole office can't work realy. + // In case we can't do so ... the whole office can't work really. // That's why it seams to be OK to throw a RuntimeException then. xSubst = css::uno::Reference< css::util::XStringSubstitution >( xSMGR->createInstance(SERVICENAME_SUBSTITUTEPATHVARIABLES), @@ -1135,7 +1135,7 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld() ::comphelper::ConfigurationHelper::openConfig( xSMGR, CFG_NODE_OLD, - ::comphelper::ConfigurationHelper::E_STANDARD), // not readonly! Somtimes we need write access there !!! + ::comphelper::ConfigurationHelper::E_STANDARD), // not readonly! Sometimes we need write access there !!! css::uno::UNO_QUERY_THROW); // SAFE -> diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index c4debde83410..345f3df47ad3 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -98,7 +98,7 @@ #define REPLACELENGTH_LANGID 9 #define REPLACELENGTH_VLANG 8 #define REPLACELENGTH_WORKDIRURL 13 -// --> PB 2004-10-27 #i32656# - new variable of hierachy service +// --> PB 2004-10-27 #i32656# - new variable of hierarchy service #define REPLACELENGTH_BASEINSTURL 14 #define REPLACELENGTH_USERDATAURL 14 // <-- @@ -121,7 +121,7 @@ #define VARIABLE_PROGURL "$(progurl)" #define VARIABLE_USERURL "$(userurl)" #define VARIABLE_WORKDIRURL "$(workdirurl)" -// --> PB 2004-10-27 #i32656# - new variable of hierachy service +// --> PB 2004-10-27 #i32656# - new variable of hierarchy service #define VARIABLE_BASEINSTURL "$(baseinsturl)" #define VARIABLE_USERDATAURL "$(userdataurl)" // <-- @@ -213,7 +213,7 @@ static FixedVariable aFixedVarTable[] = { VARIABLE_PROGURL, PREDEFVAR_PROGURL, REPLACELENGTH_PROGURL, true }, { VARIABLE_USERURL, PREDEFVAR_USERURL, REPLACELENGTH_USERURL, true }, { VARIABLE_WORKDIRURL, PREDEFVAR_WORKDIRURL, REPLACELENGTH_WORKDIRURL,true }, // Special variable (transient) and don't use for resubstitution! - // --> PB 2004-10-27 #i32656# - new variable of hierachy service + // --> PB 2004-10-27 #i32656# - new variable of hierarchy service { VARIABLE_BASEINSTURL, PREDEFVAR_BASEINSTURL, REPLACELENGTH_BASEINSTURL,true }, { VARIABLE_USERDATAURL, PREDEFVAR_USERDATAURL, REPLACELENGTH_USERDATAURL,true }, // <-- @@ -957,12 +957,12 @@ throw ( NoSuchElementException, RuntimeException ) // Fill return value with result if ( bSubstitutionCompleted ) { - // Substitution successfull! + // Substitution successful! aResult = aWorkText; } else { - // Substitution not successfull! + // Substitution not successful! if ( nDepth == nMaxRecursiveDepth ) { // recursion depth reached! @@ -1182,14 +1182,14 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Set $(inst), $(instpath), $(insturl) aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INST ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; - // --> PB 2004-10-27 #i32656# - new variable of hierachy service + // --> PB 2004-10-27 #i32656# - new variable of hierarchy service aPreDefPathVariables.m_FixedVar[ PREDEFVAR_BASEINSTURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_INSTPATH ]; // <-- // Set $(user), $(userpath), $(userurl) aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USER ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; - // --> PB 2004-11-11 #i32656# - new variable of hierachy service + // --> PB 2004-11-11 #i32656# - new variable of hierarchy service aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERDATAURL ]= aPreDefPathVariables.m_FixedVar[ PREDEFVAR_USERPATH ]; // <-- diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 1cf8a597fd6c..1dbd0c554d6a 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -175,7 +175,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI //-------------------> // HACK #125187# + #i53630# // Mark all document windows as "special ones", so VCL can bind - // special features to it. Because VCL doesnt know anything about documents ... + // special features to it. Because VCL doesn't know anything about documents ... // Note: Doing so it's no longer supported, that e.g. our wizards can use findFrame(_blank) // to create it's previes frames. They must do it manually by using WindowDescriptor+Toolkit! css::uno::Reference< css::frame::XDesktop > xDesktop(xParentFrame, css::uno::UNO_QUERY); @@ -246,7 +246,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai // get toolkit to create task container window css::uno::Reference< css::awt::XToolkit > xToolkit( xSMGR->createInstance( SERVICENAME_VCLTOOLKIT ), css::uno::UNO_QUERY_THROW); - // Check if child frames can be created realy. We need at least a valid window at the parent frame ... + // Check if child frames can be created really. We need at least a valid window at the parent frame ... css::uno::Reference< css::awt::XWindowPeer > xParentWindowPeer; if ( ! bTopWindow) { @@ -315,7 +315,7 @@ css::uno::Reference< css::frame::XFrame > TaskCreatorService::implts_createFrame xNewFrame->initialize( xContainerWindow ); // Put frame to the frame tree. - // Note: The property creator/parent will be set on the new putted frame automaticly ... by the parent container. + // Note: The property creator/parent will be set on the new putted frame automatically ... by the parent container. if (xParentFrame.is()) { css::uno::Reference< css::frame::XFramesSupplier > xSupplier (xParentFrame, css::uno::UNO_QUERY_THROW); diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 45a47aaefd52..8741ff8ca046 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -908,7 +908,7 @@ void SAL_CALL TabWindow::getFastPropertyValue( css::uno::Any& aValue , if( pInfoHelper == NULL ) { // Define static member to give structure of properties to baseclass "OPropertySetHelper". - // "impl_getStaticPropertyDescriptor" is a non exported and static funtion, who will define a static propertytable. + // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. // "sal_True" say: Table is sorted by name. static ::cppu::OPropertyArrayHelper aInfoHelper( impl_getStaticPropertyDescriptor(), sal_True ); pInfoHelper = &aInfoHelper; diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 8573e98650b1..56b1be090622 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -192,7 +192,7 @@ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "Modul m_xUserCfgRootStorage = Reference< XStorage >( xStorageFactory->createInstanceWithArguments( aArgs ), UNO_QUERY ); // Create wrapper object for module user interface configuration managers, so they are able to call commit/revert on - // root storage and nothing more (saftey)! + // root storage and nothing more (safety)! RootStorageWrapper* pUserRootStorageWrapper = new RootStorageWrapper( Reference< XTransactedObject >( m_xUserCfgRootStorage, UNO_QUERY )); m_xUserRootCommit = Reference< XTransactedObject>( static_cast< OWeakObject *>( pUserRootStorageWrapper ), UNO_QUERY ); } diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index f749c1df863c..b2fd4dae036a 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -419,7 +419,7 @@ ModuleUIConfigurationManager::UIElementData* ModuleUIConfigurationManager::impl } } - // Not successfull, we have to look into our default vector/hash_map combination + // Not successful, we have to look into our default vector/hash_map combination UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap; pIter = rDefaultHashMap.find( aResourceURL ); if ( pIter != rDefaultHashMap.end() ) diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 5a0ee8726e21..afeda03427b5 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -94,7 +94,7 @@ namespace framework // Configuration access class for PopupMenuControllerFactory implementation //***************************************************************************************************************** -class ConfigurationAccess_UICategory : // Order is neccessary for right initialization! +class ConfigurationAccess_UICategory : // Order is necessary for right initialization! private ThreadHelpBase , public ::cppu::WeakImplHelper2<XNameAccess,XContainerListener> { @@ -166,7 +166,7 @@ ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const rtl::OUStr m_bCacheFilled( sal_False ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::ConfigurationAccess_UICategory" ); - // Create configuration hierachical access name + // Create configuration hierarchical access name m_aConfigCategoryAccess += aModuleName; m_aConfigCategoryAccess += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_CATEGORY_ELEMENT_ACCESS )); diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx index 66f4062f71aa..ce079b6c6040 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx @@ -391,7 +391,7 @@ UIConfigurationManagerImpl::UIElementData* UIConfigurationManagerImpl::impl_fin if ( m_bUseDefault ) { - // Not successfull, we have to look into our default vector/hash_map combination + // Not successful, we have to look into our default vector/hash_map combination UIElementDataHashMap& rDefaultHashMap = m_aUIElements[LAYER_DEFAULT][nElementType].aElementsHashMap; pIter = rDefaultHashMap.find( aResourceURL ); if ( pIter != rDefaultHashMap.end() ) diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index 41ef92f882fd..294ede963817 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -141,7 +141,7 @@ class ConfigurationAccess_WindowState : // interfaces public XNameContainer , public XContainerListener , // baseclasses - // Order is neccessary for right initialization! + // Order is necessary for right initialization! private ThreadHelpBase , public ::cppu::OWeakObject { @@ -210,7 +210,7 @@ class ConfigurationAccess_WindowState : // interfaces WINDOWSTATE_MASK_DOCKSIZE = 32768 }; - // Cache structure. Valid values are described by tje eMask member. All other values should not be + // Cache structure. Valid values are described by the eMask member. All other values should not be // provided to outside code! struct WindowStateInfo { @@ -296,7 +296,7 @@ ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const rtl::OUS m_bConfigAccessInitialized( sal_False ), m_bModified( sal_False ) { - // Create configuration hierachical access name + // Create configuration hierarchical access name m_aConfigWindowAccess += aModuleName; m_aConfigWindowAccess += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_WINDOWSTATE_ACCESS )); m_xConfigProvider = Reference< XMultiServiceFactory >( rServiceManager->createInstance( SERVICENAME_CFGPROVIDER ), UNO_QUERY ); diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 759da39c4da3..13f20f14f234 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1292,17 +1292,13 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF aCommand == aSpecialWindowCommand ) { // Retrieve addon popup menus and add them to our menu bar - Reference< com::sun::star::frame::XModel > xModel; - Reference< com::sun::star::frame::XController > xController( rFrame->getController(), UNO_QUERY ); - if ( xController.is() ) - xModel = Reference< com::sun::star::frame::XModel >( xController->getModel(), UNO_QUERY ); - framework::AddonMenuManager::MergeAddonPopupMenus( rFrame, xModel, nPos, (MenuBar *)pMenu ); + framework::AddonMenuManager::MergeAddonPopupMenus( rFrame, nPos, (MenuBar *)pMenu, mxServiceFactory ); break; } } // Merge the Add-Ons help menu items into the Office help menu - framework::AddonMenuManager::MergeAddonHelpMenu( rFrame, (MenuBar *)pMenu ); + framework::AddonMenuManager::MergeAddonHelpMenu( rFrame, (MenuBar *)pMenu, mxServiceFactory ); } String aEmpty; @@ -1398,7 +1394,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF { // Create addon popup menu if there exist elements and this is the tools popup menu sal_uInt16 nCount = 0; - AddonMenu* pSubMenu = AddonMenuManager::CreateAddonMenu( rFrame ); + AddonMenu* pSubMenu = AddonMenuManager::CreateAddonMenu( rFrame, mxServiceFactory ); if ( pSubMenu && ( pSubMenu->GetItemCount() > 0 )) { if ( pPopup->GetItemType( nCount-1 ) != MENUITEM_SEPARATOR ) diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 5e160d40b275..81a7546da187 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -156,10 +156,13 @@ PopupMenuToolbarController::createPopupWindow() return xRet; pToolBox->SetItemDown( m_nToolBoxId, sal_True ); + WindowAlign eAlign( pToolBox->GetAlign() ); sal_uInt16 nId = m_xPopupMenu->execute( css::uno::Reference< css::awt::XWindowPeer >( getParent(), css::uno::UNO_QUERY ), VCLUnoHelper::ConvertToAWTRect( pToolBox->GetItemRect( m_nToolBoxId ) ), - css::awt::PopupMenuDirection::EXECUTE_DEFAULT ); + ( eAlign == WINDOWALIGN_TOP || eAlign == WINDOWALIGN_BOTTOM ) ? + css::awt::PopupMenuDirection::EXECUTE_DOWN : + css::awt::PopupMenuDirection::EXECUTE_RIGHT ); pToolBox->SetItemDown( m_nToolBoxId, sal_False ); if ( nId ) @@ -336,7 +339,7 @@ void NewToolbarController::functionExecuted( const OUString &rCommand ) If the given URL can be located as an action command of one menu item of the popup menu of this control, we return sal_True. Otherwhise we return sal_False. Further we return a fallback URL, in case we have to return sal_False. Because - the outside code must select a valid item of the popup menu everytime ... + the outside code must select a valid item of the popup menu every time ... and we define it here. By the way this m ethod was written to handle error situations gracefully. E.g. it can be called during creation time but then we have no valid menu. For this case we know another fallback URL. @@ -344,7 +347,7 @@ void NewToolbarController::functionExecuted( const OUString &rCommand ) @param rPopupMenu pounts to the popup menu, on which item we try to locate the given URL - Can be NULL! Search will be supressed then. + Can be NULL! Search will be suppressed then. @param sURL the URL for searching diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index dbd9b8e5b569..8fcea001b04f 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -106,7 +106,7 @@ namespace framework // Configuration access class for PopupMenuControllerFactory implementation //***************************************************************************************************************** -class ConfigurationAccess_UICommand : // Order is neccessary for right initialization! +class ConfigurationAccess_UICommand : // Order is necessary for right initialization! private ThreadHelpBase , public ::cppu::WeakImplHelper2<XNameAccess,XContainerListener> { @@ -224,7 +224,7 @@ ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const rtl::OUStrin m_bCacheFilled( sal_False ), m_bGenericDataRetrieved( sal_False ) { - // Create configuration hierachical access name + // Create configuration hierarchical access name m_aConfigCmdAccess += aModuleName; m_aConfigCmdAccess += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONFIGURATION_CMD_ELEMENT_ACCESS )); diff --git a/framework/source/unotypes/fwk.xml b/framework/source/unotypes/fwk.xml index 7305212ab7f6..8d8dc1d7a6f7 100644 --- a/framework/source/unotypes/fwk.xml +++ b/framework/source/unotypes/fwk.xml @@ -113,7 +113,7 @@ <description> It's a dispatch object which can handle "mailto:" URLs. This service is registered in configuration for this protocol - and wil be used automaticly by the generic dispatch implementation + and wil be used automatically by the generic dispatch implementation of a Frame. It should start an external mail application and forward this request to it. </description> @@ -128,10 +128,10 @@ <name> com.sun.star.comp.framework.ServiceHandler </name> <description> It's a special dispatch object which is registered for "service:*" URL pattern - and will be automaticly used by the framework dispatch mechanism if such URL occured. + and will 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. </description> <loader-name> com.sun.star.loader.SharedLibrary </loader-name> @@ -145,7 +145,7 @@ <name> com.sun.star.comp.framework.JobHandler </name> <description> It's a special dispatch object which is registered for "vnd.sun.star.job:*" URL pattern - and will be automaticly used by the framework dispatch mechanism if such URL occured. + and will be automatically used by the framework dispatch mechanism if such URL occurred. It binds the dispatch mechanism to the generic job execution of this framework module. That can be used for e.g. addon purposes. </description> diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index a1fd88231847..b9770112f4c0 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -55,7 +55,7 @@ namespace framework{ structure was detected. This macro combined the given comment with a generic - way to find out the XML line (where the error occured) + way to find out the XML line (where the error occurred) to format a suitable message. @param COMMENT @@ -131,7 +131,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString if (eElement == E_ELEMENT_ITEM) { if (!m_bInsideAcceleratorList) - THROW_PARSEEXCEPTION("An element \"accel:item\" must be embeded into 'accel:acceleratorlist'.") + THROW_PARSEEXCEPTION("An element \"accel:item\" must be embedded into 'accel:acceleratorlist'.") if (m_bInsideAcceleratorItem) THROW_PARSEEXCEPTION("An element \"accel:item\" is not a container.") m_bInsideAcceleratorItem = sal_True; @@ -189,7 +189,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const ::rtl::OUString #ifdef ENABLE_WARNINGS else { - // Attention: Its not realy a reason to throw an exception and kill the office, if the configuration contains + // Attention: Its not really a reason to throw an exception and kill the office, if the configuration contains // multiple registrations for the same key :-) Show a warning ... and ignore the second item. // THROW_PARSEEXCEPTION("Command is registered for the same key more then once.") ::rtl::OUStringBuffer sMsg(256); diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 54d2e46bca08..dce66e5b8c88 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -204,7 +204,7 @@ throw( SAXException, RuntimeException ) if ( m_bImageContainerStartFound ) { ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:imagecontainer' cannot be embeded into 'image:imagecontainer'!" )); + aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:imagecontainer' cannot be embedded into 'image:imagecontainer'!" )); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -217,14 +217,14 @@ throw( SAXException, RuntimeException ) if ( !m_bImageContainerStartFound ) { ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:images' must be embeded into element 'image:imagecontainer'!" )); + aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:images' must be embedded into element 'image:imagecontainer'!" )); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } if ( m_bImagesStartFound ) { ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:images' cannot be embeded into 'image:images'!" )); + aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:images' cannot be embedded into 'image:images'!" )); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -321,14 +321,14 @@ throw( SAXException, RuntimeException ) case IMG_ELEMENT_ENTRY: { - // Check that image:entry is embeded into image:images! + // Check that image:entry is embedded into image:images! if ( !m_bImagesStartFound ) { delete m_pImages; m_pImages = NULL; ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:entry' must be embeded into element 'image:images'!" )); + aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:entry' must be embedded into element 'image:images'!" )); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -398,25 +398,25 @@ throw( SAXException, RuntimeException ) case IMG_ELEMENT_EXTERNALIMAGES: { - // Check that image:externalimages is embeded into image:imagecontainer + // Check that image:externalimages is embedded into image:imagecontainer if ( !m_bImageContainerStartFound ) { delete m_pImages; m_pImages = NULL; ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalimages' must be embeded into element 'image:imagecontainer'!" )); + aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalimages' must be embedded into element 'image:imagecontainer'!" )); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } - // Check that image:externalentry is NOT embeded into image:externalentry + // Check that image:externalentry is NOT embedded into image:externalentry if ( m_bExternalImagesStartFound ) { delete m_pImages; m_pImages = NULL; ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalimages' cannot be embeded into 'image:externalimages'!" )); + aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalimages' cannot be embedded into 'image:externalimages'!" )); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -436,7 +436,7 @@ throw( SAXException, RuntimeException ) m_pExternalImages = NULL; ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalentry' must be embeded into 'image:externalimages'!" )); + aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalentry' must be embedded into 'image:externalimages'!" )); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } @@ -448,7 +448,7 @@ throw( SAXException, RuntimeException ) m_pExternalImages = NULL; ::rtl::OUString aErrorMessage = getErrorLineString(); - aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalentry' cannot be embeded into 'image:externalentry'!" )); + aErrorMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Element 'image:externalentry' cannot be embedded into 'image:externalentry'!" )); throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } diff --git a/framework/test/test.cxx b/framework/test/test.cxx index aef8153152bc..59c8053ff0ee 100644 --- a/framework/test/test.cxx +++ b/framework/test/test.cxx @@ -186,7 +186,7 @@ void TestApplication::Main() m_xFactory = aManager.getGlobalUNOServiceManager(); setProcessServiceFactory( m_xFactory ); - // Control sucess of operation. + // Control success of operation. LOG_ASSERT( !(m_xFactory.is() ==sal_False ), "TestApplication::Main()\nCan't create global service manager.\n\n" ) LOG_ASSERT( !(getProcessServiceFactory()!=m_xFactory), "TestApplication::Main()\nGlobal servicemanager not set in UNOTOOLS.\n\n" ) @@ -616,7 +616,7 @@ void TestApplication::impl_testDesktop( const Reference< XDesktop >& xDesktop ) LOG_ASSERT( !(xDesktopFrame->getName()!=sName), "TestApplication::impl_testDesktop()\nSetting of name works not correct on desktop.\n\n" ) // Reset name do default! - // Its neccessary for follow operations. + // Its necessary for follow operations. sName = OUString( RTL_CONSTASCII_USTRINGPARAM("Desktop") ); xDesktopFrame->setName( sName ); @@ -1304,7 +1304,7 @@ sal_Bool TestApplication::impl_testTreeSearch() } // Test inside/outside tasks search - // No frames outside current task should be found if TASKS flag isnt set. + // No frames outside current task should be found if TASKS flag isn't set. // Otherwise he must be found! if ( ( xF21211->findFrame( DECLARE_ASCII("F12" ), FrameSearchFlag::ALL ) == xF12 ) || diff --git a/framework/test/test_componentenumeration.bas b/framework/test/test_componentenumeration.bas index c837bea2fb73..ec52ce6d5cef 100644 --- a/framework/test/test_componentenumeration.bas +++ b/framework/test/test_componentenumeration.bas @@ -37,7 +37,7 @@ Sub Main rem ___________________________________________________________________________________________________________________________________ rem Control service specification of helper class "framework/helper/OComponentAccess". - rem The follow output must occure: com.sun.star.lang.XTypeProvider + rem The follow output must occur: com.sun.star.lang.XTypeProvider rem com.sun.star.container.XEnumerationAccess -> com.sun.star.container.XElementAccess msgbox xComponentAccess.dbg_supportedInterfaces @@ -70,7 +70,7 @@ Sub Main rem ___________________________________________________________________________________________________________________________________ rem Control service specification of helper class "framework/helper/OComponentEnumeration". - rem The follow output must occure: com.sun.star.lang.XTypeProvider + rem The follow output must occur: com.sun.star.lang.XTypeProvider rem com.sun.star.lang.XEventListener rem com.sun.star.container.XEnumeration msgbox xComponentEnumeration.dbg_supportedInterfaces diff --git a/framework/test/test_statusindicatorfactory.bas b/framework/test/test_statusindicatorfactory.bas index 9cd80a6d2605..6c7103c2b770 100644 --- a/framework/test/test_statusindicatorfactory.bas +++ b/framework/test/test_statusindicatorfactory.bas @@ -52,7 +52,7 @@ Sub Main xIndicator2.setValue( 50 ) rem Work with indicator 3. - rem If working finished automaticly indicator 2 is reactivated. + rem If working finished automatically indicator 2 is reactivated. i = 0 while i<300 xIndicator3.setText( "Indicator 3: Range=300 Value=" + i ) @@ -62,13 +62,13 @@ Sub Main wend rem Delete indicator 2 before you deactivate number 3! - rem The next automaticly activated indicator will be the number 1. + rem The next automatically activated indicator will be the number 1. xIndicator2.end - msgbox "Indicator 3 will be destroyed. Indicator 2 was deleted ... number 1 must reactivated automaticly!" + msgbox "Indicator 3 will be destroyed. Indicator 2 was deleted ... number 1 must reactivated automatically!" xIndicator3.end rem Work with indicator 1. - rem If working finished automaticly the window will be destroyed. + rem If working finished automatically the window will be destroyed. i = 25 while i<100 xIndicator1.setText( "Indicator 1: Range=100 Value=" + i ) @@ -82,7 +82,7 @@ Sub Main xIndicator1.setText( "Indicator 1: ... set 50 % for progress" ) wait( 1000 ) xIndicator1.setValue( 50 ) - msgbox "Indicator 1 will be destroyed. Indicator window must destroyed automaticly!" + msgbox "Indicator 1 will be destroyed. Indicator window must destroyed automatically!" xIndicator1.end msgbox "Test for status indicator finished successful!" diff --git a/framework/test/threadtest.cxx b/framework/test/threadtest.cxx index ec4285b710fe..a0e7e52608d8 100644 --- a/framework/test/threadtest.cxx +++ b/framework/test/threadtest.cxx @@ -290,7 +290,7 @@ class ThreadSafeClass : private TransactionBase ThreadSafeClass (); ~ThreadSafeClass(); - // This methods are used from differnt threads + // This methods are used from different threads // to test this class. void init ( sal_Int32 nA , sal_Int32 nThreadID ); @@ -348,7 +348,7 @@ void ThreadSafeClass::init( sal_Int32 nA, sal_Int32 nThreadID ) LOG_INIT( nA, nThreadID ) // Look for multiple calls of this method first! - // Use E_SOFTEXCEPTIONS to disable automaticly throwing of exceptions for some working modes. + // Use E_SOFTEXCEPTIONS to disable automatically throwing of exceptions for some working modes. ERejectReason eReason; TransactionGuard aTransaction( m_aTransactionManager, E_NOEXCEPTIONS, eReason ); if( eReason == E_UNINITIALIZED ) diff --git a/framework/test/threadtest/threadtest.cxx b/framework/test/threadtest/threadtest.cxx index 7f79e25d0a98..4776fef75536 100644 --- a/framework/test/threadtest/threadtest.cxx +++ b/framework/test/threadtest/threadtest.cxx @@ -288,7 +288,7 @@ class ThreadSafeClass : private ThreadHelpBase ThreadSafeClass (); ~ThreadSafeClass(); - // This methods are used from differnt threads + // This methods are used from different threads // to test this class. void init ( sal_Int32 nA , sal_Int32 nThreadID ); @@ -340,7 +340,7 @@ ThreadSafeClass::~ThreadSafeClass() void ThreadSafeClass::init( sal_Int32 nA, sal_Int32 nThreadID ) { // Look for multiple calls of this method first! - // Use E_SOFTEXCEPTIONS to disable automaticly throwing of exceptions for some working modes. + // Use E_SOFTEXCEPTIONS to disable automatically throwing of exceptions for some working modes. TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS ); // Set write lock for setting internal member AND diff --git a/framework/test/typecfg/cfgview.cxx b/framework/test/typecfg/cfgview.cxx index 8dbfb5ec27bb..eddb6d1245c9 100644 --- a/framework/test/typecfg/cfgview.cxx +++ b/framework/test/typecfg/cfgview.cxx @@ -183,7 +183,7 @@ CFGView gApplication; void CFGView::Main() { // Init global servicemanager and set it. - // It's neccessary for other services ... e.g. configuration. + // It's necessary for other services ... e.g. configuration. ServiceManager aManager; ::comphelper::setProcessServiceFactory( aManager.getGlobalUNOServiceManager() ); @@ -240,7 +240,7 @@ void CFGView::impl_printSyntax() @seealso - @param "rMember", reference to struct of global application member to fill arguments in it - @return right filled member struct or unchanged struct if an error occure! + @return right filled member struct or unchanged struct if an error occur! @onerror We do nothing - or warn programmer! *//*-*************************************************************************************************************/ diff --git a/framework/test/typecfg/xml2xcd.cxx b/framework/test/typecfg/xml2xcd.cxx index 9922f2c7eeb3..a9409fbfe1b3 100644 --- a/framework/test/typecfg/xml2xcd.cxx +++ b/framework/test/typecfg/xml2xcd.cxx @@ -81,7 +81,7 @@ using namespace ::framework ; 3) decrease size of xml file - don't write full localized values - use own formated string for all non localized values - - seperate "Installed" flag for filters + - separate "Installed" flag for filters 4) set right values for "Order" property of filters 5) support for ContentHandler draft 6) reactivate old filter names @@ -95,7 +95,7 @@ using namespace ::framework ; #define ARGUMENT_VERSION_INPUT DECLARE_ASCII("-vin=") // argument for file version to read [1|2|3] #define ARGUMENT_VERSION_OUTPUT DECLARE_ASCII("-vou=") // argument for file version to write [1|2|3] -#define ARGUMENTLENGTH 5 // All arguments should have the same lenght ... it's better to detect it! +#define ARGUMENTLENGTH 5 // All arguments should have the same length ... it's better to detect it! #define ARGUMENTFOUND 0 // OUString::compareTo returns 0 if searched string match given one #define WRITEABLE_ON DECLARE_ASCII("true" ) @@ -205,7 +205,7 @@ class XCDGenerator : public Application static ::rtl::OUString impl_encodeSpecialSigns ( const ::rtl::OUString& sValue ); // encode strings for xml static sal_Unicode impl_defineSeperator ( const ::framework::StringList& lList ); // search seperator for lists static void impl_initFilterHashNew2Old ( StringHash& aHash ); // initialize converter table to restaurate old filter names - static void impl_orderAlphabetical ( css::uno::Sequence< ::rtl::OUString >& lList ); // sort stringlist of internal type-, filter- ... names in alphabetical order to generate xcd files everytime in the same way + static void impl_orderAlphabetical ( css::uno::Sequence< ::rtl::OUString >& lList ); // sort stringlist of internal type-, filter- ... names in alphabetical order to generate xcd files every time in the same way static sal_Bool impl_isUsAsciiAlphaDigit ( sal_Unicode c , sal_Bool bDigitAllowed = sal_True ); static ::rtl::OUString impl_encodeSetName ( const ::rtl::OUString& rSource ); @@ -229,7 +229,7 @@ void XCDGenerator::Main() // impl_printCopyright(); // Init global servicemanager and set it. - // It's neccessary for other services ... e.g. configuration. + // It's necessary for other services ... e.g. configuration. ServiceManager aManager; ::comphelper::setProcessServiceFactory( aManager.getGlobalUNOServiceManager() ); ::utl::setProcessServiceFactory ( aManager.getGlobalUNOServiceManager() ); @@ -251,7 +251,7 @@ void XCDGenerator::Main() // Get some statistic informations of current filled filter cache ... (e.g. count of current activae filters) // because we need it to check if all filters are converted and written to disk. - // May be it's possible to lose some of them during convertion!!! + // May be it's possible to lose some of them during conversion!!! m_aData.nOriginalTypes = m_aData.pFilterCache->getAllTypeNames().getLength() ; m_aData.nOriginalFilters = m_aData.pFilterCache->getAllFilterNames().getLength() ; m_aData.nOriginalDetectors = m_aData.pFilterCache->getAllDetectorNames().getLength() ; @@ -324,7 +324,7 @@ void XCDGenerator::impl_printSyntax() @seealso - @param "rMember", reference to struct of global application member to fill arguments in it - @return right filled member struct or unchanged struct if an error occure! + @return right filled member struct or unchanged struct if an error occur! @onerror We do nothing - or warn programmer! *//*-*************************************************************************************************************/ @@ -638,7 +638,7 @@ void XCDGenerator::impl_generateTypeTemplate() m_aData.sBufferStandard.appendAscii( "\t\t\t<schema:value cfg:name=\"Data\" cfg:type=\"string\" cfg:writable=\"" ); m_aData.sBufferStandard.appendAscii( m_aData.bWriteable==sal_True ? "true\">\n" : "false\">\n" ); m_aData.sBufferStandard.appendAscii("\t\t\t\t<schema:documentation>\n" ); - m_aData.sBufferStandard.appendAscii( "\t\t\t\t\t<schema:description>Containes all data of a type as an own formated string.{Preferred, MediaType, ClipboardFormat, URLPattern, Extensions, DocumentIconID}</schema:description>\n" ); + m_aData.sBufferStandard.appendAscii( "\t\t\t\t\t<schema:description>Contains all data of a type as an own formated string.{Preferred, MediaType, ClipboardFormat, URLPattern, Extensions, DocumentIconID}</schema:description>\n" ); m_aData.sBufferStandard.appendAscii( "\t\t\t\t</schema:documentation>\n" ); m_aData.sBufferStandard.appendAscii( "\t\t\t\t<default:data>false</default:data>\n" ); m_aData.sBufferStandard.appendAscii( "\t\t\t</schema:value>\n" ); @@ -1525,7 +1525,7 @@ void XCDGenerator::impl_generateUINamesProperty( ::rtl::OUStringBuffer& ++pUIName; } - // Generate full localized set, if some values are realy loclaized. + // Generate full localized set, if some values are really loclaized. if( bDifferent == sal_True ) { for( ConstStringHashIterator pUIName=lUINames.begin(); pUIName!=lUINames.end(); ++pUIName ) @@ -1603,7 +1603,7 @@ sal_Unicode XCDGenerator::impl_defineSeperator( const ::framework::StringList& l // Start with first seperator. // Step over all list items. // If one item contains this seperator - try next one! - // If no new one avaliable (5 tests failed!) - show an error message for user. + // If no new one available (5 tests failed!) - show an error message for user. // => File will be wrong then! // If seperator was changed start search during list again ... because // new seperator could exist at already compared elements! |