From da40cac540e7d735edbe9069b3c8ec6af4530208 Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Mon, 10 Nov 2014 15:05:25 +0100 Subject: Fix common typos. No automatic tools. Handmade… MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959 Reviewed-on: https://gerrit.libreoffice.org/12164 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- sd/README_REMOTE | 4 ++-- sd/inc/OutlinerIterator.hxx | 2 +- sd/source/filter/eppt/pptx-epptooxml.cxx | 2 +- sd/source/filter/html/pubdlg.cxx | 2 +- sd/source/filter/xml/sdxmlwrp.cxx | 2 +- sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 2 +- sd/source/ui/app/sddll.cxx | 2 +- sd/source/ui/dlg/navigatr.cxx | 2 +- sd/source/ui/docshell/docshel3.cxx | 4 ++-- sd/source/ui/framework/factories/BasicPaneFactory.cxx | 2 +- sd/source/ui/framework/module/SlideSorterModule.hxx | 2 +- sd/source/ui/inc/View.hxx | 2 +- sd/source/ui/inc/taskpane/ControlContainer.hxx | 4 ++-- sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c | 2 +- sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h | 2 +- sd/source/ui/sidebar/DocumentHelper.cxx | 2 +- sd/source/ui/sidebar/LayoutMenu.hxx | 4 ++-- sd/source/ui/slideshow/slideshowimpl.cxx | 4 ++-- sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx | 2 +- sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 2 +- sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx | 2 +- sd/source/ui/slidesorter/view/SlsLayouter.cxx | 2 +- sd/source/ui/view/Outliner.cxx | 4 ++-- sd/source/ui/view/drawview.cxx | 2 +- sd/source/ui/view/drbezob.cxx | 2 +- sd/source/ui/view/drtxtob.cxx | 2 +- 26 files changed, 32 insertions(+), 32 deletions(-) (limited to 'sd') diff --git a/sd/README_REMOTE b/sd/README_REMOTE index 9e303e43e8f5..dc43e59badfe 100644 --- a/sd/README_REMOTE +++ b/sd/README_REMOTE @@ -76,7 +76,7 @@ Any lines in [square brackets] are optional, and should be omitted if not needed * pointer_dismissed // This dismiss the pointer red dot on screen, should be called when user stop touching screen * pointer_coordination // This update pointer's position to current (x,y) current_x // note that x, y are in percentage (from 0.0 to 1.0) with respect to the slideshow size - current_y // unless screenupdater's perfomance is significantly improved, we should consider limit the update frequency on the + current_y // unless screenupdater's performance is significantly improved, we should consider limit the update frequency on the // remote-end @@ -104,4 +104,4 @@ Status/Data (Server to Client) # As of gsoc2013, these commands are extended to the existing protocol, since remote-end also ignore all unknown commands (which is the case of gsoc2012 android implementation), backward compatibility is kept. * slideshow_info // once paired, the server-end will send back the title of the current presentation - Title \ No newline at end of file + Title diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index 1dd446da7125..d056ed412267 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -304,7 +304,7 @@ class IteratorPosition public: /** Create a new object with all data members set to default values. These values should not be accessed. The only use of the object as - it is is as a marker in comparisons. + it is as a marker in comparisons. */ IteratorPosition (void); /** Create a new object with all data members set from the given diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 9fb836bf875f..1f1362bcac0e 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -384,7 +384,7 @@ bool PowerPointExport::exportDocument() throw (css::uno::RuntimeException, std:: mPresentationFS->endElementNS( XML_p, XML_presentation ); mPresentationFS.reset(); - // Free all FSHelperPtr, to flush data before commiting storage + // Free all FSHelperPtr, to flush data before committing storage mpSlidesFSArray.clear(); commitStorage(); diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 9070b7586817..40aa4a2b1e9c 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -1298,7 +1298,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, NextPageHdl) return 0; } -// Sets the Controlls in the dialog to the settings in the design +// Sets the Controls in the dialog to the settings in the design void SdPublishingDlg::SetDesign( SdPublishingDesign* pDesign ) { if(!pDesign) diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index ad1cd23fb9f1..3770c20ff052 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -715,7 +715,7 @@ bool SdXMLFilter::Import( ErrCode& nError ) nError = ERRCODE_IO_BROKENPACKAGE; break; } - // fall through intented + // fall through intended default: { // TODO/LATER: this is completely wrong! Filter code should never call ErrorHandler directly! diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index cc3a5450e0e3..3cd301cc12dd 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -502,7 +502,7 @@ uno::Sequence< sal_Int32 > SAL_CALL } } std::sort( vXShapes.begin(), vXShapes.end(), XShapePosCompareHelper() ); - //get the the index of the selected object in the group + //get the index of the selected object in the group std::vector< uno::Reference >::iterator aIter; //we start counting position from 1 sal_Int32 nPos = 1; diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index c2016bace897..085f72fc176d 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -99,7 +99,7 @@ using namespace ::com::sun::star; -// Register all Factorys +// Register all Factories void SdDLL::RegisterFactorys() { if (SvtModuleOptions().IsImpress()) diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 7e7f1550ec7a..91f5d2f63e4e 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -227,7 +227,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc ) } /** - * DragType is set on dependance if a Drag is even possible. For example, + * DragType is set on dependence if a Drag is even possible. For example, * under certain circumstances, it is not allowed to drag graphics (#31038#). */ NavigatorDragType SdNavigatorWin::GetNavigatorDragType() diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index 07f91ef4ad8b..6c81c2f8f1c2 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -147,7 +147,7 @@ void DrawDocShell::Execute( SfxRequest& rReq ) const SvxSearchItem* pSearchItem = (const SvxSearchItem*) &pReqArgs->Get(SID_SEARCH_ITEM); - // would be nice to have an an assign operation at SearchItem + // would be nice to have an assign operation at SearchItem SvxSearchItem* pAppSearchItem = SD_MOD()->GetSearchItem(); delete pAppSearchItem; pAppSearchItem = (SvxSearchItem*) pSearchItem->Clone(); @@ -215,7 +215,7 @@ void DrawDocShell::Execute( SfxRequest& rReq ) const SvxSearchItem* pSearchItem = (const SvxSearchItem*) &pReqArgs->Get(SID_SEARCH_ITEM); - // would be nice to have an an assign operation at SearchItem + // would be nice to have an assign operation at SearchItem SvxSearchItem* pAppSearchItem = SD_MOD()->GetSearchItem(); delete pAppSearchItem; pAppSearchItem = (SvxSearchItem*)pSearchItem->Clone(); diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 0099542928d8..cf622b716f37 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -335,7 +335,7 @@ void SAL_CALL BasicPaneFactory::releaseResource ( // The given XPane reference is either empty or the pane was not // created by any of the factories managed by the called // BasicPaneFactory object. - throw lang::IllegalArgumentException("BasicPaneFactory::releasePane() called for pane that that was not created by same factory.", + throw lang::IllegalArgumentException("BasicPaneFactory::releasePane() called for pane that was not created by same factory.", NULL, 0); } diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx index 37f553a709c0..906a8ec1b556 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.hxx +++ b/sd/source/ui/framework/module/SlideSorterModule.hxx @@ -27,7 +27,7 @@ namespace sd { namespace framework { -/** This module is responsible for showing the slide sorter bar and the the +/** This module is responsible for showing the slide sorter bar and the slide sorter view in the center pane. */ class SlideSorterModule diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 6714daefaacc..962f75d9a9ba 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -149,7 +149,7 @@ public: sal_uLong nFormat = 0, sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRLAYER_NOTFOUND ); /** gets the metafile from the given transferable helper and insert it as a graphic shape. @param bOptimize if set to true, the metafile is analyzed and if only one bitmap action is - present, then is is inserted as a single graphic. + present, then is inserted as a single graphic. */ bool InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rInsertPos, diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx index f9901e26c289..f06f06be51b4 100644 --- a/sd/source/ui/inc/taskpane/ControlContainer.hxx +++ b/sd/source/ui/inc/taskpane/ControlContainer.hxx @@ -108,7 +108,7 @@ public: */ TreeNode* GetControl (sal_uInt32 nIndex) const; - /** Return the index of the control previous to that that is specified + /** Return the index of the control previous to that is specified by the given index. @param nIndex Index of the control for which to return the index of the @@ -130,7 +130,7 @@ public: bool bIncludeHidden=false, bool bCycle=false) const; - /** Return the index of the control next to that that is specified by + /** Return the index of the control next to that is specified by the given index. @param nIndex Index of the control for which to return the index of the next diff --git a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c index a2e3b580286b..35b5e90277f2 100644 --- a/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c +++ b/sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c @@ -1026,7 +1026,7 @@ static void DebugWindowsEventLogPrint( DebugLevel inLevel, char *inData, size_t } *dst = 0; - // Add the the string to the event log. + // Add the string to the event log. array[ 0 ] = buffer; if( gDebugWindowsEventLogEventSource ) { diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h b/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h index 92342be110b4..1549a9d67779 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h @@ -2474,7 +2474,7 @@ DNSServiceErrorType DNSSD_API DNSServiceSleepKeepalive * and report errors at compile-time if anything is wrong. The usual way to do this would * be to use a run-time "if" statement or the conventional run-time "assert" mechanism, but * then you don't find out what's wrong until you run the software. This way, if the assertion - * condition is false, the array size is negative, and the complier complains immediately. + * condition is false, the array size is negative, and the compiler complains immediately. */ struct CompileTimeAssertionChecks_DNS_SD diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index 3b0cc0969be7..4dedf6d69d4e 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -411,7 +411,7 @@ void DocumentHelper::AssignMasterPageToPage ( if ( ! pPage->IsMasterPage()) { - // 1. Remove the background object (so that that, if it exists, does + // 1. Remove the background object (so that, if it exists, does // not override the new master page) and assign the master page to // the regular slide. pDocument->GetDocSh()->GetUndoManager()->AddUndoAction( diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 45fce7f55c08..16d1ea3f4909 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -93,7 +93,7 @@ public: virtual void MouseButtonDown (const MouseEvent& rEvent) SAL_OVERRIDE; /** Call this method when the set of displayed layouts is not up-to-date - anymore. It will re-assemple this set according to the current + anymore. It will re-assemble this set according to the current settings. */ void InvalidateContent (void); @@ -159,7 +159,7 @@ private: void AssignLayoutToSelectedSlides (AutoLayout aLayout); /** Insert a new page with the given layout. The page is inserted via - the main view shell, i.e. its SID_INSERTPAGE slot is called. It it + the main view shell, i.e. its SID_INSERTPAGE slot is called. If it does not support this slot then inserting a new page does not take place. The new page is inserted after the currently active one (the one returned by ViewShell::GetActualPage().) diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 3f6c6cab1714..40c62cff4b7d 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1759,7 +1759,7 @@ void SlideshowImpl::startUpdateTimer() /** this timer is called 20ms after a new slide was displayed. This is used to unfreeze user input that was disabled after slide change to skip input that was buffered during slide - transition preperation */ + transition preparation */ IMPL_LINK_NOARG(SlideshowImpl, ReadyForNextInputHdl) { mbInputFreeze = false; @@ -2631,7 +2631,7 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception) if( pDispatcher ) { - // filter all forbiden slots + // filter all forbbiden slots pDispatcher->SetSlotFilter( SFX_SLOT_FILTER_ENABLED, sizeof(pAllowed) / sizeof(sal_uInt16), pAllowed ); } diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx index d093da56d010..7a730034b98a 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx @@ -88,7 +88,7 @@ public: /** Invalidate the preview bitmaps for all slides that belong to the specified document. This is necessary after model changes that - affect e.g. page number fiels. + affect e.g. page number fields. */ void InvalidateAllPreviewBitmaps (DocumentKey pDocument); diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index 993a0b568638..7e42b84363c1 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -67,7 +67,7 @@ public: */ SlideSorterController (SlideSorter& rSlideSorter); - /** Late initialization. Call this method once a new new object has been + /** Late initialization. Call this method once a new new object has been created. */ virtual void Init (void); diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index 381bac6868f7..a04d5fba8733 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -164,7 +164,7 @@ public: const bool bClampToValidRange = true) const; /** Return an object that describes the logical and visual properties of - where to do an insert operation when the user would release the the + where to do an insert operation when the user would release the mouse button at the given position after a drag operation and of where and how to display an insertion indicator. @param rModelPosition diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index d628965d8b87..bcffcab40632 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -125,7 +125,7 @@ public: between two adjacent rows or columns. @param nDistanceIntoGap Vertical distance from the bottom of the upper row down into the - gap or or horizontal distance from the right edge right into the + gap or horizontal distance from the right edge right into the gap. @param eGapMemberhship This value decides what areas in the gap belong to which (or no) diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 044e6422ce52..9b1226a5225c 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -1191,7 +1191,7 @@ void Outliner::PrepareSearchAndReplace (void) EnterEditMode(false); mpDrawDocument->GetDocSh()->SetWaitCursor( false ); - // Start seach at the right end of the current object's text + // Start search at the right end of the current object's text // depending on the search direction. OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); if (pOutlinerView != NULL) @@ -1494,7 +1494,7 @@ void Outliner::PrepareConversion (void) EnterEditMode (); mpDrawDocument->GetDocSh()->SetWaitCursor( false ); - // Start seach at the right end of the current object's text + // Start search at the right end of the current object's text // depending on the search direction. } else diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index a73048c00d57..131db8b92de6 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -590,7 +590,7 @@ void DrawView::DeleteMarked() // pUndoManager should not be NULL (see assert above) // but since we have defensive code // for it earlier and later in the function - // we might as well be consistant + // we might as well be consistent if(pUndoManager) { // Move the new PresObj to the position before the diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index 22a073e1eace..4a263d720a58 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -91,7 +91,7 @@ void BezierObjectBar::GetAttrState(SfxItemSet& rSet) { SfxItemSet aAttrSet( mpView->GetDoc().GetPool() ); mpView->GetAttributes( aAttrSet ); - rSet.Put(aAttrSet, false); // <- sal_False, so DontCare-Status gets aquired + rSet.Put(aAttrSet, false); // <- sal_False, so DontCare-Status gets acquired rtl::Reference xFunc( mpViewSh->GetCurrentFunction() ); diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 1327ea7e6ce5..2c8e7a09bf85 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -425,7 +425,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) nWhich = aIter.NextWhich(); } - rSet.Put( aAttrSet, false ); // <- sal_False, so DontCare-Status gets aquired + rSet.Put( aAttrSet, false ); // <- sal_False, so DontCare-Status gets acquired // these are disabled in outline-mode if (!mpViewShell || !mpViewShell->ISA(DrawViewShell)) -- cgit