This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 7a16433 Fixed typos (wont -> won't) and some more
7a16433 is described below
commit 7a164331e7a40ba419b1e6fcd6e382ef5579958a
Author: mseidel <[email protected]>
AuthorDate: Sun Oct 11 15:45:15 2020 +0200
Fixed typos (wont -> won't) and some more
(cherry picked from commit 9f813b30a249a2ed1e0f5e3ff3c0b88a8924b427)
---
main/avmedia/source/framework/soundhandler.cxx | 6 +-
main/basic/source/runtime/step0.cxx | 8 +--
main/comphelper/inc/comphelper/locale.hxx | 8 +--
.../source/config/cache/cacheupdatelistener.hxx | 2 +-
main/filter/source/config/cache/filtercache.cxx | 2 +-
main/filter/source/config/cache/filtercache.hxx | 4 +-
main/filter/source/config/cache/typedetection.cxx | 2 +-
main/filter/source/config/cache/typedetection.hxx | 12 ++--
.../source/win32/filepicker/asyncrequests.hxx | 2 +-
.../framework/inc/dispatch/helpagentdispatcher.hxx | 4 +-
main/framework/inc/general.h | 6 +-
main/framework/inc/jobs/shelljob.hxx | 6 +-
main/framework/inc/services/autorecovery.hxx | 44 ++++++-------
main/framework/inc/services/desktop.hxx | 10 +--
main/framework/inc/services/frame.hxx | 72 +++++++++++-----------
main/framework/inc/services/modulemanager.hxx | 6 +-
.../source/inc/accelerators/presethandler.hxx | 4 +-
main/framework/source/jobs/shelljob.cxx | 2 +-
main/framework/source/services/autorecovery.cxx | 8 +--
main/framework/source/services/frame.cxx | 2 +-
main/framework/source/services/modulemanager.cxx | 2 +-
.../moduleuiconfigurationmanager.cxx | 2 +-
.../uiconfiguration/uiconfigurationmanagerimpl.cxx | 4 +-
main/framework/source/uielement/menubarmanager.cxx | 43 +++++++------
.../source/uielement/popuptoolbarcontroller.cxx | 12 ++--
main/l10ntools/source/filter/utils/FileHelper.java | 2 +-
.../Components/Addons/JobsAddon/AsyncJob.java | 2 +-
.../java/com/sun/star/report/ReportJob.java | 2 +-
.../sun/star/report/pentaho/PentahoReportJob.java | 2 +-
.../ImageElementLayoutController.java | 2 +-
main/sane/inc/sane.h | 2 +-
main/sc/source/ui/vba/vbaworksheets.cxx | 10 +--
main/sw/source/core/txtnode/thints.cxx | 4 +-
main/sw/source/core/unocore/unochart.cxx | 2 +-
main/sw/source/core/unocore/unoobj.cxx | 2 +-
main/sw/source/filter/ww8/ww8par2.cxx | 4 +-
main/unotools/source/config/moduleoptions.cxx | 2 +-
main/uui/source/fltdlg.cxx | 10 +--
38 files changed, 160 insertions(+), 159 deletions(-)
diff --git a/main/avmedia/source/framework/soundhandler.cxx
b/main/avmedia/source/framework/soundhandler.cxx
index 9528ea7..b9f2d45 100644
--- a/main/avmedia/source/framework/soundhandler.cxx
+++ b/main/avmedia/source/framework/soundhandler.cxx
@@ -390,12 +390,12 @@ void SAL_CALL SoundHandler::dispatch( const
css::util::URL&
So call can search for another detect service and ask him too.
@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!
+ b) Don't use internal player instance "m_pPlayer" to detect
given sound file!
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
- we make some uneccssary things ...
+ we make some unneccssary things ...
@seealso -
@@ -435,7 +435,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL&
/*-************************************************************************************************************//**
@short call back of sound player
@descr Our player call us back to give us some informations.
- We use this informations to callback our might existing
listener.
+ We use these informations to callback our might existing
listener.
@seealso method dispatchWithNotification()
diff --git a/main/basic/source/runtime/step0.cxx
b/main/basic/source/runtime/step0.cxx
index 46f7090..57beb81 100644
--- a/main/basic/source/runtime/step0.cxx
+++ b/main/basic/source/runtime/step0.cxx
@@ -1182,11 +1182,11 @@ void SbiRuntime::StepINPUT()
BasResId aId( IDS_SBERR_START + 4 );
String aMsg( aId );
- //****** DONT CHECK IN, TEST ONLY *******
- //****** DONT CHECK IN, TEST ONLY *******
+ //****** DON'T CHECK IN, TEST ONLY *******
+ //****** DON'T CHECK IN, TEST ONLY *******
// ErrorBox( NULL, WB_OK, aMsg ).Execute();
- //****** DONT CHECK IN, TEST ONLY *******
- //****** DONT CHECK IN, TEST ONLY *******
+ //****** DON'T CHECK IN, TEST ONLY *******
+ //****** DON'T CHECK IN, TEST ONLY *******
pCode = pRestart;
}
diff --git a/main/comphelper/inc/comphelper/locale.hxx
b/main/comphelper/inc/comphelper/locale.hxx
index 6f49500..c77d6c9 100644
--- a/main/comphelper/inc/comphelper/locale.hxx
+++ b/main/comphelper/inc/comphelper/locale.hxx
@@ -339,7 +339,7 @@ class COMPHELPER_DLLPUBLIC Locale
to the reference Locale.
(means: same Language, Country, Variant)
- If the reference Locale couldnt be located, it will
+ If the reference Locale couldn't be located, it will be
tried again - but we are checking for "similar"
Locales then.
(means: same Language)
@@ -351,7 +351,7 @@ class COMPHELPER_DLLPUBLIC Locale
If no "same" nor any "similar" locale could be found,
we try "x-default" and "x-notranslate" explicitly.
- Sometimes localized variables are optimized and
doesn't use
+ Sometimes localized variables are optimized and don't
use
localzation really. E.g. in case the localized value
is a fix
product name.
@@ -367,7 +367,7 @@ class COMPHELPER_DLLPUBLIC Locale
@param sReferenceISO
the reference Locale, which should be searched
- if its equals or similar to any Locale inside
+ if it's equal or similar to any Locale inside
the provided Locale list.
@return An iterator, which points to the found element
@@ -376,7 +376,7 @@ class COMPHELPER_DLLPUBLIC Locale
to the end of the list.
@throw [MalFormedLocaleException]
- if at least one ISO formatted string couldnt
+ if at least one ISO formatted string couldn't
be converted to a valid Locale Object.
*/
static ::std::vector< ::rtl::OUString >::const_iterator
getFallback(const ::std::vector< ::rtl::OUString >& lISOList ,
diff --git a/main/filter/source/config/cache/cacheupdatelistener.hxx
b/main/filter/source/config/cache/cacheupdatelistener.hxx
index a6d77c8..4ca8f52 100644
--- a/main/filter/source/config/cache/cacheupdatelistener.hxx
+++ b/main/filter/source/config/cache/cacheupdatelistener.hxx
@@ -83,7 +83,7 @@ class CacheUpdateListener : public BaseLock // must be the
first one to guarante
/** @short initialize new instance of this class.
- @descr Listening wont be started here. It can be done
+ @descr Listening won't be started here. It can be done
by calling startListening() on this instance.
@see startListening()
diff --git a/main/filter/source/config/cache/filtercache.cxx
b/main/filter/source/config/cache/filtercache.cxx
index 29447c1..dc8b6b9 100644
--- a/main/filter/source/config/cache/filtercache.cxx
+++ b/main/filter/source/config/cache/filtercache.cxx
@@ -2356,7 +2356,7 @@ void FilterCache::impl_readOldFormat()
css::uno::Reference< css::uno::XInterface > xInt =
impl_openConfig(E_PROVIDER_OLD);
xCfg = css::uno::Reference< css::container::XNameAccess >(xInt,
css::uno::UNO_QUERY_THROW);
}
- /* corrupt filter addon ? because it's external (optional) code .. we can
ignore it. Addon wont work then ...
+ /* corrupt filter addon ? because it's external (optional) code .. we can
ignore it. Addon won't work then ...
but that seems to be acceptable.
see #139088# for further informations
*/
diff --git a/main/filter/source/config/cache/filtercache.hxx
b/main/filter/source/config/cache/filtercache.hxx
index fe16287..d4e8070 100644
--- a/main/filter/source/config/cache/filtercache.hxx
+++ b/main/filter/source/config/cache/filtercache.hxx
@@ -310,14 +310,14 @@ class FilterCache : public BaseLock
removed.
The original container will get these new data
automatically
- because it listen for changes on the internal used
configuration layer.
+ because it listens for changes on the internal used
configuration layer.
If the new data are needed immediately inside the original
container,
the method takeOver() can be used to copy all changes back.
The may be following notifications of the configuration
will be superflous then.
But they can't be stopped ...
All internal structures will be copied here. But the
internal used
- configuration (update) access wont be copied. The cloned
instance contains
+ configuration (update) access won't be copied. The cloned
instance contains
a different one.
@note The cloned instance is created on the heap. The user of
this instance
diff --git a/main/filter/source/config/cache/typedetection.cxx
b/main/filter/source/config/cache/typedetection.cxx
index a2847aa..e593ed1 100644
--- a/main/filter/source/config/cache/typedetection.cxx
+++ b/main/filter/source/config/cache/typedetection.cxx
@@ -422,7 +422,7 @@ sal_Bool TypeDetection::impl_getPreselectionForType(const
::rtl::OUString& sPreS
sal_Bool bBreakDetection = sal_False;
// Further we must know if it matches by pattern
- // Every flat detected type by pattern wont be detected deep!
+ // Every flat detected type by pattern won't be detected deep!
sal_Bool bMatchByPattern = sal_False;
// And we must know if a preselection must be preferred, because
diff --git a/main/filter/source/config/cache/typedetection.hxx
b/main/filter/source/config/cache/typedetection.hxx
index 5ddf934..eac64f1 100644
--- a/main/filter/source/config/cache/typedetection.hxx
+++ b/main/filter/source/config/cache/typedetection.hxx
@@ -129,21 +129,21 @@ class TypeDetection : public
::cppu::ImplInheritanceHelper1< BaseContainer
@descr It steps over all flat detected types (given by the
parameter lFlatTypes),
try it and search for most suitable one.
- The specified MediaDescriptor will be patched, so it
contain
+ The specified MediaDescriptor will be patched, so it
contains
the right values every time. Using of any deep
detection service
can be enabled/disabled. And last but not least: If
the results
- wont be really clear (because a flat detected type has
no deep
- detection service), a "sugested" type name will be
returned as "rLastChance".
+ won't be really clear (because a flat detected type
has no deep
+ detection service), a "suggested" type name will be
returned as "rLastChance".
It can be used after e.g. all well known deep
detection services
was used without getting any result. Then this
"last-chance-type"
- should be returned. Of course using of it can fail too
... but its a try :-)
+ should be returned. Of course using of it can fail too
... but it's a try :-)
As an optimization - this method collects the names of
all used deep
detection services. This information can be useful
inside the may be
afterwards called method "impl_detectTypeDeepOnly()"!
@param rDescriptor
- provides any easy-to-use stl interface to the
MediaDescriptor.
+ provides an easy-to-use stl interface to the
MediaDescriptor.
Note : Its content will be adapted to returned result
of this method.
Means: The type/filter entries of it will be
actualized or removed from it.
@@ -153,7 +153,7 @@ class TypeDetection : public
::cppu::ImplInheritanceHelper1< BaseContainer
@param rLastChance
the internal name of a "suggested type" ... (see
before)
- Note: it will be reseted to an empty string
everytimes. So
+ Note: it will be reseted to an empty string every
time. So
a set value of "rLastChance" can be detected outside
very easy.
@param rUsedDetectors
diff --git a/main/fpicker/source/win32/filepicker/asyncrequests.hxx
b/main/fpicker/source/win32/filepicker/asyncrequests.hxx
index ad9b903..b0b931b 100644
--- a/main/fpicker/source/win32/filepicker/asyncrequests.hxx
+++ b/main/fpicker/source/win32/filepicker/asyncrequests.hxx
@@ -167,7 +167,7 @@ class AsyncRequests : private ::cppu::BaseMutex
}
//---------------------------------------------------------------------
- /** does nothing special / excepting to make sure our class wont be
inline .-)
+ /** does nothing special / except to make sure our class won't be
inline .-)
*/
virtual ~AsyncRequests();
diff --git a/main/framework/inc/dispatch/helpagentdispatcher.hxx
b/main/framework/inc/dispatch/helpagentdispatcher.hxx
index bef1c2a..8c2089f 100644
--- a/main/framework/inc/dispatch/helpagentdispatcher.hxx
+++ b/main/framework/inc/dispatch/helpagentdispatcher.hxx
@@ -173,13 +173,13 @@ class HelpAgentDispatcher : public
css::lang::XTypeProvider
//---------------------------------------
/** @short starts the timer for showing the agent window.
- @descr The timer wont be started twice ... this method
checks the current running state .-)
+ @descr The timer won't be started twice ... this
method checks the current running state .-)
*/
void implts_startTimer();
//---------------------------------------
/** @short stop the timer.
- @descr The timer wont be stopped twice ... this method
checks the current running state .-)
+ @descr The timer won't be stopped twice ... this
method checks the current running state .-)
Further this method marks the current
help URL (m_xCurrentURL) as "ignorable".
Cause the user ignored it !
*/
diff --git a/main/framework/inc/general.h b/main/framework/inc/general.h
index 1a9a063..d245138 100644
--- a/main/framework/inc/general.h
+++ b/main/framework/inc/general.h
@@ -43,7 +43,7 @@
/** will make our code more readable if we can use such short name css instead
of typing ::com::sun::star everytimes.
- On the other side we had so many problems with "using namespace" so we
dont use
+ On the other side we had so many problems with "using namespace" so we
don't use
it here any longer.
*/
namespace css = ::com::sun::star;
@@ -59,8 +59,8 @@ namespace framework {
static const ::rtl::OUString FEATUREDESCRIPTOR_LOADSTATE =
DECLARE_ASCII("loadFinishedOrCancelled");
//-----------------------------------------------------------------------------
-/** Those macro is used to make it more clear where a synchronized block will
start.
- Because normal documentation code wont be recognized by some developers to
be real
+/** This macro is used to make it more clear where a synchronized block will
start.
+ Because normal documentation code won't be recognized by some developers
to be real
I need something where they are thinking about.
At least this macro will do nothing ... it's empty.
diff --git a/main/framework/inc/jobs/shelljob.hxx
b/main/framework/inc/jobs/shelljob.hxx
index fecf6b8..0e34500 100644
--- a/main/framework/inc/jobs/shelljob.hxx
+++ b/main/framework/inc/jobs/shelljob.hxx
@@ -91,7 +91,7 @@ class ShellJob : private ThreadHelpBase
//---------------------------------------
/** @short does nothing real ...
- @descr But it should exists as virtual function,
+ @descr But it should exist as virtual function,
so this class can't make trouble
related to inline/symbols etcpp.!
*/
@@ -150,8 +150,8 @@ class ShellJob : private ThreadHelpBase
@param bCheckExitCode
bind the execution result to the exit code of the started
process.
- If it's set to false we return false only in case
executable couldnt be found
- or couldnt be started.
+ If it's set to false we return false only in case
executable couldn't be found
+ or couldn't be started.
@return sal_True if command was executed successfully; sal_False
otherwise.
*/
diff --git a/main/framework/inc/services/autorecovery.hxx
b/main/framework/inc/services/autorecovery.hxx
index 802c743..521f9b1 100644
--- a/main/framework/inc/services/autorecovery.hxx
+++ b/main/framework/inc/services/autorecovery.hxx
@@ -73,7 +73,7 @@ namespace framework
@descr Because some operations are forced to be executed asynchronously
(e.g. requested by our CreashSave/Recovery dialog) ... we must
make sure
- that these informations wont be set as "normal" members of our
AtoRecovery
+ that these informations won't be set as "normal" members of our
AutoRecovery
instance. Otherwise they can disturb our normal AutoSave-timer
handling.
e.g. it can be unclear then, which progress has to be used for
storing documents ...
*/
@@ -185,7 +185,7 @@ class AutoRecovery : public css::lang::XTypeProvider
/** @short indicates the results of a FAILURE_SAFE operation
@descr We must know, which reason was the real one in case
- we couldnt copy a "failure document" to a user specified
path.
+ we couldn't copy a "failure document" to a user specified
path.
We must know, if we can forget our cache entry or not.
*/
enum EFailureSafeResult
@@ -251,10 +251,10 @@ class AutoRecovery : public css::lang::XTypeProvider
//-------------------------------
/** @short knows, if the document is really modified since
the last autosave,
- or was postponed, because it was an active one
etcpp...
+ or was postponed, because it was an active one
etcpp...
@descr Because we have no CHANGE TRACKING mechanism,
based on office document,
- we implements it by ourself. We listen for
MODIFIED events
+ we implement it by ourself. We listen for MODIFIED
events
of each document and update this state flag here.
Further we postpone saving of active documents,
e.g. if the user
@@ -408,7 +408,7 @@ class AutoRecovery : public css::lang::XTypeProvider
And further it's not possible to use a simple boolean
value here.
Because if more than one operation iterates over the same
stl container ...
- (only to modify its elements but don't add new or removing
existing ones!)
+ (only to modify its elements but don't add new or remove
existing ones!)
it should be possible doing so. But we must guarantee that
the last operation resets
this lock ... not the first one ! So we use a "ref count"
mechanism for that."
*/
@@ -423,8 +423,8 @@ class AutoRecovery : public css::lang::XTypeProvider
//---------------------------------------
/** @short special debug option to make testing faster.
- @descr We dont interpret the timer unit as [min] ...
- we use [ms] instead of that. Further we dont
+ @descr We don't interpret the timer unit as [min] ...
+ we use [ms] instead of that. Further we don't
wait 10 s for user idle ...
*/
#if OSL_DEBUG_LEVEL > 1
@@ -525,7 +525,7 @@ class AutoRecovery : public css::lang::XTypeProvider
//---------------------------------------
/** @short open the underlying configuration.
- @descr This method must be called everytimes
+ @descr This method must be called every time
a configuartion call is needed. Because
method works together with the member
m_xCFG, open it on demand and cache it
@@ -547,10 +547,10 @@ class AutoRecovery : public css::lang::XTypeProvider
@descr After that we know the initial state - means:
- if AutoSave was enabled by the user
- which time intervall has to be used
- - which recovery entries may already exists
+ - which recovery entries may already exist
@throw [com.sun.star.uno.RuntimeException]
- if config could not be opened or readed successfully!
+ if config could not be opened or read successfully!
@threadsafe
*/
@@ -718,7 +718,7 @@ class AutoRecovery : public css::lang::XTypeProvider
If a document is the most active one, saving
it
will be postponed if there exists other
unsaved
documents. This feature was implemented,
because
- we dont wish to disturb the user on it's work.
+ we don't wish to disturb the user on its work.
... bAllowUserIdleLoop should be set to
sal_True
EMERGENCY_SAVE / SESSION_SAVE =>
Here we must finish our work ASAP! It's not
allowed
@@ -727,13 +727,13 @@ class AutoRecovery : public css::lang::XTypeProvider
@param pParams
sometimes this method is required inside an external
dispatch request.
- The it contains some special environment variables, which
overwrites
+ It contains some special environment variables, which
overwrites
our normal environment.
AutoSave => pParams == 0
SessionSave/CrashSave => pParams != 0
- @return A suggestion, how the timer (if its not already disabled!)
- should be restarted to full fill the requirements.
+ @return A suggestion, how the timer (if it's not already disabled!)
+ should be restarted to fulfill the requirements.
@threadsafe
*/
@@ -770,7 +770,7 @@ class AutoRecovery : public css::lang::XTypeProvider
points to an informations structure, where
e.g. the document, its modified state, the count
of autosave-retries etcpp. exists.
- Its used also to return the new temp file name
+ It's used also to return the new temp file name
and some other state values!
@threadsafe
@@ -805,7 +805,7 @@ class AutoRecovery : public css::lang::XTypeProvider
/** @short notifies all interested listener about the current state
of the currently running operation.
- @descr We support different set's of functions. AUTO_SAVE,
EMERGENCY_SAVE,
+ @descr We support different sets of functions. AUTO_SAVE,
EMERGENCY_SAVE,
AUTO_RECOVERY, FAILURE_SAVE ... etcpp.
Listener can register itself for any type of supported
functionality ... but not for document URL's in special.
@@ -957,12 +957,12 @@ class AutoRecovery : public css::lang::XTypeProvider
/** @short try to create/use a progress and set it inside the
environment.
- @descr The problem behind: There exists different use case of
this method.
+ @descr The problem behind: There exist different use cases of
this method.
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
every time to create
- it's own progress. So we implemented a HACK for these
and now we set
+ c) Sometimes our application filters don't use the progress
+ provided by the MediaDescriptor. They use the Frame
every time to create
+ its 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
@@ -994,8 +994,8 @@ class AutoRecovery : public css::lang::XTypeProvider
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
+ feature. If we are not able doing so ... it's not a real problem.
+ Ok - users disc place will be smaller then ... but we should
produce
a crash during crash save because we can't delete a temporary file
only !
@param sURL
diff --git a/main/framework/inc/services/desktop.hxx
b/main/framework/inc/services/desktop.hxx
index 46a7c26..447c01c 100644
--- a/main/framework/inc/services/desktop.hxx
+++ b/main/framework/inc/services/desktop.hxx
@@ -181,7 +181,7 @@ class Desktop : // interfaces
Registered termination listener will be taken into
account
also. As special feature some of our registered
listener
- are well known by it's UNO implementation name. They
are handled
+ are well known by its UNO implementation name. They
are handled
different to all other listener.
Btw: Desktop.terminate() was designed in the past to
be used
@@ -210,7 +210,7 @@ class Desktop : // interfaces
@descr Additional to adding normal listener these method was
implemented special.
Every listener will be asked for it's uno
implementation name.
- Some of them are well known ... and the corresponding
listener wont be added
+ Some of them are well known ... and the corresponding
listener won't be added
to the container of "normal listener". Those listener
will be set as special
member.
see e.g. member m_xSfxTerminator
@@ -232,7 +232,7 @@ class Desktop : // interfaces
@short remove a listener from this container.
@descr Additional to removing normal listener these method
was implemented special.
- Every listener will be asked for it's uno
implementation name.
+ Every listener will be asked for its uno
implementation name.
Some of them are well known ... and the corresponding
listener was set as special member.
Now those special member will be reseted also.
see e.g. member m_xSfxTerminator
@@ -364,8 +364,8 @@ class Desktop : // interfaces
/** calls queryTermination() on every registered termination listener.
*
* Note: Only normal termination listener (registered in list
m_aListenerContainer
- * will be recognized here. Special listener like quick
starter, pipe or others
- * has to be handled explicitly !
+ * will be recognized here. Special listeners like quick
starter, pipe or others
+ * have to be handled explicitly !
*
* @param [out] lCalledListener
* every called listener will be returned here.
diff --git a/main/framework/inc/services/frame.hxx
b/main/framework/inc/services/frame.hxx
index a04cd5e..1c092a1 100644
--- a/main/framework/inc/services/frame.hxx
+++ b/main/framework/inc/services/frame.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -97,9 +97,9 @@ namespace framework{
// 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.
- E_ACTIVE , // I'am in the middle of an active path
in tree and i don't have the focus.
- E_FOCUS // I have the focus now. I must a
member of an active path!
+ E_INACTIVE , // I am not a member of active path in
tree and I don't have the focus.
+ E_ACTIVE , // I am in the middle of an active path
in tree and I don't have the focus.
+ E_FOCUS // I have the focus now. I must be a
member of an active path!
};
//_________________________________________________________________________________________________________________
@@ -108,8 +108,8 @@ enum EActiveState
/*-************************************************************************************************************//**
@short implements a normal frame of hierarchy
- @descr An instance of these class can be a normal node in frame tree.
A frame support influencing of his
- subtree, find of subframes, activate- and deactivate-mechanism
as well as
+ @descr An instance of this class can be a normal node in frame
tree. A frame support influencing of his
+ subtree, find of subframes, activate- and
deactivate-mechanism as well as
set/get of a frame window, component or
controller.
@attention This implementation supports three states:
a)uninitialized, b)working, c)disposed
@@ -117,23 +117,23 @@ enum EActiveState
How you should work with this service:
i) create it by using
"xServiceManager->createInstance(...)"
ii) call
XInitialization::initialize() with a valid window reference or use
createInstanceWithArguments() at i)
- iii) works with object
+ iii) work with object
iv) dispose object by
calling XComponent::dispose()
After iv) all further requests are rejected by
exceptions! (DisposedException)
- @base ThreadHelpBase
- help to guarantee correct initialized lock member at
startup
- @base TransactionBase
- help to implement unbreakable interface calls
- @base OBroadcastHelper
+ @base ThreadHelpBase
+ help to guarantee correct initialized
lock member at startup
+ @base TransactionBase
+ help to implement unbreakable interface
calls
+ @base OBroadcastHelper
OPropertySetHelper
- implements the property set
- @base OWeakObject
- provides the refcount and XInterface, XWeak
+ implements the property set
+ @base OWeakObject
+ provides the refcount and XInterface,
XWeak
@devstatus ready to use
@threadsafe yes
- @modified 04.10.2004 10:47, as96863
+ @modified 04.10.2004 10:47, as96863
*//*-*************************************************************************************************************/
class Frame : // interfaces
public css::lang::XTypeProvider
,
@@ -146,16 +146,16 @@ class Frame : // interfaces
public css::awt::XWindowListener
, // => XEventListener
public css::awt::XTopWindowListener
,
public css::awt::XFocusListener
,
- public css::document::XActionLockable ,
- public css::util::XCloseable , // =>
XCloseBroadcaster
- public css::frame::XComponentLoader ,
- public css::frame::XTitle ,
- public css::frame::XTitleChangeBroadcaster ,
+ public css::document::XActionLockable
,
+ public css::util::XCloseable
, // => XCloseBroadcaster
+ public css::frame::XComponentLoader
,
+ public css::frame::XTitle
,
+ public css::frame::XTitleChangeBroadcaster
,
// base classes
// Order is necessary for right initialization
of this class!
- public ThreadHelpBase ,
- public TransactionBase ,
- public PropertySetHelper , //
helper implements ThreadHelpbase, TransactionBase, XPropertySet,
XPropertySetInfo
+ public ThreadHelpBase
,
+ public TransactionBase
,
+ public PropertySetHelper
, // helper implements ThreadHelpbase,
TransactionBase, XPropertySet, XPropertySetInfo
public ::cppu::OWeakObject
// helper implements XInterface, XWeak
{
//-------------------------------------------------------------------------------------------------------------
@@ -191,9 +191,9 @@ class Frame : // interfaces
//---------------------------------------------------------------------------------------------------------
// XFramesSupplier
//---------------------------------------------------------------------------------------------------------
- virtual css::uno::Reference< css::frame::XFrames >
SAL_CALL getFrames (
) throw( css::uno::RuntimeException );
+ virtual css::uno::Reference< css::frame::XFrames >
SAL_CALL getFrames (
) throw( css::uno::RuntimeException );
virtual css::uno::Reference< css::frame::XFrame >
SAL_CALL getActiveFrame (
) throw( css::uno::RuntimeException );
- virtual void
SAL_CALL setActiveFrame
( const css::uno::Reference< css::frame::XFrame >&
xFrame
) throw( css::uno::RuntimeException );
+ virtual void
SAL_CALL setActiveFrame
( const css::uno::Reference< css::frame::XFrame >&
xFrame
) throw( css::uno::RuntimeException );
//---------------------------------------------------------------------------------------------------------
// XFrame
@@ -339,7 +339,7 @@ class Frame : // interfaces
/*-****************************************************************************************************//**
@short helper methods
- @descr Follow methods are needed at different
points of our code (more then ones!).
+ @descr Follow methods are needed at different
points of our code (more than once!).
@attention Threadsafe methods are signed by "implts_..."!
*//*-*****************************************************************************************************/
@@ -369,12 +369,12 @@ class Frame : // interfaces
//-------------------------------------------------------------------------------------------------------------
/*-****************************************************************************************************//**
- @short debug-method to check incoming
parameter of some other mehods of this class
+ @short debug-method to check incoming
parameter of some other methods of this class
@descr The following methods are used to check
parameters for other methods
of this class. The return value
is used directly for an ASSERT(...).
- @attention This methods are static and can't use
our member directly! It's better for threadsafe code...
- because we call it with
references or pointer to check variables ... and must make it safe
+ @attention These methods are static and can't use
our member directly! It's better for threadsafe code...
+ because we call it with
references or pointer to check variables... and must make it safe
by himself!
@seealso ASSERTs in implementation!
@@ -421,14 +421,14 @@ class Frame : // interfaces
css::uno::Reference< css::awt::XWindow >
m_xComponentWindow ; /// window of the actual component
css::uno::Reference< css::frame::XController >
m_xController ; /// controller of the actual frame
css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >
m_xDropTargetListener ; /// listen to drag & drop
- EActiveState
m_eActiveState ; /// state, if i'am a member of active
path in tree or i have the focus or ...
+ EActiveState
m_eActiveState ; /// state, if I am a member of active
path in tree or I have the focus or ...
::rtl::OUString
m_sName ; /// name of this frame
- sal_Bool
m_bIsFrameTop ; /// frame has no parent or the parent
is a taskor the desktop
+ sal_Bool
m_bIsFrameTop ; /// frame has no parent or the parent
is a task on the desktop
sal_Bool
m_bConnected ; /// due to FrameActionEvent
sal_Int16
m_nExternalLockCount ;
css::uno::Reference< css::frame::XDispatchRecorderSupplier >
m_xDispatchRecorderSupplier ; /// is used for dispatch recording and
will be set/get from outside. Frame provide it only!
SvtCommandOptions
m_aCommandOptions ; /// ref counted class to support
disabling commands defined by configuration file
- sal_Bool
m_bSelfClose ; /// in case of CloseVetoException on
method close() wqs thrown by ourself - we must close ourself later if no
internal processes are running
+ sal_Bool
m_bSelfClose ; /// in case of CloseVetoException on
method close() was thrown by ourself - we must close ourself later if no
internal processes are running
sal_Bool
m_bIsHidden ; /// indicates, if this frame is used
in hidden mode or not
static css::uno::WeakReference< css::frame::XFrame >
m_xCloserFrame ; /// holds the only frame, which must
show the special closer menu item (can be NULL!)
css::uno::Reference< ::com::sun::star::frame::XLayoutManager >
m_xLayoutManager ; /// is used to layout the child windows
of the frame.
diff --git a/main/framework/inc/services/modulemanager.hxx
b/main/framework/inc/services/modulemanager.hxx
index 0dd8a7d..4447b30 100644
--- a/main/framework/inc/services/modulemanager.hxx
+++ b/main/framework/inc/services/modulemanager.hxx
@@ -146,7 +146,7 @@ class ModuleManager : public css::lang::XTypeProvider
//---------------------------------------
/** @short open the underlying configuration.
- @descr This method must be called everytimes
+ @descr This method must be called every time
a (reaonly!) configuration is needed. Because
method works together with the member
m_xCFG, open it on demand and cache it
@@ -155,7 +155,7 @@ class ModuleManager : public css::lang::XTypeProvider
Note: A writable configuration access
must be created explicitly. Otherwise
we can't make sure that broken write requests
- wont affect our read access !
+ won't affect our read access !
@return [com.sun.star.container.XNameAccess]
the configuration object
@@ -175,7 +175,7 @@ class ModuleManager : public css::lang::XTypeProvider
XModule first. If this module does not exists at the
given component it tries to use XServiceInfo instead.
- Note: This method try to locate a suitable module name.
+ Note: This method tries to locate a suitable module name.
Nothing else. Selecting the right component and throwing
suitable
exceptions must be done outside.
diff --git a/main/framework/source/inc/accelerators/presethandler.hxx
b/main/framework/source/inc/accelerators/presethandler.hxx
index 20805b5..0a24da4 100644
--- a/main/framework/source/inc/accelerators/presethandler.hxx
+++ b/main/framework/source/inc/accelerators/presethandler.hxx
@@ -404,11 +404,11 @@ class PresetHandler : private ThreadHelpBase //
attention! Must be the first bas
the ALIAS name of the target.
@param bCreateIfMissing
- create target file, if it does not still exists.
+ create target file, if it does not still exist.
Note: That does not means reseting of an existing file!
@return The opened target stream ... or NULL if the target does
not exists
- or couldnt be created as new one.
+ or couldn't be created as new one.
*/
css::uno::Reference< css::io::XStream > openTarget(const
::rtl::OUString& sTarget ,
sal_Bool
bCreateIfMissing);
diff --git a/main/framework/source/jobs/shelljob.cxx
b/main/framework/source/jobs/shelljob.cxx
index 1cfcb4f..9954225 100644
--- a/main/framework/source/jobs/shelljob.cxx
+++ b/main/framework/source/jobs/shelljob.cxx
@@ -184,7 +184,7 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation()
oslProcessError eError = osl_executeProcess(sCommand.pData, pArgs, nArgs,
nOptions, NULL, NULL, NULL, 0, &hProcess);
- // executable not found or couldnt be started
+ // executable not found or couldn't be started
if (eError != osl_Process_E_None)
return sal_False;
diff --git a/main/framework/source/services/autorecovery.cxx
b/main/framework/source/services/autorecovery.cxx
index a50d4ea..249e2ea 100644
--- a/main/framework/source/services/autorecovery.cxx
+++ b/main/framework/source/services/autorecovery.cxx
@@ -2399,8 +2399,8 @@ void AutoRecovery::implts_saveOneDoc(const
::rtl::OUString&
const css::uno::Reference<
css::task::XStatusIndicator >& xExternalProgress)
{
// no document? => can occur if we loaded our configuration with files,
- // which couldnt be recovered successfully. In such case we have all
needed informations
- // excepting the real document instance!
+ // which couldn't be recovered successfully. In such case we have all
needed informations
+ // except the real document instance!
// TODO: search right place, where such "dead files" can be removed from
the configuration!
if (!rInfo.Document.is())
@@ -3103,7 +3103,7 @@ void AutoRecovery::implts_doEmergencySave(const
DispatchParams& aParams)
// flush config cached back to disc.
impl_flushALLConfigChanges();
- // try to make sure next time office will be started user wont be
+ // try to make sure next time office will be started user won't be
// notified about any other might be running office instance
// remove ".lock" file from disc !
AutoRecovery::st_impl_removeLockFile();
@@ -3180,7 +3180,7 @@ void AutoRecovery::implts_doSessionQuietQuit(const
DispatchParams& /*aParams*/)
{
LOG_RECOVERY("AutoRecovery::implts_doSessionQuietQuit()")
- // try to make sure next time office will be started user wont be
+ // try to make sure next time office will be started user won't be
// notified about any other might be running office instance
// remove ".lock" file from disc !
// it is done as a first action for session save since Gnome sessions
diff --git a/main/framework/source/services/frame.cxx
b/main/framework/source/services/frame.cxx
index f1c224c..1c605d3 100644
--- a/main/framework/source/services/frame.cxx
+++ b/main/framework/source/services/frame.cxx
@@ -1878,7 +1878,7 @@ void SAL_CALL Frame::dispose() throw(
css::uno::RuntimeException )
impl_disablePropertySet();
// interception/dispatch chain must be destructed explicitly
- // Otherwise some dispatches and/or interception objects wont die.
+ // Otherwise some dispatches and/or interception objects won't die.
css::uno::Reference< css::lang::XEventListener >
xDispatchHelper(m_xDispatchHelper, css::uno::UNO_QUERY_THROW);
xDispatchHelper->disposing(aEvent);
xDispatchHelper.clear();
diff --git a/main/framework/source/services/modulemanager.cxx
b/main/framework/source/services/modulemanager.cxx
index b0c76dc..e0b14ea 100644
--- a/main/framework/source/services/modulemanager.cxx
+++ b/main/framework/source/services/modulemanager.cxx
@@ -206,7 +206,7 @@ void SAL_CALL ModuleManager::replaceByName(const
::rtl::OUString& sName ,
// 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 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
.-)
+ // we can close it without a flush ... and our read data won't be affected
.-)
css::uno::Reference< css::uno::XInterface > xCfg =
::comphelper::ConfigurationHelper::openConfig(
xSMGR,
CFGPATH_FACTORIES,
diff --git
a/main/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
b/main/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index e31371d..207219f 100644
--- a/main/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/main/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -846,7 +846,7 @@ void SAL_CALL ModuleUIConfigurationManager::initialize(
const Sequence< Any >& a
{
m_pStorageHandler[i] = new PresetHandler( m_xServiceManager );
m_pStorageHandler[i]->connectToResource(
PresetHandler::E_MODULES,
- aResourceType, //
this path wont be used later ... seee next lines!
+ aResourceType, //
this path won't be used later ... see next lines!
m_aModuleShortName,
css::uno::Reference<
css::embed::XStorage >()); // no document root used here!
}
diff --git
a/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
b/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
index 99c4288..ac1203b 100644
--- a/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
+++ b/main/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx
@@ -817,7 +817,7 @@ void UIConfigurationManagerImpl::initialize( const
Sequence< Any >& aArguments )
{
m_pStorageHandler[i] = new PresetHandler( m_xServiceManager );
m_pStorageHandler[i]->connectToResource(
PresetHandler::E_MODULES,
- aResourceType, //
this path wont be used later ... seee next lines!
+ aResourceType, //
this path won't be used later ... see next lines!
m_aModuleShortName,
css::uno::Reference<
css::embed::XStorage >()); // no document root used here!
}
@@ -1459,7 +1459,7 @@ void UIConfigurationManagerImpl::setStorage( const
Reference< XStorage >& Storag
{
m_pStorageHandler[i] = new PresetHandler( m_xServiceManager );
m_pStorageHandler[i]->connectToResource(
PresetHandler::E_DOCUMENT,
-
rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), // this path wont be
used later ... seee next lines!
+
rtl::OUString::createFromAscii( UIELEMENTTYPENAMES[i] ), // this path won't be
used later ... see next lines!
sEmpty,
m_xUserConfigStorage);
}
diff --git a/main/framework/source/uielement/menubarmanager.cxx
b/main/framework/source/uielement/menubarmanager.cxx
index 04b9653..72a39ca 100644
--- a/main/framework/source/uielement/menubarmanager.cxx
+++ b/main/framework/source/uielement/menubarmanager.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -24,7 +24,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_framework.hxx"
-
//_________________________________________________________________________________________________________________
// my own includes
//_________________________________________________________________________________________________________________
@@ -100,10 +99,10 @@
// Be careful removing this "bad" construct. There are serious problems
// with #define STRICT and including windows.h. Changing this needs some
// redesign on other projects, too. Especially sal/main.h which defines
-// HINSTANCE depending on STRCIT!!!!!!!!!!!!!!!
+// HINSTANCE depending on STRICT!!!!!!!!!!!!!!!
struct SystemMenuData
{
- unsigned long nSize;
+ unsigned long nSize;
long hMenu;
};
@@ -292,7 +291,7 @@ Any SAL_CALL MenuBarManager::queryInterface( const Type &
rType ) throw ( Runtim
void SAL_CALL MenuBarManager::acquire() throw()
{
- OWeakObject::acquire();
+ OWeakObject::acquire();
}
@@ -304,13 +303,13 @@ void SAL_CALL MenuBarManager::release() throw()
Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >&
/*ProcessId*/, sal_Int16 SystemType ) throw (RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "[email protected]",
"MenuBarManager::getMenuHandle" );
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework",
"[email protected]", "MenuBarManager::getMenuHandle" );
ResetableGuard aGuard( m_aLock );
if ( m_bDisposed )
- throw com::sun::star::lang::DisposedException();
+ throw com::sun::star::lang::DisposedException();
- Any a;
+ Any a;
if ( m_pVCLMenu )
{
@@ -356,7 +355,7 @@ void MenuBarManager::Destroy()
if ( !m_bDisposed )
{
// stop asynchronous settings timer and
- // release defered item container reference
+ // release deferred item container reference
m_aAsyncSettingsTimer.Stop();
m_xDeferedItemContainer.clear();
RemoveListener();
@@ -499,7 +498,7 @@ throw ( RuntimeException )
std::vector< MenuItemHandler* >::iterator p;
for ( p = m_aMenuItemHandlerVector.begin(); p !=
m_aMenuItemHandlerVector.end(); p++ )
{
- // Clear dispatch reference as we will requery it later o
+ // Clear dispatch reference as we will requery it later on
MenuItemHandler* pItemHandler = *p;
pItemHandler->xMenuItemDispatch.clear();
}
@@ -651,7 +650,7 @@ void MenuBarManager::RemoveListener()
// Check service manager reference. Remove listener can be called due
// to a disposing call from the frame and therefore we already removed
- // our listeners and release the service manager reference!
+ // our listeners and released the service manager reference!
Reference< XMultiServiceFactory > xServiceManager = getServiceFactory();
if ( xServiceManager.is() )
{
@@ -988,7 +987,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
// Force update of popup menu
pMenuItemHandler->xPopupMenuController->updatePopupMenu();
bPopupMenu = sal_True;
- if (PopupMenu*
pThisPopup = pMenu->GetPopupMenu( pMenuItemHandler->nItemId ))
+ if (PopupMenu*
pThisPopup = pMenu->GetPopupMenu( pMenuItemHandler->nItemId ))
pMenu->EnableItem(
pMenuItemHandler->nItemId, pThisPopup->GetItemCount() ? true : false );
}
@@ -1220,7 +1219,7 @@ sal_Bool MenuBarManager::CreatePopupMenuController(
MenuItemHandler* pMenuItemHa
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "[email protected]",
"MenuBarManager::CreatePopupMenuController" );
rtl::OUString aItemCommand( pMenuItemHandler->aMenuItemURL );
- // Try instanciate a popup menu controller. It is stored in the menu item
handler.
+ // Try instantiate a popup menu controller. It is stored in the menu item
handler.
if ( !m_xPopupMenuControllerFactory.is() )
return sal_False;
@@ -1328,7 +1327,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const
Reference< XFrame >& rF
Reference< XStatusListener > xStatusListener;
PopupMenu* pPopup = pMenu->GetPopupMenu( nItemId );
bool bItemShowMenuImages = m_bShowMenuImages;
- MenuItemBits nBits = pMenu->GetItemBits( nItemId );
+ MenuItemBits nBits = pMenu->GetItemBits( nItemId );
// overwrite the show icons on menu option?
if ( nBits )
bItemShowMenuImages = ( ( nBits & MIB_ICON ) == MIB_ICON );
@@ -1805,13 +1804,13 @@ void MenuBarManager::FillMenu(
nBits |= MIB_RADIOCHECK;
pMenu->SetItemBits( nId, nBits );
}
-
+
if ( !bShow )
pMenu->HideItem( nId );
-
+
if ( !bEnabled)
pMenu->EnableItem( nId, sal_False );
-
+
if ( xIndexContainer.is() )
{
PopupMenu* pNewPopupMenu = new PopupMenu;
@@ -1994,7 +1993,7 @@ void MenuBarManager::GetPopupController(
PopupControllerCache& rPopupController
if (( nSchemePart > 0 ) &&
( aMenuURL.getLength() > ( nSchemePart+1 )))
{
- nQueryPart = aMenuURL.indexOf( '?', nSchemePart );
+ nQueryPart = aMenuURL.indexOf( '?', nSchemePart );
if ( nQueryPart > 0 )
aMainURL += aMenuURL.copy( nSchemePart,
nQueryPart-nSchemePart );
else if ( nQueryPart == -1 )
@@ -2088,7 +2087,7 @@ void MenuBarManager::Init(const Reference< XFrame >&
rFrame,AddonMenu* pAddonMen
Reference< XStatusListener > xSubMenuManager( static_cast<
OWeakObject *>( pSubMenuManager ), UNO_QUERY );
- // store menu item command as we later have to know which
menu is active (see Acivate handler)
+ // store menu item command as we later have to know which
menu is active (see Activate handler)
pSubMenuManager->m_aMenuItemCommand = aItemCommand;
MenuItemHandler* pMenuItemHandler = new MenuItemHandler(
diff --git a/main/framework/source/uielement/popuptoolbarcontroller.cxx
b/main/framework/source/uielement/popuptoolbarcontroller.cxx
index e5c5789..d149703 100644
--- a/main/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/main/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -19,6 +19,8 @@
*
*************************************************************/
+
+
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_framework.hxx"
@@ -308,7 +310,7 @@ NewToolbarController::execute( sal_Int16 /*KeyModifier*/ )
{
// TODO investigate how to wrap Get/SetUserValue in css::awt::XMenu
MenuConfiguration::Attributes* pMenuAttributes( 0 );
- VCLXPopupMenu* pTkPopupMenu =
+ VCLXPopupMenu* pTkPopupMenu =
( VCLXPopupMenu * ) VCLXMenu::GetImplementation( m_xPopupMenu );
vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
@@ -322,7 +324,7 @@ NewToolbarController::execute( sal_Int16 /*KeyModifier*/ )
}
css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 );
- aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
+ aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ) );
aArgs[0].Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER
) );
dispatchCommand( m_aLastURL, aArgs, aTarget );
@@ -334,19 +336,19 @@ void NewToolbarController::functionExecuted( const
OUString &rCommand )
}
/**
- it return the existing state of the given URL in the popupmenu of this
toolbox control.
+ it returns the existing state of the given URL in the popupmenu of this
toolbox control.
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. Otherwise 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 every time ...
+ the outside code must select a valid item of the popup menu every time...
and we define it here. By the way this method 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.
Then we return the private:factory/ URL of the default factory.
@param rPopupMenu
- pounts to the popup menu, on which item we try to locate the
given URL
+ points to the popup menu, on which item we try to locate the
given URL
Can be NULL! Search will be suppressed then.
@param sURL
diff --git a/main/l10ntools/source/filter/utils/FileHelper.java
b/main/l10ntools/source/filter/utils/FileHelper.java
index 8e47c05..465a6be 100644
--- a/main/l10ntools/source/filter/utils/FileHelper.java
+++ b/main/l10ntools/source/filter/utils/FileHelper.java
@@ -386,7 +386,7 @@ public class FileHelper
* used to return the file content.
*
* @throw [IOException]
- * - if the file couldnt be opened
+ * - if the file couldn't be opened
* - if the file does not use the right encoding
*/
public static void readEncodedBufferFromFile(java.io.File aFile
,
diff --git
a/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
b/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
index 2092936..0e139d6 100644
---
a/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
+++
b/main/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
@@ -297,7 +297,7 @@ public class AsyncJob extends WeakBase implements
XServiceInfo, XAsyncJob
private void showInfoNonModal( java.lang.String sTitle ,
java.lang.String sMessage )
{
- // Couldnt be implemented really using the toolkit ...
+ // Couldn't be implemented really using the toolkit ...
// Because we need a parent anytime.
// And showing e.g. a java dialog can make some trouble
// inside office ... but we have no chance here.
diff --git a/main/reportbuilder/java/com/sun/star/report/ReportJob.java
b/main/reportbuilder/java/com/sun/star/report/ReportJob.java
index 842ae51..7fb5471 100644
--- a/main/reportbuilder/java/com/sun/star/report/ReportJob.java
+++ b/main/reportbuilder/java/com/sun/star/report/ReportJob.java
@@ -53,7 +53,7 @@ public interface ReportJob
* Although we might want to run the job as soon as it has been
* created, sometimes it is wiser to let the user add some listeners
* first. If we execute at once, the user either has to deal with
- * threading code or wont receive any progress information in single
+ * threading code or won't receive any progress information in single
* threaded environments.
* @throws java.io.IOException
* @throws ReportExecutionException
diff --git
a/main/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
b/main/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
index c49e69a..e5ff809 100644
--- a/main/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
+++ b/main/reportbuilder/java/com/sun/star/report/pentaho/PentahoReportJob.java
@@ -325,7 +325,7 @@ public class PentahoReportJob implements ReportJob
/**
* Although we might want to run the job as soon as it has been created,
sometimes it is
* wiser to let the user add some listeners first. If we execute at once,
the user
- * either has to deal with threading code or wont receive any progress
information in
+ * either has to deal with threading code or won't receive any progress
information in
* single threaded environments.
*/
public void execute()
diff --git
a/main/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
b/main/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
index 6229c9a..d358d41 100644
---
a/main/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
+++
b/main/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java
@@ -145,7 +145,7 @@ public class ImageElementLayoutController
final Section tableRow = (Section) rowController.getNode();
// we are now making the assumption, that the row is a section,
that contains the table-cell.
// This breaks the ability to return nodes or to construct reports
on the fly, but the OO-report format
- // is weird anyway and wont support such advanced techniques for
the next few centuries ..
+ // is weird anyway and won't support such advanced techniques for
the next few centuries...
final int columnPos = findNodeInSection(tableRow, tableCell,
OfficeToken.COVERED_TABLE_CELL);
if (columnPos == -1)
{
diff --git a/main/sane/inc/sane.h b/main/sane/inc/sane.h
index 5320b4a..3d06023 100644
--- a/main/sane/inc/sane.h
+++ b/main/sane/inc/sane.h
@@ -70,7 +70,7 @@ typedef enum
}
SANE_Status;
-/* following are for later sane version, older frontends wont support */
+/* following are for later sane version, older frontends won't support */
#if 0
#define SANE_STATUS_WARMING_UP 12 /* lamp not ready, please retry */
#define SANE_STATUS_HW_LOCKED 13 /* scanner mechanism locked for transport */
diff --git a/main/sc/source/ui/vba/vbaworksheets.cxx
b/main/sc/source/ui/vba/vbaworksheets.cxx
index f536cb9..5cbcb2e 100644
--- a/main/sc/source/ui/vba/vbaworksheets.cxx
+++ b/main/sc/source/ui/vba/vbaworksheets.cxx
@@ -56,7 +56,7 @@ using namespace ::com::sun::star;
typedef ::cppu::WeakImplHelper1< container::XEnumeration >
SheetEnumeration_BASE;
typedef ::cppu::WeakImplHelper3< container::XNameAccess,
container::XIndexAccess, container::XEnumerationAccess >
SheetCollectionHelper_BASE;
-// a map ( or hashmap ) wont do as we need also to preserve the order
+// a map ( or hashmap ) won't do as we need also to preserve the order
// (as added ) of the items
typedef std::vector< uno::Reference< sheet::XSpreadsheet > > SheetMap;
@@ -156,8 +156,8 @@ public:
uno::Any aRet;
if ( !xIf.is() )
{
- // if the Sheet is in a document created by the api
unfortunately ( at the
- // moment, it actually wont have the special Document
modules
+ // if the Sheet is in a document created by the api
unfortunately (at the
+ // moment), it actually won't have the special Document
modules
uno::Reference< excel::XWorksheet > xNewSheet( new
ScVbaWorksheet( m_xParent, m_xContext, xSheet, m_xModel ) );
aRet <<= xNewSheet;
}
@@ -203,8 +203,8 @@ ScVbaWorksheets::createCollectionObject( const uno::Any&
aSource )
uno::Any aRet;
if ( !xIf.is() )
{
- // if the Sheet is in a document created by the api
unfortunately ( at the
- // moment, it actually wont have the special Document modules
+ // if the Sheet is in a document created by the api
unfortunately (at the
+ // moment), it actually won't have the special Document modules
uno::Reference< excel::XWorksheet > xNewSheet( new
ScVbaWorksheet( getParent(), mxContext, xSheet, mxModel ) );
aRet <<= xNewSheet;
}
diff --git a/main/sw/source/core/txtnode/thints.cxx
b/main/sw/source/core/txtnode/thints.cxx
index 675b21f..9e229b5 100644
--- a/main/sw/source/core/txtnode/thints.cxx
+++ b/main/sw/source/core/txtnode/thints.cxx
@@ -1790,13 +1790,13 @@ void SwTxtNode::DelSoftHyph( const xub_StrLen nStt,
const xub_StrLen nEnd )
}
//Modify here for #119405, by easyfan, 2012-05-24
-//In MS Word, the font underline setting of the paragraph end position wont
affect the formatting of numbering, escapement, etc, so we ignore them
+//In MS Word, the font underline setting of the paragraph end position won't
affect the formatting of numbering, escapement, etc, so we ignore them
bool lcl_IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich)
{
return (nWhich == RES_CHRATR_UNDERLINE || nWhich ==
RES_CHRATR_ESCAPEMENT);
}
-//In MS Word, following properties of the paragraph end position wont affect
the formatting of bullets, so we ignore them:
+//In MS Word, following properties of the paragraph end position won't affect
the formatting of bullets, so we ignore them:
//Font underline;
//Font Italic of Western, CJK and CTL;
//Font Bold of Wertern, CJK and CTL;
diff --git a/main/sw/source/core/unocore/unochart.cxx
b/main/sw/source/core/unocore/unochart.cxx
index 025b49f..c9247e0 100644
--- a/main/sw/source/core/unocore/unochart.cxx
+++ b/main/sw/source/core/unocore/unochart.cxx
@@ -2603,7 +2603,7 @@ void SAL_CALL SwChartDataSequence::dispose( )
//Comment: The bug is crashed for an exception threw out in
SwCharDataSequence::setModified(), just because
//the SwCharDataSequence object has been disposed. Actually,
the former design of SwClient will disband
- //itself from the notification list in its destruction. But the
SwCharDataSeqence wont be destructed but disposed
+ //itself from the notification list in its destruction. But the
SwCharDataSeqence won't be destructed but disposed
//in code (the data member SwChartDataSequence::bDisposed will
be set to TRUE), the relationship between client
//and modification are not released. So any notification from
modify object will lead said exception threw out.
//Recorrect the logic of code in
SwChartDataSequence::Dispose(), release the relationship inside...
diff --git a/main/sw/source/core/unocore/unoobj.cxx
b/main/sw/source/core/unocore/unoobj.cxx
index a6b48cc..751d43c 100644
--- a/main/sw/source/core/unocore/unoobj.cxx
+++ b/main/sw/source/core/unocore/unoobj.cxx
@@ -1743,7 +1743,7 @@ throw (uno::RuntimeException)
sal_Bool bRet = sal_False;
SwUnoCursorHelper::SelectPam(rUnoCursor, Expand);
- // if we're at the para start then we wont move
+ // if we're at the para start then we won't move
// but bRet is also true if GoSentence failed but
// the start of the sentence is reached
bRet = SwUnoCursorHelper::IsStartOfPara(rUnoCursor)
diff --git a/main/sw/source/filter/ww8/ww8par2.cxx
b/main/sw/source/filter/ww8/ww8par2.cxx
index 069af0e..0aa81aa 100644
--- a/main/sw/source/filter/ww8/ww8par2.cxx
+++ b/main/sw/source/filter/ww8/ww8par2.cxx
@@ -2368,8 +2368,8 @@ void WW8TabDesc::CalcDefaults()
/*
#96345#
If the last cell was "false" then there is no valid cell following it,
- so the default mapping forward wont't work. So map it (and
- contiguous invalid cells backwards to the last valid cell instead.
+ so the default mapping forward won't work. So map it (and
+ contiguous invalid cells) backwards to the last valid cell instead.
*/
if (i && pR->bExist[i-1] == false)
{
diff --git a/main/unotools/source/config/moduleoptions.cxx
b/main/unotools/source/config/moduleoptions.cxx
index 458dae8..925ebd5 100644
--- a/main/unotools/source/config/moduleoptions.cxx
+++ b/main/unotools/source/config/moduleoptions.cxx
@@ -460,7 +460,7 @@
SvtModuleOptions_Impl::SvtModuleOptions_Impl(SvtModuleOptions* pOutsideClass)
, m_bReadOnlyStatesWellKnown( sal_False )
, m_pOutsideClass( pOutsideClass )
{
- // First initialize list of factory infos! Otherwise we couldnt guarantee
right working of these class.
+ // First initialize list of factory infos! Otherwise we couldn't guarantee
right working of these class.
for( sal_Int32 nFactory=0; nFactory<FACTORYCOUNT; ++nFactory )
m_lFactories[nFactory].free();
diff --git a/main/uui/source/fltdlg.cxx b/main/uui/source/fltdlg.cxx
index 8aaff86..d6f2911 100644
--- a/main/uui/source/fltdlg.cxx
+++ b/main/uui/source/fltdlg.cxx
@@ -138,7 +138,7 @@ void FilterDialog::ChangeFilters( const FilterNameList*
pFilterNames )
@descr We show the dialog and if user finish it with "OK" - we try to
find selected item in internal saved
name list (which you must set in "ChangeFilters()"!). If we
return sal_True as result, you can use out
parameter "pSelectedItem" as pointer into your FilterNameList
to get selected item really ...
- but if we return sal_False ... user hsa cancel the dialog ...
you shouldn't do that. pSelectedItem isn't
+ but if we return sal_False ... user has canceled the dialog
... you shouldn't do that. pSelectedItem isn't
set to any valid value then. We don't change them ...
@seealso method ChangeFilters()
@@ -146,7 +146,7 @@ void FilterDialog::ChangeFilters( const FilterNameList*
pFilterNames )
@param "pSelectedItem", returns result of selection as pointer into
set list of filter names
(valid for function return sal_True only!)
@return true => pSelectedItem parameter points into name list and
represent use decision
- false => use has cancelled dialog (pSelectedItem isn't valid
then!)
+ false => use has canceled dialog (pSelectedItem isn't valid
then!)
@onerror We return false ... but don't change pSelectedItem!
@threadsafe no
@@ -208,9 +208,9 @@ class StringCalculator : public ::cppu::WeakImplHelper1<
::com::sun::star::util:
};
/*-************************************************************************************************************//**
- @short try to build short name of given URL to show it n GUI
+ @short try to build short name of given URL to show it in GUI
@descr We detect type of given URL automatically and build this short
name depend on this type ...
- If we couldnt make it right we return full given string
without any changes ...
+ If we couldn't make it right we return full given string
without any changes ...
@seealso class LocalFileHelper
@seealso method InetURLObject::getAbbreviated()
@@ -227,7 +227,7 @@ String FilterDialog::impl_buildUIFileName( const String&
sName )
if( ::utl::LocalFileHelper::ConvertURLToSystemPath( sName, sShortName ) ==
sal_True )
{
- // its a system file ... build short name by using osl functionality
+ // it's a system file ... build short name by using osl functionality
}
else
{
