summaryrefslogtreecommitdiff
path: root/framework/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'framework/source/inc')
-rw-r--r--framework/source/inc/accelerators/acceleratorcache.hxx2
-rw-r--r--framework/source/inc/accelerators/acceleratorconfiguration.hxx4
-rw-r--r--framework/source/inc/accelerators/keymapping.hxx2
-rw-r--r--framework/source/inc/accelerators/presethandler.hxx16
-rw-r--r--framework/source/inc/accelerators/storageholder.hxx4
-rw-r--r--framework/source/inc/dispatch/loaddispatcher.hxx4
-rw-r--r--framework/source/inc/dispatch/windowcommanddispatch.hxx2
-rw-r--r--framework/source/inc/loadenv/actionlockguard.hxx4
-rw-r--r--framework/source/inc/loadenv/loadenv.hxx40
-rw-r--r--framework/source/inc/loadenv/loadenvexception.hxx12
-rw-r--r--framework/source/inc/pattern/frame.hxx8
-rw-r--r--framework/source/inc/pattern/storages.hxx2
-rw-r--r--framework/source/inc/pattern/window.hxx8
13 files changed, 54 insertions, 54 deletions
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());