[Libreoffice-commits] core.git: dbaccess/source editeng/source filter/source framework/inc framework/source
Andrea Gelmini
andrea.gelmini at gelma.net
Sat Mar 11 05:05:18 UTC 2017
dbaccess/source/ui/inc/sbagrid.hrc | 2 +-
editeng/source/misc/hangulhanja.cxx | 2 +-
filter/source/config/cache/typedetection.cxx | 2 +-
filter/source/flash/swfwriter2.cxx | 2 +-
filter/source/msfilter/msdffimp.cxx | 2 +-
framework/inc/dispatch/dispatchprovider.hxx | 2 +-
framework/inc/dispatch/popupmenudispatcher.hxx | 2 +-
framework/inc/helper/persistentwindowstate.hxx | 2 +-
framework/inc/interaction/quietinteraction.hxx | 2 +-
framework/inc/macros/xinterface.hxx | 6 +++---
framework/inc/recording/dispatchrecordersupplier.hxx | 2 +-
framework/source/dispatch/dispatchprovider.cxx | 2 +-
framework/source/interaction/quietinteraction.cxx | 4 ++--
framework/source/services/autorecovery.cxx | 4 ++--
framework/source/services/desktop.cxx | 6 +++---
framework/source/services/frame.cxx | 2 +-
16 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit fba66b325c493567126b23d481d75ee00dc9c30d
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Fri Mar 10 18:58:02 2017 +0100
Fix typos
Change-Id: I19d30a1ef4236dbe0a0053dad67a5ba7b1586fc8
Reviewed-on: https://gerrit.libreoffice.org/35054
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Johnny_M <klasse at partyheld.de>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/dbaccess/source/ui/inc/sbagrid.hrc b/dbaccess/source/ui/inc/sbagrid.hrc
index 4c4d3a0..72fcdc4 100644
--- a/dbaccess/source/ui/inc/sbagrid.hrc
+++ b/dbaccess/source/ui/inc/sbagrid.hrc
@@ -34,7 +34,7 @@
// Spaltenbreite
#define SBA_DEF_FLTCOLWIDTH (SBA_WHICHID_START + 146) // SbaColRowSizeItem
-// Feldtyp
+// FieldType
#define SBA_DEF_FLTTYPE (SBA_WHICHID_START + 147) // DataFieldTypeItem
// Feldlänge
#define SBA_DEF_FLTLENGTH (SBA_WHICHID_START + 148) // SfxUInt32Item
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 53a45a4..54bdaea 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -78,7 +78,7 @@ namespace editeng
// additions for Chinese simplified / traditional conversion
HHC::ConversionType m_eConvType; // conversion type (Hangul/Hanja, simplified/traditional Chinese,...)
- LanguageType m_nSourceLang; // just a 'copy' of m_aSourceLocale in order in order to
+ LanguageType m_nSourceLang; // just a 'copy' of m_aSourceLocale in order to
// save the applications from always converting to this
// type in their implementations
LanguageType m_nTargetLang; // target language of new replacement text
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 6e4ef61..42d3d69 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -1109,7 +1109,7 @@ OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescript
// type and return it. (BTW: We must update the media descriptor here ...)
// The user selected explicitly a filter ... but normaly we are interested on
// a type here only. But we must be sure, that the selected filter is used
- // too and no ambigous filter registration disturb us .-)
+ // too and no ambiguous filter registration disturb us .-)
OUString sFilter = aRequest.getFilter();
if (!impl_validateAndSetFilterOnDescriptor(rDescriptor, sFilter))
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index 185bd60..c9ee555 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -255,7 +255,7 @@ void Tag::writeRect( SvStream& rOut, const Rectangle& rRect )
minY = rRect.Bottom();
}
- // AS: Figure out the maximum nubmer of bits required to represent any of the
+ // AS: Figure out the maximum number of bits required to represent any of the
// rectangle coordinates. Since minX or minY could be negative, they could
// actually require more bits than maxX or maxY.
// AS: Christian, can they be negative, or is that a wasted check?
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index b3a9cd1..2393e28 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5978,7 +5978,7 @@ bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt,
{
sal_uInt8 nVer;sal_uInt16 nInst;sal_uInt16 nFbt;sal_uInt32 nLength;
long nStartShapeGroupCont = rSt.Tell();
- // We are now in a shape group container (conditionally mulitple per page)
+ // We are now in a shape group container (conditionally multiple per page)
// an we now have to iterate through all contained shape containers
bool bFirst = !bPatriarch;
sal_uLong nReadSpGrCont = 0;
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index ab00668f..185fe8a 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -63,7 +63,7 @@ enum EDispatchHelper
- a normal frame never can create a new one by himself
@attention Use this class as member only! Never use it as baseclass.
- XInterface will be ambigous and we hold a weakreference to our OWNER - not to our SUPERCLASS!
+ XInterface will be ambiguous and we hold a weakreference to our OWNER - not to our SUPERCLASS!
@base OWeakObject
provides ref count and weak mechanism
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 01cf4a6..6b82239 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -55,7 +55,7 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
/*-************************************************************************************************************
@short helper for desktop only(!) to create new tasks on demand for dispatches
@descr Use this class as member only! Never use it as baseclass.
- XInterface will be ambigous and we hold a weakcss::uno::Reference to our OWNER - not to our SUPERCLASS!
+ XInterface will be ambiguous and we hold a weakcss::uno::Reference to our OWNER - not to our SUPERCLASS!
@implements XInterface
XDispatch
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index efd6ceb..40730a4 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -140,7 +140,7 @@ class PersistentWindowState : public ::cppu::WeakImplHelper<
@param sModuleName
identifies the application module, where the
- information should be setted on.
+ information should be set on.
@param sWindowState
contains the information about position and size.
diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index 04eb516..305a819 100644
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -60,7 +60,7 @@ class QuietInteraction : public ::cppu::WeakImplHelper<
@interface XInteractionHandler
@short called from outside to handle a problem
@descr The only interaction we can handle here is to
- decide which of two ambigous filters should be really used.
+ decide which of two ambiguous filters should be really used.
We use the user selected one every time.
All other request will be aborted and can break the code,
which use this interaction handler.
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index 4a57c3d..737e5cda 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -35,8 +35,8 @@ namespace framework{
Please use follow public macros only!
1) DEFINE_XINTERFACE => use it in header to declare XInterface and his methods
- 2) DIRECT_INTERFACE( INTERFACE ) => use it as parameter INTERFACEx at 4) if interface not ambigous
- 3) DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) => use it as parameter INTERFACEx at 4) if interface can be ambigous
+ 2) DIRECT_INTERFACE( INTERFACE ) => use it as parameter INTERFACEx at 4) if interface not ambiguous
+ 3) DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) => use it as parameter INTERFACEx at 4) if interface can be ambiguous
4) DECLARE_XINTERFACE_0( CLASS, BASECLASS ) => use it to define implementation of XInterface for 0 additional interface to baseclass
DECLARE_XINTERFACE_1( CLASS, BASECLASS, INTERFACE1 ) => use it to define implementation of XInterface for 1 additional interface to baseclass
...
@@ -120,7 +120,7 @@ ________________________________________________________________________________
static_cast< INTERFACE* >( this )
// Use it as parameter for DEFINE_XINTERFACE_X(), if you CAN'T use an interface directly in queryInterface()!
-// (zB at ambigous errors!)
+// (zB at ambiguous errors!)
#define DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) \
static_cast< BASEINTERFACE* >( static_cast< DERIVEDINTERFACE* >( this ) )
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx
index 14b02b4..5942e85 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -54,7 +54,7 @@ class DispatchRecorderSupplier : public ::cppu::WeakImplHelper<
/** provided dispatch recorder of this supplier instance
- @life Is controlled from outside. Because this variable is setted
+ @life Is controlled from outside. Because this variable is set
from there and not created internally. But we release our
reference to it if we die.
*/
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index bf7459c..509c6d7 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -320,7 +320,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
// I.VI) "_self", ""
// Our owner frame should handle this URL. But we can't do it for all of them.
- // So we ask the internal setted controller first. If he disagree we try to find a registered
+ // So we ask the internal set controller first. If he disagree we try to find a registered
// protocol handler. If this failed too - we check for a loadable content and in case of true
// we load it into the frame by returning specilized dispatch object.
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index 202a9ae..f59c2d1 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
@@ -73,8 +73,8 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI
xFOptions.set( lContinuations[i], css::uno::UNO_QUERY );
}
- // differ between abortable interactions (error, unknown filter ...)
- // and other ones (ambigous but not unknown filter ...)
+ // differ between abortable interactions (error, unknown filter...)
+ // and other ones (ambiguous but not unknown filter...)
css::task::ErrorCodeRequest aErrorCodeRequest;
css::document::LockedDocumentRequest aLockedDocumentRequest;
css::document::FilterOptionsRequest aFilterOptionsRequest;
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index fe05bbe..6d1e84b 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1323,8 +1323,8 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL&
implts_readAutoSaveConfig();
g.clear();
implts_updateTimer();
- // can it happen that might be the listener was stopped ? .-)
- // make sure it runs always ... even if AutoSave itself was disabled temporarly.
+ // can it happen that might be the listener was stopped? .-)
+ // make sure it runs always... even if AutoSave itself was disabled temporarily.
implts_startListening();
}
else
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index b210434..7463dfc 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1217,7 +1217,7 @@ void SAL_CALL Desktop::disposing( const css::lang::EventObject& )
of our own called method.
@attention a)
- Normal loop in loadComponentFromURL() breaks on setted member m_eLoadState during callback statusChanged().
+ Normal loop in loadComponentFromURL() breaks on set member m_eLoadState during callback statusChanged().
But these interaction feature implements second way to do so! So we must look on different callbacks
for same operation ... and live with it.
b)
@@ -1266,8 +1266,8 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio
xFilterSelect.set( lContinuations[nStep], css::uno::UNO_QUERY );
}
- // differ between abortable interactions (error, unknown filter ...)
- // and other ones (ambigous but not unknown filter ...)
+ // differ between abortable interactions (error, unknown filter...)
+ // and other ones (ambiguous but not unknown filter...)
css::task::ErrorCodeRequest aErrorCodeRequest;
if( aRequest >>= aErrorCodeRequest )
{
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index cf69e25..2a8fc36 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2684,7 +2684,7 @@ void SAL_CALL Frame::setActionLocks( sal_Int16 nLock )
SolarMutexGuard g;
// Attention: If somewhere called resetActionLocks() before and get e.g. 5 locks ...
// and tried to set these 5 ones here after his operations ...
- // we can't ignore setted requests during these two calls!
+ // we can't ignore set requests during these two calls!
// So we must add(!) these 5 locks here.
m_nExternalLockCount = m_nExternalLockCount + nLock;
}
More information about the Libreoffice-commits
mailing list