[Libreoffice-commits] core.git: 2 commits - comphelper/inc comphelper/source filter/source framework/inc framework/qa framework/source l10ntools/source odk/examples sfx2/source svx/source ucbhelper/inc unotools/inc
Ivan Timofeev
timofeev.i.s at gmail.com
Sun Feb 17 01:58:48 PST 2013
comphelper/inc/comphelper/mediadescriptor.hxx | 8 ++++----
comphelper/inc/comphelper/sequenceashashmap.hxx | 4 ++--
comphelper/source/misc/locale.cxx | 2 +-
comphelper/source/misc/numberedcollection.cxx | 2 +-
filter/source/config/cache/cacheitem.hxx | 6 +++---
filter/source/config/cache/filtercache.cxx | 2 +-
filter/source/config/cache/filtercache.hxx | 4 ++--
filter/source/config/cache/typedetection.cxx | 2 +-
framework/inc/classes/propertysethelper.hxx | 2 +-
framework/inc/dispatch/interceptionhelper.hxx | 2 +-
framework/inc/interaction/quietinteraction.hxx | 2 +-
framework/inc/properties.h | 4 ++--
framework/qa/complex/loadAllDocuments/InteractionHandler.java | 2 +-
framework/source/accelerators/storageholder.cxx | 4 ++--
framework/source/classes/framecontainer.cxx | 2 +-
framework/source/dispatch/dispatchprovider.cxx | 2 +-
framework/source/dispatch/mailtodispatcher.cxx | 2 +-
framework/source/inc/loadenv/actionlockguard.hxx | 4 ++--
framework/source/inc/loadenv/targethelper.hxx | 2 +-
framework/source/jobs/joburl.cxx | 2 +-
framework/source/loadenv/loadenv.cxx | 4 ++--
framework/source/services/autorecovery.cxx | 2 +-
framework/source/services/desktop.cxx | 4 ++--
framework/source/services/dispatchhelper.cxx | 2 +-
framework/source/services/frame.cxx | 8 ++++----
l10ntools/source/filter/utils/Cache.java | 2 +-
l10ntools/source/filter/utils/FileHelper.java | 2 +-
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java | 4 ++--
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java | 2 +-
sfx2/source/appl/sfxhelp.cxx | 2 +-
sfx2/source/doc/docfile.cxx | 2 +-
sfx2/source/toolbox/tbxitem.cxx | 2 +-
svx/source/dialog/simptabl.cxx | 2 +-
svx/source/form/formcontroller.cxx | 2 +-
ucbhelper/inc/ucbhelper/interceptedinteraction.hxx | 2 +-
unotools/inc/unotools/securityoptions.hxx | 2 +-
36 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit a71946505b853ca3db7fd4c3a7df7bfc62626ed2
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Sun Feb 17 13:56:11 2013 +0400
fix SvxSimpleTable size
Change-Id: I74b082e090cc382b699720f1cfc70f1920ff5db4
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index 5fa4077..c32ed74 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -125,7 +125,7 @@ SvxSimpleTable::~SvxSimpleTable()
void SvxSimpleTable::UpdateViewSize()
{
- Size theWinSize=m_rParentTableContainer.GetSizePixel();
+ Size theWinSize=m_rParentTableContainer.GetOutputSizePixel();
Size HbSize=aHeaderBar.GetSizePixel();
HbSize.Width()=theWinSize.Width();
commit e2f97dcc1006aceb80c4805c0e1cb5b2f40ab7b0
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Wed Feb 13 18:25:22 2013 +0400
spelling: otherwhise -> otherwise
Change-Id: I2d89edbb2574b4e677c9a0682bc829d9476b54db
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx
index 8c55f85..ac045dc 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.hxx
@@ -123,7 +123,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
In case of local file the system file locking is used.
@return TRUE, if the stream was already part of the descriptor or could
- be created as new item. FALSE otherwhise.
+ be created as new item. FALSE otherwise.
*/
sal_Bool addInputStream();
@@ -142,7 +142,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
configuration settings.
@return TRUE, if the stream was already part of the descriptor or could
- be created as new item. FALSE otherwhise.
+ be created as new item. FALSE otherwise.
*/
sal_Bool addInputStreamOwnLock();
@@ -162,7 +162,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
show a readonly UI on top of this read/write stream.
@return TRUE, if the stream must be interpreted as readonly ...
- FALSE otherwhise.
+ FALSE otherwise.
*/
sal_Bool isStreamReadOnly() const;
@@ -298,7 +298,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
specifies whether the file should be locked
@return TRUE, if the stream was already part of the descriptor or could
- be created as new item. FALSE otherwhise.
+ be created as new item. FALSE otherwise.
*/
COMPHELPER_DLLPRIVATE sal_Bool impl_addInputStream( sal_Bool bLockFile );
};
diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx
index 3565127..284714f 100644
--- a/comphelper/inc/comphelper/sequenceashashmap.hxx
+++ b/comphelper/inc/comphelper/sequenceashashmap.hxx
@@ -205,7 +205,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
//---------------------------------------
/** @short check if the specified item exists
and return its (unpacked!) value or it returns the
- specified default value otherwhise.
+ specified default value otherwise.
@descr If a value should be extracted only in case
the requsted property exists realy (without creating
@@ -221,7 +221,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
be found.
@return The (unpacked!) value of the specified property or
- the given default value otherwhise.
+ the given default value otherwise.
@attention "unpacked" means the Any content of every iterator->second!
*/
diff --git a/comphelper/source/misc/locale.cxx b/comphelper/source/misc/locale.cxx
index 4853033..f11a13d 100644
--- a/comphelper/source/misc/locale.cxx
+++ b/comphelper/source/misc/locale.cxx
@@ -68,7 +68,7 @@ Locale::Locale(const ::rtl::OUString& sLanguage,
//-----------------------------------------------
Locale::Locale()
{
- // Initialize instance ... otherwhise user will
+ // Initialize instance ... otherwise user will
// may be get exceptions if he e.g. copy this instance ...
(*this) = X_NOTRANSLATE();
}
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx
index 88839ad..aa9d435 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -195,7 +195,7 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe
::sal_Int32 c = (::sal_Int32)m_lComponents.size ();
::sal_Int32 i = 1;
- // c cant be less then 0 ... otherwhise hash.size() has an error :-)
+ // c cant be less then 0 ... otherwise hash.size() has an error :-)
// But we need at least n+1 numbers here.
c += 1;
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx
index 5e01890..d20981e 100644
--- a/filter/source/config/cache/cacheitem.hxx
+++ b/filter/source/config/cache/cacheitem.hxx
@@ -98,7 +98,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
contains all properties, which must exist at this item.
@return sal_True if all given properties exists
- at this item; sal_False otherwhise.
+ at this item; sal_False otherwise.
*/
sal_Bool haveProps(const CacheItem& lProps) const;
@@ -115,7 +115,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
contains all properties, which should not exists at this item.
@return sal_False if at least on property exists at this item(!);
- sal_True otherwhise.
+ sal_True otherwise.
*/
sal_Bool dontHaveProps(const CacheItem& lProps) const;
@@ -132,7 +132,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap
contains all properties, which should be checked.
@return sal_True if all given properties dont exists
- at this item; sal_False otherwhise.
+ at this item; sal_False otherwise.
*/
sal_Bool excludeProps(const CacheItem& lProps) const;
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 4b197c2..ed33a1e 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -459,7 +459,7 @@ void FilterCache::setItem( EItemType eType ,
// => rList will be valid everytimes next line is reached.
CacheItemList& rList = impl_getItemList(eType);
- // name must be part of the property set too ... otherwhise our
+ // name must be part of the property set too ... otherwise our
// container query cant work correctly
CacheItem aItem = aValue;
aItem[PROPNAME_NAME] <<= sItem;
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index b72e1c6..1448272 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -428,7 +428,7 @@ class FilterCache : public BaseLock
@return [sal_Bool]
True, if the requested sub container contains some items;
- False otherwhise.
+ False otherwise.
@throw [css::uno::Exception]
if some input parameter are wrong or the cache itself is not valid
@@ -701,7 +701,7 @@ class FilterCache : public BaseLock
@return A valid reference, if the configuration access could be opened
and initialized within the requested modes successfully;
- a NULL reference otherwhise.
+ a NULL reference otherwise.
*/
css::uno::Reference< css::uno::XInterface > impl_createConfigAccess(const ::rtl::OUString& sRoot ,
sal_Bool bReadOnly ,
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 36b38a8..0894515 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -587,7 +587,7 @@ sal_Bool TypeDetection::impl_getPreselectionForType(const ::rtl::OUString& sPreS
INetURLObject::DECODE_WITH_CHARSET);
sExtension = sExtension.toAsciiLowerCase();
- // otherwhise we must know, if it matches to the given URL realy.
+ // otherwise we must know, if it matches to the given URL realy.
// especialy if it matches by its extension or pattern registration.
OUStringList lExtensions(aType[PROPNAME_EXTENSIONS]);
OUStringList lURLPattern(aType[PROPNAME_URLPATTERN]);
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index 1a5476b5..02ddf16 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -71,7 +71,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
sal_Bool m_bReleaseLockOnCall;
- // hold it weak ... otherwhise this helper has to be "killed" explicitly .-)
+ // hold it weak ... otherwise this helper has to be "killed" explicitly .-)
css::uno::WeakReference< css::uno::XInterface > m_xBroadcaster;
LockHelper& m_rLock;
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index 9655706..e9aab8d 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -218,7 +218,7 @@ class InterceptionHelper : public css::frame::XDispatchProvider
optional search parameter for targeting, if sTargetFrameName isn't a special one.
@return A valid dispatch object, if any interceptor or at least our slave is interested on the given URL;
- or NULL otherwhise.
+ or NULL otherwise.
*/
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(const css::util::URL& aURL ,
const ::rtl::OUString& sTargetFrameName,
diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index c9a731d..2eab314 100644
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -121,7 +121,7 @@ class QuietInteraction : public css::lang::XTypeProvider
@return [boolean]
<TRUE/> for used interaction
- <FALSE/> otherwhise
+ <FALSE/> otherwise
@threadsafe yes
*/
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index d1f65e2..1071b0e 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -271,14 +271,14 @@ class PropHelper
//___________________________________________
/** checks if given property will be changed by this settings.
- * We compare the content of the given any values. If they are different we return sal_True - sal_False otherwhise.
+ * We compare the content of the given any values. If they are different we return sal_True - sal_False otherwise.
*
* @param aCurrentValue contains the current value for this property
* @param aNewValue contains the new value for this property
* @param aOldValue returns the current value, in case somthing will be changed
* @param aChangedValue returns the new value, in case somthing will be changed
*
- * @return <True/> if value of this property will be changed; <False/> otherwhise.
+ * @return <True/> if value of this property will be changed; <False/> otherwise.
*/
static sal_Bool willPropertyBeChanged( const css::uno::Any& aCurrentValue ,
diff --git a/framework/qa/complex/loadAllDocuments/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/InteractionHandler.java
index f22201f..cd558ab 100644
--- a/framework/qa/complex/loadAllDocuments/InteractionHandler.java
+++ b/framework/qa/complex/loadAllDocuments/InteractionHandler.java
@@ -121,7 +121,7 @@ public class InteractionHandler implements XInteractionHandler
}
}
- // otherwhise we can abort this interaction only
+ // otherwise we can abort this interaction only
if (xAbort != null)
{
xAbort.select();
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 1cd7a21..e128439 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -181,7 +181,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const ::rtl:
}
// TODO think about return last storage as working storage ... but dont caching it inside this holder!
- // => otherwhise the same storage is may be commit more then once.
+ // => otherwise the same storage is may be commit more then once.
return xChild;
}
@@ -237,7 +237,7 @@ void StorageHolder::commitPath(const ::rtl::OUString& sPath)
css::uno::Reference< css::embed::XTransactedObject > xCommit;
StorageHolder::TStorageList::reverse_iterator pIt;
- for ( pIt = lStorages.rbegin(); // order of commit is important ... otherwhise changes are not recognized!
+ for ( pIt = lStorages.rbegin(); // order of commit is important ... otherwise changes are not recognized!
pIt != lStorages.rend() ;
++pIt )
{
diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx
index 1ddb781..0b75fd3 100644
--- a/framework/source/classes/framecontainer.cxx
+++ b/framework/source/classes/framecontainer.cxx
@@ -122,7 +122,7 @@ void FrameContainer::remove( const css::uno::Reference< css::frame::XFrame >& xF
reference to the queried frame
@return <TRUE/> if frame is oart of this container
- <FALSE/> otherwhise
+ <FALSE/> otherwise
@threadsafe yes
*****************************************************************************************************************/
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 6185fc3..868a3b3 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -494,7 +494,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
@param aURL
the dispatch URL for which may a handler is registered
- @return A dispatch object if a handler was found and agree with the given URL or <NULL/> otherwhise.
+ @return A dispatch object if a handler was found and agree with the given URL or <NULL/> otherwise.
@threadsafe yes
*/
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index 6ec3428..ae23b02 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -231,7 +231,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL&
{
// start mail client
// Because there is no notofocation about success - we use case of
- // no detected exception as SUCCESS - FAILED otherwhise.
+ // no detected exception as SUCCESS - FAILED otherwise.
xSystemShellExecute->execute( aURL.Complete, ::rtl::OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY );
bSuccess = sal_True;
}
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index 832a3a9..f85480f 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -99,7 +99,7 @@ class ActionLockGuard : private ThreadHelpBase
points to the outside resource, which should be locked.
@return sal_True, if new resource could be set and locked.
- sal_False otherwhise.
+ sal_False otherwise.
*/
virtual sal_Bool setResource(const css::uno::Reference< css::document::XActionLockable >& xLock)
{
@@ -127,7 +127,7 @@ class ActionLockGuard : private ThreadHelpBase
points to the outside resource, which should be locked.
@return sal_True, if new resource could be set and locked.
- sal_False otherwhise.
+ sal_False otherwise.
*/
virtual void freeResource()
{
diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx
index 05ad51b..539100a 100644
--- a/framework/source/inc/loadenv/targethelper.hxx
+++ b/framework/source/inc/loadenv/targethelper.hxx
@@ -73,7 +73,7 @@ class TargetHelper
represent the expected target.
@return It returns <TRUE/> if <var>sCheckTarget</var> represent
- the expected <var>eSpecialTarget</var> value; <FALSE/> otherwhise.
+ the expected <var>eSpecialTarget</var> value; <FALSE/> otherwise.
*/
static sal_Bool matchSpecialTarget(const ::rtl::OUString& sCheckTarget ,
ESpecialTarget eSpecialTarget);
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index 9513549..3af88e4 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -236,7 +236,7 @@ sal_Bool JobURL::getService( /*OUT*/ ::rtl::OUString& sService ) const
returns the part arguments if <var>sPart</var> was splitted successfully
@return <TRUE/> if the identifier could be found and the string was splitted.
- <FALSE/> otherwhise.
+ <FALSE/> otherwise.
*/
sal_Bool JobURL::implst_split( /*IN*/ const ::rtl::OUString& sPart ,
/*IN*/ const sal_Char* pPartIdentifier ,
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index d3c8228..b41c2a0 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -885,7 +885,7 @@ sal_Bool LoadEnv::impl_handleContent()
// SAFE -> -----------------------------------
ReadGuard aReadLock(m_aLock);
- // the type must exist inside the descriptor ... otherwhise this class is implemented wrong :-)
+ // the type must exist inside the descriptor ... otherwise this class is implemented wrong :-)
::rtl::OUString sType = m_lMediaDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_TYPENAME(), ::rtl::OUString());
if (sType.isEmpty())
throw LoadEnvException(LoadEnvException::ID_INVALID_MEDIADESCRIPTOR);
@@ -1297,7 +1297,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
return css::uno::Reference< css::frame::XFrame >();
}
- // otherwhise - iterate through the tasks of the desktop container
+ // otherwise - iterate through the tasks of the desktop container
// to find out, which of them might contains the requested document
css::uno::Reference< css::frame::XDesktop2 > xSupplier = css::frame::Desktop::create( comphelper::getComponentContext(m_xSMGR) );
css::uno::Reference< css::container::XIndexAccess > xTaskList(xSupplier->getFrames() , css::uno::UNO_QUERY);
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index d84086b..2cd18a1 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1794,7 +1794,7 @@ void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::fra
pIt = AutoRecovery::impl_searchDocument(m_lDocCache, xDocument);
if (pIt != m_lDocCache.end())
m_lDocCache.erase(pIt);
- pIt = m_lDocCache.end(); // otherwhise its not specified what pIt means!
+ pIt = m_lDocCache.end(); // otherwise its not specified what pIt means!
aCacheLock2.unlock();
aWriteLock.unlock();
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index a695eb2..0c1daa5 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1078,7 +1078,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r
else
{
//-------------------------------------------------------------------------------------------------
- // II) otherwhise use optional given search flags
+ // II) otherwise use optional given search flags
// force using of combinations of such flags. means no "else" part of use if() statements.
// But we ust break further searches if target was already found.
// Order of using flags is fix: SELF - CHILDREN - SIBLINGS - PARENT
@@ -1095,7 +1095,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const ::r
//-------------------------------------------------------------------------------------------------
// II.I) SELF
- // Check for right name. If it's the searched one return ourself - otherwhise
+ // Check for right name. If it's the searched one return ourself - otherwise
// ignore this flag.
//-------------------------------------------------------------------------------------------------
if (
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index 69903bb..be645c7 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -157,7 +157,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
/** callback for started dispatch with guaranteed notifications.
We must save the result, so the method executeDispatch() can return it.
- Further we must release the broadcaster (otherwhise it can't die)
+ Further we must release the broadcaster (otherwise it can't die)
and unblock the waiting executeDispatch() request.
@param aResult
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index c6404e5..fdefc0d 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -856,7 +856,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl
else
{
//-------------------------------------------------------------------------------------------------
- // II) otherwhise use optional given search flags
+ // II) otherwise use optional given search flags
// force using of combinations of such flags. means no "else" part of use if() statements.
// But we ust break further searches if target was already found.
// Order of using flags is fix: SELF - CHILDREN - SIBLINGS - PARENT
@@ -872,7 +872,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const ::rtl
//-------------------------------------------------------------------------------------------------
// II.I) SELF
- // Check for right name. If it's the searched one return ourself - otherwhise
+ // Check for right name. If it's the searched one return ourself - otherwise
// ignore this flag.
//-------------------------------------------------------------------------------------------------
if (
@@ -1336,7 +1336,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X
implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_DETACHING );
//_____________________________________________________________________________________________________
- // otherwhise release old component first
+ // otherwise release old component first
// Always release controller before releasing window,
// because controller may want to access its window!
// But check for real changes - may the new controller is the old one.
@@ -1922,7 +1922,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException )
m_aTransactionManager.setWorkingMode( E_CLOSE );
// Don't forget it restore old value -
- // otherwhise no dialogs can be shown anymore in other frames.
+ // otherwise no dialogs can be shown anymore in other frames.
Application::SetDialogCancelMode( old );
}
diff --git a/l10ntools/source/filter/utils/Cache.java b/l10ntools/source/filter/utils/Cache.java
index 744481d..be42b24 100644
--- a/l10ntools/source/filter/utils/Cache.java
+++ b/l10ntools/source/filter/utils/Cache.java
@@ -2159,7 +2159,7 @@ public class Cache
// move the preferred filter information to any type
// Set the filter name to the type for which the filter is registered.
// If this type already have a set PreferredFilter value, check if the current filter
- // has the preferred flag set. If not ignore it - otherwhise overwrite the
+ // has the preferred flag set. If not ignore it - otherwise overwrite the
// current information at the type. But look for multiple preferred filter relations ...
// means: look if more the one filter has set the preferred flag for the same type!
diff --git a/l10ntools/source/filter/utils/FileHelper.java b/l10ntools/source/filter/utils/FileHelper.java
index d39d93b..d4061fb 100644
--- a/l10ntools/source/filter/utils/FileHelper.java
+++ b/l10ntools/source/filter/utils/FileHelper.java
@@ -341,7 +341,7 @@ public class FileHelper
* e.g.: "dat"
*
* @return A valid file object, if an unique file could be created -
- * Null otherwhise.
+ * Null otherwise.
* e.g.: "c:\temp\myfile_1.dat"
*/
public static java.io.File createUniqueFile(java.io.File aBaseDir ,
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
index 9848018..75617f0 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
@@ -138,7 +138,7 @@ public class FunctionHelper
* we nee the remote service manager to create this task/frame service
*
* @return [com.sun.star.frame.XFrame]
- * the new created frame reference in case of success or null otherwhise
+ * the new created frame reference in case of success or null otherwise
*/
private static com.sun.star.frame.XFrame impl_createEmptyFrame(
com.sun.star.uno.XComponentContext xCtx )
@@ -173,7 +173,7 @@ public class FunctionHelper
* - the office window will be a child of one of our java windows
* - the office will be a normal system window outside this java application
* This behaviour will be regulated by the second parameter of this operation.
- * If a parentview is given the first mode will be activated - otherwhise
+ * If a parentview is given the first mode will be activated - otherwise
* the second one.
*
* Note: First mode (creation of a child window) can be reached by two different
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
index 0b96c79..a386d68 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
@@ -650,7 +650,7 @@ public class AsciiReplaceFilter
* the requested service name
*
* @return True, if the given service name will be supported;
- * False otherwhise.
+ * False otherwise.
*/
public boolean supportsService( String sService )
{
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 07b6781..fa346a8 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -543,7 +543,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask ,
{
Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );
- // otherwhise - create new help task
+ // otherwise - create new help task
Reference< XFrame > xHelpTask = xDesktop->findFrame(
OUString("OFFICE_HELP_TASK"),
FrameSearchFlag::TASKS | FrameSearchFlag::CREATE);
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 5cab6ce..d2f6164 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2561,7 +2561,7 @@ SfxMedium::GetInteractionHandler()
if ( !pImp->bAllowDefaultIntHdl )
return ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >();
- // otherwhise return cached default handler ... if it exist.
+ // otherwise return cached default handler ... if it exist.
if ( pImp->xInteraction.is() )
return pImp->xInteraction;
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index 86beded..bf7003d 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1437,7 +1437,7 @@ SfxAppToolBoxControl_Impl::~SfxAppToolBoxControl_Impl()
contains the image of the menu for the URL.
@return sal_True - if URL could be located as an item of the popup menu.
- sal_False - otherwhise.
+ sal_False - otherwise.
*/
sal_Bool Impl_ExistURLInMenu( const PopupMenu *pMenu ,
String &sURL ,
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 05f5d3f..7ab21f3 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -1680,7 +1680,7 @@ void FormController::focusGained(const FocusEvent& e) throw( RuntimeException )
{
// do we need to keep the locking of the commit
// we hold the lock as long as the control differs from the current
- // otherwhise we disabled the lock
+ // otherwise we disabled the lock
m_bCommitLock = m_bCommitLock && (XControl*)xControl.get() != (XControl*)m_xCurrentControl.get();
if (m_bCommitLock)
return;
diff --git a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
index 44013b1..d727b5a 100644
--- a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
+++ b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
@@ -229,7 +229,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper
by checking its interface type.
@return A valid reference to the continuation, if it could be located ...
- or an empty reference otherwhise.
+ or an empty reference otherwise.
*/
static ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > extractContinuation(
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > >& lContinuations,
diff --git a/unotools/inc/unotools/securityoptions.hxx b/unotools/inc/unotools/securityoptions.hxx
index 9676c30..ac8e6f1 100644
--- a/unotools/inc/unotools/securityoptions.hxx
+++ b/unotools/inc/unotools/securityoptions.hxx
@@ -127,7 +127,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail
@seealso -
@param "eOption", specify, which item is queried
- @return <TRUE/> if item is readonly; <FALSE/> otherwhise
+ @return <TRUE/> if item is readonly; <FALSE/> otherwise
@onerror No error should occurre!
*//*-*****************************************************************************************************/
More information about the Libreoffice-commits
mailing list