[Libreoffice-commits] core.git: filter/source framework/source sfx2/source vcl/osx
Andrea Gelmini
andrea.gelmini at gelma.net
Fri Jan 5 10:03:39 UTC 2018
filter/source/config/cache/filtercache.cxx | 12 ++++++------
framework/source/accelerators/storageholder.cxx | 2 +-
framework/source/dispatch/dispatchprovider.cxx | 1 -
framework/source/inc/accelerators/presethandler.hxx | 2 +-
framework/source/services/autorecovery.cxx | 6 +++---
sfx2/source/dialog/backingcomp.cxx | 4 ++--
vcl/osx/salframe.cxx | 2 +-
7 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit dbe0201d3aede56e2bda475dd308a891841b98a4
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Thu Jan 4 21:39:39 2018 +0100
Fix typos
Change-Id: I766862d255ac285329ae423629c7445837ddd55f
Reviewed-on: https://gerrit.libreoffice.org/47280
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 79af348702e0..13f779e4a533 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1285,7 +1285,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
{
// Attention! If config couldn't be opened successfully
// and exception os thrown automatically and must be forwarded
- // to our calli ...
+ // to our caller...
css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY_THROW);
{
SAL_INFO( "filter.config", "FilterCache::load std");
@@ -1302,7 +1302,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
{
// Attention! If config couldn't be opened successfully
// and exception os thrown automatically and must be forwarded
- // to our calli ...
+ // to our call...
css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY_THROW);
{
SAL_INFO( "filter.config", "FilterCache::load all types");
@@ -1319,7 +1319,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
{
// Attention! If config couldn't be opened successfully
// and exception os thrown automatically and must be forwarded
- // to our calli ...
+ // to our call...
css::uno::Reference< css::container::XNameAccess > xFilters(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY_THROW);
{
SAL_INFO( "filter.config", "FilterCache::load all filters");
@@ -1336,7 +1336,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
{
// Attention! If config couldn't be opened successfully
// and exception os thrown automatically and must be forwarded
- // to our calli ...
+ // to our call...
css::uno::Reference< css::container::XNameAccess > xLoaders(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY_THROW);
{
SAL_INFO( "filter.config", "FilterCache::load all frame loader");
@@ -1345,7 +1345,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
}
- // d) We need all content handler information ...
+ // d) We need all content handler information...
if (
((eRequiredState & E_CONTAINS_CONTENTHANDLERS) == E_CONTAINS_CONTENTHANDLERS) &&
((m_eFillState & E_CONTAINS_CONTENTHANDLERS) != E_CONTAINS_CONTENTHANDLERS)
@@ -1353,7 +1353,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
{
// Attention! If config couldn't be opened successfully
// and exception os thrown automatically and must be forwarded
- // to our calli ...
+ // to our call...
css::uno::Reference< css::container::XNameAccess > xHandlers(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY_THROW);
{
SAL_INFO( "filter.config", "FilterCache::load all content handler");
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 49e0ca821c87..7ea3d2f76ce2 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -129,7 +129,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri
try
{
- xChild = StorageHolder::openSubStorageWithFallback(xParent, sChild, nOpenMode, true); // TODO think about delegating fallback decision to our own calli!
+ xChild = StorageHolder::openSubStorageWithFallback(xParent, sChild, nOpenMode, true); // TODO think about delegating fallback decision to our own caller!
}
catch(const css::uno::RuntimeException&)
{ throw; }
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 0d5d76f09bb8..8a4e3aa48a92 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -494,7 +494,6 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt
That's why we implement this method. It return an already existing helper or create a new one otherwise.
@attention The parameter sTarget and nSearchFlags are defaulted to "" and 0!
- Please use it only, if you can be sure, that the really given by the outside calli!
Mostly it depends from the parameter eHelper is they are required or not.
@param eHelper
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index f9d3ff25b54b..9faf4be6bf8c 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -371,7 +371,7 @@ class PresetHandler
@param sPath
the configuration path, which should be opened.
Its further used as out parameter too, so we can return the localized
- path to the calli!
+ path!
@param eMode
the open mode (READ/READWRITE)
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 8141af180cc9..ed66677e1b22 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1081,11 +1081,11 @@ class CacheLockGuard
{
private:
- // holds the outside calli alive, so it's shared resources
+ // holds the outside caller alive, so it's shared resources
// are valid every time
css::uno::Reference< css::uno::XInterface > m_xOwner;
- // mutex shared with outside calli !
+ // mutex shared with outside caller!
osl::Mutex& m_rSharedMutex;
// this variable knows the state of the "cache lock"
@@ -2852,7 +2852,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs( bool bAllow
if (xActiveController.is())
xActiveModel = xActiveController->getModel();
- // Set the default timer action for our calli.
+ // Set the default timer action for our call.
// Default = NORMAL_AUTOSAVE
// We return a suggestion for an active timer only.
// It will be ignored if the timer was disabled by the user ...
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx
index 86b8519e71b9..37a2348cd11f 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -556,9 +556,9 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven
/** kill this instance.
- It can be called from our owner frame only. But there is no possibility to check the calli.
+ It can be called from our owner frame only. But there is no possibility to check the caller.
We have to release all our internal used resources and die. From this point we can throw
- DisposedExceptions for every further interface request ... but current implementation doesn`t do so ...
+ DisposedExceptions for every further interface request... but current implementation doesn't do so...
*/
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 9bf63720dbef..0752d91e87ae 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1415,7 +1415,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
// Cocoa does not have an equivalent for GetCurrentEventButtonState
// and GetCurrentEventKeyModifiers.
// we could try to get away with tracking all events for modifierKeys
- // and all mouse events for button state in VCL_NSApllication::sendEvent,
+ // and all mouse events for button state in VCL_NSApplication::sendEvent,
// but it is unclear whether this will get us the same result.
// leave in GetCurrentEventButtonState and GetCurrentEventKeyModifiers for now
More information about the Libreoffice-commits
mailing list