[Libreoffice-commits] core.git: sd/source sfx2/qa sfx2/source
Andrea Gelmini
andrea.gelmini at gelma.net
Wed Sep 30 03:21:47 PDT 2015
sd/source/ui/sidebar/DocumentHelper.cxx | 2 +-
sd/source/ui/sidebar/DocumentHelper.hxx | 2 +-
sd/source/ui/sidebar/MasterPageDescriptor.hxx | 2 +-
sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx | 2 +-
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx | 2 +-
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 2 +-
sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 2 +-
sd/source/ui/unoidl/unomodel.cxx | 2 +-
sd/source/ui/view/ToolBarManager.cxx | 6 +++---
sd/source/ui/view/drviews1.cxx | 2 +-
sd/source/ui/view/drviews7.cxx | 2 +-
sd/source/ui/view/drviewsd.cxx | 2 +-
sd/source/ui/view/outlview.cxx | 2 +-
sfx2/qa/complex/sfx2/DocumentMetadataAccess.java | 2 +-
sfx2/source/appl/appcfg.cxx | 2 +-
15 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit e90848edfd8cb146ab4e11eb2e62c93ed344d62f
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Wed Sep 30 12:19:31 2015 +0200
Fix typos
Change-Id: Ib96bf8adc3f94fa0b8b306d2a609dd2eea940dd1
Reviewed-on: https://gerrit.libreoffice.org/18974
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index 38c3d36..2bac79f 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -508,7 +508,7 @@ SdPage* DocumentHelper::ProvideMasterPage (
// The given master page does not already belong to the target
// document so we have to create copies and insert them into the
- // targer document.
+ // target document.
// Determine the position where the new master pages are inserted.
// By default they are inserted at the end. When we assign to a
diff --git a/sd/source/ui/sidebar/DocumentHelper.hxx b/sd/source/ui/sidebar/DocumentHelper.hxx
index f29b5c6..3df43fc 100644
--- a/sd/source/ui/sidebar/DocumentHelper.hxx
+++ b/sd/source/ui/sidebar/DocumentHelper.hxx
@@ -41,7 +41,7 @@ public:
SdPage* pMasterPage);
/** Return and, when not yet present, create a slide that uses the given
- masster page.
+ master page.
*/
static SdPage* GetSlideForMasterPage (SdPage* pMasterPage);
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
index f2519e5..0192059 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
@@ -182,7 +182,7 @@ public:
*/
Image maLargePreview;
- /** The prewview provider. May be empty. May be replaced during the
+ /** The preview provider. May be empty. May be replaced during the
lifetime of a MasterPageDescriptor object.
*/
std::shared_ptr<PreviewProvider> mpPreviewProvider;
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
index 29390ab..1214527 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx
@@ -65,7 +65,7 @@ public:
*/
BitmapCache (const sal_Int32 nMaximalNormalCacheSize = 0);
- /** The destructor clears the cache and relases all bitmaps still in it.
+ /** The destructor clears the cache and releases all bitmaps still in it.
*/
~BitmapCache();
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index 5fb9af5..9de0a5e 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -48,7 +48,7 @@ DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter)
if (rSlideSorter.GetModel().GetEditMode() != EM_PAGE)
return;
- // For poperly handling transferables created by the navigator we
+ // For properly handling transferables created by the navigator we
// need additional information. For this a user data object is
// created that contains the necessary information.
SdTransferable* pTransferable = SD_MOD()->pTransferDrag;
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 95f8507..c419b9f 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -1320,7 +1320,7 @@ void MultiSelectionModeHandler::ProcessEvent (
{
// During a multi selection we do not want sudden jumps of the
// visible area caused by moving newly selected pages into view.
- // Therefore disable that temporarily. The disabler object is
+ // Therefore disable that temporarily. The disabled object is
// released at the end of the event processing, after the focus and
// current slide have been updated.
VisibleAreaManager::TemporaryDisabler aDisabler (mrSlideSorter);
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index 54fc9e8..a33c304 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -277,7 +277,7 @@ private:
/** Prepare for several model changes, i.e. prevent time-consuming and
non-critical operations like repaints until UnlockModelChange() is
- called. Ciritcal operations like releasing references to pages that
+ called. Critical operations like releasing references to pages that
do not exist anymore are executed.
*/
void LockModelChange();
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 9c6cb32..b12a770 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2261,7 +2261,7 @@ void SdXImpressDocument::paintTile( VirtualDevice& rDevice,
// Scaling. Must convert from pixels to twips. We know
// that VirtualDevices use a DPI of 96.
// We specifically calculate these scales first as we're still
- // in TWIPs, and might as well minimise the number of conversions.
+ // in TWIPs, and might as well minimize the number of conversions.
Fraction scaleX = Fraction( nOutputWidth, 96 ) * Fraction(1440L) /
Fraction( nTileWidth);
Fraction scaleY = Fraction( nOutputHeight, 96 ) * Fraction(1440L) /
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index ee07859..dd215ab 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -135,7 +135,7 @@ public:
void AddShellId (sd::ToolBarManager::ToolBarGroup eGroup, sd::ShellId nId);
/** Releasing all shells means that the given ToolBarRules object is
- informed that every shell mananged by the called ToolBarShellList is
+ informed that every shell managed by the called ToolBarShellList is
about to be removed and that the associated framework tool bars can
be removed as well. The caller still has to call UpdateShells().
*/
@@ -778,7 +778,7 @@ void ToolBarManager::Implementation::Update (
// tool bars then update this set now.
if (mnLockCount == 0)
{
- // During ceation of ViewShellBase we may have the situation that
+ // During creation of ViewShellBase we may have the situation that
// the controller has already been created and attached to the frame
// but that the ToolBarManager has not yet completed its
// initialization (by initializing the mxLayouter member.) We do
@@ -811,7 +811,7 @@ void ToolBarManager::Implementation::Update (
mrBase.GetViewShellManager());
// 3) Unlock the ViewShellManager::UpdateLock. This updates the
- // shell stack. We have to be carfull here. The deletion of
+ // shell stack. We have to be carefully here. The deletion of
// the lock may end in a synchronous call to LockUpdate(). When
// at this time the lock has been deleted but the unique_ptr has
// not yet been reset then the lock is deleted a second time.
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index f04dea6..83e726f 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -795,7 +795,7 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
bool bOK = false;
// With the current implementation of FuSlideShow there is a problem
- // when it dsplays the show in a window: When the show is stopped it
+ // when it displays the show in a window: when the show is stopped it
// returns at one point in time SDRPAGE_NOTFOUND as current page index.
// Because FuSlideShow is currently being rewritten this bug is fixed
// here.
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index bfd65c9..2f3484e 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -1620,7 +1620,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet)
{
- //draview
+ //DrawView
rSet.Put(SfxBoolItem(SID_DIAMODE, false));
rSet.Put(SfxBoolItem(SID_OUTLINEMODE, false));
if (mePageKind == PK_NOTES)
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index 922f148..fb08363 100644
--- a/sd/source/ui/view/drviewsd.cxx
+++ b/sd/source/ui/view/drviewsd.cxx
@@ -96,7 +96,7 @@ void DrawViewShell::ExecNavigatorWin( SfxRequest& rReq )
case PAGE_LAST:
{
- // jumpt to last page
+ // jump to last page
SwitchPage(GetDoc()->GetSdPageCount(mpActualPage->GetPageKind()) - 1);
}
break;
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 60d48d2..f5107e6 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -165,7 +165,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineVie
}
/**
- * Destructor, restore Links, clear Oultiner
+ * Destructor, restore Links, clear Outliner
*/
OutlineView::~OutlineView()
{
diff --git a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
index b871a1c..f55f9f9 100644
--- a/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
+++ b/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java
@@ -227,7 +227,7 @@ public class DocumentMetadataAccess
System.out.println("Checking some invalid args...");
- String content = "behold, for i am the content.";
+ String content = "behold, for I am the content.";
new TestRange(content);
try {
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 0b8818e..5ba334b 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -559,7 +559,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
aSaveOptions.SetAutoSave( static_cast<const SfxBoolItem*>(pItem)->GetValue() );
}
- // AutoSave-Propt
+ // AutoSave-Prompt
if ( SfxItemState::SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_AUTOSAVEPROMPT), true, &pItem))
{
DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
More information about the Libreoffice-commits
mailing list