diff options
391 files changed, 769 insertions, 769 deletions
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index 4c3452aa4164..0bc7e0ae2b07 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -239,7 +239,7 @@ public: /**_______________________________________________________________________________________________________ @short get implementation id - @descr This ID is neccessary for UNO-caching. If there no ID, cache is disabled. + @descr This ID is necessary for UNO-caching. If there no ID, cache is disabled. Another way, cache is enabled. @seealso XTypeProvider diff --git a/android/abs-lib/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java b/android/abs-lib/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java index 171d4702c1c8..1c9de73d9184 100644 --- a/android/abs-lib/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java +++ b/android/abs-lib/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java @@ -610,7 +610,7 @@ public abstract class IcsAdapterView<T extends Adapter> extends ViewGroup { /** * Sets the currently selected item. To support accessibility subclasses that - * override this method must invoke the overriden super method first. + * override this method must invoke the overridden super method first. * * @param position Index (starting at 0) of the data item to be selected. */ diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index e56f86b7822d..d6e2c929d64d 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -245,7 +245,7 @@ SoundHandler::~SoundHandler() @attention We must hold us alive by ourself ... because we use async. vcl sound player ... but playing is started in async interface call "dispatch()" too. And caller forget us immediately. But then our uno ref count will decreased to 0 and will die. The only solution is to use own reference to our implementation. - But we do it for realy started jobs only and release it during call back of vcl. + But we do it for really started jobs only and release it during call back of vcl. @seealso class vcl/Sound @seealso method implts_PlayerNotify() @@ -324,7 +324,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL& @attention a) We don't need any mutex here ... because we don't use any member! b) Don't use internal player instance "m_pPlayer" to detect given sound file! - It's not neccessary to do that ... and we can use temp. variable to do the same. + 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 @@ -340,7 +340,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL& *//*-*************************************************************************************************************/ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ) { - // Our default is "nothing". So we can return it, if detection failed or fily type is realy unknown. + // Our default is "nothing". So we can return it, if detection failed or file type is really unknown. OUString sTypeName; // Analyze given descriptor to find filename or input stream or ... diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 201c2ef3d3f0..17fffe0ec595 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -345,7 +345,7 @@ void Player::preparePlaybin( const OUString& rURL, GstElement *pSink ) } mpPlaybin = gst_element_factory_make( "playbin", NULL ); - if( pSink != NULL ) // used for getting prefered size etc. + if( pSink != NULL ) // used for getting preferred size etc. { g_object_set( G_OBJECT( mpPlaybin ), "video-sink", pSink, NULL ); mbFakeVideo = true; diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index e13977183604..85ec1bf6b092 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -456,7 +456,7 @@ bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) rView.MovAction(aPos); } - rWindow.SetPointer( rView.GetPreferedPointer( aPos, &rWindow, nHitLog ) ); + rWindow.SetPointer( rView.GetPreferredPointer( aPos, &rWindow, nHitLog ) ); return true; } @@ -569,7 +569,7 @@ bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) bMarkAction = false; - rWindow.SetPointer( rView.GetPreferedPointer( aPnt, &rWindow, nHitLog ) ); + rWindow.SetPointer( rView.GetPreferredPointer( aPnt, &rWindow, nHitLog ) ); rWindow.ReleaseMouse(); return true; @@ -595,7 +595,7 @@ bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) rView.MovAction(aPnt_); } - rWindow.SetPointer( rView.GetPreferedPointer( aPnt, &rWindow, nHitLog ) ); + rWindow.SetPointer( rView.GetPreferredPointer( aPnt, &rWindow, nHitLog ) ); return true; } diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 43c98835a4d3..816cb9bcadfb 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -710,7 +710,7 @@ sal_Bool SbxValue::IsFixed() const return ( (GetFlags() & SBX_FIXED) | (aData.eType & SbxBYREF) ) != 0; } -// A variable is numeric, if it is EMPTY or realy numeric +// A variable is numeric, if it is EMPTY or really numeric // or if it contains a complete convertible String // #41692, implement it for RTL and Basic-Core separately diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/com/sun/star/beans/LocalOfficeWindow.java index 7d81eb041619..9388dcd6f1d7 100644 --- a/bean/com/sun/star/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/beans/LocalOfficeWindow.java @@ -238,14 +238,14 @@ public class LocalOfficeWindow } /** - * Retrives a platform dependant system window identifier. + * Retrives a platform dependent system window identifier. * * @return The system window identifier. */ private native long getNativeWindow(); /** - * Retrives a platform dependant system window type. + * Retrives a platform dependent system window type. * * @return The system window type. */ diff --git a/bin/README b/bin/README index 688d758d407e..d5d0829ce1d3 100644 --- a/bin/README +++ b/bin/README @@ -6,4 +6,4 @@ build, or are simply generally useful. One example is bin/find-german-comments <directory> which will try to detect and extract all the German comments in a -given source code hireachy / directory.
\ No newline at end of file +given source code hierarchy / directory. diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 7a55cc7d8b7b..efdb3363c39d 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -1855,7 +1855,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) { if( m_pDrawViewWrapper->IsTextEditHit( aMousePos, HITPIX) ) { - m_pChartWindow->SetPointer( m_pDrawViewWrapper->GetPreferedPointer( + m_pChartWindow->SetPointer( m_pDrawViewWrapper->GetPreferredPointer( aMousePos, m_pChartWindow, nModifier, bLeftDown ) ); return; } @@ -1872,7 +1872,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent ) if( pHitSelectionHdl ) { - Pointer aPointer = m_pDrawViewWrapper->GetPreferedPointer( + Pointer aPointer = m_pDrawViewWrapper->GetPreferredPointer( aMousePos, m_pChartWindow, nModifier, bLeftDown ); bool bForceArrowPointer = false; diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index c1042693acca..14513732c53e 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -97,7 +97,7 @@ OOO_DLLPUBLIC_CHARTTOOLS OUString getDataSeriesLabel( ::com::sun::star::chart2::XDataSeries > & xSeries, const OUString & rLabelSequenceRole ); -/** Get the label of a labeled sequence including neccessary automatic generation +/** Get the label of a labeled sequence including necessary automatic generation */ OOO_DLLPUBLIC_CHARTTOOLS OUString getLabelForLabeledDataSequence( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index ca3e38935095..5aef64793b41 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -309,7 +309,7 @@ Diagram::Diagram( uno::Reference< uno::XComponentContext > const & xContext ) : // Set camera position to a default position (that should be set hard, so // that it will be exported. The property default is a camera looking // straight ono the scene). These defaults have been acquired from the old - // chart implemetation. + // chart implementation. setFastPropertyValue_NoBroadcast( SceneProperties::PROP_SCENE_CAMERA_GEOMETRY, uno::makeAny( ThreeDHelper::getDefaultCameraGeometry())); diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index 5d97833ff695..7da3d8a47118 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -126,7 +126,7 @@ struct AxisProperties ExplicitCategoriesProvider* m_pExplicitCategoriesProvider;/*no ownership here*/ ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XTextualDataSequence > - m_xAxisTextProvider; //for categries or series names + m_xAxisTextProvider; //for categories or series names //<- category axes //methods: diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index 983b2bba4c91..3ba2c135c81a 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -111,7 +111,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper( sal_Int32 nHandle = -1; // ask the infor service first if ( _pInfoService ) - nHandle = _pInfoService->getPreferedPropertyId( pMergedProps->Name ); + nHandle = _pInfoService->getPreferredPropertyId( pMergedProps->Name ); if ( -1 == nHandle ) // no handle from the info service -> default diff --git a/compilerplugins/README b/compilerplugins/README index a9881c7f3599..78bc28b3db6b 100644 --- a/compilerplugins/README +++ b/compilerplugins/README @@ -39,7 +39,7 @@ Additional optional make arguments: - it is possible to also pass FORCE_COMPILE_ALL=1 to make to trigger rebuild of all source files, even those that are up to date. - UPDATE_FILES=<scope> - limits which modified files will be actually written back with the changes - - mainfile - only the main .cxx file will be modifed (default) + - mainfile - only the main .cxx file will be modified (default) - all - all source files involved will be modified (possibly even header files from other LO modules), 3rd party header files are however never modified - <module> - only files in the given LO module (toplevel directory) will be modified (including headers) diff --git a/configure.ac b/configure.ac index b0a3d6a89da3..1ecb20fc6788 100644 --- a/configure.ac +++ b/configure.ac @@ -9704,7 +9704,7 @@ the Windows SDK are installed.]) dnl TODO: solenv/bin/modules/installer/windows/msiglobal.pm wants to use a dnl WiLangId.vbs that is included only in some SDKs (e.g., included in v7.1 - dnl but not in v8.0), so allow this to be overriden with a + dnl but not in v8.0), so allow this to be overridden with a dnl WINDOWS_SDK_WILANGID for now; a full-blown --with-windows-sdk-wilangid dnl and configuration error if no WiLangId.vbs is found would arguably be dnl better, but I do not know under which conditions exactly it is needed by diff --git a/connectivity/qa/connectivity/tools/CRMDatabase.java b/connectivity/qa/connectivity/tools/CRMDatabase.java index 5769a0078abe..ea807ae7faec 100644 --- a/connectivity/qa/connectivity/tools/CRMDatabase.java +++ b/connectivity/qa/connectivity/tools/CRMDatabase.java @@ -172,7 +172,7 @@ public class CRMDatabase new HsqlColumnDescriptor( "Comment","LONGVARCHAR")} ); m_database.createTable( table, true ); - m_database.executeSQL( "INSERT INTO \"customers\" VALUES(1,'Food, Inc.','Down Under','Melbourne','509','Prefered') " ); + m_database.executeSQL( "INSERT INTO \"customers\" VALUES(1,'Food, Inc.','Down Under','Melbourne','509','Preferred') " ); m_database.executeSQL( "INSERT INTO \"customers\" VALUES(2,'Simply Delicious','Down Under','Melbourne','518',null) " ); m_database.executeSQL( "INSERT INTO \"customers\" VALUES(3,'Pure Health','10 Fish St.','San Francisco','94107',null) " ); m_database.executeSQL( "INSERT INTO \"customers\" VALUES(4,'Milk And More','Arlington Road 21','Dublin','31021','Good one.') " ); diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index aad82fea8d39..9ecb37275a9c 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -197,7 +197,7 @@ namespace dbtools OUString sName; xParam->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME) ) >>= sName; - // only append additonal parameters when they are not already in the list + // only append additional parameters when they are not already in the list ParameterInformation::iterator aExistentPos = m_aParameterInformation.find( sName ); OSL_ENSURE( !_bSecondRun || ( aExistentPos != m_aParameterInformation.end() ), "ParameterManager::collectInnerParameters: the parameter information should already exist in the second run!" ); diff --git a/connectivity/source/drivers/firebird/SubComponent.hxx b/connectivity/source/drivers/firebird/SubComponent.hxx index 241742747760..4c78272312ca 100644 --- a/connectivity/source/drivers/firebird/SubComponent.hxx +++ b/connectivity/source/drivers/firebird/SubComponent.hxx @@ -81,7 +81,7 @@ namespace connectivity } /** call this in the getInfoHelper method of your derived class. The method returns the array helper of the - class, which is created if neccessary. + class, which is created if necessary. */ ::cppu::IPropertyArrayHelper* getArrayHelper(); diff --git a/connectivity/source/drivers/firebird/Table.hxx b/connectivity/source/drivers/firebird/Table.hxx index d6354bcd3ff9..f9684c06845c 100644 --- a/connectivity/source/drivers/firebird/Table.hxx +++ b/connectivity/source/drivers/firebird/Table.hxx @@ -21,7 +21,7 @@ namespace connectivity /** * Implements sdbcx.Table. We don't support table renaming (XRename) - * hence the appropriate methods are overriden. + * hence the appropriate methods are overridden. */ class Table: public OTableHelper { diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx index 8541de7f389d..efffeea07d69 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx @@ -50,13 +50,13 @@ public: virtual ~nsProfile(); public: - //We register an factory for Mozilla profile service its CID and CONTRACTID are NS_PROFILE_CID and NS_PROFILE_CONTRACTID - //After that, we does not need profile.dll/libprofile.so any more. Our profile service are different from the orginal one in + //We register a factory for Mozilla profile service, its CID and CONTRACTID are NS_PROFILE_CID and NS_PROFILE_CONTRACTID + //After that, we do not need profile.dll/libprofile.so any more. Our profile service is different from the original one in //these areas: //1. We do not lock Mozilla Profile, //2. We do not change Mozilla Profile settings. We do not change default profile, do not create new profiles and // do not write changes back to profile register - //3. We support can load both Thunderbird profile and Mozilla profiles + //3. We can load both Thunderbird profile and Mozilla profile static nsresult RegisterProfileManager(nsIProfile* aProfileService); }; diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx index 12d7c7c651c3..5d002be05114 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx @@ -154,7 +154,7 @@ public: // XNameAccess public: // XAppend - // Must be overriden in Non-Descriptors. May be overriden in descriptors, when + // Must be overridden in Non-Descriptors. May be overridden in descriptors, when // PropertySet.NAME != container name virtual void SAL_CALL appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx index 8875c0814150..aeb054a67a52 100644 --- a/cppuhelper/source/implbase_ex.cxx +++ b/cppuhelper/source/implbase_ex.cxx @@ -126,7 +126,7 @@ bool recursivelyFindType( // This code assumes that the vtables of a multiple-inheritance class (the // offset amount by which to adjust the this pointer) follow one another in // the object layout, and that they contain slots for the inherited classes - // in a specifc order. In theory, that need not hold for any given + // in a specific order. In theory, that need not hold for any given // platform; in practice, it seems to work well on all supported platforms: next: for (sal_Int32 i = 0; i < type->nBaseTypes; ++i) { diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index a034c26f1b7a..753f2a0b457c 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -25,7 +25,7 @@ #include <dialmgr.hxx> #include <sal/macros.h> -// modus convertion to the positions in the listbox +// modus conversion to the positions in the listbox const sal_uInt16 aPosToExportArr[] = { HTML_CFG_MSIE, diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx index 262b11f44c3e..5194ca3ae517 100644 --- a/dbaccess/source/core/api/BookmarkSet.cxx +++ b/dbaccess/source/core/api/BookmarkSet.cxx @@ -121,7 +121,7 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XRESULTSETUPDATE ), SQL_GENERAL_ERROR, *this ); } -void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { SAL_INFO("dbaccess", "OBookmarkSet::updateRow" ); Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY); @@ -129,7 +129,7 @@ void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowS ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), SQL_GENERAL_ERROR, *this ); sal_Int32 i = 1; - connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOrginalRow->get().begin()+1; + connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOriginalRow->get().begin()+1; connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->get().end(); for(connectivity::ORowVector< ORowSetValue > ::Vector::iterator aIter = _rInsertRow->get().begin()+1;aIter != aEnd;++aIter,++i,++aOrgIter) { diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx index 76e92e9cabae..243f295f2322 100644 --- a/dbaccess/source/core/api/BookmarkSet.hxx +++ b/dbaccess/source/core/api/BookmarkSet.hxx @@ -53,7 +53,7 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ,const connectivity::OSQLTable& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XResultSetUpdate virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 23ad4843315c..c30cd723570e 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -241,7 +241,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow OUString aQuote = getIdentifierQuoteString(); - sal_Int32 nCheckCount = 1; // index for the orginal values + sal_Int32 nCheckCount = 1; // index for the original values sal_Int32 i = 1; OUString sIsNull(" IS NULL"); @@ -285,7 +285,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow } } -void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) +void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) { SAL_INFO("dbaccess", "OCacheSet::updateRow" ); Reference<XPropertySet> xSet(_xTable,UNO_QUERY); @@ -324,7 +324,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR ::std::list< sal_Int32>::const_iterator aOrgValueEnd = aOrgValues.end(); for(::std::list< sal_Int32>::const_iterator aOrgValue = aOrgValues.begin(); aOrgValue != aOrgValueEnd;++aOrgValue,++i) { - setParameter(i,xParameter,(_rOrginalRow->get())[*aOrgValue],m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i)); + setParameter(i,xParameter,(_rOriginalRow->get())[*aOrgValue],m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i)); } m_bUpdated = xPrep->executeUpdate() > 0; diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index a975699539bb..d4f04d568b7d 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -129,7 +129,7 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; // ::com::sun::star::sdbc::XResultSetUpdate virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateRow( const ORowSetRow& _rInsertRow,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; + virtual void SAL_CALL updateRow( const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; virtual void SAL_CALL deleteRow( const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; virtual void SAL_CALL cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; virtual void SAL_CALL moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) = 0; diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 2e02ef555533..e02e69931bf4 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -570,7 +570,7 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows return aRet; } -void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) +void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) { SAL_INFO("dbaccess", "OKeySet::updateRow" ); Reference<XPropertySet> xSet(_xTable,UNO_QUERY); @@ -610,7 +610,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow if ( m_pKeyColumnNames->find(aIter->first) != m_pKeyColumnNames->end() ) { sKeyCondition.append(::dbtools::quoteName( aQuote,aIter->second.sRealName)); - if((_rOrginalRow->get())[aIter->second.nPosition].isNull()) + if((_rOriginalRow->get())[aIter->second.nPosition].isNull()) sKeyCondition.append(sIsNull); else sKeyCondition.append(sParam); @@ -625,7 +625,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow if((*aIndexIter)->hasByName(aIter->first)) { sIndexCondition.append(::dbtools::quoteName( aQuote,aIter->second.sRealName)); - if((_rOrginalRow->get())[aIter->second.nPosition].isNull()) + if((_rOriginalRow->get())[aIter->second.nPosition].isNull()) sIndexCondition.append(sIsNull); else { @@ -672,10 +672,10 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow // now create end execute the prepared statement OUString sEmpty; - executeUpdate(_rInsertRow ,_rOrginalRow,aSql.makeStringAndClear(),sEmpty,aIndexColumnPositions); + executeUpdate(_rInsertRow ,_rOriginalRow,aSql.makeStringAndClear(),sEmpty,aIndexColumnPositions); } -void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const OUString& i_sSQL,const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions) +void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const OUString& i_sSQL,const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions) { // now create end execute the prepared statement Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(i_sSQL)); @@ -700,7 +700,7 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO bRefetch = ::std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),aIter->second.sRealName) == m_aFilterColumns.end(); } impl_convertValue_throw(_rInsertRow,aIter->second); - (_rInsertRow->get())[nPos].setSigned((_rOrginalRow->get())[nPos].isSigned()); + (_rInsertRow->get())[nPos].setSigned((_rOriginalRow->get())[nPos].isSigned()); setParameter(i++,xParameter,(_rInsertRow->get())[nPos],aIter->second.nType,aIter->second.nScale); } } @@ -713,7 +713,7 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO { if ( i_sTableName.isEmpty() || aIter->second.sTableName == i_sTableName ) { - setParameter(i++,xParameter,(_rOrginalRow->get())[aIter->second.nPosition],aIter->second.nType,aIter->second.nScale); + setParameter(i++,xParameter,(_rOriginalRow->get())[aIter->second.nPosition],aIter->second.nType,aIter->second.nScale); } } if ( !_aIndexColumnPositions.empty() ) @@ -725,7 +725,7 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO aIter = m_pColumnNames->begin(); for(;aIdxColIter != aIdxColEnd;++aIdxColIter,++i,++j,++aIter) { - setParameter(i,xParameter,(_rOrginalRow->get())[*aIdxColIter],(_rOrginalRow->get())[*aIdxColIter].getTypeKind(),aIter->second.nScale); + setParameter(i,xParameter,(_rOriginalRow->get())[*aIdxColIter],(_rOriginalRow->get())[*aIdxColIter].getTypeKind(),aIter->second.nScale); } } const sal_Int32 nRowsUpdated = xPrep->executeUpdate(); diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index e4cfdaead9fa..582584893b85 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -144,7 +144,7 @@ namespace dbaccess OUStringBuffer createKeyFilter( ); bool doTryRefetch_throw() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);; void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch); - void executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const OUString& i_sSQL,const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>()); + void executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const OUString& i_sSQL,const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>()); void executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQL,const OUString& i_sTableName = OUString(),bool bRefetch = false); void executeStatement(OUStringBuffer& io_aFilter, ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& io_xAnalyzer); @@ -220,7 +220,7 @@ namespace dbaccess // ::com::sun::star::sdbcx::XDeleteRows virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ,const connectivity::OSQLTable& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XResultSetUpdate - virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 43e2313fe6ee..931bd57d88d6 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -184,7 +184,7 @@ Sequence< sal_Int32 > SAL_CALL OptimisticSet::deleteRows( const Sequence< Any >& return aRet; } -void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { SAL_INFO("dbaccess", "OptimisticSet::updateRow" ); if ( m_aJoinedKeyColumns.empty() ) @@ -209,7 +209,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow if ( m_pKeyColumnNames->find(aIter->first) != m_pKeyColumnNames->end() ) { aResultSetChanged[aIter->second.sTableName] = m_aJoinedKeyColumns.find(aIter->second.nPosition) != m_aJoinedKeyColumns.end(); - lcl_fillKeyCondition(aIter->second.sTableName,sQuotedColumnName,(_rOrginalRow->get())[aIter->second.nPosition],aKeyConditions); + lcl_fillKeyCondition(aIter->second.sTableName,sQuotedColumnName,(_rOriginalRow->get())[aIter->second.nPosition],aKeyConditions); } if((_rInsertRow->get())[aIter->second.nPosition].isModified()) { @@ -254,7 +254,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow if ( !rCondition.isEmpty() ) sSql.append(" WHERE " + rCondition.toString() ); - executeUpdate(_rInsertRow ,_rOrginalRow,sSql.makeStringAndClear(),aSqlIter->first); + executeUpdate(_rInsertRow ,_rOriginalRow,sSql.makeStringAndClear(),aSqlIter->first); } } } diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index bf4d59b87118..1b90fb90bd6e 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -64,7 +64,7 @@ namespace dbaccess // ::com::sun::star::sdbcx::XDeleteRows virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ,const connectivity::OSQLTable& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XResultSetUpdate - virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx index fa7ebd02a997..b9de978a8fd7 100644 --- a/dbaccess/source/core/api/StaticSet.cxx +++ b/dbaccess/source/core/api/StaticSet.cxx @@ -324,10 +324,10 @@ void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connect } } -void SAL_CALL OStaticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) +void SAL_CALL OStaticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) { SAL_INFO("dbaccess", "OStaticSet::updateRow" ); - OCacheSet::updateRow( _rInsertRow,_rOrginalRow,_xTable); + OCacheSet::updateRow( _rInsertRow,_rOriginalRow,_xTable); } void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx index e6d8a1af7a3c..6dd2707d3fe9 100644 --- a/dbaccess/source/core/api/StaticSet.hxx +++ b/dbaccess/source/core/api/StaticSet.hxx @@ -74,7 +74,7 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XResultSetUpdate virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx index eef512b7287d..81e484f5c0c9 100644 --- a/dbaccess/source/core/api/WrappedResultSet.cxx +++ b/dbaccess/source/core/api/WrappedResultSet.cxx @@ -118,11 +118,11 @@ void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const c (*_rInsertRow->get().begin()) = getBookmark(); } -void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) +void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { SAL_INFO("dbaccess", "WrappedResultSet::updateRow" ); sal_Int32 i = 1; - connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOrginalRow->get().begin()+1; + connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOriginalRow->get().begin()+1; connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->get().end(); for(connectivity::ORowVector< ORowSetValue > ::Vector::iterator aIter = _rInsertRow->get().begin()+1;aIter != aEnd;++aIter,++i,++aOrgIter) { diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx index 87fe14efa317..f99e9c337d59 100644 --- a/dbaccess/source/core/api/WrappedResultSet.hxx +++ b/dbaccess/source/core/api/WrappedResultSet.hxx @@ -56,7 +56,7 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ,const connectivity::OSQLTable& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XResultSetUpdate virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateRow(const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL deleteRow(const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index dc31e69558a7..f08758736f98 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -380,7 +380,7 @@ Any SAL_CALL ODefinitionContainer::getByName( const OUString& _rName ) throw(NoS return makeAny( implGetByName( _rName, sal_True ) ); } -Reference< XContent > ODefinitionContainer::implGetByName(const OUString& _rName, sal_Bool _bReadIfNeccessary) throw (NoSuchElementException) +Reference< XContent > ODefinitionContainer::implGetByName(const OUString& _rName, sal_Bool _bReadIfNecessary) throw (NoSuchElementException) { Documents::iterator aMapPos = m_aDocumentMap.find(_rName); if (aMapPos == m_aDocumentMap.end()) @@ -388,7 +388,7 @@ Reference< XContent > ODefinitionContainer::implGetByName(const OUString& _rName Reference< XContent > xProp = aMapPos->second; - if (_bReadIfNeccessary && !xProp.is()) + if (_bReadIfNecessary && !xProp.is()) { // the object has never been accessed before, so we have to read it now // (that's the expensive part) diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index 8318769f6928..b91dde778d84 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -222,7 +222,7 @@ protected: /** get the object specified by the given name. If desired, the object will be read if not already done so.<BR> @param _rName the object name - @param _bReadIfNeccessary if sal_True, the object will be created if necessary + @param _bReadIfNecessary if sal_True, the object will be created if necessary @return the property set interface of the object. Usually the return value is not NULL, but if so, then the object could not be read from the configuration @throws NoSuchElementException if there is no object with the given name. diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 5637bb2cc65c..b5b3197353ce 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -146,7 +146,7 @@ namespace dbaui /** return the element type for given container @param _xContainer The container where the element type has to be found - @return the element type coressponding to the given container + @return the element type corresponding to the given container */ ElementType getElementType(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _xContainer) const; diff --git a/dbaccess/source/ui/inc/dsitems.hxx b/dbaccess/source/ui/inc/dsitems.hxx index 8a6b19e633c3..2c54cd5f4c76 100644 --- a/dbaccess/source/ui/inc/dsitems.hxx +++ b/dbaccess/source/ui/inc/dsitems.hxx @@ -25,7 +25,7 @@ typedef sal_Int32 ItemID; // item ids for the data source administration dialog #define DSID_NAME 1 // name of a data source, SfxStringItem -#define DSID_ORIGINALNAME 2 // orginal name, internal, SfxStringItem +#define DSID_ORIGINALNAME 2 // original name, internal, SfxStringItem #define DSID_CONNECTURL 3 // connection URL, SfxStringItem #define DSID_TABLEFILTER 4 // table filter, OStringListItem #define DSID_TYPECOLLECTION 5 // collection of data source types, ODsnTypeCollection diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index c58e9cd5c8a6..e57d8bc8dafc 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -203,7 +203,7 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor m_sDataSourceName = _aDataDescriptor.getDataSource(); _aDataDescriptor[daCommandType] >>= m_nCommandType; _aDataDescriptor[daCommand] >>= m_sName; - // some additonal information + // some additional information if(_aDataDescriptor.has(daConnection)) { Reference< XConnection > xPureConn( _aDataDescriptor[daConnection], UNO_QUERY ); diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 4d8bc1737ce1..fad78e1b76d1 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -613,7 +613,7 @@ namespace OUStringBuffer aTmpStr,aFieldListStr; - sal_Bool bAsterix = sal_False; + sal_Bool bAsterisk = sal_False; int nVis = 0; OTableFields::iterator aIter = _rFieldList.begin(); OTableFields::iterator aEnd = _rFieldList.end(); @@ -623,12 +623,12 @@ namespace if ( pEntryField->IsVisible() ) { if ( pEntryField->GetField().toChar() == '*' ) - bAsterix = sal_True; + bAsterisk = sal_True; ++nVis; } } if(nVis == 1) - bAsterix = sal_False; + bAsterisk = sal_False; try { @@ -651,7 +651,7 @@ namespace const OUString rAlias = pEntryField->GetAlias(); const OUString rFieldAlias = pEntryField->GetFieldAlias(); - aTmpStr.append(quoteTableAlias((bAlias || bAsterix),rAlias,aQuote)); + aTmpStr.append(quoteTableAlias((bAlias || bAsterisk),rAlias,aQuote)); // if we have a none numeric field, the table alias could be in the name // otherwise we are not allowed to do this (e.g. 0.1 * PRICE ) @@ -2101,14 +2101,14 @@ namespace { SqlParseError eErrorCode = eOk; sal_Bool bFirstField = sal_True; - OUString sAsterix("*"); + OUString sAsterisk("*"); OJoinTableView::OTableWindowMap::iterator aIter = _pTabList->begin(); OJoinTableView::OTableWindowMap::iterator aEnd = _pTabList->end(); for(;aIter != aEnd && eOk == eErrorCode ;++aIter) { OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second); OTableFieldDescRef aInfo = new OTableFieldDesc(); - if (pTabWin->ExistsField( sAsterix, aInfo )) + if (pTabWin->ExistsField( sAsterisk, aInfo )) { eErrorCode = _pView->InsertField(aInfo, sal_True, bFirstField); bFirstField = sal_False; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 30655c924c3a..423882beeca9 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -63,20 +63,20 @@ using namespace ::com::sun::star::accessibility; namespace { - sal_Bool isFieldNameAsterix(const OUString& _sFieldName ) + sal_Bool isFieldNameAsterisk(const OUString& _sFieldName ) { - sal_Bool bAsterix = !(!_sFieldName.isEmpty() && _sFieldName.toChar() != '*'); - if ( !bAsterix ) + sal_Bool bAsterisk = !(!_sFieldName.isEmpty() && _sFieldName.toChar() != '*'); + if ( !bAsterisk ) { OUString sName = _sFieldName; sal_Int32 nTokenCount = comphelper::string::getTokenCount(sName, '.'); if ( (nTokenCount == 2 && sName.getToken(1,'.')[0] == '*' ) || (nTokenCount == 3 && sName.getToken(2,'.')[0] == '*' ) ) { - bAsterix = sal_True; + bAsterisk = sal_True; } } - return bAsterix; + return bAsterisk; } sal_Bool lcl_SupportsCoreSQLGrammar(const Reference< XConnection>& _xConnection) { @@ -569,7 +569,7 @@ void OSelectionBrowseBox::notifyFunctionFieldChanged(const OUString& _sOldFuncti void OSelectionBrowseBox::clearEntryFunctionField(const OUString& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction,sal_uInt16 _nColumnId) { - if ( isFieldNameAsterix( _sFieldName ) && (!_pEntry->isNoneFunction() || _pEntry->IsGroupBy()) ) + if ( isFieldNameAsterisk( _sFieldName ) && (!_pEntry->isNoneFunction() || _pEntry->IsGroupBy()) ) { OUString sFunctionName; GetFunctionName(SQL_TOKEN_COUNT,sFunctionName); @@ -736,7 +736,7 @@ sal_Bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRe // we got a valid select column // find what type of column has be inserted ::connectivity::OSQLParseNode* pSelection = pParseNode->getChild(2); - if ( SQL_ISRULE(pSelection,selection) ) // we found the asterix + if ( SQL_ISRULE(pSelection,selection) ) // we found the asterisk { _pEntry->SetField(_sFieldName); clearEntryFunctionField(_sFieldName,_pEntry,_bListAction,_pEntry->GetColumnId()); @@ -1395,7 +1395,7 @@ sal_Int8 OSelectionBrowseBox::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) { if ( IsEditing() ) { - // allow the asterix again + // allow the asterisk again m_bDisableErrorBox = sal_True; SaveModified(); m_bDisableErrorBox = sal_False; @@ -2697,10 +2697,10 @@ void OSelectionBrowseBox::setFunctionCell(OTableFieldDescRef& _pEntry) // Aggregate functions in general only available with Core SQL if ( lcl_SupportsCoreSQLGrammar(xConnection) ) { - // if we have an asterix, no other function than count is allowed + // if we have an asterisk, no other function than count is allowed m_pFunctionCell->Clear(); m_pFunctionCell->InsertEntry(m_aFunctionStrings.getToken(0, ';')); - if ( isFieldNameAsterix(_pEntry->GetField()) ) + if ( isFieldNameAsterisk(_pEntry->GetField()) ) m_pFunctionCell->InsertEntry(m_aFunctionStrings.getToken(2, ';')); // 2 -> COUNT else { @@ -2726,7 +2726,7 @@ void OSelectionBrowseBox::setFunctionCell(OTableFieldDescRef& _pEntry) else { // only COUNT(*) and COUNT("table".*) allowed - sal_Bool bCountRemoved = !isFieldNameAsterix(_pEntry->GetField()); + sal_Bool bCountRemoved = !isFieldNameAsterisk(_pEntry->GetField()); if ( bCountRemoved ) m_pFunctionCell->RemoveEntry(1); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 4265d82c47dd..0d2ef02ec61a 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -301,7 +301,7 @@ namespace dbaui void notifyFunctionFieldChanged(const OUString& _sOldFunctionName,const OUString& _sFunctionName,sal_Bool& _bListAction,sal_uInt16 _nColumnId); /** clears the function fields of the submitted entry if it doesn't match the SQL standard and append an undo action. - E.q. AGGREGATE functions are only valid when the field name isn't an asterix + E.q. AGGREGATE functions are only valid when the field name isn't an asterisk @param _sFieldName The field name. @param _pEntry diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 5da7356a41f8..9c587855124c 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -199,7 +199,7 @@ void OTableWindowListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPi OJoinTableView* pCont = m_pTabWin->getTableView(); if (!pCont->getDesignView()->getController().isReadOnly() && pCont->getDesignView()->getController().isConnected()) { - // asterix was not allowed to be copied to selection browsebox + // asterisk was not allowed to be copied to selection browsebox sal_Bool bFirstNotAllowed = FirstSelected() == First() && m_pTabWin->GetData()->IsShowAll(); EndSelection(); // create a description of the source diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 03e5743ee1b0..a664c5e1ce7e 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -188,7 +188,7 @@ bool MigrationImpl::initializeMigration() if (!checkMigrationCompleted()) { readAvailableMigrations(m_vMigrationsAvailable); - sal_Int32 nIndex = findPreferedMigrationProcess(m_vMigrationsAvailable); + sal_Int32 nIndex = findPreferredMigrationProcess(m_vMigrationsAvailable); // m_aInfo is now set to the preferred migration source if ( nIndex >= 0 ) { if (alreadyMigrated()) @@ -607,7 +607,7 @@ install_info MigrationImpl::findInstallation(const strings_v& rVersions) return aInfo; } -sal_Int32 MigrationImpl::findPreferedMigrationProcess(const migrations_available& rAvailableMigrations) +sal_Int32 MigrationImpl::findPreferredMigrationProcess(const migrations_available& rAvailableMigrations) { sal_Int32 nIndex( -1 ); sal_Int32 i( 0 ); diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index a45c6a0dd858..2f74d0420011 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.hxx @@ -194,7 +194,7 @@ private: bool readAvailableMigrations(migrations_available&); bool alreadyMigrated(); migrations_vr readMigrationSteps(const OUString& rMigrationName); - sal_Int32 findPreferedMigrationProcess(const migrations_available&); + sal_Int32 findPreferredMigrationProcess(const migrations_available&); #if defined UNX && ! defined MACOSX OUString preXDGConfigDir(const OUString& rConfigDir); #endif diff --git a/distro-configs/README b/distro-configs/README index a374acbb01ca..66a6e324d48a 100644 --- a/distro-configs/README +++ b/distro-configs/README @@ -28,5 +28,5 @@ Contrary to the above, in the Android case the amount of parameters you just must use is so large, that for convenience it is always easiest to use the corresponding distro-configs file. This is a bug and needs to be fixed; also configuring for Android should ideally use -sane (or the only possible) defaults and work fine wihout any +sane (or the only possible) defaults and work fine without any parameters at all. diff --git a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx index b620c3c654f8..cc3329ef29da 100644 --- a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx +++ b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx @@ -82,7 +82,7 @@ namespace drawinglayer // as can be seen from the TextSimplePortionPrimitive2D and the // TextDecoratedPortionPrimitive2D, inside of the mnInText marks - // the following primitives can occurr containing geometry data + // the following primitives can occur containing geometry data // from text decomposition: // // - PolyPolygonColorPrimitive2D diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 9eae423aa50a..0736d05c7060 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -573,7 +573,7 @@ void ImpEditView::SetAnchorMode( EVAnchorMode eMode ) void ImpEditView::CalcAnchorPoint() { - // GetHeight() and GetWidth() -1, because rectangle calculation not prefered. + // GetHeight() and GetWidth() -1, because rectangle calculation not preferred. // X: switch ( eAnchorMode ) diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index d1c879c49861..c7fca54d8c54 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -3101,7 +3101,7 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( sal_Bool bIgnoreExtraSpace ) OSL_ENSURE( pLine, "NULL-Pointer in the line iterator in CalcWidth" ); // nCurWidth = pLine->GetStartPosX(); // For Center- or Right- alignment it depends on the paper - // width, here not prefered. I general, it is best not leave it + // width, here not preferred. I general, it is best not leave it // to StartPosX, also the right indents have to be taken into // account! nCurWidth = GetXValue( rLRItem.GetTxtLeft() + nSpaceBeforeAndMinLabelWidth ); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 99b851d0fb32..d5fec025bc93 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -4327,7 +4327,7 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_Int32 nPara, } else { - // CTL/Bidi checking neccessary + // CTL/Bidi checking necessary // Don't use BIDI_STRONG, VCL must do some checks. nLayoutMode &= ~( TEXT_LAYOUT_COMPLEX_DISABLED | TEXT_LAYOUT_BIDI_STRONG ); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index f9adc4c5da1c..68cddecbea3d 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -156,7 +156,7 @@ EditPaM ImpEditEngine::ReadRTF( SvStream& rInput, EditSelection aSel ) aSel = ImpDeleteSelection( aSel ); // The SvRTF parser expects the Which-mapping passed on in the pool, not - // dependant on a secondary. + // dependent on a secondary. SfxItemPool* pPool = &aEditDoc.GetItemPool(); while (pPool->GetSecondaryPool() && !pPool->GetName().startsWith("EditEngineItemPool")) { diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 2a315878b14f..a204bfc32a36 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -440,7 +440,7 @@ void TextConvWrapper::ChangeText( const OUString &rNewText, const uno::Sequence< sal_Int32 > *pOffsets, ESelection *pESelection ) { - //!! code is a modifed copy of SwHHCWrapper::ChangeText from sw !! + //!! code is a modified copy of SwHHCWrapper::ChangeText from sw !! DBG_ASSERT( !rNewText.isEmpty(), "unexpected empty string" ); if (rNewText.isEmpty()) diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index bbd2a5696b35..b63345618b94 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -730,7 +730,7 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame:: bResult = sal_True; // TODO/LATER: The following action should be done only if the window is not hidden - // otherwise the activation must fail, unfortunatelly currently it is not possible + // otherwise the activation must fail, unfortunately currently it is not possible // to detect whether the window is hidden using UNO API m_xOwnWindow->setFocus(); } diff --git a/embeddedobj/test/Container1/NativeView.java b/embeddedobj/test/Container1/NativeView.java index fc4371d5ef6e..fbb2b8f6a9f5 100644 --- a/embeddedobj/test/Container1/NativeView.java +++ b/embeddedobj/test/Container1/NativeView.java @@ -41,7 +41,7 @@ public class NativeView extends java.awt.Canvas /** * ctor - * Does nothing realy. + * Does nothing really. * We can use our JNI mechanism for an already visible * canvas only. So we overload the method for showing ( "setVisible()" ) * and make our intialization there. BUt we try to show an empty clean @@ -57,8 +57,8 @@ public class NativeView extends java.awt.Canvas // ____________________ /** - * Overload this method to make neccessary initializations here. - * ( e.g. get the window handle and neccessary system information ) + * Overload this method to make necessary initializations here. + * ( e.g. get the window handle and necessary system information ) * * Why here? * Because the handle seams to be available for already visible windows @@ -76,7 +76,7 @@ public class NativeView extends java.awt.Canvas /** * to guarantee right resize handling inside a swing container * ( e.g. JSplitPane ) we must provide some information about our - * prefered/minimum and maximum size. + * preferred/minimum and maximum size. */ public Dimension getPreferredSize() { @@ -97,7 +97,7 @@ public class NativeView extends java.awt.Canvas /** * overload paint routine to show provide against - * repaint errors if no office view is realy plugged + * repaint errors if no office view is really plugged * into this canvas. * If handle is present - we shouldn't paint anything further. * May the remote window is already plugged. In such case we @@ -146,7 +146,7 @@ public class NativeView extends java.awt.Canvas // ____________________ /** - * for using of the JNI methods it's neccessary to load + * for using of the JNI methods it's necessary to load * system library which exports it. */ static diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 2a443ac77e95..f09a0b5cf7a4 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -1106,7 +1106,7 @@ HRESULT DocumentHolder::SetExtent( const SIZEL *pSize ) // TODO/LATER: in future UNO API should be used for the conversion, currently there is no if ( aMapMode == embed::EmbedMapUnits::TWIP ) { - // convertion from ONE_100TH_MM + // conversion from ONE_100TH_MM aNewSize.Width = aNewSize.Width * 144 / 254; aNewSize.Height = aNewSize.Height * 144 / 254; } @@ -1140,7 +1140,7 @@ HRESULT DocumentHolder::GetExtent( SIZEL *pSize ) // TODO/LATER: in future UNO API should be used for the conversion, currently there is no if ( aMapMode == embed::EmbedMapUnits::TWIP ) { - // convertion to ONE_100TH_MM + // conversion to ONE_100TH_MM aDocSize.Width = aDocSize.Width * 254 / 144; aDocSize.Height = aDocSize.Height * 254 / 144; } diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index 918899613194..1307d33bc4ab 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -1244,7 +1244,7 @@ size_t UnoConversionUtilities<T>::getOleElementSize( VARTYPE type) // param rSeq - an Any that has to contain a Sequence // param dim - the dimension for which the number of elements is being determined, // must be one. -// param seqElementCounts - countains the maximum number of elements for each +// param seqElementCounts - contains the maximum number of elements for each // dimension. Index 0 contains the number of dimension one. // After return the Sequence contains the maximum number of // elements for each dimension. diff --git a/extensions/test/ole/StarBasic_OleClient/oleclient.bas b/extensions/test/ole/StarBasic_OleClient/oleclient.bas index 23a8929c81a4..ed0b322a8eef 100644 --- a/extensions/test/ole/StarBasic_OleClient/oleclient.bas +++ b/extensions/test/ole/StarBasic_OleClient/oleclient.bas @@ -493,7 +493,7 @@ If outSCode.Value <> scode_paramNotFound.Value Or inLong2 <> outLong2 _ Exit Function End If -'mixed positional and named args with ommitted args as out -args +'mixed positional and named args with omitted args as out -args inLong = 1 inLong2 = 2 inLong3 = 3 diff --git a/external/libmariadb/mariadb-trunk-101.patch b/external/libmariadb/mariadb-trunk-101.patch index 228bddc04776..2216d213d261 100644 --- a/external/libmariadb/mariadb-trunk-101.patch +++ b/external/libmariadb/mariadb-trunk-101.patch @@ -21601,7 +21601,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmariadb/my_auth. + to send data to the server. + + It transparently wraps the data into a change user or authentication -+ handshake packet, if neccessary. ++ handshake packet, if necessary. +*/ + +static int client_mpvio_write_packet(struct st_plugin_vio *mpv, @@ -31835,7 +31835,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmariadb/strmake. + return dst+length; +} + -+#define strmake strmake_overlapp /* Use orginal for overlapping str */ ++#define strmake strmake_overlapp /* Use original for overlapping str */ +#endif + +char *strmake(register char *dst, register const char *src, size_t length) @@ -36192,7 +36192,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmysql/dbug.c mar - * Given name of a new file, opens the file - * and sets the profiler output stream to the new file. - * -- * It is currently unclear whether the prefered behavior is +- * It is currently unclear whether the preferred behavior is - * to truncate any existing file, or simply append to it. - * The latter behavior would be desirable for collecting - * accumulated runtime history over a number of separate @@ -44246,7 +44246,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmysql/my_auth.c - to send data to the server. - - It transparently wraps the data into a change user or authentication -- handshake packet, if neccessary. +- handshake packet, if necessary. -*/ - -static int client_mpvio_write_packet(struct st_plugin_vio *mpv, @@ -55414,7 +55414,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/libmysql/strmake.c - return dst+length; -} - --#define strmake strmake_overlapp /* Use orginal for overlapping str */ +-#define strmake strmake_overlapp /* Use original for overlapping str */ -#endif - -char *strmake(register char *dst, register const char *src, size_t length) @@ -93352,7 +93352,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/plugins/sqlite/sqli +** This file implements the default page cache implementation (the +** sqlite3_pcache interface). It also contains part of the implementation +** of the SQLITE_CONFIG_PAGECACHE and sqlite3_release_memory() features. -+** If the default page cache implementation is overriden, then neither of ++** If the default page cache implementation is overridden, then neither of +** these two features are available. +*/ + @@ -171005,7 +171005,7 @@ diff -x .bzr -u --recursive -N mariadb-native-client.release/plugins/sqlite/sqli +/* +** Another built-in collating sequence: NOCASE. +** -+** This collating sequence is intended to be used for "case independant ++** This collating sequence is intended to be used for "case independent +** comparison". SQLite's knowledge of upper and lower case equivalents +** extends only to the 26 characters used in the English language. +** diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index de888aaf0aab..1d33f5f0e9e4 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -90,7 +90,7 @@ void BaseContainer::impl_loadOnDemand() ::osl::ResettableMutexGuard aLock(m_aLock); // A generic container needs all items of a set of our cache! - // Of course it can block for a while, till the cache is realy filled. + // Of course it can block for a while, till the cache is really filled. // Note: dont load all sets supported by the cache here! FilterCache::EFillState eRequiredState = FilterCache::E_CONTAINS_NOTHING; @@ -423,7 +423,7 @@ sal_Bool SAL_CALL BaseContainer::hasElements() css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByQuery(const OUString& /* sQuery */ ) throw (css::uno::RuntimeException) { - OSL_FAIL("not pure virtual ... but not realy implemented .-)"); + OSL_FAIL("not pure virtual ... but not really implemented .-)"); ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, css::uno::Sequence< OUString >()); return css::uno::Reference< css::container::XEnumeration >(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY); diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index 743bf9db1b88..b855f4f86964 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -168,7 +168,7 @@ class BaseContainer : public BaseLock //--------------------------------------- /** @short check if the underlying configuration data was already loaded - and do it if neccessary automaticly. + and do it if necessary automaticly. */ void impl_loadOnDemand(); @@ -271,7 +271,7 @@ class BaseContainer : public BaseLock //--------------------------------------- // XContainerQuery - // must be implemented realy by derived class ... + // must be implemented really by derived class ... // We implement return of an empty result here only! // But we show an assertion :-) virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index 0a61c3e742ef..084ed4dbf609 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -73,7 +73,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea #ifdef _FILTER_CONFIG_MIGRATION_Q_ /* -> TODO - HACK - check if the given handler name realy exist ... + check if the given handler name really exist ... Because our old implementation worked with an internal type name instead of a handler name. For a small migration time we must simulate this old feature :-( */ diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 351517b50b29..17a99c13b278 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -183,7 +183,7 @@ void FilterCache::load(EFillState eRequired, #if OSL_DEBUG_LEVEL > 1 if (!bByThread && ((eRequired & E_CONTAINS_ALL) == E_CONTAINS_ALL)) { - SAL_WARN( "filter.config", "Who disturb our \"fill cache on demand\" feature and force loading of ALL data during office startup? Please optimize your code, so a full filled filter cache is not realy needed here!"); + SAL_WARN( "filter.config", "Who disturb our \"fill cache on demand\" feature and force loading of ALL data during office startup? Please optimize your code, so a full filled filter cache is not really needed here!"); } #endif @@ -1741,7 +1741,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: aItem[PROPNAME_USERDATA ] = xItem->getByName(PROPNAME_USERDATA ); aItem[PROPNAME_TEMPLATENAME] = xItem->getByName(PROPNAME_TEMPLATENAME); //TODO remove it if moving of filter uinames to type uinames -// will be finished realy +// will be finished really #ifdef AS_ENABLE_FILTER_UINAMES impl_readPatchUINames(xItem, aItem); #endif // AS_ENABLE_FILTER_UINAMES @@ -1921,7 +1921,7 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName } //TODO remove it if moving of filter uinames to type uinames -// will be finished realy +// will be finished really #ifdef AS_ENABLE_FILTER_UINAMES css::uno::Reference< css::container::XNameReplace > xUIName; xItem->getByName(PROPNAME_UINAME) >>= xUIName; @@ -1944,7 +1944,7 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName } /*----------------------------------------------- - static! => no locks neccessary + static! => no locks necessary -----------------------------------------------*/ css::uno::Sequence< OUString > FilterCache::impl_convertFlagField2FlagNames(sal_Int32 nFlags) { @@ -1979,7 +1979,7 @@ css::uno::Sequence< OUString > FilterCache::impl_convertFlagField2FlagNames(sal_ } /*----------------------------------------------- - static! => no locks neccessary + static! => no locks necessary -----------------------------------------------*/ sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< OUString >& lNames) { diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index 591b24331ef0..b5550c380f2a 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -340,7 +340,7 @@ class FilterCache : public BaseLock "load-on-demand-thread", which tries to optimize our startup performance and start this load() only in case the office startup was already finished! - @throw An exception if the cache could not be filled realy + @throw An exception if the cache could not be filled really or seems to be invalid afterwards. But there is no reaction at all if this method does nothing inside, because the cache is already full filled! @@ -461,7 +461,7 @@ class FilterCache : public BaseLock @attention This method exists to supports some UNO container interfaces only. (e.g. XNameAccess.hasByName()). But inside multithreaded environments there is no guarantee, that this item still exists, if - its realy requested e.g. by calling getItem()! + its really requested e.g. by calling getItem()! Be aware of some NoSuchElementExistExceptions ... @param eType @@ -540,7 +540,7 @@ class FilterCache : public BaseLock cache item reference. @descr Such properties can e.g. finalized or mandatory. - They are not persistent and not realy part of e.g. a + They are not persistent and not really part of e.g. a filter not. But they are attributes of a configuration entry and can influence our container interface. @@ -669,7 +669,7 @@ class FilterCache : public BaseLock see EConfigProvider for further information ... @attention If a configuration access was opened successfully - all neccessary listener connections will be established + all necessary listener connections will be established too. So this cache will be informed about outside updates. */ css::uno::Reference< css::uno::XInterface > impl_openConfig(EConfigProvider eProvide) @@ -765,7 +765,7 @@ class FilterCache : public BaseLock @descr Because detect services, frame loader or content handler are not listed inside the xml configuration as separated items (they are properties of any type entry!), this method update - the internal lists of such items. Thats neccessary to have + the internal lists of such items. Thats necessary to have it accessible for our container interfaces of detect, frame loader and content handler services. @@ -915,7 +915,7 @@ class FilterCache : public BaseLock //--------------------------------------- - /** @short specify, which save operation is neccessary for the specified item. + /** @short specify, which save operation is necessary for the specified item. @desrc If an item of this cache will be added/removed or modified it will be changed inside memory only first. But we save its name inside a special diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index de9872b74402..e1dba62e19a3 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -89,7 +89,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan #ifdef _FILTER_CONFIG_MIGRATION_Q_ /* -> TODO - HACK - check if the given filter name realy exist ... + check if the given filter name really exist ... Because our old implementation worked with an internal type name instead of a filter name. For a small migration time we must simulate this old feature :-( */ @@ -161,7 +161,7 @@ css::uno::Sequence< OUString > SAL_CALL FilterFactory::getAvailableServiceNames( throw(css::uno::RuntimeException) { /* Attention: Instead of getElementNames() this method have to return only filter names, - which can be created as UNO Services realy. Thats why we search for filters, + which can be created as UNO Services really. Thats why we search for filters, which dont have a valid value for the property "FilterService". Of course we cant check for corrupted service names here. We can check for empty strings only ... @@ -555,7 +555,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const OUString& xUISortConfig->getByName(sModule) >>= xModule; if (xModule.is()) // only to be on the safe side of life if the exception was not thrown .-) { - // Note: convertion of the returned Any to OUStringList throws + // Note: conversion of the returned Any to OUStringList throws // an IllegalArgumentException if the type does not match ... // but it resets the OUStringList to a length of 0 if the Any is empty! OUStringList lSortedFilters(xModule->getByName(PROPNAME_SORTEDFILTERLIST)); diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index 63f3a92a02dc..e937aed9d340 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -70,7 +70,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI #ifdef _FILTER_CONFIG_MIGRATION_Q_ /* -> TODO - HACK - check if the given loader name realy exist ... + check if the given loader name really exist ... Because our old implementation worked with an internal type name instead of a loader name. For a small migration time we must simulate this old feature :-( */ diff --git a/filter/source/config/cache/lateinitlistener.cxx b/filter/source/config/cache/lateinitlistener.cxx index 5f6dbf7aae92..141cfffceacc 100644 --- a/filter/source/config/cache/lateinitlistener.cxx +++ b/filter/source/config/cache/lateinitlistener.cxx @@ -107,7 +107,7 @@ void SAL_CALL LateInitListener::disposing(const css::lang::EventObject& /* aEven // Normaly it should never be called. Because we cancel our listener connection // if we got the event about finished open of the first office document. // But if this method was reached, it indicates an office, which was started - // (might as remote script container for an external API client) but not realy used. + // (might as remote script container for an external API client) but not really used. // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index 23db8ee5a9ef..e1847c63df10 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -42,7 +42,7 @@ namespace filter{ </ul> uses this schema. - @attention This class is not threadsafe implemented. Because its not neccessary. + @attention This class is not threadsafe implemented. Because its not necessary. But you have to make shure, that ist not used as such :-) */ class QueryTokenizer : public ::boost::unordered_map< OUString , diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index dadf07e78f1e..b10b0ebc7fd5 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -677,7 +677,7 @@ bool TypeDetection::impl_getPreselectionForType( INetURLObject::DECODE_WITH_CHARSET); sExtension = sExtension.toAsciiLowerCase(); - // otherwise we must know, if it matches to the given URL realy. + // otherwise we must know, if it matches to the given URL really. // especialy if it matches by its extension or pattern registration. OUStringList lExtensions(aType[PROPNAME_EXTENSIONS]); OUStringList lURLPattern(aType[PROPNAME_URLPATTERN]); @@ -1009,7 +1009,7 @@ OUString TypeDetection::impl_askDetectService(const OUString& sDet { // Attention! If e.g. an office module was not installed sometimes we // find a registered detect service, which is referred inside the - // configuration ... but not realy installed. On the other side we use + // configuration ... but not really installed. On the other side we use // third party components here, which can make trouble anyway. So we // should handle errors during creation of such services more // gracefully .-) @@ -1108,7 +1108,7 @@ OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescript if (aRequest.isAbort()) return OUString(); - // "OK" pressed => verify the selected filter, get it's coressponding + // "OK" pressed => verify the selected filter, get it's corresponding // 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 shure, that the selected filter is used diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index e9f8113c111e..6875a175e7a4 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -89,7 +89,7 @@ private: The specified MediaDescriptor will be patched, so it contain the right values everytime. Using of any deep detection service can be enabled/disabled. And last but not least: If the results - wont be realy clear (because a flat detected type has no deep + wont be really clear (because a flat detected type has no deep detection service), a "sugested" 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" @@ -188,7 +188,7 @@ private: //--------------------------------------- /** @short check if an input stream is already part of the - given MediaDesciptor and creates a new one if neccessary. + given MediaDesciptor and creates a new one if necessary. @attention This method does further something special! <ul> diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge b/filter/source/config/tools/merge/pyAltFCFGMerge index d03111d39d1d..d33d634b422f 100755 --- a/filter/source/config/tools/merge/pyAltFCFGMerge +++ b/filter/source/config/tools/merge/pyAltFCFGMerge @@ -312,7 +312,7 @@ def printHelp(): printOut("parameters:" ) printOut("\tcfg=<file name>" ) printOut("\t\tmust point to a system file, which contains" ) - printOut("\t\tall neccessary configuration data for the merge process.") + printOut("\t\tall necessary configuration data for the merge process.") printOut("\tFurther cou can specify every parameter allowed in the" ) printOut("\tconfig file as command line parameter too, to overwrite" ) printOut("\tthe value from the file." ) diff --git a/filter/source/config/tools/split/Splitter.java b/filter/source/config/tools/split/Splitter.java index 018ced080a7d..b4d40e257b74 100644 --- a/filter/source/config/tools/split/Splitter.java +++ b/filter/source/config/tools/split/Splitter.java @@ -72,7 +72,7 @@ public class Splitter createDirectoryStructures(); // use some statistic values to check if all cache items - // will be transformed realy. + // will be transformed really. int nTypes = m_aDataSet.m_aCache.getItemCount(Cache.E_TYPE ); int nFilters = m_aDataSet.m_aCache.getItemCount(Cache.E_FILTER ); int nDetectServices = m_aDataSet.m_aCache.getItemCount(Cache.E_DETECTSERVICE ); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index c2f7a2f71054..42c4b4ef4a69 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4934,7 +4934,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, case 0x0394: // And this is really just a guess, but a mere presence of this // flag makes a horizontal rule be as wide as the page (unless - // overriden by something), so it probably matches o:hr from .docx. + // overridden by something), so it probably matches o:hr from .docx. pImpRec->isHorizontalRule = true; break; } diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 8422d62fe79f..9521f3bb431d 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -459,7 +459,7 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& Macro #endif } -// Treat the args as possible inouts ( convertion at bottom of method ) +// Treat the args as possible inouts ( conversion at bottom of method ) sal_Bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& aRet, const uno::Any& /*aCaller*/) { #ifdef DISABLE_SCRIPTING diff --git a/filter/source/xslt/import/wordml/wordml2ooo_field.xsl b/filter/source/xslt/import/wordml/wordml2ooo_field.xsl index 23f75d98ff7d..0fa29362c6f5 100644 --- a/filter/source/xslt/import/wordml/wordml2ooo_field.xsl +++ b/filter/source/xslt/import/wordml/wordml2ooo_field.xsl @@ -1318,7 +1318,7 @@ </xsl:choose> </xsl:template --> <!-- ========= the following code is to generate the date styles for date/time fields ============ --> - <!--the default date styel content --> + <!--the default date style content --> <xsl:template name="default_date_style_content"> <number:year number:style="long"> </number:year> @@ -1340,7 +1340,7 @@ <number:am-pm> </number:am-pm> </xsl:template> - <!--the default date styel --> + <!--the default date style --> <xsl:template name="default_date_style"> <number:date-style style:name="NDF1"> <xsl:call-template name="default_date_style_content"/> diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx index 5dd528f62ca0..01dadf9d7808 100644 --- a/forms/source/component/propertybaghelper.cxx +++ b/forms/source/component/propertybaghelper.cxx @@ -112,7 +112,7 @@ namespace frm ::comphelper::OPropertyArrayAggregationHelper& rPropInfo( impl_ts_getArrayHelper() ); // check the preferred handle - sal_Int32 nHandle = lcl_getPropertyInfos().getPreferedPropertyId( _rPropertyName ); + sal_Int32 nHandle = lcl_getPropertyInfos().getPreferredPropertyId( _rPropertyName ); if ( ( nHandle != -1 ) && rPropInfo.fillPropertyMembersByHandle( NULL, NULL, nHandle ) ) nHandle = -1; diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index 93e62e0d7714..2584e2c54a17 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -102,7 +102,7 @@ class ConcreteInfoService : public ::comphelper::IPropertyInfoService public: virtual ~ConcreteInfoService() {} - virtual sal_Int32 getPreferedPropertyId(const OUString& _rName); + virtual sal_Int32 getPreferredPropertyId(const OUString& _rName); }; //------------------------------------------------------------------------------ diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx index 476c16425c5f..cd5be3dc23e4 100644 --- a/forms/source/misc/property.cxx +++ b/forms/source/misc/property.cxx @@ -58,7 +58,7 @@ sal_Int32 PropertyInfoService::getPropertyId(const OUString& _rName) } //------------------------------------------------------------------ -sal_Int32 ConcreteInfoService::getPreferedPropertyId(const OUString& _rName) +sal_Int32 ConcreteInfoService::getPreferredPropertyId(const OUString& _rName) { return PropertyInfoService::getPropertyId(_rName); } diff --git a/forms/source/xforms/collection.hxx b/forms/source/xforms/collection.hxx index 52425ab797b5..c923c2bdf873 100644 --- a/forms/source/xforms/collection.hxx +++ b/forms/source/xforms/collection.hxx @@ -125,7 +125,7 @@ public: } - // the following method may be overriden by sub-classes for + // the following method may be overridden by sub-classes for // customized behaviour /// called before insertion to determine whether item is valid @@ -134,7 +134,7 @@ public: protected: - // the following methods may be overriden by sub-classes for + // the following methods may be overridden by sub-classes for // customized behaviour /// called after item has been inserted into the collection diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index ae1655eb9365..c66153f6460e 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1075,7 +1075,7 @@ bool FormulaMissingContext::AddMissing( FormulaTokenArray *pNewArr, const Missin case ocOffset: // FIXME: rather tough. - // if arg 3 (height) ommitted, export arg1 (rows) + // if arg 3 (height) omitted, export arg1 (rows) break; default: break; diff --git a/fpicker/source/win32/filepicker/helppopupwindow.hxx b/fpicker/source/win32/filepicker/helppopupwindow.hxx index de52b916245f..ff476cb98c20 100644 --- a/fpicker/source/win32/filepicker/helppopupwindow.hxx +++ b/fpicker/source/win32/filepicker/helppopupwindow.hxx @@ -78,9 +78,9 @@ public: /* Shows the window with the text that was last set. - The posistion is the prefered position. The window + The posistion is the preferred position. The window may itself show at a slightly different position - if it fits not at the prefered position. + if it fits not at the preferred position. */ void SAL_CALL show( sal_Int32 x, sal_Int32 y ); diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx index 500387aecb7b..ceb3d74b430d 100644 --- a/framework/inc/classes/checkediterator.hxx +++ b/framework/inc/classes/checkediterator.hxx @@ -30,7 +30,7 @@ namespace framework{ @short implement a iterator which support 2 end states! @descr For our search methods we need a "walking" iterator object with special functionality! We must check for 3 different states of an iterator - normal position, exact end, after end. - It's neccessary to detect if we have not found a entry and must return our default or + It's necessary to detect if we have not found a entry and must return our default or default already returned and we must break loop! see using in class FilterCache too for further information! diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx index 3c5e14d5ba93..52a3dcd7b365 100644 --- a/framework/inc/classes/filtercache.hxx +++ b/framework/inc/classes/filtercache.hxx @@ -53,7 +53,7 @@ namespace framework{ /*-************************************************************************************************************//** @short cache for all filter and type information @descr Frameloader - and filterfactory need some information about our current registered filters and types. - For better performance its neccessary to cache all needed values. + For better performance its necessary to cache all needed values. @implements - @base ThreadHelpBase diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx index 7559f3c09478..82336b441f98 100644 --- a/framework/inc/classes/filtercachedata.hxx +++ b/framework/inc/classes/filtercachedata.hxx @@ -355,7 +355,7 @@ class SetNodeHash : public ::boost::unordered_map< OUString , //------------------------------------------------------------------------------------------------------------- public: //--------------------------------------------------------------------------------------------------------- - // The only way to free ALL memory realy! + // The only way to free ALL memory really! //--------------------------------------------------------------------------------------------------------- inline void free() { @@ -664,7 +664,7 @@ class FilterCFGAccess : public ::utl::ConfigItem // member //------------------------------------------------------------------------------------------------------------- private: - EFilterPackage m_ePackage ; // ... not realy used yet! should split configuration in STANDARD and ADDITIONAL filter + EFilterPackage m_ePackage ; // ... not really used yet! should split configuration in STANDARD and ADDITIONAL filter sal_Int32 m_nVersion ; // file format version of configuration! (necessary for "xml2xcd" transformation!) sal_Int32 m_nKeyCountTypes ; // follow key counts present count of configuration properties for types/filters ... and depends from m_nVersion - must be set right! sal_Int32 m_nKeyCountFilters ; diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index a2e356b57e08..c824832ae12f 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -93,7 +93,7 @@ typedef BaseHash< ProtocolHandler > HandlerHash; create new objects without opening configuration twice and free memory automaticly if last object will gone. - @attention We implement a singleton concept - so we doesn't need any mutex member here. + @attention We implement a singleton concept - so we don't need any mutex member here. Because to safe access on static member we must use a static global lock here too. @@ -136,7 +136,7 @@ class FWI_DLLPUBLIC HandlerCache We set a data container pointer for filling or reading ... this class use it temp. After successfully calling of read(), we can use filled container directly or merge it with an existing one. After successfully calling of write() all values of given data container are flushed to our configuration - - but current implementation doesn't support writeing realy. + but current implementation doesn't support writing really. @base ::utl::ConfigItem base mechanism for configuration access diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index ef116c98ad9c..ba13b052caa5 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -267,7 +267,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali directly used as css::frame::DispatchResultState value. @param aResult - not used yet realy ... + not used yet really ... */ void implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, sal_Int16 nState , @@ -275,7 +275,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali //--------------------------------------- /** @short try to find the right target frame where this close request - must be realy done. + must be really done. @descr The problem behind: closing some resources depends sometimes from the context where its dispatched. Sometimes the start frame of the dispatch diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index c6e2395530fa..e5bbeb8d01fb 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -164,7 +164,7 @@ class StartModuleDispatcher : // baseclasses ... order is necessary for right in directly used as css::frame::DispatchResultState value. @param aResult - not used yet realy ... + not used yet really ... */ void implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener, sal_Int16 nState , diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx index 2347942d7865..59b47eaccaa3 100644 --- a/framework/inc/helper/ocomponentaccess.hxx +++ b/framework/inc/helper/ocomponentaccess.hxx @@ -172,7 +172,7 @@ class OComponentAccess : private ThreadHelpBase , // M /*-****************************************************************************************************//** @short recursive method (!) to collect all components of all frames from the subtree of given node - @descr This is neccessary to create the enumeration. + @descr This is necessary to create the enumeration. @seealso method createEnumeration diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index 68890d9c1827..a9bd84d1824e 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -137,7 +137,7 @@ class TitleBarUpdate : // baseclasses (order necessary for right initialization! //____________________________ /** @short set a new icon and title on the title bar of our connected frame window. - @descr It does not check if an update is realy needed. That has to be done outside. + @descr It does not check if an update is really needed. That has to be done outside. It retrieves all needed information and update the title bar - nothing less - nothing more. */ diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx index ed0fa1176aef..69da3a330520 100644 --- a/framework/inc/interaction/quietinteraction.hxx +++ b/framework/inc/interaction/quietinteraction.hxx @@ -34,7 +34,7 @@ namespace framework{ /** @short handle interactions non visible - @descr Sometimes it's neccessary to use a non visible interaction handler. + @descr Sometimes it's necessary to use a non visible interaction handler. He can't do anything, which a visible one can handle. But it can be used to intercept problems e.g. during loading of documents. @@ -63,7 +63,7 @@ class QuietInteraction : private ThreadHelpBase @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 realy used. + decide which of two ambigous 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. @@ -83,7 +83,7 @@ class QuietInteraction : private ThreadHelpBase @short ctor to guarantee right initialized instances of this class @descr - - @threadsafe not neccessary + @threadsafe not necessary */ QuietInteraction(); diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index 2a713c60d333..b50b90fce508 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -63,7 +63,7 @@ class FWI_DLLPUBLIC ConfigAccess : public ThreadHelpBase /** reference to the uno service manager - It's neccessary to instanciate own needed services. + It's necessary to instanciate own needed services. */ css::uno::Reference< css::uno::XComponentContext > m_xContext; diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx index c3cac37ad8f3..4135f9f4c7df 100644 --- a/framework/inc/jobs/job.hxx +++ b/framework/inc/jobs/job.hxx @@ -49,7 +49,7 @@ namespace framework{ /** @short it represent a job; execute it and control it's lifetime - @descr This implemetation can be used to wrapp jobs, execute it + @descr This implementation can be used to wrapp jobs, execute it synchronously or asynchronous, control it's lifetime and differe between jobs with and without configuration. */ @@ -82,7 +82,7 @@ class Job : private ThreadHelpBase private: /** - hold all neccessary information about this job. + hold all necessary information about this job. It can be used for both modes: with and without configuration. */ JobData m_aJobCfg; @@ -108,7 +108,7 @@ class Job : private ThreadHelpBase We use it too, to listen for closing events of this resource. Please note: If m_xFrame is set - m_xModel should be NULL. - Only one environment can be supported realy. + Only one environment can be supported really. */ css::uno::Reference< css::frame::XFrame > m_xFrame; @@ -118,13 +118,13 @@ class Job : private ThreadHelpBase We use it too, to listen for closing events of this resource. Please note: If m_xModel is set - m_xFrame should be NULL. - Only one environment can be supported realy. + Only one environment can be supported really. */ css::uno::Reference< css::frame::XModel > m_xModel; /** We are registered at this instance to listen for office shutdown events. - It's neccessary supress it (if possible) or to react in the right way. + It's necessary supress it (if possible) or to react in the right way. */ css::uno::Reference< css::frame::XDesktop2 > m_xDesktop; @@ -145,7 +145,7 @@ class Job : private ThreadHelpBase /** Holds the state, if we are listen for desktop/frame or model closing events or not. - The used references are not realy enough to detect a valid listener connection. + The used references are not really enough to detect a valid listener connection. Thats why we use this additional information here too. */ sal_Bool m_bListenOnDesktop; diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index a2df2b108554..6701311447a8 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -39,7 +39,7 @@ namespace framework{ /** - @short holds all neccessary information about a job and + @short holds all necessary information about a job and handle it's configuration (if any exist!) @descr It can be used rom different use cases as a container (or proxy) for all config data of a registered job. @@ -125,7 +125,7 @@ class JobData : private ThreadHelpBase occurs. E.g. "onDocumentOpened" in case "OnNew" or "OnLoad" was notified to the JobExecutor instance. And normaly the original event is transported as parameter set to the executed job. But then such job cant differ between e.g. "OnNew" and "onDocumentOpened". - That's why we must know, for which type of event the job was realy triggered .-) + That's why we must know, for which type of event the job was really triggered .-) The information "sDocEvent" from this struct must be set on the member JobData::m_sEvent from outside user of such Jobdata structure. @@ -160,7 +160,7 @@ class JobData : private ThreadHelpBase - as a job without any configuration First mode is triggered by an alias, which points to the configuration entries. Second mode is specified by an uno service - or implementation name. Then we does the same things (use the same interfaces) + or implementation name. Then we do the same things (use the same interfaces) but don't handle any configuration data. The effect: This mode can be detected by this member. */ @@ -177,7 +177,7 @@ class JobData : private ThreadHelpBase /** the alias name of this job. Is used as entry of configuration set for job registration, to find all - neccessary properties of it.. + necessary properties of it.. */ OUString m_sAlias; diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx index 8c54a19f72f1..4d24d4ec1a71 100644 --- a/framework/inc/jobs/jobresult.hxx +++ b/framework/inc/jobs/jobresult.hxx @@ -76,7 +76,7 @@ class JobResult : private ThreadHelpBase /** an user of us must know, which (possible) parts of - a "pure result" was realy set by an executed job. + a "pure result" was really set by an executed job. Means which other members of this class are valid. This mask can be used to find it out. */ diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index 727a9c7e69e8..068412714567 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -47,7 +47,7 @@ namespace framework{ 1) DECLARE_XSERVICEINFO => use it to declare XServiceInfo in your header 2) DEFINE_XSERVICEINFO_MULTISERVICE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) => use it to define XServiceInfo for multi service mode 3) DEFINE_XSERVICEINFO_ONEINSTANCESERVICE( CLASS, XINTERFACECAST, SERVICENAME, IMPLEMENTATIONNAME ) => use it to define XServiceInfo for one instance service mode - 4) DEFINE_INIT_SERVICE( CLASS ) => use it to implement your own impl_initService() method, which is neccessary for initializeing object by using his own reference! + 4) DEFINE_INIT_SERVICE( CLASS ) => use it to implement your own impl_initService() method, which is necessary for initializeing object by using his own reference! _________________________________________________________________________________________________________________*/ diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h index 672d03087023..fd277de4963d 100644 --- a/framework/inc/protocols.h +++ b/framework/inc/protocols.h @@ -29,7 +29,7 @@ namespace framework{ //_______________________________________________________________________ /** some protocols must be checked during loading or dispatching URLs manually - It can be neccessary to decide, if a URL represent a non visible content or + It can be necessary to decide, if a URL represent a non visible content or a real visible component. */ diff --git a/framework/inc/queries.h b/framework/inc/queries.h index 24f38d238145..2a4e09632af1 100644 --- a/framework/inc/queries.h +++ b/framework/inc/queries.h @@ -328,7 +328,7 @@ class QueryAnalyzer //--------------------------------------------------------------------------------------------------------- // access to additional parameter values - // Methods return default of realy set values! + // Methods return default of really set values! //--------------------------------------------------------------------------------------------------------- sal_uInt32 getIFlags () const { return m_nIFlags ; } sal_uInt32 getEFlags () const { return m_nEFlags ; } diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx index 65d769151a98..02ae9a808258 100644 --- a/framework/inc/services/autorecovery.hxx +++ b/framework/inc/services/autorecovery.hxx @@ -163,7 +163,7 @@ class AutoRecovery : // attention! Must be the first base class to guarentee ri /// the Auto/Emergency saved document isnt useable any longer E_DAMAGED = 64, - /// the Auto/Emergency saved document isnt realy up-to-date (some changes can be missing) + /// the Auto/Emergency saved document isnt really up-to-date (some changes can be missing) E_INCOMPLETE = 128, /// the Auto/Emergency saved document was processed successfully E_SUCCEDED = 512 @@ -238,7 +238,7 @@ class AutoRecovery : // attention! Must be the first base class to guarentee ri css::uno::Reference< css::frame::XModel > Document; //------------------------------- - /** @short knows, if the document is realy modified since the last autosave, + /** @short knows, if the document is really modified since the last autosave, or was postponed, because it was an active one etcpp... @descr Because we have no CHANGE TRACKING mechanism, based on office document, @@ -713,7 +713,7 @@ class AutoRecovery : // attention! Must be the first base class to guarentee ri /** @short save all current opened documents to a specific backup directory. - @descr Only realy changed documents will be saved here. + @descr Only really changed documents will be saved here. Further this method returns a suggestion, if and how it should be called again. May be some documents was not saved yet @@ -1017,7 +1017,7 @@ class AutoRecovery : // attention! Must be the first base class to guarentee ri /** try to remove the specified file from disc. Every URL supported by our UCB component can be used here. - Further it doesn't matter if the file realy exists or not. + Further it doesn't matter if the file really exists or not. Because removing a non exsistent file will have the same result at the end ... a non existing file .-) diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 65b992587d10..42d8b9f8ccc1 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -463,15 +463,15 @@ class Desktop : // base classes //--------------------------------------------------------------------- /** special terminate listener shuting down the SfxApplication. * Because these desktop instance closes documents and informs listener - * only ... it does not realy shutdown the whole application. + * only ... it does not really shutdown the whole application. * * Btw: That wouldnt be possible by design ... because Desktop.terminate() - * has to return a boolean value about success ... it cant realy shutdown the + * has to return a boolean value about success ... it cant really shutdown the * process .-) * * So we uses a trick: A special listener (exactly these one here) listen for notifyTermination() * and shutdown the process asynchronous. But desktop has to make this special - * notification as realy last one ... Otherwise it can happen that asynchronous + * notification as really last one ... Otherwise it can happen that asynchronous * shutdown will be faster then all other code around Desktop.terminate() .-)) */ css::uno::Reference< css::frame::XTerminateListener > m_xSfxTerminator; diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx index f69337716b6c..ccdb33dff9fe 100644 --- a/framework/inc/services/logindialog.hxx +++ b/framework/inc/services/logindialog.hxx @@ -487,7 +487,7 @@ class LoginDialog : public css::lang::XTypeProvider , Don't use this directly! You must try to convert the value of given propertyhandle and return results of this operation. This will be use to ask vetoable - listener. If no listener have a veto, we will change value realy! + listener. If no listener have a veto, we will change value really! ( in method setFastPropertyValue_NoBroadcast(...) ) @seealso class OPropertySetHelper @@ -598,7 +598,7 @@ class LoginDialog : public css::lang::XTypeProvider , /*-****************************************************************************************************//** @short helper method to check if a property will change his value - @descr Is neccessary for vetoable listener mechanism of OPropertySethelper. + @descr Is necessary for vetoable listener mechanism of OPropertySethelper. @seealso - @@ -694,7 +694,7 @@ class LoginDialog : public css::lang::XTypeProvider , /*-****************************************************************************************************//** @short helper methods to read/write properties from/to ini file @descr Using of Config-Class isn't easy everytime :-( - Thats the reason for these helper. State of operation isn't realy important .. + Thats the reason for these helper. State of operation isn't really important .. but we assert impossible cases or occurred errors! @seealso - diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx index 34e65f5858eb..fb816c1055d5 100644 --- a/framework/inc/services/pathsettings.hxx +++ b/framework/inc/services/pathsettings.hxx @@ -154,7 +154,7 @@ class PathSettings : // base classes public: /** initialize a new instance of this class. - Attention: It's neccessary for right function of this class, that the order of base + Attention: It's necessary for right function of this class, that the order of base classes is the right one. Because we transfer information from one base to another during this ctor runs! */ PathSettings(const css::uno::Reference< css::uno::XComponentContext >& xContext); diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index 79523bb4f523..0214c90715b2 100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h @@ -107,7 +107,7 @@ class OUStringList : public ::comphelper::SequenceAsVector< OUString > return ::std::find(begin(), end(), sElement); } - // the only way to free used memory realy! + // the only way to free used memory really! void free() { OUStringList().swap( *this ); @@ -138,7 +138,7 @@ class BaseHash : public ::boost::unordered_map< OUString , { public: - // the only way to free used memory realy! + // the only way to free used memory really! void free() { BaseHash().swap( *this ); diff --git a/framework/inc/threadhelp/fairrwlock.hxx b/framework/inc/threadhelp/fairrwlock.hxx index 6261bab716e9..ece091b7e295 100644 --- a/framework/inc/threadhelp/fairrwlock.hxx +++ b/framework/inc/threadhelp/fairrwlock.hxx @@ -194,7 +194,7 @@ class FairRWLock : public IRWLock @attention Don't call this method if you are not a writer! Results are not defined then ... - An upgrade can't be implemented realy ... because acquiring new access + An upgrade can't be implemented really ... because acquiring new access will be the same - there no differences! @seealso - diff --git a/framework/inc/threadhelp/inoncopyable.h b/framework/inc/threadhelp/inoncopyable.h index 98f263b2bb9a..e5799baca580 100644 --- a/framework/inc/threadhelp/inoncopyable.h +++ b/framework/inc/threadhelp/inoncopyable.h @@ -25,7 +25,7 @@ namespace framework{ /*-************************************************************************************************************//** @descr Use this as one of your base classes to disable all possiblities to copy or assign one object to another one! - We declare neccessary functions private to do so. + We declare necessary functions private to do so. *//*-*************************************************************************************************************/ class INonCopyable { diff --git a/framework/inc/threadhelp/readguard.hxx b/framework/inc/threadhelp/readguard.hxx index 2db89a63f629..afdd17316f3c 100644 --- a/framework/inc/threadhelp/readguard.hxx +++ b/framework/inc/threadhelp/readguard.hxx @@ -33,7 +33,7 @@ namespace framework{ @descr This guard should be used to set a lock for reading object internal member. Nobody can control it but don't use member after successfully locking for writing! We never need a own mutex to safe our internal member access - because - a guard is used as function-local member only. There exist no multithreaded access to it realy ... + a guard is used as function-local member only. There exist no multithreaded access to it really ... @attention a) To prevent us against wrong using, the default ctor, copy ctor and the =operator are maked private! b) Use interface "IRWLock" of set LockHelper only - because we must support a finer granularity of locking. diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx index fae6b9d7e191..858fd9909738 100644 --- a/framework/inc/threadhelp/transactionguard.hxx +++ b/framework/inc/threadhelp/transactionguard.hxx @@ -54,7 +54,7 @@ class TransactionGuard : private INonCopyable @descr Use these ctor methods to initialize the guard right. Given reference must be valid - otherwise crashes could occur! - @attention It's not neccessary to lock any mutex here! Because a ctor should not be called + @attention It's not necessary to lock any mutex here! Because a ctor should not be called from different threads at the same time ... this class use no refcount mechanism! @seealso - diff --git a/framework/inc/threadhelp/writeguard.hxx b/framework/inc/threadhelp/writeguard.hxx index 696b4780ffa4..faf123086ca9 100644 --- a/framework/inc/threadhelp/writeguard.hxx +++ b/framework/inc/threadhelp/writeguard.hxx @@ -30,7 +30,7 @@ namespace framework{ @short implement a guard to set write locks @descr This guard should be used to set a lock for reading AND writing object internal member. We never need a own mutex to safe our internal member access - because - a guard is used as function-local member only. There exist no multithreaded access to it realy ... + a guard is used as function-local member only. There exist no multithreaded access to it really ... @attention a) To prevent us against wrong using, the default ctor, copy ctor and the =operator are maked private! b) Use interface "IRWLock" of set LockHelper only - because we must support a finer granularity of locking. @@ -144,7 +144,7 @@ class WriteGuard : private INonCopyable { case E_READLOCK : { // User has downgraded to a read lock before! - // => There isn't realy a write lock ... + // => There isn't really a write lock ... m_pLock->releaseReadAccess(); m_eMode = E_NOLOCK; } diff --git a/framework/qa/complex/dispatches/Interceptor.java b/framework/qa/complex/dispatches/Interceptor.java index 3ef3a1f25c3d..ee81d3d97d43 100644 --- a/framework/qa/complex/dispatches/Interceptor.java +++ b/framework/qa/complex/dispatches/Interceptor.java @@ -82,7 +82,7 @@ public class Interceptor implements XDispatchProvider, /** counts calls of setSlave...(). So the outside API test can use this value to know if this interceptor - was realy added to the interceptor chain of OOo. + was really added to the interceptor chain of OOo. */ private int m_nRegistrationCount = 0; @@ -252,7 +252,7 @@ public class Interceptor implements XDispatchProvider, // ____________________ /** set a new list of URL's, which should be used on registration time - (that's why it's neccessary to call this impl-method before the interceptor + (that's why it's necessary to call this impl-method before the interceptor is used at the OOo API!) to optimize the interception chain. */ public synchronized void setURLs4InterceptionInfo(String[] lURLs) @@ -263,7 +263,7 @@ public class Interceptor implements XDispatchProvider, // ____________________ /** set a new list of URL's, which should be blocked by this interceptor. - (that's why it's neccessary to call this impl-method before the interceptor + (that's why it's necessary to call this impl-method before the interceptor is used at the OOo API!) */ public synchronized void setURLs4URLs4Blocking(String[] lURLs) diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java index de5a9d31853b..295ed182ef9d 100644 --- a/framework/qa/complex/framework/autosave/Protocol.java +++ b/framework/qa/complex/framework/autosave/Protocol.java @@ -30,7 +30,7 @@ import java.sql.*; /** * Implements a log mechanism to create a protocol of all steps of e.g. an api test * It provides the possibility to write the logged meesages to a file and/or - * to stdout/stderr (if neccessary at the same time!). + * to stdout/stderr (if necessary at the same time!). * * TODO * - implement filter, which e.g. supress showing of INFO data @@ -473,7 +473,7 @@ public class Protocol extends JComponent // ____________________ /** - * For some modes it's neccessary, that we write some additional + * For some modes it's necessary, that we write some additional * information to the log. E.g. for html we must generate close targets. */ public synchronized void finish() @@ -495,7 +495,7 @@ public class Protocol extends JComponent /** * log an unspecified message. * - * Sometimes it's not neccessary to set a special type for an message. + * Sometimes it's not necessary to set a special type for an message. * The pure message seams to be enough. The type of such "pure messages" * will be set to INFO. * @@ -728,7 +728,7 @@ public class Protocol extends JComponent * returns a generic html header for generating html log files * * It's used from the method finish() to generate a valid html formated file. - * For that its neccessary to open some special html targets like e.g. <html>. + * For that its necessary to open some special html targets like e.g. <html>. * * @return A string, which includes the whole header. * diff --git a/framework/qa/complex/loadAllDocuments/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/StreamSimulator.java index 43c163c11dbb..851bfd2cba79 100644 --- a/framework/qa/complex/loadAllDocuments/StreamSimulator.java +++ b/framework/qa/complex/loadAllDocuments/StreamSimulator.java @@ -70,7 +70,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , * @throw com.sun.star.io.NotConnectedException * in case the internal streams to the file on disk couldn't * be established. - * They are neccessary. Otherwhise this simulator can't + * They are necessary. Otherwhise this simulator can't * really work. */ public StreamSimulator(XMultiServiceFactory xMSF, @@ -115,7 +115,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , /** * following methods simulates the XInputStream. * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal + * and try to map all necessary functions to the internal * open in-stream. */ public int readBytes(byte[][] lData, int nBytesToRead ) @@ -257,7 +257,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , /** * following methods simulates the XOutputStream. * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal + * and try to map all necessary functions to the internal * open out-stream. */ public void writeBytes(byte[] lData) @@ -344,7 +344,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , /** * following methods simulates the XSeekable. * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal + * and try to map all necessary functions to the internal * open stream. */ public void seek(long nLocation ) diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index d4a8a03663dd..5fd1a3b97b5d 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -31,7 +31,7 @@ namespace framework{ @short initialize an empty container @descr The container will be empty then - special features (e.g. the async quit mechanism) are disabled. - @threadsafe not neccessary - its not a singleton + @threadsafe not necessary - its not a singleton *****************************************************************************************************************/ FrameContainer::FrameContainer() // initialize base classes first. @@ -48,7 +48,7 @@ FrameContainer::FrameContainer() @short deinitialize may a filled container @descr Special features (if the currently are running) will be dsiabled and we free all used other resources. - @threadsafe not neccessary - its not a singleton + @threadsafe not necessary - its not a singleton *****************************************************************************************************************/ FrameContainer::~FrameContainer() { diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index 49aebce58ca1..410aa0ad06a8 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -35,7 +35,7 @@ namespace framework{ /*-****************************************************************************************************//** - @short initialize instance with neccessary information + @short initialize instance with necessary information @descr We need a valid uno service manager to create or instanciate new services. All other information to create frames or tasks come in on right interface methods. diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 8b515189414a..b5f68076a0d2 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -109,7 +109,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher:: { if (nCommandGroup == css::frame::CommandGroup::VIEW) { - /* Attention: Dont add .uno:CloseFrame here. Because its not realy + /* Attention: Dont add .uno:CloseFrame here. Because its not really a configurable feature ... and further it does not have a valid UIName entry inside the GenericCommands.xcu ... */ css::uno::Sequence< css::frame::DispatchInformation > lViewInfos(1); @@ -238,7 +238,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL& Now we do the following: - close all views to the same document, if needed and possible - make the current frame empty - ! This step is neccessary to handle errors during closing the + ! This step is necessary to handle errors during closing the document inside the frame. May the document shows a dialog and the user ignore it. Then the state of the office can be changed during we try to close frame and document. @@ -416,7 +416,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback) // We reached this method only, by using a reference to ourself :-) // Further this member is used to detect still running and not yet finished // ansynchronous operations. So its time now to release this reference. - // But hold it temp alive. Otherwhise we die before we can finish this method realy :-)) + // But hold it temp alive. Otherwhise we die before we can finish this method really :-)) css::uno::Reference< css::uno::XInterface > xTempHold = m_xSelfHold; m_xSelfHold.clear(); m_xResultListener.clear(); @@ -479,7 +479,7 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc } } - // dont remove the component realy by e.g. calling setComponent(null, null). + // dont remove the component really by e.g. calling setComponent(null, null). // It's enough to suspend the controller. // If we close the frame later this controller doesn't show the same dialog again. return sal_True; @@ -596,7 +596,7 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig if (xTopWindowCheck.is()) { // b1) Note: Toolkit interface XTopWindow sometimes is used by real VCL-child-windows also .-) - // Be sure that these window is realy a "top system window". + // Be sure that these window is really a "top system window". // Attention ! Checking Window->GetParent() isnt the right approach here. // Because sometimes VCL create "implicit border windows" as parents even we created // a simple XWindow using the toolkit only .-( diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 3b2627cfb761..7b5c74645ff5 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -86,7 +86,7 @@ DispatchProvider::~DispatchProvider() @short search a dispatcher for given URL @descr If no interceptor is set on owner, we search for right frame and dispatch URL to it. If no frame was found, we do nothing. - But we doesn't do it directly here. We detect the type of our owner frame and calls + But we don't do it directly here. We detect the type of our owner frame and calls specialized queryDispatch() helper dependen from that. Because a Desktop handle some requests in another way then a normal frame. @@ -488,7 +488,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt css::uno::Reference< css::frame::XDispatch > xDispatcher; ProtocolHandler aHandler ; - // This member is threadsafe by himself and lives if we live - we doesn't need any mutex here. + // This member is threadsafe by himself and lives if we live - we don't need any mutex here. if (m_aProtocolHandlerCache.search(aURL,&aHandler)) { /* SAFE { */ @@ -545,7 +545,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt Thats 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 shure, that the realy given by the outside calli! + Please use it only, if you can be shure, 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/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx index 7cdfc59df90f..ca358e5e7248 100644 --- a/framework/source/dispatch/interceptionhelper.cxx +++ b/framework/source/dispatch/interceptionhelper.cxx @@ -64,7 +64,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD // Use first interceptor everytimes. // Note: it doesn't matter, which direction this helper implementation use to ask interceptor objects. // Using of member m_aInterceptorList will starts at the beginning everytimes. - // It depends from the filling operation, in which direction it works realy! + // It depends from the filling operation, in which direction it works really! if (!xInterceptor.is() && m_lInterceptionRegs.size()>0) { pIt = m_lInterceptionRegs.begin(); diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx index 6eb2284a0878..8b0610bcbc0e 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -98,7 +98,7 @@ css::uno::Any LoadDispatcher::impl_dispatch( const css::util::URL& rURL, { if (xListener.is()) xListener->dispatchFinished( - css::frame::DispatchResultEvent(xThis, css::frame::DispatchResultState::DONTKNOW, css::uno::Any())); // DONTKNOW? ... not realy started ... not realy failed :-) + css::frame::DispatchResultEvent(xThis, css::frame::DispatchResultState::DONTKNOW, css::uno::Any())); // DONTKNOW? ... not really started ... not really failed :-) } css::uno::Reference< css::frame::XFrame > xBaseFrame(m_xOwnerFrame.get(), css::uno::UNO_QUERY); diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index e26385a1584f..8f3b28574ac7 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -84,7 +84,7 @@ MailToDispatcher::~MailToDispatcher() be asked by the generic dispatch mechanism inside framework, if he can handle this special URL which match his registration. He can agree by returning of a valid dispatch instance or disagree by returning <NULL/>. - We don't create new dispatch instances here realy - we return THIS as result to handle it + We don't create new dispatch instances here really - we return THIS as result to handle it at the same implementation. */ css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDispatch( const css::util::URL& aURL , @@ -122,7 +122,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail /** @short dispatch URL with arguments @descr We use threadsafe internal method to do so. It returns a state value - but we ignore it. - Because we doesn't support status listener notifications here. Status events are not guaranteed - + Because we don't support status listener notifications here. Status events are not guaranteed - and we call another service internaly which doesn't return any notifications too. @param aURL @@ -193,7 +193,7 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL& @return <TRUE/> if dispatch could be started successfully Note: Our internal used shell executor doesn't return any state value - so we must belive that call was successfully. - <FALSE/> if neccessary resource couldn't be created or an exception was thrown. + <FALSE/> if necessary resource couldn't be created or an exception was thrown. */ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& /*lArguments*/ ) throw( css::uno::RuntimeException ) @@ -231,7 +231,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL& /** @short add/remove listener for state events @descr Because we use an external process to forward such mail URLs, and this process doesn't - return any notifications about success or failed state - we doesn't support such status + return any notifications about success or failed state - we don't support such status listener. We have no status to send. @param xListener diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 6af1cb8be911..c659162dc286 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -101,7 +101,7 @@ Oxt_Handler::~Oxt_Handler() @attention We must hold us alive by ourself ... because we use async. vcl sound player ... but playing is started in async interface call "dispatch()" too. And caller forget us immediately. But then our uno ref count will decreased to 0 and will die. The only solution is to use own reference to our implementation. - But we do it for realy started jobs only and release it during call back of vcl. + But we do it for really started jobs only and release it during call back of vcl. @seealso class vcl/Sound @seealso method implts_PlayerNotify() @@ -160,7 +160,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& @attention a) We don't need any mutex here ... because we don't use any member! b) Don't use internal player instance "m_pPlayer" to detect given sound file! - It's not neccessary to do that ... and we can use temp. variable to do the same. + 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 @@ -177,7 +177,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL& OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ) { - // Our default is "nothing". So we can return it, if detection failed or fily type is realy unknown. + // Our default is "nothing". So we can return it, if detection failed or fily type is really unknown. OUString sTypeName; // Analyze given descriptor to find filename or input stream or ... diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index 342e923cc6f0..65652772f1f4 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -86,7 +86,7 @@ ServiceHandler::~ServiceHandler() be asked by the generic dispatch mechanism inside framework, if he can handle this special URL which match his registration. He can agree by returning of a valid dispatch instance or disagree by returning <NULL/>. - We don't create new dispatch instances here realy - we return THIS as result to handle it + We don't create new dispatch instances here really - we return THIS as result to handle it at the same implementation. */ css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispatch( const css::util::URL& aURL , @@ -124,7 +124,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv /** @short dispatch URL with arguments @descr We use threadsafe internal method to do so. It returns a state value - but we ignore it. - Because we doesn't support status listener notifications here. + Because we don't support status listener notifications here. @param aURL uno URL which should be executed diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index b9c7965059d5..04124b03025f 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -59,7 +59,7 @@ FrameListAnalyzer::~FrameListAnalyzer() We try to get a snapshot of all opened frames, which are part of the desktop frame container. Of course we can't access frames, which stands outside of this tree. - But it's neccessary to collect top frames here only. Otherwhise we interpret closing of last + But it's necessary to collect top frames here only. Otherwhise we interpret closing of last frame wrong. Further we analyze this list and split into different parts. E.g. for "CloseDoc" we must know, which frames of the given list referr to the same model. These frames must be closed then. But all other frames must be untouched. @@ -107,7 +107,7 @@ void FrameListAnalyzer::impl_analyze() } // check, if the reference frame is in hidden mode. - // But look, if this analyze step is realy needed. + // But look, if this analyze step is really needed. css::uno::Reference< css::beans::XPropertySet > xSet(m_xReferenceFrame, css::uno::UNO_QUERY); if ( ((m_eDetectMode & E_HIDDEN) == E_HIDDEN) && @@ -118,7 +118,7 @@ void FrameListAnalyzer::impl_analyze() } // check, if the reference frame includes the backing component. - // But look, if this analyze step is realy needed. + // But look, if this analyze step is really needed. if (((m_eDetectMode & E_BACKINGCOMPONENT) == E_BACKINGCOMPONENT) && m_xReferenceFrame.is() ) { try @@ -138,7 +138,7 @@ void FrameListAnalyzer::impl_analyze() } // check, if the reference frame includes the help module. - // But look, if this analyze step is realy needed. + // But look, if this analyze step is really needed. if ( ((m_eDetectMode & E_HELP) == E_HELP ) && (m_xReferenceFrame.is() ) && @@ -257,7 +257,7 @@ void FrameListAnalyzer::impl_analyze() catch (const css::lang::IndexOutOfBoundsException&) { // stop copying if index seams to be wrong. - // This interface can't realy guarantee its count for multithreaded + // This interface can't really guarantee its count for multithreaded // environments. So it can occur! } diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index b7f56a1ea6de..753f40c5f923 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -549,7 +549,7 @@ void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle) const OUString sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, OUString()); // An UIname property is an optional value ! - // So please add it to the title in case it does realy exists only. + // So please add it to the title in case it does really exists only. if (!sUIName.isEmpty()) { sTitle.appendAscii (" " ); diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index f1e782dd8560..e558cd64a670 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -65,7 +65,7 @@ PatternHash::iterator PatternHash::findPatternKey( const OUString& sURL ) /** @short initialize static member of class HandlerCache @descr We use a singleton pattern to implement this handler cache. - That means it use two static member list to hold all neccessary information + That means it use two static member list to hold all necessary information and a ref count mechanism to create/destroy it on demand. */ HandlerHash* HandlerCache::m_pHandler = NULL; @@ -148,7 +148,7 @@ sal_Bool HandlerCache::search( const OUString& sURL, ProtocolHandler* pReturn ) /** @short search for a registered handler by using an URL struct - @descr We combine neccessary parts of this struct to a valid URL string + @descr We combine necessary parts of this struct to a valid URL string and call our other search method ... It's a helper for outside code. */ diff --git a/framework/source/fwi/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx index 0a05c66b0011..8a7edefc8233 100644 --- a/framework/source/fwi/threadhelp/lockhelper.cxx +++ b/framework/source/fwi/threadhelp/lockhelper.cxx @@ -93,7 +93,7 @@ LockHelper::~LockHelper() we must simulate it as a write access! @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method acquireWriteAccess() @@ -115,7 +115,7 @@ void LockHelper::acquire() we must simulate it as a write access! @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method releaseWriteAccess() @@ -136,7 +136,7 @@ void LockHelper::release() Writing isn't allowed then - but nobody could check it for you! @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method releaseReadAccess() @@ -156,7 +156,7 @@ void LockHelper::acquireReadAccess() @descr A guard should call this method to release read access on your member. @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method acquireReadAccess() @@ -178,7 +178,7 @@ void LockHelper::releaseReadAccess() After successfully calling of this method you are the only writer. @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method releaseWriteAccess() @@ -198,7 +198,7 @@ void LockHelper::acquireWriteAccess() @descr A guard should call this method to release write access on your member. @attention If a shareable osl mutex exist, he must be used as twice! - It's neccessary for some cppu-helper classes ... + It's necessary for some cppu-helper classes ... @seealso method acquireWriteAccess() @@ -223,10 +223,10 @@ void LockHelper::releaseWriteAccess() @attention a) Don't call this method if you are not a writer! Results are not defined then ... - An upgrade can't be implemented realy ... because acquiring new access + An upgrade can't be implemented really ... because acquiring new access will be the same - there no differences! b) Without function ... - because, a mutex don't support it realy. + because, a mutex don't support it really. @seealso - diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index d34e79fc492c..1772515531bd 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -65,7 +65,7 @@ TransactionManager::~TransactionManager() @short set new working mode @descr These implementation knows for states of working: E_INIT, E_WORK, E_CLOSING, E_CLOSE You can step during this ones only from the left to the right side and start at left side again! - (This is neccessary e.g. for refcounted objects!) + (This is necessary e.g. for refcounted objects!) This call will block till all current existing transactions was finished. Following results can occur: E_INIT : All requests on this implementation are refused. diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 08619ba3fc9c..6f9746046d9f 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -251,7 +251,7 @@ void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIn else { // Our stack is empty. No further child exists. - // Se we must "end" our progress realy + // Se we must "end" our progress really if (xProgress.is()) xProgress->end(); // Now hide the progress bar again. diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index aa7e0dea9829..93388d304f34 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -202,7 +202,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase, //--------------------------------------- /** @short return the current office locale. - @descr We does not cache this value, because we are not listen + @descr We do not cache this value, because we are not listen for changes on the configuration layer ... @return OUString @@ -421,7 +421,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase, //--------------------------------------- /** @short return the current office locale. - @descr We does not cache this value, because we are not listen + @descr We do not cache this value, because we are not listen for changes on the configuration layer ... @return OUString diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 8d8ef71a04a8..d73816af181b 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -134,7 +134,7 @@ class KeyMapping if this method returns sal_True! @return [boolean] - sal_True if convertion was successfully. + sal_True if conversion was successfully. */ sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier, sal_uInt16& rCode ); diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index e7d67bb717ba..ef8c28af6dcb 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -392,12 +392,12 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas sal_Bool bCreateIfMissing); //--------------------------------------- - /** @short do anything which is neccessary to flush all changes + /** @short do anything which is necessary to flush all changes back to disk. @descr We have to call commit on all cached sub storages on the path from the root storage upside down to the working storage - (which are not realy used, but required to be holded alive!). + (which are not really used, but required to be holded alive!). */ void commitUserChanges(); diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx index a87ea8c010e2..10e41090c58d 100644 --- a/framework/source/inc/dispatch/loaddispatcher.hxx +++ b/framework/source/inc/dispatch/loaddispatcher.hxx @@ -64,7 +64,7 @@ class LoadDispatcher : private ThreadHelpBase public: - /** @short creates a new instance and initialize it with all neccessary parameters. + /** @short creates a new instance and initialize it with all necessary parameters. @descr Every instance of such LoadDispatcher can be used for the specified context only. That means: It can be used to load any further requested content into tzhe here(!) diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index a2f258ec9b2a..dadef232243d 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -264,7 +264,7 @@ public: passing this information to this LoadEnv instance can supress this might expensive check. That can be useful in case this information is needed outside too, - to decide if its neccessary to create some resources for this load + to decide if its necessary to create some resources for this load request ... or to reject the request imidiatly if it seems to be not loadable in general. @@ -536,7 +536,7 @@ private: @descr Note: Showing of a frame is bound to a special feature ... a) If we recycle any existing frame, we must bring it to front. - Showing of such frame isnt needed realy .. because we recycle + Showing of such frame isnt needed really .. because we recycle visible frames only! b) If the document was already shown (e.g. by our progress implementation) we do nothing here. The reason behind: The document was already shown .. diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 3cca5061f4f5..9493589509f8 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -107,7 +107,7 @@ static ::sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xW if (xTopWindowCheck.is()) { // Note: Toolkit interface XTopWindow sometimes is used by real VCL-child-windows also .-) - // Be sure that these window is realy a "top system window". + // Be sure that these window is really a "top system window". // Attention ! Checking Window->GetParent() isnt the right approach here. // Because sometimes VCL create "implicit border windows" as parents even we created // a simple XWindow using the toolkit only .-( diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index 18ea4ff53d7f..2d0bc573ddc8 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -382,7 +382,7 @@ css::uno::Sequence< css::beans::NamedValue > Job::impl_generateJobArgs( /*IN*/ c } // get the configuration data from the job data container ... if possible - // Means: if this job has any configuration data. Note: only realy + // Means: if this job has any configuration data. Note: only really // filled lists will be set to the return structure at the end of this method. css::uno::Sequence< css::beans::NamedValue > lConfigArgs ; css::uno::Sequence< css::beans::NamedValue > lJobConfigArgs; @@ -737,7 +737,7 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) thro Then we had not throwed a veto exception. But now we must agree with this situation and break all our internal processes. Its not a good idea to mark this instance as non startable any longer inside queryTermination() if no job was unning too. Because that would disable this job and may - the office does not realy shutdownm, because another listener has thrown the suitable exception. + the office does not really shutdownm, because another listener has thrown the suitable exception. @param aEvent describes the broadcaster and must be the desktop instance diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index 3fb1b958baf9..3d7972955a06 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -67,7 +67,7 @@ const sal_Char* JobData::PROP_CONTEXT = "Context" /** @short standard ctor @descr It initialize this new instance. - But for real working it's neccessary to call setAlias() or setService() later. + But for real working it's necessary to call setAlias() or setService() later. Because we need the job data ... @param rxContext @@ -138,7 +138,7 @@ JobData::~JobData() //________________________________ /** @short initalize this instance as a job with configuration - @descr They given alias can be used to address some configuraton data. + @descr They given alias can be used to address some configuration data. We read it and fill our internal structures. Of course old information will be lost doing so. @@ -482,7 +482,7 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const @short return information, if this job is part of the global configuration package org.openoffice.Office.Jobs @descr Because jobs can be executed by the dispatch framework using an uno service name - directly - an executed job must not have any configuration realy. Such jobs + directly - an executed job must not have any configuration really. Such jobs must provide the right interfaces only! But after finishing jobs can return some information (e.g. for updating her configuration ...). We must know if such request is valid or not then. @@ -704,7 +704,7 @@ css::uno::Sequence< OUString > JobData::getEnabledJobsForEvent( const css::uno:: But note: that does not set defaults for internal used members, which does not relate to any job property! e.g. the reference to the global uno service manager. Such information is used for internal processes only - and are neccessary for our work. + and are necessary for our work. */ void JobData::impl_reset() { diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index b8f50508dbf0..4b069d93407a 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -251,7 +251,7 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const OUString& // no jobs ... no execution // But a may given listener will know something ... // I think this operaton was finished successfully. - // It's not realy an error, if no registered jobs could be located. + // It's not really an error, if no registered jobs could be located. // Step over all found jobs and execute it int nExecutedJobs=0; for (int j=0; j<lJobs.getLength(); ++j) diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 5c45ca9ab4fa..d972326bf714 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -60,7 +60,7 @@ JobResult::JobResult() <br> The returned list of (for this generic implementation unknown!) properties, will be written directly to the configuration and replace - any old values there. There will no check for changes and we doesn't + any old values there. There will no check for changes and we don't support any mege feature here. They are written only. The job has to modify this list. </li> @@ -151,7 +151,7 @@ JobResult::JobResult( const JobResult& rCopy ) */ JobResult::~JobResult() { - // Nothing realy to do here. + // Nothing really to do here. } //________________________________ @@ -179,7 +179,7 @@ void JobResult::operator=( const JobResult& rCopy ) /** @short checks for existing parts of the analyzed result @descr The internal flag mask was set after analyzing of the pure result. - An user of us can check here, if the required part was realy part + An user of us can check here, if the required part was really part of this result. Otherwhise it would use invalid information ... by using our other members! diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx index b87ed7469bd4..fe46e6075be7 100644 --- a/framework/source/loadenv/targethelper.cxx +++ b/framework/source/loadenv/targethelper.cxx @@ -59,8 +59,8 @@ sal_Bool TargetHelper::matchSpecialTarget(const OUString& sCheckTarget , sal_Bool TargetHelper::isValidNameForFrame(const OUString& sName) { - // some special targets are realy special ones :-) - // E.g. the are realy used to locate one frame inside the frame tree. + // some special targets are really special ones :-) + // E.g. the are really used to locate one frame inside the frame tree. if ( (sName.isEmpty() ) || (TargetHelper::matchSpecialTarget(sName, E_HELPTASK)) || diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx index 2f6e65d4c920..f2e4a25fdeac 100644 --- a/framework/source/recording/dispatchrecordersupplier.cxx +++ b/framework/source/recording/dispatchrecordersupplier.cxx @@ -53,7 +53,7 @@ DEFINE_INIT_SERVICE( /** @short standard constructor to create instance @descr Because an instance will be initialized by her interface methods - it's not neccessary to do anything here. + it's not necessary to do anything here. */ DispatchRecorderSupplier::DispatchRecorderSupplier( const css::uno::Reference< css::lang::XMultiServiceFactory >& ) // init baseclasses first! @@ -67,7 +67,7 @@ DispatchRecorderSupplier::DispatchRecorderSupplier( const css::uno::Reference< c //_____________________________________________________________________________ /** @short standard destructor - @descr We are a helper and not a real service. So we doesn't provide + @descr We are a helper and not a real service. So we don't provide dispose() functionality. This supplier dies by ref count mechanism and should release all internal used ones too. */ diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 75595d96d21b..fef85c4b985a 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -774,7 +774,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent /* document saved as copy => mark it as "non used by concurrent save operation". so we can try to create a backup copy if next time AutoSave is started too. Dont remove temp. files or change the modified state of the document! - It was not realy saved to the original file ... + It was not really saved to the original file ... */ else if ( aEvent.EventName == EVENT_ON_SAVETODONE ) { @@ -937,7 +937,7 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf catch(const css::uno::Exception&) { // These config keys are not sooooo important, that - // we are interested on errors here realy .-) + // we are interested on errors here really .-) nMinSpaceDocSave = MIN_DISCSPACE_DOCSAVE; nMinSpaceConfigSave = MIN_DISCSPACE_CONFIGSAVE; } @@ -1697,7 +1697,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame implts_specifyAppModuleAndFactory(aNew); // Hack! Check for "illegal office documents" ... as e.g. the Basic IDE - // Its not realy a full featured office document. It doesn't provide an URL, any filter, a factory URL etcpp. + // Its not really a full featured office document. It doesn't provide an URL, any filter, a factory URL etcpp. // TODO file bug to Basci IDE developers. They must remove the office document API from its service. if ( (aNew.OrgURL.isEmpty()) && @@ -2754,7 +2754,7 @@ void AutoRecovery::implts_generateNewTempURL(const OUString& sBack // This unique name must solve an optimization problem too! // In case we are asked to save unmodified documents too - and one of them // is an empty one (because it was new created using e.g. an URL private:factory/...) - // we should not save it realy. Then we put the information about such "empty document" + // we should not save it really. Then we put the information about such "empty document" // into the configuration and dont create any recovery file on disk. // We use the title of the document to make it unique. OUStringBuffer sUniqueName; @@ -2936,7 +2936,7 @@ void AutoRecovery::implts_resetHandleStates(sal_Bool /*bLoadCache*/) //----------------------------------------------- void AutoRecovery::implts_prepareEmergencySave() { - // Be sure to know all open documents realy .-) + // Be sure to know all open documents really .-) implts_verifyCacheAgainstDesktopDocumentList(); // hide all docs, so the user cant disturb our emergency save .-) @@ -3024,7 +3024,7 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionSave()"); - // Be sure to know all open documents realy .-) + // Be sure to know all open documents really .-) implts_verifyCacheAgainstDesktopDocumentList(); // for all docs, store their current view/names in the configurtion diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 324bd73f1171..2ab1d3a7dcfd 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -347,7 +347,7 @@ sal_Bool SAL_CALL Desktop::terminate() if ( xPipeTerminator.is() ) xPipeTerminator->notifyTermination( aEvent ); - // Must be realy the last listener to be called. + // Must be really the last listener to be called. // Because it shutdown the whole process asynchronous ! if ( xSfxTerminator.is() ) xSfxTerminator->notifyTermination( aEvent ); @@ -728,7 +728,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desk @short supports registration/deregistration of interception objects, which are interested on special dispatches. - @descr Its realy provided by an internal helper, which is used inside the dispatch api too. + @descr Its really provided by an internal helper, which is used inside the dispatch api too. @param xInterceptor the interceptor object, which wish to be (de)registered. @@ -980,7 +980,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS //----------------------------------------------------------------------------------------------------- // 0) Ignore wrong parameter! - // We doesn't support search for following special targets. + // We don't support search for following special targets. // If we reject this requests - we mustnt check for such names // in following code again and again. If we do not so -wrong // search results can occur! @@ -1001,7 +1001,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS // force using of "if() else if() ..." //----------------------------------------------------------------------------------------------------- - // get threadsafe some necessary member which are neccessary for following functionality + // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ ReadGuard aReadLock( m_aLock ); css::uno::Reference< css::uno::XComponentContext> xContext = m_xContext; @@ -1051,7 +1051,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS // But note: Such flags are not valid for the desktop - especialy SIBLINGS or PARENT. //------------------------------------------------------------------------------------------------- - // get threadsafe some necessary member which are neccessary for following functionality + // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ aReadLock.lock(); OUString sOwnName = m_sName; @@ -1077,7 +1077,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS // But the desktop exists outside such task trees. They are our sub trees. So the desktop implement // a special feature: We use it to start search on our direct children only. That means we supress // search on ALL child frames. May that can be useful to get access on opened document tasks - // only without filter out all non realy required sub frames ... + // only without filter out all non really required sub frames ... // Used helper method on our container doesn't create any frame - it's a search only. //------------------------------------------------------------------------------------------------- if ( @@ -1135,7 +1135,7 @@ void SAL_CALL Desktop::dispose() WriteGuard aWriteLock( m_aLock ); // start synchronize // Look for multiple calls of this method! - // If somewhere call dispose() twice - he will be stopped here realy!!! + // If somewhere call dispose() twice - he will be stopped here really!!! TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); // Now - we are alone and its the first call of this method ... @@ -1199,7 +1199,7 @@ void SAL_CALL Desktop::dispose() about our dieing! You must releas ethis listener reference during your own disposing() method. - @attention Our container is threadsafe himeslf. So we doesn't need any lock here. + @attention Our container is threadsafe himeslf. So we don't need any lock here. @seealso - @@ -1275,7 +1275,7 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& /*-************************************************************************************************************//** @interface XEventListener @short not implemented! - @descr We are a status listener ... and so we must be an event listener too ... But we doesn't need it realy! + @descr We are a status listener ... and so we must be an event listener too ... But we don't need it really! We are a temp. listener only and our lifetime isn't smaller then of our temp. used dispatcher. @seealso method loadComponentFromURL() @@ -1382,7 +1382,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio /* SAFE AREA ------------------------------------------------------------------------------------------- */ // Ok now it's time to break yield loop of loadComponentFromURL(). - // But only for realy aborted requests! + // But only for really aborted requests! // For example warnings will be approved and we wait for any success story ... if (bAbort) { @@ -1435,7 +1435,7 @@ OUString SAL_CALL Desktop::getUntitledPrefix() Don't use this directly! You must try to convert the value of given DESKTOP_PROPHANDLE and return results of this operation. This will be used to ask vetoable - listener. If no listener has a veto, we will change value realy! + listener. If no listener has a veto, we will change value really! ( in method setFastPropertyValue_NoBroadcast(...) ) @attention Methods of OPropertySethelper are safed by using our shared osl mutex! (see ctor!) @@ -1667,7 +1667,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropert then we try to become his component. It can be a VCL-component, the model or the controller of founded frame. - @attention We don't work on internal member ... so we doesn't need any lock here. + @attention We don't work on internal member ... so we don't need any lock here. @seealso method getCurrentComponent(); diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 8975463fc449..7cbc89195f27 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -740,7 +740,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr //----------------------------------------------------------------------------------------------------- // 0) Ignore wrong parameter! - // We doesn't support search for following special targets. + // We don't support search for following special targets. // If we reject this requests - we mustnt check for such names // in following code again and again. If we do not so -wrong // search results can occur! @@ -758,7 +758,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr // force using of "if() else if() ..." //----------------------------------------------------------------------------------------------------- - // get threadsafe some necessary member which are neccessary for following functionality + // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ ReadGuard aReadLock( m_aLock ); css::uno::Reference< css::frame::XFrame > xParent ( m_xParent, css::uno::UNO_QUERY ); @@ -850,7 +850,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr // TASK and CREATE are handled special. //------------------------------------------------------------------------------------------------- - // get threadsafe some necessary member which are neccessary for following functionality + // get threadsafe some necessary member which are necessary for following functionality /* SAFE { */ aReadLock.lock(); OUString sOwnName = m_sName; @@ -906,7 +906,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr // In such case we must protect us against recursive calls. // Use snapshot of our parent. But don't use queryFrames() of XFrames interface. // Because it's return all siblings and all her children including our children too - // if we call it with the CHILDREN flag. We doesn't need that - we need the direct container + // if we call it with the CHILDREN flag. We don't need that - we need the direct container // items of our parent only to start searches there. So we must use the container interface // XIndexAccess instead of XFrames. //------------------------------------------------------------------------------------------------- @@ -1655,7 +1655,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close void SAL_CALL Frame::addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException) { TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - // We doesn't need any lock here ... + // We don't need any lock here ... // Container lives if we live and is threadsafe by himself. m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >* ) NULL ), xListener ); } @@ -1665,7 +1665,7 @@ void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util:: { // Use soft exception mode - moslty this method is called during disposing of this frame ... TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS ); - // We doesn't need any lock here ... + // We don't need any lock here ... // Container lives if we live and is threadsafe by himself. m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >* ) NULL ), xListener ); } @@ -1868,7 +1868,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException ) // should exist. Otherwhise it's the problem of the outside caller. // Note: // (a) Do it after stopWindowListening(). May that force some active/deactive - // notifications which we doesn't need here realy. + // notifications which we don't need here really. // (b) Don't forget to save the old value of IsDialogCancelEnabled() to // restore it afterwards (to not kill headless mode). Application::DialogCancelMode old = Application::GetDialogCancelMode(); @@ -1946,7 +1946,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException ) m_bSelfClose = sal_False; m_bIsHidden = sal_True; - // Disable this instance for further working realy! + // Disable this instance for further working really! m_aTransactionManager.setWorkingMode( E_CLOSE ); // Don't forget it restore old value - @@ -2348,7 +2348,7 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css:: /*-****************************************************************************************************//** @short react for a show event for the internal container window - @descr Normaly we doesn't need this information realy. But we can use it to + @descr Normaly we don't need this information really. But we can use it to implement the special feature "trigger first visible task". Algorithm: - first we have to check if we are a top (task) frame @@ -2902,7 +2902,7 @@ void Frame::implts_setIconOnWindow() @short helper to start/stop listeneing for window events on container window @descr If we get a new container window, we must set it on internal member ... and stop listening at old one ... and start listening on new one! - But sometimes (in dispose() call!) it's neccessary to stop listeneing without starting + But sometimes (in dispose() call!) it's necessary to stop listeneing without starting on new connections. So we split this functionality to make it easier at use. @seealso method initialize() diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 15fb3c05e89f..e4e2a5603a13 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -292,7 +292,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) sal_Bool bFinalized = ((aInfo.Attributes & css::beans::PropertyAttribute::READONLY ) == css::beans::PropertyAttribute::READONLY ); // Note: Till we support finalized / mandatory on our API more in detail we handle - // all states simple as READONLY ! But because all realy needed paths are "mandatory" by default + // all states simple as READONLY ! But because all really needed paths are "mandatory" by default // we have to handle "finalized" as the real "readonly" indicator . aPathVal.bIsReadonly = bFinalized; } @@ -332,7 +332,7 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) // remove the whole path from the old configuration ! // Otherwise we cant make sure that the diff between new and old configuration - // on loading time realy represent an user setting !!! + // on loading time really represent an user setting !!! // Check if the given path exists inside the old configuration. // Because our new configuration knows more then the list of old paths ... ! diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index e81b25dd6e83..6ce88a996e63 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -194,7 +194,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai // get toolkit to create task container window css::uno::Reference< css::awt::XToolkit2 > xToolkit = css::awt::Toolkit::create( xContext ); - // Check if child frames can be created realy. We need at least a valid window at the parent frame ... + // Check if child frames can be created really. We need at least a valid window at the parent frame ... css::uno::Reference< css::awt::XWindowPeer > xParentWindowPeer; if ( ! bTopWindow) { diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index be0a75d6e0dd..7a687814e36d 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -236,14 +236,14 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup // for aCmd_Dialog and aCmd_Language sal_Int16 nItemId = 1; // in this control the item id is not important for executing the command - const OUString sAsterix("*"); // multiple languages in current selection + const OUString sAsterisk("*"); // multiple languages in current selection const OUString sEmpty; // 'no language found' from language guessing std::set< OUString >::const_iterator it; for (it = aLangItems.begin(); it != aLangItems.end(); ++it) { const OUString & rStr( *it ); if (rStr != aLanguageTable.GetString( LANGUAGE_NONE ) && - rStr != sAsterix && + rStr != sAsterisk && rStr != sEmpty) { pPopupMenu->InsertItem( nItemId, rStr ); diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index b682c1865880..5a1fe2524442 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -122,7 +122,7 @@ throw (::com::sun::star::uno::RuntimeException) // add first few entries to main menu sal_Int16 nItemId = static_cast< sal_Int16 >(MID_LANG_SEL_1); - const OUString sAsterix("*"); // multiple languages in current selection + const OUString sAsterisk("*"); // multiple languages in current selection const OUString sEmpty; // 'no language found' from language guessing std::map< sal_Int16, OUString > aLangMap; std::set< OUString >::const_iterator it; @@ -130,7 +130,7 @@ throw (::com::sun::star::uno::RuntimeException) { const OUString & rStr( *it ); if ( rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) ) && - rStr != sAsterix && + rStr != sAsterisk && rStr != sEmpty) { DBG_ASSERT( MID_LANG_SEL_1 <= nItemId && nItemId <= MID_LANG_SEL_9, @@ -158,7 +158,7 @@ throw (::com::sun::star::uno::RuntimeException) { const OUString & rStr( *it ); if( rStr != OUString( aLanguageTable.GetString( LANGUAGE_NONE ) )&& - rStr != sAsterix && + rStr != sAsterisk && rStr != sEmpty) { DBG_ASSERT( MID_LANG_PARA_1 <= nItemId && nItemId <= MID_LANG_PARA_9, diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 2040fea5e209..9e1f5a46050c 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -164,7 +164,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString& m_rContainer.setKeyCommandPair(aEvent, sCommand); else { - // Attention: Its not realy a reason to throw an exception and kill the office, if the configuration contains + // Attention: Its not really a reason to throw an exception and kill the office, if the configuration contains // multiple registrations for the same key :-) Show a warning ... and ignore the second item. // THROW_PARSEEXCEPTION("Command is registered for the same key more then once.") SAL_INFO("fwk", diff --git a/i18nutil/README b/i18nutil/README index 6839c5d85be7..1eceb18bb776 100644 --- a/i18nutil/README +++ b/i18nutil/README @@ -1,4 +1,4 @@ -i18nutil is internalization related utilties +i18nutil is internalization related utilities It comprises of honest c++ code which you just link to directly, while i18npool tends to consist of code you interact with via uno. diff --git a/include/comphelper/IdPropArrayHelper.hxx b/include/comphelper/IdPropArrayHelper.hxx index 525d40778f33..1540530a9e5b 100644 --- a/include/comphelper/IdPropArrayHelper.hxx +++ b/include/comphelper/IdPropArrayHelper.hxx @@ -65,7 +65,7 @@ namespace comphelper } /** call this in the getInfoHelper method of your derived class. The method returns the array helper of the - class, which is created if neccessary. + class, which is created if necessary. */ ::cppu::IPropertyArrayHelper* getArrayHelper(sal_Int32 nId); diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index 38f834e9f8d5..c307d00cf3e1 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -160,7 +160,7 @@ namespace comphelper // getTextBeforeIndex // getTextBehindIndex // -// The following methods must be overriden by derived classes: +// The following methods must be overridden by derived classes: // // implGetText // implGetLocale diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx index 7ce0566c926c..dd1de2074014 100644 --- a/include/comphelper/embeddedobjectcontainer.hxx +++ b/include/comphelper/embeddedobjectcontainer.hxx @@ -169,7 +169,7 @@ public: /** call setPersistentEntry for each embedded object in the container * * \param _xStorage The storeage where to store the objects. - * \param _bClearModifedFlag If <TRUE/> then the modifed flag will be set to <FALSE/> otherwise nothing happen. + * \param _bClearModifedFlag If <TRUE/> then the modified flag will be set to <FALSE/> otherwise nothing happen. * \return <FALSE/> if no error occurred, otherwise <TRUE/>. */ sal_Bool SetPersistentEntries(const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& _xStorage,bool _bClearModifedFlag = true); diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx index 62a3d59509c5..78be2ee22151 100644 --- a/include/comphelper/propagg.hxx +++ b/include/comphelper/propagg.hxx @@ -68,12 +68,12 @@ namespace internal class IPropertyInfoService { public: - /** get the prefered handle for the given property + /** get the preferred handle for the given property @param _rName the property name @return the handle the property should be refered by, or -1 if there are no preferences for the given property */ - virtual sal_Int32 getPreferedPropertyId(const OUString& _rName) = 0; + virtual sal_Int32 getPreferredPropertyId(const OUString& _rName) = 0; protected: ~IPropertyInfoService() {} @@ -110,7 +110,7 @@ public: for refering the aggregate's properties from outside. If one of the properties returned from the info service conflict with other handles alread present (e.g. through _rProperties), the property is handled as if -1 was returned. - If NULL (or, for a special property, a call to getPreferedPropertyId returns -1), + If NULL (or, for a special property, a call to getPreferredPropertyId returns -1), the aggregate property(ies) get a new handle which they can be refered by from outside. @param _nFirstAggregateId if the object is about to create new handles for the aggregate properties, it uses diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx index b957683c89a6..9928f78052fa 100644 --- a/include/comphelper/proparrhlp.hxx +++ b/include/comphelper/proparrhlp.hxx @@ -68,7 +68,7 @@ public: } /** call this in the getInfoHelper method of your derived class. The method returns the array helper of the - class, which is created if neccessary. + class, which is created if necessary. */ ::cppu::IPropertyArrayHelper* getArrayHelper(); diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx index 4c73af24d484..ecc9e9030914 100644 --- a/include/comphelper/seqstream.hxx +++ b/include/comphelper/seqstream.hxx @@ -97,12 +97,12 @@ protected: public: /** constructs the object. Everything written into the stream through the XOutputStream methods will be forwarded - to the sequence, reallocating it if neccessary. Writing will start at offset 0 within the sequence. + to the sequence, reallocating it if necessary. Writing will start at offset 0 within the sequence. @param _rSeq a reference to the sequence which will be used for output. The caller is responsible for taking care of the lifetime of the stream object and the sequence. If you're in doubt about this, use <code>closeOutput</code> before destroying the sequence - @param _nResizeFactor the factor which is used for resizing the sequence when neccessary. In every + @param _nResizeFactor the factor which is used for resizing the sequence when necessary. In every resize step, the new sequence size will be calculated by multiplying the current size with this factor, rounded off to the next multiple of 4. @param _nMinimumResize the minmal number of bytes which is additionally allocated on resizing diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx index e6d44a3678be..f6c5c092b78f 100644 --- a/include/comphelper/sequenceashashmap.hxx +++ b/include/comphelper/sequenceashashmap.hxx @@ -81,7 +81,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase SequenceAsHashMap(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lSource); //--------------------------------------- - /** @short not realy used but maybe useful :-) + /** @short not really used but maybe useful :-) */ ~SequenceAsHashMap(); @@ -208,7 +208,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase specified default value otherwise. @descr If a value should be extracted only in case - the requsted property exists realy (without creating + the requsted property exists really (without creating of new items as it the index operator of a has_map does!) this method can be used. diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index d7328de834a6..3832ced90070 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -484,7 +484,7 @@ protected : const Graphic& rGrf, const Rectangle& rVisArea ); -// the following methods need to be overriden for Excel imports +// the following methods need to be overridden for Excel imports virtual sal_Bool ProcessClientAnchor( SvStream& rStData, sal_uInt32 nDatLen, char*& rpBuff, diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index 8119b09a617c..49c1cfff2e57 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.hxx @@ -120,7 +120,7 @@ typedef ::std::vector< MergeStatusbarInstruction > MergeStatusbarInstructionCont /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ diff --git a/include/framework/framelistanalyzer.hxx b/include/framework/framelistanalyzer.hxx index e039304c4181..fa276ee82b11 100644 --- a/include/framework/framelistanalyzer.hxx +++ b/include/framework/framelistanalyzer.hxx @@ -29,7 +29,7 @@ namespace framework{ /** analyze and split the current available frame list of a given frames supplier into different parts. - These analyzed information can be used e.g. to decide if it's neccessary + These analyzed information can be used e.g. to decide if it's necessary to switch into the backing mode, close the current active frame only or exit the whole application explicitly or implicitly. */ diff --git a/include/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx index a411b9184711..63ff840885f5 100644 --- a/include/framework/preventduplicateinteraction.hxx +++ b/include/framework/preventduplicateinteraction.hxx @@ -161,7 +161,7 @@ class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 @param xSMGR uno service manager for creating services internaly - @threadsafe not neccessary + @threadsafe not necessary */ PreventDuplicateInteraction(const css::uno::Reference< css::uno::XComponentContext >& rxContext); diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx index 1ddf064eb4bf..760257207096 100644 --- a/include/framework/titlehelper.hxx +++ b/include/framework/titlehelper.hxx @@ -78,7 +78,7 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex It's holded weak only so we do not need any complex dispose sessions. - Note: Passing NULL as parameter will be alloed. It will reset the internal + Note: Passing NULL as parameter will be allowed. It will reset the internal member reference only. @param xOwner @@ -92,7 +92,7 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex It's holded weak only so we do not need any complex dispose sessions. - Note: Passing NULL as parameter will be alloed. It will reset the internal + Note: Passing NULL as parameter will be allowed. It will reset the internal member reference only. @param xNumbers diff --git a/include/jvmfwk/framework.h b/include/jvmfwk/framework.h index d3160d3233c2..50480da01247 100644 --- a/include/jvmfwk/framework.h +++ b/include/jvmfwk/framework.h @@ -388,7 +388,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_isVMRunning(sal_Bool *bRunning) */ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo **pInfo); -/** provides information about all availabe JRE installations. +/** provides information about all available JRE installations. <p>The function determines dynamically what JREs are available. It uses the plug-in libraries to provide lists of available <code>JavaInfo</code> diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx index 6280f9d0001c..1d9e0dbd1a96 100644 --- a/include/oox/core/filterbase.hxx +++ b/include/oox/core/filterbase.hxx @@ -222,7 +222,7 @@ public: com.sun.star.lang.XMultiServiceFactory interface of the global service factory. The optional second argument may contain a sequence of com.sun.star.beans.NamedValue objects. The different - filter implemetations may support different arguments. + filter implementations may support different arguments. */ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ) diff --git a/include/osl/file.h b/include/osl/file.h index ed72aabee6e6..e092eb2b6d97 100644 --- a/include/osl/file.h +++ b/include/osl/file.h @@ -54,7 +54,7 @@ contain only ASCII characters<p> case preserving or not. The operating system implementation itself should determine if it can map case-insensitive paths. The case correct notation of a filename or file path is part of the "File Info". This case correct name -can be used as a unique key if neccessary.<p> +can be used as a unique key if necessary.<p> 4. Obtaining information about files or volumes is controlled by a bitmask which specifies which fields are of interest. Due to performance diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx index f3470da77145..6697d9b2f775 100644 --- a/include/rtl/ustrbuf.hxx +++ b/include/rtl/ustrbuf.hxx @@ -587,7 +587,7 @@ public: /// @endcond // This overload is needed because OUString has a ctor from rtl_uString*, but - // the bool overload above would be prefered to the conversion. + // the bool overload above would be preferred to the conversion. /** @internal */ diff --git a/include/sal/main.h b/include/sal/main.h index 7553d6802121..5d21b250b552 100644 --- a/include/sal/main.h +++ b/include/sal/main.h @@ -71,7 +71,7 @@ int SAL_DLLPUBLIC_EXPORT SAL_CALL main(int argc, char ** argv) \ #include <stdlib.h> -/* Sorry but this is neccessary cause HINSTANCE is a typedef that differs (C++ causes an error) */ +/* Sorry but this is necessary cause HINSTANCE is a typedef that differs (C++ causes an error) */ #ifndef WINAPI # define WINAPI __stdcall diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index fc52fe827e87..262a9f681ed0 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -284,7 +284,7 @@ public: /**___________________________________________________________________________________________________ @short get implementation id - @descr This ID is neccessary for UNO-caching. If there no ID, cache is disabled. + @descr This ID is necessary for UNO-caching. If there no ID, cache is disabled. Another way, cache is enabled. @seealso XTypeProvider diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx index 91080c625f1d..97c950220118 100644 --- a/include/svtools/menuoptions.hxx +++ b/include/svtools/menuoptions.hxx @@ -27,7 +27,7 @@ /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx index 59162b1f2ab5..5c5da5851b17 100644 --- a/include/svtools/miscopt.hxx +++ b/include/svtools/miscopt.hxx @@ -29,7 +29,7 @@ /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ diff --git a/include/svtools/optionsdrawinglayer.hxx b/include/svtools/optionsdrawinglayer.hxx index a5f6b0e4aea6..fe328cd95d5a 100644 --- a/include/svtools/optionsdrawinglayer.hxx +++ b/include/svtools/optionsdrawinglayer.hxx @@ -33,7 +33,7 @@ /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ diff --git a/include/svtools/slidesorterbaropt.hxx b/include/svtools/slidesorterbaropt.hxx index 8da3b240d393..01124c84f716 100644 --- a/include/svtools/slidesorterbaropt.hxx +++ b/include/svtools/slidesorterbaropt.hxx @@ -30,7 +30,7 @@ /** forward declaration to our private date container implementation We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! */ class SvtSlideSorterBarOptions_Impl; diff --git a/include/svtools/toolpanelopt.hxx b/include/svtools/toolpanelopt.hxx index 0a4573ea5cf1..89aad617e245 100644 --- a/include/svtools/toolpanelopt.hxx +++ b/include/svtools/toolpanelopt.hxx @@ -30,7 +30,7 @@ /** forward declaration to our private date container implementation We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! */ class SvtToolPanelOptions_Impl; diff --git a/include/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx index 616881a0b6d7..60e2294b1a0c 100644 --- a/include/svx/SmartTagMgr.hxx +++ b/include/svx/SmartTagMgr.hxx @@ -203,7 +203,7 @@ public: com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagRecognizer > GetRecognizer( sal_uInt32 i ) const { return maRecognizerList[i]; } - /** Is smart tag recognization active? + /** Is smart tag recognition active? */ bool IsSmartTagsEnabled() const { return 0 != NumberOfRecognizers() && IsLabelTextWithSmartTags(); } diff --git a/include/svx/graphichelper.hxx b/include/svx/graphichelper.hxx index b78ac7c2b8b9..f2109a550356 100644 --- a/include/svx/graphichelper.hxx +++ b/include/svx/graphichelper.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC GraphicHelper { public: - static void GetPreferedExtension( OUString& rExtension, const Graphic& rGraphic ); + static void GetPreferredExtension( OUString& rExtension, const Graphic& rGraphic ); static OUString ExportGraphic( const Graphic& rGraphic, const OUString& rGraphicName ); static void SaveShapeAsGraphic( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ); }; diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx index 3c995dfba3c9..cedb879371af 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx @@ -37,7 +37,7 @@ namespace sdr { /** Test whether the primitive is visible on any layer from @c aLayers - This should be overriden by ViewObjectContacts of SDR classes + This should be overridden by ViewObjectContacts of SDR classes that have subparts which can be on different layers (that is, SdrObjGroup .-) */ diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx index 9796b0ea8868..3f492b20a801 100644 --- a/include/svx/svddrgv.hxx +++ b/include/svx/svddrgv.hxx @@ -128,7 +128,7 @@ public: void BrkInsObjPoint() { BrkDragObj(); } sal_Bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; } - // Fuer die App zum Verwalten des Status. GetPreferedPointer() wird + // Fuer die App zum Verwalten des Status. GetPreferredPointer() wird // spaeter vielleicht einen passenden Pointer dafuer liefern void SetInsObjPointMode(sal_Bool bOn) { bInsObjPointMode = bOn; } sal_Bool IsInsObjPointMode() const { return bInsObjPointMode; } @@ -140,7 +140,7 @@ public: void BrkInsGluePoint() { BrkDragObj(); } sal_Bool IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; } - // Fuer die App zum Verwalten des Status. GetPreferedPointer() wird + // Fuer die App zum Verwalten des Status. GetPreferredPointer() wird // spaeter vielleicht einen passenden Pointer dafuer liefern void SetInsGluePointMode(sal_Bool bOn) { bInsGluePointMode = bOn; } sal_Bool IsInsGluePointMode() const { return bInsGluePointMode; } diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 5426c1b1bdc2..ce9062f46964 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -241,7 +241,7 @@ public: // Object-MacroModus (z.B. Rect als Button oder sowas): //************************************************************************ // Persistent. Default TRUE. SvDraw wertet das Flag u.a. bei - // SdrView::GetPreferedPointer() aus. Hat nur Wirkung, wenn das Dokument + // SdrView::GetPreferredPointer() aus. Hat nur Wirkung, wenn das Dokument // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==sal_True). void SetMacroMode(sal_Bool bOn) { bMacroMode=bOn; } sal_Bool IsMacroMode() const { return bMacroMode; } diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index d136870ba5da..cc6fcb06e60f 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -181,7 +181,7 @@ public: // SdrHitKind eHit=pSdrView->PickAnything(rMEvt,SDRMOUSEBUTTONDOWN,aVEvt); // ... hier Applikationsspezifischer Eingriff ... // pSdrView->DoMouseEvent(aVEvt); - // SetPointer(GetPreferedPointer(...)) + // SetPointer(GetPreferredPointer(...)) // CaptureMouse(...) void EnableExtendedMouseEventDispatcher(sal_Bool bOn) { bNoExtendedMouseDispatcher = !bOn; } sal_Bool IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; } @@ -217,7 +217,7 @@ public: // unvollstaendige Implementation: // Das OutputDevice ist notwendig, damit ich die HandleSize ermitteln kann. // Bei NULL wird das 1. angemeldete Win verwendet. - Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier=0, sal_Bool bLeftDown=sal_False) const; + Pointer GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier=0, sal_Bool bLeftDown=sal_False) const; SdrHitKind PickAnything(const MouseEvent& rMEvt, sal_uInt16 nMouseDownOrMoveOrUp, SdrViewEvent& rVEvt) const; SdrHitKind PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) const; sal_Bool DoMouseEvent(const SdrViewEvent& rVEvt); @@ -297,7 +297,7 @@ public: // // Sonstiges: // ~~~~~~~~~~ -// Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nTol=0) const; +// Pointer GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nTol=0) const; // OUString GetStatusText(); // ///////////////////////////////////////////////////////////////////////////////////////////////// */ diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 12326ba5653a..9ae00b7aa9ff 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -102,7 +102,7 @@ -> SvxBoxItem & SvxBoxInfoItem Additional information from DocShell: none - Bemerkung: provides dependant of chosen ValueSet-Item + Bemerkung: provides dependent of chosen ValueSet-Item only SvxBoxItem or additionally SvxBoxInfoItem If the Controller ein SfxUInt16Item receives a value != 0, paragraph mode will be switched on, diff --git a/include/tools/extendapplicationenvironment.hxx b/include/tools/extendapplicationenvironment.hxx index c8a19c4afd14..9a610a0b811e 100644 --- a/include/tools/extendapplicationenvironment.hxx +++ b/include/tools/extendapplicationenvironment.hxx @@ -24,7 +24,7 @@ namespace tools { -// Extend the environment of the process in a platform specifc way as necessary +// Extend the environment of the process in a platform specific way as necessary // for OOo-related applications; must be called first thing in main: TOOLS_DLLPUBLIC void extendApplicationEnvironment(); diff --git a/include/tools/resid.hxx b/include/tools/resid.hxx index 631f8bc8a20d..0966b3bf4630 100644 --- a/include/tools/resid.hxx +++ b/include/tools/resid.hxx @@ -84,7 +84,7 @@ public: RESOURCE_TYPE GetRT() const { return( m_nRT ); } - /** Set the type if not already set. Ask for tye with GetRT() + /** Set the type if not already set. Ask for type with GetRT() [Example] ResId aId( 1000 ); diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx index 08d44a95fe80..98e1e6b5ae3c 100644 --- a/include/ucbhelper/contenthelper.hxx +++ b/include/ucbhelper/contenthelper.hxx @@ -158,7 +158,7 @@ protected: * "getPropertySetInfo" simply return the return value of this method. * * @param xEnv is an environment to use for example, for interactions. - * @param bCache indicates, whether the implemetation should use + * @param bCache indicates, whether the implementation should use * cached data, if exist. * @return an XPropertySetInfo implementation object containing meta data * for the properties supported by this content. @@ -174,7 +174,7 @@ protected: * return the return value of this method. * * @param xEnv is an environment to use for example, for interactions. - * @param bCache indicates, whether the implemetation should use + * @param bCache indicates, whether the implementation should use * cached data, if exist. * @return an XCommandInfo implementation object containing meta data * for the commands supported by this content. diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx index 2d52d9331cfc..c2e3ab534856 100644 --- a/include/ucbhelper/interceptedinteraction.hxx +++ b/include/ucbhelper/interceptedinteraction.hxx @@ -92,7 +92,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper //----------------------------------- /** @short default ctor. - @descr Such constructed object cant be used realy. + @descr Such constructed object cant be used really. Might it will crash if its used! Dont forget to initialize all(!) members ... */ diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx index 3cec3bce2e4f..46269a15738f 100644 --- a/include/ucbhelper/resultset.hxx +++ b/include/ucbhelper/resultset.hxx @@ -493,7 +493,7 @@ public: /** * This method returns the count of objects obtained so far. There is no - * for the implemetation to obtain all objects at once. It can obtain + * for the implementation to obtain all objects at once. It can obtain * all data on demand. * * The implementation should call m_pResultSet->rowCountChanged(...) diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index 502c01aba8aa..898280ffc040 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -176,7 +176,7 @@ public: com::sun::star::uno::RuntimeException ); /** - * The implemetation of this method always returns 0. Override this + * The implementation of this method always returns 0. Override this * method, if necessary. */ virtual sal_Int16 SAL_CALL diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx index 8ba740ae4327..43b85a2a7e3b 100644 --- a/include/unotools/cmdoptions.hxx +++ b/include/unotools/cmdoptions.hxx @@ -35,7 +35,7 @@ /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx index 2583e051a16e..1b47c5f24b63 100644 --- a/include/unotools/compatibility.hxx +++ b/include/unotools/compatibility.hxx @@ -72,7 +72,7 @@ enum CompatibilityOptions /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ diff --git a/include/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx index 5475c46f8cdb..864743eca9c5 100644 --- a/include/unotools/dynamicmenuoptions.hxx +++ b/include/unotools/dynamicmenuoptions.hxx @@ -48,7 +48,7 @@ enum EDynamicMenuType /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ diff --git a/include/unotools/extendedsecurityoptions.hxx b/include/unotools/extendedsecurityoptions.hxx index 9963b919c04d..c75bb955cb90 100644 --- a/include/unotools/extendedsecurityoptions.hxx +++ b/include/unotools/extendedsecurityoptions.hxx @@ -29,7 +29,7 @@ /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx index 1b86ccc6da40..8a6f21e0485c 100644 --- a/include/unotools/fontoptions.hxx +++ b/include/unotools/fontoptions.hxx @@ -28,7 +28,7 @@ /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx index 3722b6ef3453..d57eec193c3c 100644 --- a/include/unotools/historyoptions.hxx +++ b/include/unotools/historyoptions.hxx @@ -51,7 +51,7 @@ enum EHistoryType /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ diff --git a/include/unotools/localisationoptions.hxx b/include/unotools/localisationoptions.hxx index 12d5caffc4ad..ccc1fb649571 100644 --- a/include/unotools/localisationoptions.hxx +++ b/include/unotools/localisationoptions.hxx @@ -27,7 +27,7 @@ /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx index 747a20371f1a..6ea2a3f7cc4f 100644 --- a/include/unotools/moduleoptions.hxx +++ b/include/unotools/moduleoptions.hxx @@ -41,7 +41,7 @@ /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ class SvtModuleOptions_Impl; diff --git a/include/unotools/printwarningoptions.hxx b/include/unotools/printwarningoptions.hxx index 30f35cd0d709..8a2835f70717 100644 --- a/include/unotools/printwarningoptions.hxx +++ b/include/unotools/printwarningoptions.hxx @@ -29,7 +29,7 @@ /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx index dd150f17daba..33043548a301 100644 --- a/include/unotools/securityoptions.hxx +++ b/include/unotools/securityoptions.hxx @@ -29,7 +29,7 @@ /*-************************************************************************************************************//** @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. - You can create the container if it is neccessary. The class which use these mechanism + You can create the container if it is necessary. The class which use these mechanism is faster and smaller then a complete implementation! *//*-*************************************************************************************************************/ diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx index 15587cc246d4..a262648d896c 100644 --- a/include/unotools/viewoptions.hxx +++ b/include/unotools/viewoptions.hxx @@ -186,7 +186,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op /*-****************************************************************************************************//** @short use it to set/get the window state of your view @descr These value describe position/size and some other states of a window. - Use it with right vcl methods directly. Normaly it's not neccessary to + Use it with right vcl methods directly. Normaly it's not necessary to parse given string! @seealso vcl methods diff --git a/ios/iosremote/SWRevealViewController/SWRevealViewController.m b/ios/iosremote/SWRevealViewController/SWRevealViewController.m index 53f101f0c889..30efc45e5ed8 100755 --- a/ios/iosremote/SWRevealViewController/SWRevealViewController.m +++ b/ios/iosremote/SWRevealViewController/SWRevealViewController.m @@ -549,7 +549,7 @@ static NSString * const SWSegueRightIdentifier = @"sw_right"; // the rear controller view -or the front controller view- if it is never displayed. // // If you need to manipulate views of any of your child controllers in an override - // of this method, you can load yourself the views explicitly on your overriden method. + // of this method, you can load yourself the views explicitly on your overridden method. // However we discourage it as an app following the MVC principles should never need to do so // [_frontViewController view]; diff --git a/ios/iosremote/TestFlightSDK1.2.6/libTestFlight.a b/ios/iosremote/TestFlightSDK1.2.6/libTestFlight.a Binary files differindex bc045a9fc8f4..74e7e6b44afd 100644 --- a/ios/iosremote/TestFlightSDK1.2.6/libTestFlight.a +++ b/ios/iosremote/TestFlightSDK1.2.6/libTestFlight.a diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java b/jurt/com/sun/star/comp/loader/JavaLoader.java index 3656cfed0c46..fed1f1d45ab2 100644 --- a/jurt/com/sun/star/comp/loader/JavaLoader.java +++ b/jurt/com/sun/star/comp/loader/JavaLoader.java @@ -297,7 +297,7 @@ public class JavaLoader implements XImplementationLoader, Class<?>[] paramTypes = {String.class, XMultiServiceFactory.class, XRegistryKey.class}; Object[] params = { implementationName, multiServiceFactory, xKey }; - // try to get factory from implemetation class + // try to get factory from implementation class // latest style: use the public static method __getComponentFactory // - new style: use the public static method __getServiceFactory // - old style: use the public static method getServiceFactory ( DEPRECATED ) diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index 63cda19406f2..64fe545fcd21 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -298,7 +298,7 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo OString sTmp( OU2ENC( dictpath, osl_getThreadTextEncoding() ) ); #if defined(WNT) - // workaround for Windows specifc problem that the + // workaround for Windows specific problem that the // path length in calls to 'fopen' is limted to somewhat // about 120+ characters which will usually be exceed when // using dictionaries as extensions. @@ -559,7 +559,7 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const OString sTmp( OU2ENC( dictpath, osl_getThreadTextEncoding() ) ); #if defined(WNT) - // workaround for Windows specifc problem that the + // workaround for Windows specific problem that the // path length in calls to 'fopen' is limted to somewhat // about 120+ characters which will usually be exceed when // using dictionaries as extensions. diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index e3a79df0fe66..62f682e0d459 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -313,7 +313,7 @@ sal_Int16 SpellChecker::GetSpellFailure( const OUString &rWord, const Locale &rL OString aTmpdict(OU2ENC(dict,osl_getThreadTextEncoding())); #if defined(WNT) - // workaround for Windows specifc problem that the + // workaround for Windows specific problem that the // path length in calls to 'fopen' is limted to somewhat // about 120+ characters which will usually be exceed when // using dictionaries as extensions. diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index f22286f8a4b9..3438d2dbe055 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -342,7 +342,7 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes OString aTmpdat(OU2ENC(ndat,osl_getThreadTextEncoding())); #if defined(WNT) - // workaround for Windows specifc problem that the + // workaround for Windows specific problem that the // path length in calls to 'fopen' is limted to somewhat // about 120+ characters which will usually be exceed when // using dictionaries as extensions. diff --git a/lotuswordpro/source/filter/lwpmarker.hxx b/lotuswordpro/source/filter/lwpmarker.hxx index 25b540d9f93a..d10d50450822 100644 --- a/lotuswordpro/source/filter/lwpmarker.hxx +++ b/lotuswordpro/source/filter/lwpmarker.hxx @@ -264,15 +264,15 @@ public: void Read(); OUString GetRubyText(){return m_strRubyText;} void SetRubyText(OUString sText){m_strRubyText = sText;} - OUString GetTextStyleName(){return m_TextStye;} - void SetTextStyleName(OUString sName){m_TextStye = sName;} + OUString GetTextStyleName(){return m_TextStyle;} + void SetTextStyleName(OUString sName){m_TextStyle = sName;} OUString GetRubyStyleName(){return m_RubyStyle;} void SetRubyStyleName(OUString sName){m_RubyStyle = sName;} private: LwpObjectID m_objLayout; OUString m_strRubyText; OUString m_RubyStyle; - OUString m_TextStye; + OUString m_TextStyle; }; #endif diff --git a/lotuswordpro/source/filter/xfilter/xfbase64.hxx b/lotuswordpro/source/filter/xfilter/xfbase64.hxx index 68a2233deb7e..fbea42484c38 100644 --- a/lotuswordpro/source/filter/xfilter/xfbase64.hxx +++ b/lotuswordpro/source/filter/xfilter/xfbase64.hxx @@ -64,7 +64,7 @@ /** * @brief - * Base64 algorithm implemetation. + * Base64 algorithm implementation. * I only implements encode funtion now,i'll add decode if needed later. * http://www.faqs.org/rfcs/rfc3548.html. */ diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.hxx b/lotuswordpro/source/filter/xfilter/xfstyle.hxx index 15a8c7ffe768..41951eda6a19 100644 --- a/lotuswordpro/source/filter/xfilter/xfstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfstyle.hxx @@ -85,7 +85,7 @@ public: virtual void SetStyleName(const OUString& styleName); /** - * @descr Set parent style name. + * @descr set parent style name. */ virtual OUString GetParentStyleName(); @@ -95,7 +95,7 @@ public: virtual void SetParentStyleName(const OUString& styleName); /** - * @descr get styel family. + * @descr get style family. */ virtual enumXFStyle GetStyleFamily(); diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx index dfc1f198fdbc..67c9b8a3669a 100644 --- a/mysqlc/source/mysqlc_subcomponent.hxx +++ b/mysqlc/source/mysqlc_subcomponent.hxx @@ -115,7 +115,7 @@ namespace connectivity } /** call this in the getInfoHelper method of your derived class. The method returns the array helper of the - class, which is created if neccessary. + class, which is created if necessary. */ ::cppu::IPropertyArrayHelper* getArrayHelper(); diff --git a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java index 7fb167f7081d..081502be7016 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java +++ b/odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java @@ -287,7 +287,7 @@ public class AsyncJob extends WeakBase implements XServiceInfo, XAsyncJob catch(java.lang.Throwable exIgnore) { // ignore any problem, which can occur here. - // It's not realy a bug for this example job, if + // It's not really a bug for this example job, if // it's message could not be printed out! } } @@ -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 realy using the toolkit ... + // Couldnt 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/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx index 2de4fbecab35..05bba108c173 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx @@ -131,7 +131,7 @@ namespace connectivity } /** call this in the getInfoHelper method of your derived class. The method returns the array helper of the - class, which is created if neccessary. + class, which is created if necessary. */ ::cppu::IPropertyArrayHelper* getArrayHelper(); diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java index c565fe547698..9641dc8864a9 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java @@ -49,7 +49,7 @@ public class Desk /** * main * Establish connection to a remote office and starts the demo application. - * User can overwrite some of neccessary start options by using command line parameters. + * User can overwrite some of necessary start options by using command line parameters. * * syntax: Desk [mode={inplace|outplace}] [file=<filename>] * diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java index b00bebf3ee4b..7cbb0e3ecf8b 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java @@ -359,7 +359,7 @@ public class DocumentView extends JFrame /** * callback from our internal saved frame - * which wish to die. Its not neccessary to remove listener connections + * which wish to die. Its not necessary to remove listener connections * here. Because the broadcaster do it automaticly. * We have to release all references to him only. * diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java index c227e339ab2e..88b80d34037b 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java @@ -117,7 +117,7 @@ public class FunctionHelper { // "createInstance()" method of used service manager can throw it. // Then it wasn't possible to get the URL transformer. - // Return default instead of realy parsed URL. + // Return default instead of really parsed URL. aURL = null; } @@ -253,7 +253,7 @@ public class FunctionHelper // is returned. But normaly nobody outside the office knows this id. // New version of this method ignore the id parameter and creation will // work. - // Note: You must be shure if your window handle can be realy used by + // Note: You must be shure if your window handle can be really used by // the remote office. Means if this java client and the remote office // use the same display! com.sun.star.awt.XSystemChildFactory xChildFactory = @@ -272,7 +272,7 @@ public class FunctionHelper if (xPeer==null) { // mode 3) OK - new version doesn't work. It requires the - // process id which we doesn't have. + // process id which we don't have. // So we must use the old way to get the right window peer. // Pack the handle inside a wrapper object. JavaWindowPeerFake aWrapper = new @@ -308,7 +308,7 @@ public class FunctionHelper // java window. In this case it should be enough to set return // values to null. All other resources (which was created before) // will be freed automaticly if scope wil be leaved. - System.out.println("May be the NativeView object wasn't realy visible at calling time of getNativeWindow()?"); + System.out.println("May be the NativeView object wasn't really visible at calling time of getNativeWindow()?"); xPeer = null; xWindow = null; } @@ -494,7 +494,7 @@ public class FunctionHelper * Dispatch an URL to given frame. * Caller can register himself for following result events for dispatched * URL too. Notifications are guaranteed (instead of dispatch()) - * Returning of the dispatch object isn't neccessary. + * Returning of the dispatch object isn't necessary. * Nobody must hold it alive longer the dispatch needs. * * @param xFrame frame which should be the target of this dispatch @@ -984,7 +984,7 @@ public class FunctionHelper /** * helper to get a file URL selected by user * This method doesn't show any API concepts ... - * but is neccessary rof this demo application. + * but is necessary rof this demo application. * * @param aParent parent window of this dialog * @param bOpen If it is set to true => diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java index 0ab7aa0cd606..22ce6388d1a8 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java @@ -54,7 +54,7 @@ public interface IOnewayLink * @param nRequest * The two user of this callback can define an unique number, * which identify the type of original interface method. So the called - * interface object can decide, which action will be neccessary. + * interface object can decide, which action will be necessary. * * @param lParams * If the original method used parameters, they will be coded here in diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java index bdb6f6465e4b..88eeb2fd322f 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java @@ -46,7 +46,7 @@ import com.sun.star.uno.UnoRuntime; * on any frame used in this demo application. * It intercept all URL's which try to create a new empty frame. * (e.g. "private:factory/swriter") - * Nobody can guarantee that this interception will be realy used - + * Nobody can guarantee that this interception will be really used - * because another interceptor (registered at a later time then this one!) * will be called before this one. * Implementation is executed inside a new thread to prevent application @@ -114,7 +114,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener, //_____________________ /** - * start working as frame action listener realy. + * start working as frame action listener really. * We will be frame action listener here. In case * we get a frame action which indicates, that we should * update our interception. Because such using of an interecptor @@ -524,7 +524,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener, /** * Notification of status listener isn't guaranteed (instead of listener on XNotifyingDispatch interface). - * So this interceptor doesn't support that realy ... + * So this interceptor doesn't support that really ... */ public /*ONEWAY*/ void addStatusListener(/*IN*/ com.sun.star.frame.XStatusListener xListener,/*IN*/ com.sun.star.util.URL aURL) { @@ -573,7 +573,7 @@ public class Interceptor implements com.sun.star.frame.XFrameActionListener, /** * This class listen on the intercepted frame to free all used resources on closing. * We forget the reference to the frame only here. Deregistration - * isn't neccessary here - because this frame dies and wish to forgoten. + * isn't necessary here - because this frame dies and wish to forgoten. * * @param aSource * must be our internal saved frame, on which we listen for frame action events diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java index da6078a6a905..d374af04864b 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java @@ -54,7 +54,7 @@ public class NativeView extends java.awt.Canvas /** * ctor - * Does nothing realy. + * Does nothing really. * We can use our JNI mechanism for an already visible * canvas only. So we overload the method for showing ("setVisible()") * and make our intialization there. BUt we try to show an empty clean @@ -70,8 +70,8 @@ public class NativeView extends java.awt.Canvas // ____________________ /** - * Overload this method to make neccessary initializations here. - * (e.g. get the window handle and neccessary system information) + * Overload this method to make necessary initializations here. + * (e.g. get the window handle and necessary system information) * * Why here? * Because the handle seams to be available for already visible windows @@ -110,7 +110,7 @@ public class NativeView extends java.awt.Canvas /** * overload paint routine to show provide against - * repaint errors if no office view is realy plugged + * repaint errors if no office view is really plugged * into this canvas. * If handle is present - we shouldn't paint anything further. * May the remote window is already plugged. In such case we @@ -159,7 +159,7 @@ public class NativeView extends java.awt.Canvas // ____________________ /** - * for using of the JNI methods it's neccessary to load + * for using of the JNI methods it's necessary to load * system library which exports it. */ static diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java index 2861b23bde3a..355be64638da 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java @@ -39,7 +39,7 @@ import java.util.ArrayList; /** * It's not allowed to call synchronoues back inside an oneway interface call. * (see IOnewayLink too). So we start a thread (implemented by this class), which - * gets all neccessary parameters from the original called object and + * gets all necessary parameters from the original called object and * call it back later inside his run() method. So the execution of such oneway call * will be asynchronous. It works in a generic way and can be used or any type * of oneway request. Because the source and the target of this call-link knows, @@ -82,7 +82,7 @@ class OnewayExecutor extends Thread /** * ctor - * It's initialize this thread with all neccessary parameters. + * It's initialize this thread with all necessary parameters. * It gets the object, which wish to be called back and the type * and parameters of the original request. * @@ -90,7 +90,7 @@ class OnewayExecutor extends Thread * The two user of this callback can define an unique number, * which identify the type of original interface method. * So the called interface object can decide, which action will be - * neccessary. + * necessary. * * @param lParams * If the original method used parameters, they will be coded here in @@ -119,7 +119,7 @@ class OnewayExecutor extends Thread /** * implements the thread function * Here we call the internal set link object back and - * give him all neccessary parameters. + * give him all necessary parameters. * After that we die by ouerself ... */ public void run() diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java index 5de834dac847..2f41916e24ea 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java @@ -74,7 +74,7 @@ class StatusListener implements com.sun.star.frame.XStatusListener, * @member m_sTrueText this text will be shown at the used UI control as description for an enabled status * @member m_sFalseText this text will be shown at the used UI control as description for an disabled status * @member m_xDispatch if we listen for status events, we must hold the dispatch object alive! - * @member m_xFrame reference to the frame, which can provide new dispatch objects if it's neccessary to update it + * @member m_xFrame reference to the frame, which can provide new dispatch objects if it's necessary to update it * @member m_aURL and of course we must be registered for a special URL * @member m_bIsActionListener indicates if we are currently registered as a listener for frame action events or not * @member m_bIsStatusListener indicates if we are currently registered as a listener for status events or not @@ -95,7 +95,7 @@ class StatusListener implements com.sun.star.frame.XStatusListener, /** * ctor * It initialize an instance of this class only. - * We set all neccessary information on our internal member - that's it + * We set all necessary information on our internal member - that's it */ StatusListener( /*IN*/ Component rControl , /*IN*/ String sTrueText , @@ -118,7 +118,7 @@ class StatusListener implements com.sun.star.frame.XStatusListener, //_____________________ /** - * start working as frame action listener realy. + * start working as frame action listener really. * In case we get such frame action, it indicates that we should * update our internal saved dispatch object on which we listen * for status events. So we can do it automaticly. The outside code @@ -185,9 +185,9 @@ class StatusListener implements com.sun.star.frame.XStatusListener, /** * This is the callback method for such frame action events, we listen for. * Because it's a oneway method we start a thread as reaction. This thread call - * us back and we can do neccessary things there. - * But we shouldn't start such action - if it's not realy neccessary. - * So we check before, if we are intereested on this event realy. + * us back and we can do necessary things there. + * But we shouldn't start such action - if it's not really necessary. + * So we check before, if we are intereested on this event really. * * @see impl_frameAction() * @@ -226,9 +226,9 @@ class StatusListener implements com.sun.star.frame.XStatusListener, /** * This is the callback method for the status we listen for an wish to show it - * on our UI control. Of yourse it's a oneway method ... but we doesn't call back + * on our UI control. Of course it's a oneway method ... but we don't call back * to the office synchronously here. We update our UI only. So we don't leave this - * java process. In such case it's not neccessary to use threads to decouple it. + * java process. In such case it's not necessary to use threads to decouple it. * Do it here and now ... * * @param aEvent @@ -242,7 +242,7 @@ class StatusListener implements com.sun.star.frame.XStatusListener, return; // enable/dsiable th control. - // Means: If the feature isn't available currently - we can't show an status realy here. + // Means: If the feature isn't available currently - we can't show an status really here. // Then we should colorize it gray ... m_rControl.setEnabled(aEvent.IsEnabled); @@ -279,7 +279,7 @@ class StatusListener implements com.sun.star.frame.XStatusListener, // Detect type of state value // and set it on internal well known UI control - // But do it only, if value realy change. + // But do it only, if value really change. if(aEvent.State instanceof String) { String sState = (String)aEvent.State; @@ -382,7 +382,7 @@ class StatusListener implements com.sun.star.frame.XStatusListener, /** * callback for disposing events * Our dispatch or frame object inform us about his following dead ... - * So we must forget his reference. But it's not neccessary to + * So we must forget his reference. But it's not necessary to * remove listener connections here. Because the broadcaster * forget us automaticly. The only thing we have to do: release * his reference and let him die! diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java index 51c506bdd3f1..63ae142deae9 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java @@ -46,7 +46,7 @@ import java.lang.String; * It uses separate listener threads to get this information * and actualize it automatically, if frame broadcast changes of * his contained document. - * Threads are neccessary to prevent this view against deadlocks. + * Threads are necessary to prevent this view against deadlocks. * These deadlocks can occur if a listener will be notified * by the office in an "oneway" method and try to call back * to the office by using a synchronous method. diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java index b7e113b18c29..5b9851188aea 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java @@ -53,7 +53,7 @@ public class ViewContainer extends Thread /** * provides a singleton view container - * Neccessary for terminate(9 functionality to be able + * Necessary for terminate(9 functionality to be able * to call Runtime.runFinilization(). * * @return a reference to the singleton ViewContainer instance @@ -145,12 +145,12 @@ public class ViewContainer extends Thread // remote references. if (nViewCount<1) { - boolean bNeccessary = false; + boolean bNecessary = false; synchronized(this) { - bNeccessary = ! mbShutdownActive; + bNecessary = ! mbShutdownActive; } - if (bNeccessary==true) + if (bNecessary==true) { System.out.println("call exit(0)!"); System.exit(0); diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java index dd11cec69156..7dfce4705dd0 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java @@ -57,7 +57,7 @@ import com.sun.star.document.XFilter; During import/export special functionality can be used to e.g. to change some characters inside the file content or replace some strings (no using of regular expressions!). - User can decide at runtime which functionality realy should + User can decide at runtime which functionality really should be used by selecting it in an extra filter property dialog. So we show how a filter works fro iport/export, use or create @@ -106,7 +106,7 @@ public class AsciiReplaceFilter // native interface /** * special debug helper to get an idea how expensive - * the implemented filter operations are realy. + * the implemented filter operations are really. * May be useful for own purposes. * * To see the output inside an office environment @@ -232,7 +232,7 @@ public class AsciiReplaceFilter * It's not allowed for us - neither very easy to change our internal * name during runtime of an office. Because every filter name must * be unambigous ... - * So we doesn't implement this method here. + * So we don't implement this method here. */ public void setName( String sName ) { @@ -395,7 +395,7 @@ public class AsciiReplaceFilter * But if some optional filter options are given * we make some changes: replace chars or complete strings. * - * Note: It's not alloed for a filter to seek inside the stream. + * Note: It's not allowed for a filter to seek inside the stream. * Because the outside frameloader has to set the stream position * right and a filter must read till EOF occurs only. * @@ -403,7 +403,7 @@ public class AsciiReplaceFilter * the target text model to put the data in * * @param aOptions - * capsulate all other neccessary information for this filter request + * capsulate all other necessary information for this filter request * (streams, replace values ...) * * @return a bool value which describes if method was successfully or not. @@ -527,7 +527,7 @@ public class AsciiReplaceFilter * a text model. We copy every letter from the document. * There are no checks. * - * Note: It's not alloed for a filter to seek inside the stream. + * Note: It's not allowed for a filter to seek inside the stream. * Because the outside frameloader has to set the stream position * right and a filter must read till EOF occurs only. * @@ -535,7 +535,7 @@ public class AsciiReplaceFilter * the source text model to get the data from * * @param aOptions - * capsulate all other neccessary information for this filter request + * capsulate all other necessary information for this filter request * (streams, replace values ...) * * @return a bool value which describes if method was successfully or not. @@ -560,7 +560,7 @@ public class AsciiReplaceFilter measure("get text from model"); - // Normaly this function isn't realy cancelable + // Normaly this function isn't really cancelable // But we following operation can be very expensive. So // this place is the last one to stop it. synchronized(this) diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java index 1a94bd72ab58..73198adb717a 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java @@ -40,8 +40,8 @@ import com.sun.star.lang.XMultiComponentFactory; import com.sun.star.uno.UnoRuntime; /*-************************************************************************ - @title helper to analyze neccessary option properties of our filter - @description Our filter needs some neccessary properties for working: + @title helper to analyze necessary option properties of our filter + @description Our filter needs some necessary properties for working: - a stream for input or output - or an URL for creating such streams - information about required action on filtering @@ -179,8 +179,8 @@ public class FilterOptions /** * with this method it's possible for the outside filter to decide - * if he can use this FilterOptions realy or not. - * That means especialy if neccessary streams are available or not. + * if he can use this FilterOptions really or not. + * That means especialy if necessary streams are available or not. */ public boolean isValid() { diff --git a/odk/examples/DevelopersGuide/Text/TextDocuments.java b/odk/examples/DevelopersGuide/Text/TextDocuments.java index b981e231a738..ace39e924e3b 100644 --- a/odk/examples/DevelopersGuide/Text/TextDocuments.java +++ b/odk/examples/DevelopersGuide/Text/TextDocuments.java @@ -314,7 +314,7 @@ public class TextDocuments { mxDocFactory = UnoRuntime.queryInterface( XMultiServiceFactory.class, mxDoc ); - // Examples of text fields, dependant text fields and field masters + // Examples of text fields, dependent text fields and field masters TextFieldExample (); // Example of using an XEnumerationAccess to iterate over paragraphs and diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx index d13da536c103..61ab750d3a50 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx @@ -211,7 +211,7 @@ Sequence< ::rtl::OUString > SAL_CALL MyProtocolHandler::getSupportedServiceNames void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < PropertyValue >& lArgs ) throw (RuntimeException) { - /* Its neccessary to hold this object alive, till this method finish. + /* Its necessary to hold this object alive, till this method finish. May the outside dispatch cache (implemented by the menu/toolbar!) forget this instance during de-/activation of frames (focus!). diff --git a/odk/examples/java/Spreadsheet/XCalcAddins.idl b/odk/examples/java/Spreadsheet/XCalcAddins.idl index d00ba549a62c..2c6dd3859207 100644 --- a/odk/examples/java/Spreadsheet/XCalcAddins.idl +++ b/odk/examples/java/Spreadsheet/XCalcAddins.idl @@ -49,7 +49,7 @@ module org { any number of arguments after xOptions. Furthermore, you could replace the name of the service and the interface, but only if you want to replace this name in all - your project files. This example will work with tNeccessaryhe default + your project files. This example will work with tNecessaryhe default names. Interface names should start with an X prefix. */ diff --git a/offapi/README b/offapi/README index 4417ecc749b6..6f5c1cc6101c 100644 --- a/offapi/README +++ b/offapi/README @@ -1,6 +1,6 @@ Contains all of the IDL files except those in [[udkapi]] -i.e. the interfaces that are specific to the OppenOffice.org application. +i.e. the interfaces that are specific to the LibreOffice application. An artificial (?) separation. The reference offapi/type_reference/offapi.idl and diff --git a/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs b/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs index 4f07a3fbbd2c..3f3fb5ee9f01 100644 --- a/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs +++ b/officecfg/registry/schema/org/openoffice/FirstStartWizard.xcs @@ -19,7 +19,7 @@ <!DOCTYPE oor:component-schema SYSTEM "../../../component-schema.dtd"> <oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="FirstStartWizard" oor:package="org.openoffice" xml:lang="en-US"> <info> - <desc>Contains properties regarding the first start wiazrd.</desc> + <desc>Contains properties regarding the first start wizard.</desc> </info> <templates> <group oor:name="Option"> diff --git a/officecfg/registry/schema/org/openoffice/Office/Addons.xcs b/officecfg/registry/schema/org/openoffice/Office/Addons.xcs index ee78884a9d42..74cbf453fa5a 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Addons.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Addons.xcs @@ -278,7 +278,7 @@ </prop> <prop oor:name="OwnerDraw" oor:type="xs:boolean"> <info> - <desc>Specifies whether the contents of the status bar item are drawn by the client (true) or by the internal implemenetation (false).</desc> + <desc>Specifies whether the contents of the status bar item are drawn by the client (true) or by the internal implementation (false).</desc> </info> <value>false</value> </prop> @@ -412,7 +412,7 @@ </set> <set oor:name="OfficeHelp" oor:node-type="MenuItem"> <info> - <desc>Contains a list of functions inserted into the Office help menu. The optional property 'Submeno' will be ignored for this set.</desc> + <desc>Contains a list of functions inserted into the Office help menu. The optional property 'Submenu' will be ignored for this set.</desc> </info> </set> </group> diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index 0cdb9d51cd1e..a45aaa3dcce6 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1445,7 +1445,7 @@ </group> <group oor:name="Load"> <info> - <desc>Contains settings that affect formula handling while laoding.</desc> + <desc>Contains settings that affect formula handling while loading.</desc> </info> <prop oor:name="OOXMLRecalcMode" oor:type="xs:int" oor:nillable="false"> <!-- UIHint: Tools - Options - Spreadsheet - Formula --> diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index affd280d0bde..53499848d35f 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -971,7 +971,7 @@ <desc>Specifies if the Application Repaint shall use a buffer for Pre-Rendering. If on, screen flicker is greatly reduced and remote display is fast, but a buffer (graphics memory) is needed. If off, - screen flicker will occurr and remote display is slow, but no buffer + screen flicker will occur and remote display is slow, but no buffer is needed. This is the global switch for the whole office.</desc> <label>Application Repaint is allowed to use Pre-Rendering Buffer.</label> @@ -1098,7 +1098,7 @@ activated and thus avoids AntiAliasing of pure Horizontal or Vertical Hairlines.</desc> <label>Determines if Horizontal and Vertical HairLines in AntiAliased - mode are snapped to discrete pixles to enhance visualisation</label> + mode are snapped to discrete pixels to enhance visualisation</label> </info> <value>true</value> </prop> @@ -1195,7 +1195,7 @@ <info> <desc>Specifies the maximum allowed luminance the system's selection color may have. When the colorfetched from the system is brighter - (luminacne is bigger), it will be scaled to a luminance of exactly + (luminance is bigger), it will be scaled to a luminance of exactly this given value.</desc> <label>Specifies the maximum allowed luminance for the system's selection color.</label> @@ -1259,7 +1259,7 @@ <!-- OldPath: AutoCorrect/Options/All --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools AutoCorrect/AutoFormat Options - URL - regocnition --> + recognition --> <info> <desc>Specifies if character strings which could represent an URL should be converted to a hyperlink.</desc> @@ -1408,7 +1408,7 @@ <!-- OldPath: AutoCorrect/Options/All --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools - AutoCorrect/AutoFormat - Exceptions - - Abbrevation --> + Abbreviation --> <info> <desc>Specifies if defined abbreviations should be taken into account to exclude a preceding capital letter.</desc> @@ -4728,7 +4728,7 @@ <desc>Contains settings for HTML import.</desc> </info> <prop oor:name="NumbersEnglishUS" oor:type="xs:boolean" oor:nillable="false"> - <!-- UIHints: Tools Options Load/Save - HTML Compability [Section] + <!-- UIHints: Tools Options Load/Save - HTML Compatibility [Section] Import --> <info> <desc>Specifies if numbers should be parsed according to the en-US @@ -5231,7 +5231,7 @@ </enumeration> <enumeration oor:value="3"> <info> - <desc>Opens magnified to fit the entire width of its boundig + <desc>Opens magnified to fit the entire width of its bounding box within the window (cuts out margins).</desc> </info> </enumeration> @@ -5540,14 +5540,14 @@ </prop> <prop oor:name="ExperimentalMode" oor:type="xs:boolean" oor:nillable="false"> <info> - <desc>Determins if various experimental, and potentially unstable + <desc>Determines if various experimental, and potentially unstable features should be enabled in the user interface.</desc> </info> <value>false</value> </prop> <prop oor:name="MacroRecorderMode" oor:type="xs:boolean" oor:nillable="false"> <info> - <desc>Determins if the limited, and awkward code producing + <desc>Determines if the limited, and awkward code producing macro recorder should be enabled in the user interface.</desc> </info> <value>false</value> @@ -6282,7 +6282,7 @@ <info> <author>ALG</author> <desc> - This option allows to make previews (e.g. UI previews for object attirbutes) show the content with a checkeded + This option allows to make previews (e.g. UI previews for object attributes) show the content with a checkered background to allow simple identification and better preview of transparent content, e.g. when a draw object is filled with a transparent graphic (SVG or bitmap) the preview will show the checkered background shine through, so the user can identify that the fill has transparency with a single look. @@ -6499,7 +6499,7 @@ </info> <prop oor:name="RecognizeSmartTags" oor:type="xs:boolean" oor:nillable="false"> <info> - <desc>Specifies whether smart tag recognization is enabled.</desc> + <desc>Specifies whether smart tag recognition is enabled.</desc> </info> <value>true</value> </prop> diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs index 7009d3272662..c34b2983d4f0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs @@ -662,7 +662,7 @@ </prop> <prop oor:name="PreferMailFormat" oor:type="xs:string"> <info> - <desc>Specifies the perfered mail format.</desc> + <desc>Specifies the preferred mail format.</desc> </info> </prop> <prop oor:name="WorkPhone" oor:type="xs:string"> @@ -819,9 +819,9 @@ <info> <desc>HSQLDB features calling Java code directly from SQL statements. For security reasons, this is restricted to classes from the org.hsqldb.Library package, - the java.lang.math package, plus any methods specified in this configuraton + the java.lang.math package, plus any methods specified in this configuration setting. If a method specification ends with .*, then all methods - from the respectiv package are permitted.</desc> + from the respective package are permitted.</desc> </info> </group> </group> diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs index 04bc03332bc8..f78f37103ef9 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs @@ -713,7 +713,7 @@ <!-- OldPath: Draw/Grid/Resolution --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools - Options - Drawing Grid - [Section] Grid --> - <!-- Notice: Default- nonmerical value: 1270 1/100 mm. --> + <!-- Notice: Default- nonmetrical value: 1270 1/100 mm. --> <info> <desc>Defines the vertical distance between adjacent grid points.</desc> <label>Y Axis Resolution</label> diff --git a/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs b/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs index 685bd3fa2e1b..2d3287c39be6 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Embedding.xcs @@ -118,7 +118,7 @@ </set> <group oor:name="MimeTypeClassIDRelations" oor:extensible="true"> <info> - <desc>Contains convertion table from MimeType to ClassID. MimeType is used as a name for entry.</desc> + <desc>Contains conversion table from MimeType to ClassID. MimeType is used as a name for entry.</desc> </info> </group> <group oor:name="UserFactories" oor:extensible="true"> diff --git a/officecfg/registry/schema/org/openoffice/Office/ExtensionDependencies.xcs b/officecfg/registry/schema/org/openoffice/Office/ExtensionDependencies.xcs index 29632214f479..38160475e78a 100644 --- a/officecfg/registry/schema/org/openoffice/Office/ExtensionDependencies.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/ExtensionDependencies.xcs @@ -19,16 +19,16 @@ --> <oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="ExtensionDependencies" oor:package="org.openoffice.Office" xml:lang="en-US"> <info> - <desc>Contains a list of extensions with additonal dependencies to overrule missing dependencies in extensions or to control specific extensions in general.</desc> + <desc>Contains a list of extensions with additional dependencies to overrule missing dependencies in extensions or to control specific extensions in general.</desc> </info> <templates> <group oor:name="Extension"> <info> - <desc>Describes the additonal meta data for an extension whereas the node name have to be the extension identifier.</desc> + <desc>Describes the additional meta data for an extension whereas the node name have to be the extension identifier.</desc> </info> <prop oor:name="Versions" oor:type="oor:string-list" oor:localized="false"> <info> - <desc>Specifies a list of extension versions for which the extra dependecies should be active.</desc> + <desc>Specifies a list of extension versions for which the extra dependencies should be active.</desc> </info> </prop> <prop oor:name="Platforms" oor:type="oor:string-list" oor:localized="false"> @@ -38,7 +38,7 @@ </prop> <prop oor:name="Dependencies" oor:type="xs:string" oor:localized="false"> <info> - <desc>Specifies a list of additonal dependencies.</desc> + <desc>Specifies a list of additional dependencies.</desc> </info> </prop> </group> @@ -46,7 +46,7 @@ <component> <set oor:name="Extensions" oor:node-type="Extension"> <info> - <desc>Specifies the list of extensions with extra dependecies.</desc> + <desc>Specifies the list of extensions with extra dependencies.</desc> </info> </set> </component> diff --git a/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs b/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs index c48e6d60bee9..893fd882ac37 100644 --- a/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs @@ -49,7 +49,7 @@ </group> <group oor:name="ExtensionUpdateData"> <info> - <desc>Contains inforamtion about availabe or ignored updates for extensions."</desc> + <desc>Contains information about available or ignored updates for extensions."</desc> </info> <set oor:name="AvailableUpdates" oor:node-type="UpdateInfo"> <info> diff --git a/officecfg/registry/schema/org/openoffice/Office/Histories.xcs b/officecfg/registry/schema/org/openoffice/Office/Histories.xcs index fcdc07305018..ec299adac958 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Histories.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Histories.xcs @@ -48,7 +48,7 @@ </info> <prop oor:name="HistoryItemRef" oor:type="xs:string"> <info> - <desc>Reference to an item of the orginal history list.</desc> + <desc>Reference to an item of the original history list.</desc> </info> </prop> </group> diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs index b740aca6ce04..f5f9a42ac487 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs @@ -70,7 +70,7 @@ <group oor:name="StartupService"> <info> <desc> - A service that is instantiated when a framework is initializd for a + A service that is instantiated when a framework is initialized for a Draw or Impress document. </desc> </info> @@ -422,7 +422,7 @@ <prop oor:name="ShowUndoDeleteWarning" oor:type="xs:boolean" oor:nillable="false"> <!-- OldPath: --> <!-- OldLocation: --> - <!-- UIHints: UNDO stack delete warnng dialog --> + <!-- UIHints: UNDO stack delete warning dialog --> <info> <desc>Indicates whether the warning dialog appears when setting a new standard page layout.</desc> <label>Show Undo-Stack Delete Warning</label> @@ -519,7 +519,7 @@ <prop oor:name="PreviewTransitions" oor:type="xs:boolean" oor:nillable="false"> <!-- OldPath: --> <!-- OldLocation: --> - <!-- UIHints: automatic preview in slide transtion panel --> + <!-- UIHints: automatic preview in slide transition panel --> <info> <desc>Indicates whether changes in the slide transition panel should be previewed.</desc> <label>Automatic preview for slide transition panel</label> @@ -923,7 +923,7 @@ <!-- OldPath: Impress/Grid/Resolution --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools - Options - Presentation Grid - [Section] Grid --> - <!-- Notice: Default- nonmerical value: 1270 1/100 mm. --> + <!-- Notice: Default- nonmetrical value: 1270 1/100 mm. --> <info> <desc>Defines the vertical distance between adjacent grid points.</desc> <label>Y Axis Resolution</label> diff --git a/officecfg/registry/schema/org/openoffice/Office/Java.xcs b/officecfg/registry/schema/org/openoffice/Office/Java.xcs index 8d2cdfc5f2c1..95d9947a3d4d 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Java.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Java.xcs @@ -87,7 +87,7 @@ </enumeration> <enumeration oor:value="3"> <info> - <desc>None - no connection alloed</desc> + <desc>None - no connection allowed</desc> </info> </enumeration> </constraints> diff --git a/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs b/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs index a9df82cd07b1..35474f14fd87 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Jobs.xcs @@ -65,7 +65,7 @@ </info> <set oor:name="JobList" oor:node-type="TimeStamp"> <info> - <desc>This list contains all registered jobs, which wish to be executed, if the coressponding event was triggered.</desc> + <desc>This list contains all registered jobs, which wish to be executed, if the corresponding event was triggered.</desc> </info> </set> </group> diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs index 9b78c7a269bc..ace6f963070a 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs @@ -55,7 +55,7 @@ </info> <prop oor:name="SupportedDictionaryFormats" oor:type="oor:string-list"> <info> - <desc>The list of all dictionry formats the service can handle.</desc> + <desc>The list of all dictionary formats the service can handle.</desc> <label>Supported dictionary formats</label> </info> </prop> @@ -74,7 +74,7 @@ </group> <group oor:name="VendorImagesEntry"> <info> - <desc>The images for vendor specifc branding in the UI. The node name is + <desc>The images for vendor specific branding in the UI. The node name is the service implementation name.</desc> </info> <prop oor:name="SpellAndGrammarDialogImage" oor:type="xs:string"> @@ -114,7 +114,7 @@ <group oor:name="GrammarCheckerEntry"> <info> <desc>Specifies the settings for a grammar checker. The node name is the - grammar checkers implemetation name.</desc> + grammar checkers implementation name.</desc> </info> <prop oor:name="Locales" oor:type="oor:string-list"> <info> @@ -371,7 +371,7 @@ <!-- UIHints: Tools - Options - General - Language --> <info> <desc>Allows spellchecking in headers, footers, and frames.</desc> - <label>Check spelljng in special regions</label> + <label>Check spelling in special regions</label> </info> <value>true</value> </prop> diff --git a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs index a1bcbd949247..e328cada2ddd 100644 --- a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs @@ -105,7 +105,7 @@ <info> <desc>The Emailaddress to fill out in the reportmail.xml file. DO NOT SET THIS VALUE UNLESS YOU KNOW WHAT YOU ARE DOING! - Its only purpose is testing and quality assureance. + Its only purpose is testing and quality assurance. </desc> </info> <value/> diff --git a/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs b/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs index beb1ef89bd47..4be6705aaf05 100644 --- a/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs @@ -74,7 +74,7 @@ </info> <set oor:name="Nodes" oor:node-type="OrderedNode"> <info> - <desc>A set member countains a Node (see type Node) which has been + <desc>A set member contains a Node (see type Node) which has been assigned to this Module. Also entities which do not own the Module may add members to the set. Please look at the specification for applying restrictions @@ -261,7 +261,7 @@ </set> <set oor:name="Modules" oor:node-type="Module"> <info> - <desc>List of availabe application contexts</desc> + <desc>List of available application contexts</desc> </info> </set> <set oor:name="Nodes" oor:node-type="Node"> diff --git a/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs index 881ce73134f9..01bb5a68b103 100644 --- a/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs @@ -259,7 +259,7 @@ </info> <prop oor:name="Name" oor:type="xs:string"> <info> - <desc>Name of the entry. May be used to have mode dependant entries.</desc> + <desc>Name of the entry. May be used to have mode dependent entries.</desc> </info> </prop> <prop oor:name="Type" oor:type="xs:string"> @@ -388,7 +388,7 @@ <group oor:name="ViewStyle"> <info> <desc>Visual properties of a view style: - font and backround color.</desc> + font and background color.</desc> </info> <prop oor:name="StyleName" oor:type="xs:string"> <info> diff --git a/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs b/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs index 4796fcd9602d..98230cea7199 100644 --- a/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs @@ -18,7 +18,7 @@ --> <oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="ReportDesign" oor:package="org.openoffice.Office" xml:lang="en-US"> <info> - <desc>Contains informatation of report design.</desc> + <desc>Contains information of report design.</desc> </info> <component> <group oor:name="PropertyBrowser"> diff --git a/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs b/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs index f12945ad5f7f..fa9aacd52dfe 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Scripting.xcs @@ -24,7 +24,7 @@ <templates> <group oor:name="RuntimeNode"> <info> - <desc>Specifies the runtimes available to the Scriptying Framework.</desc> + <desc>Specifies the runtimes available to the Scripting Framework.</desc> </info> <prop oor:name="SupportedFileExtensions" oor:type="oor:string-list"> <info> diff --git a/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs b/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs index 4f652fc9dbb3..82333e47e561 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Substitution.xcs @@ -37,7 +37,7 @@ </info> <prop oor:name="OS" oor:type="xs:string"> <info> - <desc>Specifies the operating system required for this share point mapping. As a result, system depedent settings can be defined.</desc> + <desc>Specifies the operating system required for this share point mapping. As a result, system dependent settings can be defined.</desc> </info> </prop> <prop oor:name="Host" oor:type="xs:string"> diff --git a/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs b/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs index 97183e97dd4c..48d2c5332eb2 100644 --- a/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs @@ -32,7 +32,7 @@ <info> <desc>Because there can exists more then one implementations of such TaskCreatorService, the actual one must be specified with it's UNO implementation name. - Otherwise it's not guaranteed, which implementation is realy used at runtime.</desc> + Otherwise it's not guaranteed, which implementation is really used at runtime.</desc> </info> </prop> </group> diff --git a/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs b/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs index 9fe359ed6023..d5fab6267379 100644 --- a/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/TableWizard.xcs @@ -89,7 +89,7 @@ </group> <group oor:name="TWizCategory"> <info> - <desc>Information on the categries of the table wizard</desc> + <desc>Information on the categories of the table wizard</desc> </info> <prop oor:name="Index" oor:type="xs:int"> <info> diff --git a/officecfg/registry/schema/org/openoffice/Office/UI.xcs b/officecfg/registry/schema/org/openoffice/Office/UI.xcs index 1968127f2f86..9d1015e05ab0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI.xcs @@ -622,7 +622,7 @@ </info> <prop oor:name="FillAsynchronously" oor:type="xs:boolean" oor:nillable="false"> <info> - <desc>Specifies whether the dialog should fill its view asynchronously. Asnychronous filling allows the user to cancel blocking operations, which may be useful for instance for mounted, but dead NFS devices.</desc> + <desc>Specifies whether the dialog should fill its view asynchronously. Asynchronous filling allows the user to cancel blocking operations, which may be useful for instance for mounted, but dead NFS devices.</desc> </info> <value>false</value> </prop> diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs index 65599123587e..54964677666e 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs @@ -87,7 +87,7 @@ com.sun.star.sheet.SpreadsheetDocument com.sun.star.presentation.PresentationDocument com.sun.star.drawing.DrawingDocument - + Recognized shortcuts: Writer Calc @@ -98,9 +98,9 @@ DrawImpress WriterVariants These shortcuts exist for even more convenience and handle the frequent case of Draw - and Impress as well as different variants of the Writer where they have otherwise + and Impress as well as different variants of the Writer where they have otherwise identical context descriptions. - + Special values: any none @@ -114,11 +114,11 @@ Special values: any - 3 Panel state. One of + 3 Panel state. One of visible Panel is initially visible and expanded hidden Panel is initially collapsed, ie only its title bar is visible - 4 (Optional, only used for panels) UNO command that overrides the DefaultMenuCommand. Use + 4 (Optional, only used for panels) UNO command that overrides the DefaultMenuCommand. Use the special value none to override the DefaultMenuCommand to the empty string and thereby disable the showing of a) the menu button in the panel titlebar and b) the showing of a dialog. </desc></info> @@ -142,7 +142,7 @@ </prop> <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean"> <info> - <desc>When true then the title bar can be ommitted when the panel is the only panel in a deck.</desc> + <desc>When true then the title bar can be omitted when the panel is the only panel in a deck.</desc> </info> <value>false</value> </prop> @@ -181,7 +181,7 @@ <prop oor:name="DefaultMenuCommand" oor:type="xs:string"> <info><desc> The default UNO command to execute when the user clicks on the menu button in the panel title bar. - Can be overriden in the ContextList to provide context dependent menu dialogs. + Can be overridden in the ContextList to provide context dependent menu dialogs. When empty then the menu icon is not shown in the panel title bar. </desc></info> <value></value> diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs index b66edc9e8549..e3e0dd499481 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs @@ -77,7 +77,7 @@ </prop> <prop oor:name="Size" oor:type="xs:string"> <info> - <desc>Specifies the size of a floating user interface element in pixel. The real size can differ if the layout manager decides to resize it due to current circumenstances. Width and height must be splitted by an comma.</desc> + <desc>Specifies the size of a floating user interface element in pixel. The real size can differ if the layout manager decides to resize it due to current circumstances. Width and height must be splitted by an comma.</desc> </info> </prop> <prop oor:name="UIName" oor:type="xs:string" oor:localized="true"> diff --git a/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs b/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs index 9f7135705307..3585d4c0f0af 100644 --- a/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs @@ -58,7 +58,7 @@ </prop> <prop oor:name="ExporterClass" oor:type="xs:string"> <info> - <desc>A full quilified class name of the exporter class</desc> + <desc>A full qualified class name of the exporter class</desc> </info> </prop> <prop oor:name="OwnDirectory" oor:type="xs:boolean"> @@ -78,7 +78,7 @@ </prop> <prop oor:name="Extension" oor:type="xs:string"> <info> - <desc>the extension that should be used, if the expoter supports filename</desc> + <desc>the extension that should be used, if the exporter supports filename</desc> </info> </prop> <prop oor:name="SupportedMimeTypes" oor:type="xs:string"> @@ -230,7 +230,7 @@ <group oor:name="WWizContent"> <info> <desc>describes a web-wizard content, which contains - recursivley documents and other contents. + recursively documents and other contents. At the moment, contents contain only documents. Implementation of sub-contents is a future issue </desc> @@ -328,7 +328,7 @@ </prop> <prop oor:name="DisplayDescription" oor:type="xs:boolean"> <info> - <desc>should the desctiprion of each document be listed in the TOC</desc> + <desc>should the description of each document be listed in the TOC</desc> </info> </prop> <prop oor:name="DisplayAuthor" oor:type="xs:boolean"> @@ -483,7 +483,7 @@ </info> <prop oor:name="WorkDir" oor:type="xs:string"> <info> - <desc>the sub dir under temnplate/(langauge)/ of the web wizard files</desc> + <desc>the sub dir under template/(language)/ of the web wizard files</desc> </info> </prop> <prop oor:name="LastSavedSession" oor:type="xs:string"> diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 9b6d768a0b61..b59764ce6f91 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -2683,7 +2683,7 @@ </info> <prop oor:name="CaptionOrderNumberingFirst" oor:type="xs:boolean"> <info> - <desc>Specifies the order of the captions. If true the Numeber appears in front of the category.</desc> + <desc>Specifies the order of the captions. If true, the number appears in front of the category.</desc> <label>Caption order: Numbering first</label> </info> </prop> @@ -3620,7 +3620,7 @@ </prop> <prop oor:name="Level" oor:type="xs:int" oor:nillable="false"> <info> - <desc>Specifies the feadings or chapter levels where the numbering starts in the document.</desc> + <desc>Specifies the headings or chapter levels where the numbering starts in the document.</desc> <label>Level</label> </info> <constraints> @@ -4249,7 +4249,7 @@ <prop oor:name="SetInetAttribute" oor:type="xs:boolean" oor:nillable="false"> <!-- OldPath: Writer/AutoFormat/Options --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Tools AutoCorrect/AutoFormat Options - URL regocnition --> + <!-- UIHints: Tools AutoCorrect/AutoFormat Options - URL recognition --> <info> <desc>Specifies whether character strings which could represent a URL are converted to a hyperlink.</desc> <label>Detect URL</label> @@ -4353,7 +4353,7 @@ <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools AutoCorrect/AutoFormat Options Replace bullets with --> <info> - <desc>Specifies whether paragraphs starting with a dash, a plus sign or an asterix followed by space or tab are replaced by a bullet character.</desc> + <desc>Specifies whether paragraphs starting with a dash, a plus sign or an asterisk followed by space or tab are replaced by a bullet character.</desc> <label>Replace bullets with</label> </info> <value>true</value> @@ -4384,7 +4384,7 @@ <!-- OldPath: Writer/AutoFormat/Options --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools AutoCorrect/AutoFormat Options Replace bullets with --> - <!--Defautl value 0 = Symbol--> + <!--Default value 0 = Symbol--> <info> <desc>Specifies the font family if ChangeToBullets=true.</desc> </info> @@ -4394,7 +4394,7 @@ <!-- OldPath: Writer/AutoFormat/Options --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools AutoCorrect/AutoFormat Options Replace bullets with --> - <!--Defautl value 10 = Symbol--> + <!--Default value 10 = Symbol--> <info> <desc>Specifies the font character set if ChangeToBullets=true.</desc> </info> @@ -4404,7 +4404,7 @@ <!-- OldPath: Writer/AutoFormat/Options --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools AutoCorrect/AutoFormat Options Replace bullets with --> - <!--Defautl value 2 = Variable--> + <!--Default value 2 = Variable--> <info> <desc>Specifies the font pitch if ChangeToBullets=true.</desc> </info> @@ -4525,7 +4525,7 @@ <!-- OldPath: Writer/AutoFormat/Options --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools AutoCorrect/AutoFormat Options Apply Numbering--> - <!--Defautl value 0 = Symbol--> + <!--Default value 0 = Symbol--> <info> <desc>Specifies the font family if ApplyNumbering=true.</desc> </info> @@ -4535,7 +4535,7 @@ <!-- OldPath: Writer/AutoFormat/Options --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools AutoCorrect/AutoFormat Options Apply Numbering--> - <!--Defautl value 10 = Symbol--> + <!--Default value 10 = Symbol--> <info> <desc>Specifies the font character set if ApplyNumbering=true.</desc> </info> @@ -4545,7 +4545,7 @@ <!-- OldPath: Writer/AutoFormat/Options --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: Tools AutoCorrect/AutoFormat Options Apply Numbering--> - <!--Defautl value 2 = Variable--> + <!--Default value 2 = Variable--> <info> <desc>Specifies the font pitch if ApplyNumbering=true.</desc> </info> @@ -4725,13 +4725,13 @@ <info> <desc>Contains settings for the media type used for the label.</desc> </info> - <prop oor:name="Continous" oor:type="xs:boolean" oor:nillable="false"> + <prop oor:name="Continuous" oor:type="xs:boolean" oor:nillable="false"> <!-- OldPath: Writer/Dialog/Labels/Labels --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: File New Labels Labels --> <info> <desc>Specifies whether continuous paper or individual sheets are used.</desc> - <label>Continous / Sheet</label> + <label>Continuous / Sheet</label> </info> <value>false</value> </prop> @@ -4913,13 +4913,13 @@ <info> <desc>Contains settings for the media type used.</desc> </info> - <prop oor:name="Continous" oor:type="xs:boolean" oor:nillable="false"> + <prop oor:name="Continuous" oor:type="xs:boolean" oor:nillable="false"> <!-- OldPath: Writer/Dialog/BusinessCards/Medium --> <!-- OldLocation: Soffice.cfg --> <!-- UIHints: File New BusinessCards Medium --> <info> <desc>Specifies whether continuous paper or individual sheets are used.</desc> - <label>Continous / Sheet</label> + <label>Continuous / Sheet</label> </info> <value>false</value> </prop> @@ -5577,7 +5577,7 @@ <prop oor:name="Addressee" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: Writer/Dialog/Envelope/Envelope --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Insert Envolpe Envelope --> + <!-- UIHints: Insert Envelope Envelope --> <info> <desc>Specifies the recipient's address.</desc> <label>Addressee</label> @@ -5588,7 +5588,7 @@ <prop oor:name="Sender" oor:type="xs:string"> <!-- OldPath: Writer/Dialog/Envelope/Envelope --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Insert Envolpe Envelope --> + <!-- UIHints: Insert Envelope Envelope --> <info> <desc>Specifies the sender's address.</desc> <label>Sender</label> @@ -5597,7 +5597,7 @@ <prop oor:name="UseSender" oor:type="xs:boolean" oor:nillable="false"> <!-- OldPath: Writer/Dialog/Envelope/Envelope --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Insert Envolpe Envelope --> + <!-- UIHints: Insert Envelope Envelope --> <info> <desc>Specifies whether the sender's address is used.</desc> <label>Use Sender</label> @@ -5607,7 +5607,7 @@ <prop oor:name="Database" oor:type="xs:string" oor:nillable="false"> <!-- OldPath: Writer/Dialog/Envelope/Envelope --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Insert Envolpe Envelope --> + <!-- UIHints: Insert Envelope Envelope --> <info> <desc>Specifies the database to be used for the addressee.</desc> <label>Database</label> @@ -5623,7 +5623,7 @@ <prop oor:name="AddresseeFromLeft" oor:type="xs:int" oor:nillable="false"> <!-- OldPath: Writer/Dialog/Envelope/Format --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Insert Envolpe Format // old twips: 6463 / 2--> + <!-- UIHints: Insert Envelope Format // old twips: 6463 / 2--> <info> <desc>Specifies the position of the addressee field measured from the left margin [UNIT=1/100 mm].</desc> <label>Addressee from left</label> @@ -5633,7 +5633,7 @@ <prop oor:name="AddresseeFromTop" oor:type="xs:int" oor:nillable="false"> <!-- OldPath: Writer/Dialog/Envelope/Format --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Insert Envolpe Format // old twips: 6463 / 2--> + <!-- UIHints: Insert Envelope Format // old twips: 6463 / 2--> <info> <desc>Specifies the position of the addressee field measured from the upper margin [UNIT=1/100 mm].</desc> <label>Addressee from top</label> @@ -5643,7 +5643,7 @@ <prop oor:name="SenderFromLeft" oor:type="xs:int" oor:nillable="false"> <!-- OldPath: Writer/Dialog/Envelope/Format --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Insert Envolpe Format --> + <!-- UIHints: Insert Envelope Format --> <info> <desc>Specifies the position of the sender field measured from the left margin [UNIT=1/100 mm].</desc> <label>Sender from left</label> @@ -5653,7 +5653,7 @@ <prop oor:name="SenderFromTop" oor:type="xs:int" oor:nillable="false"> <!-- OldPath: Writer/Dialog/Envelope/Format --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Insert Envolpe Format --> + <!-- UIHints: Insert Envelope Format --> <info> <desc>Specifies the position of the sender field measured from the upper margin [UNIT=1/100 mm].</desc> <label>Sender from top</label> @@ -5663,7 +5663,7 @@ <prop oor:name="Width" oor:type="xs:int" oor:nillable="false"> <!-- OldPath: Writer/Dialog/Envelope/Format --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Insert Envolpe Format --> + <!-- UIHints: Insert Envelope Format --> <info> <desc>Specifies the width of the envelope [UNIT=1/100 mm].</desc> <label>Width</label> @@ -5673,7 +5673,7 @@ <prop oor:name="Height" oor:type="xs:int" oor:nillable="false"> <!-- OldPath: Writer/Dialog/Envelope/Format --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Insert Envolpe Format --> + <!-- UIHints: Insert Envelope Format --> <info> <desc>Specifies the height of the envelope [UNIT=1/100 mm].</desc> <label>Height</label> @@ -5688,7 +5688,7 @@ <prop oor:name="Alignment" oor:type="xs:int" oor:nillable="false"> <!-- OldPath: Writer/Dialog/Envelope/Print --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Insert Envolpe Printer --> + <!-- UIHints: Insert Envelope Printer --> <info> <desc>Specifies the alignment when printing.</desc> <label>Alignment</label> @@ -5730,7 +5730,7 @@ <prop oor:name="FromAbove" oor:type="xs:boolean" oor:nillable="false"> <!-- OldPath: Writer/Dialog/Envelope/Print --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Insert Envolpe Printer --> + <!-- UIHints: Insert Envelope Printer --> <info> <desc>Specifies whether the envelope is printed with the side facing up or down in the printer tray.</desc> <label>Print from top / Print from bottom</label> @@ -5740,7 +5740,7 @@ <prop oor:name="Right" oor:type="xs:int" oor:nillable="false"> <!-- OldPath: Writer/Dialog/Envelope/Print --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Insert Envolpe Printer --> + <!-- UIHints: Insert Envelope Printer --> <info> <desc>Specifies the right distance of the printed area (horizontal position).</desc> <label>Shift right</label> @@ -5750,7 +5750,7 @@ <prop oor:name="Down" oor:type="xs:int" oor:nillable="false"> <!-- OldPath: Writer/Dialog/Envelope/Print --> <!-- OldLocation: Soffice.cfg --> - <!-- UIHints: Insert Envolpe Printer --> + <!-- UIHints: Insert Envelope Printer --> <info> <desc>Specifies the bottom distance of the printed area (vertical position).</desc> <label>Shift down</label> diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs index b7150eff9363..df6e1f3450ea 100644 --- a/officecfg/registry/schema/org/openoffice/Setup.xcs +++ b/officecfg/registry/schema/org/openoffice/Setup.xcs @@ -98,7 +98,7 @@ <prop oor:name="Priority" oor:type="xs:int" oor:nillable="false"> <info> <desc>Contains the priority value to specify which migration should be - prefered. Higher values are prefered.</desc> + preferred. Higher values are preferred.</desc> </info> <value/> </prop> @@ -348,7 +348,7 @@ </prop> <prop oor:name="MigrationCompleted" oor:type="xs:boolean" oor:nillable="false"> <info> - <desc>This should be set to true, as soon as settings from nother + <desc>This should be set to true, as soon as settings from another version have been imported into this installation in order to prevent multiple migrations</desc> </info> @@ -416,7 +416,7 @@ </prop> <prop oor:name="DecimalSeparatorAsLocale" oor:type="xs:boolean" oor:nillable="false"> <info> - <desc>Indicates that the decimal separator (dot or commma) is used as + <desc>Indicates that the decimal separator (dot or comma) is used as appropriate for the selected locale instead of the one related to the default keyboard layout.</desc> <label>Decimal separator key same as locale setting.</label> diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs index 11b68b4d4969..d4d12de48425 100644 --- a/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs +++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Filter.xcs @@ -70,7 +70,7 @@ <prop oor:name="TemplateName" oor:type="xs:string" oor:nillable="false"> <info> <desc>Name of a corresponding template, which is merged together with - the style seets of the loaded document.</desc> + the style sheets of the loaded document.</desc> </info> <value/> </prop> @@ -83,7 +83,7 @@ </prop> <prop oor:name="UIName" oor:localized="true" oor:type="xs:string"> <info> - <desc>Localized name of the filter, whch can be shown at the + <desc>Localized name of the filter, which can be shown at the UI.</desc> </info> </prop> diff --git a/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs b/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs index f8096568fd83..0f59d8b8ba8e 100644 --- a/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs +++ b/officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs @@ -52,7 +52,7 @@ </prop> <prop oor:name="DocumentIconID" oor:type="xs:int" oor:nillable="false"> <info> - <desc>Global ID of an icon, which represent this tye at the UI.</desc> + <desc>Global ID of an icon, which represent this type at the UI.</desc> </info> <value>0</value> </prop> @@ -64,15 +64,15 @@ </prop> <prop oor:name="Preferred" oor:type="xs:boolean" oor:nillable="false"> <info> - <desc>In case of ambigoues registrations (e.g. for extensions doc/txt) - it specify the prefererred type.</desc> + <desc>In case of ambigous registrations (e.g. for extensions doc/txt) + it specify the preferred type.</desc> </info> <value>false</value> </prop> <prop oor:name="PreferredFilter" oor:type="xs:string" oor:nillable="false"> <info> <desc>An optimization; points directly at the preferred filter for - this type. No search across all filters is neccessary.</desc> + this type. No search across all filters is necessary.</desc> </info> <value/> </prop> diff --git a/oox/README b/oox/README index a25307930259..31cb9de38d59 100644 --- a/oox/README +++ b/oox/README @@ -129,14 +129,14 @@ needed. Radek backported code for the new commands to 3-6 and 4-0 branches. the drawingml also contains new presets (compared to binary/VML) and -so we now have code with these presets - they are basicallly +so we now have code with these presets - they are basically predefined custom shapes. we generate them using scripts in oox/source/drawingml/customshapes/ and the output are oox/source/drawingml/customshapepresets[123456].cxx source files containing the definition for the preset shapes. this mean that we import presets from OOXML files perfectly. one area to look at might be check how handles on the imported custom shapes (and presets) -wotk. +work. the source code generation happens in these steps: diff --git a/qadevOOo/runner/convwatch/MSOfficePrint.java b/qadevOOo/runner/convwatch/MSOfficePrint.java index 3b3ed466c895..40eeeaa2d6b0 100644 --- a/qadevOOo/runner/convwatch/MSOfficePrint.java +++ b/qadevOOo/runner/convwatch/MSOfficePrint.java @@ -265,7 +265,7 @@ public class MSOfficePrint if (! OSHelper.isWindows()) { // TODO: use a better Exception!!! - throw new ConvWatchCancelException/*WrongEnvironmentException*/("We doesn't work within windows environment."); + throw new ConvWatchCancelException/*WrongEnvironmentException*/("We don't work within windows environment."); } diff --git a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java index a64c04792f8a..ba1b64af9fcb 100644 --- a/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java +++ b/qadevOOo/runner/graphical/MSOfficePostscriptCreator.java @@ -348,7 +348,7 @@ public class MSOfficePostscriptCreator implements IOffice if (! OSHelper.isWindows()) { // TODO: use a better Exception!!! - throw new WrongEnvironmentException("We doesn't work within windows environment."); + throw new WrongEnvironmentException("We don't work within windows environment."); } diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java index da5f422e722e..ad4dfc903a26 100644 --- a/qadevOOo/runner/helper/StreamSimulator.java +++ b/qadevOOo/runner/helper/StreamSimulator.java @@ -76,7 +76,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , * * @throw com.sun.star.io.NotConnectedException * in case the internal streams to the file on disk couldn't established. - * They are neccessary. Otherwhise this simulator can't realy work. + * They are necessary. Otherwhise this simulator can't really work. */ public StreamSimulator( String sFileName , boolean bInput , lib.TestParameters param ) throws com.sun.star.io.NotConnectedException @@ -128,7 +128,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , /** * following methods simulates the XInputStream. * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal + * and try to map all necessary functions to the internal * open in-stream. */ public int readBytes( /*OUT*/ byte[][] lData , @@ -298,7 +298,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , /** * following methods simulates the XOutputStream. * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal + * and try to map all necessary functions to the internal * open out-stream. */ public void writeBytes( /*IN*/byte[] lData ) throws com.sun.star.io.NotConnectedException , @@ -395,7 +395,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , /** * following methods simulates the XSeekable. * The notice all actions inside the internal protocol - * and try to map all neccessary functions to the internal + * and try to map all necessary functions to the internal * open stream. */ public void seek( /*IN*/long nLocation ) throws com.sun.star.lang.IllegalArgumentException, diff --git a/qadevOOo/runner/helper/URLHelper.java b/qadevOOo/runner/helper/URLHelper.java index 568178e4bf9b..d4504f81359b 100644 --- a/qadevOOo/runner/helper/URLHelper.java +++ b/qadevOOo/runner/helper/URLHelper.java @@ -31,7 +31,7 @@ import com.sun.star.util.XURLTransformer; /** * It collects some static helper functons to handle URLs. - * Sometimes it's neccessary to convert URL from/to system paths. + * Sometimes it's necessary to convert URL from/to system paths. * Or from string to strutural notations (e.g. com.sun.star.util.URL). * And sometimes java had another notation then the office it has. * @@ -83,7 +83,7 @@ public class URLHelper /** * The same as getFileURLFromSystemPath() before but uses string parameter instead - * of a File type. It exist to supress converting of neccessary parameters in the + * of a File type. It exist to supress converting of necessary parameters in the * outside code. But of course getFileURLFromSystemPath(File) will be a little bit faster * then this method ... * @@ -148,7 +148,7 @@ public class URLHelper /** * The same as getURLWithProtocolFromSystemPath() before but uses string parameter instead - * of a File types. It exist to supress converting of neccessary parameters in the + * of a File types. It exist to supress converting of necessary parameters in the * outside code. But of course getURLWithProtocolFromSystemPath(File,File,String) will be * a little bit faster then this method ... * diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java index b28194b7f0b5..cdba3a200d45 100644 --- a/qadevOOo/runner/lib/MultiMethodTest.java +++ b/qadevOOo/runner/lib/MultiMethodTest.java @@ -53,7 +53,7 @@ import com.sun.star.uno.UnoRuntime; * MultiMethodTest subclass). See also TestResult and MultiMethodTest.tRes * documentation. * - * 4. the before() and after() methods can be overriden to perform some + * 4. the before() and after() methods can be overridden to perform some * actions, accordingly, before and after calling the test methods. * * 5. besides tRes, there are some fields initialized in the MultiMethodTest, diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java b/qadevOOo/runner/lib/MultiPropertyTest.java index c52a9d84f71c..bffd56837d7f 100644 --- a/qadevOOo/runner/lib/MultiPropertyTest.java +++ b/qadevOOo/runner/lib/MultiPropertyTest.java @@ -514,7 +514,7 @@ public class MultiPropertyTest extends MultiMethodTest } /** - * Overriden method of <code>PropertyTester</code> which + * Overridden method of <code>PropertyTester</code> which * retruns new value from two values specified. * * @return The second value if old value is equal to the first diff --git a/qadevOOo/tests/java/ifc/container/_XContainerQuery.java b/qadevOOo/tests/java/ifc/container/_XContainerQuery.java index 2d7659bfb244..06f6301ded7d 100644 --- a/qadevOOo/tests/java/ifc/container/_XContainerQuery.java +++ b/qadevOOo/tests/java/ifc/container/_XContainerQuery.java @@ -43,7 +43,7 @@ import com.sun.star.container.XEnumeration; * Normaly <code>createSubSetEnumerationByProperties()</code> covers all * possible queries. But for special cases, i.e. sorted output, the function * <code>createSubSetEnumerationByQuery()</code> was made. The special cases was not -* implemented by default in the implemetation object. So this function could be +* implemented by default in the implementation object. So this function could be * marked as <code>optional</code></li> * <ul> <p> * <p> @@ -90,7 +90,7 @@ public class _XContainerQuery extends MultiMethodTest { boolean bResult = true; if ( m_queryStrings == null ) { - log.println("This object does not have an implemetation for this function"); + log.println("This object does not have an implementation for this function"); // This is not a bug, because it's a feature for future purposes } else { for (int i = 0; i < m_queryStrings.length; i++){ diff --git a/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java b/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java index d6a6576a2e11..3cec7554a81a 100644 --- a/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java +++ b/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java @@ -72,13 +72,13 @@ public class _XDocumentInsertable extends MultiMethodTest { */ public static abstract class InsertChecker { /** - * Must be overriden to check if document was + * Must be overridden to check if document was * successfully inserted. * @return <code>true</code> if document was inserted. */ public abstract boolean isInserted() ; /** - * Can be overriden to specify different than default + * Can be overridden to specify different than default * document name. This document must be situated in * the test document disrectory, and its name must * be specified relational to this directory. By diff --git a/qadevOOo/tests/java/ifc/sdb/_RowSet.java b/qadevOOo/tests/java/ifc/sdb/_RowSet.java index 1f3097de6070..9a50fbd1f524 100644 --- a/qadevOOo/tests/java/ifc/sdb/_RowSet.java +++ b/qadevOOo/tests/java/ifc/sdb/_RowSet.java @@ -97,7 +97,7 @@ public class _RowSet extends MultiPropertyTest { } /** - * Overriden method which tests all the properties + * Overridden method which tests all the properties * with <code>SafeTester</code>. * * @see SafeTester diff --git a/qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier.java b/qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier.java index 58b4d343c1a6..d5a3e5b96fef 100644 --- a/qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier.java +++ b/qadevOOo/tests/java/ifc/system/_XSimpleMailClientSupplier.java @@ -35,7 +35,7 @@ import com.sun.star.system.XSimpleMailClientSupplier; * <ul> * <li> <code>'SystemMailExist'</code> (of type <code>Boolean</code>): * if <code>true</code> then <code>SimpleSystemMail</code> service -* is available, if NOT then the service is not availabel or +* is available, if NOT then the service is not availablel or * OS doesn't has system mail.</li> * <ul> <p> * @see com.sun.star.system.XSimpleMailClientSupplier diff --git a/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java b/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java index 87d729bc962b..ed26a8817863 100644 --- a/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java +++ b/qadevOOo/tests/java/ifc/table/_XAutoFormattable.java @@ -98,7 +98,7 @@ public class _XAutoFormattable extends MultiMethodTest { // applying style oObj.autoFormat(name); - // getting new cell's backround. + // getting new cell's background. Integer bkgrnd2; try { bkgrnd2 = (Integer) PS.getPropertyValue("CellBackColor"); diff --git a/qadevOOo/tests/java/ifc/util/_XURLTransformer.java b/qadevOOo/tests/java/ifc/util/_XURLTransformer.java index f73b76c67be7..cdedf7dbd9d5 100644 --- a/qadevOOo/tests/java/ifc/util/_XURLTransformer.java +++ b/qadevOOo/tests/java/ifc/util/_XURLTransformer.java @@ -421,15 +421,15 @@ public class _XURLTransformer extends MultiMethodTest { url.Complete = expectedCompleteFTP; log.println("getPresentation('" + expectedCompleteFTP + "', false): "); // the password must be masqurade with <****> - String asterix = ""; + String asterisk = ""; for (int n = 0 ; n < password.length(); n++){ - asterix += "*"; + asterisk += "*"; } - asterix = "<" + asterix.substring(1,asterix.length()); - asterix = asterix.substring(0,asterix.length()-1) + ">"; + asterisk = "<" + asterisk.substring(1,asterisk.length()); + asterisk = asterisk.substring(0,asterisk.length()-1) + ">"; presentation = oObj.getPresentation(url, false); - String expectedPresentation = "ftp://" + user + ":" + asterix + "@" + + String expectedPresentation = "ftp://" + user + ":" + asterisk + "@" + server + ":" + port + path + "/" + name; res &= presentation.equals(expectedPresentation); log.println("Resulted presentation: " + presentation); diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java index 1dd0a26174b7..a7b3e1620152 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FixedTextLayoutController.java @@ -33,7 +33,7 @@ import org.jfree.report.flow.layoutprocessor.LayoutControllerFactory; import org.jfree.report.structure.Section; /** - * Processes a fixed-text element of the OpenOffice reporting specifciation. + * Processes a fixed-text element of the OpenOffice reporting specificiation. * The element itself contains a single paragraph which contains the content. * After checking, whether this element should be printed, this layout * controller simply delegates the dirty work to a suitable handler. diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 637e1b0a3248..28a12df042a8 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -803,7 +803,7 @@ sal_Bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) } if ( !bIsSetPoint ) - m_pParent->SetPointer( m_rView.GetPreferedPointer( aPos, m_pParent) ); + m_pParent->SetPointer( m_rView.GetPreferredPointer( aPos, m_pParent) ); return sal_True; } @@ -883,7 +883,7 @@ sal_Bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) m_pParent->getSectionWindow()->getViewsWindow()->EndAction(); checkTwoCklicks(rMEvt); - m_pParent->SetPointer( m_rView.GetPreferedPointer( aPnt, m_pParent) ); + m_pParent->SetPointer( m_rView.GetPreferredPointer( aPnt, m_pParent) ); if ( !m_bUiActive ) m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView); @@ -928,7 +928,7 @@ sal_Bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) if ( !bIsSetPoint ) { - m_pParent->SetPointer( m_rView.GetPreferedPointer( aPnt, m_pParent) ); + m_pParent->SetPointer( m_rView.GetPreferredPointer( aPnt, m_pParent) ); // restore color unColorizeOverlappedObj(); diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx index 632ffb9a858c..57ff61fc2001 100644 --- a/rsc/source/parser/erscerr.cxx +++ b/rsc/source/parser/erscerr.cxx @@ -148,7 +148,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) StdLstOut( "-presponse Use response file for Preprocessor.\n" ); StdLstOut( "-lg<language> Use a different language.\n" ); StdLstOut( "-fs=<filename> Name of the .res file.\n" ); - StdLstOut( "-lip=<path> additional search path for system dependant files\n" ); + StdLstOut( "-lip=<path> additional search path for system dependent files\n" ); StdLstOut( "-fp=<filename> Renaming of the .srs file.\n" ); StdLstOut( "-oil=<dir> Output directory for image list files\n" ); StdLstOut( "-sub<ENV>=<path> replace <path> by <ENV> in image list files\n" ); diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c index e3d1b1c1426a..c073a9e5da2c 100644 --- a/sal/osl/unx/signal.c +++ b/sal/osl/unx/signal.c @@ -471,7 +471,7 @@ callback(struct dl_phdr_info *info, size_t size, void *data) /* Get the location of the .dynamic section offset for the given elf file. * i.e. same as the "Offset" value shown for DYNAMIC from readelf -l foo * - * We want to know this value so that if the binaries have been modifed + * We want to know this value so that if the binaries have been modified * by prelink then we can still process the call stack on server side * by comparing this value to that of an "un-prelinked but known to be * otherwise equivalent" version of those binaries and adjust the call diff --git a/sal/textenc/convertsimple.cxx b/sal/textenc/convertsimple.cxx index d60adc7bd8ea..c917f17d50fb 100644 --- a/sal/textenc/convertsimple.cxx +++ b/sal/textenc/convertsimple.cxx @@ -88,7 +88,7 @@ static ImplReplaceCharData const aImplRepCharTab[] = { 0x217E, 0x0064 }, /* SMALL ROMAN NUMERAL FIVE HUNDRED */ { 0x217F, 0x006D }, /* SMALL ROMAN NUMERAL ONE THOUSAND */ { 0x2215, 0x002F }, /* DIVISION SLASH */ - { 0x2217, 0x002A }, /* ASTERIX OPERATOR */ + { 0x2217, 0x002A }, /* ASTERISK OPERATOR */ { 0xFF00, 0x0020 }, /* FULLWIDTH ASCII FORMS */ { 0xFF01, 0x0021 }, /* FULLWIDTH ASCII FORMS */ { 0xFF02, 0x0022 }, /* FULLWIDTH ASCII FORMS*/ diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 2608e71b253f..2dcb23189ab7 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -978,7 +978,7 @@ void ScDPSource::CreateRes_Impl() pRowResRoot->UpdateDataResults( pColResRoot, pResData->GetRowStartMeasure() ); } - // SortMembers does the sorting by a result dimension, using the orginal results, + // SortMembers does the sorting by a result dimension, using the original results, // but not running totals etc. pRowResRoot->SortMembers( pColResRoot ); diff --git a/sc/source/core/opencl/clcc/clew.cxx b/sc/source/core/opencl/clcc/clew.cxx index 3a7db16152ea..f80355211b7f 100644 --- a/sc/source/core/opencl/clcc/clew.cxx +++ b/sc/source/core/opencl/clcc/clew.cxx @@ -136,7 +136,7 @@ static void clewExit(void) //! \param path path to dynamic library to load //! \return CLEW_ERROR_OPEN_FAILED if the library could not be opened //! CLEW_ERROR_ATEXIT_FAILED if atexit(clewExit) failed -//! CLEW_SUCCESS when the library was succesfully loaded +//! CLEW_SUCCESS when the library was successfully loaded int clewInit(const char* path) { int error = 0; diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index 87d0cdb640f8..df37e22c48d6 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -2925,7 +2925,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) ScChangeActionType eActType = pAct->GetType(); if ( eActType == SC_CAT_REJECT || (eActType == SC_CAT_MOVE && pAct->IsRejecting()) ) - return ; // These Rejects are not dependant + return ; // These Rejects are not dependent if ( eActType == SC_CAT_CONTENT ) { @@ -2964,8 +2964,8 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) // Insert in a corresponding Insert depends on it or else we would need // to split the preceding one. - // Intersecting Inserts and Deletes are not dependant, everything else - // is dependant. + // Intersecting Inserts and Deletes are not dependent, everything else + // is dependent. // The Insert last linked in is at the beginning of a chain, just the way we need it const ScBigRange& rRange = pAct->GetBigRange(); diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index 49137528bb2b..b1765bedcd3b 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -1418,7 +1418,7 @@ static const XclBuiltInFormat spBuiltInFormats_THAI[] = // ---------------------------------------------------------------------------- -/** Specifies a number format table for a specific langauge. */ +/** Specifies a number format table for a specific language. */ struct XclBuiltInFormatTable { LanguageType meLanguage; /// The language of this table. diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 8c71cfdf8ab4..42b188267e6a 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -927,7 +927,7 @@ public: /** Inserts information about a new SdrObject. */ void InsertSdrObjectInfo( SdrObject& rSdrObj, sal_uInt32 nDffShapeId, sal_uInt32 nDffFlags ); - /** Removes inforamtion of an SdrObject (and all child objects if it is a group). */ + /** Removes information of an SdrObject (and all child objects if it is a group). */ void RemoveSdrObjectInfo( SdrObject& rSdrObj ); /** Inserts the SdrObject pointers into all connector rules. */ diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index e722ce302862..8e0f3a450808 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -975,7 +975,7 @@ sal_Bool ScChildrenShapes::FindSelectedShapesChanges(const uno::Reference<drawin SortedShapes::const_iterator aFocusedItr = aDataEndItr; while((aDataItr != aDataEndItr)) { - if (*aDataItr) // is it realy a shape or only the sheet + if (*aDataItr) // is it really a shape or only the sheet { sal_Int8 nComp(0); if (aXShapesItr == aXShapesEndItr) diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 99eb7fd3c749..1a107907e138 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -750,7 +750,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) else if ( pHdl ) { pViewShell->SetActivePointer( - pView->GetPreferedPointer( aPnt, pWindow ) ); + pView->GetPreferredPointer( aPnt, pWindow ) ); } else if ( pView->IsMarkedHit(aPnt) ) { diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 8ea5fc2d90b3..2016c26d1336 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -362,7 +362,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt) lcl_InvalidateAttribs( pViewShell->GetViewFrame()->GetBindings() ); } - pViewShell->SetActivePointer(pView->GetPreferedPointer( + pViewShell->SetActivePointer(pView->GetPreferredPointer( pWindow->PixelToLogic(rMEvt.GetPosPixel()), pWindow )); if (!bStraightEnter) { @@ -387,7 +387,7 @@ sal_Bool FuText::MouseMove(const MouseEvent& rMEvt) // pViewShell->SetActivePointer(aNewPointer); - pViewShell->SetActivePointer(pView->GetPreferedPointer( + pViewShell->SetActivePointer(pView->GetPreferredPointer( pWindow->PixelToLogic(rMEvt.GetPosPixel()), pWindow )); if (aDragTimer.IsActive() ) diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index bb022bc49565..628941a8acb0 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -715,7 +715,7 @@ void ScTableValidationObj::ClearData_Impl() aExpr2 = ""; maExprNmsp1 = ""; maExprNmsp2 = ""; - meGrammar1 = meGrammar2 = FormulaGrammar::GRAM_UNSPECIFIED; // will be overriden when needed + meGrammar1 = meGrammar2 = FormulaGrammar::GRAM_UNSPECIFIED; // will be overridden when needed aInputTitle = OUString(); aInputMessage = OUString(); aErrorTitle = OUString(); diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index e5b8e81e2435..e5c6b4961065 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -2192,7 +2192,7 @@ ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent, // Sometimes we might get a float or a double or whatever // set in the Any, we should convert as appropriate // #FIXME - perhaps worth turning this into some sort of - // convertion routine e.g. bSuccess = getValueFromAny( nRow, nRowIndex, getCppuType((sal_Int32*)0) ) + // conversion routine e.g. bSuccess = getValueFromAny( nRow, nRowIndex, getCppuType((sal_Int32*)0) ) uno::Any aRowIndexAny = nRowIndex; if ( aRowIndexAny.hasValue() && !( aRowIndexAny >>= nRow ) ) { diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index 8ec8bf170f5e..7be1a70fa88b 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -229,7 +229,7 @@ void ScViewFunc::DetectiveMarkSucc() pDocSh->GetDocFunc().DetectiveCollectAllSuccs(aRanges, aRefTokens); if (aRefTokens.empty()) - // No dependants found. Nothing to do. + // No dependents found. Nothing to do. return; ScRangeList aDestRanges; diff --git a/scripting/README b/scripting/README index 322b46c11290..f19fa3b21fea 100644 --- a/scripting/README +++ b/scripting/README @@ -32,7 +32,7 @@ UNO dialogs from various languages - java/com/sun/star/script/framework/provider Implementation of an abstract base class ScriptProvider which provides -core methods for implementing Java based LanguageScriptProvider implemetations +core methods for implementing Java based LanguageScriptProvider implementations - java/com/sun/star/script/framework/provider/* diff --git a/scripting/workben/bindings/ScriptBinding.xba b/scripting/workben/bindings/ScriptBinding.xba index 5129cca2d0f3..dd5d235f91ad 100644 --- a/scripting/workben/bindings/ScriptBinding.xba +++ b/scripting/workben/bindings/ScriptBinding.xba @@ -1673,7 +1673,7 @@ sub LangLocComboListener() end if endif - ' extra dialog dependant processing + ' extra dialog dependent processing if dialogName = "Menu" then ' will set New button to false if no text in LableBox MenuLabelBoxListener() diff --git a/scripting/workben/installer/Scripting.xcs b/scripting/workben/installer/Scripting.xcs index c6a59f0087f2..1daeab8e978d 100644 --- a/scripting/workben/installer/Scripting.xcs +++ b/scripting/workben/installer/Scripting.xcs @@ -27,7 +27,7 @@ <group oor:name="RuntimeNode"> <info> <desc xml:lang="x-no-translate"></desc> - <desc xml:lang="en-US">Specifies the runtimes available to the Scriptying Framework.</desc> + <desc xml:lang="en-US">Specifies the runtimes available to the Scripting Framework.</desc> </info> <prop oor:name="SupportedFileExtensions" oor:type="oor:string-list"> <info> diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 5c135ac965a5..16ed58e6dbbc 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2727,7 +2727,7 @@ void SdPage::setHeaderFooterSettings( const sd::HeaderFooterSettings& rNewSettin // #i119056# For HeaderFooterSettings SdrObjects are used, but the properties // used are not part of their model data, but kept in SD. This data is applied // using a 'backdoor' on primitive creation. Thus, the normal mechanism to detect - // object changes does not work here. It is neccessary to trigger updates here + // object changes does not work here. It is necessary to trigger updates here // directly. BroadcastObjectChange used for PagePreview invalidations, // flushViewObjectContacts used to invalidate and flush all visualizations in // edit views. diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 0c8fb7c14ef5..564c5c6f853c 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -175,7 +175,7 @@ void AnnotationTextWindow::KeyInput( const KeyEvent& rKeyEvt ) } if (bDone) { - mpAnnotationWindow->ResizeIfNeccessary(aOldHeight,mpAnnotationWindow->GetPostItTextHeight()); + mpAnnotationWindow->ResizeIfNecessary(aOldHeight,mpAnnotationWindow->GetPostItTextHeight()); } else { @@ -449,7 +449,7 @@ void AnnotationWindow::SetScrollbar() mpVScrollbar->SetThumbPos( mpOutlinerView->GetVisArea().Top()+ mpOutlinerView->GetEditView().GetCursor()->GetOffsetY()); } -void AnnotationWindow::ResizeIfNeccessary(long aOldHeight, long aNewHeight) +void AnnotationWindow::ResizeIfNecessary(long aOldHeight, long aNewHeight) { if (aOldHeight != aNewHeight) { diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 9d43f3576f0e..387686c11ddb 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -125,7 +125,7 @@ class AnnotationWindow : public FloatingWindow void InitControls(); void HidePostIt(); void DoResize(); - void ResizeIfNeccessary(long aOldHeight, long aNewHeight); + void ResizeIfNecessary(long aOldHeight, long aNewHeight); void SetScrollbar(); void Rescale(); diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 50c587adaa00..7e0203511e94 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -87,7 +87,7 @@ public: */ ::boost::shared_ptr<ConfigurationControllerBroadcaster> mpBroadcaster; - /** The requested configuration which is modifed (asynchronously) by + /** The requested configuration which is modified (asynchronously) by calls to requestResourceActivation() and requestResourceDeactivation(). The mpConfigurationUpdater makes the current configuration reflect the content of this one. diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index d19f9f87f750..19c95a4193c1 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -631,7 +631,7 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt) if (bDefPointer) { - mpWindow->SetPointer(mpView->GetPreferedPointer( + mpWindow->SetPointer(mpView->GetPreferredPointer( aPnt, mpWindow, nModifier, bLeftDown)); } } diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx index 67b8811bdee4..09ead4f93131 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.hxx +++ b/sd/source/ui/sidebar/MasterPageContainer.hxx @@ -42,7 +42,7 @@ class MasterPageDescriptor; controls. It uses internally a singleton implementation object. Therefore, all MasterPageContainer object operator on the same set of master pages. Each MasterPageContainer, however, has its own - PreviewSize value and thus can independantly switch between large and + PreviewSize value and thus can independently switch between large and small previews. The container maintains its own document to store master page objects. diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index 2dbf3e76ebc5..19aa959dfadd 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -358,7 +358,7 @@ geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation (voi if (mxViewWindow.is()) { - // When the mbIsInModifyNotification is set then a slightly modifed + // When the mbIsInModifyNotification is set then a slightly modified // version of the transformation is returned in order to get past // optimizations the avoid updates when the transformation is // unchanged (when the window size changes then due to the constant diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl index b7f4ce64db08..2003f6b8e4dd 100644 --- a/setup_native/scripts/admin.pl +++ b/setup_native/scripts/admin.pl @@ -139,7 +139,7 @@ sub controlparameter ############################################################################# # The program msidb.exe can be located next to the Perl program. Then it is -# not neccessary to find it in the PATH variable. +# not necessary to find it in the PATH variable. ############################################################################# sub check_local_msidb diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 3f6f8ddf062d..5256a588a584 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -134,8 +134,8 @@ OUString SAL_CALL SfxTerminateListener_Impl::getImplementationName() throw (Runt Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceNames() throw (RuntimeException) { - // Note: That service does not realy exists .-) - // But this implementation is not thought to be registered realy within our service.rdb. + // Note: That service does not really exists .-) + // But this implementation is not thought to be registered really within our service.rdb. // At least we need the implementation name only to identify these service at the global desktop instance. // The desktop must know, which listener will terminate the SfxApplication in real ! // It must call this special listener as last one ... otherwise we shutdown the SfxApplication BEFORE other listener diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 1dc1d662ef02..064d978dcc2a 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -153,7 +153,7 @@ public: sal_Bool bInUpdate; // for Assertions sal_Bool bInNextJob; // for Assertions sal_Bool bFirstRound; // First round in Update - sal_uInt16 nFirstShell; // Shell, the first round is prefered + sal_uInt16 nFirstShell; // Shell, the first round is preferred sal_uInt16 nOwnRegLevel; // Counts the real Locks, exept those of the Super Bindings InvalidateSlotMap m_aInvalidateSlots; // store slots which are invalidated while in update }; diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index d202a1c5cd5c..c34e6dc7f39c 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -349,7 +349,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL BackingComp::impl_createIns /** returns a new factory instance for instances of this class. It uses a helper class of the cppuhelper project as factory. - It will be initialized with all neccessary information and + It will be initialized with all necessary information and will be able afterwards to create instance of this class. This factory call us back inside our method impl_createInstance(). So we can create and initialize ourself. Only filtering of creation @@ -378,7 +378,7 @@ css::uno::Reference< css::lang::XSingleServiceFactory > BackingComp::impl_create attach this component to a target frame. We has to use the container window of this frame as parent window of our own component window. - But it's not allowed to work with it realy. May another component used it too. + But it's not allowed to work with it really. May another component used it too. Currently we need it only to create our child component window and support it's interfaces inside our queryInterface() method. The user of us must have e.g. the XWindow interface of it to be able to call setComponent(xWindow,xController) at the @@ -594,7 +594,7 @@ sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool ) and inform us. We must release its reference only here. Of course we check the given reference here and reject callback from unknown sources. - Note: deregistration as listener isnt neccessary here. The broadcaster do it automaticly. + Note: deregistration as listener isnt necessary here. The broadcaster do it automaticly. @param aEvent describe the broadcaster of this callback @@ -698,7 +698,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c /** not supported. - Because registration is not supported too, we must do nothing here. Nobody can call this method realy. + Because registration is not supported too, we must do nothing here. Nobody can call this method really. @param xListener not used. @@ -717,7 +717,7 @@ void SAL_CALL BackingComp::removeEventListener( /*IN*/ const css::uno::Reference Inside attachFrame() we created our component window. But it was not allowed there, to initialitze it. E.g. the menu must be set at the container window of the frame, which is our parent window. But may at that time another component used it. - That's why our creator has to inform us, when it's time to initialize us realy. + That's why our creator has to inform us, when it's time to initialize us really. Currently only calling of this method must be done. But further implementatoins can use special in parameter to configure this initialization ... diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 81887f8cf4ff..0ada1315ef65 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -900,7 +900,7 @@ void SfxTabDialog::PageCreated /* [Description] - Default implemetation of the virtual method. This is called immediately + Default implementation of the virtual method. This is called immediately after creating a page. Here the dialogue can call the TabPage Method directly. */ @@ -1049,7 +1049,7 @@ const SfxItemSet* SfxTabDialog::GetRefreshedSet() /* [Description] - Default implemetation of the virtual Method. + Default implementation of the virtual Method. This is called, when <SfxTabPage::DeactivatePage(SfxItemSet *)> returns <SfxTabPage::REFRESH_SET>. */ diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index df12f4f976a0..2fa26fc42e8d 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -280,7 +280,7 @@ OUString SfxObjectShell::CreateTempCopyOfStorage_Impl( const uno::Reference< emb uno::Reference< embed::XStorage > xTempStorage = ::comphelper::OStorageHelper::GetStorageFromURL( aTempURL, embed::ElementModes::READWRITE ); - // the password will be transferred from the xStorage to xTempStorage by storage implemetation + // the password will be transferred from the xStorage to xTempStorage by storage implementation xStorage->copyToStorage( xTempStorage ); // the temporary storage was commited by the previous method and it will die by refcount @@ -2788,7 +2788,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl SAL_WARN( "sfx.doc","Salvage item present in Itemset, check the parameters!"); #endif - // should be unneccessary - too hot to handle! + // should be unnecessary - too hot to handle! pMergedParams->ClearItem( SID_DOC_SALVAGE ); // take over the new merged itemset diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 40663d663fcb..ed78d0ffe776 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -518,7 +518,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread } /* static helper to move the temp. file to the target location by using the ucb - It's static to be useable from outside too. So it's not realy neccessary to start + It's static to be useable from outside too. So it's not really necessary to start the thread, if finishing of the job was detected outside this thread. But it must be called without using a corresponding thread for the given parameter! */ diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx index e5283c8436aa..a174dd0ab40c 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -438,7 +438,7 @@ void start_language_section( char buff[10]; int primLangID = PRIMARYLANGID(ltype); int subLangID = SUBLANGID(ltype); - // Our resources are normaly not sub language dependant. + // Our resources are normaly not sub language dependent. // Esp. for spanish we don't want to distinguish between trad. // and internatinal sorting ( which leads to two different sub languages ) // Setting the sub language to neutral allows us to use one diff --git a/slideshow/source/engine/animationnodes/animationaudionode.hxx b/slideshow/source/engine/animationnodes/animationaudionode.hxx index 76723968ad4f..a437b4e06d71 100644 --- a/slideshow/source/engine/animationnodes/animationaudionode.hxx +++ b/slideshow/source/engine/animationnodes/animationaudionode.hxx @@ -50,7 +50,7 @@ private: virtual void deactivate_st( NodeState eDestState ); virtual bool hasPendingAnimation() const; - /// overriden, because we need to deal with STOPAUDIO commands + /// overridden, because we need to deal with STOPAUDIO commands virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ); private: diff --git a/solenv/doc/gbuild/solenv/gbuild/alllangres.mk b/solenv/doc/gbuild/solenv/gbuild/alllangres.mk index e11c0042f4f3..980880d3b6c8 100644 --- a/solenv/doc/gbuild/solenv/gbuild/alllangres.mk +++ b/solenv/doc/gbuild/solenv/gbuild/alllangres.mk @@ -35,7 +35,7 @@ namespace gb SrsPartTarget(String name); friend class SrsTarget; - /// Platformdependant command to generate the dependencies for the srs target. + /// Platformdependent command to generate the dependencies for the srs target. static const Command command_dep( String srsname, Path sourcefile, diff --git a/solenv/doc/gbuild/solenv/gbuild/executable.mk b/solenv/doc/gbuild/solenv/gbuild/executable.mk index 935b58cb87f7..87b7992a71a9 100644 --- a/solenv/doc/gbuild/solenv/gbuild/executable.mk +++ b/solenv/doc/gbuild/solenv/gbuild/executable.mk @@ -32,7 +32,7 @@ namespace gb private: /// private helper function for the constructor void Executable_impl(LinkTarget library_linktarget); - /// platformdependant additional setup for constructor (used on Windows only) + /// platformdependent additional setup for constructor (used on Windows only) void Executable_platform(LinkTarget library_linktarget); /// helper function to wrap LinkTargets functions (this is more or less pimpl ...) void forward_to_linktarget(Function f); diff --git a/solenv/doc/gbuild/solenv/gbuild/library.mk b/solenv/doc/gbuild/solenv/gbuild/library.mk index a20c96f9efd6..c06a19e9bd83 100644 --- a/solenv/doc/gbuild/solenv/gbuild/library.mk +++ b/solenv/doc/gbuild/solenv/gbuild/library.mk @@ -29,7 +29,7 @@ namespace gb public: Library(String name); /// Returns how the library is named in the filesystem on the current platform. - /// Library filename schemes are defined in solenv/gbuild/libnames.mk (with some platformdependant hacks in solenv/gbuild/platform/*.mk. + /// Library filename schemes are defined in solenv/gbuild/libnames.mk (with some platformdependent hacks in solenv/gbuild/platform/*.mk. /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere. Path get_filename(); @@ -37,7 +37,7 @@ namespace gb private: /// private helper function for the constructor void Library_impl(LinkTarget library_linktarget); - /// platformdependant additional setup for constructor (used on Windows only) + /// platformdependent additional setup for constructor (used on Windows only) void Library_platform( LinkTarget library_linktarget, Path dllfile); diff --git a/solenv/doc/gbuild/solenv/gbuild/static_library.mk b/solenv/doc/gbuild/solenv/gbuild/static_library.mk index a6d529717f54..fe0272382f7e 100644 --- a/solenv/doc/gbuild/solenv/gbuild/static_library.mk +++ b/solenv/doc/gbuild/solenv/gbuild/static_library.mk @@ -29,7 +29,7 @@ namespace gb public: StaticLibrary(String name); /// Returns how the library is named in the filesystem on the current platform. - /// StaticLibrary filename schemes are defined in solenv/gbuild/libnames.mk (with some platformdependant hacks in solenv/gbuild/platform/*.mk. + /// StaticLibrary filename schemes are defined in solenv/gbuild/libnames.mk (with some platformdependent hacks in solenv/gbuild/platform/*.mk. /// This function needs to be defined in solenv/gbuild/target_names.mk so that it is available to everywhere. Path get_filename(); @@ -48,7 +48,7 @@ namespace gb static const List<String> TARGETTYPEFLAGS; /// Mapping from symbolic static library names to filenames static const Map<StaticLibrary,Path> FILENAMES; - /// platformdependant file extension for static libraries + /// platformdependent file extension for static libraries static const String PLAINEXT; }; } diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 60c1c0272750..3d6b0f672bc4 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -269,7 +269,7 @@ $(eval $(call gb_Deliver_init)) # It is important to include them in the right order as that is # -- at least in part -- defining precedence. This is not an issue in the # WORKDIR as there are no nameing collisions there, but INSTDIR is a mess -# and precedence is important there. This is also platform dependant. +# and precedence is important there. This is also platform dependent. # # This is less of an issue with GNU Make versions > 3.82 which matches for # shortest stem instead of first match. However, upon intoduction this version diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx index 1825b357615c..c6dc60e056b8 100644 --- a/sot/source/sdstor/stgole.cxx +++ b/sot/source/sdstor/stgole.cxx @@ -125,7 +125,7 @@ bool StgCompObjStream::Load() //the actual codepage used doesn't seem to be specified/stored //anywhere :-(. Might as well pick 1252 and be consistent on //all platforms and envs - //http://www.openoffice.org/nonav/issues/showattachment.cgi/68668/Orginal%20Document.doc + //https://issues.apache.org/ooo/attachment.cgi?id=68668 //for a good edge-case example aUserName = nStrLen ? OUString( p, nStrLen, RTL_TEXTENCODING_MS_1252 ) : OUString(); nCbFormat = ReadClipboardFormat( *this ); diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index d8dac6b4a941..334e52674755 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2873,7 +2873,7 @@ static bool lcl_IsFromGreekSymbolSet( const OUString &rTokenText ) { bool bRes = false; - // valid symbol name needs to have a '%' at pos 0 and at least an additonal char + // valid symbol name needs to have a '%' at pos 0 and at least an additional char if (rTokenText.getLength() > 2 && rTokenText[0] == (sal_Unicode)'%') { OUString aName( rTokenText.copy(1) ); diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx index 8e107c650c70..688631aab169 100644 --- a/svgio/source/svgreader/svgsvgnode.cxx +++ b/svgio/source/svgreader/svgsvgnode.cxx @@ -555,7 +555,7 @@ namespace svgio { // Clip is necessary. This will make Svg images evtl. smaller // than wanted from Svg (the free space which may be around it is - // conform to the Svg spec), but avoids an expensive and unneccessary + // conform to the Svg spec), but avoids an expensive and unnecessary // clip. Keep the full Svg range here to get the correct mappings // to objects using this. Optimizations can be done in the processors const drawinglayer::primitive2d::Primitive2DReference xMask( diff --git a/svl/README b/svl/README index c2cca3f58a2e..1eb3d80e8bf9 100644 --- a/svl/README +++ b/svl/README @@ -39,7 +39,7 @@ The item set can be created with a user-supplied range of WhichIds; it will accept SfxPoolItems with matching WhichIds and ignore attempts to insert items with non-matching WhichIds. -Items that are succesfully inserted into the set will be stored in the +Items that are successfully inserted into the set will be stored in the set's SfxItemPool, and for poolable items only a single instance that compares equal under the predicate operator== will be stored in the pool, regardless of how many sets contain it, thus conserving memory. diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index f1c59552f29c..17805e4b4c9d 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -867,7 +867,7 @@ Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const MapMo // another possibility is to adapt the values created so far with a factor; this // will keep the original Bitmap untouched and thus quality will not change - // caution: convert to double first, else pretty big errors may occurr + // caution: convert to double first, else pretty big errors may occur const double fFactorX((double)aBitmapEx.GetSizePixel().Width() / aSrcSizePixel.Width()); const double fFactorY((double)aBitmapEx.GetSizePixel().Height() / aSrcSizePixel.Height()); diff --git a/svx/README b/svx/README index b1cd2e079c49..d4a2a20d82f9 100644 --- a/svx/README +++ b/svx/README @@ -16,7 +16,7 @@ Drawing Layer Object diagram: | getChild() |-----| getPrimitiveList() -----> Object(s) ---> SdrView | | getVOC() | | getRecPrimitiveList() Contact | | getViewIn...| |___________|__________________________________________| -| dependantPrimitiveList() | | +| dependentPrimitiveList() | | |_________________________ | generates ______ | / | .----------------------. | diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 38ee6c63b487..926affdf8949 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -1020,7 +1020,7 @@ Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen( void ) throw( Runt Rectangle SvxPixelCtlAccessibleChild::GetBoundingBox( void ) throw( RuntimeException ) { - // no guard neccessary, because no one changes mpBoundingBox after creating it + // no guard necessary, because no one changes mpBoundingBox after creating it ThrowExceptionIfNotAlive(); return *mpBoundingBox; diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx index f7721cd1a0ce..9dd2e7e2505c 100644 --- a/svx/source/core/extedit.cxx +++ b/svx/source/core/extedit.cxx @@ -85,7 +85,7 @@ void ExternalToolEdit::Edit( GraphicObject* pGraphicObject ) //get the Preferred File Extension for this graphic OUString fExtension; - GraphicHelper::GetPreferedExtension(fExtension, aGraphic); + GraphicHelper::GetPreferredExtension(fExtension, aGraphic); //Create the temp File OUString aTempFileBase; diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx index df3015eaa071..217989f891fd 100644 --- a/svx/source/core/graphichelper.cxx +++ b/svx/source/core/graphichelper.cxx @@ -58,7 +58,7 @@ using namespace sfx2; namespace drawing = com::sun::star::drawing; -void GraphicHelper::GetPreferedExtension( OUString& rExtension, const Graphic& rGraphic ) +void GraphicHelper::GetPreferredExtension( OUString& rExtension, const Graphic& rGraphic ) { OUString aExtension = "png"; switch( const_cast<Graphic&>( rGraphic ).GetLink().GetType() ) @@ -113,7 +113,7 @@ OUString GraphicHelper::ExportGraphic( const Graphic& rGraphic, const OUString& OUString aExtension( aURL.GetExtension() ); if( aExtension.isEmpty() ) { - GetPreferedExtension( aExtension, rGraphic ); + GetPreferredExtension( aExtension, rGraphic ); } aExtension = aExtension.toAsciiLowerCase(); @@ -133,7 +133,7 @@ OUString GraphicHelper::ExportGraphic( const Graphic& rGraphic, const OUString& if ( USHRT_MAX == nDefaultFilter ) { // "wrong" extension? - GetPreferedExtension( aExtension, rGraphic ); + GetPreferredExtension( aExtension, rGraphic ); for ( sal_uInt16 i = 0; i < nCount; ++i ) if ( aExtension == rGraphicFilter.GetExportFormatShortName( i ).toAsciiLowerCase() ) { diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 4fc18b71cbeb..5e87d51cc376 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -650,7 +650,7 @@ void GraphCtrl::MouseButtonDown( const MouseEvent& rMEvt ) if ( pCreateObj && !pCreateObj->GetUserCall() ) pCreateObj->SetUserCall( pUserCall ); - SetPointer( pView->GetPreferedPointer( aLogPt, this ) ); + SetPointer( pView->GetPreferredPointer( aLogPt, this ) ); } else Control::MouseButtonDown( rMEvt ); @@ -671,7 +671,7 @@ void GraphCtrl::MouseMove(const MouseEvent& rMEvt) SetPointer( POINTER_CROSS ); } else - SetPointer( pView->GetPreferedPointer( aLogPos, this ) ); + SetPointer( pView->GetPreferredPointer( aLogPos, this ) ); } else Control::MouseButtonUp( rMEvt ); @@ -697,7 +697,7 @@ void GraphCtrl::MouseButtonUp(const MouseEvent& rMEvt) pView->MouseButtonUp( rMEvt, this ); ReleaseMouse(); - SetPointer( pView->GetPreferedPointer( PixelToLogic( rMEvt.GetPosPixel() ), this ) ); + SetPointer( pView->GetPreferredPointer( PixelToLogic( rMEvt.GetPosPixel() ), this ) ); } else Control::MouseButtonUp( rMEvt ); diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index a41d0e07d5e2..4d027bbb66cb 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -1003,7 +1003,7 @@ void SvxRuler::SetDefTabDist(long inDefTabDist) // New distance for DefaultTabs sal_uInt16 ToSvTab_Impl(SvxTabAdjust eAdj) { - /* Internal convertion routine between SV-Tab.-Enum and Svx */ + /* Internal conversion routine between SV-Tab.-Enum and Svx */ switch(eAdj) { case SVX_TAB_ADJUST_LEFT: return RULER_TAB_LEFT; case SVX_TAB_ADJUST_RIGHT: return RULER_TAB_RIGHT; diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index 7a0426c364fa..bfa7c08f421e 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -42,7 +42,7 @@ E3dCubeObj::E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, c // Set Defaults SetDefaultAttributes(rDefault); - aCubePos = aPos; // position centre or left, bottom, back (dependant on bPosIsCenter) + aCubePos = aPos; // position centre or left, bottom, back (dependent on bPosIsCenter) aCubeSize = r3DSize; } diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index ff30e5928a50..ac04ace27d1b 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -482,7 +482,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) sal_Bool bDateNTimeCol = sal_False; if (!aPossibleTypes.empty()) { - sal_Int32 nPreferedType = aPossibleTypes[0]; + sal_Int32 nPreferredType = aPossibleTypes[0]; if ((m_pImpl->nDropAction == DND_ACTION_LINK) && (aPossibleTypes.size() > 1)) { ImageList aImageList( SVX_RES(RID_SVXIMGLIST_FMEXPL) ); @@ -492,18 +492,18 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) PopupMenu* pMenu = aInsertMenu.GetPopupMenu(SID_FM_INSERTCOL); for (std::vector<sal_uInt16>::const_iterator iter = aPossibleTypes.begin(); iter != aPossibleTypes.end(); ++iter) SetMenuItem(aImageList, *iter, pMenu, aTypeMenu, sal_True, 0); - nPreferedType = aTypeMenu.Execute(this, m_pImpl->aDropPosPixel); + nPreferredType = aTypeMenu.Execute(this, m_pImpl->aDropPosPixel); } - bDateNTimeCol = nPreferedType == SID_FM_TWOFIELDS_DATE_N_TIME; + bDateNTimeCol = nPreferredType == SID_FM_TWOFIELDS_DATE_N_TIME; sal_uInt16 nColCount = bDateNTimeCol ? 2 : 1; OUString sFieldService; while (nColCount--) { if (bDateNTimeCol) - nPreferedType = nColCount ? SID_FM_DATEFIELD : SID_FM_TIMEFIELD; + nPreferredType = nColCount ? SID_FM_DATEFIELD : SID_FM_TIMEFIELD; - sFieldService = FieldServiceFromId(nPreferedType); + sFieldService = FieldServiceFromId(nPreferredType); Reference< XPropertySet > xThisRoundCol; if ( !sFieldService.isEmpty() ) xThisRoundCol = xFactory->createColumn(sFieldService); diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 02219e3e2878..6395e6fe5a68 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -101,7 +101,7 @@ enum EDocStates /// the Auto/Emergency saved document isnt useable any longer E_DAMAGED = 64, - /// the Auto/Emergency saved document isnt realy up-to-date (some changes can be missing) + /// the Auto/Emergency saved document isnt really up-to-date (some changes can be missing) E_INCOMPLETE = 128, /// the Auto/Emergency saved document was processed successfully E_SUCCEDED = 512 diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index c2b303230909..e8ef1ce00c46 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -209,7 +209,7 @@ sal_Bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) } } // switch if (bRet && pWin!=NULL) { - pWin->SetPointer(GetPreferedPointer( + pWin->SetPointer(GetPreferredPointer( pWin->PixelToLogic(pWin->ScreenToOutputPixel( pWin->GetPointerPosPixel() ) ), pWin, rKEvt.GetKeyCode().GetModifier())); @@ -933,7 +933,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) bool bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp; // left mouse button pressed or held? sal_Bool bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp; - pWin->SetPointer(GetPreferedPointer(rVEvt.aLogicPos,pWin, + pWin->SetPointer(GetPreferredPointer(rVEvt.aLogicPos,pWin, rVEvt.nMouseCode & (KEY_SHIFT|KEY_MOD1|KEY_MOD2),bLeftDown1)); sal_Bool bAction=IsAction(); if (bLeftDown && bAction) pWin->CaptureMouse(); @@ -943,7 +943,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } #include <editeng/outlobj.hxx> -Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, sal_Bool bLeftDown) const +Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, sal_Bool bLeftDown) const { // Actions if (IsCreateObj()) diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index b3c4c820476b..e7171b532ee5 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -106,7 +106,7 @@ class SwSidebarWin : public Window void InitControls(); void HidePostIt(); void DoResize(); - void ResizeIfNeccessary(long aOldHeight, long aNewHeight); + void ResizeIfNecessary(long aOldHeight, long aNewHeight); void SetScrollbar(); void SetVirtualPosSize( const Point& aPoint, const Size& aSize); diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 015a1a78266b..c3cd9ee45e97 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -33,7 +33,7 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode PolyPolygon *pContour; sal_Bool bAutomaticContour : 1; // automatic contour polygon, not manipulated sal_Bool bContourMapModeValid : 1; // contour map mode is not the graphics's - // prefered map mode, but either + // preferred map mode, but either // MM100 or or pixel sal_Bool bPixelContour : 1; // contour map mode is invalid and pixel. diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index 423f41bd1507..cdf8a20ddb15 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -62,7 +62,7 @@ public: svt::EmbeddedObjectRef& GetObject(); OUString GetCurrentPersistName() const { return aName; } OUString GetStyleString(); - sal_Bool IsOleRef() const; ///< To avoid unneccessary loading of object. + sal_Bool IsOleRef() const; ///< To avoid unnecessary loading of object. }; diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index 0a5418ad84b7..d6f7134aaf0d 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -156,7 +156,7 @@ protected: */ virtual void verify() { - CPPUNIT_FAIL( "verify method must be overriden" ); + CPPUNIT_FAIL( "verify method must be overridden" ); } /** diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index db722f62e67d..9198cc61753d 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -525,7 +525,7 @@ DECLARE_OOXMLIMPORT_TEST(testN693238, "n693238.docx") DECLARE_OOXMLIMPORT_TEST(testNumbering1, "numbering1.docx") { -/* <w:numPr> in the paragraph itself was overriden by <w:numpr> introduced by the paragraph's <w:pStyle> +/* <w:numPr> in the paragraph itself was overridden by <w:numpr> introduced by the paragraph's <w:pStyle> enum = ThisComponent.Text.createEnumeration para = enum.NextElement xray para.NumberingStyleName diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 95a3a09dc27f..4a9978e248f8 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -176,7 +176,7 @@ DECLARE_RTFIMPORT_TEST(testN695479, "n695479.rtf") CPPUNIT_ASSERT_EQUAL(OUString("plain"), xText->getString()); if (i == 0) - // Additonally, the frist frame should have double border at the bottom. + // Additionally, the frist frame should have double border at the bottom. CPPUNIT_ASSERT_EQUAL(table::BorderLineStyle::DOUBLE, getProperty<table::BorderLine2>(xPropertySet, "BottomBorder").LineStyle); } else if (xServiceInfo->supportsService("com.sun.star.drawing.LineShape")) diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx index 75a2f1b74198..19590a968e4b 100644 --- a/sw/source/core/crsr/trvltbl.cxx +++ b/sw/source/core/crsr/trvltbl.cxx @@ -285,7 +285,7 @@ sal_Bool SwCrsrShell::SelTblBox() // if we're in a table, create a table cursor, and select the cell // that the current cursor's point resides in - // search for start node of our table box. If not found, exit realy + // search for start node of our table box. If not found, exit really const SwStartNode* pStartNode = m_pCurCrsr->GetPoint()->nNode.GetNode().FindTableBoxStartNode(); diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index c0836b0c24c1..18d8a4cff1d1 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -1422,7 +1422,7 @@ bool SwDoc::IsPoolFmtUsed( sal_uInt16 nId ) const bFnd = true; } - // Not found or no dependecies? + // Not found or no dependencies? if( bFnd && pNewFmt->GetDepends() ) { // Check if we have dependent ContentNodes in the Nodes array diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx index 6696c1dc3d1c..f83f2deb669c 100644 --- a/sw/source/core/docnode/nodedump.cxx +++ b/sw/source/core/docnode/nodedump.cxx @@ -209,7 +209,7 @@ void SwNode::dumpAsXml( xmlTextWriterPtr w ) break; case ND_STARTNODE: case ND_TEXTNODE: - abort(); // overriden + abort(); // overridden case ND_TABLENODE: name = "table"; break; diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx index 364f2b8dbc9b..bbcf16976fc3 100644 --- a/sw/source/core/fields/ddetbl.cxx +++ b/sw/source/core/fields/ddetbl.cxx @@ -67,7 +67,7 @@ SwDDETable::~SwDDETable() GetTabSortBoxes()[0]->GetSttNd()->GetNodes().IsDocNodes() ) pFldTyp->DecRefCnt(); - // If it is the last dependant of the "deleted field" than delete it finally + // If it is the last dependent of the "deleted field" than delete it finally if( pFldTyp->IsDeleted() && pFldTyp->IsLastDepend() ) { pFldTyp->Remove( &aDepend ); diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 6f17a43b7935..c46c58f70b1b 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -424,7 +424,7 @@ public: SvxShadowLocation GetShadowLocation() const { return m_aShadowLocation; } /** - * Get the absolute shadow location dependant from orientation. + * Get the absolute shadow location dependent from orientation. * * @param[in] bVertLayout true, if the container layout is vertical * false, otherwise @@ -433,7 +433,7 @@ public: SvxShadowLocation GetAbsShadowLocation( const bool bVertLayout ) const; /** - * Calculate the shadow space on the specified side dependant from + * Calculate the shadow space on the specified side dependent from * the orientation and connection with neightbours. * @see shaditem.hxx for integer constants of sides * diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index d5ae1c877d22..d8e0de48d2de 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3832,7 +3832,7 @@ sal_Bool SwFlyFrm::IsPaint( SdrObject *pObj, const SwViewShell *pSh ) if ( 0 == ( pUserCall = GetUserCall(pObj) ) ) return sal_True; - //Attribute dependant, don't paint for printer or Preview + //Attribute dependent, don't paint for printer or Preview sal_Bool bPaint = pFlyOnlyDraw || ((SwContact*)pUserCall)->GetFmt()->GetPrint().GetValue(); if ( !bPaint ) diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 5d33091c645a..bc71e1344a25 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -2613,7 +2613,7 @@ sal_Bool SwDrawTextInfo::ApplyAutoColor( Font* pFont ) if( GetShell() && GetShell()->GetWin() ) { - // here we determine the prefered window text color for painting + // here we determine the preferred window text color for painting const SwViewOption* pViewOption = GetShell()->GetViewOptions(); if(pViewOption->IsPagePreview() && !SW_MOD()->GetAccessibilityOptions().GetIsForPagePreviews()) diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 6e94f608551d..de9ab9db93d4 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1465,7 +1465,7 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/ sal_Int32 nLangBegin = nBegin; sal_Int32 nLangEnd = nEnd; - // smart tag recognization has to be done for each language portion: + // smart tag recognition has to be done for each language portion: SwLanguageIterator aIter( *pNode, nLangBegin ); do diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx index c498db93e372..a2f399b3a976 100644 --- a/sw/source/filter/html/parcss1.cxx +++ b/sw/source/filter/html/parcss1.cxx @@ -127,10 +127,10 @@ CSS1Token CSS1Parser::GetNextToken() // COMMENT cNextCh = GetNextChar(); - sal_Bool bAsterix = sal_False; - while( !(bAsterix && '/'==cNextCh) && !IsEOF() ) + sal_Bool bAsterisk = sal_False; + while( !(bAsterisk && '/'==cNextCh) && !IsEOF() ) { - bAsterix = ('*'==cNextCh); + bAsterisk = ('*'==cNextCh); cNextCh = GetNextChar(); } } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index c8aa7a0d1250..924aa1b759a9 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2123,7 +2123,7 @@ void DocxAttributeOutput::TableCellProperties( ww8::WW8TableNodeInfoInner::Point bool bEcma = GetExport().GetFilter().getVersion( ) == oox::core::ECMA_DIALECT; - // Cell prefered width + // Cell preferred width SwTwips nWidth = GetGridCols( pTableTextNodeInfoInner )->at( pTableTextNodeInfoInner->getCell() ); if ( pTableTextNodeInfoInner->getCell() ) nWidth = nWidth - GetGridCols( pTableTextNodeInfoInner )->at( pTableTextNodeInfoInner->getCell() - 1 ); @@ -2351,7 +2351,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t // Create the SwWriteTable instance to use col spans (and maybe other infos) GetTablePageSize( pTableTextNodeInfoInner.get(), nPageSize, bRelBoxSize ); - // Output the table prefered width + // Output the table preferred width if ( nPageSize != 0 ) m_pSerializer->singleElementNS( XML_w, XML_tblW, FSNS( XML_w, XML_w ), OString::number( nPageSize ).getStr( ), diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index 10f2f8de7beb..eb7f8044a882 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -159,7 +159,7 @@ public: void WriteOutliner(const OutlinerParaObject& rOutliner, sal_uInt8 nTyp); protected: - /// Format-dependant part of the actual export. + /// Format-dependent part of the actual export. virtual void ExportDocument_Impl(); /// Output page/section breaks diff --git a/sw/source/filter/ww8/needed_cast.hxx b/sw/source/filter/ww8/needed_cast.hxx index cfcabb8ccf7a..992793200049 100644 --- a/sw/source/filter/ww8/needed_cast.hxx +++ b/sw/source/filter/ww8/needed_cast.hxx @@ -38,7 +38,7 @@ namespace ww /* needed_cast is the same as static_cast except that there will be a compile time assert when NDEBUG is not defined and the in and out types are the - same. i.e. needed_cast catches unneccessary casts + same. i.e. needed_cast catches unnecessary casts */ template<typename Ret, typename Param> Ret needed_cast(Param in) { diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index 20b4c0147590..9e30cf3465bd 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -104,7 +104,7 @@ public: virtual sal_uLong ReplaceCr( sal_uInt8 nChar ); protected: - /// Format-dependant part of the actual export. + /// Format-dependent part of the actual export. virtual void ExportDocument_Impl(); virtual void SectionBreaksAndFrames( const SwTxtNode& /*rNode*/ ) {} diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 750bdb457900..2a1f0529f920 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -752,7 +752,7 @@ public: int GetGrfIndex(const SvxBrushItem& rBrush); protected: - /// Format-dependant part of the actual export. + /// Format-dependent part of the actual export. virtual void ExportDocument_Impl() = 0; /// Get the next position in the text node to output @@ -940,7 +940,7 @@ public: virtual bool SupportsUnicode() const { return bWrtWW8; } private: - /// Format-dependant part of the actual export. + /// Format-dependent part of the actual export. virtual void ExportDocument_Impl(); void PrepareStorage(); diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 6b6ffdf95236..c59897f6543e 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -1984,7 +1984,7 @@ void SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord, aPoly.Scale(aMapPolyX, aMapPolyY); // #i47277# - contour is already in unit of the - // graphic prefered unit. Thus, call method <SetContour(..)> + // graphic preferred unit. Thus, call method <SetContour(..)> pNd->SetContour(&aPoly); } } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 651800ba1756..8c91d5203838 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -686,7 +686,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt, case 0x0394: // And this is really just a guess, but a mere presence of this // flag makes a horizontal rule be as wide as the page (unless - // overriden by something), so it probably matches o:hr from .docx. + // overridden by something), so it probably matches o:hr from .docx. pImpRec->isHorizontalRule = true; break; } diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index e04d00a56439..e7f7e4d6667a 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -255,7 +255,7 @@ public: //been explicitly set, it's set to the value //of pFmt->GetItemState(RES_LR_SPACE, false) //if it was possible to get the ItemState - //for L of the LR space independantly + //for L of the LR space independently bool bParaAutoBefore; // For Auto spacing before a paragraph bool bParaAutoAfter; // For Auto Spacing after a paragraph diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 4d454e14c0d6..d09db9762626 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -1101,7 +1101,7 @@ void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS) delete[] pNewSHDs, pNewSHDs = 0; } - short nFileCols = nLen / ( bVer67 ? 10 : 20 ); // realy saved + short nFileCols = nLen / ( bVer67 ? 10 : 20 ); // really saved if (!pTCs && nCols) { diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 82962db1ab52..c0caa3bb042d 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -387,7 +387,7 @@ struct WW8LFOLVL // (siehe Kommentar unten bei struct WW8LFOInfo) sal_uInt8 bStartAt :1; // true if the start-at value is overridden - sal_uInt8 bFormat :1; // true if the formatting is overriden + sal_uInt8 bFormat :1; // true if the formatting is overridden WW8LFOLVL() : nStartAt(1), nLevel(0), bStartAt(1), bFormat(0) {} diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx index b1d3767c2474..6cd7fc4b9818 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.cxx +++ b/sw/source/ui/docvw/SidebarTxtControl.cxx @@ -206,7 +206,7 @@ void SidebarTxtControl::KeyInput( const KeyEvent& rKeyEvt ) } } if (bDone) - mrSidebarWin.ResizeIfNeccessary( aOldHeight, mrSidebarWin.GetPostItTextHeight() ); + mrSidebarWin.ResizeIfNecessary( aOldHeight, mrSidebarWin.GetPostItTextHeight() ); else { // write back data first when showing navigator diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index 4cf128a85d0d..1362a83ff094 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -671,7 +671,7 @@ void SwSidebarWin::SetScrollbar() mpVScrollbar->SetThumbPos( mpOutlinerView->GetVisArea().Top()+ mpOutlinerView->GetEditView().GetCursor()->GetOffsetY()); } -void SwSidebarWin::ResizeIfNeccessary(long aOldHeight, long aNewHeight) +void SwSidebarWin::ResizeIfNecessary(long aOldHeight, long aNewHeight) { if (aOldHeight != aNewHeight) { diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 688edfe69030..93607fb044d6 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -532,7 +532,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier ) if (m_rView.GetDrawFuncPtr() && m_rView.GetDrawFuncPtr()->IsInsertForm() && !bHitHandle) SetPointer( POINTER_DRAW_RECT ); else - SetPointer( pSdrView->GetPreferedPointer( rLPt, rSh.GetOut() ) ); + SetPointer( pSdrView->GetPreferredPointer( rLPt, rSh.GetOut() ) ); } } else diff --git a/sw/source/ui/docvw/romenu.hxx b/sw/source/ui/docvw/romenu.hxx index ba20764b1306..e0242db41504 100644 --- a/sw/source/ui/docvw/romenu.hxx +++ b/sw/source/ui/docvw/romenu.hxx @@ -57,7 +57,7 @@ public: void Execute( Window* pWin, sal_uInt16 nId ); }; -void GetPreferedExtension( OUString &rExt, const Graphic &rGrf ); +void GetPreferredExtension( OUString &rExt, const Graphic &rGrf ); #endif diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx index a5b29cd4e752..50d319d24348 100644 --- a/sw/source/ui/envelp/labimg.cxx +++ b/sw/source/ui/envelp/labimg.cxx @@ -195,7 +195,7 @@ Sequence<OUString> SwLabCfgItem::GetPropertyNames() { static const char* aLabelPropNames[] = { - "Medium/Continous", // 0 + "Medium/Continuous", // 0 "Medium/Brand", // 1 "Medium/Type", // 2 "Format/Column", // 3 @@ -289,7 +289,7 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) : bNoConfigValues = false; switch(nProperty) { - case 0: aItem.bCont = *(sal_Bool*)pValues[nProp].getValue(); break;// "Medium/Continous", + case 0: aItem.bCont = *(sal_Bool*)pValues[nProp].getValue(); break;// "Medium/Continuous", case 1: pValues[nProp] >>= aItem.aMake; break;// "Medium/Brand", case 2: pValues[nProp] >>= aItem.aType; break;// "Medium/Type", case 3: pValues[nProp] >>= aItem.nCols; break;// "Format/Column", @@ -412,7 +412,7 @@ void SwLabCfgItem::Commit() nProperty += 3; switch(nProperty) { - case 0: pValues[nProp].setValue(&aItem.bCont, rType); break;// "Medium/Continous", + case 0: pValues[nProp].setValue(&aItem.bCont, rType); break;// "Medium/Continuous", case 1: pValues[nProp] <<= aItem.aMake; break;// "Medium/Brand", case 2: pValues[nProp] <<= aItem.aType; break;// "Medium/Type", case 3: pValues[nProp] <<= aItem.nCols; break;// "Format/Column", diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 693a8e58f5ca..3d77891ef2dd 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -674,7 +674,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) OUString aTmp( m_aSuggestions[ nAltIdx ] ); OUString aOrig( m_bGrammarResults ? OUString() : m_xSpellAlt->getWord() ); - // if orginal word has a trailing . (likely the end of a sentence) + // if original word has a trailing . (likely the end of a sentence) // and the replacement text hasn't, then add it to the replacement if (!aTmp.isEmpty() && !aOrig.isEmpty() && aOrig.endsWith(".") && /* !IsAlphaNumeric ??*/ diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx index 0064e9e1dfd1..2ae8b03f0e6c 100644 --- a/sw/source/ui/ribbar/drawbase.cxx +++ b/sw/source/ui/ribbar/drawbase.cxx @@ -555,7 +555,7 @@ void SwDrawBase::SetDrawPointer() SdrView *pSdrView = m_pSh->GetDrawView(); Point aPnt(m_pWin->OutputToScreenPixel(m_pWin->GetPointerPosPixel())); aPnt = m_pWin->PixelToLogic(m_pWin->ScreenToOutputPixel(aPnt)); - const Pointer aPointTyp = pSdrView->GetPreferedPointer(aPnt, m_pSh->GetOut()); + const Pointer aPointTyp = pSdrView->GetPreferredPointer(aPnt, m_pSh->GetOut()); const Pointer aDrawPt(aPointTyp); m_pWin->SetPointer(aDrawPt); } diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 1106013b376e..6f1b45d548d6 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -932,7 +932,7 @@ void SwAnnotationShell::ExecClpbrd(SfxRequest &rReq) break; } } - pPostItMgr->GetActiveSidebarWin()->ResizeIfNeccessary(aOldHeight,pPostItMgr->GetActiveSidebarWin()->GetPostItTextHeight()); + pPostItMgr->GetActiveSidebarWin()->ResizeIfNecessary(aOldHeight,pPostItMgr->GetActiveSidebarWin()->GetPostItTextHeight()); } void SwAnnotationShell::StateClpbrd(SfxItemSet &rSet) @@ -1506,7 +1506,7 @@ void SwAnnotationShell::ExecUndo(SfxRequest &rReq) rView.GetViewFrame()->GetBindings().InvalidateAll(sal_False); if (rView.GetPostItMgr()->HasActiveSidebarWin()) - rView.GetPostItMgr()->GetActiveSidebarWin()->ResizeIfNeccessary(aOldHeight,rView.GetPostItMgr()->GetActiveSidebarWin()->GetPostItTextHeight()); + rView.GetPostItMgr()->GetActiveSidebarWin()->ResizeIfNecessary(aOldHeight,rView.GetPostItMgr()->GetActiveSidebarWin()->GetPostItTextHeight()); } void SwAnnotationShell::StateUndo(SfxItemSet &rSet) diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 4fbdc9a7d5c1..67086b3275cb 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -1154,7 +1154,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption OUString sFileURL; if ( (rProp.Value >>= sFileURL ) ) { - // Convert the File URL into a system dependant path, as the SalPrinter expects + // Convert the File URL into a system dependent path, as the SalPrinter expects OUString sSystemPath; FileBase::getSystemPathFromFileURL ( sFileURL, sSystemPath ); aReq.AppendItem(SfxStringItem( SID_FILE_NAME, sSystemPath ) ); @@ -2764,7 +2764,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( { // we just state what output size we would need // which may cause vcl to set that page size on the printer - // (if available and not overriden by the user) + // (if available and not overridden by the user) aTmpSize = pVwSh->GetPageSize( nPage, bIsSkipEmptyPages ); aPreferredPageSize = awt::Size ( TWIP_TO_MM100( 2 * aTmpSize.Width() ), TWIP_TO_MM100( aTmpSize.Height() )); diff --git a/sw/source/ui/web/wview.cxx b/sw/source/ui/web/wview.cxx index 68df58e95b88..e60cfa0fa884 100644 --- a/sw/source/ui/web/wview.cxx +++ b/sw/source/ui/web/wview.cxx @@ -124,7 +124,7 @@ void SwWebView::SelectShell() { rDispatcher.Flush(); // really delete all cached shells - //Additonal to the old selection remember which toolbar was visible. + //Additional to the old selection remember which toolbar was visible. sal_Int32 nId = rDispatcher.GetObjectBarId( SFX_OBJECTBAR_OBJECT ); if ( nId ) pBarCfg->SetTopToolbar( _nSelectionType, nId ); diff --git a/test/source/diff/README b/test/source/diff/README index 4d3e551b8c7f..2ed65928d2d6 100644 --- a/test/source/diff/README +++ b/test/source/diff/README @@ -1,5 +1,5 @@ This xml diff is an adapted version of the version at git://people.freedesktop.org/~mmohrhard/xmldiff. Please write a mail to <markus.mohrhard@googlemail.com> after modifying this version with a patch otherwise it -might get overriden when updating the version in the source tree. +might get overridden when updating the version in the source tree. !This xml diff is still experimental! diff --git a/tubes/source/file-transfer-helper.c b/tubes/source/file-transfer-helper.c index 093d4190f4d8..cc35f6fb585b 100644 --- a/tubes/source/file-transfer-helper.c +++ b/tubes/source/file-transfer-helper.c @@ -1806,7 +1806,7 @@ empathy_ft_handler_get_total_bytes (EmpathyFTHandler *handler) * empathy_ft_handler_is_completed: * @handler: an #EmpathyFTHandler * - * Returns whether the transfer for @handler has been completed succesfully. + * Returns whether the transfer for @handler has been completed successfully. * * Return value: %TRUE if the handler has been transferred correctly, %FALSE * otherwise diff --git a/ucb/README b/ucb/README index d364a09e5670..d980e0fffd9e 100644 --- a/ucb/README +++ b/ucb/README @@ -3,5 +3,5 @@ Universal Content Broker (has ucp) which do things like convert files to strings mmeeks: so - I renamed the old LGPLv3 webdav code to webdav-neon, and imported the (not built) surf webdav ucp into the old space. so that in future, we can merge changes more easily - and still choose which to use. cbosdonnat kindly -volunteered to do some comparitive analysis of the two codebases to decide which +volunteered to do some comparative analysis of the two codebases to decide which is best for what etc. diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 4c1bd9f2a0cf..d15c90b6cd3e 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -928,7 +928,7 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( if ( nCount ) { uno::Reference< beans::XPropertySet > xAdditionalPropSet; - sal_Bool bTriedToGetAdditonalPropSet = sal_False; + sal_Bool bTriedToGetAdditionalPropSet = sal_False; const beans::Property* pProps = rProperties.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -971,14 +971,14 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( { // Not a Core Property! Maybe it's an Additional Core Property?! - if ( !bTriedToGetAdditonalPropSet && !xAdditionalPropSet.is() ) + if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() ) { xAdditionalPropSet = uno::Reference< beans::XPropertySet >( pProvider->getAdditionalPropertySet( rContentId, sal_False ), uno::UNO_QUERY ); - bTriedToGetAdditonalPropSet = sal_True; + bTriedToGetAdditionalPropSet = sal_True; } if ( xAdditionalPropSet.is() ) @@ -1097,7 +1097,7 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( sal_Int32 nCount = rValues.getLength(); uno::Reference< ucb::XPersistentPropertySet > xAdditionalPropSet; - sal_Bool bTriedToGetAdditonalPropSet = sal_False; + sal_Bool bTriedToGetAdditionalPropSet = sal_False; sal_Bool bExchange = sal_False; OUString aOldTitle; @@ -1250,10 +1250,10 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( { // Not a Core Property! Maybe it's an Additional Core Property?! - if ( !bTriedToGetAdditonalPropSet && !xAdditionalPropSet.is() ) + if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() ) { xAdditionalPropSet = getAdditionalPropertySet( sal_False ); - bTriedToGetAdditonalPropSet = sal_True; + bTriedToGetAdditionalPropSet = sal_True; } if ( xAdditionalPropSet.is() ) diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 34c5af5acd67..267bb5e87188 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -816,7 +816,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( nCount ) { uno::Reference< beans::XPropertySet > xAdditionalPropSet; - sal_Bool bTriedToGetAdditonalPropSet = sal_False; + sal_Bool bTriedToGetAdditionalPropSet = sal_False; const beans::Property* pProps = rProperties.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -889,14 +889,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { // Not a Core Property! Maybe it's an Additional Core Property?! - if ( !bTriedToGetAdditonalPropSet && !xAdditionalPropSet.is() ) + if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() ) { xAdditionalPropSet = uno::Reference< beans::XPropertySet >( rProvider->getAdditionalPropertySet( rContentId, sal_False ), uno::UNO_QUERY ); - bTriedToGetAdditonalPropSet = sal_True; + bTriedToGetAdditionalPropSet = sal_True; } if ( xAdditionalPropSet.is() ) @@ -1061,7 +1061,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( sal_Int32 nCount = rValues.getLength(); uno::Reference< ucb::XPersistentPropertySet > xAdditionalPropSet; - sal_Bool bTriedToGetAdditonalPropSet = sal_False; + sal_Bool bTriedToGetAdditionalPropSet = sal_False; sal_Bool bExchange = sal_False; sal_Bool bStore = sal_False; OUString aNewTitle; @@ -1313,10 +1313,10 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Not a Core Property! Maybe it's an Additional Core Property?! - if ( !bTriedToGetAdditonalPropSet && !xAdditionalPropSet.is() ) + if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() ) { xAdditionalPropSet = getAdditionalPropertySet( sal_False ); - bTriedToGetAdditonalPropSet = sal_True; + bTriedToGetAdditionalPropSet = sal_True; } if ( xAdditionalPropSet.is() ) diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 6a2acc742ade..639c0fffbdc0 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -945,7 +945,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( nCount ) { uno::Reference< beans::XPropertySet > xAdditionalPropSet; - sal_Bool bTriedToGetAdditonalPropSet = sal_False; + sal_Bool bTriedToGetAdditionalPropSet = sal_False; const beans::Property* pProps = rProperties.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -1003,14 +1003,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { // Not a Core Property! Maybe it's an Additional Core Property?! - if ( !bTriedToGetAdditonalPropSet && !xAdditionalPropSet.is() ) + if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() ) { xAdditionalPropSet = uno::Reference< beans::XPropertySet >( pProvider->getAdditionalPropertySet( rContentId, sal_False ), uno::UNO_QUERY ); - bTriedToGetAdditonalPropSet = sal_True; + bTriedToGetAdditionalPropSet = sal_True; } if ( xAdditionalPropSet.is() ) @@ -1150,7 +1150,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( sal_Int32 nCount = rValues.getLength(); uno::Reference< ucb::XPersistentPropertySet > xAdditionalPropSet; - sal_Bool bTriedToGetAdditonalPropSet = sal_False; + sal_Bool bTriedToGetAdditionalPropSet = sal_False; sal_Bool bExchange = sal_False; OUString aOldTitle; @@ -1277,10 +1277,10 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Not a Core Property! Maybe it's an Additional Core Property?! - if ( !bTriedToGetAdditonalPropSet && !xAdditionalPropSet.is() ) + if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() ) { xAdditionalPropSet = getAdditionalPropertySet( sal_False ); - bTriedToGetAdditonalPropSet = sal_True; + bTriedToGetAdditionalPropSet = sal_True; } if ( xAdditionalPropSet.is() ) diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index bff41ad5520b..ec4f694de00e 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -1158,7 +1158,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( nCount ) { uno::Reference< beans::XPropertySet > xAdditionalPropSet; - sal_Bool bTriedToGetAdditonalPropSet = sal_False; + sal_Bool bTriedToGetAdditionalPropSet = sal_False; const beans::Property* pProps = rProperties.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -1174,14 +1174,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( else { // Process local Additional Properties. - if ( !bTriedToGetAdditonalPropSet && !xAdditionalPropSet.is() ) + if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() ) { xAdditionalPropSet = uno::Reference< beans::XPropertySet >( rProvider->getAdditionalPropertySet( rContentId, sal_False ), uno::UNO_QUERY ); - bTriedToGetAdditonalPropSet = sal_True; + bTriedToGetAdditionalPropSet = sal_True; } if ( !xAdditionalPropSet.is() || @@ -1574,7 +1574,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( std::vector< sal_Int32 > aProppatchPropsPositions; uno::Reference< ucb::XPersistentPropertySet > xAdditionalPropSet; - sal_Bool bTriedToGetAdditonalPropSet = sal_False; + sal_Bool bTriedToGetAdditionalPropSet = sal_False; sal_Bool bExchange = sal_False; OUString aNewTitle; @@ -1754,12 +1754,12 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { // Property value will be stored in local property store. - if ( !bTriedToGetAdditonalPropSet && + if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() ) { xAdditionalPropSet = getAdditionalPropertySet( sal_False ); - bTriedToGetAdditonalPropSet = sal_True; + bTriedToGetAdditionalPropSet = sal_True; } if ( xAdditionalPropSet.is() ) diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index a5e7087e1a3c..52fdc1fd64d6 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -1265,7 +1265,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( nCount ) { uno::Reference< beans::XPropertySet > xAdditionalPropSet; - sal_Bool bTriedToGetAdditonalPropSet = sal_False; + sal_Bool bTriedToGetAdditionalPropSet = sal_False; const beans::Property* pProps = rProperties.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -1281,14 +1281,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( else { // Process local Additional Properties. - if ( !bTriedToGetAdditonalPropSet && !xAdditionalPropSet.is() ) + if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() ) { xAdditionalPropSet = uno::Reference< beans::XPropertySet >( rProvider->getAdditionalPropertySet( rContentId, sal_False ), uno::UNO_QUERY ); - bTriedToGetAdditonalPropSet = sal_True; + bTriedToGetAdditionalPropSet = sal_True; } if ( !xAdditionalPropSet.is() || @@ -1714,7 +1714,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( std::vector< sal_Int32 > aProppatchPropsPositions; uno::Reference< ucb::XPersistentPropertySet > xAdditionalPropSet; - sal_Bool bTriedToGetAdditonalPropSet = sal_False; + sal_Bool bTriedToGetAdditionalPropSet = sal_False; sal_Bool bExchange = sal_False; OUString aNewTitle; @@ -1892,12 +1892,12 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { // Property value will be stored in local property store. - if ( !bTriedToGetAdditonalPropSet && + if ( !bTriedToGetAdditionalPropSet && !xAdditionalPropSet.is() ) { xAdditionalPropSet = getAdditionalPropertySet( sal_False ); - bTriedToGetAdditonalPropSet = sal_True; + bTriedToGetAdditionalPropSet = sal_True; } if ( xAdditionalPropSet.is() ) diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index be3f570a3304..dfc0cb7b1294 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -723,9 +723,9 @@ void InternetProxyDecider_Impl::setNoProxyList( else { // Port given, extract server pattern - sal_Int32 nAsterixPos = aToken.indexOf( '*' ); + sal_Int32 nAsteriskPos = aToken.indexOf( '*' ); aPort = aToken.copy( nColonPos + 1 ); - if ( nAsterixPos < nColonPos ) + if ( nAsteriskPos < nColonPos ) { // pattern describes exactly one server aServer = aToken.copy( 0, nColonPos ); diff --git a/udkapi/com/sun/star/bridge/ModelDependent.idl b/udkapi/com/sun/star/bridge/ModelDependent.idl index 16a7991bbc5f..13a37f7c2042 100644 --- a/udkapi/com/sun/star/bridge/ModelDependent.idl +++ b/udkapi/com/sun/star/bridge/ModelDependent.idl @@ -23,7 +23,7 @@ module com { module sun { module star { module bridge { -/** These constants are used to specify model-dependant representations. +/** These constants are used to specify model-dependent representations. <p>They are only used for creating bridges to other component models. diff --git a/udkapi/com/sun/star/container/XContainerQuery.idl b/udkapi/com/sun/star/container/XContainerQuery.idl index 73fe077d2ed6..6fb407cf2c79 100644 --- a/udkapi/com/sun/star/container/XContainerQuery.idl +++ b/udkapi/com/sun/star/container/XContainerQuery.idl @@ -39,7 +39,7 @@ published interface XContainerQuery: com::sun::star::uno::XInterface <p> Items of this sub set must match used query string. Format of query depends - from real implementation. Using of "param=value" pairs isn't neccessary. + from real implementation. Using of "param=value" pairs isn't necessary. So it's possible to combine different parameters as one simple command string. <p> diff --git a/udkapi/com/sun/star/io/XTextOutputStream.idl b/udkapi/com/sun/star/io/XTextOutputStream.idl index 26eb0e2b4e1c..40cfe25e8d84 100644 --- a/udkapi/com/sun/star/io/XTextOutputStream.idl +++ b/udkapi/com/sun/star/io/XTextOutputStream.idl @@ -39,7 +39,7 @@ published interface XTextOutputStream: com::sun::star::io::XOutputStream /** writes a string to the stream using the encoding defined by setEncoding(). - <p>Line breaks or delimiters that may be neccessary + <p>Line breaks or delimiters that may be necessary to support XTextInputStream::readLine() and XTextInputStream::readString() have to be added manually to the parameter string.</p> diff --git a/udkapi/com/sun/star/lang/MultiServiceFactory.idl b/udkapi/com/sun/star/lang/MultiServiceFactory.idl index 24e4fd4cc443..03aeb26f370b 100644 --- a/udkapi/com/sun/star/lang/MultiServiceFactory.idl +++ b/udkapi/com/sun/star/lang/MultiServiceFactory.idl @@ -31,7 +31,7 @@ module com { module sun { module star { module lang { /** Provides a collection of implementations of services. - <p>The factories for instantiating objects of implemetations + <p>The factories for instantiating objects of implementations are accessed via a service name.</p> <p>The com::sun::star::container::XContentEnumerationAccess diff --git a/unoidl/README b/unoidl/README index 34e1cde6fef9..3c387e9038d9 100644 --- a/unoidl/README +++ b/unoidl/README @@ -49,7 +49,7 @@ of concept and size of representation, esp. for the C++ representation types in namespace unoidl) and consist of arbitrary sequences of name/value strings. Each name/value string is encoded as a single UTF-8 string containing a name (an arbitrary sequence of Unicode code points not containing U+003D EQUALS SIGN), -optionally followed by U+003D EQUALS SIGN and a value (an abritrary sequence of +optionally followed by U+003D EQUALS SIGN and a value (an arbitrary sequence of Unicode code points). The only annotation name currently in use is "deprecated" (without a value). diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index 1887cb7daeae..e2da7dfa6cb8 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -77,7 +77,7 @@ class SvtCmdOptions //--------------------------------------------------------------------------------------------------------- // convert internal list to external format - // for using it on right menus realy + // for using it on right menus really // Notice: We build a property list with 4 entries and set it on result list then. // The while-loop starts with pointer on internal member list lSetupEntries, change to // lUserEntries then and stop after that with NULL! diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index b432996c76ae..f382cf50e89f 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -133,7 +133,7 @@ class SvtDynMenu } // convert internal list to external format - // for using it on right menus realy + // for using it on right menus really // Notice: We build a property list with 4 entries and set it on result list then. // The while-loop starts with pointer on internal member list lSetupEntries, change to // lUserEntries then and stop after that with NULL! diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 41b72b55e117..c72fff8ce216 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -40,11 +40,11 @@ #include "itemholder1.hxx" /*-************************************************************************************************************//** - @descr These values are used to define neccessary keys from our configuration management to support + @descr These values are used to define necessary keys from our configuration management to support all functionality of these implementation. It's a fast way to make changes if some keys change his name or location! - Property handle are neccessary to specify right position in return list of configuration + Property handle are necessary to specify right position in return list of configuration for asked values. We ask it with a list of properties to get his values. The returned list has the same order like our given name list! e.g.: @@ -356,7 +356,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem /*-************************************************************************************************************//** @short default ctor - @descr We open our configuration here and read all neccessary values from it. + @descr We open our configuration here and read all necessary values from it. These values are cached till everyone call Commit(). Then we write changed ones back to cfg. @seealso baseclass ConfigItem @@ -453,7 +453,7 @@ void SvtModuleOptions_Impl::Notify( const css::uno::Sequence< OUString >& ) void SvtModuleOptions_Impl::Commit() { // Reserve memory for ALL possible factory properties! - // Step over all factories and get her realy changed values only. + // Step over all factories and get her really changed values only. // Build list of these ones and use it for commit. css::uno::Sequence< css::beans::PropertyValue > lCommitProperties( FACTORYCOUNT*PROPERTYCOUNT ); FactoryInfo* pInfo = NULL ; @@ -750,7 +750,7 @@ void SvtModuleOptions_Impl::SetFactoryDefaultFilter( SvtModuleOptions::EFa /*-************************************************************************************************************//** @short return list of key names of ouer configuration management which represent our module tree @descr You give use a list of current existing set node names .. and we expand it for all - well known properties which are neccessary for this implementation. + well known properties which are necessary for this implementation. These full expanded list should be used to get values of this properties. @seealso ctor diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index e95053e6ee94..43ac37df1406 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -91,8 +91,8 @@ sal_Int32 SvtViewOptions::m_nRefCount_Windows = 0 User must decide which information are useful and which not. We are a container iztem only and doesn't know anything about the context. But; we support a feature: - decision between items with default values (should not realy exist in configuration!) - and items with real values - changed by user. So user can suppress saving of realy unused items + decision between items with default values (should not really exist in configuration!) + and items with real values - changed by user. So user can suppress saving of really unused items to disk - because; defaulted items could be restored on runtime without reading from disk!!! And if only items with valid information was written to cfg - we mustn't read so much and save time. So we start with an member m_bDefault=True and reset it to False after first set-call. @@ -243,7 +243,7 @@ typedef ::boost::unordered_map< OUString , @descr Implement base data container for view options elements. Every item support ALL possible configuration information. But not every superclass should use them! Because some view types don't - have it realy. + have it really. @attention We implement a write-througt-cache! We use it for reading - but write all changes directly to configuration. (changes are made on internal cache too!). So it's easier to distinguish @@ -343,8 +343,8 @@ SvtViewOptionsBase_Impl::SvtViewOptionsBase_Impl( const OUString& sList ) @short dtor @descr clean up something - @attention We implement a write through cache! So we mustn't do it realy. All changes was written to cfg directly. - Commit isn't neccessary then. + @attention We implement a write through cache! So we mustn't do it really. All changes was written to cfg directly. + Commit isn't necessary then. @seealso baseclass ::utl::ConfigItem @seealso method IsModified() diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx index 5ffbec2459c5..f6dc852c6151 100644 --- a/uui/source/fltdlg.cxx +++ b/uui/source/fltdlg.cxx @@ -37,7 +37,7 @@ namespace uui /*-************************************************************************************************************//** @short initialize filter dialog with start values - @descr We set some neccessary information on these instance for later working and create internal structures. + @descr We set some necessary information on these instance for later working and create internal structures. After construction user should call "SetFilters()" and "SetURL()" to fill listbox with selectable filter names and set file name of file, which should be used for selected filter. @@ -120,7 +120,7 @@ void FilterDialog::ChangeFilters( const FilterNameList* pFilterNames ) @short ask user for his decision @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 realy ... + parameter "pSelectedItem" as pointer into your FilterNameList to get selected item really ... but if we return sal_False ... user has cancel the dialog ... you should not do that. pSelectedItem isnt set to any valid value then. We don't change them ... diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index b89d7163712a..31b4244f806a 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -293,7 +293,7 @@ ScVbaControl::getControlSource() throw (uno::RuntimeException) { // #FIXME I *hate* having these upstream differences // but this is necessary until I manage to upstream other -// dependant parts +// dependent parts OUString sControlSource; uno::Reference< form::binding::XBindableValue > xBindable( m_xProps, uno::UNO_QUERY ); if ( xBindable.is() ) diff --git a/vcl/README b/vcl/README index 72f02e08e351..bebb9e1787bf 100644 --- a/vcl/README +++ b/vcl/README @@ -92,7 +92,7 @@ documentation parsing: - wmf/emf filter --> GDI metafile with emf+ in commments --> cppcanvas metafile renderer + wmf/emf filter --> GDI metafile with emf+ in comments --> cppcanvas metafile renderer lately the GDIMetafile rendering path changed which also influenced emf+ rendering. now many things happen in drawing layer, where @@ -101,7 +101,7 @@ metafiles with emf+ we let the mtfrenderer render them into bitmap (with transparency) and use this bitmap in drawinlayer. cleaner solution for current state would be to extend the drawing layer for missing features and move parsing into drawing layer (might be quite -a lot of work). intemediary enhancement would be to know better the +a lot of work). intermediary enhancement would be to know better the needed size/resolution of the bitmap, before we render emf+ into bitmap in drawing layer. Thorsten is working on the same problem with svg rendering, so hopefully his approach could be extended for emf+ as @@ -111,7 +111,7 @@ look at vcl/source/gdi/gdimetafile.cxx where you can look for UseCanvas again. moving the parsing into drawinglayer might also have nice side effect for emf+-dual metafiles. in case the emf+ records are broken, it would be easier to use the duplicit emf -rendering. fortunatelly we didn't run into such a broken emf+ file +rendering. fortunately we didn't run into such a broken emf+ file yet. but there were already few cases where we first though that the problem might be because of broken emf+ part. so far it always turned out to be another problem. diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 828daee2e0d7..5eff5bf7ee26 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -703,7 +703,7 @@ void PrintFontManager::deinitFontconfig() bool PrintFontManager::addFontconfigDir( const OString& rDirName ) { // workaround for a stability problems in older FC versions - // when handling application specifc fonts + // when handling application specific fonts const int nVersion = FcGetVersion(); if( nVersion <= 20400 ) return false; diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 1dc4f4d7f782..ac63fe7878c5 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -90,7 +90,7 @@ private: sal_Int32 mnChunkLen; // Length of current PNG chunk Size maOrigSize; // pixel size of the full image Size maTargetSize; // pixel size of the result image - Size maPhysSize; // prefered size in MAP_100TH_MM units + Size maPhysSize; // preferred size in MAP_100TH_MM units sal_uInt32 mnBPP; // number of bytes per pixel sal_uInt32 mnScansize; // max size of scanline sal_uInt32 mnYpos; // latest y position in full image diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index ad2329c1108e..26c5d13e01e7 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -173,7 +173,7 @@ public: // 1. default tray // 2. tray set for a concrete page by an application, e.g., writer // allows setting a printer tray (for the default printer) for a - // page style. This setting can be overriden by user by selecting + // page style. This setting can be overridden by user by selecting // "Use only paper tray from printer preferences" on the Options // page in the print dialog, in which case the default tray is // used for all pages. diff --git a/vcl/source/gdi/regionband.cxx b/vcl/source/gdi/regionband.cxx index 7dd4f2d7d2a1..1dbfd349384e 100644 --- a/vcl/source/gdi/regionband.cxx +++ b/vcl/source/gdi/regionband.cxx @@ -756,7 +756,7 @@ void RegionBand::InsertBands(long nTop, long nBottom) break; } - // insert bands between two bands if neccessary + // insert bands between two bands if necessary if ( pBand->mpNextBand ) { if ( (pBand->mnYBottom + 1) < pBand->mpNextBand->mnYTop ) diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 4c804fa6d86c..7669b241d61a 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -380,7 +380,7 @@ static Unicode2LangType aLangFromCodeChart[]= { // get language matching to the missing char LanguageType MapCharToLanguage( sal_UCS4 uChar ) { - // entries marked with default-CJK get replaced with the prefered CJK language + // entries marked with default-CJK get replaced with the preferred CJK language static bool bFirst = true; if( bFirst ) { @@ -408,7 +408,7 @@ LanguageType MapCharToLanguage( sal_UCS4 uChar ) LanguageType nDefaultCJK = MsLangId::isCJK(nDefaultLang) ? nDefaultLang : LANGUAGE_CHINESE; - // change the marked entries to prefered language + // change the marked entries to preferred language static const int nCount = SAL_N_ELEMENTS(aLangFromCodeChart); for( int i = 0; i < nCount; ++i ) { @@ -519,7 +519,7 @@ namespace } // find a fallback font for missing characters -// TODO: should stylistic matches be searched and prefered? +// TODO: should stylistic matches be searched and preferred? bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData, OUString& rMissingChars ) const { // guess a locale matching to the missing chars @@ -603,7 +603,7 @@ struct ImplEnumInfo OUString* mpName; LOGFONTA* mpLogFontA; LOGFONTW* mpLogFontW; - UINT mnPreferedCharSet; + UINT mnPreferredCharSet; bool mbCourier; bool mbImplSalCourierScalable; bool mbImplSalCourierNew; @@ -1826,7 +1826,7 @@ int CALLBACK SalEnumFontsProcExA( const ENUMLOGFONTEXA* pLogFont, // prefer the system character set, so that we get as much as // possible important characters. In the other case we could only // display a limited set of characters (#87309#) - if ( pInfo->mnPreferedCharSet == pLogFont->elfLogFont.lfCharSet ) + if ( pInfo->mnPreferredCharSet == pLogFont->elfLogFont.lfCharSet ) pData->mnQuality += 100; // knowing Courier to be scalable is nice @@ -2127,7 +2127,7 @@ bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList, if( !ImplAddTempFont( *GetSalData(), rFontFileURL ) ) return false; - UINT nPreferedCharSet = DEFAULT_CHARSET; + UINT nPreferredCharSet = DEFAULT_CHARSET; // create matching FontData struct aDFA.SetSymbolFlag(false); // TODO: how to know it without accessing the font? @@ -2147,7 +2147,7 @@ bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList, */ ImplWinFontData* pFontData = new ImplWinFontData( aDFA, 0, - sal::static_int_cast<BYTE>(nPreferedCharSet), + sal::static_int_cast<BYTE>(nPreferredCharSet), sal::static_int_cast<BYTE>(TMPF_VECTOR|TMPF_TRUETYPE) ); pFontData->SetFontId( reinterpret_cast<sal_IntPtr>(pFontData) ); pFontList->Add( pFontData ); @@ -2225,11 +2225,11 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) aInfo.mbImplSalCourierNew = true; } - aInfo.mnPreferedCharSet = DEFAULT_CHARSET; + aInfo.mnPreferredCharSet = DEFAULT_CHARSET; DWORD nCP = GetACP(); CHARSETINFO aCharSetInfo; if ( TranslateCharsetInfo( (DWORD*)(sal_IntPtr)nCP, &aCharSetInfo, TCI_SRCCODEPAGE ) ) - aInfo.mnPreferedCharSet = aCharSetInfo.ciCharset; + aInfo.mnPreferredCharSet = aCharSetInfo.ciCharset; LOGFONTW aLogFont; memset( &aLogFont, 0, sizeof( aLogFont ) ); diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx index 608228efed74..aee96e196b3f 100644 --- a/vcl/win/source/gdi/salgdi_gdiplus.cxx +++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx @@ -193,7 +193,7 @@ bool WinSalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly // Normally GdiPlus should not be used for printing at all since printers cannot // print transparent filled polygon geometry and normally this does not happen // since OutputDevice::RemoveTransparenciesFromMetaFile is used as preparation - // and no transparent parts should remain for printing. But this can be overriden + // and no transparent parts should remain for printing. But this can be overridden // by the user and thus happens. This call can only come (currently) from // OutputDevice::DrawTransparent, see comments there with the same TaskID. // If it is used, the mapping for the printer is wrong and needs to be corrected. I diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index c342b7f0527d..db91127e7df2 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -2817,7 +2817,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetMenuColor( ImplWinColorToSal( GetSysColor( COLOR_MENU ) ) ); aStyleSettings.SetMenuBarColor( aStyleSettings.GetMenuColor() ); aStyleSettings.SetMenuBarRolloverColor( aStyleSettings.GetHighlightColor() ); - aStyleSettings.SetMenuBorderColor( aStyleSettings.GetLightBorderColor() ); // overriden below for flat menus + aStyleSettings.SetMenuBorderColor( aStyleSettings.GetLightBorderColor() ); // overridden below for flat menus aStyleSettings.SetUseFlatBorders( FALSE ); aStyleSettings.SetUseFlatMenus( FALSE ); aStyleSettings.SetMenuTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) ); diff --git a/winaccessibility/README b/winaccessibility/README index e27c68f213bf..eb425e419b75 100644 --- a/winaccessibility/README +++ b/winaccessibility/README @@ -12,11 +12,11 @@ source/service/ + the UNO service providing the accessibility bridge. It essentially listens to events from the LibreOffice core and creates and synchronises COM peers for our - internal accessibilty objects when events arrive. + internal accessibility objects when events arrive. source/UAccCom/ + COM implementations of the MSAA / IAccessible2 interfaces - to provide native peers for the accessbility code. + to provide native peers for the accessibility code. source/UAccCOMIDL/ + COM Interface Definition Language (IDL) for UAccCom. diff --git a/wizards/com/sun/star/wizards/web/Process.py b/wizards/com/sun/star/wizards/web/Process.py index b13865177807..3502b58492f9 100644 --- a/wizards/com/sun/star/wizards/web/Process.py +++ b/wizards/com/sun/star/wizards/web/Process.py @@ -205,7 +205,7 @@ class Process(ProcessErrors): task.advance(True) # Copy "static" files (which are always the same, - # thus not user-input-dependant) to a target directory. + # thus not user-input-dependent) to a target directory. # Note that this method is static since it is # also used when displaying a "preview" # @param copy diff --git a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py index 0b620c12ae31..f05458dbcdef 100644 --- a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py +++ b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.py @@ -33,7 +33,7 @@ class ImpressHTMLExporter(ConfiguredExporter): def export(source, targetDirectory, xmsf, task): # here set some filter specific properties. - # other properties, which are not dependant on + # other properties, which are not dependent on # user input are set through the exporter # configuration. diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index f726ed0d4aed..74d77e0d2767 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4089,7 +4089,7 @@ uno::Reference<beans::XPropertySet> DomainMapper_Impl::GetCurrentNumberingCharSt SectionPropertyMap * DomainMapper_Impl::GetSectionContext() { SectionPropertyMap* pSectionContext = 0; - //the section context is not availabe before the first call of startSectionGroup() + //the section context is not available before the first call of startSectionGroup() if( !IsAnyTableImport() ) { PropertyMapPtr pContext = GetTopContextOfType(CONTEXT_SECTION); diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index 04b17ff99945..7c3f1a9a3155 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -2497,7 +2497,7 @@ <UML:Attribute name="fFormatting"> <UML:ModelElement.taggedValue> <UML:TaggedValue> - <UML:TaggedValue.dataValue>true if the formatting is overriden (in which case the LFOLVL + <UML:TaggedValue.dataValue>true if the formatting is overridden (in which case the LFOLVL should contain a pointer to a LVL)</UML:TaggedValue.dataValue> <UML:TaggedValue.type> <UML:TagDefinition xmi.idref="comment"/> diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 12b8f764f736..3411dabf0864 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -400,7 +400,7 @@ void SdXMLEventContext::EndElement() pProperties++; // ClickAction_BOOKMARK and ClickAction_DOCUMENT share the same xml event - // so check here if its realy a bookmark or maybe a document + // so check here if its really a bookmark or maybe a document if( meClickAction == ClickAction_BOOKMARK ) { if( !msBookmark.startsWith( "#" ) ) diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index f2d4c782e5cd..a8316c9d144a 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -1390,9 +1390,9 @@ void XMLShapeExport::ImpExportNewTrans_FeaturesAndWrite(::basegfx::B2DTuple& rTR mrExport.AddAttribute(XML_NAMESPACE_SVG, XML_HEIGHT, aStr); // decide if transformation is necessary - sal_Bool bTransformationIsNeccessary(fTRShear != 0.0 || fTRRotate != 0.0); + sal_Bool bTransformationIsNecessary(fTRShear != 0.0 || fTRRotate != 0.0); - if(bTransformationIsNeccessary) + if(bTransformationIsNecessary) { // write transformation, but WITHOUT scale which is exported as size above SdXMLImExTransform2D aTransform; diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index 4c87b9fedc96..25211b5ebe61 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -467,7 +467,7 @@ void XMLStyleExport::exportStyleFamily( Reference< XPropertySet > xPropSet( xStyle, UNO_QUERY ); Reference< XPropertySetInfo > xPropSetInfo( xPropSet->getPropertySetInfo() ); - // styles that aren't existing realy are ignored. + // styles that aren't existing really are ignored. if( xPropSetInfo->hasPropertyByName( sIsPhysical ) ) { Any aAny( xPropSet->getPropertyValue( sIsPhysical ) ); diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index ae30b1154b80..95c4e00a35f6 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -276,7 +276,7 @@ XMLPropertyMapEntry aXMLParaPropMap[] = // RES_PARATR_WIDOWS MP_E( "ParaWidows", FO, WIDOWS, XML_TYPE_NUMBER8, 0 ), // RES_PARATR_TABSTOP - MP_ED( "ParaTabStops", STYLE, TAB_STOPS, MID_FLAG_ELEMENT_ITEM|XML_TYPE_TEXT_TABSTOP, CTF_TABSTOP ), // this is not realy a string! + MP_ED( "ParaTabStops", STYLE, TAB_STOPS, MID_FLAG_ELEMENT_ITEM|XML_TYPE_TEXT_TABSTOP, CTF_TABSTOP ), // this is not really a string! // RES_PARATR_HYPHENZONE MT_E( "ParaIsHyphenation", FO, HYPHENATE, XML_TYPE_BOOL, 0 ), MT_E( "ParaHyphenationMaxLeadingChars", FO, HYPHENATION_REMAIN_CHAR_COUNT, XML_TYPE_NUMBER16_NO_ZERO, 0 ), |